Merge branch 'master' into more-recycling-recipes

GTNewHorizons · Dec 12, 2024 · d325181 · d325181
2 parents a0cbdcd + 66d57ca
commit d325181
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 171 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,16 +1,16 @@
 // Add your dependencies here
 
 dependencies {
-    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.80:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.88:dev")
     api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
     api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
 
-    implementation("com.github.GTNewHorizons:GTNHLib:0.5.20:dev")
+    implementation("com.github.GTNewHorizons:GTNHLib:0.5.21:dev")
 
     compileOnly("com.github.GTNewHorizons:AkashicTome:1.1.9:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Avaritia:1.54:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:twilightforest:2.6.35:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.27:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.28:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Mantle:0.4.2:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.16-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.2.3:dev") { transitive = false }

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/repositories.gradle b/repositories.gradle
@@ -1,6 +1,7 @@
 // Add any additional repositories for your dependencies here
 
 repositories {
+    mavenLocal()
     ivy {
         url 'https://files.vexatos.com/'
         patternLayout {

diff --git a/settings.gradle b/settings.gradle
@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.29'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30'
 }
 
 
diff --git a/src/main/java/com/dreammaster/detrav/ScannerTools.java b/src/main/java/com/dreammaster/detrav/ScannerTools.java
@@ -12,9 +12,7 @@
 
 public class ScannerTools implements IOreRecipeRegistrator {
 
-    public ScannerTools() {
-        OrePrefixes.toolHeadPickaxe.add(this);
-    }
+    public ScannerTools() {}
 
     public void registerOre(OrePrefixes o, Materials material, String s, String s2, ItemStack i) {
         GTModHandler.addCraftingRecipe(

diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
@@ -746,14 +746,6 @@ public void run() {
                         GGMaterial.incoloy903.get(OrePrefixes.pipeSmall), 'F',
                         OrePrefixes.gearGt.get(Materials.Titanium) });
 
-        // Neutronium Stabilization Casing
-        GTModHandler.addCraftingRecipe(
-                ItemList.Neutronium_Stable_Casing.get(4),
-                bits,
-                new Object[] { "PQP", "QFQ", "PQP", 'P',
-                        GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1), 'Q',
-                        ItemList.Field_Generator_ZPM.get(1), 'F', ItemList.Casing_MAX.get(1) });
-
         // Industrial Precision Lathe
         GTModHandler.addCraftingRecipe(
                 ItemList.Machine_Multi_Lathe.get(1),
@@ -1061,11 +1053,6 @@ public void run() {
                 GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE,
                 new Object[] { " h ", "SSS", "SSS", 'S',
                         GTOreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 1) });
-        GTModHandler.addCraftingRecipe(
-                GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Steel, 1L),
-                GTProxy.tBits,
-                new Object[] { "PIh", "f  ", 'P', OrePrefixes.plate.get(Materials.Steel), 'I',
-                        OrePrefixes.ingot.get(Materials.Steel) });
 
         GTModHandler.addShapelessCraftingRecipe(
                 GTOreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1L),
@@ -1124,14 +1111,6 @@ public void run() {
                         GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatRE", 1, GTValues.W), 'E',
                         GTModHandler.getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 3), 'C',
                         OrePrefixes.cableGt01.get(Materials.Tin), 'S', screw.get(Materials.Steel) });
-        GTModHandler.addCraftingRecipe(
-                GTModHandler.getModItem(IndustrialCraft2.ID, "itemToolHoe", 1, GTValues.W),
-                bits,
-                new Object[] { "dPH", "PGB", "ECS", 'S', screw.get(Materials.Steel), 'H',
-                        OrePrefixes.toolHeadHoe.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel),
-                        'B', GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatRE", 1, GTValues.W), 'E',
-                        GTModHandler.getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 3), 'P',
-                        OrePrefixes.plate.get(Materials.Steel) });
 
         if (OpenComputers.isModLoaded()) GTModHandler.addCraftingRecipe(
                 GTModHandler.getModItem(OpenComputers.ID, "wrench", 1, 0),

diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java
@@ -2283,11 +2283,12 @@ public void run() {
         // Neutronium Stabilization Casing
         GTValues.RA.stdBuilder()
                 .itemInputs(
-                        ItemList.Field_Generator_ZPM.get(4),
-                        GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 4),
                         ItemList.Casing_MAX.get(1),
+                        ItemList.Field_Generator_ZPM.get(1),
+                        GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 4),
+                        GTOreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 24),
                         GTUtility.getIntegratedCircuit(16))
