From d9aac6488068550ce3fa321e50c23cdd4e8b1cf5 Mon Sep 17 00:00:00 2001 From: Qowyn Date: Thu, 25 Sep 2014 21:08:02 +0200 Subject: [PATCH] There should be a framework for working with multiple areas in one GUI --- .../tools/inventory/CraftingStationContainer.java | 6 +++--- .../tools/inventory/PartCrafterChestContainer.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java b/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java index ca186bff..965d9eb9 100644 --- a/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java +++ b/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java @@ -46,8 +46,8 @@ public class CraftingStationContainer extends Container if (logic.chest != null) { - craftingOffsetX += 122; - inventoryOffsetX += 122; + craftingOffsetX += 116; + inventoryOffsetX += 116; } this.addSlotToContainer(new SlotCraftingStation(inventorplayer.player, this.craftMatrix, this.craftResult, 0, craftingOffsetX + 94, 35)); @@ -92,7 +92,7 @@ public class CraftingStationContainer extends Container for (row = 0; row < 6; row++) { int value = count < 27 ? count : count - 27; - this.addSlotToContainer(new Slot(count < 27 ? firstChest : secondChest, value, 14 + row * 18, 19 + column * 18)); + this.addSlotToContainer(new Slot(count < 27 ? firstChest : secondChest, value, 8 + row * 18, 19 + column * 18)); count++; if (count >= 27 && secondChest == null) break; diff --git a/src/main/java/tconstruct/tools/inventory/PartCrafterChestContainer.java b/src/main/java/tconstruct/tools/inventory/PartCrafterChestContainer.java index e450943d..3aec9393 100644 --- a/src/main/java/tconstruct/tools/inventory/PartCrafterChestContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PartCrafterChestContainer.java @@ -25,7 +25,7 @@ public class PartCrafterChestContainer extends ActiveContainer patternLogic = pLogic; largeInventory = true; - inventory = new Slot[] { new SlotPattern(partLogic, 0, 162, 27), new SlotPattern(partLogic, 1, 162, 45), new Slot(partLogic, 2, 180, 27), new Slot(partLogic, 3, 180, 45), new SlotOnlyTake(partLogic, 4, 224, 27), new SlotOnlyTake(partLogic, 5, 242, 27), new SlotOnlyTake(partLogic, 6, 224, 45), new SlotOnlyTake(partLogic, 7, 242, 45) }; + inventory = new Slot[] { new SlotPattern(partLogic, 0, 156, 27), new SlotPattern(partLogic, 1, 156, 45), new Slot(partLogic, 2, 174, 27), new Slot(partLogic, 3, 174, 45), new SlotOnlyTake(partLogic, 4, 218, 27), new SlotOnlyTake(partLogic, 5, 236, 27), new SlotOnlyTake(partLogic, 6, 218, 45), new SlotOnlyTake(partLogic, 7, 236, 45) }; for (int iter = 0; iter < inventory.length; iter++) this.addSlotToContainer(inventory[iter]); @@ -34,7 +34,7 @@ public class PartCrafterChestContainer extends ActiveContainer { for (int row = 0; row < 6; row++) { - this.addSlotToContainer(new SlotPattern(pLogic, row + column * 6, 14 + row * 18, 30 + column * 18)); + this.addSlotToContainer(new SlotPattern(pLogic, row + column * 6, 8 + row * 18, 30 + column * 18)); } } @@ -43,13 +43,13 @@ public class PartCrafterChestContainer extends ActiveContainer { for (int row = 0; row < 9; row++) { - this.addSlotToContainer(new Slot(inventoryplayer, row + column * 9 + 9, 130 + row * 18, 84 + column * 18)); + this.addSlotToContainer(new Slot(inventoryplayer, row + column * 9 + 9, 124 + row * 18, 84 + column * 18)); } } for (int column = 0; column < 9; column++) { - this.addSlotToContainer(new Slot(inventoryplayer, column, 130 + column * 18, 142)); + this.addSlotToContainer(new Slot(inventoryplayer, column, 124 + column * 18, 142)); } }