From 57f665a03e7390878ffd8f93012e2f80ea279306 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 12 Apr 2015 06:02:29 -0400 Subject: [PATCH] Unify IProgressTile usage, only implement where needed. Tons of cleanup everywhere, implement final methods in TileEntityEio --- .../java/crazypants/enderio/ClientProxy.java | 2 - .../java/crazypants/enderio/ModObject.java | 1 + .../crazypants/enderio/TileEntityEio.java | 52 +++++++++++++++++++ .../enderio/conduit/TileConduitBundle.java | 2 +- .../enderio/item/skull/TileEndermanSkull.java | 2 +- .../machine/AbstractMachineEntity.java | 12 +---- .../machine/AbstractPoweredMachineEntity.java | 4 +- .../machine/AbstractPoweredTaskEntity.java | 14 ----- .../machine/alloy/GuiAlloySmelter.java | 2 +- .../enderio/machine/buffer/TileBuffer.java | 5 -- .../enderio/machine/capbank/TileCapBank.java | 2 +- .../enderio/machine/crafter/TileCrafter.java | 5 -- .../enderio/machine/crusher/GuiCrusher.java | 2 +- .../enderio/machine/farm/TileFarmStation.java | 10 ++-- .../combustion/TileCombustionGenerator.java | 5 -- .../stirling/GuiStirlingGenerator.java | 2 +- .../stirling/TileEntityStirlingGenerator.java | 13 ++++- .../generator/zombie/TileZombieGenerator.java | 5 -- .../machine/gui/AbstractMachineContainer.java | 11 ++++ .../enderio/machine/gui/GuiMachineBase.java | 27 +++++++--- .../machine/hypercube/TileHyperCube.java | 2 +- .../machine/killera/TileKillerJoe.java | 11 ++-- .../machine/light/TileElectricLight.java | 2 +- .../enderio/machine/light/TileLightNode.java | 2 +- .../machine/monitor/TilePowerMonitor.java | 5 -- .../obelisk/attractor/TileAttractor.java | 7 +-- .../obelisk/aversion/TileAversionObelisk.java | 5 -- .../weather/ContainerWeatherObelisk.java | 29 ----------- .../obelisk/weather/GuiWeatherObelisk.java | 24 ++------- .../obelisk/weather/TileWeatherObelisk.java | 24 +++++++-- .../obelisk/xp/TileExperienceOblisk.java | 5 -- .../enderio/machine/painter/GuiPainter.java | 2 +- .../painter/TileEntityPaintedBlock.java | 3 +- .../machine/power/TileCapacitorBank.java | 2 +- .../machine/reservoir/TileReservoir.java | 2 +- .../slicensplice/GuiSliceAndSplice.java | 2 +- .../machine/solar/TileEntitySolarPanel.java | 2 +- .../enderio/machine/soul/GuiSoulBinder.java | 2 +- .../machine/spawner/GuiPoweredSpawner.java | 4 +- .../machine/spawner/TilePoweredSpawner.java | 4 +- .../enderio/machine/tank/TileTank.java | 7 +-- .../machine/transceiver/TileTransceiver.java | 4 +- .../machine/vacuum/TileVacuumChest.java | 2 +- .../enderio/machine/vat/GuiVat.java | 2 +- .../machine/wireless/TileWirelessCharger.java | 2 +- .../teleport/anchor/TileTravelAnchor.java | 2 +- .../enderio/teleport/telepad/GuiTelePad.java | 3 +- .../enderio/teleport/telepad/TileTelePad.java | 17 ++---- .../java/crazypants/util/IProgressTile.java | 16 ++++-- 49 files changed, 176 insertions(+), 196 deletions(-) diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 6195e2da..6f592a9e 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -253,8 +253,6 @@ public class ClientProxy extends CommonProxy { BlockSoulBinder.renderId = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(new SoulBinderRenderer()); - BlockAttractor.renderId = RenderingRegistry.getNextAvailableRenderId(); - ObeliskRenderer defaultObeliskRenderer = new ObeliskRenderer(); BlockObeliskAbstract.defaultObeliskRenderId = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(defaultObeliskRenderer); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index 1b674676..1ac57359 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -60,6 +60,7 @@ public enum ModObject { blockSpawnGuard, blockExperienceObelisk, blockWeatherObelisk, + blockInhibitorObelisk, blockTransceiver, blockBuffer, diff --git a/src/main/java/crazypants/enderio/TileEntityEio.java b/src/main/java/crazypants/enderio/TileEntityEio.java index 6bd4f464..61b39c7f 100644 --- a/src/main/java/crazypants/enderio/TileEntityEio.java +++ b/src/main/java/crazypants/enderio/TileEntityEio.java @@ -5,11 +5,63 @@ import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; +import crazypants.enderio.machine.PacketProgress; +import crazypants.enderio.machine.gui.AbstractMachineContainer; +import crazypants.enderio.network.PacketHandler; import crazypants.util.BlockCoord; +import crazypants.util.IProgressTile; public abstract class TileEntityEio extends TileEntity { private final int checkOffset = (int) (Math.random() * 20); + private final boolean isProgressTile; + + protected int lastProgressScaled = -1; + protected int ticksSinceLastProgressUpdate; + + public TileEntityEio() { + isProgressTile = this instanceof IProgressTile; + } + + @Override + public final boolean canUpdate() { + return shouldUpdate() || isProgressTile; + } + + protected boolean shouldUpdate() { + return true; + } + + @Override + public final void updateEntity() { + doUpdate(); + if(isProgressTile) { + int curScaled = AbstractMachineContainer.getProgressScaled(16, (IProgressTile) this); + if(++ticksSinceLastProgressUpdate >= getProgressUpdateFreq() || curScaled != lastProgressScaled) { + sendTaskProgressPacket(); + lastProgressScaled = curScaled; + } + } + } + + protected void doUpdate() { + + } + + protected void sendTaskProgressPacket() { + if(isProgressTile) { + PacketHandler.sendToAllAround(new PacketProgress((IProgressTile) this), this); + } + ticksSinceLastProgressUpdate = 0; + } + + /** + * Controls how often progress updates. Has no effect if your TE is not + * {@link IProgressTile}. + */ + protected int getProgressUpdateFreq() { + return 20; + } @Override public final void readFromNBT(NBTTagCompound root) { diff --git a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java index 4b66fd49..f3d5e42f 100644 --- a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java @@ -222,7 +222,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { } @Override - public void updateEntity() { + public void doUpdate() { if(worldObj == null) { return; } diff --git a/src/main/java/crazypants/enderio/item/skull/TileEndermanSkull.java b/src/main/java/crazypants/enderio/item/skull/TileEndermanSkull.java index bc46a0b8..3c2b4d3b 100644 --- a/src/main/java/crazypants/enderio/item/skull/TileEndermanSkull.java +++ b/src/main/java/crazypants/enderio/item/skull/TileEndermanSkull.java @@ -22,7 +22,7 @@ public class TileEndermanSkull extends TileEntityEio { } @Override - public boolean canUpdate() { + public boolean shouldUpdate() { return false; } diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 9127b38c..f15c6667 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -197,8 +197,6 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi public abstract boolean isActive(); - public abstract float getProgress(); - public String getSoundName() { return null; } @@ -229,18 +227,12 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi } } } - - public int getProgressScaled(int scale) { - int result = (int) (getProgress() * scale); - return result; - } - + // --- Process Loop // -------------------------------------------------------------------------- @Override - public void updateEntity() { - + public void doUpdate() { if(worldObj == null) { // sanity check return; } diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java index b6f0e0f5..18c88e2c 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java @@ -33,9 +33,9 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity } @Override - public void updateEntity() { + public void doUpdate() { - super.updateEntity(); + super.doUpdate(); if(worldObj == null || worldObj.isRemote) { // sanity check return; diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index f858d4ef..d22fcf50 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -23,9 +23,6 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt protected int ticksSinceCheckedRecipe = 0; protected boolean startFailed = false; - protected int lastProgressScaled = -1; - protected int ticksSinceLastProgressUpdate; - public AbstractPoweredTaskEntity(SlotDefinition slotDefinition) { super(slotDefinition); } @@ -135,11 +132,6 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt return requiresClientSync; } - protected void sendTaskProgressPacket() { - PacketHandler.sendToAllAround(new PacketProgress(this), this); - ticksSinceLastProgressUpdate = 0; - } - protected boolean checkProgress(boolean redstoneChecksPassed) { if(currentTask == null || !hasPower()) { return false; @@ -153,12 +145,6 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt return false; } - int curScaled = getProgressScaled(16); - if(++ticksSinceLastProgressUpdate >= 20 || curScaled != lastProgressScaled) { - sendTaskProgressPacket(); - lastProgressScaled = curScaled; - } - return false; } diff --git a/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java b/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java index 8da3937c..0f8e9fe0 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java +++ b/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java @@ -102,7 +102,7 @@ public class GuiAlloySmelter extends GuiPoweredMachineBase { drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); if(shouldRenderProgress()) { - int scaled = getTileEntity().getProgressScaled(14) + 1; + int scaled = getProgressScaled(14) + 1; drawTexturedModalRect(sx + 55, sy + 49 - scaled, 176, 14 - scaled, 14, scaled); drawTexturedModalRect(sx + 103, sy + 49 - scaled, 176, 14 - scaled, 14, scaled); } diff --git a/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java index 88dea802..8b227988 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java @@ -46,11 +46,6 @@ public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintabl return false; } - @Override - public float getProgress() { - return 0; // none - } - @Override protected boolean processTasks(boolean redstoneCheckPassed) { if(getEnergyStored() <= 0 || !redstoneCheckPassed) { diff --git a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java index 58dfc5e4..8b823f84 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java @@ -162,7 +162,7 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceiver } @Override - public void updateEntity() { + public void doUpdate() { if(worldObj.isRemote) { if(networkId == -1) { if(idRequestTimer <= 0) { diff --git a/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java index 14cf37fe..2e96cb3c 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java @@ -61,11 +61,6 @@ public class TileCrafter extends AbstractPowerConsumerEntity implements IItemBuf return false; } - @Override - public float getProgress() { - return 0.5f; - } - @Override protected boolean processTasks(boolean redstoneCheckPassed) { ticksSinceLastCraft++; diff --git a/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java b/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java index 2b91592f..f23db816 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java +++ b/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java @@ -38,7 +38,7 @@ public class GuiCrusher extends GuiPoweredMachineBase { drawTexturedModalRect(guiLeft, guiTop, 0, 0, this.xSize, this.ySize); if(shouldRenderProgress()) { - int barHeight = getTileEntity().getProgressScaled(24); + int barHeight = getProgressScaled(24); drawTexturedModalRect(guiLeft + 79, guiTop + 31, 200, 0, 18, barHeight + 1); } diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index f15c17ed..5ea18c5c 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -9,7 +9,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -28,10 +27,9 @@ import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.farm.farmers.FarmersCommune; import crazypants.enderio.machine.farm.farmers.IHarvestResult; import crazypants.enderio.machine.farm.farmers.RubberTreeFarmerIC2; +import crazypants.enderio.machine.gui.AbstractMachineContainer; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.BasicCapacitor; -import crazypants.enderio.power.Capacitors; -import crazypants.enderio.power.ICapacitor; import crazypants.enderio.tool.ArrayMappingTool; import crazypants.util.BlockCoord; import crazypants.util.Lang; @@ -365,8 +363,8 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { } @Override - public void updateEntity() { - super.updateEntity(); + public void doUpdate() { + super.doUpdate(); if(isActive() != wasActive) { wasActive = isActive(); worldObj.updateLightByType(EnumSkyBlock.Block, xCoord, yCoord, zCoord); @@ -392,7 +390,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { setNotification("noPower"); return false; } - int curScaled = getProgressScaled(16); + int curScaled = AbstractMachineContainer.getProgressScaled(16, this); if(curScaled != lastProgressScaled) { sendTaskProgressPacket(); lastProgressScaled = curScaled; diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java index 6efca11c..1c9d3d03 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java @@ -102,11 +102,6 @@ public class TileCombustionGenerator extends AbstractGeneratorEntity implements return active; } - @Override - public float getProgress() { - return 0; - } - @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { if(resource == null || resource.getFluid() == null || !canFill(from, resource.getFluid())) { diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java index d005f674..bd21ace5 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java @@ -92,7 +92,7 @@ public class GuiStirlingGenerator extends GuiPoweredMachineBase extends Gu } protected int scaleProgressForTooltip(float progress) { - return (int)(progress * 100); + return (int) (progress * 100); } protected boolean shouldRenderProgress() { - float progress = tileEntity.getProgress(); - if(progress > 0 && progress < 1) { - updateProgressTooltips(scaleProgressForTooltip(progress), progress); - return true; - } else { - updateProgressTooltips(-1, -1); - return false; + if(tileEntity instanceof IProgressTile) { + float progress = ((IProgressTile) tileEntity).getProgress(); + if(progress > 0 && progress < 1) { + updateProgressTooltips(scaleProgressForTooltip(progress), progress); + return true; + } else { + updateProgressTooltips(-1, -1); + return false; + } } + return false; + } + + protected int getProgressScaled(int scale) { + if(getTileEntity() instanceof IProgressTile) { + return AbstractMachineContainer.getProgressScaled(scale, (IProgressTile) getTileEntity()); + } + return 0; } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java index 7d06e9bf..b7031d9d 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java @@ -239,7 +239,7 @@ public class TileHyperCube extends TileEntityEio implements IInternalPowerHandle } @Override - public void updateEntity() { + public void doUpdate() { if(worldObj == null) { // sanity check return; } diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index dbf98b37..7ae8e9c8 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -97,14 +97,9 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle public boolean isActive() { return false; } - + @Override - public float getProgress() { - return 0; - } - - @Override - public void updateEntity() { + public void doUpdate() { updateArmSwingProgress(); hooverXP(); if(worldObj != null && !worldObj.isRemote) { @@ -114,7 +109,7 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle hadSword = inventory[0] != null; } } - super.updateEntity(); + super.doUpdate(); } @Override diff --git a/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java b/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java index 81840ca0..6ba55d29 100644 --- a/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java @@ -107,7 +107,7 @@ public class TileElectricLight extends TileEntityEio implements IInternalPowerRe } @Override - public void updateEntity() { + public void doUpdate() { if(worldObj.isRemote) { return; } diff --git a/src/main/java/crazypants/enderio/machine/light/TileLightNode.java b/src/main/java/crazypants/enderio/machine/light/TileLightNode.java index 8363aa4c..e55d4bbb 100644 --- a/src/main/java/crazypants/enderio/machine/light/TileLightNode.java +++ b/src/main/java/crazypants/enderio/machine/light/TileLightNode.java @@ -22,7 +22,7 @@ public class TileLightNode extends TileEntityEio { } @Override - public void updateEntity() { + public void doUpdate() { if(worldObj.isRemote) { return; } diff --git a/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java index 91ccd70a..a2ca8d97 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java @@ -117,11 +117,6 @@ public class TilePowerMonitor extends AbstractPowerConsumerEntity implements IIn return false; } - @Override - public float getProgress() { - return 0; - } - public float getEnergyPerTick() { return energyPerTick; } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java index 8e15246f..d7a4bcd1 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java @@ -137,12 +137,7 @@ public class TileAttractor extends AbstractPowerConsumerEntity implements IRange public boolean isActive() { return hasPower(); } - - @Override - public float getProgress() { - return 0; - } - + @Override protected boolean processTasks(boolean redstoneCheckPassed) { if(redstoneCheckPassed && hasPower()) { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/aversion/TileAversionObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/TileAversionObelisk.java index 2c58120b..b7def3b5 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/aversion/TileAversionObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/TileAversionObelisk.java @@ -115,11 +115,6 @@ public class TileAversionObelisk extends AbstractPowerConsumerEntity implements return hasPower(); } - @Override - public float getProgress() { - return 0; - } - @Override protected boolean processTasks(boolean redstoneCheckPassed) { if(redstoneCheckPassed && hasPower()) { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/ContainerWeatherObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/ContainerWeatherObelisk.java index bcbba8f2..173f93e7 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/ContainerWeatherObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/ContainerWeatherObelisk.java @@ -1,19 +1,14 @@ package crazypants.enderio.machine.obelisk.weather; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.machine.gui.AbstractMachineContainer; public class ContainerWeatherObelisk extends AbstractMachineContainer { public static final int MAX_SCALE = 31; - private int lastPowerUsed; - public ContainerWeatherObelisk(InventoryPlayer playerInv, TileWeatherObelisk te) { super(playerInv, te); } @@ -27,28 +22,4 @@ public class ContainerWeatherObelisk extends AbstractMachineContainer { } }); } - - @SideOnly(Side.CLIENT) - public void updateProgressBar(int par1, int par2) { - TileWeatherObelisk te = (TileWeatherObelisk) getTileEntity(); - if(par1 == 0) { - te.progress = par2; - } - } - - public void detectAndSendChanges() { - super.detectAndSendChanges(); - TileWeatherObelisk te = (TileWeatherObelisk) getTileEntity(); - - for (int i = 0; i < this.crafters.size(); ++i) { - ICrafting icrafting = (ICrafting) this.crafters.get(i); - - int powerUsed = te.powerUsed; - if(powerUsed != lastPowerUsed) { - icrafting.sendProgressBarUpdate(this, 0, te.getProgressScaled(MAX_SCALE)); - } - } - - this.lastPowerUsed = te.powerUsed; - } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java index 4e601bfb..0de13e9e 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java @@ -86,19 +86,20 @@ public class GuiWeatherObelisk extends GuiPoweredMachineBase this.drawTexturedModalRect(getGuiLeft(), getGuiTop(), 0, 0, getXSize(), getYSize()); if(shouldRenderProgress() && getTileEntity().activeTask != null) { - int barHeight = getTileEntity().progress; + // TODO test + int barHeight = getProgressScaled(ContainerWeatherObelisk.MAX_SCALE); Color color = getTileEntity().activeTask.color; GL11.glColor3f((float) color.getRed() / 255f, (float) color.getGreen() / 255f, (float) color.getBlue() / 255f); this.drawTexturedModalRect(getGuiLeft() + 81, getGuiTop() + 58 - barHeight, getXSize(), 32 - barHeight, 12, barHeight); } super.drawGuiContainerBackgroundLayer(par1, par2, par3); } - + @Override protected int getPowerHeight() { return super.getPowerHeight() + 20; } - + @Override protected int getPowerU() { return super.getPowerU(); @@ -127,21 +128,4 @@ public class GuiWeatherObelisk extends GuiPoweredMachineBase PacketHandler.INSTANCE.sendToServer(new PacketActivateWeather(getTileEntity(), WeatherTask.values()[b.id])); } } - - @Override - protected int scaleProgressForTooltip(float progress) { - return (int) (progress / ((float) ContainerWeatherObelisk.MAX_SCALE) * 100); - } - - @Override - protected boolean shouldRenderProgress() { - int progress = getTileEntity().progress; - if(progress > 0) { - updateProgressTooltips(scaleProgressForTooltip(progress), progress); - return true; - } else { - updateProgressTooltips(-1, -1); - return false; - } - } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java index 095ea663..86d1bcd6 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java @@ -17,8 +17,9 @@ import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; +import crazypants.util.IProgressTile; -public class TileWeatherObelisk extends AbstractPowerConsumerEntity { +public class TileWeatherObelisk extends AbstractPowerConsumerEntity implements IProgressTile { public enum WeatherTask { CLEAR(Config.weatherObeliskClearPower, Color.YELLOW) { @@ -83,7 +84,7 @@ public class TileWeatherObelisk extends AbstractPowerConsumerEntity { } int powerUsed = 0; - int progress = 0; // client only + private float progress = 0; // client only WeatherTask activeTask = null; private Color particleColor; @@ -101,8 +102,8 @@ public class TileWeatherObelisk extends AbstractPowerConsumerEntity { setCapacitor(Capacitors.ACTIVATED_CAPACITOR); } - public void updateEntity() { - super.updateEntity(); + public void doUpdate() { + super.doUpdate(); if(worldObj.isRemote) { if(activeParticleTicks > 0) { spawnParticle(); @@ -143,6 +144,21 @@ public class TileWeatherObelisk extends AbstractPowerConsumerEntity { public float getProgress() { return isActive() ? worldObj.isRemote ? progress : (float) powerUsed / (float) activeTask.power : 0; } + + @Override + public void setProgress(float progress) { + this.progress = progress; + } + + @Override + protected int getProgressUpdateFreq() { + return 5; + } + + @Override + public TileEntity getTileEntity() { + return this; + } @Override public ICapacitor getCapacitor() { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceOblisk.java b/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceOblisk.java index 85914ab8..60864f63 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceOblisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceOblisk.java @@ -41,11 +41,6 @@ public class TileExperienceOblisk extends AbstractMachineEntity implements IFlui return true; } - @Override - public float getProgress() { - return 0; - } - @Override protected boolean processTasks(boolean redstoneCheckPassed) { if(xpCont.isDirty()) { diff --git a/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java b/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java index be39558f..367512bb 100644 --- a/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java +++ b/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java @@ -33,7 +33,7 @@ public class GuiPainter extends GuiPoweredMachineBase { drawTexturedModalRect(k, l, 0, 0, xSize, ySize); if(shouldRenderProgress()) { - int scaled = getTileEntity().getProgressScaled(24); + int scaled = getProgressScaled(24); drawTexturedModalRect(k + 88, l + 34, 176, 14, scaled + 1, 16); } diff --git a/src/main/java/crazypants/enderio/machine/painter/TileEntityPaintedBlock.java b/src/main/java/crazypants/enderio/machine/painter/TileEntityPaintedBlock.java index 337bbcdb..c9103b86 100644 --- a/src/main/java/crazypants/enderio/machine/painter/TileEntityPaintedBlock.java +++ b/src/main/java/crazypants/enderio/machine/painter/TileEntityPaintedBlock.java @@ -59,8 +59,7 @@ public class TileEntityPaintedBlock extends TileEntityEio implements IPaintableT } @Override - public boolean canUpdate() { + public boolean shouldUpdate() { return false; } - } diff --git a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java index b198cd9e..1b88ccc8 100644 --- a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -195,7 +195,7 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerHa } @Override - public void updateEntity() { + public void doUpdate() { if(worldObj == null) { // sanity check return; } diff --git a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java index f8ffe411..7cb7d665 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java @@ -81,7 +81,7 @@ public class TileReservoir extends TileEntityEio implements IFluidHandler { private ArrayList tankNeighbours; @Override - public void updateEntity() { + public void doUpdate() { if(worldObj == null || worldObj.isRemote) { return; } diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java index 4da189bd..2ddd6a75 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java @@ -29,7 +29,7 @@ public class GuiSliceAndSplice extends GuiPoweredMachineBase drawTexturedModalRect(k, l, 0, 0, xSize, ySize); if(shouldRenderProgress()) { - int scaled = getTileEntity().getProgressScaled(24); + int scaled = getProgressScaled(24); drawTexturedModalRect(k + 103, l + 49, 176, 14, scaled + 1, 16); } diff --git a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java index 49b64342..382ffc25 100644 --- a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java @@ -85,7 +85,7 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe } @Override - public void updateEntity() { + public void doUpdate() { if(worldObj == null || worldObj.isRemote) { return; } diff --git a/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java index 9789d55c..0dfcdc54 100644 --- a/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java @@ -66,7 +66,7 @@ public class GuiSoulBinder extends GuiPoweredMachineBase { TileSoulBinder binder = getTileEntity(); if(shouldRenderProgress()) { - i1 = binder.getProgressScaled(24); + i1 = getProgressScaled(24); drawTexturedModalRect(k + 80, l + 34, 176, 14, i1 + 1, 16); } diff --git a/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java index 3f8dd86a..f343d43a 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java @@ -74,13 +74,13 @@ public class GuiPoweredSpawner extends GuiPoweredMachineBase int yOff = 34; drawTexturedModalRect(left + 80, top + yOff, 207, 0, 17, 15); if(spawner.getProgress() < 1 && spawner.getProgress() > 0) { - int scaled = spawner.getProgressScaled(14) + 1; + int scaled = getProgressScaled(14) + 1; drawTexturedModalRect(left + 81, top + yOff + 14 - scaled, 176, 14 - scaled, 14, scaled); } } else { drawTexturedModalRect(left + 52, top + 40, 52, 170, 72, 21); if(spawner.getProgress() < 1 && spawner.getProgress() > 0) { - int scaled = spawner.getProgressScaled(24); + int scaled = getProgressScaled(24); drawTexturedModalRect(left + 76, top + 43, 176, 14, scaled + 1, 16); } } diff --git a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java index 49510979..797c62dd 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java @@ -199,9 +199,9 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity { } @Override - public void updateEntity() { + public void doUpdate() { logic.updateSpawner(); - super.updateEntity(); + super.doUpdate(); } /** diff --git a/src/main/java/crazypants/enderio/machine/tank/TileTank.java b/src/main/java/crazypants/enderio/machine/tank/TileTank.java index ed217964..8e7f0ef9 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TileTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/TileTank.java @@ -231,12 +231,7 @@ public class TileTank extends AbstractMachineEntity implements IFluidHandler, IT public boolean isActive() { return false; } - - @Override - public float getProgress() { - return 0; - } - + @Override protected boolean processTasks(boolean redstoneCheckPassed) { boolean res = processItems(redstoneCheckPassed); diff --git a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java index fa959bea..ed172b35 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java @@ -95,14 +95,14 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid } @Override - public void updateEntity() { + public void doUpdate() { if(!registered && worldObj != null && !worldObj.isRemote) { ServerChannelRegister.instance.register(this); registered = true; removeUnregsiteredChannels(sendChannels); removeUnregsiteredChannels(recieveChannels); } - super.updateEntity(); + super.doUpdate(); if(worldObj != null && !worldObj.isRemote) { railController.doTick(); diff --git a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java index 731a4349..11efbcf4 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java @@ -41,7 +41,7 @@ public class TileVacuumChest extends TileEntityEio implements IEntitySelector, I private boolean redstoneStateDirty = true; @Override - public void updateEntity() { + public void doUpdate() { if(redstoneStateDirty) { updateRedstoneStatus(); } diff --git a/src/main/java/crazypants/enderio/machine/vat/GuiVat.java b/src/main/java/crazypants/enderio/machine/vat/GuiVat.java index 43decedf..443d40ac 100644 --- a/src/main/java/crazypants/enderio/machine/vat/GuiVat.java +++ b/src/main/java/crazypants/enderio/machine/vat/GuiVat.java @@ -103,7 +103,7 @@ public class GuiVat extends GuiPoweredMachineBase { TileVat vat = getTileEntity(); if(shouldRenderProgress()) { - int scaled = vat.getProgressScaled(14) + 1; + int scaled = getProgressScaled(14) + 1; drawTexturedModalRect(guiLeft + 81, guiTop + 77 - scaled, 176, 14 - scaled, 14, scaled); IIcon inputIcon = null; diff --git a/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java index b6c5a29d..49aceadc 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java @@ -33,7 +33,7 @@ public class TileWirelessCharger extends TileEntityEio implements IInternalPower } @Override - public void updateEntity() { + public void doUpdate() { if(worldObj == null || worldObj.isRemote) { return; diff --git a/src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java index 8bf43602..45c8632d 100644 --- a/src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java @@ -157,7 +157,7 @@ public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable } @Override - public boolean canUpdate() { + public boolean shouldUpdate() { return false; } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java index 6673f7e2..05a635b3 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java @@ -20,6 +20,7 @@ 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; @@ -169,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 = te.getProgressScaled(progressScale); + int progressScaled = AbstractMachineContainer.getProgressScaled(progressScale, te); drawTexturedModalRect(sx + progressX, sy + progressY, 0, ySize, progressScaled, 10); FontRenderer fnt = getFontRenderer(); diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java index f047dcde..ce051296 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java @@ -34,7 +34,6 @@ import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.MachineSound; import crazypants.enderio.machine.PacketPowerStorage; -import crazypants.enderio.machine.PacketProgress; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.IInternalPowerReceiver; import crazypants.enderio.rail.TeleporterEIO; @@ -68,7 +67,6 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei private Queue toTeleport = Queues.newArrayDeque(); private int powerUsed; private int maxPower; - private int lastSyncPowerUsed; private static final ResourceLocation activeRes = AbstractMachineEntity.getSoundFor("telepad.active"); private MachineSound activeSound = null; @@ -84,8 +82,8 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei public float speedMult = 2.5f; @Override - public void updateEntity() { - super.updateEntity(); + public void doUpdate() { + super.doUpdate(); // my master is gone! if(master != null && master.isInvalid()) { master.breakNetwork(); @@ -142,11 +140,6 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei lastSyncPowerStored = getEnergyStored(); PacketHandler.sendToAllAround(new PacketPowerStorage(this), this); } - boolean progressChanged = (lastSyncPowerUsed != powerUsed); - if(progressChanged) { - lastSyncPowerUsed = getEnergyStored(); - PacketHandler.sendToAllAround(new PacketProgress(this), this); - } if(coordsChanged && inNetwork() && master != null && isMaster()) { coordsChanged = false; PacketHandler.sendToAllAround(new PacketUpdateCoords(master, master.getX(), master.getY(), master.getZ(), master.getTargetDim()), master); @@ -287,7 +280,7 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei } @Override - public boolean canUpdate() { + public boolean shouldUpdate() { return true; } @@ -350,10 +343,6 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei return (int) ((((float) getEnergyStored()) / ((float) getMaxEnergyStored())) * scale); } - public int getProgressScaled(int scale) { - return (int) (getProgress() * scale); - } - private int calculateTeleportPower() { if (worldObj.provider.dimensionId == targetDim) { this.maxPower = new BlockCoord(this).distance(target) * 1000; diff --git a/src/main/java/crazypants/util/IProgressTile.java b/src/main/java/crazypants/util/IProgressTile.java index a172a069..4e403a01 100644 --- a/src/main/java/crazypants/util/IProgressTile.java +++ b/src/main/java/crazypants/util/IProgressTile.java @@ -1,13 +1,23 @@ package crazypants.util; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; public interface IProgressTile { - + float getProgress(); - + + /** + * Client-only. Called to set clientside progress for syncing/rendering + * purposes. + * + * @param progress + * The % progress. + */ + @SideOnly(Side.CLIENT) void setProgress(float progress); - + TileEntity getTileEntity(); }