Cleanup recipe adder (#530)

* Cleanup recipe adder

* Remove redundant public

* consistent returns

4 files changed, 212 insertions, 1288 deletions

diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 3bf145f0b3..6912d3508e 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -315,24 +315,6 @@ public class RECIPES_GREGTECH {
     }
 
     private static void fusionRecipes() {
-
-        /**
-         * Adds a Fusion reactor Recipe
-         *
-         * @param aInput1                        = first Input (not null, and respects StackSize)
-         * @param aInput2                        = second Input (not null, and respects StackSize)
-         * @param aOutput                        = Output of the Fusion (can be null, and respects StackSize)
-         * @param aFusionDurationInTicks         = How many ticks the Fusion lasts (must be > 0)
-         * @param aFusionEnergyPerTick           = The EU generated per Tick (can even be negative!)
-         * @param aEnergyNeededForStartingFusion = EU needed for heating the Reactor up (must be >= 0)
-         */
-
-        // Hydrogen Plasma
-        /*
-         * CORE.RA.addFusionReactorRecipe( Particle.getIon("Hydrogen", 0), Particle.getIon("Hydrogen", 0),
-         * Materials.Hydrogen.getPlasma(1), 5000, 16, 4096, 40000000);
-         */
-
         // Hypogen Creation
         GT_Values.RA.addFusionReactorRecipe(
                 ELEMENT.STANDALONE.DRAGON_METAL.getFluidStack(144),
@@ -1476,12 +1458,9 @@ public class RECIPES_GREGTECH {
 
         ThermalFuel.addSteamTurbineFuel(FluidUtils.getFluidStack("steam", 1024));
 
-        // CORE.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketRocket_fuel",
-        // 0, 1), null, 112, 0);
         GT_Values.RA.addFuel(ItemUtils.getSimpleStack(Items.lava_bucket), null, 32, 2);
         GT_Values.RA.addFuel(ItemUtils.getIC2Cell(2), null, 32, 2);
         GT_Values.RA.addFuel(ItemUtils.getIC2Cell(11), null, 24, 2);
-        // System.exit(1);
     }
 
     private static void extractorRecipes() {
diff --git a/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java b/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
index 3bd507fb38..d08f98259d 100644
--- a/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
+++ b/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
@@ -1,18 +1,13 @@
 package gtPlusPlus.core.util.reflect;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.enums.GT_Values;
-import gregtech.api.interfaces.internal.IGT_RecipeAdder;
 import gregtech.api.util.GT_Recipe;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.minecraft.FluidUtils;
 
 public final class AddGregtechRecipe {
 
@@ -73,139 +68,8 @@ public final class AddGregtechRecipe {
         int TIME = timeInSeconds * 20;
         int TIMEPYRO = TIME + (TIME / 5);
         // Even though it says coke and pyrolyse, ICO recipes are imported from pyrolyse by #importPyroRecipe
-        PyrolyseOven(input1, inputFluid1, circuitNumber, output1, outputFluid1, TIMEPYRO, euTick);
-
-        return false;
-    }
-
-    public static boolean PyrolyseOven(final ItemStack p0, final FluidStack p1, final int p2, final ItemStack p3,
-            final FluidStack p4, final int p5, final int p6) {
-
-        try {
-            IGT_RecipeAdder IGT_RecipeAdder = GT_Values.RA;
-            if (IGT_RecipeAdder != null) {
-                Class<? extends IGT_RecipeAdder> classRA = IGT_RecipeAdder.getClass();
-                Method addRecipe = classRA.getMethod(
-                        "addPyrolyseRecipe",
-                        ItemStack.class,
-                        FluidStack.class,
-                        int.class,
-                        ItemStack.class,
-                        FluidStack.class,
-                        int.class,
-                        int.class);
-                if (addRecipe != null) {
-                    return (boolean) addRecipe.invoke(IGT_RecipeAdder, p0, p1, p2, p3, p4, p5, p6);
-                }
-            }
-        } catch (SecurityException | NoSuchMethodException | IllegalAccessException | IllegalArgumentException
-                | InvocationTargetException e) {
-            return false;
-        }
-        return false;
-    }
-
-    public static boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs,
-            FluidStack[] aFluidInputs, ItemStack aOutput, int aDuration, int aEUt) {
-        /*
-         * try { IGT_RecipeAdder IGT_RecipeAdder = GT_Values.RA; if (IGT_RecipeAdder != null){ Class<? extends
-         * IGT_RecipeAdder> classRA = IGT_RecipeAdder.getClass(); for(Method current : classRA.getDeclaredMethods()){
-         * //Utils.LOG_INFO("-----------------------------------------------");
-         * ////Utils.LOG_INFO("Found method: "+current.getName()); //Utils.LOG_INFO("With Parameters: ");
-         * //Utils.LOG_INFO("==============================================="); for (Class<?> P :
-         * current.getParameterTypes()){ //Utils.LOG_INFO(""+P.getName()); //Utils.LOG_INFO(""+P.getClass().getName());
-         * } //Utils.LOG_INFO("==============================================="); } try { Method testRA =
-         * GT_Values.RA.getClass().getMethod("addAssemblylineRecipe", GT_Values.RA.getClass(), aResearchItem.getClass(),
-         * int.class, aInputs.getClass(), aFluidInputs.getClass(), aOutput.getClass(), int.class, int.class);
-         * testRA.invoke(aResearchItem, aResearchTime, aInputs, aFluidInputs, aOutput, aDuration, aEUt); } catch
-         * (Throwable masndj){ masndj.printStackTrace(); } Method addRecipe = classRA.getDeclaredMethod(
-         * "addAssemblylineRecipe", ItemStack.class, int.class, ItemStack.class, FluidStack.class, ItemStack.class,
-         * int.class, int.class); if (addRecipe != null){ return (boolean) addRecipe.invoke(aResearchItem,
-         * aResearchTime, aInputs, aFluidInputs, aOutput, aDuration, aEUt); } } } catch (SecurityException |
-         * NoSuchMethodException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-         * Utils.LOG_INFO("[Assembly Line] - Failed to add recipe, due to GT not being .09 branch. Research: "
-         * +aResearchItem.getDisplayName()+" | Result: "+aOutput.getDisplayName()); e.printStackTrace(); return false; }
-         * Utils.LOG_INFO("[Assembly Line] - Failed to add recipe. Research: "+aResearchItem.getDisplayName()
-         * +" | Result: "+aOutput.getDisplayName());
-         */ return false;
-    }
-
-    public static boolean addCircuitAssemblerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput,
-            int aDuration, int aEUt) {
-        try {
-            IGT_RecipeAdder IGT_RecipeAdder = GT_Values.RA;
-            if (IGT_RecipeAdder != null) {
-                Class<? extends IGT_RecipeAdder> classRA = IGT_RecipeAdder.getClass();
-                Method addRecipe = classRA.getMethod(
-                        "addCircuitAssemblerRecipe",
-                        ItemStack.class,
-                        FluidStack.class,
-                        ItemStack.class,
-                        int.class,
-                        int.class);
-                if (addRecipe != null) {
-                    if (aFluidInput.isFluidEqual(FluidUtils.getFluidStack("molten.tin", 1))) {
-                        boolean[] didAdd = new boolean[3];
-                        FluidStack moltenMetal = FluidUtils.getFluidStack("molten.tin", 144);
-                        // Tin
-                        didAdd[0] = (boolean) addRecipe
-                                .invoke(IGT_RecipeAdder, aInputs, moltenMetal, aOutput, aDuration, aEUt);
-                        moltenMetal = FluidUtils.getFluidStack("molten.lead", 144);
-                        // Lead
-                        didAdd[1] = (boolean) addRecipe
-                                .invoke(IGT_RecipeAdder, aInputs, moltenMetal, aOutput, aDuration, aEUt);
-                        moltenMetal = FluidUtils.getFluidStack("molten.solderingalloy", 144 / 2);
-                        // Soldering Alloy
-                        didAdd[2] = (boolean) addRecipe
-                                .invoke(IGT_RecipeAdder, aInputs, moltenMetal, aOutput, aDuration, aEUt);
+        GT_Values.RA.addPyrolyseRecipe(input1, inputFluid1, circuitNumber, output1, outputFluid1, TIMEPYRO, euTick);
 
-                        if (didAdd[0] && didAdd[1] && didAdd[2]) {
-                            return true;
-                        } else {
-                            return false;
-                        }
-                    } else {
-                        return (boolean) addRecipe
-                                .invoke(IGT_RecipeAdder, aInputs, aFluidInput, aOutput, aDuration, aEUt);
-                    }
-                }
-            }
-        } catch (SecurityException | NoSuchMethodException | IllegalAccessException | IllegalArgumentException
-                | InvocationTargetException e) {
-            return false;
-        }
         return false;
     }
-
-    public static boolean addChemicalRecipeForBasicMachineOnly(final ItemStack p0, final ItemStack p1,
-            final FluidStack p2, final FluidStack p3, final ItemStack p4, final ItemStack p5, final int p6,
-            final int p7) {
-
-        try {
-            IGT_RecipeAdder IGT_RecipeAdder = GT_Values.RA;
-            if (IGT_RecipeAdder != null) {
-                Class<? extends IGT_RecipeAdder> classRA = IGT_RecipeAdder.getClass();
-                // final ItemStack p0, final ItemStack p1, final FluidStack p2, final FluidStack p3, final ItemStack
-                // p4, final ItemStack p5, final int p6, final int p7
-                Method addRecipe = classRA.getMethod(
-                        "addChemicalRecipeForBasicMachineOnly",
-                        ItemStack.class,
-                        ItemStack.class,
-                        FluidStack.class,
-                        FluidStack.class,
-                        ItemStack.class,
-                        ItemStack.class,
-                        int.class,
-                        int.class);
-                if (addRecipe != null) {
-                    return (boolean) addRecipe.invoke(IGT_RecipeAdder, p0, p1, p2, p3, p4, p5, p6, p7);
-                }
-            }
-        } catch (SecurityException | NoSuchMethodException | IllegalAccessException | IllegalArgumentException
-                | InvocationTargetException e) {
-
-        }
-
-        return GT_Values.RA.addChemicalRecipe(p0, p1, p2, p3, p4, p6);
-    }
 }
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 094e151fc8..680206596b 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
@@ -6,13 +6,14 @@ import net.minecraftforge.fluids.FluidStack;
 import gregtech.api.enums.Materials;
 import gtPlusPlus.core.material.Material;
 
+@SuppressWarnings("UnusedReturnValue")
 public interface IGregtech_RecipeAdder {
 
     /**
      * Adds a Coke Oven Recipe
      *
      * @param aInput1      = first Input (not null, and respects StackSize)
-     * @param aInputb      = second Input (can be null, and respects StackSize)
+     * @param aInput2      = second Input (can be null, and respects StackSize)
      * @param aFluidOutput = Output of the Creosote (not null, and respects StackSize)
      * @param aFluidInput  = fluid Input (can be null, and respects StackSize)
      * @param aOutput      = Output of the Coal/coke (can be null, and respects StackSize)
@@ -20,19 +21,15 @@ public interface IGregtech_RecipeAdder {
      * @param aEUt         = EU needed for heating up (must be >= 0)
      * @return true if the Recipe got added, otherwise false.
      */
-    // public boolean addCokeOvenRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial,
-    // FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue);
-    public boolean addCokeOvenRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput,
-            FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUt);
+    boolean addCokeOvenRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput,
+            ItemStack aOutput, int aDuration, int aEUt);
 
-    public boolean addCokeOvenRecipe(int aCircuit, ItemStack aInput2, FluidStack[] aFluidInputs,
-            FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int aDuration, int aEUt);
+    boolean addCokeOvenRecipe(int aCircuit, ItemStack aInput2, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs,
+            ItemStack[] aOutputs, int aDuration, int aEUt);
 
-    public boolean addCokeOvenRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack[] aFluidInputs,
+    boolean addCokeOvenRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack[] aFluidInputs,
             FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int aDuration, int aEUt);
 
