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 b091a4b9..19587ef2 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java @@ -24,6 +24,10 @@ public class ModCrafting{ Random rand = new Random(); + /***********************/ + /***CRUCIBLE CRAFTING***/ + /***********************/ + CrucibleCrafting.addRecipe( new OreIngredient("oreIron"), Ingredient.EMPTY, @@ -36,6 +40,58 @@ public class ModCrafting{ 100, 1000); + CrucibleCrafting.addRecipe( + new OreIngredient("dustIron"), + Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CARBONATE_SLACK, 1)), + Ingredient.EMPTY, + Ingredient.EMPTY, + Ingredient.EMPTY, + new ItemStack(PrimalAPI.Items.IRON_DUST, 1), + new ItemStack(ModItems.ironcleaningotball, 1), + 100, + 100, + 1000); + + CrucibleCrafting.addRecipe( + Ingredient.fromStacks(new ItemStack(ModItems.ironcleaningotball, 1)), + Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CHARCOAL_HIGH, 1)), + Ingredient.EMPTY, + Ingredient.EMPTY, + Ingredient.EMPTY, + new ItemStack(ModItems.ironcleaningotball, 1), + new ItemStack(ModItems.steelingotball, 1), + 100, + 100, + 1000); + + CrucibleCrafting.addRecipe( + Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CHARCOAL_PURE, 1)), + Ingredient.fromStacks(new ItemStack(Blocks.LEAVES, 1, 15)), + Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CHARCOAL_PURE, 1)), + Ingredient.fromStacks(new ItemStack(Blocks.LEAVES, 1, 15)), + new OreIngredient("oreMagnetite"), + new ItemStack(PrimalAPI.Blocks.ORE_MAGNETITE, 1), + new ItemStack(ModItems.wootzingotball, 1), + 100, + 100, + 1000); + + //TODO BRONZE RECIPE + + /* + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.rawcleanironcrucible), + "XL","Y ", + ('X'), "dustIron", + ('L'), PrimalAPI.Items.CARBONATE_SLACK, + ('Y'), ModBlocks.emptycrucible); + + RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.rawsteelcrucible), + "XC","Y ", + ('X'), new ItemStack(ModBlocks.ironcleanball, 1), + ('C'), new ItemStack(PrimalAPI.Items.CHARCOAL_HIGH), + ('Y'), ModBlocks.emptycrucible); + */ + /***CASTING BLOCK***/ RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.castingblock), " B ", "BXB", " B ", 'X', Blocks.STONE_SLAB, 'B', PrimalAPI.Items.ADOBE_BRICK_DRY); 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 8786c68c..df6fcf4e 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java @@ -153,7 +153,7 @@ public class ModItems { //itemcrucible = new ItemCrucible("itemcrucible"); bellowshandle = new BaseItem("bellowshandle"); softcrucible = new ItemSoftCrucible("softcrucible"); - stonetongs = new ItemStoneTongs("stonetongs"); + //stonetongs = new ItemStoneTongs("stonetongs"); forgehammer = new ForgeHammer("forgehammer"); castingmud = new BaseItem("castingmud"); @@ -285,7 +285,7 @@ public class ModItems { ForgeRegistries.ITEMS.register(castingmud); ForgeRegistries.ITEMS.register(bellowshandle); ForgeRegistries.ITEMS.register(softcrucible); - ForgeRegistries.ITEMS.register(stonetongs); + //ForgeRegistries.ITEMS.register(stonetongs); ForgeRegistries.ITEMS.register(forgehammer); ForgeRegistries.ITEMS.register(ironingotball); @@ -419,6 +419,8 @@ public class ModItems { registerRender(ironcleanchunk); registerRender(steelingotball); registerRender(steelchunk); + registerRender(wootzingotball); + registerRender(wootzchunk); //registerRender(test); @@ -525,7 +527,7 @@ public class ModItems { } - @SideOnly(Side.CLIENT) + /*@SideOnly(Side.CLIENT) public static void registerCustomRenders(){ ModelBakery.registerItemVariants(ModItems.stonetongs, ModItems.stonetongs.getRegistryName(), new ResourceLocation(ModInfo.MOD_ID, "stonetongs"), @@ -703,7 +705,7 @@ public class ModItems { return new ModelResourceLocation(stack.getItem().getRegistryName(), "inventory"); } }); - } + }*/ private static void registerRender(Item item) { Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0, new ModelResourceLocation(item.getRegistryName(), "inventory")); diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/ingots/cleaniron/ingot_04.json b/kfc/src/main/resources/assets/forgecraft/models/item/ingots/cleaniron/ingot_04.json new file mode 100644 index 00000000..ad59d7ab --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/ingots/cleaniron/ingot_04.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/ironball", + "textures": { + "particle": "forgecraft:blocks/clean_iron_ingot", + "texture": "forgecraft:blocks/clean_iron_ingot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/ingots/cleaniron/ingot_05.json b/kfc/src/main/resources/assets/forgecraft/models/item/ingots/cleaniron/ingot_05.json new file mode 100644 index 00000000..32e9476c --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/ingots/cleaniron/ingot_05.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/ironball", + "textures": { + "particle": "forgecraft:blocks/clean_iron_ingot_hot", + "texture": "forgecraft:blocks/clean_iron_ingot_hot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/ingots/steel/ingot_06.json b/kfc/src/main/resources/assets/forgecraft/models/item/ingots/steel/ingot_06.json new file mode 100644 index 00000000..11d7ebcc --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/ingots/steel/ingot_06.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/ironball", + "textures": { + "particle": "forgecraft:blocks/steel_ingot", + "texture": "forgecraft:blocks/steel_ingot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/ingots/steel/ingot_07.json b/kfc/src/main/resources/assets/forgecraft/models/item/ingots/steel/ingot_07.json new file mode 100644 index 00000000..6285b945 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/ingots/steel/ingot_07.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/ironball", + "textures": { + "particle": "forgecraft:blocks/steel_ingot_hot", + "texture": "forgecraft:blocks/steel_ingot_hot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/ingots/test.txt b/kfc/src/main/resources/assets/forgecraft/models/item/ingots/test.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/ingots/wootz/ingot_08.json b/kfc/src/main/resources/assets/forgecraft/models/item/ingots/wootz/ingot_08.json new file mode 100644 index 00000000..7d0b9e02 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/ingots/wootz/ingot_08.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/ironball", + "textures": { + "particle": "forgecraft:blocks/wootz_ingot", + "texture": "forgecraft:blocks/wootz_ingot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/ingots/wootz/ingot_09.json b/kfc/src/main/resources/assets/forgecraft/models/item/ingots/wootz/ingot_09.json new file mode 100644 index 00000000..05cbb1b4 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/ingots/wootz/ingot_09.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/ironball", + "textures": { + "particle": "forgecraft:blocks/wootz_ingot_hot", + "texture": "forgecraft:blocks/wootz_ingot_hot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/ironcleaningotball.json b/kfc/src/main/resources/assets/forgecraft/models/item/ironcleaningotball.json new file mode 100644 index 00000000..f45c98e6 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/ironcleaningotball.json @@ -0,0 +1,11 @@ +{ + "parent": "forgecraft:item/ironball", + "textures": { + "particle": "forgecraft:blocks/iron_ingot", + "texture": "forgecraft:blocks/iron_ingot" + }, + "overrides": [ + {"predicate": {"type": 0.04},"model": "forgecraft:item/ingots/cleaniron/ingot_04"}, + {"predicate": {"type": 0.05},"model": "forgecraft:item/ingots/cleaniron/ingot_05"} + ] +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/steelingotball.json b/kfc/src/main/resources/assets/forgecraft/models/item/steelingotball.json new file mode 100644 index 00000000..e91fae7a --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/steelingotball.json @@ -0,0 +1,11 @@ +{ + "parent": "forgecraft:item/ironball", + "textures": { + "particle": "forgecraft:blocks/iron_ingot", + "texture": "forgecraft:blocks/iron_ingot" + }, + "overrides": [ + {"predicate": {"type": 0.06},"model": "forgecraft:item/ingots/steel/ingot_06"}, + {"predicate": {"type": 0.07},"model": "forgecraft:item/ingots/steel/ingot_07"} + ] +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/wootzball.json b/kfc/src/main/resources/assets/forgecraft/models/item/wootzball_delete.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/wootzball.json rename to kfc/src/main/resources/assets/forgecraft/models/item/wootzball_delete.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/wootzballhot.json b/kfc/src/main/resources/assets/forgecraft/models/item/wootzballhot_delete.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/wootzballhot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/wootzballhot_delete.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/wootzchunk.json b/kfc/src/main/resources/assets/forgecraft/models/item/wootzchunk_delete.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/wootzchunk.json rename to kfc/src/main/resources/assets/forgecraft/models/item/wootzchunk_delete.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/wootzchunkhot.json b/kfc/src/main/resources/assets/forgecraft/models/item/wootzchunkhot_delete.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/wootzchunkhot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/wootzchunkhot_delete.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/wootzingotball.json b/kfc/src/main/resources/assets/forgecraft/models/item/wootzingotball.json new file mode 100644 index 00000000..1562179c --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/wootzingotball.json @@ -0,0 +1,11 @@ +{ + "parent": "forgecraft:item/ironball", + "textures": { + "particle": "forgecraft:blocks/iron_ingot", + "texture": "forgecraft:blocks/iron_ingot" + }, + "overrides": [ + {"predicate": {"type": 0.08},"model": "forgecraft:item/ingots/wootz/ingot_08"}, + {"predicate": {"type": 0.09},"model": "forgecraft:item/ingots/wootz/ingot_09"} + ] +} \ No newline at end of file