Migrate to new RecipeMap

GTNewHorizons · Dec 1, 2023 · 1b1d9ab · 1b1d9ab
1 parent a103aa5
commit 1b1d9ab
Show file tree

Hide file tree

Showing 110 changed files with 6,907 additions and 7,408 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,22 +1,22 @@
 // Add your dependencies here
 
 dependencies {
-    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.44.91:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.44.92-pre:dev")
     api("com.github.GTNewHorizons:Yamcl:0.5.86:dev")
     api("com.github.GTNewHorizons:Baubles:1.0.1.16:dev")
 
     compileOnly("com.github.GTNewHorizons:Avaritia:1.46:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:twilightforest:2.5.1:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:GalacticGregGT5:1.0.10:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.2.4:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:TecTech:5.3.14:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:bartworks:0.8.12:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.2.5-pre:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:TecTech:5.3.16-pre:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:bartworks:0.8.17-pre:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Mantle:0.3.7:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.10.11-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.1.14:dev") { transitive = false }
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
     compileOnly("curse.maven:witchery-69673:2234410") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.32:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.35-pre:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Chisel:2.12.3-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Botania:1.10.3-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:BloodMagic:1.4.3:dev") { transitive = false }

diff --git a/src/main/java/com/dreammaster/bartworksHandler/BW_Recipe_Loader.java b/src/main/java/com/dreammaster/bartworksHandler/BW_Recipe_Loader.java
@@ -4,7 +4,7 @@
 import static gregtech.api.enums.Mods.GalacticraftMars;
 import static gregtech.api.enums.OrePrefixes.bolt;
 import static gregtech.api.enums.OrePrefixes.dustTiny;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sImplosionRecipes;
+import static gregtech.api.recipe.RecipeMaps.implosionRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 import static gregtech.api.util.GT_RecipeConstants.AssemblyLine;
@@ -27,7 +27,7 @@ public void run() {
         GT_Values.RA.stdBuilder().itemInputs(CustomItemList.HeavyDutyAlloyIngotT4.get(1L))
                 .itemOutputs(CustomItemList.HeavyDutyPlateTier4.get(1L), Ruridit.get(dustTiny, 4))
                 .metadata(GT_RecipeConstants.ADDITIVE_AMOUNT, 32).duration(1 * SECONDS).eut(TierEU.RECIPE_LV)
-                .addTo(sImplosionRecipes);
+                .addTo(implosionRecipes);
 
         GT_Values.RA.stdBuilder()
                 .metadata(

diff --git a/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java b/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java
@@ -7,14 +7,14 @@
 import static gregtech.api.enums.Mods.GalaxySpace;
 import static gregtech.api.enums.Mods.Genetics;
 import static gregtech.api.enums.Mods.IndustrialCraft2;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCrackingRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDistillationRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFusionRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sPyrolyseRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sVacuumRecipes;
+import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes;
+import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
+import static gregtech.api.recipe.RecipeMaps.crackingRecipes;
+import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes;
+import static gregtech.api.recipe.RecipeMaps.fusionRecipes;
+import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes;
+import static gregtech.api.recipe.RecipeMaps.pyrolyseRecipes;
+import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 import static gregtech.api.util.GT_RecipeBuilder.TICKS;
@@ -185,23 +185,23 @@ private void runAdditionalFuelRecipes() {
         // XenoxRecycleRecipe
         GT_Values.RA.stdBuilder().itemOutputs(Ash.getDust(1)).fluidInputs(DelutedXenoxene.getFluid(1000))
                 .fluidOutputs(Xenoxene.getFluid(250), RadoxLight.getGas(300)).duration(30 * SECONDS)
-                .eut(TierEU.RECIPE_UV).addTo(sDistillationRecipes);
+                .eut(TierEU.RECIPE_UV).addTo(distillationTowerRecipes);
 
         // LightRadox + Nq -> Enriched Naquadah condensation int aChance, int aDuration, int aEUt, boolean aCleanroom
         GT_Values.RA.stdBuilder().itemInputs(Materials.Naquadah.getDust(1))
                 .itemOutputs(Materials.NaquadahEnriched.getDust(3)).outputChances(10000)
                 .fluidInputs(RadoxLight.getGas(2000)).duration(17 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_IV)
-                .addTo(sAutoclaveRecipes);
+                .addTo(autoclaveRecipes);
 
         // super heavy -> heavy radox conversion
         GT_Values.RA.stdBuilder().itemOutputs().fluidInputs(RadoxSuperHeavy.getFluid(1000))
                 .fluidOutputs(RadoxHeavy.getFluid(2000)).duration(50 * MINUTES).eut(TierEU.RECIPE_UV).noOptimize()
-                .addTo(sCentrifugeRecipes);
+                .addTo(centrifugeRecipes);
 
         // heavy radox + Nq+ -> Nq*
         GT_Values.RA.stdBuilder().itemInputs(Materials.NaquadahEnriched.getDust(1))
                 .itemOutputs(Materials.Naquadria.getDust(3)).outputChances(10000).fluidInputs(RadoxHeavy.getFluid(4000))
-                .duration(17 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_ZPM).addTo(sAutoclaveRecipes);
+                .duration(17 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_ZPM).addTo(autoclaveRecipes);
 
     }
 
@@ -211,7 +211,7 @@ private void runGTRecipes() {
                         GT_ModHandler.getModItem(GalaxySpace.ID, "barnardaClog", 64L),
                         GT_Utility.getIntegratedCircuit(24))
                 .itemOutputs(Ash.getDust(8)).fluidInputs(Xenoxene.getFluid(1000)).fluidOutputs(RawRadox.getFluid(1000))
-                .duration(3 * MINUTES).eut(TierEU.RECIPE_UV).addTo(sPyrolyseRecipes);
+                .duration(3 * MINUTES).eut(TierEU.RECIPE_UV).addTo(pyrolyseRecipes);
 
         GT_Values.RA.stdBuilder().itemOutputs(Ash.getDust(5)).fluidInputs(RawRadox.getFluid(5000))
                 .fluidOutputs(
@@ -226,37 +226,37 @@ private void runGTRecipes() {
                         DelutedXenoxene.getFluid(50),
                         RadoxLight.getGas(300),
                         RadoxSuperLight.getGas(500))
-                .duration(40 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(sDistillationRecipes);
+                .duration(40 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(distillationTowerRecipes);
 
         GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24))
                 .fluidInputs(RadoxSuperLight.getGas(100), Silver.getPlasma(1)).fluidOutputs(RadoxCracked.getGas(100))
-                .duration(25 * SECONDS).eut(TierEU.RECIPE_UV).addTo(sCrackingRecipes);
+                .duration(25 * SECONDS).eut(TierEU.RECIPE_UV).addTo(crackingRecipes);
 
         GT_Values.RA.stdBuilder().itemOutputs(Ash.getDust(1)).fluidInputs(RadoxCracked.getGas(1000))
                 .fluidOutputs(RadoxGas.getGas(100), RadoxLight.getGas(200)).duration(30 * SECONDS).eut(TierEU.RECIPE_UV)
-                .addTo(sDistillationRecipes);
+                .addTo(distillationTowerRecipes);
 
         // Ti & O Plasma Recipes
         GT_Values.RA.stdBuilder().fluidInputs(Aluminium.getMolten(144), Fluorine.getGas(144))
                 .fluidOutputs(Titanium.getPlasma(144)).duration(8 * SECONDS).eut(49_152)
-                .metadata(FUSION_THRESHOLD, 100_000_000).addTo(sFusionRecipes);
+                .metadata(FUSION_THRESHOLD, 100_000_000).addTo(fusionRecipes);
 
         GT_Values.RA.stdBuilder().fluidInputs(Helium.getPlasma(144), Lithium.getMolten(144))
                 .fluidOutputs(Boron.getPlasma(144)).duration(12 * SECONDS).eut(10_240)
-                .metadata(FUSION_THRESHOLD, 50_000_000).addTo(sFusionRecipes);
+                .metadata(FUSION_THRESHOLD, 50_000_000).addTo(fusionRecipes);
 
         GT_Values.RA.stdBuilder().fluidInputs(Boron.getPlasma(144), Lithium.getMolten(144))
                 .fluidOutputs(Oxygen.getPlasma(144)).duration(12 * SECONDS).eut(49_152)
-                .metadata(FUSION_THRESHOLD, 100_000_000).addTo(sFusionRecipes);
+                .metadata(FUSION_THRESHOLD, 100_000_000).addTo(fusionRecipes);
 
         GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2))
                 .fluidInputs(RadoxGas.getGas(2160), Oxygen.getPlasma(7500L), Titanium.getPlasma(100L))
                 .fluidOutputs(GT_CoreModSupport.RadoxPolymer.getMolten(720L)).duration(30 * SECONDS)
-                .eut(TierEU.RECIPE_UV).addTo(sMultiblockChemicalRecipes);
+                .eut(TierEU.RECIPE_UV).addTo(multiblockChemicalReactorRecipes);
 
         GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.cell, RadoxPolymer, 1L))
                 .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cellMolten, RadoxPolymer, 1L)).duration(30 * SECONDS)
