From 07afdf63b15e0a0deadde2db1a1cde5006ee03b0 Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 9 Sep 2014 14:43:15 -0700 Subject: [PATCH] Added Trade Station warning for full inventory #170 --- .../forestry/core/utils/InventoryAdapter.java | 17 ++++++++++++----- src/main/java/forestry/mail/TradeStation.java | 9 ++++++++- .../forestry/mail/gadgets/MachineTrader.java | 7 +++++++ 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/main/java/forestry/core/utils/InventoryAdapter.java b/src/main/java/forestry/core/utils/InventoryAdapter.java index 52701e50e..70737cc71 100755 --- a/src/main/java/forestry/core/utils/InventoryAdapter.java +++ b/src/main/java/forestry/core/utils/InventoryAdapter.java @@ -76,17 +76,20 @@ public class InventoryAdapter implements IInventory, INBTTagable { } public boolean tryAddStacksCopy(ItemStack[] stacks, boolean all) { + return tryAddStacksCopy(stacks, 0, this.getSizeInventory(), all); + } + + public boolean tryAddStacksCopy(ItemStack[] stacks, int startSlot, int slots, boolean all) { - boolean addedAll = true; for (ItemStack stack : stacks) { if (stack == null) continue; - if (!tryAddStack(stack.copy(), all)) - addedAll = false; + if (!tryAddStack(stack.copy(), startSlot, slots, all)) + return false; } - return addedAll; + return true; } public boolean tryAddStacks(ItemStack[] stacks, boolean all) { @@ -121,7 +124,11 @@ public class InventoryAdapter implements IInventory, INBTTagable { } public boolean tryAddStack(ItemStack stack, int startSlot, int slots, boolean all, boolean doAdd) { - return addStack(stack, startSlot, slots, all, doAdd) > 0; + int added = addStack(stack, startSlot, slots, all, doAdd); + if (all) + return added == stack.stackSize; + else + return added > 0; } public int addStack(ItemStack stack, boolean all, boolean doAdd) { diff --git a/src/main/java/forestry/mail/TradeStation.java b/src/main/java/forestry/mail/TradeStation.java index e5bcdeb36..1a06a78c5 100755 --- a/src/main/java/forestry/mail/TradeStation.java +++ b/src/main/java/forestry/mail/TradeStation.java @@ -286,13 +286,20 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve return (int) Math.floor(itemCount / tradegood.stackSize); } + public boolean canReceivePayment() { + InventoryAdapter test = inventory.copy(); + ItemStack [] payment = inventory.getStacks(SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT); + + return test.tryAddStacksCopy(payment, SLOT_RECEIVE_BUFFER, SLOT_RECEIVE_BUFFER_COUNT, true); + } + private int countStorablePayment(int max, ItemStack[] exchange) { InventoryAdapter test = inventory.copy(); int count = 0; for (int i = 0; i < max; i++) { - if (test.tryAddStacksCopy(exchange, true)) + if (test.tryAddStacksCopy(exchange, SLOT_RECEIVE_BUFFER, SLOT_RECEIVE_BUFFER_COUNT, true)) count++; else break; diff --git a/src/main/java/forestry/mail/gadgets/MachineTrader.java b/src/main/java/forestry/mail/gadgets/MachineTrader.java index 7ab544f70..f9ee30bb1 100755 --- a/src/main/java/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/gadgets/MachineTrader.java @@ -137,6 +137,13 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided return; } + if (inventory instanceof TradeStation) { + if (!((TradeStation)inventory).canReceivePayment()) { + setErrorState(EnumErrorCode.NOSPACE); + return; + } + } + setErrorState(EnumErrorCode.OK); }