diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityHeaterFirebox.java b/src/main/java/com/hbm/tileentity/machine/TileEntityHeaterFirebox.java index 729640995..c58b395e0 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityHeaterFirebox.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityHeaterFirebox.java @@ -72,11 +72,12 @@ public class TileEntityHeaterFirebox extends TileEntityFireboxBase implements IC return new ContainerFirebox(player.inventory, this); } - @SideOnly(Side.CLIENT) private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/machine/gui_firebox.png"); + @SideOnly(Side.CLIENT) private ResourceLocation texture; @Override @SideOnly(Side.CLIENT) public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + if(texture == null) texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/machine/gui_firebox.png"); return new GUIFirebox(player.inventory, this, texture); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityHeaterOven.java b/src/main/java/com/hbm/tileentity/machine/TileEntityHeaterOven.java index db252f124..2deec61e8 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityHeaterOven.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityHeaterOven.java @@ -96,11 +96,12 @@ public class TileEntityHeaterOven extends TileEntityFireboxBase implements IConf return new ContainerFirebox(player.inventory, this); } - @SideOnly(Side.CLIENT) private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/machine/gui_heating_oven.png"); + @SideOnly(Side.CLIENT) private ResourceLocation texture; @Override @SideOnly(Side.CLIENT) public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + if(texture == null) texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/machine/gui_heating_oven.png"); return new GUIFirebox(player.inventory, this, texture); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java index 43254da96..2f56a8feb 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java @@ -151,7 +151,7 @@ public class TileEntityMachineCentrifuge extends TileEntityMachineBase implement speed += Math.min(UpgradeManager.getLevel(UpgradeType.SPEED), 3); consumption += Math.min(UpgradeManager.getLevel(UpgradeType.SPEED), 3) * 200; - speed *= Math.min(UpgradeManager.getLevel(UpgradeType.OVERDRIVE), 3) * 5; + speed *= (1 + Math.min(UpgradeManager.getLevel(UpgradeType.OVERDRIVE), 3) * 5); consumption += Math.min(UpgradeManager.getLevel(UpgradeType.OVERDRIVE), 3) * 10000; consumption /= (1 + Math.min(UpgradeManager.getLevel(UpgradeType.POWER), 3));