From 60bf5fc3367d211c0237ce2e19c01d3d3ccff92b Mon Sep 17 00:00:00 2001
From: way2muchnoise <jens.baetens@live.be>
Date: Wed, 2 Nov 2016 21:04:25 +0100
Subject: [PATCH] clean up ore dict improvements

---
 .../apiimpl/autocrafting/CraftingPattern.java              | 6 ++----
 .../apiimpl/autocrafting/task/CraftingStepCraft.java       | 7 +++++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java
index e7043c1af..0ee93d792 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java
@@ -56,8 +56,7 @@ public class CraftingPattern implements ICraftingPattern {
                         Object[] inputs = new Object[0];
                         if (shapedOre) {
                             inputs = ((ShapedOreRecipe) recipe).getInput();
-                        }
-                        else {
+                        } else {
                             try {
                                 inputs = (Object[]) recipe.getClass().getMethod("getInput").invoke(recipe);
                             } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
@@ -67,8 +66,7 @@ public class CraftingPattern implements ICraftingPattern {
                         for (Object input : inputs) {
                             if (input == null) {
                                 oreInputs.add(Collections.emptyList());
-                            }
-                            if (input instanceof ItemStack) {
+                            } else if (input instanceof ItemStack) {
                                 oreInputs.add(Collections.singletonList((ItemStack) input));
                             } else {
                                 oreInputs.add((List<ItemStack>)input);
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 ff6d557c2..2691a6e47 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
@@ -76,6 +76,13 @@ public class CraftingStepCraft extends CraftingStep {
         IItemStackList actualInputs = API.instance().createItemStackList();
         int compare = CraftingTask.DEFAULT_COMPARE | (getPattern().isOredict() ? IComparer.COMPARE_OREDICT : 0);
         for (ItemStack insertStack : getToInsert()) {
+            // This will be a tool, like a hammer
+            if (insertStack.isItemStackDamageable()) {
+                compare &= ~IComparer.COMPARE_DAMAGE;
+            } else {
+                compare |= IComparer.COMPARE_DAMAGE;
+            }
+
             FluidStack fluidInItem = RSUtils.getFluidFromStack(insertStack, true);
             if (fluidInItem != null) {
                 network.extractFluid(fluidInItem, fluidInItem.amount, compare);