From af442dba4fe3d52f8d1aaa9655096c3251557946 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Thu, 22 Sep 2016 20:31:57 +0200
Subject: [PATCH] GUI tweaks to crafting preview

---
 .../gui/GuiCraftingPreview.java               |  25 +++++++++++-------
 .../textures/gui/crafting_preview.png         | Bin 1941 -> 1789 bytes
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/main/java/refinedstorage/gui/GuiCraftingPreview.java b/src/main/java/refinedstorage/gui/GuiCraftingPreview.java
index 1a20a5072..49c6942c4 100755
--- a/src/main/java/refinedstorage/gui/GuiCraftingPreview.java
+++ b/src/main/java/refinedstorage/gui/GuiCraftingPreview.java
@@ -37,7 +37,7 @@ public class GuiCraftingPreview extends GuiBase {
             public boolean canInteractWith(EntityPlayer player) {
                 return false;
             }
-        }, 176, 181);
+        }, 168, 171);
 
         this.stacks = new ArrayList<>(stacks);
         this.parent = parent;
@@ -45,13 +45,13 @@ public class GuiCraftingPreview extends GuiBase {
         this.hash = hash;
         this.quantity = quantity;
 
-        this.scrollbar = new Scrollbar(157, 20, 12, 59);
+        this.scrollbar = new Scrollbar(149, 20, 12, 119);
     }
 
     @Override
     public void init(int x, int y) {
-        startButton = addButton(x + 100, y + 150, 50, 20, t("misc.refinedstorage:start"));
-        cancelButton = addButton(x + 20, y + 150, 50, 20, t("gui.cancel"));
+        cancelButton = addButton(x + 16, y + 144, 50, 20, t("gui.cancel"));
+        startButton = addButton(x + 85, y + 144, 50, 20, t("misc.refinedstorage:start"));
 
         startButton.enabled = stacks.stream().filter(CraftingPreviewStack::cantCraft).count() == 0;
     }
