+ Added new Radioactive ore.

+ Added Custom Nuclear Texture Set.
% More material work.
$ Fixed issue allowing Multiblocks to have > 1 Control Core Hatch.
$ Fixed Broken Ore texture for ENRICHED TextureSet.
$ Fixed a few fluid recipes broken in the refactor.

2 files changed, 102 insertions, 76 deletions

diff --git a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
index c00ba42c68..b7a5f6074d 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
@@ -1,7 +1,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.Material;
 import gtPlusPlus.core.material.MaterialStack;
@@ -11,12 +11,12 @@ public class FLUORIDES {
 
 	public static final Material FLUORITE = new Material(
 			"Fluorite", //Material Name
-			MaterialState.SOLID, //State
-			new short[]{75, 70, 25, 0}, //Material Colour
+			MaterialState.ORE, //State
+			null, //Material Colour
 			Materials.Fluorine.mMeltingPoint, //Melting Point in C
 			Materials.Fluorine.mBlastFurnaceTemp, //Boiling Point in C
-			((ELEMENT.getInstance().CALCIUM.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()*2))/3), //Protons
-			((ELEMENT.getInstance().CALCIUM.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()*2))/3), //Neutrons
+			-1, //Protons
+			-1, //Neutrons
 			false, //Uses Blast furnace?
 			false, //Generate cells
 			//Material Stacks with Percentage of required elements.
@@ -24,19 +24,18 @@ public class FLUORIDES {
 					new MaterialStack(ELEMENT.getInstance().CALCIUM, 16),
 					new MaterialStack(ELEMENT.getInstance().FLUORINE, 32),
 					new MaterialStack(ELEMENT.getInstance().IRON, 4),
-					new MaterialStack(ELEMENT.getInstance().CARBON, 2),
-					new MaterialStack(ELEMENT.getInstance().COBALT, 2)
+					new MaterialStack(ELEMENT.getInstance().CARBON, 2)
 			});
 
 	//ThF4
 	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
-			((ELEMENT.getInstance().THORIUM232.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()*4))/5), //Protons
-			((ELEMENT.getInstance().THORIUM232.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()*4))/5), //Neutrons
+			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[]{
@@ -48,11 +47,11 @@ 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
-			((ELEMENT.getInstance().THORIUM232.getProtons()+ELEMENT.getInstance().THORIUM232.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()*6))/8), //Protons
-			((ELEMENT.getInstance().THORIUM232.getNeutrons()+ELEMENT.getInstance().THORIUM232.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()*6))/8), //Neutrons
+			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[]{
@@ -65,11 +64,11 @@ 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
-			((ELEMENT.getInstance().URANIUM233.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()*4))/5), //Protons
-			((ELEMENT.getInstance().URANIUM233.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()*4))/5), //Neutrons
+			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[]{
@@ -81,11 +80,11 @@ 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
-			((FLUORIDES.URANIUM_TETRAFLUORIDE.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()*2))/3), //Protons
-			((FLUORIDES.URANIUM_TETRAFLUORIDE.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()*2))/3), //Neutrons
+			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[]{
@@ -94,26 +93,49 @@ public class FLUORIDES {
 			});
 
 	//ZrF4
+	
 	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