-    public boolean addFuel(ItemStack aInput1, ItemStack aOutput1, int aEU, int aType);
-
     /**
      * Adds a Matter Fabricator Recipe
      *
@@ -42,43 +39,7 @@ public interface IGregtech_RecipeAdder {
      * @param aEUt         = EU needed for heating up (must be >= 0)
      * @return true if the Recipe got added, otherwise false.
      */
-    public boolean addMatterFabricatorRecipe(FluidStack aFluidInput, FluidStack aFluidOutput, int aDuration, int aEUt);
-
-    /**
-     * Adds a Matter Fabricator Recipe
-     *
-     * @param aItemInput   = ItemStack Input, can be null I assume.
-     * @param aFluidInput  = fluid Input (can be UU_Amp or null, and respects StackSize)
-     * @param aFluidOutput = Output of the UU-Matter (not null, and respects StackSize)
-     * @param aDuration    = Duration (must be >= 0)
-     * @param aEUt         = EU needed for heating up (must be >= 0)
-     * @return true if the Recipe got added, otherwise false.
-     */
-    public boolean addMatterFabricatorRecipe(ItemStack aItemInput, FluidStack aFluidInput, FluidStack aFluidOutput,
-            int aDuration, int aEUt);
-
-    /**
-     * Adds a Recipe for the Dehydrator. (up to 9 Outputs)
-     *
-     * @param aInput       = Input itemstack (not null, and respects StackSize)
-     * @param aFluidInput  = fluid Input (can be UU_Amp or null, and respects StackSize)
-     * @param aOutputItems = Itemstack[] (not null, and respects StackSize)
-     * @param aDuration    = Duration (must be >= 0)
-     * @param aEUt         = EU needed for heating up (must be >= 0)
-     * @return true if the Recipe got added, otherwise false.
-     */
-
-    // public boolean addDehydratorRecipe(ItemStack aInput, FluidStack aFluid, ItemStack[] aOutputItems, int aDuration,
-    // int aEUt);
-    /*
-     * public boolean addDehydratorRecipe(FluidStack aFluid, FluidStack aOutputFluid, ItemStack[] aOutputItems, int
-     * aDuration, int aEUt);
-     */
-    /*
-     * public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, ItemStack[] aOutputItems, int aDuration,
-     * int aEUt); public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, FluidStack aFluid, ItemStack[]
-     * aOutputItems, FluidStack aOutputFluid, int aDuration, int aEUt);
-     */
+    boolean addMatterFabricatorRecipe(FluidStack aFluidInput, FluidStack aFluidOutput, int aDuration, int aEUt);
 
     /**
      * Adds a Recipe for the Dehydrator. (up to 9 Outputs)
@@ -92,68 +53,68 @@ public interface IGregtech_RecipeAdder {
      * @param aEUt         = EU needed for heating up (must be >= 0)
      * @return true if the Recipe got added, otherwise false.
      */
