Added NEI handler for LFTR Sparging.

Fixed Material generation for noble gases.
Fixed Chemical Formula not being applied to some cells.

14 files changed, 458 insertions, 29 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 1e0b779bac..e95b646f8e 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -232,6 +232,7 @@ public final class ModItems {
 	public static Item dustFertUN32;
 
 	public static Fluid fluidFLiBeSalt;
+	public static Fluid fluidFLiBeSaltBurnt;
 
 
 	//Possibly missing base items that GT may be missing.
@@ -715,6 +716,7 @@ public final class ModItems {
 		dustLi2BeF4 = ItemUtils.generateSpecialUseDusts("Li2BeF4", "Li2BeF4 Fuel Compound", "Li2BeF4", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/FLiBe
 		//fluidFLiBeSalt = ("Li2BeF4", "Li2BeF4", 7430, new short[]{255, 255, 255, 100}, 0);
 		fluidFLiBeSalt = FluidUtils.addGTFluidNoPrefix("Li2BeF4", "Li2BeF4", new short[]{255, 255, 255, 100}, 0, 743, null, CI.emptyCells(1), 1000, true);
+		fluidFLiBeSaltBurnt = FluidUtils.addGTFluidNoPrefix("Li2BeF2UF4", "Li2BeF2UF4", new short[]{50, 255, 50, 100}, 0, 743, null, CI.emptyCells(1), 1000, true);
 
 		//LFTR Control Circuit
 		itemCircuitLFTR = new CoreItem("itemCircuitLFTR", ""+EnumChatFormatting.GREEN+"Control Circuit", AddToCreativeTab.tabMisc, 1, 0,  new String[] {"Keeps Multiblocks Stable"}, EnumRarity.epic, EnumChatFormatting.DARK_GREEN, false, null);
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
index 9b732e38e1..1975e7770d 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -46,6 +46,8 @@ public class BaseItemComponent extends Item{
 	public final int componentColour;
 	public Object extraData;
 
+	private static HashMap<String, String> mChemicalFormula = new HashMap<String, String>();
+
 	protected IIcon base;
 	protected IIcon overlay;
 
@@ -59,6 +61,7 @@ public class BaseItemComponent extends Item{
 		this.setMaxStackSize(64);
 		//this.setTextureName(this.getCorrectTextures());
 		this.componentColour = material.getRgbAsHex();
+		mChemicalFormula.put(materialName.toLowerCase(), material.vChemicalFormula);
 		GameRegistry.registerItem(this, this.unlocalName);
 
 		//if (componentType != ComponentTypes.DUST)
@@ -84,8 +87,9 @@ public class BaseItemComponent extends Item{
 		else {
 			aFormattedNameForFluids = unlocalName;
 		}		
-		 	
-		this.componentMaterial = null;
+		Material aTempMaterial = Material.mMaterialCache.get(localName.toLowerCase());
+		Logger.INFO("Attempted to get "+localName+" cell material from cache. Valid? "+(aTempMaterial != null));
+		this.componentMaterial = aTempMaterial;
 		this.unlocalName = "itemCell"+aFormattedNameForFluids;
 		this.materialName = localName;
 		this.componentType = ComponentTypes.CELL;
@@ -94,6 +98,7 @@ public class BaseItemComponent extends Item{
 		this.setMaxStackSize(64);
 		this.componentColour = MathUtils.getRgbAsHex(RGBA);
 		this.extraData = RGBA;
+		
 		this.setTextureName(CORE.MODID + ":" + "item"+ComponentTypes.CELL.COMPONENT_NAME);
 		GameRegistry.registerItem(this, aFormattedNameForFluids);
 		GT_OreDictUnificator.registerOre(ComponentTypes.CELL.getOreDictName()+Utils.sanitizeStringKeepBrackets(localName), ItemUtils.getSimpleStack(this));
@@ -202,6 +207,12 @@ public class BaseItemComponent extends Item{
 						}
 					}
 				}
+				else {
+					String aChemicalFormula = mChemicalFormula.get(materialName.toLowerCase());
+					if (aChemicalFormula != null && aChemicalFormula.length() > 0) {			
+						list.add(Utils.sanitizeStringKeepBrackets(aChemicalFormula));						
+					}
+				}
 
 				//Hidden Tooltip
 				if (KeyboardUtils.isCtrlKeyDown()) {
diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java
index 3af8b560ad..0ad231aac8 100644
--- a/src/Java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java
@@ -23,7 +23,7 @@ public final class ELEMENT {
 	public final Material NITROGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Nitrogen);
 	public final Material OXYGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Oxygen);
 	public final Material FLUORINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Fluorine);
-	public final Material NEON = new Material("Neon", MaterialState.GAS, new short[]{255, 255, 255}, -248, -246, 10, 10, false, "Ne", 0);//Not a GT Inherited Material
+	public final Material NEON = new Material("Neon", MaterialState.PURE_GAS, new short[]{240, 180, 30}, -248, -246, 10, 10, false, "Ne", 0);//Not a GT Inherited Material
 	public final Material SODIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Sodium);
 	public final Material MAGNESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Magnesium);
 	public final Material ALUMINIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Aluminium);
@@ -51,7 +51,7 @@ public final class ELEMENT {
 	public final Material ARSENIC = MaterialUtils.generateMaterialFromGtENUM(Materials.Arsenic);
 	public final Material SELENIUM = new Material("Selenium", MaterialState.SOLID, new short[]{190, 190, 190}, 217, 685, 34, 45, false, "Se", 0);//Not a GT Inherited Material
 	public final Material BROMINE = new Material("Bromine", MaterialState.PURE_LIQUID, new short[]{200, 25, 25}, -7, 58, 35, 45, false, "Br", 0);//Not a GT Inherited Material
-	public final Material KRYPTON = new Material("Krypton", MaterialState.PURE_LIQUID, new short[]{255, 255, 255}, -157, -153, 36, 48, false, "Kr", 0);//Not a GT Inherited Material
+	public final Material KRYPTON = new Material("Krypton", MaterialState.PURE_GAS, new short[]{5, 200, 220}, -157, -153, 36, 48, false, "Kr", 0);//Not a GT Inherited Material
 	public final Material RUBIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Rubidium);
 	public final Material STRONTIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Strontium, new short[] {230, 210, 110}, TextureSet.SET_FLINT);
 	public final Material YTTRIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Yttrium);
