+ Added Hydroxide, Ammonia, Ammonium, Ammonium Bifluoride, Beryllium Hydroxide.

+ Added a material state that doesn't generate anything except a fluid.

3 files changed, 92 insertions, 6 deletions

diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
index fd53a9be4d..4e4b410ccc 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -17,7 +17,9 @@ import gtPlusPlus.core.item.base.rotors.BaseItemRotor;
 import gtPlusPlus.core.item.base.screws.BaseItemScrew;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.fluid.FluidUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import gtPlusPlus.xmod.gregtech.loaders.*;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
@@ -33,7 +35,7 @@ public class MaterialGenerator {
 		generate(matInfo, generateEverything, true);
 	}
 
-	public static void generate(final Material matInfo, final boolean generateEverything, final boolean generateBlastSmelterRecipes){
+	public static boolean generate(final Material matInfo, final boolean generateEverything, final boolean generateBlastSmelterRecipes){
 		final String unlocalizedName = matInfo.getUnlocalizedName();
 		final String materialName = matInfo.getLocalizedName();
 		final short[] C = matInfo.getRGBA();
@@ -114,6 +116,10 @@ public class MaterialGenerator {
 			temp = new BaseItemNugget(matInfo);
 			temp = new BaseItemPlate(matInfo);
 			temp = new BaseItemPlateDouble(matInfo);
+		}		
+		else if (matInfo.getState() == MaterialState.PURE_LIQUID){
+			//FluidUtils.generateFluidNoPrefix(unlocalizedName,	materialName, matInfo.getMeltingPointK(), C);
+			return true;
 		}
 
 		//Add A jillion Recipes - old code
@@ -125,7 +131,7 @@ public class MaterialGenerator {
 		RecipeGen_Fluids.generateRecipes(matInfo);
 		RecipeGen_Plates.generateRecipes(matInfo);
 		RecipeGen_ShapedCrafting.generateRecipes(matInfo);
-
+		return true;
 	}
 	
 	public static void generateDusts(final Material matInfo){
diff --git a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
index e4576eea7b..04d41d8e30 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
@@ -105,7 +105,7 @@ public class FLUORIDES {
 
 	public static final Material BERYLLIUM_FLUORIDE = new Material(
 			"Beryllium Fluoride", //Material Name
-			MaterialState.LIQUID, //State
+			MaterialState.PURE_LIQUID, //State
 			new short[]{120, 180, 120, 0}, //Material Colour
 			Materials.Beryllium.mMeltingPoint, //Melting Point in C
 			Materials.Beryllium.mBlastFurnaceTemp, //Boiling Point in C
@@ -134,9 +134,88 @@ public class FLUORIDES {
 			});
 
 
+	//LFTR sub components
+	
+	public static final Material HYDROXIDE = new Material(
+			"Hydroxide", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			new short[]{240, 220, 240, 0}, //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)
+			});
+	
+	public static final Material AMMONIA = new Material(
+			"Ammonia", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			new short[]{240, 220, 240, 0}, //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)
+			});
+	
+	public static final Material AMMONIUM = new Material(
+			"Ammonium", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			new short[]{240, 220, 240, 0}, //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 AMMONIUM_BIFLUORIDE = new Material(
+			"Ammonium Bifluoride", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			new short[]{240, 220, 240, 0}, //Material Colour
+			126, //Melting Point in C
+			240, //Boiling Point in C
+			-1, //Protons
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(FLUORIDES.AMMONIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
+					new MaterialStack(ELEMENT.getInstance().FLUORINE, 2)
+			});
+	
+	public static final Material BERYLLIUM_HYDROXIDE = new Material(
+			"Beryllium Hydroxide", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			new short[]{180, 250, 180, 0}, //Material Colour
+			1000, //Melting Point in C
+			-1, //Boiling Point in C
+			-1,
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 1),
+					new MaterialStack(FLUORIDES.HYDROXIDE, 2)
+			});
+	
+	
+	
+	
 	//LFTR Output
-
-
 	public static final Material NEPTUNIUM_HEXAFLUORIDE = new Material(
 			"Neptunium Hexafluoride", //Material Name
 			MaterialState.GAS, //State
diff --git a/src/Java/gtPlusPlus/core/material/state/MaterialState.java b/src/Java/gtPlusPlus/core/material/state/MaterialState.java
index 200e80e8ab..88447395db 100644
--- a/src/Java/gtPlusPlus/core/material/state/MaterialState.java
+++ b/src/Java/gtPlusPlus/core/material/state/MaterialState.java
@@ -4,7 +4,8 @@ public enum MaterialState {
 	SOLID(0),
 	LIQUID(1),
 	GAS(2),
-	PLASMA(3);
+	PLASMA(3),
+	PURE_LIQUID(4);
 	private int STATE;
 	private MaterialState (final int State){
 		this.STATE = State;