Ra2ify gt++ Part 1 (#739)

* another deprecation

* agrichem ra2

* dehydrator coils

* nuclear chem

* general recipes

* generic chem RA2 and NO,NO2 cleanup

* start with gregtech recipes

* another deprecation

* more gregtech recipes

* dont deprecate ABS yet, was just a mistake

* gregtech recipes

* even more gregtech recipes

* finish assembler recipes

* fuels and fluid extraction

* centrifuge and mixer

* chem recipes

* compression and maceration

* remove duplicate bending

* blast furnace (remove a broken one)

* AL recipes

* distilling

* baseitemingots

* bee recipes and some cleanup

* coke things

* random one

* cryo and pyro

8 files changed, 105 insertions, 250 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
index 64b744aaf8..e8ede0a64f 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
@@ -1,6 +1,9 @@
 package gtPlusPlus.xmod.forestry.bees.custom;
 
 import static gregtech.api.enums.Mods.Forestry;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GT_RecipeBuilder.TICKS;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -13,12 +16,12 @@ import net.minecraftforge.fluids.FluidStack;
 import org.apache.commons.lang3.reflect.FieldUtils;
 
 import gregtech.GT_Mod;
+import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.base.ingots.BaseItemIngot_OLD;
 import gtPlusPlus.core.item.base.misc.BaseItemMisc;
 import gtPlusPlus.core.item.base.misc.BaseItemMisc.MiscTypes;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -88,7 +91,8 @@ public class GTPP_Bees {
     }
 
     private void addExtractorRecipe(ItemStack input, FluidStack output) {
-        CORE.RA.addFluidExtractionRecipe(input, output, 30, 8);
+        GT_Values.RA.stdBuilder().itemInputs(input).noItemOutputs().noFluidInputs().fluidOutputs(output)
+                .duration(1 * SECONDS + 10 * TICKS).eut(8).addTo(sFluidExtractionRecipes);
     }
 
     private static boolean tryGetBeesBoolean() {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
index a7896ab662..f50eb1533c 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
@@ -1,6 +1,9 @@
 package gtPlusPlus.xmod.forestry.bees.custom;
 
 import static gregtech.api.enums.Mods.GTPlusPlus;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GT_RecipeBuilder.TICKS;
 
 import java.util.List;
 
@@ -14,13 +17,11 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.core.Tabs;
-import gregtech.GT_Mod;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class ItemCustomComb extends Item {
@@ -130,134 +131,8 @@ public class ItemCustomComb extends Item {
     }
 
     public void addSpecialCent(ItemStack tComb, ItemStack aOutput, int chance) {
-        GT_Values.RA.addCentrifugeRecipe(
-                tComb,
-                GT_Values.NI,
-                GT_Values.NF,
-                GT_Values.NF,
-                aOutput,
-                ItemList.FR_Wax.get(1, new Object[0]),
-                GT_Values.NI,
-                GT_Values.NI,
-                GT_Values.NI,
-                GT_Values.NI,
-                new int[] { chance * 100, 3000 },
-                128,
-                5);
-        // RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(aOutput, chance * 0.01f,
-        // ItemList.FR_Wax.get(1, new Object[0]), 0.3f));
-    }
-
-    public void addSpecialCent(ItemStack tComb, ItemStack aOutput, int chance, ItemStack aOutput2, int chance2) {
-        GT_Values.RA.addCentrifugeRecipe(
-                tComb,
-                GT_Values.NI,
-                GT_Values.NF,
-                GT_Values.NF,
-                aOutput,
-                ItemList.FR_Wax.get(1, new Object[0]),
-                aOutput2,
-                GT_Values.NI,
-                GT_Values.NI,
-                GT_Values.NI,
-                new int[] { chance * 100, 3000, chance2 * 100 },
-                128,
-                5);
-        // RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(aOutput, chance * 0.01f,
-        // ItemList.FR_Wax.get(1, new Object[0]), 0.3f,aOutput2,chance2 * 0.01f));
-    }
-
-    public void addSpecialCent(ItemStack tComb, ItemStack aOutput, int chance, ItemStack aOutput2, int chance2,
-            ItemStack aOutput3, int chance3) {
-        GT_Values.RA.addCentrifugeRecipe(
-                tComb,
-                GT_Values.NI,
-                GT_Values.NF,
-                GT_Values.NF,
-                aOutput,
-                ItemList.FR_Wax.get(1, new Object[0]),
-                aOutput2,
-                aOutput3,
-                GT_Values.NI,
-                GT_Values.NI,
-                new int[] { chance * 100, 3000, chance2 * 100, chance3 * 100 },
-                128,
-                5);
-        // RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(aOutput, chance * 0.01f,
-        // ItemList.FR_Wax.get(1, new Object[0]), 0.3f,aOutput2,chance2 * 0.01f,aOutput3,chance3*0.01f));
-    }
-
-    public void addProcess(ItemStack tComb, Materials aMaterial, int chance) {
-        if (GT_Mod.gregtechproxy.mNerfedCombs) {
-            GT_Values.RA.addChemicalRecipe(
-                    GT_Utility.copyAmount(9, tComb),
-                    GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1),
-                    Materials.Water.getFluid(1000),
-                    aMaterial.mOreByProducts.isEmpty() ? null : aMaterial.mOreByProducts.get(0).getMolten(144),
-                    GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4),
-                    96);
-            GT_Values.RA.addAutoclaveRecipe(
-                    GT_Utility.copyAmount(16, tComb),
-                    Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass() + 9) / 10))),
-                    GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1),
-                    10000,
-                    (int) (aMaterial.getMass() * 128),
-                    384);
-        } else {
-            GT_Values.RA.addCentrifugeRecipe(
-                    tComb,
-                    GT_Values.NI,
-                    GT_Values.NF,
-                    GT_Values.NF,
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1),
-                    ItemList.FR_Wax.get(1, new Object[0]),
-                    GT_Values.NI,
-                    GT_Values.NI,
-                    GT_Values.NI,
-                    GT_Values.NI,
-                    new int[] { chance * 100, 3000 },
-                    128,
-                    5);
-            // RecipeManagers.centrifugeManager.addRecipe(40, tComb,
-            // ImmutableMap.of(GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1), chance * 0.01f,
-            // ItemList.FR_Wax.get(1, new Object[0]), 0.3f));
-        }
-    }
-
-    public void addProcess(ItemStack tComb, Materials aInMaterial, Materials aOutMaterial, int chance) {
-        if (GT_Mod.gregtechproxy.mNerfedCombs) {
-            GT_Values.RA.addChemicalRecipe(
-                    GT_Utility.copyAmount(9, tComb),
-                    GT_OreDictUnificator.get(OrePrefixes.crushed, aInMaterial, 1),
-                    Materials.Water.getFluid(1000),
-                    aInMaterial.mOreByProducts.isEmpty() ? null : aInMaterial.mOreByProducts.get(0).getMolten(144),
-                    GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aOutMaterial, 4),
-                    96);
-            GT_Values.RA.addAutoclaveRecipe(
-                    GT_Utility.copyAmount(16, tComb),
-                    Materials.UUMatter.getFluid(Math.max(1, ((aOutMaterial.getMass() + 9) / 10))),
-                    GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aOutMaterial, 1),
-                    10000,
-                    (int) (aOutMaterial.getMass() * 128),
-                    384);
-        } else {
-            GT_Values.RA.addCentrifugeRecipe(
-                    tComb,
-                    GT_Values.NI,
-                    GT_Values.NF,
-                    GT_Values.NF,
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, aOutMaterial, 1),
-                    ItemList.FR_Wax.get(1, new Object[0]),
-                    GT_Values.NI,
-                    GT_Values.NI,
-                    GT_Values.NI,
-                    GT_Values.NI,
-                    new int[] { chance * 100, 3000 },
-                    128,
-                    5);
-            // RecipeManagers.centrifugeManager.addRecipe(40, tComb,
-            // ImmutableMap.of(GT_OreDictUnificator.get(OrePrefixes.dustTiny, aOutMaterial, 1), chance * 0.01f,
-            // ItemList.FR_Wax.get(1, new Object[0]), 0.3f));
-        }
+        GT_Values.RA.stdBuilder().itemInputs(tComb).itemOutputs(aOutput, ItemList.FR_Wax.get(1))
+                .outputChances(chance * 100, 3000).noFluidInputs().noFluidOutputs().duration(6 * SECONDS + 8 * TICKS)
+                .eut(5).addTo(sCentrifugeRecipes);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java
index f9fef391e8..ddc2033012 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java
@@ -1,6 +1,8 @@
 package gtPlusPlus.xmod.forestry.bees.items.output;
 
 import static gregtech.api.enums.Mods.GTPlusPlus;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.TICKS;
 
 import java.util.List;
 
