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

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

59 files changed, 363 insertions, 425 deletions

diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 8c8b973dc9..ee2bf6c940 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -105,7 +105,6 @@ public class GTplusplus implements ActionListener {
 	//Mod Instance
 	@Mod.Instance(CORE.MODID)
 	public static GTplusplus instance;
-	public static Meta_GT_Proxy instanceGtProxy;
 
 	//Material Loader
 	public static GT_Material_Loader mGregMatLoader;
@@ -181,8 +180,7 @@ public class GTplusplus implements ActionListener {
 		mChunkLoading.preInit(event);
 		proxy.preInit(event);
 		Logger.INFO("Setting up our own GT_Proxy.");
-		instanceGtProxy = Meta_GT_Proxy.instance;
-		instanceGtProxy.preInit();
+		Meta_GT_Proxy.preInit();
 		Core_Manager.preInit();
 	}
 
@@ -194,7 +192,7 @@ public class GTplusplus implements ActionListener {
 		proxy.init(event);
 		HazmatUtils.init();
 		proxy.registerNetworkStuff();
-		instanceGtProxy.init();
+		Meta_GT_Proxy.init();
 		Core_Manager.init();
 
 		//Used by foreign players to generate .lang files for translation.
@@ -211,7 +209,7 @@ public class GTplusplus implements ActionListener {
 		mChunkLoading.postInit(event);
 		proxy.postInit(event);
 		BookHandler.runLater();
-		instanceGtProxy.postInit();
+		Meta_GT_Proxy.postInit();
 		Core_Manager.postInit();
 		//SprinklerHandler.registerModFerts();
 
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/ThreadFakeWorldGenerator.java b/src/Java/gtPlusPlus/api/objects/minecraft/ThreadFakeWorldGenerator.java
index 393d3260b5..b7462250b1 100644
--- a/src/Java/gtPlusPlus/api/objects/minecraft/ThreadFakeWorldGenerator.java
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/ThreadFakeWorldGenerator.java
@@ -21,7 +21,7 @@ public class ThreadFakeWorldGenerator extends Thread {
 	
 	public ThreadFakeWorldGenerator() {
         setName("gtpp.handler.fakeworldtrees");
-        run();
+        start();
 	}
 	
 	public static ThreadFakeWorldGenerator getInstance() {
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java b/src/Java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java
index a5f466b19f..0ff6e112ac 100644
--- a/src/Java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java
@@ -33,7 +33,7 @@ public class ThreadPooCollector extends Thread {
 	
 	public ThreadPooCollector() {
         setName("gtpp.handler.poop");
-        run();
+        start();
 	}
 	
 	public static ThreadPooCollector getInstance() {
diff --git a/src/Java/gtPlusPlus/api/objects/random/XSTR.java b/src/Java/gtPlusPlus/api/objects/random/XSTR.java
index 4b5b1298b6..6357e9895c 100644
--- a/src/Java/gtPlusPlus/api/objects/random/XSTR.java
+++ b/src/Java/gtPlusPlus/api/objects/random/XSTR.java
@@ -33,7 +33,7 @@ import java.util.concurrent.atomic.AtomicLong;
  * 03.06.2016
  * version 0.0.4
  */
-public class XSTR extends Random {
+public class XSTR extends Random implements Cloneable {
 
 	private static final long serialVersionUID = 6208727693524452904L;
 	private long seed;
diff --git a/src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianPlains.java b/src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianPlains.java
index 4ee24aaca5..c04f211fd3 100644
--- a/src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianPlains.java
+++ b/src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianPlains.java
@@ -16,7 +16,6 @@ import net.minecraftforge.common.BiomeManager;
 
 public class Biome_AustralianPlains extends BiomeGenPlains
 {
-    protected boolean field_150628_aC;
 
     public Biome_AustralianPlains(int p_i1986_1_)
     {
diff --git a/src/Java/gtPlusPlus/australia/chunk/ChunkProviderAustralia.java b/src/Java/gtPlusPlus/australia/chunk/ChunkProviderAustralia.java
index 82da02db45..07f5f969e2 100644
--- a/src/Java/gtPlusPlus/australia/chunk/ChunkProviderAustralia.java
+++ b/src/Java/gtPlusPlus/australia/chunk/ChunkProviderAustralia.java
@@ -9,26 +9,29 @@ import java.util.Map;
 import java.util.Random;
 
 import cpw.mods.fml.common.eventhandler.Event.Result;
-import cpw.mods.fml.common.registry.VillagerRegistry;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.australia.gen.map.MapGenLargeRavine;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockFalling;
 import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.IProgressUpdate;
 import net.minecraft.util.MathHelper;
-import net.minecraft.world.*;
+import net.minecraft.world.ChunkPosition;
+import net.minecraft.world.SpawnerAnimals;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldType;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.IChunkProvider;
-import net.minecraft.world.gen.*;
+import net.minecraft.world.gen.ChunkProviderGenerate;
+import net.minecraft.world.gen.MapGenBase;
+import net.minecraft.world.gen.MapGenCaves;
+import net.minecraft.world.gen.NoiseGenerator;
+import net.minecraft.world.gen.NoiseGeneratorOctaves;
+import net.minecraft.world.gen.NoiseGeneratorPerlin;
 import net.minecraft.world.gen.feature.WorldGenDungeons;
-import net.minecraft.world.gen.feature.WorldGenLakes;
 import net.minecraft.world.gen.structure.MapGenMineshaft;
 import net.minecraft.world.gen.structure.MapGenScatteredFeature;
-import net.minecraft.world.gen.structure.MapGenVillage;
-
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.terraingen.ChunkProviderEvent;
 import net.minecraftforge.event.terraingen.PopulateChunkEvent;
@@ -40,16 +43,6 @@ public class ChunkProviderAustralia extends ChunkProviderGenerate implements ICh
 	private NoiseGeneratorOctaves noiseGen2;
 	private NoiseGeneratorOctaves noiseGen3;
 	private NoiseGeneratorPerlin noiseGen4;
-
-	/**
-	 * A NoiseGeneratorOctaves used in generating terrain
-	 */
-	public NoiseGeneratorOctaves noiseGen5;
-	/**
-	 * A NoiseGeneratorOctaves used in generating terrain
-	 */
-	public NoiseGeneratorOctaves noiseGen6;
-	public NoiseGeneratorOctaves mobSpawnerNoise;
 	/**
 	 * Reference to the World object.
 	 */
diff --git a/src/Java/gtPlusPlus/australia/gen/map/component/ComponentHut.java b/src/Java/gtPlusPlus/australia/gen/map/component/ComponentHut.java
index 4af5aa09ab..1f5dd59667 100644
--- a/src/Java/gtPlusPlus/australia/gen/map/component/ComponentHut.java
+++ b/src/Java/gtPlusPlus/australia/gen/map/component/ComponentHut.java
@@ -79,11 +79,11 @@ public class ComponentHut extends AustraliaComponent {
 			placeDoorAtCurrentPosition(
 					world, this.boundingBox, random, 0, 1, 3, getMetadataWithOffset(Blocks.wooden_door, 1));
 		}
-		else if (dir == 0) {
+		else if (dir == 1) {
 			placeDoorAtCurrentPosition(
 					world, this.boundingBox, random, 3, 1, 6, getMetadataWithOffset(Blocks.wooden_door, 1));
 		}
-		else if (dir == 0) {
+		else if (dir == 2) {
 			placeDoorAtCurrentPosition(
 					world, this.boundingBox, random, 6, 1, 3, getMetadataWithOffset(Blocks.wooden_door, 1));
 		}
diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
index 8310fa3c23..c0113e869b 100644
--- a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
+++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
@@ -175,7 +175,7 @@ public class BlockBaseModular extends BasicBlock {
 				}
 			}		
 			metType = (metType.equals("9j4852jyo3rjmh3owlhw9oe") ? "METALLIC" : metType);	
-			int tier = this.blockMaterial.vTier;
+			int tier = blockMaterial != null ? this.blockMaterial.vTier : 0;
 			String aType = (this.thisBlock == BlockTypes.FRAME) ? "frameGt" : (tier <= 4 ? "block1" : "block5");			
 			this.blockIcon = iIcon.registerIcon("gregtech" + ":" + "materialicons/"+ metType +"/" + aType);
 	}
diff --git a/src/Java/gtPlusPlus/core/container/Container_SuperJukebox.java b/src/Java/gtPlusPlus/core/container/Container_SuperJukebox.java
index 34a4e9fa97..f9bf617e1b 100644
--- a/src/Java/gtPlusPlus/core/container/Container_SuperJukebox.java
+++ b/src/Java/gtPlusPlus/core/container/Container_SuperJukebox.java
@@ -191,7 +191,7 @@ public class Container_SuperJukebox extends Container {
 
 	@Override
 	public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer) {
-		if (tile_entity.getWorldObj().isRemote || tile_entity == null) return null;
+		if (tile_entity == null || tile_entity.getWorldObj().isRemote) return null;
 		switch (aSlotIndex) {
 		case SLOT_HOLO_PLAY:
 			if (tile_entity == null) return null;
@@ -217,7 +217,7 @@ public class Container_SuperJukebox extends Container {
 	@Override
 	public void detectAndSendChanges() {
 		super.detectAndSendChanges();
-		if (tile_entity.getWorldObj().isRemote || tile_entity == null) return;
+		if (tile_entity == null || tile_entity.getWorldObj().isRemote) return;
 
 		isPlaying = tile_entity.mIsPlaying;
 		isLooping = tile_entity.mIsLooping;
diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java
index 889b19443e..881c6c82a1 100644
--- a/src/Java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java
+++ b/src/Java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java
@@ -57,12 +57,10 @@ public class GUI_PestKiller extends GuiContainer {
 		Color startGrad = new Color(50, 50, 50);
 		Color endGrad = new Color(20, 20, 20);
 		Container_PestKiller aCont = (Container_PestKiller) this.inventorySlots;
-		TileEntityPestKiller aTileKiller = aCont.tile_entity;
 		
 		double aPercentage = 0;
 		double aDivisor = (100/16);		
-		int aFrameHeight = 16;
-		
+		int aFrameHeight = 16;		
 		
 		boolean didRender = false;
 		if (aCont != null) {
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 aRe