@@ -68,16 +68,17 @@ public class GuiCraftingPreview extends GuiBase {
 
         drawTexture(x, y, 0, 0, width, height);
 
-        x += 15;
+        x += 7;
         y += 20;
 
         int slot = scrollbar.getOffset() * 2;
+
         for (int i = 0; i < 8; ++i) {
             if (slot < stacks.size()) {
                 CraftingPreviewStack stack = stacks.get(slot);
 
                 if (stack.cantCraft()) {
-                    drawTexture(x, y, 0, 185, 67, 29);
+                    drawTexture(x, y, 189, 0, 67, 29);
                 }
             }
 
@@ -96,7 +97,7 @@ public class GuiCraftingPreview extends GuiBase {
     public void drawForeground(int mouseX, int mouseY) {
         drawString(7, 7, t("gui.refinedstorage:crafting_preview"));
 
-        int x = 22;
+        int x = 12;
         int y = 22;
 
         int slot = scrollbar.getOffset() * 2;
@@ -116,13 +117,17 @@ public class GuiCraftingPreview extends GuiBase {
                 GlStateManager.pushMatrix();
                 GlStateManager.scale(scale, scale, 1);
 
+                int yy = y + 8;
+
                 if (stack.needsCrafting()) {
                     String format = stack.cantCraft() ? "gui.refinedstorage:crafting_preview.missing"  : "gui.refinedstorage:crafting_preview.to_craft";
-                    drawString(calculateOffsetOnScale(x + 20, scale), calculateOffsetOnScale(y + 8, scale), t(format, stack.getToCraft()));
+                    drawString(calculateOffsetOnScale(x + 23, scale), calculateOffsetOnScale(yy, scale), t(format, stack.getToCraft()));
+
+                    yy += 15;
                 }
 
                 if (stack.getStock() > 0) {
-                    drawString(calculateOffsetOnScale(x + 20, scale), calculateOffsetOnScale(y + 13, scale), t("gui.refinedstorage:crafting_preview.available", stack.getStock()));
+                    drawString(calculateOffsetOnScale(x + 23, scale), calculateOffsetOnScale(yy, scale), t("gui.refinedstorage:crafting_preview.available", stack.getStock()));
                 }
 
                 GlStateManager.popMatrix();
@@ -132,7 +137,7 @@ public class GuiCraftingPreview extends GuiBase {
                 }
             }
 
-            if (i%2 == 1) {
+            if (i % 2 == 1) {
                 x -= 68;
                 y += 30;
             } else {
diff --git a/src/main/resources/assets/refinedstorage/textures/gui/crafting_preview.png b/src/main/resources/assets/refinedstorage/textures/gui/crafting_preview.png
index a1950cafcc58f1f2ef37dc3a003aa9febf585076..a37a2cbff531620394da8bc64d7bfafef964af92 100644
GIT binary patch
literal 1789
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd
zfKP}kP~6<yJTx@4v9YncyZhL&W4CYL{(s}f|NsAiQlnrr1crAAJkpq=3d$%YL4Lu&
zG(VC7L-2QYU|2A47I;J!GcfS&0Aa=~$FI>qLG}_)Usv{fED}N*Mto1(s)0h1C9V-A
z!TD(=<%vb93<Zgqc_n&zsU->~dIoxi25Y&v4lpn<`FpxJhE&A8y?HS2mIH%pVEcq=
z|Nkd$H_H!PvPr6$eQ&YoOU=j!Go2$gu6b=#|9Wy=|MoSfbN|ibd?KW*JHO!n?eoHo
zF-c2gAEbZNoBp30D4NSqdFlwTbW;eg)0r;833Ld<rzxGla?WAhp9noeAt2wZVZG<B
zci+$If8S=mm+`^%iu*SwzWd)Bf4%<JKNbdthM1olW0F)rIvGA}WMBshLBIs&9u@^_
zkO?55P=248;ejs0{o)cihkK0^YgjfZgGyBpDEe*-VK6wHtFC}D85k@Ncrbt!Jy2<=
zv92zA&iF)D;-ov8nGoeq_O!FZG$JhaV>+>Yb9y=H7Rofd&Ye`&aQyNf)`U+$b0>V3
zlLHz5L{k`OO~ah;A3!_>|CtsbL8#r}ki5WKP^o!f)82ny_VPV=??2D5__Q|Tw*O5x
zcgueh-TPswy)whiTMQ}L%oEn~I&3o=IF5Jpb^DtSy*)H1I9vjG#?#f$Wt~$(697Mc
B1-AeI

literal 1941
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd
zfKP}kP~6<yJTx@4v9YncyZhL&W4CYL{(s}f|NsAiQlnrr1crAAJkpq=3d$%YL4Lu&
zG(VC7L-2QYU|2A47I;J!GcfS&1YyP<Y~uTYg6t)pzOL-|SR{lrjQF0mRRe`2OI#yL
zg7ec#$`gxH8440J^GfvcQcDy}^bGV2jhtDs-!L#RJ@<5R45^5Fd-GtPv>^|}#ootT
z{{5G~cj}7FrDq;_xlP6z4i4<PUoXumn)CeP^3D4m+sM`Ka(M9K%fI8{dmR{RN?(>~
zi&roeR5!B-I52$E^JZXV5oowAt<u22w4pqbi9_K)c|*VX%YVhQpI@wJ_%ZeU<e8c8
zzZCwz_SpldG~xXwkUqvo$<~Y!3X>Vm_%OZ6t*BNxU<DGrv0DddnnS~n8-5I8CsY`W
zCo@z_-;?9qzz4Ogp`O9+{^IM5AB0alS&u0Va*Kl9HsJ<VBhCY7R1Vy0+wRV^h8g6-
zy{CnM7O-^mzhy~i^kFhE=G?IT;oFG}uN@j*GyZt}W_7hJgMFjVKQ1I0O5D3cu3`VV
zeY>da)YFXb`pq@BRWcr^{`$Q?S=NX7$3zAujsy2nITe5rfG1WO81CFtKnjQl-`GG}
z-o%D!H{4cbIR5#b*;VE>^>^+re9YDG{C|_)+ojsOADoKgJRmchVgKjC(DN)01ZVD8
zmCp2`!zbpdF=K^`+PYUW8Elk<!@v44$W82AU8Tm*f8t1}t#E^T%A-~DI1eZrk)rMM
l`om{7f~}*JS~&N)e3MwT@^gpXO~8D?;OXk;vd$@?2>^|zWXu2n