+ Made ELEMENT a singleton.

% PMD updated Material, MaterialStack and ELEMENT.

6 files changed, 305 insertions, 290 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 525b91cf85..c36bdf175d 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -206,8 +206,8 @@ public final class ModItems {
 			//Elements generate first so they can be used in compounds.
 			
 			//Uranium-233 is a fissile isotope of uranium that is bred from thorium-232 as part of the thorium fuel cycle.
-			generateItemsFromMaterial(ELEMENT.URANIUM233);
-			generateItemsFromMaterial(ELEMENT.ZIRCONIUM);
+			generateItemsFromMaterial(ELEMENT.getInstance().URANIUM233);
+			generateItemsFromMaterial(ELEMENT.getInstance().ZIRCONIUM);
 			
 			//Carbides - Tungsten Carbide exists in .09 so don't generate it. - Should still come before alloys though
 			if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index 052eaf6a9a..56cc6d1343 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -29,88 +29,88 @@ public final class ALLOY {
 			"Staballoy", //Material Name
 			new short[]{68, 75, 66, 0}, //Material Colour
 			3450, //Melting Point in C
-			((ELEMENT.URANIUM.getBoilingPointC()*9)+(ELEMENT.TITANIUM.getBoilingPointC()*1))/10, //Boiling Point in C
-			((ELEMENT.URANIUM.getProtons()*9)+ELEMENT.TITANIUM.getProtons())/10, //Protons
-			((ELEMENT.URANIUM.getNeutrons()*9)+ELEMENT.TITANIUM.getNeutrons())/10, //Neutrons
+			((ELEMENT.getInstance().URANIUM.getBoilingPointC()*9)+(ELEMENT.getInstance().TITANIUM.getBoilingPointC()*1))/10, //Boiling Point in C
+			((ELEMENT.getInstance().URANIUM.getProtons()*9)+ELEMENT.getInstance().TITANIUM.getProtons())/10, //Protons
+			((ELEMENT.getInstance().URANIUM.getNeutrons()*9)+ELEMENT.getInstance().TITANIUM.getNeutrons())/10, //Neutrons
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.URANIUM, 9),
-					new MaterialStack(ELEMENT.TITANIUM, 1)
+					new MaterialStack(ELEMENT.getInstance().URANIUM, 9),
+					new MaterialStack(ELEMENT.getInstance().TITANIUM, 1)
 			});
 
 	public static final Material TANTALLOY_60 = new Material(
 			"Tantalloy-60", //Material Name
 			new short[]{213, 231, 237, 0}, //Material Colour
 			3025, //Melting Point in C
-			((ELEMENT.TUNGSTEN.getBoilingPointC()*1)+(ELEMENT.TANTALUM.getBoilingPointC()*8)+(ELEMENT.TITANIUM.getBoilingPointC()*1))/10, //Boiling Point in C
-			((ELEMENT.TUNGSTEN.getProtons()*1)+(ELEMENT.TANTALUM.getProtons()*8)+(ELEMENT.TITANIUM.getProtons()*1))/10, //Protons
-			((ELEMENT.TUNGSTEN.getNeutrons()*1)+(ELEMENT.TANTALUM.getNeutrons()*8)+(ELEMENT.TITANIUM.getNeutrons()*1))/10, //Neutrons
+			((ELEMENT.getInstance().TUNGSTEN.getBoilingPointC()*1)+(ELEMENT.getInstance().TANTALUM.getBoilingPointC()*8)+(ELEMENT.getInstance().TITANIUM.getBoilingPointC()*1))/10, //Boiling Point in C
+			((ELEMENT.getInstance().TUNGSTEN.getProtons()*1)+(ELEMENT.getInstance().TANTALUM.getProtons()*8)+(ELEMENT.getInstance().TITANIUM.getProtons()*1))/10, //Protons
+			((ELEMENT.getInstance().TUNGSTEN.getNeutrons()*1)+(ELEMENT.getInstance().TANTALUM.getNeutrons()*8)+(ELEMENT.getInstance().TITANIUM.getNeutrons()*1))/10, //Neutrons
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.TUNGSTEN, 4),
-					new MaterialStack(ELEMENT.TANTALUM, 46)
+					new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4),
+					new MaterialStack(ELEMENT.getInstance().TANTALUM, 46)
 			});
 
 	public static final Material TANTALLOY_61 = new Material(
 			"Tantalloy-61", //Material Name
 			new short[]{193, 211, 217, 0}, //Material Colour
 			3030, //Melting Point in C
-			((ELEMENT.TUNGSTEN.getBoilingPointC()*1)+(ELEMENT.TANTALUM.getBoilingPointC()*7)+(ELEMENT.TITANIUM.getBoilingPointC()*1)+(ELEMENT.YTTRIUM.getBoilingPointC()*1))/10, //Boiling Point in C
-			((ELEMENT.TUNGSTEN.getProtons()*1)+(ELEMENT.TANTALUM.getProtons()*7)+(ELEMENT.TITANIUM.getProtons()*1)+(ELEMENT.YTTRIUM.getProtons()*1))/10, //Protons
-			((ELEMENT.TUNGSTEN.getNeutrons()*1)+(ELEMENT.TANTALUM.getNeutrons()*7)+(ELEMENT.TITANIUM.getNeutrons()*1)+(ELEMENT.YTTRIUM.getNeutrons()*1))/10, //Neutrons
+			((ELEMENT.getInstance().TUNGSTEN.getBoilingPointC()*1)+(ELEMENT.getInstance().TANTALUM.getBoilingPointC()*7)+(ELEMENT.getInstance().TITANIUM.getBoilingPointC()*1)+(ELEMENT.getInstance().YTTRIUM.getBoilingPointC()*1))/10, //Boiling Point in C
+			((ELEMENT.getInstance().TUNGSTEN.getProtons()*1)+(ELEMENT.getInstance().TANTALUM.getProtons()*7)+(ELEMENT.getInstance().TITANIUM.getProtons()*1)+(ELEMENT.getInstance().YTTRIUM.getProtons()*1))/10, //Protons
+			((ELEMENT.getInstance().TUNGSTEN.getNeutrons()*1)+(ELEMENT.getInstance().TANTALUM.getNeutrons()*7)+(ELEMENT.getInstance().TITANIUM.getNeutrons()*1)+(ELEMENT.getInstance().YTTRIUM.getNeutrons()*1))/10, //Neutrons
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
 					new MaterialStack(ALLOY.TANTALLOY_60, 2),
-					new MaterialStack(ELEMENT.TITANIUM, 12),
-					new MaterialStack(ELEMENT.YTTRIUM, 8)
+					new MaterialStack(ELEMENT.getInstance().TITANIUM, 12),
+					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 8)
 			});
 
 	public static final Material BRONZE = new Material(
 			"Bronze", //Material Name
 			new short[]{128, 128, 128, 0}, //Material Colour
-			((ELEMENT.TIN.getMeltingPointC()*1)+(ELEMENT.COPPER.getMeltingPointC()*3))/4, //Melting point in C
-			((ELEMENT.TIN.getBoilingPointC()*1)+(ELEMENT.COPPER.getBoilingPointC()*3))/4, //Boiling Point in C
-			((ELEMENT.TIN.getProtons()*1)+(ELEMENT.COPPER.getProtons()*3))/4, //Protons
-			((ELEMENT.TIN.getNeutrons()*1)+(ELEMENT.COPPER.getNeutrons()*3))/4, //Neutrons
+			((ELEMENT.getInstance().TIN.getMeltingPointC()*1)+(ELEMENT.getInstance().COPPER.getMeltingPointC()*3))/4, //Melting point in C
+			((ELEMENT.getInstance().TIN.getBoilingPointC()*1)+(ELEMENT.getInstance().COPPER.getBoilingPointC()*3))/4, //Boiling Point in C
+			((ELEMENT.getInstance().TIN.getProtons()*1)+(ELEMENT.getInstance().COPPER.getProtons()*3))/4, //Protons
+			((ELEMENT.getInstance().TIN.getNeutrons()*1)+(ELEMENT.getInstance().COPPER.getNeutrons()*3))/4, //Neutrons
 			false, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.COPPER, 35),
-					new MaterialStack(ELEMENT.COPPER, 40),
-					new MaterialStack(ELEMENT.TIN, 25)
+					new MaterialStack(ELEMENT.getInstance().COPPER, 35),
+					new MaterialStack(ELEMENT.getInstance().COPPER, 40),
+					new MaterialStack(ELEMENT.getInstance().TIN, 25)
 			});
 
 	public static final Material TUMBAGA = new Material(
 			"Tumbaga", //Material Name
 			new short[]{255,178,15, 0}, //Material Colour
-			((ELEMENT.GOLD.getMeltingPointC()*7)+(ELEMENT.COPPER.getMeltingPointC()*3))/10, //Melting point in C
-			((ELEMENT.GOLD.getBoilingPointC()*7)+(ELEMENT.COPPER.getBoilingPointC()*3))/10, //Boiling Point in C
-			((ELEMENT.GOLD.getProtons()*7)+(ELEMENT.COPPER.getProtons()*3))/10, //Protons
-			((ELEMENT.GOLD.getNeutrons()*7)+(ELEMENT.COPPER.getNeutrons()*3))/10, //Neutrons
+			((ELEMENT.getInstance().GOLD.getMeltingPointC()*7)+(ELEMENT.getInstance().COPPER.getMeltingPointC()*3))/10, //Melting point in C
+			((ELEMENT.getInstance().GOLD.getBoilingPointC()*7)+(ELEMENT.getInstance().COPPER.getBoilingPointC()*3))/10, //Boiling Point in C
+			((ELEMENT.getInstance().GOLD.getProtons()*7)+(ELEMENT.getInstance().COPPER.getProtons()*3))/10, //Protons
+			((ELEMENT.getInstance().GOLD.getNeutrons()*7)+(ELEMENT.getInstance().COPPER.getNeutrons()*3))/10, //Neutrons
 			false, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.GOLD, 30),
