diff --git a/gradle.properties b/gradle.properties index 516e5ee..16d240b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ minecraft_version=1.13 minecraft_version_toml=13 # Forge Version Information -forge_version=24.0.81-1.13-pre +forge_version=24.0.96-1.13-pre forge_version_toml=24 forge_group=net.minecraftforge.test diff --git a/src/main/java/cpw/mods/ironchest/common/core/IronChestBlocks.java b/src/main/java/cpw/mods/ironchest/common/core/IronChestBlocks.java index 2ecffbb..4bb70f0 100644 --- a/src/main/java/cpw/mods/ironchest/common/core/IronChestBlocks.java +++ b/src/main/java/cpw/mods/ironchest/common/core/IronChestBlocks.java @@ -22,6 +22,7 @@ import cpw.mods.ironchest.common.blocks.BlockIronChest; import cpw.mods.ironchest.common.blocks.BlockObsidianChest; import cpw.mods.ironchest.common.blocks.BlockSilverChest; import cpw.mods.ironchest.common.items.ItemChest; +import cpw.mods.ironchest.common.util.BlockNames; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.Item; @@ -30,41 +31,58 @@ import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.IForgeRegistry; +import net.minecraftforge.registries.ObjectHolder; public class IronChestBlocks { public static Builder itemBuilder; + @ObjectHolder(BlockNames.IRON_CHEST) public static BlockChest ironChestBlock; + @ObjectHolder(BlockNames.IRON_CHEST) public static Item ironChestItemBlock; + @ObjectHolder(BlockNames.GOLD_CHEST) public static BlockChest goldChestBlock; + @ObjectHolder(BlockNames.GOLD_CHEST) public static Item goldChestItemBlock; + @ObjectHolder(BlockNames.DIAMOND_CHEST) public static BlockChest diamondChestBlock; + @ObjectHolder(BlockNames.DIAMOND_CHEST) public static Item diamondChestItemBlock; + @ObjectHolder(BlockNames.COPPER_CHEST) public static BlockChest copperChestBlock; + @ObjectHolder(BlockNames.COPPER_CHEST) public static Item copperChestItemBlock; + @ObjectHolder(BlockNames.SILVER_CHEST) public static BlockChest silverChestBlock; + @ObjectHolder(BlockNames.SILVER_CHEST) public static Item silverChestItemBlock; + @ObjectHolder(BlockNames.CRYSTAL_CHEST) public static BlockChest crystalChestBlock; + @ObjectHolder(BlockNames.CRYSTAL_CHEST) public static Item crystalChestItemBlock; + @ObjectHolder(BlockNames.OBSIDIAN_CHEST) public static BlockChest obsidianChestBlock; + @ObjectHolder(BlockNames.OBSIDIAN_CHEST) public static Item obsidianChestItemBlock; + @ObjectHolder(BlockNames.DIRT_CHEST) public static BlockChest dirtChestBlock; + @ObjectHolder(BlockNames.DIRT_CHEST) public static Item dirtChestItemBlock; public IronChestBlocks() @@ -72,7 +90,7 @@ public class IronChestBlocks } - @Mod.EventBusSubscriber(modid = IronChest.MOD_ID) + @Mod.EventBusSubscriber(modid = IronChest.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public static class Registration { @SubscribeEvent @@ -80,14 +98,14 @@ public class IronChestBlocks { IForgeRegistry blockRegistry = event.getRegistry(); - blockRegistry.register(ironChestBlock = new BlockIronChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); - blockRegistry.register(goldChestBlock = new BlockGoldChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); - blockRegistry.register(diamondChestBlock = new BlockDiamondChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); - blockRegistry.register(copperChestBlock = new BlockCopperChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); - blockRegistry.register(silverChestBlock = new BlockSilverChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); - blockRegistry.register(crystalChestBlock = new BlockCrystalChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); - blockRegistry.register(obsidianChestBlock = new BlockObsidianChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); - blockRegistry.register(dirtChestBlock = new BlockDirtChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); + blockRegistry.register(new BlockIronChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); + blockRegistry.register(new BlockGoldChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); + blockRegistry.register(new BlockDiamondChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); + blockRegistry.register(new BlockCopperChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); + blockRegistry.register(new BlockSilverChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); + blockRegistry.register(new BlockCrystalChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); + blockRegistry.register(new BlockObsidianChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 10000.0F))); + blockRegistry.register(new BlockDirtChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); } @SubscribeEvent @@ -97,14 +115,14 @@ public class IronChestBlocks itemBuilder = (new Builder()).group(IronChestCreativeTabs.IRON_CHESTS).setTEISR(() -> TileEntityIronChestItemRenderer::new); - itemRegistry.register(ironChestItemBlock = new ItemChest(ironChestBlock, itemBuilder)); - itemRegistry.register(goldChestItemBlock = new ItemChest(goldChestBlock, itemBuilder)); - itemRegistry.register(diamondChestItemBlock = new ItemChest(diamondChestBlock, itemBuilder)); - itemRegistry.register(copperChestItemBlock = new ItemChest(copperChestBlock, itemBuilder)); - itemRegistry.register(silverChestItemBlock = new ItemChest(silverChestBlock, itemBuilder)); - itemRegistry.register(crystalChestItemBlock = new ItemChest(crystalChestBlock, itemBuilder)); - itemRegistry.register(obsidianChestItemBlock = new ItemChest(obsidianChestBlock, itemBuilder)); - itemRegistry.register(dirtChestItemBlock = new ItemChest(dirtChestBlock, itemBuilder)); + itemRegistry.register(new ItemChest(ironChestBlock, itemBuilder)); + itemRegistry.register(new ItemChest(goldChestBlock, itemBuilder)); + itemRegistry.register(new ItemChest(diamondChestBlock, itemBuilder)); + itemRegistry.register(new ItemChest(copperChestBlock, itemBuilder)); + itemRegistry.register(new ItemChest(silverChestBlock, itemBuilder)); + itemRegistry.register(new ItemChest(crystalChestBlock, itemBuilder)); + itemRegistry.register(new ItemChest(obsidianChestBlock, itemBuilder)); + itemRegistry.register(new ItemChest(dirtChestBlock, itemBuilder)); } } } diff --git a/src/main/java/cpw/mods/ironchest/common/core/IronChestItems.java b/src/main/java/cpw/mods/ironchest/common/core/IronChestItems.java index d7dddcf..3ef083c 100644 --- a/src/main/java/cpw/mods/ironchest/common/core/IronChestItems.java +++ b/src/main/java/cpw/mods/ironchest/common/core/IronChestItems.java @@ -13,33 +13,44 @@ package cpw.mods.ironchest.common.core; import cpw.mods.ironchest.IronChest; import cpw.mods.ironchest.common.items.ChestChangerType; import cpw.mods.ironchest.common.items.ItemChestChanger; +import cpw.mods.ironchest.common.util.ItemNames; import net.minecraft.item.Item; import net.minecraft.item.Item.Builder; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.IForgeRegistry; +import net.minecraftforge.registries.ObjectHolder; public class IronChestItems { public static Builder itemBuilder; + @ObjectHolder(ItemNames.IRON_GOLD_UPGRADE) public static Item ironToGoldUpgrade; + @ObjectHolder(ItemNames.GOLD_DIAMOND_UPGRADE) public static Item goldToDiamondUpgrade; + @ObjectHolder(ItemNames.COPPER_SILVER_UPGRADE) public static Item copperToSilverUpgrade; + @ObjectHolder(ItemNames.SILVER_GOLD_UPGRADE) public static Item silverToGoldUpgrade; + @ObjectHolder(ItemNames.COPPER_IRON_UPGRADE) public static Item copperToIronUpgrade; + @ObjectHolder(ItemNames.DIAMOND_CRYSTAL_UPGRADE) public static Item diamondToCrystalUpgrade; + @ObjectHolder(ItemNames.WOOD_IRON_UPGRADE) public static Item woodToIronUpgrade; + @ObjectHolder(ItemNames.WOOD_COPPER_UPGRADE) public static Item woodToCopperUpgrade; + @ObjectHolder(ItemNames.DIAMOND_OBSIDIAN_UPGRADE) public static Item diamondToObsidianUpgrade; public IronChestItems() @@ -47,7 +58,7 @@ public class IronChestItems } - @Mod.EventBusSubscriber(modid = IronChest.MOD_ID) + @Mod.EventBusSubscriber(modid = IronChest.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public static class Registration { @SubscribeEvent @@ -57,15 +68,15 @@ public class IronChestItems itemBuilder = (new Builder()).group(IronChestCreativeTabs.IRON_CHESTS).maxStackSize(1); - itemRegistry.register(ironToGoldUpgrade = new ItemChestChanger(itemBuilder, ChestChangerType.IRON_GOLD)); - itemRegistry.register(goldToDiamondUpgrade = new ItemChestChanger(itemBuilder, ChestChangerType.GOLD_DIAMOND)); - itemRegistry.register(copperToSilverUpgrade = new ItemChestChanger(itemBuilder, ChestChangerType.COPPER_SILVER)); - itemRegistry.register(silverToGoldUpgrade = new ItemChestChanger(itemBuilder, ChestChangerType.SILVER_GOLD)); - itemRegistry.register(copperToIronUpgrade = new ItemChestChanger(itemBuilder, ChestChangerType.COPPER_IRON)); - itemRegistry.register(diamondToCrystalUpgrade = new ItemChestChanger(itemBuilder, ChestChangerType.DIAMOND_CRYSTAL)); - itemRegistry.register(woodToIronUpgrade = new ItemChestChanger(itemBuilder, ChestChangerType.WOOD_IRON)); - itemRegistry.register(woodToCopperUpgrade = new ItemChestChanger(itemBuilder, ChestChangerType.WOOD_COPPER)); - itemRegistry.register(diamondToObsidianUpgrade = new ItemChestChanger(itemBuilder, ChestChangerType.DIAMOND_OBSIDIAN)); + itemRegistry.register(new ItemChestChanger(itemBuilder, ChestChangerType.IRON_GOLD)); + itemRegistry.register(new ItemChestChanger(itemBuilder, ChestChangerType.GOLD_DIAMOND)); + itemRegistry.register(new ItemChestChanger(itemBuilder, ChestChangerType.COPPER_SILVER)); + itemRegistry.register(new ItemChestChanger(itemBuilder, ChestChangerType.SILVER_GOLD)); + itemRegistry.register(new ItemChestChanger(itemBuilder, ChestChangerType.COPPER_IRON)); + itemRegistry.register(new ItemChestChanger(itemBuilder, ChestChangerType.DIAMOND_CRYSTAL)); + itemRegistry.register(new ItemChestChanger(itemBuilder, ChestChangerType.WOOD_IRON)); + itemRegistry.register(new ItemChestChanger(itemBuilder, ChestChangerType.WOOD_COPPER)); + itemRegistry.register(new ItemChestChanger(itemBuilder, ChestChangerType.DIAMOND_OBSIDIAN)); } } } diff --git a/src/main/java/cpw/mods/ironchest/common/items/ChestChangerType.java b/src/main/java/cpw/mods/ironchest/common/items/ChestChangerType.java index 8d67f8b..bfda0a8 100644 --- a/src/main/java/cpw/mods/ironchest/common/items/ChestChangerType.java +++ b/src/main/java/cpw/mods/ironchest/common/items/ChestChangerType.java @@ -10,8 +10,8 @@ ******************************************************************************/ package cpw.mods.ironchest.common.items; -import cpw.mods.ironchest.IronChest; import cpw.mods.ironchest.common.blocks.IronChestType; +import cpw.mods.ironchest.common.util.ItemNames; import net.minecraft.util.ResourceLocation; import static cpw.mods.ironchest.common.blocks.IronChestType.COPPER; @@ -26,15 +26,15 @@ import static cpw.mods.ironchest.common.blocks.IronChestType.WOOD; public enum ChestChangerType { //@formatter:off - IRON_GOLD(IRON, GOLD, "iron_gold_chest_upgrade"), - GOLD_DIAMOND(GOLD, DIAMOND, "gold_diamond_chest_upgrade"), - COPPER_SILVER(COPPER, SILVER, "copper_silver_chest_upgrade"), - SILVER_GOLD(SILVER, GOLD, "silver_gold_chest_upgrade"), - COPPER_IRON(COPPER, IRON, "copper_iron_chest_upgrade"), - DIAMOND_CRYSTAL(DIAMOND, CRYSTAL, "diamond_crystal_chest_upgrade"), - WOOD_IRON(WOOD, IRON, "wood_iron_chest_upgrade"), - WOOD_COPPER(WOOD, COPPER, "wood_copper_chest_upgrade"), - DIAMOND_OBSIDIAN(DIAMOND, OBSIDIAN, "diamond_obsidian_chest_upgrade"); + IRON_GOLD(IRON, GOLD, ItemNames.IRON_GOLD_UPGRADE), + GOLD_DIAMOND(GOLD, DIAMOND, ItemNames.GOLD_DIAMOND_UPGRADE), + COPPER_SILVER(COPPER, SILVER, ItemNames.COPPER_SILVER_UPGRADE), + SILVER_GOLD(SILVER, GOLD, ItemNames.SILVER_GOLD_UPGRADE), + COPPER_IRON(COPPER, IRON, ItemNames.COPPER_IRON_UPGRADE), + DIAMOND_CRYSTAL(DIAMOND, CRYSTAL, ItemNames.DIAMOND_CRYSTAL_UPGRADE), + WOOD_IRON(WOOD, IRON, ItemNames.WOOD_IRON_UPGRADE), + WOOD_COPPER(WOOD, COPPER, ItemNames.WOOD_COPPER_UPGRADE), + DIAMOND_OBSIDIAN(DIAMOND, OBSIDIAN, ItemNames.DIAMOND_OBSIDIAN_UPGRADE); //@formatter:on public final IronChestType source; @@ -47,7 +47,7 @@ public enum ChestChangerType { this.source = source; this.target = target; - this.itemName = new ResourceLocation(IronChest.MOD_ID, itemName); + this.itemName = new ResourceLocation(itemName); } public boolean canUpgrade(IronChestType from) diff --git a/src/main/java/cpw/mods/ironchest/common/tileentity/IronChestEntityType.java b/src/main/java/cpw/mods/ironchest/common/tileentity/IronChestEntityType.java index c4c15c2..e715eea 100644 --- a/src/main/java/cpw/mods/ironchest/common/tileentity/IronChestEntityType.java +++ b/src/main/java/cpw/mods/ironchest/common/tileentity/IronChestEntityType.java @@ -13,6 +13,7 @@ package cpw.mods.ironchest.common.tileentity; import com.mojang.datafixers.DataFixUtils; import com.mojang.datafixers.types.Type; import cpw.mods.ironchest.IronChest; +import cpw.mods.ironchest.common.util.TileEntityNames; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; @@ -24,23 +25,32 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.IForgeRegistryEntry; +import net.minecraftforge.registries.ObjectHolder; public class IronChestEntityType { + @ObjectHolder(TileEntityNames.IRON_CHEST) public static TileEntityType IRON_CHEST; + @ObjectHolder(TileEntityNames.GOLD_CHEST) public static TileEntityType GOLD_CHEST; + @ObjectHolder(TileEntityNames.DIAMOND_CHEST) public static TileEntityType DIAMOND_CHEST; + @ObjectHolder(TileEntityNames.CRYSTAL_CHEST) public static TileEntityType CRYSTAL_CHEST; + @ObjectHolder(TileEntityNames.DIRT_CHEST) public static TileEntityType DIRT_CHEST; + @ObjectHolder(TileEntityNames.COPPER_CHEST) public static TileEntityType COPPER_CHEST; + @ObjectHolder(TileEntityNames.SILVER_CHEST) public static TileEntityType SILVER_CHEST; + @ObjectHolder(TileEntityNames.OBSIDIAN_CHEST) public static TileEntityType OBSIDIAN_CHEST; public IronChestEntityType() @@ -48,34 +58,34 @@ public class IronChestEntityType } - @Mod.EventBusSubscriber(modid = IronChest.MOD_ID) + @Mod.EventBusSubscriber(modid = IronChest.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public static class Registration { @SubscribeEvent public static void onTileEntityRegistry(final RegistryEvent.Register> e) { - IronChestEntityType.IRON_CHEST = registerTileEntityType(e.getRegistry(), - register("iron_chest", TileEntityType.Builder.create(TileEntityIronChest::new)), "iron_chest"); - IronChestEntityType.GOLD_CHEST = registerTileEntityType(e.getRegistry(), - register("gold_chest", TileEntityType.Builder.create(TileEntityGoldChest::new)), "gold_chest"); - IronChestEntityType.DIAMOND_CHEST = registerTileEntityType(e.getRegistry(), - register("diamond_chest", TileEntityType.Builder.create(TileEntityDiamondChest::new)), "diamond_chest"); - IronChestEntityType.CRYSTAL_CHEST = registerTileEntityType(e.getRegistry(), - register("crystal_chest", TileEntityType.Builder.create(TileEntityCrystalChest::new)), "crystal_chest"); - IronChestEntityType.DIRT_CHEST = registerTileEntityType(e.getRegistry(), - register("dirt_chest", TileEntityType.Builder.create(TileEntityDirtChest::new)), "dirt_chest"); - IronChestEntityType.COPPER_CHEST = registerTileEntityType(e.getRegistry(), - register("copper_chest", TileEntityType.Builder.create(TileEntityCopperChest::new)), "copper_chest"); - IronChestEntityType.SILVER_CHEST = registerTileEntityType(e.getRegistry(), - register("silver_chest", TileEntityType.Builder.create(TileEntitySilverChest::new)), "silver_chest"); - IronChestEntityType.OBSIDIAN_CHEST = registerTileEntityType(e.getRegistry(), - register("obsidian_chest", TileEntityType.Builder.create(TileEntityObsidianChest::new)), "obsidian_chest"); + registerTileEntityType(e.getRegistry(), register("iron_chest", TileEntityType.Builder.create(TileEntityIronChest::new)), + TileEntityNames.IRON_CHEST); + registerTileEntityType(e.getRegistry(), register("gold_chest", TileEntityType.Builder.create(TileEntityGoldChest::new)), + TileEntityNames.GOLD_CHEST); + registerTileEntityType(e.getRegistry(), register("diamond_chest", TileEntityType.Builder.create(TileEntityDiamondChest::new)), + TileEntityNames.DIAMOND_CHEST); + registerTileEntityType(e.getRegistry(), register("crystal_chest", TileEntityType.Builder.create(TileEntityCrystalChest::new)), + TileEntityNames.CRYSTAL_CHEST); + registerTileEntityType(e.getRegistry(), register("dirt_chest", TileEntityType.Builder.create(TileEntityDirtChest::new)), + TileEntityNames.DIRT_CHEST); + registerTileEntityType(e.getRegistry(), register("copper_chest", TileEntityType.Builder.create(TileEntityCopperChest::new)), + TileEntityNames.COPPER_CHEST); + registerTileEntityType(e.getRegistry(), register("silver_chest", TileEntityType.Builder.create(TileEntitySilverChest::new)), + TileEntityNames.SILVER_CHEST); + registerTileEntityType(e.getRegistry(), register("obsidian_chest", TileEntityType.Builder.create(TileEntityObsidianChest::new)), + TileEntityNames.OBSIDIAN_CHEST); } } protected static > T registerTileEntityType(IForgeRegistry> registry, T tileEntityType, String name) { - register(registry, tileEntityType, new ResourceLocation("ironchest", name)); + register(registry, tileEntityType, new ResourceLocation(name)); return tileEntityType; } diff --git a/src/main/java/cpw/mods/ironchest/common/util/ItemNames.java b/src/main/java/cpw/mods/ironchest/common/util/ItemNames.java new file mode 100644 index 0000000..fad0ef7 --- /dev/null +++ b/src/main/java/cpw/mods/ironchest/common/util/ItemNames.java @@ -0,0 +1,34 @@ +/******************************************************************************* + * Copyright (c) 2012 cpw. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Public License v3.0 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/gpl.html + *