-    public boolean addDehydratorRecipe(ItemStack[] aInput, FluidStack aFluidInput, FluidStack aFluidOutput,
+    boolean addDehydratorRecipe(ItemStack[] aInput, FluidStack aFluidInput, FluidStack aFluidOutput,
             ItemStack[] aOutputItems, int[] aChances, int aDuration, int aEUt);
 
     /**
      * Adds a Recipe for the Alloy Blast Smelter. (up to 9 Inputs)
      *
-     * @param aInput       = ItemStack[] (not null, and respects StackSize)
-     * @param aFluidOutput = Output of the Molten Metal (not null, and respects StackSize)
-     * @param aChances     = Output Chance (can be == 0)
-     * @param aDuration    = Duration (must be >= 0)
-     * @param aEUt         = EU per tick needed for heating up (must be >= 0)
+     * @param aInput    = ItemStack[] (not null, and respects StackSize)
+     * @param aOutput   = Output of the Molten Metal (not null, and respects StackSize)
+     * @param aChance   = Output Chance (can be == 0)
+     * @param aDuration = Duration (must be >= 0)
+     * @param aEUt      = EU per tick needed for heating up (must be >= 0)
      * @return true if the Recipe got added, otherwise false.
      */
-    public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aOutput, int aChance, int aDuration, int aEUt);
+    boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aOutput, int aChance, int aDuration, int aEUt);
 
     /**
      * Adds a Recipe for the Alloy Blast Smelter. (up to 9 Inputs)
      *
-     * @param aInput       = ItemStack[] (not null, and respects StackSize)
-     * @param aFluidInput  = Input of a fluid (can be null, and respects StackSize)
-     * @param aFluidOutput = Output of the Molten Metal (not null, and respects StackSize)
-     * @param aChances     = Output Chance (can be == 0)
-     * @param aDuration    = Duration (must be >= 0)
-     * @param aEUt         = EU per tick needed for heating up (must be >= 0)
+     * @param aInput      = ItemStack[] (not null, and respects StackSize)
+     * @param aInputFluid = Input of a fluid (can be null, and respects StackSize)
+     * @param aOutput     = Output of the Molten Metal (not null, and respects StackSize)
+     * @param aChance     = Output Chance (can be == 0)
+     * @param aDuration   = Duration (must be >= 0)
+     * @param aEUt        = EU per tick needed for heating up (must be >= 0)
      * @return true if the Recipe got added, otherwise false.
      */