-					new MaterialStack(ELEMENT.GOLD, 40),
-					new MaterialStack(ELEMENT.COPPER, 30)
+					new MaterialStack(ELEMENT.getInstance().GOLD, 30),
+					new MaterialStack(ELEMENT.getInstance().GOLD, 40),
+					new MaterialStack(ELEMENT.getInstance().COPPER, 30)
 			});
 
 	public static final Material POTIN = new Material(
 			"Potin", //Material Name
 			new short[]{201,151,129, 0}, //Material Colour
-			((ELEMENT.LEAD.getMeltingPointC()*4)+(ALLOY.BRONZE.getMeltingPointC()*4)+(ELEMENT.TIN.getMeltingPointC()*2))/10, //Melting point in C
-			((ELEMENT.LEAD.getBoilingPointC()*4)+(ALLOY.BRONZE.getBoilingPointC()*4)+(ELEMENT.TIN.getBoilingPointC()*2))/10, //Boiling Point in C
-			((ELEMENT.LEAD.getProtons()*4)+(ALLOY.BRONZE.getProtons()*4)+(ELEMENT.TIN.getProtons()*2))/10, //Protons
-			((ELEMENT.LEAD.getNeutrons()*4)+(ALLOY.BRONZE.getNeutrons()*4)+(ELEMENT.TIN.getNeutrons()*2))/10, //Neutrons
+			((ELEMENT.getInstance().LEAD.getMeltingPointC()*4)+(ALLOY.BRONZE.getMeltingPointC()*4)+(ELEMENT.getInstance().TIN.getMeltingPointC()*2))/10, //Melting point in C
+			((ELEMENT.getInstance().LEAD.getBoilingPointC()*4)+(ALLOY.BRONZE.getBoilingPointC()*4)+(ELEMENT.getInstance().TIN.getBoilingPointC()*2))/10, //Boiling Point in C
+			((ELEMENT.getInstance().LEAD.getProtons()*4)+(ALLOY.BRONZE.getProtons()*4)+(ELEMENT.getInstance().TIN.getProtons()*2))/10, //Protons
+			((ELEMENT.getInstance().LEAD.getNeutrons()*4)+(ALLOY.BRONZE.getNeutrons()*4)+(ELEMENT.getInstance().TIN.getNeutrons()*2))/10, //Neutrons
 			false, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.LEAD, 40),
+					new MaterialStack(ELEMENT.getInstance().LEAD, 40),
 					new MaterialStack(ALLOY.BRONZE, 40),
-					new MaterialStack(ELEMENT.TIN, 20)
+					new MaterialStack(ELEMENT.getInstance().TIN, 20)
 			});
 
 	public static final Material BEDROCKIUM = new Material(
@@ -128,81 +128,81 @@ public final class ALLOY {
 			"Inconel-625", //Material Name
 			new short[]{128, 200, 128, 0}, //Material Colour
 			1425, //Melting Point in C
-			((ELEMENT.NICKEL.getBoilingPointC()*6)+(ELEMENT.CHROMIUM.getBoilingPointC()*2)+(ELEMENT.IRON.getBoilingPointC()*1)+(ELEMENT.MOLYBDENUM.getBoilingPointC()*1))/10, //Boiling Point in C
-			((ELEMENT.NICKEL.getProtons()*6)+(ELEMENT.CHROMIUM.getProtons()*2)+(ELEMENT.IRON.getProtons()*1)+(ELEMENT.MOLYBDENUM.getProtons()*1))/10, //Protons
-			((ELEMENT.NICKEL.getNeutrons()*6)+(ELEMENT.CHROMIUM.getNeutrons()*2)+(ELEMENT.IRON.getNeutrons()*1)+(ELEMENT.MOLYBDENUM.getNeutrons()*1))/10, //Neutrons
+			((ELEMENT.getInstance().NICKEL.getBoilingPointC()*6)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*2)+(ELEMENT.getInstance().IRON.getBoilingPointC()*1)+(ELEMENT.getInstance().MOLYBDENUM.getBoilingPointC()*1))/10, //Boiling Point in C
+			((ELEMENT.getInstance().NICKEL.getProtons()*6)+(ELEMENT.getInstance().CHROMIUM.getProtons()*2)+(ELEMENT.getInstance().IRON.getProtons()*1)+(ELEMENT.getInstance().MOLYBDENUM.getProtons()*1))/10, //Protons
+			((ELEMENT.getInstance().NICKEL.getNeutrons()*6)+(ELEMENT.getInstance().CHROMIUM.getNeutrons()*2)+(ELEMENT.getInstance().IRON.getNeutrons()*1)+(ELEMENT.getInstance().MOLYBDENUM.getNeutrons()*1))/10, //Neutrons
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.NICKEL, 60),
-					new MaterialStack(ELEMENT.CHROMIUM, 20),
-					new MaterialStack(ELEMENT.IRON, 10),
-					new MaterialStack(ELEMENT.MOLYBDENUM, 10)
+					new MaterialStack(ELEMENT.getInstance().NICKEL, 60),
+					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20),
+					new MaterialStack(ELEMENT.getInstance().IRON, 10),
+					new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10)
 			});
 
 	public static final Material INCONEL_690 = new Material(
 			"Inconel-690", //Material Name
 			new short[]{118, 220, 138, 0}, //Material Colour
 			1425, //Melting Point in C
-			((ELEMENT.NICKEL.getBoilingPointC()*6)+(ELEMENT.CHROMIUM.getBoilingPointC()*2)+(ELEMENT.NIOBIUM.getBoilingPointC()*1)+(ELEMENT.MOLYBDENUM.getBoilingPointC()*1))/10, //Boiling Point in C
-			((ELEMENT.NICKEL.getProtons()*6)+(ELEMENT.CHROMIUM.getProtons()*2)+(ELEMENT.NIOBIUM.getProtons()*1)+(ELEMENT.MOLYBDENUM.getProtons()*1))/10, //Protons
-			((ELEMENT.NICKEL.getNeutrons()*6)+(ELEMENT.CHROMIUM.getNeutrons()*2)+(ELEMENT.NIOBIUM.getNeutrons()*1)+(ELEMENT.MOLYBDENUM.getNeutrons()*1))/10, //Neutrons
+			((ELEMENT.getInstance().NICKEL.getBoilingPointC()*6)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*2)+(ELEMENT.getInstance().NIOBIUM.getBoilingPointC()*1)+(ELEMENT.getInstance().MOLYBDENUM.getBoilingPointC()*1))/10, //Boiling Point in C
+			((ELEMENT.getInstance().NICKEL.getProtons()*6)+(ELEMENT.getInstance().CHROMIUM.getProtons()*2)+(ELEMENT.getInstance().NIOBIUM.getProtons()*1)+(ELEMENT.getInstance().MOLYBDENUM.getProtons()*1))/10, //Protons
+			((ELEMENT.getInstance().NICKEL.getNeutrons()*6)+(ELEMENT.getInstance().CHROMIUM.getNeutrons()*2)+(ELEMENT.getInstance().NIOBIUM.getNeutrons()*1)+(ELEMENT.getInstance().MOLYBDENUM.getNeutrons()*1))/10, //Neutrons
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.NICKEL, 60),
-					new MaterialStack(ELEMENT.CHROMIUM, 20),
-					new MaterialStack(ELEMENT.NIOBIUM, 10),
-					new MaterialStack(ELEMENT.MOLYBDENUM, 10)
+					new MaterialStack(ELEMENT.getInstance().NICKEL, 60),
+					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20),
+					new MaterialStack(ELEMENT.getInstance().NIOBIUM, 10),
+					new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10)
 			});
 
 	public static final Material INCONEL_792 = new Material(
 			"Inconel-792", //Material Name
 			new short[]{108, 240, 118, 0}, //Material Colour
 			1425, //Melting Point in C
-			((ELEMENT.NICKEL.getBoilingPointC()*6)+(ELEMENT.CHROMIUM.getBoilingPointC()*1)+(ELEMENT.IRON.getBoilingPointC()*1)+(ELEMENT.ALUMINIUM.getBoilingPointC()*2))/10, //Boiling Point in C
-			((ELEMENT.NICKEL.getProtons()*6)+(ELEMENT.CHROMIUM.getProtons()*1)+(ELEMENT.IRON.getProtons()*1)+(ELEMENT.ALUMINIUM.getProtons()*2))/10, //Protons
-			((ELEMENT.NICKEL.getNeutrons()*6)+(ELEMENT.CHROMIUM.getNeutrons()*1)+(ELEMENT.IRON.getNeutrons()*1)+(ELEMENT.ALUMINIUM.getNeutrons()*2))/10, //Neutrons
+			((ELEMENT.getInstance().NICKEL.getBoilingPointC()*6)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*1)+(ELEMENT.getInstance().IRON.getBoilingPointC()*1)+(ELEMENT.getInstance().ALUMINIUM.getBoilingPointC()*2))/10, //Boiling Point in C
+			((ELEMENT.getInstance().NICKEL.getProtons()*6)+(ELEMENT.getInstance().CHROMIUM.getProtons()*1)+(ELEMENT.getInstance().IRON.getProtons()*1)+(ELEMENT.getInstance().ALUMINIUM.getProtons()*2))/10, //Protons
+			((ELEMENT.getInstance().NICKEL.getNeutrons()*6)+(ELEMENT.getInstance().CHROMIUM.getNeutrons()*1)+(ELEMENT.getInstance().IRON.getNeutrons()*1)+(ELEMENT.getInstance().ALUMINIUM.getNeutrons()*2))/10, //Neutrons
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.NICKEL, 60),
-					new MaterialStack(ELEMENT.CHROMIUM, 10),
-					new MaterialStack(ELEMENT.NIOBIUM, 10),
-					new MaterialStack(ELEMENT.ALUMINIUM, 20)
+					new MaterialStack(ELEMENT.getInstance().NICKEL, 60),
+					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 10),
+					new MaterialStack(ELEMENT.getInstance().NIOBIUM, 10),
+					new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 20)
 			});
 	
 	public static final Material STEEL = new Material(
 			"Steel", //Material Name
 			new short[]{180, 180, 20, 0}, //Material Colour
-			((ELEMENT.CARBON.getMeltingPointC()*5)+(ELEMENT.IRON.getMeltingPointC()*95))/100, //Melting point in C
-			((ELEMENT.CARBON.getBoilingPointC()*5)+(ELEMENT.IRON.getBoilingPointC()*95))/100, //Boiling Point in C
-			((ELEMENT.CARBON.getProtons()*5)+(ELEMENT.IRON.getProtons()*95))/100, //Protons
-			((ELEMENT.CARBON.getNeutrons()*5)+(ELEMENT.IRON.getNeutrons()*95))/100, //Neutrons
+			((ELEMENT.getInstance().CARBON.getMeltingPointC()*5)+(ELEMENT.getInstance().IRON.getMeltingPointC()*95))/100, //Melting point in C
+			((ELEMENT.getInstance().CARBON.getBoilingPointC()*5)+(ELEMENT.getInstance().IRON.getBoilingPointC()*95))/100, //Boiling Point in C
+			((ELEMENT.getInstance().CARBON.getProtons()*5)+(ELEMENT.getInstance().IRON.getProtons()*95))/100, //Protons
+			((ELEMENT.getInstance().CARBON.getNeutrons()*5)+(ELEMENT.getInstance().IRON.getNeutrons()*95))/100, //Neutrons
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.CARBON, 10),
-					new MaterialStack(ELEMENT.IRON, 30),
-					new MaterialStack(ELEMENT.IRON, 30),
-					new MaterialStack(ELEMENT.IRON, 30)
+					new MaterialStack(ELEMENT.getInstance().CARBON, 10),
+					new MaterialStack(ELEMENT.getInstance().IRON, 30),
+					new MaterialStack(ELEMENT.getInstance().IRON, 30),
+					new MaterialStack(ELEMENT.getInstance().IRON, 30)
 			});
 
 	public static final Material ZERON_100 = new Material(
 			"Zeron-100", //Material Name
 			new short[]{180, 180, 20, 0}, //Material Colour
-			((ELEMENT.CHROMIUM.getMeltingPointC()*25)+(ELEMENT.NICKEL.getMeltingPointC()*6)+(ELEMENT.COBALT.getMeltingPointC()*9)+(ALLOY.STEEL.getMeltingPointC()*60))/100, //Melting Point in C
-			((ELEMENT.CHROMIUM.getBoilingPointC()*25)+(ELEMENT.NICKEL.getBoilingPointC()*6)+(ELEMENT.COBALT.getBoilingPointC()*9)+(ALLOY.STEEL.getBoilingPointC()*60))/100, //Boiling Point in C
-			((ELEMENT.CHROMIUM.getProtons()*25)+(ELEMENT.NICKEL.getProtons()*6)+(ELEMENT.COBALT.getProtons()*9)+(ALLOY.STEEL.getProtons()*60))/100, //Protons
-			((ELEMENT.CHROMIUM.getNeutrons()*25)+(ELEMENT.NICKEL.getNeutrons()*6)+(ELEMENT.COBALT.getNeutrons()*9)+(ALLOY.STEEL.getNeutrons()*60))/100, //Neutrons
+			((ELEMENT.getInstance().CHROMIUM.getMeltingPointC()*25)+(ELEMENT.getInstance().NICKEL.getMeltingPointC()*6)+(ELEMENT.getInstance().COBALT.getMeltingPointC()*9)+(ALLOY.STEEL.getMeltingPointC()*60))/100, //Melting Point in C
+			((ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*25)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*6)+(ELEMENT.getInstance().COBALT.getBoilingPointC()*9)+(ALLOY.STEEL.getBoilingPointC()*60))/100, //Boiling Point in C
+			((ELEMENT.getInstance().CHROMIUM.getProtons()*25)+(ELEMENT.getInstance().NICKEL.getProtons()*6)+(ELEMENT.getInstance().COBALT.getProtons()*9)+(ALLOY.STEEL.getProtons()*60))/100, //Protons
+			((ELEMENT.getInstance().CHROMIUM.getNeutrons()*25)+(ELEMENT.getInstance().NICKEL.getNeutrons()*6)+(ELEMENT.getInstance().COBALT.getNeutrons()*9)+(ALLOY.STEEL.getNeutrons()*60))/100, //Neutrons
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.CHROMIUM, 26),
-					new MaterialStack(ELEMENT.NICKEL, 6),
-					new MaterialStack(ELEMENT.MOLYBDENUM, 4),
-					new MaterialStack(ELEMENT.COPPER, 20),
-					new MaterialStack(ELEMENT.TUNGSTEN, 4),
+					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 26),
+					new MaterialStack(ELEMENT.getInstance().NICKEL, 6),
+					new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4),
+					new MaterialStack(ELEMENT.getInstance().COPPER, 20),
+					new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4),
 					new MaterialStack(ALLOY.STEEL, 40)
 					});
 
