Fix duplicated recipes for ICO (#459)

3 files changed, 2 insertions, 41 deletions

diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 357f316e32..0c0701cb1d 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -27,15 +27,12 @@ import gtPlusPlus.core.util.minecraft.EnchantingUtils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
-import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
 import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import java.util.ArrayList;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.oredict.OreDictionary;
 
 public class RECIPES_GREGTECH {
 
@@ -1171,40 +1168,6 @@ public class RECIPES_GREGTECH {
 
     private static void cokeOvenRecipes() {
         Logger.INFO("Loading Recipes for Industrial Coking Oven.");
-        // Wood to Charcoal
-        // Try use all woods found
-        ArrayList<ItemStack> aLogData = OreDictionary.getOres("logWood");
-        if (aLogData.isEmpty()) {
-            AddGregtechRecipe.addCokeAndPyrolyseRecipes(
-                    GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 20L),
-                    20,
-                    GT_ModHandler.getSteam(1000),
-                    GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 24L),
-                    FluidUtils.getFluidStack("fluid.coalgas", 1440),
-                    60,
-                    30);
-        } else {
-            for (ItemStack stack : aLogData) {
-                AddGregtechRecipe.addCokeAndPyrolyseRecipes(
-                        ItemUtils.getSimpleStack(stack, 20),
-                        20,
-                        GT_ModHandler.getSteam(1000),
-                        GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 24L),
-                        FluidUtils.getFluidStack("fluid.coalgas", 1440),
-                        60,
-                        30);
-            }
-        }
-
-        // Coal to Coke
-        AddGregtechRecipe.addCokeAndPyrolyseRecipes(
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16L),
-                22,
-                GT_ModHandler.getSteam(1000),
-                ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 10),
-                FluidUtils.getFluidStack("fluid.coalgas", 2880),
-                30,
-                120);
 
         // Coke & Coal
         CORE.RA.addCokeOvenRecipe(
diff --git a/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java b/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
index 10b689f044..9aafe15528 100644
--- a/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
+++ b/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
@@ -6,7 +6,6 @@ import gregtech.api.util.GT_Recipe;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import net.minecraft.item.Item;
@@ -79,8 +78,7 @@ public final class AddGregtechRecipe {
         // Seconds Conversion
         int TIME = timeInSeconds * 20;
         int TIMEPYRO = TIME + (TIME / 5);
-        CORE.RA.addCokeOvenRecipe(
-                input1, ItemUtils.getGregtechCircuit(circuitNumber), inputFluid1, outputFluid1, output1, TIME, euTick);
+        // 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;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index 8074527a53..8de060aedf 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -176,7 +176,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
             int aDuration,
             int aEUt) {
         return addCokeOvenRecipe(
-                CI.getNumberedCircuit(aCircuit), aInput2, aFluidInputs, aFluidOutputs, aOutputs, aDuration, aEUt);
+                aInput2, CI.getNumberedCircuit(aCircuit), aFluidInputs, aFluidOutputs, aOutputs, aDuration, aEUt);
     }
 
     @Override