Merge horizontal and vertical entrances

Author: Runemoro

src/main/java/com/zixiken/dimdoors/DimDoors.java

@@ -12,9 +12,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.translation.I18n;
-import net.minecraft.world.WorldProvider;
-import net.minecraftforge.client.IRenderHandler;
-import net.minecraftforge.fml.common.FMLLog;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.SidedProxy;
 import net.minecraftforge.fml.common.event.*;

src/main/java/com/zixiken/dimdoors/client/DDProxyClient.java

@@ -3,9 +3,8 @@
 import com.zixiken.dimdoors.shared.DDProxyCommon;
 import com.zixiken.dimdoors.shared.entities.EntityMonolith;
 import com.zixiken.dimdoors.shared.entities.RenderMonolith;
-import com.zixiken.dimdoors.shared.tileentities.TileEntityVerticalEntranceRift;
+import com.zixiken.dimdoors.shared.tileentities.TileEntityEntranceRift;
 import com.zixiken.dimdoors.shared.tileentities.TileEntityFloatingRift;
-import com.zixiken.dimdoors.shared.tileentities.TileEntityHorizontalEntranceRift;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.WorldProvider;
@@ -36,8 +35,7 @@ public void onInitialization(FMLInitializationEvent event) {
     }
 
     public void registerRenderers() {
-        ClientRegistry.bindTileEntitySpecialRenderer(TileEntityVerticalEntranceRift.class, new TileEntityVerticalEntranceRiftRenderer());
-        ClientRegistry.bindTileEntitySpecialRenderer(TileEntityHorizontalEntranceRift.class, new TileEntityHorizontalEntranceRiftRenderer());
+        ClientRegistry.bindTileEntitySpecialRenderer(TileEntityEntranceRift.class, new TileEntityEntranceRiftRenderer());
         ClientRegistry.bindTileEntitySpecialRenderer(TileEntityFloatingRift.class, new TileEntityFloatingRiftRenderer());
         RenderingRegistry.registerEntityRenderingHandler(EntityMonolith.class, manager -> new RenderMonolith(manager, 0.5f));
     }

src/main/java/com/zixiken/dimdoors/client/ModelManager.java

@@ -2,7 +2,6 @@
 
 import com.zixiken.dimdoors.shared.blocks.ModBlocks;
 import com.zixiken.dimdoors.shared.items.ModItems;
-import net.minecraft.block.Block;
 import net.minecraft.block.BlockDoor;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.block.model.ModelBakery;

src/main/java/com/zixiken/dimdoors/client/ParticleRiftEffect.java

@@ -2,7 +2,6 @@
 
 import com.zixiken.dimdoors.shared.util.WorldUtils;
 import com.zixiken.dimdoors.shared.world.DimDoorDimensions;
-import net.minecraft.client.particle.ParticleFirework;
 import net.minecraft.client.particle.ParticleSimpleAnimated;
 import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.entity.Entity;

…eEntityVerticalEntranceRiftRenderer.java …ient/TileEntityEntranceRiftRenderer.javasrc/main/java/com/zixiken/dimdoors/client/TileEntityVerticalEntranceRiftRenderer.java renamed to src/main/java/com/zixiken/dimdoors/client/TileEntityEntranceRiftRenderer.java src/main/java/com/zixiken/dimdoors/client/TileEntityVerticalEntranceRiftRenderer.java renamed to src/main/java/com/zixiken/dimdoors/client/TileEntityEntranceRiftRenderer.java

@@ -1,19 +1,16 @@
 package com.zixiken.dimdoors.client;
 
 import java.nio.FloatBuffer;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Random;
 
 import com.zixiken.dimdoors.DimDoors;
-import com.zixiken.dimdoors.shared.blocks.BlockDimDoorBase;
-import com.zixiken.dimdoors.shared.tileentities.TileEntityVerticalEntranceRift;
+import com.zixiken.dimdoors.shared.tileentities.TileEntityEntranceRift;
 import com.zixiken.dimdoors.shared.util.RGBA;
