+ 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.

18 files changed, 316 insertions, 119 deletions

diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index ea106a2c2f..1920d9c903 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -277,7 +277,28 @@ public class CommonProxy {
 			EntityUtils.registerDropsForMob(aBrutishZombie, ItemUtils.getItemStackOfAmountFromOreDict("ingotRedAlloy", 1), 3, 200);		
 		}
 		
-		
+		//GalaxySpace Support
+		if (ReflectionUtils.doesClassExist("galaxyspace.SolarSystem.moons.europa.entities.EntityEvolvedColdBlaze")) {
+			Class<?> aColdBlaze = ReflectionUtils.getClass("galaxyspace.SolarSystem.moons.europa.entities.EntityEvolvedColdBlaze");			
+			ItemStack aSmallBlizz, aTinyBlizz, aSmallCryo, aTinyCryo;			
+			aSmallBlizz = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallBlizz", 1);
+			aTinyBlizz = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyBlizz", 1);			
+			aSmallCryo = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallCryotheum", 1);
+			aTinyCryo = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCryotheum", 1);			
+			EntityUtils.registerDropsForMob(aColdBlaze, ItemUtils.getItemStackOfAmountFromOreDict("stickBlizz", 1), 2, 500);			
+			if (aSmallBlizz != null) {
+				EntityUtils.registerDropsForMob(aColdBlaze, aSmallBlizz, 2, 750);				
+			}
+			if (aTinyBlizz != null) {
+				EntityUtils.registerDropsForMob(aColdBlaze, aTinyBlizz, 4, 1500);			
+			}
+			if (aSmallCryo != null) {
+				EntityUtils.registerDropsForMob(aColdBlaze, aSmallCryo, 1, 50);				
+			}
+			if (aTinyCryo != null) {
+				EntityUtils.registerDropsForMob(aColdBlaze, aTinyCryo, 2, 100);			
+			}
+		}		
 		
 	}
 	
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
index 0c2bdaa3ef..87158fe4ee 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.core.item.chemistry;
 
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 
 import forestry.plugins.PluginCore;
