From 741dd0a3b8972a598975787ee8c69edcb248024f Mon Sep 17 00:00:00 2001 From: Arthur Uzulin Date: Sun, 13 Oct 2013 15:11:28 +1100 Subject: [PATCH 1/3] Worked on the GUI of the advanced drawbridge --- .../textures/gui/drawbridgeAdvanced.png | Bin 2522 -> 2619 bytes .../blocks/logic/AdvancedDrawbridgeLogic.java | 13 +++- src/tconstruct/client/TProxyClient.java | 2 +- .../client/gui/AdvDrawbridgeGui.java | 31 ++++++++-- .../AdvancedDrawbridgeContainer.java | 58 +++++++++++++++--- 5 files changed, 86 insertions(+), 18 deletions(-) diff --git a/resources/assets/tinker/textures/gui/drawbridgeAdvanced.png b/resources/assets/tinker/textures/gui/drawbridgeAdvanced.png index 112899f415bbaac251e0d15dc677543a7b34b1e4..d146b1a9c41abec5160ab32e769018a12f25b318 100644 GIT binary patch delta 1990 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

*;)5p2p!EQif68Wcg5WDn2UK94v`=|QTp zdxqm93G0O$xy3x{M4^YSMIni(izRD`5&-idaNV)v#NVi!JLfe;(P4DX4TX3CWBjAO zeV-Mss&Tq_;S+LmbF;t7(NRZs*q_o_2FDTkWB4(OHIj22+}CSSnB-hL7@|sY*Sqe9 ozY&z!Y>EA(e`e7BIF!(d;`HLJ#ych#iq|&xdi(CK^< i1 = this.buttonList.iterator(); while(i1.hasNext()){ GuiButton b = i1.next(); @@ -90,6 +102,7 @@ public class AdvDrawbridgeGui extends GuiContainer b.drawButton = !flag; } } + ((AdvancedDrawbridgeContainer)this.inventorySlots).updateContainerSlots(); } protected void actionPerformed (GuiButton button) @@ -135,4 +148,10 @@ public class AdvDrawbridgeGui extends GuiContainer PacketDispatcher.sendPacketToServer(packet); } + + @Override + public void updateScreen(){ + super.updateScreen(); + this.containerNeglectMouse = false; + } } diff --git a/src/tconstruct/inventory/AdvancedDrawbridgeContainer.java b/src/tconstruct/inventory/AdvancedDrawbridgeContainer.java index 04b6efca..40af6fc7 100644 --- a/src/tconstruct/inventory/AdvancedDrawbridgeContainer.java +++ b/src/tconstruct/inventory/AdvancedDrawbridgeContainer.java @@ -1,11 +1,13 @@ package tconstruct.inventory; -import tconstruct.client.gui.AdvDrawbridgeGui; +import net.minecraft.entity.player.EntityPlayer; +import java.util.Iterator; import net.minecraft.entity.player.*; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; -import tconstruct.blocks.logic.*; +import tconstruct.blocks.logic.AdvancedDrawbridgeLogic; +import tconstruct.client.gui.AdvDrawbridgeGui; public class AdvancedDrawbridgeContainer extends Container { public AdvancedDrawbridgeLogic logic; @@ -26,7 +28,7 @@ public class AdvancedDrawbridgeContainer extends Container { public AdvancedDrawbridgeContainer(InventoryPlayer inventoryplayer, AdvancedDrawbridgeLogic logic, AdvDrawbridgeGui gui) { this.logic = logic; this.gui = gui; - + addContainerSlots(logic); bindPlayerInventory(inventoryplayer); updateContainerSlots(); @@ -46,9 +48,12 @@ public class AdvancedDrawbridgeContainer extends Container { public void addContainerSlots(AdvancedDrawbridgeLogic logic) { this.addSlotToContainer(new SlotOpaqueBlocksOnly(logic.camoInventory, 0, 35, 36)); - - for(int i = 0; i < logic.getSizeInventory(); i++){ - this.addSlotToContainer(new DrawbridgeSlot(logic, i, -2 + 18 * i, 40, logic)); + + for (int i = 0; i < logic.getSizeInventory(); i++) { + int ind = (int) (Math.floor(i / 8) * 8); + int x = i < 8 ? 10 + 20 * i : 10 + 20 * (i - 8); + int y = 35 + (int) Math.floor(i / 8) * 18 + (i < 8 ? 0 : 1); + this.addSlotToContainer(new DrawbridgeSlot(logic, i, x, y, logic)); } } @@ -85,8 +90,45 @@ public class AdvancedDrawbridgeContainer extends Container { } public void updateContainerSlots() { - if (gui == null || gui.isGuiExpanded) { - + if (gui == null) { + return; + } else if (gui.isGuiExpanded) { + Iterator i1 = inventorySlots.iterator(); + int index = 0; + while (i1.hasNext()) { + Slot sl = i1.next(); + if (index == 0) { + sl.xDisplayPosition = -1000; + sl.yDisplayPosition = -1000; + } else if (sl instanceof DrawbridgeSlot) { + sl.xDisplayPosition = (index - 1) < 8 ? 10 + 20 * (index - 1) : 10 + 20 * ((index - 1) - 8); + sl.yDisplayPosition = 35 + (int) Math.floor((index - 1) / 8) * 18 + ((index - 1) < 8 ? 0 : 1); + } + index++; + } + } else { + Iterator i1 = inventorySlots.iterator(); + int index = 0; + while (i1.hasNext()) { + Slot sl = i1.next(); + if (index == 0) { + sl.xDisplayPosition = 35; + sl.yDisplayPosition = 36; + } else if (sl instanceof DrawbridgeSlot) { + sl.xDisplayPosition = -1000; + sl.yDisplayPosition = -1000; + } + index++; + } + } + } + + @Override + public ItemStack slotClick(int par1, int par2, int par3, EntityPlayer par4EntityPlayer){ + if(gui != null && gui.containerNeglectMouse){ + return null; + }else{ + return super.slotClick(par1, par2, par3, par4EntityPlayer); } } } From 5043e1cf51307b37def883e8d7c73b56e0e8306e Mon Sep 17 00:00:00 2001 From: Vexatos Date: Sun, 13 Oct 2013 19:03:15 +0200 Subject: [PATCH 2/3] Added ladder. --- resources/assets/tinker/lang/de_DE.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/assets/tinker/lang/de_DE.lang b/resources/assets/tinker/lang/de_DE.lang index 7214e989..a0fc2694 100644 --- a/resources/assets/tinker/lang/de_DE.lang +++ b/resources/assets/tinker/lang/de_DE.lang @@ -238,6 +238,7 @@ StorageMetals.Steel.name=Stahlblock StorageMetals.Ender.name=Block Soliden Enders tile.decoration.stonetorch.name=Fackel +tile.decoration.stoneladder.name=Leiter tile.CraftingStation.name=Handwerksstation block.glass.pure.name=Klares Glas From beb19eb9b52f9087f38894abb49cacd6f6e57c44 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Sun, 13 Oct 2013 21:02:42 +0200 Subject: [PATCH 3/3] Added Ladder --- resources/assets/tinker/lang/it_IT.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/assets/tinker/lang/it_IT.lang b/resources/assets/tinker/lang/it_IT.lang index 29e0b3e7..fc100a1a 100644 --- a/resources/assets/tinker/lang/it_IT.lang +++ b/resources/assets/tinker/lang/it_IT.lang @@ -238,6 +238,7 @@ StorageMetals.Steel.name=Blocco d'Acciaio StorageMetals.Ender.name=Blocco di Ender Solido tile.decoration.stonetorch.name=Torcia +tile.decoration.stoneladder.name=Scala a Pioli tile.CraftingStation.name=Tavolo da Lavoro block.glass.pure.name=Vetro Chiaro