+ Added a power cost of 32eu/action for the Tree Farmer. (Will eventually get a config option).

% Moved the internal power buffer variable out of the cut method into the class.

% Massive project tidy up, lots of old unused code removed or tidied up.
$ Fixed lots of String comparisons that used == instead of .equals().
$ Fixed Double/Triple/Quad null checks in certain places.
$ Fixed returns that set values at the same time.
$ Swapped 3.14 and 1.57 to Math.PI and Math.PI/2.
$ Fixed possible cases where a NPE may be thrown, by calling logging outside of null checks.

+ Added PI to CORE.java, since it's a double and MC uses it as a float in each instance.
- Stripped 95% of the useless code out of Meta_GT_Proxy.java

50 files changed, 242 insertions, 2507 deletions

diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
index 9e71370197..d694557f55 100644
--- a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
+++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
@@ -45,15 +45,15 @@ public class BlockBaseModular extends BasicBlock{
 			//Utils.LOG_INFO("==========================================");
 		}
 		
-		if (thisBlockType == BlockTypes.STANDARD.name().toUpperCase()){
+		if (thisBlockType.equals(BlockTypes.STANDARD.name().toUpperCase())){
 			LanguageRegistry.addName(this, "Block of "+blockMaterial);
 			//Utils.LOG_INFO("Registered Block in Language Registry as: "+"Block of "+blockMaterial);
 		}
-		else if (thisBlockType == BlockTypes.FRAME.name().toUpperCase()){
+		else if (thisBlockType.equals(BlockTypes.FRAME.name().toUpperCase())){
 			LanguageRegistry.addName(this, blockMaterial+ " Frame Box");
 			//Utils.LOG_INFO("Registered Block in Language Registry as: "+blockMaterial+ " Frame Box");
 		}
-		else if (thisBlockType == BlockTypes.ORE.name().toUpperCase()){
+		else if (thisBlockType.equals(BlockTypes.ORE.name().toUpperCase())){
 			LanguageRegistry.addName(this, blockMaterial+ " Ore");
 			//Utils.LOG_INFO("Registered Block in Language Registry as: "+blockMaterial+ " Frame Box");
 		}
@@ -63,15 +63,15 @@ public class BlockBaseModular extends BasicBlock{
 		}		
 		
 		//setOreDict(unlocalizedName, blockType);
-		if (thisBlockType == BlockTypes.STANDARD.name().toUpperCase()){
+		if (thisBlockType.equals(BlockTypes.STANDARD.name().toUpperCase())){
 			GameRegistry.registerBlock(this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName));	
 			//Utils.LOG_INFO("Registered Block in Block Registry as: "+"Block of "+blockMaterial);		
 		}
-		else if (thisBlockType == BlockTypes.FRAME.name().toUpperCase()){
+		else if (thisBlockType.equals(BlockTypes.FRAME.name().toUpperCase())){
 			GameRegistry.registerBlock(this, ItemBlockGtFrameBox.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName));
 			//Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial+" Frame Box");			
 		}
-		else if (thisBlockType == BlockTypes.ORE.name().toUpperCase()){
+		else if (thisBlockType.equals(BlockTypes.ORE.name().toUpperCase())){
 			GameRegistry.registerBlock(this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName));
 			//Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial+" Frame Box");			
 		}
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_Charger.java b/src/Java/gtPlusPlus/core/block/machine/Machine_Charger.java
deleted file mode 100644
index 4f426b99c9..0000000000
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_Charger.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package gtPlusPlus.core.block.machine;
-
-import gtPlusPlus.GTplusplus;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.machines.TileEntityCharger;
-
-import java.util.ArrayList;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import scala.util.Random;
-
-public class Machine_Charger extends BlockContainer
-{
-    private static final String name = "Charging Machine";
- 
-    private final Random rand = new Random();
- 
-    public Machine_Charger(String unlocalizedName)
-    {
-        super(Material.iron);
-        //GameRegistry.registerBlock(this, unlocalizedName);
-        this.setBlockName(unlocalizedName);
-        this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName);
-        this.setCreativeTab(AddToCreativeTab.tabMachines);
-    }
- 
-    @Override
-    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, float lz)
-    {
-        if (world.isRemote) return true;
- 
-        TileEntity te = world.getTileEntity(x, y, z);
-        if (te != null && te instanceof TileEntityCharger)
-        {
-            player.openGui(GTplusplus.instance, 1, world, x, y, z);
-            return true;
-        }
-        return false;
-    }
- 
-    @Override
-    public void breakBlock(World world, int x, int y, int z, Block block, int par6)
-    {
-        if (world.isRemote) return;
- 
-        ArrayList drops = new ArrayList();
- 
-        TileEntity teRaw = world.getTileEntity(x, y, z);
- 
-        if (teRaw != null && teRaw instanceof TileEntityCharger)
-        {
-        	TileEntityCharger te = (TileEntityCharger) teRaw;
- 
-            for (int i = 0; i < te.getSizeInventory(); i++)
-            {
-                ItemStack stack = te.getStackInSlot(i);
- 
-                if (stack != null) drops.add(stack.copy());
-            }
-        }
- 
-        for (int i = 0;i < drops.size();i++)
-        {
-            EntityItem item = new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, (ItemStack) drops.get(i));
-            item.setVelocity((rand.nextDouble() - 0.5) * 0.25, rand.nextDouble() * 0.5 * 0.25, (rand.nextDouble() - 0.5) * 0.25);
-            world.spawnEntityInWorld(item);
-        }
-    }
- 
-    @Override
-	public TileEntity createNewTileEntity(World world, int par2)
-    {
-        return new TileEntityCharger();
-    }
-}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_NHG.java b/src/Java/gtPlusPlus/core/block/machine/Machine_NHG.java
deleted file mode 100644
index 011e293000..0000000000
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_NHG.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package gtPlusPlus.core.block.machine;
-
-import gtPlusPlus.GTplusplus;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.machines.TileEntityNHG;
-
-import java.util.ArrayList;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import scala.util.Random;
-
-public class Machine_NHG extends BlockContainer
-{
-    private static final String name = "Nuclear Fueled Helium Generator";
- 
-    private final Random rand = new Random();
- 
-    public Machine_NHG(String unlocalizedName)
-    {
-        super(Material.iron);
-        //GameRegistry.registerBlock(this, unlocalizedName);
-        this.setBlockName(unlocalizedName);
-        this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName);
-        this.setCreativeTab(AddToCreativeTab.tabMachines);
-    }
- 
-    @Override
-    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, float lz)
-    {
-        if (world.isRemote) return true;
- 
-        TileEntity te = world.getTileEntity(x, y, z);
-        if (te != null && te instanceof TileEntityNHG)
-        {
-            player.openGui(GTplusplus.instance, 0, world, x, y, z);
-            return true;
-        }
-        return false;
-    }
- 
-    @Override
-    public void breakBlock(World world, int x, int y, int z, Block block, int par6)
-    {
-        if (world.isRemote) return;
- 
-        ArrayList drops = new ArrayList();
- 
-        TileEntity teRaw = world.getTileEntity(x, y, z);
- 
-        if (teRaw != null && teRaw instanceof TileEntityNHG)
-        {
-            TileEntityNHG te = (TileEntityNHG) teRaw;
- 
-            for (int i = 0; i < te.getSizeInventory(); i++)
-            {
-                ItemStack stack = te.getStackInSlot(i);
- 
-                if (stack != null) drops.add(stack.copy());
-            }
-        }
- 
-        for (int i = 0;i < drops.size();i++)
-        {
-            EntityItem item = new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, (ItemStack) drops.get(i));
-            item.setVelocity((rand.nextDouble() - 0.5) * 0.25, rand.nextDouble() * 0.5 * 0.25, (rand.nextDouble() - 0.5) * 0.25);
-            world.spawnEntityInWorld(item);
-        }
-    }
- 
-    @Override
-	public TileEntity createNewTileEntity(World world, int par2)
-    {
-        return new TileEntityNHG();
-    }
-}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java b/src/Java/gtPlusPlus/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java
index 343f37527e..ffc4745059 100644
--- a/src/Java/gtPlusPlus/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java
+++ b/src/Java/gtPlusPlus/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java
@@ -249,7 +249,6 @@ public class TileEntityHeliumGenerator extends TileEntityInventory implements II
 	private boolean redstone = false;
 	private boolean fluidcoolreactor = false;
 	private boolean active = true;
