From cd5a1af0b9f2fe624bc2cd37c890a89c9b3fd758 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Tue, 17 May 2016 13:02:22 +0200 Subject: [PATCH] Escaping out of the crafting gui goes back to the grid gui --- src/main/java/refinedstorage/gui/GuiCraftingSettings.java | 3 +++ .../tile/autocrafting/task/BasicCraftingTask.java | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/refinedstorage/gui/GuiCraftingSettings.java b/src/main/java/refinedstorage/gui/GuiCraftingSettings.java index b55d30468..3fb9dd258 100755 --- a/src/main/java/refinedstorage/gui/GuiCraftingSettings.java +++ b/src/main/java/refinedstorage/gui/GuiCraftingSettings.java @@ -14,6 +14,7 @@ public class GuiCraftingSettings extends GuiBase { private GuiGrid gridGui; private int id; private GuiButton startButton; + private boolean isClosed; public GuiCraftingSettings(GuiGrid gridGui, int id) { super(new ContainerDummy(), 143, 61); @@ -60,6 +61,8 @@ public class GuiCraftingSettings extends GuiBase { } else { if (keyCode == Keyboard.KEY_RETURN) { startRequest(); + } else if (keyCode == Keyboard.KEY_ESCAPE) { + FMLClientHandler.instance().showGuiScreen(gridGui); } else { super.keyTyped(character, keyCode); } diff --git a/src/main/java/refinedstorage/tile/autocrafting/task/BasicCraftingTask.java b/src/main/java/refinedstorage/tile/autocrafting/task/BasicCraftingTask.java index 5beaa947d..7723763df 100755 --- a/src/main/java/refinedstorage/tile/autocrafting/task/BasicCraftingTask.java +++ b/src/main/java/refinedstorage/tile/autocrafting/task/BasicCraftingTask.java @@ -68,6 +68,11 @@ public class BasicCraftingTask implements ICraftingTask { satisfied[i] = true; + // This is needed because if we request 2 chests for example + // it will schedule 2 child tasks for wood the child tasks will then give 8 wood + // but the first chest task will take all the 8 wood for completion + // and then you end up with the second task not having anything anymore + // and is stuck because the child task is already created. if (childTasks[i]) { break; }