-                .eut(TierEU.RECIPE_UV).addTo(sVacuumRecipes);
+                .eut(TierEU.RECIPE_UV).addTo(vacuumFreezerRecipes);
 
         runAdditionalFuelRecipes();
     }

diff --git a/src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java b/src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java
@@ -6,10 +6,10 @@
 import static gregtech.api.enums.GT_Values.*;
 import static gregtech.api.enums.Mods.BartWorks;
 import static gregtech.api.enums.Mods.PamsHarvestCraft;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes;
+import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
+import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
+import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
+import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
@@ -76,15 +76,15 @@ public class BioItemLoader {
         GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1))
                 .itemOutputs(Materials.Phosphorus.getDust(1), new ItemStack(BIOTEMS, 4, 1))
                 .fluidInputs(new FluidStack(BIOFLUIDS[0], 6000)).duration(2 * MINUTES).eut(TierEU.RECIPE_HV)
-                .addTo(sCentrifugeRecipes);
+                .addTo(centrifugeRecipes);
 
         RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(11), new ItemStack(BIOTEMS, 1, 1))
                 .itemOutputs(new ItemStack(BIOTEMS, 1, 2)).fluidInputs(GT_ModHandler.getDistilledWater(1000))
-                .duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMixerRecipes);
+                .duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(mixerRecipes);
 
         GT_Values.RA.stdBuilder().itemInputs(Materials.MeatRaw.getDust(1))
                 .fluidOutputs(new FluidStack(BIOFLUIDS[1], 125)).duration(15 * SECONDS).eut(TierEU.RECIPE_MV)
