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, 13 insertions, 12 deletions

diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
index 554fecb6f9..7240d9268e 100644
--- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
+++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
@@ -8,11 +8,12 @@ import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-import gregtech.GT_Mod;
+import gregtech.api.enums.FluidState;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
+import gregtech.api.fluid.GT_FluidFactory;
 import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
@@ -23,17 +24,17 @@ public class GT_FuelLoader implements Runnable {
     @Override
     public void run() {
         GT_Log.out.println("GT_Mod: Initializing various Fuels.");
-        ItemList.sBlueVitriol = GT_Mod.gregtechproxy
-            .addFluid("solution.bluevitriol", "Blue Vitriol water solution", null, 1, 295);
-        ItemList.sNickelSulfate = GT_Mod.gregtechproxy
-            .addFluid("solution.nickelsulfate", "Nickel sulfate water solution", null, 1, 295);
-        ItemList.sGreenVitriol = GT_Mod.gregtechproxy
-            .addFluid("solution.greenvitriol", "Green Vitriol water solution", null, 1, 295);
-        ItemList.sIndiumConcentrate = GT_Mod.gregtechproxy
-            .addFluid("indiumconcentrate", "Indium Concentrate", null, 1, 295); // TODO CHECK NEW x3
-        ItemList.sLeadZincSolution = GT_Mod.gregtechproxy
-            .addFluid("leadzincsolution", "Lead-Zinc solution", null, 1, 295);
-        ItemList.sRocketFuel = GT_Mod.gregtechproxy.addFluid("rocket_fuel", "Rocket Fuel", null, 1, 295);
+        ItemList.sBlueVitriol = GT_FluidFactory
+            .of("solution.bluevitriol", "Blue Vitriol water solution", null, FluidState.LIQUID, 295);
+        ItemList.sNickelSulfate = GT_FluidFactory
+            .of("solution.nickelsulfate", "Nickel sulfate water solution", null, FluidState.LIQUID, 295);
+        ItemList.sGreenVitriol = GT_FluidFactory
+            .of("solution.greenvitriol", "Green Vitriol water solution", null, FluidState.LIQUID, 295);
+        ItemList.sIndiumConcentrate = GT_FluidFactory
+            .of("indiumconcentrate", "Indium Concentrate", null, FluidState.LIQUID, 295); // TODO CHECK NEW x3
+        ItemList.sLeadZincSolution = GT_FluidFactory
+            .of("leadzincsolution", "Lead-Zinc solution", null, FluidState.LIQUID, 295);
+        ItemList.sRocketFuel = GT_FluidFactory.of("rocket_fuel", "Rocket Fuel", null, FluidState.LIQUID, 295);
         new GT_Recipe(
             new ItemStack(Items.lava_bucket),
             new ItemStack(Blocks.obsidian),