diff --git a/common/mekanism/api/gas/GasNetwork.java b/common/mekanism/api/gas/GasNetwork.java index 5ed1aad5a..7eb091903 100644 --- a/common/mekanism/api/gas/GasNetwork.java +++ b/common/mekanism/api/gas/GasNetwork.java @@ -342,7 +342,7 @@ public class GasNetwork extends DynamicNetwork public float getScale() { - return (gasStored == null || getCapacity() == 0 ? 0 : gasStored.amount/getCapacity()); + return (gasStored == null || getCapacity() == 0 ? 0 : (float)gasStored.amount/getCapacity()); } @Override diff --git a/common/mekanism/client/render/RenderTickHandler.java b/common/mekanism/client/render/RenderTickHandler.java index 0ec17b4a7..1ee98d642 100644 --- a/common/mekanism/client/render/RenderTickHandler.java +++ b/common/mekanism/client/render/RenderTickHandler.java @@ -1,7 +1,9 @@ package mekanism.client.render; import java.util.EnumSet; +import java.util.HashSet; import java.util.Random; +import java.util.Set; import mekanism.api.EnumColor; import mekanism.api.Object3D; @@ -9,7 +11,6 @@ import mekanism.common.Mekanism; import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemScubaTank; import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiChat; import net.minecraft.client.gui.ScaledResolution; @@ -102,7 +103,9 @@ public class RenderTickHandler implements ITickHandler } } - for(String s : Mekanism.jetpackOn) + Set copy = (Set)((HashSet)Mekanism.jetpackOn).clone(); + + for(String s : copy) { EntityPlayer p = mc.theWorld.getPlayerEntityByName(s); diff --git a/common/mekanism/common/FluidNetwork.java b/common/mekanism/common/FluidNetwork.java index 6e04de0fd..9b101e732 100644 --- a/common/mekanism/common/FluidNetwork.java +++ b/common/mekanism/common/FluidNetwork.java @@ -348,7 +348,7 @@ public class FluidNetwork extends DynamicNetwork public float getScale() { - return (fluidStored == null || getCapacity() == 0 ? 0 : fluidStored.amount/getCapacity()); + return (fluidStored == null || getCapacity() == 0 ? 0 : (float)fluidStored.amount/getCapacity()); } @Override