Migrate to new RecipeMap (#788)

* Remove reference to GTPP_Recipe itself

* Remove GTPP_Recipe_Map_Internal

* Move recipemaps to separated class

* Remove unused recipemaps

* Migrate GT++ recipemaps
Remove sElementalDuplicatorRecipes in favor of GT replicatorRecipes supporting findRecipe

* Migrate the rest

* Adjust catalyst priorities

* Add ABS non-alloy recipe category

* Remove s prefixes from recipemaps

* Adapt to GT_StreamUtil rename

* Adjust recipe catalysts

* Fix build

* update gradle+bs+deps

(cherry picked from commit 8b185c7a4d881d38580cc98456265ebb751b6d93)

* update deps

---------

Co-authored-by: Martin Robertz <dream-master@gmx.net>

1 files changed, 37 insertions, 37 deletions

diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
index 1ddf672f02..f81c01ffaf 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
@@ -2,15 +2,15 @@ package gtPlusPlus.plugin.agrichem;
 
 import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.enums.Mods.Railcraft;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBlastRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDistilleryRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sExtractorRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sExtruderRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sLatheRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes;
+import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
+import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes;
+import static gregtech.api.recipe.RecipeMaps.distilleryRecipes;
+import static gregtech.api.recipe.RecipeMaps.extractorRecipes;
+import static gregtech.api.recipe.RecipeMaps.extruderRecipes;
+import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
+import static gregtech.api.recipe.RecipeMaps.latheRecipes;
+import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
+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_RecipeBuilder.TICKS;
@@ -233,7 +233,7 @@ public class BioRecipes {
         // Compost
         GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 4))
                 .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1)).duration(20 * SECONDS).eut(2)
-                .addTo(sMaceratorRecipes);
+                .addTo(maceratorRecipes);
 
         // Turn into Cellulose
         GT_Values.RA.stdBuilder()
@@ -241,19 +241,19 @@ public class BioRecipes {
                         getGreenAlgaeRecipeChip(),
                         ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 10))
                 .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 5))
-                .duration(7 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes);
+                .duration(7 * SECONDS + 10 * TICKS).eut(16).addTo(assemblerRecipes);
     }
 
     private static void recipeBrownAlgae() {
         // Compost
         GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 2))
                 .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1)).duration(20 * SECONDS).eut(2)
-                .addTo(sMaceratorRecipes);
+                .addTo(maceratorRecipes);
 
         // Alginic acid
         GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 10))
                 .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mAlginicAcid, 2)).duration(2 * SECONDS)
-                .eut(TierEU.RECIPE_LV).addTo(sExtractorRecipes);
+                .eut(TierEU.RECIPE_LV).addTo(extractorRecipes);
 
         // Lithium Chloride
         GT_Values.RA.stdBuilder()
@@ -261,7 +261,7 @@ public class BioRecipes {
                         getBrownAlgaeRecipeChip(),
                         ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 20))
                 .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mLithiumChloride, 5)).duration(6 * SECONDS)
-                .eut(TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(sBlastRecipes);
+                .eut(TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(blastFurnaceRecipes);
 
         // Sodium Carbonate
         GT_Values.RA.stdBuilder()
@@ -277,7 +277,7 @@ public class BioRecipes {
         // Compost
         GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, 1))
                 .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1)).duration(20 * SECONDS).eut(2)
-                .addTo(sMaceratorRecipes);
+                .addTo(maceratorRecipes);
 
         // Turn into Cellulose
         GT_Values.RA.stdBuilder()
@@ -285,20 +285,20 @@ public class BioRecipes {
                         getGoldenBrownAlgaeRecipeChip(),
                         ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, 10))
                 .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 5))
-                .duration(7 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes);
+                .duration(7 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes);
     }
 
     private static void recipeRedAlgae() {
         // Compost
         GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, 1))
                 .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 2)).duration(20 * SECONDS).eut(2)
-                .addTo(sMaceratorRecipes);
+                .addTo(maceratorRecipes);
 
         // Turn into Cellulose
         GT_Values.RA.stdBuilder()
                 .itemInputs(getRedAlgaeRecipeChip(), ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, 10))
                 .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 5))