@@ -210,285 +210,285 @@ public final class ALLOY {
 			"Maraging Steel 250", //Material Name
 			new short[]{140, 140, 140, 0}, //Material Colour
 			1413, //Melting Point in C
-			((ELEMENT.TITANIUM.getBoilingPointC()*5)+(ELEMENT.NICKEL.getBoilingPointC()*16)+(ELEMENT.COBALT.getBoilingPointC()*9)+(ALLOY.STEEL.getBoilingPointC()*70))/100, //Boiling Point in C
-			((ELEMENT.TITANIUM.getProtons()*5)+(ELEMENT.NICKEL.getProtons()*16)+(ELEMENT.COBALT.getProtons()*9)+(ALLOY.STEEL.getProtons()*70))/100, //Protons
-			((ELEMENT.TITANIUM.getNeutrons()*5)+(ELEMENT.NICKEL.getNeutrons()*16)+(ELEMENT.COBALT.getNeutrons()*9)+(ALLOY.STEEL.getNeutrons()*70))/100, //Neutrons
+			((ELEMENT.getInstance().TITANIUM.getBoilingPointC()*5)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*16)+(ELEMENT.getInstance().COBALT.getBoilingPointC()*9)+(ALLOY.STEEL.getBoilingPointC()*70))/100, //Boiling Point in C
+			((ELEMENT.getInstance().TITANIUM.getProtons()*5)+(ELEMENT.getInstance().NICKEL.getProtons()*16)+(ELEMENT.getInstance().COBALT.getProtons()*9)+(ALLOY.STEEL.getProtons()*70))/100, //Protons
+			((ELEMENT.getInstance().TITANIUM.getNeutrons()*5)+(ELEMENT.getInstance().NICKEL.getNeutrons()*16)+(ELEMENT.getInstance().COBALT.getNeutrons()*9)+(ALLOY.STEEL.getNeutrons()*70))/100, //Neutrons
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
 					new MaterialStack(ALLOY.STEEL, 64),
-					new MaterialStack(ELEMENT.MOLYBDENUM, 4),
-					new MaterialStack(ELEMENT.TITANIUM, 4),
-					new MaterialStack(ELEMENT.NICKEL, 16),
-					new MaterialStack(ELEMENT.COBALT, 8),
+					new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4),
+					new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
+					new MaterialStack(ELEMENT.getInstance().NICKEL, 16),
+					new MaterialStack(ELEMENT.getInstance().COBALT, 8),
 			});
 
 	public static final Material MARAGING300 = new Material(
 			"Maraging Steel 300", //Material Name
 			new short[]{150, 150, 150, 0}, //Material Colour
 			1413, //Melting Point in C
-			((ELEMENT.TITANIUM.getBoilingPointC()*10)+(ELEMENT.NICKEL.getBoilingPointC()*21)+(ELEMENT.COBALT.getBoilingPointC()*14)+(ALLOY.STEEL.getBoilingPointC()*55))/100, //Boiling Point in C
-			((ELEMENT.TITANIUM.getProtons()*10)+(ELEMENT.NICKEL.getProtons()*21)+(ELEMENT.COBALT.getProtons()*14)+(ALLOY.STEEL.getProtons()*55))/100, //Protons
-			((ELEMENT.TITANIUM.getNeutrons()*10)+(ELEMENT.NICKEL.getNeutrons()*21)+(ELEMENT.COBALT.getNeutrons()*14)+(ALLOY.STEEL.getNeutrons()*55))/100, //Neutrons
+			((ELEMENT.getInstance().TITANIUM.getBoilingPointC()*10)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*21)+(ELEMENT.getInstance().COBALT.getBoilingPointC()*14)+(ALLOY.STEEL.getBoilingPointC()*55))/100, //Boiling Point in C
+			((ELEMENT.getInstance().TITANIUM.getProtons()*10)+(ELEMENT.getInstance().NICKEL.getProtons()*21)+(ELEMENT.getInstance().COBALT.getProtons()*14)+(ALLOY.STEEL.getProtons()*55))/100, //Protons
+			((ELEMENT.getInstance().TITANIUM.getNeutrons()*10)+(ELEMENT.getInstance().NICKEL.getNeutrons()*21)+(ELEMENT.getInstance().COBALT.getNeutrons()*14)+(ALLOY.STEEL.getNeutrons()*55))/100, //Neutrons
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
 				new MaterialStack(ALLOY.STEEL, 64),
