Merge branch 'master' of https://github.com/draknyte1/GTplusplus

1 files changed, 100 insertions, 7 deletions

diff --git a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
index e4576eea7b..87830ab493 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
@@ -106,11 +106,11 @@ public class FLUORIDES {
 	public static final Material BERYLLIUM_FLUORIDE = new Material(
 			"Beryllium Fluoride", //Material Name
 			MaterialState.LIQUID, //State
-			new short[]{120, 180, 120, 0}, //Material Colour
-			Materials.Beryllium.mMeltingPoint, //Melting Point in C
-			Materials.Beryllium.mBlastFurnaceTemp, //Boiling Point in C
-			((ELEMENT.getInstance().BERYLLIUM.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()*2))/3), //Protons
-			((ELEMENT.getInstance().BERYLLIUM.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()*2))/3), //Neutrons
+			new short[]{120, 210, 120, 0}, //Material Colour
+			-1,
+			-1,
+			-1,
+			-1,
 			false, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
@@ -134,9 +134,102 @@ 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)
+			});
+	
+	public static final Material AMMONIUM_TETRAFLUOROBERYLLATE = new Material(
+			"Ammonium Tetrafluoroberyllate", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			new short[]{140, 220, 140, 0}, //Material Colour
+			280, //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(FLUORIDES.AMMONIUM, 2),
+					new MaterialStack(FLUORIDES.BERYLLIUM_HYDROXIDE, 1)
+			});
+	
+	
+	
 	//LFTR Output
-
-
 	public static final Material NEPTUNIUM_HEXAFLUORIDE = new Material(
 			"Neptunium Hexafluoride", //Material Name
 			MaterialState.GAS, //State