-    public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput, int aChance,
+    boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput, int aChance,
             int aDuration, int aEUt);
 
     /**
      * Adds a Recipe for the Alloy Blast Smelter. (up to 9 Inputs, More than 1 Fluids)
      *
-     * @param aInput       = ItemStack[] (not null, and respects StackSize)
-     * @param aFluidInput  = FluidStack[] (can be null, and respects StackSize)
-     * @param aFluidOutput = Output of the Molten Metal (not null, and respects StackSize)
-     * @param aChances     = Output Chance (can be == 0)
-     * @param aDuration    = Duration (must be >= 0)
-     * @param aEUt         = EU per tick needed for heating up (must be >= 0)
+     * @param aInput      = ItemStack[] (not null, and respects StackSize)
+     * @param aInputFluid = FluidStack[] (can be null, and respects StackSize)
+     * @param aOutput     = Output of the Molten Metal (not null, and respects StackSize)
+     * @param aChance     = Output Chance (can be == 0)
+     * @param aDuration   = Duration (must be >= 0)
+     * @param aEUt        = EU per tick needed for heating up (must be >= 0)
      * @return true if the Recipe got added, otherwise false.
      */
-    public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput, int aChance,
+    boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput, int aChance,
             int aDuration, int aEUt);
 
     /**
      * Adds a Recipe for the Alloy Blast Smelter. (up to 9 Inputs)
      *
      * @param aInput       = ItemStack[] (not null, and respects StackSize)
-     * @param aFluidInput  = Input of a fluid (can be null, and respects StackSize)
-     * @param aFluidOutput = Output of the Molten Metal (not null, and respects StackSize)
+     * @param aInputFluid  = Input of a fluid (can be null, and respects StackSize)
+     * @param aOutput      = Output of the Molten Metal (not null, and respects StackSize)
      * @param aOutputStack = Item Output (Can be null)
-     * @param aChances     = Output Chance (can be == 0)
+     * @param aChance      = Output Chance (can be == 0)
      * @param aDuration    = Duration (must be >= 0)
      * @param aEUt         = EU per tick needed for heating up (must be >= 0)
      * @return true if the Recipe got added, otherwise false.
      */