-				new MaterialStack(ELEMENT.TITANIUM, 4),
-				new MaterialStack(ELEMENT.ALUMINIUM, 4),
-				new MaterialStack(ELEMENT.NICKEL, 16),
-				new MaterialStack(ELEMENT.COBALT, 8),
+				new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
+				new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4),
+				new MaterialStack(ELEMENT.getInstance().NICKEL, 16),
+				new MaterialStack(ELEMENT.getInstance().COBALT, 8),
 			});
 
 	public static final Material MARAGING350 = new Material(
 			"Maraging Steel 350", //Material Name
 			new short[]{160, 160, 160, 0}, //Material Colour
 			1413, //Melting Point in C
-			((ELEMENT.TITANIUM.getBoilingPointC()*15)+(ELEMENT.NICKEL.getBoilingPointC()*21)+(ELEMENT.COBALT.getBoilingPointC()*9)+(ALLOY.STEEL.getBoilingPointC()*55))/100, //Boiling Point in C
-			((ELEMENT.TITANIUM.getProtons()*15)+(ELEMENT.NICKEL.getProtons()*21)+(ELEMENT.COBALT.getProtons()*9)+(ALLOY.STEEL.getProtons()*55))/100, //Protons
-			((ELEMENT.TITANIUM.getNeutrons()*15)+(ELEMENT.NICKEL.getNeutrons()*21)+(ELEMENT.COBALT.getNeutrons()*9)+(ALLOY.STEEL.getNeutrons()*55))/100, //Neutrons
+			((ELEMENT.getInstance().TITANIUM.getBoilingPointC()*15)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*21)+(ELEMENT.getInstance().COBALT.getBoilingPointC()*9)+(ALLOY.STEEL.getBoilingPointC()*55))/100, //Boiling Point in C
+			((ELEMENT.getInstance().TITANIUM.getProtons()*15)+(ELEMENT.getInstance().NICKEL.getProtons()*21)+(ELEMENT.getInstance().COBALT.getProtons()*9)+(ALLOY.STEEL.getProtons()*55))/100, //Protons
+			((ELEMENT.getInstance().TITANIUM.getNeutrons()*15)+(ELEMENT.getInstance().NICKEL.getNeutrons()*21)+(ELEMENT.getInstance().COBALT.getNeutrons()*9)+(ALLOY.STEEL.getNeutrons()*55))/100, //Neutrons
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
 				new MaterialStack(ALLOY.STEEL, 64),
-				new MaterialStack(ELEMENT.ALUMINIUM, 4),
-				new MaterialStack(ELEMENT.MOLYBDENUM, 4),
-				new MaterialStack(ELEMENT.NICKEL, 16),
-				new MaterialStack(ELEMENT.COBALT, 8),
+				new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4),
+				new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4),
+				new MaterialStack(ELEMENT.getInstance().NICKEL, 16),
+				new MaterialStack(ELEMENT.getInstance().COBALT, 8),
 			});
 
 	public static final Material STELLITE = new Material(
 			"Stellite", //Material Name
 			new short[]{129, 75, 120, 0}, //Material Colour
 			1310, //Melting Point in C
-			((ELEMENT.TITANIUM.getBoilingPointC()*10)+(ELEMENT.CHROMIUM.getBoilingPointC()*35)+(ELEMENT.COBALT.getBoilingPointC()*35)+(ELEMENT.MANGANESE.getBoilingPointC()*20))/100, //Boiling Point in C
-			((ELEMENT.TITANIUM.getProtons()*10)+(ELEMENT.CHROMIUM.getProtons()*35)+(ELEMENT.COBALT.getProtons()*35)+(ELEMENT.MANGANESE.getProtons()*20))/100, //Protons
-			((ELEMENT.TITANIUM.getNeutrons()*10)+(ELEMENT.CHROMIUM.getNeutrons()*35)+(ELEMENT.COBALT.getNeutrons()*35)+(ELEMENT.MANGANESE.getNeutrons()*20))/100, //Neutrons
+			((ELEMENT.getInstance().TITANIUM.getBoilingPointC()*10)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*35)+(ELEMENT.getInstance().COBALT.getBoilingPointC()*35)+(ELEMENT.getInstance().MANGANESE.getBoilingPointC()*20))/100, //Boiling Point in C
+			((ELEMENT.getInstance().TITANIUM.getProtons()*10)+(ELEMENT.getInstance().CHROMIUM.getProtons()*35)+(ELEMENT.getInstance().COBALT.getProtons()*35)+(ELEMENT.getInstance().MANGANESE.getProtons()*20))/100, //Protons
+			((ELEMENT.getInstance().TITANIUM.getNeutrons()*10)+(ELEMENT.getInstance().CHROMIUM.getNeutrons()*35)+(ELEMENT.getInstance().COBALT.getNeutrons()*35)+(ELEMENT.getInstance().MANGANESE.getNeutrons()*20))/100, //Neutrons
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.COBALT, 35),
-					new MaterialStack(ELEMENT.CHROMIUM, 35),
-					new MaterialStack(ELEMENT.MANGANESE, 20),
-					new MaterialStack(ELEMENT.TITANIUM, 10)
+					new MaterialStack(ELEMENT.getInstance().COBALT, 35),
+					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 35),
+					new MaterialStack(ELEMENT.getInstance().MANGANESE, 20),
+					new MaterialStack(ELEMENT.getInstance().TITANIUM, 10)
 			});
 
 	public static final Material TALONITE = new Material(
 			"Talonite", //Material Name
 			new short[]{228, 75, 120, 0}, //Material Colour
 			1454, //Melting Point in C
-			((ELEMENT.MOLYBDENUM.getBoilingPointC()*10)+(ELEMENT.CHROMIUM.getBoilingPointC()*30)+(ELEMENT.COBALT.getBoilingPointC()*40)+(ELEMENT.PHOSPHORUS.getBoilingPointC()*20))/100, //Boiling Point in C
-			((ELEMENT.MOLYBDENUM.getProtons()*10)+(ELEMENT.CHROMIUM.getProtons()*30)+(ELEMENT.COBALT.getProtons()*40)+(ELEMENT.PHOSPHORUS.getProtons()*20))/100, //Protons
-			((ELEMENT.MOLYBDENUM.getNeutrons()*10)+(ELEMENT.CHROMIUM.getNeutrons()*30)+(ELEMENT.COBALT.getNeutrons()*40)+(ELEMENT.PHOSPHORUS.getNeutrons()*20))/100, //Neutrons
+			((ELEMENT.getInstance().MOLYBDENUM.getBoilingPointC()*10)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*30)+(ELEMENT.getInstance().COBALT.getBoilingPointC()*40)+(ELEMENT.getInstance().PHOSPHORUS.getBoilingPointC()*20))/100, //Boiling Point in C
+			((ELEMENT.getInstance().MOLYBDENUM.getProtons()*10)+(ELEMENT.getInstance().CHROMIUM.getProtons()*30)+(ELEMENT.getInstance().COBALT.getProtons()*40)+(ELEMENT.getInstance().PHOSPHORUS.getProtons()*20))/100, //Protons
+			((ELEMENT.getInstance().MOLYBDENUM.getNeutrons()*10)+(ELEMENT.getInstance().CHROMIUM.getNeutrons()*30)+(ELEMENT.getInstance().COBALT.getNeutrons()*40)+(ELEMENT.getInstance().PHOSPHORUS.getNeutrons()*20))/100, //Neutrons
 			false, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.COBALT, 40),
-					new MaterialStack(ELEMENT.CHROMIUM, 30),
-					new MaterialStack(ELEMENT.PHOSPHORUS, 20),
-					new MaterialStack(ELEMENT.MOLYBDENUM, 10)
+					new MaterialStack(ELEMENT.getInstance().COBALT, 40),
+					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 30),
+					new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 20),
+					new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10)
 			});
 
 	public static final Material HASTELLOY_W = new Material(
 			"Hastelloy-W", //Material Name
 			new short[]{218, 165, 32, 0}, //Material Colour
 			1350, //Melting Point in C
-			((ELEMENT.IRON.getBoilingPointC()*6)+(ELEMENT.MOLYBDENUM.getBoilingPointC()*24)+(ELEMENT.CHROMIUM.getBoilingPointC()*5)+(ELEMENT.NICKEL.getBoilingPointC()*65))/100, //Boiling Point in C
-			((ELEMENT.IRON.getProtons()*6)+(ELEMENT.MOLYBDENUM.getProtons()*24)+(ELEMENT.CHROMIUM.getProtons()*5)+(ELEMENT.NICKEL.getProtons()*65))/100, //Protons
-			((ELEMENT.IRON.getNeutrons()*6)+(ELEMENT.MOLYBDENUM.getNeutrons()*24)+(ELEMENT.CHROMIUM.getNeutrons()*5)+(ELEMENT.NICKEL.getNeutrons()*65))/100, //Neutrons
+			((ELEMENT.getInstance().IRON.getBoilingPointC()*6)+(ELEMENT.getInstance().MOLYBDENUM.getBoilingPointC()*24)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*5)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*65))/100, //Boiling Point in C
+			((ELEMENT.getInstance().IRON.getProtons()*6)+(ELEMENT.getInstance().MOLYBDENUM.getProtons()*24)+(ELEMENT.getInstance().CHROMIUM.getProtons()*5)+(ELEMENT.getInstance().NICKEL.getProtons()*65))/100, //Protons
+			((ELEMENT.getInstance().IRON.getNeutrons()*6)+(ELEMENT.getInstance().MOLYBDENUM.getNeutrons()*24)+(ELEMENT.getInstance().CHROMIUM.getNeutrons()*5)+(ELEMENT.getInstance().NICKEL.getNeutrons()*65))/100, //Neutrons
 			false, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.IRON, 06),
