From 2e421d40f25a9c35a41b5abc0fd1e19fa6a281b6 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Sat, 15 Apr 2017 23:57:33 -0400 Subject: [PATCH] finished json completing recipes, still have all the tool head and tool head upgrades --- 1.11/To-Dos | 9 +- .../nmd/primal/forgecraft/init/ModBlocks.java | 80 +++++++- .../primal/forgecraft/init/ModCrafting.java | 186 ++++++++++++++++-- .../renders/blocks/TileBreakerRender.java | 2 +- .../blockstates/coolcleanironcrucible.json | 12 ++ .../blockstates/coolsteelcrucible.json | 12 ++ .../blockstates/coolwootzcrucible.json | 12 ++ .../blockstates/failedcleanironcrucible.json | 12 ++ .../failedcleanironcruciblehot.json | 12 ++ .../blockstates/failedsteelcrucible.json | 12 ++ .../blockstates/failedsteelcruciblehot.json | 12 ++ .../blockstates/failedwootzcrucible.json | 12 ++ .../blockstates/failedwootzcruciblehot.json | 12 ++ .../blockstates/hotcleanironcrucible.json | 12 ++ .../hotcookedcleanironcrucible.json | 12 ++ .../blockstates/hotcookedsteelcrucible.json | 12 ++ .../blockstates/hotcookedwootzcrucible.json | 12 ++ .../blockstates/hotsteelcrucible.json | 12 ++ .../blockstates/hotwootzcrucible.json | 12 ++ .../blockstates/rawcleanironcrucible.json | 12 ++ .../blockstates/rawsteelcrucible.json | 12 ++ .../blockstates/rawwootzcrucible.json | 12 ++ .../models/item/cleanironhoehead.json | 2 +- .../models/item/coolcleanironcrucible.json | 8 + .../models/item/coolsteelcrucible.json | 8 + .../models/item/coolwootzcrucible.json | 8 + .../models/item/failedcleanironcrucible.json | 8 + .../item/failedcleanironcruciblehot.json | 8 + .../models/item/failedsteelcrucible.json | 8 + .../models/item/failedsteelcruciblehot.json | 8 + .../models/item/failedwootzcrucible.json | 8 + .../models/item/failedwootzcruciblehot.json | 8 + ...nironhoehead_0.json => ironhoehead_0.json} | 0 ...nironhoehead_1.json => ironhoehead_1.json} | 0 ...ronhoehead_10.json => ironhoehead_10.json} | 0 ...ronhoehead_11.json => ironhoehead_11.json} | 0 ...ronhoehead_12.json => ironhoehead_12.json} | 0 ...ronhoehead_13.json => ironhoehead_13.json} | 0 ...ronhoehead_14.json => ironhoehead_14.json} | 0 ...ronhoehead_15.json => ironhoehead_15.json} | 0 ...ronhoehead_16.json => ironhoehead_16.json} | 0 ...ronhoehead_17.json => ironhoehead_17.json} | 0 ...ronhoehead_18.json => ironhoehead_18.json} | 0 ...ronhoehead_19.json => ironhoehead_19.json} | 0 ...nironhoehead_2.json => ironhoehead_2.json} | 0 ...ronhoehead_20.json => ironhoehead_20.json} | 0 ...ronhoehead_21.json => ironhoehead_21.json} | 0 ...nironhoehead_3.json => ironhoehead_3.json} | 0 ...nironhoehead_4.json => ironhoehead_4.json} | 0 ...nironhoehead_5.json => ironhoehead_5.json} | 0 ...nironhoehead_6.json => ironhoehead_6.json} | 0 ...nironhoehead_7.json => ironhoehead_7.json} | 0 ...nironhoehead_8.json => ironhoehead_8.json} | 0 ...nironhoehead_9.json => ironhoehead_9.json} | 0 .../models/item/hotcleanironcrucible.json | 8 + .../item/hotcookedcleanironcrucible.json | 8 + .../models/item/hotcookedsteelcrucible.json | 8 + .../models/item/hotcookedwootzcrucible.json | 8 + .../models/item/hotsteelcrucible.json | 8 + .../models/item/hotwootzcrucible.json | 8 + .../models/item/rawcleanironcrucible.json | 8 + .../models/item/rawsteelcrucible.json | 8 + .../models/item/rawwootzcrucible.json | 8 + 63 files changed, 618 insertions(+), 21 deletions(-) create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/coolcleanironcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/coolsteelcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/coolwootzcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/failedcleanironcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/failedcleanironcruciblehot.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/failedsteelcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/failedsteelcruciblehot.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/failedwootzcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/failedwootzcruciblehot.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/hotcleanironcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedcleanironcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedsteelcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedwootzcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/hotsteelcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/hotwootzcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/rawcleanironcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/rawsteelcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/rawwootzcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/coolcleanironcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/coolsteelcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/coolwootzcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/failedcleanironcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/failedcleanironcruciblehot.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/failedsteelcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/failedsteelcruciblehot.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/failedwootzcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/failedwootzcruciblehot.json rename 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/{cleanironhoehead_0.json => ironhoehead_0.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/{cleanironhoehead_1.json => ironhoehead_1.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/{cleanironhoehead_10.json => ironhoehead_10.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/{cleanironhoehead_11.json => ironhoehead_11.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/{cleanironhoehead_12.json => ironhoehead_12.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/{cleanironhoehead_13.json => ironhoehead_13.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/{cleanironhoehead_14.json => ironhoehead_14.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/{cleanironhoehead_15.json => ironhoehead_15.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/{cleanironhoehead_16.json => ironhoehead_16.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/{cleanironhoehead_17.json => ironhoehead_17.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/{cleanironhoehead_18.json => ironhoehead_18.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/{cleanironhoehead_19.json => ironhoehead_19.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/{cleanironhoehead_2.json => ironhoehead_2.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/{cleanironhoehead_20.json => ironhoehead_20.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/{cleanironhoehead_21.json => ironhoehead_21.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/{cleanironhoehead_3.json => ironhoehead_3.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/{cleanironhoehead_4.json => ironhoehead_4.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/{cleanironhoehead_5.json => ironhoehead_5.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/{cleanironhoehead_6.json => ironhoehead_6.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/{cleanironhoehead_7.json => ironhoehead_7.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/{cleanironhoehead_8.json => ironhoehead_8.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/{cleanironhoehead_9.json => ironhoehead_9.json} (100%) create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hotcleanironcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hotcookedcleanironcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hotcookedsteelcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hotcookedwootzcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hotsteelcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hotwootzcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/rawcleanironcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/rawsteelcrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/rawwootzcrucible.json diff --git a/1.11/To-Dos b/1.11/To-Dos index 8b9ce6e3..dd43415b 100644 --- a/1.11/To-Dos +++ b/1.11/To-Dos @@ -4,11 +4,18 @@ To-Dos - [ ] Duplication Bug for Tool Repair *** Priority *** +- [ ] Change how bloomery does recipe cookTime +- [x] Update blockstates with: + - [x] cleanIron + - [x] steel + - [x] wootz +- [ ] Fix Breaker Render to rotate correctly + - [ ] Move Ingot break into chunks logic out of the block and into the ForgeHammer - [x] Make an Iron Anvil - [x] Check Iron Anvil creation logic - [x] Make New Ore Tool, Tool Part, Ingot, and Chunk Assets -- [ ] Make New Ore Recipes +- [ ] Make All Accompanying Recipes - [x] Make Steel Recipes and Tools - [x] Make Wootz Recipes and Tools - [ ] Add Yew diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java index 01d72437..401f9c7a 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java @@ -63,6 +63,20 @@ public class ModBlocks { public static Block failedcleanironcrucible; public static Block failedcleanironcruciblehot; + public static Block rawsteelcrucible; + public static Block hotsteelcrucible; + public static Block hotcookedsteelcrucible; + public static Block coolsteelcrucible; + public static Block failedsteelcrucible; + public static Block failedsteelcruciblehot; + + public static Block rawwootzcrucible; + public static Block hotwootzcrucible; + public static Block hotcookedwootzcrucible; + public static Block coolwootzcrucible; + public static Block failedwootzcrucible; + public static Block failedwootzcruciblehot; + public static Block ironball; public static Block ironchunk; public static Block ironcleanball; @@ -98,12 +112,30 @@ public class ModBlocks { hotironcrucible = new CrucibleHot(Material.ROCK, "hotironcrucible"); hotcookedironcrucible = new CrucibleHot(Material.ROCK, "hotcookedironcrucible"); coolironcrucible = new Crucible(Material.ROCK, "coolironcrucible"); - - rawcleanironcrucible; - failedironcrucible = new Crucible(Material.ROCK, "failedironcrucible"); failedironcruciblehot = new CrucibleHot(Material.ROCK, "failedironcruciblehot"); + rawcleanironcrucible = new Crucible(Material.ROCK, "rawcleanironcrucible"); + hotcleanironcrucible = new Crucible(Material.ROCK, "hotcleanironcrucible"); + hotcookedcleanironcrucible = new Crucible(Material.ROCK, "hotcookedcleanironcrucible"); + coolcleanironcrucible = new Crucible(Material.ROCK, "coolcleanironcrucible"); + failedcleanironcrucible = new Crucible(Material.ROCK, "failedcleanironcrucible"); + failedcleanironcruciblehot = new Crucible(Material.ROCK, "failedcleanironcruciblehot"); + + rawsteelcrucible = new Crucible(Material.ROCK, "rawsteelcrucible"); + hotsteelcrucible = new Crucible(Material.ROCK, "hotsteelcrucible"); + hotcookedsteelcrucible = new Crucible(Material.ROCK, "hotcookedsteelcrucible"); + coolsteelcrucible = new Crucible(Material.ROCK, "coolsteelcrucible"); + failedsteelcrucible = new Crucible(Material.ROCK, "failedsteelcrucible"); + failedsteelcruciblehot = new Crucible(Material.ROCK, "failedsteelcruciblehot"); + + rawwootzcrucible = new Crucible(Material.ROCK, "rawwootzcrucible"); + hotwootzcrucible = new Crucible(Material.ROCK, "hotwootzcrucible"); + hotcookedwootzcrucible = new Crucible(Material.ROCK, "hotcookedwootzcrucible"); + coolwootzcrucible = new Crucible(Material.ROCK, "coolwootzcrucible"); + failedwootzcrucible = new Crucible(Material.ROCK, "failedwootzcrucible"); + failedwootzcruciblehot = new Crucible(Material.ROCK, "failedwootzcruciblehot"); + ironball = new IngotBall(Material.IRON, "ironball", 5.0F, "ingot") { @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitx, float hity, float hitz) @@ -358,6 +390,27 @@ public class ModBlocks { registerBlock(failedironcrucible); registerBlock(failedironcruciblehot); + registerBlock(rawcleanironcrucible); + registerBlock(hotcleanironcrucible); + registerBlock(hotcookedcleanironcrucible); + registerBlock(coolcleanironcrucible); + registerBlock(failedcleanironcrucible); + registerBlock(failedcleanironcruciblehot); + + registerBlock(rawsteelcrucible); + registerBlock(hotsteelcrucible); + registerBlock(hotcookedsteelcrucible); + registerBlock(coolsteelcrucible); + registerBlock(failedsteelcrucible); + registerBlock(failedsteelcruciblehot); + + registerBlock(rawwootzcrucible); + registerBlock(hotwootzcrucible); + registerBlock(hotcookedwootzcrucible); + registerBlock(coolwootzcrucible); + registerBlock(failedwootzcrucible); + registerBlock(failedwootzcruciblehot); + registerBlock(ironball); registerBlock(ironchunk); @@ -399,6 +452,27 @@ public class ModBlocks { registerRender(failedironcrucible); registerRender(failedironcruciblehot); + registerRender(rawcleanironcrucible); + registerRender(hotcleanironcrucible); + registerRender(hotcookedcleanironcrucible); + registerRender(coolcleanironcrucible); + registerRender(failedcleanironcrucible); + registerRender(failedcleanironcruciblehot); + + registerRender(rawsteelcrucible); + registerRender(hotsteelcrucible); + registerRender(hotcookedsteelcrucible); + registerRender(coolsteelcrucible); + registerRender(failedsteelcrucible); + registerRender(failedsteelcruciblehot); + + registerRender(rawwootzcrucible); + registerRender(hotwootzcrucible); + registerRender(hotcookedwootzcrucible); + registerRender(coolwootzcrucible); + registerRender(failedwootzcrucible); + registerRender(failedwootzcruciblehot); + registerRender(ironball); registerRender(ironchunk); diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java index 4fc35ecc..cd78f419 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java @@ -76,12 +76,24 @@ public class ModCrafting { /***Iron Crucible***/ - ItemStack iron0 = new ItemStack(ModBlocks.rawironcrucible, 1); - //ItemStack cleanIron = new ItemStack(ModBlocks.cleanironcrucible, 1); //Regular Iron Ore - GameRegistry.addShapedRecipe(iron0, - " X ", " Y ", 'X', Blocks.IRON_ORE, 'Y', ModBlocks.emptycrucible); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawironcrucible), + "X","Y", + ('X'), "oreIron", + ('Y'), ModBlocks.emptycrucible)); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawcleanironcrucible), + "X","Y", + ('X'), "dustIron", + ('Y'), ModBlocks.emptycrucible)); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawsteelcrucible), + "XC","Y ", + ('X'), "dustIron", + ('C'), new ItemStack(Items.COAL, 1, 1), + ('Y'), ModBlocks.emptycrucible)); + /***Pickaxe Crafting***/ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ironpickaxe), "T", "C", "S", @@ -89,23 +101,63 @@ public class ModCrafting { ('S'), "stickWood", ('C'), "cordageGeneral")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cleanironpickaxe), "T", "C", "S", + ('T'), ModItems.cleanironpickaxehead, + ('S'), "stickWood", + ('C'), "cordageGeneral")); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steelpickaxe), "T", "C", "S", + ('T'), ModItems.steelpickaxehead, + ('S'), "stickWood", + ('C'), "cordageGeneral")); + + //placeholder wootz + /***Axe Crafting***/ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ironaxe), "T", "C", "S", ('T'), ModItems.ironaxehead, ('S'), "stickWood", ('C'), "cordageGeneral")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cleanironaxe), "T", "C", "S", + ('T'), ModItems.cleanironaxehead, + ('S'), "stickWood", + ('C'), "cordageGeneral")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steelaxe), "T", "C", "S", + ('T'), ModItems.steelaxehead, + ('S'), "stickWood", + ('C'), "cordageGeneral")); + //wootz placeholder /***Shovel Crafting***/ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ironshovel), "T", "C", "S", ('T'), ModItems.ironshovelhead, ('S'), "stickWood", ('C'), "cordageGeneral")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cleanironshovel), "T", "C", "S", + ('T'), ModItems.cleanironshovelhead, + ('S'), "stickWood", + ('C'), "cordageGeneral")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steelshovel), "T", "C", "S", + ('T'), ModItems.steelshovelhead, + ('S'), "stickWood", + ('C'), "cordageGeneral")); + //placed holder for wootz /***Hoe Crafting***/ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ironhoe), "T", "C", "S", ('T'), ModItems.ironhoehead, ('S'), "stickWood", ('C'), "cordageGeneral")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cleanironhoe), "T", "C", "S", + ('T'), ModItems.cleanironhoehead, + ('S'), "stickWood", + ('C'), "cordageGeneral")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steelhoe), "T", "C", "S", + ('T'), ModItems.steelhoehead, + ('S'), "stickWood", + ('C'), "cordageGeneral")); + + //PLACE HOLDER FOR WOOTZ STEEL /*************************************************************** @@ -126,9 +178,31 @@ public class ModCrafting { GameRegistry.addRecipe(new ShapedOreRecipe(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(PrimalBlocks.SOULSTONE_CHISELED, 1), true, new Object[]{"S", "S", - ('S'), PrimalBlocks.SLAB_SOULSTONE - }));*/ + + GameRegistry.addRecipe(new ShapedOreRecipe(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))); + + GameRegistry.addRecipe(new ShapedOreRecipe(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))); + + + GameRegistry.addRecipe(new ShapedOreRecipe(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))); + + GameRegistry.addRecipe(new ShapedOreRecipe(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))); /***************************************************************/ @@ -184,19 +258,61 @@ public class ModCrafting { 0.5f ); -//Makes the Finished Hot Iron Crucible -/* BloomeryCrafting.addRecipe( - new ItemStack(ModBlocks.hotcookedironcrucible, 1), - new ItemStack(ModBlocks.failedironcruciblehot, 1), - new ItemStack(ModBlocks.failedironcruciblehot, 1), - new ItemStack(ModBlocks.failedironcrucible, 1), +//Makes the Hot Clean Iron Crucible + BloomeryCrafting.addRecipe( + new ItemStack(ModBlocks.rawcleanironcrucible, 1), + new ItemStack(ModBlocks.hotcleanironcrucible, 1), + new ItemStack(ModBlocks.hotcleanironcrucible, 1), + new ItemStack(ModBlocks.rawcleanironcrucible, 1), + 800, + 20, + 500, + 0.5f, + 0.0f + ); + +//Makes the Finished Hot Clean Iron Crucible + BloomeryCrafting.addRecipe( + new ItemStack(ModBlocks.hotcleanironcrucible, 1), + new ItemStack(ModBlocks.hotcookedcleanironcrucible, 1), + new ItemStack(ModBlocks.failedcleanironcrucible, 1), + new ItemStack(ModBlocks.coolcleanironcrucible, 1), 1550, 1200, 800, 0.33f, 0.5f ); -*/ + + //Makes the Hot Steel Crucible + BloomeryCrafting.addRecipe( + new ItemStack(ModBlocks.rawsteelcrucible, 1), + new ItemStack(ModBlocks.hotsteelcrucible, 1), + new ItemStack(ModBlocks.hotsteelcrucible, 1), + new ItemStack(ModBlocks.rawsteelcrucible, 1), + 800, + 20, + 500, + 0.5f, + 0.0f + ); + +//Makes the Finished Hot Steel Crucible + BloomeryCrafting.addRecipe( + new ItemStack(ModBlocks.hotsteelcrucible, 1), + new ItemStack(ModBlocks.hotcookedsteelcrucible, 1), + new ItemStack(ModBlocks.failedsteelcrucible, 1), + new ItemStack(ModBlocks.coolsteelcrucible, 1), + 1550, + 1500, + 1000, + 0.2f, + 0.25f + ); + + //PLACE HOLDER FOR WOOTZ + + /****************************************************************************** FORGING ******************************************************************************/ @@ -211,8 +327,28 @@ public class ModCrafting { 1.0f, 1.0f ); +//Makes a Hot Clean Iron Ingot + ForgeCrafting.addRecipe( + Item.getItemFromBlock(ModBlocks.ironcleanball), + new ItemStack(ModItems.ironcleaningotballhot, 1), + 900, + 250, + 500, + 1.0f, + 1.0f + ); +//Makes a Hot Steel Ingot + ForgeCrafting.addRecipe( + Item.getItemFromBlock(ModBlocks.steelball), + new ItemStack(ModItems.steelingotballhot, 1), + 1000, + 300, + 500, + 1.0f, + 1.0f + ); - // Converts a Vanilla Ingot into ForgeCraft Ingot Ball +// Converts a Vanilla Ingot into ForgeCraft Ingot Ball ForgeCrafting.addRecipe( Items.IRON_INGOT, new ItemStack(ModItems.ironingotballhot, 1), @@ -233,6 +369,26 @@ public class ModCrafting { 1.0f, 1.0f ); +//Makes a Hot Clean Iron Chunk + ForgeCrafting.addRecipe( + Item.getItemFromBlock(ModBlocks.ironcleanchunk), + new ItemStack(ModItems.ironcleanchunkhot,1), + 900, + 250, + 500, + 1.0f, + 1.0f + ); +//Makes a Hot Steel Chunk + ForgeCrafting.addRecipe( + Item.getItemFromBlock(ModBlocks.steelchunk), + new ItemStack(ModItems.steelchunkhot,1), + 1000, + 300, + 500, + 1.0f, + 1.0f + ); //Makes a Hot PickaxeHead ForgeCrafting.addRecipe( diff --git a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBreakerRender.java b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBreakerRender.java index 2984cadb..1306c1b0 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBreakerRender.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBreakerRender.java @@ -45,7 +45,7 @@ public class TileBreakerRender extends TileEntitySpecialRenderer if(state.getValue(Breaker.FACING) == EnumFacing.NORTH) { GL11.glPushMatrix(); GL11.glRotated(90, 0.0f, 1.0f, 0.0f); - GL11.glRotatef(tile.charge, 0.0f, 0.0f, 1.0f); + GL11.glRotatef(tile.getCharge(), 0.0f, 0.0f, 1.0f); renderItem.renderItem(tile.getSlotStack(0), ItemCameraTransforms.TransformType.FIXED); GL11.glPopMatrix(); } diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/coolcleanironcrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/coolcleanironcrucible.json new file mode 100644 index 00000000..73d7acf3 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/coolcleanironcrucible.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/coolsteelcrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/coolsteelcrucible.json new file mode 100644 index 00000000..73d7acf3 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/coolsteelcrucible.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/coolwootzcrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/coolwootzcrucible.json new file mode 100644 index 00000000..73d7acf3 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/coolwootzcrucible.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/failedcleanironcrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/failedcleanironcrucible.json new file mode 100644 index 00000000..168baa06 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/failedcleanironcrucible.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab_burnt", + "texture": "forgecraft:blocks/stone_slab_burnt" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/failedcleanironcruciblehot.json b/1.11/src/main/resources/assets/forgecraft/blockstates/failedcleanironcruciblehot.json new file mode 100644 index 00000000..62b92916 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/failedcleanironcruciblehot.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot_burnt", + "texture": "forgecraft:blocks/stone_slab_hot_burnt" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/failedsteelcrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/failedsteelcrucible.json new file mode 100644 index 00000000..168baa06 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/failedsteelcrucible.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab_burnt", + "texture": "forgecraft:blocks/stone_slab_burnt" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/failedsteelcruciblehot.json b/1.11/src/main/resources/assets/forgecraft/blockstates/failedsteelcruciblehot.json new file mode 100644 index 00000000..62b92916 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/failedsteelcruciblehot.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot_burnt", + "texture": "forgecraft:blocks/stone_slab_hot_burnt" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/failedwootzcrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/failedwootzcrucible.json new file mode 100644 index 00000000..168baa06 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/failedwootzcrucible.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab_burnt", + "texture": "forgecraft:blocks/stone_slab_burnt" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/failedwootzcruciblehot.json b/1.11/src/main/resources/assets/forgecraft/blockstates/failedwootzcruciblehot.json new file mode 100644 index 00000000..62b92916 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/failedwootzcruciblehot.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot_burnt", + "texture": "forgecraft:blocks/stone_slab_hot_burnt" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/hotcleanironcrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/hotcleanironcrucible.json new file mode 100644 index 00000000..11a526c7 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/hotcleanironcrucible.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedcleanironcrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedcleanironcrucible.json new file mode 100644 index 00000000..11a526c7 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedcleanironcrucible.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedsteelcrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedsteelcrucible.json new file mode 100644 index 00000000..11a526c7 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedsteelcrucible.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedwootzcrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedwootzcrucible.json new file mode 100644 index 00000000..11a526c7 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedwootzcrucible.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/hotsteelcrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/hotsteelcrucible.json new file mode 100644 index 00000000..11a526c7 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/hotsteelcrucible.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/hotwootzcrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/hotwootzcrucible.json new file mode 100644 index 00000000..11a526c7 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/hotwootzcrucible.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/rawcleanironcrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/rawcleanironcrucible.json new file mode 100644 index 00000000..73d7acf3 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/rawcleanironcrucible.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/rawsteelcrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/rawsteelcrucible.json new file mode 100644 index 00000000..73d7acf3 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/rawsteelcrucible.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/rawwootzcrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/rawwootzcrucible.json new file mode 100644 index 00000000..73d7acf3 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/rawwootzcrucible.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/cleanironhoehead.json b/1.11/src/main/resources/assets/forgecraft/models/item/cleanironhoehead.json index e3cdc5b9..45ae8a1a 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/item/cleanironhoehead.json +++ b/1.11/src/main/resources/assets/forgecraft/models/item/cleanironhoehead.json @@ -6,7 +6,7 @@ "texture1": "forgecraft:items/clean_iron_ingot" }, "overrides": [ - {"predicate": {"type": 0.0},"model": "forgecraft:item/hoehead/cleaniron/cleanironhoehead_0"}, + {"predicate": {"type": 0.0},"model": "forgecraft:item/hoehead/cleaniron/ironhoehead_0"}, {"predicate": {"type": 0.0001},"model": "forgecraft:item/hoehead/cleaniron/ironhoehead_13"}, {"predicate": {"type": 0.0002},"model": "forgecraft:item/hoehead/cleaniron/ironhoehead_14"}, {"predicate": {"type": 0.0003},"model": "forgecraft:item/hoehead/cleaniron/ironhoehead_15"}, diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/coolcleanironcrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/coolcleanironcrucible.json new file mode 100644 index 00000000..0b7be2fb --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/coolcleanironcrucible.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/coolsteelcrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/coolsteelcrucible.json new file mode 100644 index 00000000..0b7be2fb --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/coolsteelcrucible.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/coolwootzcrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/coolwootzcrucible.json new file mode 100644 index 00000000..0b7be2fb --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/coolwootzcrucible.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/failedcleanironcrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/failedcleanironcrucible.json new file mode 100644 index 00000000..39ac95e5 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/failedcleanironcrucible.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab_burnt", + "texture": "forgecraft:blocks/stone_slab_burnt" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/failedcleanironcruciblehot.json b/1.11/src/main/resources/assets/forgecraft/models/item/failedcleanironcruciblehot.json new file mode 100644 index 00000000..18b1af63 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/failedcleanironcruciblehot.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot_burnt", + "texture": "forgecraft:blocks/stone_slab_hot_burnt" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/failedsteelcrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/failedsteelcrucible.json new file mode 100644 index 00000000..39ac95e5 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/failedsteelcrucible.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab_burnt", + "texture": "forgecraft:blocks/stone_slab_burnt" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/failedsteelcruciblehot.json b/1.11/src/main/resources/assets/forgecraft/models/item/failedsteelcruciblehot.json new file mode 100644 index 00000000..18b1af63 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/failedsteelcruciblehot.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot_burnt", + "texture": "forgecraft:blocks/stone_slab_hot_burnt" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/failedwootzcrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/failedwootzcrucible.json new file mode 100644 index 00000000..39ac95e5 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/failedwootzcrucible.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab_burnt", + "texture": "forgecraft:blocks/stone_slab_burnt" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/failedwootzcruciblehot.json b/1.11/src/main/resources/assets/forgecraft/models/item/failedwootzcruciblehot.json new file mode 100644 index 00000000..18b1af63 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/failedwootzcruciblehot.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot_burnt", + "texture": "forgecraft:blocks/stone_slab_hot_burnt" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_0.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_0.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_0.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_0.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_1.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_1.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_1.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_1.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_10.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_10.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_10.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_10.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_11.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_11.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_11.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_11.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_12.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_12.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_12.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_12.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_13.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_13.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_13.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_13.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_14.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_14.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_14.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_14.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_15.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_15.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_15.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_15.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_16.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_16.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_16.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_16.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_17.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_17.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_17.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_17.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_18.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_18.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_18.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_18.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_19.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_19.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_19.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_19.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_2.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_2.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_2.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_2.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_20.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_20.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_20.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_20.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_21.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_21.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_21.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_21.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_3.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_3.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_3.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_3.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_4.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_4.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_4.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_4.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_5.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_5.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_5.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_5.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_6.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_6.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_6.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_6.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_7.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_7.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_7.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_7.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_8.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_8.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_8.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_8.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_9.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_9.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/cleanironhoehead_9.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/cleaniron/ironhoehead_9.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hotcleanironcrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/hotcleanironcrucible.json new file mode 100644 index 00000000..70bc79c2 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hotcleanironcrucible.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedcleanironcrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedcleanironcrucible.json new file mode 100644 index 00000000..70bc79c2 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedcleanironcrucible.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedsteelcrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedsteelcrucible.json new file mode 100644 index 00000000..70bc79c2 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedsteelcrucible.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedwootzcrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedwootzcrucible.json new file mode 100644 index 00000000..70bc79c2 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedwootzcrucible.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hotsteelcrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/hotsteelcrucible.json new file mode 100644 index 00000000..70bc79c2 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hotsteelcrucible.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hotwootzcrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/hotwootzcrucible.json new file mode 100644 index 00000000..70bc79c2 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hotwootzcrucible.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/rawcleanironcrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/rawcleanironcrucible.json new file mode 100644 index 00000000..0b7be2fb --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/rawcleanironcrucible.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/rawsteelcrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/rawsteelcrucible.json new file mode 100644 index 00000000..0b7be2fb --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/rawsteelcrucible.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/rawwootzcrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/rawwootzcrucible.json new file mode 100644 index 00000000..0b7be2fb --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/rawwootzcrucible.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file