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>

12 files changed, 163 insertions, 158 deletions

diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java
index 1e390eeb72..8ad226bb7a 100644
--- a/src/main/java/gtPlusPlus/core/item/ModItems.java
+++ b/src/main/java/gtPlusPlus/core/item/ModItems.java
@@ -4,7 +4,7 @@ import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gregtech.api.enums.Mods.GregTech;
 import static gregtech.api.enums.Mods.Thaumcraft;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes;
+import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.TICKS;
 import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc;
 
@@ -673,7 +673,7 @@ public final class ModItems {
                         null,
                         true);
                 GT_Values.RA.stdBuilder().itemInputs(temp2).fluidOutputs(new FluidStack(fluidFertBasic, 36))
-                        .duration(5 * TICKS).eut(16).addTo(sFluidExtractionRecipes);
+                        .duration(5 * TICKS).eut(16).addTo(fluidExtractionRecipes);
             }
             fluidFertUN32 = FluidUtils.generateFluidNonMolten(
                     "UN32Fertiliser",
diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
index 40ecd9d3e7..ca7fc7c087 100644
--- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
+++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.item.base.ingots;
 
 import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gregtech.api.enums.Mods.GregTech;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sVacuumRecipes;
+import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.TICKS;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -56,7 +56,7 @@ public class BaseItemIngotHot extends BaseItemIngot {
         Logger.WARNING("Adding Vacuum Freezer recipe for a Hot Ingot of " + this.materialName + ".");
         GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(this)).itemOutputs(this.outputIngot.copy())
                 .duration(Math.max(this.componentMaterial.getMass() * 3L, 1L) * TICKS)
-                .eut(this.componentMaterial.vVoltageMultiplier).addTo(sVacuumRecipes);
+                .eut(this.componentMaterial.vVoltageMultiplier).addTo(vacuumFreezerRecipes);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java
index 3679121ed5..bd03cf33fb 100644
--- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java
+++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.core.item.base.ingots;
 
 import static gregtech.api.enums.Mods.GTPlusPlus;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCompressorRecipes;
+import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 
 import net.minecraft.entity.Entity;
@@ -81,7 +81,7 @@ public class BaseItemIngot_OLD extends Item {
                 tempOutput = ItemUtils.getItemStackOfAmountFromOreDict(temp, 1);
                 if (tempOutput != null) {
                     GT_Values.RA.stdBuilder().itemInputs(tempStack).itemOutputs(tempOutput).duration(15 * SECONDS)
-                            .eut(2).addTo(sCompressorRecipes);
+                            .eut(2).addTo(compressorRecipes);
                 }
             }
         } else if (this.unlocalName.contains("itemHotIngot")) {
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
index b914730ee2..95d1fc616d 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
@@ -3,9 +3,9 @@ package gtPlusPlus.core.item.chemistry;
 import static gregtech.api.enums.Mods.BiomesOPlenty;
 import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.enums.Mods.TinkerConstruct;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCompressorRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes;
+import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
+import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
+import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
 
@@ -424,14 +424,14 @@ public class AgriculturalChem extends ItemPackage {
                 .itemOutputs(aDirtDust, aDirtDust, aManureByprod1, aManureByprod1, aManureByprod1, aManureByprod1)
                 .outputChances(2000, 2000, 500, 500, 250, 250).fluidInputs(FluidUtils.getFluidStack(PoopJuice, 1000))
                 .fluidOutputs(FluidUtils.getFluidStack(ManureSlurry, 250)).duration(10 * SECONDS).eut(TierEU.RECIPE_LV)
-                .addTo(sCentrifugeRecipes);
+                .addTo(centrifugeRecipes);
 
         // More Efficient way to get byproducts, less Slurry
         GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(20))
                 .itemOutputs(aDirtDust, aDirtDust, aManureByprod1, aManureByprod1, aManureByprod2, aManureByprod2)
                 .outputChances(4000, 3000, 1250, 1250, 675, 675).fluidInputs(FluidUtils.getFluidStack(PoopJuice, 1000))
                 .fluidOutputs(FluidUtils.getFluidStack(ManureSlurry, 50)).duration(20 * SECONDS)
-                .eut(TierEU.RECIPE_MV / 2).addTo(sCentrifugeRecipes);
+                .eut(TierEU.RECIPE_MV / 2).addTo(centrifugeRecipes);
     }
 
     private static void addAdvancedSlurryRecipes() {
@@ -451,7 +451,7 @@ public class AgriculturalChem extends ItemPackage {
                     // Poop Juice to Fertile Slurry
                     GT_Values.RA.stdBuilder().itemInputs(aCircuit, aBone, aMeat, aInputCells).itemOutputs(aEmptyCells)
                             .fluidInputs(aBloodStack).fluidOutputs(aOutput).duration(8 * SECONDS)
-                            .eut(TierEU.RECIPE_MV / 2).addTo(sMixerRecipes);
+                            .eut(TierEU.RECIPE_MV / 2).addTo(mixerRecipes);
                 }
             }
         }