-    public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput,
+    boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput,
             ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt);
 
-    public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput, int aChance,
+    boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput, int aChance,
             int aDuration, int aEUt, int aSpecialValue);
 
-    public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput,
+    boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput,
             ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue,
             boolean aOptimizeRecipe);
 
@@ -161,21 +122,21 @@ public interface IGregtech_RecipeAdder {
      * Adds a Recipe for the Alloy Blast Smelter. (up to 9 Inputs, More than 1 fluids)
      *
      * @param aInput       = ItemStack[] (not null, and respects StackSize)
-     * @param aFluidInput  = FluidStack[] (can be null, and respects StackSize)
-     * @param aFluidOutput = Output of the Molten Metal (not null, and respects StackSize)
+     * @param aInputFluid  = FluidStack[] (can be null, and respects StackSize)
+     * @param aOutput      = Output of the Molten Metal (not null, and respects StackSize)
      * @param aOutputStack = Item Output (Can be null)
-     * @param aChances     = Output Chance (can be == 0)
+     * @param aChance      = Output Chance (can be == 0)
      * @param aDuration    = Duration (must be >= 0)
      * @param aEUt         = EU per tick needed for heating up (must be >= 0)
      * @return true if the Recipe got added, otherwise false.
      */
-    public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput,
+    boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput,
             ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt);
 
-    public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput, int aChance,
+    boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput, int aChance,
             int aDuration, int aEUt, int aSpecialValue);
 
-    public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput,
+    boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput,
             ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue,
             boolean aOptimizeRecipe);
 
@@ -183,16 +144,16 @@ public interface IGregtech_RecipeAdder {
      * Adds a Recipe for the LFTRr. (up to 9 Inputs)
      *
      * @param aInput        = ItemStack[] (not null, and respects StackSize)
-     * @param aFluidInput   = Input of a fluid (can be null, and respects StackSize)
-     * @param aFluidOutput  = Output of the Molten Salts (not null, and respects StackSize)
+     * @param aInputFluid   = Input of a fluid (can be null, and respects StackSize)
+     * @param aOutput       = Output of the Molten Salts (not null, and respects StackSize)
      * @param aOutputStack  = Item Output (Can be null)
-     * @param aChances      = Output Chance (can be == 0)
+     * @param aChance       = Output Chance (can be == 0)
      * @param aDuration     = Duration (must be >= 0)
      * @param aEUt          = EU per tick needed for heating up (must be >= 0)
      * @param aSpecialValue = Power produced in EU/t per dynamo
      * @return true if the Recipe got added, otherwise false.
      */
-    public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput,
+    boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput,
             ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue);
 
     /**
@@ -200,32 +161,25 @@ public interface IGregtech_RecipeAdder {
      *
      *
      **/
-    public boolean addQuantumTransformerRecipe(ItemStack[] aInput, FluidStack[] aFluidInput, FluidStack[] aFluidOutput,
+    boolean addQuantumTransformerRecipe(ItemStack[] aInput, FluidStack[] aFluidInput, FluidStack[] aFluidOutput,
             ItemStack[] aOutputStack, int[] aChances, int aDuration, int aEUt, int aSpecialValue);
 
     /**
      * Adds a Recipe for the LFTRr. (up to 9 Inputs, More than 1 fluids)
      *
      * @param aInput        = ItemStack[] (not null, and respects StackSize)
-     * @param aFluidInput   = FluidStack[] (can be null, and respects StackSize)
-     * @param aFluidOutput  = Output of the Molten Salts (not null, and respects StackSize)
+     * @param aInputFluid   = FluidStack[] (can be null, and respects StackSize)
+     * @param aOutput       = Output of the Molten Salts (not null, and respects StackSize)
      * @param aOutputStack  = Item Output (Can be null)
-     * @param aChances      = Output Chance (can be == 0)
+     * @param aChance       = Output Chance (can be == 0)
      * @param aDuration     = Duration (must be >= 0)
      * @param aEUt          = EU per tick needed for heating up (must be >= 0)
      * @param aSpecialValue = Power produced in EU/t per dynamo
      * @return true if the Recipe got added, otherwise false.
      */
-    public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput,
+    boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput,
             ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue);
 
