Recipes ra2 (#1872)

* Recipes RA2 fixes

* Use \uXXXX for non-ASCII characters

* Misc cleanup (#1888)

* migrate away from addThermalCentrifugeRecipe

* split recipes of GT_Block_Stones_Abstract

* migrate away from addForgeHammerRecipe

* migrate away from addChemicalBathRecipe

* remove "DisableOldChemicalRecipes" and its usage, as it's disabled by default in NH and it increases recipe complexity for nothing

* Remove underground biomes ore classes, as it's not present in NH

* migrate away from addFluidCannerRecipe

* migrate away from addFluidExtractionRecipe

* migrate away from addChemicalRecipe

* migrate away from addMultiblockChemicalRecipe

* deprecate addChemicalRecipeForBasicMachineOnly

* migrate away from addCentrifugeRecipe

* spotlessApply

* fixing wrong merge conflict solving

* Add Tengam materials (#1891)

* Add Tengam materials

* Change new recipes to consume 15/16 Amp

* Remove now redundant `break` statements

* fix comb chances?

* fix centrifuge code not working

---------

Co-authored-by: glowredman <35727266+glowredman@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>

1 files changed, 142 insertions, 90 deletions

diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java
index 4c7b10f7cb..c71069661b 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java
@@ -1,10 +1,14 @@
 package gregtech.loaders.oreprocessing;
 
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+
 import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.TierEU;
 import gregtech.api.interfaces.IOreRecipeRegistrator;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
@@ -20,103 +24,151 @@ public class ProcessingTransforming implements IOreRecipeRegistrator {
     @Override
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
         ItemStack aStack) {
-        if (aPrefix == OrePrefixes.plank) aPrefix = OrePrefixes.plate;
+
+        if (aPrefix == OrePrefixes.plank) {
+            aPrefix = OrePrefixes.plate;
+        }
+
         switch (aMaterial.mName) {
-            case "Wood":
-                GT_Values.RA.addChemicalBathRecipe(
-                    GT_Utility.copyAmount(1L, aStack),
-                    Materials.SeedOil
-                        .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 120L, true)),
-                    GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L),
-                    GT_Values.NI,
-                    GT_Values.NI,
-                    null,
-                    100,
-                    8);
-                GT_Values.RA.addChemicalBathRecipe(
-                    GT_Utility.copyAmount(1L, aStack),
-                    Materials.SeedOilLin
-                        .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)),
-                    GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L),
-                    GT_Values.NI,
-                    GT_Values.NI,
-                    null,
-                    100,
-                    8);
-                GT_Values.RA.addChemicalBathRecipe(
-                    GT_Utility.copyAmount(1L, aStack),
-                    Materials.SeedOilHemp
-                        .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)),
-                    GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L),
-                    GT_Values.NI,
-                    GT_Values.NI,
-                    null,
-                    100,
-                    8);
-                break;
-            case "Iron":
-                GT_Values.RA.addChemicalBathRecipe(
-                    GT_Utility.copyAmount(1L, aStack),
-                    Materials.FierySteel
-                        .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 250L, true)),
-                    GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L),
-                    GT_Values.NI,
-                    GT_Values.NI,
-                    null,
-                    100,
-                    8);
-                GT_Values.RA.addPolarizerRecipe(
-                    GT_Utility.copyAmount(1L, aStack),
-                    GT_OreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L),
-                    (int) Math.max(16L, aPrefix.mMaterialAmount * 128L / 3628800L),
-                    16);
-                break;
-            case "WroughtIron":
-                GT_Values.RA.addChemicalBathRecipe(
-                    GT_Utility.copyAmount(1L, aStack),
-                    Materials.FierySteel
-                        .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 225L, true)),
-                    GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L),
-                    GT_Values.NI,
-                    GT_Values.NI,
-                    null,
-                    100,
-                    8);
-                GT_Values.RA.addPolarizerRecipe(
-                    GT_Utility.copyAmount(1L, aStack),
-                    GT_OreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L),
-                    (int) Math.max(16L, aPrefix.mMaterialAmount * 128L / 3628800L),
-                    16);
-                break;
-            case "Steel":
-                GT_Values.RA.addChemicalBathRecipe(
-                    GT_Utility.copyAmount(1L, aStack),
-                    Materials.FierySteel
-                        .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 200L, true)),
-                    GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L),
-                    GT_Values.NI,
-                    GT_Values.NI,
-                    null,
-                    100,
-                    8);
-                GT_Values.RA.addPolarizerRecipe(
-                    GT_Utility.copyAmount(1L, aStack),
-                    GT_OreDictUnificator.get(aPrefix, Materials.SteelMagnetic, 1L),
-                    (int) Math.max(16L, aPrefix.mMaterialAmount * 128L / 3628800L),
-                    16);
-                break;
-            case "Neodymium":
+            case "Wood" ->
+            // Chemical bath recipes
+            {
+                GT_Values.RA.stdBuilder()
+                    .itemInputs(GT_Utility.copyAmount(1L, aStack))
+                    .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L))
+                    .fluidInputs(
+                        Materials.SeedOil
+                            .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 120L, true)))
+                    .noFluidOutputs()
+                    .duration(5 * SECONDS)
+                    .eut(TierEU.ULV)
+                    .addTo(sChemicalBathRecipes);
+
+                GT_Values.RA.stdBuilder()
+                    .itemInputs(GT_Utility.copyAmount(1L, aStack))
+                    .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L))
+                    .fluidInputs(
+                        Materials.SeedOilLin
+                            .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)))
+                    .noFluidOutputs()
+                    .duration(5 * SECONDS)
+                    .eut(TierEU.ULV)
+                    .addTo(sChemicalBathRecipes);
+
+                GT_Values.RA.stdBuilder()
+                    .itemInputs(GT_Utility.copyAmount(1L, aStack))
+                    .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L))
+                    .fluidInputs(
+                        Materials.SeedOilHemp
+                            .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)))
+                    .noFluidOutputs()
+                    .duration(5 * SECONDS)
+                    .eut(TierEU.ULV)
+                    .addTo(sChemicalBathRecipes);
+
+            }
+            case "Iron" -> {
+                // Chemical bath recipes
+                {
+                    GT_Values.RA.stdBuilder()
+                        .itemInputs(GT_Utility.copyAmount(1L, aStack))
+                        .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L))
+                        .fluidInputs(
+                            Materials.FierySteel
+                                .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 250L, true)))
+                        .noFluidOutputs()
+                        .duration(5 * SECONDS)
+                        .eut(TierEU.ULV)
+                        .addTo(sChemicalBathRecipes);
+                }
+
+                // Polarizer recipes
+                {
+                    GT_Values.RA.addPolarizerRecipe(
+                        GT_Utility.copyAmount(1L, aStack),
+                        GT_OreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L),
+                        (int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M),
+                        (int) TierEU.LV / 2);
+                }
+            }
+            case "WroughtIron" -> {
+                // Chemical bath recipes
+                {
+                    GT_Values.RA.stdBuilder()
+                        .itemInputs(GT_Utility.copyAmount(1L, aStack))
+                        .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L))
+                        .fluidInputs(
+                            Materials.FierySteel
+                                .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 225L, true)))
+                        .noFluidOutputs()
+                        .duration(5 * SECONDS)
+                        .eut(TierEU.ULV)
+                        .addTo(sChemicalBathRecipes);
+                }
+
+                // Polarizer recipes
+                {
+                    GT_Values.RA.addPolarizerRecipe(
+                        GT_Utility.copyAmount(1L, aStack),
+                        GT_OreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L),
+                        (int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M),
+                        (int) TierEU.LV / 2);
+                }
+            }
+            case "Steel" -> {
+                // Chemical Bath recipes
+                {
+                    GT_Values.RA.stdBuilder()
+                        .itemInputs(GT_Utility.copyAmount(1L, aStack))
+                        .itemOutputs(GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L))
+                        .fluidInputs(
+                            Materials.FierySteel
+                                .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 200L, true)))
+                        .noFluidOutputs()
+                        .duration(5 * SECONDS)
+                        .eut(TierEU.ULV)
+                        .addTo(sChemicalBathRecipes);
+                }
+
+                // polarizer recipes
+                {
+                    GT_Values.RA.addPolarizerRecipe(
+                        GT_Utility.copyAmount(1L, aStack),
+                        GT_OreDictUnificator.get(aPrefix, Materials.SteelMagnetic, 1L),
+                        (int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M),
+                        (int) TierEU.LV / 2);
+                }
+            }
+            case "Neodymium" ->
+            // Polarizer recipes
+            {
                 GT_Values.RA.addPolarizerRecipe(
                     GT_Utility.copyAmount(1L, aStack),
                     GT_OreDictUnificator.get(aPrefix, Materials.NeodymiumMagnetic, 1L),
-                    (int) Math.max(16L, aPrefix.mMaterialAmount * 128L / 3628800L),
-                    256);
-            case "Samarium":
+                    (int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M),
+                    (int) TierEU.HV / 2);
+            }
+            case "Samarium" ->
+            // Polarizer recipes
+            {
                 GT_Values.RA.addPolarizerRecipe(
                     GT_Utility.copyAmount(1L, aStack),
                     GT_OreDictUnificator.get(aPrefix, Materials.SamariumMagnetic, 1L),
-                    (int) Math.max(16L, aPrefix.mMaterialAmount * 128L / 3628800L),
-                    4096);
+                    (int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M),
+                    (int) TierEU.IV / 2);
+            }
+
+            case "TengamPurified" ->
+            // Polarizer recipes
+            {
+                GT_Values.RA.addPolarizerRecipe(
+                    GT_Utility.copyAmount(1L, aStack),
+                    GT_OreDictUnificator.get(aPrefix, Materials.TengamAttuned, 1L),
+                    (int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GT_Values.M),
+                    (int) TierEU.RECIPE_UHV);
+            }
+
+            default -> { /* NO-OP */ }
         }
     }
 }