From 4dd3dd44b3c5785d2ee0018e32f47953e8de854a Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 30 Apr 2016 14:36:41 +0200 Subject: [PATCH] Better crafter GUI --- .../container/ContainerCrafter.java | 13 ++----------- .../java/refinedstorage/gui/GuiCrafter.java | 8 ++++---- .../refinedstorage/textures/gui/crafter.png | Bin 1994 -> 1974 bytes 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/main/java/refinedstorage/container/ContainerCrafter.java b/src/main/java/refinedstorage/container/ContainerCrafter.java index 28f182c8c..46cb578d1 100755 --- a/src/main/java/refinedstorage/container/ContainerCrafter.java +++ b/src/main/java/refinedstorage/container/ContainerCrafter.java @@ -14,7 +14,7 @@ public class ContainerCrafter extends ContainerStorage { public ContainerCrafter(EntityPlayer player, TileCrafter crafter) { super(player); - for (int i = 0; i < 3; ++i) { + for (int i = 0; i < 6; ++i) { addSlotToContainer(new SlotFiltered(crafter, i, 8, 19 + (i * 18), new IItemValidator() { @Override public boolean isValid(ItemStack stack) { @@ -23,15 +23,6 @@ public class ContainerCrafter extends ContainerStorage { })); } - for (int i = 3; i < 6; ++i) { - addSlotToContainer(new SlotFiltered(crafter, i, 89, 19 + ((i - 3) * 18), new IItemValidator() { - @Override - public boolean isValid(ItemStack stack) { - return stack.getItem() == RefinedStorageItems.PATTERN && ItemPattern.hasResult(stack); - } - })); - } - for (int i = 0; i < 4; ++i) { addSlotToContainer(new SlotFiltered(crafter, 6 + i, 187, 6 + (i * 18), new IItemValidator() { @Override @@ -41,7 +32,7 @@ public class ContainerCrafter extends ContainerStorage { })); } - addPlayerInventory(8, 90); + addPlayerInventory(8, 144); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiCrafter.java b/src/main/java/refinedstorage/gui/GuiCrafter.java index 24e9c707a..aeb5fb23c 100755 --- a/src/main/java/refinedstorage/gui/GuiCrafter.java +++ b/src/main/java/refinedstorage/gui/GuiCrafter.java @@ -12,7 +12,7 @@ public class GuiCrafter extends GuiBase { private TileCrafter crafter; public GuiCrafter(ContainerCrafter container, TileCrafter crafter) { - super(container, 211, 173); + super(container, 211, 226); this.crafter = crafter; } @@ -41,13 +41,13 @@ public class GuiCrafter extends GuiBase { @Override public void drawForeground(int mouseX, int mouseY) { drawString(7, 7, t("gui.refinedstorage:crafter")); - drawString(7, 77, t("container.inventory")); + drawString(7, 131, t("container.inventory")); RenderHelper.enableGUIStandardItemLighting(); for (int i = 0; i < 6; ++i) { - int x = i >= 3 ? 109 : 27; - int y = 19 + ((i - (i >= 3 ? 3 : 0)) * 18); + int x = 27; + int y = 19 + (i * 18); if (crafter.getStackInSlot(i) != null) { ItemStack result = ItemPattern.getResult(crafter.getStackInSlot(i)); diff --git a/src/main/resources/assets/refinedstorage/textures/gui/crafter.png b/src/main/resources/assets/refinedstorage/textures/gui/crafter.png index 9fe1182e56e70d1025e03d567464a1662f2d8277..1f043a932a3fdb288c3fd36a3e97e6273a8f48f7 100755 GIT binary patch literal 1974 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;5!7ujG`J|4M0JO64!{5;QX|b^2DN4hJwV*yb`^<)Di^~Jp(<<9OF7a zV1Xjz>Eakt5%=~^qnC`KMC-+stKa`Waocx~->EgHuBeqbopV=|*#2?;VKGCG?Z0bh zFaPcS^T*Dbe>Jyjt7k9ofBw7b*?zGbX;uHWU;qC6ciOW(k7`68lunC_d-b{2xHztG zAJc^W){eXi(*A2%KD@rMcJHGaW9B=2Q+Ueq7!j<_eKGQS2$mvng3Pj!}(j<=gdD_Ke%Ckm*c1U1m|xIQ|_(?7Ksg3CJYSy z{0u3VY#H8)K4%ta@UI7%aG&w`9ge9`B_(rj_FgbFcLFH@n%Pif(jc>meZiYJU6B0? z*%@{ST0L`H0pq_ulh@L>Q!s12g*;H6Vaj60ClhQLQom;b3+M%WwhRZrhQau;>2d$u zUR(}iuZUzx(Dwi3s?A_??A&F$@7w<`eXxX~f9HOU`Sy3$Fx+K=T5a?FUKT^}U5>9g z_3SdcKlKKj|04{PamE?KmBvV9L8Z zP+fsd#~x;#dSw%LpzMh|5F6*%0c#Ls9y8;oZo{?F*RIvyljNPS`oP}ptKR}ufPqo@ zb{LakUcKwHEbC^*qW71iDz;DFTAGz^;&3msn)&`2``aM+F$FuP~>$(LJ=B^18v zt!*r~j*MPj=EnSF?l$ueXa8&lM>SBD!?Sl{V8uYe8-;(!)B1I0hkzw!(_t8;nx z+&_EEYOAr7!u{NDY<14RZ}LIaD-@T50tO5c?&RjJpL>v@n1$iMEe3sOhHXXfOun*L z{5g5kcuOyX#`~toD*0XM%zbmT86v0iI$TR-o=|#|Atly~C~maOgS!8`C3V7o?(M8e P0NLp2>gTe~DWM4fG-qY| literal 1994 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5D>38$lZxy-8q?;Kn_c~qpu?a z!^VE@KZ&di49pAxJ|V6^adUI?(9qEC?(Sp9j{X1tA1E>kMnhnPgh10{aTQRmDGBlm z1}6TI3>bpHv#SE5owL9rvY3H^?=T269?xHq0u+=eag8Vm&QB{TPb^AhC`ioAE78kK zEm1JhGtjflF|P9i7AVS|E{-7;ac}Q5c10PAxL&+o_~*ZWo$1FJTh3o}o9w-J&R)$J zsoW0k_9V7D-)c`^uJf+n@893Q{q1c_|Lxbm|2U)1oij7;|IgpQe$AT`d0t{YQ%(BI z*Q@vKQ%}EUd`z3+*LKcV3{g8yb3VAfF}VI%#Y{%O_ESng#|6Y+F94_4()S{uLh$Pa zMuuND7q#c>q+K%Gdz06DBEzjEq2cOL`w}^U(kt56rQ2QgK4Aa)yoCN|>jyWk^ai*w zvr@ax*v^EEw`y`U;gp!qiWFQ)Xx| z%VZ1)Q}1Gb;Pyho-0836V>J61GUkghR3)e}JYsm0-%`W^H1vuybHKSh-`q6Z>ly#d zus$%I^FUbK%Vrq{z2nzb?|pxDy@(H2f#vt+FFy(*8K(hDcLs(9cZFFTWE$!Y-m=d8 z_V2ToNrPR`wsZ5hF@YpO;KiNOa5lq^|Dms!uVrC=ac`-3#rDNFrK398E?BP>{gGCe z4>k^@gg*4>DMSY%O`0dY7T(`z`K0_piR;UF*X9qJDPRgZhm3YvJmxzHfrF86M>ohXbAW zgoA-$596upY_IQ}zBRAT`}6ayat}VaSEs-Ds_*wNJoWJFaHHifs$NWG&6%mqV3N!1 iaM^6IP{!;xzTbC9ubUFEZ~hXH&pciIT-G@yGywqpR%Q19