From 33c058228757202025d57c44534988ea79a89377 Mon Sep 17 00:00:00 2001 From: srw Date: Wed, 30 Aug 2017 19:04:06 -0700 Subject: [PATCH] update to 1.12.1 --- kfc/build.gradle | 2 +- kfc/gradle.properties | 4 +- .../nmd/primal/forgecraft/init/ModBlocks.java | 30 +- .../primal/forgecraft/init/ModCrafting.java | 277 +++++++++--------- .../nmd/primal/forgecraft/init/ModItems.java | 159 +++++----- .../forgecraft/items/ItemStoneTongs.java | 4 +- .../items/parts/BronzeToolPart.java | 40 ++- .../forgecraft/items/parts/ToolPart.java | 40 ++- .../forgecraft/items/tools/BronzeAxe.java | 39 ++- .../forgecraft/items/tools/BronzeHoe.java | 37 ++- .../forgecraft/items/tools/BronzePickaxe.java | 37 ++- .../forgecraft/items/tools/BronzeShovel.java | 37 ++- .../forgecraft/items/tools/CustomAxe.java | 39 ++- .../forgecraft/items/tools/CustomHoe.java | 37 ++- .../forgecraft/items/tools/CustomPickaxe.java | 39 ++- .../forgecraft/items/tools/CustomShovel.java | 37 ++- .../renders/blocks/TileAnvilRender.java | 9 +- .../renders/blocks/TileBloomeryRender.java | 5 +- .../renders/blocks/TileBreakerRender.java | 5 +- .../blocks/TileCastingBlockRender.java | 9 +- .../renders/blocks/TileCastingformRender.java | 9 +- .../renders/blocks/TileForgeRender.java | 5 +- .../blocks/TilePistonBellowsRender.java | 8 +- .../renders/items/ModelPickaxe.java | 8 +- 24 files changed, 454 insertions(+), 462 deletions(-) diff --git a/kfc/build.gradle b/kfc/build.gradle index 97c92df7..668283ae 100644 --- a/kfc/build.gradle +++ b/kfc/build.gradle @@ -52,7 +52,7 @@ dependencies { //compile against the JEI API deobfCompile "mezz.jei:jei_${mc_version}:${jei_version}:api" //runtime "mezz.jei:jei_${mc_version}:${jei_version}" - deobfCompile "nmd.primal.core:PrimalCore:${primal_version}:dev" + deobfCompile "nmd.primal.core:PrimalCore:${mc_version}-${primal_version}:dev" //runtime "nmd.primal.core:PrimalCore:${primal_version}" } diff --git a/kfc/gradle.properties b/kfc/gradle.properties index 2fd00f27..04a9f177 100644 --- a/kfc/gradle.properties +++ b/kfc/gradle.properties @@ -7,9 +7,9 @@ mod_group=nmd.primal.forgecraft mod_name=ForgeCraft mod_version=1.3.0 -forge_version=14.21.0.2368 +forge_version=14.22.0.2463 mcp_mappings=snapshot_20170624 -mc_version=1.12 +mc_version=1.12.1 primal_version=0.5+ jei_version=4.7+ diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java b/kfc/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java index 8950d538..5be7a751 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java @@ -15,6 +15,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -599,25 +600,36 @@ public class ModBlocks { } - private static void registerBlock(Block block) { - GameRegistry.register(block); + private static void registerBlock(Block block) + { + ForgeRegistries.BLOCKS.register(block); + //GameRegistry.register(block); + ItemBlock item = new ItemBlock(block); item.setRegistryName(block.getRegistryName()); - GameRegistry.register(item); + + ForgeRegistries.ITEMS.register(item); + //GameRegistry.register(item); } - private static void registerBlockSubType(Block block, ItemBlock itemBlock, String registryName){ - GameRegistry.register(block); - ItemBlock item = itemBlock; + private static void registerBlockSubType(Block block, ItemBlock item, String registryName) + { + ForgeRegistries.BLOCKS.register(block); + //GameRegistry.register(block); + item.setRegistryName(registryName); - GameRegistry.register(item); + + ForgeRegistries.ITEMS.register(item); + //GameRegistry.register(item); } - private static void registerRender(Block block) { + private static void registerRender(Block block) + { Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(Item.getItemFromBlock(block), 0, new ModelResourceLocation(block.getRegistryName(), "inventory")); } - private static void registerRenderCustom(ItemBlock item, Integer meta, ModelResourceLocation model){ + private static void registerRenderCustom(ItemBlock item, Integer meta, ModelResourceLocation model) + { ModelLoader.setCustomModelResourceLocation(item, meta, model); } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java b/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java index aa392b54..6ca5daf2 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java @@ -8,6 +8,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import nmd.primal.core.api.PrimalItems; +import nmd.primal.core.common.crafting.RecipeHandler; import nmd.primal.core.common.helper.CommonUtils; import nmd.primal.forgecraft.crafting.AnvilCrafting; import nmd.primal.forgecraft.crafting.BloomeryCrafting; @@ -25,176 +26,178 @@ public class ModCrafting { Random rand = new Random(); + //RecipeHandler.addShapedOreRecipe(); + /***CASTING BLOCK***/ - GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.castingblock), + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.castingblock), " B ", "BXB", " B ", 'X', Blocks.STONE_SLAB, 'B', PrimalItems.ADOBEBRICK_DRY); /***CASTING FORM***/ - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.castingform, 1), + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.castingform, 1), true, new Object[]{" S ", "S S", " S ", ('S'), "logSplit" - })); + }); /***CASTING MUD***/ - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.castingmud, 4), + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.castingmud, 4), true, new Object[]{" C ", "CSC", " C ", ('S'), Blocks.SAND, ('C'), PrimalItems.MUD_CLUMP - })); + }); /***YEW STAVE***/ - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.yewstave, 2), + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.yewstave, 2), true, new Object[]{"C", "C", ('C'), PrimalItems.LOGS_SPLIT_YEW - })); + }); /***Unstrung Longbow***/ - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.unstrunglongbow, 1), + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.unstrunglongbow, 1), true, new Object[]{"C", "A", ('C'), "fatAnimal", ('A'), ModItems.rawlongbow - })); + }); /***Longbow***/ - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.longbow, 1), + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.longbow, 1), true, new Object[]{"C ","CA","C ", ('C'), PrimalItems.SILK_CORDAGE, ('A'), ModItems.unstrunglongbow - })); + }); /***Forge***/ - GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.forge_brick), + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.forge_brick), "X X", "XYX", "X X", 'X', Items.BRICK, 'Y', Blocks.FURNACE); - GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.forge_adobe), + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.forge_adobe), "X X", "XYX", "X X", 'X', PrimalItems.ADOBEBRICK_DRY, 'Y', Blocks.FURNACE); /***Bloomery***/ - GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.bloomery_brick), + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.bloomery_brick), "X X", "X X", "XXX", 'X', Items.BRICK); - GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.bloomery_adobe), + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.bloomery_adobe), "X X", "X X", "XXX", 'X', PrimalItems.ADOBEBRICK_DRY); /***Block Breaker***/ - GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.blockbreaker), + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.blockbreaker), "L ", "BSB", "BBB", 'L', Blocks.LEVER, 'B', new ItemStack(Blocks.PLANKS, 1, OreDictionary.WILDCARD_VALUE), 'S', PrimalItems.SILK_CORDAGE_COILED); /*** Soft Crucible ***/ - GameRegistry.addShapedRecipe(new ItemStack(ModItems.softcrucible), + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.softcrucible), "X X", "X X", "XXX", 'X', Items.CLAY_BALL); /*** Soft Crucible ***/ - GameRegistry.addShapedRecipe(new ItemStack(ModItems.softcrucible), + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.softcrucible), "X X", "X X", "XXX", 'X', PrimalItems.MUD_CLUMP); /***Wooden PistonBellows***/ - GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.pistonbellowsoak), "XXX", "X Y", "XXX", + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.pistonbellowsoak), "XXX", "X Y", "XXX", 'X', new ItemStack(Blocks.PLANKS, 1, 0), 'Y', ModItems.bellowshandle); - GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.pistonbellowsspruce), "XXX", "X Y", "XXX", + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.pistonbellowsspruce), "XXX", "X Y", "XXX", 'X', new ItemStack(Blocks.PLANKS, 1, 1), 'Y', ModItems.bellowshandle); - GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.pistonbellowsbirch), "XXX", "X Y", "XXX", + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.pistonbellowsbirch), "XXX", "X Y", "XXX", 'X', new ItemStack(Blocks.PLANKS, 1, 2), 'Y', ModItems.bellowshandle); - GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.pistonbellowsjungle), "XXX", "X Y", "XXX", + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.pistonbellowsjungle), "XXX", "X Y", "XXX", 'X', new ItemStack(Blocks.PLANKS, 1, 3), 'Y', ModItems.bellowshandle); - GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.pistonbellowsacacia), "XXX", "X Y", "XXX", + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.pistonbellowsacacia), "XXX", "X Y", "XXX", 'X', new ItemStack(Blocks.PLANKS, 1, 4), 'Y', ModItems.bellowshandle); - GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.pistonbellowsdarkoak), "XXX", "X Y", "XXX", + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.pistonbellowsdarkoak), "XXX", "X Y", "XXX", 'X', new ItemStack(Blocks.PLANKS, 1, 5), 'Y', ModItems.bellowshandle); /***Bellows Handle***/ - GameRegistry.addShapedRecipe(new ItemStack(ModItems.bellowshandle), + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.bellowshandle), "X X", "X X", " X ", 'X', Items.STICK); /***Tongs***/ - GameRegistry.addShapedRecipe(new ItemStack(ModItems.stonetongs, 1), + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.stonetongs, 1), "X X", "YSY", 'X', Blocks.STONE, 'S', Items.STRING, 'Y', Items.STICK); /***RAW CRUCIBLES***/ - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawironcrucible), + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.rawironcrucible), "X","Y", ('X'), "oreIron", - ('Y'), ModBlocks.emptycrucible)); + ('Y'), ModBlocks.emptycrucible); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawcleanironcrucible), + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.rawcleanironcrucible), "XL","Y ", ('X'), "dustIron", ('L'), PrimalItems.CARBONATE_SLACK, - ('Y'), ModBlocks.emptycrucible)); + ('Y'), ModBlocks.emptycrucible); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawsteelcrucible), + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.rawsteelcrucible), "XC","Y ", ('X'), new ItemStack(ModBlocks.ironcleanball, 1), ('C'), new ItemStack(PrimalItems.CHARCOAL_HIGH), - ('Y'), ModBlocks.emptycrucible)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible), + ('Y'), ModBlocks.emptycrucible); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible), "XCX"," X "," Y ", ('X'), "dustCopper", ('C'), "dustTin", - ('Y'), ModBlocks.emptycrucible)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible), + ('Y'), ModBlocks.emptycrucible); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible), "XXX"," X "," Y ", ('X'), "nuggetBronze", - ('Y'), ModBlocks.emptycrucible)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible), + ('Y'), ModBlocks.emptycrucible); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible), "X","Y", ('X'), new ItemStack(ModItems.bronzepickaxehead, 1, OreDictionary.WILDCARD_VALUE), - ('Y'), ModBlocks.emptycrucible)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible), + ('Y'), ModBlocks.emptycrucible); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible), "X","Y", ('X'), new ItemStack(ModItems.bronzeaxehead, 1, OreDictionary.WILDCARD_VALUE), - ('Y'), ModBlocks.emptycrucible)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible), + ('Y'), ModBlocks.emptycrucible); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible), "X","Y", ('X'), new ItemStack(ModItems.bronzeshovelhead, 1, OreDictionary.WILDCARD_VALUE), - ('Y'), ModBlocks.emptycrucible)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible), + ('Y'), ModBlocks.emptycrucible); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible), "X","Y", ('X'), new ItemStack(ModItems.bronzehoehead, 1, OreDictionary.WILDCARD_VALUE), - ('Y'), ModBlocks.emptycrucible)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible), + ('Y'), ModBlocks.emptycrucible); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible), "X","Y", ('X'), new ItemStack(ModItems.bronzegladius, 1, OreDictionary.WILDCARD_VALUE), - ('Y'), ModBlocks.emptycrucible)); + ('Y'), ModBlocks.emptycrucible); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible_redstone), + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible_redstone), "R","Y", ('R'), Items.REDSTONE, - ('Y'), ModBlocks.rawbronzecrucible)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible_diamond), + ('Y'), ModBlocks.rawbronzecrucible); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible_diamond), "D","Y", ('D'), PrimalItems.DIAMOND_KNAPP, - ('Y'), ModBlocks.rawbronzecrucible)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible_lapis), + ('Y'), ModBlocks.rawbronzecrucible); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible_lapis), "L","Y", ('L'), new ItemStack(Items.DYE, 1, 4), - ('Y'), ModBlocks.rawbronzecrucible)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible_emerald), + ('Y'), ModBlocks.rawbronzecrucible); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible_emerald), "E","Y", ('E'), PrimalItems.EMERALD_KNAPP, - ('Y'), ModBlocks.rawbronzecrucible)); + ('Y'), ModBlocks.rawbronzecrucible); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible, 1), + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible, 1), "T", "Y", ('T'), new ItemStack(ModItems.brokenbronzetool, 1), ('Y'), new ItemStack(ModBlocks.emptycrucible, 1) - )); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawironcrucible, 1), + ); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.rawironcrucible, 1), "T", "Y", ('T'), new ItemStack(ModItems.brokenwroughtirontool, 1), ('Y'), new ItemStack(ModBlocks.emptycrucible, 1) - )); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawcleanironcrucible, 1), + ); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.rawcleanironcrucible, 1), "T", "Y", ('T'), new ItemStack(ModItems.brokencleanirontool, 1), ('Y'), new ItemStack(ModBlocks.emptycrucible, 1) - )); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawsteelcrucible, 1), + ); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.rawsteelcrucible, 1), "T", "Y", ('T'), new ItemStack(ModItems.brokensteeltool, 1), ('Y'), new ItemStack(ModBlocks.emptycrucible, 1) - )); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawwootzcrucible, 1), + ); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.rawwootzcrucible, 1), "T", "Y", ('T'), new ItemStack(ModItems.brokenwootztool, 1), ('Y'), new ItemStack(ModBlocks.emptycrucible, 1) - )); + ); /*************************************************************** @@ -202,163 +205,163 @@ public class ModCrafting { ***************************************************************/ /***Pickaxe Crafting***/ - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.bronzepickaxe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.bronzepickaxe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", ('T'), new ItemStack(ModItems.bronzepickaxehead, 1, OreDictionary.WILDCARD_VALUE), //new ItemStack( 1, OreDictionary.WILDCARD_VALUE), ('S'), PrimalItems.LACQUER_STICK, - ('C'), "cordageGeneral")); + ('C'), "cordageGeneral"); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ironpickaxe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.ironpickaxe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", ('T'), new ItemStack(ModItems.pickaxehead, 1, OreDictionary.WILDCARD_VALUE), //new ItemStack( 1, OreDictionary.WILDCARD_VALUE), ('S'), PrimalItems.LACQUER_STICK, - ('C'), "cordageGeneral")); + ('C'), "cordageGeneral"); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cleanironpickaxe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.cleanironpickaxe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", ('T'), new ItemStack(ModItems.cleanironpickaxehead, 1, OreDictionary.WILDCARD_VALUE), ('S'), PrimalItems.LACQUER_STICK, - ('C'), "cordageGeneral")); + ('C'), "cordageGeneral"); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steelpickaxe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.steelpickaxe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", ('T'), new ItemStack(ModItems.steelpickaxehead, 1, OreDictionary.WILDCARD_VALUE), ('S'), PrimalItems.LACQUER_STICK, - ('C'), "cordageGeneral")); + ('C'), "cordageGeneral"); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.IRON_PICKAXE), "T", "S", + RecipeHandler.addShapedOreRecipe(new ItemStack(Items.IRON_PICKAXE), "T", "S", ('T'), ModItems.pickaxehead, - ('S'), Items.STICK)); + ('S'), Items.STICK); //TODO wootz placeholder /***Axe Crafting***/ - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.bronzeaxe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.bronzeaxe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", ('T'), new ItemStack(ModItems.bronzeaxehead, 1, OreDictionary.WILDCARD_VALUE), ('S'), PrimalItems.LACQUER_STICK, - ('C'), "cordageGeneral")); + ('C'), "cordageGeneral"); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ironaxe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.ironaxe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", ('T'), new ItemStack(ModItems.ironaxehead, 1, OreDictionary.WILDCARD_VALUE), ('S'), PrimalItems.LACQUER_STICK, - ('C'), "cordageGeneral")); + ('C'), "cordageGeneral"); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cleanironaxe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.cleanironaxe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", ('T'), new ItemStack(ModItems.cleanironaxehead, 1, OreDictionary.WILDCARD_VALUE), ('S'), PrimalItems.LACQUER_STICK, - ('C'), "cordageGeneral")); + ('C'), "cordageGeneral"); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steelaxe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.steelaxe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", ('T'), new ItemStack(ModItems.steelaxehead,1, OreDictionary.WILDCARD_VALUE), ('S'), PrimalItems.LACQUER_STICK, - ('C'), "cordageGeneral")); + ('C'), "cordageGeneral"); //TODO wootz placeholder - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.IRON_AXE), "T", "S", + RecipeHandler.addShapedOreRecipe(new ItemStack(Items.IRON_AXE), "T", "S", ('T'), ModItems.ironaxehead, - ('S'), Items.STICK)); + ('S'), Items.STICK); /***Shovel Crafting***/ - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.bronzeshovel, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.bronzeshovel, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", ('T'), new ItemStack(ModItems.bronzeshovelhead, 1, OreDictionary.WILDCARD_VALUE), ('S'), PrimalItems.LACQUER_STICK, - ('C'), "cordageGeneral")); + ('C'), "cordageGeneral"); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ironshovel, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.ironshovel, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", ('T'), new ItemStack(ModItems.ironshovelhead, 1, OreDictionary.WILDCARD_VALUE), ('S'), PrimalItems.LACQUER_STICK, - ('C'), "cordageGeneral")); + ('C'), "cordageGeneral"); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cleanironshovel, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.cleanironshovel, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", ('T'), new ItemStack(ModItems.cleanironshovelhead, 1, OreDictionary.WILDCARD_VALUE), ('S'), PrimalItems.LACQUER_STICK, - ('C'), "cordageGeneral")); + ('C'), "cordageGeneral"); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steelshovel, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.steelshovel, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", ('T'), new ItemStack(ModItems.steelshovelhead, 1, OreDictionary.WILDCARD_VALUE), ('S'), PrimalItems.LACQUER_STICK, - ('C'), "cordageGeneral")); + ('C'), "cordageGeneral"); //TODO placed holder for wootz - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.IRON_SHOVEL), "T", "S", + RecipeHandler.addShapedOreRecipe(new ItemStack(Items.IRON_SHOVEL), "T", "S", ('T'), ModItems.ironshovelhead, - ('S'), Items.STICK)); + ('S'), Items.STICK); /***Hoe Crafting***/ - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.bronzehoe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.bronzehoe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", ('T'), new ItemStack(ModItems.bronzehoehead, 1, OreDictionary.WILDCARD_VALUE), ('S'), PrimalItems.LACQUER_STICK, - ('C'), "cordageGeneral")); + ('C'), "cordageGeneral"); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ironhoe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.ironhoe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", ('T'), new ItemStack(ModItems.ironhoehead, 1, OreDictionary.WILDCARD_VALUE), ('S'), PrimalItems.LACQUER_STICK, - ('C'), "cordageGeneral")); + ('C'), "cordageGeneral"); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cleanironhoe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.cleanironhoe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", ('T'), new ItemStack(ModItems.cleanironhoehead, 1, OreDictionary.WILDCARD_VALUE), ('S'), PrimalItems.LACQUER_STICK, - ('C'), "cordageGeneral")); + ('C'), "cordageGeneral"); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steelhoe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.steelhoe, 1, OreDictionary.WILDCARD_VALUE), "T", "C", "S", ('T'), new ItemStack(ModItems.steelhoehead, 1, OreDictionary.WILDCARD_VALUE), ('S'), PrimalItems.LACQUER_STICK, - ('C'), "cordageGeneral")); + ('C'), "cordageGeneral"); //TODO PLACE HOLDER FOR WOOTZ STEEL - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.IRON_HOE), "T", "S", + RecipeHandler.addShapedOreRecipe(new ItemStack(Items.IRON_HOE), "T", "S", ('T'), ModItems.ironhoehead, - ('S'), Items.STICK)); + ('S'), Items.STICK); /*************************************************************** * TOOL DISASSEMBLY RECIPES ***************************************************************/ - //GameRegistry.addShapedRecipe(new ItemStack(ModItems.ironaxehead, 1, OreDictionary.WILDCARD_VALUE), + //RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.ironaxehead, 1, OreDictionary.WILDCARD_VALUE), // " ", " X ", " ", 'X', ModItems.ironaxe); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.bronzeaxehead, 1, OreDictionary.WILDCARD_VALUE), - true, "X", ('X'), new ItemStack(ModItems.bronzeaxe, 1, OreDictionary.WILDCARD_VALUE))); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.bronzeaxehead, 1, OreDictionary.WILDCARD_VALUE), + true, "X", ('X'), new ItemStack(ModItems.bronzeaxe, 1, OreDictionary.WILDCARD_VALUE)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.bronzepickaxehead, 1, OreDictionary.WILDCARD_VALUE), - true, "X", ('X'), new ItemStack(ModItems.bronzepickaxe, 1, OreDictionary.WILDCARD_VALUE))); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.bronzepickaxehead, 1, OreDictionary.WILDCARD_VALUE), + true, "X", ('X'), new ItemStack(ModItems.bronzepickaxe, 1, OreDictionary.WILDCARD_VALUE)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.bronzeshovelhead, 1, OreDictionary.WILDCARD_VALUE), - true, "X", ('X'), new ItemStack(ModItems.bronzeshovel, 1, OreDictionary.WILDCARD_VALUE))); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.bronzeshovelhead, 1, OreDictionary.WILDCARD_VALUE), + true, "X", ('X'), new ItemStack(ModItems.bronzeshovel, 1, OreDictionary.WILDCARD_VALUE)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.bronzehoehead, 1, OreDictionary.WILDCARD_VALUE), - true, "X", ('X'), new ItemStack(ModItems.bronzehoe, 1, OreDictionary.WILDCARD_VALUE))); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.bronzehoehead, 1, OreDictionary.WILDCARD_VALUE), + true, "X", ('X'), new ItemStack(ModItems.bronzehoe, 1, OreDictionary.WILDCARD_VALUE)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ironaxehead, 1, OreDictionary.WILDCARD_VALUE), - true, "X", ('X'), new ItemStack(ModItems.ironaxe, 1, OreDictionary.WILDCARD_VALUE))); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.ironaxehead, 1, OreDictionary.WILDCARD_VALUE), + true, "X", ('X'), new ItemStack(ModItems.ironaxe, 1, OreDictionary.WILDCARD_VALUE)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pickaxehead, 1, OreDictionary.WILDCARD_VALUE), - true, "X", ('X'), new ItemStack(ModItems.ironpickaxe, 1, OreDictionary.WILDCARD_VALUE))); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.pickaxehead, 1, OreDictionary.WILDCARD_VALUE), + true, "X", ('X'), new ItemStack(ModItems.ironpickaxe, 1, OreDictionary.WILDCARD_VALUE)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ironshovelhead, 1, OreDictionary.WILDCARD_VALUE), - true, "X", ('X'), new ItemStack(ModItems.ironshovel, 1, OreDictionary.WILDCARD_VALUE))); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.ironshovelhead, 1, OreDictionary.WILDCARD_VALUE), + true, "X", ('X'), new ItemStack(ModItems.ironshovel, 1, OreDictionary.WILDCARD_VALUE)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ironhoehead, 1, OreDictionary.WILDCARD_VALUE), - true, "X", ('X'), new ItemStack(ModItems.ironhoe, 1, OreDictionary.WILDCARD_VALUE))); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.ironhoehead, 1, OreDictionary.WILDCARD_VALUE), + true, "X", ('X'), new ItemStack(ModItems.ironhoe, 1, OreDictionary.WILDCARD_VALUE)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cleanironaxehead, 1, OreDictionary.WILDCARD_VALUE), - true, "X", ('X'), new ItemStack(ModItems.cleanironaxe, 1, OreDictionary.WILDCARD_VALUE))); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.cleanironaxehead, 1, OreDictionary.WILDCARD_VALUE), + true, "X", ('X'), new ItemStack(ModItems.cleanironaxe, 1, OreDictionary.WILDCARD_VALUE)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cleanironpickaxehead, 1, OreDictionary.WILDCARD_VALUE), - true, "X", ('X'), new ItemStack(ModItems.cleanironpickaxe, 1, OreDictionary.WILDCARD_VALUE))); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.cleanironpickaxehead, 1, OreDictionary.WILDCARD_VALUE), + true, "X", ('X'), new ItemStack(ModItems.cleanironpickaxe, 1, OreDictionary.WILDCARD_VALUE)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cleanironshovelhead, 1, OreDictionary.WILDCARD_VALUE), - true, "X", ('X'), new ItemStack(ModItems.cleanironshovel, 1, OreDictionary.WILDCARD_VALUE))); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.cleanironshovelhead, 1, OreDictionary.WILDCARD_VALUE), + true, "X", ('X'), new ItemStack(ModItems.cleanironshovel, 1, OreDictionary.WILDCARD_VALUE)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cleanironhoehead, 1, OreDictionary.WILDCARD_VALUE), - true, "X", ('X'), new ItemStack(ModItems.cleanironhoe, 1, OreDictionary.WILDCARD_VALUE))); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.cleanironhoehead, 1, OreDictionary.WILDCARD_VALUE), + true, "X", ('X'), new ItemStack(ModItems.cleanironhoe, 1, OreDictionary.WILDCARD_VALUE)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steelaxehead, 1, OreDictionary.WILDCARD_VALUE), - true, "X", ('X'), new ItemStack(ModItems.steelaxe, 1, OreDictionary.WILDCARD_VALUE))); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.steelaxehead, 1, OreDictionary.WILDCARD_VALUE), + true, "X", ('X'), new ItemStack(ModItems.steelaxe, 1, OreDictionary.WILDCARD_VALUE)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steelpickaxehead, 1, OreDictionary.WILDCARD_VALUE), - true, "X", ('X'), new ItemStack(ModItems.steelpickaxe, 1, OreDictionary.WILDCARD_VALUE))); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.steelpickaxehead, 1, OreDictionary.WILDCARD_VALUE), + true, "X", ('X'), new ItemStack(ModItems.steelpickaxe, 1, OreDictionary.WILDCARD_VALUE)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steelshovelhead, 1, OreDictionary.WILDCARD_VALUE), - true, "X", ('X'), new ItemStack(ModItems.steelshovel, 1, OreDictionary.WILDCARD_VALUE))); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.steelshovelhead, 1, OreDictionary.WILDCARD_VALUE), + true, "X", ('X'), new ItemStack(ModItems.steelshovel, 1, OreDictionary.WILDCARD_VALUE)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steelhoehead, 1, OreDictionary.WILDCARD_VALUE), - true, "X", ('X'), new ItemStack(ModItems.steelhoe, 1, OreDictionary.WILDCARD_VALUE))); + RecipeHandler.addShapedOreRecipe(new ItemStack(ModItems.steelhoehead, 1, OreDictionary.WILDCARD_VALUE), + true, "X", ('X'), new ItemStack(ModItems.steelhoe, 1, OreDictionary.WILDCARD_VALUE)); /***************************************************************/ diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java b/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java index 16c83870..26f782b6 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java @@ -10,6 +10,7 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -265,120 +266,120 @@ public class ModItems { } public static void register() { - GameRegistry.register(castingmud); - GameRegistry.register(bellowshandle); - GameRegistry.register(softcrucible); - GameRegistry.register(stonetongs); - GameRegistry.register(forgehammer); - GameRegistry.register(ironingotballhot); - GameRegistry.register(ironchunkhot); - GameRegistry.register(ironcleaningotballhot); - GameRegistry.register(ironcleanchunkhot); - GameRegistry.register(steelingotballhot); - GameRegistry.register(steelchunkhot); - GameRegistry.register(wootzingotballhot); - GameRegistry.register(wootzchunkhot); - //GameRegistry.register(test); + ForgeRegistries.ITEMS.register(castingmud); + ForgeRegistries.ITEMS.register(bellowshandle); + ForgeRegistries.ITEMS.register(softcrucible); + ForgeRegistries.ITEMS.register(stonetongs); + ForgeRegistries.ITEMS.register(forgehammer); + ForgeRegistries.ITEMS.register(ironingotballhot); + ForgeRegistries.ITEMS.register(ironchunkhot); + ForgeRegistries.ITEMS.register(ironcleaningotballhot); + ForgeRegistries.ITEMS.register(ironcleanchunkhot); + ForgeRegistries.ITEMS.register(steelingotballhot); + ForgeRegistries.ITEMS.register(steelchunkhot); + ForgeRegistries.ITEMS.register(wootzingotballhot); + ForgeRegistries.ITEMS.register(wootzchunkhot); + //ForgeRegistries.ITEMS.register(test); /********** CASTING PARTS **********/ - GameRegistry.register(cast_axe); - GameRegistry.register(cast_gladius); - GameRegistry.register(cast_hoe); - GameRegistry.register(cast_pickaxe); - GameRegistry.register(cast_shovel); + ForgeRegistries.ITEMS.register(cast_axe); + ForgeRegistries.ITEMS.register(cast_gladius); + ForgeRegistries.ITEMS.register(cast_hoe); + ForgeRegistries.ITEMS.register(cast_pickaxe); + ForgeRegistries.ITEMS.register(cast_shovel); /********** TOOL PARTS **********/ - GameRegistry.register(bronzepickaxehead); - GameRegistry.register(bronzeaxehead); - GameRegistry.register(bronzeshovelhead); - GameRegistry.register(bronzehoehead); + ForgeRegistries.ITEMS.register(bronzepickaxehead); + ForgeRegistries.ITEMS.register(bronzeaxehead); + ForgeRegistries.ITEMS.register(bronzeshovelhead); + ForgeRegistries.ITEMS.register(bronzehoehead); - GameRegistry.register(pickaxehead); - GameRegistry.register(ironaxehead); - GameRegistry.register(ironshovelhead); - GameRegistry.register(ironhoehead); + ForgeRegistries.ITEMS.register(pickaxehead); + ForgeRegistries.ITEMS.register(ironaxehead); + ForgeRegistries.ITEMS.register(ironshovelhead); + ForgeRegistries.ITEMS.register(ironhoehead); - GameRegistry.register(cleanironpickaxehead); - GameRegistry.register(cleanironaxehead); - GameRegistry.register(cleanironshovelhead); - GameRegistry.register(cleanironhoehead); + ForgeRegistries.ITEMS.register(cleanironpickaxehead); + ForgeRegistries.ITEMS.register(cleanironaxehead); + ForgeRegistries.ITEMS.register(cleanironshovelhead); + ForgeRegistries.ITEMS.register(cleanironhoehead); - GameRegistry.register(steelpickaxehead); - GameRegistry.register(steelaxehead); - GameRegistry.register(steelshovelhead); - GameRegistry.register(steelhoehead); + ForgeRegistries.ITEMS.register(steelpickaxehead); + ForgeRegistries.ITEMS.register(steelaxehead); + ForgeRegistries.ITEMS.register(steelshovelhead); + ForgeRegistries.ITEMS.register(steelhoehead); - GameRegistry.register(wootzpickaxehead); - GameRegistry.register(wootzaxehead); - GameRegistry.register(wootzshovelhead); - GameRegistry.register(wootzhoehead); + ForgeRegistries.ITEMS.register(wootzpickaxehead); + ForgeRegistries.ITEMS.register(wootzaxehead); + ForgeRegistries.ITEMS.register(wootzshovelhead); + ForgeRegistries.ITEMS.register(wootzhoehead); /********** TOOLS **********/ - GameRegistry.register(bronzepickaxe); - GameRegistry.register(bronzeaxe); - GameRegistry.register(bronzeshovel); - GameRegistry.register(bronzehoe); + ForgeRegistries.ITEMS.register(bronzepickaxe); + ForgeRegistries.ITEMS.register(bronzeaxe); + ForgeRegistries.ITEMS.register(bronzeshovel); + ForgeRegistries.ITEMS.register(bronzehoe); - GameRegistry.register(ironpickaxe); - GameRegistry.register(ironaxe); - GameRegistry.register(ironshovel); - GameRegistry.register(ironhoe); + ForgeRegistries.ITEMS.register(ironpickaxe); + ForgeRegistries.ITEMS.register(ironaxe); + ForgeRegistries.ITEMS.register(ironshovel); + ForgeRegistries.ITEMS.register(ironhoe); - GameRegistry.register(cleanironpickaxe); - GameRegistry.register(cleanironaxe); - GameRegistry.register(cleanironshovel); - GameRegistry.register(cleanironhoe); + ForgeRegistries.ITEMS.register(cleanironpickaxe); + ForgeRegistries.ITEMS.register(cleanironaxe); + ForgeRegistries.ITEMS.register(cleanironshovel); + ForgeRegistries.ITEMS.register(cleanironhoe); - GameRegistry.register(steelpickaxe); - GameRegistry.register(steelaxe); - GameRegistry.register(steelshovel); - GameRegistry.register(steelhoe); + ForgeRegistries.ITEMS.register(steelpickaxe); + ForgeRegistries.ITEMS.register(steelaxe); + ForgeRegistries.ITEMS.register(steelshovel); + ForgeRegistries.ITEMS.register(steelhoe); - GameRegistry.register(wootzpickaxe); - GameRegistry.register(wootzaxe); - GameRegistry.register(wootzshovel); - GameRegistry.register(wootzhoe); + ForgeRegistries.ITEMS.register(wootzpickaxe); + ForgeRegistries.ITEMS.register(wootzaxe); + ForgeRegistries.ITEMS.register(wootzshovel); + ForgeRegistries.ITEMS.register(wootzhoe); /********** WEAPONS **********/ - GameRegistry.register(wroughtirongladius); - GameRegistry.register(bronzegladius); - GameRegistry.register(cleanirongladius); - GameRegistry.register(steelgladius); + ForgeRegistries.ITEMS.register(wroughtirongladius); + ForgeRegistries.ITEMS.register(bronzegladius); + ForgeRegistries.ITEMS.register(cleanirongladius); + ForgeRegistries.ITEMS.register(steelgladius); - GameRegistry.register(cleanironlongsword); - GameRegistry.register(steellongsword); + ForgeRegistries.ITEMS.register(cleanironlongsword); + ForgeRegistries.ITEMS.register(steellongsword); - GameRegistry.register(wroughtironslayer); - GameRegistry.register(cleanironslayer); - GameRegistry.register(steelslayer); + ForgeRegistries.ITEMS.register(wroughtironslayer); + ForgeRegistries.ITEMS.register(cleanironslayer); + ForgeRegistries.ITEMS.register(steelslayer); - GameRegistry.register(rawlongbow); - GameRegistry.register(unstrunglongbow); - GameRegistry.register(longbow); - //GameRegistry.register(matchlockmusket); + ForgeRegistries.ITEMS.register(rawlongbow); + ForgeRegistries.ITEMS.register(unstrunglongbow); + ForgeRegistries.ITEMS.register(longbow); + //ForgeRegistries.ITEMS.register(matchlockmusket); - GameRegistry.register(brokenbronzetool); - GameRegistry.register(brokenwroughtirontool); - GameRegistry.register(brokencleanirontool); - GameRegistry.register(brokensteeltool); - GameRegistry.register(brokenwootztool); + ForgeRegistries.ITEMS.register(brokenbronzetool); + ForgeRegistries.ITEMS.register(brokenwroughtirontool); + ForgeRegistries.ITEMS.register(brokencleanirontool); + ForgeRegistries.ITEMS.register(brokensteeltool); + ForgeRegistries.ITEMS.register(brokenwootztool); /********** ARMOR **********/ - //GameRegistry.register(testleggings); + //ForgeRegistries.ITEMS.register(testleggings); - //GameRegistry.register(forgingmanual); + //ForgeRegistries.ITEMS.register(forgingmanual); } @SideOnly(Side.CLIENT) diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java b/kfc/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java index 6afc1966..b6f9c93d 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java @@ -1,6 +1,7 @@ package nmd.primal.forgecraft.items; import net.minecraft.block.material.Material; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -27,6 +28,7 @@ import nmd.primal.forgecraft.tiles.TileBaseCrucible; import nmd.primal.forgecraft.tiles.TileBloomery; import nmd.primal.forgecraft.tiles.TileForge; +import javax.annotation.Nullable; import java.util.List; /** @@ -888,7 +890,7 @@ public class ItemStoneTongs extends Item { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { //tooltip.add(ChatFormatting.BLUE + "NBT: " + item.getSubCompound("tags")); //tooltip.add(ChatFormatting.RED + "NBT: " + item.getTagCompound().getInteger("type")); diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/parts/BronzeToolPart.java b/kfc/src/main/java/nmd/primal/forgecraft/items/parts/BronzeToolPart.java index c07e43ca..ab811075 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/parts/BronzeToolPart.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/parts/BronzeToolPart.java @@ -1,6 +1,7 @@ package nmd.primal.forgecraft.items.parts; import com.mojang.realmsclient.gui.ChatFormatting; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -125,30 +126,23 @@ public class BronzeToolPart extends Item implements ToolNBT{ @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack item, @Nullable World world, List tooltip, ITooltipFlag flagIn) { - if(player.getEntityWorld().isRemote) { - - if(item.hasTagCompound()) { - - tooltip.add(ChatFormatting.GRAY + "Upgrades"); - if (getEmerald(item) == true) { - tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); - } - if (getDiamondLevel(item) > 0) { - tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); - } - if (getRedstoneLevel(item) > 0) { - tooltip.add(ChatFormatting.RED + "Redstone Level: " + getRedstoneLevel(item)); - } - if (getLapisLevel(item) > 0) { - tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item)); - } + if(item.hasTagCompound()) + { + tooltip.add(ChatFormatting.GRAY + "Upgrades"); + if (getEmerald(item) == true) { + tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); + } + if (getDiamondLevel(item) > 0) { + tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); + } + if (getRedstoneLevel(item) > 0) { + tooltip.add(ChatFormatting.RED + "Redstone Level: " + getRedstoneLevel(item)); + } + if (getLapisLevel(item) > 0) { + tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item)); } } } - - - - -} +} \ No newline at end of file diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/parts/ToolPart.java b/kfc/src/main/java/nmd/primal/forgecraft/items/parts/ToolPart.java index 93f0b767..fbc72b47 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/parts/ToolPart.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/parts/ToolPart.java @@ -1,6 +1,7 @@ package nmd.primal.forgecraft.items.parts; import com.mojang.realmsclient.gui.ChatFormatting; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -271,30 +272,23 @@ public class ToolPart extends Item implements ToolNBT{ @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack item, @Nullable World world, List tooltip, ITooltipFlag flagIn) { - if(player.getEntityWorld().isRemote) { - - if(item.hasTagCompound()) { - - tooltip.add(ChatFormatting.GRAY + "Upgrades"); - if (getEmerald(item) == true) { - tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); - } - if (getDiamondLevel(item) > 0) { - tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); - } - if (getRedstoneLevel(item) > 0) { - tooltip.add(ChatFormatting.RED + "Redstone Level: " + getRedstoneLevel(item)); - } - if (getLapisLevel(item) > 0) { - tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item)); - } + if(item.hasTagCompound()) + { + tooltip.add(ChatFormatting.GRAY + "Upgrades"); + if (getEmerald(item) == true) { + tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); + } + if (getDiamondLevel(item) > 0) { + tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); + } + if (getRedstoneLevel(item) > 0) { + tooltip.add(ChatFormatting.RED + "Redstone Level: " + getRedstoneLevel(item)); + } + if (getLapisLevel(item) > 0) { + tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item)); } } } - - - - -} +} \ No newline at end of file diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeAxe.java b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeAxe.java index 36a25465..dadd7298 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeAxe.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeAxe.java @@ -3,6 +3,7 @@ package nmd.primal.forgecraft.items.tools; import com.mojang.realmsclient.gui.ChatFormatting; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -136,28 +137,26 @@ public class BronzeAxe extends ItemAxe implements ToolNBT { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack item, @Nullable World world, List tooltip, ITooltipFlag flagIn) { - if(!item.isEmpty()) { - if (player.getEntityWorld().isRemote) { - - if (item.hasTagCompound()) { - - tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " + (1 - getModifiers(item)) ); - if (getEmerald(item) == true) { - tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); - } - if (getDiamondLevel(item) > 0) { - tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); - } - if (getRedstoneLevel(item) > 0) { - tooltip.add(ChatFormatting.RED + "Redstone Level: " + "1" ); - } - if (getLapisLevel(item) > 0) { - tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + "5" ); - } - tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() ); + if(!item.isEmpty()) + { + if (item.hasTagCompound()) + { + tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " + (1 - getModifiers(item)) ); + if (getEmerald(item) == true) { + tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); } + if (getDiamondLevel(item) > 0) { + tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); + } + if (getRedstoneLevel(item) > 0) { + tooltip.add(ChatFormatting.RED + "Redstone Level: " + "1" ); + } + if (getLapisLevel(item) > 0) { + tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + "5" ); + } + tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() ); } } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeHoe.java b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeHoe.java index 562579a9..a4dde0b7 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeHoe.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeHoe.java @@ -2,6 +2,7 @@ package nmd.primal.forgecraft.items.tools; import com.mojang.realmsclient.gui.ChatFormatting; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -138,27 +139,25 @@ public class BronzeHoe extends ItemHoe implements ToolNBT { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack item, @Nullable World world, List tooltip, ITooltipFlag flagIn) { - if(player.getEntityWorld().isRemote) { - //tooltip.add(ChatFormatting.GRAY + "Damage: " + item.getItemDamage() ); - if(item.hasTagCompound()) { - - tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " + (1 - getModifiers(item)) ); - if (getEmerald(item) == true) { - tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); - } - if (getDiamondLevel(item) > 0) { - tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); - } - if (getRedstoneLevel(item) > 0) { - tooltip.add(ChatFormatting.RED + "Redstone Level: " + 1 ); - } - if (getLapisLevel(item) > 0) { - tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + 5 ); - } - tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() ); + //tooltip.add(ChatFormatting.GRAY + "Damage: " + item.getItemDamage() ); + if(item.hasTagCompound()) + { + tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " + (1 - getModifiers(item)) ); + if (getEmerald(item) == true) { + tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); } + if (getDiamondLevel(item) > 0) { + tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); + } + if (getRedstoneLevel(item) > 0) { + tooltip.add(ChatFormatting.RED + "Redstone Level: " + 1 ); + } + if (getLapisLevel(item) > 0) { + tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + 5 ); + } + tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() ); } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzePickaxe.java b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzePickaxe.java index 9983caa4..1cda00b0 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzePickaxe.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzePickaxe.java @@ -3,6 +3,7 @@ package nmd.primal.forgecraft.items.tools; import com.mojang.realmsclient.gui.ChatFormatting; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -136,27 +137,25 @@ public class BronzePickaxe extends ItemPickaxe implements ToolNBT{ @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack item, @Nullable World world, List tooltip, ITooltipFlag flagIn) { - if(player.getEntityWorld().isRemote) { - //tooltip.add(ChatFormatting.GRAY + "Damage: " + item.getItemDamage() ); - if(item.hasTagCompound()) { - - tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " + (1 - getModifiers(item)) ); - if (getEmerald(item) == true) { - tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); - } - if (getDiamondLevel(item) > 0) { - tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); - } - if (getRedstoneLevel(item) > 0) { - tooltip.add(ChatFormatting.RED + "Redstone Level: " + 1 ); - } - if (getLapisLevel(item) > 0) { - tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + 5 ); - } - tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() ); + //tooltip.add(ChatFormatting.GRAY + "Damage: " + item.getItemDamage() ); + if(item.hasTagCompound()) + { + tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " + (1 - getModifiers(item)) ); + if (getEmerald(item) == true) { + tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); } + if (getDiamondLevel(item) > 0) { + tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); + } + if (getRedstoneLevel(item) > 0) { + tooltip.add(ChatFormatting.RED + "Redstone Level: " + 1 ); + } + if (getLapisLevel(item) > 0) { + tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + 5 ); + } + tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() ); } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeShovel.java b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeShovel.java index 30d20214..e8ba4b33 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeShovel.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/BronzeShovel.java @@ -4,6 +4,7 @@ import com.google.common.collect.Sets; import com.mojang.realmsclient.gui.ChatFormatting; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -141,27 +142,25 @@ Item drop; @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack item, @Nullable World world, List tooltip, ITooltipFlag flagIn) { - if(player.getEntityWorld().isRemote) { - //tooltip.add(ChatFormatting.GRAY + "Damage: " + item.getItemDamage() ); - if(item.hasTagCompound()) { - - tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " + (1 - getModifiers(item)) ); - if (getEmerald(item) == true) { - tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); - } - if (getDiamondLevel(item) > 0) { - tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); - } - if (getRedstoneLevel(item) > 0) { - tooltip.add(ChatFormatting.RED + "Redstone Level: " + 1 ); - } - if (getLapisLevel(item) > 0) { - tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + 5 ); - } - tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() ); + //tooltip.add(ChatFormatting.GRAY + "Damage: " + item.getItemDamage() ); + if(item.hasTagCompound()) + { + tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " + (1 - getModifiers(item)) ); + if (getEmerald(item) == true) { + tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); } + if (getDiamondLevel(item) > 0) { + tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); + } + if (getRedstoneLevel(item) > 0) { + tooltip.add(ChatFormatting.RED + "Redstone Level: " + 1 ); + } + if (getLapisLevel(item) > 0) { + tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + 5 ); + } + tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() ); } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomAxe.java b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomAxe.java index 0661c18c..0236282c 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomAxe.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomAxe.java @@ -3,6 +3,7 @@ package nmd.primal.forgecraft.items.tools; import com.mojang.realmsclient.gui.ChatFormatting; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -276,28 +277,26 @@ public class CustomAxe extends ItemAxe implements ToolNBT { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack item, @Nullable World world, List tooltip, ITooltipFlag flagIn) { - if(!item.isEmpty()) { - if (player.getEntityWorld().isRemote) { - - if (item.hasTagCompound()) { - - tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " + (3 - getModifiers(item)) ); - if (getEmerald(item) == true) { - tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); - } - if (getDiamondLevel(item) > 0) { - tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); - } - if (getRedstoneLevel(item) > 0) { - tooltip.add(ChatFormatting.RED + "Redstone Level: " + getRedstoneLevel(item) ); - } - if (getLapisLevel(item) > 0) { - tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item) ); - } - tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() ); + if(!item.isEmpty()) + { + if (item.hasTagCompound()) + { + tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " + (3 - getModifiers(item)) ); + if (getEmerald(item) == true) { + tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); } + if (getDiamondLevel(item) > 0) { + tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); + } + if (getRedstoneLevel(item) > 0) { + tooltip.add(ChatFormatting.RED + "Redstone Level: " + getRedstoneLevel(item) ); + } + if (getLapisLevel(item) > 0) { + tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item) ); + } + tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() ); } } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomHoe.java b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomHoe.java index 0bc34705..82cf637d 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomHoe.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomHoe.java @@ -2,6 +2,7 @@ package nmd.primal.forgecraft.items.tools; import com.mojang.realmsclient.gui.ChatFormatting; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -273,30 +274,26 @@ public class CustomHoe extends ItemHoe implements ToolNBT { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack item, @Nullable World world, List tooltip, ITooltipFlag flagIn) { - if(player.getEntityWorld().isRemote) { - - if(item.hasTagCompound()) { - - tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " + (3 - getModifiers(item)) ); - if (getEmerald(item) == true) { - tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); - } - if (getDiamondLevel(item) > 0) { - tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); - } - if (getRedstoneLevel(item) > 0) { - tooltip.add(ChatFormatting.RED + "Redstone Level: " + getRedstoneLevel(item) ); - } - if (getLapisLevel(item) > 0) { - tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item) ); - } - tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() ); + if(item.hasTagCompound()) + { + tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " + (3 - getModifiers(item)) ); + if (getEmerald(item) == true) { + tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); } + if (getDiamondLevel(item) > 0) { + tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); + } + if (getRedstoneLevel(item) > 0) { + tooltip.add(ChatFormatting.RED + "Redstone Level: " + getRedstoneLevel(item) ); + } + if (getLapisLevel(item) > 0) { + tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item) ); + } + tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() ); } - } @Override diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java index 6a621736..584d7925 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java @@ -3,6 +3,7 @@ package nmd.primal.forgecraft.items.tools; import com.mojang.realmsclient.gui.ChatFormatting; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -276,27 +277,25 @@ public class CustomPickaxe extends ItemPickaxe implements ToolNBT{ @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack item, @Nullable World world, List tooltip, ITooltipFlag flagIn) { - if(player.getEntityWorld().isRemote) { - //tooltip.add(ChatFormatting.GRAY + "Damage: " + item.getItemDamage() ); - if(item.hasTagCompound()) { - - tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " + (3 - getModifiers(item)) ); - if (getEmerald(item) == true) { - tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); - } - if (getDiamondLevel(item) > 0) { - tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); - } - if (getRedstoneLevel(item) > 0) { - tooltip.add(ChatFormatting.RED + "Redstone Level: " + getRedstoneLevel(item) ); - } - if (getLapisLevel(item) > 0) { - tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item) ); - } - tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() ); + //tooltip.add(ChatFormatting.GRAY + "Damage: " + item.getItemDamage() ); + if(item.hasTagCompound()) + { + tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " + (3 - getModifiers(item)) ); + if (getEmerald(item) == true) { + tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); } + if (getDiamondLevel(item) > 0) { + tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); + } + if (getRedstoneLevel(item) > 0) { + tooltip.add(ChatFormatting.RED + "Redstone Level: " + getRedstoneLevel(item) ); + } + if (getLapisLevel(item) > 0) { + tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item) ); + } + tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() ); } } @@ -371,7 +370,7 @@ public class CustomPickaxe extends ItemPickaxe implements ToolNBT{ entityLiving.renderBrokenItemStack(stack); stack.shrink(1); player.inventory.markDirty(); - player.inventory.inventoryChanged = true; + //player.inventory.inventoryChanged = true; } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomShovel.java b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomShovel.java index 61f5cd88..ca9dcba7 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomShovel.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/tools/CustomShovel.java @@ -4,6 +4,7 @@ import com.google.common.collect.Sets; import com.mojang.realmsclient.gui.ChatFormatting; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -276,30 +277,26 @@ public class CustomShovel extends ItemSpade implements ToolNBT { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack item, @Nullable World world, List tooltip, ITooltipFlag flagIn) { - if(player.getEntityWorld().isRemote) { + if(item.hasTagCompound()) + { - if(item.hasTagCompound()) { - - tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " + (3 - getModifiers(item)) ); - if (getEmerald(item) == true) { - tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); - } - if (getDiamondLevel(item) > 0) { - tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); - } - if (getRedstoneLevel(item) > 0) { - tooltip.add(ChatFormatting.RED + "Redstone Level: " + getRedstoneLevel(item) ); - } - if (getLapisLevel(item) > 0) { - tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item) ); - } - tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() ); + tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " + (3 - getModifiers(item)) ); + if (getEmerald(item) == true) { + tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); } + if (getDiamondLevel(item) > 0) { + tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); + } + if (getRedstoneLevel(item) > 0) { + tooltip.add(ChatFormatting.RED + "Redstone Level: " + getRedstoneLevel(item) ); + } + if (getLapisLevel(item) > 0) { + tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item) ); + } + tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() ); } - - } @Override diff --git a/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java b/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java index 202a0b80..177c7bcf 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java @@ -25,18 +25,13 @@ import org.lwjgl.opengl.GL11; /** * Created by mminaie on 3/5/17. */ - - - public class TileAnvilRender extends TileEntitySpecialRenderer { - - private RenderItem renderItem = Minecraft.getMinecraft().getRenderItem(); @Override - public void renderTileEntityAt(TileAnvil tile, double x, double y, double z, float partialTicks, int destroyStage) { - + public void render(TileAnvil tile, double x, double y, double z, float partialTicks, int destroyStage, float alpha) + { BlockPos pos = tile.getPos(); IBlockState state = this.getWorld().getBlockState(pos); if (state.getBlock() instanceof AnvilBase) { diff --git a/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBloomeryRender.java b/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBloomeryRender.java index dfcd7b2c..37eb1b92 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBloomeryRender.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBloomeryRender.java @@ -10,6 +10,7 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import nmd.primal.forgecraft.blocks.BloomeryBase; +import nmd.primal.forgecraft.tiles.TileAnvil; import nmd.primal.forgecraft.tiles.TileBloomery; import org.lwjgl.opengl.GL11; @@ -21,8 +22,8 @@ public class TileBloomeryRender extends TileEntitySpecialRenderer private RenderItem renderItem = Minecraft.getMinecraft().getRenderItem(); @Override - public void renderTileEntityAt(TileBloomery tile, double x, double y, double z, float partialTicks, int destroyStage) { - + public void render(TileBloomery tile, double x, double y, double z, float partialTicks, int destroyStage, float alpha) + { BlockPos pos = tile.getPos(); IBlockState state = this.getWorld().getBlockState(pos); if (state.getBlock() instanceof BloomeryBase) { diff --git a/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBreakerRender.java b/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBreakerRender.java index 00473a92..99507135 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBreakerRender.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBreakerRender.java @@ -10,6 +10,7 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import nmd.primal.forgecraft.blocks.Breaker; +import nmd.primal.forgecraft.tiles.TileAnvil; import nmd.primal.forgecraft.tiles.TileBreaker; import org.lwjgl.opengl.GL11; @@ -21,8 +22,8 @@ public class TileBreakerRender extends TileEntitySpecialRenderer private RenderItem renderItem = Minecraft.getMinecraft().getRenderItem(); @Override - public void renderTileEntityAt(TileBreaker tile, double x, double y, double z, float partialTicks, int destroyStage) { - + public void render(TileBreaker tile, double x, double y, double z, float partialTicks, int destroyStage, float alpha) + { BlockPos pos = tile.getPos(); IBlockState state = this.getWorld().getBlockState(pos); if (state.getBlock() instanceof Breaker) { diff --git a/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileCastingBlockRender.java b/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileCastingBlockRender.java index 94897ed5..8c7f0dc6 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileCastingBlockRender.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileCastingBlockRender.java @@ -13,19 +13,20 @@ import net.minecraft.util.math.BlockPos; import nmd.primal.forgecraft.blocks.CastingBlock; import nmd.primal.forgecraft.blocks.CustomContainerFacing; import nmd.primal.forgecraft.items.casting.CastingPart; +import nmd.primal.forgecraft.tiles.TileAnvil; import nmd.primal.forgecraft.tiles.TileCastingBlock; import org.lwjgl.opengl.GL11; /** * Created by mminaie on 6/21/17. */ -public class TileCastingBlockRender extends TileEntitySpecialRenderer { - +public class TileCastingBlockRender extends TileEntitySpecialRenderer +{ private RenderItem renderItem = Minecraft.getMinecraft().getRenderItem(); @Override - public void renderTileEntityAt(TileCastingBlock tile, double x, double y, double z, float partialTicks, int destroyStage) { - + public void render(TileCastingBlock tile, double x, double y, double z, float partialTicks, int destroyStage, float alpha) + { BlockPos pos = tile.getPos(); IBlockState state = this.getWorld().getBlockState(pos); if (state.getBlock() instanceof CastingBlock) { diff --git a/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileCastingformRender.java b/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileCastingformRender.java index b0f5325a..0357780a 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileCastingformRender.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileCastingformRender.java @@ -13,19 +13,20 @@ import net.minecraft.util.math.BlockPos; import nmd.primal.forgecraft.blocks.CastingForm; import nmd.primal.forgecraft.blocks.CustomContainerFacing; import nmd.primal.forgecraft.init.ModItems; +import nmd.primal.forgecraft.tiles.TileCastingBlock; import nmd.primal.forgecraft.tiles.TileCastingForm; import org.lwjgl.opengl.GL11; /** * Created by mminaie on 6/21/17. */ -public class TileCastingformRender extends TileEntitySpecialRenderer { - +public class TileCastingformRender extends TileEntitySpecialRenderer +{ private RenderItem renderItem = Minecraft.getMinecraft().getRenderItem(); @Override - public void renderTileEntityAt(TileCastingForm tile, double x, double y, double z, float partialTicks, int destroyStage) { - + public void render(TileCastingForm tile, double x, double y, double z, float partialTicks, int destroyStage, float alpha) + { BlockPos pos = tile.getPos(); IBlockState state = this.getWorld().getBlockState(pos); if (state.getBlock() instanceof CastingForm) { diff --git a/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileForgeRender.java b/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileForgeRender.java index 34772fe5..9bf2f487 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileForgeRender.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileForgeRender.java @@ -13,6 +13,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import nmd.primal.forgecraft.blocks.Forge; import nmd.primal.forgecraft.init.ModItems; +import nmd.primal.forgecraft.tiles.TileCastingForm; import nmd.primal.forgecraft.tiles.TileForge; import org.lwjgl.opengl.GL11; @@ -24,8 +25,8 @@ public class TileForgeRender extends TileEntitySpecialRenderer private RenderItem renderItem = Minecraft.getMinecraft().getRenderItem(); @Override - public void renderTileEntityAt(TileForge tile, double x, double y, double z, float partialTicks, int destroyStage) { - + public void render(TileForge tile, double x, double y, double z, float partialTicks, int destroyStage, float alpha) + { BlockPos pos = tile.getPos(); IBlockState state = this.getWorld().getBlockState(pos); if (state.getBlock() instanceof Forge) { diff --git a/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TilePistonBellowsRender.java b/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TilePistonBellowsRender.java index 6cf5ff24..bdeabc2e 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TilePistonBellowsRender.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TilePistonBellowsRender.java @@ -12,20 +12,20 @@ import net.minecraft.util.math.BlockPos; import nmd.primal.core.api.PrimalStates; import nmd.primal.forgecraft.blocks.PistonBellows; import nmd.primal.forgecraft.init.ModItems; +import nmd.primal.forgecraft.tiles.TileForge; import nmd.primal.forgecraft.tiles.TilePistonBellows; import org.lwjgl.opengl.GL11; /** * Created by mminaie on 1/7/17. */ -public class TilePistonBellowsRender extends TileEntitySpecialRenderer { - +public class TilePistonBellowsRender extends TileEntitySpecialRenderer +{ private RenderItem renderItem = Minecraft.getMinecraft().getRenderItem(); @Override - public void renderTileEntityAt(TilePistonBellows tile, double x, double y, double z, float partialTicks, int destroyStage) + public void render(TilePistonBellows tile, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { - BlockPos pos = tile.getPos(); IBlockState state = this.getWorld().getBlockState(pos); if (state.getBlock() instanceof PistonBellows) { diff --git a/kfc/src/main/java/nmd/primal/forgecraft/renders/items/ModelPickaxe.java b/kfc/src/main/java/nmd/primal/forgecraft/renders/items/ModelPickaxe.java index 3ea6d441..f19b6506 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/renders/items/ModelPickaxe.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/renders/items/ModelPickaxe.java @@ -1,13 +1,11 @@ package nmd.primal.forgecraft.renders.items; -import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.IModelCustomData; import net.minecraftforge.common.model.IModelState; import java.util.Collection; @@ -15,8 +13,8 @@ import java.util.Collection; /** * Created by mminaie on 3/8/17. */ -public class ModelPickaxe implements IModel, IModelCustomData { - +public class ModelPickaxe implements IModel +{ public static final IModel MODEL = new ModelPickaxe(); //private final ResourceLocation resourceHead; //private final ResourceLocation resourceHandle; @@ -37,7 +35,7 @@ public class ModelPickaxe implements IModel, IModelCustomData { } @Override - public IBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) { + public IBakedModel bake(IModelState state, VertexFormat format, java.util.function.Function bakedTextureGetter) { return null; }