More Work clearing up Nulls.

Making more things final and accessible to others.

2 files changed, 62 insertions, 45 deletions

diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index 5c368a23da..3b203b037e 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.core.material;
 
 
-public class ALLOY {
+public final class ALLOY {
 
 	public static final Material ENERGYCRYSTAL = new Material(
 			"Energy Crystal", //Material Name
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 0af8d91278..7085ec9329 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -10,7 +10,7 @@ public class Material {
 	final String unlocalizedName;
 	final String localizedName;
 
-	final MaterialStack[] materialInput = new MaterialStack[4];
+	private MaterialStack[] materialInput = new MaterialStack[4];
 
 	final short[] RGBA;
 
@@ -41,49 +41,55 @@ public class Material {
 		this.vMass = getMass();
 		this.usesBlastFurnace = blastFurnace;
 
-		for (int i=0; i < inputs.length; i++){
-			if (inputs[i] != null){
-				materialInput[i] = inputs[i];
+		if (inputs == null){
+			this.materialInput = null;			
+		}
+		else {
+			if (inputs.length != 0){
+				for (int i=0; i < inputs.length; i++){
+					if (inputs[i] != null){
+						this.materialInput[i] = inputs[i];
+					}
+				}
 			}
 		}
-
 	}
-	
+
 	public String getLocalizedName(){
 		return localizedName;
 	}
-	
+
 	public String getUnlocalizedName(){
 		return unlocalizedName;
 	}
-	
+
 	public short[] getRGBA(){
 		return RGBA;
 	}
-	
+
 	public long getProtons() {
-        return vProtons;
-    }
-
-    public long getNeutrons() {
-        return vNeutrons;
-    }
-
-    public long getMass() {
-        return vProtons + vNeutrons;
-    }
-    
-    public int getMeltingPoint_C() {
-        return meltingPointC;
-    }
-    
-    public int getBoilingPoint_C() {
-        return boilingPointC;
-    }
-    
-    public boolean requiresBlastFurnace(){
-    	return usesBlastFurnace;
-    }
+		return vProtons;
+	}
+
+	public long getNeutrons() {
+		return vNeutrons;
+	}
+
+	public long getMass() {
+		return vProtons + vNeutrons;
+	}
+
+	public int getMeltingPoint_C() {
+		return meltingPointC;
+	}
+
+	public int getBoilingPoint_C() {
+		return boilingPointC;
+	}
+
+	public boolean requiresBlastFurnace(){
+		return usesBlastFurnace;
+	}
 
 	public ItemStack getDust(){
 		return UtilsItems.getItemStackOfAmountFromOreDictNoBroken("dust"+unlocalizedName, 1);
@@ -92,21 +98,32 @@ public class Material {
 	public ItemStack[] getValidInputStacks(){
 		return UtilsItems.validItemsForOreDict(unlocalizedName);
 	}
-	
+
 	public ItemStack[] getMaterialComposites(){
-		ItemStack[] temp = new ItemStack[materialInput.length];
-		for (int i=0;i<materialInput.length;i++){
-			temp[i] = materialInput[i].getDustStack();
-		}		
-		return temp;
+		if (materialInput != null && materialInput.length >= 1){
+			ItemStack[] temp = new ItemStack[materialInput.length];
+			for (int i=0;i<materialInput.length;i++){
+				Utils.LOG_INFO("i:"+i);
+				ItemStack testNull = materialInput[i].getDustStack();
+				if (testNull != null){
+					Utils.LOG_INFO("not null");
+					temp[i] = materialInput[i].getDustStack();
+				}
+			}		
+			return temp;
+		}
+		return new ItemStack[]{};
 	}
-	
+
 	public int[] getMaterialCompositeStackSizes(){
-		int[] temp = new int[materialInput.length];
-		for (int i=0;i<materialInput.length;i++){
-			temp[i] = materialInput[i].getDustStack().stackSize;
-		}		
-		return temp;
+		if (materialInput != null && materialInput.length >= 1){
+			int[] temp = new int[materialInput.length];
+			for (int i=0;i<materialInput.length;i++){
+				temp[i] = materialInput[i].getDustStack().stackSize;
+			}		
+			return temp;
+		}
+		return new int[]{};
 	}
-	
+
 }