updateBuildScript & spotlessApply

23 files changed, 1024 insertions, 1025 deletions

diff --git a/src/main/java/common/blocks/BaseGTUpdateableBlock.java b/src/main/java/common/blocks/BaseGTUpdateableBlock.java
index 6f554101ca..77ee67469f 100644
--- a/src/main/java/common/blocks/BaseGTUpdateableBlock.java
+++ b/src/main/java/common/blocks/BaseGTUpdateableBlock.java
@@ -1,6 +1,5 @@
 package common.blocks;
 
-
 import gregtech.api.GregTech_API;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -23,7 +22,7 @@ public abstract class BaseGTUpdateableBlock extends Block {
     }
 
     @Override
-    public int damageDropped(int meta){
+    public int damageDropped(int meta) {
         return meta;
     }
 
diff --git a/src/main/java/common/blocks/Block_BeamTransmitter.java b/src/main/java/common/blocks/Block_BeamTransmitter.java
index af7a837fdd..be29bde3fd 100644
--- a/src/main/java/common/blocks/Block_BeamTransmitter.java
+++ b/src/main/java/common/blocks/Block_BeamTransmitter.java
@@ -1,7 +1,6 @@
 package common.blocks;
 
 import common.tileentities.TE_BeamTransmitter;
-import common.tileentities.TE_SpaceElevatorTether;
 import cpw.mods.fml.common.registry.GameRegistry;
 import kekztech.KekzCore;
 import net.minecraft.block.Block;
@@ -41,15 +40,12 @@ public class Block_BeamTransmitter extends Block {
     }
 
     @Override
-    public boolean isOpaqueCube()
-    {
+    public boolean isOpaqueCube() {
         return false;
     }
 
     @Override
-    public boolean renderAsNormalBlock()
-    {
+    public boolean renderAsNormalBlock() {
         return false;
     }
-
 }
diff --git a/src/main/java/common/blocks/Block_ControlRod.java b/src/main/java/common/blocks/Block_ControlRod.java
index 808881dead..9849816a2a 100644
--- a/src/main/java/common/blocks/Block_ControlRod.java
+++ b/src/main/java/common/blocks/Block_ControlRod.java
@@ -7,22 +7,22 @@ import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 
 public class Block_ControlRod extends BaseGTUpdateableBlock {
-	
-	private static final Block_ControlRod instance = new Block_ControlRod();
-	
-	private Block_ControlRod() {
-		super(Material.iron);
-	}
-	
-	public static Block registerBlock() {
-		final String blockName = "kekztech_controlrod_block";
-		instance.setBlockName(blockName);
-		instance.setCreativeTab(CreativeTabs.tabMisc);
-		instance.setBlockTextureName(KekzCore.MODID + ":" + "ControlRod");
-		instance.setHardness(5.0f);
-		instance.setResistance(6.0f);
-		GameRegistry.registerBlock(instance, blockName);
-		
-		return instance;
-	}
+
+    private static final Block_ControlRod instance = new Block_ControlRod();
+
+    private Block_ControlRod() {
+        super(Material.iron);
+    }
+
+    public static Block registerBlock() {
+        final String blockName = "kekztech_controlrod_block";
+        instance.setBlockName(blockName);
+        instance.setCreativeTab(CreativeTabs.tabMisc);
+        instance.setBlockTextureName(KekzCore.MODID + ":" + "ControlRod");
+        instance.setHardness(5.0f);
+        instance.setResistance(6.0f);
+        GameRegistry.registerBlock(instance, blockName);
+
+        return instance;
+    }
 }
diff --git a/src/main/java/common/blocks/Block_GDCUnit.java b/src/main/java/common/blocks/Block_GDCUnit.java
index aab81e1aeb..c86a55f200 100644
--- a/src/main/java/common/blocks/Block_GDCUnit.java
+++ b/src/main/java/common/blocks/Block_GDCUnit.java
@@ -1,28 +1,28 @@
-package common.blocks;

-

-import cpw.mods.fml.common.registry.GameRegistry;

-import kekztech.KekzCore;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.creativetab.CreativeTabs;

-

-public class Block_GDCUnit extends BaseGTUpdateableBlock {

-	

-	private static final Block_GDCUnit instance = new Block_GDCUnit();

-	

-	private Block_GDCUnit() {

-		super(Material.iron);

-	}

-	

-	public static Block registerBlock() {

-		final String blockName = "kekztech_gdcceramicelectrolyteunit_block";

-		instance.setBlockName(blockName);

-		instance.setCreativeTab(CreativeTabs.tabMisc);

-		instance.setBlockTextureName(KekzCore.MODID + ":" + "GDCCeramicElectrolyteUnit");

-		instance.setHardness(5.0f);

-		instance.setResistance(6.0f);

-		GameRegistry.registerBlock(instance, blockName);

-		

-		return instance;

-	}

-}

+package common.blocks;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import kekztech.KekzCore;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+
+public class Block_GDCUnit extends BaseGTUpdateableBlock {
+
+    private static final Block_GDCUnit instance = new Block_GDCUnit();
+
+    private Block_GDCUnit() {
+        super(Material.iron);
+    }
+
+    public static Block registerBlock() {
+        final String blockName = "kekztech_gdcceramicelectrolyteunit_block";
+        instance.setBlockName(blockName);
+        instance.setCreativeTab(CreativeTabs.tabMisc);
+        instance.setBlockTextureName(KekzCore.MODID + ":" + "GDCCeramicElectrolyteUnit");
+        instance.setHardness(5.0f);
+        instance.setResistance(6.0f);
+        GameRegistry.registerBlock(instance, blockName);
+
+        return instance;
+    }
+}
diff --git a/src/main/java/common/blocks/Block_IchorJar.java b/src/main/java/common/blocks/Block_IchorJar.java
index 0c2417b2f1..e7cf3c77eb 100644
--- a/src/main/java/common/blocks/Block_IchorJar.java
+++ b/src/main/java/common/blocks/Block_IchorJar.java
@@ -6,6 +6,9 @@ import common.tileentities.TE_IchorVoidJar;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -24,200 +27,204 @@ import thaumcraft.common.config.ConfigItems;
 import thaumcraft.common.items.ItemEssence;
 import thaumcraft.common.tiles.TileJarFillable;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 public class Block_IchorJar extends BlockJar {
-	
-	private static final Block_IchorJar INSTANCE = new Block_IchorJar();
-	
-	private Block_IchorJar() {
-		super();
-		
-		super.setHardness(12.0F);
-		super.setResistance(3.0f);
-	}
-
-	public static Block registerBlock() {
-		final String blockName = "kekztech_ichorjar_block";
-		INSTANCE.setBlockName(blockName);
-		INSTANCE.setHarvestLevel("pickaxe", 3);
-		GameRegistry.registerBlock(INSTANCE, IB_IchorJar.class, blockName);
-		
-		return INSTANCE;
-	}
-	
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister ir) {
-		super.iconLiquid = ir.registerIcon("thaumcraft:animatedglow");
-		super.iconJarSide = ir.registerIcon("kekztech:ichor_jar_side");
-		super.iconJarTop = ir.registerIcon("kekztech:ichor_jar_top");
-		super.iconJarTopVoid = ir.registerIcon("kekztech:ichor_jar_top_void");
-		super.iconJarSideVoid = ir.registerIcon("kekztech:ichor_jar_side_void");
-		super.iconJarBottom = ir.registerIcon("kekztech:ichor_jar_bottom");
-	}
-	
-	@Override
-	@SideOnly(Side.CLIENT)
-	@SuppressWarnings({"unchecked"})
-	public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
-		par3List.add(new ItemStack(par1, 1, 0)); // Normal jar
-		par3List.add(new ItemStack(par1, 1, 3)); // Void jar
-	}
-	
-	@Override
-	public TileEntity createTileEntity(World world, int meta) {
-		if(meta == 3) {
-			return new TE_IchorVoidJar();
-		} else {
-			return new TE_IchorJar();
-		}
-	}
-
-	@Override
-	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float f1, float f2, float f3) {
-		// Call parent method to handle jar emptying, labels stuff etc
-		super.onBlockActivated(world, x, y, z, player, side, f1, f2, f3);
-		// Interact with Essentia Phials if the player holds one
-		final ItemStack heldItem = player.getHeldItem();
-		if(heldItem != null && heldItem.getItem() == ConfigItems.itemEssence) {
-			final TileEntity te = world.getTileEntity(x, y, z);
-			if(te instanceof TE_IchorJar) {
-				return dealWithPhial(world, player, x, y, z);
-			} else if(te instanceof TE_IchorVoidJar) {
-				return dealWithPhial(world, player, x, y, z);
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Handle compatibility with Essentia Phials
-	 * @param world
-	 * 			Pass through from onBlockActivated()
-	 * @param player
-	 * 			Pass through from onBlockActivated()
-	 * @param x
-	 * 			Pass through from onBlockActivated()
-	 * @param y
-	 * 			Pass through from onBlockActivated()
-	 * @param z
-	 * 			Pass through from onBlockActivated()
-	 * @return Not sure tbh
-	 */
-	private boolean dealWithPhial(World world, EntityPlayer player, int x, int y, int z) {
-		final TileJarFillable jarTE = (TileJarFillable) world.getTileEntity(x, y, z);
-		final ItemStack heldItem = player.getHeldItem();
-		// Check whether to fill or to drain the phial
-		if(heldItem.getItemDamage() == 0) {
-			if(jarTE.amount >= 8){
-				if (world.isRemote) {
-					player.swingItem();
-					return false;
-				}
-
-				final Aspect jarAspect = Aspect.getAspect(jarTE.aspect.getTag());
-				if(jarTE.takeFromContainer(jarAspect, 8)) {
-					// Take an empty phial from the player's inventory
-					heldItem.stackSize--;
-					// Fill a new phial
-					final ItemStack filledPhial = new ItemStack(ConfigItems.itemEssence, 1, 1);
-					final AspectList phialContent = new AspectList().add(jarAspect, 8);
-					((ItemEssence) ConfigItems.itemEssence).setAspects(filledPhial, phialContent);
-					// Drop on ground if there's no inventory space
-					if (!player.inventory.addItemStackToInventory(filledPhial)) {
-						world.spawnEntityInWorld(new EntityItem(world, (float)x + 0.5F, (float)y + 0.5F, (float)z + 0.5F, filledPhial));
-					}
-
-					world.playSoundAtEntity(player, "game.neutral.swim", 0.25F, 1.0F);
-					player.inventoryContainer.detectAndSendChanges();
-					return true;
-				}
-			}
-		} else {
-			final AspectList phialContent = ((ItemEssence) ConfigItems.itemEssence).getAspects(heldItem);
-			if(phialContent != null && phialContent.size() == 1) {
-				final Aspect phialAspect = phialContent.getAspects()[0];
-				if(jarTE.amount + 8 <= jarTE.maxAmount && jarTE.doesContainerAccept(phialAspect)) {
-					if (world.isRemote) {
-						player.swingItem();
-						return false;
-					}
-
-					if(jarTE.addToContainer(phialAspect, 8) == 0) {
-						world.markBlockForUpdate(x, y, z);
-						jarTE.markDirty();
-						heldItem.stackSize--;
-						// Drop on ground if there's no inventory space
-						if (!player.inventory.addItemStackToInventory(new ItemStack(ConfigItems.itemEssence, 1, 0))) {
-							world.spawnEntityInWorld(new EntityItem(world, (float)x + 0.5F, (float)y + 0.5F, (float)z + 0.5F, new ItemStack(ConfigItems.itemEssence, 1, 0)));
-						}
-
-						world.playSoundAtEntity(player, "game.neutral.swim", 0.25F, 1.0F);
-						player.inventoryContainer.detectAndSendChanges();
-						return true;
-					}
-				}
-			}
-		}
-
-		return true;
-	}
-
-	@Override
-	public void breakBlock(World world, int x, int y, int z, Block par5, int par6) {
-		final TileEntity te = world.getTileEntity(x, y, z);
-		if(te instanceof TE_IchorJar) {
-			final TE_IchorJar ite = (TE_IchorJar) te;
-			breakBlockWarpy(world, x, y, z, ite.amount, 200, 6.0F);
-		} else if(te instanceof  TE_IchorVoidJar) {
-			final TE_IchorVoidJar ite = (TE_IchorVoidJar) te;
-			breakBlockWarpy(world, x, y, z, ite.amount, 200, 6.0F);
-		}
-		super.breakBlock(world, x, y, z, par5, par6);
-	}
-
-	private void breakBlockWarpy(World world, int x, int y, int z, int fillAmount, int iterations, float explosionStrength){
-		if(fillAmount > 0) {
-			// Create a decent explosion in the center of the block (TNT has strength 4.0F)
-			world.createExplosion(null, x + 0.5D, y + 0.5D, z + 0.5D, explosionStrength, false);
-
-			// Place a lot of Flux in the area
-			final int limit = fillAmount / 16;
-			int created = 0;
-			for(int i = 0; i < iterations; i++) {
-				final int xf = x + world.rand.nextInt(7) - world.rand.nextInt(7);
-				final int yf = x + world.rand.nextInt(7) - world.rand.nextInt(7);
-				final int zf = x + world.rand.nextInt(7) - world.rand.nextInt(7);
-				if(world.isAirBlock(xf, yf, zf)) {
-					if(yf > y) {
-						world.setBlock(xf, yf, zf, ConfigBlocks.blockFluxGas, 8, 3);
-					} else {
-						world.setBlock(xf, yf, zf, ConfigBlocks.blockFluxGoo, 8, 3);
-					}
-
-					if(created++ > limit) {
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	@Override
-	public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int meta, int fortune) {
-		return new ArrayList<>(Collections.singleton(new ItemStack(this, 1, (meta == 3) ? 3 : 0)));
-	}
-
-	@Override
-	public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) {
-	}
-
-	@Override
-	public boolean canDropFromExplosion(Explosion e) {
-		return false;
-	}
+
+    private static final Block_IchorJar INSTANCE = new Block_IchorJar();
+
+    private Block_IchorJar() {
+        super();
+
+        super.setHardness(12.0F);
+        super.setResistance(3.0f);
+    }
+
+    public static Block registerBlock() {
+        final String blockName = "kekztech_ichorjar_block";
+        INSTANCE.setBlockName(blockName);
+        INSTANCE.setHarvestLevel("pickaxe", 3);
+        GameRegistry.registerBlock(INSTANCE, IB_IchorJar.class, blockName);
+
+        return INSTANCE;
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerBlockIcons(IIconRegister ir) {
+        super.iconLiquid = ir.registerIcon("thaumcraft:animatedglow");
+        super.iconJarSide = ir.registerIcon("kekztech:ichor_jar_side");
+        super.iconJarTop = ir.registerIcon("kekztech:ichor_jar_top");
+        super.iconJarTopVoid = ir.registerIcon("kekztech:ichor_jar_top_void");
+        super.iconJarSideVoid = ir.registerIcon("kekztech:ichor_jar_side_void");
+        super.iconJarBottom = ir.registerIcon("kekztech:ichor_jar_bottom");
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    @SuppressWarnings({"unchecked"})
+    public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+        par3List.add(new ItemStack(par1, 1, 0)); // Normal jar
+        par3List.add(new ItemStack(par1, 1, 3)); // Void jar
+    }
+
+    @Override
+    public TileEntity createTileEntity(World world, int meta) {
+        if (meta == 3) {
+            return new TE_IchorVoidJar();
+        } else {
+            return new TE_IchorJar();
+        }
+    }
+
+    @Override
+    public boolean onBlockActivated(
+            World world, int x, int y, int z, EntityPlayer player, int side, float f1, float f2, float f3) {
+        // Call parent method to handle jar emptying, labels stuff etc
+        super.onBlockActivated(world, x, y, z, player, side, f1, f2, f3);
+        // Interact with Essentia Phials if the player holds one
+        final ItemStack heldItem = player.getHeldItem();
+        if (heldItem != null && heldItem.getItem() == ConfigItems.itemEssence) {
+            final TileEntity te = world.getTileEntity(x, y, z);
+            if (te instanceof TE_IchorJar) {
+                return dealWithPhial(world, player, x, y, z);
+            } else if (te instanceof TE_IchorVoidJar) {
+                return dealWithPhial(world, player, x, y, z);
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle compatibility with Essentia Phials
+     * @param world
+     * 			Pass through from onBlockActivated()
+     * @param player
+     * 			Pass through from onBlockActivated()
+     * @param x
+     * 			Pass through from onBlockActivated()
+     * @param y
+     * 			Pass through from onBlockActivated()
+     * @param z
+     * 			Pass through from onBlockActivated()
+     * @return Not sure tbh
+     */
+    private boolean dealWithPhial(World world, EntityPlayer player, int x, int y, int z) {
+        final TileJarFillable jarTE = (TileJarFillable) world.getTileEntity(x, y, z);
+        final ItemStack heldItem = player.getHeldItem();
+        // Check whether to fill or to drain the phial
+        if (heldItem.getItemDamage() == 0) {
+            if (jarTE.amount >= 8) {
+                if (world.isRemote) {
+                    player.swingItem();
+                    return false;
+                }
+
+                final Aspect jarAspect = Aspect.getAspect(jarTE.aspect.getTag());
+                if (jarTE.takeFromContainer(jarAspect, 8)) {
+                    // Take an empty phial from the player's inventory
+                    heldItem.stackSize--;
+                    // Fill a new phial
+                    final ItemStack filledPhial = new ItemStack(ConfigItems.itemEssence, 1, 1);
+                    final AspectList phialContent = new AspectList().add(jarAspect, 8);
+                    ((ItemEssence) ConfigItems.itemEssence).setAspects(filledPhial, phialContent);
+                    // Drop on ground if there's no inventory space
+                    if (!player.inventory.addItemStackToInventory(filledPhial)) {
+                        world.spawnEntityInWorld(new EntityItem(
+                                world, (float) x + 0.5F, (float) y + 0.5F, (float) z + 0.5F, filledPhial));
+                    }
+
+                    world.playSoundAtEntity(player, "game.neutral.swim", 0.25F, 1.0F);
+                    player.inventoryContainer.detectAndSendChanges();
+                    return true;
+                }
+            }
+        } else {
+            final AspectList phialContent = ((ItemEssence) ConfigItems.itemEssence).getAspects(heldItem);
+            if (phialContent != null && phialContent.size() == 1) {
+                final Aspect phialAspect = phialContent.getAspects()[0];
+                if (jarTE.amount + 8 <= jarTE.maxAmount && jarTE.doesContainerAccept(phialAspect)) {
+                    if (world.isRemote) {
+                        player.swingItem();
+                        return false;
+                    }
+
+                    if (jarTE.addToContainer(phialAspect, 8) == 0) {
+                        world.markBlockForUpdate(x, y, z);
+                        jarTE.markDirty();
+                        heldItem.stackSize--;
+                        // Drop on ground if there's no inventory space
+                        if (!player.inventory.addItemStackToInventory(new ItemStack(ConfigItems.itemEssence, 1, 0))) {
+                            world.spawnEntityInWorld(new EntityItem(
+                                    world,
+                                    (float) x + 0.5F,
+                                    (float) y + 0.5F,
+                                    (float) z + 0.5F,
+                                    new ItemStack(ConfigItems.itemEssence, 1, 0)));
+                        }
+
+                        world.playSoundAtEntity(player, "game.neutral.swim", 0.25F, 1.0F);
+                        player.inventoryContainer.detectAndSendChanges();
+                        return true;
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
+    @Override
+    public void breakBlock(World world, int x, int y, int z, Block par5, int par6) {
+        final TileEntity te = world.getTileEntity(x, y, z);
+        if (te instanceof TE_IchorJar) {
+            final TE_IchorJar ite = (TE_IchorJar) te;
+            breakBlockWarpy(world, x, y, z, ite.amount, 200, 6.0F);
+        } else if (te instanceof TE_IchorVoidJar) {
+            final TE_IchorVoidJar ite = (TE_IchorVoidJar) te;
+            breakBlockWarpy(world, x, y, z, ite.amount, 200, 6.0F);
+        }
+        super.breakBlock(world, x, y, z, par5, par6);
+    }
+
+    private void breakBlockWarpy(
+            World world, int x, int y, int z, int fillAmount, int iterations, float explosionStrength) {
+        if (fillAmount > 0) {
+            // Create a decent explosion in the center of the block (TNT has strength 4.0F)
+            world.createExplosion(null, x + 0.5D, y + 0.5D, z + 0.5D, explosionStrength, false);
+
+            // Place a lot of Flux in the area
+            final int limit = fillAmount / 16;
+            int created = 0;
+            for (int i = 0; i < iterations; i++) {
+                final int xf = x + world.rand.nextInt(7) - world.rand.nextInt(7);
+                final int yf = x + world.rand.nextInt(7) - world.rand.nextInt(7);
+                final int zf = x + world.rand.nextInt(7) - world.rand.nextInt(7);
+                if (world.isAirBlock(xf, yf, zf)) {
+                    if (yf > y) {
+                        world.setBlock(xf, yf, zf, ConfigBlocks.blockFluxGas, 8, 3);
+                    } else {
+                        world.setBlock(xf, yf, zf, ConfigBlocks.blockFluxGoo, 8, 3);
+                    }
+
+                    if (created++ > limit) {
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int meta, int fortune) {
+        return new ArrayList<>(Collections.singleton(new ItemStack(this, 1, (meta == 3) ? 3 : 0)));
+    }
+
+    @Override
+    public void onBlockHarvested(
+            World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) {}
+
+    @Override
+    public boolean canDropFromExplosion(Explosion e) {
+        return false;
+    }
 }
diff --git a/src/main/java/common/blocks/Block_ItemProxyCable.java b/src/main/java/common/blocks/Block_ItemProxyCable.java
index ce2f1e9820..57b5fc6138 100644
--- a/src/main/java/common/blocks/Block_ItemProxyCable.java
+++ b/src/main/java/common/blocks/Block_ItemProxyCable.java
@@ -1,5 +1,6 @@
 package common.blocks;
 
+import client.renderer.ConduitRenderer;
 import common.itemBlocks.IB_ItemProxyCable;
 import common.tileentities.TE_ItemProxyCable;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -11,56 +12,55 @@ import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import client.renderer.ConduitRenderer;
 
 public class Block_ItemProxyCable extends Block {
-	
-	private static Block_ItemProxyCable instance = new Block_ItemProxyCable();
-	
-	private Block_ItemProxyCable() {
-		super(Material.glass);
-	}
-	
-	public static Block registerBlock() {
-		final String blockName = "kekztech_itemproxycable_block";
-		instance.setBlockName(blockName);
-		instance.setCreativeTab(CreativeTabs.tabMisc);
-		instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTCasing");
-		instance.setHardness(3.0f);
-		instance.setResistance(2.0f);
-		GameRegistry.registerBlock(instance, IB_ItemProxyCable.class, blockName);
-		
-		return instance;
-	}
-	
-	@Override
-	public boolean isOpaqueCube() {
-		return false;
-	}
-	
-	@Override
-	public TileEntity createTileEntity(World world, int p_149915_2_) {
-		return new TE_ItemProxyCable();
-	}
 
-	@Override
-	public boolean hasTileEntity(int metadata) {
-		return true;
-	}
+    private static Block_ItemProxyCable instance = new Block_ItemProxyCable();
+
+    private Block_ItemProxyCable() {
+        super(Material.glass);
+    }
+
+    public static Block registerBlock() {
+        final String blockName = "kekztech_itemproxycable_block";
+        instance.setBlockName(blockName);
+        instance.setCreativeTab(CreativeTabs.tabMisc);
+        instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTCasing");
+        instance.setHardness(3.0f);
+        instance.setResistance(2.0f);
+        GameRegistry.registerBlock(instance, IB_ItemProxyCable.class, blockName);
+
+        return instance;
+    }
+
+    @Override
+    public boolean isOpaqueCube() {
+        return false;
+    }
+
+    @Override
+    public TileEntity createTileEntity(World world, int p_149915_2_) {
+        return new TE_ItemProxyCable();
+    }
+
+    @Override
+    public boolean hasTileEntity(int metadata) {
+        return true;
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int getRenderBlockPass() {
-		return 1;
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public int getRenderBlockPass() {
+        return 1;
+    }
 
-	@Override
-	public int getRenderType() {
-		return ConduitRenderer.RID;
-	}
+    @Override
+    public int getRenderType() {
+        return ConduitRenderer.RID;
+    }
 
-	@Override
-	public boolean renderAsNormalBlock() {
-		return false;
-	}
+    @Override
+    public boolean renderAsNormalBlock() {
+        return false;
+    }
 }
diff --git a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java
index 00e0426250..7c7712988d 100644
--- a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java
+++ b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java
@@ -13,49 +13,49 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
 public class Block_ItemProxyEndpoint extends Block {
-	
-	private static final Block_ItemProxyEndpoint instance = new Block_ItemProxyEndpoint();
-	
-	private Block_ItemProxyEndpoint() {
-		super(Material.glass);
-	}
-	
-	public static Block registerBlock() {
-		final String blockName = "kekztech_itemproxyendpoint_block";
-		instance.setBlockName(blockName);
-		instance.setCreativeTab(CreativeTabs.tabMisc);
-		instance.setBlockTextureName(KekzCore.MODID + ":" + "ItemProxyEndpoint");
-		instance.setHardness(3.0f);
-		instance.setResistance(2.0f);
-		instance.setHarvestLevel("wrench", 2);
-		GameRegistry.registerBlock(instance, IB_ItemProxyEndpoint.class, blockName);
-		
-		return instance;
-	}
-	
-	@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;
-		}
-		
-		final TileEntity te = world.getTileEntity(x, y, z);
-		if(te instanceof TE_ItemProxyEndpoint) {
-			player.openGui(KekzCore.instance, GuiHandler.ITEM_PROXY_ENDPOINT, world, x, y, z);
-			return true;
-		} else {
-			return false;
-		}
-	}
-	
-	@Override
-	public TileEntity createTileEntity(World world, int p_149915_2_) {
-		return new TE_ItemProxyEndpoint();
-	}
-
-	@Override
-	public boolean hasTileEntity(int metadata) {
-		return true;
-	}
-
-}
\ No newline at end of file
+
+    private static final Block_ItemProxyEndpoint instance = new Block_ItemProxyEndpoint();
+
+    private Block_ItemProxyEndpoint() {
+        super(Material.glass);
+    }
+
+    public static Block registerBlock() {
+        final String blockName = "kekztech_itemproxyendpoint_block";
+        instance.setBlockName(blockName);
+        instance.setCreativeTab(CreativeTabs.tabMisc);
+        instance.setBlockTextureName(KekzCore.MODID + ":" + "ItemProxyEndpoint");
+        instance.setHardness(3.0f);
+        instance.setResistance(2.0f);
+        instance.setHarvestLevel("wrench", 2);
+        GameRegistry.registerBlock(instance, IB_ItemProxyEndpoint.class, blockName);
+
+        return instance;
+    }
+
+    @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;
+        }
+
+        final TileEntity te = world.getTileEntity(x, y, z);
+        if (te instanceof TE_ItemProxyEndpoint) {
+            player.openGui(KekzCore.instance, GuiHandler.ITEM_PROXY_ENDPOINT, world, x, y, z);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public TileEntity createTileEntity(World world, int p_149915_2_) {
+        return new TE_ItemProxyEndpoint();
+    }
+
+    @Override
+    public boolean hasTileEntity(int metadata) {
+        return true;
+    }
+}
diff --git a/src/main/java/common/blocks/Block_ItemProxySource.java b/src/main/java/common/blocks/Block_ItemProxySource.java
index 7291c15e6f..cb3c95bec0 100644
--- a/src/main/java/common/blocks/Block_ItemProxySource.java
+++ b/src/main/java/common/blocks/Block_ItemProxySource.java
@@ -13,49 +13,49 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
 public class Block_ItemProxySource extends Block {
-	
-	private static final Block_ItemProxySource instance = new Block_ItemProxySource();
-	
-	private Block_ItemProxySource() {
-		super(Material.glass);
-	}
-	
-	public static Block registerBlock() {
-		final String blockName = "kekztech_itemproxysource_block";
-		instance.setBlockName(blockName);
-		instance.setCreativeTab(CreativeTabs.tabMisc);
-		instance.setBlockTextureName(KekzCore.MODID + ":" + "ItemProxySource");
-		instance.setHardness(3.0f);
-		instance.setResistance(2.0f);
-		instance.setHarvestLevel("wrench", 2);
-		GameRegistry.registerBlock(instance, IB_ItemProxySource.class, blockName);
-		
-		return instance;
-	}
-	
-	@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;
-		}
-		
-		final TileEntity te = world.getTileEntity(x, y, z);
-		if(te instanceof TE_ItemProxySource) {
-			player.openGui(KekzCore.instance, GuiHandler.ITEM_PROXY_SOURCE, world, x, y, z);
-			return true;
-		} else {
-			return false;
-		}
-	}
-	
-	@Override
-	public TileEntity createTileEntity(World world, int p_149915_2_) {
-		return new TE_ItemProxySource();
-	}
-
-	@Override
-	public boolean hasTileEntity(int metadata) {
-		return true;
-	}
 
+    private static final Block_ItemProxySource instance = new Block_ItemProxySource();
+
+    private Block_ItemProxySource() {
+        super(Material.glass);
+    }
+
+    public static Block registerBlock() {
+        final String blockName = "kekztech_itemproxysource_block";
+        instance.setBlockName(blockName);
+        instance.setCreativeTab(CreativeTabs.tabMisc);
+        instance.setBlockTextureName(KekzCore.MODID + ":" + "ItemProxySource");
+        instance.setHardness(3.0f);
+        instance.setResistance(2.0f);
+        instance.setHarvestLevel("wrench", 2);
+        GameRegistry.registerBlock(instance, IB_ItemProxySource.class, blockName);
+
+        return instance;
+    }
+
+    @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;
+        }
+
+        final TileEntity te = world.getTileEntity(x, y, z);
+        if (te instanceof TE_ItemProxySource) {
+            player.openGui(KekzCore.instance, GuiHandler.ITEM_PROXY_SOURCE, world, x, y, z);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public TileEntity createTileEntity(World world, int p_149915_2_) {
+        return new TE_ItemProxySource();
+    }
+
+    @Override
+    public boolean hasTileEntity(int metadata) {
+        return true;
+    }
 }
diff --git a/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java b/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java
index db55c17610..b9c930d545 100644
--- a/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java
+++ b/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java
@@ -1,13 +1,12 @@
 package common.blocks;
 
-import java.util.List;
-
 import common.itemBlocks.IB_LapotronicEnergyUnit;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Utility;
+import java.util.List;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -20,7 +19,8 @@ import net.minecraft.util.ResourceLocation;
 
 public class Block_LapotronicEnergyUnit extends BaseGTUpdateableBlock {
 
-	private static final Block_LapotronicEnergyUnit INSTANCE = new Block_LapotronicEnergyUnit();
+    private static final Block_LapotronicEnergyUnit INSTANCE = new Block_LapotronicEnergyUnit();
+
     public enum IconBaseSide implements IIconContainer {
         INSTANCE;
 
@@ -47,92 +47,99 @@ public class Block_LapotronicEnergyUnit extends BaseGTUpdateableBlock {
         Textures.BlockIcons.setCasingTexture((byte) 42, (byte) 127, TextureFactory.of(IconBaseSide.INSTANCE));
     }
 
-	private IIcon iconBaseSide;
-	private IIcon iconBaseTop;
-
-	private IIcon iconLapoEmptySide;
-	private IIcon iconLapoEmptyTop;
-	private IIcon iconLapoEVSide;
-	private IIcon iconLapoEVTop;
-	private IIcon iconLapoIVSide;
-	private IIcon iconLapoIVTop;
-	private IIcon iconLapoLuVSide;
-	private IIcon iconLapoLuVTop;
-	private IIcon iconLapoZPMSide;
-	private IIcon iconLapoZPMTop;
-	private IIcon iconLapoUVSide;
-	private IIcon iconLapoUVTop;
-	private IIcon iconUltimateSide;
-	private IIcon iconUltimateTop;
-
-	private Block_LapotronicEnergyUnit() {
-		super(Material.iron);
-	}
-
-	public static Block registerBlock() {
-		final String blockName = "kekztech_lapotronicenergyunit_block";
-		INSTANCE.setBlockName(blockName);
-		INSTANCE.setCreativeTab(CreativeTabs.tabMisc);
-		INSTANCE.setHardness(5.0f);
-		INSTANCE.setResistance(6.0f);
-		GameRegistry.registerBlock(INSTANCE, IB_LapotronicEnergyUnit.class, blockName);
-
-		return INSTANCE;
-	}
-
-	@Override
-	public void registerBlockIcons(IIconRegister ir) {
-		iconBaseSide = ir.registerIcon("kekztech:LSCBase_side");
-		iconBaseTop = ir.registerIcon("kekztech:LSCBase_top");
-
-
-		iconLapoEmptySide = ir.registerIcon("kekztech:LapotronicEnergyUnit6_side");
-		iconLapoEmptyTop = ir.registerIcon("kekztech:LapotronicEnergyUnit6_top");
-		iconLapoEVSide = ir.registerIcon("kekztech:LapotronicEnergyUnit7_side");
-		iconLapoEVTop = ir.registerIcon("kekztech:LapotronicEnergyUnit7_top");
-		iconLapoIVSide = ir.registerIcon("kekztech:LapotronicEnergyUnit1_side");
-		iconLapoIVTop = ir.registerIcon("kekztech:LapotronicEnergyUnit1_top");
-		iconLapoLuVSide = ir.registerIcon("kekztech:LapotronicEnergyUnit2_side");
-		iconLapoLuVTop = ir.registerIcon("kekztech:LapotronicEnergyUnit2_top");
-		iconLapoZPMSide = ir.registerIcon("kekztech:LapotronicEnergyUnit3_side");
-		iconLapoZPMTop = ir.registerIcon("kekztech:LapotronicEnergyUnit3_top");
-		iconLapoUVSide = ir.registerIcon("kekztech:LapotronicEnergyUnit4_side");
-		iconLapoUVTop = ir.registerIcon("kekztech:LapotronicEnergyUnit4_top");
-
-		iconUltimateSide = ir.registerIcon("kekztech:UltimateEnergyUnit_side");
-		iconUltimateTop = ir.registerIcon("kekztech:UltimateEnergyUnit_top");
-	}
-
-	@Override
-	@SuppressWarnings({"unchecked" })
-	public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
-		// Multi casing
-		par3List.add(new ItemStack(par1, 1, 0));
-		// Empty capacitor
-		par3List.add(new ItemStack(par1, 1, 6));
-		// Lapo capacitors EV - UV
-		par3List.add(new ItemStack(par1, 1, 7));
-		par3List.add(new ItemStack(par1, 1, 1));
-		par3List.add(new ItemStack(par1, 1, 2));
-		par3List.add(new ItemStack(par1, 1, 3));
-		par3List.add(new ItemStack(par1, 1, 4));
-		// Ultimate battery
-		par3List.add(new ItemStack(par1, 1, 5));
-	}
-
-	@Override
-	public IIcon getIcon(int side, int meta) {
-		switch(meta) {
-		case 0: return (side < 2) ? iconBaseTop : iconBaseSide;
-		case 1: return (side < 2) ? iconLapoIVTop : iconLapoIVSide;
-		case 2: return (side < 2) ? iconLapoLuVTop : iconLapoLuVSide;
-		case 3: return (side < 2) ? iconLapoZPMTop : iconLapoZPMSide;
-		case 4: return (side < 2) ? iconLapoUVTop : iconLapoUVSide;
-		case 5: return (side < 2) ? iconUltimateTop : iconUltimateSide;
-		case 6: return (side < 2) ? iconLapoEmptyTop : iconLapoEmptySide;
-		case 7: return (side < 2) ? iconLapoEVTop : iconLapoEVSide;
-		default: return iconUltimateTop;
-		}
-	}
+    private IIcon iconBaseSide;
+    private IIcon iconBaseTop;
+
+    private IIcon iconLapoEmptySide;
+    private IIcon iconLapoEmptyTop;
+    private IIcon iconLapoEVSide;
+    private IIcon iconLapoEVTop;
+    private IIcon iconLapoIVSide;
+    private IIcon iconLapoIVTop;
+    private IIcon iconLapoLuVSide;
+    private IIcon iconLapoLuVTop;
+    private IIcon iconLapoZPMSide;
+    private IIcon iconLapoZPMTop;
+    private IIcon iconLapoUVSide;
+    private IIcon iconLapoUVTop;
+    private IIcon iconUltimateSide;
+    private IIcon iconUltimateTop;
+
+    private Block_LapotronicEnergyUnit() {
+        super(Material.iron);
+    }
+
+    public static Block registerBlock() {
+        final String blockName = "kekztech_lapotronicenergyunit_block";
+        INSTANCE.setBlockName(blockName);
+        INSTANCE.setCreativeTab(CreativeTabs.tabMisc);
+        INSTANCE.setHardness(5.0f);
+        INSTANCE.setResistance(6.0f);
+        GameRegistry.registerBlock(INSTANCE, IB_LapotronicEnergyUnit.class, blockName);
+
+        return INSTANCE;
+    }
+
+    @Override
+    public void registerBlockIcons(IIconRegister ir) {
+        iconBaseSide = ir.registerIcon("kekztech:LSCBase_side");
+        iconBaseTop = ir.registerIcon("kekztech:LSCBase_top");
+
+        iconLapoEmptySide = ir.registerIcon("kekztech:LapotronicEnergyUnit6_side");
+        iconLapoEmptyTop = ir.registerIcon("kekztech:LapotronicEnergyUnit6_top");
+        iconLapoEVSide = ir.registerIcon("kekztech:LapotronicEnergyUnit7_side");
+        iconLapoEVTop = ir.registerIcon("kekztech:LapotronicEnergyUnit7_top");
+        iconLapoIVSide = ir.registerIcon("kekztech:LapotronicEnergyUnit1_side");
+        iconLapoIVTop = ir.registerIcon("kekztech:LapotronicEnergyUnit1_top");
+        iconLapoLuVSide = ir.registerIcon("kekztech:LapotronicEnergyUnit2_side");
+        iconLapoLuVTop = ir.registerIcon("kekztech:LapotronicEnergyUnit2_top");
+        iconLapoZPMSide = ir.registerIcon("kekztech:LapotronicEnergyUnit3_side");
+        iconLapoZPMTop = ir.registerIcon("kekztech:LapotronicEnergyUnit3_top");
+        iconLapoUVSide = ir.registerIcon("kekztech:LapotronicEnergyUnit4_side");
+        iconLapoUVTop = ir.registerIcon("kekztech:LapotronicEnergyUnit4_top");
+
+        iconUltimateSide = ir.registerIcon("kekztech:UltimateEnergyUnit_side");
+        iconUltimateTop = ir.registerIcon("kekztech:UltimateEnergyUnit_top");
+    }
 
+    @Override
+    @SuppressWarnings({"unchecked"})
+    public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+        // Multi casing
+        par3List.add(new ItemStack(par1, 1, 0));
+        // Empty capacitor
+        par3List.add(new ItemStack(par1, 1, 6));
+        // Lapo capacitors EV - UV
+        par3List.add(new ItemStack(par1, 1, 7));
+        par3List.add(new ItemStack(par1, 1, 1));
+        par3List.add(new ItemStack(par1, 1, 2));
+        par3List.add(new ItemStack(par1, 1, 3));
+        par3List.add(new ItemStack(par1, 1, 4));
+        // Ultimate battery
+        par3List.add(new ItemStack(par1, 1, 5));
+    }
+
+    @Override
+    public IIcon getIcon(int side, int meta) {
+        switch (meta) {
+            case 0:
+                return (side < 2) ? iconBaseTop : iconBaseSide;
+            case 1:
+                return (side < 2) ? iconLapoIVTop : iconLapoIVSide;
+            case 2:
+                return (side < 2) ? iconLapoLuVTop : iconLapoLuVSide;
+            case 3:
+                return (side < 2) ? iconLapoZPMTop : iconLapoZPMSide;
+            case 4:
+                return (side < 2) ? iconLapoUVTop : iconLapoUVSide;
+            case 5:
+                return (side < 2) ? iconUltimateTop : iconUltimateSide;
+            case 6:
+                return (side < 2) ? iconLapoEmptyTop : iconLapoEmptySide;
+            case 7:
+                return (side < 2) ? iconLapoEVTop : iconLapoEVSide;
+            default:
+                return iconUltimateTop;
+        }
+    }
 }
diff --git a/src/main/java/common/blocks/Block_LargeHexPlate.java b/src/main/java/common/blocks/Block_LargeHexPlate.java
index 8bdad56323..ab1ebc138e 100644
--- a/src/main/java/common/blocks/Block_LargeHexPlate.java
+++ b/src/main/java/common/blocks/Block_LargeHexPlate.java
@@ -32,8 +32,8 @@ public class Block_LargeHexPlate extends Block {
 
     @Override
     public void registerBlockIcons(IIconRegister ir) {
-        for(int x = 0; x < BATCH_SIZE; x++) {
-            for(int z = 0; z < BATCH_SIZE; z++) {
+        for (int x = 0; x < BATCH_SIZE; x++) {
+            for (int z = 0; z < BATCH_SIZE; z++) {
                 parts[x][z] = ir.registerIcon("kekztech:LargeHexTile_" + x + "_" + z);
             }
         }
@@ -41,13 +41,16 @@ public class Block_LargeHexPlate extends Block {
 
     @Override
     public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
-        final int xMod = x >= 0 ? Math.abs(x % BATCH_SIZE) : Math.abs((Math.abs(x) % BATCH_SIZE) - BATCH_SIZE) % BATCH_SIZE;
-        final int yMod = y >= 0 ? Math.abs(y % BATCH_SIZE) : Math.abs((Math.abs(y) % BATCH_SIZE) - BATCH_SIZE) % BATCH_SIZE;
-        final int zMod = z >= 0 ? Math.abs(z % BATCH_SIZE) : Math.abs((Math.abs(z) % BATCH_SIZE) - BATCH_SIZE) % BATCH_SIZE;
+        final int xMod =
+                x >= 0 ? Math.abs(x % BATCH_SIZE) : Math.abs((Math.abs(x) % BATCH_SIZE) - BATCH_SIZE) % BATCH_SIZE;
+        final int yMod =
+                y >= 0 ? Math.abs(y % BATCH_SIZE) : Math.abs((Math.abs(y) % BATCH_SIZE) - BATCH_SIZE) % BATCH_SIZE;
+        final int zMod =
+                z >= 0 ? Math.abs(z % BATCH_SIZE) : Math.abs((Math.abs(z) % BATCH_SIZE) - BATCH_SIZE) % BATCH_SIZE;
 
-        if(side == 0 || side == 1) {
+        if (side == 0 || side == 1) {
             return parts[xMod][zMod];
-        } else if(side == 2 || side == 3) {
+        } else if (side == 2 || side == 3) {
             return parts[xMod][yMod];
         } else {
             return parts[zMod][yMod];
diff --git a/src/main/java/common/blocks/Block_ReactorChamber_OFF.java b/src/main/java/common/blocks/Block_ReactorChamber_OFF.java
index e6a5b3c3b3..6f70534a4a 100644
--- a/src/main/java/common/blocks/Block_ReactorChamber_OFF.java
+++ b/src/main/java/common/blocks/Block_ReactorChamber_OFF.java
@@ -7,23 +7,22 @@ import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 
 public class Block_ReactorChamber_OFF extends BaseGTUpdateableBlock {
-	
-	private static Block_ReactorChamber_OFF instance = new Block_ReactorChamber_OFF();
-	
-	private Block_ReactorChamber_OFF() {
-		super(Material.iron);
-	}
-	
-	public static Block registerBlock() {
-		final String blockName = "kekztech_reactorchamberoff_block";
-		instance.setBlockName(blockName);
-		instance.setCreativeTab(CreativeTabs.tabMisc);
-		instance.setBlockTextureName(KekzCore.MODID + ":" + "ReactorChamber_OFF");
-		instance.setHardness(10.0f);
-		instance.setResistance(16.0f);
-		GameRegistry.registerBlock(instance, blockName);
-		
-		return instance;
-	}
-	
+
+    private static Block_ReactorChamber_OFF instance = new Block_ReactorChamber_OFF();
+
+    private Block_ReactorChamber_OFF() {
+        super(Material.iron);
+    }
+
+    public static Block registerBlock() {
+        final String blockName = "kekztech_reactorchamberoff_block";
+        instance.setBlockName(blockName);
+        instance.setCreativeTab(CreativeTabs.tabMisc);
+        instance.setBlockTextureName(KekzCore.MODID + ":" + "ReactorChamber_OFF");
+        instance.setHardness(10.0f);
+        instance.setResistance(16.0f);
+        GameRegistry.registerBlock(instance, blockName);
+
+        return instance;
+    }
 }
diff --git a/src/main/java/common/blocks/Block_ReactorChamber_ON.java b/src/main/java/common/blocks/Block_ReactorChamber_ON.java
index 0c7e230a11..66a3452bea 100644
--- a/src/main/java/common/blocks/Block_ReactorChamber_ON.java
+++ b/src/main/java/common/blocks/Block_ReactorChamber_ON.java
@@ -7,28 +7,27 @@ import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 
 public class Block_ReactorChamber_ON extends BaseGTUpdateableBlock {
-	
-	private static Block_ReactorChamber_ON instance = new Block_ReactorChamber_ON();
-	
-	private Block_ReactorChamber_ON() {
-		super(Material.iron);
-	}
-	
-	public static Block registerBlock() {
-		final String blockName = "kekztech_reactorchamberon_block";
-		instance.setBlockName(blockName);
-		instance.setCreativeTab(CreativeTabs.tabMisc);
-		instance.setBlockTextureName(KekzCore.MODID + ":" + "ReactorChamber_ON");
-		instance.setHardness(-1.0f);
-		instance.setResistance(16.0f);
-		GameRegistry.registerBlock(instance, blockName);
-		
-		return instance;
-	}
-	
-	@Override
-	public int getLightValue() {
-		return 15;
-	}
 
+    private static Block_ReactorChamber_ON instance = new Block_ReactorChamber_ON();
+
+    private Block_ReactorChamber_ON() {
+        super(Material.iron);
+    }
+
+    public static Block registerBlock() {
+        final String blockName = "kekztech_reactorchamberon_block";
+        instance.setBlockName(blockName);
+        instance.setCreativeTab(CreativeTabs.tabMisc);
+        instance.setBlockTextureName(KekzCore.MODID + ":" + "ReactorChamber_ON");
+        instance.setHardness(-1.0f);
+        instance.setResistance(16.0f);
+        GameRegistry.registerBlock(instance, blockName);
+
+        return instance;
+    }
+
+    @Override
+    public int getLightValue() {
+        return 15;
+    }
 }
diff --git a/src/main/java/common/blocks/Block_SpaceElevator.java b/src/main/java/common/blocks/Block_SpaceElevator.java
index 524f34ba46..0e9cec70d7 100644
--- a/src/main/java/common/blocks/Block_SpaceElevator.java
+++ b/src/main/java/common/blocks/Block_SpaceElevator.java
@@ -2,7 +2,7 @@ package common.blocks;
 
 import common.itemBlocks.IB_SpaceElevator;
 import cpw.mods.fml.common.registry.GameRegistry;
-import kekztech.KekzCore;
+import java.util.List;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -11,8 +11,6 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
-import java.util.List;
-
 public class Block_SpaceElevator extends BaseGTUpdateableBlock {
 
     private static final Block_SpaceElevator INSTANCE = new Block_SpaceElevator();
@@ -44,7 +42,7 @@ public class Block_SpaceElevator extends BaseGTUpdateableBlock {
     }
 
     @Override
-    @SuppressWarnings({"unchecked" })
+    @SuppressWarnings({"unchecked"})
     public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
         par3List.add(new ItemStack(par1, 1, 0));
         par3List.add(new ItemStack(par1, 1, 1));
@@ -52,7 +50,7 @@ public class Block_SpaceElevator extends BaseGTUpdateableBlock {
 
     @Override
     public IIcon getIcon(int side, int meta) {
-        if(meta == 0) {
+        if (meta == 0) {
             return (side < 2) ? baseTop : baseSide;
         } else {
             return coilHolder;
diff --git a/src/main/java/common/blocks/Block_SpaceElevatorTether.java b/src/main/java/common/blocks/Block_SpaceElevatorTether.java
index 3031cd8a12..67a4061d62 100644
--- a/src/main/java/common/blocks/Block_SpaceElevatorTether.java
+++ b/src/main/java/common/blocks/Block_SpaceElevatorTether.java
@@ -1,9 +1,7 @@
 package common.blocks;
 
-import common.tileentities.TE_ItemProxyCable;
 import common.tileentities.TE_SpaceElevatorTether;
 import cpw.mods.fml.common.registry.GameRegistry;
-import kekztech.KekzCore;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -56,15 +54,12 @@ public class Block_SpaceElevatorTether extends BaseGTUpdateableBlock {
     }
 
     @Override
-    public boolean isOpaqueCube()
-    {
+    public boolean isOpaqueCube() {
         return false;
     }
 
     @Override
-    public boolean renderAsNormalBlock()
-    {
+    public boolean renderAsNormalBlock() {
         return false;
     }
-
 }
diff --git a/src/main/java/common/blocks/Block_TFFTCasing.java b/src/main/java/common/blocks/Block_TFFTCasing.java
index 5815a75862..b6d793e7ec 100644
--- a/src/main/java/common/blocks/Block_TFFTCasing.java
+++ b/src/main/java/common/blocks/Block_TFFTCasing.java
@@ -1,28 +1,28 @@
-package common.blocks;

-

-import cpw.mods.fml.common.registry.GameRegistry;

-import kekztech.KekzCore;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.creativetab.CreativeTabs;

-

-public class Block_TFFTCasing extends BaseGTUpdateableBlock {

-	

-	private static Block_TFFTCasing instance = new Block_TFFTCasing();

-	

-	private Block_TFFTCasing() {

-		super(Material.iron);

-	}

-	

-	public static Block registerBlock() {

-		final String blockName = "kekztech_tfftcasingblock_block";

-		instance.setBlockName(blockName);

-		instance.setCreativeTab(CreativeTabs.tabMisc);

-		instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTCasing");

-		instance.setHardness(5.0f);

-		instance.setResistance(6.0f);

-		GameRegistry.registerBlock(instance, blockName);

-		

-		return instance;

-	} 

-}

+package common.blocks;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import kekztech.KekzCore;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+
+public class Block_TFFTCasing extends BaseGTUpdateableBlock {
+
+    private static Block_TFFTCasing instance = new Block_TFFTCasing();
+
+    private Block_TFFTCasing() {
+        super(Material.iron);
+    }
+
+    public static Block registerBlock() {
+        final String blockName = "kekztech_tfftcasingblock_block";
+        instance.setBlockName(blockName);
+        instance.setCreativeTab(CreativeTabs.tabMisc);
+        instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTCasing");
+        instance.setHardness(5.0f);
+        instance.setResistance(6.0f);
+        GameRegistry.registerBlock(instance, blockName);
+
+        return instance;
+    }
+}
diff --git a/src/main/java/common/blocks/Block_TFFTMultiHatch.java b/src/main/java/common/blocks/Block_TFFTMultiHatch.java
index 564113efe5..14d288b7bb 100644
--- a/src/main/java/common/blocks/Block_TFFTMultiHatch.java
+++ b/src/main/java/common/blocks/Block_TFFTMultiHatch.java
@@ -3,63 +3,53 @@ package common.blocks;
 import common.itemBlocks.IB_TFFTMultiHatch;
 import common.tileentities.TE_TFFTMultiHatch;
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import java.util.List;
-
 @Deprecated
 public class Block_TFFTMultiHatch extends BaseGTUpdateableBlock {
-	
-	private static final Block_TFFTMultiHatch INSTANCE = new Block_TFFTMultiHatch();
 
-	private IIcon casing;
+    private static final Block_TFFTMultiHatch INSTANCE = new Block_TFFTMultiHatch();
+
+    private IIcon casing;
 
-	private Block_TFFTMultiHatch() {
-		super(Material.iron);
-	}
-	
-	public static Block registerBlock() {
-		final String blockName = "kekztech_tfftmultihatch_block";
-		INSTANCE.setBlockName(blockName);
-		INSTANCE.setCreativeTab(CreativeTabs.tabMisc);
-		INSTANCE.setHardness(5.0f);
-		INSTANCE.setResistance(6.0f);
-		GameRegistry.registerBlock(INSTANCE, IB_TFFTMultiHatch.class, blockName);
+    private Block_TFFTMultiHatch() {
+        super(Material.iron);
+    }
 
-		return INSTANCE;
-	}
+    public static Block registerBlock() {
+        final String blockName = "kekztech_tfftmultihatch_block";
+        INSTANCE.setBlockName(blockName);
+        INSTANCE.setCreativeTab(CreativeTabs.tabMisc);
+        INSTANCE.setHardness(5.0f);
+        INSTANCE.setResistance(6.0f);
+        GameRegistry.registerBlock(INSTANCE, IB_TFFTMultiHatch.class, blockName);
 
-	@Override
-	public void registerBlockIcons(IIconRegister ir) {
-		casing = ir.registerIcon("kekztech:TFFTCasing");
-	}
+        return INSTANCE;
+    }
 
-	@Override
-	public IIcon getIcon(int side, int meta) {
-		return casing;
-	}
+    @Override
+    public void registerBlockIcons(IIconRegister ir) {
+        casing = ir.registerIcon("kekztech:TFFTCasing");
+    }
 
-	@Override
-	public TileEntity createTileEntity(World world, int meta) {
-		return new TE_TFFTMultiHatch();
-	}
+    @Override
+    public IIcon getIcon(int side, int meta) {
+        return casing;
+    }
 
-	@Override
-	public boolean hasTileEntity(int meta) {
-		return true;
-	}
+    @Override
+    public TileEntity createTileEntity(World world, int meta) {
+        return new TE_TFFTMultiHatch();
+    }
 
+    @Override
+    public boolean hasTileEntity(int meta) {
+        return true;
+    }
 }
diff --git a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java
index f7554c4724..e6e3649f3a 100644
--- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java
@@ -1,38 +1,37 @@
-package common.blocks;

-

-import common.itemBlocks.IB_TFFTStorageFieldBlockT1;

-import cpw.mods.fml.common.registry.GameRegistry;

-import kekztech.KekzCore;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.creativetab.CreativeTabs;

-

-public class Block_TFFTStorageFieldBlockT1 extends BaseGTUpdateableBlock {

-	

-	private static Block_TFFTStorageFieldBlockT1 instance;

-	

-	private Block_TFFTStorageFieldBlockT1() {

-		super(Material.iron);

-	}

-	

-	public static int getCapacity() {

-		return 500000;

-	}

-	

-	public static Block registerBlock() {

-		if(instance == null) {

-			instance = new Block_TFFTStorageFieldBlockT1();

-		}

-		

-		final String blockName = "kekztech_tfftstoragefieldblock1_block";

-		instance.setBlockName(blockName);

-		instance.setCreativeTab(CreativeTabs.tabMisc);

-		instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock1");

-		instance.setHardness(5.0f);

-		instance.setResistance(6.0f);

-		GameRegistry.registerBlock(instance, IB_TFFTStorageFieldBlockT1.class, blockName);

-		

-		return instance;

-	}

-	

-}

+package common.blocks;
+
+import common.itemBlocks.IB_TFFTStorageFieldBlockT1;
+import cpw.mods.fml.common.registry.GameRegistry;
+import kekztech.KekzCore;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+
+public class Block_TFFTStorageFieldBlockT1 extends BaseGTUpdateableBlock {
+
+    private static Block_TFFTStorageFieldBlockT1 instance;
+
+    private Block_TFFTStorageFieldBlockT1() {
+        super(Material.iron);
+    }
+
+    public static int getCapacity() {
+        return 500000;
+    }
+
+    public static Block registerBlock() {
+        if (instance == null) {
+            instance = new Block_TFFTStorageFieldBlockT1();
+        }
+
+        final String blockName = "kekztech_tfftstoragefieldblock1_block";
+        instance.setBlockName(blockName);
+        instance.setCreativeTab(CreativeTabs.tabMisc);
+        instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock1");
+        instance.setHardness(5.0f);
+        instance.setResistance(6.0f);
+        GameRegistry.registerBlock(instance, IB_TFFTStorageFieldBlockT1.class, blockName);
+
+        return instance;
+    }
+}
diff --git a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java
index 394fbcf90f..2b3477f750 100644
--- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java
@@ -1,37 +1,37 @@
-package common.blocks;

-

-import common.itemBlocks.IB_TFFTStorageFieldBlockT2;

-import cpw.mods.fml.common.registry.GameRegistry;

-import kekztech.KekzCore;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.creativetab.CreativeTabs;

-

-public class Block_TFFTStorageFieldBlockT2 extends BaseGTUpdateableBlock {

-	

-	private static Block_TFFTStorageFieldBlockT2 instance;

-	

-	private Block_TFFTStorageFieldBlockT2() {

-		super(Material.iron);

-	}

-	

-	public static int getCapacity() {

-		return 4000000;

-	}

-	

-	public static Block registerBlock() {

-		if(instance == null) {

-			instance = new Block_TFFTStorageFieldBlockT2();

-		}

-		

-		final String blockName = "kekztech_tfftstoragefieldblock2_block";

-		instance.setBlockName(blockName);

-		instance.setCreativeTab(CreativeTabs.tabMisc);

-		instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock2");

-		instance.setHardness(5.0f);

-		instance.setResistance(6.0f);

-		GameRegistry.registerBlock(instance, IB_TFFTStorageFieldBlockT2.class, blockName);

-		

-		return instance;

-	} 

-}

+package common.blocks;
+
+import common.itemBlocks.IB_TFFTStorageFieldBlockT2;
+import cpw.mods.fml.common.registry.GameRegistry;
+import kekztech.KekzCore;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+
+public class Block_TFFTStorageFieldBlockT2 extends BaseGTUpdateableBlock {
+
+    private static Block_TFFTStorageFieldBlockT2 instance;
+
+    private Block_TFFTStorageFieldBlockT2() {
+        super(Material.iron);
+    }
+
+    public static int getCapacity() {
+        return 4000000;
+    }
+
+    public static Block registerBlock() {
+        if (instance == null) {
+            instance = new Block_TFFTStorageFieldBlockT2();
+        }
+
+        final String blockName = "kekztech_tfftstoragefieldblock2_block";
+        instance.setBlockName(blockName);
+        instance.setCreativeTab(CreativeTabs.tabMisc);
+        instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock2");
+        instance.setHardness(5.0f);
+        instance.setResistance(6.0f);
+        GameRegistry.registerBlock(instance, IB_TFFTStorageFieldBlockT2.class, blockName);
+
+        return instance;
+    }
+}
diff --git a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java
index 0b2123ae87..313b87d10f 100644
--- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java
@@ -1,37 +1,37 @@
-package common.blocks;

-

-import common.itemBlocks.IB_TFFTStorageFieldBlockT3;

-import cpw.mods.fml.common.registry.GameRegistry;

-import kekztech.KekzCore;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.creativetab.CreativeTabs;

-

-public class Block_TFFTStorageFieldBlockT3 extends BaseGTUpdateableBlock {

-	

-	private static Block_TFFTStorageFieldBlockT3 instance;

-	

-	private Block_TFFTStorageFieldBlockT3() {

-		super(Material.iron);

-	}

-	

-	public static int getCapacity() {

-		return 16000000;

-	}

-	

-	public static Block registerBlock() {

-		if(instance == null) {

-			instance = new Block_TFFTStorageFieldBlockT3();

-		}

-		

-		final String blockName = "kekztech_tfftstoragefieldblock3_block";

-		instance.setBlockName(blockName);

-		instance.setCreativeTab(CreativeTabs.tabMisc);

-		instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock3");

-		instance.setHardness(5.0f);

-		instance.setResistance(6.0f);

-		GameRegistry.registerBlock(instance, IB_TFFTStorageFieldBlockT3.class, blockName);

-		

-		return instance;

-	} 

-}

+package common.blocks;
+
+import common.itemBlocks.IB_TFFTStorageFieldBlockT3;
+import cpw.mods.fml.common.registry.GameRegistry;
+import kekztech.KekzCore;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+
+public class Block_TFFTStorageFieldBlockT3 extends BaseGTUpdateableBlock {
+
+    private static Block_TFFTStorageFieldBlockT3 instance;
+
+    private Block_TFFTStorageFieldBlockT3() {
+        super(Material.iron);
+    }
+
+    public static int getCapacity() {
+        return 16000000;
+    }
+
+    public static Block registerBlock() {
+        if (instance == null) {
+            instance = new Block_TFFTStorageFieldBlockT3();
+        }
+
+        final String blockName = "kekztech_tfftstoragefieldblock3_block";
+        instance.setBlockName(blockName);
+        instance.setCreativeTab(CreativeTabs.tabMisc);
+        instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock3");
+        instance.setHardness(5.0f);
+        instance.setResistance(6.0f);
+        GameRegistry.registerBlock(instance, IB_TFFTStorageFieldBlockT3.class, blockName);
+
+        return instance;
+    }
+}
diff --git a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java
index 138c66ac0c..bdd0af8d2b 100644
--- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java
@@ -1,37 +1,37 @@
-package common.blocks;

-

-import common.itemBlocks.IB_TFFTStorageFieldBlockT4;

-import cpw.mods.fml.common.registry.GameRegistry;

-import kekztech.KekzCore;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.creativetab.CreativeTabs;

-

-public class Block_TFFTStorageFieldBlockT4 extends BaseGTUpdateableBlock {

-	

-	private static Block_TFFTStorageFieldBlockT4 instance;

-	

-	private Block_TFFTStorageFieldBlockT4() {

-		super(Material.iron);

-	}

-	

-	public static int getCapacity() {

-		return 64000000;

-	}

-	

-	public static Block registerBlock() {

-		if(instance == null) {

-			instance = new Block_TFFTStorageFieldBlockT4();

-		}

-		

-		final String blockName = "kekztech_tfftstoragefieldblock4_block";

-		instance.setBlockName(blockName);

-		instance.setCreativeTab(CreativeTabs.tabMisc);

-		instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock4");

-		instance.setHardness(5.0f);

-		instance.setResistance(6.0f);

-		GameRegistry.registerBlock(instance, IB_TFFTStorageFieldBlockT4.class, blockName);

-		

-		return instance;

-	} 

-}

+package common.blocks;
+
+import common.itemBlocks.IB_TFFTStorageFieldBlockT4;
+import cpw.mods.fml.common.registry.GameRegistry;
+import kekztech.KekzCore;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+
+public class Block_TFFTStorageFieldBlockT4 extends BaseGTUpdateableBlock {
+
+    private static Block_TFFTStorageFieldBlockT4 instance;
+
+    private Block_TFFTStorageFieldBlockT4() {
+        super(Material.iron);
+    }
+
+    public static int getCapacity() {
+        return 64000000;
+    }
+
+    public static Block registerBlock() {
+        if (instance == null) {
+            instance = new Block_TFFTStorageFieldBlockT4();
+        }
+
+        final String blockName = "kekztech_tfftstoragefieldblock4_block";
+        instance.setBlockName(blockName);
+        instance.setCreativeTab(CreativeTabs.tabMisc);
+        instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock4");
+        instance.setHardness(5.0f);
+        instance.setResistance(6.0f);
+        GameRegistry.registerBlock(instance, IB_TFFTStorageFieldBlockT4.class, blockName);
+
+        return instance;
+    }
+}
diff --git a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java
index 7e30695804..c215fe3909 100644
--- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java
@@ -8,30 +8,30 @@ import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 
 public class Block_TFFTStorageFieldBlockT5 extends BaseGTUpdateableBlock {
-	
-	private static Block_TFFTStorageFieldBlockT5 instance;
-	
-	private Block_TFFTStorageFieldBlockT5() {
-		super(Material.iron);
-	}
-	
-	public static int getCapacity() {
-		return 256000000;
-	}
-	
-	public static Block registerBlock() {
-		if(instance == null) {
-			instance = new Block_TFFTStorageFieldBlockT5();
-		}
-		
-		final String blockName = "kekztech_tfftstoragefieldblock5_block";
-		instance.setBlockName(blockName);
-		instance.setCreativeTab(CreativeTabs.tabMisc);
-		instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock5");
-		instance.setHardness(5.0f);
-		instance.setResistance(6.0f);
-		GameRegistry.registerBlock(instance, IB_TFFTStorageFieldBlockT5.class, blockName);
-		
-		return instance;
-	} 
-}
\ No newline at end of file
+
+    private static Block_TFFTStorageFieldBlockT5 instance;
+
+    private Block_TFFTStorageFieldBlockT5() {
+        super(Material.iron);
+    }
+
+    public static int getCapacity() {
+        return 256000000;
+    }
+
+    public static Block registerBlock() {
+        if (instance == null) {
+            instance = new Block_TFFTStorageFieldBlockT5();
+        }
+
+        final String blockName = "kekztech_tfftstoragefieldblock5_block";
+        instance.setBlockName(blockName);
+        instance.setCreativeTab(CreativeTabs.tabMisc);
+        instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock5");
+        instance.setHardness(5.0f);
+        instance.setResistance(6.0f);
+        GameRegistry.registerBlock(instance, IB_TFFTStorageFieldBlockT5.class, blockName);
+
+        return instance;
+    }
+}
diff --git a/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
index cce03b0236..09a50f4b94 100644
--- a/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
+++ b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
@@ -6,6 +6,8 @@ import common.tileentities.TE_ThaumiumReinforcedVoidJar;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import java.util.ArrayList;
+import java.util.List;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -25,221 +27,226 @@ import thaumcraft.common.config.ConfigItems;
 import thaumcraft.common.items.ItemEssence;
 import thaumcraft.common.tiles.TileJarFillable;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class Block_ThaumiumReinforcedJar extends BlockJar {
-	
-	private static final Block_ThaumiumReinforcedJar INSTANCE = new Block_ThaumiumReinforcedJar();
-	
-	private Block_ThaumiumReinforcedJar() {
-		super();
-		
-		super.setHardness(6.0F);
-		super.setResistance(6.0F);
-	}
-	
-	public static Block registerBlock() {
-		final String blockName = "kekztech_thaumiumreinforcedjar_block";
-		INSTANCE.setBlockName(blockName);
-		INSTANCE.setHarvestLevel("pickaxe", 2);
-		GameRegistry.registerBlock(INSTANCE, IB_ThaumiumReinforcedJar.class, blockName);
-		
-		return INSTANCE;
-	}
-	
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister ir) {
-		super.iconLiquid = ir.registerIcon("thaumcraft:animatedglow");
-		super.iconJarSide = ir.registerIcon("kekztech:thaumreinforced_jar_side");
-		super.iconJarTop = ir.registerIcon("kekztech:thaumreinforced_jar_top");
-		super.iconJarTopVoid = ir.registerIcon("kekztech:thaumreinforced_jar_top_void");
-		super.iconJarSideVoid = ir.registerIcon("kekztech:thaumreinforced_jar_side_void");
-		super.iconJarBottom = ir.registerIcon("kekztech:thaumreinforced_jar_bottom");
-	}
-	
-	@Override
-	@SideOnly(Side.CLIENT)
-	@SuppressWarnings({"unchecked"})
-	public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
-		par3List.add(new ItemStack(par1, 1, 0)); // Normal jar
-		par3List.add(new ItemStack(par1, 1, 3)); // Void jar
-	}
-	
-	@Override
-	public TileEntity createTileEntity(World world, int meta) {
-		if(meta == 3) {
-			return new TE_ThaumiumReinforcedVoidJar();
-		} else {
-			return new TE_ThaumiumReinforcedJar();
-		}
-	}
-	
-	@Override
-	public void breakBlock(World world, int x, int y, int z, Block par5, int par6) {
-		final TileEntity te = world.getTileEntity(x, y, z);
-		if(te instanceof TE_ThaumiumReinforcedJar) {
-			final TE_ThaumiumReinforcedJar ite = (TE_ThaumiumReinforcedJar) te;
-			breakBlockWarpy(world, x, y, z, ite.amount, 50, 1.0F);
-		} else if(te instanceof  TE_ThaumiumReinforcedVoidJar) {
-			final TE_ThaumiumReinforcedVoidJar ite = (TE_ThaumiumReinforcedVoidJar) te;
-			breakBlockWarpy(world, x, y, z, ite.amount, 50, 1.0F);
-		}
-		super.breakBlock(world, x, y, z, par5, par6);
-	}
-
-	private void breakBlockWarpy(World world, int x, int y, int z, int fillAmount, int iterations, float explosionStrength){
-		if(fillAmount > 0) {
-			// Create a decent explosion in the center of the block (TNT has strength 4.0F)
-			world.createExplosion(null, x + 0.5D, y + 0.5D, z + 0.5D, explosionStrength, false);
-
-			// Place a lot of Flux in the area
-			final int limit = fillAmount / 16;
-			int created = 0;
-			for(int i = 0; i < iterations; i++) {
-				final int xf = x + world.rand.nextInt(7) - world.rand.nextInt(7);
-				final int yf = x + world.rand.nextInt(7) - world.rand.nextInt(7);
-				final int zf = x + world.rand.nextInt(7) - world.rand.nextInt(7);
-				if(world.isAirBlock(xf, yf, zf)) {
-					if(yf > y) {
-						world.setBlock(xf, yf, zf, ConfigBlocks.blockFluxGas, 8, 3);
-					} else {
-						world.setBlock(xf, yf, zf, ConfigBlocks.blockFluxGoo, 8, 3);
-					}
-
-					if(created++ > limit) {
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	@Override
-	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float f1, float f2, float f3) {
-		// Call parent method to handle jar emptying, labels stuff etc
-		super.onBlockActivated(world, x, y, z, player, side, f1, f2, f3);
-		// Interact with Essentia Phials if the player holds one
-		final ItemStack heldItem = player.getHeldItem();
-		if(heldItem != null && heldItem.getItem() == ConfigItems.itemEssence) {
-			final TileEntity te = world.getTileEntity(x, y, z);
-			if(te instanceof TE_ThaumiumReinforcedJar) {
-				return dealWithPhial(world, player, x, y, z);
-			} else if(te instanceof  TE_ThaumiumReinforcedVoidJar) {
-				return dealWithPhial(world, player, x, y, z);
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Handle compatibility with Essentia Phials
-	 * @param world
-	 * 			Pass through from onBlockActivated()
-	 * @param player
-	 * 			Pass through from onBlockActivated()
-	 * @param x
-	 * 			Pass through from onBlockActivated()
-	 * @param y
-	 * 			Pass through from onBlockActivated()
-	 * @param z
-	 * 			Pass through from onBlockActivated()
-	 * @return Not sure tbh
-	 */
-	private boolean dealWithPhial(World world, EntityPlayer player, int x, int y, int z) {
-		final TileJarFillable kte = (TileJarFillable) world.getTileEntity(x, y, z);
-		final ItemStack heldItem = player.getHeldItem();
-		// Check whether to fill or to drain the phial
-		if(heldItem.getItemDamage() == 0) {
-			if(kte.amount >= 8){
-				if (world.isRemote) {
-					player.swingItem();
-					return false;
-				}
-
-				final Aspect jarAspect = Aspect.getAspect(kte.aspect.getTag());
-				if(kte.takeFromContainer(jarAspect, 8)) {
-					// Take an empty phial from the player's inventory
-					heldItem.stackSize--;
-					// Fill a new phial
-					final ItemStack filledPhial = new ItemStack(ConfigItems.itemEssence, 1, 1);
-					final AspectList phialContent = new AspectList().add(jarAspect, 8);
-					((ItemEssence) ConfigItems.itemEssence).setAspects(filledPhial, phialContent);
-					// Drop on ground if there's no inventory space
-					if (!player.inventory.addItemStackToInventory(filledPhial)) {
-						world.spawnEntityInWorld(new EntityItem(world, (float)x + 0.5F, (float)y + 0.5F, (float)z + 0.5F, filledPhial));
-					}
-
-					world.playSoundAtEntity(player, "game.neutral.swim", 0.25F, 1.0F);
-					player.inventoryContainer.detectAndSendChanges();
-					return true;
-				}
-			}
-		} else {
-			final AspectList phialContent = ((ItemEssence) ConfigItems.itemEssence).getAspects(heldItem);
-			if(phialContent != null && phialContent.size() == 1) {
-				final Aspect phialAspect = phialContent.getAspects()[0];
-				if(kte.amount + 8 <= kte.maxAmount && kte.doesContainerAccept(phialAspect)) {
-					if (world.isRemote) {
-						player.swingItem();
-						return false;
-					}
-
-					if(kte.addToContainer(phialAspect, 8) == 0) {
-						world.markBlockForUpdate(x, y, z);
-						kte.markDirty();
-						heldItem.stackSize--;
-						// Drop on ground if there's no inventory space
-						if (!player.inventory.addItemStackToInventory(new ItemStack(ConfigItems.itemEssence, 1, 0))) {
-							world.spawnEntityInWorld(new EntityItem(world, (float)x + 0.5F, (float)y + 0.5F, (float)z + 0.5F, new ItemStack(ConfigItems.itemEssence, 1, 0)));
-						}
-
-						world.playSoundAtEntity(player, "game.neutral.swim", 0.25F, 1.0F);
-						player.inventoryContainer.detectAndSendChanges();
-						return true;
-					}
-				}
-			}
-		}
-
-		return true;
-	}
-
-	@Override
-	public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int meta, int fortune) {
-		final ArrayList<ItemStack> drops = new ArrayList<>();
-		drops.add(new ItemStack(this, 1, (meta == 3) ? 3 : 0));
-		final TileEntity te = world.getTileEntity(x, y, z);
-		if(te instanceof TE_ThaumiumReinforcedJar) {
-			final TE_ThaumiumReinforcedJar ite = (TE_ThaumiumReinforcedJar) te;
-			if(ite.aspectFilter != null){
-				final ItemStack droppedLabel = new ItemStack(ConfigItems.itemResource, 1, 13);
-				droppedLabel.setTagCompound(new NBTTagCompound());
-				final AspectList aspect = new AspectList().add(ite.aspectFilter,0);
-				aspect.writeToNBT(droppedLabel.getTagCompound());
-				drops.add(droppedLabel);
-			}
-		} else if(te instanceof TE_ThaumiumReinforcedVoidJar) {
-			final TE_ThaumiumReinforcedVoidJar ite = (TE_ThaumiumReinforcedVoidJar) te;
-			if(ite.aspectFilter != null) {
-				final ItemStack droppedLabel = new ItemStack(ConfigItems.itemResource, 1, 13);
-				droppedLabel.setTagCompound(new NBTTagCompound());
-				final AspectList aspect = new AspectList().add(ite.aspectFilter,0);
-				aspect.writeToNBT(droppedLabel.getTagCompound());
-				drops.add(droppedLabel);
-			}
-		}
-		return drops;
-	}
-
-	@Override
-	public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) {
-	}
-	
-	@Override
-	public boolean canDropFromExplosion(Explosion e) {
-		return false;
-	}
+
+    private static final Block_ThaumiumReinforcedJar INSTANCE = new Block_ThaumiumReinforcedJar();
+
+    private Block_ThaumiumReinforcedJar() {
+        super();
+
+        super.setHardness(6.0F);
+        super.setResistance(6.0F);
+    }
+
+    public static Block registerBlock() {
+        final String blockName = "kekztech_thaumiumreinforcedjar_block";
+        INSTANCE.setBlockName(blockName);
+        INSTANCE.setHarvestLevel("pickaxe", 2);
+        GameRegistry.registerBlock(INSTANCE, IB_ThaumiumReinforcedJar.class, blockName);
+
+        return INSTANCE;
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerBlockIcons(IIconRegister ir) {
+        super.iconLiquid = ir.registerIcon("thaumcraft:animatedglow");
+        super.iconJarSide = ir.registerIcon("kekztech:thaumreinforced_jar_side");
+        super.iconJarTop = ir.registerIcon("kekztech:thaumreinforced_jar_top");
+        super.iconJarTopVoid = ir.registerIcon("kekztech:thaumreinforced_jar_top_void");
+        super.iconJarSideVoid = ir.registerIcon("kekztech:thaumreinforced_jar_side_void");
+        super.iconJarBottom = ir.registerIcon("kekztech:thaumreinforced_jar_bottom");
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    @SuppressWarnings({"unchecked"})
+    public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+        par3List.add(new ItemStack(par1, 1, 0)); // Normal jar
+        par3List.add(new ItemStack(par1, 1, 3)); // Void jar
+    }
+
+    @Override
+    public TileEntity createTileEntity(World world, int meta) {
+        if (meta == 3) {
+            return new TE_ThaumiumReinforcedVoidJar();
+        } else {
+            return new TE_ThaumiumReinforcedJar();
+        }
+    }
+
+    @Override
+    public void breakBlock(World world, int x, int y, int z, Block par5, int par6) {
+        final TileEntity te = world.getTileEntity(x, y, z);
+        if (te instanceof TE_ThaumiumReinforcedJar) {
+            final TE_ThaumiumReinforcedJar ite = (TE_ThaumiumReinforcedJar) te;
+            breakBlockWarpy(world, x, y, z, ite.amount, 50, 1.0F);
+        } else if (te instanceof TE_ThaumiumReinforcedVoidJar) {
+            final TE_ThaumiumReinforcedVoidJar ite = (TE_ThaumiumReinforcedVoidJar) te;
+            breakBlockWarpy(world, x, y, z, ite.amount, 50, 1.0F);
+        }
+        super.breakBlock(world, x, y, z, par5, par6);
+    }
+
+    private void breakBlockWarpy(
+            World world, int x, int y, int z, int fillAmount, int iterations, float explosionStrength) {
+        if (fillAmount > 0) {
+            // Create a decent explosion in the center of the block (TNT has strength 4.0F)
+            world.createExplosion(null, x + 0.5D, y + 0.5D, z + 0.5D, explosionStrength, false);
+
+            // Place a lot of Flux in the area
+            final int limit = fillAmount / 16;
+            int created = 0;
+            for (int i = 0; i < iterations; i++) {
+                final int xf = x + world.rand.nextInt(7) - world.rand.nextInt(7);
+                final int yf = x + world.rand.nextInt(7) - world.rand.nextInt(7);
+                final int zf = x + world.rand.nextInt(7) - world.rand.nextInt(7);
+                if (world.isAirBlock(xf, yf, zf)) {
+                    if (yf > y) {
+                        world.setBlock(xf, yf, zf, ConfigBlocks.blockFluxGas, 8, 3);
+                    } else {
+                        world.setBlock(xf, yf, zf, ConfigBlocks.blockFluxGoo, 8, 3);
+                    }
+
+                    if (created++ > limit) {
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public boolean onBlockActivated(
+            World world, int x, int y, int z, EntityPlayer player, int side, float f1, float f2, float f3) {
+        // Call parent method to handle jar emptying, labels stuff etc
+        super.onBlockActivated(world, x, y, z, player, side, f1, f2, f3);
+        // Interact with Essentia Phials if the player holds one
+        final ItemStack heldItem = player.getHeldItem();
+        if (heldItem != null && heldItem.getItem() == ConfigItems.itemEssence) {
+            final TileEntity te = world.getTileEntity(x, y, z);
+            if (te instanceof TE_ThaumiumReinforcedJar) {
+                return dealWithPhial(world, player, x, y, z);
+            } else if (te instanceof TE_ThaumiumReinforcedVoidJar) {
+                return dealWithPhial(world, player, x, y, z);
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle compatibility with Essentia Phials
+     * @param world
+     * 			Pass through from onBlockActivated()
+     * @param player
+     * 			Pass through from onBlockActivated()
+     * @param x
+     * 			Pass through from onBlockActivated()
+     * @param y
+     * 			Pass through from onBlockActivated()
+     * @param z
+     * 			Pass through from onBlockActivated()
+     * @return Not sure tbh
+     */
+    private boolean dealWithPhial(World world, EntityPlayer player, int x, int y, int z) {
+        final TileJarFillable kte = (TileJarFillable) world.getTileEntity(x, y, z);
+        final ItemStack heldItem = player.getHeldItem();
+        // Check whether to fill or to drain the phial
+        if (heldItem.getItemDamage() == 0) {
+            if (kte.amount >= 8) {
+                if (world.isRemote) {
+                    player.swingItem();
+                    return false;
+                }
+
+                final Aspect jarAspect = Aspect.getAspect(kte.aspect.getTag());
+                if (kte.takeFromContainer(jarAspect, 8)) {
+                    // Take an empty phial from the player's inventory
+                    heldItem.stackSize--;
+                    // Fill a new phial
+                    final ItemStack filledPhial = new ItemStack(ConfigItems.itemEssence, 1, 1);
+                    final AspectList phialContent = new AspectList().add(jarAspect, 8);
+                    ((ItemEssence) ConfigItems.itemEssence).setAspects(filledPhial, phialContent);
+                    // Drop on ground if there's no inventory space
+                    if (!player.inventory.addItemStackToInventory(filledPhial)) {
+                        world.spawnEntityInWorld(new EntityItem(
+                                world, (float) x + 0.5F, (float) y + 0.5F, (float) z + 0.5F, filledPhial));
+                    }
+
+                    world.playSoundAtEntity(player, "game.neutral.swim", 0.25F, 1.0F);
+                    player.inventoryContainer.detectAndSendChanges();
+                    return true;
+                }
+            }
+        } else {
+            final AspectList phialContent = ((ItemEssence) ConfigItems.itemEssence).getAspects(heldItem);
+            if (phialContent != null && phialContent.size() == 1) {
+                final Aspect phialAspect = phialContent.getAspects()[0];
+                if (kte.amount + 8 <= kte.maxAmount && kte.doesContainerAccept(phialAspect)) {
+                    if (world.isRemote) {
+                        player.swingItem();
+                        return false;
+                    }
+
+                    if (kte.addToContainer(phialAspect, 8) == 0) {
+                        world.markBlockForUpdate(x, y, z);
+                        kte.markDirty();
+                        heldItem.stackSize--;
+                        // Drop on ground if there's no inventory space
+                        if (!player.inventory.addItemStackToInventory(new ItemStack(ConfigItems.itemEssence, 1, 0))) {
+                            world.spawnEntityInWorld(new EntityItem(
+                                    world,
+                                    (float) x + 0.5F,
+                                    (float) y + 0.5F,
+                                    (float) z + 0.5F,
+                                    new ItemStack(ConfigItems.itemEssence, 1, 0)));
+                        }
+
+                        world.playSoundAtEntity(player, "game.neutral.swim", 0.25F, 1.0F);
+                        player.inventoryContainer.detectAndSendChanges();
+                        return true;
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
+    @Override
+    public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int meta, int fortune) {
+        final ArrayList<ItemStack> drops = new ArrayList<>();
+        drops.add(new ItemStack(this, 1, (meta == 3) ? 3 : 0));
+        final TileEntity te = world.getTileEntity(x, y, z);
+        if (te instanceof TE_ThaumiumReinforcedJar) {
+            final TE_ThaumiumReinforcedJar ite = (TE_ThaumiumReinforcedJar) te;
+            if (ite.aspectFilter != null) {
+                final ItemStack droppedLabel = new ItemStack(ConfigItems.itemResource, 1, 13);
+                droppedLabel.setTagCompound(new NBTTagCompound());
+                final AspectList aspect = new AspectList().add(ite.aspectFilter, 0);
+                aspect.writeToNBT(droppedLabel.getTagCompound());
+                drops.add(droppedLabel);
+            }
+        } else if (te instanceof TE_ThaumiumReinforcedVoidJar) {
+            final TE_ThaumiumReinforcedVoidJar ite = (TE_ThaumiumReinforcedVoidJar) te;
+            if (ite.aspectFilter != null) {
+                final ItemStack droppedLabel = new ItemStack(ConfigItems.itemResource, 1, 13);
+                droppedLabel.setTagCompound(new NBTTagCompound());
+                final AspectList aspect = new AspectList().add(ite.aspectFilter, 0);
+                aspect.writeToNBT(droppedLabel.getTagCompound());
+                drops.add(droppedLabel);
+            }
+        }
+        return drops;
+    }
+
+    @Override
+    public void onBlockHarvested(
+            World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) {}
+
+    @Override
+    public boolean canDropFromExplosion(Explosion e) {
+        return false;
+    }
 }
diff --git a/src/main/java/common/blocks/Block_YSZUnit.java b/src/main/java/common/blocks/Block_YSZUnit.java
index fad48dd1b2..dcfc3a3d09 100644
--- a/src/main/java/common/blocks/Block_YSZUnit.java
+++ b/src/main/java/common/blocks/Block_YSZUnit.java
@@ -1,28 +1,28 @@
-package common.blocks;

-

-import cpw.mods.fml.common.registry.GameRegistry;

-import kekztech.KekzCore;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.creativetab.CreativeTabs;

-

-public class Block_YSZUnit extends BaseGTUpdateableBlock {

-	

-	private static Block_YSZUnit instance = new Block_YSZUnit();

-	

-	private Block_YSZUnit() {

-		super(Material.iron);

-	}

-	

-	public static Block registerBlock() {

-		final String blockName = "kekztech_yszceramicelectrolyteunit_block";

-		instance.setBlockName(blockName);

-		instance.setCreativeTab(CreativeTabs.tabMisc);

-		instance.setBlockTextureName(KekzCore.MODID + ":" + "YSZCeramicElectrolyteUnit");

-		instance.setHardness(5.0f);

-		instance.setResistance(6.0f);

-		GameRegistry.registerBlock(instance, blockName);

-		

-		return instance;

-	}

-}

+package common.blocks;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import kekztech.KekzCore;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+
+public class Block_YSZUnit extends BaseGTUpdateableBlock {
+
+    private static Block_YSZUnit instance = new Block_YSZUnit();
+
+    private Block_YSZUnit() {
+        super(Material.iron);
+    }
+
+    public static Block registerBlock() {
+        final String blockName = "kekztech_yszceramicelectrolyteunit_block";
+        instance.setBlockName(blockName);
+        instance.setCreativeTab(CreativeTabs.tabMisc);
+        instance.setBlockTextureName(KekzCore.MODID + ":" + "YSZCeramicElectrolyteUnit");
+        instance.setHardness(5.0f);
+        instance.setResistance(6.0f);
+        GameRegistry.registerBlock(instance, blockName);
+
+        return instance;
+    }
+}