$ Cleaned up the entire project.

> Much neat, very nices.

7 files changed, 941 insertions, 985 deletions

diff --git a/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java b/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
index 4fb3afe485..eebe106e58 100644
--- a/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
+++ b/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
@@ -7,16 +7,20 @@ import gtPlusPlus.core.util.Utils;
 
 public class ModTileEntities {
 
-	
-	public static void init(){
+	public static void init() {
 		Utils.LOG_INFO("Registering Tile Entities.");
-		//GameRegistry.registerTileEntity(TileEntityReverter.class, "TE_blockGriefSaver");
-		//GameRegistry.registerTileEntity(TileEntityReverter.class, "Tower Reverter");
-		//GameRegistry.registerTileEntity(TileEntityNHG.class, "NuclearFueledHeliumGenerator");
-		//GameRegistry.registerTileEntity(TileEntityCharger.class, "TE_Charger");
-       // GameRegistry.registerTileEntity(TileEntityHeliumGenerator.class, "Helium");
+		// GameRegistry.registerTileEntity(TileEntityReverter.class,
+		// "TE_blockGriefSaver");
+		// GameRegistry.registerTileEntity(TileEntityReverter.class, "Tower
+		// Reverter");
+		// GameRegistry.registerTileEntity(TileEntityNHG.class,
+		// "NuclearFueledHeliumGenerator");
+		// GameRegistry.registerTileEntity(TileEntityCharger.class,
+		// "TE_Charger");
+		// GameRegistry.registerTileEntity(TileEntityHeliumGenerator.class,
+		// "Helium");
 		GameRegistry.registerTileEntity(TileEntityWorkbench.class, "TileWorkbench");
 		GameRegistry.registerTileEntity(TileEntityWorkbenchAdvanced.class, "TileWorkbenchAdvanced");
 	}
-	
+
 }
diff --git a/src/Java/gtPlusPlus/core/tileentities/base/TILE_ENTITY_BASE.java b/src/Java/gtPlusPlus/core/tileentities/base/TILE_ENTITY_BASE.java
index 67c592c79c..196c01a018 100644
--- a/src/Java/gtPlusPlus/core/tileentities/base/TILE_ENTITY_BASE.java
+++ b/src/Java/gtPlusPlus/core/tileentities/base/TILE_ENTITY_BASE.java
@@ -9,31 +9,34 @@ import net.minecraft.tileentity.TileEntity;
 public class TILE_ENTITY_BASE extends TileEntity {
 
 	@Override
-	public void writeToNBT(NBTTagCompound tag) {
-		super.writeToNBT(tag);
-		writeCustomNBT(tag);
+	public Packet getDescriptionPacket() {
+		final NBTTagCompound tag = new NBTTagCompound();
+		this.writeCustomNBT(tag);
+		return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, -999, tag);
 	}
 
 	@Override
-	public void readFromNBT(NBTTagCompound tag) {
-		super.readFromNBT(tag);
-		readCustomNBT(tag);
+	public void onDataPacket(final NetworkManager net, final S35PacketUpdateTileEntity packet) {
+		super.onDataPacket(net, packet);
+		this.readCustomNBT(packet.func_148857_g());
 	}
 
-	public void writeCustomNBT(NBTTagCompound tag) {}
-	public void readCustomNBT(NBTTagCompound tag) {}
+	public void readCustomNBT(final NBTTagCompound tag) {
+	}
 
 	@Override
-	public Packet getDescriptionPacket() {
-		NBTTagCompound tag = new NBTTagCompound();
-		writeCustomNBT(tag);
-		return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, -999, tag);
+	public void readFromNBT(final NBTTagCompound tag) {
+		super.readFromNBT(tag);
+		this.readCustomNBT(tag);
+	}
+
+	public void writeCustomNBT(final NBTTagCompound tag) {
 	}
 
 	@Override
-	public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity packet) {
-		super.onDataPacket(net, packet);
-		readCustomNBT(packet.func_148857_g());
+	public void writeToNBT(final NBTTagCompound tag) {
+		super.writeToNBT(tag);
+		this.writeCustomNBT(tag);
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityReverter.java b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityReverter.java
index 392f80f939..535af68200 100644
--- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityReverter.java
+++ b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityReverter.java
@@ -7,83 +7,90 @@ import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.tileentity.TileEntity;
 
+public class TileEntityReverter extends TileEntity {
+	private static final int	REVERT_CHANCE		= 10;
+	public int					radius				= 16;
+	public int					diameter			= 8 * this.radius + 4;
+	public double				requiredPlayerRange	= 64.0D;
+	public Random				rand				= new Random();
+	private int					tickCount;
+	private boolean				slowScan;
+	private int					ticksSinceChange;
+	private Block[]				blockData;
+	private byte[]				metaData;
 
+	public boolean anyPlayerInRange() {
+		return this.worldObj.getClosestPlayer(this.xCoord + 0.5D, this.yCoord + 0.5D, this.zCoord + 0.5D,
+				this.requiredPlayerRange) != null;
+	}
 
-public class TileEntityReverter extends TileEntity
-{
-	private static final int REVERT_CHANCE = 10;
-	public int radius = 16;
-	public int diameter = 8 * this.radius + 4;
-	public double requiredPlayerRange = 64.0D;
-	public Random rand = new Random();
-	private int tickCount;
-	private boolean slowScan;
-	private int ticksSinceChange;
-	private Block[] blockData;
-	private byte[] metaData;
-
-	public boolean canUpdate(){
+	@Override
+	public boolean canUpdate() {
 		return true;
 	}
 
-	public void updateEntity()
-	{
-		if (anyPlayerInRange())
-		{
-			this.tickCount += 1;
-			if (this.worldObj.isRemote)
-			{
-				double var1 = this.xCoord + this.worldObj.rand.nextFloat();
-				double var3 = this.yCoord + this.worldObj.rand.nextFloat();
-				double var5 = this.zCoord + this.worldObj.rand.nextFloat();
+	private void captureBlockData() {
+		this.blockData = new Block[this.diameter * this.diameter * this.diameter];
+		this.metaData = new byte[this.diameter * this.diameter * this.diameter];
 
-				this.worldObj.spawnParticle("enchantmenttable", var1, var3, var5, 0.0D, 0.0D, 0.0D);
-				if (this.rand.nextInt(5) == 0)
-				{
-					makeRandomOutline();
-					makeRandomOutline();
-					makeRandomOutline();
-				}
-			}
-			else
-			{
-				if ((this.blockData == null) || (this.metaData == null))
-				{
-					captureBlockData();
-					this.slowScan = true;
-				}
-				if ((!this.slowScan) || (this.tickCount % 20 == 0)) {
-					if (scanAndRevertChanges())
-					{
-						this.slowScan = false;
-						this.ticksSinceChange = 0;
-					}
-					else
-					{
-						this.ticksSinceChange += 1;
-						if (this.ticksSinceChange > 20) {
-							this.slowScan = true;
-						}
-					}
+		int index = 0;
+		for (int x = -this.radius; x <= this.radius; x++) {
+			for (int y = -this.radius; y <= this.radius; y++) {
+				for (int z = -this.radius; z <= this.radius; z++) {
+					final Block blockID = this.worldObj.getBlock(this.xCoord + x, this.yCoord + y, this.zCoord + z);
+					final int meta = this.worldObj.getBlockMetadata(this.xCoord + x, this.yCoord + y, this.zCoord + z);
+
+					this.blockData[index] = blockID;
+					this.metaData[index] = (byte) meta;
+
+					index++;
 				}
 			}
 		}
-		else
-		{
-			this.blockData = null;
-			this.metaData = null;
+	}
 
-			this.tickCount = 0;
+	protected void drawParticleLine(final double srcX, final double srcY, final double srcZ, final double destX,
+			final double destY, final double destZ) {
+		final int particles = 16;
+		for (int i = 0; i < particles; i++) {
+			final double trailFactor = i / (particles - 1.0D);
+
+			final double tx = srcX + (destX - srcX) * trailFactor + this.rand.nextFloat() * 0.005D;
+			final double ty = srcY + (destY - srcY) * trailFactor + this.rand.nextFloat() * 0.005D;
+			final double tz = srcZ + (destZ - srcZ) * trailFactor + this.rand.nextFloat() * 0.005D;
+			this.worldObj.spawnParticle("portal", tx, ty, tz, 0.0D, 0.0D, 0.0D);
 		}
 	}
 
-	private void makeRandomOutline()
-	{
-		makeOutline(this.rand.nextInt(12));
+	private boolean isUnrevertable(final Block thereBlockID, final byte thereMeta, final Block replaceBlockID,
+			final byte replaceMeta) {
+		if (thereBlockID == ModBlocks.blockGriefSaver || replaceBlockID == ModBlocks.blockGriefSaver) {
+			return true;
+		}
+		/*
+		 * if (((thereBlockID == towerTranslucent) && (thereMeta != 4)) ||
+		 * ((replaceBlockID == towerTranslucent) && (replaceMeta != 4))) {
+		 * return true; }
+		 */
+		if (thereBlockID == Blocks.redstone_lamp && replaceBlockID == Blocks.lit_redstone_lamp) {
+			return true;
+		}
+		if (thereBlockID == Blocks.lit_redstone_lamp && replaceBlockID == Blocks.redstone_lamp) {
+			return true;
+		}
+		/*
+		 * if ((thereBlockID == Blocks.water) || (replaceBlockID ==
+		 * Blocks.flowing_water)) { return true; } if ((thereBlockID ==
+		 * Blocks.flowing_water) || (replaceBlockID == Blocks.water)) { return
+		 * true; }
+		 */
+		if (replaceBlockID == Blocks.tnt) {
+			return true;
+		}
+		return false;
 	}
 
-	private void makeOutline(int outline)
-	{
+	private void makeOutline(final int outline) {
 		double sx = this.xCoord;
 		double sy = this.yCoord;
 		double sz = this.zCoord;
@@ -91,126 +98,143 @@ public class TileEntityReverter extends TileEntity
 		double dx = this.xCoord;
 		double dy = this.yCoord;
 		double dz = this.zCoord;
-		switch (outline)
-		{
-		case 0: 
-			sx -= this.radius;
-			dx -= this.radius;
-			sz -= this.radius;
-			dz += this.radius + 1;
-		case 8: 
-			sx -= this.radius;
-			dx += this.radius + 1;
-			sz -= this.radius;
-			dz -= this.radius;
-			break;
-		case 1: 
-		case 9: 
-			sx -= this.radius;
-			dx -= this.radius;
-			sz -= this.radius;
-			dz += this.radius + 1;
-			break;
-		case 2: 
-		case 10: 
-			sx -= this.radius;
-			dx += this.radius + 1;
-			sz += this.radius + 1;
-			dz += this.radius + 1;
-			break;
-		case 3: 
-		case 11: 
-			sx += this.radius + 1;
-			dx += this.radius + 1;
-			sz -= this.radius;
-			dz += this.radius + 1;
-			break;
-		case 4: 
-			sx -= this.radius;
-			dx -= this.radius;
-			sz -= this.radius;
-			dz -= this.radius;
-			break;
-		case 5: 
-			sx += this.radius + 1;
-			dx += this.radius + 1;
-			sz -= this.radius;
-			dz -= this.radius;
-			break;
-		case 6: 
-			sx += this.radius + 1;
-			dx += this.radius + 1;
-			sz += this.radius + 1;
-			dz += this.radius + 1;
-			break;
-		case 7: 
-			sx -= this.radius;
-			dx -= this.radius;
-			sz += this.radius + 1;
-			dz += this.radius + 1;
+		switch (outline) {
+			case 0:
+				sx -= this.radius;
+				dx -= this.radius;
+				sz -= this.radius;
+				dz += this.radius + 1;
+			case 8:
+				sx -= this.radius;
+				dx += this.radius + 1;
+				sz -= this.radius;
+				dz -= this.radius;
+				break;
+			case 1:
+			case 9:
+				sx -= this.radius;
+				dx -= this.radius;
+				sz -= this.radius;
+				dz += this.radius + 1;
+				break;
+			case 2:
+			case 10:
+				sx -= this.radius;
+				dx += this.radius + 1;
+				sz += this.radius + 1;
+				dz += this.radius + 1;
+				break;
+			case 3:
+			case 11:
+				sx += this.radius + 1;
+				dx += this.radius + 1;
+				sz -= this.radius;
+				dz += this.radius + 1;
+				break;
+			case 4:
+				sx -= this.radius;
+				dx -= this.radius;
+				sz -= this.radius;
+				dz -= this.radius;
+				break;
+			case 5:
+				sx += this.radius + 1;
+				dx += this.radius + 1;
+				sz -= this.radius;
+				dz -= this.radius;
+				break;
+			case 6:
+				sx += this.radius + 1;
+				dx += this.radius + 1;
+				sz += this.radius + 1;
+				dz += this.radius + 1;
+				break;
+			case 7:
+				sx -= this.radius;
+				dx -= this.radius;
+				sz += this.radius + 1;
+				dz += this.radius + 1;
 		}
-		switch (outline)
-		{
-		case 0: 
-		case 1: 
-		case 2: 
-		case 3: 
-			sy += this.radius + 1;
-			dy += this.radius + 1;
-			break;
-		case 4: 
-		case 5: 
-		case 6: 
-		case 7: 
-			sy -= this.radius;
-			dy += this.radius + 1;
-			break;
-		case 8: 
-		case 9: 
-		case 10: 
-		case 11: 
-			sy -= this.radius;
-			dy -= this.radius;
+		switch (outline) {
+			case 0:
+			case 1:
+			case 2:
+			case 3:
+				sy += this.radius + 1;
+				dy += this.radius + 1;
+				break;
+			case 4:
+			case 5:
+			case 6:
+			case 7:
+				sy -= this.radius;
+				dy += this.radius + 1;
+				break;
+			case 8:
+			case 9:
+			case 10:
+			case 11:
+				sy -= this.radius;
+				dy -= this.radius;
 		}
 		if (this.rand.nextBoolean()) {
-			drawParticleLine(this.xCoord + 0.5D, this.yCoord + 0.5D, this.zCoord + 0.5D, dx, dy, dz);
-		} else {
-			drawParticleLine(sx, sy, sz, this.xCoord + 0.5D, this.yCoord + 0.5D, this.zCoord + 0.5D);
+			this.drawParticleLine(this.xCoord + 0.5D, this.yCoord + 0.5D, this.zCoord + 0.5D, dx, dy, dz);
+		}
+		else {
+			this.drawParticleLine(sx, sy, sz, this.xCoord + 0.5D, this.yCoord + 0.5D, this.zCoord + 0.5D);
 		}
-		drawParticleLine(sx, sy, sz, dx, dy, dz);
+		this.drawParticleLine(sx, sy, sz, dx, dy, dz);
 	}
 
-	protected void drawParticleLine(double srcX, double srcY, double srcZ, double destX, double destY, double destZ)
-	{
-		int particles = 16;
-		for (int i = 0; i < particles; i++)
-		{
-			double trailFactor = i / (particles - 1.0D);
+	private void makeRandomOutline() {
+		this.makeOutline(this.rand.nextInt(12));
+	}
 
-			double tx = srcX + (destX - srcX) * trailFactor + this.rand.nextFloat() * 0.005D;
-			double ty = srcY + (destY - srcY) * trailFactor + this.rand.nextFloat() * 0.005D;
-			double tz = srcZ + (destZ - srcZ) * trailFactor + this.rand.nextFloat() * 0.005D;
-			this.worldObj.spawnParticle("portal", tx, ty, tz, 0.0D, 0.0D, 0.0D);
+	private boolean revertBlock(final int x, final int y, final int z, final Block thereBlockID, final byte thereMeta,
+			final Block replaceBlockID, byte replaceMeta) {
+		/*
+		 * if ((thereBlockID == Blocks.air) &&
+		 * (!replaceBlockID.getMaterial().blocksMovement())) {
+		 * System.out.println("Not replacing block " + replaceBlockID +
+		 * " because it doesn't block movement");
+		 * 
+		 * return false; }
+		 */
+		if (this.isUnrevertable(thereBlockID, thereMeta, replaceBlockID, replaceMeta)) {
+			return false;
+		}
+		if (this.rand.nextInt(5) == 0) {
+			if (replaceBlockID != Blocks.air) {
+				// replaceBlockID = null;
+				replaceMeta = 4;
+			}
+			this.worldObj.setBlock(x, y, z, replaceBlockID, replaceMeta, 2);
+			if (thereBlockID == Blocks.air) {
+				this.worldObj.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(replaceBlockID) + (replaceMeta << 12));
+			}
+			else if (replaceBlockID == Blocks.air) {
+				this.worldObj.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(thereBlockID) + (thereMeta << 12));
+				thereBlockID.dropBlockAsItem(this.worldObj, x, y, z, thereMeta, 0);
+			}
 		}
+		return true;
 	}
 
-	private boolean scanAndRevertChanges()
-	{
+	private boolean scanAndRevertChanges() {
 		int index = 0;
 		boolean reverted = false;
 		for (int x = -this.radius; x <= this.radius; x++) {
 			for (int y = -this.radius; y <= this.radius; y++) {
-				for (int z = -this.radius; z <= this.radius; z++)
-				{
-					Block blockID = this.worldObj.getBlock(this.xCoord + x, this.yCoord + y, this.zCoord + z);
-					byte meta = (byte)this.worldObj.getBlockMetadata(this.xCoord + x, this.yCoord + y, this.zCoord + z);
+				for (int z = -this.radius; z <= this.radius; z++) {
+					final Block blockID = this.worldObj.getBlock(this.xCoord + x, this.yCoord + y, this.zCoord + z);
+					final byte meta = (byte) this.worldObj.getBlockMetadata(this.xCoord + x, this.yCoord + y,
+							this.zCoord + z);
 					if (this.blockData[index] != blockID) {
-						if (revertBlock(this.xCoord + x, this.yCoord + y, this.zCoord + z, blockID, meta, this.blockData[index], this.metaData[index]))
-						{
+						if (this.revertBlock(this.xCoord + x, this.yCoord + y, this.zCoord + z, blockID, meta,
+								this.blockData[index], this.metaData[index])) {
 							reverted = true;
 						}
-						else
-						{
+						else {
 							this.blockData[index] = blockID;
 							this.metaData[index] = meta;
 						}
@@ -222,88 +246,46 @@ public class TileEntityReverter extends TileEntity
 		return reverted;
 	}
 
-	private boolean revertBlock(int x, int y, int z, Block thereBlockID, byte thereMeta, Block replaceBlockID, byte replaceMeta)
-	{
-		/*if ((thereBlockID == Blocks.air) && (!replaceBlockID.getMaterial().blocksMovement()))
-		{
-			System.out.println("Not replacing block " + replaceBlockID + " because it doesn't block movement");
+	@Override
+	public void updateEntity() {
+		if (this.anyPlayerInRange()) {
+			this.tickCount += 1;
+			if (this.worldObj.isRemote) {
+				final double var1 = this.xCoord + this.worldObj.rand.nextFloat();
+				final double var3 = this.yCoord + this.worldObj.rand.nextFloat();
+				final double var5 = this.zCoord + this.worldObj.rand.nextFloat();
 
-			return false;
-		}*/
-		if (isUnrevertable(thereBlockID, thereMeta, replaceBlockID, replaceMeta)) {
-			return false;
-		}
-		if (this.rand.nextInt(5) == 0)
-		{
-			if (replaceBlockID != Blocks.air)
-			{
-				//replaceBlockID = null;
-				replaceMeta = 4;
-			}
-			this.worldObj.setBlock(x, y, z, replaceBlockID, replaceMeta, 2);
-			if (thereBlockID == Blocks.air)
-			{
-				this.worldObj.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(replaceBlockID) + (replaceMeta << 12));
-			}
-			else if (replaceBlockID == Blocks.air)
-			{
-				this.worldObj.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(thereBlockID) + (thereMeta << 12));
-				thereBlockID.dropBlockAsItem(this.worldObj, x, y, z, thereMeta, 0);
+				this.worldObj.spawnParticle("enchantmenttable", var1, var3, var5, 0.0D, 0.0D, 0.0D);
+				if (this.rand.nextInt(5) == 0) {
+					this.makeRandomOutline();
+					this.makeRandomOutline();
+					this.makeRandomOutline();
+				}
 			}
-		}
-		return true;
-	}
-
-	private boolean isUnrevertable(Block thereBlockID, byte thereMeta, Block replaceBlockID, byte replaceMeta)
-	{
-		if ((thereBlockID == ModBlocks.blockGriefSaver) || (replaceBlockID == ModBlocks.blockGriefSaver)) {
-			return true;
-		}
-		/*if (((thereBlockID == towerTranslucent) && (thereMeta != 4)) || ((replaceBlockID == towerTranslucent) && (replaceMeta != 4))) {
-			return true;
-		}*/
-		if ((thereBlockID == Blocks.redstone_lamp) && (replaceBlockID == Blocks.lit_redstone_lamp)) {
-			return true;
-		}
-		if ((thereBlockID == Blocks.lit_redstone_lamp) && (replaceBlockID == Blocks.redstone_lamp)) {
-			return true;
-		}
-		/*if ((thereBlockID == Blocks.water) || (replaceBlockID == Blocks.flowing_water)) {
-			return true;
-		}
-		if ((thereBlockID == Blocks.flowing_water) || (replaceBlockID == Blocks.water)) {
-			return true;
-		}*/
-		if (replaceBlockID == Blocks.tnt) {
-			return true;
-		}
-		return false;
-	}
-
-	private void captureBlockData()
-	{
-		this.blockData = new Block[this.diameter * this.diameter * this.diameter];
-		this.metaData = new byte[this.diameter * this.diameter * this.diameter];
-
-		int index = 0;
-		for (int x = -this.radius; x <= this.radius; x++) {
-			for (int y = -this.radius; y <= this.radius; y++) {
-				for (int z = -this.radius; z <= this.radius; z++)
-				{
-					Block blockID = this.worldObj.getBlock(this.xCoord + x, this.yCoord + y, this.zCoord + z);
-					int meta = this.worldObj.getBlockMetadata(this.xCoord + x, this.yCoord + y, this.zCoord + z);
-
-					this.blockData[index] = blockID;
-					this.metaData[index] = ((byte)meta);
-
-					index++;
+			else {
+				if (this.blockData == null || this.metaData == null) {
+					this.captureBlockData();
+					this.slowScan = true;
+				}
+				if (!this.slowScan || this.tickCount % 20 == 0) {
+					if (this.scanAndRevertChanges()) {
+						this.slowScan = false;
+						this.ticksSinceChange = 0;
+					}
+					else {
+						this.ticksSinceChange += 1;
+						if (this.ticksSinceChange > 20) {
+							this.slowScan = true;
+						}
+					}
 				}
 			}
 		}
-	}
+		else {
+			this.blockData = null;
+			this.metaData = null;
 
-	public boolean anyPlayerInRange()
-	{
-		return this.worldObj.getClosestPlayer(this.xCoord + 0.5D, this.yCoord + 0.5D, this.zCoord + 0.5D, this.requiredPlayerRange) != null;
+			this.tickCount = 0;
+		}
 	}
 }
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityCharger.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityCharger.java
index 9ec6aa3b24..cc260527c4 100644
--- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityCharger.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityCharger.java
@@ -9,178 +9,165 @@ import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.Constants;
 
-public class TileEntityCharger extends TileEntity implements IInventory
-{
-	private ItemStack[] items = new ItemStack[1]; //18
-	private int progress_Current = 1;
-	private int progress_Max = 1000;
-	public float charge_Current;
-	public float charge_Max = 10000;
-	private float tempItemChargeValue;
-	
-	public float getCharge(){
-		return charge_Current;
-	}
-
-	public int getProgress(){
-		return progress_Current;
-	}
+public class TileEntityCharger extends TileEntity implements IInventory {
+	private ItemStack[]	items				= new ItemStack[1];	// 18
+	private int			progress_Current	= 1;
+	private final int	progress_Max		= 1000;
+	public float		charge_Current;
+	public float		charge_Max			= 10000;
+	private float		tempItemChargeValue;
 
 	@Override
-	public int getSizeInventory()
-	{
-		return items.length;
+	public void closeInventory() {
 	}
 
 	@Override
-	public ItemStack getStackInSlot(int slot)
-	{
-		return items[slot];
-	}
-
-	@Override
-	public ItemStack decrStackSize(int slot, int amount)
-	{
-		if (items[slot] != null)
-		{
+	public ItemStack decrStackSize(final int slot, final int amount) {
+		if (this.items[slot] != null) {
 			ItemStack itemstack;
 
-			if (items[slot].stackSize == amount)
-			{
-				itemstack = items[slot];
-				items[slot] = null;
-				markDirty();
+			if (this.items[slot].stackSize == amount) {
+				itemstack = this.items[slot];
+				this.items[slot] = null;
+				this.markDirty();
 				return itemstack;
 			}
-			itemstack = items[slot].splitStack(amount);
-			if (items[slot].stackSize == 0) items[slot] = null;
-			markDirty();
+			itemstack = this.items[slot].splitStack(amount);
+			if (this.items[slot].stackSize == 0) {
+				this.items[slot] = null;
+			}
+			this.markDirty();
 			return itemstack;
 		}
 		return null;
 	}
 
-	@Override
-	public ItemStack getStackInSlotOnClosing(int slot)
-	{
-		if (items[slot] != null)
-		{
-			ItemStack itemstack = items[slot];
-			items[slot] = null;
-			return itemstack;
-		}
-		return null;
+	public float getCharge() {
+		return this.charge_Current;
 	}
 
 	@Override
-	public void setInventorySlotContents(int slot, ItemStack stack)
-	{
-		if (stack != null){
-			items[slot] = stack;
-			if (stack != null && stack.stackSize > getInventoryStackLimit())
-			{
-				stack.stackSize = getInventoryStackLimit();
-			}
+	public String getInventoryName() {
+		return "container.Charger";
+	}
 
+	@Override
+	public int getInventoryStackLimit() {
+		return 64;
+	}
 
-			markDirty();
-		}
+	public int getProgress() {
+		return this.progress_Current;
 	}
 
 	@Override
-	public String getInventoryName()
-	{
-		return "container.Charger";
+	public int getSizeInventory() {
+		return this.items.length;
 	}
 
 	@Override
-	public boolean hasCustomInventoryName()
-	{
-		return false;
+	public ItemStack getStackInSlot(final int slot) {
+		return this.items[slot];
 	}
 
 	@Override
-	public void readFromNBT(NBTTagCompound nbt)
-	{
-		super.readFromNBT(nbt);
-		NBTTagList list = nbt.getTagList("Items", Constants.NBT.TAG_COMPOUND);
-		items = new ItemStack[getSizeInventory()];
-
-		for (int i = 0; i < list.tagCount(); ++i) { NBTTagCompound comp = list.getCompoundTagAt(i); int j = comp.getByte("Slot") & 255; if (j >= 0 && j < items.length)
-		{
-			items[j] = ItemStack.loadItemStackFromNBT(comp);
-		}
+	public ItemStack getStackInSlotOnClosing(final int slot) {
+		if (this.items[slot] != null) {
+			final ItemStack itemstack = this.items[slot];
+			this.items[slot] = null;
+			return itemstack;
 		}
+		return null;
 	}
 
 	@Override
-	public void writeToNBT(NBTTagCompound nbt)
-	{
-		super.writeToNBT(nbt);
-		NBTTagList list = new NBTTagList();
-
-		for (int i = 0; i < items.length; ++i)
-		{
-			if (items[i] != null)
-			{
-				NBTTagCompound comp = new NBTTagCompound();
-				comp.setByte("Slot", (byte)i);
-				items[i].writeToNBT(comp);
-				list.appendTag(comp);
-			}
-		}
-
-		nbt.setTag("Items", list);
+	public boolean hasCustomInventoryName() {
+		return false;
 	}
 
 	@Override
-	public int getInventoryStackLimit()
-	{
-		return 64;
+	public boolean isItemValidForSlot(final int slot, final ItemStack stack) {
+		return true;
 	}
 
 	@Override
-	public boolean isUseableByPlayer(EntityPlayer player)
-	{
-		return worldObj.getTileEntity(xCoord, yCoord, zCoord) != this ? false : player.getDistanceSq((double)xCoord + 0.5D, (double)yCoord + 0.5D, (double)zCoord + 0.5D) <= 64.0D;
+	public boolean isUseableByPlayer(final EntityPlayer player) {
+		return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false
+				: player.getDistanceSq(this.xCoord + 0.5D, this.yCoord + 0.5D, this.zCoord + 0.5D) <= 64.0D;
 	}
 
 	@Override
-	public void openInventory() {}
+	public void openInventory() {
+	}
 
 	@Override
-	public void closeInventory() {}
+	public void readFromNBT(final NBTTagCompound nbt) {
+		super.readFromNBT(nbt);
+		final NBTTagList list = nbt.getTagList("Items", Constants.NBT.TAG_COMPOUND);
+		this.items = new ItemStack[this.getSizeInventory()];
+
+		for (int i = 0; i < list.tagCount(); ++i) {
+			final NBTTagCompound comp = list.getCompoundTagAt(i);
+			final int j = comp.getByte("Slot") & 255;
+			if (j >= 0 && j < this.items.length) {
+				this.items[j] = ItemStack.loadItemStackFromNBT(comp);
+			}
+		}
+	}
 
 	@Override
-	public boolean isItemValidForSlot(int slot, ItemStack stack)
-	{
-		return true;
+	public void setInventorySlotContents(final int slot, final ItemStack stack) {
+		if (stack != null) {
+			this.items[slot] = stack;
+			if (stack != null && stack.stackSize > this.getInventoryStackLimit()) {
+				stack.stackSize = this.getInventoryStackLimit();
+			}
+
+			this.markDirty();
+		}
 	}
 
 	@Override
 	public void updateEntity() {
-		if(!this.worldObj.isRemote){
-			if (progress_Current < progress_Max){
-				progress_Current++;
+		if (!this.worldObj.isRemote) {
+			if (this.progress_Current < this.progress_Max) {
+				this.progress_Current++;
 			}
-			else if (progress_Current >= progress_Max){
-				if (charge_Current < charge_Max){
-					charge_Current = charge_Current+500;
-				}	
-				if (getStackInSlot(0).getItem() instanceof BaseItemWithCharge){
+			else if (this.progress_Current >= this.progress_Max) {
+				if (this.charge_Current < this.charge_Max) {
+					this.charge_Current = this.charge_Current + 500;
+				}
+				if (this.getStackInSlot(0).getItem() instanceof BaseItemWithCharge) {
 					float tempCharge;
-					ItemStack output = getStackInSlot(0).copy();
-					if (output.stackTagCompound != null){
+					final ItemStack output = this.getStackInSlot(0).copy();
+					if (output.stackTagCompound != null) {
 						tempCharge = output.stackTagCompound.getFloat("charge_Current");
 						output.stackTagCompound = new NBTTagCompound();
-						output.stackTagCompound.setFloat("charge_Current", tempCharge+40);
-						this.charge_Current = charge_Current-40;
+						output.stackTagCompound.setFloat("charge_Current", tempCharge + 40);
+						this.charge_Current = this.charge_Current - 40;
 						tempCharge = 0;
 					}
 				}
-				progress_Current = 0;
+				this.progress_Current = 0;
 			}
 		}
 	}
 
+	@Override
+	public void writeToNBT(final NBTTagCompound nbt) {
+		super.writeToNBT(nbt);
+		final NBTTagList list = new NBTTagList();
+
+		for (int i = 0; i < this.items.length; ++i) {
+			if (this.items[i] != null) {
+				final NBTTagCompound comp = new NBTTagCompound();
+				comp.setByte("Slot", (byte) i);
+				this.items[i].writeToNBT(comp);
+				list.appendTag(comp);
+			}
+		}
+
+		nbt.setTag("Items", list);
+	}
+
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityNHG.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityNHG.java
index 3a9dbbd4c7..1183b906dc 100644
--- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityNHG.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityNHG.java
@@ -12,491 +12,486 @@ import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.Constants;
 
-public class TileEntityNHG extends TileEntity implements IInventory
-{
-	private ItemStack[] items = new ItemStack[19]; //18
-	private int progress = 1;
-	private int maxProgress = 180;
-	private int heatCycleProgress = 12;
-	public float coreTemp;
-	public float maxTemp = 10000;
-	private boolean fuelrod_1 = false;
-	private boolean fuelrod_2 = false;
-	private boolean fuelrod_3 = false;
-	private boolean fuelrod_4 = false;
-	private boolean fuelrod_5 = false;
-	private boolean fuelrod_6 = false;
-	private boolean fuelrod_7 = false;
-	private boolean fuelrod_8 = false;
-	private boolean fuelrod_9 = false;
-	private boolean fuelrod_10 = false;
-	private boolean fuelrod_11 = false;
-	private boolean fuelrod_12 = false;
-	private boolean fuelrod_13 = false;
-	private boolean fuelrod_14 = false;
-	private boolean fuelrod_15 = false;
-	private boolean fuelrod_16 = false;
-	private boolean fuelrod_17 = false;
-	private boolean fuelrod_18 = false;
-
-	public float getCoreTemp(){
-		return coreTemp;
-	}
-
-	public int getProgress(){
-		return progress;
-	}
-
-	public boolean isValidFuelRod(ItemStack input){
-		if(!this.worldObj.isRemote){
-			if (input != null){
-				if (input.getItem() instanceof FuelRod_Base){
-					int fuelRodFuelLevel = getRodFuelValue(input);
-					float fuelRodHeatLevel = getRodHeatValue(input);
-					Utils.LOG_WARNING("Fuel Left: "+fuelRodFuelLevel+" Current Temp: "+fuelRodHeatLevel);	
-					return true;
-					//return input.stackTagCompound.getInteger("code");
-				}
-			}
-
-		}
-		return false;
-	}
-
-	public ItemStack doFuelRodHeatDamage(ItemStack input){
-		if(!this.worldObj.isRemote){
-			if (input != null){
-				if (isValidFuelRod(input)){
-					int fuelRodFuelLevel = getRodFuelValue(input);
-					float fuelRodHeatLevel = getRodHeatValue(input);
-					if(fuelRodFuelLevel <= 0 || fuelRodFuelLevel == 0){
-						return null;
-					}
-					if(fuelRodHeatLevel == 0 && fuelRodFuelLevel > 0){	
-						if(fuelRodFuelLevel >= 5){
-							int tempInt=fuelRodFuelLevel;
-							float tempFloat=fuelRodHeatLevel;
-							ItemStack output = input.copy();
-							if (input.stackTagCompound != null){
-								output.stackTagCompound = new NBTTagCompound();
-								output.stackTagCompound.setInteger("fuelRemaining", tempInt-40);
-								output.stackTagCompound.setFloat("heat", tempFloat+20);
-							}
-							return output;
-						}
-						return null;
-					}
-					else if(fuelRodHeatLevel >= 5 && fuelRodFuelLevel > 0){
-						int tempInt=fuelRodFuelLevel;
-						float tempFloat=fuelRodHeatLevel;
-						ItemStack output = input.copy();
-						if (input.stackTagCompound != null){
-							output.stackTagCompound = new NBTTagCompound();
-							output.stackTagCompound.setInteger("fuelRemaining", tempInt-5);
-							output.stackTagCompound.setFloat("heat", tempFloat+5);
-						}
-						return output;
-					}				
+public class TileEntityN