@@ -112,6 +114,11 @@ public class GTPP_Drop extends Item {
     }
 
     public static boolean addProcess(ItemStack tDrop, FluidStack aOutput, int aDuration, int aEUt) {
-        return GT_Values.RA.addFluidExtractionRecipe(tDrop, null, aOutput, 10000, aDuration, aEUt);
+        if (aOutput == null) {
+            return false;
+        }
+        GT_Values.RA.stdBuilder().itemInputs(tDrop).noItemOutputs().noFluidInputs().fluidOutputs(aOutput)
+                .duration(aDuration * TICKS).eut(aEUt).addTo(sFluidExtractionRecipes);
+        return true;
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java
index d2ce94ce54..8158f08e73 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java
@@ -1,6 +1,8 @@
 package gtPlusPlus.xmod.forestry.bees.items.output;
 
 import static gregtech.api.enums.Mods.GTPlusPlus;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sExtractorRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.TICKS;
 
 import java.util.List;
 
@@ -14,8 +16,8 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.core.Tabs;
+import gregtech.api.enums.GT_Values;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PropolisType;
 import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
 
@@ -91,6 +93,11 @@ public class GTPP_Propolis extends Item {
     }
 
     public static boolean addProcess(ItemStack tDrop, ItemStack aOutput, int aChance, int aDuration, int aEUt) {
-        return CORE.RA.addExtractorRecipe(tDrop, aOutput, aChance, aDuration, aEUt);
+        if (aOutput == null) {
+            return false;
+        }
+        GT_Values.RA.stdBuilder().itemInputs(tDrop).itemOutputs(aOutput).outputChances(aChance).noFluidInputs()
+                .noFluidOutputs().duration(aDuration * TICKS).eut(aEUt).addTo(sExtractorRecipes);
+        return true;
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
index d03bd2bcf2..6754828db2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
@@ -67,7 +67,7 @@ public interface IGregtech_RecipeAdder {
      * @param aEUt      = EU per tick needed for heating up (must be >= 0)
      * @return true if the Recipe got added, otherwise false.
      */
-    @Deprecated
+
     boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aOutput, int aChance, int aDuration, int aEUt);
 
     /**
@@ -81,7 +81,7 @@ public interface IGregtech_RecipeAdder {
      * @param aEUt        = EU per tick needed for heating up (must be >= 0)
      * @return true if the Recipe got added, otherwise false.
      */
-    @Deprecated
+
     boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput, int aChance,
             int aDuration, int aEUt);
 
@@ -96,7 +96,7 @@ public interface IGregtech_RecipeAdder {
      * @param aEUt        = EU per tick needed for heating up (must be >= 0)
      * @return true if the Recipe got added, otherwise false.
      */
-    @Deprecated
+
     boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput, int aChance,
             int aDuration, int aEUt);
 
@@ -112,15 +112,13 @@ public interface IGregtech_RecipeAdder {
      * @param aEUt         = EU per tick needed for heating up (must be >= 0)
      * @return true if the Recipe got added, otherwise false.
      */
-    @Deprecated
+
     boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput,
             ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt);
 
-    @Deprecated
     boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput, int aChance,
             int aDuration, int aEUt, int aSpecialValue);
 