@@ -556,7 +556,7 @@ public class AgriculturalChem extends ItemPackage {
         // Dirt Production
         GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(dustDirt, 9))
                 .itemOutputs(ItemUtils.getSimpleStack(Blocks.dirt)).duration(2 * SECONDS).eut(8)
-                .addTo(sCompressorRecipes);
+                .addTo(compressorRecipes);
 
         // Centrifuge Byproducts
 
@@ -572,7 +572,7 @@ public class AgriculturalChem extends ItemPackage {
                         ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAmmoniumNitrate", 1))
                 .outputChances(2500, 2500, 750, 1000, 5000, 250).fluidInputs(Materials.SulfuricAcid.getFluid(250))
                 .fluidOutputs(FluidUtils.getFluidStack("sulfuricapatite", 50)).duration(20 * SECONDS)
-                .eut(TierEU.RECIPE_MV / 2).addTo(sCentrifugeRecipes);
+                .eut(TierEU.RECIPE_MV / 2).addTo(centrifugeRecipes);
 
         // Add Fuel Usages
         CORE.RA.addSemifluidFuel(FluidUtils.getFluidStack(PoopJuice, 1000), 12);
@@ -591,7 +591,7 @@ public class AgriculturalChem extends ItemPackage {
                 .outputChances(3000, 3000, 2000, 2000, 1000, 1000)
                 .fluidInputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 1000))
                 .fluidOutputs(Materials.Water.getFluid(500)).duration(30 * SECONDS).eut(TierEU.RECIPE_LV)
-                .addTo(sCentrifugeRecipes);
+                .addTo(centrifugeRecipes);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
index 81eed041c6..c20fe9d522 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.core.item.chemistry;
 
-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.recipe.RecipeMaps.assemblerRecipes;
+import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT;
@@ -441,7 +441,7 @@ public class GenericChem extends ItemPackage {
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 16L))
                 .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1L))
                 .fluidOutputs(FluidUtils.getFluidStack(Carbon_Disulfide, 4000)).duration(10 * MINUTES)
-                .eut(TierEU.RECIPE_LV).metadata(COIL_HEAT, 1500).addTo(sBlastRecipes);
+                .eut(TierEU.RECIPE_LV).metadata(COIL_HEAT, 1500).addTo(blastFurnaceRecipes);
 
         CORE.RA.addChemicalPlantRecipe(
                 new ItemStack[] { CI.getNumberedCircuit(20), ItemUtils.getSimpleStack(mBrownCatalyst, 0),
@@ -487,7 +487,7 @@ public class GenericChem extends ItemPackage {
                         GT_Utility.getIntegratedCircuit(10))
                 .itemOutputs(ItemUtils.getSimpleStack(mMillingBallAlumina, 8))
                 .fluidInputs(FluidUtils.getFluidStack(GenericChem.Aniline, 4000)).duration(3 * MINUTES)
-                .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes);
+                .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);
     }
 
     private void recipeGrindingBallSoapstone() {
@@ -497,7 +497,7 @@ public class GenericChem extends ItemPackage {
                         GT_Utility.getIntegratedCircuit(10))
                 .itemOutputs(ItemUtils.getSimpleStack(mMillingBallSoapstone, 8))
                 .fluidInputs(FluidUtils.getFluidStack(AgrichemFluids.mLiquidResin, 2500)).duration(2 * MINUTES)
-                .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes);
+                .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);
     }
 
     private void recipeCyclohexane() {
@@ -546,7 +546,7 @@ public class GenericChem extends ItemPackage {
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2L),
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 2L))
                 .itemOutputs(ItemUtils.getSimpleStack(mRedCatalyst, 10)).duration(20 * SECONDS).eut(TierEU.RECIPE_LV)