+ * Contributors: + * cpw - initial API and implementation + ******************************************************************************/ +package cpw.mods.ironchest.common.util; + +import cpw.mods.ironchest.IronChest; + +public class ItemNames +{ + public static final String IRON_GOLD_UPGRADE = IronChest.MOD_ID + ":iron_gold_chest_upgrade"; + + public static final String GOLD_DIAMOND_UPGRADE = IronChest.MOD_ID + ":gold_diamond_chest_upgrade"; + + public static final String COPPER_SILVER_UPGRADE = IronChest.MOD_ID + ":copper_silver_chest_upgrade"; + + public static final String SILVER_GOLD_UPGRADE = IronChest.MOD_ID + ":silver_gold_chest_upgrade"; + + public static final String COPPER_IRON_UPGRADE = IronChest.MOD_ID + ":copper_iron_chest_upgrade"; + + public static final String DIAMOND_CRYSTAL_UPGRADE = IronChest.MOD_ID + ":diamond_crystal_chest_upgrade"; + + public static final String WOOD_IRON_UPGRADE = IronChest.MOD_ID + ":wood_iron_chest_upgrade"; + + public static final String WOOD_COPPER_UPGRADE = IronChest.MOD_ID + ":wood_copper_chest_upgrade"; + + public static final String DIAMOND_OBSIDIAN_UPGRADE = IronChest.MOD_ID + ":diamond_obsidian_chest_upgrade"; +} diff --git a/src/main/java/cpw/mods/ironchest/common/util/TileEntityNames.java b/src/main/java/cpw/mods/ironchest/common/util/TileEntityNames.java new file mode 100644 index 0000000..f0dc9ef --- /dev/null +++ b/src/main/java/cpw/mods/ironchest/common/util/TileEntityNames.java @@ -0,0 +1,32 @@ +/******************************************************************************* + * Copyright (c) 2012 cpw. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Public License v3.0 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/gpl.html + *

+ * Contributors: + * cpw - initial API and implementation + ******************************************************************************/ +package cpw.mods.ironchest.common.util; + +import cpw.mods.ironchest.IronChest; + +public class TileEntityNames +{ + public static final String IRON_CHEST = IronChest.MOD_ID + ":iron_chest"; + + public static final String GOLD_CHEST = IronChest.MOD_ID + ":gold_chest"; + + public static final String DIAMOND_CHEST = IronChest.MOD_ID + ":diamond_chest"; + + public static final String COPPER_CHEST = IronChest.MOD_ID + ":copper_chest"; + + public static final String SILVER_CHEST = IronChest.MOD_ID + ":silver_chest"; + + public static final String CRYSTAL_CHEST = IronChest.MOD_ID + ":crystal_chest"; + + public static final String OBSIDIAN_CHEST = IronChest.MOD_ID + ":obsidian_chest"; + + public static final String DIRT_CHEST = IronChest.MOD_ID + ":dirt_chest"; +} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 929188d..47e7a23 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -7,15 +7,15 @@ displayURL="https://minecraft.curseforge.com/projects/iron-chests" modId="ironchest" version="${version}" displayName="Iron Chests" - authors="cpw,alexbegt,progwml6" + authors="cpw, alexbegt, progwml6" description=''' New chests with larger sizes, with in-place upgrade items. The feature chest is the crystal chest, which is transparent - some inventory contents are visible without opening the chest ''' - -[[dependencies.ironchest]] - modId="forge" - mandatory=true - versionRange="[24,)" - ordering="NONE" - side="BOTH" \ No newline at end of file + namespace="ironchest" + [[dependencies.ironchest]] + modId="forge" + mandatory=true + versionRange="[24,)" + ordering="NONE" + side="BOTH" \ No newline at end of file diff --git a/src/main/resources/data/ironchest/recipes/_constants.json b/src/main/resources/data/ironchest/recipes/_constants.json new file mode 100644 index 0000000..109ccd2 --- /dev/null +++ b/src/main/resources/data/ironchest/recipes/_constants.json @@ -0,0 +1,57 @@ +[ + { + "name": "ironchest:iron", + "tag": "forge:ingots/iron" + }, + { + "name": "ironchest:gold", + "tag": "forge:ingots/gold" + }, + { + "name": "ironchest:diamond", + "tag": "forge:gems/diamond" + }, + { + "name": "ironchest:copper", + "tag": "forge:gems/lapis", + "_comment": "replaceme" + }, + { + "name": "ironchest:silver", + "tag": "forge:ingots/nether_brick", + "_comment": "replaceme" + }, + { + "name": "ironchest:glass", + "tag": "forge:storage_blocks", + "_comment": "replaceme" + }, + { + "name": "ironchest:planks", + "tag": "minecraft:planks" + }, + { + "name": "ironchest:chest", + "tag": "forge:chests/wooden" + }, + { + "name": "ironchest:obsidian", + "item": { + "item": "minecraft:obsidian" + } + }, + { + "name": "ironchest:dirt", + "items": [ + { + "item": "minecraft:dirt" + }, + { + "item": "minecraft:coarse_dirt" + }, + { + "item": "minecraft:podzol" + } + ] + } +] \ No newline at end of file diff --git a/src/main/resources/data/ironchest/recipes/chests/copper_iron_chest.json b/src/main/resources/data/ironchest/recipes/chests/copper_iron_chest.json new file mode 100644 index 0000000..71f6097 --- /dev/null +++ b/src/main/resources/data/ironchest/recipes/chests/copper_iron_chest.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "MGM", + "GSG", + "MGM" + ], + "key": { + "M": { + "constant": "ironchest:iron" + }, + "G": { + "constant": "ironchest:glass" + }, + "S": { + "item": "ironchest:copper_chest" + } + }, + "result": { + "item": "ironchest:iron_chest" + } +} \ No newline at end of file diff --git a/src/main/resources/data/ironchest/recipes/chests/copper_silver_chest.json b/src/main/resources/data/ironchest/recipes/chests/copper_silver_chest.json new file mode 100644 index 0000000..2c6d10d --- /dev/null +++ b/src/main/resources/data/ironchest/recipes/chests/copper_silver_chest.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "MMM", + "MSM", + "MMM" + ], + "key": { + "M": { + "constant": "ironchest:silver" + }, + "S": { + "item": "ironchest:copper_chest" + } + }, + "result": { + "item": "ironchest:silver_chest" + } +} \ No newline at end of file diff --git a/src/main/resources/data/ironchest/recipes/chests/diamond_crystal_chest.json b/src/main/resources/data/ironchest/recipes/chests/diamond_crystal_chest.json new file mode 100644 index 0000000..f74893d --- /dev/null +++ b/src/main/resources/data/ironchest/recipes/chests/diamond_crystal_chest.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GGG", + "GSG", + "GGG" + ], + "key": { + "G": { + "constant": "ironchest:glass" + }, + "S": { + "item": "ironchest:diamond_chest" + } + }, + "result": { + "item": "ironchest:crystal_chest" + } +} \ No newline at end of file diff --git a/src/main/resources/data/ironchest/recipes/chests/diamond_obsidian_chest.json b/src/main/resources/data/ironchest/recipes/chests/diamond_obsidian_chest.json new file mode 100644 index 0000000..0acffba --- /dev/null +++ b/src/main/resources/data/ironchest/recipes/chests/diamond_obsidian_chest.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "MMM", + "MSM", + "MMM" + ], + "key": { + "M": { + "constant": "ironchest:obsidian" + }, + "S": { + "item": "ironchest:diamond_chest" + } + }, + "result": { + "item": "ironchest:obsidian_chest" + } +} \ No newline at end of file diff --git a/src/main/resources/data/ironchest/recipes/chests/gold_diamond_chest.json b/src/main/resources/data/ironchest/recipes/chests/gold_diamond_chest.json new file mode 100644 index 0000000..11270b1 --- /dev/null +++ b/src/main/resources/data/ironchest/recipes/chests/gold_diamond_chest.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GGG", + "MSM", + "GGG" + ], + "key": { + "M": { + "constant": "ironchest:diamond" + }, + "G": { + "constant": "ironchest:glass" + }, + "S": { + "item": "ironchest:gold_chest" + } + }, + "result": { + "item": "ironchest:diamond_chest" + } +} \ No newline at end of file diff --git a/src/main/resources/data/ironchest/recipes/chests/iron_gold_chest.json b/src/main/resources/data/ironchest/recipes/chests/iron_gold_chest.json new file mode 100644 index 0000000..e82f7bb --- /dev/null +++ b/src/main/resources/data/ironchest/recipes/chests/iron_gold_chest.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "MMM", + "MSM", + "MMM" + ], + "key": { + "M": { + "constant": "ironchest:gold" + }, + "S": { + "item": "ironchest:iron_chest" + } + }, + "result": { + "item": "ironchest:gold_chest" + } +} \ No newline at end of file diff --git a/src/main/resources/data/ironchest/recipes/chests/iron_silver_chest.json b/src/main/resources/data/ironchest/recipes/chests/iron_silver_chest.json new file mode 100644 index 0000000..02c8d76 --- /dev/null +++ b/src/main/resources/data/ironchest/recipes/chests/iron_silver_chest.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GGG", + "MSM", + "GGG" + ], + "key": { + "M": { + "constant": "ironchest:silver" + }, + "G": { + "constant": "ironchest:glass" + }, + "S": { + "item": "ironchest:iron_chest" + } + }, + "result": { + "item": "ironchest:silver_chest" + } +} \ No newline at end of file diff --git a/src/main/resources/data/ironchest/recipes/chests/silver_diamond_chest.json b/src/main/resources/data/ironchest/recipes/chests/silver_diamond_chest.json new file mode 100644 index 0000000..3e246cb --- /dev/null +++ b/src/main/resources/data/ironchest/recipes/chests/silver_diamond_chest.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GGG", + "GSG", + "MMM" + ], + "key": { + "M": { + "constant": "ironchest:diamond" + }, + "G": { + "constant": "ironchest:glass" + }, + "S": { + "item": "ironchest:silver_chest" + } + }, + "result": { + "item": "ironchest:diamond_chest" + } +} \ No newline at end of file diff --git a/src/main/resources/data/ironchest/recipes/chests/silver_gold_chest.json b/src/main/resources/data/ironchest/recipes/chests/silver_gold_chest.json new file mode 100644 index 0000000..d01a430 --- /dev/null +++ b/src/main/resources/data/ironchest/recipes/chests/silver_gold_chest.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "MGM", + "GSG", + "MGM" + ], + "key": { + "M": { + "constant": "ironchest:gold" + }, + "G": { + "constant": "ironchest:glass" + }, + "S": { + "item": "ironchest:silver_chest" + } + }, + "result": { + "item": "ironchest:gold_chest" + } +} \ No newline at end of file diff --git a/src/main/resources/data/ironchest/recipes/chests/vanilla_copper_chest.json b/src/main/resources/data/ironchest/recipes/chests/vanilla_copper_chest.json new file mode 100644 index 0000000..b45428d --- /dev/null +++ b/src/main/resources/data/ironchest/recipes/chests/vanilla_copper_chest.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "MMM", + "MSM", + "MMM" + ], + "key": { + "M": { + "constant": "ironchest:copper" + }, + "S": { + "constant": "ironchest:chest" + } + }, + "result": { + "item": "ironchest:copper_chest" + } +} \ No newline at end of file diff --git a/src/main/resources/data/ironchest/recipes/chests/vanilla_dirt_chest.json b/src/main/resources/data/ironchest/recipes/chests/vanilla_dirt_chest.json new file mode 100644 index 0000000..026f54b --- /dev/null +++ b/src/main/resources/data/ironchest/recipes/chests/vanilla_dirt_chest.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "MMM", + "MSM", + "MMM" + ], + "key": { + "M": { + "constant": "ironchest:dirt" + }, + "S": { + "constant": "ironchest:chest" + } + }, + "result": { + "item": "ironchest:dirt_chest" + } +} \ No newline at end of file diff --git a/src/main/resources/data/ironchest/recipes/chests/vanilla_iron_chest.json b/src/main/resources/data/ironchest/recipes/chests/vanilla_iron_chest.json new file mode 100644 index 0000000..3e365a2 --- /dev/null +++ b/src/main/resources/data/ironchest/recipes/chests/vanilla_iron_chest.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "MMM", + "MSM", + "MMM" + ], + "key": { + "M": { + "constant": "ironchest:iron" + }, + "S": { + "constant": "ironchest:chest" + } + }, + "result": { + "item": "ironchest:iron_chest" + } +} \ No newline at end of file diff --git a/src/main/resources/data/ironchest/recipes/upgrades/copper_iron_chest_upgrade.json b/src/main/resources/data/ironchest/recipes/upgrades/copper_iron_chest_upgrade.json new file mode 100644 index 0000000..106638b --- /dev/null +++ b/src/main/resources/data/ironchest/recipes/upgrades/copper_iron_chest_upgrade.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "MGM", + "GSG", + "MGM" + ], + "key": { + "M": { + "constant": "ironchest:iron" + }, + "S": { + "constant": "ironchest:copper" + }, + "G": { + "constant": "ironchest:glass" + } + }, + "result": { + "item": "ironchest:copper_iron_chest_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/data/ironchest/recipes/upgrades/copper_silver_chest_upgrade.json b/src/main/resources/data/ironchest/recipes/upgrades/copper_silver_chest_upgrade.json new file mode 100644 index 0000000..bb27459 --- /dev/null +++ b/src/main/resources/data/ironchest/recipes/upgrades/copper_silver_chest_upgrade.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "MMM", + "MSM", + "MMM" + ], + "key": { + "M": { + "constant": "ironchest:silver" + }, + "S": { + "constant": "ironchest:copper" + } + }, + "result": { + "item": "ironchest:copper_silver_chest_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/data/ironchest/recipes/upgrades/diamond_crystal_chest_upgrade.json b/src/main/resources/data/ironchest/recipes/upgrades/diamond_crystal_chest_upgrade.json new file mode 100644 index 0000000..318add9 --- /dev/null +++ b/src/main/resources/data/ironchest/recipes/upgrades/diamond_crystal_chest_upgrade.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GGG", + "GSG", + "GGG" + ], + "key": { + "G": { + "constant": "ironchest:glass" + }, + "S": { + "constant": "ironchest:obsidian" + } + }, + "result": { + "item": "ironchest:diamond_crystal_chest_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/data/ironchest/recipes/upgrades/diamond_obsidian_chest_upgrade.json b/src/main/resources/data/ironchest/recipes/upgrades/diamond_obsidian_chest_upgrade.json new file mode 100644 index 0000000..c3849cd --- /dev/null +++ b/src/main/resources/data/ironchest/recipes/upgrades/diamond_obsidian_chest_upgrade.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "MMM", + "MGM", + "MMM" + ], + "key": { + "M": { + "constant": "ironchest:obsidian" + }, + "G": { + "constant": "ironchest:glass" + } + }, + "result": { + "item": "ironchest:diamond_obsidian_chest_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/data/ironchest/recipes/upgrades/gold_diamond_chest_upgrade.json b/src/main/resources/data/ironchest/recipes/upgrades/gold_diamond_chest_upgrade.json new file mode 100644 index 0000000..6f9fd52 --- /dev/null +++ b/src/main/resources/data/ironchest/recipes/upgrades/gold_diamond_chest_upgrade.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GGG", + "MSM", + "GGG" + ], + "key": { + "M": { + "constant": "ironchest:diamond" + }, + "S": { + "constant": "ironchest:gold" + }, + "G": { + "constant": "ironchest:glass" + } + }, + "result": { + "item": "ironchest:gold_diamond_chest_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/data/ironchest/recipes/upgrades/iron_gold_chest_upgrade.json b/src/main/resources/data/ironchest/recipes/upgrades/iron_gold_chest_upgrade.json new file mode 100644 index 0000000..56b9706 --- /dev/null +++ b/src/main/resources/data/ironchest/recipes/upgrades/iron_gold_chest_upgrade.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "MMM", + "MSM", + "MMM" + ], + "key": { + "M": { + "constant": "ironchest:gold" + }, + "S": { + "constant": "ironchest:iron" + } + }, + "result": { + "item": "ironchest:iron_gold_chest_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/data/ironchest/recipes/upgrades/silver_gold_chest_upgrade.json b/src/main/resources/data/ironchest/recipes/upgrades/silver_gold_chest_upgrade.json new file mode 100644 index 0000000..dd0f7cc --- /dev/null +++ b/src/main/resources/data/ironchest/recipes/upgrades/silver_gold_chest_upgrade.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "MGM", + "GSG", + "MGM" + ], + "key": { + "M": { + "constant": "ironchest:gold" + }, + "S": { + "constant": "ironchest:silver" + }, + "G": { + "constant": "ironchest:glass" + } + }, + "result": { + "item": "ironchest:silver_gold_chest_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/data/ironchest/recipes/upgrades/wood_copper_chest_upgrade.json b/src/main/resources/data/ironchest/recipes/upgrades/wood_copper_chest_upgrade.json new file mode 100644 index 0000000..cffd038 --- /dev/null +++ b/src/main/resources/data/ironchest/recipes/upgrades/wood_copper_chest_upgrade.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "MMM", + "MSM", + "MMM" + ], + "key": { + "M": { + "constant": "ironchest:copper" + }, + "S": { + "constant": "ironchest:planks" + } + }, + "result": { + "item": "ironchest:wood_copper_chest_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/data/ironchest/recipes/upgrades/wood_iron_chest_upgrade.json b/src/main/resources/data/ironchest/recipes/upgrades/wood_iron_chest_upgrade.json new file mode 100644 index 0000000..4ae7095 --- /dev/null +++ b/src/main/resources/data/ironchest/recipes/upgrades/wood_iron_chest_upgrade.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "MMM", + "MSM", + "MMM" + ], + "key": { + "M": { + "constant": "ironchest:iron" + }, + "S": { + "constant": "ironchest:planks" + } + }, + "result": { + "item": "ironchest:wood_iron_chest_upgrade" + } +} \ No newline at end of file