Merge branch 'master' into TG-Removal

GTNewHorizons · Feb 1, 2025 · 417eccb · 417eccb
2 parents 0ce9917 + 9ab4b05
commit 417eccb
Showing 1 changed file with 52 additions and 1 deletion.
diff --git a/src/main/java/com/dreammaster/scripts/ScriptIronChests.java b/src/main/java/com/dreammaster/scripts/ScriptIronChests.java
@@ -338,6 +338,39 @@ public void loadRecipes() {
                 "craftingToolHardHammer",
                 GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.DarkSteel, 1L),
                 "craftingToolScrewdriver");
+        addShapedRecipe(
+                getModItem(IronChests.ID, "crystalDarkSteelUpgrade", 1, 0, missing),
+                "screwDarkSteel",
+                GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.DarkSteel, 1L),
+                "screwDarkSteel",
+                GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.DarkSteel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Glass, 1L),
+                GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.DarkSteel, 1L),
+                "craftingToolHardHammer",
+                GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.DarkSteel, 1L),
+                "craftingToolScrewdriver");
+        addShapedRecipe(
+                getModItem(IronChests.ID, "obsidianDarkSteelUpgrade", 1, 0, missing),
+                "screwDarkSteel",
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.DarkSteel, 1L),
+                "screwDarkSteel",
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.DarkSteel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Obsidian, 1L),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.DarkSteel, 1L),
+                "craftingToolHardHammer",
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.DarkSteel, 1L),
+                "craftingToolScrewdriver");
+        addShapedRecipe(
+                getModItem(IronChests.ID, "ironSteelUpgrade", 1, 0, missing),
+                "screwSteel",
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L),
+                "screwSteel",
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L),
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L),
+                "craftingToolHardHammer",
+                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L),
+                "craftingToolScrewdriver");
 
         GTValues.RA.stdBuilder()
                 .itemInputs(
@@ -1343,6 +1376,13 @@ public void loadRecipes() {
                         GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(getModItem(IronChests.ID, "copperSteelUpgrade", 1, 0, missing)).duration(20 * SECONDS)
                 .eut(30).addTo(assemblerRecipes);
+        GTValues.RA.stdBuilder()
+                .itemInputs(
+                        GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Steel, 1L),
+                        GTUtility.getIntegratedCircuit(2))
+                .itemOutputs(getModItem(IronChests.ID, "ironSteelUpgrade", 1, 0, missing)).duration(20 * SECONDS)
+                .eut(30).addTo(assemblerRecipes);
         GTValues.RA.stdBuilder()
                 .itemInputs(
                         getModItem(Minecraft.ID, "chest", 1, 0, missing),
@@ -1416,6 +1456,17 @@ public void loadRecipes() {
                         GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.DarkSteel, 2L))
                 .itemOutputs(getModItem(IronChests.ID, "diamondDarkSteelUpgrade", 1, 0, missing)).duration(40 * SECONDS)
                 .eut(480).addTo(assemblerRecipes);
-
+        GTValues.RA.stdBuilder()
+                .itemInputs(
+                        GTOreDictUnificator.get(OrePrefixes.plate, Materials.Glass, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.DarkSteel, 2L))
+                .itemOutputs(getModItem(IronChests.ID, "crystalDarkSteelUpgrade", 1, 0, missing)).duration(40 * SECONDS)
+                .eut(480).addTo(assemblerRecipes);
+        GTValues.RA.stdBuilder()
+                .itemInputs(
+                        GTOreDictUnificator.get(OrePrefixes.plate, Materials.Obsidian, 1L),
+                        GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.DarkSteel, 2L))
+                .itemOutputs(getModItem(IronChests.ID, "obsidianDarkSteelUpgrade", 1, 0, missing))
+                .duration(40 * SECONDS).eut(480).addTo(assemblerRecipes);
     }
 }