full RA1 removal (#2713)

* remove addExtractionRecipes

* remove addPulverisationRecipe

* remove thermalcraft fake compat

* deprecate addAlloySmelterRecipe

* remove fake compat

* remove RA1 fusion recipe usage

* remove RA1 centrifuge recipe usage

* remove RA1 compressor recipe usage

* remove RA1 electrolyzer recipe usage

* remove RA1 chemical reactor recipe usage

* deprecate GT based recipes adders

* obliterate RA1 entries in interfaces (1/?)

* remove RA1 blast furnace recipe usage

* remove RA1 canner recipe usage

* remove RA1 alloy smelter recipe usage

* remove RA1 circuit assembler recipe usage

* obliterate RA1 entries in interfaces (2/?)

* remove RA1 bender recipe usage

* clean class

* remove RA1 cutter recipe usage

* remove RA1 fuels recipe usage

* remove RA1 implosion compressor recipe usage

* remove RA1 thermal centrifuge recipe usage

* clean GT_ModHandler

* obliterate RA1 entries in interfaces (3/?)

* remove RA1 packager recipe usage

* remove RA1 lathe recipe usage

* remove RA1 vacuum freezer recipe usage

* remove RA1 fluid heater recipe usage

* remove RA1 nano forge recipe usage

* remove RA1 autoclave recipe usage

* obliterate RA1 entries in interfaces (4/?)

* remove RA1 cracker recipe usage

* remove RA1 pyrolyse recipe usage

* remove RA1 pulveriser recipe usage

* remove RA1 fluid extractor recipe usage

* remove RA1 assembly line recipe usage

* remove RA1 alloy blast smelter recipe usage

* remove RA1 coke oven recipe usage

* obliterate RA1 entries in interfaces (5/?)

* remove RA1 dehydrator recipe usage

* remove deprecated usages

* obliterate RA1 entries in interfaces (6/?)

* remove RA1 assembler recipe usage

* obliterate RA1 entries in interfaces (7/?)

* remove RA1 mixer recipe usage

* remove RA1 forge hammer recipe usage

* remove RA1 wiremill recipe usage

* remove RA1 extruder recipe usage

* remove RA1 fluid soldifier recipe usage

* remove RA1 chemical bath recipe usage

* remove RA1 electromagnetic separator recipe usage

* remove RA1 sifter recipe usage

* remove distillery recipe usage

* remove distillation tower usage

* remove extractor usage

* obliterate RA1 entries in interfaces (8/?)

* remove QFT usage

* cleaning

* remove packager usage

* remove fluid heater usage

* remove vacuum freezer usage

* remove distillery usage

* fix QFT chances arrays

* remove fission fuel usage

* remove cyclotron usage

* remove molecular transformer usage

* remove chemplant usage

* remove coldtrap and reactor processing unit usage

* obliterate RA1 entries in interfaces (9/?)

* spotlessApply

* fixes

* remove addRecipe calls

* migrate forge of gods recipes

* yeet special value calls (1 / 2)

* yeet special value calls (2 / 2)

* migrate GG Fuel recipes

* migrate all GG maps except EHE

* CORE.RA is no more

* clear GT_RecipeAdder

* remove dead code

* clean RecipeMap a bit

* spotless apply

* fix output chances

* Update RecipeLoader.java

* fix

* remove buggy recipe

* migrate to enum for IDs

* sort enum

* move to enum

* fix recipes

* spotless apply

* fix recipe

* remove useless recipes

* spotless apply

* remove unused blocks

* fix GT++ recipe

* Update RecipeLoader.java

* Update RecipeLoader.java

* fix imports

* Spotless apply for branch remove_RA1_calls for #2713 (#2742)

spotlessApply

Co-authored-by: GitHub GTNH Actions <>

* fix recipe

(cherry picked from commit a25d3b62997f080e064369e940eaf53a96a300e6)

* fix

(cherry picked from commit d9af01140f3ee77de2be18be70f04f8fbe4b547f)

* temporarily remove panic mode

* fix recipes

* Revert "temporarily remove panic mode"

This reverts commit 483cfcf74371b91e7d545f058f9d25ff4fcec95a.

* fix recipes

---------

Co-authored-by: Dream Master <dream-master@gmx.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

6 files changed, 581 insertions, 415 deletions

diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java
index f1b16089d9..a37b1ac329 100644
--- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java
@@ -3,6 +3,7 @@ package goodgenerator.loader;
 import static goodgenerator.util.StackUtils.getTotalItems;
 import static goodgenerator.util.StackUtils.mergeStacks;
 import static goodgenerator.util.StackUtils.multiplyAndSplitIntoStacks;
+import static gregtech.api.util.GT_RecipeConstants.COAL_CASING_TIER;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -20,7 +21,7 @@ import net.minecraftforge.oredict.OreDictionary;
 
 import org.apache.commons.lang3.tuple.Pair;
 
-import goodgenerator.util.MyRecipeAdder;
+import goodgenerator.api.recipe.GoodGeneratorRecipeMaps;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
@@ -107,14 +108,17 @@ public class ComponentAssemblyLineRecipeLoader {
                     replaceIntoFluids(fixedInputs, fixedFluids, 64);
                     int tier = info.getRight();
                     int energy = (int) Math.min(Integer.MAX_VALUE - 7, GT_Values.VP[tier - 1]);
-                    MyRecipeAdder.instance.addComponentAssemblyLineRecipe(
-                        fixedInputs.toArray(new ItemStack[0]),
-                        fixedFluids.toArray(new FluidStack[0]),
-                        info.getLeft()
-                            .get(OUTPUT_MULTIPLIER),
-                        recipe.mDuration * INPUT_MULTIPLIER,
-                        energy,
-                        info.getRight());
+                    GT_Values.RA.stdBuilder()
+                        .itemInputs(fixedInputs.toArray(new ItemStack[0]))
+                        .itemOutputs(
+                            info.getLeft()
+                                .get(OUTPUT_MULTIPLIER))
+                        .fluidInputs(fixedFluids.toArray(new FluidStack[0]))
+                        .duration(recipe.mDuration * INPUT_MULTIPLIER)
+                        .eut(energy)
+                        .metadata(COAL_CASING_TIER, info.getRight())
+                        .noOptimize()
+                        .addTo(GoodGeneratorRecipeMaps.componentAssemblyLineRecipes);
                 }
             }
         });
