$ Recipes Fixes.

$ Fixed ICO not using Pyro Recipes. Closes #471.

4 files changed, 82 insertions, 17 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 1b2588f469..52a6c4889e 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -2074,9 +2074,9 @@ public class RECIPES_Machines {
         };	    
 	    for (int i = 0;i<10;i++) {
 	        GT_Values.RA.addCutterRecipe(
-	                CI.getNumberedCircuit(18),
-	                CI.getTieredMachineCasing(i),
-	                mMachineCasingCovers[i].get(9),
+	                CI.getTieredMachineCasing(i),	                
+	                mMachineCasingCovers[i].get(5),
+	                null,
 	                20 * 5 * i,
 	                (int) GT_Values.V[i]);
 	    }	    
@@ -2111,11 +2111,11 @@ public class RECIPES_Machines {
 
 	    ItemStack[] mInputHatch = new ItemStack[] {
                 ItemList.Hatch_Input_Bus_EV.get(1),
-                ItemList.Hatch_Input_Bus_EV.get(1),
-                ItemList.Hatch_Input_Bus_EV.get(1),
-                ItemList.Hatch_Input_Bus_EV.get(1),
-                ItemList.Hatch_Input_Bus_EV.get(1),
-                ItemList.Hatch_Input_Bus_EV.get(1),
+                ItemList.Hatch_Input_Bus_IV.get(1),
+                ItemList.Hatch_Input_Bus_LuV.get(1),
+                ItemList.Hatch_Input_Bus_ZPM.get(1),
+                ItemList.Hatch_Input_Bus_UV.get(1),
+                ItemList.Hatch_Input_Bus_MAX.get(1),
                 GregtechItemList.Hatch_SuperBus_Input_ULV.get(1),
                 GregtechItemList.Hatch_SuperBus_Input_LV.get(1),
                 GregtechItemList.Hatch_SuperBus_Input_MV.get(1),
@@ -2124,11 +2124,11 @@ public class RECIPES_Machines {
 
         ItemStack[] mOutputHatch = new ItemStack[] {
                 ItemList.Hatch_Output_Bus_EV.get(1),
-                ItemList.Hatch_Output_Bus_EV.get(1),
-                ItemList.Hatch_Output_Bus_EV.get(1),
-                ItemList.Hatch_Output_Bus_EV.get(1),
-                ItemList.Hatch_Output_Bus_EV.get(1),
-                ItemList.Hatch_Output_Bus_EV.get(1),
+                ItemList.Hatch_Output_Bus_IV.get(1),
+                ItemList.Hatch_Output_Bus_LuV.get(1),
+                ItemList.Hatch_Output_Bus_ZPM.get(1),
+                ItemList.Hatch_Output_Bus_UV.get(1),
+                ItemList.Hatch_Output_Bus_MAX.get(1),
                 GregtechItemList.Hatch_SuperBus_Output_ULV.get(1),
                 GregtechItemList.Hatch_SuperBus_Output_LV.get(1),
                 GregtechItemList.Hatch_SuperBus_Output_MV.get(1),
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java
index eaa939a2fd..471a3cc33e 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java
@@ -23,10 +23,10 @@ public class RECIPES_SeleniumProcessing {
         processCopperRecipes();
         
         //Liquify the Dried Dioxide
-        AddGregtechRecipe.addCokeAndPyrolyseRecipes(MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), 13, FluidUtils.getSteam(500), null, MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(1000), 120, 1024);
+        AddGregtechRecipe.addCokeAndPyrolyseRecipes(MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), 13, FluidUtils.getSteam(500), null, MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(1000), 20, 1024);
         
         // Produce Selenious Acid        
-        AddGregtechRecipe.addCokeAndPyrolyseRecipes(MISC_MATERIALS.SELENIUM_DIOXIDE.getCell(1), 14, FluidUtils.getHotWater(4000), CI.emptyCells(1), MISC_MATERIALS.SELENIOUS_ACID.getFluid(1000), 120, 2048);
+        AddGregtechRecipe.addCokeAndPyrolyseRecipes(MISC_MATERIALS.SELENIUM_DIOXIDE.getCell(1), 14, FluidUtils.getHotWater(4000), CI.emptyCells(1), MISC_MATERIALS.SELENIOUS_ACID.getFluid(1000), 20, 2048);
         
         // Make Selenium        
         CORE.RA.addBlastSmelterRecipe(
diff --git a/src/Java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java b/src/Java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
index fcb8c42197..c56b9a09ef 100644
--- a/src/Java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
+++ b/src/Java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
@@ -7,13 +7,65 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.interfaces.internal.IGT_RecipeAdder;
-
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraftforge.fluids.FluidStack;
 
 public final class AddGregtechRecipe {
+    
+    
+    public static boolean importPyroRecipe(GT_Recipe aRecipe) {
+        
+        int aModifiedTime = (int) (aRecipe.mDuration * 0.8);
+        
+        if (aRecipe.mInputs.length > 2 || aRecipe.mFluidInputs.length > 1 || aRecipe.mFluidOutputs.length > 1 || aRecipe.mOutputs.length > 1) {
+            return false;
+        }
+        
+        int aCircuitNumber = -1;
+        int aItemSlot = -1;
+        
+        int aSlot = 0;
+        for (ItemStack a : aRecipe.mInputs) {
+            if (a != null && a.getItem() != CI.getNumberedCircuit(1).getItem()) {
+                aItemSlot = aSlot;
+            }
+            else {
+                aSlot++;
+            }
+        }
+        
+        for (int i=0;i<25;i++) {
+            ItemStack aTest = CI.getNumberedCircuit(i);
+            for (ItemStack a : aRecipe.mInputs) {
+                if (a != null && GT_Utility.areStacksEqual(a, aTest)) {
+                    aCircuitNumber = i;
+                    break;
+                }
+            }
+        }
+        
+        if (aCircuitNumber < 0) {
+            return false;
+        }
+        
+        
+        return CORE.RA.addCokeOvenRecipe(
+                aRecipe.mInputs[aItemSlot],
+                ItemUtils.getGregtechCircuit(aCircuitNumber),
+                aRecipe.mFluidInputs[0],
+                aRecipe.mFluidOutputs[0],
+                aRecipe.mOutputs[0],
+                aModifiedTime,
+                aRecipe.mEUt);
+        
+        
+    }
+    
 
 	public static boolean addCokeAndPyrolyseRecipes(
 			ItemStack input1, int circuitNumber,
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
index 47f4ad372b..ba1ead8c76 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
@@ -35,6 +35,7 @@ import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
+import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
 import gtPlusPlus.everglades.gen.gt.WorldGen_GT;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config;
@@ -135,9 +136,21 @@ public class HANDLER_GT {
 	        removeOldHighTierCasingRecipes();		    
 		}		
 		RecipesToRemove.go();
+		convertPyroToCokeOven();
 	}
 
-	private static GT_Recipe replaceItemInRecipeWithAnother(GT_Recipe aRecipe, ItemStack aExisting, ItemStack aNewItem) {
+	private static void convertPyroToCokeOven() {
+        int aCount = 0;
+	    for (GT_Recipe g : GT_Recipe.GT_Recipe_Map.sPyrolyseRecipes.mRecipeList) {
+	        if (AddGregtechRecipe.importPyroRecipe(g)) {
+	            aCount++;
+	        }
+	    }
+	    Logger.INFO("Converted "+aCount+" Pyrolyse recipes into Industrial Coke Oven recipes.");
+	    
+    }
+
+    private static GT_Recipe replaceItemInRecipeWithAnother(GT_Recipe aRecipe, ItemStack aExisting, ItemStack aNewItem) {
 	    ItemStack[] aInputItemsCopy = aRecipe.mInputs;
 	    String aOutputName = ItemUtils.getItemName(aRecipe.mOutputs[0]);
 	    boolean aDidChange = false;