diff --git a/common/mekanism/client/render/RenderPartTransmitter.java b/common/mekanism/client/render/RenderPartTransmitter.java index af2be598c..77e76644d 100644 --- a/common/mekanism/client/render/RenderPartTransmitter.java +++ b/common/mekanism/client/render/RenderPartTransmitter.java @@ -49,6 +49,7 @@ public class RenderPartTransmitter implements IIconRegister private static final int stages = 40; private static final double height = 0.45; private static final double offset = 0.015; + private HashMap> cachedLiquids = new HashMap>(); static @@ -131,11 +132,11 @@ public class RenderPartTransmitter implements IIconRegister public void renderContents(PartMechanicalPipe pipe, Vector3 pos) { - if(pipe.getTransmitterNetwork().fluidScale > 0) - { - Fluid fluid = pipe.getTransmitterNetwork().refFluid; - float scale = pipe.getTransmitterNetwork().fluidScale; - + Fluid fluid = pipe.getTransmitterNetwork().refFluid; + float scale = pipe.getTransmitterNetwork().fluidScale; + + if(scale > 0 && fluid != null) + { push(); MekanismRenderer.glowOn(fluid.getLuminosity()); @@ -143,6 +144,8 @@ public class RenderPartTransmitter implements IIconRegister CCRenderState.changeTexture((MekanismRenderer.getBlocksTexture())); GL11.glTranslated(pos.x, pos.y, pos.z); + boolean gas = fluid.isGaseous(); + for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { if(PartTransmitter.connectionMapContainsSide(pipe.getAllCurrentConnections(), side)) @@ -151,7 +154,14 @@ public class RenderPartTransmitter implements IIconRegister if(displayLists != null) { - displayLists[Math.max(3, (int)((float)scale*(stages-1)))].render(); + if(!gas) + { + displayLists[Math.max(3, (int)((float)scale*(stages-1)))].render(); + } + else { + GL11.glColor4f(1F, 1F, 1F, scale); + displayLists[stages-1].render(); + } } } } @@ -160,7 +170,14 @@ public class RenderPartTransmitter implements IIconRegister if(displayLists != null) { - displayLists[Math.max(3, (int)((float)scale*(stages-1)))].render(); + if(!gas) + { + displayLists[Math.max(3, (int)((float)scale*(stages-1)))].render(); + } + else { + GL11.glColor4f(1F, 1F, 1F, scale); + displayLists[stages-1].render(); + } } MekanismRenderer.glowOff(); diff --git a/resources/assets/mekanism/textures/blocks/models/LogisticalTransporter.png b/resources/assets/mekanism/textures/blocks/models/LogisticalTransporter.png deleted file mode 100644 index eb77c616f..000000000 Binary files a/resources/assets/mekanism/textures/blocks/models/LogisticalTransporter.png and /dev/null differ diff --git a/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterActive.png b/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterActive.png deleted file mode 100644 index ea7997cb7..000000000 Binary files a/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterActive.png and /dev/null differ