@@ -173,14 +177,17 @@ public class ComponentAssemblyLineRecipeLoader {
                     if (addProgrammedCircuit) fixedInputs.add(GT_Utility.getIntegratedCircuit(componentCircuit));
 
                     addEternityForMHDCSM(fixedFluids);
-                    MyRecipeAdder.instance.addComponentAssemblyLineRecipe(
-                        fixedInputs.toArray(new ItemStack[0]),
-                        fixedFluids.toArray(new FluidStack[0]),
-                        info.getLeft()
-                            .get(OUTPUT_MULTIPLIER), // The component output
-                        recipe.mDuration * INPUT_MULTIPLIER, // Takes as long as this many
-                        recipe.mEUt,
-                        info.getRight()); // Casing tier
+                    GT_Values.RA.stdBuilder()
+                        .itemInputs(fixedInputs.toArray(new ItemStack[0]))
+                        .itemOutputs(
+                            info.getLeft()
+                                .get(OUTPUT_MULTIPLIER))
+                        .fluidInputs(fixedFluids.toArray(new FluidStack[0]))
+                        .duration(recipe.mDuration * INPUT_MULTIPLIER)
+                        .eut(recipe.mEUt)
+                        .metadata(COAL_CASING_TIER, info.getRight())
+                        .noOptimize()
+                        .addTo(GoodGeneratorRecipeMaps.componentAssemblyLineRecipes);
 
                     // Add a second recipe using Styrene-Butadiene
                     // Rubber instead of Silicone Rubber.
@@ -188,14 +195,17 @@ public class ComponentAssemblyLineRecipeLoader {
                     // @allSyntheticRubber so it's quite fragile, but
                     // it's also the least invasive change.
                     if (swapSiliconeForStyreneButadiene(fixedFluids)) {
-                        MyRecipeAdder.instance.addComponentAssemblyLineRecipe(
-                            fixedInputs.toArray(new ItemStack[0]),
-                            fixedFluids.toArray(new FluidStack[0]),
-                            info.getLeft()
-                                .get(OUTPUT_MULTIPLIER), // The component output
-                            recipe.mDuration * INPUT_MULTIPLIER, // Takes as long as this many
-                            recipe.mEUt,
-                            info.getRight()); // Casing tier
+                        GT_Values.RA.stdBuilder()
+                            .itemInputs(fixedInputs.toArray(new ItemStack[0]))
+                            .itemOutputs(
+                                info.getLeft()
+                                    .get(OUTPUT_MULTIPLIER))
+                            .fluidInputs(fixedFluids.toArray(new FluidStack[0]))
+                            .duration(recipe.mDuration * INPUT_MULTIPLIER)
+                            .eut(recipe.mEUt)
+                            .metadata(COAL_CASING_TIER, info.getRight())
+                            .noOptimize()
+                            .addTo(GoodGeneratorRecipeMaps.componentAssemblyLineRecipes);
                     }
                 }
             }
