From daa2368ad0c9035ccae0adcb9080276c418516db Mon Sep 17 00:00:00 2001 From: unleashurgeek Date: Mon, 9 Dec 2013 20:28:44 -0800 Subject: [PATCH 1/4] Fixed armor slots to only allow the correct type of armor in the slots. Kept the abbility to wear blocks on your head --- src/tconstruct/inventory/SlotArmorCopy.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/tconstruct/inventory/SlotArmorCopy.java b/src/tconstruct/inventory/SlotArmorCopy.java index 90a52ef6..5a21ca64 100644 --- a/src/tconstruct/inventory/SlotArmorCopy.java +++ b/src/tconstruct/inventory/SlotArmorCopy.java @@ -5,6 +5,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import cpw.mods.fml.relauncher.Side; @@ -44,7 +45,11 @@ public class SlotArmorCopy extends Slot public boolean isItemValid (ItemStack par1ItemStack) { Item item = (par1ItemStack == null ? null : par1ItemStack.getItem()); - return item != null;// && item.isValidArmor(par1ItemStack, armorType, parent.thePlayer); + boolean isValidArmor = false; + if (item instanceof ItemArmor) { + isValidArmor = (((ItemArmor)item).armorType == armorType); + } + return item != null && (isValidArmor || (item instanceof ItemBlock && armorType == 0)); } @SideOnly(Side.CLIENT) From 041381258c0a0b1bc38d6c884c5045254982bb8c Mon Sep 17 00:00:00 2001 From: unleashurgeek Date: Mon, 9 Dec 2013 20:44:25 -0800 Subject: [PATCH 2/4] Fixed unused, Knapsack, and Canister slots --- .../inventory/ArmorExtendedContainer.java | 14 ++++---- src/tconstruct/inventory/SlotCanister.java | 34 +++++++++++++++++++ src/tconstruct/inventory/SlotKnapsack.java | 34 +++++++++++++++++++ src/tconstruct/inventory/SlotUnused.java | 30 ++++++++++++++++ 4 files changed, 105 insertions(+), 7 deletions(-) create mode 100644 src/tconstruct/inventory/SlotCanister.java create mode 100644 src/tconstruct/inventory/SlotKnapsack.java create mode 100644 src/tconstruct/inventory/SlotUnused.java diff --git a/src/tconstruct/inventory/ArmorExtendedContainer.java b/src/tconstruct/inventory/ArmorExtendedContainer.java index b9901a74..3b0c7d05 100644 --- a/src/tconstruct/inventory/ArmorExtendedContainer.java +++ b/src/tconstruct/inventory/ArmorExtendedContainer.java @@ -16,13 +16,13 @@ public class ArmorExtendedContainer extends ActiveContainer invPlayer = inventoryplayer; this.armor = armor; - this.addSlotToContainer(new Slot(armor, 0, 80, 17)); - this.addSlotToContainer(new Slot(armor, 1, 80, 35)); - this.addSlotToContainer(new Slot(armor, 2, 116, 17)); - this.addSlotToContainer(new Slot(armor, 3, 116, 35)); - this.addSlotToContainer(new Slot(armor, 4, 152, 17)); - this.addSlotToContainer(new Slot(armor, 5, 152, 35)); - this.addSlotToContainer(new Slot(armor, 6, 152, 53)); + this.addSlotToContainer(new SlotUnused(armor, 0, 80, 17)); + this.addSlotToContainer(new SlotUnused(armor, 1, 80, 35)); + this.addSlotToContainer(new SlotKnapsack(armor, 2, 116, 17)); + this.addSlotToContainer(new SlotUnused(armor, 3, 116, 35)); + this.addSlotToContainer(new SlotUnused(armor, 4, 152, 17)); + this.addSlotToContainer(new SlotUnused(armor, 5, 152, 35)); + this.addSlotToContainer(new SlotCanister(armor, 6, 152, 53)); /* Player inventory */ for (int playerArmor = 0; playerArmor < 4; ++playerArmor) diff --git a/src/tconstruct/inventory/SlotCanister.java b/src/tconstruct/inventory/SlotCanister.java new file mode 100644 index 00000000..98513656 --- /dev/null +++ b/src/tconstruct/inventory/SlotCanister.java @@ -0,0 +1,34 @@ +package tconstruct.inventory; + +import tconstruct.items.armor.HeartCanister; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Item; + +public class SlotCanister extends Slot +{ + public SlotCanister(IInventory par2IInventory, int par3, int par4, int par5) + { + super(par2IInventory, par3, par4, par5); + this.parent = container; + } + + /** + * Returns the maximum stack size for a given slot (usually the same as getInventoryStackLimit(), but 1 in the case + * of armor slots) + */ + public int getSlotStackLimit () + { + return 10; + } + + /** + * Check if the stack is a valid item for this slot. Always true beside for the armor slots. + */ + public boolean isItemValid (ItemStack par1ItemStack) + { + Item item = (par1ItemStack == null ? null : par1ItemStack.getItem()); + return item != null && (item instanceof HeartCanister); + } +} diff --git a/src/tconstruct/inventory/SlotKnapsack.java b/src/tconstruct/inventory/SlotKnapsack.java new file mode 100644 index 00000000..f56ad9e5 --- /dev/null +++ b/src/tconstruct/inventory/SlotKnapsack.java @@ -0,0 +1,34 @@ +package tconstruct.inventory; + +import tconstruct.items.armor.Knapsack; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Item; + +public class SlotKnapsack extends Slot +{ + public SlotKnapsack(IInventory par2IInventory, int par3, int par4, int par5) + { + super(par2IInventory, par3, par4, par5); + this.parent = container; + } + + /** + * Returns the maximum stack size for a given slot (usually the same as getInventoryStackLimit(), but 1 in the case + * of armor slots) + */ + public int getSlotStackLimit () + { + return 1; + } + + /** + * Check if the stack is a valid item for this slot. Always true beside for the armor slots. + */ + public boolean isItemValid (ItemStack par1ItemStack) + { + Item item = (par1ItemStack == null ? null : par1ItemStack.getItem()); + return item != null && (item instanceof Knapsack); + } +} diff --git a/src/tconstruct/inventory/SlotUnused.java b/src/tconstruct/inventory/SlotUnused.java new file mode 100644 index 00000000..4abefba6 --- /dev/null +++ b/src/tconstruct/inventory/SlotUnused.java @@ -0,0 +1,30 @@ +package tconstruct.inventory; + +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class SlotUnused extends Slot +{ + public SlotUnused(IInventory par2IInventory, int par3, int par4, int par5) + { + super(par2IInventory, par3, par4, par5); + } + + /** + * Returns the maximum stack size for a given slot (usually the same as getInventoryStackLimit(), but 1 in the case + * of armor slots) + */ + public int getSlotStackLimit () + { + return 0; + } + + /** + * Check if the stack is a valid item for this slot. Always true beside for the armor slots. + */ + public boolean isItemValid (ItemStack par1ItemStack) + { + return false; + } +} From 8d64362e0e7088694cf564403a3595674a1b2a04 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Sat, 21 Dec 2013 19:17:46 -0500 Subject: [PATCH 3/4] swap names back to aluminum brass and bronze. this will be a 1.7 change... --- resources/assets/tinker/lang/en_US.lang | 30 +++++++++---------- resources/assets/tinker/manuals/materials.xml | 2 +- resources/assets/tinker/manuals/smeltery.xml | 4 +-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 6da20682..aeddf5a2 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -223,8 +223,8 @@ item.tconstruct.Materials.CopperIngot.name=Copper Ingot item.tconstruct.Materials.TinIngot.name=Tin Ingot item.tconstruct.Materials.AluminumIngot.name=Aluminum Ingot item.tconstruct.Materials.RawAluminum.name=Raw Aluminum -item.tconstruct.Materials.BronzeIngot.name=Tinker's Alloy Ingot -item.tconstruct.Materials.AluBrassIngot.name=Tinker's Alloy Ingot +item.tconstruct.Materials.BronzeIngot.name=Bronze Ingot +item.tconstruct.Materials.AluBrassIngot.name=Aluminum Brass Ingot item.tconstruct.Materials.AlumiteIngot.name=Alumite Ingot item.tconstruct.Materials.SteelIngot.name=Steel Ingot item.tconstruct.Materials.BlueSlimeCrystal.name=Slime Crystal @@ -234,14 +234,14 @@ item.tconstruct.Materials.CopperNugget.name=Copper Nugget item.tconstruct.Materials.TinNugget.name=Tin Nugget item.tconstruct.Materials.AluminumNugget.name=Aluminum Nugget item.tconstruct.Materials.EssenceCrystal.name=Fake Essence Crystal -item.tconstruct.Materials.AluBrassNugget.name=Tinker's Alloy Nugget +item.tconstruct.Materials.AluBrassNugget.name=Aluminum Brass Nugget item.tconstruct.Materials.SilkyCloth.name=Silky Cloth item.tconstruct.Materials.SilkyJewel.name=Silky Jewel item.tconstruct.Materials.ObsidianNugget.name=Obsidian Nugget item.tconstruct.Materials.CobaltNugget.name=Cobalt Nugget item.tconstruct.Materials.ArditeNugget.name=Ardite Nugget item.tconstruct.Materials.ManyullynNugget.name=Manyullyn Nugget -item.tconstruct.Materials.BronzeNugget.name=Tinker's Alloy Nugget +item.tconstruct.Materials.BronzeNugget.name=Bronze Nugget item.tconstruct.Materials.AlumiteNugget.name=Alumite Nugget item.tconstruct.Materials.SteelNugget.name=Steel Nugget item.tconstruct.Materials.PigIronIngot.name=Pig Iron Ingot @@ -302,10 +302,10 @@ StorageMetals.Cobalt.name=Block of Cobalt StorageMetals.Ardite.name=Block of Ardite StorageMetals.Manyullyn.name=Block of Manyullyn StorageMetals.Copper.name=Block of Copper -StorageMetals.Bronze.name=Block of Tinker's Alloy +StorageMetals.Bronze.name=Block of Bronze StorageMetals.Tin.name=Block of Tin StorageMetals.Aluminum.name=Block of Aluminum -StorageMetals.AlBrass.name=Block of Tinker's Alloy +StorageMetals.AlBrass.name=Block of Aluminum Brass StorageMetals.Alumite.name=Block of Alumite StorageMetals.Steel.name=Block of Steel StorageMetals.Ender.name=Block of Solid Ender @@ -406,8 +406,8 @@ item.tconstruct.bucket.Tin.name=Molten Tin Bucket item.tconstruct.bucket.Aluminum.name=Molten Aluminum Bucket item.tconstruct.bucket.Cobalt.name=Molten Cobalt Bucket item.tconstruct.bucket.Ardite.name=Molten Ardite Bucket -item.tconstruct.bucket.Bronze.name=Molten Tinker's Alloy Bucket -item.tconstruct.bucket.AluBrass.name=Molten Tinker's Alloy Bucket +item.tconstruct.bucket.Bronze.name=Molten Bronze Bucket +item.tconstruct.bucket.AluBrass.name=Molten Aluminum Brass Bucket item.tconstruct.bucket.Manyullyn.name=Molten Manyullyn Bucket item.tconstruct.bucket.Alumite.name=Molten Alumite Bucket item.tconstruct.bucket.Obsidian.name=Molten Obsidian Bucket @@ -437,8 +437,8 @@ tile.metal.molten.tin.name=Liquid Tin tile.metal.molten.aluminum.name=Molten Aluminum tile.metal.molten.cobalt.name=Molten Cobalt tile.metal.molten.ardite.name=Molten Ardite -tile.metal.molten.bronze.name=Molten Tinker's Alloy -tile.metal.molten.alubrass.name=Molten Tinker's Alloy +tile.metal.molten.bronze.name=Molten Bronze +tile.metal.molten.alubrass.name=Molten Aluminum Brass tile.metal.molten.manyullyn.name=Molten Manyullyn tile.metal.molten.alumite.name=Molten Alumite tile.metal.molten.obsidian.name=Molten Obsidian @@ -463,8 +463,8 @@ LiquidMetal.Tin.name=Liquid Tin LiquidMetal.Aluminum.name=Molten Aluminum LiquidMetal.Cobalt.name=Molten Cobalt LiquidMetal.Ardite.name=Molten Ardite -LiquidMetal.Bronze.name=Molten Tinker's Alloy -LiquidMetal.AluBrass.name=Molten Tinker's Alloy +LiquidMetal.Bronze.name=Molten Bronze +LiquidMetal.AluBrass.name=Molten Aluminum Brass LiquidMetal.Manyullyn.name=Molten Manyullyn LiquidMetal.Alumite.name=Molten Alumite LiquidMetal.Obsidian.name=Molten Obsidian @@ -523,7 +523,7 @@ parttype.cobalt=Cobalt parttype.ardite=Ardite parttype.manyullyn=Manyullyn parttype.copper=Copper -parttype.bronze=Tinker's Alloy +parttype.bronze=Bronze parttype.alumite=Alumite parttype.steel=Steel parttype.blueslime=Slime @@ -564,8 +564,8 @@ fluid.tin.molten=Molten Tin fluid.aluminum.molten=Molten Aluminum fluid.cobalt.molten=Molten Cobalt fluid.ardite.molten=Molten Ardite -fluid.bronze.molten=Molten Tinker's Alloy -fluid.aluminumbrass.molten=Molten Tinker's Alloy +fluid.bronze.molten=Molten Bronze +fluid.aluminumbrass.molten=Molten Aluminum Brass fluid.manyullyn.molten=Molten Manyullyn fluid.alumite.molten=Molten Alumite fluid.obsidian.molten=Molten Obsidian diff --git a/resources/assets/tinker/manuals/materials.xml b/resources/assets/tinker/manuals/materials.xml index 4d6a2818..7cfb46c0 100644 --- a/resources/assets/tinker/manuals/materials.xml +++ b/resources/assets/tinker/manuals/materials.xml @@ -661,7 +661,7 @@ Class: Ranged Projectile Launcher -Tinker's Alloy +Bronze bronzeaxe A common alloy. It's a bit better than iron. - Requires the Smeltery diff --git a/resources/assets/tinker/manuals/smeltery.xml b/resources/assets/tinker/manuals/smeltery.xml index ae79e746..6137ea9c 100644 --- a/resources/assets/tinker/manuals/smeltery.xml +++ b/resources/assets/tinker/manuals/smeltery.xml @@ -116,11 +116,11 @@ Other liquid removal objects will work, but are frowned upon. An example picture Alloys are made when two or more metals are mixed in precise proportions. Currently known alloys are: - Tinker's Alloy, made from Copper(3) and Tin(1) + Bronze, made from Copper(3) and Tin(1) bronzeingot - Tinker's Alloy, made from Aluminum(3) and Copper(1) + Aluminum Brass, made from Aluminum(3) and Copper(1) alubrassingot From af0330ad734f3144f2d55e62fcb81e8cc5677273 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Sat, 21 Dec 2013 23:25:20 -0500 Subject: [PATCH 4/4] get rid of this.parent = container --- src/tconstruct/inventory/SlotCanister.java | 2 +- src/tconstruct/inventory/SlotKnapsack.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tconstruct/inventory/SlotCanister.java b/src/tconstruct/inventory/SlotCanister.java index 98513656..c1341c10 100644 --- a/src/tconstruct/inventory/SlotCanister.java +++ b/src/tconstruct/inventory/SlotCanister.java @@ -11,7 +11,7 @@ public class SlotCanister extends Slot public SlotCanister(IInventory par2IInventory, int par3, int par4, int par5) { super(par2IInventory, par3, par4, par5); - this.parent = container; + //this.parent = container; } /** diff --git a/src/tconstruct/inventory/SlotKnapsack.java b/src/tconstruct/inventory/SlotKnapsack.java index f56ad9e5..f69e3a0d 100644 --- a/src/tconstruct/inventory/SlotKnapsack.java +++ b/src/tconstruct/inventory/SlotKnapsack.java @@ -11,7 +11,7 @@ public class SlotKnapsack extends Slot public SlotKnapsack(IInventory par2IInventory, int par3, int par4, int par5) { super(par2IInventory, par3, par4, par5); - this.parent = container; + //this.parent = container; } /**