Skip to content

Commit 7c75175

Browse files
Gordon-FrohmanDream-Master
Gordon-Frohman
and
Dream-Master
authored
Updated Twilight Forest compatibility (#781)
* Fixed recipies and added storage blocks to Chisel * Fixed TF doors recipes --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
1 parent 661fc74 commit 7c75175

File tree

3 files changed

+126
-0
lines changed

3 files changed

+126
-0
lines changed

‎src/main/java/com/dreammaster/recipes/RecipeRemover.java

+8
Original file line numberDiff line numberDiff line change
@@ -2744,6 +2744,14 @@ public static void run() {
27442744
removeRecipeByOutputDelayed(getModItem("TwilightForest", "item.emptyMagicMap", 1, 0, missing));
27452745
removeRecipeByOutputDelayed(getModItem("TwilightForest", "item.ironwoodRaw", 1, 0, missing));
27462746
removeRecipeByOutputDelayed(getModItem("TwilightForest", "tile.TFUncraftingTable", 1, 0, missing));
2747+
2748+
String[] materials = new String[] { "Twilight", "Canopy", "Mangrove", "Darkwood", "Time", "Trans", "Mine",
2749+
"Sort" };
2750+
for (int i = 0; i < materials.length; i++) {
2751+
removeRecipeByOutputDelayed(getModItem("TwilightForest", "tile.TFTrapDoor" + materials[i], 1, 0, missing));
2752+
removeRecipeByOutputDelayed(getModItem("TwilightForest", "item.door" + materials[i], 1, 0, missing));
2753+
}
2754+
27472755
removeRecipeByOutputDelayed(getModItem("WR-CBE|Core", "obsidianStick", 1, 0, missing));
27482756
removeRecipeByOutputDelayed(getModItem("WR-CBE|Core", "stoneBowl", 1, 0, missing));
27492757
removeRecipeByOutputDelayed(getModItem("WR-CBE|Core", "retherPearl", 1, 0, missing));

‎src/main/java/com/dreammaster/scripts/ScriptChisel.java

+9
Original file line numberDiff line numberDiff line change
@@ -598,5 +598,14 @@ public void loadRecipes() {
598598
getModItem(TwilightForest.ID, "tile.KnightmetalBlock", 1, 0, missing));
599599
ChiselHelper
600600
.addVariationFromStack("knightmetalblock", getModItem(GregTech.ID, "gt.blockmetal4", 1, 0, missing));
601+
ChiselHelper.addGroup("ironwoodblock");
602+
ChiselHelper.addVariationFromStack(
603+
"ironwoodblock",
604+
getModItem(TwilightForest.ID, "tile.IronwoodBlock", 1, 0, missing));
605+
ChiselHelper.addVariationFromStack("ironwoodblock", getModItem(GregTech.ID, "gt.blockmetal3", 1, 14, missing));
606+
ChiselHelper.addGroup("fieryblock");
607+
ChiselHelper
608+
.addVariationFromStack("fieryblock", getModItem(TwilightForest.ID, "tile.FieryBlock", 1, 0, missing));
609+
ChiselHelper.addVariationFromStack("fieryblock", getModItem(GregTech.ID, "gt.blockmetal3", 1, 4, missing));
601610
}
602611
}

‎src/main/java/com/dreammaster/scripts/ScriptTwilightForest.java

+109
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,115 @@ public void loadRecipes() {
6464
getModItem(TwilightForest.ID, "item.carminite", 1, 0, missing),
6565
getModItem(TwilightForest.ID, "tile.TFTowerStone", 1, 1, missing));
6666

