From 4fdafeb3abe86546702d4ac5987e3dd2b6fb17db Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 2 Jul 2016 23:43:50 +0200 Subject: [PATCH] Tweak grid GUI's a bit --- .../container/ContainerGrid.java | 18 ++++++++--------- src/main/java/refinedstorage/gui/GuiGrid.java | 19 ++++++------------ .../textures/gui/crafting_grid.png | Bin 2089 -> 2092 bytes .../textures/gui/pattern_grid.png | Bin 2639 -> 2635 bytes 4 files changed, 15 insertions(+), 22 deletions(-) diff --git a/src/main/java/refinedstorage/container/ContainerGrid.java b/src/main/java/refinedstorage/container/ContainerGrid.java index 6bfd9ea7c..6967d47fa 100755 --- a/src/main/java/refinedstorage/container/ContainerGrid.java +++ b/src/main/java/refinedstorage/container/ContainerGrid.java @@ -21,11 +21,11 @@ public class ContainerGrid extends ContainerBase { this.grid = grid; - addPlayerInventory(8, (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN) ? 174 : 126); + addPlayerInventory(8, (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN) ? 167 : 126); if (grid.getType() == EnumGridType.CRAFTING) { - int x = 25; - int y = 106; + int x = 26; + int y = 98; for (int i = 0; i < 9; ++i) { addSlotToContainer(new SlotGridCrafting(((TileGrid) grid).getMatrix(), i, x, y)); @@ -34,14 +34,14 @@ public class ContainerGrid extends ContainerBase { if ((i + 1) % 3 == 0) { y += 18; - x = 25; + x = 26; } } - addSlotToContainer(craftingResultSlot = new SlotGridCraftingResult(this, player, (TileGrid) grid, 0, 133 + 4, 120 + 4)); + addSlotToContainer(craftingResultSlot = new SlotGridCraftingResult(this, player, (TileGrid) grid, 0, 130 + 4, 112 + 4)); } else if (grid.getType() == EnumGridType.PATTERN) { int x = 8; - int y = 106; + int y = 98; for (int i = 0; i < 9; ++i) { addSlotToContainer(new SlotSpecimenLegacy(((TileGrid) grid).getMatrix(), i, x, y, false)); @@ -54,10 +54,10 @@ public class ContainerGrid extends ContainerBase { } } - addSlotToContainer(patternResultSlot = new SlotDisabled(((TileGrid) grid).getResult(), 0, 116 + 4, 120 + 4)); + addSlotToContainer(patternResultSlot = new SlotDisabled(((TileGrid) grid).getResult(), 0, 112 + 4, 112 + 4)); - addSlotToContainer(new SlotItemHandler(((TileGrid) grid).getPatterns(), 0, 152, 104)); - addSlotToContainer(new SlotOutput(((TileGrid) grid).getPatterns(), 1, 152, 144)); + addSlotToContainer(new SlotItemHandler(((TileGrid) grid).getPatterns(), 0, 152, 97)); + addSlotToContainer(new SlotOutput(((TileGrid) grid).getPatterns(), 1, 152, 137)); } } diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java index b47eb8b0e..27418046a 100755 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -74,7 +74,7 @@ public class GuiGrid extends GuiBase { private int slotNumber; public GuiGrid(ContainerGrid container, IGrid grid) { - super(container, 193, (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN) ? 256 : 208); + super(container, 193, (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN) ? 249 : 208); setScrollbar(new Scrollbar(174, 20, 12, (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN) ? 70 : 88)); getScrollbar().setCanScroll(false); @@ -204,16 +204,16 @@ public class GuiGrid extends GuiBase { public boolean isOverClear(int mouseX, int mouseY) { switch (grid.getType()) { case CRAFTING: - return inBounds(81, 105, 7, 7, mouseX, mouseY); + return inBounds(82, 97, 7, 7, mouseX, mouseY); case PATTERN: - return inBounds(64, 105, 7, 7, mouseX, mouseY); + return inBounds(64, 97, 7, 7, mouseX, mouseY); default: return false; } } public boolean isOverCreatePattern(int mouseX, int mouseY) { - return grid.getType() == EnumGridType.PATTERN && inBounds(152, 124, 16, 16, mouseX, mouseY) && ((TileGrid) grid).canCreatePattern(); + return grid.getType() == EnumGridType.PATTERN && inBounds(152, 117, 16, 16, mouseX, mouseY) && ((TileGrid) grid).canCreatePattern(); } @Override @@ -239,7 +239,7 @@ public class GuiGrid extends GuiBase { ty = 2; } - drawTexture(x + 152, y + 124, 195, ty * 16, 16, 16); + drawTexture(x + 64, y + 97, 195, ty * 16, 16, 16); } searchField.drawTextBox(); @@ -248,14 +248,7 @@ public class GuiGrid extends GuiBase { @Override public void drawForeground(int mouseX, int mouseY) { drawString(7, 7, t(grid instanceof WirelessGrid ? "gui.refinedstorage:wireless_grid" : "gui.refinedstorage:grid")); - - if (grid.getType() == EnumGridType.CRAFTING) { - drawString(7, 95, t("container.crafting")); - } else if (grid.getType() == EnumGridType.PATTERN) { - drawString(7, 95, t("gui.refinedstorage:grid.pattern")); - } - - drawString(7, (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN) ? 163 : 114, t("container.inventory")); + drawString(7, (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN) ? 155 : 114, t("container.inventory")); int x = 8; int y = 20; diff --git a/src/main/resources/assets/refinedstorage/textures/gui/crafting_grid.png b/src/main/resources/assets/refinedstorage/textures/gui/crafting_grid.png index d10eaab8107ebbd6447507ce5813a6c782a77156..42e4bd625da97160f53d600c47b7362c8b2153c5 100755 GIT binary patch delta 775 zcmZ1}uts1*2n*Lf1_r);jIW$F9+(`*qFz7A)5S5QBJSCMtDXw@3R-HV5~8}{r20+ z0}Kl$Z@ux8AusOkSLrj>iU;nld>hKdz`(F;!Yv@lz))f|nc+g!*=*Jac6HOAO{ip^h<(n+W>c@C^axSYeW836~tj6^` z%fH<|xpCH-@Jy}?84N7!J6f3~{!e_Gxsjpd;$*wM|DG{?`OmeaMDpujz6F1O#Jqg> z_lL~aTgSJbd*EMlQ=Z{hm2&8>r>7o&eUWX`ox7HS$KHwAX8n9?g>SMSbPO8iNgvyM z;~HB-GSICJ*K);x)Q9s7kHdMTb8GA?eHm)&U##jaW-L%~`1|hfzH`;=I@)!%&-b0< zUQoJ(=O0(j&m&AX1UT3>h;^`S5aM9pAkx9UL12eP!?Vv{wr%WSFmCK%sJeaQDC4u< z_ew?Ey0vMv_iZ#eCOnt*K)#uAWYbFQzU0PfR zetkY+y|@1G5^ttAoIrP7*mV{ZvJ4k)iZd?A_F`mckXypA!{k7qwNtf~$b%k6pj_1U zNRSc+t7>Kh_W-wpe!&URy)sV6=R7_l?GSCXa?#)U%IaX1KmzJ-2-o56X~n)d7R(v< zRiE$JzBsvlUB)Bc1=hMxD~zxE!gMgKy{!XhGwh!$v%1r`;ahA`U$wQ>vo5uJ47)A| z^_dsnWq~PzxgE^^0E$lw<}HFi-h$HEU)e6)%RX0FAAUUMBG7f`%`}gzZ`lR%F$he) z$1d$qP|WzE?X%fr+XJ7MpS$Zcm;FG2_?AmMGEU3*-3()RAz{W)!XwRK#kTf+J;TZW VIm|ms73P67d%F6$taD0e0sy2(Lj3>$ delta 725 zcmZ1@uu@<{2n*K%1_r(Zj9J$@IVZ=lsMq&Wq}TW1DUi-;%uJ>vY82B=gCZw`~ivcO;hIySnEd|DCIc z!78$QF8_k>uhx|tyl-JBU%oAzlYxQZg;N$YkYc!S(uc|6wds1%hTmU8XE|4~e?G@v zP$0!HgYnL^yQOFTeoonXsxXOTLBHwB<2Th-hxSdDXZ2%zJUNfmnDN-;MXbj4J@N;8`usofDSabD$wm3Md;dLS`0}4?Nr~iFQ}zX=vspowF4$}? zz`!8GzF_&&;-&tN{Nq>cn|IFqeE>tQ^%AdgUAgt{+h6J&Gi5UP$HDtyPu;tQ8|4Q! zA7J=($6)T!9cm0VAeV2++YBTd{@1h5`1fSP#ZTF%PBXnY8?Jkv{XiqbSN})#_buNy zq#mtb`}p@c&IP7Rbn3YOFp6*_L@Nj#SmvP7pxYS1AkB1;;Tlso+Xe1tFH=_*FnBi> zFjPgpI>qpL+4W2MMF$za{8${pQ1v5HgTZ!|D5nGeGghVxg@G~+_ExG4)=sBy2x`r= zc+tC`hhgu}RT>Ph`&Hk6;d;N0D?kS1Nw{avGdo%mx%*`QqB(q%35V9Mk_ zY!c!Ij4wF<#a!IZ{9;D&oC@X)Z{^S}{|lc??qe6LU-7%FL0SDA!>#g@mhaxan4vwZ zg87A?x8=PvrNTh-!NB3Q88?j0a3Ej(c-AAH1+~-XJigc0w{uaadBeLcQy!m)3W^iFQL&@XH u*(c>5{0x4cx9}Wu!XECZ%&0A~hd*%l*KKZEUe`SfWTdC7pUXO@geCwM8#vnl diff --git a/src/main/resources/assets/refinedstorage/textures/gui/pattern_grid.png b/src/main/resources/assets/refinedstorage/textures/gui/pattern_grid.png index 7039086c7154db9844c7f690e526f7fff8fb1dc9..3e0a2c671b714bfe0b878142e6401ae10dd3ddab 100755 GIT binary patch delta 1512 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 h7`uqi9S$ZX0WVs8xvp8&HT5jwa_aB3`a}odm