From e1e568363736891096f771aad5a9a02730db399b Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Sun, 10 Apr 2016 20:45:24 +0200
Subject: [PATCH] GUI improvements

---
 .../gui/GuiCraftingSettings.java              |  28 ++++++++++++++++--
 .../java/refinedstorage/item/ItemPattern.java |   2 +-
 .../assets/refinedstorage/lang/en_US.lang     |   1 +
 .../assets/refinedstorage/lang/nl_NL.lang     |   1 +
 .../textures/gui/crafting_monitor.png         | Bin 0 -> 1835 bytes
 5 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100755 src/main/resources/assets/refinedstorage/textures/gui/crafting_monitor.png

diff --git a/src/main/java/refinedstorage/gui/GuiCraftingSettings.java b/src/main/java/refinedstorage/gui/GuiCraftingSettings.java
index 52aef83af..627f78a15 100755
--- a/src/main/java/refinedstorage/gui/GuiCraftingSettings.java
+++ b/src/main/java/refinedstorage/gui/GuiCraftingSettings.java
@@ -1,15 +1,28 @@
 package refinedstorage.gui;
 
+import net.minecraft.client.gui.GuiTextField;
 import refinedstorage.container.ContainerDummy;
 
+import java.io.IOException;
+
 public class GuiCraftingSettings extends GuiBase {
+    private GuiTextField amountField;
+
     public GuiCraftingSettings() {
         super(new ContainerDummy(), 143, 61);
     }
 
     @Override
     public void init(int x, int y) {
-        addButton(x + 56, y + 38, 50, 50, "Craft");
+        addButton(x + 48, y + 35, 50, 20, t("misc.refinedstorage:start"));
+
+        amountField = new GuiTextField(0, fontRendererObj, x + 39 + 1, y + 21 + 1, 69 - 6, fontRendererObj.FONT_HEIGHT);
+        amountField.setEnableBackgroundDrawing(false);
+        amountField.setVisible(true);
+        amountField.setText("1");
+        amountField.setTextColor(16777215);
+        amountField.setCanLoseFocus(false);
+        amountField.setFocused(true);
     }
 
     @Override
@@ -21,10 +34,21 @@ public class GuiCraftingSettings extends GuiBase {
         bindTexture("gui/crafting_settings.png");
 
         drawTexture(x, y, 0, 0, width, height);
+
+        amountField.drawTextBox();
     }
 
     @Override
     public void drawForeground(int mouseX, int mouseY) {
-        drawString(55, 7, "Crafting");
+        drawString(53, 7, t("container.crafting"));
+    }
+
+    @Override
+    protected void keyTyped(char character, int keyCode) throws IOException {
+        if (!checkHotbarKeys(keyCode) && amountField.textboxKeyTyped(character, keyCode)) {
+            // NO OP
+        } else {
+            super.keyTyped(character, keyCode);
+        }
     }
 }
diff --git a/src/main/java/refinedstorage/item/ItemPattern.java b/src/main/java/refinedstorage/item/ItemPattern.java
index a68d19e9b..6dc5bfbf6 100755
--- a/src/main/java/refinedstorage/item/ItemPattern.java
+++ b/src/main/java/refinedstorage/item/ItemPattern.java
@@ -15,7 +15,7 @@ public class ItemPattern extends ItemBase {
 
     @Override
     public void addInformation(ItemStack pattern, EntityPlayer player, List list, boolean b) {
-        if (getResult(pattern) != null) {
+        if (hasResult(pattern)) {
             list.add(getResult(pattern).getDisplayName());
         }
     }
diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang
index 243c193c6..0c6a45469 100755
--- a/src/main/resources/assets/refinedstorage/lang/en_US.lang
+++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang
@@ -40,6 +40,7 @@ misc.refinedstorage:wireless_grid.not_found=Controller not found.
 
 misc.refinedstorage:yes=Yes
 misc.refinedstorage:no=No
+misc.refinedstorage:start=Start
 misc.refinedstorage:clear=Clear
 misc.refinedstorage:priority=Priority
 
diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang
index 5935ffe4f..1f4d6c711 100755
--- a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang
+++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang
@@ -40,6 +40,7 @@ misc.refinedstorage:wireless_grid.not_found=Controller werd niet gevonden.
 
 misc.refinedstorage:yes=Ja
 misc.refinedstorage:no=Nee
+misc.refinedstorage:start=Start
 misc.refinedstorage:clear=Legen
 misc.refinedstorage:priority=Prioriteit
 
diff --git a/src/main/resources/assets/refinedstorage/textures/gui/crafting_monitor.png b/src/main/resources/assets/refinedstorage/textures/gui/crafting_monitor.png
new file mode 100755
index 0000000000000000000000000000000000000000..b293e451bf2d85af5625bc1c7615d0eb60dbfbf5
GIT binary patch
literal 1835
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd
zfKP}kP~6<yJTx@4v9YncyZhL&W4CYL{{R0!P<#}OhQP27f#Yol|AI0~NswPKFxih}
zz!3bMT@@JNoCO|{#S9F5yFi#xbidgppdfpRr>`sfJr)Te4I{p%ZPh>_i4xa{lHmNb
zlJdl&REC1Y%)Ao4ywnl}6Fmbx%N*l6KL!S-I!_nJkczmscP?h#b`Wt5JX-kb|NkV@
zP5x_|;(JWZzZP6yR*)b!<>Vnn1+QtPvClGP?{CtZUa2Jzk@oAKe*9zBbqw*FORRXs
zZ!moN!pX$I;PB2?2b3sJTvq1*QaitI0Fni)KPon#<DY)ZPmA$i&r9R#Ew`7R`@dx_
zP)gyuoEVUTfQFifiy2SI@j`efzSlun3=^vPxexFkcwYVWH^W5xS@Ml<F2Z!YzYf(5
zwF}C7!Y$A1@GS$#`w`pl`R)3td;R;TuVS5{3>0~C?=aA%3=KB5O+X4{Hjo0lKY)G0
z{>bg+=idE&J~^vlPt~6C%I(4+Ng#mv48(3Y{$Ke^p88RS%J-YXf8?p}{(i;N)WI(E
zJD2^L^&oG7LDBm}P$>@vSN5KiEDhqB@LjLE^?li<YX7+*%ugnlt^aWN&n-@<8sxBW
zxI24JAkczh7NBi+sw3<fD!=av|50ZSv8wL&9qm7@-*9NXeFv)5A-^G*^S~zC@>$22
zYyO|!oSw0g;f5XS=91lCPH@RthBIu+WuA~L-H>yeA>}rk!fi8#o7)&qY~yv<mP>P~
bEv0|CS6|89b2~;p9~1zdu6{1-oD!M<pd=+%

literal 0
HcmV?d00001