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

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

7 files changed, 36 insertions, 156 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 007079b9c8..96fe5694cc 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -1055,10 +1055,10 @@ public final class ModItems {
 			GT_OreDictUnificator.registerOre("platePhasedIron", ItemUtils.getSimpleStack(itemPlatePulsatingIron));
 			GT_OreDictUnificator.registerOre("blockVibrantAlloy", ItemUtils.getItemStackOfAmountFromOreDict("blockPhasedGold", 1));			
 
-			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getPlate(1), null, MaterialEIO.REDSTONE_ALLOY.getFluid(144), 10000, 16, 4*9);
-			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getIngot(1), null, MaterialEIO.REDSTONE_ALLOY.getFluid(144), 10000, 16, 4*9);
-			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getNugget(1), null, MaterialEIO.REDSTONE_ALLOY.getFluid(16), 10000, 16, 4);
-			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getBlock(1), null, MaterialEIO.REDSTONE_ALLOY.getFluid(1294), 10000, 16, 4*9*9);
+			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getPlate(1), null, MaterialEIO.REDSTONE_ALLOY.getFluid(144), 16, 4*9);
+			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getIngot(1), null, MaterialEIO.REDSTONE_ALLOY.getFluid(144), 16, 4*9);
+			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getNugget(1), null, MaterialEIO.REDSTONE_ALLOY.getFluid(16), 16, 4);
+			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getBlock(1), null, MaterialEIO.REDSTONE_ALLOY.getFluid(1294), 16, 4*9*9);
 			
 		}
 		else {
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
index afc4b17354..1b13d34495 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
@@ -1,14 +1,10 @@
 package gtPlusPlus.core.item.base.dusts;
 
 import gtPlusPlus.core.item.base.BaseItemComponent;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 
 public class BaseItemDust extends BaseItemComponent {
 
-
-
-	private Material dustInfo;
 	private BaseItemComponent[] mSizedDusts = new BaseItemComponent[2];
 
 	public BaseItemDust(Material aMat) {
@@ -33,127 +29,10 @@ public class BaseItemDust extends BaseItemComponent {
 		}
 	}
 
-	private BaseItemDust(final String unlocalizedName, final String materialName, final Material matInfo, final int colour, final String pileSize, final int tier){
-		this(unlocalizedName, materialName, matInfo, colour, pileSize, tier, true);
-	}
-
 	private BaseItemDust(String unlocalizedName, String materialName, Material matInfo, int colour, String pileSize, int tier, boolean addRecipes) {
 		super(matInfo, ComponentTypes.DUST);
-
-		try {/*
-			this.setUnlocalizedName(unlocalizedName);
-			this.setMaxStackSize(64);
-
-			this.setCreativeTab(tabMisc);
-			this.colour = colour;
-			this.mTier = tier;
-			this.materialName = materialName;
-			this.dustInfo = matInfo;
-			this.setTextureName(this.getCorrectTexture(pileSize));
-			GameRegistry.registerItem(this, unlocalizedName);
-
-			String temp = "";
-			Logger.WARNING("Unlocalized name for OreDict nameGen: "+this.getUnlocalizedName());
-			if (this.getUnlocalizedName().contains("item.")){
-				temp = this.getUnlocalizedName().replace("item.", "");
-				Logger.WARNING("Generating OreDict Name: "+temp);
-			}
-			else {
-				temp = this.getUnlocalizedName();
-			}
-			if (temp.contains("DustTiny")){
-				temp = temp.replace("itemD", "d");
-				Logger.WARNING("Generating OreDict Name: "+temp);
-			}
-			else if (temp.contains("DustSmall")){
-				temp = temp.replace("itemD", "d");
-				Logger.WARNING("Generating OreDict Name: "+temp);
-			}
-			else {
-				temp = temp.replace("itemD", "d");
-				Logger.WARNING("Generating OreDict Name: "+temp);
-			}
-			if ((temp != null) && !temp.equals("")){
-				GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this));
-			}
-			if (addRecipes){
-				this.addFurnaceRecipe();
-				this.addMacerationRecipe();
-			}		
-		 */}
-		catch (Throwable t) {
-			t.printStackTrace();
-		}
-	}
-
-	private String getCorrectTexture(final String pileSize){
-
-		if (!CORE.ConfigSwitches.useGregtechTextures || this.dustInfo.getTextureSet() == null){
-			if ((pileSize == "dust") || (pileSize == "Dust")){
-				this.setTextureName(CORE.MODID + ":" + "dust");}
-			else{
-				this.setTextureName(CORE.MODID + ":" + "dust"+pileSize);
-			}
-		}
-
-
-		if (pileSize.toLowerCase().contains("small")){
-			return "gregtech" + ":" + "materialicons/"+this.dustInfo.getTextureSet().mSetName+"/dustSmall";
-		}
-		else if (pileSize.toLowerCase().contains("tiny")){
-			return "gregtech" + ":" + "materialicons/"+this.dustInfo.getTextureSet().mSetName+"/dustTiny";
-		}
-		return "gregtech" + ":" + "materialicons/"+this.dustInfo.getTextureSet().mSetName+"/dust";
 	}
 
-	/*	@Override
-	public String getItemStackDisplayName(final ItemStack iStack) {
-
-		String unlocal = super.getItemStackDisplayName(iStack);
-		if (!unlocal.toLowerCase().contains(".name")) {
-			return unlocal;
-		}
-		else {
-			return unlocal;
-		}
-
-	}*/
-
-	/*	@Override
-	public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) {
-		try {
-			if (this.dustInfo != null){
-				if (entityHolding instanceof EntityPlayer){
-					if (!((EntityPlayer) entityHolding).capabilities.isCreativeMode){
-						EntityUtils.applyRadiationDamageToEntity(iStack.stackSize, this.dustInfo.vRadiationLevel, world, entityHolding);	
-					}
-				}
-			}		
-		}
-		catch (Throwable t) {
-			t.printStackTrace();
-		}
-	}*/
-
-	/*@SuppressWarnings({ "unchecked", "rawtypes" })
-	@Override
-	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-
-		if (stack.getDisplayName().toLowerCase().contains("fluorite")){
-			list.add("Mined from Sandstone and Limestone.");
-		}
-		if (this.dustInfo != null){
-			list.add(this.dustInfo.vChemicalFormula);
-		}
-		if (this.dustInfo.vRadiationLevel > 0){
-			list.add(CORE.GT_Tooltip_Radioactive);
-		}
-
-
-		//}
-		super.addInformation(stack, aPlayer, list, bool);
-	}*/
-
 	public static class DustState {
 		static final int NORMAL = (1);
 		static final int SMALL = (10);
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemControlCore.java b/src/Java/gtPlusPlus/core/item/general/ItemControlCore.java
index 5ef72b6f17..b74b7972be 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemControlCore.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemControlCore.java
@@ -71,6 +71,9 @@ public class ItemControlCore extends Item {
 
 	@Override
 	public String getItemStackDisplayName(final ItemStack tItem) {
+		if (tItem == null) {
+			return "Control Core";
+		}
 		String aReturnValue = super.getItemStackDisplayName(tItem);
 		if (tItem != null) {
 			try {
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java b/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java
index c8acdc2152..82bb29b5bf 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java
@@ -2,23 +2,10 @@ package gtPlusPlus.core.item.general;
 
 import java.util.List;
 
-import cpw.mods.fml.common.Optional;
-import cpw.mods.fml.common.registry.GameRegistry;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
-import net.minecraft.world.World;
-
 import baubles.api.BaubleType;
 import baubles.api.IBauble;
+import cpw.mods.fml.common.Optional;
+import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
@@ -31,6 +18,16 @@ import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
 import ic2.api.item.IElectricItemManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
 
 @Optional.InterfaceList(value = {@Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"), @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles")})
 public class ItemHealingDevice extends Item implements IElectricItem, IElectricItemManager, IBauble{
@@ -232,7 +229,7 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI
 
 	@Override //TODO
 	public void onWornTick(final ItemStack aBaubleStack, final EntityLivingBase arg1) {
-		if (!arg1.worldObj.isRemote){
+		if (arg1 != null && arg1.worldObj != null && !arg1.worldObj.isRemote){
 			
 			//Try Charge First
 
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java b/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java
index 09c23d3551..c151a16f09 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java
@@ -111,11 +111,8 @@ public class ItemSlowBuildingRing extends Item implements IBauble{
 	private static void doEffect(final EntityLivingBase arg1){
 		try {		
 			// Get World
-			World aWorld = arg1.worldObj;		
-			if (arg1.worldObj.isRemote){
-				return;
-			}
-			if (aWorld != null) {				
+			World aWorld = arg1.worldObj;
+			if (aWorld != null && !aWorld.isRemote) {				
 				EntityPlayer aPlayer;
 				if (arg1 instanceof EntityPlayer) {
 					aPlayer = (EntityPlayer) arg1;
diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/DebugScanner.java b/src/Java/gtPlusPlus/core/item/tool/misc/DebugScanner.java
index d0f3005d00..0170df0dc7 100644
--- a/src/Java/gtPlusPlus/core/item/tool/misc/DebugScanner.java
+++ b/src/Java/gtPlusPlus/core/item/tool/misc/DebugScanner.java
@@ -7,6 +7,7 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
@@ -62,19 +63,22 @@ public class DebugScanner extends CoreItem {
 			PlayerUtils.messagePlayer(player, "Invisible? "+entity.isInvisible());
 			PlayerUtils.messagePlayer(player, "Age: "+entity.ticksExisted);
 			
-			if (entity instanceof EntityLiving) {
-				EntityLiving g = (EntityLiving) entity;
+			if (entity instanceof EntityLivingBase) {
+				EntityLivingBase g = (EntityLivingBase) entity;
 				PlayerUtils.messagePlayer(player, "Health: "+g.getHealth()+"/"+g.getMaxHealth());
 				PlayerUtils.messagePlayer(player, "On ground? "+g.onGround);
-				PlayerUtils.messagePlayer(player, "Can Loot? "+g.canPickUpLoot());
-				PlayerUtils.messagePlayer(player, "Child? "+g.isChild());
-				if (entity instanceof EntityPlayer) {
-					EntityPlayer y = (EntityPlayer) entity;
-					PlayerUtils.messagePlayer(player, "Experience: "+y.experience);
-					PlayerUtils.messagePlayer(player, "Name: "+y.getCommandSenderName());				
-				}
+				PlayerUtils.messagePlayer(player, "Child? "+g.isChild());				
+			}
+			if (entity instanceof EntityLiving) {
+				EntityLiving g = (EntityLiving) entity;
+				PlayerUtils.messagePlayer(player, "Can Loot? "+g.canPickUpLoot());				
 				
 			}
+			if (entity instanceof EntityPlayer) {
+				EntityPlayer y = (EntityPlayer) entity;
+				PlayerUtils.messagePlayer(player, "Experience: "+y.experience);
+				PlayerUtils.messagePlayer(player, "Name: "+y.getCommandSenderName());				
+			}
 			
 		}
 		return true;
diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java b/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java
index 0c31b999cd..a48573888e 100644
--- a/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java
+++ b/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java
@@ -1127,7 +1127,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
 		else if ((aTileEntity instanceof IFluidTank || aTileEntity instanceof IFluidHandler)) {
 			if (aTileEntity instanceof IFluidTank) {
 				Logger.INFO("Tile Was instanceof IFluidTank.");
-				FluidStack f = ((IFluidTank) aTileEntity).getFluid();
+				FluidStack f = ((IFluidTank) aTileEntity).getFluid();				
 				if (aSetFluid == null) {
 					aSetFluid = f;
 					aSetFluid.amount = f.amount;