diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 8e9235a6..1d036115 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -353,8 +353,9 @@ public class ClientProxy extends CommonProxy { RenderingRegistry.registerBlockHandler(new PaintedBlockRenderer(BlockTravelAnchor.renderId, EnderIO.blockTravelPlatform)); BlockTelePad.renderId = RenderingRegistry.getNextAvailableRenderId(); - RenderingRegistry.registerBlockHandler(new TelePadRenderer()); - ClientRegistry.bindTileEntitySpecialRenderer(TileTelePad.class, new TelePadSpecialRenderer()); + TelePadRenderer telePadRenderer = new TelePadRenderer(); + RenderingRegistry.registerBlockHandler(telePadRenderer); + ClientRegistry.bindTileEntitySpecialRenderer(TileTelePad.class, new TelePadSpecialRenderer(telePadRenderer)); MinecraftForgeClient.registerItemRenderer(EnderIO.itemMachinePart, new MachinePartRenderer()); MinecraftForgeClient.registerItemRenderer(EnderIO.itemConduitFacade, new FacadeRenderer()); diff --git a/src/main/java/crazypants/enderio/TileEntityEio.java b/src/main/java/crazypants/enderio/TileEntityEio.java index f02b05f0..6a95187f 100644 --- a/src/main/java/crazypants/enderio/TileEntityEio.java +++ b/src/main/java/crazypants/enderio/TileEntityEio.java @@ -4,4 +4,5 @@ import com.enderio.core.common.TileEntityEnder; public abstract class TileEntityEio extends TileEntityEnder { // Nothing yet ;D + } diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index 89d943ab..0e6df397 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -120,7 +120,7 @@ public abstract class AbstractMachineBlock exte iconBuffer[0][11] = iIconRegister.registerIcon(side); iconBuffer[1][0] = iIconRegister.registerIcon(getModelIconKey(false)); - iconBuffer[1][1] = iIconRegister.registerIcon(getModelIconKey(false)); + iconBuffer[1][1] = iIconRegister.registerIcon(getModelIconKey(true)); registerOverlayIcons(iIconRegister); diff --git a/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java b/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java index 947f121e..f1de15d4 100644 --- a/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java +++ b/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java @@ -9,6 +9,7 @@ import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.api.client.render.VertexTransform; import com.enderio.core.client.render.CustomCubeRenderer; import com.enderio.core.client.render.TechneModelRenderer; +import com.enderio.core.client.render.TechneUtil; import com.enderio.core.client.render.VertexRotationFacing; import com.enderio.core.client.render.VertexTransformComposite; import com.google.common.collect.ObjectArrays; @@ -24,6 +25,10 @@ public class TechneMachineRenderer extends Tech super(EnderIO.MODID, modelPath, block.getRenderType(), new VertexTransformComposite(new VertexRotationFacing(ForgeDirection.NORTH))); } + public TechneMachineRenderer(int renderId, String modelPath) { + super(TechneUtil.getModel(EnderIO.MODID, modelPath), renderId, new VertexTransformComposite(new VertexRotationFacing(ForgeDirection.NORTH))); + } + public TechneMachineRenderer addTransform(VertexTransform vt) { this.vt = new VertexTransformComposite(ObjectArrays.concat(vt, ((VertexTransformComposite) this.vt).xforms)); return this; diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java b/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java index 529211c0..f37a8708 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java @@ -21,19 +21,32 @@ import crazypants.enderio.EnderIO; public class TelePadRenderer extends TechneModelRenderer { - public static final Map all = TechneUtil.getModel(EnderIO.MODID, "models/telePad"); + private final Collection strippedModel = Lists.newArrayList(); public TelePadRenderer() { - super(getModel(), BlockTelePad.renderId); - } - - private static Collection getModel() { - Collection model = Lists.newArrayList(); - for (String s : all.keySet()) { + super(TechneUtil.getModel(EnderIO.MODID, "models/telePad"), BlockTelePad.renderId); + for (String s : this.model.keySet()) { if(!s.equals("glass") && !s.contains("blade")) { - model.add(all.get(s)); + strippedModel.add(this.model.get(s)); } } + } + + protected Collection getModel() { + return strippedModel; + } + + @Override + protected Collection getModel(Block block, int metadata) { + return getModel(); + } + + @Override + protected Collection getModel(IBlockAccess world, int x, int y, int z) { + return getModel(); + } + + Map getFullModel() { return model; } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TelePadSpecialRenderer.java b/src/main/java/crazypants/enderio/teleport/telepad/TelePadSpecialRenderer.java index 7917fc60..a658fdc1 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TelePadSpecialRenderer.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TelePadSpecialRenderer.java @@ -15,16 +15,26 @@ import com.google.common.collect.Lists; public class TelePadSpecialRenderer extends TileEntitySpecialRenderer { - private static GroupObject blade1 = TelePadRenderer.all.get("blade1"); - private static GroupObject blade2 = TelePadRenderer.all.get("blade2"); - private static GroupObject blade3 = TelePadRenderer.all.get("blade3"); + private final GroupObject blade1; + private final GroupObject blade2; + private final GroupObject blade3; // Reverse order for top to bottom - private static List blades = Lists.newArrayList(blade3, blade2, blade1); + private final List blades; - private static GroupObject glass = TelePadRenderer.all.get("glass"); + private final GroupObject glass; private static Random rand = new Random(); + public TelePadSpecialRenderer(TelePadRenderer telePadRenderer) { + super(); + blade1 = telePadRenderer.getFullModel().get("blade1"); + blade2 = telePadRenderer.getFullModel().get("blade2"); + blade3 = telePadRenderer.getFullModel().get("blade3"); + blades = Lists.newArrayList(blade3, blade2, blade1); + + glass = telePadRenderer.getFullModel().get("glass"); + } + @Override public void renderTileEntityAt(TileEntity te, double x, double y, double z, float p_147500_8_) { TileTelePad tp = (TileTelePad) te; @@ -50,8 +60,8 @@ public class TelePadSpecialRenderer extends TileEntitySpecialRenderer { private void render(GroupObject model, TileEntity te, Tessellator tes) { tes.startDrawingQuads(); - TechneUtil.renderWithIcon(model, te.getBlockType().getIcon(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord, 0), null, Tessellator.instance, - te.getWorldObj(), 0, 0, 0, null, false); + TechneUtil.renderWithIcon(model, te.getBlockType().getIcon(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord, 0), null, + Tessellator.instance, te.getWorldObj(), 0, 0, 0, null, false); tes.draw(); } }