-			((ELEMENT.getInstance().ZIRCONIUM.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()*4))/5), //Protons
-			((ELEMENT.getInstance().ZIRCONIUM.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()*4))/5), //Neutrons
+			null, //Texture Set (Autogenerated)
+			0,
+			null, //Material Colour
+			-1, 
+			-1, 
+			-1, 
+			-1,
+			false,
+			"ZrF4", 
+			-1, 
+			true,
+			false, 
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().FLUORINE, 4)
+			});
+	
+
+	
+/*	public static final Material ZIRCONIUM_TETRAFLUORIDE = new Material(
+			"Zirconium Tetrafluoride", //Material Name
+			MaterialState.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().ZIRCONIUM, 1),
 					new MaterialStack(ELEMENT.getInstance().FLUORINE, 4)
-			});
+			});*/
 
 	//BeF2
 	public static final Material BERYLLIUM_FLUORIDE = new Material(
 			"Beryllium Fluoride", //Material Name
 			MaterialState.LIQUID, //State
-			new short[]{120, 210, 120, 0}, //Material Colour
+			null, //Material Colour
 			-1,
 			-1,
 			-1,
@@ -129,11 +151,11 @@ public class FLUORIDES {
 	public static final Material LITHIUM_FLUORIDE = new Material(
 			"Lithium Fluoride", //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
-			((ELEMENT.getInstance().LITHIUM7.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()))/2), //Protons
-			((ELEMENT.getInstance().LITHIUM7.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()))/2), //Neutrons
+			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[]{
@@ -148,7 +170,7 @@ public class FLUORIDES {
 	public static final Material HYDROXIDE = new Material(
 			"Hydroxide", //Material Name
 			MaterialState.PURE_LIQUID, //State
-			new short[]{240, 220, 240, 0}, //Material Colour
+			null, //Material Colour
 			-1, //Melting Point in C
 			-1, //Boiling Point in C
 			-1, //Protons
@@ -164,7 +186,7 @@ public class FLUORIDES {
 	public static final Material AMMONIA = new Material(
 			"Ammonia", //Material Name
 			MaterialState.PURE_LIQUID, //State
-			new short[]{240, 220, 240, 0}, //Material Colour
+			null, //Material Colour
 			-77, //Melting Point in C
 			-33, //Boiling Point in C
 			-1, //Protons
@@ -180,7 +202,7 @@ public class FLUORIDES {
 	public static final Material AMMONIUM = new Material(
 			"Ammonium", //Material Name
 			MaterialState.PURE_LIQUID, //State
-			new short[]{240, 220, 240, 0}, //Material Colour
+			null, //Material Colour
 			-1, //Melting Point in C
 			-1, //Boiling Point in C
 			-1, //Protons
@@ -196,7 +218,7 @@ public class FLUORIDES {
 	public static final Material AMMONIUM_BIFLUORIDE = new Material(
 			"Ammonium Bifluoride", //Material Name
 			MaterialState.PURE_LIQUID, //State
-			new short[]{240, 220, 240, 0}, //Material Colour
+			null, //Material Colour
 			126, //Melting Point in C
 			240, //Boiling Point in C
 			-1, //Protons
@@ -213,11 +235,11 @@ public class FLUORIDES {
 	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
+			null, //Material Colour
+			-1, //Melting Point in C
 			-1, //Boiling Point in C
-			-1,
-			-1,
+			-1, //Protons
+			-1, //Neutrons
 			false, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
@@ -229,7 +251,7 @@ public class FLUORIDES {
 	public static final Material AMMONIUM_TETRAFLUOROBERYLLATE = new Material(
 			"Ammonium Tetrafluoroberyllate", //Material Name
 			MaterialState.PURE_LIQUID, //State
-			new short[]{140, 220, 140, 0}, //Material Colour
+			null, //Material Colour
 			280, //Melting Point in C
 			-1, //Boiling Point in C
 			-1, //Protons
@@ -247,11 +269,11 @@ 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
-			((ELEMENT.getInstance().NEPTUNIUM.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()*6))/7), //Protons
-			((ELEMENT.getInstance().NEPTUNIUM.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()*6))/7), //Neutrons
+			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[]{
@@ -262,11 +284,11 @@ 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
-			((ELEMENT.getInstance().TECHNETIUM.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()*6))/7), //Protons
-			((ELEMENT.getInstance().TECHNETIUM.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()*6))/7), //Neutrons
+			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[]{
@@ -277,11 +299,11 @@ 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
-			((ELEMENT.getInstance().SELENIUM.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()*6))/7), //Protons
-			((ELEMENT.getInstance().SELENIUM.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()*6))/7), //Neutrons
+			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[]{
diff --git a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
index 45d35d1022..d2e24b04a1 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.core.material.nuclear;
 
+import gtPlusPlus.core.client.CustomTextureSet.TextureSets;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialStack;
@@ -12,12 +13,13 @@ public final class NUCLIDE {
 	public static final Material LiFBeF2ThF4UF4 = new Material(
 			"LiFBeF2ThF4UF4", //Material Name
 			MaterialState.LIQUID, //State
-			new short[]{40, 90, 25, 0}, //Material Colour
+			TextureSets.NUCLEAR.get(),
+			null, //Material Colour
 			566, //Melting Point in C
 			870, //Boiling Point in C
-			150, //Protons
-			150, //Neutrons
-			true, //Uses Blast furnace?
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
 			StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2ThF4UF4"), //Chemical Formula
 			5, //Radioactivity Level
 			//Material Stacks with Percentage of required elements.
@@ -27,16 +29,17 @@ public final class NUCLIDE {
 					new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1),
 					new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1)
 			});
-
+	
 	public static final Material LiFBeF2ZrF4UF4 = new Material(
 			"LiFBeF2ZrF4UF4", //Material Name
 			MaterialState.LIQUID, //State
-			new short[]{20, 70, 45, 0}, //Material Colour
+			TextureSets.NUCLEAR.get(),
+			null, //Material Colour
 			650, //Melting Point in C
 			940, //Boiling Point in C
-			150, //Protons
-			150, //Neutrons
-			true, //Uses Blast furnace?
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
 			StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2ZrF4UF4"), //Chemical Formula
 			5, //Radioactivity Level
 			//Material Stacks with Percentage of required elements.
@@ -50,12 +53,13 @@ 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
+			TextureSets.NUCLEAR.get(),
+			null, //Material Colour
 			590, //Melting Point in C
 			890, //Boiling Point in C
-			150, //Protons
-			150, //Neutrons
-			true, //Uses Blast furnace?
+			-1, //Protons
+			-1, //Neutrons
+			false, //Uses Blast furnace?
 			StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2ZrF4")+StringUtils.superscript("235U"), //Chemical Formula
 			5, //Radioactivity Level
 			//Material Stacks with Percentage of required elements.