From e228e719a2c3a0f51c119d2aec50ce6d250effa8 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Fri, 6 May 2016 15:50:28 +0200
Subject: [PATCH] Cancel button in crafting monitor

---
 .../container/ContainerCraftingMonitor.java   |   2 +-
 .../gui/GuiCraftingMonitor.java               |  15 +++++++++++----
 .../textures/gui/crafting_monitor.png         | Bin 1858 -> 1859 bytes
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/refinedstorage/container/ContainerCraftingMonitor.java b/src/main/java/refinedstorage/container/ContainerCraftingMonitor.java
index c9864b0c9..b39a7f9e5 100755
--- a/src/main/java/refinedstorage/container/ContainerCraftingMonitor.java
+++ b/src/main/java/refinedstorage/container/ContainerCraftingMonitor.java
@@ -6,6 +6,6 @@ public class ContainerCraftingMonitor extends ContainerBase {
     public ContainerCraftingMonitor(EntityPlayer player) {
         super(player);
 
-        addPlayerInventory(8, 129);
+        addPlayerInventory(8, 148);
     }
 }
diff --git a/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java b/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java
index b38e3dd60..81b185ccf 100755
--- a/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java
+++ b/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java
@@ -1,5 +1,6 @@
 package refinedstorage.gui;
 
+import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.item.ItemStack;
@@ -19,6 +20,8 @@ public class GuiCraftingMonitor extends GuiBase {
 
     private TileCraftingMonitor craftingMonitor;
 
+    private GuiButton cancelButton;
+
     private int itemSelected = -1;
     private int itemSelectedX;
     private int itemSelectedY;
@@ -26,7 +29,7 @@ public class GuiCraftingMonitor extends GuiBase {
     private Scrollbar scrollbar = new Scrollbar(157, 20, 12, 89);
 
     public GuiCraftingMonitor(ContainerCraftingMonitor container, TileCraftingMonitor craftingMonitor) {
-        super(container, 176, 211);
+        super(container, 176, 230);
 
         this.craftingMonitor = craftingMonitor;
     }
@@ -34,6 +37,8 @@ public class GuiCraftingMonitor extends GuiBase {
     @Override
     public void init(int x, int y) {
         addSideButton(new SideButtonRedstoneMode(craftingMonitor));
+
+        cancelButton = addButton(x + 7, y + 113, 50, 20, "Cancel");
     }
 
     @Override
@@ -44,6 +49,8 @@ public class GuiCraftingMonitor extends GuiBase {
         if (itemSelected >= craftingMonitor.getTasks().size()) {
             itemSelected = -1;
         }
+
+        cancelButton.enabled = itemSelected != -1;
     }
 
     @Override
@@ -69,7 +76,7 @@ public class GuiCraftingMonitor extends GuiBase {
         scrollbar.update(this, mouseX, mouseY);
 
         drawString(7, 7, t("gui.refinedstorage:crafting_monitor"));
-        drawString(7, 116, t("container.inventory"));
+        drawString(7, 137, t("container.inventory"));
 
         int ox = 11;
         int x = ox;
@@ -141,9 +148,9 @@ public class GuiCraftingMonitor extends GuiBase {
     protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException {
         super.mouseClicked(mouseX, mouseY, mouseButton);
 
-        itemSelected = -1;
+        if (mouseButton == 0 && inBounds(8, 20, 144, 90, mouseX - guiLeft, mouseY - guiTop)) {
+            itemSelected = -1;
 
-        if (mouseButton == 0) {
             int i = 0;
 
             for (int y = 0; y < 3; ++y) {
diff --git a/src/main/resources/assets/refinedstorage/textures/gui/crafting_monitor.png b/src/main/resources/assets/refinedstorage/textures/gui/crafting_monitor.png
index 3d16ae45b837700e468867a578b9efeb0abb738b..6311ffae4df94c3e55585dbafa62415ae928b4ea 100755
GIT binary patch
delta 643
zcmX@acbIQO2n*MC1_r+Ej57Vvj+5h9tQe<Fp2?zA-^~1Lp~v|ct~hu7(?ycYQ{R@)
z-?lezd%WKL$6Gj`Fs;qK9{>N>=I;WvYngUBWdHtK-mpIK*N+__slN;--Z8T<fIv~>
zH82e(-Z1R<yY}^Az-uqn1M}@_)3$AsfAwo|DJxhKsE?6>At9h)ACO{Ts0Rz4VBgNB
zu-O#MW>6@<&&04m?7`=lz48j5*8UVak;4m-IdK>01qiS#hcg)%o-{`@Pq--sl)1+<
zp?<2Z_j~q^n(TcnM$ya=)kWWRq52%o-GwoMB0nG0Ut>tw#>T+V@SQ2<`~B3?d2;-r
z+y-tyxf45ggI#>HwgJeSP+ZOpq!>2+W&pZd;rTl;5HICBBNGDy%uGmVG|br@&A>Dv
z{!@L)S({(ywXZV#%-mCbKRp`kU!bNZckTi;K|n?QpZwzVXic^g)zcRrDz~2L?!PvK
z`HAQ5@E->Ix51RboC4Al@Lg^BbuUAQd%I;s_uW2eQ<b$;O2Plu-b3v_w~9hdg*gbs
zZP;aQxi_qf@fZh?0}Qo)j8E>q4t)6g?wQ5Q!&Wi6f4ciD?xFdX>tRs6AT=;1!>fDG
zzC~%WNhmWgJY)Nz!MJ11Z@%FAhTHSs*g8$;YWS)tvGnf+TkRV~YbL*C)0WCDYDoRb
YEqV0Y!b@|Erh-iIboFyt=akR{049dsd;kCd

delta 614
zcmX@icZhF82n*K^1_r(zj9HFfqbJ9)STRnWJd;JKzLojcLyz+@T(1^PPu<ybdDFMu
z{<k;hEsxi`|9A`M6Na_9$K(J1{QO4oR}^be!?kap-!sH7{_?R<_yl9rZ^jAB`2`q2
z0LWtoGeE=!=08@E*V}#9YENaT|Mg|&&0G6czV5#!3RW<Ic?%l@LxUsZFCfLhP!ASV
zkiR3<aON7A&CoEXmYbm=s^NU`*Sdxi+n+@%Y&M0+D5T$Kg0L7;?%#zm85kz;=kYqE
zWdo%uj2-H<tEb)L7x;OthC5{&*bWAUCvT#m`WoKshB1L6pAOcqWjv9?3uL}$-SMve
z^eY?Nyj5ZeJwSm8wdLF(O`pCn0&Q~mc2^g~J8_wv!$H>J-=dorO+UY|UmwE!<kiP}
z-*1M2BthV2`F02cNXq^1zi>0Gi?Qf^QAox1$(3KOc$qrf+fv=C|2bP5qN<(&#YLs&
zmV5DQz^eWj2gK%oj8EQuUGbsL{PT;IQ?nZWY}pz9gZb@NNXR2R0kXPb*X=uT+DBCw
zl35rI++mPcWtjeT=iw{z557%J@4v8=DWR6zE%ScKc`iB2u*sb43X^%*Wr0{o;?|}=
Ytbb&89&*(AQUo%{)78&qol`;+0Py_V%m4rY