From daf764149696b7a13c1019d29b3d1d1dd1db1e69 Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Sun, 3 Jun 2018 00:24:44 +0200
Subject: [PATCH] Crafting task cancelling.

---
 .../apiimpl/autocrafting/task/CraftingInserter.java    | 10 ++++++++++
 .../apiimpl/autocrafting/task/CraftingTask.java        |  2 +-
 .../refinedstorage/block/FluidStorageType.java         |  8 ++++----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingInserter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingInserter.java
index 2a2931dac..b53b3898e 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingInserter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingInserter.java
@@ -44,6 +44,16 @@ public class CraftingInserter {
         }
     }
 
+    public void insertAll() {
+        while (!items.isEmpty()) {
+            CraftingInserterItem item = items.pop();
+
+            network.insertItem(item.getStack(), item.getStack().getCount(), false);
+        }
+
+        network.getCraftingManager().onTaskChanged();
+    }
+
     public Collection<CraftingInserterItem> getItems() {
         return items;
     }
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 1d91bb5ad..e56cef4a9 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
@@ -192,8 +192,8 @@ public class CraftingTask implements ICraftingTask {
     }
 
     @Override
-    // TODO
     public void onCancelled() {
+        inserter.insertAll();
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/FluidStorageType.java b/src/main/java/com/raoulvdberge/refinedstorage/block/FluidStorageType.java
index a9e3746d8..f0da354c4 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/FluidStorageType.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/FluidStorageType.java
@@ -3,10 +3,10 @@ package com.raoulvdberge.refinedstorage.block;
 import net.minecraft.util.IStringSerializable;
 
 public enum FluidStorageType implements IStringSerializable {
-    TYPE_64K(0, 64000, "64k"),
-    TYPE_128K(1, 128000, "128k"),
-    TYPE_256K(2, 256000, "256k"),
-    TYPE_512K(3, 512000, "512k"),
+    TYPE_64K(0, 64_000, "64k"),
+    TYPE_128K(1, 128_000, "128k"),
+    TYPE_256K(2, 256_000, "256k"),
+    TYPE_512K(3, 512_000, "512k"),
     TYPE_CREATIVE(4, -1, "creative");
 
     private int id;