-    public boolean addLFTRRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt);
-
-    public boolean addLFTRRecipe(ItemStack aInput1, FluidStack aInput2, ItemStack aOutput1, FluidStack aOutput2,
-            int aDuration, int aEUt);
-
-    public boolean addLFTRRecipe(FluidStack aInput1, FluidStack aInput2, FluidStack aOutput1, int aDuration, int aEUt);
-
     /**
      * Adds a custom Semifluid fuel for the GT++ SemiFluid Generators.
      * 
@@ -233,7 +187,7 @@ public interface IGregtech_RecipeAdder {
      * @param aFuelValue - Fuel value in thousands (1 = 1000)
      * @return - Was the Fuel added?
      */
-    public boolean addSemifluidFuel(FluidStack aFuelItem, int aFuelValue);
+    boolean addSemifluidFuel(FluidStack aFuelItem, int aFuelValue);
 
     /**
      * Adds a custom Semifluid fuel for the GT++ SemiFluid Generators.
@@ -242,23 +196,23 @@ public interface IGregtech_RecipeAdder {
      * @param aFuelValue - Fuel value in thousands (1 = 1000)
      * @return - Was the Fuel added?
      */
-    public boolean addSemifluidFuel(ItemStack aFuelItem, int aFuelValue);
+    boolean addSemifluidFuel(ItemStack aFuelItem, int aFuelValue);
 
-    public boolean addFissionFuel(FluidStack aInput1, FluidStack aInput2, FluidStack aInput3, FluidStack aInput4,
+    boolean addFissionFuel(FluidStack aInput1, FluidStack aInput2, FluidStack aInput3, FluidStack aInput4,
             FluidStack aInput5, FluidStack aInput6, FluidStack aInput7, FluidStack aInput8, FluidStack aInput9,
             FluidStack aOutput1, FluidStack aOutput2, int aDuration, int aEUt);
 
-    public boolean addFissionFuel(boolean aOptimise, FluidStack aInput1, FluidStack aInput2, FluidStack aInput3,
+    boolean addFissionFuel(boolean aOptimise, FluidStack aInput1, FluidStack aInput2, FluidStack aInput3,
             FluidStack aInput4, FluidStack aInput5, FluidStack aInput6, FluidStack aInput7, FluidStack aInput8,
             FluidStack aInput9, FluidStack aOutput1, FluidStack aOutput2, int aDuration, int aEUt);
 
-    public boolean addCyclotronRecipe(ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs,
-            FluidStack aFluidOutput, int[] aChances, int aDuration, int aEUt, int aSpecialValue);
+    boolean addCyclotronRecipe(ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs, FluidStack aFluidOutput,
+            int[] aChances, int aDuration, int aEUt, int aSpecialValue);
 
     boolean addCyclotronRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack[] aOutput,
             FluidStack aFluidOutput, int[] aChances, int aDuration, int aEUt, int aSpecialValue);
 
-    public boolean addMixerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aInput3, ItemStack aInput4,
+    boolean addMixerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aInput3, ItemStack aInput4,
             FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3,
             ItemStack aOutput4, int aDuration, int aEUt);
 
@@ -272,37 +226,31 @@ 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.
      */
-    public boolean addComponentMakerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput1,
-            int aDuration, int aEUt);
-
-    public boolean addMultiblockCentrifugeRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs,
-            FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUtick, int aSpecial);
-
-    public boolean addMultiblockElectrolyzerRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs,
-            FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUtick, int aSpecial);
+    boolean addComponentMakerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput1, int aDuration,
+            int aEUt);
 
-    public boolean addAdvancedFreezerRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs,
+    boolean addMultiblockCentrifugeRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs,
             ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUtick, int aSpecial);
 
-    public boolean addAssemblerRecipeWithOreDict(Object aInput1, int aAmount1, Object aInput2, int aAmount2,
-            ItemStack aOutput, int a1, int a2);
+    boolean addMultiblockElectrolyzerRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs,
+            ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUtick, int aSpecial);
 
-    public boolean addAssemblerRecipeWithOreDict(Object aInput1, int aAmount1, Object aInput2, int aAmount2,
-            FluidStack aInputFluid, ItemStack aOutput, int a1, int a2);
+    boolean addAdvancedFreezerRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs,
+            ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUtick, int aSpecial);
 