-                .addTo(sFluidExtractionRecipes);
+                .addTo(fluidExtractionRecipes);
 
         GT_Values.RA.stdBuilder()
                 .itemInputs(
@@ -96,7 +96,7 @@ public class BioItemLoader {
                         Materials.PhthalicAcid.getFluid(3000),
                         new FluidStack(BIOFLUIDS[1], 1000))
                 .fluidOutputs(new FluidStack(BIOFLUIDS[2], 8000)).duration(60 * SECONDS).eut(TierEU.RECIPE_UV)
-                .addTo(sMultiblockChemicalRecipes);
+                .addTo(multiblockChemicalReactorRecipes);
 
         addBacterialVatRecipe(
                 new ItemStack[] { ItemList.IC2_Energium_Dust.get(8), Materials.Mytryl.getDust(1),
@@ -114,7 +114,7 @@ public class BioItemLoader {
             GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(i + 1))
                     .itemOutputs(OreDictionary.getOres("cropTcetiESeaweed").get(i).copy().splitStack(64))
                     .fluidInputs(new FluidStack(BIOFLUIDS[3], 1000)).duration(2 * SECONDS).eut(TierEU.RECIPE_UV)
-                    .noOptimize().addTo(sCentrifugeRecipes);
+                    .noOptimize().addTo(centrifugeRecipes);
         }
         addBacterialVatRecipe(
                 new ItemStack[] { Materials.MeatRaw.getDust(4), Materials.Salt.getDust(4), Materials.Calcium.getDust(4),