diff --git a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java
index 7a4f913521..c233f96ec0 100644
--- a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java
@@ -1,10 +1,14 @@
 package goodgenerator.loader;
 
+import static goodgenerator.api.recipe.GoodGeneratorRecipeMaps.naquadahFuelRefineFactoryRecipes;
+import static goodgenerator.api.recipe.GoodGeneratorRecipeMaps.naquadahReactorFuels;
 import static goodgenerator.main.GG_Config_Loader.NaquadahFuelTime;
 import static goodgenerator.main.GG_Config_Loader.NaquadahFuelVoltage;
 import static gregtech.api.enums.Mods.GTPlusPlus;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GT_RecipeConstants.LNG_BASIC_OUTPUT;
+import static gregtech.api.util.GT_RecipeConstants.NFR_COIL_TIER;
 
-import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -12,7 +16,7 @@ import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
 
 import goodgenerator.items.MyMaterial;
 import goodgenerator.util.ItemRefer;
-import goodgenerator.util.MyRecipeAdder;
+import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsUEVplus;
 import gregtech.api.enums.OrePrefixes;
@@ -23,147 +27,158 @@ import gtPlusPlus.core.material.ELEMENT;
 public class FuelRecipeLoader {
 
     public static void RegisterFuel() {
-        // MyRecipeAdder.instance.addLiquidMentalFuel(Materials.NaquadahEnriched.getMolten(1L),Materials.Naquadah.getMolten(1L),32768,100);
-        // MyRecipeAdder.instance.addLiquidMentalFuel(Materials.Naquadria.getMolten(1L),Materials.Naquadah.getMolten(1L),262144,120);
-        MyRecipeAdder.instance.addLiquidMentalFuel(
-            MyMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(1),
-            MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1),
-            NaquadahFuelVoltage[0],
-            NaquadahFuelTime[0]);
-        MyRecipeAdder.instance.addLiquidMentalFuel(
+        FluidStack[] inputs = new FluidStack[] { MyMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(1),
             MyMaterial.thoriumBasedLiquidFuelExcited.getFluidOrGas(1),
-            MyMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1),
-            NaquadahFuelVoltage[1],
-            NaquadahFuelTime[1]);
-        MyRecipeAdder.instance.addLiquidMentalFuel(
             MyMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(1),
+            MyMaterial.naquadahBasedFuelMkI.getFluidOrGas(1), MyMaterial.naquadahBasedFuelMkII.getFluidOrGas(1),
+            MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(1), MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(1),
+            MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(1), MyMaterial.naquadahBasedFuelMkVI.getFluidOrGas(1) };
+
+        FluidStack[] outputs = new FluidStack[] { MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1),
+            MyMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1),
             MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1),
-            NaquadahFuelVoltage[2],
-            NaquadahFuelTime[2]);
-        MyRecipeAdder.instance.addLiquidMentalFuel(
-            MyMaterial.naquadahBasedFuelMkI.getFluidOrGas(1),
             MyMaterial.naquadahBasedFuelMkIDepleted.getFluidOrGas(1),
-            NaquadahFuelVoltage[3],
-            NaquadahFuelTime[3]);
-        MyRecipeAdder.instance.addLiquidMentalFuel(
-            MyMaterial.naquadahBasedFuelMkII.getFluidOrGas(1),
             MyMaterial.naquadahBasedFuelMkIIDepleted.getFluidOrGas(1),
-            NaquadahFuelVoltage[4],
-            NaquadahFuelTime[4]);
-        MyRecipeAdder.instance.addLiquidMentalFuel(
-            MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(1),
             MyMaterial.naquadahBasedFuelMkIIIDepleted.getFluidOrGas(1),
-            NaquadahFuelVoltage[5],
-            NaquadahFuelTime[5]);
-        MyRecipeAdder.instance.addLiquidMentalFuel(
-            MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(1),
             MyMaterial.naquadahBasedFuelMkIVDepleted.getFluidOrGas(1),
-            NaquadahFuelVoltage[6],
-            NaquadahFuelTime[6]);
-        MyRecipeAdder.instance.addLiquidMentalFuel(
-            MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(1),
             MyMaterial.naquadahBasedFuelMkVDepleted.getFluidOrGas(1),
-            NaquadahFuelVoltage[7],
-            NaquadahFuelTime[7]);
-        MyRecipeAdder.instance.addLiquidMentalFuel(
-            MyMaterial.naquadahBasedFuelMkVI.getFluidOrGas(1),
-            MyMaterial.naquadahBasedFuelMkVIDepleted.getFluidOrGas(1),
-            NaquadahFuelVoltage[8],
-            NaquadahFuelTime[8]);
+            MyMaterial.naquadahBasedFuelMkVIDepleted.getFluidOrGas(1) };
+        for (int i = 0; i < 9; i++) {
+            GT_Values.RA.stdBuilder()
+                .fluidInputs(inputs[i])
+                .fluidOutputs(outputs[i])
+                .duration(NaquadahFuelTime[i])
+                .eut(0)
+                .metadata(LNG_BASIC_OUTPUT, NaquadahFuelVoltage[i])
+                .addTo(naquadahReactorFuels);
+        }
+
         // MK III Naquadah Fuel