-                .itemOutputs(ItemList.Neutronium_Stable_Casing.get(4)).duration(2 * SECONDS + 10 * TICKS).eut(16)
+                .itemOutputs(ItemList.Neutronium_Stable_Casing.get(4)).duration(10 * SECONDS).eut(TierEU.RECIPE_UV)
                 .addTo(assemblerRecipes);
 
         // Neutronium Compressor conversion
@@ -2586,7 +2587,7 @@ public void run() {
                         GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1),
                         GTOreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4),
                         GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 4),
-                        GTUtility.getIntegratedCircuit(3))
+                        GTUtility.getIntegratedCircuit(13))
                 .itemOutputs(ItemList.Casing_Firebox_Steel.get(1)).duration(5 * SECONDS).eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
@@ -2595,7 +2596,7 @@ public void run() {
                         GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1),
                         GTOreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 4),
                         GTOreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4),
-                        GTUtility.getIntegratedCircuit(3))
+                        GTUtility.getIntegratedCircuit(13))
                 .itemOutputs(ItemList.Casing_Firebox_Titanium.get(1)).duration(5 * SECONDS).eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 
@@ -2604,7 +2605,7 @@ public void run() {
                         GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1),
                         GTOreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4),
                         GTOreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 4),
-                        GTUtility.getIntegratedCircuit(3))
+                        GTUtility.getIntegratedCircuit(13))
                 .itemOutputs(ItemList.Casing_Firebox_TungstenSteel.get(1)).duration(5 * SECONDS).eut(TierEU.RECIPE_LV)
                 .addTo(assemblerRecipes);
 

diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java
@@ -328,10 +328,7 @@ public static void run() {
 
         GTModHandler.removeFurnaceSmelting(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Sunnarium, 1L));
         GTModHandler.removeFurnaceSmelting(GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Sunnarium, 1L));
-        GTModHandler
-                .removeFurnaceSmelting(GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Sunnarium, 1L));
-        GTModHandler.removeFurnaceSmelting(
-                GTOreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, Materials.Sunnarium, 1L));
+
         GTModHandler.removeFurnaceSmelting(GTOreDictUnificator.get(OrePrefixes.spring, Materials.Sunnarium, 1L));
         GTModHandler.removeFurnaceSmelting(GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Sunnarium, 1L));
         GTModHandler.removeFurnaceSmelting(getModItem(Backpack.ID, "boundLeather", 1, wildcard, missing));
@@ -1240,11 +1237,6 @@ public static void run() {
         removeRecipeByOutputDelayed(getModItem(GraviSuite.ID, "graviTool", 1, 0, missing));
         removeRecipeByOutputDelayed(getModItem(GraviSuite.ID, "ultimateLappack", 1, 0, missing));
         removeRecipeByOutputDelayed(getModItem(GraviSuiteNEO.ID, "epicLappack", 1, wildcard, missing));
-        removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Diamond, 1L));
-        removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Diamond, 1L));
-        removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Diamond, 1L));
-        removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Diamond, 1L));
-        removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Diamond, 1L));
         removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemRTGPellet", 1, 0, missing));
         removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemOreIridium", 1, 0, missing));
         removeRecipeByOutputDelayed(getModItem(ThaumicBases.ID, "resource", 1, 0, missing));
@@ -1558,14 +1550,7 @@ public static void run() {
         removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "blockMiningPipe", 1, 0, missing));
         removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "blockGenerator", 1, 5, missing));
         removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L));
-        removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Iridium, 1L));
-        removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Iridium, 1L));
-        removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadSense, Materials.Iridium, 1L));
-        removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Iridium, 1L));
-        removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadPlow, Materials.Iridium, 1L));
-        removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Iridium, 1L));
         removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadSaw, Materials.Iridium, 1L));
-        removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Iridium, 1L));
         removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemBatLamaCrystal", 1, 0, missing));
         removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemDust2", 1, 2, missing));
         removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemPartCFPowder", 1, 0, missing));