-                .duration(7 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_HV / 2).addTo(sAssemblerRecipes);
+                .duration(7 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_HV / 2).addTo(assemblerRecipes);
     }
 
     private static void recipeCelluloseFibre() {
@@ -314,17 +314,17 @@ public class BioRecipes {
         GT_Values.RA.stdBuilder()
                 .itemInputs(getBioChip(2), ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 12))
                 .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 24))
-                .duration(2 * SECONDS + 8 * TICKS).eut(8).addTo(sAssemblerRecipes);
+                .duration(2 * SECONDS + 8 * TICKS).eut(8).addTo(assemblerRecipes);
 
         // Methanol Extraction
         GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 12))
                 .fluidOutputs(Materials.Methanol.getFluid(1000L)).duration(7 * SECONDS + 10 * TICKS)
-                .eut(TierEU.RECIPE_LV).addTo(sFluidExtractionRecipes);
+                .eut(TierEU.RECIPE_LV).addTo(fluidExtractionRecipes);
 
         // Compost
         GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 3))
                 .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1)).duration(20 * SECONDS).eut(2)
-                .addTo(sMaceratorRecipes);
+                .addTo(maceratorRecipes);
 
         // Plastic
         CORE.RA.addChemicalPlantRecipe(
@@ -357,17 +357,17 @@ public class BioRecipes {
                         ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 12),
                         ItemUtils.getSimpleStack(AgriculturalChem.mPelletMold, 0))
                 .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 3)).duration(10 * SECONDS).eut(16)
-                .addTo(sExtruderRecipes);
+                .addTo(extruderRecipes);
 
         // Assembly Recipe
         GT_Values.RA.stdBuilder().itemInputs(getBioChip(2), ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 8))
                 .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodBrick, 2)).duration(5 * SECONDS).eut(8)
-                .addTo(sAssemblerRecipes);
+                .addTo(assemblerRecipes);
 
         // CO2
         GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1))
                 .fluidOutputs(FluidUtils.getFluidStack(mCarbonDioxide, 70)).duration(10 * SECONDS).eut(TierEU.RECIPE_LV)
-                .addTo(sFluidExtractionRecipes);
+                .addTo(fluidExtractionRecipes);
 
         // Add Charcoal Recipe
         if (Railcraft.isModLoaded()) {
@@ -395,7 +395,7 @@ public class BioRecipes {
         GT_Values.RA.stdBuilder()
                 .itemInputs(getBioChip(3), ItemUtils.getOrePrefixStack(OrePrefixes.dust, Materials.Wood, 50))
                 .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodBrick, 1))
-                .duration(1 * MINUTES + 40 * SECONDS).eut(16).addTo(sAssemblerRecipes);
+                .duration(1 * MINUTES + 40 * SECONDS).eut(16).addTo(assemblerRecipes);
     }
 
     private static void recipeCellulosePulp() {
@@ -404,7 +404,7 @@ public class BioRecipes {
         GT_Values.RA.stdBuilder()
                 .itemInputs(getBioChip(2), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 4))
                 .itemOutputs(ItemUtils.getSimpleStack(Items.paper, 4)).duration(2 * SECONDS).eut(16)
-                .addTo(sAssemblerRecipes);
+                .addTo(assemblerRecipes);
     }
 
     private static void recipeCatalystCarrier() {
@@ -415,7 +415,7 @@ public class BioRecipes {
                         GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 8L),
                         GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 4L),
                         GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Tin, 6L))
-                .itemOutputs(CI.getEmptyCatalyst(1)).duration(5 * MINUTES).eut(16).addTo(sAssemblerRecipes);
+                .itemOutputs(CI.getEmptyCatalyst(1)).duration(5 * MINUTES).eut(16).addTo(assemblerRecipes);
     }
 
     private static void recipeAluminiumSilverCatalyst() {
@@ -427,7 +427,7 @@ public class BioRecipes {
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4L),
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 4L))
                 .itemOutputs(CI.getGreenCatalyst(10)).duration(20 * SECONDS).eut(TierEU.RECIPE_LV)
-                .addTo(sAssemblerRecipes);
+                .addTo(assemblerRecipes);
     }
 
     private static void recipeAceticAcid() {
@@ -614,19 +614,19 @@ public class BioRecipes {
         GT_Values.RA.stdBuilder().itemInputs(BioRecipes.getBioChip(2))
                 .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000))
                 .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mEthanol, 100)).duration(20 * SECONDS)
