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

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

5 files changed, 17 insertions, 9 deletions

diff --git a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
index ff60d8c416..8902947c0d 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
@@ -149,7 +149,7 @@ public class FluidUtils {
 
 
 	public static Fluid addGtFluid(final String aName, final String aLocalized, final GT_Materials aMaterial, final int aState, final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer, final int aFluidAmount, final boolean aGenerateCell) {
-		Fluid g = addGTFluid(aName, "fluid.autogenerated", aLocalized, aMaterial.mRGBa, aState, aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount, aGenerateCell);
+		Fluid g = addGTFluid(aName, "fluid.autogenerated", aLocalized, aMaterial != null ? aMaterial.mRGBa : new short[]{255, 255, 255, 0}, aState, aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount, aGenerateCell);
 		if (g != null) {
 			if (aMaterial != null) {
 				switch (aState) {
@@ -310,7 +310,7 @@ public class FluidUtils {
 			rFluid.setTemperature((int) (aTemperatureK));
 		}
 		if ((aFullContainer != null) && (aEmptyContainer != null) && !FluidContainerRegistry.registerFluidContainer(new FluidStack(rFluid, aFluidAmount), aFullContainer, aEmptyContainer)) {
-			CORE.RA.addFluidCannerRecipe(CI.emptyCells(1), aFullContainer, null, new FluidStack(rFluid, aFluidAmount));
+			CORE.RA.addFluidCannerRecipe(CI.emptyCells(1), aFullContainer, new FluidStack(rFluid, aFluidAmount));
 		}
 		else {
 			//Utils.LOG_INFO("Failed creating recipes to fill/empty cells of "+aName+".");
@@ -466,7 +466,6 @@ public class FluidUtils {
 						dustStack, //Input
 						null, //Input 2
 						FluidUtils.getFluidStack(gtFluid, amountPerItem), //Fluid Output
-						0, //Chance
 						1*20, //Duration
 						16 //Eu Tick
 						);
@@ -476,7 +475,6 @@ public class FluidUtils {
 						dustStack2, //Input
 						null, //Input 2
 						FluidUtils.getFluidStack(gtFluid, amountPerItem), //Fluid Output
-						0, //Chance
 						1*20, //Duration
 						16 //Eu Tick
 						);
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
index c529f60ba1..d69dd5d66e 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
@@ -306,7 +306,14 @@ public class HazmatUtils {
 			//Logger.INFO("[Hazmat] Item was mapped for TTs");
 			Collections.sort(aTempTooltipData);
 			//Logger.INFO("[Hazmat] Sorted TTs");
-			return aTempTooltipData.toArray();
+			
+			String[] mBuiltOutput = new String[aTempTooltipData.size()];
+			int aIndex = 0;
+			for (String i : aTempTooltipData) {
+				mBuiltOutput[aIndex++] = i;
+			}
+			
+			return mBuiltOutput;
 		}
 	}
 
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 25d1eb2793..a8cef939be 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -694,7 +694,9 @@ public class ItemUtils {
 
 	public static String[] getArrayStackNamesAsArray(final ItemStack[] aStack) {
 		final String[] itemNames = aStack == null ? new String[] {} : new String[aStack.length];
-		Logger.INFO(""+aStack.length);
+		if (aStack != null){ 
+			Logger.INFO(""+aStack.length);
+		}
 
 		if (aStack == null || aStack.length < 1) {
 			return itemNames;
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
index 364430b07d..9c623bb9be 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
@@ -25,6 +25,7 @@ import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.data.EnumUtils;
 import gtPlusPlus.core.util.data.StringUtils;
+import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -207,9 +208,9 @@ public class MaterialUtils {
 		return true;
 	}
 
-	public static int getTierOfMaterial(final int aMeltingPoint){
+	public static int getTierOfMaterial(final double aMeltingPoint){
 		
-		return aMeltingPoint < 1000 ? 0 : (Math.round(aMeltingPoint/1000));
+		return aMeltingPoint < 1000 ? 0 : (MathUtils.roundToClosestInt(aMeltingPoint/1000f));
 		
 		
 		/*if ((aMeltingPoint >= 0) && (aMeltingPoint <= 1000)){
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
index 6a41e54ec3..2f42e36bec 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
@@ -138,7 +138,7 @@ public class PollutionUtils {
 		if (te == null) {
 			return false;
 		}
-		return nullifyPollution(te);
+		return nullifyPollution((IHasWorldObjectAndCoords) te);
 	}
 
 	public static boolean nullifyPollution(IHasWorldObjectAndCoords aTileOfSomeSort) {