From 786dbd82c73171c6d07f76ae3a4ae188eabef4f7 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 8 Feb 2015 14:17:21 -0800 Subject: [PATCH] #19 Spread out tick updates for tile entities --- .../apiculture/gadgets/TileAlveary.java | 2 +- .../gadgets/TileAlvearyHygroregulator.java | 2 +- .../apiculture/gadgets/TileAlvearyPlain.java | 6 +++--- .../apiculture/gadgets/TileAlvearySieve.java | 2 +- .../gadgets/TileAlvearyStabiliser.java | 2 +- .../gadgets/TileAlvearySwarmer.java | 4 ++-- .../apiculture/gadgets/TileBeehouse.java | 21 ++----------------- .../forestry/core/gadgets/TileForestry.java | 8 +++++++ .../forestry/core/gadgets/TilePowered.java | 2 +- .../forestry/energy/gadgets/EngineBronze.java | 2 +- .../forestry/energy/gadgets/EngineCopper.java | 2 +- .../energy/gadgets/MachineGenerator.java | 2 +- .../factory/gadgets/MachineBottler.java | 2 +- .../factory/gadgets/MachineCarpenter.java | 4 ++-- .../factory/gadgets/MachineCentrifuge.java | 2 +- .../factory/gadgets/MachineFermenter.java | 2 +- .../factory/gadgets/MachineRaintank.java | 11 +++++----- .../factory/gadgets/MachineSqueezer.java | 2 +- .../factory/gadgets/MachineStill.java | 2 +- .../forestry/farming/gadgets/TileFarm.java | 2 +- .../farming/gadgets/TileFarmPlain.java | 2 +- .../forestry/farming/gadgets/TileGearbox.java | 2 +- .../forestry/farming/gadgets/TileHatch.java | 2 +- .../items/ItemButterflyGE.java | 5 ++++- .../mail/gadgets/MachinePhilatelist.java | 2 +- .../forestry/mail/gadgets/MachineTrader.java | 2 +- 26 files changed, 46 insertions(+), 51 deletions(-) diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlveary.java b/src/main/java/forestry/apiculture/gadgets/TileAlveary.java index 3fe79112d..1babb7d54 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlveary.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlveary.java @@ -71,7 +71,7 @@ public abstract class TileAlveary extends TileForestry implements IAlvearyCompon } // Periodic validation if needed - if (worldObj.getTotalWorldTime() % 200 == 0 && (!isIntegratedIntoStructure() || isMaster())) { + if (updateOnInterval(200) && (!isIntegratedIntoStructure() || isMaster())) { validateStructure(); } diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java index 4f5e85965..17d9f21b9 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java @@ -136,7 +136,7 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory } } - if (worldObj.getTotalWorldTime() % 20 * 10 != 0) { + if (!updateOnInterval(20)) { return; } diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java index 62c0bda46..b6661e463 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java @@ -150,7 +150,7 @@ public class TileAlvearyPlain extends TileAlveary implements ISidedInventory, IB } // Add swarm effects - if (worldObj.getTotalWorldTime() % 200 == 0) { + if (updateOnInterval(200)) { ISidedInventory inventory = getStructureInventory(); if (inventory != null) { onQueenChange(inventory.getStackInSlot(SLOT_QUEEN)); @@ -161,7 +161,7 @@ public class TileAlvearyPlain extends TileAlveary implements ISidedInventory, IB queen.doFX(beekeepingLogic.getEffectData(), this); } - if (getErrorState() == EnumErrorCode.OK && worldObj.getTotalWorldTime() % 50 == 0) { + if (getErrorState() == EnumErrorCode.OK && updateOnInterval(50)) { float f = xCoord + 0.5F; float f1 = yCoord + 0.0F + (worldObj.rand.nextFloat() * 6F) / 16F; float f2 = zCoord + 0.5F; @@ -191,7 +191,7 @@ public class TileAlvearyPlain extends TileAlveary implements ISidedInventory, IB // / Multiplayer FX ItemStack queenStack = inventory.getStackInSlot(SLOT_QUEEN); if (PluginApiculture.beeInterface.isMated(queenStack)) { - if (getErrorState() == EnumErrorCode.OK && worldObj.getTotalWorldTime() % 2 == 0) { + if (getErrorState() == EnumErrorCode.OK && updateOnInterval(2)) { IBee displayQueen = PluginApiculture.beeInterface.getMember(queenStack); displayQueen.doFX(beekeepingLogic.getEffectData(), this); } diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java index 68405f49b..5e9f21fda 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java @@ -71,7 +71,7 @@ public class TileAlvearySieve extends TileAlveary implements ICrafter, IBeeListe @Override protected void updateServerSide() { super.updateServerSide(); - if (worldObj.getTotalWorldTime() % 200 != 0) { + if (!updateOnInterval(200)) { return; } diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyStabiliser.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyStabiliser.java index 54b18f8f5..890d1ee70 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyStabiliser.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyStabiliser.java @@ -38,7 +38,7 @@ public class TileAlvearyStabiliser extends TileAlveary implements IBeeModifier { @Override protected void updateServerSide() { super.updateServerSide(); - if (worldObj.getTotalWorldTime() % 200 != 0) { + if (!updateOnInterval(200)) { return; } diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java index 1359ba11a..c2d87e007 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java @@ -66,14 +66,14 @@ public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory { if (pendingSpawns.size() > 0) { setIsActive(true); - if (worldObj.getTotalWorldTime() % 1000 == 0) { + if (updateOnInterval(1000)) { trySpawnSwarm(); } } else { setIsActive(false); } - if (worldObj.getTotalWorldTime() % 500 != 0) { + if (!updateOnInterval(500)) { return; } diff --git a/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java b/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java index 759b18194..4420e4beb 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java +++ b/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java @@ -161,7 +161,7 @@ public class TileBeehouse extends TileBase implements IBeeHousing, IClimatised { // / Multiplayer FX if (PluginApiculture.beeInterface.isMated(getInternalInventory().getStackInSlot(SLOT_QUEEN))) { - if (getErrorState() == EnumErrorCode.OK && worldObj.getTotalWorldTime() % 2 % 2 == 0) { + if (getErrorState() == EnumErrorCode.OK && updateOnInterval(2)) { IBee displayQueen = PluginApiculture.beeInterface.getMember(getInternalInventory().getStackInSlot(SLOT_QUEEN)); displayQueen.doFX(logic.getEffectData(), this); } @@ -180,26 +180,9 @@ public class TileBeehouse extends TileBase implements IBeeHousing, IClimatised { } // Add swarm effects - if (worldObj.getTotalWorldTime() % 200 * 10 == 0) { + if (updateOnInterval(200)) { onQueenChange(getInternalInventory().getStackInSlot(SLOT_QUEEN)); } - /* These should get already done on the client / doesn't work server-side anyway - if (getErrorState() == EnumErrorCode.OK && worldObj.getTotalWorldTime() % 2 % 2 == 0) - queen.doFX(logic.getEffectData(), this); - - if (getErrorState() == EnumErrorCode.OK && worldObj.getTotalWorldTime() % 50 == 0) { - float f = xCoord + 0.5F; - float f1 = yCoord + 0.0F + (worldObj.rand.nextFloat() * 6F) / 16F; - float f2 = zCoord + 0.5F; - float f3 = 0.52F; - float f4 = worldObj.rand.nextFloat() * 0.6F - 0.3F; - - Proxies.common.addEntitySwarmFX(worldObj, (f - f3), f1, (f2 + f4), 0F, 0F, 0F); - Proxies.common.addEntitySwarmFX(worldObj, (f + f3), f1, (f2 + f4), 0F, 0F, 0F); - Proxies.common.addEntitySwarmFX(worldObj, (f + f4), f1, (f2 - f3), 0F, 0F, 0F); - Proxies.common.addEntitySwarmFX(worldObj, (f + f4), f1, (f2 + f3), 0F, 0F, 0F); - }*/ - } // @Override diff --git a/src/main/java/forestry/core/gadgets/TileForestry.java b/src/main/java/forestry/core/gadgets/TileForestry.java index a3f08b354..fba0b390c 100755 --- a/src/main/java/forestry/core/gadgets/TileForestry.java +++ b/src/main/java/forestry/core/gadgets/TileForestry.java @@ -11,6 +11,7 @@ package forestry.core.gadgets; import java.util.Collection; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; @@ -58,9 +59,12 @@ import buildcraft.api.statements.ITriggerProvider; @Optional.Interface(iface = "buildcraft.api.statements.ITriggerProvider", modid = "BuildCraftAPI|statements") public abstract class TileForestry extends TileEntity implements INetworkedEntity, IRestrictedAccess, IErrorSource, ITriggerProvider, ISidedInventory, IFilterSlotDelegate { + private static Random rand = new Random(); + protected final AdjacentTileCache tileCache = new AdjacentTileCache(this); protected boolean isInited = false; private IInventoryAdapter inventory = FakeInventoryAdapter.instance(); + private final int tickUpdateOffset = rand.nextInt(); public AdjacentTileCache getTileCache() { return tileCache; @@ -116,6 +120,10 @@ public abstract class TileForestry extends TileEntity implements INetworkedEntit } } + public final boolean updateOnInterval(int tickInterval) { + return (worldObj.getTotalWorldTime() + tickUpdateOffset) % tickInterval == 0; + } + public abstract void initialize(); // / SAVING & LOADING diff --git a/src/main/java/forestry/core/gadgets/TilePowered.java b/src/main/java/forestry/core/gadgets/TilePowered.java index bb2b17f21..746990cbf 100644 --- a/src/main/java/forestry/core/gadgets/TilePowered.java +++ b/src/main/java/forestry/core/gadgets/TilePowered.java @@ -62,7 +62,7 @@ public abstract class TilePowered extends TileBase implements IRenderableMachine workCounter++; } - if (workCounter >= WORK_CYCLES && worldObj.getTotalWorldTime() % 5 == 0) { + if (workCounter >= WORK_CYCLES && updateOnInterval(5)) { if (workCycle()) { workCounter = 0; } diff --git a/src/main/java/forestry/energy/gadgets/EngineBronze.java b/src/main/java/forestry/energy/gadgets/EngineBronze.java index 7eb4edfdf..9e3514677 100755 --- a/src/main/java/forestry/energy/gadgets/EngineBronze.java +++ b/src/main/java/forestry/energy/gadgets/EngineBronze.java @@ -116,7 +116,7 @@ public class EngineBronze extends Engine implements ISidedInventory, ILiquidTank @Override public void updateServerSide() { super.updateServerSide(); - if (worldObj.getTotalWorldTime() % 20 * 10 != 0) { + if (!updateOnInterval(20)) { return; } diff --git a/src/main/java/forestry/energy/gadgets/EngineCopper.java b/src/main/java/forestry/energy/gadgets/EngineCopper.java index b3e918a5a..e3a821db4 100755 --- a/src/main/java/forestry/energy/gadgets/EngineCopper.java +++ b/src/main/java/forestry/energy/gadgets/EngineCopper.java @@ -122,7 +122,7 @@ public class EngineCopper extends Engine implements ISidedInventory { public void updateServerSide() { super.updateServerSide(); - if (worldObj.getTotalWorldTime() % 40 != 0) { + if (!updateOnInterval(40)) { return; } diff --git a/src/main/java/forestry/energy/gadgets/MachineGenerator.java b/src/main/java/forestry/energy/gadgets/MachineGenerator.java index 2547755dd..01045a62b 100755 --- a/src/main/java/forestry/energy/gadgets/MachineGenerator.java +++ b/src/main/java/forestry/energy/gadgets/MachineGenerator.java @@ -125,7 +125,7 @@ public class MachineGenerator extends TileBase implements ISidedInventory, ILiqu @Override public void updateServerSide() { - if (worldObj.getTotalWorldTime() % 20 == 0) { + if (updateOnInterval(20)) { // Check inventory slots for fuel // Check if we have suitable items waiting in the item slot IInventoryAdapter inventory = getInternalInventory(); diff --git a/src/main/java/forestry/factory/gadgets/MachineBottler.java b/src/main/java/forestry/factory/gadgets/MachineBottler.java index 1bea43384..2a3a92f56 100755 --- a/src/main/java/forestry/factory/gadgets/MachineBottler.java +++ b/src/main/java/forestry/factory/gadgets/MachineBottler.java @@ -229,7 +229,7 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq @Override public void updateServerSide() { - if (worldObj.getTotalWorldTime() % 20 != 0) { + if (!updateOnInterval(20)) { return; } diff --git a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java index d65102014..41d082988 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java @@ -339,7 +339,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL @Override public void updateServerSide() { - if (worldObj.getTotalWorldTime() % 20 != 0) { + if (!updateOnInterval(20)) { return; } IInventoryAdapter accessibleInventory = getInternalInventory(); @@ -348,7 +348,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL FluidHelper.drainContainers(tankManager, accessibleInventory, SLOT_CAN_INPUT); } - if (worldObj.getTotalWorldTime() % 40 != 0) { + if (!updateOnInterval(40)) { return; } diff --git a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java index 145f8cd0d..e45ee6528 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java +++ b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java @@ -213,7 +213,7 @@ public class MachineCentrifuge extends TilePowered implements ISidedInventory { @Override public void updateServerSide() { - if (worldObj.getTotalWorldTime() % 20 * 10 != 0) { + if (!updateOnInterval(20)) { return; } diff --git a/src/main/java/forestry/factory/gadgets/MachineFermenter.java b/src/main/java/forestry/factory/gadgets/MachineFermenter.java index 997e08d41..05cc53e97 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFermenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineFermenter.java @@ -278,7 +278,7 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL @Override public void updateServerSide() { - if (worldObj.getTotalWorldTime() % 20 != 0) { + if (!updateOnInterval(20)) { return; } diff --git a/src/main/java/forestry/factory/gadgets/MachineRaintank.java b/src/main/java/forestry/factory/gadgets/MachineRaintank.java index dc9d80c58..1efd55875 100755 --- a/src/main/java/forestry/factory/gadgets/MachineRaintank.java +++ b/src/main/java/forestry/factory/gadgets/MachineRaintank.java @@ -115,6 +115,11 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui @Override public void updateServerSide() { + + if (!updateOnInterval(20)) { + return; + } + if (!isValidBiome) { setErrorState(EnumErrorCode.INVALIDBIOME); } else if (!worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord)) { @@ -125,11 +130,7 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui resourceTank.fill(STACK_WATER, true); setErrorState(EnumErrorCode.OK); } - - if (worldObj.getTotalWorldTime() % 16 != 0) { - return; - } - + IInventoryAdapter inventory = getInternalInventory(); if (!StackUtils.isIdenticalItem(usedEmpty, inventory.getStackInSlot(SLOT_RESOURCE))) { fillingTime = 0; diff --git a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java index dd572eca4..ac8f74d03 100755 --- a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java +++ b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java @@ -210,7 +210,7 @@ public class MachineSqueezer extends TilePowered implements ISidedInventory, ILi @Override public void updateServerSide() { - if (worldObj.getTotalWorldTime() % 20 != 0) { + if (!updateOnInterval(20)) { return; } diff --git a/src/main/java/forestry/factory/gadgets/MachineStill.java b/src/main/java/forestry/factory/gadgets/MachineStill.java index 293fe9446..7a6276cc4 100755 --- a/src/main/java/forestry/factory/gadgets/MachineStill.java +++ b/src/main/java/forestry/factory/gadgets/MachineStill.java @@ -188,7 +188,7 @@ public class MachineStill extends TilePowered implements ISidedInventory, ILiqui @Override public void updateServerSide() { - if (worldObj.getTotalWorldTime() % 20 * 10 != 0) { + if (!updateOnInterval(20)) { return; } diff --git a/src/main/java/forestry/farming/gadgets/TileFarm.java b/src/main/java/forestry/farming/gadgets/TileFarm.java index 231c50313..2bf157430 100755 --- a/src/main/java/forestry/farming/gadgets/TileFarm.java +++ b/src/main/java/forestry/farming/gadgets/TileFarm.java @@ -108,7 +108,7 @@ public abstract class TileFarm extends TileForestry implements IFarmComponent { } // Periodic validation if needed - if (worldObj.getTotalWorldTime() % 200 == 0 && (!isIntegratedIntoStructure() || isMaster())) { + if (updateOnInterval(200) && (!isIntegratedIntoStructure() || isMaster())) { validateStructure(); } diff --git a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java index 57cede8b3..35049852c 100755 --- a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java +++ b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java @@ -204,7 +204,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable } } - if (worldObj.getTotalWorldTime() % 20 != 0) { + if (!updateOnInterval(20)) { return; } diff --git a/src/main/java/forestry/farming/gadgets/TileGearbox.java b/src/main/java/forestry/farming/gadgets/TileGearbox.java index 54fc96a84..eb3fc78ee 100644 --- a/src/main/java/forestry/farming/gadgets/TileGearbox.java +++ b/src/main/java/forestry/farming/gadgets/TileGearbox.java @@ -84,7 +84,7 @@ public class TileGearbox extends TileFarm implements IPowerHandler { workCounter++; } - if (workCounter >= WORK_CYCLES && worldObj.getTotalWorldTime() % 5 == 0) { + if (workCounter >= WORK_CYCLES && updateOnInterval(5)) { ITileStructure central = getCentralTE(); if (!(central instanceof IFarmHousing)) { return; diff --git a/src/main/java/forestry/farming/gadgets/TileHatch.java b/src/main/java/forestry/farming/gadgets/TileHatch.java index 2aec7ef16..59613c6a5 100755 --- a/src/main/java/forestry/farming/gadgets/TileHatch.java +++ b/src/main/java/forestry/farming/gadgets/TileHatch.java @@ -54,7 +54,7 @@ public class TileHatch extends TileFarm implements ISidedInventory { @Override protected void updateServerSide() { - if (worldObj.getTotalWorldTime() % 40 == 0) { + if (updateOnInterval(40)) { dumpStash(); } } diff --git a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java index 44f5ce797..8e31fc35f 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java +++ b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java @@ -11,6 +11,7 @@ package forestry.lepidopterology.items; import java.util.List; +import java.util.Random; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -44,6 +45,8 @@ import forestry.plugins.PluginLepidopterology; public class ItemButterflyGE extends ItemGE { + private static Random rand = new Random(); + private final EnumFlutterType type; public ItemButterflyGE(EnumFlutterType type) { @@ -113,7 +116,7 @@ public class ItemButterflyGE extends ItemGE { if (!Proxies.common.isSimulating(entityItem.worldObj) || entityItem.ticksExisted < 80) { return false; } - if (entityItem.worldObj.getTotalWorldTime() % 24 != 0) { + if (rand.nextInt(24) != 0) { return false; } diff --git a/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java b/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java index 491b00b67..bfd4b815e 100755 --- a/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java +++ b/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java @@ -47,7 +47,7 @@ public class MachinePhilatelist extends TileBase implements IInventory { // / UPDATING @Override public void updateServerSide() { - if (worldObj.getTotalWorldTime() % 20 * 10 != 0) { + if (!updateOnInterval(20)) { return; } diff --git a/src/main/java/forestry/mail/gadgets/MachineTrader.java b/src/main/java/forestry/mail/gadgets/MachineTrader.java index 4eab94290..701db9c7e 100755 --- a/src/main/java/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/gadgets/MachineTrader.java @@ -118,7 +118,7 @@ public class MachineTrader extends TileBase { @Override public void updateServerSide() { - if (!isLinked() || worldObj.getTotalWorldTime() % 4 != 0) { + if (!isLinked() || !updateOnInterval(10)) { return; }