From 261f63c7962a3ce156b1f773ab2e01c94a744438 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Sun, 27 Nov 2016 13:03:48 +0100
Subject: [PATCH] Change naming

---
 .../raoulvdberge/refinedstorage/RSUtils.java  |  4 ++--
 .../refinedstorage/gui/grid/GuiGrid.java      |  2 +-
 .../gui/grid/stack/ClientStackItem.java       | 19 ++++++++++---------
 .../network/MessageGridItemDelta.java         | 11 ++++++++---
 .../network/MessageGridItemUpdate.java        |  2 +-
 5 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java
index 1db95742d..19cecb5c1 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java
@@ -59,14 +59,14 @@ public final class RSUtils {
         QUANTITY_FORMATTER.setRoundingMode(RoundingMode.DOWN);
     }
 
-    public static void writeItemStack(ByteBuf buf, INetworkMaster network, ItemStack stack, boolean outputFromPattern) {
+    public static void writeItemStack(ByteBuf buf, INetworkMaster network, ItemStack stack, boolean displayCraftText) {
         buf.writeInt(Item.getIdFromItem(stack.getItem()));
         buf.writeInt(stack.getCount());
         buf.writeInt(stack.getItemDamage());
         ByteBufUtils.writeTag(buf, stack.getItem().getNBTShareTag(stack));
         buf.writeInt(API.instance().getItemStackHashCode(stack));
         buf.writeBoolean(network.hasPattern(stack));
-        buf.writeBoolean(outputFromPattern);
+        buf.writeBoolean(displayCraftText);
     }
 
     public static void writeFluidStack(ByteBuf buf, FluidStack stack) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
index f73386363..c7e00ca62 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
@@ -369,7 +369,7 @@ public class GuiGrid extends GuiBase {
                 if (grid.getType() != EnumGridType.FLUID && (held.isEmpty() || (!held.isEmpty() && clickedButton == 2))) {
                     ClientStackItem stack = (ClientStackItem) STACKS.get(slotNumber);
 
-                    if (stack.isCraftable() && (stack.isOutputFromPattern() || (GuiScreen.isShiftKeyDown() && GuiScreen.isCtrlKeyDown()))) {
+                    if (stack.isCraftable() && (stack.doesDisplayCraftText() || (GuiScreen.isShiftKeyDown() && GuiScreen.isCtrlKeyDown()))) {
                         FMLCommonHandler.instance().showGuiScreen(new GuiCraftingStart(this, container.getPlayer(), stack));
                     } else {
                         int flags = 0;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/ClientStackItem.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/ClientStackItem.java
index 2e20a8c5e..5f9304c2f 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/ClientStackItem.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/ClientStackItem.java
@@ -17,14 +17,15 @@ public class ClientStackItem implements IClientStack {
     private int hash;
     private ItemStack stack;
     private boolean craftable;
-    private boolean outputFromPattern;
+    private boolean displayCraftText;
 
     public ClientStackItem(ByteBuf buf) {
         stack = new ItemStack(Item.getItemById(buf.readInt()), buf.readInt(), buf.readInt());
         stack.setTagCompound(ByteBufUtils.readTag(buf));
         hash = buf.readInt();
         craftable = buf.readBoolean();
-        setOutputFromPattern(buf.readBoolean());
+
+        setDisplayCraftText(buf.readBoolean());
     }
 
     public ItemStack getStack() {
@@ -35,15 +36,15 @@ public class ClientStackItem implements IClientStack {
         return craftable;
     }
 
-    public boolean isOutputFromPattern() {
-        return outputFromPattern;
+    public boolean doesDisplayCraftText() {
+        return displayCraftText;
     }
 
-    public void setOutputFromPattern(boolean outputFromPattern) {
-        this.outputFromPattern = outputFromPattern;
+    public void setDisplayCraftText(boolean displayCraftText) {
+        this.displayCraftText = displayCraftText;
 
-        if (outputFromPattern) {
-            stack.setCount(1);
+        if (displayCraftText) {
+            this.stack.setCount(1);
         }
     }
 
@@ -86,7 +87,7 @@ public class ClientStackItem implements IClientStack {
     private String getQuantityForDisplay(boolean advanced) {
         int qty = stack.getCount();
 
-        if (outputFromPattern) {
+        if (displayCraftText) {
             return I18n.format("gui.refinedstorage:grid.craft");
         } else if (advanced && qty > 1) {
             return String.valueOf(qty);
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemDelta.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemDelta.java
index 106cd07d7..04375060b 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemDelta.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemDelta.java
@@ -47,13 +47,18 @@ public class MessageGridItemDelta implements IMessage, IMessageHandler<MessageGr
             if (stack.equals(message.clientStack)) {
                 if (stack.getStack().getCount() + message.delta == 0) {
                     if (message.clientStack.isCraftable()) {
-                        stack.setOutputFromPattern(true);
+                        stack.setDisplayCraftText(true);
                     } else {
                         GuiGrid.ITEMS.remove(item, stack);
                     }
                 } else {
-                    stack.getStack().grow(message.delta - (stack.isOutputFromPattern() ? 1 : 0));
-                    stack.setOutputFromPattern(false);
+                    if (stack.doesDisplayCraftText()) {
+                        stack.setDisplayCraftText(false);
+
+                        stack.getStack().setCount(message.delta);
+                    } else {
+                        stack.getStack().grow(message.delta);
+                    }
                 }
 
                 GuiGrid.markForSorting();
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemUpdate.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemUpdate.java
index 7c1bef469..1ce295999 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemUpdate.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemUpdate.java
@@ -65,7 +65,7 @@ public class MessageGridItemUpdate implements IMessage, IMessageHandler<MessageG
         for (ClientStackItem item : message.stacks) {
             boolean canAdd = true;
 
-            if (item.isOutputFromPattern()) {
+            if (item.doesDisplayCraftText()) {
                 // This is an output from a pattern being sent. Only add it if it hasn't been added before.
                 for (ClientStackItem otherItem : GuiGrid.ITEMS.get(item.getStack().getItem())) {
                     if (API.instance().getComparer().isEqualNoQuantity(item.getStack(), otherItem.getStack())) {