diff --git a/src/main/java/com/dreammaster/scripts/ScriptGregtech.java b/src/main/java/com/dreammaster/scripts/ScriptGregtech.java
@@ -98,61 +98,6 @@ public void loadRecipes() {
                 getModItem(SGCraft.ID, "ic2Capacitor", 1, 0, missing),
                 getModItem(SGCraft.ID, "ocInterface", 1, 0, missing),
                 getModItem(SGCraft.ID, "ic2Capacitor", 1, 0, missing));
-        addShapedRecipe(
-                GTOreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Diamond, 1L),
-                null,
-                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L),
-                null,
-                "craftingToolFile",
-                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L),
-                "craftingToolHardHammer",
-                null,
-                null,
-                null);
-        addShapedRecipe(
-                GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Diamond, 1L),
-                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L),
-                "gemDiamond",
-                "gemDiamond",
-                "craftingToolFile",
-                null,
-                "craftingToolHardHammer",
-                null,
-                null,
-                null);
-        addShapedRecipe(
-                GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Diamond, 1L),
-                "craftingToolFile",
-                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L),
-                "craftingToolHardHammer",
-                null,
-                null,
-                null,
-                null,
-                null,
-                null);
-        addShapedRecipe(
-                GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Diamond, 1L),
-                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L),
-                "gemDiamond",
-                "craftingToolHardHammer",
-                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L),
-                null,
-                null,
-                "craftingToolFile",
-                null,
-                null);
-        addShapedRecipe(
-                GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Diamond, 1L),
-                GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L),
-                "gemDiamond",
-                "craftingToolHardHammer",
-                "craftingToolFile",
-                null,
-                null,
-                null,
-                null,
-                null);
         addShapedRecipe(
                 GTOreDictUnificator.get(OrePrefixes.ring, Materials.Wood, 1L),
                 "craftingToolKnife",

diff --git a/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java b/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java
@@ -1019,33 +1019,7 @@ public void loadRecipes() {
                 GTOreDictUnificator.get(OrePrefixes.ingotDouble, Materials.Iridium, 1L),
                 null,
                 null);
-        addShapedRecipe(
-                GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Iridium, 1L),
-                "plateIridium",
-                "ingotIridium",
-                "craftingToolHardHammer",
-                "plateIridium",
-                null,
-                null,
-                "craftingToolFile",
-                null,
-                null);
-        addShapedRecipe(
-                GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Iridium, 1L),
-                "plateIridium",
-                "ingotIridium",
-                "craftingToolHardHammer",
-                "craftingToolFile",
-                null,
-                null);
-        addShapedRecipe(
-                GTOreDictUnificator.get(OrePrefixes.toolHeadSense, Materials.Iridium, 1L),
-                "plateIridium",
-                "plateIridium",
-                "ingotIridium",
-                "craftingToolHardHammer",
-                "craftingToolFile",
-                null);
+
         addShapedRecipe(
                 createItemStack(
                         GregTech.ID,
@@ -1063,39 +1037,6 @@ public void loadRecipes() {
                 "ingotIridium",
                 "ingotIridium",
                 null);
-        addShapedRecipe(
-                GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Iridium, 1L),
-                "plateIridium",
-                "ingotIridium",
-                "ingotIridium",
-                "craftingToolFile",
-                null,
-                "craftingToolHardHammer",
-                null,
-                null,
-                null);
-        addShapedRecipe(
-                GTOreDictUnificator.get(OrePrefixes.toolHeadPlow, Materials.Iridium, 1L),
-                "plateIridium",
-                "plateIridium",
-                null,
-                "plateIridium",
-                "plateIridium",
-                null,
-                "craftingToolHardHammer",
-                "craftingToolFile",
-                null);
-        addShapedRecipe(
-                GTOreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Iridium, 1L),
-                null,
-                "plateIridium",
-                null,
-                "craftingToolFile",
-                "plateIridium",
-                "craftingToolHardHammer",
-                null,
-                null,
-                null);
         addShapedRecipe(
                 GTOreDictUnificator.get(OrePrefixes.toolHeadSaw, Materials.Iridium, 1L),
                 "plateIridium",
@@ -1107,11 +1048,6 @@ public void loadRecipes() {
                 null,
                 null,
                 null);
-        addShapedRecipe(
-                GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Iridium, 1L),
-                "craftingToolFile",
-                "plateIridium",
-                "craftingToolHardHammer");
         addShapedRecipe(
                 getModItem(IndustrialCraft2.ID, "itemWeedingTrowel", 1, 0, missing),
                 "screwSteel",