-        MyRecipeAdder.instance.addNaquadahFuelRefineRecipe(
-            new FluidStack[] { MyMaterial.heavyNaquadahFuel.getFluidOrGas(800),
-                MyMaterial.lightNaquadahFuel.getFluidOrGas(1000), },
-            new ItemStack[] { MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 4),
-                WerkstoffLoader.Tiberium.get(OrePrefixes.dust, 27), ItemRefer.High_Density_Uranium.get(2),
-                ItemRefer.High_Density_Plutonium.get(1), },
-            MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(100),
-            1100000,
-            100,
-            1);
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 4),
+                WerkstoffLoader.Tiberium.get(OrePrefixes.dust, 27),
+                ItemRefer.High_Density_Uranium.get(2),
+                ItemRefer.High_Density_Plutonium.get(1))
+            .fluidInputs(
+                MyMaterial.heavyNaquadahFuel.getFluidOrGas(800),
+                MyMaterial.lightNaquadahFuel.getFluidOrGas(1000))
+            .fluidOutputs(MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(100))
+            .duration(5 * SECONDS)
+            .eut(1_100_000)
+            .metadata(NFR_COIL_TIER, 1)
+            .noOptimize()
+            .addTo(naquadahFuelRefineFactoryRecipes);
 
         // Alternative higher tier recipe
-        MyRecipeAdder.instance.addNaquadahFuelRefineRecipe(
-            new FluidStack[] { MyMaterial.heavyNaquadahFuel.getFluidOrGas(800),
-                MyMaterial.lightNaquadahFuel.getFluidOrGas(1000), },
-            new ItemStack[] { MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 8),
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 8),
                 GT_ModHandler.getModItem(GTPlusPlus.ID, "itemDustChromaticGlass", 9),
-                ItemRefer.High_Density_Uranium.get(2), ItemRefer.High_Density_Plutonium.get(1), },
-            MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(200),
-            2100000,
-            100,
-            1);
+                ItemRefer.High_Density_Uranium.get(2),
+                ItemRefer.High_Density_Plutonium.get(1))
+            .fluidInputs(
+                MyMaterial.heavyNaquadahFuel.getFluidOrGas(800),
+                MyMaterial.lightNaquadahFuel.getFluidOrGas(1000))
+            .fluidOutputs(MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(200))
+            .duration(5 * SECONDS)
+            .eut(2_100_000)
+            .metadata(NFR_COIL_TIER, 1)
+            .noOptimize()
+            .addTo(naquadahFuelRefineFactoryRecipes);
+
         // MK IV Naquadah Fuel
-        MyRecipeAdder.instance.addNaquadahFuelRefineRecipe(
-            new FluidStack[] { MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000),
-                Materials.Praseodymium.getMolten(9216L) },
-            new ItemStack[] { MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 27),
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 27),
                 GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 64),
                 GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64),
-                MyMaterial.orundum.get(OrePrefixes.dust, 32), },
-            MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(250),
-            46000000,
-            160,
-            2);
+                MyMaterial.orundum.get(OrePrefixes.dust, 32))
+            .fluidInputs(MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000), Materials.Praseodymium.getMolten(9216L))
+            .fluidOutputs(MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(250))
+            .duration(8 * SECONDS)
+            .eut(46_000_000)
+            .metadata(NFR_COIL_TIER, 2)
+            .noOptimize()
+            .addTo(naquadahFuelRefineFactoryRecipes);
 
         // Alternate higher tier recipe
-        MyRecipeAdder.instance.addNaquadahFuelRefineRecipe(
-            new FluidStack[] { MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000),
-                new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 1440) },
-            new ItemStack[] { MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 27),
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 27),
                 GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bedrockium, 64),
                 GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64),
-                MyMaterial.orundum.get(OrePrefixes.dust, 64), },
-            MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(500),
-            75000000,
-            160,
-            2);
+                MyMaterial.orundum.get(OrePrefixes.dust, 64))
+            .fluidInputs(
+                MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000),
+                new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 1440))
+            .fluidOutputs(MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(500))
+            .duration(8 * SECONDS)
+            .eut(75_000_000)
+            .metadata(NFR_COIL_TIER, 2)
+            .noOptimize()
+            .addTo(naquadahFuelRefineFactoryRecipes);
 
         // MK V Naquadah Fuel
