diff --git a/src/main/java/crazypants/enderio/TileEntityEio.java b/src/main/java/crazypants/enderio/TileEntityEio.java index 61b39c7f..44804bed 100644 --- a/src/main/java/crazypants/enderio/TileEntityEio.java +++ b/src/main/java/crazypants/enderio/TileEntityEio.java @@ -10,6 +10,7 @@ import crazypants.enderio.machine.gui.AbstractMachineContainer; import crazypants.enderio.network.PacketHandler; import crazypants.util.BlockCoord; import crazypants.util.IProgressTile; +import crazypants.util.Util; public abstract class TileEntityEio extends TileEntity { @@ -36,7 +37,7 @@ public abstract class TileEntityEio extends TileEntity { public final void updateEntity() { doUpdate(); if(isProgressTile) { - int curScaled = AbstractMachineContainer.getProgressScaled(16, (IProgressTile) this); + int curScaled = getProgressScaled(16); if(++ticksSinceLastProgressUpdate >= getProgressUpdateFreq() || curScaled != lastProgressScaled) { sendTaskProgressPacket(); lastProgressScaled = curScaled; @@ -44,6 +45,13 @@ public abstract class TileEntityEio extends TileEntity { } } + public final int getProgressScaled(int scale) { + if(isProgressTile) { + return Util.getProgressScaled(scale, (IProgressTile) this); + } + return 0; + } + protected void doUpdate() { } diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index 5ea18c5c..a3b276be 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -390,11 +390,6 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { setNotification("noPower"); return false; } - int curScaled = AbstractMachineContainer.getProgressScaled(16, this); - if(curScaled != lastProgressScaled) { - sendTaskProgressPacket(); - lastProgressScaled = curScaled; - } return true; } diff --git a/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java index 210226dc..408d3964 100644 --- a/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java +++ b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java @@ -12,6 +12,7 @@ import net.minecraft.item.ItemStack; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.SlotDefinition; import crazypants.util.IProgressTile; +import crazypants.util.Util; public abstract class AbstractMachineContainer extends Container { @@ -246,12 +247,8 @@ public abstract class AbstractMachineContainer extends Container { protected int getProgressScaled(int scale) { if(getTileEntity() instanceof IProgressTile) { - getProgressScaled(scale, (IProgressTile) getTileEntity()); + Util.getProgressScaled(scale, (IProgressTile) getTileEntity()); } return 0; } - - public static int getProgressScaled(int scale, IProgressTile tile) { - return (int) (tile.getProgress() * scale); - } } diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java index 156f0b0c..620480d5 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java @@ -25,6 +25,7 @@ import crazypants.render.RenderUtil; import crazypants.util.BlockCoord; import crazypants.util.IProgressTile; import crazypants.util.Lang; +import crazypants.util.Util; import crazypants.vecmath.Vector4f; public abstract class GuiMachineBase extends GuiContainerBase { @@ -201,7 +202,7 @@ public abstract class GuiMachineBase extends Gu protected int getProgressScaled(int scale) { if(getTileEntity() instanceof IProgressTile) { - return AbstractMachineContainer.getProgressScaled(scale, (IProgressTile) getTileEntity()); + return Util.getProgressScaled(scale, (IProgressTile) getTileEntity()); } return 0; } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java index 05a635b3..ec5d05a4 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java @@ -20,7 +20,6 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.TextFieldEIO; -import crazypants.enderio.machine.gui.AbstractMachineContainer; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiContainerBase; @@ -28,6 +27,7 @@ import crazypants.gui.GuiToolTip; import crazypants.render.RenderUtil; import crazypants.util.BlockCoord; import crazypants.util.Lang; +import crazypants.util.Util; public class GuiTelePad extends GuiContainerBase implements IToggleableGui { @@ -170,7 +170,7 @@ public class GuiTelePad extends GuiContainerBase implements IToggleableGui { int powerScaled = te.getPowerScaled(powerScale); drawTexturedModalRect(sx + powerX, sy + powerY + powerScale - powerScaled, xSize, 0, 10, powerScaled); - int progressScaled = AbstractMachineContainer.getProgressScaled(progressScale, te); + int progressScaled = Util.getProgressScaled(progressScale, te); drawTexturedModalRect(sx + progressX, sy + progressY, 0, ySize, progressScaled, 10); FontRenderer fnt = getFontRenderer(); diff --git a/src/main/java/crazypants/util/IProgressTile.java b/src/main/java/crazypants/util/IProgressTile.java index 4e403a01..2a63ae05 100644 --- a/src/main/java/crazypants/util/IProgressTile.java +++ b/src/main/java/crazypants/util/IProgressTile.java @@ -19,5 +19,4 @@ public interface IProgressTile { void setProgress(float progress); TileEntity getTileEntity(); - } diff --git a/src/main/java/crazypants/util/Util.java b/src/main/java/crazypants/util/Util.java index 893b25a9..15bb6d3a 100644 --- a/src/main/java/crazypants/util/Util.java +++ b/src/main/java/crazypants/util/Util.java @@ -513,6 +513,10 @@ public class Util { return ForgeDirection.UNKNOWN; } + public static int getProgressScaled(int scale, IProgressTile tile) { + return (int) (tile.getProgress() * scale); + } + // copied from WAILA source to avoid API dependency public static String WailaStyle = "\u00A4"; public static String WailaIcon = "\u00A5";