-                .addTo(sAssemblerRecipes);
+                .addTo(assemblerRecipes);
     }
 
     private void recipeCatalystYellow() {
@@ -558,7 +558,7 @@ public class GenericChem extends ItemPackage {
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 4L),
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 4L))
                 .itemOutputs(ItemUtils.getSimpleStack(mYellowCatalyst, 10)).duration(1 * MINUTES).eut(TierEU.RECIPE_EV)
-                .addTo(sAssemblerRecipes);
+                .addTo(assemblerRecipes);
     }
 
     private void recipeCatalystBlue() {
@@ -570,7 +570,7 @@ public class GenericChem extends ItemPackage {
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 3L),
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 3L))
                 .itemOutputs(ItemUtils.getSimpleStack(mBlueCatalyst, 10)).duration(40 * SECONDS).eut(TierEU.RECIPE_HV)
-                .addTo(sAssemblerRecipes);
+                .addTo(assemblerRecipes);
     }
 
     private void recipeCatalystOrange() {
@@ -582,7 +582,7 @@ public class GenericChem extends ItemPackage {
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 5L),
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 5L))
                 .itemOutputs(ItemUtils.getSimpleStack(mOrangeCatalyst, 10)).duration(40 * SECONDS).eut(TierEU.RECIPE_HV)
-                .addTo(sAssemblerRecipes);
+                .addTo(assemblerRecipes);
     }
 
     private void recipeCatalystPurple() {
@@ -594,7 +594,7 @@ public class GenericChem extends ItemPackage {
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 6L),
                         ELEMENT.getInstance().RUTHENIUM.getDust(6))
                 .itemOutputs(ItemUtils.getSimpleStack(mPurpleCatalyst, 10)).duration(2 * MINUTES).eut(TierEU.RECIPE_IV)
-                .addTo(sAssemblerRecipes);
+                .addTo(assemblerRecipes);
     }
 
     private void recipeCatalystBrown() {
@@ -606,7 +606,7 @@ public class GenericChem extends ItemPackage {
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 4L),
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4L))
                 .itemOutputs(ItemUtils.getSimpleStack(mBrownCatalyst, 10)).duration(15 * SECONDS).eut(TierEU.RECIPE_LV)
-                .addTo(sAssemblerRecipes);
+                .addTo(assemblerRecipes);
     }
 
     private void recipeCatalystPink() {
@@ -618,7 +618,7 @@ public class GenericChem extends ItemPackage {
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 4L),
                         ELEMENT.getInstance().RHODIUM.getDust(4))
                 .itemOutputs(ItemUtils.getSimpleStack(mPinkCatalyst, 10)).duration(30 * SECONDS).eut(TierEU.RECIPE_EV)
-                .addTo(sAssemblerRecipes);
+                .addTo(assemblerRecipes);
     }
 
     private void recipeCatalystFormaldehyde() {
@@ -629,7 +629,7 @@ public class GenericChem extends ItemPackage {
                         CI.getEmptyCatalyst(4),
                         ItemUtils.getSimpleStack(RocketFuels.Formaldehyde_Catalyst_Dust, 8))
                 .itemOutputs(ItemUtils.getSimpleStack(mFormaldehydeCatalyst, 4)).duration(30 * SECONDS)
-                .eut(TierEU.RECIPE_HV / 2).addTo(sAssemblerRecipes);
+                .eut(TierEU.RECIPE_HV / 2).addTo(assemblerRecipes);
     }
 
     private void recipeCatalystSolidAcid() {
@@ -641,7 +641,7 @@ public class GenericChem extends ItemPackage {
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 2L))
                 .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 5))
                 .fluidInputs(MISC_MATERIALS.SOLID_ACID_MIXTURE.getFluidStack(1000)).duration(30 * SECONDS)
-                .eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes);
+                .eut(TierEU.RECIPE_EV).addTo(assemblerRecipes);
     }
 
     private void recipeCatalystInfiniteMutation() {
@@ -653,7 +653,7 @@ public class GenericChem extends ItemPackage {
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 1L),
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 10L))
                 .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mInfiniteMutationCatalyst, 5)).duration(5 * SECONDS)