-        MyRecipeAdder.instance.addNaquadahFuelRefineRecipe(
-            new FluidStack[] { MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000),
-                FluidRegistry.getFluidStack("heavyradox", 1000), },
-            new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 16),
-                MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 32), },
-            MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(500),
-            100000000,
-            200,
-            2);
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 16),
+                MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 32))
+            .fluidInputs(
+                MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000),
+                FluidRegistry.getFluidStack("heavyradox", 1000))
+            .fluidOutputs(MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(500))
+            .duration(100_000_000)
+            .eut(10 * SECONDS)
+            .metadata(NFR_COIL_TIER, 2)
+            .noOptimize()
+            .addTo(naquadahFuelRefineFactoryRecipes);
 
         // Alternate higher tier recipe
-        MyRecipeAdder.instance.addNaquadahFuelRefineRecipe(
-            new FluidStack[] { MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000),
-                FluidRegistry.getFluidStack("heavyradox", 1000), },
-            new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.SpaceTime, 8),
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.SpaceTime, 8),
                 GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.TranscendentMetal, 16),
-                MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 48), },
-            MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(750),
-            300000000,
-            200,
-            3);
+                MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 48))
+            .fluidInputs(
+                MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000),
+                FluidRegistry.getFluidStack("heavyradox", 1000))
+            .fluidOutputs(MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(750))
+            .duration(10 * SECONDS)
+            .eut(300_000_000)
+            .metadata(NFR_COIL_TIER, 3)
+            .noOptimize()
+            .addTo(naquadahFuelRefineFactoryRecipes);
 
         // MK VI Naquadah Fuel
-        MyRecipeAdder.instance.addNaquadahFuelRefineRecipe(
-            new FluidStack[] { MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(2000),
-                FluidRegistry.getFluidStack("molten.shirabon", 1440), },
-            new ItemStack[] { ELEMENT.STANDALONE.ASTRAL_TITANIUM.getDust(64),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tritanium, 32), },
-            MyMaterial.naquadahBasedFuelMkVI.getFluidOrGas(500),
-            320000000,
-            240,
-            3);
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                ELEMENT.STANDALONE.ASTRAL_TITANIUM.getDust(64),
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tritanium, 32))
+            .fluidInputs(
+                MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(2000),
+                FluidRegistry.getFluidStack("molten.shirabon", 1440))
+            .fluidOutputs(MyMaterial.naquadahBasedFuelMkVI.getFluidOrGas(500))
+            .duration(12 * SECONDS)
+            .eut(320_000_000)
+            .metadata(NFR_COIL_TIER, 3)
+            .noOptimize()
+            .addTo(naquadahFuelRefineFactoryRecipes);
 
         // Alternate higher tier recipe
-        MyRecipeAdder.instance.addNaquadahFuelRefineRecipe(
-            new FluidStack[] { MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(2000),
-                FluidRegistry.getFluidStack("molten.shirabon", 1440), },
-            new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.WhiteDwarfMatter, 8),
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.WhiteDwarfMatter, 8),
                 ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getDust(64),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tritanium, 48), },
-            MyMaterial.naquadahBasedFuelMkVI.getFluidOrGas(750),
-            530000000,
-            240,
-            4);
-
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tritanium, 48))
+            .fluidInputs(
+                MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(2000),
+                FluidRegistry.getFluidStack("molten.shirabon", 1440))
+            .fluidOutputs(MyMaterial.naquadahBasedFuelMkVI.getFluidOrGas(750))
+            .duration(12 * SECONDS)
+            .eut(530_000_000)
+            .metadata(NFR_COIL_TIER, 4)
+            .noOptimize()
+            .addTo(naquadahFuelRefineFactoryRecipes);
     }
 }
diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
index 9b28bb91fe..2354ec61c2 100644
--- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
@@ -1,5 +1,6 @@
 package goodgenerator.loader;
 
+import static goodgenerator.api.recipe.GoodGeneratorRecipeMaps.neutronActivatorRecipes;
 import static goodgenerator.items.MyMaterial.P507;
 import static goodgenerator.items.MyMaterial.adamantine;
 import static goodgenerator.items.MyMaterial.concentratedEnrichedNaquadahSludge;
@@ -34,6 +35,7 @@ import static goodgenerator.items.MyMaterial.towEthyl1Hexanol;
 import static goodgenerator.items.MyMaterial.triniumSulphate;
 import static goodgenerator.items.MyMaterial.wasteLiquid;
 import static goodgenerator.main.GG_Config_Loader.EnableNaquadahRework;