-import net.minecraft.block.BlockDoor;
-import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.*;
 import net.minecraft.client.renderer.vertex.*;
 import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
 import org.lwjgl.opengl.GL11;
 
 import net.minecraft.client.Minecraft;
@@ -22,46 +19,38 @@
 
 import static org.lwjgl.opengl.GL11.*;
 
-public class TileEntityVerticalEntranceRiftRenderer extends TileEntitySpecialRenderer<TileEntityVerticalEntranceRift> {
+public class TileEntityEntranceRiftRenderer extends TileEntitySpecialRenderer<TileEntityEntranceRift> { // TODO: see TileEntityEndGatewayRenderer
 
     private FloatBuffer buffer = GLAllocation.createDirectFloatBuffer(16);
     private ResourceLocation warpPath = new ResourceLocation(DimDoors.MODID + ":textures/other/warp.png");
     private ResourceLocation keyPath = new ResourceLocation(DimDoors.MODID + ":textures/other/keyhole.png");
     private ResourceLocation keyholeLight = new ResourceLocation(DimDoors.MODID + ":textures/other/keyhole_light.png");
+    Map<TileEntityEntranceRift, RGBA[]> colorMap = new HashMap<>();
 
-    /**
-     * Renders the dimdoor.
-     */
-    public void renderDimDoorTileEntity(TileEntityVerticalEntranceRift tile, double x, double y, double z) {
+    // TODO: allow any angle, make static and in a separate class
+    public void renderDimensionalWall(double x, double y, double z, RGBA[] colors, EnumFacing orientation, double extendUp, double extendDown, double extendLeft, double extendRight, double pushIn) {
         GL11.glDisable(GL11.GL_LIGHTING);
-        Random rand = new Random(31100L);
-
-        EnumFacing orientation = tile.orientation;
-        IBlockState state = tile.getWorld().getBlockState(tile.getPos());
-        if (state.getBlock() instanceof BlockDoor && state.getValue(BlockDoor.HALF) == BlockDoor.EnumDoorHalf.LOWER) y += 1;
-        // TODO: option for non-doors in the TileEntityEntranceRift
 
-        for (int count = 0; count < 16; ++count) {
+        for (int pass = 0; pass < 16; pass++) {
             GlStateManager.pushMatrix();
 
-            float var15 = 16 - count;
+            float var15 = 16 - pass;
             float var16 = 0.2625F;
             float var17 = 1.0F / (var15 + .80F);
 
             bindTexture(warpPath);
             GlStateManager.enableBlend();
 
-            if (count == 0) {
+            if (pass == 0) {
                 var17 = 0.1F;
                 var15 = 25.0F;
                 var16 = 0.125F;
 
                 GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
             }
 
-            if (count == 1) {
-                var16 = .5F;
-
+            if (pass == 1) {
+                var16 = 0.5F;
                 GlStateManager.blendFunc(GL11.GL_ONE, GL11.GL_ONE);
             }
 
@@ -74,6 +63,7 @@ public void renderDimDoorTileEntity(TileEntityVerticalEntranceRift tile, double
             GlStateManager.texGen(GlStateManager.TexGen.R, GL11.GL_OBJECT_LINEAR);
             GlStateManager.texGen(GlStateManager.TexGen.Q, GL11.GL_OBJECT_LINEAR);
 
+
             switch (orientation) {
                 case SOUTH:
                     GlStateManager.texGen(GlStateManager.TexGen.S, GL11.GL_OBJECT_PLANE, getFloatBuffer(0.0F, 1.0F, 0.0F, 0.0F));
@@ -99,6 +89,14 @@ public void renderDimDoorTileEntity(TileEntityVerticalEntranceRift tile, double
                     GlStateManager.texGen(GlStateManager.TexGen.R, GL11.GL_OBJECT_PLANE, getFloatBuffer(0.0F, 0.0F, 0.0F, 1.0F));
                     GlStateManager.texGen(GlStateManager.TexGen.Q, GL11.GL_OBJECT_PLANE, getFloatBuffer(1.0F, 0.0F, 0.0F, -0.15F));
                     break;
+                case DOWN:
+                    GlStateManager.texGen(GlStateManager.TexGen.S, GL11.GL_OBJECT_PLANE, getFloatBuffer(1.0F, 0.0F, 0.0F, 0.0F));
+                    GlStateManager.texGen(GlStateManager.TexGen.T, GL11.GL_OBJECT_PLANE, getFloatBuffer(0.0F, 0.0F, 1.0F, 0.0F));
+                    GlStateManager.texGen(GlStateManager.TexGen.R, GL11.GL_OBJECT_PLANE, getFloatBuffer(0.0F, 0.0F, 0.0F, 1.0F));
+                    GlStateManager.texGen(GlStateManager.TexGen.Q, GL11.GL_EYE_PLANE, getFloatBuffer(0.0F, 1.0F, 0.0F, 0.0F));
+                    break;
+                case UP:
+                    // TODO: logic for UP
             }
 
             GlStateManager.enableTexGenCoord(GlStateManager.TexGen.S);
@@ -114,40 +112,44 @@ public void renderDimDoorTileEntity(TileEntityVerticalEntranceRift tile, double
             GlStateManager.translate(0.0F, Minecraft.getSystemTime() % 200000L / 200000.0F * var15, 0.0F);
             GlStateManager.scale(var16, var16, var16);
             GlStateManager.translate(0.5F, 0.5F, 0.5F);
-            GlStateManager.rotate((count * count * 4321 + count * 9) * 2.0F, 0.0F, 0.0F, 1.0F);
+            GlStateManager.rotate((pass * pass * 4321 + pass * 9) * 2.0F, 0.0F, 0.0F, 1.0F);
             GlStateManager.translate(0.5F, 0.5F, 0.5F);
 
             Tessellator tessellator = Tessellator.getInstance();
             BufferBuilder worldRenderer = tessellator.getBuffer();
             worldRenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION);
 
-            RGBA color = tile.getEntranceRenderColor(rand); // TODO: cache this since it's constant
+            RGBA color = colors[pass];
             GlStateManager.color(color.getRed() * var17, color.getGreen() * var17, color.getBlue() * var17, color.getAlpha());
 
+            // Offsets in horizontal vertical and depth directions
+            double ohs = 0.5 - extendLeft;
+            double ohe = 0.5 + extendRight;
+            double ovs = 0.5 - extendDown;
+            double ove = 0.5 + extendUp;
+            // Render the rectangle based on the orientation
+            double od = orientation == EnumFacing.NORTH || orientation == EnumFacing.WEST || orientation == EnumFacing.DOWN ? pushIn : 1 - pushIn;
             switch (orientation) {
+                case NORTH:
                 case SOUTH:
-                    worldRenderer.pos(x, y - 1, z + .99).endVertex();
-                    worldRenderer.pos(x + 1, y - 1, z + .99).endVertex();
-                    worldRenderer.pos(x + 1, y + 1, z + .99).endVertex();
-                    worldRenderer.pos(x, y + 1, z + .99).endVertex();
+                    worldRenderer.pos(x + ohs, y + ovs, z + od).endVertex();
+                    worldRenderer.pos(x + ohe, y + ovs, z + od).endVertex();
+                    worldRenderer.pos(x + ohe, y + ove, z + od).endVertex();
+                    worldRenderer.pos(x + ohs, y + ove, z + od).endVertex();
                     break;
                 case WEST:
-                    worldRenderer.pos(x + .01, y - 1, z).endVertex();
-                    worldRenderer.pos(x + .01, y - 1, z + 1.0D).endVertex();
-                    worldRenderer.pos(x + .01, y + 1, z + 1.0D).endVertex();
-                    worldRenderer.pos(x + .01, y + 1, z).endVertex();
-                    break;
-                case NORTH:
-                    worldRenderer.pos(x, y + 1, z + .01).endVertex();
-                    worldRenderer.pos(x + 1, y + 1, z + .01).endVertex();
-                    worldRenderer.pos(x + 1, y - 1, z + .01).endVertex();
-                    worldRenderer.pos(x, y - 1, z + .01).endVertex();
-                    break;
                 case EAST:
-                    worldRenderer.pos(x + .99, y + 1, z).endVertex();
-                    worldRenderer.pos(x + .99, y + 1, z + 1.0D).endVertex();
-                    worldRenderer.pos(x + .99, y - 1, z + 1.0D).endVertex();
-                    worldRenderer.pos(x + .99, y - 1, z).endVertex();
+                    worldRenderer.pos(x + od, y + ovs, z + ohs).endVertex();
+                    worldRenderer.pos(x + od, y + ove, z + ohs).endVertex();
+                    worldRenderer.pos(x + od, y + ove, z + ohe).endVertex();
+                    worldRenderer.pos(x + od, y + ovs, z + ohe).endVertex();
+                    break;
+                case UP:
+                case DOWN:
+                    worldRenderer.pos(x + ovs, y + od, z + ohs).endVertex();
+                    worldRenderer.pos(x + ohe, y + od, z + ohs).endVertex();
+                    worldRenderer.pos(x + ohe, y + od, z + ohe).endVertex();
+                    worldRenderer.pos(x + ohs, y + od, z + ohe).endVertex();
                     break;
             }
 
@@ -165,14 +167,23 @@ public void renderDimDoorTileEntity(TileEntityVerticalEntranceRift tile, double
         GlStateManager.enableLighting();
     }
 
+    private RGBA[] getColors(TileEntityEntranceRift entrance) {
+        if (colorMap.containsKey(entrance)) return colorMap.get(entrance);
+        Random rand = new Random(31100L);
+        RGBA[] colors = new RGBA[16];
+        for (int i = 0; i < 16; i++) colors[i] = entrance.getEntranceRenderColor(rand);
+        colorMap.put(entrance, colors);
+        return colors;
+    }
+
     private FloatBuffer getFloatBuffer(float par1, float par2, float par3, float par4) {
         buffer.clear();
         buffer.put(par1).put(par2).put(par3).put(par4);
         buffer.flip();
         return buffer;
     }
 
-    private void renderKeyHole(TileEntityVerticalEntranceRift tile, double x, double y, double z, int i) {
+    private void renderKeyHole(TileEntityEntranceRift tile, double x, double y, double z, int i) {
         EnumFacing rotation = EnumFacing.getHorizontal((tile.orientation.getHorizontalIndex() + 3) % 4);
 
         GlStateManager.pushMatrix();
@@ -238,17 +249,14 @@ private void renderKeyHole(TileEntityVerticalEntranceRift tile, double x, double
     }
 
     @Override
-    public void render(TileEntityVerticalEntranceRift te, double x, double y, double z, float partialTicks, int destroyStage, float alpha) {
-        World world = te.getWorld();
-        BlockPos pos = te.getPos();
-        if (te.doorShouldRender) {
-            renderDimDoorTileEntity(te, x, y, z);
-            if (te.lockStatus >= 1) {
-                for (int i = 0; i < 1 + te.lockStatus; i++) {
-                    renderKeyHole(te, x, y, z, i);
+    public void render(TileEntityEntranceRift entrance, double x, double y, double z, float partialTicks, int destroyStage, float alpha) {
+        if (entrance.shouldRender) {
+            renderDimensionalWall(x, y, z, getColors(entrance), entrance.orientation, entrance.extendUp, entrance.extendDown, entrance.extendLeft, entrance.extendRight, entrance.pushIn);
+            if (entrance.lockStatus >= 1) {
+                for (int i = 0; i < 1 + entrance.lockStatus; i++) {
+                    renderKeyHole(entrance, x, y, z, i);
                 }
             }
-
         }
     }
 }