-					new MaterialStack(ELEMENT.MOLYBDENUM, 24),
-					new MaterialStack(ELEMENT.CHROMIUM, 8),
-					new MaterialStack(ELEMENT.NICKEL, 62)
+					new MaterialStack(ELEMENT.getInstance().IRON, 06),
+					new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 24),
+					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 8),
+					new MaterialStack(ELEMENT.getInstance().NICKEL, 62)
 			});
 
 	/*public static final Material HASTELLOY_X = new Material(
 			"Hastelloy-X", //Material Name
 			new short[]{255, 193, 37, 0}, //Material Colour
 			1350, //Melting Point in C
-			((ELEMENT.IRON.getBoilingPoint_C()*18)+(ELEMENT.MOLYBDENUM.getBoilingPoint_C()*9)+(ELEMENT.CHROMIUM.getBoilingPoint_C()*22)+(ELEMENT.NICKEL.getBoilingPoint_C()*51))/100, //Boiling Point in C
-			((ELEMENT.IRON.getProtons()*18)+(ELEMENT.MOLYBDENUM.getProtons()*9)+(ELEMENT.CHROMIUM.getProtons()*22)+(ELEMENT.NICKEL.getProtons()*51))/100, //Protons
-			((ELEMENT.IRON.getNeutrons()*18)+(ELEMENT.MOLYBDENUM.getNeutrons()*9)+(ELEMENT.CHROMIUM.getNeutrons()*22)+(ELEMENT.NICKEL.getNeutrons()*51))/100, //Neutrons
+			((ELEMENT.getInstance().IRON.getBoilingPoint_C()*18)+(ELEMENT.getInstance().MOLYBDENUM.getBoilingPoint_C()*9)+(ELEMENT.getInstance().CHROMIUM.getBoilingPoint_C()*22)+(ELEMENT.getInstance().NICKEL.getBoilingPoint_C()*51))/100, //Boiling Point in C
+			((ELEMENT.getInstance().IRON.getProtons()*18)+(ELEMENT.getInstance().MOLYBDENUM.getProtons()*9)+(ELEMENT.getInstance().CHROMIUM.getProtons()*22)+(ELEMENT.getInstance().NICKEL.getProtons()*51))/100, //Protons
+			((ELEMENT.getInstance().IRON.getNeutrons()*18)+(ELEMENT.getInstance().MOLYBDENUM.getNeutrons()*9)+(ELEMENT.getInstance().CHROMIUM.getNeutrons()*22)+(ELEMENT.getInstance().NICKEL.getNeutrons()*51))/100, //Neutrons
 			false, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.IRON, 18),
-					new MaterialStack(ELEMENT.MOLYBDENUM, 9),
-					new MaterialStack(ELEMENT.CHROMIUM, 22),
-					new MaterialStack(ELEMENT.NICKEL, 51)
+					new MaterialStack(ELEMENT.getInstance().IRON, 18),
+					new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 9),
+					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 22),
+					new MaterialStack(ELEMENT.getInstance().NICKEL, 51)
 			});*/
 	
 	public static final Material HASTELLOY_X = new Material(
 			"Hastelloy-X", //Material Name
 			new short[]{255, 193, 37, 0}, //Material Colour
 			1350, //Melting Point in C
-			((ELEMENT.IRON.getBoilingPointC()*18)+(ELEMENT.MOLYBDENUM.getBoilingPointC()*9)+(ELEMENT.CHROMIUM.getBoilingPointC()*22)+(ELEMENT.NICKEL.getBoilingPointC()*51))/100, //Boiling Point in C
-			((ELEMENT.IRON.getProtons()*18)+(ELEMENT.MOLYBDENUM.getProtons()*9)+(ELEMENT.CHROMIUM.getProtons()*22)+(ELEMENT.NICKEL.getProtons()*51))/100, //Protons
-			((ELEMENT.IRON.getNeutrons()*18)+(ELEMENT.MOLYBDENUM.getNeutrons()*9)+(ELEMENT.CHROMIUM.getNeutrons()*22)+(ELEMENT.NICKEL.getNeutrons()*51))/100, //Neutrons
+			((ELEMENT.getInstance().IRON.getBoilingPointC()*18)+(ELEMENT.getInstance().MOLYBDENUM.getBoilingPointC()*9)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*22)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*51))/100, //Boiling Point in C
+			((ELEMENT.getInstance().IRON.getProtons()*18)+(ELEMENT.getInstance().MOLYBDENUM.getProtons()*9)+(ELEMENT.getInstance().CHROMIUM.getProtons()*22)+(ELEMENT.getInstance().NICKEL.getProtons()*51))/100, //Protons
+			((ELEMENT.getInstance().IRON.getNeutrons()*18)+(ELEMENT.getInstance().MOLYBDENUM.getNeutrons()*9)+(ELEMENT.getInstance().CHROMIUM.getNeutrons()*22)+(ELEMENT.getInstance().NICKEL.getNeutrons()*51))/100, //Neutrons
 			false, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.IRON, 18),
-					new MaterialStack(ELEMENT.MOLYBDENUM, 9),
-					new MaterialStack(ELEMENT.CHROMIUM, 22),
-					new MaterialStack(ELEMENT.NICKEL, 51)
+					new MaterialStack(ELEMENT.getInstance().IRON, 18),
+					new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 9),
+					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 22),
+					new MaterialStack(ELEMENT.getInstance().NICKEL, 51)
 			});
 
 	public static final Material HASTELLOY_N = new Material(
 			"Hastelloy-N", //Material Name
 			new short[]{236, 213, 48, 0}, //Material Colour
 			1350, //Melting Point in C
-			((ELEMENT.YTTRIUM.getBoilingPointC()*5)+(ELEMENT.MOLYBDENUM.getBoilingPointC()*16)+(ELEMENT.CHROMIUM.getBoilingPointC()*7)+(ELEMENT.NICKEL.getBoilingPointC()*72))/100, //Boiling Point in C
-			((ELEMENT.YTTRIUM.getProtons()*5)+(ELEMENT.MOLYBDENUM.getProtons()*16)+(ELEMENT.CHROMIUM.getProtons()*7)+(ELEMENT.NICKEL.getProtons()*72))/100, //Protons
-			((ELEMENT.YTTRIUM.getNeutrons()*5)+(ELEMENT.MOLYBDENUM.getNeutrons()*16)+(ELEMENT.CHROMIUM.getNeutrons()*7)+(ELEMENT.NICKEL.getNeutrons()*72))/100, //Neutrons
+			((ELEMENT.getInstance().YTTRIUM.getBoilingPointC()*5)+(ELEMENT.getInstance().MOLYBDENUM.getBoilingPointC()*16)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*7)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*72))/100, //Boiling Point in C
+			((ELEMENT.getInstance().YTTRIUM.getProtons()*5)+(ELEMENT.getInstance().MOLYBDENUM.getProtons()*16)+(ELEMENT.getInstance().CHROMIUM.getProtons()*7)+(ELEMENT.getInstance().NICKEL.getProtons()*72))/100, //Protons
+			((ELEMENT.getInstance().YTTRIUM.getNeutrons()*5)+(ELEMENT.getInstance().MOLYBDENUM.getNeutrons()*16)+(ELEMENT.getInstance().CHROMIUM.getNeutrons()*7)+(ELEMENT.getInstance().NICKEL.getNeutrons()*72))/100, //Neutrons
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.YTTRIUM, 10),
-					new MaterialStack(ELEMENT.MOLYBDENUM, 16),
-					new MaterialStack(ELEMENT.CHROMIUM, 10),
-					new MaterialStack(ELEMENT.NICKEL, 64)
+					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 10),
+					new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 16),
+					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 10),
+					new MaterialStack(ELEMENT.getInstance().NICKEL, 64)
 			});
 
 	public static final Material HASTELLOY_C276 = new Material(
 			"Hastelloy-C276", //Material Name
 			new short[]{238, 180, 34, 0}, //Material Colour
 			1350, //Melting Point in C
-			((ELEMENT.COBALT.getBoilingPointC()*2)+(ELEMENT.MOLYBDENUM.getBoilingPointC()*16)+(ELEMENT.CHROMIUM.getBoilingPointC()*16)+(ELEMENT.NICKEL.getBoilingPointC()*66))/100, //Boiling Point in C
-			((ELEMENT.COBALT.getProtons()*2)+(ELEMENT.MOLYBDENUM.getProtons()*16)+(ELEMENT.CHROMIUM.getProtons()*16)+(ELEMENT.NICKEL.getProtons()*66))/100, //Protons
-			((ELEMENT.COBALT.getNeutrons()*2)+(ELEMENT.MOLYBDENUM.getNeutrons()*16)+(ELEMENT.CHROMIUM.getNeutrons()*16)+(ELEMENT.NICKEL.getNeutrons()*66))/100, //Neutrons
+			((ELEMENT.getInstance().COBALT.getBoilingPointC()*2)+(ELEMENT.getInstance().MOLYBDENUM.getBoilingPointC()*16)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*16)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*66))/100, //Boiling Point in C
+			((ELEMENT.getInstance().COBALT.getProtons()*2)+(ELEMENT.getInstance().MOLYBDENUM.getProtons()*16)+(ELEMENT.getInstance().CHROMIUM.getProtons()*16)+(ELEMENT.getInstance().NICKEL.getProtons()*66))/100, //Protons
+			((ELEMENT.getInstance().COBALT.getNeutrons()*2)+(ELEMENT.getInstance().MOLYBDENUM.getNeutrons()*16)+(ELEMENT.getInstance().CHROMIUM.getNeutrons()*16)+(ELEMENT.getInstance().NICKEL.getNeutrons()*66))/100, //Neutrons
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.COBALT, 02),
-					new MaterialStack(ELEMENT.MOLYBDENUM, 16),
-					new MaterialStack(ELEMENT.CHROMIUM, 16),
-					new MaterialStack(ELEMENT.NICKEL, 66)
+					new MaterialStack(ELEMENT.getInstance().COBALT, 02),
+					new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 16),
+					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 16),
+					new MaterialStack(ELEMENT.getInstance().NICKEL, 66)
 			});
 
 	public static final Material INCOLOY_020 = new Material(
 			"Incoloy-020", //Material Name
 			new short[]{101, 81, 71, 0}, //Material Colour
 			1425, //Melting Point in C
-			((ELEMENT.IRON.getBoilingPointC()*40)+(ELEMENT.COPPER.getBoilingPointC()*4)+(ELEMENT.CHROMIUM.getBoilingPointC()*20)+(ELEMENT.NICKEL.getBoilingPointC()*36))/100, //Boiling Point in C
-			((ELEMENT.IRON.getProtons()*40)+(ELEMENT.COPPER.getProtons()*4)+(ELEMENT.CHROMIUM.getProtons()*20)+(ELEMENT.NICKEL.getProtons()*36))/100, //Protons
-			((ELEMENT.IRON.getNeutrons()*40)+(ELEMENT.COPPER.getNeutrons()*4)+(ELEMENT.CHROMIUM.getNeutrons()*20)+(ELEMENT.NICKEL.getNeutrons()*36))/100, //Neutrons
+			((ELEMENT.getInstance().IRON.getBoilingPointC()*40)+(ELEMENT.getInstance().COPPER.getBoilingPointC()*4)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*20)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*36))/100, //Boiling Point in C
+			((ELEMENT.getInstance().IRON.getProtons()*40)+(ELEMENT.getInstance().COPPER.getProtons()*4)+(ELEMENT.getInstance().CHROMIUM.getProtons()*20)+(ELEMENT.getInstance().NICKEL.getProtons()*36))/100, //Protons
+			((ELEMENT.getInstance().IRON.getNeutrons()*40)+(ELEMENT.getInstance().COPPER.getNeutrons()*4)+(ELEMENT.getInstance().CHROMIUM.getNeutrons()*20)+(ELEMENT.getInstance().NICKEL.getNeutrons()*36))/100, //Neutrons
 			false, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.IRON, 40),