-    public boolean addSixSlotAssemblingRecipe(ItemStack[] aInputs, FluidStack aInputFluid, ItemStack aOutput1,
-            int aDuration, int aEUt);
+    boolean addSixSlotAssemblingRecipe(ItemStack[] aInputs, FluidStack aInputFluid, ItemStack aOutput1, int aDuration,
+            int aEUt);
 
     /**
      * Adds an Assemblyline Recipe
      *
      * @param aInputs      must be != null, 4-16 inputs
      * @param aFluidInputs 0-4 fluids
-     * @param aOutput1     must be != null
+     * @param aOutput      must be != null
      * @param aDuration    must be > 0
      * @param aEUt         should be > 0
      */
-    public boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs,
+    boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs,
             FluidStack[] aFluidInputs, ItemStack aOutput, int aDuration, int aEUt);
 
     /**
@@ -314,145 +262,98 @@ public interface IGregtech_RecipeAdder {
     boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, Object[] aInputs,
             FluidStack[] aFluidInputs, ItemStack aOutput1, int aDuration, int aEUt);
 
-    public boolean addChemicalRecipe(ItemStack input1, ItemStack input2, FluidStack inputFluid, FluidStack outputFluid,
+    boolean addChemicalRecipe(ItemStack input1, ItemStack input2, FluidStack inputFluid, FluidStack outputFluid,
             ItemStack output, int time, int eu);
 
-    public boolean addChemicalRecipe(ItemStack input1, ItemStack input2, FluidStack inputFluid, FluidStack outputFluid,
+    boolean addChemicalRecipe(ItemStack input1, ItemStack input2, FluidStack inputFluid, FluidStack outputFluid,
             ItemStack output, Object object, int time, int eu);
 
-    public boolean addChemicalRecipe(ItemStack input1, ItemStack input2, FluidStack inputFluid, FluidStack outputFluid,
+    boolean addChemicalRecipe(ItemStack input1, ItemStack input2, FluidStack inputFluid, FluidStack outputFluid,
             ItemStack output, ItemStack object, int time);
 
-    public boolean addChemicalRecipe(ItemStack input1, ItemStack input2, int aCircuit, FluidStack inputFluid,
+    boolean addChemicalRecipe(ItemStack input1, ItemStack input2, int aCircuit, FluidStack inputFluid,
             FluidStack outputFluid, ItemStack output, ItemStack output2, int time, int eu);
 
-    public boolean addMultiblockChemicalRecipe(ItemStack[] itemStacks, FluidStack[] fluidStacks,
-            FluidStack[] fluidStacks2, ItemStack[] outputs, int time, int eu);
+    boolean addMultiblockChemicalRecipe(ItemStack[] itemStacks, FluidStack[] fluidStacks, FluidStack[] fluidStacks2,
+            ItemStack[] outputs, int time, int eu);
 
-    public boolean addCompressorRecipe(ItemStack aInput1, ItemStack aOutput1, int aDuration, int aEUt);
+    boolean addCompressorRecipe(ItemStack aInput1, ItemStack aOutput1, int aDuration, int aEUt);
 
-    public boolean addBrewingRecipe(ItemStack aIngredient, FluidStack aInput, FluidStack aOutput, int aTime, int aEu,
+    boolean addBrewingRecipe(ItemStack aIngredient, FluidStack aInput, FluidStack aOutput, int aTime, int aEu,
             boolean aHidden);
 
-    public boolean addBrewingRecipe(int aCircuit, FluidStack aInput, FluidStack aOutput, int aTime, int aEu,
-            boolean aHidden);
+    boolean addBrewingRecipe(int aCircuit, FluidStack aInput, FluidStack aOutput, int aTime, int aEu, boolean aHidden);
 
-    public boolean addSmeltingAndAlloySmeltingRecipe(ItemStack aDust, ItemStack aOutput);
+    boolean addSmeltingAndAlloySmeltingRecipe(ItemStack aDust, ItemStack aOutput);
 
-    public boolean addFluidExtractionRecipe(ItemStack input, FluidStack output, int aTime, int aEu);
+    boolean addFluidExtractionRecipe(ItemStack input, FluidStack output, int aTime, int aEu);
 
-    public boolean addFluidExtractionRecipe(ItemStack aContainer, ItemStack aFullContainer, FluidStack rFluidOut,
-            int aTime, int aEu);
+    boolean addFluidExtractionRecipe(ItemStack aContainer, ItemStack aFullContainer, FluidStack rFluidOut, int aTime,
+            int aEu);
 
-    public boolean addFluidCannerRecipe(ItemStack aContainer, ItemStack aFullContainer, FluidStack rFluidIn);
+    boolean addFluidCannerRecipe(ItemStack aContainer, ItemStack aFullContainer, FluidStack rFluidIn);
 
-    public boolean addFluidCannerRecipe(ItemStack aContainer, ItemStack aFullContainer, FluidStack rFluidIn,
+    boolean addFluidCannerRecipe(ItemStack aContainer, ItemStack aFullContainer, FluidStack rFluidIn,
             FluidStack rFluidOut);
 
-    public boolean addFluidCannerRecipe(ItemStack aContainer, ItemStack aFullContainer, FluidStack rFluidIn,
+    boolean addFluidCannerRecipe(ItemStack aContainer, ItemStack aFullContainer, FluidStack rFluidIn,
             FluidStack rFluidOut, int aTime, int aEu);
 
-    /**
-     * Adds a Fusion reactor Recipe
-     *
-     * @param aInput1                = first Input (not null, and respects StackSize)
-     * @param aInput2                = second Input (not null, and respects StackSize)
-     * @param plasma                 = Output of the Fusion (can be null, and respects StackSize)
-     * @param aFusionDurationInTicks = How many ticks the Fusion lasts (must be > 0)
-     * @param aEu                    = The EU generated per Tick (can even be negative!)
-     * @param aSpecial               = EU needed for heating the Reactor up (must be >= 0)
-     */
-    public boolean addFusionReactorRecipe(ItemStack aInputStackA, ItemStack aInputStackB, FluidStack plasma,
-            int aFusionDurationInTicks, int aEu, int aSpecial);
-
-    /**
-     * Adds a Fusion reactor Recipe
-     *
-     * @param aInput1                = first Input (not null, and respects StackSize)
-     * @param aInput2                = second Input (not null, and respects StackSize)
-     * @param plasma                 = Output of the Fusion (can be null, and respects StackSize)
-     * @param aOutputChance          = chance to output plasma (can be 0)
-     * @param aFusionDurationInTicks = How many ticks the Fusion lasts (must be > 0)
-     * @param aEu                    = The EU generated per Tick (can even be negative!)
-     * @param aSpecial               = EU needed for heating the Reactor up (must be >= 0)
-     */
-    public boolean addFusionReactorRecipe(FluidStack aInputStackA, FluidStack aInputStackB, FluidStack plasma,
-            int aOutputChance, int aFusionDurationInTicks, int aEu, int aSpecial);
-
-    /**
-     * Adds a Fusion reactor Recipe
-     *
-     * @param aInput1                = first Input (not null, and respects StackSize)
-     * @param aInput2                = second Input (not null, and respects StackSize)
-     * @param plasma                 = Output of the Fusion (can be null, and respects StackSize)
-     * @param aOutputChance          = chance to output plasma (can be 0)
-     * @param aFusionDurationInTicks = How many ticks the Fusion lasts (must be > 0)
-     * @param aEu                    = The EU generated per Tick (can even be negative!)
-     * @param aSpecial               = EU needed for heating the Reactor up (must be >= 0)
-     */
-    public boolean addFusionReactorRecipe(ItemStack aInputStackA, ItemStack aInputStackB, FluidStack plasma,
-            int aOutputChance, int aFusionDurationInTicks, int aEu, int aSpecial);
-
-    public boolean addVacuumFurnaceRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput,
+    boolean addVacuumFurnaceRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput,
             FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt, int aLevel);
 
-    public boolean addVacuumFurnaceRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, ItemStack[] aOutputs,
+    boolean addVacuumFurnaceRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, ItemStack[] aOutputs,
             FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aLevel);
 
-    public boolean addUvLaserRecipe(ItemStack aInput1, ItemStack aOutput, int time, long eu);
+    boolean addUvLaserRecipe(ItemStack aInput1, ItemStack aOutput, int time, long eu);
 
-    public boolean addIrLaserRecipe(ItemStack aInput1, ItemStack aOutput, int time, long eu);
-
-    public boolean addChemicalPlantRecipe(ItemStack[] aInputs, FluidStack[] aInputFluids, ItemStack[] aOutputs,
+    boolean addChemicalPlantRecipe(ItemStack[] aInputs, FluidStack[] aInputFluids, ItemStack[] aOutputs,
             FluidStack[] aFluidOutputs, int time, long eu, int aTier);
 
-    public boolean addChemicalPlantRecipe(ItemStack[] aInputs, FluidStack[] aInputFluids, ItemStack[] aOutputs,
+    boolean addChemicalPlantRecipe(ItemStack[] aInputs, FluidStack[] aInputFluids, ItemStack[] aOutputs,