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, 85 insertions, 56 deletions

diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java
index 097a637f0e..1340ca18a9 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java
@@ -1,5 +1,11 @@
 package gregtech.loaders.oreprocessing;
 
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBenderRecipes;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sPressRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+
 import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.GT_Values;
@@ -21,67 +27,90 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr
         ItemStack aStack) {
         switch (aOreDictName) {
             case "foodCheese" -> {
-                GT_Values.RA.addSlicerRecipe(
-                    aStack,
-                    ItemList.Shape_Slicer_Flat.get(0L),
-                    ItemList.Food_Sliced_Cheese.get(4L),
-                    64,
-                    4);
+                registerSlicerRecipes(aStack);
                 GT_OreDictUnificator.addItemData(aStack, new gregtech.api.objects.ItemData(Materials.Cheese, 3628800L));
             }
             case "foodDough" -> {
                 GT_ModHandler.removeFurnaceSmelting(aStack);
-                GT_Values.RA
-                    .addBenderRecipe(GT_Utility.copyAmount(1L, aStack), ItemList.Food_Flat_Dough.get(1L), 16, 4);
-                GT_Values.RA.addMixerRecipe(
-                    aStack,
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L),
-                    null,
-                    null,
-                    null,
-                    null,
-                    ItemList.Food_Dough_Sugar.get(2L),
-                    32,
-                    8);
-                GT_Values.RA.addMixerRecipe(
-                    aStack,
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L),
-                    null,
-                    null,
-                    null,
-                    null,
-                    ItemList.Food_Dough_Chocolate.get(2L),
-                    32,
-                    8);
-                GT_Values.RA.addMixerRecipe(
-                    aStack,
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chocolate, 1L),
-                    null,
-                    null,
-                    null,
-                    null,
-                    ItemList.Food_Dough_Chocolate.get(2L),
-                    32,
-                    8);
-                GT_Values.RA.addFormingPressRecipe(
-                    GT_Utility.copyAmount(1L, aStack),
-                    ItemList.Shape_Mold_Bun.get(0L),
-                    ItemList.Food_Raw_Bun.get(1L),
-                    128,
-                    4);
-                GT_Values.RA.addFormingPressRecipe(
-                    GT_Utility.copyAmount(2L, aStack),
-                    ItemList.Shape_Mold_Bread.get(0L),
-                    ItemList.Food_Raw_Bread.get(1L),
-                    256,
-                    4);
-                GT_Values.RA.addFormingPressRecipe(
-                    GT_Utility.copyAmount(3L, aStack),
-                    ItemList.Shape_Mold_Baguette.get(0L),
-                    ItemList.Food_Raw_Baguette.get(1L),
-                    384,
-                    4);
+                registerBenderRecipes(aStack);
+                registerMixerRecipes(aStack);
+                registerFormingPressRecipes(aStack);
             }
         }
     }
+
+    private void registerSlicerRecipes(ItemStack stack) {
+        GT_Values.RA
+            .addSlicerRecipe(stack, ItemList.Shape_Slicer_Flat.get(0L), ItemList.Food_Sliced_Cheese.get(4L), 64, 4);
+    }
+
+    private void registerBenderRecipes(ItemStack stack) {
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GT_Utility.copyAmount(1L, stack))
+            .itemOutputs(ItemList.Food_Flat_Dough.get(1L))
+            .noFluidInputs()
+            .noFluidOutputs()
+            .duration(16 * TICKS)
+            .eut(4)
+            .addTo(sBenderRecipes);
+    }
+
+    private void registerMixerRecipes(ItemStack stack) {
+        GT_Values.RA.stdBuilder()
+            .itemInputs(stack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L))
+            .itemOutputs(ItemList.Food_Dough_Sugar.get(2L))
+            .noFluidInputs()
+            .noFluidOutputs()
+            .duration(1 * SECONDS + 12 * TICKS)
+            .eut(8)
+            .addTo(sMixerRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(stack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L))
+            .itemOutputs(ItemList.Food_Dough_Chocolate.get(2L))
+            .noFluidInputs()
+            .noFluidOutputs()
+            .duration(1 * SECONDS + 12 * TICKS)
+            .eut(8)
+            .addTo(sMixerRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(stack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chocolate, 1L))
+            .itemOutputs(ItemList.Food_Dough_Chocolate.get(2L))
+            .noFluidInputs()
+            .noFluidOutputs()
+            .duration(1 * SECONDS + 12 * TICKS)
+            .eut(8)
+            .addTo(sMixerRecipes);
+    }
+
+    private void registerFormingPressRecipes(ItemStack stack) {
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GT_Utility.copyAmount(1L, stack), ItemList.Shape_Mold_Bun.get(0L))
+            .itemOutputs(ItemList.Food_Raw_Bun.get(1L))
+            .noFluidInputs()
+            .noFluidOutputs()
+            .duration(6 * SECONDS + 8 * TICKS)
+            .eut(4)
+            .addTo(sPressRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GT_Utility.copyAmount(2L, stack), ItemList.Shape_Mold_Bread.get(0L))
+            .itemOutputs(ItemList.Food_Raw_Bread.get(1L))
+            .noFluidInputs()
+            .noFluidOutputs()
+            .duration(12 * SECONDS + 16 * TICKS)
+            .eut(4)
+            .addTo(sPressRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GT_Utility.copyAmount(3L, stack), ItemList.Shape_Mold_Baguette.get(0L))
+            .itemOutputs(ItemList.Food_Raw_Baguette.get(1L))
+            .noFluidInputs()
+            .noFluidOutputs()
+            .duration(19 * SECONDS + 4 * TICKS)
+            .eut(4)
+            .addTo(sPressRecipes);
+    }
 }