-					new MaterialStack(ELEMENT.COPPER, 4),
-					new MaterialStack(ELEMENT.CHROMIUM, 20),
-					new MaterialStack(ELEMENT.NICKEL, 36)
+					new MaterialStack(ELEMENT.getInstance().IRON, 40),
+					new MaterialStack(ELEMENT.getInstance().COPPER, 4),
+					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20),
+					new MaterialStack(ELEMENT.getInstance().NICKEL, 36)
 			});
 
 	public static final Material INCOLOY_DS = new Material(
 			"Incoloy-DS", //Material Name
 			new short[]{71, 101, 81, 0}, //Material Colour
 			1425, //Melting Point in C
-			((ELEMENT.IRON.getBoilingPointC()*46)+(ELEMENT.COBALT.getBoilingPointC()*18)+(ELEMENT.CHROMIUM.getBoilingPointC()*18)+(ELEMENT.NICKEL.getBoilingPointC()*18))/100, //Boiling Point in C
-			((ELEMENT.IRON.getProtons()*46)+(ELEMENT.COBALT.getProtons()*18)+(ELEMENT.CHROMIUM.getProtons()*18)+(ELEMENT.NICKEL.getProtons()*18))/100, //Protons
-			((ELEMENT.IRON.getNeutrons()*46)+(ELEMENT.COBALT.getNeutrons()*18)+(ELEMENT.CHROMIUM.getNeutrons()*18)+(ELEMENT.NICKEL.getNeutrons()*18))/100, //Neutrons
+			((ELEMENT.getInstance().IRON.getBoilingPointC()*46)+(ELEMENT.getInstance().COBALT.getBoilingPointC()*18)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*18)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*18))/100, //Boiling Point in C
+			((ELEMENT.getInstance().IRON.getProtons()*46)+(ELEMENT.getInstance().COBALT.getProtons()*18)+(ELEMENT.getInstance().CHROMIUM.getProtons()*18)+(ELEMENT.getInstance().NICKEL.getProtons()*18))/100, //Protons
+			((ELEMENT.getInstance().IRON.getNeutrons()*46)+(ELEMENT.getInstance().COBALT.getNeutrons()*18)+(ELEMENT.getInstance().CHROMIUM.getNeutrons()*18)+(ELEMENT.getInstance().NICKEL.getNeutrons()*18))/100, //Neutrons
 			false, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.IRON, 46),
-					new MaterialStack(ELEMENT.COBALT, 18),
-					new MaterialStack(ELEMENT.CHROMIUM, 18),
-					new MaterialStack(ELEMENT.NICKEL, 18)
+					new MaterialStack(ELEMENT.getInstance().IRON, 46),
+					new MaterialStack(ELEMENT.getInstance().COBALT, 18),
+					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 18),
+					new MaterialStack(ELEMENT.getInstance().NICKEL, 18)
 			});
 
 	public static final Material INCOLOY_MA956 = new Material(
 			"Incoloy-MA956", //Material Name
 			new short[]{81, 71, 101, 0}, //Material Colour
 			1425, //Melting Point in C
-			((ELEMENT.IRON.getBoilingPointC()*75)+(ELEMENT.ALUMINIUM.getBoilingPointC()*4)+(ELEMENT.CHROMIUM.getBoilingPointC()*20)+(ELEMENT.YTTRIUM.getBoilingPointC()*1))/100, //Boiling Point in C
-			((ELEMENT.IRON.getProtons()*75)+(ELEMENT.ALUMINIUM.getProtons()*4)+(ELEMENT.CHROMIUM.getProtons()*20)+(ELEMENT.YTTRIUM.getProtons()*1))/100, //Protons
-			((ELEMENT.IRON.getNeutrons()*75)+(ELEMENT.ALUMINIUM.getNeutrons()*4)+(ELEMENT.CHROMIUM.getNeutrons()*20)+(ELEMENT.YTTRIUM.getNeutrons()*1))/100, //Neutrons
+			((ELEMENT.getInstance().IRON.getBoilingPointC()*75)+(ELEMENT.getInstance().ALUMINIUM.getBoilingPointC()*4)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*20)+(ELEMENT.getInstance().YTTRIUM.getBoilingPointC()*1))/100, //Boiling Point in C
+			((ELEMENT.getInstance().IRON.getProtons()*75)+(ELEMENT.getInstance().ALUMINIUM.getProtons()*4)+(ELEMENT.getInstance().CHROMIUM.getProtons()*20)+(ELEMENT.getInstance().YTTRIUM.getProtons()*1))/100, //Protons
+			((ELEMENT.getInstance().IRON.getNeutrons()*75)+(ELEMENT.getInstance().ALUMINIUM.getNeutrons()*4)+(ELEMENT.getInstance().CHROMIUM.getNeutrons()*20)+(ELEMENT.getInstance().YTTRIUM.getNeutrons()*1))/100, //Neutrons
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.IRON, 64),
-					new MaterialStack(ELEMENT.ALUMINIUM, 12),
-					new MaterialStack(ELEMENT.CHROMIUM, 20),
-					new MaterialStack(ELEMENT.YTTRIUM, 4)
+					new MaterialStack(ELEMENT.getInstance().IRON, 64),
+					new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 12),
+					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20),
+					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 4)
 			});
 
 	public static final Material TUNGSTEN_CARBIDE = new Material(
 			"Tungsten Carbide", //Material Name
 			new short[]{44, 44, 44, 0}, //Material Colour
 			3422, //Melting Point in C
-			((ELEMENT.TUNGSTEN.getBoilingPointC()*5)+(ELEMENT.CARBON.getBoilingPointC()*5))/10, //Boiling Point in C
-			((ELEMENT.TUNGSTEN.getProtons()*5)+(ELEMENT.CARBON.getProtons()*5))/10, //Protons
-			((ELEMENT.TUNGSTEN.getNeutrons()*5)+(ELEMENT.CARBON.getNeutrons()*5))/10, //Neutrons
+			((ELEMENT.getInstance().TUNGSTEN.getBoilingPointC()*5)+(ELEMENT.getInstance().CARBON.getBoilingPointC()*5))/10, //Boiling Point in C
+			((ELEMENT.getInstance().TUNGSTEN.getProtons()*5)+(ELEMENT.getInstance().CARBON.getProtons()*5))/10, //Protons
+			((ELEMENT.getInstance().TUNGSTEN.getNeutrons()*5)+(ELEMENT.getInstance().CARBON.getNeutrons()*5))/10, //Neutrons
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.CARBON, 50),
-					new MaterialStack(ELEMENT.TUNGSTEN, 50)
+					new MaterialStack(ELEMENT.getInstance().CARBON, 50),
+					new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 50)
 			});
 
 	public static final Material SILICON_CARBIDE = new Material(
 			"Silicon Carbide", //Material Name
 			new short[]{40, 48, 36, 0}, //Material Colour
 			1414, //Melting Point in C
-			((ELEMENT.SILICON.getBoilingPointC()*5)+(ELEMENT.CARBON.getBoilingPointC()*5))/10, //Boiling Point in C
-			((ELEMENT.SILICON.getProtons()*5)+(ELEMENT.CARBON.getProtons()*5))/10, //Protons
-			((ELEMENT.SILICON.getNeutrons()*5)+(ELEMENT.CARBON.getNeutrons()*5))/10, //Neutrons
+			((ELEMENT.getInstance().SILICON.getBoilingPointC()*5)+(ELEMENT.getInstance().CARBON.getBoilingPointC()*5))/10, //Boiling Point in C
+			((ELEMENT.getInstance().SILICON.getProtons()*5)+(ELEMENT.getInstance().CARBON.getProtons()*5))/10, //Protons
+			((ELEMENT.getInstance().SILICON.getNeutrons()*5)+(ELEMENT.getInstance().CARBON.getNeutrons()*5))/10, //Neutrons
 			false, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.SILICON, 40),
