From ea1f3f0ee479d66b70b14d132310bee6325899a4 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 8 Sep 2014 03:09:55 -0700 Subject: [PATCH] Properly fixed Trade Station buffer triggers --- .../forestry/mail/gadgets/MachineTrader.java | 26 ++++++++++++------- .../forestry/mail/triggers/TriggerBuffer.java | 2 +- .../mail/triggers/TriggerLowInput.java | 2 +- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/main/java/forestry/mail/gadgets/MachineTrader.java b/src/main/java/forestry/mail/gadgets/MachineTrader.java index 5f4a4faac..ac02b47ea 100755 --- a/src/main/java/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/gadgets/MachineTrader.java @@ -95,7 +95,7 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided if (worldObj.getTotalWorldTime() % 40 * 10 != 0) return; - if (!hasPaperMin(0.0f) || !hasBufMin(0.0f)) { + if (!hasPaperMin(0.0f) || !hasInputBufMin(0.0f)) { setErrorState(EnumErrorCode.NORESOURCE); return; } @@ -113,27 +113,35 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided return address.isValid(); } - private float percentOccupied(int startSlot, int countSlots) { - int max = 0; + private float percentOccupied(int startSlot, int countSlots, ItemStack item) { + int max = countSlots * 64; int avail = 0; IInventory tradeInventory = this.getOrCreateTradeInventory(); for (int i = startSlot; i < startSlot + countSlots; i++) { - max += 64; - if (tradeInventory.getStackInSlot(i) == null) + ItemStack itemInSlot = tradeInventory.getStackInSlot(i); + if (itemInSlot == null || (item != null && !StackUtils.isIdenticalItem(itemInSlot, item))) continue; - avail += tradeInventory.getStackInSlot(i).stackSize; + avail += itemInSlot.stackSize; } return ((float) avail / (float) max); } public boolean hasPaperMin(float percentage) { - return percentOccupied(TradeStation.SLOT_LETTERS_1, TradeStation.SLOT_LETTERS_COUNT) > percentage; + return percentOccupied(TradeStation.SLOT_LETTERS_1, TradeStation.SLOT_LETTERS_COUNT, new ItemStack(Items.paper)) > percentage; } - public boolean hasBufMin(float percentage) { - return percentOccupied(TradeStation.SLOT_BUFFER, TradeStation.SLOT_BUFFER_COUNT) > percentage; + public boolean hasInputBufMin(float percentage) { + IInventory inventory = getOrCreateTradeInventory(); + ItemStack tradegood = inventory.getStackInSlot(TradeStation.SLOT_TRADEGOOD); + if (tradegood == null) + return true; + return percentOccupied(TradeStation.SLOT_BUFFER, TradeStation.SLOT_BUFFER_COUNT, tradegood) > percentage; + } + + public boolean hasOutputBufMin(float percentage) { + return percentOccupied(TradeStation.SLOT_BUFFER, TradeStation.SLOT_BUFFER_COUNT, null) > percentage; } public boolean hasPostageMin(int postage) { diff --git a/src/main/java/forestry/mail/triggers/TriggerBuffer.java b/src/main/java/forestry/mail/triggers/TriggerBuffer.java index 2e5b0a8a1..bff411e0c 100755 --- a/src/main/java/forestry/mail/triggers/TriggerBuffer.java +++ b/src/main/java/forestry/mail/triggers/TriggerBuffer.java @@ -39,7 +39,7 @@ public class TriggerBuffer extends Trigger { if (!(tile instanceof MachineTrader)) return false; - return ((MachineTrader) tile).hasBufMin(threshold); + return ((MachineTrader) tile).hasOutputBufMin(threshold); } } diff --git a/src/main/java/forestry/mail/triggers/TriggerLowInput.java b/src/main/java/forestry/mail/triggers/TriggerLowInput.java index 1917bb522..001f1aa19 100755 --- a/src/main/java/forestry/mail/triggers/TriggerLowInput.java +++ b/src/main/java/forestry/mail/triggers/TriggerLowInput.java @@ -39,6 +39,6 @@ public class TriggerLowInput extends Trigger { if (!(tile instanceof MachineTrader)) return false; - return !((MachineTrader) tile).hasBufMin(threshold); + return !((MachineTrader) tile).hasInputBufMin(threshold); } }