Fixes #94 "multiple recipies"

CHANGELOG.md

@@ -11,6 +11,7 @@
 **Features**
 - Added an API
 - Added Storage Drawers integration
+- Added handling for patterns that return the same item
 - Increased cable recipe to 12 cables
 
 ### 0.7.8

src/main/java/refinedstorage/autocrafting/CraftingTaskScheduler.java

@@ -15,7 +15,7 @@ public class CraftingTaskScheduler {
     }
 
     public void schedule(TileController controller, int compare, ItemStack item) {
-        CraftingPattern pattern = controller.getPattern(item, compare);
+        CraftingPattern pattern = controller.getPatternWithBestScore(item, compare);
 
         if (pattern != null) {
             scheduledItem = item;

src/main/java/refinedstorage/autocrafting/task/BasicCraftingTask.java

@@ -71,7 +71,7 @@ public class BasicCraftingTask implements ICraftingTask {
 
                     satisfied[i] = true;
                 } else if (!childTasks[i]) {
-                    CraftingPattern pattern = controller.getPattern(input);
+                    CraftingPattern pattern = controller.getPatternWithBestScore(input);
 
                     if (pattern != null) {
                         controller.addCraftingTask(controller.createCraftingTask(pattern));

src/main/java/refinedstorage/autocrafting/task/ProcessingCraftingTask.java

@@ -64,7 +64,7 @@ public class ProcessingCraftingTask implements ICraftingTask {
                             controller.push(took, took.stackSize, false);
                         }
                     } else if (!childTasks[i]) {
-                        CraftingPattern pattern = controller.getPattern(input);
+                        CraftingPattern pattern = controller.getPatternWithBestScore(input);
 
                         if (pattern != null) {
                             childTasks[i] = true;

src/main/java/refinedstorage/tile/controller/StorageHandler.java

@@ -105,7 +105,7 @@ public class StorageHandler {
 
             int quantityPerRequest = 0;
 
-            CraftingPattern pattern = controller.getPattern(requested);
+            CraftingPattern pattern = controller.getPatternWithBestScore(requested);
 
             if (pattern != null) {
                 for (ItemStack output : pattern.getOutputs()) {

src/main/java/refinedstorage/tile/controller/TileController.java

@@ -229,20 +229,55 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
         return patterns;
     }
 
-    public CraftingPattern getPattern(ItemStack pattern) {
+    public List<CraftingPattern> getPattern(ItemStack pattern) {
         return getPattern(pattern, CompareFlags.COMPARE_DAMAGE | CompareFlags.COMPARE_NBT);
     }
 
-    public CraftingPattern getPattern(ItemStack pattern, int flags) {
+    public List<CraftingPattern> getPattern(ItemStack pattern, int flags) {
+        List<CraftingPattern> patterns = new ArrayList<CraftingPattern>();
+
         for (CraftingPattern craftingPattern : getPatterns()) {
             for (ItemStack output : craftingPattern.getOutputs()) {
                 if (RefinedStorageUtils.compareStack(output, pattern, flags)) {
-                    return craftingPattern;
+                    patterns.add(craftingPattern);
                 }
             }
         }
 
-        return null;
+        return patterns;
+    }
+
+    public CraftingPattern getPatternWithBestScore(ItemStack pattern) {
+        return getPatternWithBestScore(pattern, CompareFlags.COMPARE_DAMAGE | CompareFlags.COMPARE_NBT);
+    }
+
+    public CraftingPattern getPatternWithBestScore(ItemStack pattern, int flags) {
+        List<CraftingPattern> patterns = getPattern(pattern, flags);
+
+        if (patterns.isEmpty()) {
+            return null;
+        } else if (patterns.size() == 1) {
+            return patterns.get(0);
+        }
+
+        int[] scores = new int[patterns.size()];
+        int highestScore = 0;
+        int highestPattern = 0;
+
+        for (int i = 0; i < patterns.size(); ++i) {
+            for (ItemStack input : patterns.get(i).getInputs()) {
+                ItemStack stored = getItem(input, CompareFlags.COMPARE_DAMAGE | CompareFlags.COMPARE_NBT);
+
+                scores[i] += stored != null ? stored.stackSize : 0;
+            }
+
+            if (scores[i] > highestScore) {
+                highestScore = scores[i];
+                highestPattern = i;
+            }
+        }
+
+        return patterns.get(highestPattern);
     }
 
     private void syncMachines() {