Merge pull request #13 from draknyte1/NewMatSystem

New Back-end systems for dynamic Material (Alloys) and Tool generation.
Also fixes a few issues with other things, which were noticed during development of the new systems.

19 files changed, 1577 insertions, 196 deletions

diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
index ceb8880299..de4520fee9 100644
--- a/src/Java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.core.block;
 
 import gtPlusPlus.core.block.general.LightGlass;
-import gtPlusPlus.core.block.general.fluids.FluidRegistryHandler;
+import gtPlusPlus.core.fluids.FluidRegistryHandler;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
@@ -25,10 +25,7 @@ public final class ModBlocks {
 	public static Block MatterFabricatorEffectBlock;
 
 	public static Fluid fluidJackDaniels = new Fluid("fluidJackDaniels");
-	public static Block blockFluidJackDaniels; 
-	public static Block blockGtFrameStaballoy;
-	public static Block blockGtFrameTantalloy60;
-	public static Block blockGtFrameTantalloy61;
+	public static Block blockFluidJackDaniels;
 
 
 
diff --git a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java
index cd879167ba..c95f37d9c5 100644
--- a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java
+++ b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java
@@ -8,7 +8,7 @@ import net.minecraft.block.material.Material;
 
 public class BasicBlock extends Block {
 
-    public BasicBlock(String unlocalizedName, Material material) {
+    public BasicBlock(final String unlocalizedName, final Material material) {
         super(material);
         this.setBlockName(Utils.sanitizeString(unlocalizedName));
         this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName);
@@ -28,7 +28,7 @@ public class BasicBlock extends Block {
     	private String TEXTURE_NAME;
     	private String HARVEST_TOOL;
     	private SoundType soundOfBlock;
-    	private BlockTypes (String textureName, String harvestTool, SoundType blockSound)
+    	private BlockTypes (final String textureName, final String harvestTool, final SoundType blockSound)
     	{
     		this.TEXTURE_NAME = textureName;
     		this.HARVEST_TOOL = harvestTool;
diff --git a/src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java b/src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java
new file mode 100644
index 0000000000..ebd84f9654
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java
@@ -0,0 +1,107 @@
+package gtPlusPlus.core.fluids;
+
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.math.MathUtils;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.fluids.BlockFluidClassic;
+import net.minecraftforge.fluids.Fluid;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class BlockFluidBase extends BlockFluidClassic {
+
+    @SideOnly(Side.CLIENT)
+    protected IIcon stillIcon;
+    @SideOnly(Side.CLIENT)
+    protected IIcon flowingIcon;
+    
+    protected int colour;
+    protected Material fluidMaterial;
+    final String displayName;
+    
+    @SuppressWarnings("deprecation")
+	public BlockFluidBase(Fluid fluid, Material material) {
+            super(fluid, net.minecraft.block.material.Material.water);
+            short[] tempColour = material.getRGBA(); 
+            this.colour = Utils.rgbtoHexValue(tempColour[0], tempColour[1], tempColour[2]);
+            this.fluidMaterial = material;
+            setCreativeTab(AddToCreativeTab.tabOther);
+            this.displayName = material.getLocalizedName();
+            LanguageRegistry.addName(this, "Molten "+displayName+" ["+MathUtils.celsiusToKelvin(fluidMaterial.getBoilingPoint_C())+"K]");
+    		this.setBlockName(GetProperName());
+    }
+    
+    @SuppressWarnings("deprecation")
+	public BlockFluidBase(String fluidName, Fluid fluid, short[] colour) {
+            super(fluid, net.minecraft.block.material.Material.water);
+            short[] tempColour = colour; 
+            this.colour = Utils.rgbtoHexValue(tempColour[0], tempColour[1], tempColour[2]);
+            setCreativeTab(AddToCreativeTab.tabOther);
+            this.displayName = fluidName;
+            LanguageRegistry.addName(this, "Molten "+displayName);
+    		this.setBlockName(GetProperName());
+    }
+    
+    @Override
+    public IIcon getIcon(int side, int meta) {
+            return (side == 0 || side == 1)? stillIcon : flowingIcon;
+    }
+    
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void registerBlockIcons(IIconRegister register) {
+            stillIcon = register.registerIcon(CORE.MODID+":fluids/fluid.molten.autogenerated");
+            flowingIcon = register.registerIcon(CORE.MODID+":fluids/fluid.molten.autogenerated");
+    }
+    
+    @Override
+    public boolean canDisplace(IBlockAccess world, int x, int y, int z) {
+            if (world.getBlock(x,  y,  z).getMaterial().isLiquid()) return false;
+            return super.canDisplace(world, x, y, z);
+    }
+    
+    @Override
+    public boolean displaceIfPossible(World world, int x, int y, int z) {
+            if (world.getBlock(x,  y,  z).getMaterial().isLiquid()) return false;
+            return super.displaceIfPossible(world, x, y, z);
+    }
+
+	@Override
+	public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2, int par3, int par4){		
+		
+		if (this.colour == 0){
+			return MathUtils.generateSingularRandomHexValue();
+		}
+		
+		return this.colour;
+	}
+	
+    @Override
+	public int getRenderColor(int aMeta) {
+    	if (this.colour == 0){
+			return MathUtils.generateSingularRandomHexValue();
+		}
+		
+		return this.colour;
+    }
+    
+    public String GetProperName() {
+		String tempIngot;	
+
+		tempIngot = "Molten "+displayName;
+
+		return tempIngot;
+	}
+    
+    public Material getFluidMaterial(){
+    	return fluidMaterial;
+    }
+    
+}		
diff --git a/src/Java/gtPlusPlus/core/block/general/fluids/FluidRegistryHandler.java b/src/Java/gtPlusPlus/core/fluids/FluidRegistryHandler.java
index bda2aae35b..477d5da944 100644
--- a/src/Java/gtPlusPlus/core/block/general/fluids/FluidRegistryHandler.java
+++ b/src/Java/gtPlusPlus/core/fluids/FluidRegistryHandler.java
@@ -1,7 +1,8 @@
-package gtPlusPlus.core.block.general.fluids;
+package gtPlusPlus.core.fluids;
 
 import static gtPlusPlus.core.block.ModBlocks.blockFluidJackDaniels;
 import static gtPlusPlus.core.block.ModBlocks.fluidJackDaniels;
+import gtPlusPlus.core.block.general.fluids.BlockFluidJackDaniels;
 import gtPlusPlus.core.lib.CORE;
 import net.minecraft.block.material.Material;
 import net.minecraftforge.fluids.FluidRegistry;
@@ -29,6 +30,7 @@ public class FluidRegistryHandler {
 		run();
 	}
 	
+	@SuppressWarnings("unused")
 	private static void run(){
 		fluidJackDaniels();
 	}
diff --git a/src/Java/gtPlusPlus/core/fluids/GenericFluid.java b/src/Java/gtPlusPlus/core/fluids/GenericFluid.java
new file mode 100644
index 0000000000..1780cb8577
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/fluids/GenericFluid.java
@@ -0,0 +1,66 @@
+package gtPlusPlus.core.fluids;
+
+import gtPlusPlus.core.item.base.itemblock.ItemBlockFluid;
+import gtPlusPlus.core.material.Material;
+import net.minecraft.block.Block;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+import cpw.mods.fml.common.registry.GameRegistry;
+
+public class GenericFluid extends Fluid{
+
+	protected final String fluidName;
+	protected final Fluid fluidFactory;
+	protected final Block blockFactory;
+	protected final short[] rgba;
+	
+	public GenericFluid(String displayName, String fluidName, int luminosity, int density, int temperature, int viscosity, boolean isGas, short[] rgba) {
+		super(fluidName);
+		fluidFactory = this;
+		this.rgba = rgba;
+		this.fluidName = fluidName;
+		fluidFactory.setLuminosity(luminosity);
+		fluidFactory.setDensity(density);
+		fluidFactory.setTemperature(temperature);
+		fluidFactory.setViscosity(viscosity);
+		fluidFactory.setGaseous(isGas);
+		fluidFactory.setUnlocalizedName("fluid"+fluidName);
+		FluidRegistry.registerFluid(fluidFactory);			
+		blockFactory = new BlockFluidBase(displayName, fluidFactory, rgba).setBlockName("fluidblock"+fluidName);
+		GameRegistry.registerBlock(blockFactory, ItemBlockFluid.class, blockFactory.getUnlocalizedName().substring(5));
+		
+		//fluidFactory.setUnlocalizedName(blockFactory.getUnlocalizedName());
+		
+	}
+	
+	public GenericFluid(Material fluidMaterial, int luminosity, int density, int temperature, int viscosity, boolean isGas) {
+		
+		super(fluidMaterial.getUnlocalizedName());
+		//IC2_ItemFluidCell fullFluidCell = emptyCell.fill(emptyCell, FluidUtils.getFluidStack(getUnlocalizedName(), 1), true);
+		
+		fluidFactory = this;
+		this.rgba = fluidMaterial.getRGBA();
+		this.fluidName = fluidMaterial.getUnlocalizedName();
+		fluidFactory.setLuminosity(luminosity);
+		fluidFactory.setDensity(density);
+		fluidFactory.setTemperature(temperature);
+		fluidFactory.setViscosity(viscosity);
+		fluidFactory.setGaseous(isGas);
+		fluidFactory.setUnlocalizedName("fluid"+fluidName);
+		FluidRegistry.registerFluid(fluidFactory);			
+		blockFactory = new BlockFluidBase(fluidFactory, fluidMaterial).setBlockName("fluidblock"+fluidName);
+		GameRegistry.registerBlock(blockFactory, ItemBlockFluid.class, blockFactory.getUnlocalizedName().substring(5));
+		//IC2_ItemFluidCell emptyCell = new IC2_ItemFluidCell(fluidName);
+		/*if (aFullContainer != null && aEmptyContainer != null && !FluidContainerRegistry.registerFluidContainer(new FluidStack(rFluid, aFluidAmount), aFullContainer, aEmptyContainer)) {
+			GT_Values.RA.addFluidCannerRecipe(aFullContainer, container(aFullContainer, false), null, new FluidStack(rFluid, aFluidAmount));
+		}*/
+		//fluidFactory.setUnlocalizedName(blockFactory.getUnlocalizedName());
+		
+	}
+	
+	@Override
+	public int getColor() {
+        return Math.max(0, Math.min(255, this.rgba[0])) << 16 | Math.max(0, Math.min(255, this.rgba[1])) << 8 | Math.max(0, Math.min(255, this.rgba[2]));
+    }	
+
+}
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index aafe02d470..1737b6ea4a 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -2,6 +2,7 @@ package gtPlusPlus.core.item;
 import static gtPlusPlus.core.creative.AddToCreativeTab.tabMachines;
 import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc;
 import static gtPlusPlus.core.lib.CORE.LOAD_ALL_CONTENT;
+import static gtPlusPlus.core.util.item.UtilsItems.generateItemsFromMaterial;
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.creative.AddToCreativeTab;
@@ -25,13 +26,15 @@ import gtPlusPlus.core.item.tool.staballoy.StaballoyPickaxe;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.CORE.configSwitches;
 import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.lib.MaterialInfo;
+import gtPlusPlus.core.material.ALLOY;
+import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.debug.DEBUG_INIT;
 import gtPlusPlus.core.util.item.UtilsItems;
 import net.minecraft.item.Item;
 import net.minecraft.item.Item.ToolMaterial;
 import net.minecraft.item.ItemFood;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.EnumHelper;
 import cpw.mods.fml.common.registry.GameRegistry;
 public final class ModItems {
@@ -105,7 +108,9 @@ public final class ModItems {
 	public static Item itemPersonalCloakingDeviceCharged;
 	public static Item itemPersonalHealingDevice;
 
-	public static MultiPickaxeBase MP_GTMATERIAL;	
+	public static MultiPickaxeBase MP_GTMATERIAL;
+	
+	public static ItemStack FluidCell;
 	
 	public static BaseItemBackpack backpack_Red;
 	public static BaseItemBackpack backpack_Green;
@@ -162,53 +167,65 @@ public final class ModItems {
 		//Start meta Item Generation
 		ItemsFoods.load();
 
-		UtilsItems.generateItemsFromMaterial("EnergyCrystal", "Energy Crystal", 8, MaterialInfo.ENERGYCRYSTAL, Utils.rgbtoHexValue(228, 225, 0), true);
-		UtilsItems.generateItemsFromMaterial("BloodSteel", "Blood Steel", 3, MaterialInfo.BLOODSTEEL, Utils.rgbtoHexValue(142, 28, 0), false);
-		UtilsItems.generateItemsFromMaterial("Staballoy", "Staballoy", 6, MaterialInfo.STABALLOY, Utils.rgbtoHexValue(68, 75, 66), true);
-		UtilsItems.generateItemsFromMaterial("Tantalloy60", "Tantalloy-60", 5, MaterialInfo.TANTALLOY60, Utils.rgbtoHexValue(68, 75, 166), true);
-		UtilsItems.generateItemsFromMaterial("Tantalloy61", "Tantalloy-61", 6, MaterialInfo.TANTALLOY61, Utils.rgbtoHexValue(122, 135, 196), true);
-		UtilsItems.generateItemsFromMaterial("Bedrockium", "Bedrockium", 9, MaterialInfo.BEDROCKIUM, Utils.rgbtoHexValue(32, 32, 32), false);
-		UtilsItems.generateItemsFromMaterial("Quantum", "Quantum", 10, MaterialInfo.QUANTUM, Utils.rgbtoHexValue(128, 128, 128), true);
+		try{
+		generateItemsFromMaterial(ALLOY.ENERGYCRYSTAL);
+		generateItemsFromMaterial(ALLOY.BLOODSTEEL);
+		generateItemsFromMaterial(ALLOY.STABALLOY);
+		generateItemsFromMaterial(ALLOY.TANTALLOY_60);
+		generateItemsFromMaterial(ALLOY.TANTALLOY_61);
+		generateItemsFromMaterial(ALLOY.BEDROCKIUM);
+		generateItemsFromMaterial(ALLOY.QUANTUM);
 		
 
-		UtilsItems.generateItemsFromMaterial("Inconel625", "Inconel-625", 4, MaterialInfo.INCONEL625, Utils.rgbtoHexValue(128, 200, 128), true); //Inconel 625: Acid resistant, good weldability. The LCF version is typically used in bellows.
-		UtilsItems.generateItemsFromMaterial("Inconel690", "Inconel-690", 6, MaterialInfo.INCONEL690, Utils.rgbtoHexValue(118, 220, 138), true); //Inconel 690: Low cobalt content for nuclear applications, and low resistivity.
-		UtilsItems.generateItemsFromMaterial("Inconel792", "Inconel-792", 5, MaterialInfo.INCONEL792, Utils.rgbtoHexValue(108, 240, 118), true); //Inconel 792: Increased aluminium content for improved high temperature corrosion properties, used especially in gas turbines.
-		
+		generateItemsFromMaterial(ALLOY.INCONEL_625);
+		generateItemsFromMaterial(ALLOY.INCONEL_690);
+		generateItemsFromMaterial(ALLOY.INCONEL_792);
 
 		if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
-			UtilsItems.generateItemsFromMaterial("TungstenCarbide", "Tungsten Carbide", 5, MaterialInfo.TUNGSTENCARBIDE, Utils.rgbtoHexValue(44, 44, 44), true);
+			generateItemsFromMaterial(ALLOY.TUNGSTEN_CARBIDE);
 		}
-		UtilsItems.generateItemsFromMaterial("SiliconCarbide", "Silicon Carbide", 4, MaterialInfo.SILICONCARBIDE, Utils.rgbtoHexValue(32, 32, 32), false);
-		UtilsItems.generateItemsFromMaterial("Zeron100", "Zeron-100", 8, MaterialInfo.ZERON100, Utils.rgbtoHexValue(180, 180, 20), true);
-		UtilsItems.generateItemsFromMaterial("MaragingSteel250", "Maraging Steel 250", 4, MaterialInfo.MARAGING250, Utils.rgbtoHexValue(140, 140, 140), true);
-		UtilsItems.generateItemsFromMaterial("MaragingSteel300", "Maraging Steel 300", 5, MaterialInfo.MARAGING300, Utils.rgbtoHexValue(150, 150, 150), true);
-		UtilsItems.generateItemsFromMaterial("MaragingSteel350", "Maraging Steel 350", 6, MaterialInfo.MARAGING350, Utils.rgbtoHexValue(160, 160, 160), true);
-		UtilsItems.generateItemsFromMaterial("Stellite", "Stellite", 7, MaterialInfo.STELLITE, Utils.rgbtoHexValue(129, 75, 120), true);
-		UtilsItems.generateItemsFromMaterial("Talonite", "Talonite", 8, MaterialInfo.TALONITE, Utils.rgbtoHexValue(228, 75, 120), false);
+		generateItemsFromMaterial(ALLOY.SILICON_CARBIDE);
+		generateItemsFromMaterial(ALLOY.ZERON_100);
+		generateItemsFromMaterial(ALLOY.MARAGING250);
+		generateItemsFromMaterial(ALLOY.MARAGING300);
+		generateItemsFromMaterial(ALLOY.MARAGING350);
+		generateItemsFromMaterial(ALLOY.STELLITE);
+		generateItemsFromMaterial(ALLOY.TALONITE);
 		
-		UtilsItems.generateItemsFromMaterial("Tumbaga", "Tumbaga", 2, MaterialInfo.TUMBAGA, Utils.rgbtoHexValue(255,178,15), false); //Tumbaga was the name given by Spaniards to a non-specific alloy of gold and copper 
-		UtilsItems.generateItemsFromMaterial("Potin", "Potin", 4, MaterialInfo.POTIN, Utils.rgbtoHexValue(201,151,129), false); //Potin is traditionally an alloy of bronze, tin and lead, with varying quantities of each possible
+		//Tumbaga was the name given by Spaniards to a non-specific alloy of gold and copper 
+		generateItemsFromMaterial(ALLOY.TUMBAGA);
+		//Potin is traditionally an alloy of bronze, tin and lead, with varying quantities of each possible
+		generateItemsFromMaterial(ALLOY.POTIN);
 		
 
-		UtilsItems.generateItemsFromMaterial("HastelloyW", "Hastelloy-W", 6, MaterialInfo.HASTELLOY_W, Utils.rgbtoHexValue(218, 165, 32), false);
-		UtilsItems.generateItemsFromMaterial("HastelloyX", "Hastelloy-X", 6, MaterialInfo.HASTELLOY_X, Utils.rgbtoHexValue(255, 193, 37), false);
-		UtilsItems.generateItemsFromMaterial("HastelloyC276", "Hastelloy-C276", 7, MaterialInfo.HASTELLOY_C276, Utils.rgbtoHexValue(238, 180, 34), true);
-		UtilsItems.generateItemsFromMaterial("HastelloyN", "Hastelloy-N", 8, MaterialInfo.HASTELLOY_N, Utils.rgbtoHexValue(155, 223, 237), true);
+		generateItemsFromMaterial(ALLOY.HASTELLOY_W);
+		generateItemsFromMaterial(ALLOY.HASTELLOY_X);
+		generateItemsFromMaterial(ALLOY.HASTELLOY_C276);
+		generateItemsFromMaterial(ALLOY.HASTELLOY_N);
+		
+		generateItemsFromMaterial(ALLOY.INCOLOY_020);
+		generateItemsFromMaterial(ALLOY.INCOLOY_DS);
+		generateItemsFromMaterial(ALLOY.INCOLOY_MA956);
 		
-		UtilsItems.generateItemsFromMaterial("Incoloy020", "Incoloy-020", 7, MaterialInfo.INCOLOY020, Utils.rgbtoHexValue(81, 81, 81), false);
-		UtilsItems.generateItemsFromMaterial("IncoloyDS", "Incoloy-DS", 7, MaterialInfo.INCOLOYDS, Utils.rgbtoHexValue(91, 91, 91), false);
-		UtilsItems.generateItemsFromMaterial("IncoloyMA956", "Incoloy-MA956", 8, MaterialInfo.INCOLOYMA956, Utils.rgbtoHexValue(101, 101, 101), true);
 		
+		generateItemsFromMaterial(ELEMENT.ZIRCONIUM);
+		generateItemsFromMaterial(ALLOY.ZIRCONIUM_CARBIDE);
+		generateItemsFromMaterial(ALLOY.TANTALUM_CARBIDE);
+		generateItemsFromMaterial(ALLOY.NIOBIUM_CARBIDE);		
 		
-		UtilsItems.generateItemsFromMaterial("Zirconium", "Zirconium", 6, MaterialInfo.ZIRCONIUM, Utils.rgbtoHexValue(255, 250, 205), false);
-		UtilsItems.generateItemsFromMaterial("ZirconiumCarbide", "Zirconium Carbide", 7, MaterialInfo.ZIRCONIUMCARBIDE, Utils.rgbtoHexValue(222, 202, 180), true);
-		UtilsItems.generateItemsFromMaterial("TantalumCarbide", "Tantalum Carbide", 7, MaterialInfo.TANTALUMCARBIDE, Utils.rgbtoHexValue(139, 136, 120), true);
-		UtilsItems.generateItemsFromMaterial("NiobiumCarbide", "Niobium Carbide", 6, MaterialInfo.NIOMBIUMCARBIDE, Utils.rgbtoHexValue(205, 197, 191), true);
+		//Uranium-233 is a fissile isotope of uranium that is bred from thorium-232 as part of the thorium fuel cycle.
+		UtilsItems.generateItemsFromMaterial(ELEMENT.URANIUM233);
+		
+		} catch (Throwable r){
+			Utils.LOG_INFO("Failed to Generated a Material. "+r.getMessage());
+			//Utils.LOG_INFO("Failed to Generated a Material. "+r.getCause().getMessage());
+			Utils.LOG_INFO("Failed to Generated a Material. "+r.getStackTrace()[0].getMethodName());
+			Utils.LOG_INFO("Failed to Generated a Material. "+r.getStackTrace()[1].getMethodName());
+			r.printStackTrace();
+			System.exit(1);
+		}
 		
 		
-		//Uranium-233if
-		UtilsItems.generateItemsFromMaterial("Uranium233", "Uranium 233", 4, MaterialInfo.URANIUM233, Utils.rgbtoHexValue(73, 220, 83), false); //Uranium-233 is a fissile isotope of uranium that is bred from thorium-232 as part of the thorium fuel cycle. 
 		dustLithiumCarbonate = UtilsItems.generateSpecialUseDusts("LithiumCarbonate", "Lithium Carbonate", Utils.rgbtoHexValue(137, 139, 142))[0];
 
 		
@@ -382,6 +399,10 @@ public final class ModItems {
 			//GameRegistry.registerItem(FuelRod_Thorium, "itemFuelRod_Thorium");
 			//GameRegistry.registerItem(FuelRod_Uranium, "itemFuelRod_Uranium");
 			//GameRegistry.registerItem(FuelRod_Plutonium, "itemFuelRod_Plutonium");
+			
+			//FluidCell = new ItemStack(new IC2_ItemFluidCell("itemGT++FluidCell"));
+			
+			
 		}
 		else {
 			Utils.LOG_WARNING("IndustrialCraft2 not Found - Skipping Resources.");
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
index 6d12624487..0342f7f104 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
@@ -5,7 +5,7 @@ import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.MaterialInfo;
+import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.item.UtilsItems;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -29,9 +29,10 @@ public class BaseItemDust extends Item{
 	protected boolean useBlastFurnace;
 	String name = "";
 	private int mTier;
-	private MaterialInfo dustInfo;
+	private Material dustInfo;
+	private String oredictName;
 
-	public BaseItemDust(String unlocalizedName, String materialName, MaterialInfo matInfo, int colour, String pileSize, boolean blastFurnaceRequired, int tier, int sRadioactivity) {
+	public BaseItemDust(String unlocalizedName, String materialName, Material matInfo, int colour, String pileSize, boolean blastFurnaceRequired, int tier, int sRadioactivity) {
 		setUnlocalizedName(unlocalizedName);
 		this.setUnlocalizedName(unlocalizedName);
 		this.setMaxStackSize(64);	
@@ -70,6 +71,7 @@ public class BaseItemDust extends Item{
 			Utils.LOG_WARNING("Generating OreDict Name: "+temp);
 		}		
 		if (temp != null && temp != ""){
+			oredictName = temp;
 			GT_OreDictUnificator.registerOre(temp, UtilsItems.getSimpleStack(this));
 		}
 		addMixerRecipe();
@@ -133,109 +135,75 @@ public class BaseItemDust extends Item{
 
 
 	private void addMixerRecipe(){
-		ItemStack tempStack = UtilsItems.getSimpleStack(this);
-		ItemStack tempOutput = null;
-		ItemStack[] inputStacks = dustInfo.getInputs();
-		ItemStack[] outputStacks = dustInfo.getOutputs();
-		String temp = "";
-		Utils.LOG_WARNING("Unlocalized name for OreDict nameGen: "+getUnlocalizedName());
-		if (getUnlocalizedName().contains("item.")){
-			temp = getUnlocalizedName().replace("item.", "");
-			Utils.LOG_WARNING("Generating OreDict Name: "+temp);
+		
+		ItemStack thisItem;		
+		ItemStack normalDust = dustInfo.getDust(1);
+		ItemStack smallDust = dustInfo.getSmallDust(1);
+		ItemStack tinyDust = dustInfo.getTinyDust(1);
+		
+		ItemStack[] inputStacks = dustInfo.getMaterialComposites();
+		ItemStack outputStacks = dustInfo.getDust(10);
+		
+		if (oredictName.contains("dustTiny")){
+			thisItem = tinyDust;
+			ItemStack normalStack = dustInfo.getDust(1);
+			ItemStack tinyStack = dustInfo.getTinyDust(9);
+			Utils.LOG_INFO("Generating a 9 Tiny dust to 1 Dust recipe for "+materialName);
+			UtilsRecipe.recipeBuilder(
+					thisItem,	thisItem, thisItem, 
+					thisItem, thisItem, thisItem, 
+					thisItem, thisItem, thisItem,
+					normalStack);
+			
+			Utils.LOG_INFO("Generating a 9 Tiny dust from 1 Dust recipe for "+materialName);
+			UtilsRecipe.recipeBuilder(
+					normalStack, null, null, 
+					null, null, null, 
+					null, null, null,
+					tinyStack);
+			
 		}
-		else {
-			temp = getUnlocalizedName();
-		}
-		if (temp.contains("DustTiny")){
-			temp = temp.replace("itemDustTiny", "dust");
-			Utils.LOG_WARNING("Generating OreDict Name: "+temp);
-		}
-		else if (temp.contains("DustSmall")){
-			temp = temp.replace("itemDustSmall", "dust");
-			Utils.LOG_WARNING("Generating OreDict Name: "+temp);
+		else if (oredictName.contains("dustSmall")){
+			thisItem = smallDust;
+			ItemStack normalStack = dustInfo.getDust(1);
+			ItemStack smallStack = dustInfo.getSmallDust(4);
+			
+			Utils.LOG_INFO("Generating a 4 Small dust to 1 Dust recipe for "+materialName);
+			UtilsRecipe.recipeBuilder(
+					thisItem, thisItem, null, 
+					thisItem, thisItem, null, 
+					null, null, null,
+					normalStack);
+			
+			Utils.LOG_INFO("Generating a 4 Small dust from 1 Dust recipe for "+materialName);
+			UtilsRecipe.recipeBuilder(
+					null, normalStack, null, 
+					null, null, null, 
+					null, null, null,
+					smallStack);
+			
 		}
 		else {
-			temp = temp.replace("itemD", "d");
-			Utils.LOG_WARNING("Generating OreDict Name: "+temp);
-		}		
-		if (temp != null && temp != ""){
-
-			if (getUnlocalizedName().contains("DustTiny") || getUnlocalizedName().contains("DustSmall")){
-				tempOutput = UtilsItems.getItemStackOfAmountFromOreDict(temp, 1);
-			}
-			else {				
-				if (outputStacks[0] != null){
-					Utils.LOG_WARNING("Getting output dusts for mixer recipe. Checking ENUM, got: "+outputStacks[0].toString());
-					tempOutput = outputStacks[0];
+			thisItem = normalDust;
+		}			
+
+		if (thisItem == normalDust){				
+				Utils.LOG_WARNING("Generating a Dust recipe for "+materialName+" in the mixer.");
+
+				if (inputStacks.length != 0){
+					GT_Values.RA.addMixerRecipe(
+							inputStacks[0], inputStacks[1],
+							inputStacks[2], inputStacks[3],
+							null, null,
+							outputStacks,
+							8*mTier*20, 8*mTier*2);
 				}
 				else {
-					Utils.LOG_WARNING("Getting output dusts for mixer recipe. Enum check failed, failback item is: "+temp);
-					tempOutput = UtilsItems.getItemStackOfAmountFromOreDict(temp, 1);
+					return;
 				}
 			}
-
 		}
 
-		if (tempOutput != null){
-			if (getUnlocalizedName().contains("DustTiny")){
-				Utils.LOG_WARNING("Generating a 9 Tiny dust to 1 Dust recipe for "+materialName);
-				UtilsRecipe.addShapelessGregtechRecipe(tempOutput,
-						tempStack, tempStack, tempStack,
-						tempStack, tempStack, tempStack,
-						tempStack, tempStack, tempStack);
-			}
-			else if (getUnlocalizedName().contains("DustSmall")){
-				Utils.LOG_WARNING("Generating a 4 Small dust to 1 Dust recipe for "+materialName);
-				UtilsRecipe.addShapelessGregtechRecipe(tempOutput,
-						tempStack, tempStack, null,
-						tempStack, tempStack, null,
-						null, null, null);
-			}
-			else {
-				Utils.LOG_WARNING("Generating a Dust recipe for "+materialName+" in the mixer.");		
-
-
-				int i = 0;
-				if (inputStacks.length >= 2){
-					for (ItemStack is : inputStacks){
-						if (is != null){
-							Utils.LOG_WARNING("Found "+is.getDisplayName()+" as an input for mixer recipe.");		
-							if (is.getDisplayName().toLowerCase().contains("tell alkalus")){
-								ItemStack tempStackForAName = inputStacks[i];
-								String[] inputList = dustInfo.getInputItemsAsList();
-								int[] inputSizes = dustInfo.getInputStackSizesAsList();
-								inputStacks[i] = UtilsItems.getItemStackOfAmountFromOreDict(inputList[i], inputSizes[i]);
-								Utils.LOG_WARNING("Swapping input slot "+i+" which contains "+tempStackForAName.getDisplayName()+" with "+inputStacks[i].getDisplayName()+".");	
-							}
-
-						}
-
-						else {
-							Utils.LOG_WARNING("Input "+i+" was null.");						
-						}
-
-						i++;
-					}
-				}
-
-				GT_Values.RA.addMixerRecipe(
-						inputStacks[0], inputStacks[1],
-						inputStacks[2], inputStacks[3],
-						null, null,
-						tempOutput,
-						8*mTier*20, 8*mTier*2);
-
-				/*GT_Values.RA.addMixerRecipe(
-						GT_Utility.copyAmount(inputStacks[0].stackSize, new Object[]{inputStacks[0]}), GT_Utility.copyAmount(inputStacks[1].stackSize, new Object[]{inputStacks[1]}),
-						GT_Utility.copyAmount(inputStacks[2].stackSize, new Object[]{inputStacks[2]}), GT_Utility.copyAmount(inputStacks[3].stackSize, new Object[]{inputStacks[3]}), 
-						null, null,
-						tempOutput,
-						8*mTier*20, 8*mTier*2);*/
-
-			}
-		}
-
-	}
 
 	private void addMacerationRecipe(){
 		Utils.LOG_WARNING("Adding recipe for "+materialName+" Dusts");
@@ -260,15 +228,25 @@ public class BaseItemDust extends Item{
 
 		tempIngot = tempIngot.replace("itemDust", "ingot");
 		Utils.LOG_WARNING("Generating OreDict Name: "+tempIngot);
-		ItemStack[] outputStacks = dustInfo.getOutputs();
+		ItemStack[] outputStacks = {dustInfo.getDust(1)};
 		if (tempIngot != null && tempIngot != ""){
 			tempInputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1);
 			tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempDust, 1);
-			ItemStack tempStackOutput2;
+			ItemStack tempStackOutput2 = null;
 			int chance = mTier*10/MathUtils.randInt(10, 20);
-			if (outputStacks[1] != null && !outputStacks[1].getUnlocalizedName().toLowerCase().contains("aaa_broken")){
-				tempStackOutput2 = outputStacks[1];
-				tempOutputStack = outputStacks[0];
+			if (outputStacks.length != 0){
+				if (outputStacks.length == 1){
+					tempStackOutput2 = null;
+				}
+				else {
+					if (!outputStacks[1].getUnlocalizedName().toLowerCase().contains("aaa_broken")){
+						tempStackOutput2 = outputStacks[1];
+						tempOutputStack = outputStacks[0];
+					}
+					else {
+						tempStackOutput2 = null;
+					}
+				}								
 			}
 			else {
 				tempStackOutput2 = null;
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java
new file mode 100644
index 0000000000..77af69f809
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java
@@ -0,0 +1,78 @@
+package gtPlusPlus.core.item.base.itemblock;
+
+import gtPlusPlus.core.fluids.BlockFluidBase;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.math.MathUtils;
+
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+
+public class ItemBlockFluid extends ItemBlock{
+
+	protected final int blockColour;
+	protected final int sRadiation;
+	protected Material thisFluid;
+	final BlockFluidBase baseBlock;
+	String name;
+
+	public ItemBlockFluid(Block block) {
+		super(block);
+		this.baseBlock = (BlockFluidBase) block;
+		this.blockColour = baseBlock.getRenderColor(1);
+		this.thisFluid = baseBlock.getFluidMaterial();
+		this.sRadiation=UtilsItems.getRadioactivityLevel(baseBlock.getUnlocalizedName());
+		this.name = baseBlock.getLocalizedName().replace("tile", "").replace("fluid", "").replace("name", "").replace("block", "").replace(".", "");
+		//GT_OreDictUnificator.registerOre("frameGt"+block.getUnlocalizedName().replace("tile.", "").replace("tile.BlockGtFrame", "").replace("-", "").replace("_", "").replace(" ", "").replace("FrameBox", ""), UtilsItems.getSimpleStack(this));
+	}
+	
+	public final Material setFluidMaterial(Material M){
+		return thisFluid=M;
+	}
+
+	public int getRenderColor(int aMeta) {
+		return blockColour;
+	}
+	
+	@Override
+	public String getItemStackDisplayName(ItemStack iStack) {
+		if (thisFluid != null){
+		this.name = "Molten "+thisFluid.getLocalizedName();
+		return name;
+		}
+		this.name = "Molten "+baseBlock.getLocalizedName().replace("tile", "").replace("fluid", "").replace("name", "").replace("block", "").replace(".", "");
+		return name;
+	}
+	
+	@Override
+	public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) {
+		if (blockColour == 0){
+			return MathUtils.generateSingularRandomHexValue();
+		}
+		return blockColour;
+
+	}
+
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer aPlay