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 00000000..7c536751 Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/items/copperChest.png differ 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 7bb21593..00000000 Binary files a/src/main/resources/assets/ironchest/textures/items/copperIronUpgrade.png and /dev/null differ diff --git a/src/main/resources/assets/ironchest/textures/items/copperSilverUpgrade.png b/src/main/resources/assets/ironchest/textures/items/copperSilverUpgrade.png deleted file mode 100755 index de87597d..00000000 Binary files a/src/main/resources/assets/ironchest/textures/items/copperSilverUpgrade.png and /dev/null differ diff --git a/src/main/resources/assets/ironchest/textures/items/crystalUpgrade.png b/src/main/resources/assets/ironchest/textures/items/crystalUpgrade.png new file mode 100644 index 00000000..f40b925c Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/items/crystalUpgrade.png differ diff --git a/src/main/resources/assets/ironchest/textures/items/diamondChest.png b/src/main/resources/assets/ironchest/textures/items/diamondChest.png new file mode 100644 index 00000000..45a9143e Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/items/diamondChest.png differ diff --git a/src/main/resources/assets/ironchest/textures/items/diamondCrystalUpgrade.png b/src/main/resources/assets/ironchest/textures/items/diamondCrystalUpgrade.png deleted file mode 100755 index 68caa0c5..00000000 Binary files a/src/main/resources/assets/ironchest/textures/items/diamondCrystalUpgrade.png and /dev/null differ diff --git a/src/main/resources/assets/ironchest/textures/items/diamondObsidianUpgrade.png b/src/main/resources/assets/ironchest/textures/items/diamondObsidianUpgrade.png deleted file mode 100755 index dd1a36d1..00000000 Binary files a/src/main/resources/assets/ironchest/textures/items/diamondObsidianUpgrade.png and /dev/null differ 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 00000000..83020b9f Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/items/diamondUpgrade.png differ 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 00000000..d522f3dc Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/items/goldChest.png differ 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 028e2d8b..00000000 Binary files a/src/main/resources/assets/ironchest/textures/items/goldDiamondUpgrade.png and /dev/null differ 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 00000000..918861df Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/items/goldUpgrade.png differ diff --git a/src/main/resources/assets/ironchest/textures/items/ironChest.png b/src/main/resources/assets/ironchest/textures/items/ironChest.png new file mode 100644 index 00000000..9b5c96a0 Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/items/ironChest.png differ 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 65cf6aee..00000000 Binary files a/src/main/resources/assets/ironchest/textures/items/ironGoldUpgrade.png and /dev/null differ 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 00000000..14250cea Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/items/ironUpgrade.png differ diff --git a/src/main/resources/assets/ironchest/textures/items/obsidianUpgrade.png b/src/main/resources/assets/ironchest/textures/items/obsidianUpgrade.png new file mode 100644 index 00000000..a26a5a5a Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/items/obsidianUpgrade.png differ 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 00000000..22318411 Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/items/silverChest.png differ 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 d3cad2e2..00000000 Binary files a/src/main/resources/assets/ironchest/textures/items/silverGoldUpgrade.png and /dev/null differ diff --git a/src/main/resources/assets/ironchest/textures/items/woodChest.png b/src/main/resources/assets/ironchest/textures/items/woodChest.png new file mode 100644 index 00000000..c04c9797 Binary files /dev/null and b/src/main/resources/assets/ironchest/textures/items/woodChest.png differ 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 4273a546..00000000 Binary files a/src/main/resources/assets/ironchest/textures/items/woodCopperUpgrade.png and /dev/null differ 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 e6e62bb9..00000000 Binary files a/src/main/resources/assets/ironchest/textures/items/woodIronUpgrade.png and /dev/null differ