diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java b/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java index 78f35c12..f7b57229 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java @@ -29,7 +29,7 @@ import crazypants.enderio.machine.painter.PainterUtil; @ThreadSafeISBRH(perThread = true) public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { - private OverlayRenderer overlayRenderer = new OverlayRenderer() { + private final OverlayRenderer overlayRenderer = new OverlayRenderer() { @Override public void renderFace(CustomRenderBlocks rb, ForgeDirection face, Block par1Block, double x, double y, @@ -40,7 +40,7 @@ public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler, II } }; - private CustomCubeRenderer ccr = new CustomCubeRenderer(); + private final CustomCubeRenderer ccr = new CustomCubeRenderer(); private final PaintedBlockRenderer paintedRenderer = new PaintedBlockRenderer(this.getRenderId(), null); // renderer for @@ -112,6 +112,7 @@ public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler, II ccr.renderBlock(world, block, x, y, z, overlayRenderer); } ccr.setOverrideTexture(null); + overlayRenderer.setTile(null); return true; } diff --git a/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java b/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java index ee6d4730..2ba93e9f 100644 --- a/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java +++ b/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java @@ -18,8 +18,8 @@ import crazypants.enderio.EnderIO; public class TechneMachineRenderer extends TechneModelRenderer { - private CustomCubeRenderer ccr = new CustomCubeRenderer(); - private OverlayRenderer overlay = new OverlayRenderer(); + private final CustomCubeRenderer ccr = new CustomCubeRenderer(); + private final OverlayRenderer overlay = new OverlayRenderer(); public TechneMachineRenderer(AbstractMachineBlock block, String modelPath) { super( @@ -51,7 +51,7 @@ public class TechneMachineRenderer extends Tech public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { @SuppressWarnings("unchecked") - T te = (T) world.getTileEntity(x, y, z); + final T te = (T) world.getTileEntity(x, y, z); if (te != null) { setFacingDir(te.getFacingDir()); overlay.setTile(te); @@ -63,6 +63,8 @@ public class TechneMachineRenderer extends Tech ccr.renderBlock(world, block, x, y, z, overlay); } + overlay.setTile(null); + return true; } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java index fefd2337..5b6da7fe 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java @@ -28,10 +28,8 @@ import crazypants.enderio.machine.transceiver.TileTransceiver; @SideOnly(Side.CLIENT) public class TransceiverRenderer extends TileEntitySpecialRenderer implements IItemRenderer { - private IModel model; - - private BoundingBox bb; - + private final IModel model; + private final BoundingBox bb; private boolean adjustForItem = false; public TransceiverRenderer() { diff --git a/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java b/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java index f4b13516..fb9c045a 100644 --- a/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java +++ b/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java @@ -26,9 +26,7 @@ import crazypants.enderio.machine.painter.TileEntityPaintedBlock; @ThreadSafeISBRH(perThread = false) public class FusedQuartzRenderer implements ISimpleBlockRenderingHandler { - static int renderPass; - - private ConnectedTextureRenderer connectedTextureRenderer = new ConnectedTextureRenderer() { + private final ConnectedTextureRenderer connectedTextureRenderer = new ConnectedTextureRenderer() { @Override public boolean matchesMetadata(int meta1, int meta2) {