% Changed the Autogenerated Fluid textures again.

+ Created Thorium-232, a step towards ThF4.
+ Added centrifuge recipe for Th->Th232(Bonus U232 0.10%).
+ Added THORIUM_HEXAFLUORIDE & THORIUM_TETRAFLUORIDE into ALLOY.java
% Fixed fluid extractor recipes not being added for every dust.
+ Added more fluid extractor and fluid solidifier recipes for each material.

- Removed old "uraniumHexafluoride", "uraniumTetrafluoride", "thoriumTetrafluoride" fluids and IC2 cells.

% Changed Multitank Controller Logic, maybe broke things.

+ Added getNugget and getCell to Material.java
% Changed MaterialGenerator.java to use the materials radioactivity level, not the old method based on name.
% Moved material blacklist for BlastSmelting Recipe generation out of material/MaterialGenerator.java.

3 files changed, 50 insertions, 7 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index a489c2d136..c5476f5f89 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -1,11 +1,12 @@
 package gtPlusPlus.core.recipe;
 
+import gregtech.api.GregTech_API;
 import gregtech.api.enums.*;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.*;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.fluid.FluidUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
@@ -35,6 +36,7 @@ public class RECIPES_GREGTECH {
 		autoclaveRecipes();
 		mixerRecipes();
 		macerationRecipes();
+		centrifugeRecipes();
 		addFuels();
 	}
 
@@ -278,7 +280,7 @@ public class RECIPES_GREGTECH {
 		try {		
 			//Fli2BeF4 + Thorium TetraFluoride = Uranium233
 			CORE.RA.addLFTRRecipe(
-					FluidUtils.getFluidStack("thoriumtetrafluoride", 400), //Fluid input (slot 1)
+					FluidUtils.getFluidStack("molten.thoriumtetrafluoride", 400), //Fluid input (slot 1)
 					FluidUtils.getFluidStack("molten.li2bef4", 1200), //Fluid output (slot 2)
 					FluidUtils.getFluidStack("molten.uranium233", 750), //Output Array of Items - Upto 9,
 					12000*20, //Time in ticks
@@ -399,6 +401,24 @@ public class RECIPES_GREGTECH {
 		
 	}
 	
+	private static void centrifugeRecipes(){
+		GT_Values.RA.addCentrifugeRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("dustThorium", 8),
+				GT_Values.NI,
+				GT_Values.NF,
+				GT_Values.NF,
+				ELEMENT.getInstance().THORIUM232.getDust(2),
+				ELEMENT.getInstance().THORIUM.getDust(5),
+				ELEMENT.getInstance().URANIUM232.getDust(1),
+				GT_Values.NI,
+				GT_Values.NI,
+				GT_Values.NI,
+				new int[]{10000, 10000, 10},
+				500*20,
+				2000);
+		
+	}
+	
 	private static void mixerRecipes(){
 		GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1), null, null, null, FluidUtils.getFluidStack("oxygen", 288), FluidUtils.getFluidStack("sulfurdioxide", 432), null, 600, 60);
 		GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustUranium233", 2), ItemUtils.getItemStackOfAmountFromOreDict("dustUranium233", 1), null, null, FluidUtils.getFluidStack("hydrofluoricacid", 2000), FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 144*3), null, 3000, 500);
@@ -485,6 +505,25 @@ public class RECIPES_GREGTECH {
 				ItemUtils.getItemStackOfAmountFromOreDict("pelletZirconium", 1),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustZrCl4", 1));
 	}
-
+	
+	public static boolean addPulverisationRecipe(ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3) {
+		aOutput1 = GT_OreDictUnificator.get(true, aOutput1);
+		aOutput2 = GT_OreDictUnificator.get(true, aOutput2);
+		if ((GT_Utility.isStackInvalid(aInput)) || (GT_Utility.isStackInvalid(aOutput1))){
+			return false;
+		}
+		if (GT_Utility.getContainerItem(aInput, false) == null) {
+			
+			if (GregTech_API.sRecipeFile.get(ConfigCategories.Machines.maceration, aInput, true)) {
+				GT_Utility.addSimpleIC2MachineRecipe(aInput, GT_ModHandler.getMaceratorRecipeList(), null, new Object[] { aOutput1 });
+			}
+			GT_Values.RA.addPulveriserRecipe(aInput, new ItemStack[] {
+					aOutput1, aOutput2, aOutput3 }, 
+					new int[] {10000, 10000, 10000},
+					400,
+					2);
+		}
+		return true;
+	}
 
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index 0f95c7e1d1..53ad2e3ba1 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -24,7 +24,7 @@ public class RECIPES_General {
 	static String RECIPE_BronzePlate = "plateAnyBronze";
 	static ItemStack RECIPE_BasicCasingIC2;
 	static ItemStack OUTPUT_Workbench_Bronze = ItemUtils.getSimpleStack(Item.getItemFromBlock(ModBlocks.blockWorkbench));
-	static String RECIPE_HydrogenDust = "dustHydrogen";
+	static ItemStack RECIPE_HydrogenDust = ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob);
 
 	public static void RECIPES_LOAD(){
 		if (LoadedMods.Gregtech){
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index c866b66e98..3f656ce9ad 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -1,7 +1,6 @@
 package gtPlusPlus.core.recipe;
 
 import gregtech.api.enums.*;
-import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.item.ItemUtils;
@@ -504,7 +503,12 @@ public class RECIPES_Machines {
 					RECIPE_IronPlatedBricks);
 			
 			//Add recycle recipes for the Iron Plated Bricks
-			GT_ModHandler.addPulverisationRecipe(RECIPE_IronPlatedBricks, ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustIron", 6), ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustClay", 2), true);
+			//GT_ModHandler.addPulverisationRecipe(RECIPE_IronPlatedBricks, ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustIron", 6), ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustClay", 2), true);
+			RECIPES_GREGTECH.addPulverisationRecipe(
+					RECIPE_IronPlatedBricks,
+					ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustIron", 6),
+					ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustClay", 2),
+					null);
 			GT_Values.RA.addArcFurnaceRecipe(RECIPE_IronPlatedBricks, new ItemStack[]{ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotWroughtIron", 6), ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustAsh", 2)}, new int[]{0}, 32*20, 32);
 			
 			/*//Electrolyzer Frame Casing