Revert "Anoter go at fixing #389, Part 2"

This reverts commit c126234f2c.

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

@@ -78,16 +78,6 @@ public abstract class CraftingTask implements ICraftingTask {
         this.satisfied = satisfied;
     }
 
-    protected boolean hasReceivedInputs() {
-        for (boolean item : satisfied) {
-            if (!item) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
     public boolean[] getChecked() {
         return checked;
     }
@@ -108,11 +98,6 @@ public abstract class CraftingTask implements ICraftingTask {
         }
     }
 
-    @Override
-    public boolean isFinished() {
-        return hasReceivedInputs();
-    }
-
     @Override
     @Nullable
     public ICraftingTask getChild() {

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

@@ -32,12 +32,7 @@ public interface ICraftingTask {
      * @param network the network
      * @return true if the crafting task is done, false otherwise
      */
-    void update(World world, INetworkMaster network);
+    boolean update(World world, INetworkMaster network);
-
-    /**
-     * @return whether this crafting task is finished
-     */
-    boolean isFinished();
 
     /**
      * Gets called when the crafting task is cancelled.

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

@@ -13,7 +13,7 @@ public class CraftingTaskNormal extends CraftingTask {
     }
 
     @Override
-    public void update(World world, INetworkMaster network) {
+    public boolean update(World world, INetworkMaster network) {
         for (int i = 0; i < pattern.getInputs().size(); ++i) {
             checked[i] = true;
 
@@ -34,8 +34,10 @@ public class CraftingTaskNormal extends CraftingTask {
             }
         }
 
-        if (!hasReceivedInputs()) {
+        for (boolean item : satisfied) {
-            return;
+            if (!item) {
+                return false;
+            }
         }
 
         for (ItemStack output : pattern.getOutputs()) {
@@ -47,6 +49,8 @@ public class CraftingTaskNormal extends CraftingTask {
             // @TODO: Handle remainder
             network.insertItem(byproduct, byproduct.stackSize, false);
         }
+
+        return true;
     }
 
     @Override

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

@@ -35,7 +35,7 @@ public class CraftingTaskProcessing extends CraftingTask {
     }
 
     @Override
-    public void update(World world, INetworkMaster network) {
+    public boolean update(World world, INetworkMaster network) {
         for (int i = 0; i < pattern.getInputs().size(); ++i) {
             checked[i] = true;
 
@@ -56,8 +56,8 @@ public class CraftingTaskProcessing extends CraftingTask {
             }
         }
 
-        if (!hasReceivedInputs()) {
+        if (!hasTakenInputs()) {
-            return;
+            return false;
         }
 
         ICraftingPatternContainer container = pattern.getContainer();
@@ -77,11 +77,8 @@ public class CraftingTaskProcessing extends CraftingTask {
         } else {
             tileInUse = null;
         }
-    }
 
-    @Override
+        return hasReceivedOutputs();
-    public boolean isFinished() {
-        return super.isFinished() && hasReceivedOutputs();
     }
 
     private boolean hasReceivedOutputs() {
@@ -94,6 +91,16 @@ 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)) {
@@ -125,7 +132,7 @@ public class CraftingTaskProcessing extends CraftingTask {
     }
 
     public boolean onInserted(ItemStack stack) {
-        if (!hasReceivedOutputs() && hasReceivedInputs()) {
+        if (!hasReceivedOutputs() && hasTakenInputs()) {
             for (int i = 0; i < pattern.getOutputs().size(); ++i) {
                 ItemStack output = pattern.getOutputs().get(i);
 
@@ -191,7 +198,7 @@ public class CraftingTaskProcessing extends CraftingTask {
             }
         }
 
-        if (hasReceivedInputs()) {
+        if (hasTakenInputs()) {
             builder.append("I=gui.refinedstorage:crafting_monitor.items_processing\n");
 
             for (int i = 0; i < pattern.getInputs().size(); ++i) {

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

@@ -275,12 +275,22 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
 
                 craftingTasksToAdd.clear();
 
-                updateCraftingTasks(CraftingTaskUpdateType.NORMAL);
+                Iterator<ICraftingTask> craftingTaskIterator = craftingTasks.iterator();
+
+                while (craftingTaskIterator.hasNext()) {
+                    ICraftingTask task = craftingTaskIterator.next();
+
+                    if (updateCraftingTask(task)) {
+                        craftingTaskIterator.remove();
+
+                        craftingTasksChanged = true;
+                    }
+                }
 
                 if (!craftingTasks.isEmpty() || craftingTasksChanged) {
                     markDirty();
 
-                    updateCraftingMonitors();
+                    updateCraftingTasks();
                 }
             }
 
@@ -314,26 +324,9 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
         super.update();
     }
 
-    enum CraftingTaskUpdateType {
+    private boolean updateCraftingTask(ICraftingTask task) {
-        NORMAL,
-        DELETION
-    }
-
-    private void updateCraftingTasks(CraftingTaskUpdateType type) {
-        Iterator<ICraftingTask> craftingTaskIterator = craftingTasks.iterator();
-
-        while (craftingTaskIterator.hasNext()) {
-            ICraftingTask task = craftingTaskIterator.next();
-
-            if (updateCraftingTask(task, type)) {
-                craftingTaskIterator.remove();
-            }
-        }
-    }
-
-    private boolean updateCraftingTask(ICraftingTask task, CraftingTaskUpdateType type) {
         if (task.getChild() != null) {
-            if (updateCraftingTask(task.getChild(), type)) {
+            if (updateCraftingTask(task.getChild())) {
                 task.setChild(null);
             }
 
@@ -342,18 +335,10 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
 
         ICraftingPatternContainer container = task.getPattern().getContainer();
 
-        if (container != null && (ticks % container.getSpeed() == 0 || type == CraftingTaskUpdateType.DELETION)) {
+        return container != null && ticks % container.getSpeed() == 0 && task.update(worldObj, this);
-            if (type == CraftingTaskUpdateType.NORMAL) {
-                task.update(worldObj, this);
     }
 
-            return task.isFinished();
+    public void updateCraftingTasks() {
-        }
-
-        return false;
-    }
-
-    private void updateCraftingMonitors() {
         for (INetworkNode node : nodeGraph.all()) {
             if (node instanceof TileCraftingMonitor) {
                 ((TileCraftingMonitor) node).dataManager.sendParameterToWatchers(TileCraftingMonitor.TASKS);
@@ -566,17 +551,13 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
             itemStorage.add(ItemHandlerHelper.copyStackWithSize(stack, inserted), false);
 
             for (int i = 0; i < inserted; ++i) {
-                for (int j = 0; j < craftingTasks.size(); ++j) {
+                for (ICraftingTask task : craftingTasks) {
-                    ICraftingTask task = craftingTasks.get(j);
-
                     if (inserted == 0) {
                         break;
                     }
 
                     if (onInserted(stack, task)) {
                         inserted--;
-
-                        updateCraftingTasks(CraftingTaskUpdateType.DELETION);
                     }
                 }
             }