$ Cleaned up the entire project.

> Much neat, very nices.

9 files changed, 549 insertions, 635 deletions

diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java
index 4115258bb5..215b1dd0a3 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java
@@ -18,6 +18,7 @@ import ic2.core.block.BlockMultiID;
 import ic2.core.block.TileEntityBlock;
 import ic2.core.block.reactor.tileentity.TileEntityNuclearReactorElectric;
 import ic2.core.init.InternalName;
+import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -25,15 +26,12 @@ import net.minecraft.item.*;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
-public class BlockRTG
-extends BlockMultiID
-{
-	public BlockRTG(InternalName internalName1)
-	{
+public class BlockRTG extends BlockMultiID {
+	public BlockRTG(final InternalName internalName1) {
 		super(internalName1, Material.iron, ItemGenerators.class);
-		setCreativeTab(AddToCreativeTab.tabMachines);
-		setHardness(3.0F);
-		setStepSound(soundTypeMetal);
+		this.setCreativeTab(AddToCreativeTab.tabMachines);
+		this.setHardness(3.0F);
+		this.setStepSound(Block.soundTypeMetal);
 
 		IC2_Items.blockRTG = new ItemStack(this, 1, 0);
 		IC2_Items.blockKineticGenerator = new ItemStack(this, 1, 1);
@@ -43,130 +41,127 @@ extends BlockMultiID
 	}
 
 	@Override
-	public void getSubBlocks(Item j, CreativeTabs tabs, List itemList) {
-		Item item = Item.getItemFromBlock(this);
-		if (!item.getHasSubtypes()) {
-			itemList.add(new ItemStack(this));
-		} else {
-			for (int i = 0; i < 16; i++)
-			{
-				ItemStack is = new ItemStack(this, 1, i);
-				if (is.getItem().getUnlocalizedName(is) == null) {
-					break;
-				}
-				itemList.add(is);
-			}
+	public int damageDropped(final int meta) {
+		switch (meta) {
+			case 2:
+				return 2;
 		}
+		return 0;
 	}
 
-
 	@Override
-	public String getTextureFolder(int id)
-	{
-		return "generator";
+	@SideOnly(Side.CLIENT)
+	public EnumRarity getRarity(final ItemStack stack) {
+		return stack.getItemDamage() == 5 ? EnumRarity.uncommon : EnumRarity.common;
 	}
 
 	@Override
-	public int damageDropped(int meta)
-	{
-		switch (meta)
-		{
-		case 2: 
-			return 2;
+	public void getSubBlocks(final Item j, final CreativeTabs tabs, final List itemList) {
+		final Item item = Item.getItemFromBlock(this);
+		if (!item.getHasSubtypes()) {
+			itemList.add(new ItemStack(this));
+		}
+		else {
+			for (int i = 0; i < 16; i++) {
+				final ItemStack is = new ItemStack(this, 1, i);
+				if (is.getItem().getUnlocalizedName(is) == null) {
+					break;
+				}
+				itemList.add(is);
+			}
 		}
-		return 0;
 	}
 
 	@Override
-	public Class<? extends TileEntity> getTeClass(int meta, MutableObject<Class<?>[]> ctorArgTypes, MutableObject<Object[]> ctorArgs)
-	{
-		try
-		{
-			switch (meta)
-			{      
-			case 0: 
-				return TileEntityRTG.class;    
-			case 1: 
-				return TileEntityKineticWindGenerator.class;
+	public Class<? extends TileEntity> getTeClass(final int meta, final MutableObject<Class<?>[]> ctorArgTypes,
+			final MutableObject<Object[]> ctorArgs) {
+		try {
+			switch (meta) {
+				case 0:
+					return TileEntityRTG.class;
+				case 1:
+					return TileEntityKineticWindGenerator.class;
 			}
 		}
-		catch (Exception e)
-		{
+		catch (final Exception e) {
 			throw new RuntimeException(e);
 		}
 		return null;
 	}
 
 	/*
-	 * 
-	 *  {
-      case 0: 
-        return TileEntityGenerator.class;
-      case 1: 
-        return TileEntityGeoGenerator.class;
-      case 2: 
-        return TileEntityWaterGenerator.class;
-      case 3: 
-        return TileEntitySolarGenerator.class;
-      case 4: 
-        return TileEntityWindGenerator.class;
-      case 5: 
-        return TileEntityNuclearReactorElectric.class;
-      case 6: 
-        return TileEntityRTGenerator.class;
-      case 7: 
-        return TileEntitySemifluidGenerator.class;
-      case 8: 
-        return TileEntityStirlingGenerator.class;
-      case 9: 
-        return TileEntityKineticGenerator.class;
-      }
-	 * 
+	 *
+	 * { case 0: return TileEntityGenerator.class; case 1: return
+	 * TileEntityGeoGenerator.class; case 2: return
+	 * TileEntityWaterGenerator.class; case 3: return
+	 * TileEntitySolarGenerator.class; case 4: return
+	 * TileEntityWindGenerator.class; case 5: return
+	 * TileEntityNuclearReactorElectric.class; case 6: return
+	 * TileEntityRTGenerator.class; case 7: return
+	 * TileEntitySemifluidGenerator.class; case 8: return
+	 * TileEntityStirlingGenerator.class; case 9: return
+	 * TileEntityKineticGenerator.class; }
+	 *
 	 * (non-Javadoc)
-	 * @see net.minecraft.block.Block#randomDisplayTick(net.minecraft.world.World, int, int, int, java.util.Random)
+	 * 
+	 * @see
+	 * net.minecraft.block.Block#randomDisplayTick(net.minecraft.world.World,
+	 * int, int, int, java.util.Random)
 	 */
 
 	@Override
-	public void randomDisplayTick(World world, int x, int y, int z, Random random)
-	{
+	public String getTextureFolder(final int id) {
+		return "generator";
+	}
+
+	@Override
+	public boolean onBlockActivated(final World world, final int i, final int j, final int k,
+			final EntityPlayer entityplayer, final int side, final float a, final float b, final float c) {
+		if (entityplayer.getCurrentEquippedItem() != null
+				&& entityplayer.getCurrentEquippedItem().isItemEqual(Ic2Items.reactorChamber)) {
+			return false;
+		}
+		return super.onBlockActivated(world, i, j, k, entityplayer, side, a, b, c);
+	}
+
+	@Override
+	public void randomDisplayTick(final World world, final int x, final int y, final int z, final Random random) {
 		if (!IC2.platform.isRendering()) {
 			return;
 		}
-		int meta = world.getBlockMetadata(x, y, z);
-		if ((meta == 0) && (isActive(world, x, y, z)))
-		{
-			TileEntityBlock te = (TileEntityBlock)getOwnTe(world, x, y, z);
+		final int meta = world.getBlockMetadata(x, y, z);
+		if (meta == 0 && this.isActive(world, x, y, z)) {
+			final TileEntityBlock te = (TileEntityBlock) this.getOwnTe(world, x, y, z);
 			if (te == null) {
 				return;
 			}
-			int l = te.getFacing();
-			float f = x + 0.5F;
-			float f1 = y + 0.0F + random.nextFloat() * 6.0F / 16.0F;
-			float f2 = z + 0.5F;
-			float f3 = 0.52F;
-			float f4 = random.nextFloat() * 0.6F - 0.3F;
-			switch (l)
-			{
-			case 4: 
-				world.spawnParticle("smoke", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D);
-				world.spawnParticle("flame", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D);
-				break;
-			case 5: 
-				world.spawnParticle("smoke", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D);
-				world.spawnParticle("flame", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D);
-				break;
-			case 2: 
-				world.spawnParticle("smoke", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D);
-				world.spawnParticle("flame", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D);
-				break;
-			case 3: 
-				world.spawnParticle("smoke", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D);
-				world.spawnParticle("flame", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D);
+			final int l = te.getFacing();
+			final float f = x + 0.5F;
+			final float f1 = y + 0.0F + random.nextFloat() * 6.0F / 16.0F;
+			final float f2 = z + 0.5F;
+			final float f3 = 0.52F;
+			final float f4 = random.nextFloat() * 0.6F - 0.3F;
+			switch (l) {
+				case 4:
+					world.spawnParticle("smoke", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D);
+					world.spawnParticle("flame", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D);
+					break;
+				case 5:
+					world.spawnParticle("smoke", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D);
+					world.spawnParticle("flame", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D);
+					break;
+				case 2:
+					world.spawnParticle("smoke", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D);
+					world.spawnParticle("flame", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D);
+					break;
+				case 3:
+					world.spawnParticle("smoke", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D);
+					world.spawnParticle("flame", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D);
 			}
 		}
-		else if (meta == 5)
-		{
-			TileEntityNuclearReactorElectric te = (TileEntityNuclearReactorElectric)getOwnTe(world, x, y, z);
+		else if (meta == 5) {
+			final TileEntityNuclearReactorElectric te = (TileEntityNuclearReactorElectric) this.getOwnTe(world, x, y,
+					z);
 			if (te == null) {
 				return;
 			}
@@ -176,28 +171,14 @@ extends BlockMultiID
 			}
 			puffs = world.rand.nextInt(puffs);
 			for (int n = 0; n < puffs; n++) {
-				world.spawnParticle("smoke", x + random.nextFloat(), y + 0.95F, z + random.nextFloat(), 0.0D, 0.0D, 0.0D);
+				world.spawnParticle("smoke", x + random.nextFloat(), y + 0.95F, z + random.nextFloat(), 0.0D, 0.0D,
+						0.0D);
 			}
 			puffs -= world.rand.nextInt(4) + 3;
 			for (int n = 0; n < puffs; n++) {
-				world.spawnParticle("flame", x + random.nextFloat(), y + 1.0F, z + random.nextFloat(), 0.0D, 0.0D, 0.0D);
+				world.spawnParticle("flame", x + random.nextFloat(), y + 1.0F, z + random.nextFloat(), 0.0D, 0.0D,
+						0.0D);
 			}
 		}
 	}
-
-	@Override
-	public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int side, float a, float b, float c)
-	{
-		if ((entityplayer.getCurrentEquippedItem() != null) && (entityplayer.getCurrentEquippedItem().isItemEqual(Ic2Items.reactorChamber))) {
-			return false;
-		}
-		return super.onBlockActivated(world, i, j, k, entityplayer, side, a, b, c);
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public EnumRarity getRarity(ItemStack stack)
-	{
-		return stack.getItemDamage() == 5 ? EnumRarity.uncommon : EnumRarity.common;
-	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java
index 915f1d0fbe..cac4cbf9db 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java
@@ -13,74 +13,64 @@ import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 
-public class TileEntityRTG
-extends TileEntityRTGenerator
-{
+public class TileEntityRTG extends TileEntityRTGenerator {
 	public final InvSlotConsumable fuelSlot;
 
-	public TileEntityRTG()
-	{
-		this.fuelSlot = new InvSlotConsumableId(this, "fuelSlot", 0, 12, new Item[] { Ic2Items.RTGPellets.getItem() });
+	public TileEntityRTG() {
+		this.fuelSlot = new InvSlotConsumableId(this, "fuelSlot", 0, 12, new Item[] {
+				Ic2Items.RTGPellets.getItem()
+		});
 	}
 
 	@Override
-	public int gaugeFuelScaled(int i)
-	{
-		return i;
+	public boolean delayActiveUpdate() {
+		return true;
 	}
 
 	@Override
-	 public boolean gainEnergy()
-	  {
-	    int counter = 0;
-	    for (int i = 0; i < this.fuelSlot.size(); i++) {
-	      if (this.fuelSlot.get(i) != null) {
-	        counter++;
-	      }
-	    }
-	    if (counter == 0) {
-	      return false;
-	    }
-	    this.storage += (int)Math.pow(2.0D, counter - 1);
-	    return true;
-	  }
+	public boolean gainEnergy() {
+		int counter = 0;
+		for (int i = 0; i < this.fuelSlot.size(); i++) {
+			if (this.fuelSlot.get(i) != null) {
+				counter++;
+			}
+		}
+		if (counter == 0) {
+			return false;
+		}
+		this.storage += (int) Math.pow(2.0D, counter - 1);
+		return true;
+	}
 
 	@Override
-	public boolean gainFuel()
-	{
+	public boolean gainFuel() {
 		return false;
 	}
 
 	@Override
-	public boolean needsFuel()
-	{
-		return true;
+	public int gaugeFuelScaled(final int i) {
+		return i;
 	}
 
 	@Override
-	public String getInventoryName()
-	{
-		return "RTG";
+	@SideOnly(Side.CLIENT)
+	public GuiScreen getGui(final EntityPlayer entityPlayer, final boolean isAdmin) {
+		return new GUI_RTG(new CONTAINER_RTG(entityPlayer, this));
 	}
-	
+
 	@Override
-	public ContainerBase<TileEntityRTGenerator> getGuiContainer(EntityPlayer entityPlayer)
-	{
+	public ContainerBase<TileEntityRTGenerator> getGuiContainer(final EntityPlayer entityPlayer) {
 		return new CONTAINER_RTG(entityPlayer, this);
 	}
 
 	@Override
-	@SideOnly(Side.CLIENT)
-	public GuiScreen getGui(EntityPlayer entityPlayer, boolean isAdmin)
-	{
-		return new GUI_RTG(new CONTAINER_RTG(entityPlayer, this));
+	public String getInventoryName() {
+		return "RTG";
 	}
 
 	@Override
-	public boolean delayActiveUpdate()
-	{
+	public boolean needsFuel() {
 		return true;
 	}
 
-	
 }
diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java
index 7e0733de24..8336cad6f4 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java
@@ -7,27 +7,23 @@ import ic2.core.block.generator.container.ContainerRTGenerator;
 import ic2.core.slot.SlotInvSlot;
 import net.minecraft.entity.player.EntityPlayer;
 
-public class CONTAINER_RTG
-extends ContainerRTGenerator
-{
-	public CONTAINER_RTG(EntityPlayer entityPlayer, TileEntityRTG tileEntity1)
-	{
+public class CONTAINER_RTG extends ContainerRTGenerator {
+	public CONTAINER_RTG(final EntityPlayer entityPlayer, final TileEntityRTG tileEntity1) {
 		super(entityPlayer, tileEntity1);
 		for (int i = 0; i < 4; i++) {
-			addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + i * 18, 18));
+			this.addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + i * 18, 18));
 		}
 		for (int i = 4; i < 8; i++) {
-			addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + (i - 4) * 18, 36));
+			this.addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + (i - 4) * 18, 36));
 		}
 		for (int i = 8; i < 12; i++) {
-			addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + (i - 8) * 18, 54));
+			this.addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + (i - 8) * 18, 54));
 		}
 	}
 
 	@Override
-	public List<String> getNetworkedFields()
-	{
-		List<String> ret = super.getNetworkedFields();
+	public List<String> getNetworkedFields() {
+		final List<String> ret = super.getNetworkedFields();
 
 		ret.add("storage");
 
diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java
index 756d272c9d..d7cdc17fe8 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java
@@ -12,40 +12,40 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 
 @SideOnly(Side.CLIENT)
-public class GUI_RTG
-  extends GuiRTGenerator
-{
-  public CONTAINER_RTG container;
-  public String name;
-  
-  public GUI_RTG(CONTAINER_RTG container1)
-  {
-    super(container1);
-    
-    this.container = container1;
-    this.name = "RTG Mach II";
-  }
-  
-  @Override
-protected void drawGuiContainerForegroundLayer(int par1, int par2)
-  {
-    this.fontRendererObj.drawString(this.name, (this.xSize - this.fontRendererObj.getStringWidth(this.name)) / 2, 4, 4210752);
-    
-    GuiTooltipHelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocalFormatted("ic2.generic.text.bufferEU", new Object[] { Double.valueOf(((TileEntityRTG)this.container.base).storage) }), 117, 38, 150, 48);
-  }
-  
-  @Override
-protected void drawGuiContainerBackgroundLayer(float f, int x, int y)
-  {
-    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-    this.mc.getTextureManager().bindTexture(background);
-    int j = (this.width - this.xSize) / 2;
-    int k = (this.height - this.ySize) / 2;
-    drawTexturedModalRect(j, k, 0, 0, this.xSize, this.ySize);
-    
-    int i1 = ((TileEntityRTG)this.container.base).gaugeStorageScaled(31);
-    drawTexturedModalRect(j + 119, k + 40, 179, 3, i1, 8);
-  }
-  
-  private static final ResourceLocation background = new ResourceLocation(IC2.textureDomain, "textures/gui/GUIRTGenerator.png");
+public class GUI_RTG extends GuiRTGenerator {
+	private static final ResourceLocation background = new ResourceLocation(IC2.textureDomain,
+			"textures/gui/GUIRTGenerator.png");
+	public CONTAINER_RTG	container;
+
+	public String			name;
+
+	public GUI_RTG(final CONTAINER_RTG container1) {
+		super(container1);
+
+		this.container = container1;
+		this.name = "RTG Mach II";
+	}
+
+	@Override
+	protected void drawGuiContainerBackgroundLayer(final float f, final int x, final int y) {
+		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+		this.mc.getTextureManager().bindTexture(GUI_RTG.background);
+		final int j = (this.width - this.xSize) / 2;
+		final int k = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(j, k, 0, 0, this.xSize, this.ySize);
+
+		final int i1 = ((TileEntityRTG) this.container.base).gaugeStorageScaled(31);
+		this.drawTexturedModalRect(j + 119, k + 40, 179, 3, i1, 8);
+	}
+
+	@Override
+	protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
+		this.fontRendererObj.drawString(this.name, (this.xSize - this.fontRendererObj.getStringWidth(this.name)) / 2, 4,
+				4210752);
+
+		GuiTooltipHelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop,
+				StatCollector.translateToLocalFormatted("ic2.generic.text.bufferEU", new Object[] {
+						Double.valueOf(((TileEntityRTG) this.container.base).storage)
+				}), 117, 38, 150, 48);
+	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java
index b0a6b0d6fb..d4597cecab 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java
@@ -15,61 +15,53 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
-public class IC2_BlockKineticGenerator
-  extends BlockMultiID
-{
-  public IC2_BlockKineticGenerator(InternalName internalName1)
-  {
-    super(internalName1, Material.iron, ItemKineticGenerator.class);
-    
-    setHardness(3.0F);
-    setStepSound(Block.soundTypeMetal);
-    this.setCreativeTab(AddToCreativeTab.tabMachines);
-    
-    GameRegistry.registerTileEntity(TileEntityWindKineticGenerator.class, "Advanced Kinetic Wind Generator");
-    
-  }
-  
-  @Override
-public String getTextureFolder(int id)
-  {
-    return "kineticgenerator";
-  }
-  
-  @Override
-public int damageDropped(int meta)
-  {
-    return meta;
-  }
-  
-  @Override
-public Class<? extends TileEntity> getTeClass(int meta, MutableObject<Class<?>[]> ctorArgTypes, MutableObject<Object[]> ctorArgs)
-  {
-    try
-    {
-      switch (meta)
-      {
-      case 0: 
-        return TileEntityWindKineticGenerator.class;     
-      }
-    }
-    catch (Exception e)
-    {
-      throw new RuntimeException(e);
-    }
-    return null;
-  }
-  
-  @Override
-public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float a, float b, float c)
-  {
-    if (entityPlayer.isSneaking()) {
-      return false;
-    }
-    TileEntity te = getOwnTe(world, x, y, z);
-    if ((te != null) && ((te instanceof TileEntityManualKineticGenerator))) {
-      return ((TileEntityManualKineticGenerator)te).playerKlicked(entityPlayer);
-    }
-    return super.onBlockActivated(world, x, y, z, entityPlayer, side, a, b, c);
-  }
+public class IC2_BlockKineticGenerator extends BlockMultiID {
+	public IC2_BlockKineticGenerator(final InternalName internalName1) {
+		super(internalName1, Material.iron, ItemKineticGenerator.class);
+
+		this.setHardness(3.0F);
+		this.setStepSound(Block.soundTypeMetal);
+		this.setCreativeTab(AddToCreativeTab.tabMachines);
+
+		GameRegistry.registerTileEntity(TileEntityWindKineticGenerator.class, "Advanced Kinetic Wind Generator");
+
+	}
+
+	@Override
+	public int damageDropped(final int meta) {
+		return meta;
+	}
+
+	@Override
+	public Class<? extends TileEntity> getTeClass(final int meta, final MutableObject<Class<?>[]> ctorArgTypes,
+			final MutableObject<Object[]> ctorArgs) {
+		try {
+			switch (meta) {
+				case 0:
+					return TileEntityWindKineticGenerator.class;
+			}
+		}
+		catch (final Exception e) {
+			throw new RuntimeException(e);
+		}
+		return null;
+	}
+
+	@Override
+	public String getTextureFolder(final int id) {
+		return "kineticgenerator";
+	}
+
+	@Override
+	public boolean onBlockActivated(final World world, final int x, final int y, final int z,
+			final EntityPlayer entityPlayer, final int side, final float a, final float b, final float c) {
+		if (entityPlayer.isSneaking()) {
+			return false;
+		}
+		final TileEntity te = this.getOwnTe(world, x, y, z);
+		if (te != null && te instanceof TileEntityManualKineticGenerator) {
+			return ((TileEntityManualKineticGenerator) te).playerKlicked(entityPlayer);
+		}
+		return super.onBlockActivated(world, x, y, z, entityPlayer, side, a, b, c);
+	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java
index e41097c6ef..7d61881016 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java
@@ -8,40 +8,41 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;
 
-public abstract class IC2_TEComponent
-{
-  protected final TileEntityBlock parent;
-  
-  public IC2_TEComponent(TileEntityBlock parent)
-  {
-    this.parent = parent;
-  }
-  
-  public abstract String getDefaultName();
-  
-  public void readFromNbt(NBTTagCompound nbt) {}
-  
-  public NBTTagCompound writeToNbt()
-  {
-    return null;
-  }
-  
-  public void onLoaded() {}
-  
-  public void onUnloaded() {}
-  
-  public void onNeighborUpdate(Block srcBlock) {}
-  
-  public void onContainerUpdate(String name, EntityPlayerMP player) {}
-  
-  public void onNetworkUpdate(DataInput is)
-    throws IOException
-  {}
-  
-  public boolean enableWorldTick()
-  {
-    return false;
-  }
-  
-  public void onWorldTick() {}
+public abstract class IC2_TEComponent {
+	protected final TileEntityBlock parent;
+
+	public IC2_TEComponent(final TileEntityBlock parent) {
+		this.parent = parent;
+	}
+
+	public boolean enableWorldTick() {
+		return false;
+	}
+
+	public abstract String getDefaultName();
+
+	public void onContainerUpdate(final String name, final EntityPlayerMP player) {
+	}
+
+	public void onLoaded() {
+	}
+
+	public void onNeighborUpdate(final Block srcBlock) {
+	}
+
+	public void onNetworkUpdate(final DataInput is) throws IOException {
+	}
+
+	public void onUnloaded() {
+	}
+
+	public void onWorldTick() {
+	}
+
+	public void readFromNbt(final NBTTagCompound nbt) {
+	}
+
+	public NBTTagCompound writeToNbt() {
+		return null;
+	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java
index 132aee6f00..7d65a042ec 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java
@@ -7,20 +7,18 @@ import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator
 import ic2.core.slot.SlotInvSlot;
 import net.minecraft.entity.player.EntityPlayer;
 
-public class ContainerKineticWindgenerator
-  extends ContainerFullInv<TileEntityWindKineticGenerator>
-{
-  public ContainerKineticWindgenerator(EntityPlayer entityPlayer, TileEntityWindKineticGenerator tileEntity1)
-  {
-    super(entityPlayer, tileEntity1, 166);
-    
-    addSlotToContainer(new SlotInvSlot(tileEntity1.rotorSlot, 0, 80, 26));
-  }
-  
-  public List<String> getNetworkedFields()
-  {
-    List<String> ret = super.getNetworkedFields();
-    ret.add("windStrength");
-    return ret;
-  }
+public class ContainerKineticWindgenerator extends ContainerFullInv<TileEntityWindKineticGenerator> {
+	public ContainerKineticWindgenerator(final EntityPlayer entityPlayer,
+			final TileEntityWindKineticGenerator tileEntity1) {
+		super(entityPlayer, tileEntity1, 166);
+
+		this.addSlotToContainer(new SlotInvSlot(tileEntity1.rotorSlot, 0, 80, 26));
+	}
+
+	@Override
+	public List<String> getNetworkedFields() {
+		final List<String> ret = super.getNetworkedFields();
+		ret.add("windStrength");
+		return ret;
+	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java
index 5612a43651..3380b83c39 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java
@@ -6,70 +6,72 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ic2.core.IC2;
 import ic2.core.block.kineticgenerator.container.ContainerWindKineticGenerator;
-import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator;
 import ic2.core.util.GuiTooltipHelper;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 
 @SideOnly(Side.CLIENT)
-public class GuiKineticWindGenerator
-  extends GuiContainer
-{
-  public ContainerWindKineticGenerator container;
-  public String name;
-  
-  public GuiKineticWindGenerator(ContainerWindKineticGenerator container1)
-  {
-    super(container1);
-    
-    this.container = container1;
-    this.name = StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.name");
-  }
-  
-  protected void drawGuiContainerForegroundLayer(int par1, int par2)
-  {
-    this.fontRendererObj.drawString(this.name, (this.xSize - this.fontRendererObj.getStringWidth(this.name)) / 2, 6, 4210752);
-    if (((TileEntityWindKineticGenerator)this.container.base).checkrotor())
-    {
-      if (!((TileEntityWindKineticGenerator)this.container.base).rotorspace())
-      {
-        this.fontRendererObj.drawString(StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotorspace"), 20, 52, 2157374);
-      }
-      else if ((((TileEntityWindKineticGenerator)this.container.base).checkrotor()) && (!((TileEntityWindKineticGenerator)this.container.base).guiisminWindStrength()))
-      {
-        this.fontRendererObj.drawString(StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.windweak1"), 27, 52, 2157374);
-        this.fontRendererObj.drawString(StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.windweak2"), 24, 69, 2157374);
-      }
-      else
-      {
-        this.fontRendererObj.drawString(StatCollector.translateToLocalFormatted("ic2.WindKineticGenerator.gui.output", new Object[] { Integer.valueOf(((TileEntityWindKineticGenerator)this.container.base).getKuOutput()) }), 55, 52, 2157374);
-        this.fontRendererObj.drawString(((TileEntityWindKineticGenerator)this.container.base).getRotorhealth() + " %", 46, 70, 2157374);
-        if (((TileEntityWindKineticGenerator)this.container.base).guiisoverload())
-        {
-          GuiTooltipHelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload"), 44, 20, 79, 45);
-          GuiTooltipHelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload2"), 102, 20, 131, 45);
-        }
-      }
-    }
-    else {
-      this.fontRendererObj.drawString(StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotormiss"), 27, 52, 2157374);
-    }
-  }
-  
-  protected void drawGuiContainerBackgroundLayer(float f, int x, int y)
-  {
-    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-    this.mc.getTextureManager().bindTexture(background);
-    int j = (this.width - this.xSize) / 2;
-    int k = (this.height - this.ySize) / 2;
-    drawTexturedModalRect(j, k, 0, 0, this.xSize, this.ySize);
-    if ((((TileEntityWindKineticGenerator)this.container.base).guiisoverload()) && (((TileEntityWindKineticGenerator)this.container.base).checkrotor()))
-    {
-      drawTexturedModalRect(j + 44, k + 20, 176, 0, 30, 26);
-      drawTexturedModalRect(j + 102, k + 20, 176, 0, 30, 26);
-    }
-  }
-  
-  private static final ResourceLocation background = new ResourceLocation(IC2.textureDomain, "textures/gui/GUIWindKineticGenerator.png");
+public class GuiKineticWindGenerator extends GuiContainer {
+	private static final ResourceLocation background = new ResourceLocation(IC2.textureDomain,
+			"textures/gui/GUIWindKineticGenerator.png");
+	public ContainerWindKineticGenerator	container;
+
+	public String							name;
+
+	public GuiKineticWindGenerator(final ContainerWindKineticGenerator container1) {
+		super(container1);
+
+		this.container = container1;
+		this.name = StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.name");
+	}
+
+	@Override
+	protected void drawGuiContainerBackgroundLayer(final float f, final int x, final int y) {
+		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+		this.mc.getTextureManager().bindTexture(GuiKineticWindGenerator.background);
+		final int j = (this.width - this.xSize) / 2;
+		final int k = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(j, k, 0, 0, this.xSize, this.ySize);
+		if (this.container.base.guiisoverload() && this.container.base.checkrotor()) {
+			this.drawTexturedModalRect(j + 44, k + 20, 176, 0, 30, 26);
+			this.drawTexturedModalRect(j + 102, k + 20, 176, 0, 30, 26);
+		}
+	}
+
+	@Override
+	protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
+		this.fontRendererObj.drawString(this.name, (this.xSize - this.fontRendererObj.getStringWidth(this.name)) / 2, 6,
+				4210752);
+		if (this.container.base.checkrotor()) {
+			if (!this.container.base.rotorspace()) {
+				this.fontRendererObj.drawString(
+						StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotorspace"), 20, 52, 2157374);
+			}
+			else if (this.container.base.checkrotor() && !this.container.base.guiisminWindStrength()) {
+				this.fontRendererObj.drawString(
+						StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.windweak1"), 27, 52, 2157374);
+				this.fontRendererObj.drawString(
+						StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.windweak2"), 24, 69, 2157374);
+			}
+			else {
+				this.fontRendererObj.drawString(
+						StatCollector.translateToLocalFormatted("ic2.WindKineticGenerator.gui.output", new Object[] {
+								Integer.valueOf(this.container.base.getKuOutput())
+						}), 55, 52, 2157374);
+				this.fontRendererObj.drawString(this.container.base.getRotorhealth() + " %", 46, 70, 2157374);
+				if (this.container.base.guiisoverload()) {
+					GuiTooltipHelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop,
+							StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload"), 44, 20, 79, 45);
+					GuiTooltipHelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop,
+							StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overloa