From 020e92c6a19b8f3f74ef42f7092c9c7b57f92d49 Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Sat, 9 Dec 2017 17:06:31 +0100
Subject: [PATCH] 1.5.27 - Fixed non-oredict patterns not consuming resources,
 fixes #1570

---
 CHANGELOG.md                                  |  3 ++
 build.gradle                                  |  2 +-
 .../com/raoulvdberge/refinedstorage/RS.java   |  2 +-
 .../apiimpl/autocrafting/CraftingPattern.java | 50 +++++++++----------
 src/main/resources/mcmod.info                 |  2 +-
 5 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffe33ab1a..dba463eef 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Refined Storage Changelog
 
+### 1.5.27
+- Fixed non-oredict patterns not consuming resources (raoulvdberge)
+
 ### 1.5.26
 - Added Funky Locomotion integration (raoulvdberge)
 - Minor fixes to autocrafting (raoulvdberge)
diff --git a/build.gradle b/build.gradle
index 0465d07a1..e772a5244 100755
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ apply plugin: 'maven'
 apply plugin: 'maven-publish'
 apply plugin: 'net.minecraftforge.gradle.forge'
 
-version = "1.5.26"
+version = "1.5.27"
 group = "refinedstorage"
 archivesBaseName = "refinedstorage"
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RS.java b/src/main/java/com/raoulvdberge/refinedstorage/RS.java
index 90a696456..626fdb428 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/RS.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/RS.java
@@ -23,7 +23,7 @@ public final class RS {
     }
 
     public static final String ID = "refinedstorage";
-    public static final String VERSION = "1.5.26";
+    public static final String VERSION = "1.5.27";
     public static final String DEPENDENCIES = "required-after:forge@[14.21.0.2363,);after:mcmultipart@[2.2.1,);after:storagedrawers@[1.12-5.2.2,);";
     public static final String GUI_FACTORY = "com.raoulvdberge.refinedstorage.gui.config.ModGuiFactory";
     public static final String UPDATE_JSON = "https://refinedstorage.raoulvdberge.com/update";
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 3cbd50971..770ce6f72 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java
@@ -96,33 +96,33 @@ public class CraftingPattern implements ICraftingPattern {
             }
         } else {
             outputs = ItemPattern.getOutputs(stack);
+        }
 
-            if (oreInputs.isEmpty()) {
-                for (ItemStack input : inputs) {
-                    if (input == null || input.isEmpty()) {
-                        oreInputs.add(Collections.emptyList());
+        if (oreInputs.isEmpty()) {
+            for (ItemStack input : inputs) {
+                if (input == null || input.isEmpty()) {
+                    oreInputs.add(Collections.emptyList());
+                } else {
+                    int[] ids = OreDictionary.getOreIDs(input);
+
+                    if (ids.length == 0) {
+                        oreInputs.add(Collections.singletonList(Comparer.stripTags(input)));
+                    } else if (isOredict()) {
+                        List<ItemStack> oredictInputs = Arrays.stream(ids)
+                            .mapToObj(OreDictionary::getOreName)
+                            .map(OreDictionary::getOres)
+                            .flatMap(List::stream)
+                            .map(ItemStack::copy)
+                            .map(Comparer::stripTags)
+                            .peek(s -> s.setCount(input.getCount()))
+                            .collect(Collectors.toList());
+
+                        // Add original stack as first, should prevent some issues
+                        oredictInputs.add(0, Comparer.stripTags(input.copy()));
+
+                        oreInputs.add(oredictInputs);
                     } else {
-                        int[] ids = OreDictionary.getOreIDs(input);
-
-                        if (ids.length == 0) {
-                            oreInputs.add(Collections.singletonList(Comparer.stripTags(input)));
-                        } else if (isOredict()) {
-                            List<ItemStack> oredictInputs = Arrays.stream(ids)
-                                .mapToObj(OreDictionary::getOreName)
-                                .map(OreDictionary::getOres)
-                                .flatMap(List::stream)
-                                .map(ItemStack::copy)
-                                .map(Comparer::stripTags)
-                                .peek(s -> s.setCount(input.getCount()))
-                                .collect(Collectors.toList());
-
-                            // Add original stack as first, should prevent some issues
-                            oredictInputs.add(0, Comparer.stripTags(input.copy()));
-
-                            oreInputs.add(oredictInputs);
-                        } else {
-                            oreInputs.add(Collections.singletonList(Comparer.stripTags(input)));
-                        }
+                        oreInputs.add(Collections.singletonList(Comparer.stripTags(input)));
                     }
                 }
             }
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index ef79c8af1..752b5f3fa 100755
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
       "modid": "refinedstorage",
       "name": "Refined Storage",
       "description": "An elegant solution to your hoarding problem",
-      "version": "1.5.26",
+      "version": "1.5.27",
       "mcversion": "1.12.2",
       "url": "https://refinedstorage.raoulvdberge.com",
       "updateUrl": "",