-	public boolean prevActive = false;
 
 
 	public short getReactorSize()
@@ -273,6 +272,7 @@ public class TileEntityHeliumGenerator extends TileEntityInventory implements II
 		return cols;
 	}
 
+	@Override
 	protected void updateEntityServer()
 	{
 		Utils.LOG_WARNING("updateEntityServer");
diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index f16beb625f..d5a126ff39 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -15,18 +15,15 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.debug.DEBUG_INIT;
 import gtPlusPlus.core.util.player.PlayerCache;
 import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
-
-import java.util.Iterator;
-
 import net.minecraft.entity.Entity;
-import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.oredict.OreDictionary;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.event.*;
 
 public class CommonProxy {
 	
+	public static Meta_GT_Proxy GtProxy;
+	
 	public CommonProxy(){
 		//Should Register Gregtech Materials I've Made
 		MinecraftForge.EVENT_BUS.register(this);
@@ -38,19 +35,11 @@ public class CommonProxy {
 			else {
 				Utils.LOG_INFO("We're using Gregtech 5.08 or an equivalent fork.");
 			}
-			handleGtIntegrationInit();
+			Utils.LOG_INFO("Setting up our own GT_Proxy.");
+			GtProxy = new Meta_GT_Proxy();	
 		}
-	}
-	private static void handleGtIntegrationInit(){
-		Utils.LOG_INFO("Setting up our own GT_Proxy.");
-		Meta_GT_Proxy GtProxy = new Meta_GT_Proxy();	
-		for (String tOreName : OreDictionary.getOreNames()) {
-			ItemStack tOreStack;
-			Utils.LOG_INFO("Iterating list of GT materials for custom tool parts.");
-			for (Iterator i$ = OreDictionary.getOres(tOreName).iterator(); i$.hasNext(); GtProxy.registerOre(new OreDictionary.OreRegisterEvent(tOreName, tOreStack))) {
-				Utils.LOG_INFO("Iterating Material");
-				tOreStack = (ItemStack) i$.next();
-			}
+		else {
+			GtProxy = null;
 		}
 	}
 
@@ -122,12 +111,11 @@ public class CommonProxy {
 
 	}
 
-	@SuppressWarnings("static-method")
 	public int addArmor(String armor) {
 		return 0;
 	}
-	
-	public void generateMysteriousParticles(Entity theEntity) { }
 
+	public void generateMysteriousParticles(Entity entity) {		
+	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/container/Container_Charger.java b/src/Java/gtPlusPlus/core/container/Container_Charger.java
deleted file mode 100644
index 4b6c43ada6..0000000000
--- a/src/Java/gtPlusPlus/core/container/Container_Charger.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package gtPlusPlus.core.container;
-
-import gtPlusPlus.core.tileentities.machines.TileEntityCharger;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-public class Container_Charger extends Container
-{
-	private TileEntityCharger te;
-
-	public static final int INPUT_1 = 0;
-
-	private int slotID = 0;
-
-	public Container_Charger(TileEntityCharger te, EntityPlayer player)
-	{
-		this.te = te;
-
-		//Fuel Slot A
-		addSlotToContainer(new Slot(te, slotID++, 80, 53));
-
-
-
-		//Inventory
-		for (int i = 0; i < 3; i++)
-		{
-			for (int j = 0; j < 9; j++)
-			{
-				addSlotToContainer(new Slot(player.inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
-			}
-		}
-		// Hotbar
-		for (int i = 0; i < 9; i++)
-		{
-			addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, 142));
-		}
-	}
-
-	@Override
-	public ItemStack transferStackInSlot(EntityPlayer player, int slotRaw)
-	{
-		ItemStack stack = null;
-		Slot slot = (Slot)inventorySlots.get(slotRaw);
-
-		if (slot != null && slot.getHasStack())
-		{
-			ItemStack stackInSlot = slot.getStack();
-			stack = stackInSlot.copy();
-
-			if (slotRaw < 3 * 9)
-			{
-				if (!mergeItemStack(stackInSlot, 3 * 9, inventorySlots.size(), true))
-				{
-					return null;
-				}
-			}
-			else if (!mergeItemStack(stackInSlot, 0, 3 * 9, false))
-			{
-				return null;
-			}
-
-			if (stackInSlot.stackSize == 0)
-			{
-				slot.putStack((ItemStack)null);
-			}
-			else
-			{
-				slot.onSlotChanged();
-			}
-		}
-		return stack;
-	}
-
-	@Override
-	public boolean canInteractWith(EntityPlayer player)
-	{
-		return te.isUseableByPlayer(player);
-	}
-}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/container/Container_NHG.java b/src/Java/gtPlusPlus/core/container/Container_NHG.java
deleted file mode 100644
index 5fd19489c0..0000000000
--- a/src/Java/gtPlusPlus/core/container/Container_NHG.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package gtPlusPlus.core.container;
-
-import gtPlusPlus.core.tileentities.machines.TileEntityNHG;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.*;
-import net.minecraft.item.ItemStack;
-
-public class Container_NHG extends Container
-{
-	private TileEntityNHG te;
-
-	public static final int INPUT_1 = 0, INPUT_2 = 1, INPUT_3 = 2,
-			INPUT_4 = 3, INPUT_5 = 4, INPUT_6 = 5,
-			INPUT_7 = 6, INPUT_8 = 7, INPUT_9 = 8, 
-			INPUT_10 = 9, INPUT_11 = 10, INPUT_12 = 11,
-			INPUT_13 = 12, INPUT_14 = 13, INPUT_15 = 14,
-			INPUT_16 = 15, INPUT_17 = 16, INPUT_18 = 17,
-			OUTPUT = 18;
-	
-	private int slotID = 0;
-
-	public Container_NHG(TileEntityNHG te, EntityPlayer player)
-	{
-		this.te = te;
-
-
-		//Fuel Rods A
-		for (int i = 0; i < 3; i++)
-		{
-			for (int j = 0; j < 3; j++)
-			{
-				addSlotToContainer(new Slot(te, slotID++, 8 + j * 18, 17 + i * 18));
-			}
-		}
-		//Fuel Rods B
-		for (int i = 0; i < 3; i++)
-		{
-			for (int j = 0; j < 3; j++)
-			{
-				addSlotToContainer(new Slot(te, slotID++, 116 + j * 18, 17 + i * 18));
-			}
-		}
-
-		//Output
-		addSlotToContainer(new SlotFurnace(player, te, OUTPUT, 80, 53));
-
-		//Inventory
-		for (int i = 0; i < 3; i++)
-		{
-			for (int j = 0; j < 9; j++)
-			{
-				addSlotToContainer(new Slot(player.inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
-			}
-		}
-		// Hotbar
-		for (int i = 0; i < 9; i++)
-		{
-			addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, 142));
-		}
-	}
-
-	@Override
-	public ItemStack transferStackInSlot(EntityPlayer player, int slotRaw)
-	{
-		ItemStack stack = null;
-		Slot slot = (Slot)inventorySlots.get(slotRaw);
-
-		if (slot != null && slot.getHasStack())
-		{
-			ItemStack stackInSlot = slot.getStack();
-			stack = stackInSlot.copy();
-
-			if (slotRaw < 3 * 9)
-			{
-				if (!mergeItemStack(stackInSlot, 3 * 9, inventorySlots.size(), true))
-				{
-					return null;
-				}
-			}
-			else if (!mergeItemStack(stackInSlot, 0, 3 * 9, false))
-			{
-				return null;
-			}
-
-			if (stackInSlot.stackSize == 0)
-			{
-				slot.putStack((ItemStack)null);
-			}
-			else
-			{
-				slot.onSlotChanged();
-			}
-		}
-		return stack;
-	}
-
-	@Override
-	public boolean canInteractWith(EntityPlayer player)
-	{
-		return te.isUseableByPlayer(player);
-	}
-}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_Charger.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_Charger.java
deleted file mode 100644
index c1f687c554..0000000000
--- a/src/Java/gtPlusPlus/core/gui/machine/GUI_Charger.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package gtPlusPlus.core.gui.machine;
-
-import gtPlusPlus.core.container.Container_Charger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.machines.TileEntityCharger;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.ResourceLocation;
-
-import org.lwjgl.opengl.GL11;
-
-public class GUI_Charger extends GuiContainer
-{
-    private ResourceLocation texture = new ResourceLocation(CORE.MODID, "textures/gui/machine_Charger.png");
- 
-    private InventoryPlayer inventory;
-    private TileEntityCharger te;
- 
-    public GUI_Charger(TileEntityCharger te, EntityPlayer player)
-    {
-        super(new Container_Charger(te, player));
-        inventory = player.inventory;
-        this.te = te;
-    }
- 
-    @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
-    {
-        Minecraft.getMinecraft().renderEngine.bindTexture(texture);
- 
-        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
- 
-        int x = (width - xSize) / 2;
-        int y = (height - ySize) / 2;
- 
-        drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
-    }
- 
-    @Override
-    protected void drawGuiContainerForegroundLayer(int par1, int par2)
-    {
-        fontRendererObj.drawString(I18n.format(te.getInventoryName()), (xSize / 2) - (fontRendererObj.getStringWidth(I18n.format(te.getInventoryName())) / 2), 6, 4210752, false);
-        //fontRendererObj.drawString(I18n.format(inventory.getInventoryName()), 8, ySize - 96 + 2, 4210752);
-        fontRendererObj.drawString(I18n.format("Charge:"+te.getCharge()+"~"), 8, ySize - 96 + 2, 4210752);
-        fontRendererObj.drawString(I18n.format("Progress:"+te.getProgress()+"ticks"), 80, ySize - 96 + 2, 4210752);
-    }
-}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_NHG.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_NHG.java
deleted file mode 100644
index 09b2ee93d8..0000000000
--- a/