-    @Deprecated
     boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput,
             ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue,
             boolean aOptimizeRecipe);
@@ -137,15 +135,13 @@ public interface IGregtech_RecipeAdder {
      * @param aEUt         = EU per tick needed for heating up (must be >= 0)
      * @return true if the Recipe got added, otherwise false.
      */
-    @Deprecated
+
     boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput,
             ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt);
 
-    @Deprecated
     boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput, int aChance,
             int aDuration, int aEUt, int aSpecialValue);
 
-    @Deprecated
     boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput,
             ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue,
             boolean aOptimizeRecipe);
@@ -163,7 +159,7 @@ public interface IGregtech_RecipeAdder {
      * @param aSpecialValue = Power produced in EU/t per dynamo
      * @return true if the Recipe got added, otherwise false.
      */
-    @Deprecated
+
     boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput,
             ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue);
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
index a74d3b36ba..9fb011810f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
@@ -1,11 +1,15 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+
 import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.TierEU;
 import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
@@ -114,10 +118,14 @@ public class GregtechDehydrator {
         ItemStack spoolT4 = ItemUtils.getItemStackOfAmountFromOreDict("pipeMediumTitanium", 1);
 
         // Make some coils by wrapping wire around a spool.
-        GT_Values.RA.addAssemblerRecipe(coilWire1, spoolT1, coilT1, 8 * 20, 120);
-        GT_Values.RA.addAssemblerRecipe(coilWire2, spoolT2, coilT2, 8 * 20, 240);
-        GT_Values.RA.addAssemblerRecipe(coilWire3, spoolT3, coilT3, 8 * 20, 480);
-        GT_Values.RA.addAssemblerRecipe(coilWire4, spoolT4, coilT4, 8 * 20, 960);
+        GT_Values.RA.stdBuilder().itemInputs(coilWire1, spoolT1).itemOutputs(coilT1).noFluidInputs().noFluidOutputs()
+                .duration(8 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes);
+        GT_Values.RA.stdBuilder().itemInputs(coilWire2, spoolT2).itemOutputs(coilT2).noFluidInputs().noFluidOutputs()
+                .duration(8 * SECONDS).eut(TierEU.RECIPE_HV / 2).addTo(sAssemblerRecipes);
+        GT_Values.RA.stdBuilder().itemInputs(coilWire3, spoolT3).itemOutputs(coilT3).noFluidInputs().noFluidOutputs()
+                .duration(8 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes);
+        GT_Values.RA.stdBuilder().itemInputs(coilWire4, spoolT4).itemOutputs(coilT4).noFluidInputs().noFluidOutputs()
+                .duration(8 * SECONDS).eut(TierEU.RECIPE_EV / 2).addTo(sAssemblerRecipes);
 
         // Add recipes for the Dehydrators.
 
diff --git a/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java b/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java
index 1b8dcf4583..11e9ea1f25 100644
--- a/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java
+++ b/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java
@@ -3,6 +3,10 @@ package gtPlusPlus.xmod.railcraft;
 import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
 import static gregtech.api.enums.Mods.Railcraft;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
 import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc;
 
 import net.minecraft.init.Blocks;
@@ -151,33 +155,22 @@ public class HANDLER_Railcraft {
                     240);
 
             // Fluid Extracting the Charcoals for Wood Tar
-            GT_Values.RA.addFluidExtractionRecipe(
-                    aInputs2[i],
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 1L),
-                    Materials.WoodTar.getFluid(50L),
-                    1000,
-                    30,
-                    16);
+            GT_Values.RA.stdBuilder().itemInputs(aInputs2[i])
+                    .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 1L)).outputChances(1000)
+                    .noFluidInputs().fluidOutputs(Materials.WoodTar.getFluid(50L)).duration(1 * SECONDS + 10 * TICKS)
+                    .eut(16).addTo(sFluidExtractionRecipes);
 
             // Processing the Charcoals with Oxygen to get CO and CO2
             // C + O = CO
