Some more RA2 conversions (#752)

* remove deprecated methods

* laser engraving

* fluid utils cleanup

* more deprecations

* biorecipes

* RA2 rocketfuel

* rare earth

* typo

* more rareearth cleanup

* nuclear fuel processing

* Update RecipeLoader_NuclearFuelProcessing.java

---------

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

3 files changed, 29 insertions, 66 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java
index 397f590c12..734832807e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java
@@ -284,6 +284,7 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base {
         }
     }
 
+    @Deprecated
     public static boolean addCentrifgeRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput,
             FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4,
             ItemStack aOutput5, ItemStack aOutput6, int[] aChances, int aDuration, int aEUt) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
index d366bb0106..1ed259a3e5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
@@ -106,7 +106,7 @@ public class RecipeLoader_Nuclear {
                         ELEMENT.getInstance().URANIUM233.getSmallDust(1),
                         GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Uranium235, 1L),
                         GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium, 1L))
-                .outputChances(10000, 10000, 1000, 1000, 1000, 500).noFluidInputs()
+                .outputChances(10000, 10000, 1000, 1000, 1000, 500)
                 .fluidOutputs(FluidUtils.getFluidStack("krypton", 60)).duration(4 * MINUTES + 10 * SECONDS)
                 .eut(TierEU.RECIPE_IV).addTo(sCentrifugeRecipes);
         // Mox
@@ -121,9 +121,8 @@ public class RecipeLoader_Nuclear {
                         GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium, 1L),
                         ELEMENT.getInstance().PLUTONIUM238.getTinyDust(1),
                         GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium, 1L))
-                .outputChances(10000, 10000, 500, 500, 500, 500).noFluidInputs()
-                .fluidOutputs(FluidUtils.getFluidStack("krypton", 90)).duration(6 * MINUTES + 15 * SECONDS)
-                .eut(TierEU.RECIPE_IV).addTo(sCentrifugeRecipes);
+                .outputChances(10000, 10000, 500, 500, 500, 500).fluidOutputs(FluidUtils.getFluidStack("krypton", 90))
+                .duration(6 * MINUTES + 15 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sCentrifugeRecipes);
         // Thorium
         GT_Values.RA.stdBuilder().itemInputs(ItemList.Depleted_Thorium_1.get(8), GT_Utility.getIntegratedCircuit(20))
                 .itemOutputs(
@@ -133,7 +132,7 @@ public class RecipeLoader_Nuclear {
                         GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lutetium, 1L),
                         ELEMENT.getInstance().POLONIUM.getSmallDust(1),
                         ELEMENT.getInstance().THALLIUM.getTinyDust(1))
-                .outputChances(10000, 10000, 5000, 5000, 5000, 2500).noFluidInputs()
+                .outputChances(10000, 10000, 5000, 5000, 5000, 2500)
                 .fluidOutputs(FluidUtils.getFluidStack("krypton", 30)).duration(2 * MINUTES + 5 * SECONDS)
                 .eut(TierEU.RECIPE_IV).addTo(sCentrifugeRecipes);
     }
