From f33bf78226369168e64f535efc16d1cc1f209d4c Mon Sep 17 00:00:00 2001 From: way2muchnoise Date: Mon, 14 Nov 2016 21:45:39 +0100 Subject: [PATCH] also use that tool code in the CraftingStep, fixes #619 --- .../apiimpl/autocrafting/task/CraftingStepCraft.java | 6 ++++++ .../apiimpl/autocrafting/task/CraftingTask.java | 1 + 2 files changed, 7 insertions(+) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepCraft.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepCraft.java index 59e9a5974..433dd9412 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepCraft.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepCraft.java @@ -105,6 +105,12 @@ public class CraftingStepCraft extends CraftingStep { for (int i = 0; i < toInsert.size(); i++) { ItemStack input = toInsert.get(i); if (input != null) { + // This will be a tool, like a hammer + if (input.isItemStackDamageable()) { + compare &= ~IComparer.COMPARE_DAMAGE; + } else { + compare |= IComparer.COMPARE_DAMAGE; + } ItemStack actualInput = actualInputs.get(input, compare); ItemStack taken = ItemHandlerHelper.copyStackWithSize(actualInput, input.stackSize); took[i] = taken; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java index dc1305c34..fdc15bbbf 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java @@ -219,6 +219,7 @@ public class CraftingTask implements ICraftingTask { for (int i = 0; i < usedStacks.size(); i++) { ItemStack input = usedStacks.get(i); if (input != null) { + // This will be a tool, like a hammer if (input.isItemStackDamageable()) { compare &= ~IComparer.COMPARE_DAMAGE; } else {