+import static goodgenerator.util.MyRecipeAdder.computeRangeNKE;
 import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes;
 import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes;
 import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
@@ -47,8 +49,11 @@ import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 import static gregtech.api.util.GT_RecipeBuilder.TICKS;
 import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT;
+import static gregtech.api.util.GT_RecipeConstants.NKE_RANGE;
+import static gregtech.api.util.GT_RecipeConstants.QFT_FOCUS_TIER;
 import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
 import static gregtech.common.items.GT_MetaGenerated_Item_01.registerCauldronCleaningFor;
+import static gtPlusPlus.api.recipe.GTPPRecipeMaps.quantumForceTransformerRecipes;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -76,7 +81,6 @@ import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
 import goodgenerator.main.GoodGenerator;
 import goodgenerator.util.CrackRecipeAdder;
 import goodgenerator.util.ItemRefer;
-import goodgenerator.util.MyRecipeAdder;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
@@ -91,7 +95,6 @@ import gregtech.common.items.CombType;
 import gregtech.loaders.misc.GT_Bees;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.item.chemistry.GenericChem;
-import gtPlusPlus.core.lib.CORE;
 
 public class NaquadahReworkRecipeLoader {
 
@@ -101,68 +104,97 @@ public class NaquadahReworkRecipeLoader {
 
         try {
             // Naquadah (UEV)
-            CORE.RA.addQuantumTransformerRecipe(
-                new ItemStack[] { naquadahEarth.get(OrePrefixes.dust, 32), Materials.Sodium.getDust(64),
-                    Materials.Carbon.getDust(1), GT_Utility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst) },
-                new FluidStack[] { Materials.Hydrogen.getGas(64000L), Materials.Fluorine.getGas(64000L),
-                    Materials.Oxygen.getGas(100L) },
-                new FluidStack[] {},
-                new ItemStack[] { inertNaquadah.get(OrePrefixes.dust, 1), Materials.Titanium.getDust(64),
-                    Materials.Adamantium.getDust(64), Materials.Gallium.getDust(64) },
-                new int[] { 2500, 2500, 2500, 2500 },
-                10 * 20,
-                (int) GT_Values.VP[10],
-                2);
+            GT_Values.RA.stdBuilder()
+                .itemInputs(
+                    naquadahEarth.get(OrePrefixes.dust, 32),
+                    Materials.Sodium.getDust(64),
+                    Materials.Carbon.getDust(1),
+                    GT_Utility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst))
+                .itemOutputs(
+                    inertNaquadah.get(OrePrefixes.dust, 1),
+                    Materials.Titanium.getDust(64),
+                    Materials.Adamantium.getDust(64),
+                    Materials.Gallium.getDust(64))
+                .outputChances(2500, 2500, 2500, 2500)
+                .fluidInputs(
+                    Materials.Hydrogen.getGas(64000L),
+                    Materials.Fluorine.getGas(64000L),
+                    Materials.Oxygen.getGas(100L))
+                .duration(10 * SECONDS)
+                .eut(GT_Values.VP[10])
+                .metadata(QFT_FOCUS_TIER, 2)
+                .addTo(quantumForceTransformerRecipes);
             // Enriched Naquadah (UIV)
-            CORE.RA.addQuantumTransformerRecipe(
-                new ItemStack[] { enrichedNaquadahEarth.get(OrePrefixes.dust, 32), Materials.Zinc.getDust(64),
-                    Materials.Carbon.getDust(1), GT_Utility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst) },
-                new FluidStack[] { Materials.SulfuricAcid.getFluid(16000), Materials.Oxygen.getGas(100L) },
-                new FluidStack[] { wasteLiquid.getFluidOrGas(32000) },
-                new ItemStack[] { inertEnrichedNaquadah.get(OrePrefixes.dust, 1), Materials.Trinium.getDust(64), },
-                new int[] { 3300, 3300, 3300 },
-                10 * 20,
-                (int) GT_Values.VP[11],
-                2);
+            GT_Values.RA.stdBuilder()
+                .itemInputs(
+                    enrichedNaquadahEarth.get(OrePrefixes.dust, 32),
+                    Materials.Zinc.getDust(64),
+                    Materials.Carbon.getDust(1),
+                    GT_Utility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst))
+                .itemOutputs(inertEnrichedNaquadah.get(OrePrefixes.dust, 1), Materials.Trinium.getDust(64))
+                .outputChances(3300, 3300, 3300)
+                .fluidInputs(Materials.SulfuricAcid.getFluid(16000), Materials.Oxygen.getGas(100L))
+                .fluidOutputs(wasteLiquid.getFluidOrGas(32000))
+                .duration(10 * SECONDS)
+                .eut(GT_Values.VP[11])
+                .metadata(QFT_FOCUS_TIER, 2)
+                .addTo(quantumForceTransformerRecipes);
             // Naquadria (UMV)
