Added NEI handler for LFTR Sparging.

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

8 files changed, 57 insertions, 19 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);
 		}