Buildscript + Spotless (#318)

* Convert AES.java to readable class

* Buildscript

* Spotless

22 files changed, 2013 insertions, 1964 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/ic2/CustomInternalName.java b/src/main/java/gtPlusPlus/xmod/ic2/CustomInternalName.java
index a349d7f86e..6ac8a86504 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/CustomInternalName.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/CustomInternalName.java
@@ -5,18 +5,18 @@ import net.minecraftforge.common.util.EnumHelper;
 
 public class CustomInternalName {
 
-	public static InternalName aHazmatHelmetEx;
-	public static InternalName aHazmatChestEx;
-	public static InternalName aHazmatLegsEx;
-	public static InternalName aHazmatBootsEx;
-	
-	public static void init() {
-		aHazmatHelmetEx = EnumHelper.addEnum(InternalName.class, "itemArmorHazmatHelmetEx", new Class[] {}, new Object[] {});
-		aHazmatChestEx = EnumHelper.addEnum(InternalName.class, "itemArmorHazmatChestplateEx", new Class[] {}, new Object[] {});
-		aHazmatLegsEx = EnumHelper.addEnum(InternalName.class, "itemArmorHazmatLeggingsEx", new Class[] {}, new Object[] {});
-		aHazmatBootsEx = EnumHelper.addEnum(InternalName.class, "itemArmorRubBootsEx", new Class[] {}, new Object[] {});	
-	}
+    public static InternalName aHazmatHelmetEx;
+    public static InternalName aHazmatChestEx;
+    public static InternalName aHazmatLegsEx;
+    public static InternalName aHazmatBootsEx;
 
-	
-	
+    public static void init() {
+        aHazmatHelmetEx =
+                EnumHelper.addEnum(InternalName.class, "itemArmorHazmatHelmetEx", new Class[] {}, new Object[] {});
+        aHazmatChestEx =
+                EnumHelper.addEnum(InternalName.class, "itemArmorHazmatChestplateEx", new Class[] {}, new Object[] {});
+        aHazmatLegsEx =
+                EnumHelper.addEnum(InternalName.class, "itemArmorHazmatLeggingsEx", new Class[] {}, new Object[] {});
+        aHazmatBootsEx = EnumHelper.addEnum(InternalName.class, "itemArmorRubBootsEx", new Class[] {}, new Object[] {});
+    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java b/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java
index bb97132ab4..66b9d9aabe 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java
@@ -4,25 +4,22 @@ import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.xmod.ic2.item.IC2_Items;
 import gtPlusPlus.xmod.ic2.recipe.RECIPE_IC2;
 
-public class HANDLER_IC2{
+public class HANDLER_IC2 {
 
-	public static void preInit() {
-		if (LoadedMods.IndustrialCraft2){
-			IC2_Items.register();
-			//new BlockRTG(InternalName.beer);
-		}
-	}
+    public static void preInit() {
+        if (LoadedMods.IndustrialCraft2) {
+            IC2_Items.register();
+            // new BlockRTG(InternalName.beer);
+        }
+    }
 
-	public static void init() {
-		if (LoadedMods.IndustrialCraft2){
-
-		}
-	}
-
-	public static void postInit() {
-		if (LoadedMods.IndustrialCraft2){
-			RECIPE_IC2.initRecipes();
-		}
-	}
+    public static void init() {
+        if (LoadedMods.IndustrialCraft2) {}
+    }
 
+    public static void postInit() {
+        if (LoadedMods.IndustrialCraft2) {
+            RECIPE_IC2.initRecipes();
+        }
+    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java
index 2a1b5ab44d..03a2606f71 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java
@@ -1,23 +1,8 @@
 package gtPlusPlus.xmod.ic2.block.RTGGenerator;
 
-import java.util.List;
-import java.util.Random;
-
-import org.apache.commons.lang3.mutable.MutableObject;
-
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.EnumRarity;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.xmod.ic2.block.kieticgenerator.tileentity.TileEntityKineticWindGenerator;
 import gtPlusPlus.xmod.ic2.item.IC2_Items;
@@ -28,181 +13,186 @@ import ic2.core.block.BlockMultiID;
 import ic2.core.block.TileEntityBlock;
 import ic2.core.block.reactor.tileentity.TileEntityNuclearReactorElectric;
 import ic2.core.init.InternalName;
+import java.util.List;
+import java.util.Random;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import org.apache.commons.lang3.mutable.MutableObject;
 
-public class BlockRTG
-extends BlockMultiID
-{
-	public BlockRTG(final InternalName internalName1)
-	{
-		super(internalName1, Material.iron, ItemGenerators.class);
-		this.setCreativeTab(AddToCreativeTab.tabMachines);
-		this.setHardness(3.0F);
-		this.setStepSound(soundTypeMetal);
-
-		IC2_Items.blockRTG = new ItemStack(this, 1, 0);
-		IC2_Items.blockKineticGenerator = new ItemStack(this, 1, 1);
-
-		GameRegistry.registerTileEntity(TileEntityRTG.class, "RTG Mach II");
-		GameRegistry.registerTileEntity(TileEntityKineticWindGenerator.class, "Wind Ripper Mach II");
-	}
-
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	@Override
-	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);
-			}
-		}
-	}
-
-
-	@Override
-	public String getTextureFolder(final int id)
-	{
-		return "generator";
-	}
-
-	@Override
-	public int damageDropped(final int meta)
-	{
-		switch (meta)
-		{
-		case 2:
-			return 2;
-		}
-		return 0;
-	}
-
-	@Override
-	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 (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;
-      }
-	 *
-	 * (non-Javadoc)
-	 * @see net.minecraft.block.Block#randomDisplayTick(net.minecraft.world.World, int, int, int, java.util.Random)
-	 */
-
-	@Override
-	public void randomDisplayTick(final World world, final int x, final int y, final int z, final Random random)
-	{
-		if (!IC2.platform.isRendering()) {
-			return;
-		}
-		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;
-			}
-			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)
-		{
-			final TileEntityNuclearReactorElectric te = (TileEntityNuclearReactorElectric)this.getOwnTe(world, x, y, z);
-			if (te == null) {
-				return;
-			}
-			int puffs = te.heat / 1000;
-			if (puffs <= 0) {
-				return;
-			}
-			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);
-			}
-			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);
-			}
-		}
-	}
-
-	@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
-	@SideOnly(Side.CLIENT)
-	public EnumRarity getRarity(final ItemStack stack)
-	{
-		return stack.getItemDamage() == 5 ? EnumRarity.uncommon : EnumRarity.common;
-	}
+public class BlockRTG extends BlockMultiID {
+    public BlockRTG(final InternalName internalName1) {
+        super(internalName1, Material.iron, ItemGenerators.class);
+        this.setCreativeTab(AddToCreativeTab.tabMachines);
+        this.setHardness(3.0F);
+        this.setStepSound(soundTypeMetal);
+
+        IC2_Items.blockRTG = new ItemStack(this, 1, 0);
+        IC2_Items.blockKineticGenerator = new ItemStack(this, 1, 1);
+
+        GameRegistry.registerTileEntity(TileEntityRTG.class, "RTG Mach II");
+        GameRegistry.registerTileEntity(TileEntityKineticWindGenerator.class, "Wind Ripper Mach II");
+    }
+
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    @Override
+    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);
+            }
+        }
+    }
+
+    @Override
+    public String getTextureFolder(final int id) {
+        return "generator";
+    }
+
+    @Override
+    public int damageDropped(final int meta) {
+        switch (meta) {
+            case 2:
+                return 2;
+        }
+        return 0;
+    }
+
+    @Override
+    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 (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;
+        }
+    *
+    * (non-Javadoc)
+    * @see net.minecraft.block.Block#randomDisplayTick(net.minecraft.world.World, int, int, int, java.util.Random)
+    */
+
+    @Override
+    public void randomDisplayTick(final World world, final int x, final int y, final int z, final Random random) {
+        if (!IC2.platform.isRendering()) {
+            return;
+        }
+        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;
+            }
+            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) {
+            final TileEntityNuclearReactorElectric te =
+                    (TileEntityNuclearReactorElectric) this.getOwnTe(world, x, y, z);
+            if (te == null) {
+                return;
+            }
+            int puffs = te.heat / 1000;
+            if (puffs <= 0) {
+                return;
+            }
+            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);
+            }
+            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);
+            }
+        }
+    }
+
+    @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
+    @SideOnly(Side.CLIENT)
+    public EnumRarity getRarity(final ItemStack stack) {
+        return stack.getItemDamage() == 5 ? EnumRarity.uncommon : EnumRarity.common;
+    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java
index aa50243914..19602273c3 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java
@@ -2,11 +2,6 @@ package gtPlusPlus.xmod.ic2.block.RTGGenerator;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-
 import gtPlusPlus.xmod.ic2.block.RTGGenerator.gui.CONTAINER_RTG;
 import gtPlusPlus.xmod.ic2.block.RTGGenerator.gui.GUI_RTG;
 import ic2.core.ContainerBase;
@@ -14,75 +9,65 @@ import ic2.core.Ic2Items;
 import ic2.core.block.generator.tileentity.TileEntityRTGenerator;
 import ic2.core.block.invslot.InvSlotConsumable;
 import ic2.core.block.invslot.InvSlotConsumableId;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 
-public class TileEntityRTG
-extends TileEntityRTGenerator
-{
-	public final InvSlotConsumable fuelSlot;
-
-	public TileEntityRTG()
-	{
-		this.fuelSlot = new InvSlotConsumableId(this, "fuelSlot", 0, 12, new Item[] { Ic2Items.RTGPellets.getItem() });
-	}
-
-	@Override
-	public int gaugeFuelScaled(final int i)
-	{
-		return i;
-	}
+public class TileEntityRTG extends TileEntityRTGenerator {
+    public final InvSlotConsumable fuelSlot;
 
-	@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 TileEntityRTG() {
+        this.fuelSlot = new InvSlotConsumableId(this, "fuelSlot", 0, 12, new Item[] {Ic2Items.RTGPellets.getItem()});
+    }
 
-	@Override
-	public boolean gainFuel()
-	{
-		return false;
-	}
+    @Override
+    public int gaugeFuelScaled(final int i) {
+        return i;
+    }
 
-	@Override
-	public boolean needsFuel()
-	{
-		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;
+    }
 
-	@Override
-	public String getInventoryName()
-	{
-		return "RTG";
-	}
+    @Override
+    public boolean gainFuel() {
+        return false;
+    }
 
-	@Override
-	public ContainerBase<TileEntityRTGenerator> getGuiContainer(final EntityPlayer entityPlayer)
-	{
-		return new CONTAINER_RTG(entityPlayer, this);
-	}
+    @Override
+    public boolean needsFuel() {
+        return true;
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public GuiScreen getGui(final EntityPlayer entityPlayer, final boolean isAdmin)
-	{
-		return new GUI_RTG(new CONTAINER_RTG(entityPlayer, this));
-	}
+    @Override
+    public String getInventoryName() {
+        return "RTG";
+    }
 
-	@Override
-	public boolean delayActiveUpdate()
-	{
-		return true;
-	}
+    @Override
+    public ContainerBase<TileEntityRTGenerator> getGuiContainer(final EntityPlayer entityPlayer) {
+        return new CONTAINER_RTG(entityPlayer, this);
+    }
 
+    @Override
+    @SideOnly(Side.CLIENT)
+    public GuiScreen getGui(final EntityPlayer entityPlayer, final boolean isAdmin) {
+        return new GUI_RTG(new CONTAINER_RTG(entityPlayer, this));
+    }
 
+    @Override
+    public boolean delayActiveUpdate() {
+        return true;
+    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java
index 0afe47c983..9ac5476ed9 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java
@@ -1,37 +1,31 @@
 package gtPlusPlus.xmod.ic2.block.RTGGenerator.gui;
 
-import java.util.List;
-
-import net.minecraft.entity.player.EntityPlayer;
-
 import gtPlusPlus.xmod.ic2.block.RTGGenerator.TileEntityRTG;
 import ic2.core.block.generator.container.ContainerRTGenerator;
 import ic2.core.slot.SlotInvSlot;
+import java.util.List;
+import net.minecraft.entity.player.EntityPlayer;
 
-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++) {
-			this.addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + (i * 18), 18));
-		}
-		for (int i = 4; i < 8; i++) {
-			this.addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + ((i - 4) * 18), 36));
-		}
-		for (int i = 8; i < 12; i++) {
-			this.addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + ((i - 8) * 18), 54));
-		}
-	}
+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++) {
+            this.addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + (i * 18), 18));
+        }
+        for (int i = 4; i < 8; i++) {
+            this.addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + ((i - 4) * 18), 36));
+        }
+        for (int i = 8; i < 12; i++) {
+            this.addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + ((i - 8) * 18), 54));
+        }
+    }
 