-            CORE.RA.addQuantumTransformerRecipe(
-                new ItemStack[] { naquadriaEarth.get(OrePrefixes.dust, 32), Materials.Magnesium.getDust(64),
-                    GT_Utility.copyAmount(0, GenericChem.mAdvancedNaquadahCatalyst) },
-                new FluidStack[] { Materials.PhosphoricAcid.getFluid(16000), Materials.SulfuricAcid.getFluid(16000),
-                    Materials.Oxygen.getGas(100L) },
-                new FluidStack[] {},
-                new ItemStack[] { inertNaquadria.get(OrePrefixes.dust, 1), Materials.Barium.getDust(64),
-                    Materials.Indium.getDust(64), ItemList.NaquadriaSupersolid.get(1) },
-                new int[] { 2500, 2500, 2500, 2500 },
-                5 * 20,
-                (int) GT_Values.VP[12],
-                3);
+            GT_Values.RA.stdBuilder()
+                .itemInputs(
+                    naquadriaEarth.get(OrePrefixes.dust, 32),
+                    Materials.Magnesium.getDust(64),
+                    GT_Utility.copyAmount(0, GenericChem.mAdvancedNaquadahCatalyst))
+                .itemOutputs(
+                    inertNaquadria.get(OrePrefixes.dust, 1),
+                    Materials.Barium.getDust(64),
+                    Materials.Indium.getDust(64),
+                    ItemList.NaquadriaSupersolid.get(1))
+                .outputChances(2500, 2500, 2500, 2500)
+                .fluidInputs(
+                    Materials.PhosphoricAcid.getFluid(16000),
+                    Materials.SulfuricAcid.getFluid(16000),
+                    Materials.Oxygen.getGas(100L))
+                .duration(5 * SECONDS)
+                .eut(GT_Values.VP[12])
+                .metadata(QFT_FOCUS_TIER, 3)
+                .addTo(quantumForceTransformerRecipes);
+
             // Activate Them
-            MyRecipeAdder.instance.addNeutronActivatorRecipe(
-                new FluidStack[] { Materials.Nickel.getPlasma(144 * 16) },
-                new ItemStack[] { inertNaquadah.get(OrePrefixes.dust, 64), inertNaquadah.get(OrePrefixes.dust, 32) },
-                new FluidStack[] { Materials.Naquadah.getMolten(144 * 9216) },
-                new ItemStack[] { Materials.Nickel.getDust(16) },
-                2000,
-                600,
-                500);
-            MyRecipeAdder.instance.addNeutronActivatorRecipe(
-                new FluidStack[] { Materials.Titanium.getPlasma(16 * 144) },
-                new ItemStack[] { inertEnrichedNaquadah.get(OrePrefixes.dust, 64),
-                    inertEnrichedNaquadah.get(OrePrefixes.dust, 32) },
-                new FluidStack[] { Materials.NaquadahEnriched.getMolten(144 * 9216) },
-                new ItemStack[] { Materials.Titanium.getDust(16) },
-                2000,
-                900,
-                850);
-            MyRecipeAdder.instance.addNeutronActivatorRecipe(
-                new FluidStack[] { Materials.Americium.getPlasma(144 * 16) },
-                new ItemStack[] { inertNaquadria.get(OrePrefixes.dust, 64), inertNaquadria.get(OrePrefixes.dust, 32) },
-                new FluidStack[] { Materials.Naquadria.getMolten(144 * 9216) },
-                new ItemStack[] { Materials.Americium.getDust(16) },
-                2000,
-                1100,
-                1080);
+
+            GT_Values.RA.stdBuilder()
+                .itemInputs(inertNaquadah.get(OrePrefixes.dust, 64), inertNaquadah.get(OrePrefixes.dust, 32))
+                .itemOutputs(Materials.Nickel.getDust(16))
+                .fluidInputs(Materials.Nickel.getPlasma(144 * 16))
+                .fluidOutputs(Materials.Naquadah.getMolten(144 * 9216))
+                .duration(1 * MINUTES + 40 * SECONDS)
+                .eut(0)
+                .metadata(NKE_RANGE, computeRangeNKE(600, 500))
+                .noOptimize()
+                .addTo(neutronActivatorRecipes);
+            GT_Values.RA.stdBuilder()
+                .itemInputs(
+                    inertEnrichedNaquadah.get(OrePrefixes.dust, 64),
+                    inertEnrichedNaquadah.get(OrePrefixes.dust, 32))
+                .itemOutputs(Materials.Titanium.getDust(16))
+                .fluidInputs(Materials.Titanium.getPlasma(16 * 144))
+                .fluidOutputs(Materials.NaquadahEnriched.getMolten(144 * 9216))
+                .duration(1 * MINUTES + 40 * SECONDS)
+                .eut(0)
+                .metadata(NKE_RANGE, computeRangeNKE(900, 850))
+                .noOptimize()
+                .addTo(neutronActivatorRecipes);
+            GT_Values.RA.stdBuilder()
+                .itemInputs(inertNaquadria.get(OrePrefixes.dust, 64), inertNaquadria.get(OrePrefixes.dust, 32))
+                .itemOutputs(Materials.Americium.getDust(16))
+                .fluidInputs(Materials.Americium.getPlasma(144 * 16))
+                .fluidOutputs(Materials.Naquadria.getMolten(144 * 9216))
+                .duration(1 * MINUTES + 40 * SECONDS)
+                .eut(0)
+                .metadata(NKE_RANGE, computeRangeNKE(1100, 1080))
+                .noOptimize()
+                .addTo(neutronActivatorRecipes);
+
         } catch (Throwable t) {
             // Cry about it
         }
