% Cleaned up material/Material.java using PMD to a rather decent level.

> Inadvertently this refactored things in other classes.

% Changed the Blast Smelter Casing Block textures.

2 files changed, 38 insertions, 2 deletions

diff --git a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
index 742c3c6e9f..83b0bfd65d 100644
--- a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
@@ -109,7 +109,7 @@ public class FluidUtils {
 	 * @return short[]
 	 */
 	public static Fluid generateFluid(Material material ,int aState){
-		int tempK = material.getMeltingPoint_C();
+		int tempK = material.getMeltingPointC();
 		Fluid generatedFluid = null;
 		switch (aState) {
 		case 0: {
diff --git a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
index 35605169c5..dac1162357 100644
--- a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
+++ b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
@@ -62,7 +62,7 @@ public class MaterialUtils {
 		if (hasValidRGBA(rgba) || element == Element.H){
 			//ModItems.itemBaseDecidust = UtilsItems.generateDecidust(material);
 			//ModItems.itemBaseCentidust = UtilsItems.generateCentidust(material);
-			return new Material(name, rgba, melting, boiling, protons, neutrons, blastFurnace, null, chemicalFormula, radioactivity);
+			return new Material(name, rgba, melting, boiling, protons, neutrons, blastFurnace, chemicalFormula, radioactivity);
 		}
 		return null;
 		
@@ -133,6 +133,42 @@ public class MaterialUtils {
 	    return str;
 	}
 	
+	public static int getTierOfMaterial(int M){
+		if (M >= 0 && M <= 750){
+			return 1;
+		}
+		else if(M >= 751 && M <= 1250){
+			return 2;
+		}
+		else if(M >= 1251 && M <= 1750){
+			return 3;
+		}
+		else if(M >= 1751 && M <= 2250){
+			return 4;
+		}
+		else if(M >= 2251 && M <= 2750){
+			return 5;
+		}
+		else if(M >= 2751 && M <= 3250){
+			return 6;
+		}
+		else if(M >= 3251 && M <= 3750){
+			return 7;
+		}
+		else if(M >= 3751 && M <= 4250){
+			return 8;
+		}
+		else if(M >= 4251 && M <= 4750){
+			return 9;
+		}
+		else if(M >= 4751 && M <= 9999){
+			return 10;
+		}
+		else {
+			return 0;
+		}
+	}
+	
 
 	/*
 	 * That's shown, many times, in the EnumHelper code, all the add functions just wrap the addEnum function.