From d7de2a6eeb5070050c41f95f9474d36e8db6c72b Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Sun, 27 Mar 2016 16:41:10 +0200
Subject: [PATCH] Make normal grid one row larger

---
 .../container/ContainerGrid.java              |   2 +-
 src/main/java/refinedstorage/gui/GuiGrid.java |  21 ++++++++++++------
 .../refinedstorage/textures/gui/grid.png      | Bin 1940 -> 1960 bytes
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/java/refinedstorage/container/ContainerGrid.java b/src/main/java/refinedstorage/container/ContainerGrid.java
index f3d320fe9..fff95f757 100755
--- a/src/main/java/refinedstorage/container/ContainerGrid.java
+++ b/src/main/java/refinedstorage/container/ContainerGrid.java
@@ -15,7 +15,7 @@ public class ContainerGrid extends ContainerBase {
     public ContainerGrid(EntityPlayer player, TileGrid grid) {
         super(player);
 
-        addPlayerInventory(8, grid.getType() == EnumGridType.CRAFTING ? 174 : 108);
+        addPlayerInventory(8, grid.getType() == EnumGridType.CRAFTING ? 174 : 126);
 
         if (grid.getType() == EnumGridType.CRAFTING) {
             int x = 25;
diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java
index 0b15f189e..a42316d84 100755
--- a/src/main/java/refinedstorage/gui/GuiGrid.java
+++ b/src/main/java/refinedstorage/gui/GuiGrid.java
@@ -25,8 +25,6 @@ import java.io.IOException;
 import java.util.*;
 
 public class GuiGrid extends GuiBase {
-    public static final int VISIBLE_ROWS = 4;
-
     private ContainerGrid container;
     private TileGrid grid;
 
@@ -35,13 +33,14 @@ public class GuiGrid extends GuiBase {
     private int hoveringSlotId;
     private int hoveringId;
 
-    private Scrollbar scrollbar = new Scrollbar(174, 20, 12, 70);
+    private Scrollbar scrollbar;
 
     public GuiGrid(ContainerGrid container, TileGrid grid) {
-        super(container, 193, grid.getType() == EnumGridType.CRAFTING ? 256 : 190);
+        super(container, 193, grid.getType() == EnumGridType.CRAFTING ? 256 : 208);
 
         this.container = container;
         this.grid = grid;
+        this.scrollbar = new Scrollbar(174, 20, 12, grid.getType() == EnumGridType.CRAFTING ? 70 : 88);
     }
 
     @Override
@@ -61,7 +60,7 @@ public class GuiGrid extends GuiBase {
 
     @Override
     public void update(int x, int y) {
-        scrollbar.setCanScroll(getRows() > VISIBLE_ROWS);
+        scrollbar.setCanScroll(getRows() > getVisibleRows());
     }
 
     public int getOffset() {
@@ -119,7 +118,7 @@ public class GuiGrid extends GuiBase {
             drawString(7, 94, t("container.crafting"));
         }
 
-        drawString(7, grid.getType() == EnumGridType.CRAFTING ? 163 : 96, t("container.inventory"));
+        drawString(7, grid.getType() == EnumGridType.CRAFTING ? 163 : 113, t("container.inventory"));
 
         int x = 8;
         int y = 20;
@@ -132,7 +131,7 @@ public class GuiGrid extends GuiBase {
 
         RenderHelper.enableGUIStandardItemLighting();
 
-        for (int i = 0; i < 9 * VISIBLE_ROWS; ++i) {
+        for (int i = 0; i < 9 * getVisibleRows(); ++i) {
             if (slot < items.size()) {
                 int qty = items.get(slot).getQuantity();
 
@@ -299,4 +298,12 @@ public class GuiGrid extends GuiBase {
             super.keyTyped(character, keyCode);
         }
     }
+
+    public int getVisibleRows() {
+        if (grid.getType() == EnumGridType.CRAFTING) {
+            return 4;
+        }
+
+        return 5;
+    }
 }
diff --git a/src/main/resources/assets/refinedstorage/textures/gui/grid.png b/src/main/resources/assets/refinedstorage/textures/gui/grid.png
index 2d6a3bb865e42ca4abf2691f42ff7352ca71912c..d2bc104a9cca0509aaf93c2e198c779526fbf2c2 100644
GIT binary patch
literal 1960
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd
zfKP}kP~6<yJTx@4ySw|?v19-L{|AbUg3%BdAtBK8SX>2^QA&dRf`N&DBm;)v@9e6;
zXy+{Oh%9Dc;M)trjPAcDtOW{6l(<He1m~xflqVLYG880c=9TE>rIsj|=o#o)<`~!c
z0Sgp9PZ!6KinzCTFXjmw3bb8R&Ak7ABC~hhHQ&QWPknUIneXqRe75zbZP$totIBrY
z-PXB#@13&ScIxj+8*^WM|No~V@`3q*<6C0&)^ojKu*^AjkN-i?Rnz)|$@v@wy06~*
zb22bA?D5D4rOXM3+gKFNTknZvSoi(^Qqd{<A8h>2{Np&I1lxzl)z{BltG{Ps`*fcq
z$AtRqKD+z5pTA7`%?8v~Iq@DyHyF6trriaJO=UP=Uip5TCff;J@6{jj)Hj!A1@le_
z?&q>UQ!5QpS#g62tbu{ylhR&Lv3j7c<gV|z6~2ZJ?_#4`%dKaw4W6CVFsCZyN8-EN
zAf*Qmi$Qfv5P!)FVt!lvI<Lqrw~Mjp{UxnEw@>EGy%oaz<jUeh{KfY{j$n}61|op~
z=EDv0vE`GEvx0dhR8J3kc-JrO^_68(3d`k0>t_5m11bEl0a%EG!4uaiP%+=|_r<Q+
za{^~SUoOLCkjWs%zC(w-;Q!X>_-Jkg{l81Y@7G&3{8@H#@gBGO%ZyKUwu7}>);0mP
zPIxXS*1+)Ow?S0v{nrz3T5Vm)cEa{@;KQe35Z6JKfNcX32Ufg)yyCV9^OJi^Lo2pV
zhNxG6yW+#)JKI441OhM%K<of4KAFD-;d!7EkPARcLBIhLx(8%{W+|MvU1QI%vpQGw
z-utv|ez~g{KV5yc;sbXSR);y<&3y-q7m&^kW(PXtm;T+Gd;44Q@=Tip>+LP8+t~gX
ze9V8#ey`r=r^sFTsuWiDbD|ArQkf_0%waH^&g<}O6XS^(GlrR`*%XRzGNkB9lP3ub
c`nz>Z2Nu0ZJGyek6OflYUHx3vIVCg!0DW6!jQ{`u

literal 1940
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd
zfKP}kP~6<yJTx@4ySw|?v19-L{|AbUg3%BdAtBK8SX>2^QA&dRf`N&DBm;)v@9e6;
zXy+{Oh%9Dc;M)hnjIW$F9smkTl(<He1m~xflqVLYG880c=9TE>rIsj|=o#o)<`~!c
zF)%Rw@^o<wsfc@f_hQy<2Z6T0tA6+XPrSS8pZ3v0{gyqKt7d)<l$gQoYSq!EcPut<
zd+MV+{q1+Ao$suUO_=%Xr@eig*bm+hhPl&EuV&JA&@)SZ&t9<d)hziBH>8<jx_|wS
zWny4Z;4d-*rOXpY+gKF7TknZvSoghtspu4-qTh^v9y9PT|M<8!``Nwvdp38U?vmt~
zus?g7-TmCpCDUKC0ku_5*bFKc!Juc?*<HLqmKNi@^PleJ2J=h^p0@YU=DBC~I?v8(
zh$&tDA=Pd>NOeQIE<^|1_6Ysh@=3;7KrO}7X|CmS&2(o*HC~6}25;+z-_v#K*NQvH
z{qkOK_rHYUXFcn-PZG~(^C^6{)d4y3#8q_;Ahq*-A|r=`UHiuHACdhK56v;o6_v}I
zdmHK%hNAn2f#C@O5??L*cKI4QoQwU&b-v8#J74Z9#!t&~MfaU~4i0Ugs)jq?H^7uL
zyz(n@%k5$;dbcUOV%y}M<r%@e6U=kr0R~d{WM4b5j)8yxNMISb1Gy(^`Cs!poQwO;
zb-vsfV$toi)gQ!f?F7XI2*A7oVmIu%d?#>rQiCNE!vgaI9qTXsySGW_b?Nd<n*;0Z
zcYfpH{bBSmf35hQdf%TSck`=KSf|g?W|*1FJmIDpy{K)^7`ET`|I+7DG-dYj5|E=k
MUHx3vIVCg!0Qitom;e9(