67+
String[] materials = new String[] { "Twilight", "Canopy", "Mangrove", "Darkwood", "Time", "Trans", "Mine",
68+
"Sort" };
69+
70+
for (int i = 0; i < materials.length; i++) {
71+
addShapedRecipe(
72+
getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 1, 0, missing),
73+
getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing),
74+
"stickWood",
75+
getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing),
76+
"stickWood",
77+
getModItem(Minecraft.ID, "flint", 1, 0, missing),
78+
"stickWood",
79+
getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing),
80+
"stickWood",
81+
getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing));
82+
addShapedRecipe(
83+
getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 2, 0, missing),
84+
getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing),
85+
"stickWood",
86+
getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing),
87+
"stickWood",
88+
"screwAnyIron",
89+
"stickWood",
90+
getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing),
91+
"stickWood",
92+
getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing));
93+
addShapedRecipe(
94+
getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 3, 0, missing),
95+
getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing),
96+
"stickWood",
97+
getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing),
98+
"stickWood",
99+
"screwSteel",
100+
"stickWood",
101+
getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing),
102+
"stickWood",
103+
getModItem(TwilightForest.ID, "tile.TFWoodSlab", 1, i, missing));
104+
105+
addShapedRecipe(
106+
getModItem(TwilightForest.ID, "item.door" + materials[i], 1, 0, missing),
107+
getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing),
108+
getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 1, 0, missing),
109+
"craftingToolScrewdriver",
110+
getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing),
111+
"ringAnyIron",
112+
"screwAnyIron",
113+
getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing),
114+
getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing),
115+
"craftingToolSaw");
116+
addShapedRecipe(
117+
getModItem(TwilightForest.ID, "item.door" + materials[i], 1, 0, missing),
118+
getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing),
119+
getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 1, 0, missing),
120+
"craftingToolScrewdriver",
121+
getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing),
122+
"ringCopper",
123+
"screwCopper",
124+
getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing),
125+
getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing),
126+
"craftingToolSaw");
127+
addShapedRecipe(
128+
getModItem(TwilightForest.ID, "item.door" + materials[i], 1, 0, missing),
129+
getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing),
130+
getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 1, 0, missing),
131+
"craftingToolSaw",
132+
getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing),
133+
"ringAnyIron",
134+
"screwAnyIron",
135+
getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing),
136+
getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing),
137+
"craftingToolScrewdriver");
138+
addShapedRecipe(
139+
getModItem(TwilightForest.ID, "item.door" + materials[i], 1, 0, missing),
140+
getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing),
141+
getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 1, 0, missing),
142+
"craftingToolSaw",
143+
getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing),
144+
"ringCopper",
145+
"screwCopper",
146+
getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing),
147+
getModItem(TwilightForest.ID, "tile.TFPlanks", 1, i, missing),
148+
"craftingToolScrewdriver");
149+
150+
GT_Values.RA.stdBuilder()
151+
.itemInputs(
152+
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 4L),
153+
getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 1, 0, missing))
154+
.itemOutputs(getModItem(TwilightForest.ID, "item.TFDoor" + materials[i], 1, 0, missing))
155+
.fluidInputs(Materials.Iron.getMolten(16)).duration(20 * SECONDS).eut(4).addTo(assemblerRecipes);
156+
GT_Values.RA.stdBuilder()
157+
.itemInputs(
158+
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 4L),
159+
getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 1, 0, missing))
160+
.itemOutputs(getModItem(TwilightForest.ID, "item.TFDoor" + materials[i], 1, 0, missing))
161+
.fluidInputs(Materials.Copper.getMolten(16)).duration(20 * SECONDS).eut(4).addTo(assemblerRecipes);
162+
GT_Values.RA.stdBuilder()
163+
.itemInputs(
164+
getModItem(TwilightForest.ID, "tile.TFWoodSlab", 4, i, missing),
165+
GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 4L))
166+
.itemOutputs(getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 4, 0, missing))
167+
.fluidInputs(Materials.Iron.getMolten(16)).duration(30 * SECONDS).eut(4).addTo(assemblerRecipes);
168+
GT_Values.RA.stdBuilder()
169+
.itemInputs(
170+
getModItem(TwilightForest.ID, "tile.TFWoodSlab", 4, i, missing),
171+
GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 4L))
172+
.itemOutputs(getModItem(TwilightForest.ID, "tile.TFTrapDoor" + materials[i], 6, 0, missing))
173+
.fluidInputs(Materials.Steel.getMolten(16)).duration(30 * SECONDS).eut(4).addTo(assemblerRecipes);
174+
}
175+
67176
GT_Values.RA.stdBuilder()
68177
.itemInputs(
69178
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steeleaf, 1L),

0 commit comments

Comments
 (0)