+ Added some new functions to ReflectionUtils.java.

+ Added an alternative way to Obtain Blizz rods, dust and Cryotheum dust if GalaxySpace is loaded. Closes #557.
$ Fixed bug in DecayableRecipeHandler.java.
$ Fixed instance where I was directly referencing forestry code.
$ Rewrote how canning/uncanning recipes are handled, hopefully fixes the corruption of the recipe map.
> I potentially broke some of my own canning recipes, so be aware of any missing and let me know.

1 files changed, 38 insertions, 23 deletions

diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
index 44c02bc70d..1757b461ee 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -2,13 +2,6 @@ package gtPlusPlus.core.material;
 
 import java.util.Set;
 
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.Recipe_GT;
-
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
@@ -24,7 +17,11 @@ import gtPlusPlus.core.item.base.gears.BaseItemGear;
 import gtPlusPlus.core.item.base.ingots.BaseItemIngot;
 import gtPlusPlus.core.item.base.ingots.BaseItemIngotHot;
 import gtPlusPlus.core.item.base.nugget.BaseItemNugget;
-import gtPlusPlus.core.item.base.ore.*;
+import gtPlusPlus.core.item.base.ore.BaseItemCentrifugedCrushedOre;
+import gtPlusPlus.core.item.base.ore.BaseItemCrushedOre;
+import gtPlusPlus.core.item.base.ore.BaseItemImpureDust;
+import gtPlusPlus.core.item.base.ore.BaseItemPurifiedCrushedOre;
+import gtPlusPlus.core.item.base.ore.BaseItemPurifiedDust;
 import gtPlusPlus.core.item.base.plates.BaseItemPlate;
 import gtPlusPlus.core.item.base.plates.BaseItemPlateDouble;
 import gtPlusPlus.core.item.base.rings.BaseItemRing;
@@ -36,7 +33,21 @@ import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.xmod.gregtech.loaders.*;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_AlloySmelter;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Assembler;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_BlastSmelter;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_DustGeneration;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Extruder;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_FluidCanning;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Fluids;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_MaterialProcessing;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Ore;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Plates;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_ShapedCrafting;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
 public class MaterialGenerator {
@@ -48,21 +59,28 @@ public class MaterialGenerator {
 	@SuppressWarnings("unused")
 	private static volatile Block tempBlock;
 	
-	public static void addFluidExtractionRecipe(ItemStack a, Object b, FluidStack c, int a1, int a2, int a3) {
-		GT_Recipe r = new Recipe_GT(
+	/**
+	 * Called Reflectively from CORE.RA.addFluidExtractionRecipe
+	 */
+	private static void addFluidExtractionRecipe(ItemStack aEmpty, ItemStack aRemains, FluidStack aFluid, int aDuration, int aEU) {
+		/*GT_Recipe r = new Recipe_GT(
 				true,
-				new ItemStack[] {a,  b != null ? (ItemStack) b : null},
+				new ItemStack[] {aEmpty,  aRemains != null ? aRemains : null},
 				new ItemStack[] {},
 				null,
 				new int[] {},
 				new FluidStack[] {},
 				new FluidStack[] {c},
-				a2, a3, a1);
-		new RecipeGen_FluidCanning(r, true);
+				a2, a3, a1);*/
+		//new RecipeGen_FluidCanning(r, true);
+		new RecipeGen_FluidCanning(true, aEmpty, aRemains, aFluid, aDuration, aEU);
 	}
-	
-	public static void addFluidCannerRecipe(ItemStack aFullContainer, ItemStack aEmpty, FluidStack rFluidIn, FluidStack rFluidOut) {		
-		GT_Recipe r = new Recipe_GT(
+
+	/**
+	 * Called Reflectively from CORE.RA.addFluidCannerRecipe
+	 */
+	private static void addFluidCannerRecipe(ItemStack aFullContainer, ItemStack aEmpty, FluidStack aFluid) {		
+		/*GT_Recipe r = new Recipe_GT(
 				true,
 				new ItemStack[] {aEmpty},
 				new ItemStack[] {aFullContainer},
@@ -70,12 +88,9 @@ public class MaterialGenerator {
 				new int[] {},
 				new FluidStack[] {rFluidIn},
 				new FluidStack[] {rFluidOut},
-				0, 0, 0);
-		new RecipeGen_FluidCanning(r, false);
-	}
-	
-	public static void generateFluidExtractorRecipe(GT_Recipe recipe, boolean extracting) {
-		new RecipeGen_FluidCanning(recipe, extracting);
+				0, 0, 0);*/
+		//new RecipeGen_FluidCanning(r, false);
+		new RecipeGen_FluidCanning(false, aEmpty, aFullContainer, aFluid, null, null);
 	}
 	
 	public static void generate(final Material matInfo){