-                .eut(TierEU.RECIPE_MV / 2).addTo(sDistilleryRecipes);
+                .eut(TierEU.RECIPE_MV / 2).addTo(distilleryRecipes);
     }
 
     private static void recipeGoldenBrownCelluloseFiber() {
         GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 5))
                 .fluidOutputs(Materials.Ammonia.getGas(500)).duration(15 * SECONDS).eut(TierEU.RECIPE_MV)
-                .addTo(sFluidExtractionRecipes);
+                .addTo(fluidExtractionRecipes);
     }
 
     private static void recipeRedCelluloseFiber() {
         GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mRedCelluloseFiber, 3))
                 .itemOutputs(ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 5)).duration(5 * SECONDS)
-                .eut(TierEU.RECIPE_HV / 2).addTo(sExtractorRecipes);
+                .eut(TierEU.RECIPE_HV / 2).addTo(extractorRecipes);
     }
 
     private static void recipeSodiumHydroxide() {
@@ -683,7 +683,7 @@ public class BioRecipes {
     private static void recipePelletMold() {
         GregtechItemList.Pellet_Mold.set(ItemUtils.getSimpleStack(AgriculturalChem.mPelletMold, 1));
         GT_Values.RA.stdBuilder().itemInputs(ALLOY.TUMBAGA.getBlock(1)).itemOutputs(GregtechItemList.Pellet_Mold.get(1))
-                .duration(7 * MINUTES + 30 * SECONDS).eut(TierEU.RECIPE_MV / 4 * 3).addTo(sLatheRecipes);
+                .duration(7 * MINUTES + 30 * SECONDS).eut(TierEU.RECIPE_MV / 4 * 3).addTo(latheRecipes);
     }
 
     private static void recipeAluminiumPellet() {
@@ -766,7 +766,7 @@ public class BioRecipes {
                         ItemUtils.getSimpleStack(AgriculturalChem.mCleanAluminiumMix, 3),
                         ItemUtils.getSimpleStack(AgriculturalChem.mPelletMold, 0))
                 .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mAluminiumPellet, 4)).duration(30 * SECONDS)
-                .eut(TierEU.RECIPE_MV / 2).addTo(sExtruderRecipes);
+                .eut(TierEU.RECIPE_MV / 2).addTo(extruderRecipes);
     }
 
     private static void recipeAlumina() {
@@ -779,7 +779,7 @@ public class BioRecipes {
                         ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 5),
                         ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 12))
                 .fluidInputs(Materials.CarbonDioxide.getGas(2000L)).duration(40 * SECONDS).eut(TierEU.RECIPE_MV)
-                .metadata(COIL_HEAT, 1200).addTo(sBlastRecipes);
+                .metadata(COIL_HEAT, 1200).addTo(blastFurnaceRecipes);
     }
 
     private static void recipeAluminium() {
@@ -790,7 +790,7 @@ public class BioRecipes {
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 3L))
                 .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4L))
                 .fluidOutputs(Materials.CarbonDioxide.getGas(3000L)).duration(2 * MINUTES).eut(TierEU.RECIPE_MV)
-                .metadata(COIL_HEAT, 1600).addTo(sBlastRecipes);
+                .metadata(COIL_HEAT, 1600).addTo(blastFurnaceRecipes);
     }
 
     private static void recipeLithiumChloride() {
@@ -808,7 +808,7 @@ public class BioRecipes {
                 .outputChances(7500, 8000, 8500, 9000, 7500, 8500)
                 .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mAir, 4000))
                 .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mChlorine, 500)).duration(1 * MINUTES + 30 * SECONDS)
-                .eut(TierEU.RECIPE_MV / 2).addTo(sMultiblockChemicalRecipes);
+                .eut(TierEU.RECIPE_MV / 2).addTo(multiblockChemicalReactorRecipes);
         if (OreDictUtils.containsValidEntries("dustPotash")) {
             GT_Values.RA.stdBuilder()
                     .itemInputs(
@@ -824,7 +824,7 @@ public class BioRecipes {
                     .outputChances(7500, 8000, 8500, 9000, 9000, 9000)
                     .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mThermalWater, 2000))
                     .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mChlorine, 250)).duration(1 * MINUTES)
-                    .eut(TierEU.RECIPE_MV).addTo(sMultiblockChemicalRecipes);
+                    .eut(TierEU.RECIPE_MV).addTo(multiblockChemicalReactorRecipes);
         }
     }