From 687ef02073dd5afaa1a38ee3e16b8def875fecd8 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Thu, 8 Dec 2016 20:11:06 +0100 Subject: [PATCH] Added back slot background for filters --- .../refinedstorage/gui/grid/GuiGrid.java | 23 +++++++++++------- .../textures/gui/crafting_grid.png | Bin 2072 -> 2261 bytes .../refinedstorage/textures/gui/grid.png | Bin 1920 -> 2112 bytes .../textures/gui/pattern_grid.png | Bin 2594 -> 2770 bytes 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java index 34eea2107..c1471841a 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java @@ -295,7 +295,7 @@ public class GuiGrid extends GuiBase implements IGridDisplay { return !grid.getTabs().isEmpty() ? ContainerGrid.TAB_HEIGHT - 4 : 0; } - private void renderTab(GridTab tab, boolean foregroundLayer, int x, int y, int mouseX, int mouseY) { + private void drawTab(GridTab tab, boolean foregroundLayer, int x, int y, int mouseX, int mouseY) { int i = grid.getTabs().indexOf(tab); boolean selected = i == grid.getTabSelected(); @@ -312,7 +312,7 @@ public class GuiGrid extends GuiBase implements IGridDisplay { ty += 3; } - int uvx = 0; + int uvx; int uvy = 225; int tbw = ContainerGrid.TAB_WIDTH; int otx = tx; @@ -346,7 +346,7 @@ public class GuiGrid extends GuiBase implements IGridDisplay { tabHovering = -1; for (GridTab tab : grid.getTabs()) { - renderTab(tab, false, x, y, mouseX, mouseY); + drawTab(tab, false, x, y, mouseX, mouseY); } if (grid.getType() == EnumGridType.CRAFTING) { @@ -359,21 +359,26 @@ public class GuiGrid extends GuiBase implements IGridDisplay { int yy = y + getTabDelta(); - drawTexture(x, yy, 0, 0, screenWidth, getHeader()); - int r = getVisibleRows(); + drawTexture(x, yy, 0, 0, screenWidth - (grid.getType() != EnumGridType.FLUID ? 34 : 0), getHeader()); - for (int i = 0; i < r; ++i) { + if (grid.getType() != EnumGridType.FLUID) { + drawTexture(x + screenWidth - 34 + 4, y + getTabDelta(), 197, 0, 30, 82); + } + + int rows = getVisibleRows(); + + for (int i = 0; i < rows; ++i) { yy += 18; - drawTexture(x, yy, 0, getHeader() + (i > 0 ? (i == r - 1 ? 18 * 2 : 18) : 0), screenWidth, 18); + drawTexture(x, yy, 0, getHeader() + (i > 0 ? (i == rows - 1 ? 18 * 2 : 18) : 0), screenWidth - (grid.getType() != EnumGridType.FLUID ? 34 : 0), 18); } yy += 18; - drawTexture(x, yy, 0, getHeader() + (18 * 3), screenWidth, getFooter()); + drawTexture(x, yy, 0, getHeader() + (18 * 3), screenWidth - (grid.getType() != EnumGridType.FLUID ? 34 : 0), getFooter()); for (GridTab tab : grid.getTabs()) { - renderTab(tab, true, x, y, mouseX, mouseY); + drawTab(tab, true, x, y, mouseX, mouseY); } if (grid.getType() == EnumGridType.PATTERN) { 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 1e35e4c059f61d447f7818d382cbe79c3277c577..3866e493d0d6280e9a91515ec00a4d187b7ff7b8 100755 GIT binary patch delta 1135 zcmZuweKea_7=K=gaL`s(9rZCrt?OB0N{c2{VF;rivz8_nAMLs#Dx)@ymZUqIIf~M# zX>&?cZBwmgRt*xoMvGd=bVTEGOtmr%XEC<4EN{;I)!jeteeSu>^ZPjGcgrjXiQ>a} zvnGIzO-Libx=j#+-_FBRLIeE|pNW|tJ)b6Yw+#B=Sl8NGPu=;GWT%q2o36Pnl56e7 zJBtq_MzB5R%lqqoE7xdK%gf&#@|Ds%T9i>Sog5?9BQ@{bMYS%TNU0izg|TGGh`819 z^-9mYC7?9ix1iw|blj+{S-tsZA##qajy>&zj@2wN`jB*9(oIJ^0OWjCYNS8F#_h-s z&^Fa7&Cskf=1+?EwaflQ?CoI?w5vVM>V%hzAzr;bXIpF`bN^iGz2f9j!3+YlHUCwI z?!LD_uc5|0-cAi@`1YCiCAo)*VslN;*83PP)Q2taaXT>);uQwTT>TxLv;8Cg81TT| z=y%PHKCglP0U}LPLF#I8aJaqSrGwN^U-?i^@^JB!aXr>+5d8*pI7haneA$dE{lVqq zlU6tkw%cuNwy`A3xBT+vc;Zx2%x5i*b@&pH!7-K_~U+z!n0HgQy84XNILP} zWkh?mWLhrcY!kWy@7`X>3A&X%X8M^4={Q~Qfq=mlv6}l+cj$ua8Afrv7*V7$4rAmK zMMJFx6CwM;qGOEt!8j)$lx&Z##Lk5aK@T##NyOU1R*%oGG=0q)RVDr+crf^K;ky+_ zXucQ`-Nx|Ep~p@infr?=cfNhyv?%}mCLU`!TZ4 z7%c|fa*Cf?mVwsG{p8DxS!2cCh%KvTxBl)lI!ZJp6qyI&y752p5R&l}Lc+Uk6fJTy zQ%KHexRW!#+)nC)$`-d}iKdXJi_%Xavn-DwqDQ)eZ<&=jtt+t-hA3p92J{XSRUX%^ zd6tlw7-_|Sq3)($bANUTDzHo?j1L+zr5LnEM7yg2XqzJ7BiqUE9V!n}tS0jf%CBZL z=vx8Omk3z%e}-`UY_wgaowlSf3th%RH4u7AwYDb>Lp3agtk!tF2C=5=%|iQBf}-`p zOrxZ#sv)t{j+VhRB*!2C>s%LOm|7U=so6bcA&@boQfMZ~pVUhE)7N$D~B? zA-i*{r~sRnOPL&)Z($bdq*$tCh<5C)nUxKvCQJ?J`c1@*GGDI&<#`aEIHeQf! iVF#3)4X-{Y^w0VgypV=V{$W{RjG;jX0_y_ezW5jJwAUs8 delta 945 zcmcaAI747V2n*LP1_r)ejH3I^E=`VOQLksN^>lFzsfc@fr#El0fq-k`ER*;DPvmfz zo7G228ao>np9?FxmK*!I(=1y1*1Gq*+g|fu|9W@z!#?g3-}wKpzi&9e{$Tq}x&FmW z%nf4M8(%Zp?5TRieP*}9fy*o3#xgN5FzlLe3rI3BY?n=0bhl$6DLAGCru60NS#kb~Y=J`eS(D$NIKj zv%2|v)En$duO5qHn8O)RU$%Sw>wAo+yW-DoU;mmZLte8vzfpI71cNlwL56Eg7a78s z9x_a0`p6*0WX^u!kImkE9i;<43Q7(4%*%=!Dj&1I)Yp=0kgMlrU(miXgQ02)H`@aC z$w`bEbHun3R@a|qDp12;lG?I#tv9l04S-CAx&&+i!vjeCUvPt%bWPkLeSN*< z@z1fnI~PgjGuYlr@JKUA9cF7dwt;bhVGaSVR0dDf{r}9-TNH!5a+dE0 O+2`r%=d#Wzp$P!VHe-YU diff --git a/src/main/resources/assets/refinedstorage/textures/gui/grid.png b/src/main/resources/assets/refinedstorage/textures/gui/grid.png index 64761542012ce530c692f1c3f293e67330d58a53..bbae0380488220bdfb969a9a33dcc32dd43caf29 100755 GIT binary patch literal 2112 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~62^QA&dRf`N&DBm;)v@9e6; zXy+{Oh%9Dc;M)Phj9HFfqk)2wC9V-A!TD(=<%vb93~dIoxiM$RnR zZ-6DrQcoAhkczmsa~ks=83?cz2mJd#S<_SQW<&CViPI17k(~SG%F&j)6GKJfr#`Ha zvwBwJYCrwOSFOX97NuuO_x%z$&%+aYzW&$D=hX%+VIebF{*;`4XmIv>0>|1FMqC#z z$#F7jiR_6!pxC|G?!h!^#{cgm?|&|1Jg%~B_a4y&OSzK;895vdm}Ky>C@?T`%+R~a z!SZ7B?91H^k4w0xH3GGq7yghYaKWeH-TbD-MnBF^U3B{D-Z*Z?s`H0lUe>XEqCYa%J`)(gcuFwn3gG;)#pdNZK$>o>;k!mfkk1# zjxQdMG=2m9#?b-v90NKx-n~il-W?RUujX*RBl?2KRYfs((_O*~_T@{q^`0#}>UbcP&o}zhlZj3Dl^z&* zu&UfUS%I_jy&<-J`EiWpEBHZXj>%L9%k zFt4Gue(T3`UYi)^?q=ysw}$9>yQTHW**)u9Zo_7#Np$*(9XbQ0@}JE|Tw zw*%SqLpQNzEZ0@ZdsZt7(;%>5-|R-Xc7X}ylP<5Cq_cn@WXg*7X)&xX-k5sW+z$n7 zesMcZ@gsL`Jj4@FB?$MjJem7!+bR|A7tAaQ2ci%Bn3C}IZqLJq&NJ=%zcK0kFL^6h z@oUZ#d*ir*I;LXrGrrqZ9!{!lWLT=p5pb(%uu#vK&OML+``4<%+K&AYsD$@)^>bP0 Hl+XkK6*{V> literal 1920 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