$ Fixed Circular dependencies between FLUORIDES.java & NUCLIDE.java.

$ PMD Improvements.

4 files changed, 85 insertions, 85 deletions

diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java
index cf4e5f780c..4896fa48ae 100644
--- a/src/Java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java
@@ -10,28 +10,6 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils;
 
 public final class ELEMENT {
 
-	private static final ELEMENT thisClass = new ELEMENT();
-	
-	static {
-		Logger.MATERIALS("Initialising Base Elements.");
-	}
-
-	public ELEMENT(){		
-		//GTNH Trinium Handling		
-		if (CORE.GTNH){
-			TRINIUM  = MaterialUtils.generateMaterialFromGtENUM(MaterialUtils.getMaterialByName("Trinium"));
-			TRINIUM_REFINED = new Material("Refined Trinium", MaterialState.SOLID, new short[]{210, 255, 170}, 4304, 14057, 181, 133, false, "Ke", 0, new MaterialStack[]{new MaterialStack(TRINIUM, 1)});//Not a GT Inherited Material
-		}
-		else {
-			TRINIUM = new Material("Trinium", MaterialState.SOLID, new short[]{70, 110, 30}, 604, 4057, 181, 133, false, "Ke", 0, false);//Not a GT Inherited Material
-			TRINIUM_REFINED = new Material("Refined Trinium", MaterialState.SOLID, new short[]{210, 255, 170}, 4304, 14057, 181, 133, false, "Ke", 0, new MaterialStack[]{new MaterialStack(TRINIUM, 1)});//Not a GT Inherited Material
-		}		
-	}
-
-	public static ELEMENT getInstance(){
-		return thisClass;
-	}
-
 	//First 50 Elements
 	public final Material HYDROGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Hydrogen);
 	public final Material HELIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Helium);
