From 927a13883ce5f175f41b90b6f5d87bbe01252dc0 Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Thu, 17 Mar 2016 10:30:53 -0700 Subject: [PATCH 1/2] Make StackFilter static methods public --- .../java/forestry/core/inventory/filters/StackFilter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/forestry/core/inventory/filters/StackFilter.java b/src/main/java/forestry/core/inventory/filters/StackFilter.java index 6adeb12cb..e3831bada 100755 --- a/src/main/java/forestry/core/inventory/filters/StackFilter.java +++ b/src/main/java/forestry/core/inventory/filters/StackFilter.java @@ -80,7 +80,7 @@ public class StackFilter implements IStackFilter { }; } - private static StackFilter buildAnd(@Nonnull final Predicate... filters) { + public static StackFilter buildAnd(@Nonnull final Predicate... filters) { return new StackFilter() { @Override public boolean apply(ItemStack stack) { @@ -95,7 +95,7 @@ public class StackFilter implements IStackFilter { }; } - private static StackFilter buildOr(@Nonnull final Predicate... filters) { + public static StackFilter buildOr(@Nonnull final Predicate... filters) { return new StackFilter() { @Override public boolean apply(ItemStack stack) { @@ -110,7 +110,7 @@ public class StackFilter implements IStackFilter { }; } - private static StackFilter invert(@Nonnull final Predicate filter) { + public static StackFilter invert(@Nonnull final Predicate filter) { return new StackFilter() { @Override public boolean apply(ItemStack stack) { From 8d549e14e61e5b682e8e17debe39b95c1e53066c Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Thu, 17 Mar 2016 10:31:58 -0700 Subject: [PATCH 2/2] decreaseStackInSlot() should not simulate --- .../core/inventory/iterators/ItemHandlerInventoryIterator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/forestry/core/inventory/iterators/ItemHandlerInventoryIterator.java b/src/main/java/forestry/core/inventory/iterators/ItemHandlerInventoryIterator.java index 54a37d725..9a8f9bd95 100644 --- a/src/main/java/forestry/core/inventory/iterators/ItemHandlerInventoryIterator.java +++ b/src/main/java/forestry/core/inventory/iterators/ItemHandlerInventoryIterator.java @@ -76,7 +76,7 @@ public class ItemHandlerInventoryIterator extends InventoryIterator { @Override public ItemStack decreaseStackInSlot() { - return inv.extractItem(slot, 1, true); + return inv.extractItem(slot, 1, false); } @Override