-            GT_Values.RA.addChemicalRecipe(
-                    aInputs2[i],
-                    GT_Utility.getIntegratedCircuit(1),
-                    Materials.Oxygen.getGas(500),
-                    Materials.CarbonMonoxide.getGas(500),
-                    Materials.Ash.getDustTiny(1),
-                    80,
-                    8);
+            GT_Values.RA.stdBuilder().itemInputs(aInputs2[i], GT_Utility.getIntegratedCircuit(1))
+                    .itemOutputs(Materials.Ash.getDustTiny(1)).fluidInputs(Materials.Oxygen.getGas(500))
+                    .fluidOutputs(Materials.CarbonMonoxide.getGas(500)).duration(4 * SECONDS).eut(8)
+                    .addTo(UniversalChemical);
             // C + 2O = CO2
-            GT_Values.RA.addChemicalRecipe(
-                    aInputs2[i],
-                    GT_Utility.getIntegratedCircuit(2),
-                    Materials.Oxygen.getGas(2000),
-                    Materials.CarbonDioxide.getGas(1000),
-                    Materials.Ash.getDustTiny(1),
-                    40,
-                    8);
+            GT_Values.RA.stdBuilder().itemInputs(aInputs2[i], GT_Utility.getIntegratedCircuit(2))
+                    .itemOutputs(Materials.Ash.getDustTiny(1)).fluidInputs(Materials.Oxygen.getGas(2000))
+                    .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(2 * SECONDS).eut(8)
+                    .addTo(UniversalChemical);
         }
         if (Railcraft.isModLoaded()) {
             for (int i = 0; i < aOutputs.length; i++) {
diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
index 7f3d4a636b..a19d990252 100644
--- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
+++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
@@ -1,17 +1,21 @@
 package gtPlusPlus.xmod.thermalfoundation.recipe;
 
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sVacuumRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-import cofh.lib.util.helpers.ItemHelper;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
+import gregtech.api.enums.TierEU;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class TF_Gregtech_Recipes {
 
@@ -20,91 +24,52 @@ public class TF_Gregtech_Recipes {
     }
 
     private static void start() {
-        // Get Items to work with
-        final ItemStack dust_Cryotheum = ItemUtils.getItemStackOfAmountFromOreDict("dustCryotheum", 1);
-        final ItemStack dust_Pyrotheum = GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Pyrotheum, 1L);
-        final ItemStack dust_Blizz = ItemUtils.getItemStackOfAmountFromOreDict("dustBlizz", 1);
-        final ItemStack dust_Blizz3 = ItemUtils.getItemStackOfAmountFromOreDict("dustBlizz", 3);
-        final ItemStack rod_Blizz = ItemUtils.getItemStackOfAmountFromOreDict("stickBlizz", 1);
 
         final FluidStack moltenBlaze = getFluidStack("molten.blaze", 1440);
 
         // Gelid Cryotheum
-        GT_Values.RA.addChemicalBathRecipe(
-                (GT_OreDictUnificator.get(OrePrefixes.ore, Materials.Cinnabar, 1L)),
-                getFluidStack("cryotheum", 144),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cinnabar, 3L),
-                GT_Values.NI,
-                GT_Values.NI,
-                null,
-                400,
-                30);
+        GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.ore, Materials.Cinnabar, 1L))
+                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cinnabar, 3L))
+                .fluidInputs(getFluidStack("cryotheum", 144)).noFluidOutputs().duration(20 * SECONDS)
+                .eut(TierEU.RECIPE_LV).addTo(sChemicalBathRecipes);
 
         // Blizz Powder
