From e85f0e7a7dee1c84c1d9b2c89f8a3c8a3e690524 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Wed, 14 Sep 2016 19:30:45 +0200
Subject: [PATCH] +64 in crafting start GUI now gives 64 from the first time
 instead of 65, fixes #334

---
 CHANGELOG.md                                                | 1 +
 .../{GuiCraftingSettings.java => GuiCraftingStart.java}     | 6 +++---
 src/main/java/refinedstorage/gui/grid/GuiGrid.java          | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename src/main/java/refinedstorage/gui/grid/{GuiCraftingSettings.java => GuiCraftingStart.java} (94%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c1f6a97e..caf8889b3 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### 1.0.2
 - Fixed processing patterns not handling item insertion sometimes (raoulvdberge)
 - Removed crafting task limit in crafting start GUI (raoulvdberge)
+- +64 in crafting start GUI now gives 64 from the first time instead of 65 (raoulvdberge)
 
 ### 1.0.1
 - Fixed advanced tooltips showing in Grid when not configured to do so (raoulvdberge)
diff --git a/src/main/java/refinedstorage/gui/grid/GuiCraftingSettings.java b/src/main/java/refinedstorage/gui/grid/GuiCraftingStart.java
similarity index 94%
rename from src/main/java/refinedstorage/gui/grid/GuiCraftingSettings.java
rename to src/main/java/refinedstorage/gui/grid/GuiCraftingStart.java
index 795021663..5b15f5d7f 100755
--- a/src/main/java/refinedstorage/gui/grid/GuiCraftingSettings.java
+++ b/src/main/java/refinedstorage/gui/grid/GuiCraftingStart.java
@@ -14,7 +14,7 @@ import refinedstorage.network.MessageGridCraftingStart;
 
 import java.io.IOException;
 
-public class GuiCraftingSettings extends GuiBase {
+public class GuiCraftingStart extends GuiBase {
     private static final int DEFAULT_AMOUNT = 1;
 
     private GuiTextField amountField;
@@ -24,7 +24,7 @@ public class GuiCraftingSettings extends GuiBase {
     private GuiButton cancelButton;
     private GuiButton[] incrementButtons = new GuiButton[6];
 
-    public GuiCraftingSettings(GuiGrid gui, EntityPlayer player, ClientStackItem stack) {
+    public GuiCraftingStart(GuiGrid gui, EntityPlayer player, ClientStackItem stack) {
         super(new ContainerCraftingSettings(player, stack.getStack()), 172, 99);
 
         this.gui = gui;
@@ -110,7 +110,7 @@ public class GuiCraftingSettings extends GuiBase {
 
                     int newAmount = Integer.parseInt(incrementButton.displayString);
 
-                    newAmount = Math.max(DEFAULT_AMOUNT, oldAmount + newAmount);
+                    newAmount = Math.max(DEFAULT_AMOUNT, ((oldAmount == 1 && newAmount != 1) ? 0 : oldAmount) + newAmount);
 
                     amountField.setText(String.valueOf(newAmount));
 
diff --git a/src/main/java/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/refinedstorage/gui/grid/GuiGrid.java
index 0a591a9ec..6964e6ae4 100755
--- a/src/main/java/refinedstorage/gui/grid/GuiGrid.java
+++ b/src/main/java/refinedstorage/gui/grid/GuiGrid.java
@@ -373,7 +373,7 @@ public class GuiGrid extends GuiBase {
                     ClientStackItem stack = (ClientStackItem) STACKS.get(slotNumber);
 
                     if (stack.isCraftable() && (stack.getQuantity() == 0 || (GuiScreen.isShiftKeyDown() && GuiScreen.isCtrlKeyDown()))) {
-                        FMLCommonHandler.instance().showGuiScreen(new GuiCraftingSettings(this, container.getPlayer(), stack));
+                        FMLCommonHandler.instance().showGuiScreen(new GuiCraftingStart(this, container.getPlayer(), stack));
                     } else {
                         int flags = 0;