From ace6a56ffe0c79dbae53ae868657d0a685e82580 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Sun, 8 May 2016 16:24:42 +0200
Subject: [PATCH] Fix all bugs, crafting task saving to disk done.

---
 CHANGELOG.md                                               | 3 +--
 src/main/java/refinedstorage/gui/GuiCrafter.java           | 4 ++--
 src/main/java/refinedstorage/tile/TileController.java      | 4 ++--
 .../refinedstorage/tile/autocrafting/CraftingPattern.java  | 1 +
 .../tile/autocrafting/task/BasicCraftingTask.java          | 7 +++++++
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06c3b2926..243d2980d 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,7 @@
 WIP
 
 **TODO**
-- Saving crafting task state
-- Cancelling all crafting tasks
+- Crafter direction
 - Textures
 - Update wiki
 
diff --git a/src/main/java/refinedstorage/gui/GuiCrafter.java b/src/main/java/refinedstorage/gui/GuiCrafter.java
index 898c1efb5..2dd14f9ef 100755
--- a/src/main/java/refinedstorage/gui/GuiCrafter.java
+++ b/src/main/java/refinedstorage/gui/GuiCrafter.java
@@ -52,7 +52,7 @@ public class GuiCrafter extends GuiBase {
             if (crafter.getStackInSlot(i) != null) {
                 ItemStack pattern = crafter.getStackInSlot(i);
 
-                String text = "Processing";
+                String text = t("misc.refinedstorage:processing");
 
                 if (!ItemPattern.isProcessing(pattern)) {
                     ItemStack result = ItemPattern.getOutputs(pattern)[0];
@@ -66,7 +66,7 @@ public class GuiCrafter extends GuiBase {
 
                 float scale = 0.5f;
                 GlStateManager.scale(scale, scale, 1);
-                drawString(calculateOffsetOnScale(x + (ItemPattern.isProcessing(pattern) ? 0 : 20), scale), calculateOffsetOnScale(y + 6, scale), text);
+                drawString(calculateOffsetOnScale(x + (ItemPattern.isProcessing(pattern) ? 5 : 20), scale), calculateOffsetOnScale(y + 6, scale), text);
 
                 GlStateManager.popMatrix();
             }
diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java
index d3d987251..abd21dd4b 100755
--- a/src/main/java/refinedstorage/tile/TileController.java
+++ b/src/main/java/refinedstorage/tile/TileController.java
@@ -520,10 +520,10 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
                 NBTTagCompound taskTag = taskList.getCompoundTagAt(i);
 
                 switch (taskTag.getInteger("Type")) {
-                    case 0:
+                    case BasicCraftingTask.ID:
                         addCraftingTask(new BasicCraftingTask(taskTag));
                         break;
-                    case 1:
+                    case ProcessingCraftingTask.ID:
                         addCraftingTask(new ProcessingCraftingTask(taskTag));
                         break;
                 }
diff --git a/src/main/java/refinedstorage/tile/autocrafting/CraftingPattern.java b/src/main/java/refinedstorage/tile/autocrafting/CraftingPattern.java
index 2cf09b4f1..dea6a54d1 100755
--- a/src/main/java/refinedstorage/tile/autocrafting/CraftingPattern.java
+++ b/src/main/java/refinedstorage/tile/autocrafting/CraftingPattern.java
@@ -36,6 +36,7 @@ public class CraftingPattern {
         if (crafter == null) {
             crafter = (TileCrafter) world.getTileEntity(new BlockPos(crafterX, crafterY, crafterZ));
         }
+
         return crafter;
     }
 
diff --git a/src/main/java/refinedstorage/tile/autocrafting/task/BasicCraftingTask.java b/src/main/java/refinedstorage/tile/autocrafting/task/BasicCraftingTask.java
index 3dac3f1e6..ef2234fe8 100755
--- a/src/main/java/refinedstorage/tile/autocrafting/task/BasicCraftingTask.java
+++ b/src/main/java/refinedstorage/tile/autocrafting/task/BasicCraftingTask.java
@@ -4,6 +4,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.text.TextFormatting;
+import net.minecraftforge.common.util.Constants;
 import refinedstorage.tile.TileController;
 import refinedstorage.tile.autocrafting.CraftingPattern;
 import refinedstorage.util.NBTUtils;
@@ -37,6 +38,12 @@ public class BasicCraftingTask implements ICraftingTask {
         this.satisfied = NBTUtils.readBoolArray(tag, NBT_SATISFIED);
         this.checked = NBTUtils.readBoolArray(tag, NBT_CHECKED);
         this.childTasks = NBTUtils.readBoolArray(tag, NBT_CHILD_TASKS);
+
+        NBTTagList tookList = tag.getTagList(NBT_TOOK, Constants.NBT.TAG_COMPOUND);
+
+        for (int i = 0; i < tookList.tagCount(); ++i) {
+            itemsTook.add(ItemStack.loadItemStackFromNBT(tookList.getCompoundTagAt(i)));
+        }
     }
 
     public CraftingPattern getPattern() {