+ Added new recipes for Hydrogen Chloride, Sodium Hydroxide, Brine.

+ Added new UV/IR laser lens.
$ Fixed Chemical formula not showing up correctly on some mixed materials.
$ Fixed Tooltips of Rare Earth materials being too long.
$ Fixed Voltage of Rare Earth materials being a tier too high.

3 files changed, 131 insertions, 61 deletions

diff --git a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
index 236af1b060..aa80f784a9 100644
--- a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
@@ -3,8 +3,8 @@ package gtPlusPlus.core.material;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.TextureSet;
 import gtPlusPlus.core.client.CustomTextureSet.TextureSets;
-import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.material.state.MaterialState;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 
 public final class MISC_MATERIALS {	
@@ -17,6 +17,7 @@ public final class MISC_MATERIALS {
 	public static void run() {
 		MaterialUtils.generateSpecialDustAndAssignToAMaterial(STRONTIUM_OXIDE, false);
 		MaterialUtils.generateSpecialDustAndAssignToAMaterial(STRONTIUM_HYDROXIDE, false);
+		WATER.registerComponentForMaterial(FluidUtils.getWater(1000));
 	}
 
 	public static final Material STRONTIUM_OXIDE = new Material(
@@ -52,7 +53,7 @@ public final class MISC_MATERIALS {
 			false,
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().STRONTIUM, 1),
-					new MaterialStack(FLUORIDES.HYDROXIDE, 2)
+					new MaterialStack(MISC_MATERIALS.HYDROXIDE, 2)
 			});
 
 	public static final Material SELENIUM_DIOXIDE = new Material(
@@ -116,14 +117,12 @@ public final class MISC_MATERIALS {
 					new MaterialStack(ELEMENT.getInstance().CARBON, 1),
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 2)
 			});
-	
-	
-	
-	
+
+
 	/*
 	 * Rare Earth Materials
 	 */
-	
+
 	public static final Material RARE_EARTH_LOW = new Material(
 			"Rare Earth (I)", //Material Name
 			MaterialState.ORE, //State
@@ -145,7 +144,7 @@ public final class MISC_MATERIALS {
 					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Cobaltite), 1),
 					new MaterialStack(ELEMENT.STANDALONE.BLACK_METAL, 1)
 			});
-	
+
 	public static final Material RARE_EARTH_MID = new Material(
 			"Rare Earth (II)", //Material Name
 			MaterialState.ORE, //State
@@ -167,7 +166,7 @@ public final class MISC_MATERIALS {
 					new MaterialStack(ELEMENT.STANDALONE.WHITE_METAL, 1),
 					new MaterialStack(ELEMENT.STANDALONE.RUNITE, 1)			
 			});
-	
+
 	public static final Material RARE_EARTH_HIGH = new Material(
 			"Rare Earth (III)", //Material Name
 			MaterialState.ORE, //State
@@ -190,6 +189,105 @@ public final class MISC_MATERIALS {
 					new MaterialStack(ORES.AGARDITE_LA, 1),
 			});
 
