From 65ca680a638c08161cf9a0de9c2698bef5b2ae8b Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Thu, 9 Jun 2016 19:59:21 +0200 Subject: [PATCH] Improved crafter GUI --- .../container/ContainerCrafter.java | 6 +-- .../java/refinedstorage/gui/GuiCrafter.java | 38 +----------------- .../java/refinedstorage/tile/TileCrafter.java | 4 +- .../tile/controller/TileController.java | 2 +- .../refinedstorage/textures/gui/crafter.png | Bin 1974 -> 1989 bytes 5 files changed, 7 insertions(+), 43 deletions(-) diff --git a/src/main/java/refinedstorage/container/ContainerCrafter.java b/src/main/java/refinedstorage/container/ContainerCrafter.java index e855d19cf..44acff72e 100755 --- a/src/main/java/refinedstorage/container/ContainerCrafter.java +++ b/src/main/java/refinedstorage/container/ContainerCrafter.java @@ -10,15 +10,15 @@ public class ContainerCrafter extends ContainerStorage { public ContainerCrafter(EntityPlayer player, TileCrafter crafter) { super(player); - for (int i = 0; i < TileCrafter.PATTERN_SLOTS; ++i) { - addSlotToContainer(new SlotItemHandler(crafter.getPatterns(), i, 8, 19 + (i * 18))); + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new SlotItemHandler(crafter.getPatterns(), i, 8 + (18 * i), 20)); } for (int i = 0; i < 4; ++i) { addSlotToContainer(new SlotItemHandler(crafter.getUpgrades(), i, 187, 6 + (i * 18))); } - addPlayerInventory(8, 144); + addPlayerInventory(8, 55); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiCrafter.java b/src/main/java/refinedstorage/gui/GuiCrafter.java index 11478b5d8..e26b43c06 100755 --- a/src/main/java/refinedstorage/gui/GuiCrafter.java +++ b/src/main/java/refinedstorage/gui/GuiCrafter.java @@ -1,19 +1,14 @@ package refinedstorage.gui; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.item.ItemStack; -import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerCrafter; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; -import refinedstorage.item.ItemPattern; import refinedstorage.tile.TileCrafter; public class GuiCrafter extends GuiBase { private TileCrafter crafter; public GuiCrafter(ContainerCrafter container, TileCrafter crafter) { - super(container, 211, 226); + super(container, 211, 137); this.crafter = crafter; } @@ -37,35 +32,6 @@ public class GuiCrafter extends GuiBase { @Override public void drawForeground(int mouseX, int mouseY) { drawString(7, 7, t("gui.refinedstorage:crafter")); - drawString(7, 131, t("container.inventory")); - - RenderHelper.enableGUIStandardItemLighting(); - - for (int i = 0; i < TileCrafter.PATTERN_SLOTS; ++i) { - int x = 27; - int y = 19 + (i * 18); - - ItemStack pattern = crafter.getPatterns().getStackInSlot(i); - - if (pattern != null && ItemPattern.isValid(pattern)) { - String text = t("gui.refinedstorage:crafter.processing"); - - if (!ItemPattern.isProcessing(pattern)) { - ItemStack result = ItemPattern.getOutputs(pattern)[0]; - - drawItem(x, y, result); - - text = result.getDisplayName(); - } - - float scale = 0.5f; - - GlStateManager.pushMatrix(); - GlStateManager.scale(scale, scale, 1); - - drawString(RefinedStorageUtils.calculateOffsetOnScale(x + (ItemPattern.isProcessing(pattern) ? 1 : 20), scale), RefinedStorageUtils.calculateOffsetOnScale(y + 6, scale), text); - GlStateManager.popMatrix(); - } - } + drawString(7, 43, t("container.inventory")); } } diff --git a/src/main/java/refinedstorage/tile/TileCrafter.java b/src/main/java/refinedstorage/tile/TileCrafter.java index af7834419..6fe9a0b7f 100755 --- a/src/main/java/refinedstorage/tile/TileCrafter.java +++ b/src/main/java/refinedstorage/tile/TileCrafter.java @@ -20,7 +20,7 @@ import refinedstorage.item.ItemPattern; import refinedstorage.item.ItemUpgrade; public class TileCrafter extends TileMachine { - private BasicItemHandler patterns = new BasicItemHandler(PATTERN_SLOTS, this, new IItemValidator() { + private BasicItemHandler patterns = new BasicItemHandler(9, this, new IItemValidator() { @Override public boolean valid(ItemStack stack) { return stack.getItem() == RefinedStorageItems.PATTERN && ItemPattern.isValid(stack); @@ -29,8 +29,6 @@ public class TileCrafter extends TileMachine { private BasicItemHandler upgrades = new BasicItemHandler(4, this, new BasicItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_SPEED)); - public static final int PATTERN_SLOTS = 6; - @Override public int getEnergyUsage() { return 2 + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java index be84c6040..fbda7369f 100755 --- a/src/main/java/refinedstorage/tile/controller/TileController.java +++ b/src/main/java/refinedstorage/tile/controller/TileController.java @@ -302,7 +302,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr if (machine instanceof TileCrafter) { TileCrafter crafter = (TileCrafter) machine; - for (int i = 0; i < TileCrafter.PATTERN_SLOTS; ++i) { + for (int i = 0; i < crafter.getPatterns().getSlots(); ++i) { ItemStack pattern = crafter.getPatterns().getStackInSlot(i); if (pattern != null && ItemPattern.isValid(pattern)) { diff --git a/src/main/resources/assets/refinedstorage/textures/gui/crafter.png b/src/main/resources/assets/refinedstorage/textures/gui/crafter.png index 1f043a932a3fdb288c3fd36a3e97e6273a8f48f7..1490acd108bc93408200103f3bd6e37b4c2bcc94 100755 GIT binary patch literal 1989 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!Jyj5{V~zXb|Pl(rIsj|=o#o)<`~!c z0SgpuPZ!6KinzCPy7LYh2(Sdp{r`VbGku!Gp~Y%nw?DPH21X8zrGgjY8}0>!emix_-hWZ* zG6vmE1%I}9ZgF8?TF3I{wBiHPuU%zs`1VZzLSV~!8CY!A#H`PFu9R^5c-X%pph@o= zOgq!9PkCKdiAv+Tpv2v2{&^eNivj^&)6en8tIuVzITCx|oXY_b>)NK~hTz<{-{zJ7 zU;1DHli%L?3!cxG40SLUXaKqb=pTtUE-Tbe%WhEnnByLqIV*+x!rW~WDva}IgCs#d zYhd{LjtxYCl{+}x^YmNqxv9YrB)8z+-5nekZf2`~tO|-Oiq*lfVNsFQ4(_T#c{qj(z#0oiX3No^iSST3e>~_1bULlMa6VezxsF s%r13K?><(hDcckrGP#Ebwd~AibGP@Rc2Z&+c|gUir>mdKI;Vst0O0*)#{d8T delta 846 zcmX@gzm0!G2n*LC1_r)EjG`J|4U^+o)azwDT^vIy;@;kA^pY`@XuY^{_51%PZu{=> zJGJK26}1wlbMA@~+ds}fEN1Aj{deu`<-gs3{@7XbujY1b_3Y*S&wp1v+b?z_t?J+Q z>))UMPJ6cJQH|(>(rIyVuRhlr7snOuW16tv+L2d5+J7y}hu1gO?tN5a%zTG$sxJcr z!VLLbiG(mrSY z+4{i^`@0-J)h9TAW0-PxH7f%{gOv#bLq9)5$|YNdx1!IP1seS8K_=X1Jbs5`DpX0y z+?%}@49%TD3V>!d6qz*0Y+_&Vran#=Q!s12g*;H6 zVaj60ClhQLQom<0GB7OQvt>8{HVwv)O^^HM_Tq9FdqpHmg0}xJS8WEHW9Kg0ec%3n z>4PN<{X6$-%(uV0hT$#~)NY&a_p%s*?{a*tmZ+5M?E;QSw9pqzuHl*7DgeuuwZ z;@m*)%-zvIk|CgvZNl?=(Yz2#ziP+n00mRtEBH8?KGMR)4Mjo+R&t)d%)&U;P%S1PqMIx5JnW^XgrnWmz{f7QMeDRk3~Y*3ztW z6Nh`5)y((L*xv>@00f|J0keB{pM1I1SVG~u-rB};>&WQkWp2z*=590paQ4q;S+EMA zqo2JKgD`>de_+S#IdMQ6o`KQ;(8ux&JF9bf_uM~w%WA8!l*0YoZ)|nWzi;wE^(qvX zgMtPO67J;Yt)F|4p_ql?z%2%SXNGM>?@Ye3SNu77(|AiSgU0)&$SV0=>CAm|v>76& w^EzBhWu8!alOZM648}D_