diff --git a/common/mekanism/api/gas/GasNetwork.java b/common/mekanism/api/gas/GasNetwork.java index e38f2e2ea..8d194bcfe 100644 --- a/common/mekanism/api/gas/GasNetwork.java +++ b/common/mekanism/api/gas/GasNetwork.java @@ -266,12 +266,10 @@ public class GasNetwork extends DynamicNetwork protected GasNetwork create(Set networks) { GasNetwork network = new GasNetwork(networks); - network.refGas = refGas; - network.gasScale = gasScale; for(GasNetwork iterNet : networks) { - if(iterNet.refGas != null && iterNet.gasScale > 0) + if(iterNet.refGas != null && iterNet.gasScale > network.gasScale) { network.refGas = iterNet.refGas; network.gasScale = iterNet.gasScale; @@ -279,6 +277,8 @@ public class GasNetwork extends DynamicNetwork } } + System.out.println(network.gasScale); + return network; } diff --git a/common/mekanism/client/render/tileentity/RenderPressurizedTube.java b/common/mekanism/client/render/tileentity/RenderPressurizedTube.java index 186764c7f..1d06910b4 100644 --- a/common/mekanism/client/render/tileentity/RenderPressurizedTube.java +++ b/common/mekanism/client/render/tileentity/RenderPressurizedTube.java @@ -84,20 +84,20 @@ public class RenderPressurizedTube extends TileEntitySpecialRenderer switch(ForgeDirection.getOrientation(i)) { case NORTH: - GL11.glScalef(1, 1, 1.7f); - GL11.glTranslatef(0, 0, -.077f); + GL11.glScalef(1, 1, 1.7F); + GL11.glTranslatef(0, 0, -.077F); break; case SOUTH: - GL11.glScalef(1, 1, 1.7f); - GL11.glTranslatef(0, 0, .077f); + GL11.glScalef(1, 1, 1.7F); + GL11.glTranslatef(0, 0, .077F); break; case WEST: - GL11.glScalef(1.7f, 1, 1); - GL11.glTranslatef(.077f, 0, 0); + GL11.glScalef(1.7F, 1, 1); + GL11.glTranslatef(.077F, 0, 0); break; case EAST: - GL11.glScalef(1.7f, 1, 1); - GL11.glTranslatef(-.077f, 0, 0); + GL11.glScalef(1.7F, 1, 1); + GL11.glTranslatef(-.077F, 0, 0); break; } @@ -128,7 +128,9 @@ public class RenderPressurizedTube extends TileEntitySpecialRenderer { if(connectable[i]) { - Block b = Block.blocksList[Object3D.get(tileEntity).getFromSide(ForgeDirection.getOrientation(i)).getBlockId(tileEntity.worldObj)]; + Object3D obj = Object3D.get(tileEntity).getFromSide(ForgeDirection.getOrientation(i)); + Block b = Block.blocksList[obj.getBlockId(tileEntity.worldObj)]; + b.setBlockBoundsBasedOnState(tileEntity.worldObj, obj.xCoord, obj.yCoord, obj.zCoord); getListAndRender(ForgeDirection.getOrientation(i), gasType, b).render(); } } diff --git a/common/mekanism/common/EnergyNetwork.java b/common/mekanism/common/EnergyNetwork.java index c0e188f45..ac15c8aef 100644 --- a/common/mekanism/common/EnergyNetwork.java +++ b/common/mekanism/common/EnergyNetwork.java @@ -419,19 +419,34 @@ public class EnergyNetwork extends DynamicNetwork @Override protected EnergyNetwork create(ITransmitter... varTransmitters) { - return new EnergyNetwork(varTransmitters); + EnergyNetwork network = new EnergyNetwork(varTransmitters); + network.clientEnergyScale = clientEnergyScale; + return network; } @Override protected EnergyNetwork create(Collection> collection) { - return new EnergyNetwork(collection); + EnergyNetwork network = new EnergyNetwork(collection); + network.clientEnergyScale = clientEnergyScale; + return network; } @Override protected EnergyNetwork create(Set networks) { - return new EnergyNetwork(networks); + EnergyNetwork network = new EnergyNetwork(networks); + network.clientEnergyScale = clientEnergyScale; + + for(EnergyNetwork iterNet : networks) + { + if(iterNet.clientEnergyScale > network.clientEnergyScale) + { + network.clientEnergyScale = iterNet.clientEnergyScale; + } + } + + return network; } @Override diff --git a/common/mekanism/common/FluidNetwork.java b/common/mekanism/common/FluidNetwork.java index aeec21e25..d10c081ab 100644 --- a/common/mekanism/common/FluidNetwork.java +++ b/common/mekanism/common/FluidNetwork.java @@ -293,7 +293,7 @@ public class FluidNetwork extends DynamicNetwork for(FluidNetwork iterNet : networks) { - if(iterNet.refFluid != null && iterNet.fluidScale > 0) + if(iterNet.refFluid != null && iterNet.fluidScale > network.fluidScale) { network.refFluid = iterNet.refFluid; network.fluidScale = iterNet.fluidScale;