-        GT_Values.RA.addChemicalBathRecipe(
-                new ItemStack(Items.snowball, 4),
-                moltenBlaze,
-                dust_Blizz,
-                GT_Values.NI,
-                GT_Values.NI,
-                null,
-                400,
-                240);
+        GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.snowball, 4))
+                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blizz, 1L)).fluidInputs(moltenBlaze)
+                .noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_HV / 2).addTo(sChemicalBathRecipes);
 
         // Blizz Rod
-        GT_Values.RA.addVacuumFreezerRecipe(
-                new ItemStack(Items.blaze_rod),
-                rod_Blizz,
-                (int) Math.max((Materials.Blaze.getMass() * 4) * 3L, 1L));
-        GT_ModHandler.addPulverisationRecipe(rod_Blizz, dust_Blizz3, new ItemStack(Items.snowball, 1), 50, false);
-
-        ItemStack dustCoal = ItemUtils.getItemStackOfAmountFromOreDict("dustCoal", 1);
-        ItemStack dustSulfur = ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1);
-        ItemStack dustRedstone = ItemUtils.getItemStackOfAmountFromOreDict("dustRedstone", 1);
-        ItemStack dustBlaze = ItemUtils.getItemStackOfAmountFromOreDict("dustBlaze", 1);
-        ItemStack dustSaltpeter = ItemUtils.getItemStackOfAmountFromOreDict("dustSaltpeter", 1);
-        ItemStack dustSnow = ItemUtils.getItemStackOfAmountFromOreDict("dustSnow", 1);
-        ItemStack dustBlizz = ItemUtils.getItemStackOfAmountFromOreDict("dustBlizz", 1);
-        ItemStack dustNiter = ItemUtils.getItemStackOfAmountFromOreDict("dustNiter", 1);
+        GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.blaze_rod))
+                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Blizz, 1L)).noFluidInputs()
+                .noFluidOutputs().duration(((int) Math.max((Materials.Blaze.getMass() * 4) * 3L, 1L)) * TICKS)
+                .eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes);
 