@@ -69,7 +69,7 @@ public final class ELEMENT {
 	public final Material ANTIMONY = MaterialUtils.generateMaterialFromGtENUM(Materials.Antimony);
 	public final Material TELLURIUM = new Material("Tellurium", MaterialState.SOLID, new short[]{210, 210, 210}, 449, 989, 52, 76, false, "Te", 0);//Not a GT Inherited Material
 	public final Material IODINE = new Material("Iodine", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{96, 96, 96}, 114, 184, 53, 74, false, "I", 0);//Not a GT Inherited Material
-	public final Material XENON = new Material("Xenon", MaterialState.GAS, new short[]{255, 255, 255}, -111, -108, 54, 77, false, "Xe", 0);//Not a GT Inherited Material
+	public final Material XENON = new Material("Xenon", MaterialState.PURE_GAS, new short[]{5, 105, 210}, -111, -108, 54, 77, false, "Xe", 0);//Not a GT Inherited Material
 	public final Material CAESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Caesium);
 	public final Material BARIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Barium);
 	public final Material LANTHANUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Lanthanum);
diff --git a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
index 8dad69f70a..aaee1cc790 100644
--- a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
@@ -71,7 +71,7 @@ public final class MISC_MATERIALS {
 
 	public static final Material HYDROGEN_CYANIDE = new Material(
 			"Hydrogen Cyanide",
-			MaterialState.PURE_LIQUID, //State
+			MaterialState.PURE_GAS, //State
 			null, //Material Colour
 			4, //Melting Point in C
 			26, //Boiling Point in C
@@ -87,7 +87,7 @@ public final class MISC_MATERIALS {
 
 	public static final Material CARBON_MONOXIDE = new Material(
 			"Carbon Monoxide",
-			MaterialState.PURE_LIQUID, //State
+			MaterialState.PURE_GAS, //State
 			null, //Material Colour
 			-1, //Melting Point in C
 			-1, //Boiling Point in C
@@ -102,7 +102,7 @@ public final class MISC_MATERIALS {
 
 	public static final Material CARBON_DIOXIDE = new Material(
 			"Carbon Dioxide",
-			MaterialState.PURE_LIQUID, //State
+			MaterialState.PURE_GAS, //State
 			null, //Material Colour
 			-1, //Melting Point in C
 			-1, //Boiling Point in C
@@ -245,7 +245,7 @@ public final class MISC_MATERIALS {
 
 	public static final Material HYDROGEN_CHLORIDE = new Material(
 			"Hydrogen Chloride",
-			MaterialState.PURE_LIQUID,
+			MaterialState.PURE_GAS,
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
 					new MaterialStack(ELEMENT.getInstance().CHLORINE, 1),
@@ -254,7 +254,7 @@ public final class MISC_MATERIALS {
 
 	public static final Material SODIUM_CHLORIDE = new Material(
 			"Sodium Chloride",
-			MaterialState.PURE_LIQUID,
+			MaterialState.PURE_GAS,
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().SODIUM, 1),
 					new MaterialStack(ELEMENT.getInstance().CHLORINE, 1),
@@ -263,7 +263,7 @@ public final class MISC_MATERIALS {
 
 	public static final Material SODIUM_HYDROXIDE = new Material(
 			"Sodium Hydroxide",
-			MaterialState.PURE_LIQUID,
+			MaterialState.PURE_GAS,
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().SODIUM, 1),
 					new MaterialStack(HYDROXIDE, 1),
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index dee064353a..c4131d99e7 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -3,7 +3,11 @@ package gtPlusPlus.core.material;
 import static gregtech.api.enums.GT_Values.M;
 import static gtPlusPlus.core.util.math.MathUtils.safeCast_LongToInt;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
@@ -33,6 +37,7 @@ import net.minecraftforge.fluids.FluidStack;
 public class Material {
 
 	public static final Set<Material> mMaterialMap = new HashSet<Material>();
+	public static HashMap<String, Material> mMaterialCache = new HashMap<String, Material>();
 
 	public static final Map<String, Map<String, ItemStack>> mComponentMap = new HashMap<String, Map<String, ItemStack>>();
 
@@ -163,6 +168,8 @@ public class Material {
 		try {
 			this.unlocalizedName = Utils.sanitizeString(materialName);
 			this.localizedName = materialName;
+			mMaterialCache.put(getLocalizedName().toLowerCase(), this);
+			Logger.INFO("Stored "+getLocalizedName()+" to cache with key: "+getLocalizedName().toLowerCase());
 
 			this.materialState = defaultState;
 
@@ -1185,8 +1192,9 @@ public class Material {
 					1000,
 					this.vGenerateCells);
 		}
-		else if (this.materialState == MaterialState.GAS){
-			return FluidUtils.addGTFluid(
+		else if (this.materialState == MaterialState.GAS || this.materialState == MaterialState.PURE_GAS){
+			return FluidUtils.generateGas(unlocalizedName,	this.getLocalizedName(), getMeltingPointK(), getRGBA(), vGenerateCells);
+			/*return FluidUtils.addGTFluid(
 					this.getUnlocalizedName(),
 					this.getLocalizedName()+" Gas",
 					this.RGBA,
@@ -1195,7 +1203,7 @@ public class Material {
 					aFullCell,
 					ItemUtils.getEmptyCell(),
 					1000,
-					this.vGenerateCells);
+					this.vGenerateCells);*/
 		}
 		else { //Plasma
 			return this.generatePlasma();
diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
index 20fdfd3c8c..68026d1cac 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -188,6 +188,10 @@ public class MaterialGenerator {
 				temp = new BaseItemDust(matInfo);
 				FluidUtils.generateGas(unlocalizedName,	materialName, matInfo.getMeltingPointK(), C, true);
 			}
+			else if (matInfo.getState() == MaterialState.PURE_GAS){
+				FluidUtils.generateGas(unlocalizedName,	materialName, matInfo.getMeltingPointK(), C, true);
+				return true;
+			}
 			else if (matInfo.getState() == MaterialState.PURE_LIQUID){
 				FluidUtils.generateFluidNoPrefix(unlocalizedName,	materialName, matInfo.getMeltingPointK(), C);
 				return true;
diff --git a/src/Java/gtPlusPlus/core/material/state/MaterialState.java b/src/Java/gtPlusPlus/core/material/state/MaterialState.java
index 284e9582f1..460fe019dc 100644
--- a/src/Java/gtPlusPlus/core/material/state/MaterialState.java
+++ b/src/Java/gtPlusPlus/core/material/state/MaterialState.java
@@ -6,7 +6,8 @@ public enum MaterialState {
 	GAS(2),
 	PLASMA(3),
 	PURE_LIQUID(4),
-	ORE(5);
+	ORE(5),
+	PURE_GAS(6);
 	private int STATE;
 	private MaterialState (final int State){
 		this.STATE = State;
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
index 758ec8bab0..7b945ba507 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
@@ -232,6 +232,7 @@ public class FluidUtils {
 	public static Fluid addGTFluid(String aName, final String aTexture, final String aLocalized, final short[] aRGBa, final int aState, final long aTemperatureK, ItemStack aFullContainer, final ItemStack aEmptyContainer, final int aFluidAmount, final boolean aGenerateFilledCell) {
 		
 		String aNameOriginal = aName;
+		Logger.INFO("Generating Fluid for "+aName);
 		
 		aName = Utils.sanitizeString(aName.toLowerCase());
 		
@@ -288,8 +289,18 @@ public class FluidUtils {
 
 		
 		if (aFullContainer == null) {
-			ItemStack oreStack = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+aName, 1);				
-			aFullContainer = oreStack;					
+			ItemStack oreStack = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+aLocalName, 1);				
+			aFullContainer = oreStack;		
+			if (aFullContainer == null) {
+				oreStack = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+aNameOriginal, 1);				
+				aFullContainer = oreStack;	
+				if (aFullContainer != null) {	
+					Logger.INFO("Found cell for "+aNameOriginal);
+				}
+			}
+			else {
+				Logger.INFO("Found cell for "+aLocalName);
+			}
 		}		
 		
 		Item tempCell = null;
@@ -304,7 +315,8 @@ public class FluidUtils {
 				aMatName = aMatName.replace("fluid.", "");
 				aMatName = aMatName.substring(0, 1).toUpperCase() + aMatName.substring(1);
 			}			
-			tempCell = new BaseItemComponent(aMatName, aLocalized, aRGBa);
+			Logger.INFO("Generating cell for "+aMatName+", "+aLocalName);
+			tempCell = new BaseItemComponent(aMatName, aLocalName, aRGBa);
 			aFullContainer =  ItemUtils.getSimpleStack(tempCell);
 		}
 		
diff --git a/src/Java/gtPlusPlus/nei/NEI_GT_Config.java b/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
index 1c647210c0..06e02d273b 100644
--- a/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
+++ b/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
@@ -91,6 +91,10 @@ implements IConfigureNEI {
 		API.registerRecipeHandler(new DecayableRecipeHandler());
 		API.registerUsageHandler(new DecayableRecipeHandler());
 		
+		Logger.INFO("NEI Registration: Registering NEI handler for "+SpargingRecipeHandler.mNEIName);
+		API.registerRecipeHandler(new SpargingRecipeHandler());
+		API.registerUsageHandler(new SpargingRecipeHandler());
+		
 		// Hide Flasks
 		if (Utils.isClient()) {
 			codechicken.nei.api.API.addItemListEntry(GregtechItemList.VOLUMETRIC_FLASK_8k.get(1));
diff --git a/src/Java/gtPlusPlus/nei/NEI_IMC_Sender.java b/src/Java/gtPlusPlus/nei/NEI_IMC_Sender.java
index 16a8f9b677..e3712f5ab2 100644
--- a/src/Java/gtPlusPlus/nei/NEI_IMC_Sender.java
+++ b/src/Java/gtPlusPlus/nei/NEI_IMC_Sender.java
@@ -20,6 +20,7 @@ public class NEI_IMC_Sender {
         setNBTInfoAndSendIt("gtpp.recipe.fissionfuel", "gregtech:gt.blockmachines:835");
         setNBTInfoAndSendIt("gtpp.recipe.geothermalfuel", "gregtech:gt.blockmachines:830");
         setNBTInfoAndSendIt("gtpp.recipe.lftr", "gregtech:gt.blockmachines:751");
+        setNBTInfoAndSendIt("gtpp.recipe.lftr.sparging", "gregtech:gt.blockmachines:751");
         setNBTInfoAndSendIt("gtpp.recipe.matterfab2", "gregtech:gt.blockmachines:799");
         setNBTInfoAndSendIt("gtpp.recipe.multicentrifuge", "gregtech:gt.blockmachines:790");
         setNBTInfoAndSendIt("gtpp.recipe.multielectro", "gregtech:gt.blockmachines:796");
diff --git a/src/Java/gtPlusPlus/nei/SpargingRecipeHandler.java b/src/Java/gtPlusPlus/nei/SpargingRecipeHandler.java
new file mode 100644
index 0000000000..2373d55967
--- /dev/null
+++ b/src/Java/gtPlusPlus/nei/SpargingRecipeHandler.java
@@ -0,0 +1,317 @@
+package gtPlusPlus.nei;
+
+import java.awt.Rectangle;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import codechicken.nei.PositionedStack;
+import codechicken.nei.recipe.GuiRecipe;
+import codechicken.nei.recipe.TemplateRecipeHandler;
+import gregtech.api.enums.ItemList;
+import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GasSpargingRecipe;
+import gregtech.api.util.GasSpargingRecipeMap;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.gui.machine.GUI_DecayablesChest;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+
+public class SpargingRecipeHandler extends TemplateRecipeHandler {
+
+	public static final String mNEIName = GasSpargingRecipeMap.mNEIDisplayName;
+
+	public String getRecipeName() {
+		return mNEIName;
+	}
+
+	public String getGuiTexture() {
+		return GasSpargingRecipeMap.mNEIGUIPath;
+	}
+
+	public Class<? extends GuiContainer> getGuiClass() {
+		return GUI_DecayablesChest.class;
+	}
+
+	public String getOverlayIdentifier() {
+		return "GTPP_Sparging";
+	}
+
+	public int recipiesPerPage() {
+		return 1;
+	}
+
+	public void loadTransferRects() {
+		this.transferRects.add(new RecipeTransferRect(new Rectangle(72, 14, 22, 16), getOverlayIdentifier(), new Object[0]));
+	}
+
+	public void loadCraftingRecipes(ItemStack result) {
+		if (result == null) {
+			return;
+		}
+		if (result != null) {
+			//Logger.INFO("Looking up crafting recipes for "+ItemUtils.getItemName(result));
+		}
+		final List<GasSpargingRecipe> recipes = GasSpargingRecipeMap.mRecipes;
+		for (final GasSpargingRecipe recipe : recipes) {
+			if (recipe.isValid()) {				
+				final GasSpargingRecipeNEI rec = new GasSpargingRecipeNEI(recipe);
+				this.arecipes.add(rec);
+				sort();
+			}
+		}
+	}
+
+	public void loadCraftingRecipes(String outputId, Object... results) {
+		if (outputId.equals(getOverlayIdentifier()) && this.getClass() == SpargingRecipeHandler.class) {
+			final List<GasSpargingRecipe> recipes = GasSpargingRecipeMap.mRecipes;
+			for (final GasSpargingRecipe recipe : recipes) {
+				if (recipe.isValid()) {
+					final GasSpargingRecipeNEI rec = new GasSpargingRecipeNEI(recipe);
+					this.arecipes.add(rec);
+					sort();
+				}
+			}
+		} else {
+			super.loadCraftingRecipes(outputId, results);
+		}
+	}
+
+	public void loadUsageRecipes(ItemStack ingredient) {
+		final List<GasSpargingRecipe> recipes = GasSpargingRecipeMap.mRecipes;
+		if (ingredient != null) {
+			//Logger.INFO("Looking up Usage results for "+ItemUtils.getItemName(ingredient));
+		}
+		for (final GasSpargingRecipe recipe : recipes) {
+			if (recipe.isValid()) {
+				final GasSpargingRecipeNEI rec = new GasSpargingRecipeNEI(recipe);
+				this.arecipes.add(rec);
+				sort();
+			}
+		}
+	}
+
+	private final void sort() {
+		List<GasSpargingRecipeNEI> g = new ArrayList<GasSpargingRecipeNEI>();
+		for (CachedRecipe u : arecipes) {
+			g.add((GasSpargingRecipeNEI) u);
+		}
+		if (g != null && !g.isEmpty()) {
+			Collections.sort(g);
+		}
+	}
+
+	public void drawExtras(int recipeIndex) {
+		GasSpargingRecipeNEI recipe = (GasSpargingRecipeNEI) this.arecipes.get(recipeIndex);		
+		//NeiTextureHandler.RECIPE_BUTTON.renderIcon(72.0D, 14.0D, 22.0D, 16.0D, 0.0D, true);
+	}
+	
+	@Override
+	public List<String> handleItemTooltip(final GuiRecipe gui, final ItemStack aStack, final List<String> currenttip, final int aRecipeIndex) {
+		final TemplateRecipeHandler.CachedRecipe tObject = this.arecipes.get(aRecipeIndex);
+		if ((tObject instanceof GasSpargingRecipeNEI)) {
+			final GasSpargingRecipeNEI tRecipe = (GasSpargingRecipeNEI) tObject;
+			ItemStack aInput = tRecipe.mInputs.get(0).item;
+			for (final PositionedStack tStack : tRecipe.mOutputs) {
+				if (aStack == tStack.item) {
+					if (ItemList.Display_Fluid.isStackEqual(tStack.item, true, true) && ((FixedPositionedStack) tStack).mChance <= 10000) {						
+						if (GT_Utility.areStacksEqual(aStack, aInput, true)) {
+							currenttip.add("The amount returned is the remainder after all other outputs.");
+						}
+						currenttip.add("Maximum Output: " + (((FixedPositionedStack) tStack).mChance / 100) + "." + ((((FixedPositionedStack) tStack).mChance % 100) < 10 ? "0" + (((FixedPositionedStack) tStack).mChance % 100) : Integer.valueOf(((FixedPositionedStack) tStack).mChance % 100)) + "L");
+						break;
+					}
+					break;
+				}
+			}
+			for (final PositionedStack tStack : tRecipe.mInputs) {
+				if (GT_Utility.areStacksEqual(aStack, tStack.item)) {
+					if ((gregtech.api.enums.ItemList.Display_Fluid.isStackEqual(tStack.item, true, true)) ||
+							(tStack.item.stackSize != 0)) {
+						break;
+					}
+					if (ItemUtils.isControlCircuit(aStack)) {
+						currenttip.add("Does not get consumed in the process");					
+					}
+					break;
+				}
+			}
+		}
+		return currenttip;
+	}
+	
+	public class FixedPositionedStack
+	extends PositionedStack {
+		public final int mChance;
+		public boolean permutated = false;
+
+		public FixedPositionedStack(final Object object, final int x, final int y) {
+			this(object, x, y, 0);
+		}
+
+		public FixedPositionedStack(final Object object, final int x, final int y, final int aChance) {
+			super(object, x, y, true);
+			this.mChance = aChance;
+		}
+
+		@Override
+		public void generatePermutations() {
+			if (this.permutated) {
+				return;
+			}
+			final ArrayList<ItemStack> tDisplayStacks = new ArrayList<ItemStack>();
+			for (final ItemStack tStack : this.items) {
+				if (GT_Utility.isStackValid(tStack)) {
+					if (tStack.getItemDamage() == 32767) {
+						final List<ItemStack> permutations = codechicken.nei.ItemList.itemMap.get(tStack.getItem());
+						if (!permutations.isEmpty()) {
+							ItemStack stack;
+							for (final Iterator<ItemStack> i$ = permutations.iterator(); i$.hasNext(); tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, new Object[]{stack}))) {
+								stack = i$.next();
+							}
+						} else {
+							final ItemStack base = new ItemStack(tStack.getItem(), tStack.stackSize);
+							base.stackTagCompound = tStack.stackTagCompound;
+							tDisplayStacks.add(base);
+						}
+					} else {
+						tDisplayStacks.add(GT_Utility.copy(new Object[]{tStack}));
+					}
+				}
+			}
+			this.items = (tDisplayStacks.toArray(new ItemStack[0]));
+			if (this.items.length == 0) {
+				this.items = new ItemStack[]{new ItemStack(Blocks.fire)};
+			}
+			this.permutated = true;
+			this.setPermutationToRender(0);
+		}
+	}
+
+	public class GasSpargingRecipeNEI extends CachedRecipe implements Comparable<CachedRecipe> {
+
+		public final GasSpargingRecipe mRecipe;
+		public final List<PositionedStack> mOutputs = new ArrayList<PositionedStack>();
+		public final List<PositionedStack> mInputs = new ArrayList<PositionedStack>();
+
+		public GasSpargingRecipeNEI(GasSpargingRecipe tRecipe) {
+			super();
+			this.mRecipe = tRecipe;
+			int tStartIndex = 0;
+			if (tRecipe.mFluidInputs.length > 0) {
+				if ((tRecipe.mFluidInputs[0] != null) && (tRecipe.mFluidInputs[0].getFluid() != null)) {
+					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[0], true), 12, 5));
+				}
+				if ((tRecipe.mFluidInputs.length > 1) && (tRecipe.mFluidInputs[1] != null) && (tRecipe.mFluidInputs[1].getFluid() != null)) {
+					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[1], true), 30, 5));
+				}
+				if ((tRecipe.mFluidInputs.length > 2) && (tRecipe.mFluidInputs[2] != null) && (tRecipe.mFluidInputs[2].getFluid() != null)) {
+					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[2], true), 48, 5));
+				}
+				if ((tRecipe.mFluidInputs.length > 3) && (tRecipe.mFluidInputs[3] != null) && (tRecipe.mFluidInputs[3].getFluid() != null)) {
+					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[3], true), 12, 23));
+				}
+				if ((tRecipe.mFluidInputs.length > 4) && (tRecipe.mFluidInputs[4] != null) && (tRecipe.mFluidInputs[4].getFluid() != null)) {
+					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[4], true), 30, 23));
+				}
+				if ((tRecipe.mFluidInputs.length > 5) && (tRecipe.mFluidInputs[5] != null) && (tRecipe.mFluidInputs[5].getFluid() != null)) {
+					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[5], true), 48, 23));
+				}
+				if ((tRecipe.mFluidInputs.length > 6) && (tRecipe.mFluidInputs[6] != null) && (tRecipe.mFluidInputs[6].getFluid() != null)) {
+					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[6], true), 12, 41));
+				}
+				if ((tRecipe.mFluidInputs.length > 7) && (tRecipe.mFluidInputs[7] != null) && (tRecipe.mFluidInputs[7].getFluid() != null)) {
+					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[7], true), 30, 41));
+				}
+				if ((tRecipe.mFluidInputs.length > 8) && (tRecipe.mFluidInputs[8] != null) && (tRecipe.mFluidInputs[8].getFluid() != null)) {
+					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[8], true), 48, 41));
+				}
+			}
+
+			tStartIndex = 0;
+			if (tRecipe.mFluidOutputs.length > 0) {
+				if ((tRecipe.mFluidOutputs[0] != null) && (tRecipe.mFluidOutputs[0].getFluid() != null)) {
+					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[0], false), 102, 5, tRecipe.getMaxOutput(tStartIndex++)));
+				}
+				if ((tRecipe.mFluidOutputs.length > 1) && (tRecipe.mFluidOutputs[1] != null) && (tRecipe.mFluidOutputs[1].getFluid() != null)) {
+					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[1], false), 120, 5, tRecipe.getMaxOutput(tStartIndex++)));
+				}
+				if ((tRecipe.mFluidOutputs.length > 2) && (tRecipe.mFluidOutputs[2] != null) && (tRecipe.mFluidOutputs[2].getFluid() != null)) {
+					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[2], false), 138, 5, tRecipe.getMaxOutput(tStartIndex++)));
+				}
+				if ((tRecipe.mFluidOutputs.length > 3) && (tRecipe.mFluidOutputs[3] != null) && (tRecipe.mFluidOutputs[3].getFluid() != null)) {
+					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[3], false), 102, 23, tRecipe.getMaxOutput(tStartIndex++)));
+				}
+				if ((tRecipe.mFluidOutputs.length > 4) && (tRecipe.mFluidOutputs[4] != null) && (tRecipe.mFluidOutputs[4].getFluid() != null)) {
+					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[4], false), 120, 23, tRecipe.getMaxOutput(tStartIndex++)));
+				}
+				if ((tRecipe.mFluidOutputs.length > 5) && (tRecipe.mFluidOutputs[5] != null) && (tRecipe.mFluidOutputs[5].getFluid() != null)) {
+					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[5], false), 138, 23, tRecipe.getMaxOutput(tStartIndex++)));
+				}
+				if ((tRecipe.mFluidOutputs.length > 6) && (tRecipe.mFluidOutputs[6] != null) && (tRecipe.mFluidOutputs[6].getFluid() != null)) {
+					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[6], false), 102, 41, tRecipe.getMaxOutput(tStartIndex++)));
+				}
+				if ((tRecipe.mFluidOutputs.length > 7) && (tRecipe.mFluidOutputs[7] != null) && (tRecipe.mFluidOutputs[7].getFluid() != null)) {
+					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[7], false), 120, 41, tRecipe.getMaxOutput(tStartIndex++)));
+				}
+				if ((tRecipe.mFluidOutputs.length > 8) && (tRecipe.mFluidOutputs[8] != null) && (tRecipe.mFluidOutputs[8].getFluid() != null)) {
+					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[8], false), 138, 41, tRecipe.getMaxOutput(tStartIndex++)));
+				}
+				Logger.INFO("Outputs: "+tRecipe.mFluidOutputs.length);
+			}
+		}		
+
+		@Override
+		public int compareTo(CachedRecipe o) {
+			boolean b = GasSpargingRecipeNEI.class.isInstance(o);
+			if (b) {
+				GasSpargingRecipeNEI p = (GasSpargingRecipeNEI) o;
+				if (p.mOutputs.size() > this.mOutputs.size()) {
+					return 1;
+				} else if (p.mOutputs.size() == this.mOutputs.size()) {
+					return 0;
+				} else {
+					return -1;
+				}
+			}
+			return 0;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (obj != null) {
+				if (GasSpargingRecipeNEI.class.isInstance(obj)) {
+					GasSpargingRecipeNEI p = (GasSpargingRecipeNEI) obj;
+					if (p != null) {
+						if (GT_Utility.areStacksEqual(p.mInputs.get(0).item, this.mInputs.get(0).item, true)) {
+							if (p.mOutputs.size() == this.mOutputs.size()) {
+								return true;
+							}
+						}
+					}					
+				}
+			}
+			return false;
+		}
+
+		@Override
+		public List<PositionedStack> getIngredients() {
+			return this.getCycledIngredients(SpargingRecipeHandler.this.cycleticks / 10, this.mInputs);
+		}
+
+		@Override
+		public PositionedStack getResult() {
+			return null;
+		}
+
+		@Override
+		public List<PositionedStack> getOtherStacks() {
+			return this.mOutputs;
+		}
+		
+		
+	}
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
index 95d0419edf..a52b55234d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
@@ -658,7 +658,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase {
 		}
 		else {
 			// Try output some Uranium-233
-			if (MathUtils.randInt(300, 600) == 1){
+			if (MathUtils.randInt(1, 300) == 1){
 				this.addOutput(ELEMENT.getInstance().URANIUM233.getFluid(MathUtils.randInt(1, 10)));
 			}			
 			// Set a random tick counter, count it up.
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
index d5ca3211e9..173d11c97b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -298,7 +298,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
 									if (x.getStackMaterial() != null){
 										if (x.getStackMaterial().getDust(1) == null){
 											MaterialState f = x.getStackMaterial().getState();
-											if (f == MaterialState.GAS || f == MaterialState.LIQUID || f == MaterialState.PURE_LIQUID){
+											if (f == MaterialState.GAS || f == MaterialState.LIQUID || f == MaterialState.PURE_LIQUID || f == MaterialState.PURE_GAS){
 												oxygen = x.getStackMaterial().getFluid((int) (material.vSmallestRatio[compSlot] * 1000));
 											}
 										}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
index af692c8bbf..43097413be 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
@@ -1,17 +1,55 @@
 package gtPlusPlus.xmod.gregtech.loaders.recipe;
 
+import gregtech.api.enums.Materials;
 import gregtech.api.util.GTPP_Recipe;
 import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GasSpargingRecipe;
+import gregtech.api.util.GasSpargingRecipeMap;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.chemistry.NuclearChem;
+import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.material.nuclear.NUCLIDE;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
 public class RecipeLoader_LFTR {	
 
+	private static AutoMap<Fluid> mNobleGases;
+	private static AutoMap<Fluid> mFluorideGases;
+	private static AutoMap<Fluid> mSpargeGases;
+
+	private static void configureSparging() {
+		if (mSpargeGases == null) {
+			mSpargeGases = new AutoMap<Fluid>();
+			mSpargeGases.add(Materials.Helium.getGas(1).getFluid());
+			mSpargeGases.add(Materials.Fluorine.getGas(1).getFluid());
+		}
+		if (mNobleGases == null) {
+			mNobleGases = new AutoMap<Fluid>();
+			mNobleGases.add(mSpargeGases.get(0));
+			mNobleGases.add(ELEMENT.getInstance().XENON.getFluid(1).getFluid());
+			mNobleGases.add(ELEMENT.getInstance().NEON.getFluid(1).getFluid());
+			mNobleGases.add(ELEMENT.getInstance().ARGON.getFluid(1).getFluid());
+			mNobleGases.add(ELEMENT.getInstance().KRYPTON.getFluid(1).getFluid());
+			mNobleGases.add(ELEMENT.getInstance().RADON.getFluid(1).getFluid());
+		}
+		if (mFluorideGases == null) {
+			mFluorideGases = new AutoMap<Fluid>();
+			mFluorideGases.add(mSpargeGases.get(1));
+			mFluorideGases.add(FLUORIDES.LITHIUM_FLUORIDE.getFluid(1).getFluid());
+			mFluorideGases.add(FLUORIDES.NEPTUNIUM_HEXAFLUORIDE.getFluid(1).getFluid());
+			mFluorideGases.add(FLUORIDES.TECHNETIUM_HEXAFLUORIDE.getFluid(1).getFluid());
+			mFluorideGases.add(FLUORIDES.SELENIUM_HEXAFLUORIDE.getFluid(1).getFluid());
+			mFluorideGases.add(FLUORIDES.THORIUM_TETRAFLUORIDE.getFluid(1).getFluid());
+		}
+	}
+
 	public static void generate() {
 		// Fli2BeF4 + Thorium TetraFluoride = Uranium233
 		//72k Ticks/hr
@@ -19,21 +57,24 @@ public class RecipeLoader_LFTR {
 		//1l/40t = 1000l/10hr (Probably better) LiFBeF2ThF4UF4
 		//1l/20t= 1000l/2.5hr LiFBeF2ZrF4UF4
 		//1l/10t= 1000l/2.5hr LiFBeF2ZrF4U235
-		
+
+		configureSparging();
 		FluidStack Li2BeF4 = new FluidStack(ModItems.fluidFLiBeSalt, 34);
+		FluidStack aBurntLi2BeF4 = new FluidStack(ModItems.fluidFLiBeSaltBurnt, 34);
 
 		//LiFBeF2ThF4UF4
 		GT_Recipe LFTR1 = new GTPP_Recipe(
 				true, 
 				new ItemStack[] {},
 				new ItemStack[] {},
-				null, new int[] {10000, 5000, 2500},
+				null, new int[] {10000, 10000, 5000, 2500},
 				new FluidStack[] {
 						NUCLIDE.LiFBeF2ThF4UF4.getFluid(17),
 						Li2BeF4
 				},
 				new FluidStack[] {
 						new FluidStack(NuclearChem.Burnt_LiFBeF2ThF4UF4, 17),
+						aBurntLi2BeF4,
 						FluidUtils.getFluidStack("molten.uraniumhexafluoride", 10),
 						FluidUtils.getFluidStack("molten.uraniumhexafluoride", 5)
 				},
@@ -47,13 +88,14 @@ public class RecipeLoader_LFTR {
 				true, 
 				new ItemStack[] {},
 				new ItemStack[] {},
-				null, new int[] {10000, 2500, 1250},
+				null, new int[] {10000, 10000, 2500, 1250},
 				new FluidStack[] {
 						NUCLIDE.LiFBeF2ZrF4UF4.getFluid(17),
 						Li2BeF4
 				},
 				new FluidStack[] {
 						new FluidStack(NuclearChem.Burnt_LiFBeF2ZrF4UF4, 17),
+						aBurntLi2BeF4,
 						FluidUtils.getFluidStack("molten.uraniumhexafluoride", 4),
 						FluidUtils.getFluidStack("molten.uraniumhexafluoride", 2)						
 				},
@@ -67,13 +109,14 @@ public class RecipeLoader_LFTR {
 				true, 
 				new ItemStack[] {},
 				new ItemStack[] {},
-				null, new int[] {10000, 1000, 500},
+				null, new int[] {10000, 10000, 1000, 500},
 				new FluidStack[] {
 						NUCLIDE.LiFBeF2ZrF4U235.getFluid(17),
 						Li2BeF4
 				},
 				new FluidStack[] {
 						new FluidStack(NuclearChem.Burnt_LiFBeF2ZrF4U235, 17),
+						aBurntLi2BeF4,
 						FluidUtils.getFluidStack("molten.uraniumhexafluoride", 2),
 						FluidUtils.getFluidStack("molten.uraniumhexafluoride", 1)
 				},
@@ -82,13 +125,39 @@ public class RecipeLoader_LFTR {
 				8192//fuel value
 				);
 
-		/*mRecipesLFTR.add(LFTR1);
-		mRecipesLFTR.add(LFTR2);
-		mRecipesLFTR.add(LFTR3);*/		
+		// Sparging NEI Recipes
+		GasSpargingRecipeMap.addRecipe(
+				new FluidStack(mSpargeGases.get(0), 50),
+				new FluidStack[] {
+						new FluidStack(mNobleGases.get(0), 50),
+						new FluidStack(mNobleGases.get(1), 10),
+						new FluidStack(mNobleGases.get(2), 10),
+						new FluidStack(mNobleGases.get(3), 10),
+						new FluidStack(mNobleGases.get(4), 10),
+						new FluidStack(mNobleGases.get(5), 10)
+				},
+				new int[] {
+						5000, 1000, 1000, 1000, 1000, 1000
+				});
+
+		GasSpargingRecipeMap.addRecipe(
+				new FluidStack(mSpargeGases.get(1), 100),
+				new FluidStack[] {
+						new FluidStack(mFluorideGases.get(0), 100),
+						new FluidStack(mFluorideGases.get(1), 20),
+						new FluidStack(mFluorideGases.get(2), 20),
+						new FluidStack(mFluorideGases.get(3), 20),
+						new FluidStack(mFluorideGases.get(4), 20),
+						new FluidStack(mFluorideGases.get(5), 20)
+				},
+				new int[] {
+						10000, 2000, 2000, 2000, 2000, 2000
+				});
+	
 		GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.add(LFTR1);
 		GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.add(LFTR2);
 		GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.add(LFTR3);
-		
+
 
 	}
 }