@@ -150,4 +128,43 @@ public final class ELEMENT {
 	public final Material TRINIUM;
 	public final Material TRINIUM_REFINED;
 	//https://github.com/Blood-Asp/GT5-Unofficial/issues/609
+	
+	
+	//Custom Isotopes
+	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, StringUtils.superscript("7Li"), 0, false);//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, StringUtils.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, StringUtils.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, StringUtils.superscript("232Th"), 1, false);//Not a GT Inherited Material
+	public final Material PLUTONIUM239 = new Material("Plutonium-239", MaterialState.SOLID, Materials.Plutonium.mIconSet, Materials.Plutonium.mDurability, Materials.Plutonium.mRGBa, Materials.Plutonium.mMeltingPoint, Materials.Plutonium.mBlastFurnaceTemp, 94, 145, false, StringUtils.superscript("239Pu"), 4, true);//Not a GT Inherited Material
+	//RTG Fuels
+	public final Material PLUTONIUM238 = new Material("Plutonium-238", MaterialState.SOLID, Materials.Plutonium241.mIconSet, Materials.Plutonium241.mDurability, Materials.Plutonium241.mRGBa, Materials.Plutonium241.mMeltingPoint, Materials.Plutonium241.mBlastFurnaceTemp, 94, 144, false, StringUtils.superscript("238Pu"), 2, false);//Not a GT Inherited Material
+	public final Material STRONTIUM90 = new Material("Strontium-90", MaterialState.SOLID, Materials.Strontium.mIconSet, Materials.Strontium.mDurability, Materials.Strontium.mRGBa, Materials.Strontium.mMeltingPoint, Materials.Strontium.mBlastFurnaceTemp, 38, 52, false, StringUtils.superscript("90Sr"), 2, false);//Not a GT Inherited Material
+	public final Material POLONIUM210 = new Material("Polonium-210", MaterialState.SOLID, Materials.Plutonium241.mIconSet, ELEMENT.getInstance().POLONIUM.vDurability, ELEMENT.getInstance().POLONIUM.getRGBA(), ELEMENT.getInstance().POLONIUM.getMeltingPointK(), ELEMENT.getInstance().POLONIUM.getBoilingPointK(), 84, 126, false, StringUtils.superscript("210Po"), 2, false);//Not a GT Inherited Material
+	public final Material AMERICIUM241 = new Material("Americium-241", MaterialState.SOLID, Materials.Americium.mIconSet, Materials.Americium.mDurability, Materials.Americium.mRGBa, Materials.Americium.mMeltingPoint, Materials.Americium.mBlastFurnaceTemp, 95, 146, false, StringUtils.superscript("241Am"), 2, false);//Not a GT Inherited Material
+
+
+
+	static {
+		Logger.MATERIALS("Initialising Base Elements.");
+	}
+	
+	private static final ELEMENT INSTANCE = new ELEMENT();
+
+	public ELEMENT(){		
+		//GTNH Trinium Handling		
+		if (CORE.GTNH){
+			TRINIUM  = MaterialUtils.generateMaterialFromGtENUM(MaterialUtils.getMaterialByName("Trinium"));
+			TRINIUM_REFINED = new Material("Refined Trinium", MaterialState.SOLID, new short[]{210, 255, 170}, 4304, 14057, 181, 133, false, "Ke", 0, new MaterialStack[]{new MaterialStack(TRINIUM, 1)});//Not a GT Inherited Material
+		}
+		else {
+			TRINIUM = new Material("Trinium", MaterialState.SOLID, new short[]{70, 110, 30}, 604, 4057, 181, 133, false, "Ke", 0, false);//Not a GT Inherited Material
+			TRINIUM_REFINED = new Material("Refined Trinium", MaterialState.SOLID, new short[]{210, 255, 170}, 4304, 14057, 181, 133, false, "Ke", 0, new MaterialStack[]{new MaterialStack(TRINIUM, 1)});//Not a GT Inherited Material
+		}		
+	}
+
+	public static ELEMENT getInstance(){
+		return INSTANCE;
+	}
+
+
 }
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 4267bea316..4ab502e1ab 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -35,10 +35,6 @@ public class Material {
 	private MaterialState materialState;
 	private TextureSet textureSet;
 
-	public synchronized final TextureSet getTextureSet() {
-		return textureSet;
-	}
-
 	private Fluid vMoltenFluid;
 	private Fluid vPlasma;
 
@@ -72,7 +68,7 @@ public class Material {
 	public long vDurability;
 	public int vToolQuality;
 	public int vHarvestLevel;
-	
+
 	private GTPP_Aspects[] vAspects;
 
 
@@ -85,7 +81,7 @@ public class Material {
 	public Material(String materialName, MaterialState defaultState, short[] rgba, int j, int k, int l, int m, int radiationLevel, MaterialStack[] materialStacks){
 		this(materialName, defaultState, null, 0, rgba, j, k, l, m, false, "", radiationLevel, false, materialStacks);
 	}
-	
+
 	public Material(String materialName, MaterialState defaultState, final TextureSet set, short[] rgba, int j, int k, int l, int m, int radiationLevel, MaterialStack[] materialStacks){
 		this(materialName, defaultState, set, 0, rgba, j, k, l, m, false, "", radiationLevel, false, materialStacks);
 	}
@@ -336,9 +332,15 @@ public class Material {
 		}
 	}
 
+	public final TextureSet getTextureSet() {
+		synchronized(this) {
+			return textureSet;
+		}		
+	}
+
 	private TextureSet setTextureSet(TextureSet set) {
 		if (set != null) {
-			 return set;			
+			return set;			
 		}
 		else {
 			// build hash table with count
@@ -574,29 +576,27 @@ public class Material {
 	}
 
 	final public ItemStack[] getMaterialComposites(){
-		if (this.vMaterialInput != null){
-			if (!this.vMaterialInput.isEmpty()){
-				final ItemStack[] temp = new ItemStack[this.vMaterialInput.size()];
-				for (int i=0;i<this.vMaterialInput.size();i++){
-					//Utils.LOG_INFO("i:"+i);
-					ItemStack testNull = null;
-					try {
-						testNull = this.vMaterialInput.get(i).getValidStack();
-					} catch (final Throwable r){
-						Logger.INFO("Failed gathering material stack for "+this.localizedName+".");
-						Logger.INFO("What Failed: Length:"+this.vMaterialInput.size()+" current:"+i);
-					}
-					try {
-						if (testNull != null){
-							//Utils.LOG_INFO("not null");
-							temp[i] = this.vMaterialInput.get(i).getValidStack();
-						}
-					} catch (final Throwable r){
-						Logger.INFO("Failed setting slot "+i+", using "+this.localizedName);
+		if (this.vMaterialInput != null && !this.vMaterialInput.isEmpty()){
+			final ItemStack[] temp = new ItemStack[this.vMaterialInput.size()];
+			for (int i=0;i<this.vMaterialInput.size();i++){
+				//Utils.LOG_INFO("i:"+i);
+				ItemStack testNull = null;
+				try {
+					testNull = this.vMaterialInput.get(i).getValidStack();
+				} catch (final Throwable r){
+					Logger.INFO("Failed gathering material stack for "+this.localizedName+".");
+					Logger.INFO("What Failed: Length:"+this.vMaterialInput.size()+" current:"+i);
+				}
+				try {
+					if (testNull != null){
+						//Utils.LOG_INFO("not null");
+						temp[i] = this.vMaterialInput.get(i).getValidStack();
 					}
+				} catch (final Throwable r){
+					Logger.INFO("Failed setting slot "+i+", using "+this.localizedName);
 				}
-				return temp;
 			}
+			return temp;			
 		}
 		return new ItemStack[]{};
 	}
@@ -621,7 +621,7 @@ public class Material {
 	}
 
 	private final short getComponentCount(final MaterialStack[] inputs){
-		
+
 		if (inputs == null || inputs.length < 1) {
 			return 1;
 		}
diff --git a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
index affe480a57..c00ba42c68 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
@@ -9,10 +9,6 @@ import gtPlusPlus.core.material.state.MaterialState;
 
 public class FLUORIDES {
 
-	private static final FLUORIDES thisClass = new FLUORIDES();
-	public FLUORIDES(){}
-	public static FLUORIDES getInstance(){return thisClass;}
-
 	public static final Material FLUORITE = new Material(
 			"Fluorite", //Material Name
 			MaterialState.SOLID, //State
@@ -39,12 +35,12 @@ public class FLUORIDES {
 			new short[]{25, 70, 25, 0}, //Material Colour
 			Materials.Thorium.mMeltingPoint, //Melting Point in C
 			Materials.Thorium.mBlastFurnaceTemp, //Boiling Point in C
-			((NUCLIDE.getInstance().THORIUM232.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()*4))/5), //Protons
-			((NUCLIDE.getInstance().THORIUM232.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()*4))/5), //Neutrons
+			((ELEMENT.getInstance().THORIUM232.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()*4))/5), //Protons
+			((ELEMENT.getInstance().THORIUM232.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()*4))/5), //Neutrons
 			false, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(NUCLIDE.getInstance().THORIUM232, 1),
+					new MaterialStack(ELEMENT.getInstance().THORIUM232, 1),
 					new MaterialStack(ELEMENT.getInstance().FLUORINE, 4)
 			});
 
@@ -55,12 +51,12 @@ public class FLUORIDES {
 			new short[]{10, 50, 10, 0}, //Material Colour
 			Materials.Thorium.mMeltingPoint, //Melting Point in C
 			Materials.Thorium.mBlastFurnaceTemp, //Boiling Point in C
-			((NUCLIDE.getInstance().THORIUM232.getProtons()+NUCLIDE.getInstance().THORIUM232.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()*6))/8), //Protons
-			((NUCLIDE.getInstance().THORIUM232.getNeutrons()+NUCLIDE.getInstance().THORIUM232.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()*6))/8), //Neutrons
+			((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
 			false, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(NUCLIDE.getInstance().THORIUM232, 1),
+					new MaterialStack(ELEMENT.getInstance().THORIUM232, 1),
 					new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
 					new MaterialStack(ELEMENT.getInstance().FLUORINE, 12)
 			});
@@ -72,12 +68,12 @@ public class FLUORIDES {
 			new short[]{50, 240, 50, 0}, //Material Colour
 			Materials.Uranium235.mMeltingPoint, //Melting Point in C
 			Materials.Uranium235.mBlastFurnaceTemp, //Boiling Point in C
-			((NUCLIDE.getInstance().URANIUM233.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()*4))/5), //Protons
-			((NUCLIDE.getInstance().URANIUM233.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()*4))/5), //Neutrons
+			((ELEMENT.getInstance().URANIUM233.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()*4))/5), //Protons
+			((ELEMENT.getInstance().URANIUM233.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()*4))/5), //Neutrons
 			false, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(NUCLIDE.getInstance().URANIUM233, 1),
+					new MaterialStack(ELEMENT.getInstance().URANIUM233, 1),
 					new MaterialStack(ELEMENT.getInstance().FLUORINE, 4)
 			});
 
