+ New texture for the slow builders ring.

+ Added the Alkalus Disk.
$ Fixed Frame Box Assembler Recipes.
$ Fixed Missing 7Li material.
$ Fixed Tiered Tanks not showing their capacity in the tooltip.
$ Fixed tooltips for alloys containing Bronze or Steel.
$ Fixed Clay Pipe Extruder Recipes.
- Removed a handful of Plasma cells for misc. materials.
% Changed the Industrial Coke Oven's tooltip, to better describe the input/output requirements.
% Cleaned up The Entire Project.

8 files changed, 354 insertions, 359 deletions

diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index 30dd7dc87e..550a23b4c5 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -1,12 +1,18 @@
 package gtPlusPlus.core.material;
 
+import gregtech.api.enums.Materials;
 import gtPlusPlus.core.material.state.MaterialState;
+import gtPlusPlus.core.util.materials.MaterialUtils;
 
 public final class ALLOY {
+	
+	//Just some GT Alloys that I need within mine.
+	public static final Material BRONZE = MaterialUtils.generateMaterialFromGtENUM(Materials.Bronze);
+	public static final Material STEEL = MaterialUtils.generateMaterialFromGtENUM(Materials.Steel);
 
 	public static final Material ENERGYCRYSTAL = new Material(
 			"Energy Crystal", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{228, 255, 0, 0}, //Material Colour
 			5660, //Melting Point in C
 			0, //Boiling Point in C
@@ -23,7 +29,7 @@ public final class ALLOY {
 
 	public static final Material BLOODSTEEL = new Material(
 			"Blood Steel", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{142, 28, 0, 0}, //Material Colour
 			2500, //Melting Point in C
 			0, //Boiling Point in C
@@ -38,7 +44,7 @@ public final class ALLOY {
 
 	public static final Material STABALLOY = new Material(
 			"Staballoy", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{68, 75, 66, 0}, //Material Colour
 			3450, //Melting Point in C
 			((ELEMENT.getInstance().URANIUM238.getBoilingPointC()*9)+(ELEMENT.getInstance().TITANIUM.getBoilingPointC()*1))/10, //Boiling Point in C
@@ -53,7 +59,7 @@ public final class ALLOY {
 
 	public static final Material TANTALLOY_60 = new Material(
 			"Tantalloy-60", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{213, 231, 237, 0}, //Material Colour
 			3025, //Melting Point in C
 			((ELEMENT.getInstance().TUNGSTEN.getBoilingPointC()*1)+(ELEMENT.getInstance().TANTALUM.getBoilingPointC()*8)+(ELEMENT.getInstance().TITANIUM.getBoilingPointC()*1))/10, //Boiling Point in C
@@ -68,7 +74,7 @@ public final class ALLOY {
 
 	public static final Material TANTALLOY_61 = new Material(
 			"Tantalloy-61", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{193, 211, 217, 0}, //Material Colour
 			3030, //Melting Point in C
 			((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
@@ -82,25 +88,9 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 8)
 			});
 
-	public static final Material BRONZE = new Material(
-			"Bronze", //Material Name
-			 MaterialState.SOLID, //State
-			new short[]{128, 128, 128, 0}, //Material Colour
-			((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.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
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{255,178,15, 0}, //Material Colour
 			((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
@@ -116,7 +106,7 @@ public final class ALLOY {
 
 	public static final Material POTIN = new Material(
 			"Potin", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{201,151,129, 0}, //Material Colour
 			((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
@@ -143,7 +133,7 @@ public final class ALLOY {
 
 	public static final Material INCONEL_625 = new Material(
 			"Inconel-625", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{128, 200, 128, 0}, //Material Colour
 			1425, //Melting Point in C
 			((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
@@ -160,7 +150,7 @@ public final class ALLOY {
 
 	public static final Material INCONEL_690 = new Material(
 			"Inconel-690", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{118, 220, 138, 0}, //Material Colour
 			1425, //Melting Point in C
 			((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
@@ -177,7 +167,7 @@ public final class ALLOY {
 
 	public static final Material INCONEL_792 = new Material(
 			"Inconel-792", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{108, 240, 118, 0}, //Material Colour
 			1425, //Melting Point in C
 			((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
@@ -191,27 +181,11 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().NIOBIUM, 10),
 					new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 20)
 			});
-	
-	public static final Material STEEL = new Material(
-			"Steel", //Material Name
-			 MaterialState.SOLID, //State
-			new short[]{180, 180, 20, 0}, //Material Colour
-			((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.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
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{180, 180, 20, 0}, //Material Colour
 			((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
@@ -226,11 +200,11 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().COPPER, 20),
 					new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4),
 					new MaterialStack(ALLOY.STEEL, 40)
-					});
+			});
 
 	public static final Material MARAGING250 = new Material(
 			"Maraging Steel 250", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{140, 140, 140, 0}, //Material Colour
 			1413, //Melting Point in C
 			((ELEMENT.getInstance().TITANIUM.getBoilingPointC()*5)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*16)+(ELEMENT.getInstance().COBALT.getBoilingPointC()*9)+(ALLOY.STEEL.getBoilingPointC()*70))/100, //Boiling Point in C
@@ -248,7 +222,7 @@ public final class ALLOY {
 
 	public static final Material MARAGING300 = new Material(
 			"Maraging Steel 300", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{150, 150, 150, 0}, //Material Colour
 			1413, //Melting Point in C
 			((ELEMENT.getInstance().TITANIUM.getBoilingPointC()*10)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*21)+(ELEMENT.getInstance().COBALT.getBoilingPointC()*14)+(ALLOY.STEEL.getBoilingPointC()*55))/100, //Boiling Point in C
@@ -257,16 +231,16 @@ public final class ALLOY {
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-				new MaterialStack(ALLOY.STEEL, 64),
-				new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
-				new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4),
-				new MaterialStack(ELEMENT.getInstance().NICKEL, 16),
-				new MaterialStack(ELEMENT.getInstance().COBALT, 8),
+					new MaterialStack(ALLOY.STEEL, 64),
+					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
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{160, 160, 160, 0}, //Material Colour
 			1413, //Melting Point in C
 			((ELEMENT.getInstance().TITANIUM.getBoilingPointC()*15)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*21)+(ELEMENT.getInstance().COBALT.getBoilingPointC()*9)+(ALLOY.STEEL.getBoilingPointC()*55))/100, //Boiling Point in C
@@ -275,16 +249,16 @@ public final class ALLOY {
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-				new MaterialStack(ALLOY.STEEL, 64),
-				new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4),
-				new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4),
-				new MaterialStack(ELEMENT.getInstance().NICKEL, 16),
-				new MaterialStack(ELEMENT.getInstance().COBALT, 8),
+					new MaterialStack(ALLOY.STEEL, 64),
+					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
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{129, 75, 120, 0}, //Material Colour
 			1310, //Melting Point in C
 			((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
@@ -301,7 +275,7 @@ public final class ALLOY {
 
 	public static final Material TALONITE = new Material(
 			"Talonite", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{228, 75, 120, 0}, //Material Colour
 			1454, //Melting Point in C
 			((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
@@ -318,7 +292,7 @@ public final class ALLOY {
 
 	public static final Material HASTELLOY_W = new Material(
 			"Hastelloy-W", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{218, 165, 32, 0}, //Material Colour
 			1350, //Melting Point in C
 			((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
@@ -348,10 +322,10 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 22),
 					new MaterialStack(ELEMENT.getInstance().NICKEL, 51)
 			});*/
-	
+
 	public static final Material HASTELLOY_X = new Material(
 			"Hastelloy-X", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{255, 193, 37, 0}, //Material Colour
 			1350, //Melting Point in C
 			((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
@@ -368,7 +342,7 @@ public final class ALLOY {
 
 	public static final Material HASTELLOY_N = new Material(
 			"Hastelloy-N", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{236, 213, 48, 0}, //Material Colour
 			1350, //Melting Point in C
 			((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
@@ -385,7 +359,7 @@ public final class ALLOY {
 
 	public static final Material HASTELLOY_C276 = new Material(
 			"Hastelloy-C276", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{238, 180, 34, 0}, //Material Colour
 			1350, //Melting Point in C
 			((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
@@ -402,7 +376,7 @@ public final class ALLOY {
 
 	public static final Material INCOLOY_020 = new Material(
 			"Incoloy-020", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{101, 81, 71, 0}, //Material Colour
 			1425, //Melting Point in C
 			((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
@@ -419,7 +393,7 @@ public final class ALLOY {
 
 	public static final Material INCOLOY_DS = new Material(
 			"Incoloy-DS", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{71, 101, 81, 0}, //Material Colour
 			1425, //Melting Point in C
 			((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
@@ -436,7 +410,7 @@ public final class ALLOY {
 
 	public static final Material INCOLOY_MA956 = new Material(
 			"Incoloy-MA956", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{81, 71, 101, 0}, //Material Colour
 			1425, //Melting Point in C
 			((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
@@ -453,7 +427,7 @@ public final class ALLOY {
 
 	public static final Material TUNGSTEN_CARBIDE = new Material(
 			"Tungsten Carbide", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{44, 44, 44, 0}, //Material Colour
 			3422, //Melting Point in C
 			((ELEMENT.getInstance().TUNGSTEN.getBoilingPointC()*5)+(ELEMENT.getInstance().CARBON.getBoilingPointC()*5))/10, //Boiling Point in C
@@ -468,7 +442,7 @@ public final class ALLOY {
 
 	public static final Material SILICON_CARBIDE = new Material(
 			"Silicon Carbide", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{40, 48, 36, 0}, //Material Colour
 			1414, //Melting Point in C
 			((ELEMENT.getInstance().SILICON.getBoilingPointC()*5)+(ELEMENT.getInstance().CARBON.getBoilingPointC()*5))/10, //Boiling Point in C
@@ -484,7 +458,7 @@ public final class ALLOY {
 
 	public static final Material TANTALUM_CARBIDE = new Material(
 			"Tantalum Carbide", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{139, 136, 120, 0}, //Material Colour
 			2980, //Melting Point in C
 			((ELEMENT.getInstance().TANTALUM.getBoilingPointC()*5)+(ELEMENT.getInstance().CARBON.getBoilingPointC()*5))/10, //Boiling Point in C
@@ -500,7 +474,7 @@ public final class ALLOY {
 
 	public static final Material ZIRCONIUM_CARBIDE = new Material(
 			"Zirconium Carbide", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{222, 202, 180, 0}, //Material Colour
 			1855, //Melting Point in C
 			((ELEMENT.getInstance().ZIRCONIUM.getBoilingPointC()*5)+(ELEMENT.getInstance().CARBON.getBoilingPointC()*5))/10, //Boiling Point in C
@@ -516,7 +490,7 @@ public final class ALLOY {
 
 	public static final Material NIOBIUM_CARBIDE = new Material(
 			"Niobium Carbide", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{205, 197, 191, 0}, //Material Colour
 			2477, //Melting Point in C
 			((ELEMENT.getInstance().NIOBIUM.getBoilingPointC()*5)+(ELEMENT.getInstance().CARBON.getBoilingPointC()*5))/10, //Boiling Point in C
@@ -529,10 +503,10 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().CARBON, 50),
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 10)
 			});
-	
+
 	public static final Material LEAGRISIUM = new Material(
 			"Grisium", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{53, 93, 106, 0}, //Material Colour
 			9001, //Melting Point in C
 			25000, //Boiling Point in C
@@ -548,21 +522,21 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10)
 			});	//Material Stacks with Percentage of required elements.
 
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+
+
+
+
+
+
+
+
+
+
+
 	//Quantum
 	public static final Material QUANTUM = new Material(
 			"Quantum", //Material Name
-			 MaterialState.SOLID, //State
+			MaterialState.SOLID, //State
 			new short[]{128, 128, 255, 50}, //Material Colour
 			9999, //Melting Point in C
 			25000, //Boiling Point in C
@@ -580,7 +554,7 @@ public final class ALLOY {
 					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 0fee6f3fbd..108f4f1097 100644
--- a/src/Java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java
@@ -5,15 +5,15 @@ import gtPlusPlus.core.material.state.MaterialState;
 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;	
+		return thisClass;
 	}
 
 	//First 50 Elements
@@ -71,7 +71,7 @@ public final class ELEMENT {
 	public final Material TELLURIUM = new Material("Tellurium", MaterialState.SOLID, 25600, new short[]{210, 210, 210}, 449, 989, 52, 76, false, "Te", 0);//Not a GT Inherited Material
 	public final Material IODINE = new Material("Iodine", MaterialState.SOLID, 25600, new short[]{96, 96, 96}, 114, 184, 53, 74, false, "I", 0);//Not a GT Inherited Material
 	public final Material XENON = new Material("Xenon", MaterialState.GAS, 12800, new short[]{255, 255, 255}, -111, -108, 54, 77, false, "Xe", 0);//Not a GT Inherited Material
-	public final Material CESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Caesium);	
+	public final Material CESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Caesium);
 	public final Material BARIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Barium);
 	public final Material LANTHANUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Lanthanum);
 	public final Material CERIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Cerium);
@@ -95,12 +95,12 @@ public final class ELEMENT {
 	public final Material TUNGSTEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Tungsten);
 	public final Material RHENIUM = new Material("Rhenium", MaterialState.SOLID, 25600, new short[]{150, 150, 150}, 3180, 3627, 75, 111, false, "Re", 0);//Not a GT Inherited Material
 	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 IRIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Iridium);
+	public final Material PLATINUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Platinum);
+	public final Material GOLD = MaterialUtils.generateMaterialFromGtENUM(Materials.Gold);
 	public final Material MERCURY = MaterialUtils.generateMaterialFromGtENUM(Materials.Mercury); //Mercury
 	public final Material THALLIUM = new Material("Thallium", MaterialState.SOLID, 25600, new short[]{175, 175, 175}, 304, 1457, 81, 123, false, "Tl", 0);//Not a GT Inherited Material
-	public final Material LEAD = MaterialUtils.generateMaterialFromGtENUM(Materials.Lead);	
+	public final Material LEAD = MaterialUtils.generateMaterialFromGtENUM(Materials.Lead);
 	public final Material BISMUTH = MaterialUtils.generateMaterialFromGtENUM(Materials.Bismuth);
 	public final Material POLONIUM = new Material("Polonium", MaterialState.SOLID, 25600, new short[]{180, 170, 180}, 254, 962, 84, 125, false, "Po", 1);//Not a GT Inherited Material
 	public final Material ASTATINE = new Material("Astatine", MaterialState.SOLID, 25600, new short[]{170, 180, 170}, 302, 337, 85, 125, false, "At", 1);//Not a GT Inherited Material
@@ -108,7 +108,7 @@ public final class ELEMENT {
 	public final Material FRANCIUM = new Material("Francium", MaterialState.SOLID, 25600, new short[]{170, 160, 170}, 27, 677, 87, 136, false, "Fr", 1);//Not a GT Inherited Material
 	public final Material RADIUM = new Material("Radium", MaterialState.SOLID, 25600, new short[]{165, 165, 165}, 700, 1737, 88, 138, false, "Ra", 1);//Not a GT Inherited Material
 	public final Material ACTINIUM = new Material("Actinium", MaterialState.SOLID, 25600, new short[]{150, 165, 165}, 1050, 3200, 89, 138, false, "Ac", 1);//Not a GT Inherited Material
-	public final Material THORIUM = new Material("Thorium", MaterialState.SOLID, 51200, Materials.Thorium.mRGBa, Materials.Thorium.mMeltingPoint, Materials.Thorium.mBlastFurnaceTemp, 90, 142, false, MaterialUtils.superscript("Th"), 1);	
+	public final Material THORIUM = new Material("Thorium", MaterialState.SOLID, 51200, Materials.Thorium.mRGBa, Materials.Thorium.mMeltingPoint, Materials.Thorium.mBlastFurnaceTemp, 90, 142, false, MaterialUtils.superscript("Th"), 1);
 	public final Material PROTACTINIUM = new Material("Protactinium", MaterialState.SOLID, 25600, new short[]{190, 150, 170}, 1568, 4027, 91, 140, false, "Pa", 1);//Not a GT Inherited Material
 	public final Material URANIUM238 = MaterialUtils.generateMaterialFromGtENUM(Materials.Uranium);
 	public final Material URANIUM235 = MaterialUtils.generateMaterialFromGtENUM(Materials.Uranium235);
@@ -121,7 +121,7 @@ public final class ELEMENT {
 	public final Material CALIFORNIUM = new Material("Californium", MaterialState.SOLID, 25600, new short[]{85, 110, 205}, 899, 1472, 98, 153, false, "Cf", 4);//Not a GT Inherited Material
 	public final Material EINSTEINIUM = new Material("Einsteinium", MaterialState.SOLID, 25600, new short[]{255, 85, 110}, 860, 3500, 99, 153, false, "Es", 5);//Not a GT Inherited Material //Boiling Point is made up
 	public final Material FERMIUM = new Material("Fermium", MaterialState.LIQUID, 25600, new short[]{75, 90, 25}, 1527, 3850, 100, 157, false, "Fm", 5);//Not a GT Inherited Material //Boiling Point is made up
-	
+
 	//Misc
 	public final Material AER = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedAir);
 	public final Material IGNIS = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedFire);
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index fe7370e777..581c5f4972 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -1,6 +1,9 @@
 package gtPlusPlus.core.material;
 
 import static gregtech.api.enums.GT_Values.M;
+
+import java.util.ArrayList;
+
 import gregtech.api.enums.*;
 import gtPlusPlus.core.item.base.cell.BaseItemCell;
 import gtPlusPlus.core.material.state.MaterialState;
@@ -9,9 +12,6 @@ import gtPlusPlus.core.util.fluid.FluidUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.materials.MaterialUtils;
 import gtPlusPlus.core.util.math.MathUtils;
-
-import java.util.ArrayList;
-
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -22,7 +22,7 @@ public class Material {
 
 	private final String unlocalizedName;
 	private final String localizedName;
-	
+
 	private final MaterialState materialState;
 
 	private final Fluid vMoltenFluid;
@@ -30,7 +30,7 @@ public class Material {
 
 	protected Object dataVar = MathUtils.generateSingularRandomHexValue();
 
-	private ArrayList<MaterialStack> vMaterialInput = new ArrayList<MaterialStack>();
+	private ArrayList<MaterialStack> vMaterialInput = new ArrayList<>();
 	public final long[] vSmallestRatio;
 	public final short vComponentCount;
 
@@ -57,23 +57,23 @@ public class Material {
 	public final int vToolQuality;
 	public final int vHarvestLevel;
 
-	public Material(final String materialName, MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final MaterialStack... inputs){		
+	public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final MaterialStack... inputs){
 		this(materialName, defaultState, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, "", 0, inputs);
 	}
 
-	public Material(final String materialName, MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final int radiationLevel, MaterialStack... inputs){		
+	public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final int radiationLevel, final MaterialStack... inputs){
 		this(materialName, defaultState, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, "", radiationLevel, inputs);
 	}
 
-	public Material(final String materialName, MaterialState defaultState,final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final int radiationLevel, MaterialStack... inputs){		
+	public Material(final String materialName, final MaterialState defaultState,final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final int radiationLevel, final MaterialStack... inputs){
 		this(materialName, defaultState, durability, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, "", radiationLevel, inputs);
 	}
 
-	public Material(final String materialName, MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, final MaterialStack... inputs){
+	public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, final MaterialStack... inputs){
 		this(materialName, defaultState, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemicalSymbol, radiationLevel, inputs);
 	}
 
-	public Material(final String materialName, MaterialState defaultState, final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, final MaterialStack... inputs){
+	public Material(final String materialName, final MaterialState defaultState, final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, final MaterialStack... inputs){
 
 		this.unlocalizedName = Utils.sanitizeString(materialName);
 		this.localizedName = materialName;
@@ -86,30 +86,30 @@ public class Material {
 		else {
 			this.boilingPointC = meltingPoint*4;
 		}
-		this.meltingPointK = (int) MathUtils.celsiusToKelvin(meltingPointC);
-		this.boilingPointK = (int) MathUtils.celsiusToKelvin(boilingPointC);
+		this.meltingPointK = (int) MathUtils.celsiusToKelvin(this.meltingPointC);
+		this.boilingPointK = (int) MathUtils.celsiusToKelvin(this.boilingPointC);
 		this.vProtons = protons;
 		this.vNeutrons = neutrons;
-		this.vMass = getMass();
+		this.vMass = this.getMass();
 
 		//Sets tool Durability
-		if (durability != 0){			
+		if (durability != 0){
 			this.vDurability = durability;
 		}
 		else {
 			if (inputs != null){
 				long durabilityTemp = 0;
 				int counterTemp = 0;
-				for (MaterialStack m : inputs){
+				for (final MaterialStack m : inputs){
 					if (m.getStackMaterial() != null){
 						if (m.getStackMaterial().vDurability != 0){
 							durabilityTemp =  (durabilityTemp+m.getStackMaterial().vDurability);
 							counterTemp++;
 
 						}
-					}					
+					}
 				}
-				if (durabilityTemp != 0 && counterTemp != 0){
+				if ((durabilityTemp != 0) && (counterTemp != 0)){
 					this.vDurability = (durabilityTemp/counterTemp);
 				}
 				else {
@@ -121,23 +121,23 @@ public class Material {
 			}
 		}
 
-		if (this.vDurability >= 0 && this.vDurability < 64000){
+		if ((this.vDurability >= 0) && (this.vDurability < 64000)){
 			this.vToolQuality = 1;
 			this.vHarvestLevel = 2;
 		}
-		else if (this.vDurability >= 64000 && this.vDurability < 128000){
+		else if ((this.vDurability >= 64000) && (this.vDurability < 128000)){
 			this.vToolQuality = 2;
 			this.vHarvestLevel = 2;
 		}
-		else if (this.vDurability >= 128000 && this.vDurability < 256000){
+		else if ((this.vDurability >= 128000) && (this.vDurability < 256000)){
 			this.vToolQuality = 3;
 			this.vHarvestLevel = 2;
 		}
-		else if (this.vDurability >= 256000 && this.vDurability < 512000){
+		else if ((this.vDurability >= 256000) && (this.vDurability < 512000)){
 			this.vToolQuality = 3;
 			this.vHarvestLevel = 3;
 		}
-		else if (this.vDurability >= 512000 && this.vDurability <= Integer.MAX_VALUE){
+		else if ((this.vDurability >= 512000) && (this.vDurability <= Integer.MAX_VALUE)){
 			this.vToolQuality = 4;
 			this.vHarvestLevel = 4;
 		}
@@ -163,7 +163,7 @@ public class Material {
 		this.vVoltageMultiplier = this.getMeltingPointK() >= 2800 ? 64 : 16;
 
 		if (inputs == null){
-			this.vMaterialInput = null;			
+			this.vMaterialInput = null;
 		}
 		else {
 			if (inputs.length != 0){
@@ -175,25 +175,25 @@ public class Material {
 			}
 		}
 
-		this.vComponentCount = getComponentCount(inputs);
-		this.vSmallestRatio = getSmallestRatio(vMaterialInput);
+		this.vComponentCount = this.getComponentCount(inputs);
+		this.vSmallestRatio = this.getSmallestRatio(this.vMaterialInput);
 		int tempSmallestSize = 0;
 
-		if (vSmallestRatio != null){
+		if (this.vSmallestRatio != null){
 			for (int v=0;v<this.vSmallestRatio.length;v++){
-				tempSmallestSize=(int) (tempSmallestSize+vSmallestRatio[v]);
+				tempSmallestSize=(int) (tempSmallestSize+this.vSmallestRatio[v]);
 			}
 			this.smallestStackSizeWhenProcessing = tempSmallestSize; //Valid stacksizes
 		}
 		else {
-			this.smallestStackSizeWhenProcessing = 1; //Valid stacksizes			
+			this.smallestStackSizeWhenProcessing = 1; //Valid stacksizes
 		}
 
 
 		//Makes a Fancy Chemical Tooltip
 		this.vChemicalSymbol = chemicalSymbol;
-		if (vMaterialInput != null){
-			this.vChemicalFormula = getToolTip(chemicalSymbol, OrePrefixes.dust.mMaterialAmount / M, true);
+		if (this.vMaterialInput != null){
+			this.vChemicalFormula = this.getToolTip(chemicalSymbol, OrePrefixes.dust.mMaterialAmount / M, true);
 		}
 		else if (!this.vChemicalSymbol.equals("")){
 			Utils.LOG_WARNING("materialInput is null, using a valid chemical symbol.");
@@ -204,11 +204,11 @@ public class Material {
 			this.vChemicalFormula = "??";
 		}
 
-		Materials isValid = Materials.get(getLocalizedName());
+		final Materials isValid = Materials.get(this.getLocalizedName());
 		if (isValid == Materials._NULL){
-			this.vMoltenFluid = generateFluid();
+			this.vMoltenFluid = this.generateFluid();
 		}
-		else {			
+		else {
 			if (isValid.mFluid != null){
 				this.vMoltenFluid = isValid.mFluid;
 			}
@@ -216,230 +216,234 @@ public class Material {
 				this.vMoltenFluid = isValid.mGas;
 			}
 			else {
-				this.vMoltenFluid = generateFluid();
+				this.vMoltenFluid = this.generateFluid();
 			}
 		}
 
-		this.vPlasma = generatePlasma();
+		this.vPlasma = this.generatePlasma();
 
 		//dataVar = MathUtils.generateSingularRandomHexValue();
 
 		String ratio = "";
-		if (vSmallestRatio != null) {
-			for (int hu=0;hu<vSmallestRatio.length;hu++){
+		if (this.vSmallestRatio != null) {
+			for (int hu=0;hu<this.vSmallestRatio.length;hu++){
 				if (ratio.equals("")){
-					ratio = String.valueOf(vSmallestRatio[hu]);
+					ratio = String.valueOf(this.vSmallestRatio[hu]);
 				}
 				else {
-					ratio = ratio + ":" +vSmallestRatio[hu];
-				}		
+					ratio = ratio + ":" +this.vSmallestRatio[hu];
+				}
 			}
 		}
 
 		Utils.LOG_INFO("Creating a Material instance for "+materialName);
-		Utils.LOG_INFO("Formula: "+vChemicalFormula + " Smallest Stack: "+smallestStackSizeWhenProcessing+" Smallest Ratio:"+ratio);
-		Utils.LOG_INFO("Protons: "+vProtons);
-		Utils.LOG_INFO("Neutrons: "+vNeutrons);
-		Utils.LOG_INFO("Mass: "+vMass+"/units");
-		Utils.LOG_INFO("Melting Point: "+meltingPointC+"C.");
-		Utils.LOG_INFO("Boiling Point: "+boilingPointC+"C.");
+		Utils.LOG_INFO("Formula: "+this.vChemicalFormula + " Smallest Stack: "+this.smallestStackSizeWhenProcessing+" Smallest Ratio:"+ratio);
+		Utils.LOG_INFO("Protons: "+this.vProtons);
+		Utils.LOG_INFO("Neutrons: "+this.vNeutrons);
+		Utils.LOG_INFO("Mass: "+this.vMass+"/units");
+		Utils.LOG_INFO("Melting Point: "+this.meltingPointC+"C.");
+		Utils.LOG_INFO("Boiling Point: "+this.boilingPointC+"C.");
 	}
 
 	public final String getLocalizedName(){
-		if (this.localizedName != null)
+		if (this.localizedName != null) {
 			return this.localizedName;
+		}
 		return "ERROR BAD LOCALIZED NAME";
 	}
 
 	public final String getUnlocalizedName(){
-		if (this.unlocalizedName != null)
+		if (this.unlocalizedName != null) {
 			return this.unlocalizedName;
+		}
 		return "ERROR.BAD.UNLOCALIZED.NAME";
 	}
-	
+
 	final public MaterialState getState(){
 		return this.materialState;
 	}
 
 	final public short[] getRGBA(){
-		if (this.RGBA != null)
+		if (this.RGBA != null) {
 			return this.RGBA;
+		}
 		return new short[] {255,0,0};
 	}
 
 	final public int getRgbAsHex(){
 
-		int returnValue = Utils.rgbtoHexValue(RGBA[0], RGBA[1], RGBA[2]);
+		final int returnValue = Utils.rgbtoHexValue(this.RGBA[0], this.RGBA[1], this.RGBA[2]);
 		if (returnValue == 0){
-			return (int) dataVar;
-		}		
-		return Utils.rgbtoHexValue(RGBA[0], RGBA[1], RGBA[2]);
+			return (int) this.dataVar;
+		}
+		return Utils.rgbtoHexValue(this.RGBA[0], this.RGBA[1], this.RGBA[2]);
 	}
 
 	final public long getProtons() {
-		return vProtons;
+		return this.vProtons;
 	}
 
 	public final long getNeutrons() {
-		return vNeutrons;
+		return this.vNeutrons;
 	}
 
 	final public long getMass() {
-		return vProtons + vNeutrons;
+		return this.vProtons + this.vNeutrons;
 	}
 
 	public final int getMeltingPointC() {
-		return meltingPointC;
+		return this.meltingPointC;
 	}
 
 	public final int getBoilingPointC() {
-		return boilingPointC;
+		return this.boilingPointC;
 	}
 
 	public final int getMeltingPointK() {
-		return meltingPointK;
+		return this.meltingPointK;
 	}
 
 	public final int getBoilingPointK() {
-		return boilingPointK;
+		return this.boilingPointK;
 	}
 
 	public final boolean requiresBlastFurnace(){
-		return usesBlastFurnace;
+		return this.usesBlastFurnace;
 	}
 
 	final public Block getBlock(){
-		return Block.getBlockFromItem(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("block"+unlocalizedName, 1).getItem());
+		return Block.getBlockFromItem(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("block"+this.unlocalizedName, 1).getItem());
 	}
 
-	public final ItemStack getBlock(int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("block"+unlocalizedName, stacksize);
+	public final ItemStack getBlock(final int stacksize){
+		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("block"+this.unlocalizedName, stacksize);
 	}
 
-	public final ItemStack getDust(int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+unlocalizedName, stacksize);
+	public final ItemStack getDust(final int stacksize){
+		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+this.unlocalizedName, stacksize);
 	}
 
-	public final ItemStack getSmallDust(int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustSmall"+unlocalizedName, stacksize);
+	public final ItemStack getSmallDust(final int stacksize){
+		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustSmall"+this.unlocalizedName, stacksize);
 	}
 
-	public final ItemStack getTinyDust(int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustTiny"+unlocalizedName, stacksize);
+	public final ItemStack getTinyDust(final int stacksize){
+		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustTiny"+this.unlocalizedName, stacksize);
 	}
 
 	public final ItemStack[] getValidInputStacks(){
-		return ItemUtils.validItemsForOreDict(unlocalizedName);
+		return ItemUtils.validItemsForOreDict(this.unlocalizedName);
 	}
 
-	public final ItemStack getIngot(int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingot"+unlocalizedName, stacksize);
+	public final ItemStack getIngot(final int stacksize){
+		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingot"+this.unlocalizedName, stacksize);
 	}
 
-	public final ItemStack getPlate(int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plate"+unlocalizedName, stacksize);
+	public final ItemStack getPlate(final int stacksize){
+		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plate"+this.unlocalizedName, stacksize);
 	}
 
-	public final ItemStack getPlateDouble(int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDouble"+unlocalizedName, stacksize);
+	public final ItemStack getPlateDouble(final int stacksize){
+		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDouble"+this.unlocalizedName, stacksize);
 	}
 
-	public final ItemStack getGear(int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("gear"+unlocalizedName, stacksize);
+	public final ItemStack getGear(final int stacksize){
+		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("gear"+this.unlocalizedName, stacksize);
 	}
 
-	public final ItemStack getRod(int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("stick"+unlocalizedName, stacksize);
+	public final ItemStack getRod(final int stacksize){
+		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("stick"+this.unlocalizedName, stacksize);
 	}
 
-	public final ItemStack getLongRod(int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("stickLong"+unlocalizedName, stacksize);
+	public final ItemStack getLongRod(final int stacksize){
+		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("stickLong"+this.unlocalizedName, stacksize);
 	}
 
-	public final ItemStack getBolt(int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("bolt"+unlocalizedName, stacksize);
+	public final ItemStack getBolt(final int stacksize){
+		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("bolt"+this.unlocalizedName, stacksize);
 	}
 
-	public final ItemStack getScrew(int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("screw"+unlocalizedName, stacksize);
+	public final ItemStack getScrew(final int stacksize){
+		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("screw"+this.unlocalizedName, stacksize);
 	}
 
-	public final ItemStack getRing(int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ring"+unlocalizedName, stacksize);
+	public final ItemStack getRing(final int stacksize){
+		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ring"+this.unlocalizedName, stacksize);
 	}
 
-	public final ItemStack getRotor(int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("rotor"+unlocalizedName, stacksize);
+	public final ItemStack getRotor(final int stacksize){
+		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("rotor"+this.unlocalizedName, stacksize);
 	}
 
-	public final ItemStack getFrameBox(int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("frameGt"+unlocalizedName, stacksize);
+	public final ItemStack getFrameBox(final int stacksize){
+		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("frameGt"+this.unlocalizedName, stacksize);
 	}
 
-	public final ItemStack getCell(int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+unlocalizedName, stacksize);
+	public final ItemStack getCell(final int stacksize){
+		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.unlocalizedName, stacksize);
 	}
 
-	public final ItemStack getPlasmaCell(int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellPlasma"+unlocalizedName, stacksize);
+	public final ItemStack getPlasmaCell(final int stacksize){
+		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellPlasma"+this.unlocalizedName, stacksize);
 	}
 
-	public final ItemStack getNugget(int stacksize){
-		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("nugget"+unlocalizedName, stacksize);
+	public final ItemStack getNugget(final int stacksize){
+		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("nugget"+this.unlocalizedName, stacksize);
 	}
 
 	final public ItemStack[] getMaterialComposites(){
-		if (vMaterialInput != null){
-			if (!vMaterialInput.isEmpty()){
-				ItemStack[] temp = new ItemStack[vMaterialInput.size()];
-				for (int i=0;i<vMaterialInput.size();i++){
+		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_WARNING("i:"+i);
 					ItemStack testNull = null;
 					try {
-						testNull = vMaterialInput.get(i).getValidStack();
-					} catch (Throwable r){
-						Utils.LOG_WARNING("Failed gathering material stack for "+localizedName+".");
-						Utils.LOG_WARNING("What Failed: Length:"+vMaterialInput.size()+" current:"+i);
+						testNull = this.vMaterialInput.get(i).getValidStack();
+					} catch (final Throwable r){
+						Utils.LOG_WARNING("Failed gathering material stack for "+this.localizedName+".");
+						Utils.LOG_WARNING("What Failed: Length:"+this.vMaterialInput.size()+" current:"+i);
 					}
 					try {
 						if (testNull != null){
 							//Utils.LOG_WARNING("not null");
-							temp[i] = vMaterialInput.get(i).getValidStack();
+							temp[i] = this.vMaterialInput.get(i).getValidStack();
 						}
-					} catch (Throwable r){
-						Utils.LOG_WARNING("Failed setting slot "+i+", using "+localizedName);
+					} catch (final Throwable r){
+						Utils.LOG_WARNING("Failed setting slot "+i+", using "+this.localizedName);
 					}
-				}		
+				}
 				return temp;
 			}
 		}
 		return new ItemStack[]{};
 	}
 
-	public final ArrayList<MaterialStack> getComposites(){		
+	public final ArrayList<MaterialStack> getComposites(){
 		return this.vMaterialInput;
 	}
 
 	final public int[] getMaterialCompositeStackSizes(){
-		if (!vMaterialInput.isEmpty()){
-			int[] temp = new int[vMaterialInput.size()];
-			for (int i=0;i<vMaterialInput.size();i++){
-				if (vMaterialInput.get(i) != null)
-					temp[i] = vMaterialInput.get(i).getDustStack().stackSize;
-				else
+		if (!this.vMaterialInput.isEmpty()){
+			final int[] temp = new int[this.vMaterialInput.size()];
+			for (int i=0;i<this.vMaterialInput.size();i++){
+				if (this.vMaterialInput.get(i) != null) {
+					temp[i] = this.vMaterialInput.get(i).getDustStack().stackSize;
+				} else {
 					temp[i]=0;
-			}		
+				}
+			}
 			return temp;
 		}
 		return new int[]{};
 	}
 
-	private final short getComponentCount(MaterialStack[] inputs){
+	private final short getComponentCount(final MaterialStack[] inputs){
 		int counterTemp = 0;
-		for (MaterialStack m : inputs){
+		for (final MaterialStack m : inputs){
 			if (m.getStackMaterial() != null){
-				counterTemp++;				
-			}					
+				counterTemp++;
+			}
 		}
 		if (counterTemp != 0){
 			return (short) counterTemp;
@@ -451,22 +455,22 @@ public class Material {
 
 
 	@SuppressWarnings("static-method")
-	public final long[] getSmallestRatio(ArrayList<MaterialStack> tempInput){
+	public final long[] getSmallestRatio(final ArrayList<MaterialStack> tempInput){
 		if (tempInput != null){
 			if (!tempInput.isEmpty()){
 				Utils.LOG_WARNING("length: "+tempInput.size());
 				Utils.LOG_WARNING("(inputs != null): "+(tempInput != null));
 				//Utils.LOG_WARNING("length: "+inputs.length);
-				long[] tempRatio = new long[tempInput.size()];
+				final long[] tempRatio = new long[tempInput.size()];
 				for (int x=0;x<tempInput.size();x++){
 					//tempPercentage = tempPercentage+inputs[x].percentageToUse;
 					//this.mMaterialList.add(inputs[x]);
 					if (tempInput.get(x) != null){
-						tempRatio[x] = tempInput.get(x).getPartsPerOneHundred();						
+						tempRatio[x] = tempInput.get(x).getPartsPerOneHundred();
 					}
 				}
 
-				long[] smallestRatio = MathUtils.simplifyNumbersToSmallestForm(tempRatio);
+				final long[] smallestRatio = MathUtils.simplifyNumbersToSmallestForm(tempRatio);
 
 				if (smallestRatio.length > 0){
 					String tempRatioStringThing1 = "";
@@ -485,21 +489,24 @@ public class Material {
 					Utils.LOG_WARNING("Smallest Ratio: "+tempRatioStringThing);
 					return smallestRatio;
 				}
-			}		
+			}
 		}
 		return null;
 	}
 
-	public final String getToolTip(String chemSymbol, long aMultiplier, boolean aShowQuestionMarks) {
-		if (!aShowQuestionMarks && (vChemicalFormula.equals("?")||vChemicalFormula.equals("??"))) return "";
+	public final String getToolTip(final String chemSymbol, final long aMultiplier, final boolean aShowQuestionMarks) {
+		if (!aShowQuestionMarks && (this.vChemicalFormula.equals("?")||this.vChemicalFormula.equals("??"))) {
+			return "";
+		}
 		Utils.LOG_WARNING("===============| Calculating Atomic Formula for "+this.localizedName+" |===============");
-		if (!chemSymbol.equals(""))
+		if (!chemSymbol.equals("")) {
 			return chemSymbol;
-		ArrayList<MaterialStack> tempInput = vMaterialInput;
+		}
+		final ArrayList<MaterialStack> tempInput = this.vMaterialInput;
 		if (tempInput != null){
 			if (!tempInput.isEmpty()){
 				String dummyFormula = "";
-				long[] dummyFormulaArray = getSmallestRatio(tempInput);
+				final long[] dummyFormulaArray = this.getSmallestRatio(tempInput);
 				if (dummyFormulaArray != null){
 					if (dummyFormulaArray.length >= 1){
 						for (int e=0;e<tempInput.size();e++){
@@ -509,18 +516,18 @@ public class Material {
 										if (dummyFormulaArray[e] > 1){
 
 											if (tempInput.get(e).getStackMaterial().vChemicalFormula.length() > 3){
-												dummyFormula = dummyFormula + "(" + tempInput.get(e).getStackMaterial().vChemicalFormula + ")" + dummyFormulaArray[e];										
+												dummyFormula = dummyFormula + "(" + tempInput.get(e).getStackMaterial().vChemicalFormula + ")" + dummyFormulaArray[e];
 											}
 											else {
-												dummyFormula = dummyFormula + tempInput.get(e).getStackMaterial().vChemicalFormula + dummyFormulaArray[e];										
+												dummyFormula = dummyFormula + tempInput.get(e).getStackMaterial().vChemicalFormula + dummyFormulaArray[e];
 											}
 										}
 										else if (dummyFormulaArray[e] == 1){
 											if (tempInput.get(e).getStackMaterial().vChemicalFormula.length() > 3){
-												dummyFormula = dummyFormula + "(" +tempInput.get(e).getStackMaterial().vChemicalFormula + ")";											
+												dummyFormula = dummyFormula + "(" +tempInput.get(e).getStackMaterial().vChemicalFormula + ")";
 											}
 											else {
-												dummyFormula = dummyFormula +tempInput.get(e).getStackMaterial().vChemicalFormula;											
+												dummyFormula = dummyFormula +tempInput.get(e).getStackMaterial().vChemicalFormula;
 											}
 										}
 									} else {
@@ -548,69 +555,70 @@ public class Material {
 	public final Fluid generateFluid(){
 
 		try {
-			if (Materials.get(localizedName) == Materials.Clay){
+			if (Materials.get(this.localizedName) == Materials.Clay){
 				return null;
 			}
-		} catch (Throwable e){}
+		} catch (final Throwable e){}
 
-		if (Materials.get(localizedName).mFluid == null){
+		if (Materials.get(this.localizedName).mFluid == null){
 			Utils.LOG_WARNING("Generating our own fluid.");
 
 			//Generate a Cell if we need to
-			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+getUnlocalizedName(), 1) == null){
+			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getUnlocalizedName(), 1) == null){
 				@SuppressWarnings("unused")
+				final
 				Item temp = new BaseItemCell(this);
 			}
-			
+
 			if (this.materialState == MaterialState.SOLID){
 				return FluidUtils.addGTFluid(
 						this.getUnlocalizedName(),
-						"Molten "+this.getLocalizedName(),		
+						"Molten "+this.getLocalizedName(),
 						this.RGBA,
 						this.materialState.ID(),
 						this.getMeltingPointK(),
-						ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+getUnlocalizedName(), 1),
+						ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getUnlocalizedName(), 1),
 						ItemList.Cell_Empty.get(1L, new Object[0]),
 						1000);
 			}
 			else if (this.materialState == MaterialState.LIQUID){
 				return FluidUtils.addGTFluid(
 						this.getUnlocalizedName(),
-						this.getLocalizedName(),		
+						this.getLocalizedName(),
 						this.RGBA,
 						this.materialState.ID(),
 						this.getMeltingPointK(),
-						ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+getUnlocalizedName(), 1),
+						ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getUnlocalizedName(), 1),
 						ItemList.Cell_Empty.get(1L, new Object[0]),
 						1000);
 			}
 			else if (this.materialState == MaterialState.GAS){
 				return FluidUtils.addGTFluid(
 						this.getUnlocalizedName(),
-						this.getLocalizedName()+" Gas",		
+						this.getLocalizedName()+" Gas",
 						this.RGBA,
 						this.materialState.ID(),
 						this.getMeltingPointK(),
-						ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+getUnlocalizedName(), 1),
+						ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getUnlocalizedName(), 1),
 						ItemList.Cell_Empty.get(1L, new Object[0]),
 						1000);
 			}
 			else { //Plasma
-				return generatePlasma();
-			}			
+				return this.generatePlasma();
+			}
 		}
 		Utils.LOG_WARNING("Getting the fluid from a GT material instead.");
-		return Materials.get(localizedName).mFluid;
+		return Materials.get(this.localizedName).mFluid;
 	}
 
 	public final Fluid generatePlasma(){
-		Materials isValid = Materials.get(getLocalizedName());
-		if (isValid != Materials._NULL && isValid != null && isValid != Materials.Clay){
+		final Materials isValid = Materials.get(this.getLocalizedName());
+		if ((isValid != Materials._NULL) && (isValid != null) && (isValid != Materials.Clay)){
 			if (isValid.mPlasma != null){
 				Utils.LOG_INFO("Using a pre-defined Plasma from GT.");
 				return isValid.mPlasma;
 			}
-		}	
+		}
 		Utils.LOG_INFO("Generating our own Plasma.");
 		return FluidUtils.addGTPlasma(this);
 		//return null;
@@ -618,9 +626,9 @@ public class Material {
 
 
 
-	final public FluidStack getFluid(int fluidAmount) {
+	final public FluidStack getFluid(final int fluidAmount) {
 		Utils.LOG_WARNING("Attempting to get "+fluidAmount+"L of "+this.vMoltenFluid.getName());
-		FluidStack moltenFluid = new FluidStack(this.vMoltenFluid, fluidAmount);
+		final FluidStack moltenFluid = new FluidStack(this.vMoltenFluid, fluidAmount);
 		Utils.LOG_WARNING("Info: "+moltenFluid.getFluid().getName()+" Info: "+moltenFluid.amount+" Info: "+moltenFluid.getFluidID());
 		return moltenFluid;
 	}
diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
index ffc864feb3..d4ed2c3be8 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -22,36 +22,37 @@ import gtPlusPlus.xmod.gregtech.loaders.*;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 
-public class MaterialGenerator {	
+public class MaterialGenerator {
 
-	public static void generate(final Material matInfo){	
-		generate(matInfo, true);	
+	public static void generate(final Material matInfo){
+		generate(matInfo, true);
 	}
 
 
-	public static void generate(final Material matInfo, boolean generateEverything){	
+	public static void generate(final Material matInfo, final boolean generateEverything){
 		generate(matInfo, generateEverything, true);
 	}
 
-	public static void generate(final Material matInfo, boolean generateEverything, boolean generateBlastSmelterRecipes){	
-		String unlocalizedName = matInfo.getUnlocalizedName();
-		String materialName = matInfo.getLocalizedName();
-		short[] C = matInfo.getRGBA();
-		int Colour = Utils.rgbtoHexValue(C[0], C[1], C[2]);
-		boolean hotIngot = matInfo.requiresBlastFurnace();
+	@SuppressWarnings("unused")
+	public static void generate(final Material matInfo, final boolean generateEverything, final boolean generateBlastSmelterRecipes){
+		final String unlocalizedName = matInfo.getUnlocalizedName();
+		final String materialName = matInfo.getLocalizedName();
+		final short[] C = matInfo.getRGBA();
+		final int Colour = Utils.rgbtoHexValue(C[0], C[1], C[2]);
+		final boolean hotIngot = matInfo.requiresBlastFurnace();
 		int materialTier = matInfo.vTier; //TODO
 
-		if (materialTier > 10 || materialTier <= 0){
+		if ((materialTier > 10) || (materialTier <= 0)){
 			materialTier = 2;
-		}	
+		}
 
 		int sRadiation = 0;
 		if (ItemUtils.isRadioactive(materialName)){
 			sRadiation = matInfo.vRadioationLevel;
 		}
 
-		if (matInfo.getState() == MaterialState.SOLID){		
-			if (generateEverything == true){		
+		if (matInfo.getState() == MaterialState.SOLID){
+			if (generateEverything == true){
 				if (sRadiation >= 1){
 					Item temp;
 					Block tempBlock;
@@ -89,7 +90,7 @@ public class MaterialGenerator {
 					temp = new BaseItemScrew(matInfo);
 					temp = new BaseItemRotor(matInfo);
 					temp = new BaseItemGear(matInfo);
-				}	
+				}
 			} else {
 				Item temp;
 				Block tempBlock;
@@ -103,32 +104,45 @@ public class MaterialGenerator {
 				temp = new BaseItemPlateDouble(matInfo);
 			}
 		}
+		else if (matInfo.getState() == MaterialState.LIQUID){
+			Item temp;
+			Block tempBlock;
+			tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.STANDARD, Colour);
+			temp = new BaseItemIngot(matInfo);
+			temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", materialTier, sRadiation);
+			temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, matInfo, Colour, "Tiny", materialTier, sRadiation);
+			temp = new BaseItemDust("itemDustSmall"+unlocalizedName, materialName, matInfo, Colour, "Small", materialTier, sRadiation);
+			temp = new BaseItemNugget(matInfo);
+			temp = new BaseItemPlate(matInfo);
+			temp = new BaseItemPlateDouble(matInfo);
+		}
 
 		//Add A jillion Recipes - old code
 		RecipeGen_AlloySmelter.generateRecipes(matInfo);
 		RecipeGen_Assembler.generateRecipes(matInfo);
 		RecipeGen_BlastSmelter.generateARecipe(matInfo);
-		RecipeGen_DustGeneration.generateRecipes(matInfo);	
+		RecipeGen_DustGeneration.generateRecipes(matInfo);
 		RecipeGen_Extruder.generateRecipes(matInfo);
 		RecipeGen_Fluids.generateRecipes(matInfo);
 		RecipeGen_Plates.generateRecipes(matInfo);
 		RecipeGen_ShapedCrafting.generateRecipes(matInfo);
 
 	}
-	public static void generateNuclearMaterial(final Material matInfo){	
+	public static void generateNuclearMaterial(final Material matInfo){
 		generateNuclearMaterial(matInfo, true);
 	}
 
-	public static void generateNuclearMaterial(final Material matInfo, boolean generatePlates){	
-		String unlocalizedName = matInfo.getUnlocalizedName();
-		String materialName = matInfo.getLocalizedName();
-		short[] C = matInfo.getRGBA();
-		int Colour = Utils.rgbtoHexValue(C[0], C[1], C[2]);
+	@SuppressWarnings("unused")
+	public static void generateNuclearMaterial(final Material matInfo, final boolean generatePlates){
+		final String unlocalizedName = matInfo.getUnlocalizedName();
+		final String materialName = matInfo.getLocalizedName();
+		final short[] C = matInfo.getRGBA();
+		final int Colour = Utils.rgbtoHexValue(C[0], C[1], C[2]);
 
 		int sRadiation = 0;
 		if (matInfo.vRadioationLevel != 0){
 			sRadiation = matInfo.vRadioationLevel;
-		}	
+		}
 
 		Item temp;
 		Block tempBlock;
diff --git a/src/Java/gtPlusPlus/core/material/MaterialStack.java b/src/Java/gtPlusPlus/core/material/MaterialStack.java
index 710a9b645a..e18d738b97 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialStack.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialStack.java
@@ -1,10 +1,9 @@
 package gtPlusPlus.core.material;
 
-import gtPlusPlus.core.util.item.ItemUtils;
-
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
+import gtPlusPlus.core.util.item.ItemUtils;
 import net.minecraft.item.ItemStack;
 
 public class MaterialStack {
@@ -16,27 +15,27 @@ public class MaterialStack {
 	public MaterialStack(final Material inputs, final double partOutOf100){
 		this.stackMaterial = inputs;
 		this.vPercentageToUse = partOutOf100;
-		this.vAmount = math(partOutOf100);
+		this.vAmount = this.math(partOutOf100);
 	}
 
 	@SuppressWarnings("static-method")
-	private int[] math(final double val){	
+	private int[] math(final double val){
 		double i;
 		//Cast to a BigDecimal to round it.
 		final BigDecimal bd = new BigDecimal(val).setScale(2, RoundingMode.HALF_EVEN);
 		i = bd.doubleValue();
 		//Split the string into xx.xx
 		final String[] arr=String.valueOf(i).split("\\.");
-		int[] intArr=new int[2];
+		final int[] intArr=new int[2];
 		intArr[0]=Integer.parseInt(arr[0]);
 		intArr[1]=Integer.parseInt(arr[1]);
 		return intArr;
 	}
-	
+
 	public ItemStack getValidStack(){
 		if (this.stackMaterial.getDust(1) == null){
 			//if (this.stackMaterial.getCell(1) == null){
-				return null;
+			return null;
 			//}
 			//return this.stackMaterial.getCell(this.vAmount[0]);
 		}
@@ -46,26 +45,26 @@ public class MaterialStack {
 	public ItemStack getDustStack(){
 		return this.stackMaterial.getDust(this.vAmount[0]);
 	}
-	
+
 	public ItemStack getDustStack(final int amount){
 		return this.stackMaterial.getDust(amount);
 	}
-	
+
 	public Material getStackMaterial(){
 		return this.stackMaterial;
 	}
-	
+
 	public double getvPercentageToUse(){
 		return this.vPercentageToUse;
 	}
-	
+
 	public long[] getSmallestStackSizes(){
-		return this.stackMaterial.getSmallestRatio(stackMaterial.getComposites());
+		return this.stackMaterial.getSmallestRatio(this.stackMaterial.getComposites());
 	}
-	
+
 	public int getPartsPerOneHundred(){
 		if (this.vAmount != null){
-			if (this.vAmount[0] >= 1 && this.vAmount[0] <= 100){
+			if ((this.vAmount[0] >= 1) && (this.vAmount[0] <= 100)){
 				return this.vAmount[0];
 			}
 		}
@@ -74,21 +73,21 @@ public class MaterialStack {
 	public ItemStack getLeftOverStacksFromDecimalValue(){
 		final int temp = this.vAmount[1];
 		int getCount;
-		if (temp >= 25 && temp <=99){
+		if ((temp >= 25) && (temp <=99)){
 			getCount = temp/25;
 			return this.stackMaterial.getSmallDust(getCount);
 		}
-		else if (temp >= 11 && temp <= 24){
+		else if ((temp >= 11) && (temp <= 24)){
 			getCount = temp/11;
 			return this.stackMaterial.getTinyDust(getCount);
 		}
 		else {
 			return null;
-		}		
+		}
 	}
 
 	public ItemStack[] getValidItemStacks(){
-		return ItemUtils.validItemsForOreDict(stackMaterial.getUnlocalizedName());
+		return ItemUtils.validItemsForOreDict(this.stackMaterial.getUnlocalizedName());
 	}
 
 
diff --git a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
index a95703349e..0971431828 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
@@ -9,10 +9,10 @@ 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
+			MaterialState.SOLID, //State
 			new short[]{75, 70, 25, 0}, //Material Colour
 			Materials.Fluorine.mMeltingPoint, //Melting Point in C
 			Materials.Fluorine.mBlastFurnaceTemp, //Boiling Point in C
@@ -26,39 +26,39 @@ public class FLUORIDES {
 			});
 
 	public static final Material THORIUM_TETRAFLUORIDE = new Material(
-	"Thorium Tetrafluoride", //Material Name
-	 MaterialState.LIQUID, //State
-	new short[]{25, 70, 25, 0}, //Material Colour
-	Materials.Thorium.mMeltingPoint, //Melting Point in C
-	Materials.Thorium.mBlastFurnaceTemp, //Boiling Point in C
-	((NUCLIDE.getInstance().THORIUM232.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()*4))/5), //Protons
-	((NUCLIDE.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().FLUORINE, 4)
-	});
+			"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
+			((NUCLIDE.getInstance().THORIUM232.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()*4))/5), //Protons
+			((NUCLIDE.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().FLUORINE, 4)
+			});
 
 	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
-	((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
-	false, //Uses Blast furnace?
-	//Material Stacks with Percentage of required elements.
-	new MaterialStack[]{
-			new MaterialStack(NUCLIDE.getInstance().THORIUM232, 1),
-			new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
-			new MaterialStack(ELEMENT.getInstance().FLUORINE, 12)
-	});
-	
+			"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
+			((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
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(NUCLIDE.getInstance().THORIUM232, 1),
+					new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().FLUORINE, 12)
+			});
+
 	public static final Material URANIUM_TETRAFLUORIDE = new Material(
 			"Uranium Tetrafluoride", //Material Name
-			 MaterialState.LIQUID, //State
+			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
@@ -70,10 +70,10 @@ public class FLUORIDES {
 					new MaterialStack(NUCLIDE.getInstance().URANIUM233, 1),
 					new MaterialStack(ELEMENT.getInstance().FLUORINE, 4)
 			});
-	
+
 	public static final Material URANIUM_HEXAFLUORIDE = new Material(
 			"Uranium Hexafluoride", //Material Name
-			 MaterialState.LIQUID, //State
+			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
@@ -85,12 +85,12 @@ public class FLUORIDES {
 					new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
 					new MaterialStack(ELEMENT.getInstance().FLUORINE, 2)
 			});
-	
+
 	//
-	
+
 	public static final Material ZIRCONIUM_TETRAFLUORIDE = new Material(
 			"Zirconium Tetrafluoride", //Material Name
-			 MaterialState.LIQUID, //State
+			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
@@ -102,10 +102,10 @@ public class FLUORIDES {
 					new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
 					new MaterialStack(ELEMENT.getInstance().FLUORINE, 4)
 			});
-	
+
 	public static final Material BERYLLIUM_FLUORIDE = new Material(
 			"Beryllium Tetrafluoride", //Material Name
-			 MaterialState.LIQUID, //State
+			MaterialState.LIQUID, //State
 			new short[]{120, 180, 120, 0}, //Material Colour
 			Materials.Beryllium.mMeltingPoint, //Melting Point in C
 			Materials.Beryllium.mBlastFurnaceTemp, //Boiling Point in C
@@ -117,10 +117,10 @@ public class FLUORIDES {
 					new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 1),
 					new MaterialStack(ELEMENT.getInstance().FLUORINE, 2)
 			});
-	
+
 	public static final Material LITHIUM_FLUORIDE = new Material(
 			"Lithium Tetrafluoride", //Material Name
-			 MaterialState.LIQUID, //State
+			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
@@ -132,14 +132,14 @@ public class FLUORIDES {
 					new MaterialStack(NUCLIDE.getInstance().LITHIUM7, 1),
 					new MaterialStack(ELEMENT.getInstance().FLUORINE, 1)
 			});
-	
-	
+
+
 	//LFTR Output
-	
-	
+
+
 	public static final Material NEPTUNIUM_HEXAFLUORIDE = new Material(
 			"Neptunium Hexafluoride", //Material Name
-			 MaterialState.GAS, //State
+			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
@@ -151,10 +151,10 @@ public class FLUORIDES {
 					new MaterialStack(ELEMENT.getInstance().NEPTUNIUM, 1),
 					new MaterialStack(ELEMENT.getInstance().FLUORINE, 6)
 			});
-	
+
 	public static final Material TECHNETIUM_HEXAFLUORIDE = new Material(
 			"Technetium Hexafluoride", //Material Name
-			 MaterialState.GAS, //State
+			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
@@ -166,10 +166,10 @@ public class FLUORIDES {
 					new MaterialStack(ELEMENT.getInstance().TECHNETIUM, 1),
 					new MaterialStack(ELEMENT.getInstance().FLUORINE, 6)
 			});
-	
+
 	public static final Material SELENIUM_HEXAFLUORIDE = new Material(
 			"Selenium Hexafluoride", //Material Name
-			 MaterialState.GAS, //State
+			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
@@ -181,5 +181,5 @@ public class FLUORIDES {
 					new MaterialStack(ELEMENT.getInstance().SELENIUM, 1),
 					new MaterialStack(ELEMENT.getInstance().FLUORINE, 6)
 			});
-	
+
 }
diff --git a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
index f598102630..404710e4bf 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
@@ -18,12 +18,12 @@ public final class NUCLIDE {
 	public final Material URANIUM233 = new Material("Uranium 233", MaterialState.SOLID, new short[]{73, 220, 83, 0}, 1132, 4131, 92, 141, false, MaterialUtils.superscript("233U"), 2);//Not a GT Inherited Material
 	public final Material THORIUM232 = new Material("Thorium 232", MaterialState.SOLID, new short[]{15, 60, 15, 0}, Materials.Thorium.mMeltingPoint, Materials.Thorium.mBlastFurnaceTemp, 90, 142, false, MaterialUtils.superscript("232Th"), 1);//Not a GT Inherited Material
 	public final Material PLUTONIUM238 = new Material("Plutonium-238", MaterialState.SOLID, Materials.Plutonium241.mDurability, Materials.Plutonium241.mRGBa, Materials.Plutonium241.mMeltingPoint, Materials.Plutonium241.mBlastFurnaceTemp, 94, 144, false, MaterialUtils.superscript("238Pu"), 2);//Not a GT Inherited Material
-	
-	
-	
+
+
+
 	public static final Material LiFBeF2ThF4UF4 = new Material(
 			"LiFBeF2ThF4UF4", //Material Name
-			 MaterialState.LIQUID, //State
+			MaterialState.LIQUID, //State
 			new short[]{40, 90, 25, 0}, //Material Colour
 			566, //Melting Point in C
 			870, //Boiling Point in C
@@ -39,10 +39,10 @@ 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
+			MaterialState.LIQUID, //State
 			new short[]{20, 70, 45, 0}, //Material Colour
 			650, //Melting Point in C
 			940, //Boiling Point in C
@@ -58,10 +58,10 @@ public final class NUCLIDE {
 					new MaterialStack(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE, 5),
 					new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 2)
 			});
-	
+
 	public static final Material LiFBeF2ZrF4U235 = new Material(
 			"LiFBeF2ZrF4U235", //Material Name
-			 MaterialState.LIQUID, //State
+			MaterialState.LIQUID, //State
 			new short[]{50, 70, 15, 0}, //Material Colour
 			590, //Melting Point in C
 			890, //Boiling Point in C
diff --git a/src/Java/gtPlusPlus/core/material/state/MaterialState.java b/src/Java/gtPlusPlus/core/material/state/MaterialState.java
index a640976281..200e80e8ab 100644
--- a/src/Java/gtPlusPlus/core/material/state/MaterialState.java
+++ b/src/Java/gtPlusPlus/core/material/state/MaterialState.java
@@ -10,6 +10,6 @@ public enum MaterialState {
 		this.STATE = State;
 	}
 	public int ID() {
-		return STATE;
+		return this.STATE;
 	}
 }