From 3a5275396bee5b507cd379f0c7f6fd8a72361b8d Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 5 Nov 2014 21:56:12 -0800 Subject: [PATCH] Add "No Power" error state --- lang | 2 +- src/main/java/forestry/core/EnumErrorCode.java | 4 +++- src/main/java/forestry/factory/gadgets/MachineBottler.java | 5 +++++ .../java/forestry/factory/gadgets/MachineCarpenter.java | 2 ++ .../java/forestry/factory/gadgets/MachineCentrifuge.java | 5 +++++ .../java/forestry/factory/gadgets/MachineFabricator.java | 7 +++++++ .../java/forestry/factory/gadgets/MachineFermenter.java | 2 ++ .../java/forestry/factory/gadgets/MachineSqueezer.java | 4 ++++ src/main/java/forestry/factory/gadgets/MachineStill.java | 4 ++++ 9 files changed, 33 insertions(+), 2 deletions(-) diff --git a/lang b/lang index 8812057c8..17e04cd6e 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 8812057c81797062a6194f1a270a7e518290c97b +Subproject commit 17e04cd6e567da581b3ca05d93c2fcb6381f9149 diff --git a/src/main/java/forestry/core/EnumErrorCode.java b/src/main/java/forestry/core/EnumErrorCode.java index 64d96143b..81d3b3c21 100755 --- a/src/main/java/forestry/core/EnumErrorCode.java +++ b/src/main/java/forestry/core/EnumErrorCode.java @@ -94,7 +94,9 @@ public enum EnumErrorCode { NOSUPPLIES("noSupplies", "noResource", 32), - NOTRADE("noTrade", "noResource", 33); + NOTRADE("noTrade", "noResource", 33), + + NOPOWER("noPower", "errored", 34); private String name; private String iconName; diff --git a/src/main/java/forestry/factory/gadgets/MachineBottler.java b/src/main/java/forestry/factory/gadgets/MachineBottler.java index 627aee714..8507d08f6 100755 --- a/src/main/java/forestry/factory/gadgets/MachineBottler.java +++ b/src/main/java/forestry/factory/gadgets/MachineBottler.java @@ -232,6 +232,11 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq checkRecipe(); if (getErrorState() == EnumErrorCode.NORECIPE && currentRecipe != null) setErrorState(EnumErrorCode.OK); + + if (energyManager.getTotalEnergyStored() == 0) { + setErrorState(EnumErrorCode.NOPOWER); + return; + } } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java index 83c5b9264..9cf6663fd 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java @@ -356,6 +356,8 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL setErrorState(EnumErrorCode.NORECIPE); else if (!validateResources()) setErrorState(EnumErrorCode.NORESOURCE); + else if (energyManager.getTotalEnergyStored() == 0) + setErrorState(EnumErrorCode.NOPOWER); else setErrorState(EnumErrorCode.OK); diff --git a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java index 9aa6ddf64..6f36c4255 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java +++ b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java @@ -206,6 +206,11 @@ public class MachineCentrifuge extends TilePowered implements ISidedInventory, I checkRecipe(); if (getErrorState() == EnumErrorCode.NORECIPE && currentRecipe != null) setErrorState(EnumErrorCode.OK); + + if (energyManager.getTotalEnergyStored() == 0) { + setErrorState(EnumErrorCode.NOPOWER); + return; + } } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineFabricator.java b/src/main/java/forestry/factory/gadgets/MachineFabricator.java index 4fe0fcf0d..03c06c863 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFabricator.java +++ b/src/main/java/forestry/factory/gadgets/MachineFabricator.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import forestry.core.EnumErrorCode; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; @@ -328,6 +329,12 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial } this.dissipateHeat(); + + if (energyManager.getTotalEnergyStored() == 0 && heat == 0) { + setErrorState(EnumErrorCode.NOPOWER); + } else if (getErrorState() == EnumErrorCode.NOPOWER) { + setErrorState(EnumErrorCode.OK); + } } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineFermenter.java b/src/main/java/forestry/factory/gadgets/MachineFermenter.java index 440fe6a74..d3d33b6ab 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFermenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineFermenter.java @@ -275,6 +275,8 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL setErrorState(EnumErrorCode.OK); else if (inventory.getStackInSlot(SLOT_FUEL) == null && fuelBurnTime <= 0) setErrorState(EnumErrorCode.NOFUEL); + else if (energyManager.getTotalEnergyStored() == 0) + setErrorState(EnumErrorCode.NOPOWER); else setErrorState(EnumErrorCode.NORECIPE); } diff --git a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java index 872d88e49..9cb136383 100755 --- a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java +++ b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java @@ -253,6 +253,10 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I if (getErrorState() == EnumErrorCode.NORECIPE && currentRecipe != null) setErrorState(EnumErrorCode.OK); + if (energyManager.getTotalEnergyStored() == 0) { + setErrorState(EnumErrorCode.NOPOWER); + return; + } } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineStill.java b/src/main/java/forestry/factory/gadgets/MachineStill.java index 049c2880f..4880473c9 100755 --- a/src/main/java/forestry/factory/gadgets/MachineStill.java +++ b/src/main/java/forestry/factory/gadgets/MachineStill.java @@ -212,6 +212,10 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid if (getErrorState() == EnumErrorCode.NORECIPE && currentRecipe != null) setErrorState(EnumErrorCode.OK); + if (energyManager.getTotalEnergyStored() == 0) { + setErrorState(EnumErrorCode.NOPOWER); + return; + } } @Override