$ Fixed many tiny bugs, found by static code analysis.

$ Fixed Canning handling further.
$ Adjusted the Charcoal Pit fix.

2 files changed, 28 insertions, 17 deletions

diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index dbcbeac32a..d95b17e75c 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -237,7 +237,7 @@ public class Material {
 					int hashSize = MathUtils.howManyPlaces(aValueForGen);
 
 					String a = String.valueOf(aValueForGen);
-					String b = null;
+					String b = "";
 					
 					if (hashSize < 9) {
 						int aSecondHash = this.materialState.hashCode();
@@ -379,9 +379,6 @@ public class Material {
 						aDataSet.put(m.getStackMaterial().vRadiationLevel);
 					}
 					byte aAverage = MathUtils.getByteAverage(aDataSet);
-					if (aAverage > Byte.MAX_VALUE || aAverage < Byte.MIN_VALUE) {
-						aAverage = 0;
-					}
 					if (aAverage > 0) {
 						Logger.MATERIALS(this.getLocalizedName()+" is radioactive due to trace elements. Level: "+aAverage+".");
 						this.isRadioactive = true;
@@ -531,11 +528,6 @@ public class Material {
 		}
 	}
 
-	public Material(String string, MaterialState solid, TextureSet setShiny, int i, short[] s, int j, int k, int l,
-			int m, boolean b, String string2, int n) {
-		// TODO Auto-generated constructor stub
-	}
-
 	public final TextureSet getTextureSet() {
 		synchronized(this) {
 			return textureSet;
@@ -868,10 +860,9 @@ public class Material {
 			ItemStack a1 = getOre(1);
 			Item a2 = a1.getItem();
 			Block a3 = Block.getBlockFromItem(a2);
-
-			//Logger.DEBUG_MATERIALS("[Invalid Ore] Is a1 valid? "+(a1 != null));
-			//Logger.DEBUG_MATERIALS("[Invalid Ore] Is a2 valid? "+(a2 != null));
-			//Logger.DEBUG_MATERIALS("[Invalid Ore] Is a3 valid? "+(a3 != null));
+			if (a3 != null) {
+				return a3;
+			}
 
 			Block x = Block.getBlockFromItem(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ore"+Utils.sanitizeString(this.unlocalizedName), stacksize).getItem());
 			if (x != null){
diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
index 1757b461ee..797a033dcc 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -59,10 +59,17 @@ public class MaterialGenerator {
 	@SuppressWarnings("unused")
 	private static volatile Block tempBlock;
 	
+
+	public static boolean addFluidExtractionRecipe(ItemStack aEmpty, ItemStack aRemains, FluidStack aFluid) {
+		return addFluidExtractionRecipe(aEmpty, aRemains, aFluid, null, null);
+	}
+	
 	/**
 	 * Called Reflectively from CORE.RA.addFluidExtractionRecipe
+	 * @param aSpecial 
+	 * @return 
 	 */
-	private static void addFluidExtractionRecipe(ItemStack aEmpty, ItemStack aRemains, FluidStack aFluid, int aDuration, int aEU) {
+	public static boolean addFluidExtractionRecipe(ItemStack aEmpty, ItemStack aRemains, FluidStack aFluid, Integer aDuration, Integer aEU) {
 		/*GT_Recipe r = new Recipe_GT(
 				true,
 				new ItemStack[] {aEmpty,  aRemains != null ? aRemains : null},
@@ -73,13 +80,22 @@ public class MaterialGenerator {
 				new FluidStack[] {c},
 				a2, a3, a1);*/
 		//new RecipeGen_FluidCanning(r, true);
-		new RecipeGen_FluidCanning(true, aEmpty, aRemains, aFluid, aDuration, aEU);
+		RecipeGen_FluidCanning g = new RecipeGen_FluidCanning(true, aEmpty, aRemains, aFluid, aDuration, aEU);
+		if (g != null && g.valid()) {
+			return true;
+		}
+		return false;
 	}
 
+
+	public static boolean addFluidCannerRecipe(ItemStack aEmpty, ItemStack aFullContainer, FluidStack aFluidIn, FluidStack rFluidOut) {	
+		return addFluidCannerRecipe(aEmpty, aFullContainer, aFluidIn, rFluidOut, null, null);
+	}
 	/**
 	 * Called Reflectively from CORE.RA.addFluidCannerRecipe
+	 * @return 
 	 */
-	private static void addFluidCannerRecipe(ItemStack aFullContainer, ItemStack aEmpty, FluidStack aFluid) {		
+	public static boolean addFluidCannerRecipe(ItemStack aEmpty, ItemStack aFullContainer, FluidStack aFluidIn, FluidStack rFluidOut, Integer aTime, Integer aEu) {		
 		/*GT_Recipe r = new Recipe_GT(
 				true,
 				new ItemStack[] {aEmpty},
@@ -90,7 +106,11 @@ public class MaterialGenerator {
 				new FluidStack[] {rFluidOut},
 				0, 0, 0);*/
 		//new RecipeGen_FluidCanning(r, false);
-		new RecipeGen_FluidCanning(false, aEmpty, aFullContainer, aFluid, null, null);
+		RecipeGen_FluidCanning g = new RecipeGen_FluidCanning(false, aEmpty, aFullContainer, aFluidIn, null, null, 0);
+		if (g != null && g.valid()) {
+			return true;
+		}
+		return false;
 	}
 	
 	public static void generate(final Material matInfo){