Update changelog, small fixes

CHANGELOG.md

@@ -1,9 +1,9 @@
 # Refined Storage Changelog
 
 ### 1.1.2
+- Added recipe transfer handler for Solderer (way2muchnoise)
 - It is now possible to start a crafting task even if the crafting preview says you can't (raoulvdberge)
-- Fixed crash when changing screens in autocrafting (raoulvdberge)
+- Fixed crash with JEI when changing screens in autocrafting (raoulvdberge)
-- Fixed autocrafting getting stuck with processing patterns (raoulvdberge)
 - Fixed Detector hitbox (raoulvdberge)
 
 ### 1.1.1

src/main/java/refinedstorage/api/autocrafting/task/CraftingTask.java

@@ -74,6 +74,16 @@ public abstract class CraftingTask implements ICraftingTask {
         return satisfied;
     }
 
+    protected boolean hasReceivedInputs() {
+        for (boolean item : satisfied) {
+            if (!item) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     public void setSatisfied(boolean[] satisfied) {
         this.satisfied = satisfied;
     }

src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTaskNormal.java

@@ -34,11 +34,9 @@ public class CraftingTaskNormal extends CraftingTask {
             }
         }
 
-        for (boolean item : satisfied) {
+        if (!hasReceivedInputs()) {
-            if (!item) {
             return false;
         }
-        }
 
         for (ItemStack output : pattern.getOutputs()) {
             // @TODO: Handle remainder

src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTaskProcessing.java

@@ -56,7 +56,7 @@ public class CraftingTaskProcessing extends CraftingTask {
             }
         }
 
-        if (!hasTakenInputs()) {
+        if (!hasReceivedInputs()) {
             return false;
         }
 
@@ -91,16 +91,6 @@ public class CraftingTaskProcessing extends CraftingTask {
         return true;
     }
 
-    private boolean hasTakenInputs() {
-        for (boolean item : satisfied) {
-            if (!item) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
     private boolean isTileInUse(INetworkMaster network) {
         for (ICraftingTask task : network.getCraftingTasks()) {
             if (isTileInUse(task)) {
@@ -132,7 +122,7 @@ public class CraftingTaskProcessing extends CraftingTask {
     }
 
     public boolean onInserted(ItemStack stack) {
-        if (!hasReceivedOutputs() && hasTakenInputs()) {
+        if (!hasReceivedOutputs() && hasReceivedInputs()) {
             for (int i = 0; i < pattern.getOutputs().size(); ++i) {
                 ItemStack output = pattern.getOutputs().get(i);
 
@@ -198,7 +188,7 @@ public class CraftingTaskProcessing extends CraftingTask {
             }
         }
 
-        if (hasTakenInputs()) {
+        if (hasReceivedInputs()) {
             builder.append("I=gui.refinedstorage:crafting_monitor.items_processing\n");
 
             for (int i = 0; i < pattern.getInputs().size(); ++i) {