Merge pull request #50 from GTNewHorizons/gtnh-milling

Milling/Nuclear Sciences revamp + Lots of minor fixes

2 files changed, 262 insertions, 1 deletions

diff --git a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
index bfa08d3c29..5872587872 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
@@ -1,7 +1,6 @@
 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;
@@ -263,6 +262,21 @@ public class FLUORIDES {
 					new MaterialStack(ELEMENT.getInstance().SELENIUM, 1),
 					new MaterialStack(ELEMENT.getInstance().FLUORINE, 6)
 			});
+	
+	public static final Material SODIUM_FLUORIDE = new Material(
+			"Sodium Fluoride", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().SODIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().FLUORINE, 1)
+			});
 
 	private static final FLUORIDES INSTANCE = new FLUORIDES();
 	public static FLUORIDES getInstance(){return INSTANCE;}
diff --git a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
index 73751ac49d..9bc7459f0e 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
@@ -10,6 +10,24 @@ import gtPlusPlus.core.util.data.StringUtils;
 
 public final class NUCLIDE {
 
+	public static final Material Li2BeF4 = new Material(
+			"Lithium Tetrafluoroberyllate", //Material Name
+			MaterialState.LIQUID, //State
+			TextureSets.NUCLEAR.get(),
+			null, //Material Colour
+			566, //Melting Point in C
+			870, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			StringUtils.subscript(StringUtils.superscript("7")+"Li2BeF4"), //Chemical Formula
+			4, //Radioactivity Level
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 2),
+					new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1)
+			});
+	
 	public static final Material LiFBeF2ThF4UF4 = new Material(
 			"LiFBeF2ThF4UF4", //Material Name
 			MaterialState.LIQUID, //State
@@ -69,6 +87,235 @@ public final class NUCLIDE {
 					new MaterialStack(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE, 6),
 					new MaterialStack(ELEMENT.getInstance().URANIUM235, 14)
 			});
+	
+	// Misc	
+	public static final Material BurntLftrFuel_MK1 = new Material(
+			"Burnt Reactor Fuel I", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			StringUtils.subscript(StringUtils.superscript("7")+"LiBeF2UF4FP"), //Chemical Formula
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().LITHIUM, 1),
+					new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
+					new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
+					new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1)
+			});
+	
+	public static final Material BurntLftrFuel_MK2 = new Material(
+			"Burnt Reactor Fuel II", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			StringUtils.subscript(StringUtils.superscript("7")+"LiBeF2UF4FP"), //Chemical Formula
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().LITHIUM, 1),
+					new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
+					new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
+					new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1)
+			});
+	
+	
+	
+	// LFTR Core Fluids
+	public static final Material LiFBeF2UF4FP = new Material(
+			"LiFBeF2UF4FP", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2UF4FP"), //Chemical Formula
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+					new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
+					new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
+					new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1)
+			});
+	
+	public static final Material Sparged_LiFBeF2UF4FP = new Material(
+			"Helium Sparged LiFBeF2UF4FP", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2UF4FP"), //Chemical Formula
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+					new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
+					new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
+					new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1)
+			});
+	
+	public static final Material UF6F2FP = new Material(
+			"UF6F2FP", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			StringUtils.subscript("UF6F2FP"), //Chemical Formula
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(FLUORIDES.URANIUM_HEXAFLUORIDE, 1),
+					new MaterialStack(ELEMENT.getInstance().FLUORINE, 3),
+					new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1)
+			});
+	
+	public static final Material LiFBeF2 = new Material(
+			"LiFBeF2", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2"), //Chemical Formula
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+					new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1)
+			});
+	
+	public static final Material LiFBeF2UF4 = new Material(
+			"LiFBeF2UF4", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2UF4"), //Chemical Formula
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(LiFBeF2, 1),
+					new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1)
+			});
+	
+	
+	
+	
+	
+	
+	// LFTR Blanket Fluids
+
+	// Tier 1 Fuel blanket output
+	public static final Material LiFThF4 = new Material(
+			"LiFThF4", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			StringUtils.subscript(StringUtils.superscript("7")+"LiFThF4"), //Chemical Formula
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+					new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1)
+			});
+	
+	// Tier 2 Fuel blanket output
+	public static final Material LiFBeF2ThF4 = new Material(
+			"LiFBeF2ThF4", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2ThF4"), //Chemical Formula
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+					new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
+					new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1)
+			});
+	
+	// Tier 1 Fuel blanket output
+	public static final Material Sparged_LiFThF4 = new Material(
+			"Fluorine Sparged LiFThF4", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			StringUtils.subscript(StringUtils.superscript("7")+"LiFThF4"), //Chemical Formula
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+					new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1)
+			});
+	
+	// Tier 2 Fuel blanket output
+	public static final Material Sparged_LiFBeF2ThF4 = new Material(
+			"Fluorine Sparged LiFBeF2ThF4", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2ThF4"), //Chemical Formula
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+					new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
+					new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1)
+			});
+	
+	public static final Material UF6F2 = new Material(
+			"UF6F2", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
+			StringUtils.subscript("UF6F2"), //Chemical Formula
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(FLUORIDES.URANIUM_HEXAFLUORIDE, 1),
+					new MaterialStack(ELEMENT.getInstance().FLUORINE, 2)
+			});
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 	// Secondary material is molten metal
 	public static final Material NAQ_FUEL_T1 = new Material(