From abef0f10ad8e8cec9df6ab1bace88f9c3687e245 Mon Sep 17 00:00:00 2001
From: way2muchnoise <jens.baetens@live.be>
Date: Thu, 3 Nov 2016 22:21:39 +0100
Subject: [PATCH] more fixes to autocrafting and ore dict magic

---
 .../apiimpl/autocrafting/CraftingPattern.java      |  6 ++++++
 .../apiimpl/autocrafting/task/CraftingTask.java    | 14 +++++++-------
 2 files changed, 13 insertions(+), 7 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 d3b833794..35d644036 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java
@@ -80,6 +80,9 @@ public class CraftingPattern implements ICraftingPattern {
                                 if (mekanism && ((ItemStack) input).hasTagCompound()) {
                                     stripped.getTagCompound().removeTag("mekData");
                                 }
+                                if (stripped.getItemDamage() == OreDictionary.WILDCARD_VALUE) {
+                                    stripped.setItemDamage(0);
+                                }
                                 oreInputs.add(Collections.singletonList(stripped));
                             } else {
                                 List<ItemStack> cleaned = new LinkedList<>();
@@ -88,6 +91,9 @@ public class CraftingPattern implements ICraftingPattern {
                                     if (mekanism && stripped.hasTagCompound()){
                                         stripped.getTagCompound().removeTag("mekData");
                                     }
+                                    if (stripped.getItemDamage() == OreDictionary.WILDCARD_VALUE) {
+                                        stripped.setItemDamage(0);
+                                    }
                                     cleaned.add(stripped);
                                 }
                                 oreInputs.add(cleaned);
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 f295c1689..27a4771f9 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
@@ -189,8 +189,8 @@ public class CraftingTask implements ICraftingTask {
             steps.add(new CraftingStepCraft(network, pattern, usedStacks));
         }
 
+        ItemStack[] took = new ItemStack[9];
         if (missing.isEmpty()) {
-            ItemStack[] took = new ItemStack[9];
             if (!pattern.isProcessing()) {
                 for (int i = 0; i < usedStacks.size(); i++) {
                     ItemStack input = usedStacks.get(i);
@@ -202,14 +202,14 @@ public class CraftingTask implements ICraftingTask {
                     }
                 }
             }
+        }
 
-            for (ItemStack byproduct : (!pattern.isProcessing() && pattern.isOredict() && missing.isEmpty() ? pattern.getByproducts(took) : pattern.getByproducts())) {
-                toInsert.add(byproduct.copy());
-            }
+        for (ItemStack byproduct : (!pattern.isProcessing() && pattern.isOredict() && missing.isEmpty() ? pattern.getByproducts(took) : pattern.getByproducts())) {
+            toInsert.add(byproduct.copy());
+        }
 
-            for (ItemStack output : (!pattern.isProcessing() && pattern.isOredict() && missing.isEmpty() ? pattern.getOutputs(took) : pattern.getOutputs())) {
-                toInsert.add(output.copy());
-            }
+        for (ItemStack output : (!pattern.isProcessing() && pattern.isOredict() && missing.isEmpty() ? pattern.getOutputs(took) : pattern.getOutputs())) {
+            toInsert.add(output.copy());
         }
 
         usedPatterns.remove(pattern);