-                .eut(TierEU.RECIPE_UHV).addTo(sAssemblerRecipes);
+                .eut(TierEU.RECIPE_UHV).addTo(assemblerRecipes);
     }
 
     private void recipeCadaverineAndPutrescine() {
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index 07b2913434..d3705cbb9b 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -1,8 +1,8 @@
 package gtPlusPlus.core.item.chemistry;
 
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDistilleryRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sVacuumRecipes;
+import static gregtech.api.recipe.RecipeMaps.distilleryRecipes;
+import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
+import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 
 import java.util.HashMap;
@@ -19,10 +19,11 @@ import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TierEU;
-import gregtech.api.util.GTPP_Recipe;
 import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
+import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.recipe.common.CI;
@@ -72,12 +73,12 @@ public class RocketFuels extends ItemPackage {
         if (fuelA != null) {
             GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(23)).fluidInputs(fuelA)
                     .fluidOutputs(FluidUtils.getFluidStack(Kerosene, 1800)).duration(10 * SECONDS)
-                    .eut(TierEU.RECIPE_MV / 2).addTo(sDistilleryRecipes);
+                    .eut(TierEU.RECIPE_MV / 2).addTo(distilleryRecipes);
         }
         if (fuelA == null && fuelB != null) {
             GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(23)).fluidInputs(fuelB)
                     .fluidOutputs(FluidUtils.getFluidStack(Kerosene, 1800)).duration(10 * SECONDS)
-                    .eut(TierEU.RECIPE_MV / 2).addTo(sDistilleryRecipes);
+                    .eut(TierEU.RECIPE_MV / 2).addTo(distilleryRecipes);
         }
     }
 
@@ -86,7 +87,7 @@ public class RocketFuels extends ItemPackage {
         if (fuelA != null) {
             GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(23)).fluidInputs(fuelA)
                     .fluidOutputs(FluidUtils.getFluidStack(RP1, 750)).duration(40 * SECONDS).eut(TierEU.RECIPE_MV)
-                    .addTo(sDistilleryRecipes);
+                    .addTo(distilleryRecipes);
         }
     }
 
@@ -136,7 +137,7 @@ public class RocketFuels extends ItemPackage {
     private static void createLOH() {
         GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1))
                 .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellLiquidHydrogen", 1)).duration(16 * SECONDS)
-                .eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes);
+                .eut(TierEU.RECIPE_MV).addTo(vacuumFreezerRecipes);
 
         CORE.RA.addAdvancedFreezerRecipe(
                 new ItemStack[] {},
@@ -196,7 +197,7 @@ public class RocketFuels extends ItemPackage {
                         GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 1L),
                         GT_Utility.getIntegratedCircuit(18))
                 .itemOutputs(ItemUtils.getSimpleStack(Formaldehyde_Catalyst_Dust, 4)).duration(8 * SECONDS)
