+ Added MaterialState.java

% Changed handling of Fluid generation for materials to now use MaterialState, instead of always being a molten metal.

2 files changed, 21 insertions, 5 deletions

diff --git a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
index 8c4c797e12..a95703349e 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
@@ -2,6 +2,7 @@ package gtPlusPlus.core.material.nuclear;
 
 import gregtech.api.enums.Materials;
 import gtPlusPlus.core.material.*;
+import gtPlusPlus.core.material.state.MaterialState;
 
 public class FLUORIDES {
 
@@ -11,6 +12,7 @@ public class FLUORIDES {
 	
 	public static final Material FLUORITE = new Material(
 			"Fluorite", //Material Name
+			 MaterialState.SOLID, //State
 			new short[]{75, 70, 25, 0}, //Material Colour
 			Materials.Fluorine.mMeltingPoint, //Melting Point in C
 			Materials.Fluorine.mBlastFurnaceTemp, //Boiling Point in C
@@ -25,6 +27,7 @@ public class FLUORIDES {
 
 	public static final Material THORIUM_TETRAFLUORIDE = new Material(
 	"Thorium Tetrafluoride", //Material Name
+	 MaterialState.LIQUID, //State
 	new short[]{25, 70, 25, 0}, //Material Colour
 	Materials.Thorium.mMeltingPoint, //Melting Point in C
 	Materials.Thorium.mBlastFurnaceTemp, //Boiling Point in C
@@ -39,6 +42,7 @@ public class FLUORIDES {
 
 	public static final Material THORIUM_HEXAFLUORIDE = new Material(
 	"Thorium Hexafluoride", //Material Name
+	 MaterialState.LIQUID, //State
 	new short[]{10, 50, 10, 0}, //Material Colour
 	Materials.Thorium.mMeltingPoint, //Melting Point in C
 	Materials.Thorium.mBlastFurnaceTemp, //Boiling Point in C
@@ -54,6 +58,7 @@ public class FLUORIDES {
 	
 	public static final Material URANIUM_TETRAFLUORIDE = new Material(
 			"Uranium Tetrafluoride", //Material Name
+			 MaterialState.LIQUID, //State
 			new short[]{50, 240, 50, 0}, //Material Colour
 			Materials.Uranium235.mMeltingPoint, //Melting Point in C
 			Materials.Uranium235.mBlastFurnaceTemp, //Boiling Point in C
@@ -68,6 +73,7 @@ public class FLUORIDES {
 	
 	public static final Material URANIUM_HEXAFLUORIDE = new Material(
 			"Uranium Hexafluoride", //Material Name
+			 MaterialState.LIQUID, //State
 			new short[]{70, 250, 70, 0}, //Material Colour
 			Materials.Uranium235.mMeltingPoint, //Melting Point in C
 			Materials.Uranium235.mBlastFurnaceTemp, //Boiling Point in C
@@ -84,6 +90,7 @@ public class FLUORIDES {
 	
 	public static final Material ZIRCONIUM_TETRAFLUORIDE = new Material(
 			"Zirconium Tetrafluoride", //Material Name
+			 MaterialState.LIQUID, //State
 			ELEMENT.getInstance().ZIRCONIUM.getRGBA(), //Material Colour
 			ELEMENT.getInstance().ZIRCONIUM.getMeltingPointC(), //Melting Point in C
 			ELEMENT.getInstance().ZIRCONIUM.getBoilingPointC(), //Boiling Point in C
@@ -98,6 +105,7 @@ public class FLUORIDES {
 	
 	public static final Material BERYLLIUM_FLUORIDE = new Material(
 			"Beryllium Tetrafluoride", //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
@@ -112,6 +120,7 @@ public class FLUORIDES {
 	
 	public static final Material LITHIUM_FLUORIDE = new Material(
 			"Lithium Tetrafluoride", //Material Name
+			 MaterialState.LIQUID, //State
 			new short[]{225, 220, 255, 0}, //Material Colour
 			Materials.Lithium.mMeltingPoint, //Melting Point in C
 			Materials.Lithium.mBlastFurnaceTemp, //Boiling Point in C
@@ -130,6 +139,7 @@ public class FLUORIDES {
 	
 	public static final Material NEPTUNIUM_HEXAFLUORIDE = new Material(
 			"Neptunium Hexafluoride", //Material Name
+			 MaterialState.GAS, //State
 			ELEMENT.getInstance().NEPTUNIUM.getRGBA(), //Material Colour
 			ELEMENT.getInstance().NEPTUNIUM.getMeltingPointC(), //Melting Point in C
 			ELEMENT.getInstance().NEPTUNIUM.getBoilingPointC(), //Boiling Point in C
@@ -144,6 +154,7 @@ public class FLUORIDES {
 	
 	public static final Material TECHNETIUM_HEXAFLUORIDE = new Material(
 			"Technetium Hexafluoride", //Material Name
+			 MaterialState.GAS, //State
 			ELEMENT.getInstance().TECHNETIUM.getRGBA(), //Material Colour
 			ELEMENT.getInstance().TECHNETIUM.getMeltingPointC(), //Melting Point in C
 			ELEMENT.getInstance().TECHNETIUM.getBoilingPointC(), //Boiling Point in C
@@ -158,6 +169,7 @@ public class FLUORIDES {
 	
 	public static final Material SELENIUM_HEXAFLUORIDE = new Material(
 			"Selenium Hexafluoride", //Material Name
+			 MaterialState.GAS, //State
 			ELEMENT.getInstance().SELENIUM.getRGBA(), //Material Colour
 			ELEMENT.getInstance().SELENIUM.getMeltingPointC(), //Melting Point in C
 			ELEMENT.getInstance().SELENIUM.getBoilingPointC(), //Boiling Point in C
diff --git a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
index a94d8a5077..f598102630 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
@@ -2,6 +2,7 @@ package gtPlusPlus.core.material.nuclear;
 
 import gregtech.api.enums.Materials;
 import gtPlusPlus.core.material.*;
+import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.materials.MaterialUtils;
 
 
@@ -12,16 +13,17 @@ public final class NUCLIDE {
 	public static NUCLIDE getInstance(){return thisClass;}
 
 	//Custom Isotopes
-	public final Material LITHIUM7 = new Material("Lithium 7", Materials.Lithium.mRGBa, Materials.Lithium.mMeltingPoint, Materials.Lithium.mBlastFurnaceTemp, Materials.Lithium.getProtons(), Materials.Lithium.getNeutrons(), Materials.Lithium.mBlastFurnaceRequired, MaterialUtils.superscript("7Li"), 0);//Not a GT Inherited Material
-	public final Material URANIUM232 = new Material("Uranium 232", new short[]{88, 220, 103, 0}, 1132, 4131, 92, 140, false, MaterialUtils.superscript("232U"), 4);//Not a GT Inherited Material
-	public final Material URANIUM233 = new Material("Uranium 233", new short[]{73, 220, 83, 0}, 1132, 4131, 92, 141, false, MaterialUtils.superscript("233U"), 2);//Not a GT Inherited Material
-	public final Material THORIUM232 = new Material("Thorium 232", new short[]{15, 60, 15, 0}, Materials.Thorium.mMeltingPoint, Materials.Thorium.mBlastFurnaceTemp, 90, 142, false, MaterialUtils.superscript("232Th"), 1);//Not a GT Inherited Material
-	public final Material PLUTONIUM238 = new Material("Plutonium-238", 51200, Materials.Plutonium241.mRGBa, Materials.Plutonium241.mMeltingPoint, Materials.Plutonium241.mBlastFurnaceTemp, 94, 144, false, MaterialUtils.superscript("238Pu"), 2);//Not a GT Inherited Material
+	public final Material LITHIUM7 = new Material("Lithium 7", MaterialState.LIQUID, Materials.Lithium.mRGBa, Materials.Lithium.mMeltingPoint, Materials.Lithium.mBlastFurnaceTemp, Materials.Lithium.getProtons(), Materials.Lithium.getNeutrons(), Materials.Lithium.mBlastFurnaceRequired, MaterialUtils.superscript("7Li"), 0);//Not a GT Inherited Material
+	public final Material URANIUM232 = new Material("Uranium 232", MaterialState.SOLID, new short[]{88, 220, 103, 0}, 1132, 4131, 92, 140, false, MaterialUtils.superscript("232U"), 4);//Not a GT Inherited Material
+	public final Material URANIUM233 = new Material("Uranium 233", MaterialState.SOLID, new short[]{73, 220, 83, 0}, 1132, 4131, 92, 141, false, MaterialUtils.superscript("233U"), 2);//Not a GT Inherited Material
+	public final Material THORIUM232 = new Material("Thorium 232", MaterialState.SOLID, new short[]{15, 60, 15, 0}, Materials.Thorium.mMeltingPoint, Materials.Thorium.mBlastFurnaceTemp, 90, 142, false, MaterialUtils.superscript("232Th"), 1);//Not a GT Inherited Material
+	public final Material PLUTONIUM238 = new Material("Plutonium-238", MaterialState.SOLID, Materials.Plutonium241.mDurability, Materials.Plutonium241.mRGBa, Materials.Plutonium241.mMeltingPoint, Materials.Plutonium241.mBlastFurnaceTemp, 94, 144, false, MaterialUtils.superscript("238Pu"), 2);//Not a GT Inherited Material
 	
 	
 	
 	public static final Material LiFBeF2ThF4UF4 = new Material(
 			"LiFBeF2ThF4UF4", //Material Name
+			 MaterialState.LIQUID, //State
 			new short[]{40, 90, 25, 0}, //Material Colour
 			566, //Melting Point in C
 			870, //Boiling Point in C
@@ -40,6 +42,7 @@ public final class NUCLIDE {
 	
 	public static final Material LiFBeF2ZrF4UF4 = new Material(
 			"LiFBeF2ZrF4UF4", //Material Name
+			 MaterialState.LIQUID, //State
 			new short[]{20, 70, 45, 0}, //Material Colour
 			650, //Melting Point in C
 			940, //Boiling Point in C
@@ -58,6 +61,7 @@ public final class NUCLIDE {
 	
 	public static final Material LiFBeF2ZrF4U235 = new Material(
 			"LiFBeF2ZrF4U235", //Material Name
+			 MaterialState.LIQUID, //State
 			new short[]{50, 70, 15, 0}, //Material Colour
 			590, //Melting Point in C
 			890, //Boiling Point in C