@@ -252,15 +284,18 @@ public class NaquadahReworkRecipeLoader {
             15 * SECONDS,
             TierEU.RECIPE_HV);
 
-        MyRecipeAdder.instance.addNeutronActivatorRecipe(
-            new FluidStack[] { naquadahAdamantiumSolution.getFluidOrGas(3000) },
-            null,
-            new FluidStack[] { naquadahRichSolution.getFluidOrGas(2000) },
-            new ItemStack[] { adamantine.get(OrePrefixes.dust, 4), naquadahEarth.get(OrePrefixes.dust, 2),
-                concentratedEnrichedNaquadahSludge.get(OrePrefixes.dust, 1) },
-            100,
-            230,
-            200);
+        GT_Values.RA.stdBuilder()
+            .itemOutputs(
+                adamantine.get(OrePrefixes.dust, 4),
+                naquadahEarth.get(OrePrefixes.dust, 2),
+                concentratedEnrichedNaquadahSludge.get(OrePrefixes.dust, 1))
+            .fluidInputs(naquadahAdamantiumSolution.getFluidOrGas(3000))
+            .fluidOutputs(naquadahRichSolution.getFluidOrGas(2000))
+            .duration(5 * SECONDS)
+            .eut(0)
+            .metadata(NKE_RANGE, computeRangeNKE(230, 200))
+            .noOptimize()
+            .addTo(neutronActivatorRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 27))
@@ -326,19 +361,21 @@ public class NaquadahReworkRecipeLoader {
             .eut(TierEU.RECIPE_HV)
             .addTo(autoclaveRecipes);
 
-        MyRecipeAdder.instance.addNeutronActivatorRecipe(
-            null,
-            new ItemStack[] { concentratedEnrichedNaquadahSludge.get(OrePrefixes.dust, 16), },
-            null,
-            new ItemStack[] { enrichedNaquadahSulphate.get(OrePrefixes.dust, 64),
-                enrichedNaquadahSulphate.get(OrePrefixes.dust, 64), enrichedNaquadahSulphate.get(OrePrefixes.dust, 37),
+        GT_Values.RA.stdBuilder()
+            .itemInputs(concentratedEnrichedNaquadahSludge.get(OrePrefixes.dust, 16))
+            .itemOutputs(
+                enrichedNaquadahSulphate.get(OrePrefixes.dust, 64),
+                enrichedNaquadahSulphate.get(OrePrefixes.dust, 64),
+                enrichedNaquadahSulphate.get(OrePrefixes.dust, 37),
                 WerkstoffLoader.Sodiumsulfate.get(OrePrefixes.dust, 64),
                 WerkstoffLoader.Sodiumsulfate.get(OrePrefixes.dust, 64),
                 WerkstoffLoader.Sodiumsulfate.get(OrePrefixes.dust, 12),
-                lowQualityNaquadriaSulphate.get(OrePrefixes.dust, 2), },
-            120,
-            480,
-            460);
+                lowQualityNaquadriaSulphate.get(OrePrefixes.dust, 2))
+            .duration(6 * SECONDS)
+            .eut(0)
+            .metadata(NKE_RANGE, computeRangeNKE(480, 460))
+            .noOptimize()
+            .addTo(neutronActivatorRecipes);
 
         // Nq+(SO4)2 + 2Zn = Nq+ + 2ZnSO4
         GT_Values.RA.stdBuilder()
@@ -406,15 +443,16 @@ public class NaquadahReworkRecipeLoader {
             .eut(TierEU.RECIPE_IV)
             .add