From 60e2666a2989d196590309b10e1f8bdd75278758 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Tue, 17 Dec 2013 14:45:30 -0500 Subject: [PATCH] Render defined scale properly --- common/mekanism/api/gas/GasNetwork.java | 2 ++ common/mekanism/common/FluidNetwork.java | 2 ++ common/mekanism/common/network/PacketTransmitterUpdate.java | 1 - 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/common/mekanism/api/gas/GasNetwork.java b/common/mekanism/api/gas/GasNetwork.java index c61069988..ec4fb0d63 100644 --- a/common/mekanism/api/gas/GasNetwork.java +++ b/common/mekanism/api/gas/GasNetwork.java @@ -234,6 +234,8 @@ public class GasNetwork extends DynamicNetwork { super.clientTick(); + gasScale = Math.max(gasScale, definedScale); + if(didTransfer && gasScale < 1) { gasScale = Math.max(definedScale, Math.min(1, gasScale+0.02F)); diff --git a/common/mekanism/common/FluidNetwork.java b/common/mekanism/common/FluidNetwork.java index de14a77ae..08fd20168 100644 --- a/common/mekanism/common/FluidNetwork.java +++ b/common/mekanism/common/FluidNetwork.java @@ -238,6 +238,8 @@ public class FluidNetwork extends DynamicNetwork { super.clientTick(); + fluidScale = Math.max(fluidScale, definedScale); + if(didTransfer && fluidScale < 1) { fluidScale = Math.max(definedScale, Math.min(1, fluidScale+0.02F)); diff --git a/common/mekanism/common/network/PacketTransmitterUpdate.java b/common/mekanism/common/network/PacketTransmitterUpdate.java index 24165568b..c4d6d20dc 100644 --- a/common/mekanism/common/network/PacketTransmitterUpdate.java +++ b/common/mekanism/common/network/PacketTransmitterUpdate.java @@ -104,7 +104,6 @@ public class PacketTransmitterUpdate implements IMekanismPacket if(tileEntity != null) { - System.out.println("UPDATE " + gasType + " " + didGasTransfer + " " + scale); ((ITransmitter)tileEntity).getTransmitterNetwork().refGas = gasType; ((ITransmitter)tileEntity).getTransmitterNetwork().didTransfer = didGasTransfer; ((ITransmitter)tileEntity).getTransmitterNetwork().definedScale = scale;