From 08e7319e5ca68c761b5178822a944885e19f60bf Mon Sep 17 00:00:00 2001 From: 61352151511 Date: Sat, 6 Feb 2016 12:37:31 -0400 Subject: [PATCH] Add new chest upgrades & Fix upgrading changing the direction the chest faces. --- .../cpw/mods/ironchest/ChestChangerType.java | 165 ++++++++--------- .../java/cpw/mods/ironchest/IronChest.java | 12 -- .../cpw/mods/ironchest/IronChestType.java | 12 +- .../mods/ironchest/IronChestTypeSimple.java | 33 ++++ .../cpw/mods/ironchest/ItemChestChanger.java | 169 +++++++++--------- .../mods/ironchest/client/ModelHelper.java | 54 +++--- .../assets/ironchest/lang/en_US.lang | 29 +-- .../models/item/copperUpgradeDiamond.json | 19 ++ ...ianUpgrade.json => copperUpgradeGold.json} | 37 ++-- .../models/item/copperUpgradeIron.json | 19 ++ .../models/item/copperUpgradeObsidian.json | 19 ++ .../item/diamondCrystalUpgradeCrystal.json | 19 ++ .../item/diamondObsidianUpgradeObsidian.json | 19 ++ .../models/item/goldDiamondUpgrade.json | 18 -- .../models/item/goldUpgradeDiamond.json | 19 ++ .../models/item/goldUpgradeObsidian.json | 19 ++ .../models/item/ironGoldUpgrade.json | 18 -- .../models/item/ironUpgradeDiamond.json | 19 ++ ...rIronUpgrade.json => ironUpgradeGold.json} | 37 ++-- .../models/item/ironUpgradeObsidian.json | 19 ++ .../models/item/silverGoldUpgrade.json | 18 -- .../models/item/silverUpgradeDiamond.json | 19 ++ .../models/item/silverUpgradeGold.json | 19 ++ .../models/item/silverUpgradeObsidian.json | 19 ++ .../models/item/woodCopperUpgrade.json | 18 -- .../models/item/woodIronUpgrade.json | 18 -- .../models/item/woodUpgradeDiamond.json | 19 ++ ...ilverUpgrade.json => woodUpgradeGold.json} | 37 ++-- ...ystalUpgrade.json => woodUpgradeIron.json} | 37 ++-- .../models/item/woodUpgradeObsidian.json | 19 ++ .../ironchest/textures/items/copperChest.png | Bin 0 -> 511 bytes .../textures/items/copperIronUpgrade.png | Bin 480 -> 0 bytes .../textures/items/copperSilverUpgrade.png | Bin 480 -> 0 bytes .../textures/items/crystalUpgrade.png | Bin 0 -> 280 bytes .../ironchest/textures/items/diamondChest.png | Bin 0 -> 503 bytes .../textures/items/diamondCrystalUpgrade.png | Bin 418 -> 0 bytes .../textures/items/diamondObsidianUpgrade.png | Bin 466 -> 0 bytes .../textures/items/diamondUpgrade.png | Bin 0 -> 351 bytes .../ironchest/textures/items/goldChest.png | Bin 0 -> 511 bytes .../textures/items/goldDiamondUpgrade.png | Bin 480 -> 0 bytes .../ironchest/textures/items/goldUpgrade.png | Bin 0 -> 375 bytes .../ironchest/textures/items/ironChest.png | Bin 0 -> 499 bytes .../textures/items/ironGoldUpgrade.png | Bin 526 -> 0 bytes .../ironchest/textures/items/ironUpgrade.png | Bin 0 -> 335 bytes .../textures/items/obsidianUpgrade.png | Bin 0 -> 319 bytes .../ironchest/textures/items/silverChest.png | Bin 0 -> 447 bytes .../textures/items/silverGoldUpgrade.png | Bin 526 -> 0 bytes .../ironchest/textures/items/woodChest.png | Bin 0 -> 553 bytes .../textures/items/woodCopperUpgrade.png | Bin 542 -> 0 bytes .../textures/items/woodIronUpgrade.png | Bin 540 -> 0 bytes 50 files changed, 596 insertions(+), 382 deletions(-) create mode 100644 src/main/java/cpw/mods/ironchest/IronChestTypeSimple.java create mode 100644 src/main/resources/assets/ironchest/models/item/copperUpgradeDiamond.json rename src/main/resources/assets/ironchest/models/item/{diamondObsidianUpgrade.json => copperUpgradeGold.json} (80%) create mode 100644 src/main/resources/assets/ironchest/models/item/copperUpgradeIron.json create mode 100644 src/main/resources/assets/ironchest/models/item/copperUpgradeObsidian.json create mode 100644 src/main/resources/assets/ironchest/models/item/diamondCrystalUpgradeCrystal.json create mode 100644 src/main/resources/assets/ironchest/models/item/diamondObsidianUpgradeObsidian.json delete mode 100755 src/main/resources/assets/ironchest/models/item/goldDiamondUpgrade.json create mode 100644 src/main/resources/assets/ironchest/models/item/goldUpgradeDiamond.json create mode 100644 src/main/resources/assets/ironchest/models/item/goldUpgradeObsidian.json delete mode 100755 src/main/resources/assets/ironchest/models/item/ironGoldUpgrade.json create mode 100644 src/main/resources/assets/ironchest/models/item/ironUpgradeDiamond.json rename src/main/resources/assets/ironchest/models/item/{copperIronUpgrade.json => ironUpgradeGold.json} (80%) create mode 100644 src/main/resources/assets/ironchest/models/item/ironUpgradeObsidian.json delete mode 100755 src/main/resources/assets/ironchest/models/item/silverGoldUpgrade.json create mode 100644 src/main/resources/assets/ironchest/models/item/silverUpgradeDiamond.json create mode 100644 src/main/resources/assets/ironchest/models/item/silverUpgradeGold.json create mode 100644 src/main/resources/assets/ironchest/models/item/silverUpgradeObsidian.json delete mode 100644 src/main/resources/assets/ironchest/models/item/woodCopperUpgrade.json delete mode 100644 src/main/resources/assets/ironchest/models/item/woodIronUpgrade.json create mode 100644 src/main/resources/assets/ironchest/models/item/woodUpgradeDiamond.json rename src/main/resources/assets/ironchest/models/item/{copperSilverUpgrade.json => woodUpgradeGold.json} (80%) mode change 100755 => 100644 rename src/main/resources/assets/ironchest/models/item/{diamondCrystalUpgrade.json => woodUpgradeIron.json} (80%) create mode 100644 src/main/resources/assets/ironchest/models/item/woodUpgradeObsidian.json create mode 100644 src/main/resources/assets/ironchest/textures/items/copperChest.png delete mode 100755 src/main/resources/assets/ironchest/textures/items/copperIronUpgrade.png delete mode 100755 src/main/resources/assets/ironchest/textures/items/copperSilverUpgrade.png create mode 100644 src/main/resources/assets/ironchest/textures/items/crystalUpgrade.png create mode 100644 src/main/resources/assets/ironchest/textures/items/diamondChest.png delete mode 100755 src/main/resources/assets/ironchest/textures/items/diamondCrystalUpgrade.png delete mode 100755 src/main/resources/assets/ironchest/textures/items/diamondObsidianUpgrade.png create mode 100644 src/main/resources/assets/ironchest/textures/items/diamondUpgrade.png create mode 100644 src/main/resources/assets/ironchest/textures/items/goldChest.png delete mode 100755 src/main/resources/assets/ironchest/textures/items/goldDiamondUpgrade.png create mode 100644 src/main/resources/assets/ironchest/textures/items/goldUpgrade.png create mode 100644 src/main/resources/assets/ironchest/textures/items/ironChest.png delete mode 100755 src/main/resources/assets/ironchest/textures/items/ironGoldUpgrade.png create mode 100644 src/main/resources/assets/ironchest/textures/items/ironUpgrade.png create mode 100644 src/main/resources/assets/ironchest/textures/items/obsidianUpgrade.png create mode 100644 src/main/resources/assets/ironchest/textures/items/silverChest.png delete mode 100755 src/main/resources/assets/ironchest/textures/items/silverGoldUpgrade.png create mode 100644 src/main/resources/assets/ironchest/textures/items/woodChest.png delete mode 100755 src/main/resources/assets/ironchest/textures/items/woodCopperUpgrade.png delete mode 100755 src/main/resources/assets/ironchest/textures/items/woodIronUpgrade.png diff --git a/src/main/java/cpw/mods/ironchest/ChestChangerType.java b/src/main/java/cpw/mods/ironchest/ChestChangerType.java index c4a1f0c5..cdb7177d 100755 --- a/src/main/java/cpw/mods/ironchest/ChestChangerType.java +++ b/src/main/java/cpw/mods/ironchest/ChestChangerType.java @@ -6,97 +6,90 @@ ******************************************************************************/ package cpw.mods.ironchest; -import static cpw.mods.ironchest.IronChestType.COPPER; -import static cpw.mods.ironchest.IronChestType.CRYSTAL; -import static cpw.mods.ironchest.IronChestType.DIAMOND; -import static cpw.mods.ironchest.IronChestType.GOLD; -import static cpw.mods.ironchest.IronChestType.IRON; -import static cpw.mods.ironchest.IronChestType.OBSIDIAN; -import static cpw.mods.ironchest.IronChestType.SILVER; -import static cpw.mods.ironchest.IronChestType.WOOD; +import static cpw.mods.ironchest.IronChestTypeSimple.COPPER; +import static cpw.mods.ironchest.IronChestTypeSimple.CRYSTAL; +import static cpw.mods.ironchest.IronChestTypeSimple.DIAMOND; +import static cpw.mods.ironchest.IronChestTypeSimple.GOLD; +import static cpw.mods.ironchest.IronChestTypeSimple.IRON; +import static cpw.mods.ironchest.IronChestTypeSimple.OBSIDIAN; +import static cpw.mods.ironchest.IronChestTypeSimple.SILVER; +import static cpw.mods.ironchest.IronChestTypeSimple.WOOD; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.registry.GameRegistry; -import cpw.mods.ironchest.client.ModelHelper; import net.minecraftforge.fml.relauncher.Side; +import cpw.mods.ironchest.client.ModelHelper; public enum ChestChangerType { - IRONGOLD(IRON, GOLD, "ironGoldUpgrade", "Iron to Gold Chest Upgrade", "mmm", "msm", "mmm"), - GOLDDIAMOND(GOLD, DIAMOND, "goldDiamondUpgrade", "Gold to Diamond Chest Upgrade", "GGG", "msm", "GGG"), - COPPERSILVER(COPPER, SILVER, "copperSilverUpgrade", "Copper to Silver Chest Upgrade", "mmm", "msm", "mmm"), - SILVERGOLD(SILVER, GOLD, "silverGoldUpgrade", "Silver to Gold Chest Upgrade", "mGm", "GsG", "mGm"), - COPPERIRON(COPPER, IRON, "copperIronUpgrade", "Copper to Iron Chest Upgrade", "mGm", "GsG", "mGm"), - DIAMONDCRYSTAL(DIAMOND, CRYSTAL, "diamondCrystalUpgrade", "Diamond to Crystal Chest Upgrade", "GGG", "GOG", "GGG"), - WOODIRON(WOOD, IRON, "woodIronUpgrade", "Normal chest to Iron Chest Upgrade", "mmm", "msm", "mmm"), - WOODCOPPER(WOOD, COPPER, "woodCopperUpgrade", "Normal chest to Copper Chest Upgrade", "mmm", "msm", "mmm"), - DIAMONDOBSIDIAN(DIAMOND, OBSIDIAN, "diamondObsidianUpgrade", "Diamond to Obsidian Chest Upgrade", "mmm", "mGm", "mmm"); - - private IronChestType source; - private IronChestType target; - public String itemName; - public String descriptiveName; - public ItemChestChanger item; - private String[] recipe; - - private ChestChangerType(IronChestType source, IronChestType target, String itemName, String descriptiveName, String... recipe) - { - this.source = source; - this.target = target; - this.itemName = itemName; - this.descriptiveName = descriptiveName; - this.recipe = recipe; - } - - public IronChestType getSource(){ - return source; - } - - public boolean canUpgrade(IronChestType from) - { - return from == this.source; - } - - public int getTarget() - { - return this.target.ordinal(); - } - - public ItemChestChanger buildItem() - { - item = new ItemChestChanger(this); - GameRegistry.registerItem(item, itemName); - if(FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) - ModelHelper.registerItem(item, "ironchest:" + itemName); - return item; - } - - public void addRecipes() - { - for (String sourceMat : source.getMatList()) - { - for (String targetMat : target.getMatList()) - { - Object targetMaterial = IronChestType.translateOreName(targetMat); - Object sourceMaterial = IronChestType.translateOreName(sourceMat); - IronChestType.addRecipe(new ItemStack(item), recipe, 'm', targetMaterial, 's', sourceMaterial, 'G', "blockGlass", 'O', Blocks.obsidian); - } - } - } - - public static void buildItems() - { - for (ChestChangerType type : values()) - { - type.buildItem(); - } - } - - public static void generateRecipes() - { - for (ChestChangerType item : values()) - { - item.addRecipes(); - } - } + WOOD_UPGRADE(WOOD, new IronChestTypeSimple[] {IRON, GOLD, DIAMOND, OBSIDIAN}, "woodUpgrade", new String[][] {{"ttt", "tst", "ttt"}, {"ttt", "tst", "ttt"}, {"GGG", "tst", "GGG"}, {"tst", "tGt", "ttt"}}), + IRON_UPGRADE(IRON, new IronChestTypeSimple[] {GOLD, DIAMOND, OBSIDIAN}, "ironUpgrade", new String[][] {{"ttt", "tst", "ttt"}, {"GGG", "tst", "GGG"}, {"tst", "tGt", "ttt"}}), + GOLD_UPGRADE(GOLD, new IronChestTypeSimple[] {DIAMOND, OBSIDIAN}, "goldUpgrade", new String[][] {{"GGG", "tst", "GGG"}, {"tst", "tGt", "ttt"}}), + DIAMOND_OBSIDIAN_UPGRADE(DIAMOND, new IronChestTypeSimple[] {OBSIDIAN}, "diamondObsidianUpgrade", new String[][] {{"tst", "tGt", "ttt"}}), + DIAMOND_CRYSTAL_UPGRADE(DIAMOND, new IronChestTypeSimple[] {CRYSTAL}, "diamondCrystalUpgrade", new String[][] {{"GsG", "GOG", "GGG"}}), + COPPER_UPGRADE(COPPER, new IronChestTypeSimple[] {IRON, GOLD, DIAMOND, OBSIDIAN}, "copperUpgrade", new String[][] {{"tGt", "GsG", "tGt"}, {"ttt", "tst", "ttt"}, {"GGG", "tst", "GGG"}, {"tst", "tGt", "ttt"}}), + SILVER_UPGRADE(SILVER, new IronChestTypeSimple[] {GOLD, DIAMOND, OBSIDIAN}, "silverUpgrade", new String[][] {{"tGt", "GsG", "tGt"}, {"GGG", "tst", "GGG"}, {"tst", "tGt", "ttt"}}); + + private IronChestTypeSimple source; + IronChestTypeSimple[] upgradeChain; + public ItemChestChanger item; + public String itemName; + private String[][] recipe; + + private ChestChangerType(IronChestTypeSimple source, IronChestTypeSimple[] upgradeChain, String itemName, String[][] recipes) { + this.source = source; + this.upgradeChain = upgradeChain; + this.itemName = itemName; + this.recipe = recipes; + } + + public IronChestTypeSimple getSource() { + return source; + } + + public boolean canUpgrade(IronChestTypeSimple from) { + return from == this.source; + } + + public int getTarget(int meta) { + return this.upgradeChain[meta].ordinal(); + } + + public String getTargetName(int meta) { + return this.upgradeChain[meta].getName(); + } + + public ItemChestChanger buildItem() { + item = new ItemChestChanger(this); + GameRegistry.registerItem(item, itemName); + if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) { + for (int i = 0; i < this.upgradeChain.length; i ++) { + String targetName = this.upgradeChain[i].getName().substring(0, 1).toUpperCase() + this.upgradeChain[i].getName().substring(1); + ModelHelper.registerItem(item, i, itemName + targetName); + } + } + return item; + } + + public void addRecipes() { + Object sourceMaterial = this.source.toObject(); + Object targetMaterial = this.upgradeChain[0].toObject(); + IronChestType.addRecipe(new ItemStack(item), recipe[0], 's', sourceMaterial, 't', targetMaterial, 'G', "blockGlass", 'O', Blocks.obsidian); + for (int i = 1; i < this.upgradeChain.length; i ++) { + targetMaterial = this.upgradeChain[i].toObject(); + IronChestType.addRecipe(new ItemStack(item, 1, i), recipe[i], 's', new ItemStack(this.item, 1, i - 1), 't', targetMaterial, 'G', "blockGlass", 'O', Blocks.obsidian); + } + } + + public static void buildItems() { + for (ChestChangerType type : values()) { + type.buildItem(); + } + } + + public static void generateRecipes() { + for (ChestChangerType item : values()) { + item.addRecipes(); + } + } } diff --git a/src/main/java/cpw/mods/ironchest/IronChest.java b/src/main/java/cpw/mods/ironchest/IronChest.java index 9898ce72..8a33c090 100755 --- a/src/main/java/cpw/mods/ironchest/IronChest.java +++ b/src/main/java/cpw/mods/ironchest/IronChest.java @@ -10,14 +10,7 @@ ******************************************************************************/ package cpw.mods.ironchest; -import io.netty.buffer.ByteBuf; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderFireball; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.entity.projectile.EntitySmallFireball; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.client.registry.IRenderFactory; -import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.Mod.Instance; @@ -25,12 +18,7 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; @Mod(modid = "IronChest", name = "Iron Chests", dependencies = "required-after:Forge@[11.15.0,12.0]", acceptedMinecraftVersions="[1.8,1.8.9]") public class IronChest diff --git a/src/main/java/cpw/mods/ironchest/IronChestType.java b/src/main/java/cpw/mods/ironchest/IronChestType.java index 6dd83b3a..8c5bb93a 100755 --- a/src/main/java/cpw/mods/ironchest/IronChestType.java +++ b/src/main/java/cpw/mods/ironchest/IronChestType.java @@ -26,18 +26,19 @@ public enum IronChestType implements IStringSerializable { - IRON(54, 9, true, "Iron Chest", "ironchest.png", 0, Arrays.asList("ingotIron", "ingotRefinedIron"), TileEntityIronChest.class, "mmmmPmmmm", "mGmG3GmGm"), - GOLD(81, 9, true, "Gold Chest", "goldchest.png", 1, Arrays.asList("ingotGold"), TileEntityGoldChest.class, "mmmmPmmmm", "mGmG4GmGm"), - DIAMOND(108, 12, true, "Diamond Chest", "diamondchest.png", 2, Arrays.asList("gemDiamond"), TileEntityDiamondChest.class, "GGGmPmGGG", "GGGG4Gmmm"), - COPPER(45, 9, false, "Copper Chest", "copperchest.png", 3, Arrays.asList("ingotCopper"), TileEntityCopperChest.class, "mmmmCmmmm"), + IRON(54, 9, true, "Iron Chest", "ironchest.png", 0, Arrays.asList("ingotIron", "ingotRefinedIron"), TileEntityIronChest.class, "mmmmPmmmm", "mGmG3GmGm"), + GOLD(81, 9, true, "Gold Chest", "goldchest.png", 1, Arrays.asList("ingotGold"), TileEntityGoldChest.class, "mmmmPmmmm", "mGmG4GmGm"), + DIAMOND(108, 12, true, "Diamond Chest", "diamondchest.png", 2, Arrays.asList("gemDiamond"), TileEntityDiamondChest.class, "GGGmPmGGG", "GGGG4Gmmm"), + COPPER(45, 9, false, "Copper Chest", "copperchest.png", 3, Arrays.asList("ingotCopper"), TileEntityCopperChest.class, "mmmmCmmmm"), SILVER(72, 9, false, "Silver Chest", "silverchest.png", 4, Arrays.asList("ingotSilver"), TileEntitySilverChest.class, "mmmm3mmmm", "mGmG0GmGm"), CRYSTAL(108, 12, true, "Crystal Chest", "crystalchest.png", 5, Arrays.asList("blockGlass"), TileEntityCrystalChest.class, "GGGGPGGGG"), OBSIDIAN(108, 12, false, "Obsidian Chest", "obsidianchest.png", 6, Arrays.asList("obsidian"), TileEntityObsidianChest.class, "mmmm2mmmm"), DIRTCHEST9000(1, 1, false, "Dirt Chest 9000", "dirtchest.png",7,Arrays.asList("dirt"), TileEntityDirtChest.class,Item.getItemFromBlock(Blocks.dirt),"mmmmCmmmm"), - WOOD(0, 0, false, "", "", -1, Arrays.asList("plankWood"), null); + WOOD(0, 0, false, "", "", -1, Arrays.asList("plankWood"), null); int size; private int rowLength; public String friendlyName; + public String tierName; private boolean tieredChest; private String modelTexture; private int textureRow; @@ -58,6 +59,7 @@ public enum IronChestType implements IStringSerializable this.rowLength = rowLength; this.tieredChest = tieredChest; this.friendlyName = friendlyName; + this.tierName = friendlyName.replace(" Chest", "").replace(" 9000", ""); this.modelTexture = modelTexture; this.textureRow = textureRow; this.clazz = clazz; diff --git a/src/main/java/cpw/mods/ironchest/IronChestTypeSimple.java b/src/main/java/cpw/mods/ironchest/IronChestTypeSimple.java new file mode 100644 index 00000000..047414be --- /dev/null +++ b/src/main/java/cpw/mods/ironchest/IronChestTypeSimple.java @@ -0,0 +1,33 @@ +package cpw.mods.ironchest; + +import net.minecraft.init.Blocks; + + +public enum IronChestTypeSimple { + IRON("ingotIron"), + GOLD("ingotGold"), + DIAMOND("gemDiamond"), + COPPER("ingotCopper"), + SILVER("ingotSilver"), + CRYSTAL("blockGlass"), + OBSIDIAN("obsidian"), + DIRTCHEST9000("dirt"), + WOOD("plankWood"); + + private String material; + + IronChestTypeSimple(String material) { + this.material = material; + } + + public String getMaterial() { return this.material; } + public Object toObject() { + if (this == OBSIDIAN) return Blocks.obsidian; + if (this == DIRTCHEST9000) return Blocks.dirt; + return this.material; + } + + public String getName() { + return name().toLowerCase(); + } +} \ No newline at end of file diff --git a/src/main/java/cpw/mods/ironchest/ItemChestChanger.java b/src/main/java/cpw/mods/ironchest/ItemChestChanger.java index b080f890..f74dbccb 100755 --- a/src/main/java/cpw/mods/ironchest/ItemChestChanger.java +++ b/src/main/java/cpw/mods/ironchest/ItemChestChanger.java @@ -10,7 +10,10 @@ ******************************************************************************/ package cpw.mods.ironchest; +import java.util.List; + import net.minecraft.block.BlockChest; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -20,88 +23,88 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemChestChanger extends Item -{ - private ChestChangerType type; - - public ItemChestChanger(ChestChangerType type) - { - this.type = type; - - this.setMaxStackSize(1); - this.setUnlocalizedName("ironchest:" + type.name()); - this.setCreativeTab(CreativeTabs.tabMisc); - } - - @Override - public boolean onItemUseFirst (ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) - { - if (world.isRemote) - return false; - if(this.type.canUpgrade(IronChestType.WOOD)){ - if(!(world.getBlockState(pos).getBlock() instanceof BlockChest)){ - return false; - } - }else{ - if(world.getBlockState(pos) != IronChest.ironChestBlock.getStateFromMeta(IronChestType.valueOf(type.getSource().getName().toUpperCase()).ordinal())){ - return false; - } - } - TileEntity te = world.getTileEntity(pos); - TileEntityIronChest newchest = new TileEntityIronChest(); - ItemStack[] chestContents = new ItemStack[27]; - if (te != null) - { - if (te instanceof TileEntityIronChest) - { - chestContents = ((TileEntityIronChest) te).chestContents; - newchest = IronChestType.makeEntity(this.getTargetChestOrdinal(this.type.ordinal())); - if (newchest == null) - return false; - } - else if (te instanceof TileEntityChest) - { - if (((TileEntityChest) te).numPlayersUsing > 0) - return false; - if (!getType().canUpgrade(IronChestType.WOOD)) - return false; - chestContents = new ItemStack[((TileEntityChest) te).getSizeInventory()]; - for (int i = 0; i < chestContents.length; i++) - chestContents[i] = ((TileEntityChest) te).getStackInSlot(i); - newchest = IronChestType.makeEntity(this.getTargetChestOrdinal(this.type.ordinal())); - } - } - - te.updateContainingBlockInfo(); - if (te instanceof TileEntityChest) - ((TileEntityChest) te).checkForAdjacentChests(); - - world.removeTileEntity(pos); - world.setBlockToAir(pos); - - world.setTileEntity(pos, newchest); - world.setBlockState(pos, IronChest.ironChestBlock.getStateFromMeta(newchest.getType().ordinal()), 3); - - world.markBlockForUpdate(pos); - - TileEntity te2 = world.getTileEntity(pos); - if (te2 instanceof TileEntityIronChest) - { - ((TileEntityIronChest) te2).setContents(chestContents); - } - - stack.stackSize = player.capabilities.isCreativeMode ? stack.stackSize : stack.stackSize - 1; - return true; - } - - public int getTargetChestOrdinal(int sourceOrdinal) - { - return type.getTarget(); - } - - public ChestChangerType getType() - { - return type; - } +public class ItemChestChanger extends Item { + private ChestChangerType type; + + public ItemChestChanger(ChestChangerType type) { + this.type = type; + + this.setHasSubtypes(true); + this.setMaxStackSize(1); + this.setUnlocalizedName("ironchest:" + type.name()); + this.setCreativeTab(CreativeTabs.tabMisc); + } + + @Override public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { + if (world.isRemote) return false; + if (this.type.canUpgrade(IronChestTypeSimple.WOOD)) { + if (!(world.getBlockState(pos).getBlock() instanceof BlockChest)) { return false; } + } else { + if (world.getBlockState(pos) != IronChest.ironChestBlock.getStateFromMeta(IronChestType.valueOf(type.getSource().getName().toUpperCase()).ordinal())) { return false; } + } + TileEntity te = world.getTileEntity(pos); + TileEntityIronChest newchest = new TileEntityIronChest(); + ItemStack[] chestContents = new ItemStack[27]; + int chestFacing = 0; + if (te != null) { + if (te instanceof TileEntityIronChest) { + chestContents = ((TileEntityIronChest) te).chestContents; + chestFacing = ((TileEntityIronChest) te).getFacing(); + newchest = IronChestType.makeEntity(this.getTargetChestOrdinal(this.type.ordinal(), stack.getItemDamage())); + if (newchest == null) return false; + } else if (te instanceof TileEntityChest) { + IBlockState chestState = world.getBlockState(pos); + EnumFacing facing = chestState.getValue(BlockChest.FACING); + if (facing == EnumFacing.NORTH) chestFacing = 2; + if (facing == EnumFacing.EAST) chestFacing = 5; + if (facing == EnumFacing.SOUTH) chestFacing = 3; + if (facing == EnumFacing.WEST) chestFacing = 4; + if (((TileEntityChest) te).numPlayersUsing > 0) return false; + if (!getType().canUpgrade(IronChestTypeSimple.WOOD)) return false; + chestContents = new ItemStack[((TileEntityChest) te).getSizeInventory()]; + for (int i = 0; i < chestContents.length; i ++) + chestContents[i] = ((TileEntityChest) te).getStackInSlot(i); + newchest = IronChestType.makeEntity(this.getTargetChestOrdinal(this.type.ordinal(), stack.getItemDamage())); + } + } + + te.updateContainingBlockInfo(); + if (te instanceof TileEntityChest) ((TileEntityChest) te).checkForAdjacentChests(); + + world.removeTileEntity(pos); + world.setBlockToAir(pos); + + world.setTileEntity(pos, newchest); + world.setBlockState(pos, IronChest.ironChestBlock.getStateFromMeta(newchest.getType().ordinal()), 3); + + world.markBlockForUpdate(pos); + + TileEntity te2 = world.getTileEntity(pos); + if (te2 instanceof TileEntityIronChest) { + ((TileEntityIronChest) te2).setContents(chestContents); + ((TileEntityIronChest) te2).setFacing((byte) chestFacing); + } + + stack.stackSize = player.capabilities.isCreativeMode ? stack.stackSize : stack.stackSize - 1; + return true; + } + + @Override @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs tab, List list) { + for (int i = 0; i < this.type.upgradeChain.length; i ++) list.add(new ItemStack(item, 1, i)); + } + + @Override public String getUnlocalizedName(ItemStack stack) { + return super.getUnlocalizedName(stack) + "_" + this.type.getTargetName(stack.getItemDamage()).toUpperCase(); + } + + public int getTargetChestOrdinal(int sourceOrdinal, int meta) { + return type.getTarget(meta); + } + + public ChestChangerType getType() { + return type; + } } diff --git a/src/main/java/cpw/mods/ironchest/client/ModelHelper.java b/src/main/java/cpw/mods/ironchest/client/ModelHelper.java index 9fb7a35c..ef39fab8 100644 --- a/src/main/java/cpw/mods/ironchest/client/ModelHelper.java +++ b/src/main/java/cpw/mods/ironchest/client/ModelHelper.java @@ -10,35 +10,41 @@ ******************************************************************************/ package cpw.mods.ironchest.client; -import net.minecraft.block.Block; +import java.util.ArrayList; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemModelMesher; +import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class ModelHelper -{ - public static void registerItem(Item item, int metadata, String itemName) - { - ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher(); - mesher.register(item, metadata, new ModelResourceLocation(itemName, "inventory")); - } - - public static void registerBlock(Block block, int metadata, String blockName) - { - registerItem(Item.getItemFromBlock(block), metadata, blockName); - } - - public static void registerBlock(Block block, String blockName) - { - registerBlock(block, 0, blockName); - } - - public static void registerItem(Item item, String itemName) - { - registerItem(item, 0, itemName); - } -} + public class ModelHelper { + public static void registerItemInternal(Item item, String[] registryNames, int[] registryMetas) { + if (registryNames.length != registryMetas.length) { return; } + ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher(); + for (int i = 0; i < registryNames.length; i ++) { + mesher.register(item, registryMetas[i], new ModelResourceLocation("ironchest:" + registryNames[i], "inventory")); + } + } + + public static void registerItem(Item item, String[] registryNames, int[] registryMetas) { + ModelBakery.registerItemVariants(item, generateVariants(registryNames)); + registerItemInternal(item, registryNames, registryMetas); + } + + public static void registerItem(Item item, int meta, String registryName) { + registerItem(item, new String[] {registryName}, new int[] {meta}); + } + + static ResourceLocation[] generateVariants(String[] registryNames) { + ArrayList ret = new ArrayList(); + for (String aString : registryNames) { + ret.add(new ResourceLocation("ironchest", aString.contains("ironchest:") ? aString.replace("ironchest:", "") : aString)); + } + return ret.toArray(new ResourceLocation[] {}); + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ironchest/lang/en_US.lang b/src/main/resources/assets/ironchest/lang/en_US.lang index c848ed80..5bfc86ce 100755 --- a/src/main/resources/assets/ironchest/lang/en_US.lang +++ b/src/main/resources/assets/ironchest/lang/en_US.lang @@ -7,19 +7,28 @@ tile.ironchest:CRYSTAL.name=Crystal Chest tile.ironchest:OBSIDIAN.name=Obsidian Chest tile.ironchest:DIRTCHEST9000.name=DirtChest 9000! -item.ironchest:IRONGOLD.name=Iron to Gold Chest Upgrade -item.ironchest:GOLDDIAMOND.name=Gold to Diamond Chest Upgrade -item.ironchest:COPPERSILVER.name=Copper to Silver Chest Upgrade -item.ironchest:SILVERGOLD.name=Silver to Gold Chest Upgrade -item.ironchest:COPPERIRON.name=Copper to Iron Chest Upgrade -item.ironchest:DIAMONDCRYSTAL.name=Diamond to Crystal Chest Upgrade -item.ironchest:WOODIRON.name=Wood to Iron Chest Upgrade -item.ironchest:WOODCOPPER.name=Wood to Copper Chest Upgrade -item.ironchest:DIAMONDOBSIDIAN.name=Diamond to Obsidian Chest Upgrade +item.ironchest:WOOD_UPGRADE_IRON.name=Wood to Iron Chest Upgrade +item.ironchest:WOOD_UPGRADE_GOLD.name=Wood to Gold Chest Upgrade +item.ironchest:WOOD_UPGRADE_DIAMOND.name=Wood to Diamond Chest Upgrade +item.ironchest:WOOD_UPGRADE_OBSIDIAN.name=Wood to Obsidian Chest Upgrade +item.ironchest:IRON_UPGRADE_GOLD.name=Iron to Gold Chest Upgrade +item.ironchest:IRON_UPGRADE_DIAMOND.name=Iron to Diamond Chest Upgrade +item.ironchest:IRON_UPGRADE_OBSIDIAN.name=Iron to Obsidian Chest Upgrade +item.ironchest:GOLD_UPGRADE_DIAMOND.name=Gold to Diamond Chest Upgrade +item.ironchest:GOLD_UPGRADE_OBSIDIAN.name=Gold to Obsidian Chest Upgrade +item.ironchest:DIAMOND_OBSIDIAN_UPGRADE_OBSIDIAN.name=Diamond to Obsidian Chest Upgrade +item.ironchest:DIAMOND_CRYSTAL_UPGRADE_CRYSTAL.name=Diamond to Crystal Chest Upgrade +item.ironchest:COPPER_UPGRADE_IRON.name=Copper to Iron Chest Upgrade +item.ironchest:COPPER_UPGRADE_GOLD.name=Copper to Gold Chest Upgrade +item.ironchest:COPPER_UPGRADE_DIAMOND.name=Copper to Diamond Chest Upgrade +item.ironchest:COPPER_UPGRADE_OBSIDIAN.name=Copper to Obsidian Chest Upgrade +item.ironchest:SILVER_UPGRADE_GOLD.name=Silver to Gold Chest Upgrade +item.ironchest:SILVER_UPGRADE_DIAMOND.name=Silver to Diamond Chest Upgrade +item.ironchest:SILVER_UPGRADE_OBSIDIAN.name=Silver to Obsidian Chest Upgrade book.ironchest:dirtchest9000.title=How to use your DirtChest 9000! book.ironchest:dirtchest9000.page1=Welcome to your new DirtChest 9000! We hope you will enjoy many happy years of storing your stack of dirt in our storage utility. book.ironchest:dirtchest9000.page2=Usage: simply insert the stack of dirt of your choice into the highly receptive slot and enjoy the great convenience of having that dirt available to you, any time you pass by this chest! book.ironchest:dirtchest9000.page3=We hope you have enjoyed reviewing this instruction manual, and hope you will consider using our products in future! Kind regards, The DirtChest 9000 manual writers incorporated. book.ironchest:dirtchest9000.page4=Warranty: This product has no warranty of any kind. Your dirt may not be stored, it may slowly leech into the environment, or alternatively, it may not do anything at all. -book.ironchest:dirtchest9000.page5=DirtChest 9000 is kind to the environment. Please dispose of this guide book responsibly, and do not whatever you do just chuck it into some lava. We would be very sad. +book.ironchest:dirtchest9000.page5=DirtChest 9000 is kind to the environment. Please dispose of this guide book responsibly, and do not whatever you do just chuck it into some lava. We would be very sad. \ No newline at end of file diff --git a/src/main/resources/assets/ironchest/models/item/copperUpgradeDiamond.json b/src/main/resources/assets/ironchest/models/item/copperUpgradeDiamond.json new file mode 100644 index 00000000..eeb9cb96 --- /dev/null +++ b/src/main/resources/assets/ironchest/models/item/copperUpgradeDiamond.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "ironchest:items/copperChest", + "layer1": "ironchest:items/diamondUpgrade" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/ironchest/models/item/diamondObsidianUpgrade.json b/src/main/resources/assets/ironchest/models/item/copperUpgradeGold.json similarity index 80% rename from src/main/resources/assets/ironchest/models/item/diamondObsidianUpgrade.json rename to src/main/resources/assets/ironchest/models/item/copperUpgradeGold.json index 04e94ba3..c93d07bc 100644 --- a/src/main/resources/assets/ironchest/models/item/diamondObsidianUpgrade.json +++ b/src/main/resources/assets/ironchest/models/item/copperUpgradeGold.json @@ -1,18 +1,19 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "ironchest:items/diamondObsidianUpgrade" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } - } -} +{ + "parent": "builtin/generated", + "textures": { + "layer0": "ironchest:items/copperChest", + "layer1": "ironchest:items/goldUpgrade" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/ironchest/models/item/copperUpgradeIron.json b/src/main/resources/assets/ironchest/models/item/copperUpgradeIron.json new file mode 100644 index 00000000..26e24524 --- /dev/null +++ b/src/main/resources/assets/ironchest/models/item/copperUpgradeIron.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "ironchest:items/copperChest", + "layer1": "ironchest:items/ironUpgrade" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/ironchest/models/item/copperUpgradeObsidian.json b/src/main/resources/assets/ironchest/models/item/copperUpgradeObsidian.json new file mode 100644 index 00000000..b0366a2c --- /dev/null +++ b/src/main/resources/assets/ironchest/models/item/copperUpgradeObsidian.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "ironchest:items/copperChest", + "layer1": "ironchest:items/obsidianUpgrade" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/ironchest/models/item/diamondCrystalUpgradeCrystal.json b/src/main/resources/assets/ironchest/models/item/diamondCrystalUpgradeCrystal.json new file mode 100644 index 00000000..2b64b50f --- /dev/null +++ b/src/main/resources/assets/ironchest/models/item/diamondCrystalUpgradeCrystal.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "ironchest:items/diamondChest", + "layer1": "ironchest:items/crystalUpgrade" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/ironchest/models/item/diamondObsidianUpgradeObsidian.json b/src/main/resources/assets/ironchest/models/item/diamondObsidianUpgradeObsidian.json new file mode 100644 index 00000000..ad163b04 --- /dev/null +++ b/src/main/resources/assets/ironchest/models/item/diamondObsidianUpgradeObsidian.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "ironchest:items/diamondChest", + "layer1": "ironchest:items/obsidianUpgrade" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/ironchest/models/item/goldDiamondUpgrade.json b/src/main/resources/assets/ironchest/models/item/goldDiamondUpgrade.json deleted file mode 100755 index 0a0e6269..00000000 --- a/src/main/resources/assets/ironchest/models/item/goldDiamondUpgrade.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "ironchest:items/goldDiamondUpgrade" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } - } -} diff --git a/src/main/resources/assets/ironchest/models/item/goldUpgradeDiamond.json b/src/main/resources/assets/ironchest/models/item/goldUpgradeDiamond.json new file mode 100644 index 00000000..df0e889b --- /dev/null +++ b/src/main/resources/assets/ironchest/models/item/goldUpgradeDiamond.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "ironchest:items/goldChest", + "layer1": "ironchest:items/diamondUpgrade" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/ironchest/models/item/goldUpgradeObsidian.json b/src/main/resources/assets/ironchest/models/item/goldUpgradeObsidian.json new file mode 100644 index 00000000..458e5178 --- /dev/null +++ b/src/main/resources/assets/ironchest/models/item/goldUpgradeObsidian.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "ironchest:items/goldChest", + "layer1": "ironchest:items/obsidianUpgrade" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/ironchest/models/item/ironGoldUpgrade.json b/src/main/resources/assets/ironchest/models/item/ironGoldUpgrade.json deleted file mode 100755 index 4579f8a4..00000000 --- a/src/main/resources/assets/ironchest/models/item/ironGoldUpgrade.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "ironchest:items/ironGoldUpgrade" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } - } -} diff --git a/src/main/resources/assets/ironchest/models/item/ironUpgradeDiamond.json b/src/main/resources/assets/ironchest/models/item/ironUpgradeDiamond.json new file mode 100644 index 00000000..ee5f076b --- /dev/null +++ b/src/main/resources/assets/ironchest/models/item/ironUpgradeDiamond.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "ironchest:items/ironChest", + "layer1": "ironchest:items/diamondUpgrade" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/ironchest/models/item/copperIronUpgrade.json b/src/main/resources/assets/ironchest/models/item/ironUpgradeGold.json similarity index 80% rename from src/main/resources/assets/ironchest/models/item/copperIronUpgrade.json rename to src/main/resources/assets/ironchest/models/item/ironUpgradeGold.json index 3ef545ee..84310029 100644 --- a/src/main/resources/assets/ironchest/models/item/copperIronUpgrade.json +++ b/src/main/resources/assets/ironchest/models/item/ironUpgradeGold.json @@ -1,18 +1,19 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "ironchest:items/copperIronUpgrade" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } - } -} +{ + "parent": "builtin/generated", + "textures": { + "layer0": "ironchest:items/ironChest", + "layer1": "ironchest:items/goldUpgrade" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/ironchest/models/item/ironUpgradeObsidian.json b/src/main/resources/assets/ironchest/models/item/ironUpgradeObsidian.json new file mode 100644 index 00000000..36e5ca98 --- /dev/null +++ b/src/main/resources/assets/ironchest/models/item/ironUpgradeObsidian.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "ironchest:items/ironChest", + "layer1": "ironchest:items/obsidianUpgrade" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/ironchest/models/item/silverGoldUpgrade.json b/src/main/resources/assets/ironchest/models/item/silverGoldUpgrade.json deleted file mode 100755 index 62351b24..00000000 --- a/src/main/resources/assets/ironchest/models/item/silverGoldUpgrade.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "ironchest:items/silverGoldUpgrade" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } - } -} diff --git a/src/main/resources/assets/ironchest/models/item/silverUpgradeDiamond.json b/src/main/resources/assets/ironchest/models/item/silverUpgradeDiamond.json new file mode 100644 index 00000000..88b90c8a --- /dev/null +++ b/src/main/resources/assets/ironchest/models/item/silverUpgradeDiamond.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "ironchest:items/silverChest", + "layer1": "ironchest:items/diamondUpgrade" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/ironchest/models/item/silverUpgradeGold.json b/src/main/resources/assets/ironchest/models/item/silverUpgradeGold.json new file mode 100644 index 00000000..13d34e40 --- /dev/null +++ b/src/main/resources/assets/ironchest/models/item/silverUpgradeGold.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "ironchest:items/silverChest", + "layer1": "ironchest:items/goldUpgrade" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/ironchest/models/item/silverUpgradeObsidian.json b/src/main/resources/assets/ironchest/models/item/silverUpgradeObsidian.json new file mode 100644 index 00000000..6d5d0849 --- /dev/null +++ b/src/main/resources/assets/ironchest/models/item/silverUpgradeObsidian.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "ironchest:items/silverChest", + "layer1": "ironchest:items/obsidianUpgrade" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/ironchest/models/item/woodCopperUpgrade.json b/src/main/resources/assets/ironchest/models/item/woodCopperUpgrade.json deleted file mode 100644 index 51918f77..00000000 --- a/src/main/resources/assets/ironchest/models/item/woodCopperUpgrade.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "ironchest:items/woodCopperUpgrade" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } - } -} diff --git a/src/main/resources/assets/ironchest/models/item/woodIronUpgrade.json b/src/main/resources/assets/ironchest/models/item/woodIronUpgrade.json deleted file mode 100644 index 84e149dc..00000000 --- a/src/main/resources/assets/ironchest/models/item/woodIronUpgrade.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "ironchest:items/woodIronUpgrade" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } - } -} diff --git a/src/main/resources/assets/ironchest/models/item/woodUpgradeDiamond.json b/src/main/resources/assets/ironchest/models/item/woodUpgradeDiamond.json new file mode 100644 index 00000000..a6c66baf --- /dev/null +++ b/src/main/resources/assets/ironchest/models/item/woodUpgradeDiamond.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "ironchest:items/woodChest", + "layer1": "ironchest:items/diamondUpgrade" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/ironchest/models/item/copperSilverUpgrade.json b/src/main/resources/assets/ironchest/models/item/woodUpgradeGold.json old mode 100755 new mode 100644 similarity index 80% rename from src/main/resources/assets/ironchest/models/item/copperSilverUpgrade.json rename to src/main/resources/assets/ironchest/models/item/woodUpgradeGold.json index 01941656..d820ecd9 --- a/src/main/resources/assets/ironchest/models/item/copperSilverUpgrade.json +++ b/src/main/resources/assets/ironchest/models/item/woodUpgradeGold.json @@ -1,18 +1,19 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "ironchest:items/copperSilverUpgrade" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } - } -} +{ + "parent": "builtin/generated", + "textures": { + "layer0": "ironchest:items/woodChest", + "layer1": "ironchest:items/goldUpgrade" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/ironchest/models/item/diamondCrystalUpgrade.json b/src/main/resources/assets/ironchest/models/item/woodUpgradeIron.json similarity index 80% rename from src/main/resources/assets/ironchest/models/item/diamondCrystalUpgrade.json rename to src/main/resources/assets/ironchest/models/item/woodUpgradeIron.json index 846f6e92..be0be39b 100644 --- a/src/main/resources/assets/ironchest/models/item/diamondCrystalUpgrade.json +++ b/src/main/resources/assets/ironchest/models/item/woodUpgradeIron.json @@ -1,18 +1,19 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "ironchest:items/diamondCrystalUpgrade" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } - } -} +{ + "parent": "builtin/generated", + "textures": { + "layer0": "ironchest:items/woodChest", + "layer1": "ironchest:items/ironUpgrade" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/ironchest/models/item/woodUpgradeObsidian.json b/src/main/resources/assets/ironchest/models/item/woodUpgradeObsidian.json new file mode 100644 index 00000000..259e1f7c --- /dev/null +++ b/src/main/resources/assets/ironchest/models/item/woodUpgradeObsidian.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "ironchest:items/woodChest", + "layer1": "ironchest:items/obsidianUpgrade" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/ironchest/textures/items/copperChest.png b/src/main/resources/assets/ironchest/textures/items/copperChest.png new file mode 100644 index 0000000000000000000000000000000000000000..7c53675157df8951b25be9eaa4ff0a730fb4591a GIT binary patch literal 511 zcmVnnp{7{>RX5i>;6 zQkz4DB4s3_#cRmW7~5FdVuzxnhev77P3{;4Klrp@d93V{vQ z!SkUNm-8*+fQ#8C-0eun`Nom+j1h)1UIVh*qsaRv5S?ih2SiQv$WZ%fw;rj@L8P1m zxLxm~PP&nF^de!GM^K6bBGW2Xlydg7!la#MU+w(H+Fl9ZO8yvM>tg2EiWV^{h+8{o zC6+bpE<*o`Fd$^CB10`RRaOeEoM|62R&xRriciYn4vYqo>y!Wh002ovPDHLkV1k-( B&iViV literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ironchest/textures/items/copperIronUpgrade.png b/src/main/resources/assets/ironchest/textures/items/copperIronUpgrade.png deleted file mode 100755 index 7bb215937bcfe3c5e4820ec26540800a914e008f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 480 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5ln4*- z32_C|eG3-edh_<`^B3nIKDzMe@rhfvPu{+B;L_!Tm#^$Cw_lfMwd2(3?I%xNTU35@ zYTo*Tht5n+?dxva(;mBg=dP{w!OKg1=5O3IW7X>ED_2cgvUK9&CIA2bkL5aM1vHwm zB*-tA!Qt7BG!Q4r+ucQG4vQl@ki%Kv5n0T@z%2~Ij105pNB{-1JY5_^Brb=ZeJ#`= zAmSDn|DvfY$m{+8c@u?xw45bDP46hOx7_4S6Fo+k-*%fF5ln4*- z32_C|Gv~~F`r_$>#}97Zy>hQ6{hmIb)wy6B* z)Vy7Lcb%D>+SlE-r#*Jl)=gXMgO`{3tXjKj@v_B>mM)sRVD6mxbN>JT|1-}lA80gV zNswPKgTu2MX&_FLx4VnX92Q4*AcwQSBeIx*fm;}a85w5HkpK#2dAc};NL&s*`&y_$ zK*TLD{zX$)kk|YF^Ck-YZcm(R+&n?XLv~h_gQhNPPw}xj$J<*s>M;CD z%0xUkr|sG==HxS*4n_SwBo@w|(7^COFXsXhC%9DbQNdrV?VdeplA#~#L#$!sfc zHwbG2ZB;FCjVMV;EJ?LWE=mPb3`Pcq#<~WEx<*DJhGtfV=2oVbx(23J1_n!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z%2yAjF;}# z{Q(L}l(rIsj|=o#o)NSpZG0IJFIba4!^@K06{Q;Dhj zEpbXkmcjIY`=uq)OqY3>U)1bji2S&--~Q$TpGQ23Phy(d7)1ZDNj9w$IKuwux5lIY z|NkHF+$hPAs>EQ{YhaVbFqOyQct9>kgRin)k7z=02X`{-4UtEORx~s+GWk~^KJtT@9*KhkeW(ifNa2=~bPD=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15(WW2 zA+A6=;qu#aAAbT#2vR=uOk(HVJ70hAdGme!%Wu(_-b{M|(eHvL>4nJa0`PlBg3pY5l7qL^=$uSCgK^l}D7K^}jSS4p3>8f>=Y^vAP6CZqEpd$~Nl7e8wMs5Z1yT$~ z28PDE28OyuMj?h~R)*$Qrk1(}rd9?9Pc2e^qG-s?PsvQH#I0dU>RnJ6F?hQAxvX45bDP46hOx7_4S6Fo+k-*%fF5l<*7i z32_C|78Vx4!NGxnf&Tvf0RaI%K0dy_zFuBl%7>mw?7Zvl?(XL1cIWHwJ#W6dxVWr; z`7Qd=n@JBpJ32ac-20e&{hghiowc>KrKRQn|Npo2e>Ve~$XF8O7tG-B>_!@hljQC0 zBKan7YX^|SS>O>_%)r1c48n{Iv*t(u1yem;977~7hn~7A)gU0ymRKK>u~GEy|EX@= z&#Y%0-_yKNN`jYJwBTHIqlCNStb|$1gG3pEPT72pw$0Re{psG-uv>{eKMzK|wsGQ+ zm$58YI(Fml202YtuIsE^46Sq0WT#wVU%Tm^=TbKHV<)@2fEKEjxJHzuB$lLFB^RXv zDF!10Lt|Y7LtP`I5JNL7Lvt%rOI-s~D+7b47O6i`H00)|WTsW()-WaYE+|YHJYD@< J);T3K0RW!Umcal3 diff --git a/src/main/resources/assets/ironchest/textures/items/diamondUpgrade.png b/src/main/resources/assets/ironchest/textures/items/diamondUpgrade.png new file mode 100644 index 0000000000000000000000000000000000000000..83020b9fad9794a834fb3393f640f6984f346a0c GIT binary patch literal 351 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z%2yAjF;}# z{Q(L}l(rIsj|=o#o)NSpZG0IJ#O>Eak-;h(G^wqnlC zkMgHfWE)K0|M~jgKC-RBWbLn?@_n90EK4e$_5c6>+`+Je_mGPuQ_z)9fB*k4Q((LJ zV#WeR1y+MOpTGY9U!&nB)~=PB@Zq4t+x-$|nbU*36JsGVlmo8ABKbzCjSvXe#*j}OTjgxS~6wqd?t7$VJ-aJhp! pne~RqqeBslX01C6v=V^+UN3Vz(~;@L6rkf7JYD@<);T3K0RRV(ff4`! literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ironchest/textures/items/goldChest.png b/src/main/resources/assets/ironchest/textures/items/goldChest.png new file mode 100644 index 0000000000000000000000000000000000000000..d522f3dced8beb5d29fd16d703995ef09a83f590 GIT binary patch literal 511 zcmVl6Ilr$dbUocV9R-RIi* zUH{#?Ni6{Wg=%;*57qEw9;)HVJXFJzd8mdb^JrvpTEJYmo6&`t1v7l}`Ud`xk`J%eFW9FArwzd zD4z+4Cke@IVkKr=R6Df`>>eYejFr(3akCGFT_c=s9iozfAs`|Om~zQ`Dh2+K36&=+ z&hLA0`Opg~X@JYyg7RH^;|8UhR(JzC^#a!{Vdtm?xdTGB_{~;Phs-`9cc_EYuWqvLIYC&8D?~(Uz5zG#Pg#sg zgvB*NcwPB!%rRxwEEuyf!TAFwH~E~$ne(@R=mP=h-@@#lbAA8-002ovPDHLkV1l6| B(l`JB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ironchest/textures/items/goldDiamondUpgrade.png b/src/main/resources/assets/ironchest/textures/items/goldDiamondUpgrade.png deleted file mode 100755 index 028e2d8b9153d7ee8ec3965fec826059501ff760..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 480 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5ln4*- z32_C|Drau&{Plm;&;K)j{GapVf6Mp(?ce|BeEpyQ_5aE)hB@^Npm7DsjJqJVC}oc2<;wrY>tw@v%C`+gms4F#Jm7NZ-+|&S|>J zL_9dB?b$W%Y%6a! z2x|guRV{IiC`m~yNwrEYN(E93Mh1q)x(0^2Mn)lqW>$vgR;HG^2Bua922U+gf1+r} b%}>cptHiBgO6pxu2s3!P`njxgN@xNArGu{V diff --git a/src/main/resources/assets/ironchest/textures/items/goldUpgrade.png b/src/main/resources/assets/ironchest/textures/items/goldUpgrade.png new file mode 100644 index 0000000000000000000000000000000000000000..918861df55205765bbd979853939427faba16024 GIT binary patch literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z%2yAjF;}# z{Q(L}l(rIsj|=o#o)NSpZG0IE6Z>Eak-;Xk)Wk-sTG zq?J>|^HzpXubHQW$q#GZSq4I;J8jK*k`BJy;?dl|#*uftT>im~>fnm<-(~OLo%^|E z+2*;~8t1<`r#>;(@Lchw%FkQvt%}IGB=*Wj3f{;5sLe?e;<9~bcIm{kYL&cOD{p+O z=VaA-^jYBJ(gpv-9U1HwCW!C|$Xe9YcU?WA{Py zl|EE4sUEy%`e3*04{c}P1JkU^WVT(n%5s0o)ufcAW*+l%C)mwqe#@16ovWS8by&p zTLD2f!77D95wKVU11^aK0po&Ei81WH^Fr_k9H(`S&NQCnd$^f1XXYLoO91`_Q#3OT zrf6mwOwr6Vn4+0!Fhw)dFtxnK!yAs7tOuhI{2>!@Gh)tSAc7@_oA`fS{FIMee3`#u zG@IdeG(zQ~3B6uNBEP!4o6=B%Z;dUa0x zeL;2r=keq4yaBCtibD0|i+w`=s0Qu$3{G)_9pK=-P)ikL^fFSK4!KZ-q~;M%XCY;B zh$~sFxGYvMI!GA%6C^cqfuIDCyDTG>Z3q1OR_mz1}v;_ puselsI0Nw=a~82kJbwdhwm0(SA5fFqA5H)O002ovPDHLkV1kfE!Vmxe literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ironchest/textures/items/ironGoldUpgrade.png b/src/main/resources/assets/ironchest/textures/items/ironGoldUpgrade.png deleted file mode 100755 index 65cf6aee66a145641921297812d2a9320f0400ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 526 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l&B8y z32_C|M;9^t|KaiHv&)~)&fnkI{djBl{jL4?H};>NSbThH@#%^A$0rtVZX3M0V^B4F zUP1q)rzv|Gfhd1_1+}tm5W1qyv(-#-- zK6rVXz@=@1XV-F_S<8859oLEFEGL(lsUe{DK)Ap4~_Tagw~< zT{QM?*t!YG;VkfoEM{Qf76xHPhFNnYfPy8SE{-7*mqX9K7HU!uXiK!??G3rmSJ8K6 z*MI9APv?qygAZ@c9hkwb!xN~{@wi$4foIi|-41h%CO$pH+2G`5^>SU^)D`EhT7`?> z7Tx~)F@MzSU5>ZEO7n!+KFaLbzEFD4GRu~ye>oXnFXvk^sWKs0`pwPf;^n_N^E(=+ z07H~PwZt`|BqgyV)hf9t6-Y4{85kPt8W`#t8HE^{Ss9vJnOf=^m|7VaJhe#uiJ~Dl aKP5A*61Rpasdqu~!QkoY=d#Wzp$PzYfzD|F diff --git a/src/main/resources/assets/ironchest/textures/items/ironUpgrade.png b/src/main/resources/assets/ironchest/textures/items/ironUpgrade.png new file mode 100644 index 0000000000000000000000000000000000000000..14250cea7947c3514ad2a0ce5939cb6ca99427c4 GIT binary patch literal 335 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p>QK$!8;-MT+OLG}_)Usv{fY?1_8!j64!{5;QX|b z^2DN4hJwV*yb`^<)Di^~Jp(-pX%oL2Ks9SUT^vI!{O9%04)s_`#F|;j%Wc;AZ@<;FuPmYF9e>|%e|{y-zFX^3%RD#4 zn2KKU^?e|HQ{`aLN38`l(@UoRnVOKORGl)xzBuWhzbnIrrlVixITd-o_*Br9X~NF_ z(KOAa>4lJ?l4Av*Kc>OnGeXRm=Ec X!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z%2yAjF;}# z{Q(L}l(rIsj|=o#o)NSpZG0IHej>Eak-;Xk*hk&9JO zz_nIPbE!+`g#Z7iRrb#KUbc9<^>#nCyVXZ7duS%kd*A%{p7jP5i>$SR>s2E3mO890 zZ7~1j(X@1m(33gGtDmoD;qI1D{`lK|wG+buL7g^%1J(BTP8Xz_$2>S->Ar#GT2zy& z!7%}y#%r?@IHv?L?}==(F8+2luOex7?8hT!yB~FCxBOr@T9Vt(WYJLtbR2`HtDnm{ Hr-UW|yoPSF literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ironchest/textures/items/silverChest.png b/src/main/resources/assets/ironchest/textures/items/silverChest.png new file mode 100644 index 0000000000000000000000000000000000000000..223184117508c3cc61ed83f7530e118726ea2346 GIT binary patch literal 447 zcmV;w0YLtVP)phZ(}^rETpVaDBU;6l$Qy*j7z;?Hl8*H98n0hzrfXQ+qJLhH2U(ZNP*Hj0bE2Ll# z3~?SK$|8iT5CPvLxC>;JixtGW;*#Jt3uOh5EeDo~I|Pt27W!axVn@y%C$i!4Z^EMt pxVEk!ekNh+XHS0?p5FnQ_6@>uC34&Kj<^5-002ovPDHLkV1n;*uWkSU literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ironchest/textures/items/silverGoldUpgrade.png b/src/main/resources/assets/ironchest/textures/items/silverGoldUpgrade.png deleted file mode 100755 index d3cad2e203a47884b9dbe28867f40bace8dc5e03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 526 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l&B8y z32_C|M;9^t|KaiHv&)~)&fnkI{djBl{jL4?H};>NSbThH@#%^A$0rtVZX3M0V=!sX z#P$hoPcLaay{NH$-}aU3SKdFNaPNfty%P#6)-UhtZkxSu){XrVH}^~2*e5Y{_LR>4 zj?3EwE^QM$yO!(BTFx`;xK1o*Ik}wW#4?uu|Nk%fIq5FYdd89R^j5e zMYsQc%pdi7m*efP(mWxyk1~6P6{Eo&c zzz}6nEpd$~Nl7e8wMs5Z1yT$~28PDE28OyuMj?h~R)*$Qrk1(}rd9?9Pc2e^qG-s? aPsvQH#I0dU>RnKLFnGH9xvXPx#1ZP1_K>z@;j|==^1poj532;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^RZ1{n}G z5+E{p2LJ#77<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMI2$xh*Z=?lheA;T*@11+N?>-Gn0R9D2G&2pRXl5Er(abcMqM2zhMKjY-6$?s8Mx59SJCNFO zBN=ufLCD4=WTGBq32Tx_{C^sMlqOAMna8lip7}#Dif73tk}_4tmr8gw2M4$PmQ=K7|H0FCAgRieJ_tjHBJ00000NkvXXu0mjf`AFPp literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ironchest/textures/items/woodCopperUpgrade.png b/src/main/resources/assets/ironchest/textures/items/woodCopperUpgrade.png deleted file mode 100755 index 4273a54660295d9d4c22a9001afc1b31522da67d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 542 zcmV+(0^$9MP)2wj!d!G)`~7)ld^nPl>BGI{g5nB@6CEgrb=xbNP>IrrTM{|P6b)7%$MKBue4 zU-Z35oP17Kz8#pjP9px*{B&^zgcT)p2*B^%4Q5ui#6SWkpVN=uEJw|~#>*(~Z8EdE zCG0^8ihG*?JepfHD$0jDS88m4`ByJ=&1)j93qdQp4wY)1?e{NH?FL#Ygp>eAz9EQ7 z$%lmprn%dw@h1qWxI+M_rgx`GE1Hd>;JPO4kufr_KN198L)ee&umOZ6**SV>k})Y+ zcv9x`Nt}1j1}m@u0;O1*JvYg0Duw@RjknW20HNPRYmE@%c7m9cq=yp##N(0gvsRO8 zryb3}Z$)dM)a?X1RD^z)nC#N>Bi|F&5M|kk6a<~Y7K9}k9!r=+!F9=|QdCZBtbgA( z#h<=f{45m34FZ6YCn$M!05ZvON*<)glVp;kz56;NiJKM#!1Jj|-G9@tx7`-HcfR;L gt#*eWr&ksH1?X72C}dej+5i9m07*qoM6N<$f(dfxvH$=8 diff --git a/src/main/resources/assets/ironchest/textures/items/woodIronUpgrade.png b/src/main/resources/assets/ironchest/textures/items/woodIronUpgrade.png deleted file mode 100755 index e6e62bb956036eeb0da647c08d792685ea909ff4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 540 zcmV+%0^|LOP)s*KljDIXOKs zcM@@Hu4%PfHm{4wzb;oQ6%-19gam+ky-szzDsu(gnrq50%7_TY%#t_u8&tQe;>;sx z>^A@?l}d=Dy_(G?GZrf4=cYdxq16?Th|s$jva|P|%_o}}V-OJz4i79ofCG@xn%%8? z_Hz8Y&uNs<^A-RYjYqdqDgcvA=y;w@XK9(@%MV0R3_#!qHm`>RAWHN3`>HKwv}SAl zjIT#o-o6Gu@NXq>0HVo+H_y&(aidTmXno|>gkQTj+Qm8-)VBcAws-clPj? zZ;BtCpE4r=&>aZf!4QCAeueG;)>iTq^Y^FwLzZ%r83F-#`sks#eA8t5yA@`-zVhvl eLyp^j6Z`?HQM>Y_R~z~O0000