From 1a9b83059a33e8ac3c440c5f53b43bf64ac62465 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Tue, 2 Oct 2018 00:27:23 -0400 Subject: [PATCH] checking these damn recipes --- .../forgecraft/compat/CT/CTCrucible.java | 36 ++--- .../CrucibleCraftingRegister.java | 124 +++++++++--------- .../primal/forgecraft/init/ModCrafting.java | 10 +- .../primal/forgecraft/init/ModRegistries.java | 26 +++- .../init/recipes/CauldronRecipes.java | 17 --- 5 files changed, 109 insertions(+), 104 deletions(-) diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/CT/CTCrucible.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/CT/CTCrucible.java index c6c7809e..ffac02a1 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/compat/CT/CTCrucible.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/CT/CTCrucible.java @@ -29,18 +29,18 @@ public class CTCrucible { @ZenMethod public static void addRecipe(String recipe_name, - int cookTemp, - int cookTime, - int coolTime, Ingredient ing0, Ingredient ing1, Ingredient ing2, Ingredient ing3, Ingredient ing4, - ItemStack dropsCooked, - ItemStack dropsRaw) + int cookTemp, + int cookTime, + int coolTime, + ItemStack dropsRaw, + ItemStack dropsCooked) { - CraftTweakerAPI.apply(new Add(recipe_name, cookTemp, cookTime, coolTime, ing0, ing1, ing2, ing3, ing4, dropsCooked, dropsRaw) ); + CraftTweakerAPI.apply(new Add(recipe_name, ing0, ing1, ing2, ing3, ing4, dropsRaw, dropsCooked, cookTemp, cookTime, coolTime) ); } @ZenMethod @@ -57,9 +57,6 @@ public class CTCrucible { private static class Add implements IAction { - - - private final String recipe_name; private final int cookTemp; private final int cookTime; @@ -74,7 +71,7 @@ public class CTCrucible { //private final int cook_time; //private boolean is_disabled, is_hidden; - public Add(String recipe_name, int cookTemp, int cookTime, int coolTime, Ingredient ing0, Ingredient ing1, Ingredient ing2, Ingredient ing3, Ingredient ing4,ItemStack dropsCooked, ItemStack dropsRaw) + public Add(String recipe_name, Ingredient ing0, Ingredient ing1, Ingredient ing2, Ingredient ing3, Ingredient ing4, ItemStack dropsRaw, ItemStack dropsCooked, int cookTemp, int cookTime, int coolTime) { this.recipe_name = recipe_name; this.cookTemp = cookTemp; @@ -85,7 +82,7 @@ public class CTCrucible { this.ing2 = ing2; this.ing3 = ing3; this.ing4 =ing4; - this.dropsCooked = dropsCooked + this.dropsCooked = dropsCooked; this.dropsRaw = dropsRaw; this.isDisabled = false; this.isHidden = false; @@ -95,7 +92,17 @@ public class CTCrucible { public void apply() { PrimalCore.LOGGER.info("Add CraftTweaker Recipe: " + this.recipe_name); - CrucibleCrafting.REGISTRY.register(new CrucibleCrafting(this.cook_time, this.ingredients, this.output).setRecipeName(this.recipe_name)); + CrucibleCrafting.REGISTRY.register(new CrucibleCrafting( + this.ing0, + this.ing1, + this.ing2, + this.ing3, + this.ing4, + this.dropsRaw, + this.dropsCooked, + this.cookTemp, + this.cookTime, + this.coolTime).setRecipeName(this.recipe_name)); } @Override @@ -139,7 +146,7 @@ public class CTCrucible { @Override public void apply() { - for (HibachiRecipe recipe : HibachiRecipe.RECIPES) + for (CrucibleCrafting recipe : CrucibleCrafting.RECIPES) { if (!recipe.isHidden()) recipe.setDisabled(true); @@ -149,9 +156,8 @@ public class CTCrucible { @Override public String describe() { - return "[" + ModInfo.MOD_NAME + "] Removing Crafting Tweaker recipe for:" + HibachiRecipe.RECIPE_PREFIX; + return "[" + ModInfo.MOD_NAME + "] Removing Crafting Tweaker recipe for:" + CrucibleCrafting.RECIPE_PREFIX; } } } -} diff --git a/kfc/src/main/java/nmd/primal/forgecraft/crafting/CraftingRegistery/CrucibleCraftingRegister.java b/kfc/src/main/java/nmd/primal/forgecraft/crafting/CraftingRegistery/CrucibleCraftingRegister.java index 6337b37c..297a3139 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/crafting/CraftingRegistery/CrucibleCraftingRegister.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/crafting/CraftingRegistery/CrucibleCraftingRegister.java @@ -2,7 +2,6 @@ package nmd.primal.forgecraft.crafting.CraftingRegistery; import net.minecraft.block.BlockPlanks; import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.nbt.NBTTagCompound; @@ -16,7 +15,6 @@ import nmd.primal.core.api.PrimalAPI; import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.crafting.CrucibleCrafting; import nmd.primal.forgecraft.init.ModItems; -import nmd.primal.forgecraft.util.ToolNBT; @GameRegistry.ObjectHolder(ModInfo.MOD_ID) @Mod.EventBusSubscriber @@ -280,10 +278,10 @@ public final class CrucibleCraftingRegister{ new ItemStack(ModItems.ironingotball, 1), 1400, 1200, - 800).setRecipeName("wroughtIron")); + 800).setRecipeName("wroughtIron1")); - recipes.register (new CrucibleCrafting( - new OreIngredient("dustIron"), + recipes.register (new CrucibleCrafting( + new OreIngredient("dustIron"), Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, @@ -292,9 +290,9 @@ public final class CrucibleCraftingRegister{ new ItemStack(ModItems.ironingotball, 1), 1250, 1100, - 800).setRecipeName("wroughtIron")); + 800).setRecipeName("wroughtIron2")); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( Ingredient.fromStacks(new ItemStack(ModItems.brokenwroughtirontool, 1)), Ingredient.EMPTY, Ingredient.EMPTY, @@ -304,9 +302,9 @@ public final class CrucibleCraftingRegister{ new ItemStack(ModItems.ironingotball, 1), 1250, 1100, - 800); + 800).setRecipeName("wroughtIron3")); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("dustIron"), Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CARBONATE_SLACK, 1)), Ingredient.EMPTY, @@ -316,9 +314,9 @@ public final class CrucibleCraftingRegister{ new ItemStack(ModItems.ironcleaningotball, 1), 1550, 1200, - 800); + 800).setRecipeName("cleanIron1")); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( Ingredient.fromStacks(new ItemStack(ModItems.brokencleanirontool, 1)), new OreIngredient("nuggetIron"), Ingredient.EMPTY, @@ -328,9 +326,9 @@ public final class CrucibleCraftingRegister{ new ItemStack(ModItems.ironcleaningotball, 1), 1550, 1200, - 800); + 800).setRecipeName("cleanIron2")); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( Ingredient.fromStacks(new ItemStack(ModItems.ironcleaningotball, 1)), Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CHARCOAL_HIGH, 1)), Ingredient.EMPTY, @@ -340,9 +338,9 @@ public final class CrucibleCraftingRegister{ new ItemStack(ModItems.steelingotball, 1), 2100, 1500, - 1000); + 1000).setRecipeName("steel1")); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( Ingredient.fromStacks(new ItemStack(ModItems.brokensteeltool, 1)), new OreIngredient("nuggetSteel"), Ingredient.EMPTY, @@ -352,9 +350,9 @@ public final class CrucibleCraftingRegister{ new ItemStack(ModItems.steelingotball, 1), 2100, 1500, - 1000); + 1000).setRecipeName("steel2")); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("dustMagnetite"), Ingredient.fromStacks(new ItemStack(Blocks.LEAVES, 1,BlockPlanks.EnumType.JUNGLE.getMetadata())), Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CHARCOAL_PURE, 1)), @@ -364,9 +362,9 @@ public final class CrucibleCraftingRegister{ new ItemStack(ModItems.wootzingotball, 1), 2100, 1800, - 1500); + 1500).setRecipeName("wootz1")); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("magnetite"), Ingredient.fromStacks(new ItemStack(Blocks.LEAVES, 1, BlockPlanks.EnumType.JUNGLE.getMetadata())), Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CHARCOAL_PURE, 1)), @@ -376,9 +374,9 @@ public final class CrucibleCraftingRegister{ new ItemStack(ModItems.wootzingotball, 1), 2100, 1800, - 1500); + 1500).setRecipeName("wootz2")); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( Ingredient.fromStacks(new ItemStack(ModItems.brokenwootztool, 1)), new OreIngredient("nuggetWootz"), Ingredient.EMPTY, @@ -388,7 +386,7 @@ public final class CrucibleCraftingRegister{ new ItemStack(ModItems.wootzingotball, 1), 2100, 1800, - 1500); + 1500).setRecipeName("wootz3")); /***BRONZE***/ NBTTagCompound tagBronzeDefault = new NBTTagCompound(); @@ -397,7 +395,7 @@ public final class CrucibleCraftingRegister{ ItemStack defaultBronze = new ItemStack(ModItems.bronzeingotball, 1); defaultBronze.setTagCompound(tagBronzeDefault.copy()); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("dustCopper"), new OreIngredient("dustCopper"), new OreIngredient("dustCopper"), @@ -407,9 +405,9 @@ public final class CrucibleCraftingRegister{ defaultBronze, 1100, 800, - 600); + 600).setRecipeName("bronze1")); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("ingotBronze"), Ingredient.EMPTY, Ingredient.EMPTY, @@ -419,11 +417,11 @@ public final class CrucibleCraftingRegister{ defaultBronze, 1100, 800, - 600); + 600).setRecipeName("bronze2")); ItemStack redBronze = defaultBronze.copy(); redBronze.getTagCompound().setString("upgrades", "redstone"); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("ingotBronze"), new OreIngredient("dustRedstone"), Ingredient.EMPTY, @@ -433,11 +431,11 @@ public final class CrucibleCraftingRegister{ redBronze, 1100, 800, - 600); + 600).setRecipeName("redBronze1")); ItemStack diamondBronze = defaultBronze.copy(); diamondBronze.getTagCompound().setString("upgrades", "diamond"); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("ingotBronze"), new OreIngredient("flakeDiamond"), Ingredient.EMPTY, @@ -447,11 +445,11 @@ public final class CrucibleCraftingRegister{ diamondBronze, 1100, 800, - 600); + 600).setRecipeName("diamondBronze1")); ItemStack emeraldBronze = defaultBronze.copy(); emeraldBronze.getTagCompound().setString("upgrades", "emerald"); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("ingotBronze"), new OreIngredient("flakeEmerald"), Ingredient.EMPTY, @@ -461,11 +459,11 @@ public final class CrucibleCraftingRegister{ emeraldBronze, 1100, 800, - 600); + 600).setRecipeName("emeraldBronze1")); ItemStack lapisBronze = defaultBronze.copy(); lapisBronze.getTagCompound().setString("upgrades", "lapis"); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("ingotBronze"), new OreIngredient("gemLapis"), Ingredient.EMPTY, @@ -475,9 +473,9 @@ public final class CrucibleCraftingRegister{ lapisBronze, 1100, 800, - 600); + 600).setRecipeName("lapisBronze1")); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("dustCopper"), new OreIngredient("dustCopper"), new OreIngredient("dustCopper"), @@ -487,9 +485,9 @@ public final class CrucibleCraftingRegister{ redBronze, 1100, 800, - 600); + 600).setRecipeName("redBronze2")); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("dustCopper"), new OreIngredient("dustCopper"), new OreIngredient("dustCopper"), @@ -499,9 +497,9 @@ public final class CrucibleCraftingRegister{ diamondBronze, 1100, 800, - 600); + 600).setRecipeName("diamondBronze2")); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("dustCopper"), new OreIngredient("dustCopper"), new OreIngredient("dustCopper"), @@ -511,9 +509,9 @@ public final class CrucibleCraftingRegister{ emeraldBronze, 1100, 800, - 600); + 600).setRecipeName("emeraldBronze2")); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("dustCopper"), new OreIngredient("dustCopper"), new OreIngredient("dustCopper"), @@ -523,7 +521,7 @@ public final class CrucibleCraftingRegister{ lapisBronze, 1100, 800, - 600); + 600).setRecipeName("lapisBronze2")); /***COPPER***/ @@ -533,7 +531,7 @@ public final class CrucibleCraftingRegister{ ItemStack defaultCopper = new ItemStack(PrimalAPI.Items.COPPER_INGOT, 1); defaultCopper.setTagCompound(tagCopperDefault.copy()); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("oreCopper"), Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CARBONATE_SLACK, 1)), Ingredient.EMPTY, @@ -543,9 +541,9 @@ public final class CrucibleCraftingRegister{ defaultCopper, 900, 800, - 600); + 600).setRecipeName("copper1")); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("ingotCopper"), Ingredient.EMPTY, Ingredient.EMPTY, @@ -555,11 +553,11 @@ public final class CrucibleCraftingRegister{ defaultCopper, 900, 750, - 550); + 550).setRecipeName("copper2")); ItemStack redCopper = defaultCopper.copy(); redCopper.getTagCompound().setString("upgrades", "redstone"); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("ingotCopper"), new OreIngredient("dustRedstone"), Ingredient.EMPTY, @@ -569,11 +567,11 @@ public final class CrucibleCraftingRegister{ redCopper, 900, 750, - 550); + 550).setRecipeName("redCopper1")); ItemStack diamondCopper = defaultCopper.copy(); diamondCopper.getTagCompound().setString("upgrades", "diamond"); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("ingotCopper"), new OreIngredient("flakeDiamond"), Ingredient.EMPTY, @@ -583,11 +581,11 @@ public final class CrucibleCraftingRegister{ diamondCopper, 900, 750, - 550); + 550).setRecipeName("diamondCopper1")); ItemStack emeraldCopper = defaultCopper.copy(); emeraldCopper.getTagCompound().setString("upgrades", "emerald"); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("ingotCopper"), new OreIngredient("flakeEmerald"), Ingredient.EMPTY, @@ -597,11 +595,11 @@ public final class CrucibleCraftingRegister{ emeraldCopper, 900, 750, - 550); + 550).setRecipeName("emeraldCopper1")); ItemStack lapisCopper = defaultCopper.copy(); lapisCopper.getTagCompound().setString("upgrades", "lapis"); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("ingotCopper"), new OreIngredient("gemLapis"), Ingredient.EMPTY, @@ -611,9 +609,9 @@ public final class CrucibleCraftingRegister{ lapisCopper, 900, 750, - 550); + 550).setRecipeName("lapisCopper1")); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("oreCopper"), Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CARBONATE_SLACK, 1)), new OreIngredient("dustRedstone"), @@ -623,9 +621,9 @@ public final class CrucibleCraftingRegister{ redCopper, 900, 750, - 550); + 550).setRecipeName("redCopper2")); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("oreCopper"), Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CARBONATE_SLACK, 1)), new OreIngredient("flakeDiamond"), @@ -635,9 +633,9 @@ public final class CrucibleCraftingRegister{ diamondCopper, 900, 750, - 550); + 550).setRecipeName("diamondCopper2")); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("oreCopper"), Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CARBONATE_SLACK, 1)), new OreIngredient("flakeEmerald"), @@ -647,9 +645,9 @@ public final class CrucibleCraftingRegister{ emeraldCopper, 900, 750, - 550); + 550).setRecipeName("emeraldCopper2")); - CrucibleCrafting.addRecipe( + recipes.register (new CrucibleCrafting( new OreIngredient("oreCopper"), Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CARBONATE_SLACK, 1)), new OreIngredient("gemLapis"), @@ -659,7 +657,7 @@ public final class CrucibleCraftingRegister{ lapisCopper, 900, 750, - 550); - + 550).setRecipeName("lapisCopper2")); + } } \ No newline at end of file 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 2ab9f802..02f3ba8f 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java @@ -269,7 +269,7 @@ public class ModCrafting{ /***********************/ /***CRUCIBLE CRAFTING***/ /***********************/ - +/* CrucibleCrafting.addRecipe( new OreIngredient("oreIron"), Ingredient.EMPTY, @@ -389,8 +389,9 @@ public class ModCrafting{ 2100, 1800, 1500); - +*/ /***BRONZE***/ +/* NBTTagCompound tagBronzeDefault = new NBTTagCompound(); tagBronzeDefault.setString("upgrades", ""); tagBronzeDefault.setBoolean("hot", false); @@ -525,8 +526,9 @@ public class ModCrafting{ 800, 600); - +*/ /***COPPER***/ + /* NBTTagCompound tagCopperDefault = new NBTTagCompound(); tagCopperDefault.setString("upgrades", ""); tagCopperDefault.setBoolean("hot", false); @@ -660,7 +662,7 @@ public class ModCrafting{ 900, 750, 550); - +*/ /***CASTING FORM***/ diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/ModRegistries.java b/kfc/src/main/java/nmd/primal/forgecraft/init/ModRegistries.java index 34c3f219..ce815e3f 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModRegistries.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModRegistries.java @@ -1,14 +1,30 @@ package nmd.primal.forgecraft.init; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.registries.RegistryBuilder; +import nmd.primal.core.api.PrimalAPI; +import nmd.primal.forgecraft.ModInfo; +import nmd.primal.forgecraft.crafting.CrucibleCrafting; + /** * Created by kitsu on 12/3/2016. */ + +@GameRegistry.ObjectHolder(ModInfo.MOD_ID) +@Mod.EventBusSubscriber public class ModRegistries { - public static void registerFuels() - { - //if (ModConfig.FEATURE_ENABLE_FUELS) - //{ - + @SubscribeEvent + public static void customRegistries(RegistryEvent.NewRegistry event) { + PrimalAPI.logger(1, "Custom Registry", CrucibleCrafting.RECIPE_PREFIX); + RegistryBuilder registryCrucible = new RegistryBuilder(); + registryCrucible.setType(CrucibleCrafting.class); + registryCrucible.setName(new ResourceLocation(ModInfo.MOD_ID, "recipes_" + CrucibleCrafting.RECIPE_PREFIX)); + registryCrucible.setIDRange(0, 1000); + registryCrucible.create(); } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/recipes/CauldronRecipes.java b/kfc/src/main/java/nmd/primal/forgecraft/init/recipes/CauldronRecipes.java index ac62dfd7..396d62a2 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/recipes/CauldronRecipes.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/recipes/CauldronRecipes.java @@ -33,22 +33,5 @@ public class CauldronRecipes lapisBronze.getSubCompound("tags").setInteger("lapis", 1); lapisBronze.getSubCompound("tags").setBoolean("modified", true); - - - - -/* - recipes.register(new CauldronRecipe( - 5, - FluidRegistry.getFluidStack("water", 1000), - FluidRegistry.getFluidStack("water", 1000), - new ItemStack(ModItems.rawbronzegladius, 1), - new ItemStack(Items.DYE, 1, 4), - ItemStack.EMPTY, - ItemStack.EMPTY, - lapisBronze, - ItemStack.EMPTY).setRecipeName("finishedGladius") - ); - */ } }