-	@Override
-	public List<String> getNetworkedFields()
-	{
-		final List<String> ret = super.getNetworkedFields();
+    @Override
+    public List<String> getNetworkedFields() {
+        final List<String> ret = super.getNetworkedFields();
 
-		ret.add("storage");
+        ret.add("storage");
 
-		return ret;
-	}
+        return ret;
+    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java
index c6e09a78d1..913d456553 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java
@@ -1,52 +1,55 @@
 package gtPlusPlus.xmod.ic2.block.RTGGenerator.gui;
 
-import org.lwjgl.opengl.GL11;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StatCollector;
-
 import gtPlusPlus.xmod.ic2.block.RTGGenerator.TileEntityRTG;
 import ic2.core.IC2;
 import ic2.core.block.generator.gui.GuiRTGenerator;
 import ic2.core.util.GuiTooltipHelper;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+import org.lwjgl.opengl.GL11;
 
 @SideOnly(Side.CLIENT)
-public class GUI_RTG
-extends GuiRTGenerator
-{
-	public CONTAINER_RTG container;
-
-	public GUI_RTG(final CONTAINER_RTG container1)
-	{
-		super(container1);
-
-		this.container = container1;
-		this.name = "RTG Mach II";
-	}
-
-	@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);
-	}
-
-	@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(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);
-	}
-
-	private static final ResourceLocation background = new ResourceLocation(IC2.textureDomain, "textures/gui/GUIRTGenerator.png");
+public class GUI_RTG extends GuiRTGenerator {
+    public CONTAINER_RTG container;
+
+    public GUI_RTG(final CONTAINER_RTG container1) {
+        super(container1);
+
+        this.container = container1;
+        this.name = "RTG Mach II";
+    }
+
+    @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);
+    }
+
+    @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(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);
+    }
+
+    private static final ResourceLocation background =
+            new ResourceLocation(IC2.textureDomain, "textures/gui/GUIRTGenerator.png");
 }
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java
index 95e785d1a1..4f9a2ccab1 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java
@@ -1,77 +1,72 @@
 package gtPlusPlus.xmod.ic2.block.kieticgenerator;
 
-import org.apache.commons.lang3.mutable.MutableObject;
-
 import cpw.mods.fml.common.registry.GameRegistry;
-