@@ -136,12 +132,12 @@ public class FLUORIDES {
 			new short[]{225, 220, 255, 0}, //Material Colour
 			Materials.Lithium.mMeltingPoint, //Melting Point in C
 			Materials.Lithium.mBlastFurnaceTemp, //Boiling Point in C
-			((NUCLIDE.getInstance().LITHIUM7.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()))/2), //Protons
-			((NUCLIDE.getInstance().LITHIUM7.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()))/2), //Neutrons
+			((ELEMENT.getInstance().LITHIUM7.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()))/2), //Protons
+			((ELEMENT.getInstance().LITHIUM7.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()))/2), //Neutrons
 			false, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(NUCLIDE.getInstance().LITHIUM7, 1),
+					new MaterialStack(ELEMENT.getInstance().LITHIUM7, 1),
 					new MaterialStack(ELEMENT.getInstance().FLUORINE, 1)
 			});
 
@@ -293,4 +289,7 @@ public class FLUORIDES {
 					new MaterialStack(ELEMENT.getInstance().FLUORINE, 6)
 			});
 
+	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 0a922b7c8c..0c81a39959 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
@@ -1,7 +1,5 @@
 package gtPlusPlus.core.material.nuclear;
 
-import gregtech.api.enums.Materials;
-
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialStack;
@@ -11,23 +9,6 @@ import gtPlusPlus.core.util.data.StringUtils;
 
 public final class NUCLIDE {
 
-	private static final NUCLIDE thisClass = new NUCLIDE();
-	public NUCLIDE(){}
-	public static NUCLIDE getInstance(){return thisClass;}
-
-	//Custom Isotopes
-	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, StringUtils.superscript("7Li"), 0, false);//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, StringUtils.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, StringUtils.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, StringUtils.superscript("232Th"), 1, false);//Not a GT Inherited Material
-	public final Material PLUTONIUM239 = new Material("Plutonium-239", MaterialState.SOLID, Materials.Plutonium.mIconSet, Materials.Plutonium.mDurability, Materials.Plutonium.mRGBa, Materials.Plutonium.mMeltingPoint, Materials.Plutonium.mBlastFurnaceTemp, 94, 145, false, StringUtils.superscript("239Pu"), 4, true);//Not a GT Inherited Material
-	
-	//RTG Fuels
-	public final Material PLUTONIUM238 = new Material("Plutonium-238", MaterialState.SOLID, Materials.Plutonium241.mIconSet, Materials.Plutonium241.mDurability, Materials.Plutonium241.mRGBa, Materials.Plutonium241.mMeltingPoint, Materials.Plutonium241.mBlastFurnaceTemp, 94, 144, false, StringUtils.superscript("238Pu"), 2, false);//Not a GT Inherited Material
-	public final Material STRONTIUM90 = new Material("Strontium-90", MaterialState.SOLID, Materials.Strontium.mIconSet, Materials.Strontium.mDurability, Materials.Strontium.mRGBa, Materials.Strontium.mMeltingPoint, Materials.Strontium.mBlastFurnaceTemp, 38, 52, false, StringUtils.superscript("90Sr"), 2, false);//Not a GT Inherited Material
-	public final Material POLONIUM210 = new Material("Polonium-210", MaterialState.SOLID, Materials.Plutonium241.mIconSet, ELEMENT.getInstance().POLONIUM.vDurability, ELEMENT.getInstance().POLONIUM.getRGBA(), ELEMENT.getInstance().POLONIUM.getMeltingPointK(), ELEMENT.getInstance().POLONIUM.getBoilingPointK(), 84, 126, false, StringUtils.superscript("210Po"), 2, false);//Not a GT Inherited Material
-	public final Material AMERICIUM241 = new Material("Americium-241", MaterialState.SOLID, Materials.Americium.mIconSet, Materials.Americium.mDurability, Materials.Americium.mRGBa, Materials.Americium.mMeltingPoint, Materials.Americium.mBlastFurnaceTemp, 95, 146, false, StringUtils.superscript("241Am"), 2, false);//Not a GT Inherited Material
-
 	public static final Material LiFBeF2ThF4UF4 = new Material(
 			"LiFBeF2ThF4UF4", //Material Name
 			MaterialState.LIQUID, //State
@@ -86,4 +67,7 @@ public final class NUCLIDE {
 			});
 
 
+	private static final NUCLIDE INSTANCE = new NUCLIDE();
+	public static NUCLIDE getInstance(){return INSTANCE;}
+
 }