diff --git a/src/main/java/forestry/farming/multiblock/FarmController.java b/src/main/java/forestry/farming/multiblock/FarmController.java index 92f064461..ee72331f8 100644 --- a/src/main/java/forestry/farming/multiblock/FarmController.java +++ b/src/main/java/forestry/farming/multiblock/FarmController.java @@ -125,6 +125,9 @@ public class FarmController extends RectangularMultiblockControllerBase implemen private final FarmHydrationManager hydrationManager; private final FarmFertilizerManager fertilizerManager; + // the number of work ticks that this farm has had no power + private int noPowerTime = 0; + private BiomeGenBase cachedBiome; public FarmController(World world) { @@ -269,12 +272,28 @@ public class FarmController extends RectangularMultiblockControllerBase implemen inventory.drainCan(tankManager); } + boolean hasPower = false; for (Map.Entry entry : farmActiveComponents.entrySet()) { IFarmComponent.Active farmComponent = entry.getKey(); + if (farmComponent instanceof TileGearbox) { + hasPower |= ((TileGearbox) farmComponent).getEnergyManager().getTotalEnergyStored() > 0; + } + int tickOffset = entry.getValue(); farmComponent.updateServer(tickCount + tickOffset); } + if (hasPower) { + noPowerTime = 0; + getErrorLogic().setCondition(false, EnumErrorCode.NOPOWER); + } else { + if (noPowerTime <= 4) { + noPowerTime++; + } else { + getErrorLogic().setCondition(true, EnumErrorCode.NOPOWER); + } + } + //FIXME: be smarter about the farm needing to save return true; } diff --git a/src/main/java/forestry/farming/tiles/TileGearbox.java b/src/main/java/forestry/farming/tiles/TileGearbox.java index b42e7bacf..652296b69 100644 --- a/src/main/java/forestry/farming/tiles/TileGearbox.java +++ b/src/main/java/forestry/farming/tiles/TileGearbox.java @@ -14,9 +14,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -import forestry.api.core.IErrorLogic; import forestry.api.farming.IFarmComponent; -import forestry.core.errors.EnumErrorCode; import forestry.core.tiles.IPowerHandler; import forestry.energy.EnergyManager; import forestry.farming.multiblock.IFarmController; @@ -57,13 +55,7 @@ public class TileGearbox extends TileFarm implements IPowerHandler, IFarmCompone @Override public void updateServer(int tickCount) { - - IFarmController farmController = getFarmController(); - IErrorLogic errorLogic = farmController.getErrorLogic(); - - boolean hasPower = energyManager.getTotalEnergyStored() > 0; - - if (errorLogic.setCondition(!hasPower, EnumErrorCode.NOPOWER)) { + if (energyManager.getTotalEnergyStored() <= 0) { return; } @@ -78,6 +70,7 @@ public class TileGearbox extends TileFarm implements IPowerHandler, IFarmCompone } if (workCounter >= WORK_CYCLES && (tickCount % 5 == 0)) { + IFarmController farmController = getFarmController(); if (farmController.doWork()) { workCounter = 0; previousDelays = 0;