-        if (ItemUtils.checkForInvalidItems(new ItemStack[] { dustCoal, dustSulfur, dustRedstone, dustBlaze })) {
-            GT_Values.RA.addMixerRecipe(
-                    dustCoal,
-                    dustSulfur,
-                    dustRedstone,
-                    dustBlaze, // Input
-                    null, // F in
-                    null, // F out
-                    ItemHelper.cloneStack(dust_Pyrotheum, 1), // Output
-                    20 * 8,
-                    120);
-        }
+        GT_Values.RA.stdBuilder()
+                .itemInputs(
+                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1L))
+                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Pyrotheum, 1L)).noFluidInputs()
+                .noFluidOutputs().duration(8 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMixerRecipes);
 
-        if (ItemUtils.checkForInvalidItems(new ItemStack[] { dustSaltpeter, dustSnow, dustRedstone, dustBlizz })) {
-            GT_Values.RA.addMixerRecipe(
-                    dustSaltpeter,
-                    dustSnow,
-                    dustRedstone,
-                    dustBlizz, // Input
-                    null, // F in
-                    null, // F out
-                    ItemHelper.cloneStack(dust_Cryotheum, 1), // Output
-                    20 * 8,
-                    120);
-        }
+        GT_Values.RA.stdBuilder()
+                .itemInputs(
+                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Snow, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blizz, 1L))
+                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cryotheum, 1L)).noFluidInputs()
+                .noFluidOutputs().duration(8 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMixerRecipes);
 
-        if (ItemUtils.checkForInvalidItems(new ItemStack[] { dustNiter, dustSnow, dustRedstone, dustBlizz })) {
-            GT_Values.RA.addMixerRecipe(
-                    dustNiter,
-                    dustSnow,
-                    dustRedstone,
-                    dustBlizz, // Input
-                    null, // F in
-                    null, // F out
-                    ItemHelper.cloneStack(dust_Cryotheum, 1), // Output
-                    20 * 8,
-                    120);
-        }
+        GT_Values.RA.stdBuilder()
+                .itemInputs(
+                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Niter, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Snow, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blizz, 1L))
+                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cryotheum, 1L)).noFluidInputs()
+                .noFluidOutputs().duration(8 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMixerRecipes);
     }
 
     private static FluidStack getFluidStack(final String fluidName, final int amount) {