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

4 files changed, 29 insertions, 136 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;
     }
 }