@@ -482,8 +481,7 @@ public class RecipeLoader_Nuclear {
 
     private static void fusionChainRecipes() {
         // Mk1
-        GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs()
-                .fluidInputs(Materials.Boron.getPlasma(144), Materials.Calcium.getPlasma(16))
+        GT_Values.RA.stdBuilder().fluidInputs(Materials.Boron.getPlasma(144), Materials.Calcium.getPlasma(16))
                 .fluidOutputs(new FluidStack(ELEMENT.getInstance().NEON.getPlasma(), 1000))
                 .duration(3 * SECONDS + 4 * TICKS).eut(TierEU.RECIPE_LuV).metadata(FUSION_THRESHOLD, 100000000)
                 .addTo(sFusionRecipes);
@@ -497,8 +495,7 @@ public class RecipeLoader_Nuclear {
                 .addTo(sFusionRecipes);
 
         // Mk2
-        GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs()
-                .fluidInputs(Materials.Niobium.getPlasma(144), Materials.Zinc.getPlasma(144))
+        GT_Values.RA.stdBuilder().fluidInputs(Materials.Niobium.getPlasma(144), Materials.Zinc.getPlasma(144))
                 .fluidOutputs(new FluidStack(ELEMENT.getInstance().KRYPTON.getPlasma(), 144)).duration(32 * TICKS)
                 .eut(TierEU.RECIPE_ZPM).metadata(FUSION_THRESHOLD, 300000000).addTo(sFusionRecipes);
 
@@ -509,7 +506,7 @@ public class RecipeLoader_Nuclear {
                 .fluidOutputs(new FluidStack(ELEMENT.STANDALONE.ASTRAL_TITANIUM.getPlasma(), 1000)).duration(32 * TICKS)
                 .eut(TierEU.RECIPE_ZPM).metadata(FUSION_THRESHOLD, 300000000).addTo(sFusionRecipes);
 
-        GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs()
+        GT_Values.RA.stdBuilder()
                 .fluidInputs(
                         new FluidStack(ELEMENT.STANDALONE.ASTRAL_TITANIUM.getPlasma(), 144),
                         new FluidStack(ALLOY.TITANSTEEL.getFluid(), 8))
@@ -517,19 +514,19 @@ public class RecipeLoader_Nuclear {
                 .eut(TierEU.RECIPE_ZPM).metadata(FUSION_THRESHOLD, 300000000).addTo(sFusionRecipes);
 
         // Mk3
-        GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs()
+        GT_Values.RA.stdBuilder()
                 .fluidInputs(ELEMENT.getInstance().CURIUM.getFluidStack(144), Materials.Americium.getPlasma(144))
                 .fluidOutputs(new FluidStack(ELEMENT.getInstance().XENON.getPlasma(), 144)).duration(16 * TICKS)
                 .eut(TierEU.RECIPE_UV).metadata(FUSION_THRESHOLD, 500000000).addTo(sFusionRecipes);
 
-        GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs()
+        GT_Values.RA.stdBuilder()
                 .fluidInputs(
                         new FluidStack(ELEMENT.getInstance().XENON.getPlasma(), 144),
                         new FluidStack(ELEMENT.STANDALONE.RUNITE.getPlasma(), 1000))
                 .fluidOutputs(new FluidStack(ELEMENT.STANDALONE.ADVANCED_NITINOL.getPlasma(), 1000))
                 .duration(16 * TICKS).eut(TierEU.RECIPE_UV).metadata(FUSION_THRESHOLD, 500000000).addTo(sFusionRecipes);
 
-        GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs()
+        GT_Values.RA.stdBuilder()
                 .fluidInputs(
                         new FluidStack(ELEMENT.STANDALONE.ADVANCED_NITINOL.getPlasma(), 144),
                         Materials.Tartarite.getMolten(2))
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java
index ae3bcbe32e..14faa3a438 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java
@@ -1,9 +1,17 @@
 package gtPlusPlus.xmod.gregtech.loaders.recipe;
 
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBlastRecipes;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDistillationRecipes;
+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;
+
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.TierEU;
 import gtPlusPlus.core.item.chemistry.NuclearChem;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.ELEMENT;
@@ -147,15 +155,6 @@ public class RecipeLoader_NuclearFuelProcessing {
                 20 * 60 * 10,
                 MaterialUtils.getVoltageForTier(3));
 
-        // Reactor Core step 0 - Process Burnt Salt
-        // Tier 1 Fuel - Gives back FLIBE and breeds U233
-        /*
-         * CORE.RA.addReactorProcessingUnitRecipe( CI.getNumberedAdvancedCircuit(1), CI.emptyCells(2), new
-         * FluidStack(NuclearChem.Burnt_LiFBeF2ZrF4U235, 4000), new ItemStack[] { FLUORIDES.LITHIUM_FLUORIDE.getCell(1),
-         * ELEMENT.getInstance().URANIUM233.getCell(1) }, new int[] {10000, 10000}, NUCLIDE.LiFBeF2.getFluidStack(2000),
-         * 20 * 60 * 60, MaterialUtils.getVoltageForTier(3));
-         */
-
         // LiBeF2UF4FP + F2 = LiFBeF2 & UF6F2FP
         // Reactor Core step 1 - Process Burnt Salt
         CORE.RA.addReactorProcessingUnitRecipe(
@@ -195,24 +194,19 @@ public class RecipeLoader_NuclearFuelProcessing {
                 MaterialUtils.getVoltageForTier(4));
 
         // Reactor Core step 2B - Distillation
-        GT_Values.RA.addDistillationTowerRecipe(
-                FluidUtils.getFluidStack(NuclearChem.Impure_LiFBeF2, 1000),
-                new FluidStack[] { NUCLIDE.LiFBeF2.getFluidStack(250) },
-                null,
-                450 * 20,
-                MaterialUtils.getVoltageForTier(5));
+        GT_Values.RA.stdBuilder().fluidInputs(FluidUtils.getFluidStack(NuclearChem.Impure_LiFBeF2, 1000))
+                .fluidOutputs(NUCLIDE.LiFBeF2.getFluidStack(250)).duration(7 * MINUTES + 30 * SECONDS)
+                .eut(TierEU.RECIPE_IV).addTo(sDistillationRecipes);
 
         // UF6 -> UF4 reduction
         // UF6 + LiFBeF2 + H2 -> LiFBeF2UF4 + HF
-        CORE.RA.addBlastRecipe(
-                new ItemStack[] { FLUORIDES.URANIUM_HEXAFLUORIDE.getCell(1), NUCLIDE.LiFBeF2.getCell(1) },
-                new FluidStack[] { ELEMENT.getInstance().HYDROGEN.getFluidStack(2000) },
-                new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2) },
-                new FluidStack[] { NUCLIDE.LiFBeF2UF4.getFluidStack(3000) },
-                300 * 10,
-                MaterialUtils.getVoltageForTier(5),
-                5400);
-        // Alternative recipe to the above, for chemplant, to not use cells
+        GT_Values.RA.stdBuilder().itemInputs(FLUORIDES.URANIUM_HEXAFLUORIDE.getCell(1), NUCLIDE.LiFBeF2.getCell(1))
+                .fluidInputs(Materials.Hydrogen.getGas(2000L))
+                .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2))
+                .fluidOutputs(NUCLIDE.LiFBeF2UF4.getFluidStack(3000)).duration(2 * MINUTES + 30 * SECONDS)
+                .eut(TierEU.RECIPE_IV).metadata(COIL_HEAT, 5400).addTo(sBlastRecipes);
+                // Alternative recipe to the above, for chemplant, to not use cells
+        
         CORE.RA.addChemicalPlantRecipe(
                 new ItemStack[] {},
                 new FluidStack[] { FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(1000),
@@ -224,24 +218,6 @@ public class RecipeLoader_NuclearFuelProcessing {
                 MaterialUtils.getVoltageForTier(5),
                 4);
 
-        // LiFBeF2ZrF4U235 - We can't add both ZrF4 and U235 here, so best we leave this disabled.
-        /*
-         * CORE.RA.addReactorProcessingUnitRecipe( CI.getNumberedAdvancedCircuit(8), NUCLIDE.LiFBeF2UF4.getCell(9),
-         * ELEMENT.getInstance().URANIUM235.getFluidStack(1000), new ItemStack[] { CI.emptyCells(9) }, new int[]
-         * {10000}, NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(10000), 20 * 60 * 5, MaterialUtils.getVoltageForTier(4));
-         */
-
-        // LiFBeF2ZrF4UF4
-        /*
-         * CORE.RA.addReactorProcessingUnitRecipe( CI.getNumberedAdvancedCircuit(9), NUCLIDE.LiFBeF2UF4.getCell(9),
-         * FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(1000), new ItemStack[] { CI.emptyCells(9) }, new int[]
-         * {10000}, NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(10000), 20 * 60 * 5, MaterialUtils.getVoltageForTier(5));
-         * CORE.RA.addReactorProcessingUnitRecipe( CI.getNumberedAdvancedCircuit(9),
-         * FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getCell(1), NUCLIDE.LiFBeF2UF4.getFluidStack(9000), new ItemStack[] {
-         * CI.emptyCells(1) }, new int[] {10000}, NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(10000), 20 * 60 * 5,
-         * MaterialUtils.getVoltageForTier(5));
-         */
-
         CORE.RA.addFissionFuel(
                 FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(100),
                 NUCLIDE.LiFBeF2UF4.getFluidStack(900),
@@ -257,17 +233,6 @@ public class RecipeLoader_NuclearFuelProcessing {
                 20 * 60 * 12, // Duration
                 MaterialUtils.getVoltageForTier(5));
 
-        // LiFBeF2ThF4UF4
-        /*
-         * CORE.RA.addReactorProcessingUnitRecipe( CI.getNumberedAdvancedCircuit(10), NUCLIDE.LiFBeF2UF4.getCell(9),
-         * FLUORIDES.THORIUM_TETRAFLUORIDE.getFluidStack(1000), new ItemStack[] { CI.emptyCells(9) }, new int[] {10000},
-         * NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(10000), 20 * 60 * 5, MaterialUtils.getVoltageForTier(5));
-         * CORE.RA.addReactorProcessingUnitRecipe( CI.getNumberedAdvancedCircuit(10),
-         * FLUORIDES.THORIUM_TETRAFLUORIDE.getCell(1), NUCLIDE.LiFBeF2UF4.getFluidStack(9000), new ItemStack[] {
-         * CI.emptyCells(1) }, new int[] {10000}, NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(10000), 20 * 60 * 5,
-         * MaterialUtils.getVoltageForTier(5));
-         */
-
         CORE.RA.addFissionFuel(
                 FLUORIDES.THORIUM_TETRAFLUORIDE.getFluidStack(100),
                 NUCLIDE.LiFBeF2UF4.getFluidStack(900),