-					new MaterialStack(ELEMENT.CARBON, 50),
-					new MaterialStack(ELEMENT.OXYGEN, 10)
+					new MaterialStack(ELEMENT.getInstance().SILICON, 40),
+					new MaterialStack(ELEMENT.getInstance().CARBON, 50),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 10)
 			});
 
 	public static final Material TANTALUM_CARBIDE = new Material(
 			"Tantalum Carbide", //Material Name
 			new short[]{139, 136, 120, 0}, //Material Colour
 			2980, //Melting Point in C
-			((ELEMENT.TANTALUM.getBoilingPointC()*5)+(ELEMENT.CARBON.getBoilingPointC()*5))/10, //Boiling Point in C
-			((ELEMENT.TANTALUM.getProtons()*5)+(ELEMENT.CARBON.getProtons()*5))/10, //Protons
-			((ELEMENT.TANTALUM.getNeutrons()*5)+(ELEMENT.CARBON.getNeutrons()*5))/10, //Neutrons
+			((ELEMENT.getInstance().TANTALUM.getBoilingPointC()*5)+(ELEMENT.getInstance().CARBON.getBoilingPointC()*5))/10, //Boiling Point in C
+			((ELEMENT.getInstance().TANTALUM.getProtons()*5)+(ELEMENT.getInstance().CARBON.getProtons()*5))/10, //Protons
+			((ELEMENT.getInstance().TANTALUM.getNeutrons()*5)+(ELEMENT.getInstance().CARBON.getNeutrons()*5))/10, //Neutrons
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.TANTALUM, 40),
-					new MaterialStack(ELEMENT.CARBON, 50),
-					new MaterialStack(ELEMENT.OXYGEN, 10)
+					new MaterialStack(ELEMENT.getInstance().TANTALUM, 40),
+					new MaterialStack(ELEMENT.getInstance().CARBON, 50),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 10)
 			});
 
 	public static final Material ZIRCONIUM_CARBIDE = new Material(
 			"Zirconium Carbide", //Material Name
 			new short[]{222, 202, 180, 0}, //Material Colour
 			1855, //Melting Point in C
-			((ELEMENT.ZIRCONIUM.getBoilingPointC()*5)+(ELEMENT.CARBON.getBoilingPointC()*5))/10, //Boiling Point in C
-			((ELEMENT.ZIRCONIUM.getProtons()*5)+(ELEMENT.CARBON.getProtons()*5))/10, //Protons
-			((ELEMENT.ZIRCONIUM.getNeutrons()*5)+(ELEMENT.CARBON.getNeutrons()*5))/10, //Neutrons
+			((ELEMENT.getInstance().ZIRCONIUM.getBoilingPointC()*5)+(ELEMENT.getInstance().CARBON.getBoilingPointC()*5))/10, //Boiling Point in C
+			((ELEMENT.getInstance().ZIRCONIUM.getProtons()*5)+(ELEMENT.getInstance().CARBON.getProtons()*5))/10, //Protons
+			((ELEMENT.getInstance().ZIRCONIUM.getNeutrons()*5)+(ELEMENT.getInstance().CARBON.getNeutrons()*5))/10, //Neutrons
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.ZIRCONIUM, 40),
-					new MaterialStack(ELEMENT.CARBON, 50),
-					new MaterialStack(ELEMENT.OXYGEN, 10)
+					new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 40),
+					new MaterialStack(ELEMENT.getInstance().CARBON, 50),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 10)
 			});
 
 	public static final Material NIOBIUM_CARBIDE = new Material(
 			"Niobium Carbide", //Material Name
 			new short[]{205, 197, 191, 0}, //Material Colour
 			2477, //Melting Point in C
-			((ELEMENT.NIOBIUM.getBoilingPointC()*5)+(ELEMENT.CARBON.getBoilingPointC()*5))/10, //Boiling Point in C
-			((ELEMENT.NIOBIUM.getProtons()*5)+(ELEMENT.CARBON.getProtons()*5))/10, //Protons
-			((ELEMENT.NIOBIUM.getNeutrons()*5)+(ELEMENT.CARBON.getNeutrons()*5))/10, //Neutrons
+			((ELEMENT.getInstance().NIOBIUM.getBoilingPointC()*5)+(ELEMENT.getInstance().CARBON.getBoilingPointC()*5))/10, //Boiling Point in C
+			((ELEMENT.getInstance().NIOBIUM.getProtons()*5)+(ELEMENT.getInstance().CARBON.getProtons()*5))/10, //Protons
+			((ELEMENT.getInstance().NIOBIUM.getNeutrons()*5)+(ELEMENT.getInstance().CARBON.getNeutrons()*5))/10, //Neutrons
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.NIOBIUM, 40),
-					new MaterialStack(ELEMENT.CARBON, 50),
-					new MaterialStack(ELEMENT.OXYGEN, 10)
+					new MaterialStack(ELEMENT.getInstance().NIOBIUM, 40),
+					new MaterialStack(ELEMENT.getInstance().CARBON, 50),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 10)
 			});
 	
 	
@@ -501,12 +501,12 @@ public final class ALLOY {
 			128, //Neutrons
 			true, //Uses Blast furnace?
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.TITANIUM, 18),
-					new MaterialStack(ELEMENT.CARBON, 18),
-					new MaterialStack(ELEMENT.POTASSIUM, 18),
-					new MaterialStack(ELEMENT.LITHIUM, 18),
-					new MaterialStack(ELEMENT.SULFUR, 18),
-					new MaterialStack(ELEMENT.HYDROGEN, 10)
+					new MaterialStack(ELEMENT.getInstance().TITANIUM, 18),
+					new MaterialStack(ELEMENT.getInstance().CARBON, 18),
+					new MaterialStack(ELEMENT.getInstance().POTASSIUM, 18),
+					new MaterialStack(ELEMENT.getInstance().LITHIUM, 18),
+					new MaterialStack(ELEMENT.getInstance().SULFUR, 18),
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10)
 			});	//Material Stacks with Percentage of required elements.
 
 	
@@ -555,11 +555,11 @@ public final class ALLOY {
 					new MaterialStack(ALLOY.LEAGRISIUM, 25),
 					new MaterialStack(ALLOY.ENERGYCRYSTAL, 25),
 					new MaterialStack(ALLOY.ZIRCONIUM_CARBIDE, 25),
-					new MaterialStack(ELEMENT.MANGANESE, 5),
-					new MaterialStack(ELEMENT.MOLYBDENUM, 5),
-					new MaterialStack(ELEMENT.TUNGSTEN, 5),
-					new MaterialStack(ELEMENT.BERYLLIUM, 5),
-					new MaterialStack(ELEMENT.BISMUTH, 5)
+					new MaterialStack(ELEMENT.getInstance().MANGANESE, 5),
+					new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 5),
+					new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 5),
+					new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 5),
+					new MaterialStack(ELEMENT.getInstance().BISMUTH, 5)
 			});
 	
 	
diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java
index 1265905c24..73d49e2694 100644
--- a/src/Java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java
@@ -5,58 +5,67 @@ import gtPlusPlus.core.util.materials.MaterialUtils;
 
 public final class ELEMENT {
 	
+	private static final ELEMENT thisClass = new ELEMENT();
+	
+	public ELEMENT(){
+		
+	}	
+	
+	public static ELEMENT getInstance(){
+	return thisClass;	
+	}
 
 	//First 50 Elements
-	public static final Material HYDROGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Hydrogen);
-	public static final Material HELIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Helium);
-	public static final Material LITHIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Lithium);
-	public static final Material BERYLLIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Beryllium);
-	public static final Material BORON = MaterialUtils.generateMaterialFromGtENUM(Materials.Boron);
-	public static final Material CARBON = MaterialUtils.generateMaterialFromGtENUM(Materials.Carbon);
-	public static final Material NITROGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Nitrogen);
-	public static final Material OXYGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Oxygen);
-	public static final Material FLUORINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Fluorine);
-	//public static final Material NEON = MaterialUtils.generateMaterialFromGtENUM(Materials.Ne);
-	public static final Material SODIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Sodium);
-	public static final Material MAGNESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Magnesium);
-	public static final Material ALUMINIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Aluminium);
-	public static final Material SILICON = MaterialUtils.generateMaterialFromGtENUM(Materials.Silicon);
-	public static final Material PHOSPHORUS = MaterialUtils.generateMaterialFromGtENUM(Materials.Phosphorus);
-	public static final Material SULFUR = MaterialUtils.generateMaterialFromGtENUM(Materials.Sulfur);
-	public static final Material CHLORINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Chlorine);
-	public static final Material ARGON = MaterialUtils.generateMaterialFromGtENUM(Materials.Argon);
-	public static final Material POTASSIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Potassium);
-	public static final Material CALCIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Calcium);
-	public static final Material SCANDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Scandium);
-	public static final Material TITANIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Titanium);
-	public static final Material VANADIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Vanadium);
-	public static final Material CHROMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Chrome);
-	public static final Material MANGANESE = MaterialUtils.generateMaterialFromGtENUM(Materials.Manganese);
-	public static final Material IRON = MaterialUtils.generateMaterialFromGtENUM(Materials.Iron);
-	public static final Material COBALT = MaterialUtils.generateMaterialFromGtENUM(Materials.Cobalt);
-	public static final Material NICKEL = MaterialUtils.generateMaterialFromGtENUM(Materials.Nickel);
-	public static final Material COPPER = MaterialUtils.generateMaterialFromGtENUM(Materials.Copper);
-	public static final Material ZINC = MaterialUtils.generateMaterialFromGtENUM(Materials.Zinc);
-	public static final Material GALLIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Gallium);
-	//public static final Material GERMANIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Germanium);
-	public static final Material ARSENIC = MaterialUtils.generateMaterialFromGtENUM(Materials.Arsenic);
-	//public static final Material SELENIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Selenium);
-	//public static final Material BROMINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Bromine);
-	//public static final Material KRYPTON = MaterialUtils.generateMaterialFromGtENUM(Materials.Krypton);
-	public static final Material RUBIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Rubidium);
-	public static final Material STRONTIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Strontium);
-	public static final Material YTTRIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Yttrium);
-	public static final Material ZIRCONIUM = new Material("Zirconium", new short[]{255, 250, 205}, 1855, 4377, 40, 51, false, "Zr", 0);//Not a GT Inherited Material
-	public static final Material NIOBIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Niobium);
-	public static final Material MOLYBDENUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Molybdenum);
-	//public static final Material TECHNETIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Technetium);
-	//public static final Material RUTHENIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Ruthenium);
-	//public static final Material RHODIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Rhodium);
-	public static final Material PALLADIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Palladium);
-	public static final Material SILVER = MaterialUtils.generateMaterialFromGtENUM(Materials.Silver);
-	public static final Material CADMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Cadmium);
-	public static final Material INDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Indium);
-	public static final Material TIN = MaterialUtils.generateMaterialFromGtENUM(Materials.Tin);
+	public final Material HYDROGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Hydrogen);
+	public final Material HELIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Helium);
+	public final Material LITHIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Lithium);
+	public final Material BERYLLIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Beryllium);
+	public final Material BORON = MaterialUtils.generateMaterialFromGtENUM(Materials.Boron);
+	public final Material CARBON = MaterialUtils.generateMaterialFromGtENUM(Materials.Carbon);
+	public final Material NITROGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Nitrogen);
+	public final Material OXYGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Oxygen);
+	public final Material FLUORINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Fluorine);
+	//public final Material NEON = MaterialUtils.generateMaterialFromGtENUM(Materials.Ne);
+	public final Material SODIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Sodium);
+	public final Material MAGNESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Magnesium);
+	public final Material ALUMINIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Aluminium);
+	public final Material SILICON = MaterialUtils.generateMaterialFromGtENUM(Materials.Silicon);
+	public final Material PHOSPHORUS = MaterialUtils.generateMaterialFromGtENUM(Materials.Phosphorus);
+	public final Material SULFUR = MaterialUtils.generateMaterialFromGtENUM(Materials.Sulfur);
+	public final Material CHLORINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Chlorine);
+	public final Material ARGON = MaterialUtils.generateMaterialFromGtENUM(Materials.Argon);
+	public final Material POTASSIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Potassium);
+	public final Material CALCIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Calcium);
+	public final Material SCANDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Scandium);
+	public final Material TITANIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Titanium);
+	public final Material VANADIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Vanadium);
+	public final Material CHROMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Chrome);
+	public final Material MANGANESE = MaterialUtils.generateMaterialFromGtENUM(Materials.Manganese);
+	public final Material IRON = MaterialUtils.generateMaterialFromGtENUM(Materials.Iron);
+	public final Material COBALT = MaterialUtils.generateMaterialFromGtENUM(Materials.Cobalt);
+	public final Material NICKEL = MaterialUtils.generateMaterialFromGtENUM(Materials.Nickel);
+	public final Material COPPER = MaterialUtils.generateMaterialFromGtENUM(Materials.Copper);
+	public final Material ZINC = MaterialUtils.generateMaterialFromGtENUM(Materials.Zinc);
+	public final Material GALLIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Gallium);
+	//public final Material GERMANIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Germanium);
+	public final Material ARSENIC = MaterialUtils.generateMaterialFromGtENUM(Materials.Arsenic);
+	//public final Material SELENIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Selenium);
+	//public final Material BROMINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Bromine);
+	//public final Material KRYPTON = MaterialUtils.generateMaterialFromGtENUM(Materials.Krypton);
+	public final Material RUBIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Rubidium);
+	public final Material STRONTIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Strontium);
+	public final Material YTTRIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Yttrium);
+	public final Material ZIRCONIUM = new Material("Zirconium", new short[]{255, 250, 205}, 1855, 4377, 40, 51, false, "Zr", 0);//Not a GT Inherited Material
+	public final Material NIOBIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Niobium);
+	public final Material MOLYBDENUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Molybdenum);
+	//public final Material TECHNETIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Technetium);
+	//public final Material RUTHENIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Ruthenium);
+	//public final Material RHODIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Rhodium);
+	public final Material PALLADIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Palladium);
+	public final Material SILVER = MaterialUtils.generateMaterialFromGtENUM(Materials.Silver);
+	public final Material CADMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Cadmium);
+	public final Material INDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Indium);
+	public final Material TIN = MaterialUtils.generateMaterialFromGtENUM(Materials.Tin);
 
 
 