-                .eut(TierEU.RECIPE_LV).addTo(sMixerRecipes);
+                .eut(TierEU.RECIPE_LV).addTo(mixerRecipes);
     }
 
     private static void createUnsymmetricalDimethylhydrazine() {
@@ -215,10 +216,10 @@ public class RocketFuels extends ItemPackage {
     }
 
     private static void addRocketFuelsToMap() {
-        HashMap<Integer, GTPP_Recipe> mRocketFuels = new LinkedHashMap<>();
+        HashMap<Integer, GT_Recipe> mRocketFuels = new LinkedHashMap<>();
         mRocketFuels.put(
                 0,
-                new GTPP_Recipe(
+                new GT_Recipe(
                         true,
                         new ItemStack[] {},
                         new ItemStack[] {},
@@ -232,7 +233,7 @@ public class RocketFuels extends ItemPackage {
 
         mRocketFuels.put(
                 1,
-                new GTPP_Recipe(
+                new GT_Recipe(
                         true,
                         new ItemStack[] {},
                         new ItemStack[] {},
@@ -246,7 +247,7 @@ public class RocketFuels extends ItemPackage {
 
         mRocketFuels.put(
                 2,
-                new GTPP_Recipe(
+                new GT_Recipe(
                         true,
                         new ItemStack[] {},
                         new ItemStack[] {},
@@ -260,7 +261,7 @@ public class RocketFuels extends ItemPackage {
 
         mRocketFuels.put(
                 3,
-                new GTPP_Recipe(
+                new GT_Recipe(
                         true,
                         new ItemStack[] {},
                         new ItemStack[] {},
@@ -278,11 +279,11 @@ public class RocketFuels extends ItemPackage {
 
         mValidRocketFuelNames.add(FluidRegistry.getFluidName(Diesel));
         for (int mID : mRocketFuels.keySet()) {
-            GTPP_Recipe aFuelRecipe = mRocketFuels.get(mID);
+            GT_Recipe aFuelRecipe = mRocketFuels.get(mID);
             if (aFuelRecipe != null) {
                 mValidRocketFuelNames.add(FluidRegistry.getFluidName(aFuelRecipe.mFluidInputs[0].getFluid()));
                 mValidRocketFuels.put(mID, aFuelRecipe.mFluidInputs[0].getFluid());
-                GTPP_Recipe.GTPP_Recipe_Map.sRocketFuels.add(aFuelRecipe);
+                GTPPRecipeMaps.rocketFuels.add(aFuelRecipe);
             }
         }
     }
diff --git a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
index b1bcbe39ed..9826478ec5 100644
--- a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
+++ b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
@@ -10,6 +10,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraftforge.client.IItemRenderer;
 import net.minecraftforge.client.MinecraftForgeClient;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
@@ -45,6 +46,7 @@ import gtPlusPlus.core.entity.projectile.EntityToxinballSmall;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.CORE.ConfigSwitches;
 import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest;
+import gtPlusPlus.nei.NEI_GTPP_Config;
 import gtPlusPlus.xmod.gregtech.common.render.GTPP_CapeRenderer;
 import gtPlusPlus.xmod.gregtech.common.render.GTPP_FlaskRenderer;
 import gtPlusPlus.xmod.gregtech.common.render.GTPP_Render_MachineBlock;
@@ -95,6 +97,8 @@ public class ClientProxy extends CommonProxy implements Runnable {
 
         new GTPP_FlaskRenderer();
 
+        MinecraftForge.EVENT_BUS.register(new NEI_GTPP_Config());
+
         super.init(e);
     }
 
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 858be53dd4..54d8fa3675 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -3,24 +3,24 @@ package gtPlusPlus.core.recipe;
 import static gregtech.api.enums.Mods.Backpack;
 import static gregtech.api.enums.Mods.Baubles;
 import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAlloySmelterRecipes;
-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.sBrewingRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCompressorRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCutterRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDistillationRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDistilleryRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes;
-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.sFluidHeaterRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFusionRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes;
-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.alloySmelterRecipes;
+import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
+import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes;
+import static gregtech.api.recipe.RecipeMaps.brewingRecipes;
+import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
+import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
+import static gregtech.api.recipe.RecipeMaps.cutterRecipes;
+import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes;
+import static gregtech.api.recipe.RecipeMaps.distilleryRecipes;
+import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes;
+import static gregtech.api.recipe.RecipeMaps.extruderRecipes;
+import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
+import static gregtech.api.recipe.RecipeMaps.fluidHeaterRecipes;
+import static gregtech.api.recipe.RecipeMaps.fusionRecipes;
+import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes;
+import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
+import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
+import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.BUCKETS;
 import static gregtech.api.util.GT_RecipeBuilder.HOURS;
 import static gregtech.api.util.GT_RecipeBuilder.INGOTS;
@@ -121,7 +121,7 @@ public class RECIPES_GREGTECH {
         // Wood's Glass Laser Lens
         GT_Values.RA.stdBuilder().itemInputs(MISC_MATERIALS.WOODS_GLASS.getDust(5), ItemList.Shape_Mold_Ball.get(0))
                 .itemOutputs(GregtechItemList.Laser_Lens_WoodsGlass.get(1)).duration(5 * MINUTES).eut(TierEU.RECIPE_HV)
-                .addTo(sAlloySmelterRecipes);
+                .addTo(alloySmelterRecipes);
     }
 
     private static void chemplantRecipes() {
@@ -260,7 +260,7 @@ public class RECIPES_GREGTECH {
     private static void fluidHeaterRecipes() {
         GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(20))
                 .fluidInputs(Materials.Water.getFluid(1000)).fluidOutputs(FluidUtils.getHotWater(1000))
-                .duration(1 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV).addTo(sFluidHeaterRecipes);
+                .duration(1 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV).addTo(fluidHeaterRecipes);
     }
 
     private static void fusionRecipes() {
@@ -271,7 +271,7 @@ public class RECIPES_GREGTECH {
                         ELEMENT.STANDALONE.RHUGNOR.getFluidStack(288))
                 .fluidOutputs(ELEMENT.STANDALONE.HYPOGEN.getFluidStack(36))
                 .duration(6 * MINUTES + 49 * SECONDS + 12 * TICKS).eut(TierEU.RECIPE_UHV)
-                .metadata(FUSION_THRESHOLD, 1_200_000_000).addTo(sFusionRecipes);
+                .metadata(FUSION_THRESHOLD, 1_200_000_000).addTo(fusionRecipes);
 
         // Rhugnor
         GT_Values.RA.stdBuilder()
@@ -279,7 +279,7 @@ public class RECIPES_GREGTECH {
                         MaterialUtils.getMaterial("Infinity", "Neutronium").getMolten(144),
                         ALLOY.QUANTUM.getFluidStack(288))
                 .fluidOutputs(ELEMENT.STANDALONE.RHUGNOR.getFluidStack(144)).duration(25 * SECONDS + 12 * TICKS)
-                .eut(TierEU.RECIPE_UV).metadata(FUSION_THRESHOLD, 2_000_000_000).addTo(sFusionRecipes);
+                .eut(TierEU.RECIPE_UV).metadata(FUSION_THRESHOLD, 2_000_000_000).addTo(fusionRecipes);
     }
 
     private static void assemblyLineRecipes() {
@@ -519,7 +519,7 @@ public class RECIPES_GREGTECH {
         for (int i = 1; i < aTransParts.length; i++) {
             GT_Values.RA.stdBuilder().itemInputs(CI.getEmitter(i, 2), CI.getSensor(i, 2))
                     .itemOutputs(aTransParts[i - 1].get(1)).duration(5 * SECONDS).eut(GT_Values.VP[i])
-                    .addTo(sLaserEngraverRecipes);
+                    .addTo(laserEngraverRecipes);
         }
 
         GT_Values.RA.stdBuilder()
@@ -528,7 +528,7 @@ public class RECIPES_GREGTECH {
                         GregtechItemList.Laser_Lens_Special.get(0))
                 .itemOutputs(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getDust(1)).duration(3 * MINUTES)
                 .eut(MaterialUtils.getVoltageForTier(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.vTier))
-                .addTo(sLaserEngraverRecipes);
+                .addTo(laserEngraverRecipes);
 
         GT_Values.RA.stdBuilder()
                 .itemInputs(
@@ -536,12 +536,12 @@ public class RECIPES_GREGTECH {
                         GregtechItemList.Laser_Lens_Special.get(0))
                 .itemOutputs(ELEMENT.STANDALONE.ASTRAL_TITANIUM.getDust(1)).duration(2 * MINUTES)
                 .eut(MaterialUtils.getVoltageForTier(ELEMENT.STANDALONE.ASTRAL_TITANIUM.vTier))
-                .addTo(sLaserEngraverRecipes);
+                .addTo(laserEngraverRecipes);
 
         GT_Values.RA.stdBuilder().itemInputs(ALLOY.NITINOL_60.getBlock(2), GregtechItemList.Laser_Lens_Special.get(0))
                 .itemOutputs(ELEMENT.STANDALONE.ADVANCED_NITINOL.getBlock(1)).duration(1 * MINUTES)
                 .eut(MaterialUtils.getVoltageForTier(ELEMENT.STANDALONE.ADVANCED_NITINOL.vTier))
-                .addTo(sLaserEngraverRecipes);
+                .addTo(laserEngraverRecipes);
 
         GT_Values.RA.stdBuilder()
                 .itemInputs(
@@ -549,11 +549,11 @@ public class RECIPES_GREGTECH {
                         GregtechItemList.Laser_Lens_Special.get(0))
                 .itemOutputs(ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getDust(1)).duration(5 * MINUTES)
                 .eut(MaterialUtils.getVoltageForTier(ELEMENT.STANDALONE.CHRONOMATIC_GLASS.vTier))
-                .addTo(sLaserEngraverRecipes);
+                .addTo(laserEngraverRecipes);
 
         GT_Values.RA.stdBuilder().itemInputs(CI.getFieldGenerator(6, 1), CI.getEmitter(7, 2))
                 .itemOutputs(ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_1_CONTAINMENT, 1))
-                .duration(5 * MINUTES).eut(TierEU.RECIPE_IV).addTo(sLaserEngraverRecipes);
+                .duration(5 * MINUTES).eut(TierEU.RECIPE_IV).addTo(laserEngraverRecipes);
 
         // Distillus Upgrade Chip
         GT_Values.RA.stdBuilder()
@@ -561,37 +561,37 @@ public class RECIPES_GREGTECH {
                         GregtechItemList.Laser_Lens_WoodsGlass.get(0),
                         ItemUtils.simpleMetaStack(AgriculturalChem.mBioCircuit, 20, 1))
                 .itemOutputs(GregtechItemList.Distillus_Upgrade_Chip.get(1)).duration(5 * MINUTES).eut(TierEU.RECIPE_IV)
-                .addTo(sLaserEngraverRecipes);
+                .addTo(laserEngraverRecipes);
     }
 
     private static void breweryRecipes() {
         GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(14))
                 .fluidInputs(EnchantingUtils.getMobEssence(100)).fluidOutputs(EnchantingUtils.getLiquidXP(1332))
-                .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sBrewingRecipes);
+                .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(brewingRecipes);
         GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(14))
                 .fluidInputs(EnchantingUtils.getLiquidXP(1332)).fluidOutputs(EnchantingUtils.getMobEssence(100))
-                .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sBrewingRecipes);
+                .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(brewingRecipes);
         GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest))
                 .fluidInputs(Materials.Water.getFluid(100L)).fluidOutputs(Materials.Biomass.getFluid(100L))
-                .duration(1 * MINUTES).eut(3).addTo(sBrewingRecipes);
+                .duration(1 * MINUTES).eut(3).addTo(brewingRecipes);
         GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest))
                 .fluidInputs(Materials.Honey.getFluid(100L)).fluidOutputs(Materials.Biomass.getFluid(100L))
-                .duration(1 * MINUTES).eut(3).addTo(sBrewingRecipes);
+                .duration(1 * MINUTES).eut(3).addTo(brewingRecipes);
         GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest))
                 .fluidInputs(FluidUtils.getFluidStack("juice", 100)).fluidOutputs(Materials.Biomass.getFluid(100L))
-                .duration(1 * MINUTES).eut(3).addTo(sBrewingRecipes);
+                .duration(1 * MINUTES).eut(3).addTo(brewingRecipes);
     }
 
     private static void cuttingSawRecipes() {
         GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("blockMeatRaw", 1))
                 .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("plateMeatRaw", 9)).duration(16 * TICKS)
-                .eut(TierEU.RECIPE_ULV).addTo(sCutterRecipes);
+                .eut(TierEU.RECIPE_ULV).addTo(cutterRecipes);
     }
 
     private static void electrolyzerRecipes() {
         GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(ModItems.dustDecayedRadium226, 1))
                 .fluidOutputs(FluidUtils.getFluidStack("radon", 144)).duration(1 * MINUTES + 30 * SECONDS)
-                .eut(TierEU.RECIPE_HV / 2).addTo(sElectrolyzerRecipes);
+                .eut(TierEU.RECIPE_HV / 2).addTo(electrolyzerRecipes);
     }
 
     private static void extruderRecipes() {
@@ -601,7 +601,7 @@ public class RECIPES_GREGTECH {
                         ItemUtils.getItemStackOfAmountFromOreDict("blockOsmium", 1),
                         ItemList.Shape_Mold_Credit.get(0))
                 .itemOutputs(ItemList.Credit_Greg_Osmium.get(1)).duration(6 * MINUTES + 20 * SECONDS)
-                .eut(TierEU.RECIPE_EV / 2).addTo(sExtruderRecipes);
+                .eut(TierEU.RECIPE_EV / 2).addTo(extruderRecipes);
     }
 
     private static void blastSmelterRecipes() {
@@ -829,14 +829,14 @@ public class RECIPES_GREGTECH {
         GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).itemOutputs()
                 .fluidInputs(FluidUtils.getFluidStack("fluid.ethylbenzene", 1000))
                 .fluidOutputs(Materials.Styrene.getFluid(1000L), Materials.Hydrogen.getGas(2000))
-                .duration(1 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV).addTo(sMultiblockChemicalRecipes);
+                .duration(1 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV).addTo(multiblockChemicalReactorRecipes);
 
         // Short-cut Styrene
         // C6H6 + C2H4 = C8H8 + 2H
         GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).itemOutputs()
                 .fluidInputs(Materials.Ethylene.getGas(500L), Materials.Benzene.getFluid(500L))
                 .fluidOutputs(Materials.Styrene.getFluid(500L), Materials.Hydrogen.getGas(1000)).duration(12 * SECONDS)
-                .eut(TierEU.R