+	public static final Material WATER = new Material(
+			"Water",
+			MaterialState.PURE_LIQUID,
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 1)
+			});
+
+	//OH
+	public static final Material HYDROXIDE = new Material(
+			"Hydroxide", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 1),
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1)
+			});
+
+	//NH3
+	public static final Material AMMONIA = new Material(
+			"Ammonia", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-77, //Melting Point in C
+			-33, //Boiling Point in C
+			-1, //Protons
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().NITROGEN, 1),
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3)
+			});
+
+	//NH4
+	public static final Material AMMONIUM = new Material(
+			"Ammonium", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().NITROGEN, 1),
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 4)
+			});
+
+
+	public static final Material HYDROGEN_CHLORIDE = new Material(
+			"Hydrogen Chloride",
+			MaterialState.PURE_LIQUID,
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
+					new MaterialStack(ELEMENT.getInstance().CHLORINE, 1),
+			});
+
+
+	public static final Material SODIUM_CHLORIDE = new Material(
+			"Sodium Chloride",
+			MaterialState.PURE_LIQUID,
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().SODIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().CHLORINE, 1),
+			});
+
+
+	public static final Material SODIUM_HYDROXIDE = new Material(
+			"Sodium Hydroxide",
+			MaterialState.PURE_LIQUID,
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().SODIUM, 1),
+					new MaterialStack(HYDROXIDE, 1),
+			});
+
+	public static final Material SALT_WATER = new Material(
+			"Salt Water",
+			MaterialState.PURE_LIQUID,
+			new MaterialStack[]{
+					new MaterialStack(WATER, 3),
+					new MaterialStack(SODIUM_CHLORIDE, 1),
+			});
+
+	public static final Material BRINE = new Material(
+			"Brine",
+			MaterialState.PURE_LIQUID,
+			new MaterialStack[]{
+					new MaterialStack(SALT_WATER, 1),
+					new MaterialStack(SODIUM_CHLORIDE, 2),
+			});
+
 
 
 }
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 5fca2fb2fe..904d1fb4df 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -85,8 +85,17 @@ public class Material {
 
 
 	public static AutoMap<Materials> invalidMaterials = new AutoMap<Materials>();
+	
+
+	public Material(final String materialName, final MaterialState defaultState, final MaterialStack... inputs){
+		this(materialName, defaultState, null, inputs);
+	}
+	
+	public Material(final String materialName, final MaterialState defaultState, final short[] rgba, final MaterialStack... inputs){
+		this(materialName, defaultState, null, 0, rgba, -1, -1, -1, -1, false, "", 0, false, false, inputs);
+	}
 
-	public Material(String materialName, MaterialState defaultState, short[] rgba, int radiationLevel, MaterialStack[] materialStacks) {
+	public Material(final String materialName, final MaterialState defaultState, final short[] rgba, int radiationLevel, MaterialStack... materialStacks) {
 		this(materialName, defaultState, null, 0, rgba, -1, -1, -1, -1, false, "", radiationLevel, false, materialStacks);
 	}
 
@@ -1335,7 +1344,17 @@ public class Material {
 	}
 	
 	
+	public boolean registerComponentForMaterial(FluidStack aStack) {
+		return registerComponentForMaterial(this, aStack);
+	}
 	
+	private static boolean registerComponentForMaterial(Material componentMaterial, FluidStack aStack) {		
+		if (componentMaterial != null && aStack != null && componentMaterial.vMoltenFluid == null) {
+			componentMaterial.vMoltenFluid = aStack.getFluid();
+			return true;
+		}
+		return false;
+	}
 	
 	public boolean registerComponentForMaterial(ComponentTypes aPrefix, ItemStack aStack) {
 		return registerComponentForMaterial(this, aPrefix.getGtOrePrefix(), aStack);
diff --git a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
index b7a5f6074d..bfa08d3c29 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
@@ -3,6 +3,7 @@ package gtPlusPlus.core.material.nuclear;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.TextureSet;
 import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.MISC_MATERIALS;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.material.state.MaterialState;
@@ -166,54 +167,6 @@ public class FLUORIDES {
 
 	//LFTR sub components
 	
-	//OH
-	public static final Material HYDROXIDE = new Material(
-			"Hydroxide", //Material Name
-			MaterialState.PURE_LIQUID, //State
-			null, //Material Colour
-			-1, //Melting Point in C
-			-1, //Boiling Point in C
-			-1, //Protons
-			-1,
-			false, //Uses Blast furnace?
-			//Material Stacks with Percentage of required elements.
-			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 1),
-					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1)
-			});
-	
-	//NH3
-	public static final Material AMMONIA = new Material(
-			"Ammonia", //Material Name
-			MaterialState.PURE_LIQUID, //State
-			null, //Material Colour
-			-77, //Melting Point in C
-			-33, //Boiling Point in C
-			-1, //Protons
-			-1,
-			false, //Uses Blast furnace?
-			//Material Stacks with Percentage of required elements.
-			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().NITROGEN, 1),
-					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3)
-			});
-	
-	//NH4
-	public static final Material AMMONIUM = new Material(
-			"Ammonium", //Material Name
-			MaterialState.PURE_LIQUID, //State
-			null, //Material Colour
-			-1, //Melting Point in C
-			-1, //Boiling Point in C
-			-1, //Protons
-			-1,
-			false, //Uses Blast furnace?
-			//Material Stacks with Percentage of required elements.
-			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().NITROGEN, 1),
-					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 4)
-			});
-	
 	//(NH4)HF2
 	public static final Material AMMONIUM_BIFLUORIDE = new Material(
 			"Ammonium Bifluoride", //Material Name
@@ -226,7 +179,7 @@ public class FLUORIDES {
 			false, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(FLUORIDES.AMMONIUM, 1),
+					new MaterialStack(MISC_MATERIALS.AMMONIUM, 1),
 					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
 					new MaterialStack(ELEMENT.getInstance().FLUORINE, 2)
 			});
@@ -244,7 +197,7 @@ public class FLUORIDES {
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 1),
-					new MaterialStack(FLUORIDES.HYDROXIDE, 2)
+					new MaterialStack(MISC_MATERIALS.HYDROXIDE, 2)
 			});
 	
 	// (NH4)2Be(OH)2 / (NH4)2BeF4
@@ -259,7 +212,7 @@ public class FLUORIDES {
 			false, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(FLUORIDES.AMMONIUM, 2),
+					new MaterialStack(MISC_MATERIALS.AMMONIUM, 2),
 					new MaterialStack(FLUORIDES.BERYLLIUM_HYDROXIDE, 1)
 			});