@@ -67,19 +76,19 @@ public final class ELEMENT {
 
 
 	//Second 50 elements
-	public static final Material TANTALUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Tantalum);
-	public static final Material TUNGSTEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Tungsten);
-	public static final Material OSMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Osmium);
-	public static final Material IRIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Iridium);	
-	public static final Material PLATINUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Platinum);	
-	public static final Material GOLD = MaterialUtils.generateMaterialFromGtENUM(Materials.Gold);	
-	public static final Material LEAD = MaterialUtils.generateMaterialFromGtENUM(Materials.Lead);	
-	public static final Material BISMUTH = MaterialUtils.generateMaterialFromGtENUM(Materials.Bismuth);	
-	public static final Material RADON = MaterialUtils.generateMaterialFromGtENUM(Materials.Radon);	
-	public static final Material THORIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Thorium);	
-	public static final Material URANIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Uranium);	
-	public static final Material PLUTONIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Plutonium);	
-	public static 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 TANTALUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Tantalum);
+	public final Material TUNGSTEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Tungsten);
+	public final Material OSMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Osmium);
+	public final Material IRIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Iridium);	
+	public final Material PLATINUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Platinum);	
+	public final Material GOLD = MaterialUtils.generateMaterialFromGtENUM(Materials.Gold);	
+	public final Material LEAD = MaterialUtils.generateMaterialFromGtENUM(Materials.Lead);	
+	public final Material BISMUTH = MaterialUtils.generateMaterialFromGtENUM(Materials.Bismuth);	
+	public final Material RADON = MaterialUtils.generateMaterialFromGtENUM(Materials.Radon);	
+	public final Material THORIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Thorium);	
+	public final Material URANIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Uranium);	
+	public final Material PLUTONIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Plutonium);	
+	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
 
 
 }
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 16c87c427a..d73ac96bec 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -387,23 +387,23 @@ public class Material {
 					if (dummyFormulaArray.length >= 1){
 						for (int e=0;e<tempInput.size();e++){
 							if (tempInput.get(e) != null){
-								if (tempInput.get(e).stackMaterial != null){
-									if (!tempInput.get(e).stackMaterial.vChemicalSymbol.equals("??")){
+								if (tempInput.get(e).getStackMaterial() != null){
+									if (!tempInput.get(e).getStackMaterial().vChemicalSymbol.equals("??")){
 										if (dummyFormulaArray[e] > 1){
 
-											if (tempInput.get(e).stackMaterial.vChemicalFormula.length() > 3){
-												dummyFormula = dummyFormula + "(" + tempInput.get(e).stackMaterial.vChemicalFormula + ")" + dummyFormulaArray[e];										
+											if (tempInput.get(e).getStackMaterial().vChemicalFormula.length() > 3){
+												dummyFormula = dummyFormula + "(" + tempInput.get(e).getStackMaterial().vChemicalFormula + ")" + dummyFormulaArray[e];										
 											}
 											else {
-												dummyFormula = dummyFormula + tempInput.get(e).stackMaterial.vChemicalFormula + dummyFormulaArray[e];										
+												dummyFormula = dummyFormula + tempInput.get(e).getStackMaterial().vChemicalFormula + dummyFormulaArray[e];										
 											}
 										}
 										else if (dummyFormulaArray[e] == 1){
-											if (tempInput.get(e).stackMaterial.vChemicalFormula.length() > 3){
-												dummyFormula = dummyFormula + "(" +tempInput.get(e).stackMaterial.vChemicalFormula + ")";											
+											if (tempInput.get(e).getStackMaterial().vChemicalFormula.length() > 3){
+												dummyFormula = dummyFormula + "(" +tempInput.get(e).getStackMaterial().vChemicalFormula + ")";											
 											}
 											else {
-												dummyFormula = dummyFormula +tempInput.get(e).stackMaterial.vChemicalFormula;											
+												dummyFormula = dummyFormula +tempInput.get(e).getStackMaterial().vChemicalFormula;											
 											}
 										}
 									}
diff --git a/src/Java/gtPlusPlus/core/material/MaterialStack.java b/src/Java/gtPlusPlus/core/material/MaterialStack.java
index a804a09da2..f2f8ff4e5a 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialStack.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialStack.java
@@ -9,22 +9,24 @@ import net.minecraft.item.ItemStack;
 
 public class MaterialStack {
 
-	final int[] vAmount;
-	final Material stackMaterial;
-	final double percentageToUse;
+	private transient final int[] vAmount;
+	private final Material stackMaterial;
+	private final double vPercentageToUse;
 
-	public MaterialStack(Material inputs, double partOutOf100){
+	public MaterialStack(final Material inputs, final double partOutOf100){
 		this.stackMaterial = inputs;
-		this.percentageToUse = partOutOf100;
+		this.vPercentageToUse = partOutOf100;
 		this.vAmount = math(partOutOf100);
 	}
 
-	private int[] math(double val){	
+	@SuppressWarnings("static-method")
+	private int[] math(final double val){	
+		double i;
 		//Cast to a BigDecimal to round it.
-		BigDecimal bd = new BigDecimal(val).setScale(2, RoundingMode.HALF_EVEN);
-		val = bd.doubleValue();
+		final BigDecimal bd = new BigDecimal(val).setScale(2, RoundingMode.HALF_EVEN);
+		i = bd.doubleValue();
 		//Split the string into xx.xx
-		String[] arr=String.valueOf(val).split("\\.");
+		final String[] arr=String.valueOf(i).split("\\.");
 		int[] intArr=new int[2];
 		intArr[0]=Integer.parseInt(arr[0]);
 		intArr[1]=Integer.parseInt(arr[1]);
@@ -35,7 +37,7 @@ public class MaterialStack {
 		return this.stackMaterial.getDust(this.vAmount[0]);
 	}
 	
-	public ItemStack getDustStack(int amount){
+	public ItemStack getDustStack(final int amount){
 		return this.stackMaterial.getDust(amount);
 	}
 	
@@ -43,6 +45,10 @@ public class MaterialStack {
 		return this.stackMaterial;
 	}
 	
+	public double getvPercentageToUse(){
+		return this.vPercentageToUse;
+	}
+	
 	public long[] getSmallestStackSizes(){
 		return this.stackMaterial.getSmallestRatio(stackMaterial.getComposites());
 	}
@@ -56,7 +62,7 @@ public class MaterialStack {
 		return 100;
 	}
 	public ItemStack getLeftOverStacksFromDecimalValue(){
-		int temp = this.vAmount[1];
+		final int temp = this.vAmount[1];
 		int getCount;
 		if (temp >= 25 && temp <=99){
 			getCount = temp/25;
@@ -72,7 +78,7 @@ public class MaterialStack {
 	}
 
 	public ItemStack[] getValidItemStacks(){
-		return ItemUtils.validItemsForOreDict(stackMaterial.unlocalizedName);
+		return ItemUtils.validItemsForOreDict(stackMaterial.getUnlocalizedName());
 	}
 
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
index 791d7b5ea4..ad0db9f927 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
@@ -217,7 +217,7 @@ public class GregtechConduits {
 			}			
 		}
 		else {
-			mass = ELEMENT.IRON.getMass();
+			mass = ELEMENT.getInstance().IRON.getMass();
 			voltage = 8;			
 		}