From 78c7a6319065b8f190805919a4e1d18ca6a09cf4 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Wed, 31 Aug 2016 08:30:35 -0400 Subject: [PATCH] Expanded the size of the Routing GUI and moved the buttons over to the right. Future movement is planned. --- .../client/gui/GuiItemRoutingNode.java | 44 ++++++++++++++---- .../container/ContainerItemRoutingNode.java | 2 +- .../bloodmagic/textures/gui/routingNode.png | Bin 1881 -> 1707 bytes 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java index af4ca641..6e5c099f 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java @@ -9,8 +9,10 @@ import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.client.CPacketCustomPayload; import net.minecraft.util.EnumFacing; @@ -45,7 +47,7 @@ public class GuiItemRoutingNode extends GuiContainer public GuiItemRoutingNode(InventoryPlayer playerInventory, IInventory tileRoutingNode) { super(new ContainerItemRoutingNode(playerInventory, tileRoutingNode)); - this.xSize = 176; + this.xSize = 201; this.ySize = 169; inventory = (TileFilteredRoutingNode) tileRoutingNode; container = (ContainerItemRoutingNode) this.inventorySlots; @@ -70,17 +72,17 @@ public class GuiItemRoutingNode extends GuiContainer top = (this.height - this.ySize) / 2; this.buttonList.clear(); - this.buttonList.add(this.downButton = new GuiButton(0, left + 133, top + 50, 18, 17, "D")); - this.buttonList.add(this.upButton = new GuiButton(1, left + 133, top + 14, 18, 18, "U")); - this.buttonList.add(this.northButton = new GuiButton(2, left + 150, top + 14, 18, 18, "N")); - this.buttonList.add(this.southButton = new GuiButton(3, left + 150, top + 50, 18, 17, "S")); - this.buttonList.add(this.westButton = new GuiButton(4, left + 133, top + 32, 18, 18, "W")); - this.buttonList.add(this.eastButton = new GuiButton(5, left + 150, top + 32, 18, 18, "E")); + this.buttonList.add(this.downButton = new GuiButton(0, left + 176, top + 14, 18, 18, "D")); + this.buttonList.add(this.upButton = new GuiButton(1, left + 176, top + 32, 18, 18, "U")); + this.buttonList.add(this.northButton = new GuiButton(2, left + 176, top + 50, 18, 18, "N")); + this.buttonList.add(this.southButton = new GuiButton(3, left + 176, top + 68, 18, 18, "S")); + this.buttonList.add(this.westButton = new GuiButton(4, left + 176, top + 86, 18, 18, "W")); + this.buttonList.add(this.eastButton = new GuiButton(5, left + 176, top + 104, 18, 18, "E")); this.buttonList.add(this.incrementButton = new GuiButton(6, left + 97, top + 14, 18, 17, "^")); this.buttonList.add(this.decrementButton = new GuiButton(7, left + 97, top + 50, 18, 17, "v")); disableDirectionalButton(inventory.currentActiveSlot); - this.textBox = new GuiTextField(0, this.fontRendererObj, left + 9, top + 73, 103, 12); + this.textBox = new GuiTextField(0, this.fontRendererObj, left + 90, top + 73, 64, 12); this.textBox.setEnableBackgroundDrawing(false); this.textBox.setText("Test"); } @@ -171,6 +173,17 @@ public class GuiItemRoutingNode extends GuiContainer protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { this.fontRendererObj.drawString("" + getCurrentActiveSlotPriority(), 98 + 5, 33 + 4, 0xFFFFFF); + String s = ""; + if (container.lastGhostSlotClicked != -1) + { + ItemStack clickedStack = inventorySlots.getSlot(1 + container.lastGhostSlotClicked).getStack(); + if (clickedStack != null) + { + s = clickedStack.getDisplayName(); + } + } + + this.fontRendererObj.drawStringWithShadow(s, 9, 73, 0xFFFFFF); } @Override @@ -181,4 +194,19 @@ public class GuiItemRoutingNode extends GuiContainer this.mc.getTextureManager().bindTexture(soulForgeGuiTextures); this.drawTexturedModalRect(left, top, 0, 0, this.xSize, this.ySize); } + +// @Override +// public void sendSlotContents(Container containerToSend, int slotInd, ItemStack stack) +// { +// if (slotInd == 0) +// { +// this.nameField.setText(stack == null ? "" : stack.getDisplayName()); +// this.nameField.setEnabled(stack != null); +// +// if (stack != null) +// { +// this.renameItem(); +// } +// } +// } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java index 5af44a4a..611c17f7 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java @@ -78,7 +78,7 @@ public class ContainerItemRoutingNode extends Container if (slot instanceof SlotGhostItem) //TODO: make the slot clicking work! { lastGhostSlotClicked = slot.getSlotIndex(); -// System.out.println(lastGhostSlotClicked); + System.out.println(lastGhostSlotClicked); if ((dragType == 0 || dragType == 1) && (clickTypeIn == ClickType.PICKUP || clickTypeIn == ClickType.QUICK_MOVE)) { diff --git a/src/main/resources/assets/bloodmagic/textures/gui/routingNode.png b/src/main/resources/assets/bloodmagic/textures/gui/routingNode.png index 845aa520afe797be1b3eec8172ae946a9a00c2fd..86790120436be76f62348e1bdc8f7f1b1f36bf6f 100644 GIT binary patch literal 1707 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 N4Db!6RPUr^{sCD!^?3jQ