From a0a9e222a34d66c4e9308332dfe96b1840d7f649 Mon Sep 17 00:00:00 2001 From: Qowyn Date: Tue, 23 Sep 2014 18:30:13 +0200 Subject: [PATCH] Specify stack limit for slots at creation time. Fixes equipping 10 knapsacks --- .../armor/inventory/ArmorExtendedContainer.java | 16 +++++++++------- .../armor/inventory/SlotAccessory.java | 7 ++++--- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java b/src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java index 30d9bbd0ca8..24b87c50860 100644 --- a/src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java +++ b/src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java @@ -16,13 +16,15 @@ public ArmorExtendedContainer(InventoryPlayer inventoryplayer, ArmorExtended arm invPlayer = inventoryplayer; this.armor = armor; - this.addSlotToContainer(new SlotAccessory(armor, 0, 80, 17)); - this.addSlotToContainer(new SlotAccessory(armor, 1, 80, 35)); - this.addSlotToContainer(new SlotAccessory(armor, 2, 116, 17)); - this.addSlotToContainer(new SlotAccessory(armor, 3, 116, 35)); - this.addSlotToContainer(new SlotAccessory(armor, 4, 152, 53)); - this.addSlotToContainer(new SlotAccessory(armor, 5, 152, 35)); - this.addSlotToContainer(new SlotAccessory(armor, 6, 152, 17)); + this.addSlotToContainer(new SlotAccessory(armor, 0, 80, 17, 1)); + this.addSlotToContainer(new SlotAccessory(armor, 1, 80, 35, 1)); + this.addSlotToContainer(new SlotAccessory(armor, 2, 116, 17, 1)); + this.addSlotToContainer(new SlotAccessory(armor, 3, 116, 35, 1)); + + // HeartCanister + this.addSlotToContainer(new SlotAccessory(armor, 4, 152, 53, 10)); + this.addSlotToContainer(new SlotAccessory(armor, 5, 152, 35, 10)); + this.addSlotToContainer(new SlotAccessory(armor, 6, 152, 17, 10)); for (int playerArmor = 0; playerArmor < 4; ++playerArmor) { this.addSlotToContainer(new SlotArmorCopy(this, inventoryplayer, inventoryplayer.getSizeInventory() - 1 - playerArmor, 98, 8 + playerArmor * 18, playerArmor)); diff --git a/src/main/java/tconstruct/armor/inventory/SlotAccessory.java b/src/main/java/tconstruct/armor/inventory/SlotAccessory.java index d4205ee7e16..e580ae8e1ce 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotAccessory.java +++ b/src/main/java/tconstruct/armor/inventory/SlotAccessory.java @@ -7,12 +7,13 @@ public class SlotAccessory extends Slot { private final int slotID; + private final int slotStackLimit; - public SlotAccessory(IInventory par2IInventory, int par3, int par4, int par5) + public SlotAccessory(IInventory par2IInventory, int par3, int par4, int par5, int slotStackLimit) { super(par2IInventory, par3, par4, par5); this.slotID = par3; - //this.parent = container; + this.slotStackLimit = slotStackLimit; } /** @@ -21,7 +22,7 @@ public SlotAccessory(IInventory par2IInventory, int par3, int par4, int par5) */ public int getSlotStackLimit () { - return 10; + return slotStackLimit; } /**