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, 48 insertions, 45 deletions

diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java
index 0e5a2ae241..44474c65da 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java
@@ -1,5 +1,8 @@
 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.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.item.ItemStack;
@@ -26,15 +29,15 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis
             tOutput,
             Enchantment.smite,
             EnchantmentHelper.getEnchantmentLevel(Enchantment.smite.effectId, tOutput) + 3);
-        GT_Values.RA.addChemicalBathRecipe(
-            GT_Utility.copyAmount(1L, aStack),
-            Materials.HolyWater.getFluid(25L),
-            tOutput,
-            null,
-            null,
-            null,
-            100,
-            2);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GT_Utility.copyAmount(1L, aStack))
+            .itemOutputs(tOutput)
+            .fluidInputs(Materials.HolyWater.getFluid(25L))
+            .noFluidOutputs()
+            .duration(5 * SECONDS)
+            .eut(2)
+            .addTo(sChemicalBathRecipes);
 
         tOutput = GT_Utility.copyAmount(1L, aStack);
         GT_Utility.updateItemStack(tOutput);
@@ -42,15 +45,15 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis
             tOutput,
             Enchantment.fireAspect,
             EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, tOutput) + 3);
-        GT_Values.RA.addChemicalBathRecipe(
-            GT_Utility.copyAmount(1L, aStack),
-            Materials.FierySteel.getFluid(25L),
-            tOutput,
-            null,
-            null,
-            null,
-            100,
-            2);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GT_Utility.copyAmount(1L, aStack))
+            .itemOutputs(tOutput)
+            .fluidInputs(Materials.FierySteel.getFluid(25L))
+            .noFluidOutputs()
+            .duration(5 * SECONDS)
+            .eut(2)
+            .addTo(sChemicalBathRecipes);
 
         tOutput = GT_Utility.copyAmount(1L, aStack);
         GT_Utility.updateItemStack(tOutput);
@@ -58,15 +61,15 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis
             tOutput,
             Enchantment.fireAspect,
             EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, tOutput) + 1);
-        GT_Values.RA.addChemicalBathRecipe(
-            GT_Utility.copyAmount(1L, aStack),
-            Materials.Blaze.getMolten(18L),
-            tOutput,
-            null,
-            null,
-            null,
-            100,
-            2);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GT_Utility.copyAmount(1L, aStack))
+            .itemOutputs(tOutput)
+            .fluidInputs(Materials.Blaze.getMolten(18L))
+            .noFluidOutputs()
+            .duration(5 * SECONDS)
+            .eut(2)
+            .addTo(sChemicalBathRecipes);
 
         tOutput = GT_Utility.copyAmount(1L, aStack);
         GT_Utility.updateItemStack(tOutput);
@@ -74,15 +77,15 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis
             tOutput,
             Enchantment.knockback,
             EnchantmentHelper.getEnchantmentLevel(Enchantment.knockback.effectId, tOutput) + 1);
-        GT_Values.RA.addChemicalBathRecipe(
-            GT_Utility.copyAmount(1L, aStack),
-            Materials.Rubber.getMolten(18L),
-            tOutput,
-            null,
-            null,
-            null,
-            100,
-            2);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GT_Utility.copyAmount(1L, aStack))
+            .itemOutputs(tOutput)
+            .fluidInputs(Materials.Rubber.getMolten(18L))
+            .noFluidOutputs()
+            .duration(5 * SECONDS)
+            .eut(2)
+            .addTo(sChemicalBathRecipes);
 
         tOutput = GT_Utility.copyAmount(1L, aStack);
         GT_Utility.updateItemStack(tOutput);
@@ -91,15 +94,15 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis
             gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE,
             EnchantmentHelper
                 .getEnchantmentLevel(gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE.effectId, tOutput) + 1);
-        GT_Values.RA.addChemicalBathRecipe(
-            GT_Utility.copyAmount(1L, aStack),
-            Materials.Mercury.getFluid(25L),
-            tOutput,
-            null,
-            null,
-            null,
-            100,
-            2);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GT_Utility.copyAmount(1L, aStack))
+            .itemOutputs(tOutput)
+            .fluidInputs(Materials.Mercury.getFluid(25L))
+            .noFluidOutputs()
+            .duration(5 * SECONDS)
+            .eut(2)
+            .addTo(sChemicalBathRecipes);
 
         if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial)
             && !aMaterial.contains(SubTag.NO_WORKING)) {