@@ -14,6 +15,7 @@ import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -334,13 +336,24 @@ public class AgriculturalChem extends ItemPackage {
 		 * Forestry Support
 		 */
 		if (LoadedMods.Forestry) {
-
-			Item aForestryFert = PluginCore.items.fertilizerCompound;
-
-			CORE.RA.addDehydratorRecipe(
-					new ItemStack[] { CI.getNumberedCircuit(11), ItemUtils.getSimpleStack(aDustOrganicFert, 4) }, null,
-					null, new ItemStack[] { ItemUtils.getSimpleStack(aForestryFert, 3), aManureByprod, aManureByprod },
-					new int[] { 10000, 2000, 2000 }, 20 * 20, 240);
+			Field aItemField = ReflectionUtils.getField(ReflectionUtils.getClass("forestry.plugins.PluginCore"), "items");
+			try {
+				Object aItemRegInstance = aItemField != null ? aItemField.get(aItemField) : null;
+				if (aItemRegInstance != null) {
+					Field aFertField = ReflectionUtils.getField(aItemRegInstance.getClass(), "fertilizerCompound");	
+					Object aItemInstance = aFertField.get(aItemRegInstance);
+					if (aItemInstance instanceof Item) {
+						Item aForestryFert = (Item) aItemInstance;
+						CORE.RA.addDehydratorRecipe(
+								new ItemStack[] { CI.getNumberedCircuit(11), ItemUtils.getSimpleStack(aDustOrganicFert, 4) }, null,
+								null, new ItemStack[] { ItemUtils.getSimpleStack(aForestryFert, 3), aManureByprod, aManureByprod },
+								new int[] { 10000, 2000, 2000 }, 20 * 20, 240);
+					}
+				}
+			}
+			catch (IllegalArgumentException | IllegalAccessException e) {
+				
+			}		
 		}
 
 		/**
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
index 46837be310..0e21387c56 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -1,8 +1,5 @@
 package gtPlusPlus.core.item.chemistry;
 
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
@@ -12,12 +9,13 @@ import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -429,7 +427,7 @@ public class CoalTar extends ItemPackage {
 		else {
 			Toluene = FluidUtils.getWildcardFluidStack("Toluene", 1).getFluid();
 			Item itemCellToluene = new BaseItemComponent("Toluene", "Toluene", new short[]{140, 70, 20, 100});
-			MaterialGenerator.addFluidCannerRecipe(ItemUtils.getEmptyCell(), ItemUtils.getSimpleStack(itemCellToluene), FluidUtils.getFluidStack(Toluene, 1000), null);
+			CORE.RA.addFluidCannerRecipe(ItemUtils.getEmptyCell(), ItemUtils.getSimpleStack(itemCellToluene), FluidUtils.getFluidStack(Toluene, 1000), null);
 		}
 
 		//Create Coal Tar
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){
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 3d36ffb2ab..c3c8da7761 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -750,10 +750,10 @@ public class RECIPES_GREGTECH {
 
 	private static void fluidcannerRecipes() {
 		// Sulfuric Acid
-		GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(Items.glass_bottle),
+		CORE.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(Items.glass_bottle),
 				ItemUtils.getSimpleStack(ModItems.itemSulfuricPotion), FluidUtils.getFluidStack("sulfuricacid", 250),
 				null);
-		GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemSulfuricPotion),
+		CORE.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemSulfuricPotion),
 				ItemUtils.getSimpleStack(Items.glass_bottle), null, FluidUtils.getFluidStack("sulfuricacid", 250));
 
 
@@ -763,21 +763,20 @@ public class RECIPES_GREGTECH {
 		// Try use Internal GT Fluid first
 		if (Utils.getGregtechVersionAsInt() >= 50929) {
 			// Hydrofluoric Acid
-			GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(Items.glass_bottle),
+			CORE.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(Items.glass_bottle),
 					ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
 					FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 250), null);
-			addedGtExtraction = GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
+			addedGtExtraction = CORE.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
 					ItemUtils.getSimpleStack(Items.glass_bottle), null, FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 250));
 		}
 		//Add a Fill recipe for GT++ Acid
-		GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(Items.glass_bottle),
+		CORE.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(Items.glass_bottle),
 				ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
 				FluidUtils.getFluidStack("hydrofluoricacid", 125), null);
 		//Add an empty recipe, but only if we didn't for the standard GT HF. Prevents Fluid transformation exploits.
-		if (!addedGtExtraction)
-			GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
-					ItemUtils.getSimpleStack(Items.glass_bottle), null, FluidUtils.getFluidStack("hydrofluoricacid", 125));
-
+		if (!addedGtExtraction) {
+			CORE.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),	ItemUtils.getSimpleStack(Items.glass_bottle), null, FluidUtils.getFluidStack("hydrofluoricacid", 125));
+		}
 
 	}
 
@@ -1589,18 +1588,18 @@ public class RECIPES_GREGTECH {
 
 	private static void fluidExtractorRecipes() {		
 		//FLiBe fuel
-		GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLi2BeF4", 1), null,
+		CORE.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLi2BeF4", 1), null,
 				FluidUtils.getFluidStack("li2bef4", 144), 10000, 100, 500);
 		//LFTR Fuel 1
-		GT_Values.RA.addFluidExtractionRecipe(NUCLIDE.LiFBeF2ZrF4U235.getDust(1), null,
+		CORE.RA.addFluidExtractionRecipe(NUCLIDE.LiFBeF2ZrF4U235.getDust(1), null,
 				NUCLIDE.LiFBeF2ZrF4U235.getFluid(144), 10000, 250, 1000);
-		GT_Values.RA.addFluidExtractionRecipe(NUCLIDE.LiFBeF2ZrF4UF4.getDust(1), null,
+		CORE.RA.addFluidExtractionRecipe(NUCLIDE.LiFBeF2ZrF4UF4.getDust(1), null,
 				NUCLIDE.LiFBeF2ZrF4UF4.getFluid(144), 10000, 150, 2000);
-		GT_Values.RA.addFluidExtractionRecipe(NUCLIDE.LiFBeF2ThF4UF4.getDust(1), null,
+		CORE.RA.addFluidExtractionRecipe(NUCLIDE.LiFBeF2ThF4UF4.getDust(1), null,
 				NUCLIDE.LiFBeF2ThF4UF4.getFluid(144), 10000, 200, 1500);
 
 		//ZIRCONIUM_TETRAFLUORIDE
-		GT_Values.RA.addFluidExtractionRecipe(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(1), null,
+		CORE.RA.addFluidExtractionRecipe(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(1), null,
 				FluidUtils.getFluidStack(ModItems.fluidZrF4, 144), 10000, 200, 512+256);
 
 
diff --git a/src/Java/gtPlusPlus/core/util/math/MathUtils.java b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
index a9f7b901ef..2f4db2efcc 100644
--- a/src/Java/gtPlusPlus/core/util/math/MathUtils.java
+++ b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
@@ -13,6 +13,8 @@ import gtPlusPlus.core.util.Utils;
 
 public class MathUtils {
 
+	final static Random rand = CORE.RANDOM;
+
 	/**
 	 * Returns a psuedo-random number between min and max, inclusive.
 	 * The difference between min and max can be at most
@@ -23,9 +25,6 @@ public class MathUtils {
 	 * @return Integer between min and max, inclusive.
 	 * @see java.util.Random#nextInt(int)
 	 */
-
-	final static Random rand = CORE.RANDOM;
-
 	public static int randInt(final int min, final int max) {
 		// nextInt is normally exclusive of the top value,
 		// so add 1 to make it inclusive
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
index a2bfa5dcb2..a0eb0f17e2 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
@@ -13,9 +13,11 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.minecraft.FluidGT6;
 import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.item.base.cell.BaseItemPlasmaCell;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.material.MaterialStack;
+import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraftforge.fluids.*;
@@ -309,7 +311,7 @@ public class FluidUtils {
 			rFluid.setTemperature((int) (aTemperatureK));
 		}
 		if ((aFullContainer != null) && (aEmptyContainer != null) && !FluidContainerRegistry.registerFluidContainer(new FluidStack(rFluid, aFluidAmount), aFullContainer, aEmptyContainer)) {
-			MaterialGenerator.addFluidCannerRecipe(aFullContainer, container(aFullContainer, false), null, new FluidStack(rFluid, aFluidAmount));
+			CORE.RA.addFluidCannerRecipe(CI.emptyCells(1), aFullContainer, null, new FluidStack(rFluid, aFluidAmount));
 		}
 		else {
 			//Utils.LOG_INFO("Failed creating recipes to fill/empty cells of "+aName+".");
@@ -461,7 +463,7 @@ public class FluidUtils {
 					aGenerateCell);
 
 			if (dustStack != null){
-				MaterialGenerator.addFluidExtractionRecipe(
+				CORE.RA.addFluidExtractionRecipe(
 						dustStack, //Input
 						null, //Input 2
 						FluidUtils.getFluidStack(gtFluid, amountPerItem), //Fluid Output
@@ -471,7 +473,7 @@ public class FluidUtils {
 						);
 			}
 			if (dustStack2 != null){
-				MaterialGenerator.addFluidExtractionRecipe(
+				CORE.RA.addFluidExtractionRecipe(
 						dustStack2, //Input
 						null, //Input 2
 						FluidUtils.getFluidStack(gtFluid, amountPerItem), //Fluid Output
diff --git a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
index b52c13c563..7ef9ef6632 100644
--- a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
+++ b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
@@ -169,6 +169,17 @@ public class ReflectionUtils {
 			return y.get();
 		}
 	}
+		
+	public static boolean isStaticMethod(Class<?> aClass, String aMethodName, Class<?>... aTypes) {
+		return isStaticMethod(ReflectionUtils.getMethod(aClass, aMethodName, aTypes));
+	}
+	
+	public static boolean isStaticMethod(Method aMethod) {
+		if (aMethod != null && Modifier.isStatic(aMethod.getModifiers())) {
+				return true;
+		}
+		return false;
+	}
 
 
 
@@ -381,7 +392,6 @@ public class ReflectionUtils {
 
 	public static boolean invoke(Object objectInstance, String methodName, Class[] parameters, Object[] values){
 		if (objectInstance == null || methodName == null || parameters == null || values == null){
-			//Logger.REFLECTION("Null value when trying to Dynamically invoke "+methodName+" on an object of type: "+objectInstance.getClass().getName());
 			return false;
 		}		
 		Class<?> mLocalClass = (objectInstance instanceof Class ? (Class<?>) objectInstance : objectInstance.getClass());
@@ -389,6 +399,28 @@ public class ReflectionUtils {
 		try {
 			Method mInvokingMethod = mLocalClass.getDeclaredMethod(methodName, parameters);
 			if (mInvokingMethod != null){
+				return invoke(objectInstance, mInvokingMethod, values);
+			}
+		}
+		catch (NoSuchMethodException | SecurityException | IllegalArgumentException e) {
+			Logger.REFLECTION("Failed to Dynamically invoke "+methodName+" on an object of type: "+mLocalClass.getName());
+		}		
+
+		Logger.REFLECTION("Invoke failed or did something wrong.");		
+		return false;
+	}
+	
+	public static boolean invoke(Object objectInstance, Method method, Object[] values){		
+		if (method == null || values == null || (!ReflectionUtils.isStaticMethod(method)  && objectInstance == null)){
+			//Logger.REFLECTION("Null value when trying to Dynamically invoke "+methodName+" on an object of type: "+objectInstance.getClass().getName());
+			return false;
+		}		
+		String methodName = method.getName();
+		String classname = objectInstance != null ? objectInstance.getClass().getCanonicalName() : method.getDeclaringClass().getCanonicalName();
+		Logger.REFLECTION("Trying to invoke "+methodName+" on an instance of "+classname+".");		
+		try {
+			Method mInvokingMethod = method;
+			if (mInvokingMethod != null){
 				Logger.REFLECTION(methodName+" was not null.");
 				if ((boolean) mInvokingMethod.invoke(objectInstance, values)){
 					Logger.REFLECTION("Successfully invoked "+methodName+".");
@@ -398,14 +430,10 @@ public class ReflectionUtils {
 					Logger.REFLECTION("Invocation failed for "+methodName+".");
 				}
 			}
-			else {
-				Logger.REFLECTION(methodName+" is null.");				
-			}
 		}
-		catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-			Logger.REFLECTION("Failed to Dynamically invoke "+methodName+" on an object of type: "+mLocalClass.getName());
-		}		
-
+		catch (SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+			Logger.REFLECTION("Failed to Dynamically invoke "+methodName+" on an object of type: "+classname);
+		}
 		Logger.REFLECTION("Invoke failed or did something wrong.");		
 		return false;
 	}
diff --git a/src/Java/gtPlusPlus/nei/DecayableRecipeHandler.java b/src/Java/gtPlusPlus/nei/DecayableRecipeHandler.java
index c619ff4479..b5f5fa7989 100644
--- a/src/Java/gtPlusPlus/nei/DecayableRecipeHandler.java
+++ b/src/Java/gtPlusPlus/nei/DecayableRecipeHandler.java
@@ -8,8 +8,8 @@ import java.util.List;
 import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.TemplateRecipeHandler;
-import crazypants.enderio.machine.enchanter.GuiEnchanter;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.gui.machine.GUI_DecayablesChest;
 import gtPlusPlus.core.handler.Recipes.DecayableRecipe;
 import gtPlusPlus.core.item.base.dusts.BaseItemDustUnique;
 import gtPlusPlus.core.item.materials.DustDecayable;
@@ -32,7 +32,7 @@ public class DecayableRecipeHandler extends TemplateRecipeHandler {
 	}
 
 	public Class<? extends GuiContainer> getGuiClass() {
-		return GuiEnchanter.class;
+		return GUI_DecayablesChest.class;
 	}
 
 	public String getOverlayIdentifier() {
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
index bb360d5a87..fd83cc707d 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
@@ -7,25 +7,21 @@ import java.lang.reflect.Method;
 import org.apache.commons.lang3.reflect.FieldUtils;
 
 import cpw.mods.fml.common.Loader;
-
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-import gregtech.GT_Mod;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.Materials;
-
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IAllele;
+import gregtech.GT_Mod;
+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.material.MaterialGenerator;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
 public class GTPP_Bees {
@@ -111,7 +107,7 @@ public class GTPP_Bees {
     }
     
     private void addExtractorRecipe(ItemStack input, FluidStack output){
-    	MaterialGenerator.addFluidExtractionRecipe(
+    	CORE.RA.addFluidExtractionRecipe(
     			input, 
     			null, 
     			output, 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
index 94ddda283d..94adb5a92c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
@@ -216,8 +216,10 @@ public interface IGregtech_RecipeAdder {
 
 	public boolean addSmeltingAndAlloySmeltingRecipe(ItemStack aDust, ItemStack aOutput);
 
-	public void addFluidExtractionRecipe(ItemStack input, Object input2, FluidStack output, int aTime, int aEu, int aSpecial);
-	 
+	public boolean addFluidExtractionRecipe(ItemStack input, ItemStack input2, FluidStack output, int aTime, int aEu, int aSpecial);
+	
+	public boolean addFluidCannerRecipe(ItemStack aContainer, ItemStack aFullContainer, FluidStack rFluidIn, FluidStack rFluidOut);
+	
 	/**
      * Adds a Fusion reactor Recipe
      *
@@ -262,4 +264,5 @@ public interface IGregtech_RecipeAdder {
 
 	public boolean addUvLaserRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput, int time, long eu);
 	public boolean addIrLaserRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput, int time, long eu);
+
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java
index 7bc0eacd4f..0a20d9357c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java
@@ -4,11 +4,17 @@ import java.util.HashSet;
 import java.util.Set;
 
 import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_Recipe;
-
+import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
+import gregtech.api.util.Recipe_GT;
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
 
 public class RecipeGen_FluidCanning extends RecipeGen_Base {
 
@@ -18,13 +24,76 @@ public class RecipeGen_FluidCanning extends RecipeGen_Base {
 	}
 
 	private final GT_Recipe recipe;
-	public RecipeGen_FluidCanning(GT_Recipe g) {
-		this(g, true);
-	}
-	public RecipeGen_FluidCanning(GT_Recipe g, boolean extracting) {
-		recipe = g;
-		mRecipeGenMap.add(this);
-		disableOptional = extracting;
+	private final boolean isValid;
+
+	// Alternative Constructor
+	public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluid, Integer aDuration, Integer aEUt) {
+		ItemStack aInput;
+		ItemStack aOutput;
+		FluidStack aFluidInput;
+		FluidStack aFluidOutput;
+
+		// Safety check on the duration
+		if (aDuration == null || aDuration <= 0) {
+			aDuration = (aFluid != null) ? (aFluid.amount / 62) : (1000 / 62);
+		}
+
+		// Safety check on the EU
+		if (aEUt == null || aEUt <= 0) {
+			if (aExtracting) {
+				aEUt = 2;
+			}
+			else {
+				aEUt = 1;
+			}
+		}
+
+		// Set Item stacks correctly, invert if extraction recipe.
+		if (aExtracting) {
+			aInput = aFull;
+			aOutput = aEmpty;
+			aFluidInput = null;
+			aFluidOutput = aFluid;			
+		}
+		else {
+			aInput = aEmpty;
+			aOutput = aFull;
+			aFluidInput = aFluid;
+			aFluidOutput = null;			
+		}
+
+		//Check validity
+
+		Recipe_GT aRecipe = new Recipe_GT(
+				true,
+				new ItemStack[] { aInput },
+				new ItemStack[] { aOutput },
+				null,
+				new int[] {},
+				new FluidStack[] { aFluidInput },
+				new FluidStack[] { aFluidOutput },
+				aDuration,
+				1,
+				0);
+
+
+		// Not Valid
+		if ((aExtracting && (aInput == null || aOutput == null ||aFluidOutput == null)) || (!aExtracting && (aInput == null || aOutput == null || aFluidInput == null))) {
+			isValid = false;
+			disableOptional = aExtracting;
+			recipe = null;
+		}
+		else {
+			// Valid Recipe
+			recipe = aRecipe;
+			mRecipeGenMap.add(this);
+			disableOptional = aExtracting;
+			isValid = true;
+		}
+
+
+
+
 	}
 
 	@Override
@@ -33,29 +102,79 @@ public class RecipeGen_FluidCanning extends RecipeGen_Base {
 	}
 
 	private void generateRecipes() {
-		if (recipe != null) {			
+		if (isValid && recipe != null) {			
 			//Used to store Fluid extraction state
 			if (this.disableOptional) {
-				GT_Values.RA.addFluidExtractionRecipe(
-					recipe.mInputs.length >= 1 ? recipe.mInputs[0] : null, //Input
-					recipe.mInputs.length == 2 ? recipe.mInputs[1] : null, //Input 2
-					recipe.mFluidOutputs.length == 1 ? recipe.mFluidOutputs[0] : null, //Fluid Output
-					recipe.mSpecialValue, //Chance
-					recipe.mDuration, //Duration
-					recipe.mEUt //Eu Tick
-					);	
+				addFluidExtractionRecipe(
+						recipe.mInputs.length >= 1 ? recipe.mInputs[0] : null, //Input
+								recipe.mInputs.length == 2 ? recipe.mInputs[1] : null, //Input 2
+										recipe.mFluidOutputs.length == 1 ? recipe.mFluidOutputs[0] : null, //Fluid Output
+												recipe.mDuration, //Duration
+												recipe.mEUt //Eu Tick
+						);	
 			}
 			else {
-				GT_Values.RA.addFluidCannerRecipe(
-					recipe.mInputs.length == 1 ? recipe.mInputs[0] : null, //Input
-					recipe.mOutputs.length == 1 ? recipe.mOutputs[0] : null, //Input 2
-					recipe.mFluidInputs.length == 1 ? recipe.mFluidInputs[0] : null, //Fluid Input
-					recipe.mFluidOutputs.length == 1 ? recipe.mFluidOutputs[0] : null //Fluid Output
-					);
+				addFluidCannerRecipe(
+						recipe.mInputs.length == 1 ? recipe.mInputs[0] : null, //Input
+								recipe.mOutputs.length == 1 ? recipe.mOutputs[0] : null, //Input 2
+										recipe.mFluidInputs.length == 1 ? recipe.mFluidInputs[0] : null //Fluid Input
+						);
 
 			}
 
 		}		
 	}
 
+	private final boolean addFluidExtractionRecipe(final ItemStack aInput, final ItemStack aRemains, FluidStack aOutput, int aDuration, final int aEUt) {
+		if (aInput == null || aOutput == null) {
+			return false;
+		}
+		if (aOutput.isFluidEqual(Materials.PhasedGold.getMolten(1L))) {
+			aOutput = Materials.VibrantAlloy.getMolten(aOutput.amount);
+		}
+		if (aOutput.isFluidEqual(Materials.PhasedIron.getMolten(1L))) {
+			aOutput = Materials.PulsatingIron.getMolten(aOutput.amount);
+		}
+		//Logger.INFO(buildLogString());
+		boolean result = GT_Values.RA.addFluidExtractionRecipe(aInput, aRemains, aOutput, 10000, aDuration, aEUt);
+		//Logger.INFO(buildLogString());
+		//dumpStack();
+		return result;
+	}
+
+	public final boolean addFluidCannerRecipe(final ItemStack aInput, final ItemStack aOutput, FluidStack aFluidInput) {
+		if (aInput == null || aOutput == null || aFluidInput == null) {
+			return false;
+		}
+		if (aFluidInput.isFluidEqual(Materials.PhasedGold.getMolten(1L))) {
+			aFluidInput = Materials.VibrantAlloy.getMolten(aFluidInput.amount);
+		}
+		if (aFluidInput.isFluidEqual(Materials.PhasedIron.getMolten(1L))) {
+			aFluidInput = Materials.PulsatingIron.getMolten(aFluidInput.amount);
+		}
+		//Logger.INFO(buildLogString());
+		boolean result = GT_Values.RA.addFluidCannerRecipe(aInput, aOutput, aFluidInput, GT_Values.NF);
+		//Logger.INFO(buildLogString());
+		//dumpStack();
+		return result;
+	}	
+	
+	private void dumpStack() {
+		int parents = 2;
+		for (int i=0;i<6;i++) {
+			Logger.INFO((disableOptional ? "EXTRACTING" : "CANNING")+" DEBUG | "+(i == 0 ? "Called from: " : "Parent: ")+ReflectionUtils.getMethodName(i+parents));			
+		}
+		
+	}
+	
+	private String buildLogString() {
+		int solidSize = getMapSize(GT_Recipe_Map.sCannerRecipes);
+		int fluidSize = getMapSize(GT_Recipe_Map.sFluidCannerRecipes);		
+		return (disableOptional ? "EXTRACTING" : "CANNING")+" DEBUG | Solids: "+solidSize+" | Liquids: "+fluidSize+" | ";
+	}
+	
+	private final int getMapSize(GT_Recipe_Map aMap) {
+		return aMap.mRecipeList.size();
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
index b2236fdd6c..b3b71c7587 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
@@ -48,7 +48,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
 
 				// Ingot
 				if (ItemUtils.checkForInvalidItems(material.getIngot(1)))
-					if (GT_Values.RA.addFluidExtractionRecipe(material.getIngot(1), // Input
+					if (CORE.RA.addFluidExtractionRecipe(material.getIngot(1), // Input
 							null, // Input 2
 							material.getFluid(144), // Fluid Output
 							0, // Chance
@@ -64,7 +64,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
 
 				// Plate
 				if (ItemUtils.checkForInvalidItems(material.getPlate(1)))
-					if (GT_Values.RA.addFluidExtractionRecipe(material.getPlate(1), // Input
+					if (CORE.RA.addFluidExtractionRecipe(material.getPlate(1), // Input
 							null, // Input 2
 							material.getFluid(144), // Fluid Output
 							0, // Chance
@@ -80,7 +80,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
 
 				// Double Plate
 				if (ItemUtils.checkForInvalidItems(material.getPlateDouble(1)))
-					if (GT_Values.RA.addFluidExtractionRecipe(material.getPlateDouble(1), // Input
+					if (CORE.RA.addFluidExtractionRecipe(material.getPlateDouble(1), // Input
 							null, // Input 2
 							material.getFluid(288), // Fluid Output
 							0, // Chance
@@ -96,7 +96,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
 
 				// Nugget
 				if (ItemUtils.checkForInvalidItems(material.getNugget(1)))
-					if (GT_Values.RA.addFluidExtractionRecipe(material.getNugget(1), // Input
+					if (CORE.RA.addFluidExtractionRecipe(material.getNugget(1), // Input
 							null, // Input 2
 							material.getFluid(16), // Fluid Output
 							0, // Chance
@@ -112,7 +112,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
 
 				// Block
 				if (ItemUtils.checkForInvalidItems(material.getBlock(1)))
-					if (GT_Values.RA.addFluidExtractionRecipe(material.getBlock(1), // Input
+					if (CORE.RA.addFluidExtractionRecipe(material.getBlock(1), // Input
 							null, // Input 2
 							material.getFluid(144 * 9), // Fluid Output
 							0, // Chance
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
index f0c2785e1b..3328b0894f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
@@ -139,7 +139,7 @@ public class RecipeGen_Recycling implements Runnable {
 					//Fluid Extractor
 					if (ItemUtils.checkForInvalidItems(tempStack)) {
 						// mValidItems[mSlotIndex++] = tempStack;
-						if ((mDust != null) && GT_Values.RA.addFluidExtractionRecipe(tempStack, null, material.getFluid(mFluidAmount), 0, 30, material.vVoltageMultiplier)) {
+						if ((mDust != null) && CORE.RA.addFluidExtractionRecipe(tempStack, null, material.getFluid(mFluidAmount), 0, 30, material.vVoltageMultiplier)) {
 							Logger.WARNING("Fluid Recycle Recipe: " + material.getLocalizedName() + " - Success - Recycle "
 									+ tempStack.getDisplayName() + " and obtain " + mFluidAmount+"mb of "+material.getFluid(1).getLocalizedName()+".");
 						}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index 83704b6af9..3c996ef64f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -991,14 +991,16 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
     }
 
     @Override
-    public void addFluidExtractionRecipe(ItemStack input, Object input2, FluidStack output, int aTime, int aEu,	int aSpecial) {
-        MaterialGenerator.addFluidExtractionRecipe(input, input2, output, aSpecial, aTime, aEu);
-
+    public boolean addFluidExtractionRecipe(ItemStack input, ItemStack input2, FluidStack output, int aTime, int aEu,	int aSpecial) {
+    	Method aExtractionMethod = ReflectionUtils.getMethod(MaterialGenerator.class, "addFluidExtractionRecipe", new Class[] {ItemStack.class, ItemStack.class, FluidStack.class, int.class, int.class});
+    	return ReflectionUtils.invoke(null, aExtractionMethod, new Object[] {input, input2, output, aSpecial, aTime, aEu});
     }
 
-
-
-
+    @Override
+    public boolean addFluidCannerRecipe(ItemStack aFullContainer, ItemStack container, FluidStack rFluidIn, FluidStack rFluidOut) {
+    	Method aExtractionMethod = ReflectionUtils.getMethod(MaterialGenerator.class, "addFluidCannerRecipe", new Class[] {ItemStack.class, ItemStack.class, FluidStack.class});
+    	return ReflectionUtils.invoke(null, aExtractionMethod, new Object[] {aFullContainer, container, rFluidIn, rFluidOut});
+    }
 
     /**
      * Adds a Fusion reactor Recipe
diff --git a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
index 5a9dc748ca..307319f642 100644
--- a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
+++ b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
@@ -222,10 +222,10 @@ public class FishTrapHandler {
 	private static void addGregtechFluidRecipe(final ItemStack input){
 		if (LoadedMods.Gregtech){
 			if (CORE.GTNH) {
-				MaterialGenerator.addFluidExtractionRecipe(input, null, FluidUtils.getFluidStack("fishoil", 50), 10000, 16, 4);
+				CORE.RA.addFluidExtractionRecipe(input, null, FluidUtils.getFluidStack("fishoil", 50), 10000, 16, 4);
 			}
 			else {
-				MaterialGenerator.addFluidExtractionRecipe(input, null, FluidUtils.getFluidStack("fishoil", 4), 0, 16, 4); //4eu/t  total eu used = 64 so time = 64/4
+				CORE.RA.addFluidExtractionRecipe(input, null, FluidUtils.getFluidStack("fishoil", 4), 0, 16, 4); //4eu/t  total eu used = 64 so time = 64/4
 			}
 		}
 	}
diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
index 603789bd23..a628b9c5b6 100644
--- a/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
@@ -53,7 +53,8 @@ public class TF_Items {
 		if (ReflectionUtils.doesClassExist("cofh.core.util.energy.FurnaceFuelHandler")){
 			FurnaceFuelHandler.registerFuel(dustPyrotheum, 2400); //cofh.core.util.energy.FurnaceFuelHandler.registerFuel(ItemStack, int)
 		}
-
+		
+		ItemUtils.addItemToOreDictionary(rodBlizz, "stickBlizz");
 
 		itemRodBlizz = ItemUtils.simpleMetaStack(itemMaterial, 1, 1);
 		itemDustBlizz = ItemUtils.simpleMetaStack(itemMaterial, 2, 1);
diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
index e18e0e19f0..1b2541ff3a 100644
--- a/src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
@@ -11,6 +11,7 @@ import gregtech.api.util.GT_OreDictUnificator;
 
 import cofh.lib.util.helpers.ItemHelper;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.thermalfoundation.item.TF_Items;
 import net.minecraftforge.fluids.FluidRegistry;
@@ -33,7 +34,7 @@ public class TF_Gregtech_Recipes {
 
 		//Gelid Cryotheum
 		Logger.INFO("Adding Recipes for Gelid Cryotheum");
-		GT_Values.RA.addFluidExtractionRecipe(dust_Cryotheum, GT_Values.NI, getFluidStack("cryotheum", 250), 10000, 200, 240);
+		CORE.RA.addFluidExtractionRecipe(dust_Cryotheum, GT_Values.NI, getFluidStack("cryotheum", 250), 10000, 200, 240);
 		GT_Values.RA.addChemicalBathRecipe((GT_OreDictUnificator.get(OrePrefixes.ore, Materials.Cinnabar, 1L)), getFluidStack("cryotheum", 144), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cinnabar, 3L), GT_Values.NI, GT_Values.NI, null, 400, 30);
 
 		//Blizz Powder
@@ -47,10 +48,10 @@ public class TF_Gregtech_Recipes {
 
 		//Blazing Pyrotheum
 		Logger.INFO("Adding Recipes for Blazing Pyrotheum");
-		GT_Values.RA.addFluidExtractionRecipe(dust_Pyrotheum, GT_Values.NI, getFluidStack("pyrotheum", 250), 10000, 200, 240);
+		CORE.RA.addFluidExtractionRecipe(dust_Pyrotheum, GT_Values.NI, getFluidStack("pyrotheum", 250), 10000, 200, 240);
 		
 		//Ender Fluid
-		GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getSimpleStack(Items.ender_pearl), GT_Values.NI, getFluidStack("ender", 250), 10000, 100, 30);
+		CORE.RA.addFluidExtractionRecipe(ItemUtils.getSimpleStack(Items.ender_pearl), GT_Values.NI, getFluidStack("ender", 250), 10000, 100, 30);
 		
 
 		ItemStack dustCoal = ItemUtils.getItemStackOfAmountFromOreDict("dustCoal", 1);