From efb545d817b02e39df9ce2800ec15bea856b9ca8 Mon Sep 17 00:00:00 2001 From: Gordon-Frohman Date: Thu, 21 Dec 2023 23:04:07 +0700 Subject: [PATCH 1/2] Fixed recipies and added storage blocks to Chisel --- .../dreammaster/recipes/RecipeRemover.java | 8 ++ .../com/dreammaster/scripts/ScriptChisel.java | 9 ++ .../scripts/ScriptTwilightForest.java | 109 ++++++++++++++++++ 3 files changed, 126 insertions(+) diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java index 9c9827cca..431221183 100644 --- a/src/main/java/com/dreammaster/recipes/RecipeRemover.java +++ b/src/main/java/com/dreammaster/recipes/RecipeRemover.java @@ -2854,6 +2854,14 @@ public static void run() { removeRecipeByOutputDelayed(getModItem("TwilightForest", "item.emptyMagicMap", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem("TwilightForest", "item.ironwoodRaw", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem("TwilightForest", "tile.TFUncraftingTable", 1, 0, missing)); + + String[] materials = new String[] { "Twilight", "Canopy", "Mangrove", "Darkwood", "Time", "Trans", "Mine", + "Sort" }; + for (int i = 0; i < materials.length; i++) { + removeRecipeByOutputDelayed(getModItem("TwilightForest", "tile.TFTrapDoor" + materials[i], 1, 0, missing)); + removeRecipeByOutputDelayed(getModItem("TwilightForest", "item.TFDoor" + materials[i], 1, 0, missing)); + } + removeRecipeByOutputDelayed(getModItem("WR-CBE|Core", "obsidianStick", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem("WR-CBE|Core", "stoneBowl", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem("WR-CBE|Core", "retherPearl", 1, 0, missing)); diff --git a/src/main/java/com/dreammaster/scripts/ScriptChisel.java b/src/main/java/com/dreammaster/scripts/ScriptChisel.java index 6b63cd217..68577ebe9 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptChisel.java +++ b/src/main/java/com/dreammaster/scripts/ScriptChisel.java @@ -584,5 +584,14 @@ public void loadRecipes() { getModItem(TwilightForest.ID, "tile.KnightmetalBlock", 1, 0, missing)); ChiselHelper .addVariationFromStack("knightmetalblock", getModItem(GregTech.ID, "gt.blockmetal4", 1, 0, missing)); + ChiselHelper.addGroup("ironwoodblock"); + ChiselHelper.addVariationFromStack( + "ironwoodblock", + getModItem(TwilightForest.ID, "tile.IronwoodBlock", 1, 0, missing)); + ChiselHelper.addVariationFromStack("ironwoodblock", getModItem(GregTech.ID, "gt.blockmetal3", 1, 14, missing)); + ChiselHelper.addGroup("fieryblock"); + ChiselHelper + .addVariationFromStack("fieryblock", getModItem(TwilightForest.ID, "tile.FieryBlock", 1, 0, missing)); + ChiselHelper.addVariationFromStack("fieryblock", getModItem(GregTech.ID, "gt.blockmetal3", 1, 4, missing)); } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptTwilightForest.java b/src/main/java/com/dreammaster/scripts/ScriptTwilightForest.java index 22341f0a5..3086206e4 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptTwilightForest.java +++ b/src/main/java/com/dreammaster/scripts/ScriptTwilightForest.java @@ -64,6 +64,115 @@ public void loadRecipes() { getModItem(TwilightForest.ID, "item.carminite", 1, 0, missing), getModItem(TwilightForest.ID, "tile.TFTowerStone", 1, 1, missing)); + String[] materials = new String[] { "Twilight", "Canopy", "Mangrove", "Darkwood", "Time", "Trans", "Mine", + "Sort" }; + + for (int i = 0; i < materials.length; i++) { + addShapedRecipe( + getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 1, 0, missing), + getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing), + "stickWood", + getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing), + "stickWood", + getModItem(Minecraft.ID, "flint", 1, 0, missing), + "stickWood", + getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing), + "stickWood", + getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing)); + addShapedRecipe( + getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 2, 0, missing), + getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing), + "stickWood", + getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing), + "stickWood", + "screwAnyIron", + "stickWood", + getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing), + "stickWood", + getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing)); + addShapedRecipe( + getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 3, 0, missing), + getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing), + "stickWood", + getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing), + "stickWood", + "screwSteel", + "stickWood", + getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing), + "stickWood", + getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing)); + + addShapedRecipe( + getModItem(TwilightForest.ID, "item.TFDoor" + materials[i], 3, 0, missing), + getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), + getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 3, 0, missing), + "craftingToolScrewdriver", + getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), + "ringAnyIron", + "screwAnyIron", + getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), + getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), + "craftingToolSaw"); + addShapedRecipe( + getModItem(TwilightForest.ID, "item.TFDoor" + materials[i], 3, 0, missing), + getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), + getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 3, 0, missing), + "craftingToolScrewdriver", + getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), + "ringCopper", + "screwCopper", + getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), + getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), + "craftingToolSaw"); + addShapedRecipe( + getModItem(TwilightForest.ID, "item.TFDoor" + materials[i], 3, 0, missing), + getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), + getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 3, 0, missing), + "craftingToolSaw", + getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), + "ringAnyIron", + "screwAnyIron", + getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), + getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), + "craftingToolScrewdriver"); + addShapedRecipe( + getModItem(TwilightForest.ID, "item.TFDoor" + materials[i], 3, 0, missing), + getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), + getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 3, 0, missing), + "craftingToolSaw", + getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), + "ringCopper", + "screwCopper", + getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), + getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), + "craftingToolScrewdriver"); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 4L), + getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 1, 0, missing)) + .itemOutputs(getModItem(TwilightForest.ID, "item.TFDoor" + materials[i], 1, 0, missing)) + .fluidInputs(Materials.Iron.getMolten(16)).duration(20 * SECONDS).eut(4).addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 4L), + getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 1, 0, missing)) + .itemOutputs(getModItem(TwilightForest.ID, "item.TFDoor" + materials[i], 1, 0, missing)) + .fluidInputs(Materials.Copper.getMolten(16)).duration(20 * SECONDS).eut(4).addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + getModItem(TwilightForest.ID, "tile.TFWoodSlab", 4, i, missing), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 4L)) + .itemOutputs(getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 4, 0, missing)) + .fluidInputs(Materials.Iron.getMolten(16)).duration(30 * SECONDS).eut(4).addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + getModItem(TwilightForest.ID, "tile.TFWoodSlab", 4, i, missing), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 4L)) + .itemOutputs(getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 6, 0, missing)) + .fluidInputs(Materials.Steel.getMolten(16)).duration(30 * SECONDS).eut(4).addTo(assemblerRecipes); + } + GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steeleaf, 1L), From a2f3ff8e3f099305daa795632ad04401304064dc Mon Sep 17 00:00:00 2001 From: Gordon-Frohman Date: Sat, 30 Dec 2023 17:31:34 +0700 Subject: [PATCH 2/2] Fixed TF doors recipes --- .../com/dreammaster/recipes/RecipeRemover.java | 2 +- .../scripts/ScriptTwilightForest.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java index 431221183..31c22c5a6 100644 --- a/src/main/java/com/dreammaster/recipes/RecipeRemover.java +++ b/src/main/java/com/dreammaster/recipes/RecipeRemover.java @@ -2859,7 +2859,7 @@ public static void run() { "Sort" }; for (int i = 0; i < materials.length; i++) { removeRecipeByOutputDelayed(getModItem("TwilightForest", "tile.TFTrapDoor" + materials[i], 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("TwilightForest", "item.TFDoor" + materials[i], 1, 0, missing)); + removeRecipeByOutputDelayed(getModItem("TwilightForest", "item.door" + materials[i], 1, 0, missing)); } removeRecipeByOutputDelayed(getModItem("WR-CBE|Core", "obsidianStick", 1, 0, missing)); diff --git a/src/main/java/com/dreammaster/scripts/ScriptTwilightForest.java b/src/main/java/com/dreammaster/scripts/ScriptTwilightForest.java index 3086206e4..133ef43c4 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptTwilightForest.java +++ b/src/main/java/com/dreammaster/scripts/ScriptTwilightForest.java @@ -103,9 +103,9 @@ public void loadRecipes() { getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing)); addShapedRecipe( - getModItem(TwilightForest.ID, "item.TFDoor" + materials[i], 3, 0, missing), + getModItem(TwilightForest.ID, "item.door" + materials[i], 1, 0, missing), getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), - getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 3, 0, missing), + getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 1, 0, missing), "craftingToolScrewdriver", getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), "ringAnyIron", @@ -114,9 +114,9 @@ public void loadRecipes() { getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), "craftingToolSaw"); addShapedRecipe( - getModItem(TwilightForest.ID, "item.TFDoor" + materials[i], 3, 0, missing), + getModItem(TwilightForest.ID, "item.door" + materials[i], 1, 0, missing), getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), - getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 3, 0, missing), + getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 1, 0, missing), "craftingToolScrewdriver", getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), "ringCopper", @@ -125,9 +125,9 @@ public void loadRecipes() { getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), "craftingToolSaw"); addShapedRecipe( - getModItem(TwilightForest.ID, "item.TFDoor" + materials[i], 3, 0, missing), + getModItem(TwilightForest.ID, "item.door" + materials[i], 1, 0, missing), getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), - getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 3, 0, missing), + getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 1, 0, missing), "craftingToolSaw", getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), "ringAnyIron", @@ -136,9 +136,9 @@ public void loadRecipes() { getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), "craftingToolScrewdriver"); addShapedRecipe( - getModItem(TwilightForest.ID, "item.TFDoor" + materials[i], 3, 0, missing), + getModItem(TwilightForest.ID, "item.door" + materials[i], 1, 0, missing), getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), - getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 3, 0, missing), + getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 1, 0, missing), "craftingToolSaw", getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing), "ringCopper",