All parameters on one line (for now)

Easier picking of 1.7 changes

src/api/java/appeng/api/config/FuzzyMode.java

@@ -27,7 +27,11 @@ package appeng.api.config;
 public enum FuzzyMode
 {
 	// Note that percentage damaged, is the inverse of percentage durability.
-	IGNORE_ALL( -1 ), PERCENT_99( 0 ), PERCENT_75( 25 ), PERCENT_50( 50 ), PERCENT_25( 75 );
+	IGNORE_ALL( -1 ),
+	PERCENT_99( 0 ),
+	PERCENT_75( 25 ),
+	PERCENT_50( 50 ),
+	PERCENT_25( 75 );
 
 	public final float breakPoint;
 	public final float percentage;

src/api/java/appeng/api/movable/IMovableHandler.java

@@ -54,14 +54,12 @@ public interface IMovableHandler
 	 * {
 	 * 	@code
 	 * 	Chunk c = world.getChunkFromBlockCoords( x, z );
-	 * 	c.setChunkBlockTileEntity( x
+	 * 	c.setChunkBlockTileEntity( x & 0xF, y + y, z & 0xF, tile );
-	 * 			& 0xF, y + y, z & 0xF, tile );
 	 * 
 	 * 	if( c.isChunkLoaded )
 	 * 	{
 	 * 		world.addTileEntity( tile );
-	 * 		world.markBlockForUpdate( x,
+	 * 		world.markBlockForUpdate( x, y, z );
-	 * 				y, z );
 	 * 	}
 	 * }
 	 * </pre>

src/api/java/appeng/api/util/AEAxisAlignedBB.java

@@ -32,25 +32,13 @@ public class AEAxisAlignedBB
 		this.maxZ = f;
 	}
 
-	public static AEAxisAlignedBB fromBounds(
+	public static AEAxisAlignedBB fromBounds( final double a, final double b, final double c, final double d, final double e, final double f )
-			final double a,
-			final double b,
-			final double c,
-			final double d,
-			final double e,
-			final double f )
 	{
 		return new AEAxisAlignedBB( a, b, c, d, e, f );
 	}
 
-	public static AEAxisAlignedBB fromBounds(
+	public static AEAxisAlignedBB fromBounds( final AxisAlignedBB bb )
-			final AxisAlignedBB bb )
 	{
-		return new AEAxisAlignedBB( bb.minX,
+		return new AEAxisAlignedBB( bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ );
-				bb.minY,
-				bb.minZ,
-				bb.maxX,
-				bb.maxY,
-				bb.maxZ );
 	}
 }

src/api/java/appeng/api/util/WorldCoord.java

@@ -51,8 +51,7 @@ public class WorldCoord
 		this.z = _z;
 	}
 
-	public WorldCoord(
+	public WorldCoord( final BlockPos pos )
-			final BlockPos pos )
 	{
 		this.x = pos.getX();
 		this.y = pos.getY();

src/main/java/appeng/block/AEBaseBlock.java

@@ -144,10 +144,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
 	}
 
 	@Override
-	public final IBlockState getExtendedState(
+	public final IBlockState getExtendedState( final IBlockState state, final IBlockAccess world, final BlockPos pos )
-			final IBlockState state,
-			final IBlockAccess world,
-			final BlockPos pos )
 	{
 		return ( (IExtendedBlockState) super.getExtendedState( state, world, pos ) ).withProperty( AE_BLOCK_POS, pos ).withProperty( AE_BLOCK_ACCESS, world );
 	}
@@ -188,10 +185,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
 	}
 
 	@Override
-	public int colorMultiplier(
+	public int colorMultiplier( final IBlockAccess worldIn, final BlockPos pos, final int colorTint )
-			final IBlockAccess worldIn,
-			final BlockPos pos,
-			final int colorTint )
 	{
 		return colorTint;
 	}
@@ -266,13 +260,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
 	}
 
 	@Override
-	public void addCollisionBoxesToList(
+	public void addCollisionBoxesToList( final World w, final BlockPos pos, final IBlockState state, final AxisAlignedBB bb, final List out, final Entity e )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final AxisAlignedBB bb,
-			final List out,
-			final Entity e )
 	{
 		final ICustomCollision collisionHandler = this.getCustomCollision( w, pos );
 
@@ -297,9 +285,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
 
 	@Override
 	@SideOnly( Side.CLIENT )
-	public AxisAlignedBB getSelectedBoundingBox(
+	public AxisAlignedBB getSelectedBoundingBox( final World w, final BlockPos pos )
-			final World w,
-			final BlockPos pos )
 	{
 		final ICustomCollision collisionHandler = this.getCustomCollision( w, pos );
 
@@ -388,11 +374,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
 	}
 
 	@Override
-	public MovingObjectPosition collisionRayTrace(
+	public MovingObjectPosition collisionRayTrace( final World w, final BlockPos pos, final Vec3 a, final Vec3 b )
-			final World w,
-			final BlockPos pos,
-			final Vec3 a,
-			final Vec3 b )
 	{
 		final ICustomCollision collisionHandler = this.getCustomCollision( w, pos );
 
@@ -458,17 +440,13 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
 	}
 
 	@Override
-	public int getComparatorInputOverride(
+	public int getComparatorInputOverride( final World worldIn, final BlockPos pos )
-			final World worldIn,
-			final BlockPos pos )
 	{
 		return 0;
 	}
 
 	@Override
-	public boolean isNormalCube(
+	public boolean isNormalCube( final IBlockAccess world, final BlockPos pos )
-			final IBlockAccess world,
-			final BlockPos pos )
 	{
 		return this.isFullSize();
 	}
@@ -483,10 +461,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
 	}
 
 	@Override
-	public boolean rotateBlock(
+	public boolean rotateBlock( final World w, final BlockPos pos, final EnumFacing axis )
-			final World w,
-			final BlockPos pos,
-			final EnumFacing axis )
 	{
 		final IOrientable rotatable = this.getOrientable( w, pos );
 
@@ -572,9 +547,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
 		return this.hasSubtypes;
 	}
 
-	public EnumFacing mapRotation(
+	public EnumFacing mapRotation( final IOrientable ori, final EnumFacing dir )
-			final IOrientable ori,
-			final EnumFacing dir )
 	{
 		// case DOWN: return bottomIcon;
 		// case UP: return blockIcon;
@@ -640,9 +613,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
 	}
 
 	@SideOnly( Side.CLIENT )
-	public void registerBlockIcons(
+	public void registerBlockIcons( final TextureMap clientHelper, final String name )
-			final TextureMap clientHelper,
-			final String name )
 	{
 		final BlockRenderInfo info = this.getRendererInstance();
 		final FlippableIcon topIcon;

src/main/java/appeng/block/AEBaseItemBlock.java

@@ -91,16 +91,7 @@ public class AEBaseItemBlock extends ItemBlock
 	}
 
 	@Override
-	public boolean placeBlockAt(
+	public boolean placeBlockAt( final ItemStack stack, final EntityPlayer player, final World w, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ, final IBlockState newState )
-			final ItemStack stack,
-			final EntityPlayer player,
-			final World w,
-			final BlockPos pos,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ,
-			final IBlockState newState )
 	{
 		EnumFacing up = null;
 		EnumFacing forward = null;

src/main/java/appeng/block/AEBaseTileBlock.java

@@ -156,10 +156,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
 	}
 
 	@Override
-	public void breakBlock(
+	public void breakBlock( final World w, final BlockPos pos, final IBlockState state )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state )
 	{
 		final AEBaseTile te = this.getTileEntity( w, pos );
 		if( te != null )
@@ -195,11 +192,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
 	}
 
 	@Override
-	public boolean recolorBlock(
+	public boolean recolorBlock( final World world, final BlockPos pos, final EnumFacing side, final EnumDyeColor color )
-			final World world,
-			final BlockPos pos,
-			final EnumFacing side,
-			final EnumDyeColor color )
 	{
 		final TileEntity te = this.getTileEntity( world, pos );
 
@@ -221,9 +214,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
 	}
 
 	@Override
-	public int getComparatorInputOverride(
+	public int getComparatorInputOverride( final World w, final BlockPos pos )
-			final World w,
-			final BlockPos pos )
 	{
 		final TileEntity te = this.getTileEntity( w, pos );
 		if( te instanceof IInventory )
@@ -234,12 +225,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
 	}
 
 	@Override
-	public boolean onBlockEventReceived(
+	public boolean onBlockEventReceived( final World worldIn, final BlockPos pos, final IBlockState state, final int eventID, final int eventParam )
-			final World worldIn,
-			final BlockPos pos,
-			final IBlockState state,
-			final int eventID,
-			final int eventParam )
 	{
 		super.onBlockEventReceived( worldIn, pos, state, eventID, eventParam );
 		final TileEntity tileentity = worldIn.getTileEntity( pos );
@@ -247,12 +233,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
 	}
 
 	@Override
-	public void onBlockPlacedBy(
+	public void onBlockPlacedBy( final World w, final BlockPos pos, final IBlockState state, final EntityLivingBase placer, final ItemStack is )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final EntityLivingBase placer,
-			final ItemStack is )
 	{
 		if( is.hasDisplayName() )
 		{
@@ -265,15 +246,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
 	}
 
 	@Override
-	public boolean onBlockActivated(
+	public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final EntityPlayer player,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		if( player != null )
 		{

src/main/java/appeng/block/UnlistedBlockAccess.java

@@ -15,8 +15,7 @@ public final class UnlistedBlockAccess implements IUnlistedProperty<IBlockAccess
 	}
 
 	@Override
-	public boolean isValid(
+	public boolean isValid( final IBlockAccess value )
-			final IBlockAccess value )
 	{
 		return true;
 	}
@@ -28,8 +27,7 @@ public final class UnlistedBlockAccess implements IUnlistedProperty<IBlockAccess
 	}
 
 	@Override
-	public String valueToString(
+	public String valueToString( final IBlockAccess value )
-			final IBlockAccess value )
 	{
 		return null;
 	}

src/main/java/appeng/block/UnlistedBlockPos.java

@@ -15,8 +15,7 @@ public final class UnlistedBlockPos implements IUnlistedProperty<BlockPos>
 	}
 
 	@Override
-	public boolean isValid(
+	public boolean isValid( final BlockPos value )
-			final BlockPos value )
 	{
 		return true;
 	}
@@ -28,8 +27,7 @@ public final class UnlistedBlockPos implements IUnlistedProperty<BlockPos>
 	}
 
 	@Override
-	public String valueToString(
+	public String valueToString( final BlockPos value )
-			final BlockPos value )
 	{
 		return null;
 	}

src/main/java/appeng/block/crafting/BlockCraftingMonitor.java

@@ -53,9 +53,7 @@ public class BlockCraftingMonitor extends BlockCraftingUnit
 	}
 
 	@Override
-	public IAESprite getIcon(
+	public IAESprite getIcon( final EnumFacing side, final IBlockState state )
-			final EnumFacing side,
-			final IBlockState state )
 	{
 		if( side != EnumFacing.SOUTH )
 		{

src/main/java/appeng/block/crafting/BlockCraftingStorage.java

@@ -54,21 +54,13 @@ public class BlockCraftingStorage extends BlockCraftingUnit
 		{
 			default:
 			case STORAGE_1K:
-				return formed ?
+				return formed ? super.getIcon( side, state ) : ExtraBlockTextures.BlockCraftingStorage1kFit.getIcon();
-						super.getIcon( side, state ) :
-						ExtraBlockTextures.BlockCraftingStorage1kFit.getIcon();
 			case STORAGE_4K:
-				return formed ?
+				return formed ? ExtraBlockTextures.BlockCraftingStorage4k.getIcon() : ExtraBlockTextures.BlockCraftingStorage1kFit.getIcon();
-						ExtraBlockTextures.BlockCraftingStorage4k.getIcon() :
-						ExtraBlockTextures.BlockCraftingStorage1kFit.getIcon();
 			case STORAGE_16K:
-				return formed ?
+				return formed ? ExtraBlockTextures.BlockCraftingStorage16k.getIcon() : ExtraBlockTextures.BlockCraftingStorage16kFit.getIcon();
-						ExtraBlockTextures.BlockCraftingStorage16k.getIcon() :
-						ExtraBlockTextures.BlockCraftingStorage16kFit.getIcon();
 			case STORAGE_64K:
-				return formed ?
+				return formed ? ExtraBlockTextures.BlockCraftingStorage64k.getIcon() : ExtraBlockTextures.BlockCraftingStorage64kFit.getIcon();
-						ExtraBlockTextures.BlockCraftingStorage64k.getIcon() :
-						ExtraBlockTextures.BlockCraftingStorage64kFit.getIcon();
 
 		}
 	}

src/main/java/appeng/block/crafting/BlockCraftingUnit.java

@@ -138,10 +138,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock
 	@Override
 	protected IProperty[] getAEStates()
 	{
-		return new IProperty[] {
+		return new IProperty[] { POWERED, FORMED };
-				POWERED,
-				FORMED
-		};
 	}
 
 	@Override

src/main/java/appeng/block/crafting/BlockMolecularAssembler.java

@@ -68,15 +68,7 @@ public class BlockMolecularAssembler extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onBlockActivated(
+	public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final EntityPlayer p,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		final TileMolecularAssembler tg = this.getTileEntity( w, pos );
 		if( tg != null && !p.isSneaking() )

src/main/java/appeng/block/grindstone/BlockCrank.java

@@ -64,14 +64,7 @@ public class BlockCrank extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated(
+	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final World w,
-			final BlockPos pos,
-			final EntityPlayer player,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		if( player instanceof FakePlayer || player == null )
 		{
@@ -98,12 +91,7 @@ public class BlockCrank extends AEBaseTileBlock
 	}
 
 	@Override
-	public void onBlockPlacedBy(
+	public void onBlockPlacedBy( final World world, final BlockPos pos, final IBlockState state, final EntityLivingBase placer, final ItemStack stack )
-			final World world,
-			final BlockPos pos,
-			final IBlockState state,
-			final EntityLivingBase placer,
-			final ItemStack stack )
 	{
 		final AEBaseTile tile = this.getTileEntity( world, pos );
 		if( tile != null )
@@ -123,11 +111,7 @@ public class BlockCrank extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean isValidOrientation(
+	public boolean isValidOrientation( final World w, final BlockPos pos, final EnumFacing forward, final EnumFacing up )
-			final World w,
-			final BlockPos pos,
-			final EnumFacing forward,
-			final EnumFacing up )
 	{
 		final TileEntity te = w.getTileEntity( pos );
 		return !( te instanceof TileCrank ) || this.isCrankable( w, pos, up.getOpposite() );
@@ -154,11 +138,7 @@ public class BlockCrank extends AEBaseTileBlock
 	}
 
 	@Override
-	public void onNeighborBlockChange(
+	public void onNeighborBlockChange( final World world, final BlockPos pos, final IBlockState state, final Block neighborBlock )
-			final World world,
-			final BlockPos pos,
-			final IBlockState state,
-			final Block neighborBlock )
 	{
 
 		final AEBaseTile tile = this.getTileEntity( world, pos );

src/main/java/appeng/block/grindstone/BlockGrinder.java

@@ -49,29 +49,14 @@ public class BlockGrinder extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onBlockActivated(
+	public boolean onBlockActivated( final World worldIn, final BlockPos pos, final IBlockState state, final EntityPlayer playerIn, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final World worldIn,
-			final BlockPos pos,
-			final IBlockState state,
-			final EntityPlayer playerIn,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		// TODO Auto-generated method stub
 		return super.onBlockActivated( worldIn, pos, state, playerIn, side, hitX, hitY, hitZ );
 	}
 
 	@Override
-	public boolean onActivated(
+	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final World w,
-			final BlockPos pos,
-			final EntityPlayer p,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		final TileGrinder tg = this.getTileEntity( w, pos );
 		if( tg != null && !p.isSneaking() )

src/main/java/appeng/block/misc/BlockCellWorkbench.java

@@ -47,14 +47,7 @@ public class BlockCellWorkbench extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated(
+	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final World w,
-			final BlockPos pos,
-			final EntityPlayer p,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		if( p.isSneaking() )
 		{

src/main/java/appeng/block/misc/BlockCharger.java

@@ -71,14 +71,7 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public boolean onActivated(
+	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final World w,
-			final BlockPos pos,
-			final EntityPlayer player,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		if( player.isSneaking() )
 		{
@@ -99,11 +92,7 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision
 
 	@Override
 	@SideOnly( Side.CLIENT )
-	public void randomDisplayTick(
+	public void randomDisplayTick( final World w, final BlockPos pos, final IBlockState state, final Random r )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final Random r )
 	{
 		if( !AEConfig.instance.enableEffects )
 		{
@@ -139,11 +128,7 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool(
+	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b )
-			final World w,
-			final BlockPos pos,
-			final Entity thePlayer,
-			final boolean b )
 	{
 		final TileCharger tile = this.getTileEntity( w, pos );
 		if( tile != null )
@@ -199,12 +184,7 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public void addCollidingBlockToList(
+	public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List<AxisAlignedBB> out, final Entity e )
-			final World w,
-			final BlockPos pos,
-			final AxisAlignedBB bb,
-			final List<AxisAlignedBB> out,
-			final Entity e )
 	{
 		out.add( AxisAlignedBB.fromBounds( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) );
 	}

src/main/java/appeng/block/misc/BlockCondenser.java

@@ -47,14 +47,7 @@ public class BlockCondenser extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated(
+	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final World w,
-			final BlockPos pos,
-			final EntityPlayer player,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		if( player.isSneaking() )
 		{

src/main/java/appeng/block/misc/BlockInscriber.java

@@ -58,14 +58,7 @@ public class BlockInscriber extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated(
+	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final World w,
-			final BlockPos pos,
-			final EntityPlayer p,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		if( p.isSneaking() )
 		{

src/main/java/appeng/block/misc/BlockInterface.java

@@ -56,14 +56,7 @@ public class BlockInterface extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated(
+	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final World w,
-			final BlockPos pos,
-			final EntityPlayer p,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		if( p.isSneaking() )
 		{

src/main/java/appeng/block/misc/BlockLightDetector.java

@@ -62,15 +62,13 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
 	}
 
 	@Override
-	public int getMetaFromState(
+	public int getMetaFromState( final IBlockState state )
-			final IBlockState state )
 	{
 		return 0;
 	}
 
 	@Override
-	public IBlockState getStateFromMeta(
+	public IBlockState getStateFromMeta( final int meta )
-			final int meta )
 	{
 		return this.getDefaultState();
 	}
@@ -82,11 +80,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
 	}
 
 	@Override
-	public int getWeakPower(
+	public int getWeakPower( final IBlockAccess w, final BlockPos pos, final IBlockState state, final EnumFacing side )
-			final IBlockAccess w,
-			final BlockPos pos,
-			final IBlockState state,
-			final EnumFacing side )
 	{
 		if( w instanceof World && ( (TileLightDetector) this.getTileEntity( w, pos ) ).isReady() )
 		{
@@ -97,10 +91,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
 	}
 
 	@Override
-	public void onNeighborChange(
+	public void onNeighborChange( final IBlockAccess world, final BlockPos pos, final BlockPos neighbor )
-			final IBlockAccess world,
-			final BlockPos pos,
-			final BlockPos neighbor )
 	{
 		super.onNeighborChange( world, pos, neighbor );
 
@@ -112,11 +103,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
 	}
 
 	@Override
-	public void randomDisplayTick(
+	public void randomDisplayTick( final World worldIn, final BlockPos pos, final IBlockState state, final Random rand )
-			final World worldIn,
-			final BlockPos pos,
-			final IBlockState state,
-			final Random rand )
 	{
 		// cancel out lightning
 	}
@@ -128,29 +115,18 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
 	}
 
 	@Override
-	public boolean isValidOrientation(
+	public boolean isValidOrientation( final World w, final BlockPos pos, final EnumFacing forward, final EnumFacing up )
-			final World w,
-			final BlockPos pos,
-			final EnumFacing forward,
-			final EnumFacing up )
 	{
 		return this.canPlaceAt( w, pos, up.getOpposite() );
 	}
 
-	private boolean canPlaceAt(
+	private boolean canPlaceAt( final World w, final BlockPos pos, final EnumFacing dir )
-			final World w,
-			final BlockPos pos,
-			final EnumFacing dir )
 	{
 		return w.isSideSolid( pos.offset( dir ), dir.getOpposite(), false );
 	}
 
 	@Override
-	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool(
+	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b )
-			final World w,
-			final BlockPos pos,
-			final Entity thePlayer,
-			final boolean b )
 	{
 		final EnumFacing up = this.getOrientable( w, pos ).getUp();
 		final double xOff = -0.3 * up.getFrontOffsetX();
@@ -160,12 +136,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
 	}
 
 	@Override
-	public void addCollidingBlockToList(
+	public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List<AxisAlignedBB> out, final Entity e )
-			final World w,
-			final BlockPos pos,
-			final AxisAlignedBB bb,
-			final List<AxisAlignedBB> out,
-			final Entity e )
 	{/*
 	 * double xOff = -0.15 * getUp().offsetX; double yOff = -0.15 *
 	 * getUp().offsetY; double zOff = -0.15 * getUp().offsetZ; out.add(
@@ -176,11 +147,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
 	}
 
 	@Override
-	public void onNeighborBlockChange(
+	public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final Block neighborBlock )
 	{
 		final EnumFacing up = this.getOrientable( w, pos ).getUp();
 		if( !this.canPlaceAt( w, pos, up.getOpposite() ) )
@@ -189,18 +156,14 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
 		}
 	}
 
-	private void dropTorch(
+	private void dropTorch( final World w, final BlockPos pos )
-			final World w,
-			final BlockPos pos )
 	{
 		w.destroyBlock( pos, true );
 		w.markBlockForUpdate( pos );
 	}
 
 	@Override
-	public boolean canPlaceBlockAt(
+	public boolean canPlaceBlockAt( final World w, final BlockPos pos )
-			final World w,
-			final BlockPos pos )
 	{
 		for( final EnumFacing dir : EnumFacing.VALUES )
 		{
@@ -219,9 +182,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
 	}
 
 	@Override
-	public IOrientable getOrientable(
+	public IOrientable getOrientable( final IBlockAccess w, final BlockPos pos )
-			final IBlockAccess w,
-			final BlockPos pos )
 	{
 		return new MetaRotation( w, pos, true );
 	}

src/main/java/appeng/block/misc/BlockPaint.java

@@ -80,28 +80,19 @@ public class BlockPaint extends AEBaseTileBlock
 	}
 
 	@Override
-	public AxisAlignedBB getCollisionBoundingBox(
+	public AxisAlignedBB getCollisionBoundingBox( final World worldIn, final BlockPos pos, final IBlockState state )
-			final World worldIn,
-			final BlockPos pos,
-			final IBlockState state )
 	{
 		return null;
 	}
 
 	@Override
-	public boolean canCollideCheck(
+	public boolean canCollideCheck( final IBlockState state, final boolean hitIfLiquid )
-			final IBlockState state,
-			final boolean hitIfLiquid )
 	{
 		return false;
 	}
 
 	@Override
-	public void onNeighborBlockChange(
+	public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final Block neighborBlock )
 	{
 		final TilePaint tp = this.getTileEntity( w, pos );
 
@@ -112,29 +103,19 @@ public class BlockPaint extends AEBaseTileBlock
 	}
 
 	@Override
-	public Item getItemDropped(
+	public Item getItemDropped( final IBlockState state, final Random rand, final int fortune )
-			final IBlockState state,
-			final Random rand,
-			final int fortune )
 	{
 		return null;
 	}
 
 	@Override
-	public void dropBlockAsItemWithChance(
+	public void dropBlockAsItemWithChance( final World worldIn, final BlockPos pos, final IBlockState state, final float chance, final int fortune )
-			final World worldIn,
-			final BlockPos pos,
-			final IBlockState state,
-			final float chance,
-			final int fortune )
 	{
 
 	}
 
 	@Override
-	public void fillWithRain(
+	public void fillWithRain( final World w, final BlockPos pos )
-			final World w,
-			final BlockPos pos )
 	{
 		if( Platform.isServer() )
 		{
@@ -143,9 +124,7 @@ public class BlockPaint extends AEBaseTileBlock
 	}
 
 	@Override
-	public int getLightValue(
+	public int getLightValue( final IBlockAccess w, final BlockPos pos )
-			final IBlockAccess w,
-			final BlockPos pos )
 	{
 		final TilePaint tp = this.getTileEntity( w, pos );
 
@@ -158,17 +137,13 @@ public class BlockPaint extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean isAir(
+	public boolean isAir( final IBlockAccess world, final BlockPos pos )
-			final IBlockAccess world,
-			final BlockPos pos )
 	{
 		return true;
 	}
 
 	@Override
-	public boolean isReplaceable(
+	public boolean isReplaceable( final World worldIn, final BlockPos pos )
-			final World worldIn,
-			final BlockPos pos )
 	{
 		return true;
 	}

src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java

@@ -58,11 +58,7 @@ public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock
 	}
 
 	@Override
-	public void randomDisplayTick(
+	public void randomDisplayTick( final World w, final BlockPos pos, final IBlockState state, final Random r )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final Random r )
 	{
 		if( !AEConfig.instance.enableEffects )
 		{

src/main/java/appeng/block/misc/BlockQuartzTorch.java

@@ -66,15 +66,13 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
 	}
 
 	@Override
-	public int getMetaFromState(
+	public int getMetaFromState( final IBlockState state )
-			final IBlockState state )
 	{
 		return 0;
 	}
 
 	@Override
-	public IBlockState getStateFromMeta(
+	public IBlockState getStateFromMeta( final int meta )
-			final int meta )
 	{
 		return this.getDefaultState();
 	}
@@ -124,11 +122,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
 
 	@Override
 	@SideOnly( Side.CLIENT )
-	public void randomDisplayTick(
+	public void randomDisplayTick( final World w, final BlockPos pos, final IBlockState state, final Random r )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final Random r )
 	{
 		if( !AEConfig.instance.enableEffects )
 		{
@@ -156,11 +150,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
 	}
 
 	@Override
-	public void onNeighborBlockChange(
+	public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final Block neighborBlock )
 	{
 		final EnumFacing up = this.getOrientable( w, pos ).getUp();
 		if( !this.canPlaceAt( w, pos, up.getOpposite() ) )

src/main/java/appeng/block/misc/BlockSecurity.java

@@ -62,14 +62,7 @@ public class BlockSecurity extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated(
+	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final World w,
-			final BlockPos pos,
-			final EntityPlayer p,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		if( p.isSneaking() )
 		{

src/main/java/appeng/block/misc/BlockSkyCompass.java

@@ -75,11 +75,7 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public void onNeighborBlockChange(
+	public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final Block neighborBlock )
 	{
 		final TileSkyCompass sc = this.getTileEntity( w, pos );
 		final EnumFacing up = sc.getForward();
@@ -96,9 +92,7 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public boolean canPlaceBlockAt(
+	public boolean canPlaceBlockAt( final World w, final BlockPos pos )
-			final World w,
-			final BlockPos pos )
 	{
 		for( final EnumFacing dir : EnumFacing.VALUES )
 		{
@@ -111,11 +105,7 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool(
+	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b )
-			final World w,
-			final BlockPos pos,
-			final Entity thePlayer,
-			final boolean b )
 	{
 		final TileSkyCompass tile = this.getTileEntity( w, pos );
 		if( tile != null )
@@ -177,12 +167,7 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public void addCollidingBlockToList(
+	public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List<AxisAlignedBB> out, final Entity e )
-			final World w,
-			final BlockPos pos,
-			final AxisAlignedBB bb,
-			final List<AxisAlignedBB> out,
-			final Entity e )
 	{
 
 	}

src/main/java/appeng/block/misc/BlockVibrationChamber.java

@@ -69,14 +69,7 @@ public final class BlockVibrationChamber extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated(
+	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final World w,
-			final BlockPos pos,
-			final EntityPlayer player,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		if( player.isSneaking() )
 		{
@@ -97,11 +90,7 @@ public final class BlockVibrationChamber extends AEBaseTileBlock
 	}
 
 	@Override
-	public void randomDisplayTick(
+	public void randomDisplayTick( final World w, final BlockPos pos, final IBlockState state, final Random r )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final Random r )
 	{
 		if( !AEConfig.instance.enableEffects )
 		{

src/main/java/appeng/block/networking/BlockCableBus.java

@@ -104,43 +104,29 @@ public class BlockCableBus extends AEBaseTileBlock // implements
 	}
 
 	@Override
-	public void randomDisplayTick(
+	public void randomDisplayTick( final World worldIn, final BlockPos pos, final IBlockState state, final Random rand )
-			final World worldIn,
-			final BlockPos pos,
-			final IBlockState state,
-			final Random rand )
 	{
 		this.cb( worldIn, pos ).randomDisplayTick( worldIn, pos, rand );
 	}
 
 	@Override
-	public void onNeighborChange(
+	public void onNeighborChange( final IBlockAccess w, final BlockPos pos, final BlockPos neighbor )
-			final IBlockAccess w,
-			final BlockPos pos,
-			final BlockPos neighbor )
 	{
 		this.cb( w, pos ).onNeighborChanged();
 	}
 
 	@Override
-	public Item getItemDropped(
+	public Item getItemDropped( final IBlockState state, final Random rand, final int fortune )
-			final IBlockState state,
-			final Random rand,
-			final int fortune )
 	{
 		return null;
 	}
 
 	@Override
-	public int getWeakPower(
+	public int getWeakPower( final IBlockAccess w, final BlockPos pos, final IBlockState state, final EnumFacing side )
-			final IBlockAccess w,
-			final BlockPos pos,
-			final IBlockState state,
-			final EnumFacing side )
 	{
 		return this.cb( w, pos ).isProvidingWeakPower( side.getOpposite() ); // TODO:
-																		// IS
+		// IS
-																		// OPPOSITE!?
+		// OPPOSITE!?
 	}
 
 	@Override
@@ -150,31 +136,21 @@ public class BlockCableBus extends AEBaseTileBlock // implements
 	}
 
 	@Override
-	public void onEntityCollidedWithBlock(
+	public void onEntityCollidedWithBlock( final World w, final BlockPos pos, final IBlockState state, final Entity entityIn )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final Entity entityIn )
 	{
 		this.cb( w, pos ).onEntityCollision( entityIn );
 	}
 
 	@Override
-	public int getStrongPower(
+	public int getStrongPower( final IBlockAccess w, final BlockPos pos, final IBlockState state, final EnumFacing side )
-			final IBlockAccess w,
-			final BlockPos pos,
-			final IBlockState state,
-			final EnumFacing side )
 	{
 		return this.cb( w, pos ).isProvidingStrongPower( side.getOpposite() ); // TODO:
-																			// IS
+																				// IS
-																			// OPPOSITE!?
+																				// OPPOSITE!?
 	}
 
 	@Override
-	public int getLightValue(
+	public int getLightValue( final IBlockAccess world, final BlockPos pos )
-			final IBlockAccess world,
-			final BlockPos pos )
 	{
 		final IBlockState block = world.getBlockState( pos );
 		if( block != null && block.getBlock() != this )
@@ -189,37 +165,25 @@ public class BlockCableBus extends AEBaseTileBlock // implements
 	}
 
 	@Override
-	public boolean isLadder(
+	public boolean isLadder( final IBlockAccess world, final BlockPos pos, final EntityLivingBase entity )
-			final IBlockAccess world,
-			final BlockPos pos,
-			final EntityLivingBase entity )
 	{
 		return this.cb( world, pos ).isLadder( entity );
 	}
 
 	@Override
-	public boolean isSideSolid(
+	public boolean isSideSolid( final IBlockAccess w, final BlockPos pos, final EnumFacing side )
-			final IBlockAccess w,
-			final BlockPos pos,
-			final EnumFacing side )
 	{
 		return this.cb( w, pos ).isSolidOnSide( side );
 	}
 
 	@Override
-	public boolean isReplaceable(
+	public boolean isReplaceable( final World w, final BlockPos pos )
-			final World w,
-			final BlockPos pos )
 	{
 		return this.cb( w, pos ).isEmpty();
 	}
 
 	@Override
-	public boolean removedByPlayer(
+	public boolean removedByPlayer( final World world, final BlockPos pos, final EntityPlayer player, final boolean willHarvest )
-			final World world,
-			final BlockPos pos,
-			final EntityPlayer player,
-			final boolean willHarvest )
 	{
 		if( player.capabilities.isCreativeMode )
 		{
@@ -234,10 +198,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
 	}
 
 	@Override
-	public boolean canConnectRedstone(
+	public boolean canConnectRedstone( final IBlockAccess w, final BlockPos pos, EnumFacing side )
-			final IBlockAccess w,
-			final BlockPos pos,
-			EnumFacing side )
 	{
 		if( side == null )
 		{
@@ -248,8 +209,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
 	}
 
 	@Override
-	public boolean canRenderInLayer(
+	public boolean canRenderInLayer( final EnumWorldBlockLayer layer )
-			final EnumWorldBlockLayer layer )
 	{
 		if( AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass ) )
 		{
@@ -260,10 +220,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
 	}
 
 	@Override
-	public ItemStack getPickBlock(
+	public ItemStack getPickBlock( final MovingObjectPosition target, final World world, final BlockPos pos )
-			final MovingObjectPosition target,
-			final World world,
-			final BlockPos pos )
 	{
 		final Vec3 v3 = target.hitVec.subtract( pos.getX(), pos.getY(), pos.getZ() );
 		final SelectedPart sp = this.cb( world, pos ).selectPart( v3 );
@@ -282,10 +239,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
 
 	@Override
 	@SideOnly( Side.CLIENT )
-	public boolean addHitEffects(
+	public boolean addHitEffects( final World world, final MovingObjectPosition target, final EffectRenderer effectRenderer )
-			final World world,
-			final MovingObjectPosition target,
-			final EffectRenderer effectRenderer )
 	{
 		final Object object = this.cb( world, target.getBlockPos() );
 		if( object instanceof IPartHost )
@@ -316,10 +270,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
 	}
 
 	@Override
-	public boolean addDestroyEffects(
+	public boolean addDestroyEffects( final World world, final BlockPos pos, final EffectRenderer effectRenderer )
-			final World world,
-			final BlockPos pos,
-			final EffectRenderer effectRenderer )
 	{
 		final Object object = this.cb( world, pos );
 		if( object instanceof IPartHost )
@@ -345,11 +296,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
 	}
 
 	@Override
-	public void onNeighborBlockChange(
+	public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final Block neighborBlock )
 	{
 		if( Platform.isServer() )
 		{
@@ -357,9 +304,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
 		}
 	}
 
-	private ICableBusContainer cb(
+	private ICableBusContainer cb( final IBlockAccess w, final BlockPos pos )
-			final IBlockAccess w,
-			final BlockPos pos )
 	{
 		final TileEntity te = w.getTileEntity( pos );
 		ICableBusContainer out = null;
@@ -383,34 +328,18 @@ public class BlockCableBus extends AEBaseTileBlock // implements
 	}
 
 	@Override
-	public boolean onActivated(
+	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final World w,
-			final BlockPos pos,
-			final EntityPlayer player,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		return this.cb( w, pos ).activate( player, new Vec3( hitX, hitY, hitZ ) );
 	}
 
 	@Override
-	public boolean recolorBlock(
+	public boolean recolorBlock( final World world, final BlockPos pos, final EnumFacing side, final EnumDyeColor color )
-			final World world,
-			final BlockPos pos,
-			final EnumFacing side,
-			final EnumDyeColor color )
 	{
 		return this.recolorBlock( world, pos, side, color, null );
 	}
 
-	public boolean recolorBlock(
+	public boolean recolorBlock( final World world, final BlockPos pos, final EnumFacing side, final EnumDyeColor color, final EntityPlayer who )
-			final World world,
-			final BlockPos pos,
-			final EnumFacing side,
-			final EnumDyeColor color,
-			final EntityPlayer who )
 	{
 		try
 		{
@@ -424,18 +353,13 @@ public class BlockCableBus extends AEBaseTileBlock // implements
 
 	@Override
 	@SideOnly( Side.CLIENT )
-	public void getCheckedSubBlocks(
+	public void getCheckedSubBlocks( final Item item, final CreativeTabs tabs, final List<ItemStack> itemStacks )
-			final Item item,
-			final CreativeTabs tabs,
-			final List<ItemStack> itemStacks )
 	{
 		// do nothing
 	}
 
 	@Override
-	public <T extends AEBaseTile> T getTileEntity(
+	public <T extends AEBaseTile> T getTileEntity( final IBlockAccess w, final BlockPos pos )
-			final IBlockAccess w,
-			final BlockPos pos )
 	{
 		final TileEntity te = w.getTileEntity( pos );
 
@@ -453,8 +377,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
 	}
 
 	@Override
-	protected void setFeature(
+	protected void setFeature( final EnumSet<AEFeature> f )
-			final EnumSet<AEFeature> f )
 	{
 		final AECableBusFeatureHandler featureHandler = new AECableBusFeatureHandler( f, this, this.getFeatureSubName() );
 		this.setHandler( featureHandler );

src/main/java/appeng/block/networking/BlockController.java

@@ -62,8 +62,7 @@ public class BlockController extends AEBaseTileBlock
 	}
 
 	@Override
-	public int getMetaFromState(
+	public int getMetaFromState( final IBlockState state )
-			final IBlockState state )
 	{
 		return ( (ControllerBlockState) state.getValue( CONTROLLER_STATE ) ).ordinal();
 	}
@@ -89,11 +88,7 @@ public class BlockController extends AEBaseTileBlock
 	}
 
 	@Override
-	public void onNeighborBlockChange(
+	public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final Block neighborBlock )
 	{
 		final TileController tc = this.getTileEntity( w, pos );
 		if( tc != null )

src/main/java/appeng/block/networking/BlockEnergyCell.java

@@ -50,8 +50,7 @@ public class BlockEnergyCell extends AEBaseTileBlock
 	public static final PropertyInteger ENERGY_STORAGE = PropertyInteger.create( "fullness", 0, 8 );
 
 	@Override
-	public int getMetaFromState(
+	public int getMetaFromState( final IBlockState state )
-			final IBlockState state )
 	{
 		return (int) state.getValue( ENERGY_STORAGE );
 	}

src/main/java/appeng/block/networking/BlockWireless.java

@@ -70,15 +70,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public boolean onBlockActivated(
+	public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final EntityPlayer player,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		if( player.isSneaking() )
 		{
@@ -98,11 +90,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool(
+	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b )
-			final World w,
-			final BlockPos pos,
-			final Entity thePlayer,
-			final boolean b )
 	{
 		final TileWireless tile = this.getTileEntity( w, pos );
 		if( tile != null )
@@ -164,12 +152,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public void addCollidingBlockToList(
+	public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List<AxisAlignedBB> out, final Entity e )
-			final World w,
-			final BlockPos pos,
-			final AxisAlignedBB bb,
-			final List<AxisAlignedBB> out,
-			final Entity e )
 	{
 		final TileWireless tile = this.getTileEntity( w, pos );
 		if( tile != null )

src/main/java/appeng/block/qnb/BlockQuantumBase.java

@@ -56,11 +56,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto
 	}
 
 	@Override
-	public void onNeighborBlockChange(
+	public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final Block neighborBlock )
 	{
 		final TileQuantumBridge bridge = this.getTileEntity( w, pos );
 		if( bridge != null )
@@ -70,10 +66,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto
 	}
 
 	@Override
-	public void breakBlock(
+	public void breakBlock( final World w, final BlockPos pos, final IBlockState state )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state )
 	{
 		final TileQuantumBridge bridge = this.getTileEntity( w, pos );
 		if( bridge != null )

src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java

@@ -49,11 +49,7 @@ public class BlockQuantumLinkChamber extends BlockQuantumBase
 	}
 
 	@Override
-	public void randomDisplayTick(
+	public void randomDisplayTick( final World w, final BlockPos pos, final IBlockState state, final Random rand )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final Random rand )
 	{
 		final TileQuantumBridge bridge = this.getTileEntity( w, pos );
 		if( bridge != null )
@@ -69,14 +65,7 @@ public class BlockQuantumLinkChamber extends BlockQuantumBase
 	}
 
 	@Override
-	public boolean onActivated(
+	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final World w,
-			final BlockPos pos,
-			final EntityPlayer p,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		if( p.isSneaking() )
 		{
@@ -96,23 +85,14 @@ public class BlockQuantumLinkChamber extends BlockQuantumBase
 	}
 
 	@Override
-	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool(
+	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b )
-			final World w,
-			final BlockPos pos,
-			final Entity thePlayer,
-			final boolean b )
 	{
 		final double onePixel = 2.0 / 16.0;
 		return Collections.singletonList( AxisAlignedBB.fromBounds( onePixel, onePixel, onePixel, 1.0 - onePixel, 1.0 - onePixel, 1.0 - onePixel ) );
 	}
 
 	@Override
-	public void addCollidingBlockToList(
+	public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List<AxisAlignedBB> out, final Entity e )
-			final World w,
-			final BlockPos pos,
-			final AxisAlignedBB bb,
-			final List<AxisAlignedBB> out,
-			final Entity e )
 	{
 		final double onePixel = 2.0 / 16.0;
 		out.add( AxisAlignedBB.fromBounds( onePixel, onePixel, onePixel, 1.0 - onePixel, 1.0 - onePixel, 1.0 - onePixel ) );

src/main/java/appeng/block/qnb/BlockQuantumRing.java

@@ -40,11 +40,7 @@ public class BlockQuantumRing extends BlockQuantumBase
 	}
 
 	@Override
-	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool(
+	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b )
-			final World w,
-			final BlockPos pos,
-			final Entity thePlayer,
-			final boolean b )
 	{
 		double onePixel = 2.0 / 16.0;
 		final TileQuantumBridge bridge = this.getTileEntity( w, pos );
@@ -60,12 +56,7 @@ public class BlockQuantumRing extends BlockQuantumBase
 	}
 
 	@Override
-	public void addCollidingBlockToList(
+	public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List<AxisAlignedBB> out, final Entity e )
-			final World w,
-			final BlockPos pos,
-			final AxisAlignedBB bb,
-			final List<AxisAlignedBB> out,
-			final Entity e )
 	{
 		double onePixel = 2.0 / 16.0;
 		final TileQuantumBridge bridge = this.getTileEntity( w, pos );

src/main/java/appeng/block/spatial/BlockMatrixFrame.java

@@ -70,49 +70,32 @@ public class BlockMatrixFrame extends AEBaseBlock implements ICustomCollision
 	}
 
 	@Override
-	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool(
+	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b )
-			final World w,
-			final BlockPos pos,
-			final Entity thePlayer,
-			final boolean b )
 	{
 		return Arrays.asList( new AxisAlignedBB[] {} );// AxisAlignedBB.getBoundingBox( 0.25, 0, 0.25, 0.75, 0.5, 0.75 )
 		// } );
 	}
 
 	@Override
-	public void addCollidingBlockToList(
+	public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List<AxisAlignedBB> out, final Entity e )
-			final World w,
-			final BlockPos pos,
-			final AxisAlignedBB bb,
-			final List<AxisAlignedBB> out,
-			final Entity e )
 	{
 		out.add( AxisAlignedBB.fromBounds( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) );
 	}
 
 	@Override
-	public boolean canPlaceBlockAt(
+	public boolean canPlaceBlockAt( final World worldIn, final BlockPos pos )
-			final World worldIn,
-			final BlockPos pos )
 	{
 		return false;
 	}
 
 	@Override
-	public void onBlockExploded(
+	public void onBlockExploded( final World world, final BlockPos pos, final Explosion explosion )
-			final World world,
-			final BlockPos pos,
-			final Explosion explosion )
 	{
 		// Don't explode.
 	}
 
 	@Override
-	public boolean canEntityDestroy(
+	public boolean canEntityDestroy( final IBlockAccess world, final BlockPos pos, final Entity entity )
-			final IBlockAccess world,
-			final BlockPos pos,
-			final Entity entity )
 	{
 		return false;
 	}

src/main/java/appeng/block/spatial/BlockSpatialIOPort.java

@@ -48,11 +48,7 @@ public class BlockSpatialIOPort extends AEBaseTileBlock
 	}
 
 	@Override
-	public void onNeighborBlockChange(
+	public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final Block neighborBlock )
 	{
 		final TileSpatialIOPort te = this.getTileEntity( w, pos );
 		if( te != null )
@@ -62,14 +58,7 @@ public class BlockSpatialIOPort extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated(
+	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final World w,
-			final BlockPos pos,
-			final EntityPlayer p,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		if( p.isSneaking() )
 		{

src/main/java/appeng/block/spatial/BlockSpatialPylon.java

@@ -46,11 +46,7 @@ public class BlockSpatialPylon extends AEBaseTileBlock
 	}
 
 	@Override
-	public void onNeighborBlockChange(
+	public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final Block neighborBlock )
 	{
 		final TileSpatialPylon tsp = this.getTileEntity( w, pos );
 		if( tsp != null )
@@ -60,9 +56,7 @@ public class BlockSpatialPylon extends AEBaseTileBlock
 	}
 
 	@Override
-	public int getLightValue(
+	public int getLightValue( final IBlockAccess w, final BlockPos pos )
-			final IBlockAccess w,
-			final BlockPos pos )
 	{
 		final TileSpatialPylon tsp = this.getTileEntity( w, pos );
 		if( tsp != null )

src/main/java/appeng/block/storage/BlockChest.java

@@ -65,14 +65,7 @@ public class BlockChest extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated(
+	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final World w,
-			final BlockPos pos,
-			final EntityPlayer p,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		final TileChest tg = this.getTileEntity( w, pos );
 		if( tg != null && !p.isSneaking() )

src/main/java/appeng/block/storage/BlockDrive.java

@@ -61,14 +61,7 @@ public class BlockDrive extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated(
+	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final World w,
-			final BlockPos pos,
-			final EntityPlayer p,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		if( p.isSneaking() )
 		{

src/main/java/appeng/block/storage/BlockIOPort.java

@@ -48,11 +48,7 @@ public class BlockIOPort extends AEBaseTileBlock
 	}
 
 	@Override
-	public void onNeighborBlockChange(
+	public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final Block neighborBlock )
 	{
 		final TileIOPort te = this.getTileEntity( w, pos );
 		if( te != null )
@@ -62,14 +58,7 @@ public class BlockIOPort extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated(
+	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final World w,
-			final BlockPos pos,
-			final EntityPlayer p,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		if( p.isSneaking() )
 		{

src/main/java/appeng/block/storage/BlockSkyChest.java

@@ -74,14 +74,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public boolean onActivated(
+	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final World w,
-			final BlockPos pos,
-			final EntityPlayer player,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		if( Platform.isServer() )
 		{
@@ -92,11 +85,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool(
+	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b )
-			final World w,
-			final BlockPos pos,
-			final Entity thePlayer,
-			final boolean b )
 	{
 		final TileSkyChest sk = this.getTileEntity( w, pos );
 		EnumFacing o = EnumFacing.UP;
@@ -115,12 +104,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public void addCollidingBlockToList(
+	public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List<AxisAlignedBB> out, final Entity e )
-			final World w,
-			final BlockPos pos,
-			final AxisAlignedBB bb,
-			final List<AxisAlignedBB> out,
-			final Entity e )
 	{
 		out.add( AxisAlignedBB.fromBounds( 0.05, 0.05, 0.05, 0.95, 0.95, 0.95 ) );
 	}

src/main/java/appeng/client/ClientHelper.java

@@ -262,8 +262,7 @@ public class ClientHelper extends ServerHelper
 		inst.entityRenderMap.put( EntityFloatingItem.class, new RenderFloatingItem( inst ) );
 
 		final ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher();
-		final ItemMeshDefinition imd = new ItemMeshDefinition()
+		final ItemMeshDefinition imd = new ItemMeshDefinition(){
-		{
 
 			@Override
 			public ModelResourceLocation getModelLocation( final ItemStack stack )

src/main/java/appeng/client/SmartModel.java

@@ -31,15 +31,13 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode
 
 	private final BlockRenderInfo aeRenderer;
 
-	public SmartModel(
+	public SmartModel( final BlockRenderInfo rendererInstance )
-			final BlockRenderInfo rendererInstance )
 	{
 		this.aeRenderer = rendererInstance;
 	}
 
 	@Override
-	public List getFaceQuads(
+	public List getFaceQuads( final EnumFacing p_177551_1_ )
-			final EnumFacing p_177551_1_ )
 	{
 		return Collections.emptyList();
 	}
@@ -81,8 +79,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode
 	}
 
 	@Override
-	public IBakedModel handleItemState(
+	public IBakedModel handleItemState( final ItemStack stack )
-			final ItemStack stack )
 	{
 		final ModelGenerator helper = new ModelGenerator();
 		final Block blk = Block.getBlockFromItem( stack.getItem() );
@@ -93,8 +90,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode
 	}
 
 	@Override
-	public IBakedModel handleBlockState(
+	public IBakedModel handleBlockState( final IBlockState state )
-			final IBlockState state )
 	{
 		final ModelGenerator helper = new ModelGenerator();
 		final Block blk = state.getBlock();

src/main/java/appeng/client/render/AppEngRenderItem.java

@@ -48,9 +48,7 @@ import appeng.util.ReadableNumberConverter;
  */
 public class AppEngRenderItem extends RenderItem
 {
-	public AppEngRenderItem(
+	public AppEngRenderItem( final TextureManager textureManager, final ModelManager modelManager )
-			final TextureManager textureManager,
-			final ModelManager modelManager )
 	{
 		super( textureManager, modelManager );
 	}
@@ -61,12 +59,7 @@ public class AppEngRenderItem extends RenderItem
 	private IAEItemStack aeStack = null;
 
 	@Override
-	public void renderItemOverlayIntoGUI(
+	public void renderItemOverlayIntoGUI( final FontRenderer fontRenderer, final ItemStack is, final int xPos, final int yPos, final String text )
-			final FontRenderer fontRenderer,
-			final ItemStack is,
-			final int xPos,
-			final int yPos,
-			final String text )
 	{
 		if( is != null )
 		{

src/main/java/appeng/client/render/BaseBlockRender.java

@@ -443,11 +443,11 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
 
 	protected void renderBlockBounds( final ModelGenerator renderer,
 
-			double minX, double minY, double minZ,
+	double minX, double minY, double minZ,
 
-			double maxX, double maxY, double maxZ,
+	double maxX, double maxY, double maxZ,
 
-			final EnumFacing x, final EnumFacing y, final EnumFacing z )
+	final EnumFacing x, final EnumFacing y, final EnumFacing z )
 	{
 		minX /= 16.0;
 		minY /= 16.0;
@@ -557,28 +557,28 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
 		final double layerBX = 0.0;
 		final double layerAY = 0.0;
 		this.renderFace( orientation, tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
-				// u -> u
+		// u -> u
-				0, 1.0,
+		0, 1.0,
-				// v -> v
+		// v -> v
-				0, edgeThickness, ico, flip );
+		0, edgeThickness, ico, flip );
 
 		this.renderFace( orientation, tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
-				// u -> u
+		// u -> u
-				0.0, edgeThickness,
+		0.0, edgeThickness,
-				// v -> v
+		// v -> v
-				edgeThickness, 1.0 - edgeThickness, ico, flip );
+		edgeThickness, 1.0 - edgeThickness, ico, flip );
 
 		this.renderFace( orientation, tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
-				// u -> u
+		// u -> u
-				1.0 - edgeThickness, 1.0,
+		1.0 - edgeThickness, 1.0,
-				// v -> v
+		// v -> v
-				edgeThickness, 1.0 - edgeThickness, ico, flip );
+		edgeThickness, 1.0 - edgeThickness, ico, flip );
 
 		this.renderFace( orientation, tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
-				// u -> u
+		// u -> u
-				0, 1.0,
+		0, 1.0,
-				// v -> v
+		// v -> v
-				1.0 - edgeThickness, 1.0, ico, flip );
+		1.0 - edgeThickness, 1.0, ico, flip );
 	}
 
 	@SideOnly( Side.CLIENT )

src/main/java/appeng/client/render/BusRenderer.java

@@ -31,8 +31,7 @@ public class BusRenderer
 		return this.mg;
 	}
 
-	public void setRenderer(
+	public void setRenderer( ModelGenerator renderer )
-			ModelGenerator renderer )
 	{
 		this.mg = renderer;
 	}

src/main/java/appeng/client/render/ISimpleBlockRenderingHandler.java

@@ -10,17 +10,8 @@ import net.minecraft.world.IBlockAccess;
 public interface ISimpleBlockRenderingHandler
 {
 
-	void renderInventoryBlock(
+	void renderInventoryBlock( Block block, int metadata, int modelID, ModelGenerator renderer );
-			Block block,
-			int metadata,
-			int modelID,
-			ModelGenerator renderer );
 
-	boolean renderWorldBlock(
+	boolean renderWorldBlock( IBlockAccess world, BlockPos pos, Block block, int modelId, ModelGenerator renderer );
-			IBlockAccess world,
-			BlockPos pos,
-			Block block,
-			int modelId,
-			ModelGenerator renderer );
 
 }

src/main/java/appeng/client/render/IconUnwrapper.java

@@ -18,8 +18,7 @@ public class IconUnwrapper extends TextureAtlasSprite
 	private final float min_v;
 	private final float max_v;
 
-	protected IconUnwrapper(
+	protected IconUnwrapper( final IAESprite src )
-			final IAESprite src )
 	{
 		super( src.getIconName() );
 		this.width = src.getIconWidth();

src/main/java/appeng/client/render/ModelGenerator.java

@@ -90,8 +90,7 @@ public class ModelGenerator
 		}
 
 		@Override
-		public List getFaceQuads(
+		public List getFaceQuads( final EnumFacing p_177551_1_ )
-				final EnumFacing p_177551_1_ )
 		{
 			return this.faces[p_177551_1_.ordinal()];
 		}
@@ -125,16 +124,7 @@ public class ModelGenerator
 	private float tx = 0, ty = 0, tz = 0;
 	private final float[] defUVs = { 0, 0, 1, 1 };
 
-	private final float[] quadsUV = {
+	private final float[] quadsUV = { 0, 0, 1, 1, 0, 0, 1, 1 };
-			0,
-			0,
-			1,
-			1,
-			0,
-			0,
-			1,
-			1
-	};
 	private EnumSet<EnumFacing> renderFaces = EnumSet.allOf( EnumFacing.class );
 	private boolean flipTexture = false;
 	private final List<SMFace> faces = new ArrayList();
@@ -145,8 +135,7 @@ public class ModelGenerator
 	private EnumFacing currentFace = EnumFacing.UP;
 	private int color = -1;
 
-	public void setRenderBoundsFromBlock(
+	public void setRenderBoundsFromBlock( final Block block )
-			final Block block )
 	{
 		if( block == null )
 		{
@@ -161,13 +150,7 @@ public class ModelGenerator
 		this.setRenderMaxZ( block.getBlockBoundsMaxZ() );
 	}
 
-	public void setRenderBounds(
+	public void setRenderBounds( final double d, final double e, final double f, final double g, final double h, final double i )
-			final double d,
-			final double e,
-			final double f,
-			final double g,
-			final double h,
-			final double i )
 	{
 		this.setRenderMinX( d );
 		this.setRenderMinY( e );
@@ -177,74 +160,49 @@ public class ModelGenerator
 		this.setRenderMaxZ( i );
 	}
 
-	public void setBrightness(
+	public void setBrightness( final int i )
-			final int i )
 	{
 		this.brightness = i;
 	}
 
-	public void setColorRGBA_F(
+	public void setColorRGBA_F( final int r, final int g, final int b, final float a )
-			final int r,
-			final int g,
-			final int b,
-			final float a )
 	{
 		final int alpha = (int) ( a * 0xff );
-		this.color = alpha << 24 |
+		this.color = alpha << 24 | r << 16 | b << 8 | b;
-				r << 16 |
-				b << 8 |
-				b;
 	}
 
-	public void setColorOpaque_I(
+	public void setColorOpaque_I( final int whiteVariant )
-			final int whiteVariant )
 	{
 		final int alpha = 0xff;
 		this.color = // alpha << 24 |
 		whiteVariant;
 	}
 
-	public void setColorOpaque(
+	public void setColorOpaque( final int r, final int g, final int b )
-			final int r,
-			final int g,
-			final int b )
 	{
 		final int alpha = 0xff;
 		this.color = // alpha << 24 |
-		r << 16 |
+		r << 16 | g << 8 | b;
-				g << 8 |
-				b;
 	}
 
-	public void setColorOpaque_F(
+	public void setColorOpaque_F( final int r, final int g, final int b )
-			final int r,
-			final int g,
-			final int b )
 	{
 		final int alpha = 0xff;
 		this.color = // alpha << 24 |
-		Math.min( 0xff, Math.max( 0, r ) ) << 16 |
+		Math.min( 0xff, Math.max( 0, r ) ) << 16 | Math.min( 0xff, Math.max( 0, g ) ) << 8 | Math.min( 0xff, Math.max( 0, b ) );
-				Math.min( 0xff, Math.max( 0, g ) ) << 8 |
-				Math.min( 0xff, Math.max( 0, b ) );
 	}
 
-	public void setColorOpaque_F(
+	public void setColorOpaque_F( final float rf, final float bf, final float gf )
-			final float rf,
-			final float bf,
-			final float gf )
 	{
 		final int r = (int) ( rf * 0xff );
 		final int g = (int) ( gf * 0xff );
 		final int b = (int) ( bf * 0xff );
 		final int alpha = 0xff;
 		this.color = // alpha << 24 |
-		Math.min( 0xff, Math.max( 0, r ) ) << 16 |
+		Math.min( 0xff, Math.max( 0, r ) ) << 16 | Math.min( 0xff, Math.max( 0, g ) ) << 8 | Math.min( 0xff, Math.max( 0, b ) );
-				Math.min( 0xff, Math.max( 0, g ) ) << 8 |
-				Math.min( 0xff, Math.max( 0, b ) );
 	}
 
-	public IAESprite getIcon(
+	public IAESprite getIcon( final ItemStack is )
-			final ItemStack is )
 	{
 		final Item it = is.getItem();
 
@@ -272,8 +230,7 @@ public class ModelGenerator
 		return new MissingIcon( is );
 	}
 
-	public IAESprite[] getIcon(
+	public IAESprite[] getIcon( final IBlockState state )
-			final IBlockState state )
 	{
 		final IAESprite[] out = new IAESprite[6];
 
@@ -334,52 +291,20 @@ public class ModelGenerator
 		return this.getIcon( state );
 	}
 
-	public void addVertexWithUV(
+	public void addVertexWithUV( final EnumFacing face, final double x, final double y, final double z, final double u, final double v )
-			final EnumFacing face,
-			final double x,
-			final double y,
-			final double z,
-			final double u,
-			final double v )
 	{
 		this.points[this.point++] = new float[] { (float) x + this.tx, (float) y + this.ty, (float) z + this.tz, (float) u, (float) v };
 
 		if( this.point == 4 )
 		{
 			this.brightness = -1;
-			final int[] vertData = {
+			final int[] vertData = { Float.floatToRawIntBits( this.points[0][0] ), Float.floatToRawIntBits( this.points[0][1] ), Float.floatToRawIntBits( this.points[0][2] ), this.brightness, Float.floatToRawIntBits( this.points[0][3] ), Float.floatToRawIntBits( this.points[0][4] ), 0,
-					Float.floatToRawIntBits( this.points[0][0] ),
-					Float.floatToRawIntBits( this.points[0][1] ),
-					Float.floatToRawIntBits( this.points[0][2] ),
-					this.brightness,
-					Float.floatToRawIntBits( this.points[0][3] ),
-					Float.floatToRawIntBits( this.points[0][4] ),
-					0,
 
-					Float.floatToRawIntBits( this.points[1][0] ),
+			Float.floatToRawIntBits( this.points[1][0] ), Float.floatToRawIntBits( this.points[1][1] ), Float.floatToRawIntBits( this.points[1][2] ), this.brightness, Float.floatToRawIntBits( this.points[1][3] ), Float.floatToRawIntBits( this.points[1][4] ), 0,
-					Float.floatToRawIntBits( this.points[1][1] ),
-					Float.floatToRawIntBits( this.points[1][2] ),
-					this.brightness,
-					Float.floatToRawIntBits( this.points[1][3] ),
-					Float.floatToRawIntBits( this.points[1][4] ),
-					0,
 
-					Float.floatToRawIntBits( this.points[2][0] ),
+			Float.floatToRawIntBits( this.points[2][0] ), Float.floatToRawIntBits( this.points[2][1] ), Float.floatToRawIntBits( this.points[2][2] ), this.brightness, Float.floatToRawIntBits( this.points[2][3] ), Float.floatToRawIntBits( this.points[2][4] ), 0,
-					Float.floatToRawIntBits( this.points[2][1] ),
-					Float.floatToRawIntBits( this.points[2][2] ),
-					this.brightness,
-					Float.floatToRawIntBits( this.points[2][3] ),
-					Float.floatToRawIntBits( this.points[2][4] ),
-					0,
 
-					Float.floatToRawIntBits( this.points[3][0] ),
+			Float.floatToRawIntBits( this.points[3][0] ), Float.floatToRawIntBits( this.points[3][1] ), Float.floatToRawIntBits( this.points[3][2] ), this.brightness, Float.floatToRawIntBits( this.points[3][3] ), Float.floatToRawIntBits( this.points[3][4] ), 0, };
-					Float.floatToRawIntBits( this.points[3][1] ),
-					Float.floatToRawIntBits( this.points[3][2] ),
-					this.brightness,
-					Float.floatToRawIntBits( this.points[3][3] ),
-					Float.floatToRawIntBits( this.points[3][4] ),
-					0,
-			};
 
 			this.generatedModel.general.add( new IColoredBakedQuad.ColoredBakedQuad( vertData, this.color, face ) );
 
@@ -387,9 +312,7 @@ public class ModelGenerator
 		}
 	}
 
-	public boolean renderStandardBlock(
+	public boolean renderStandardBlock( final Block block, final BlockPos pos )
-			final Block block,
-			final BlockPos pos )
 	{
 		// setRenderBoundsFromBlock( block );
 
@@ -406,10 +329,7 @@ public class ModelGenerator
 		return false;
 	}
 
-	public void setTranslation(
+	public void setTranslation( final int x, final int y, final int z )
-			final int x,
-			final int y,
-			final int z )
 	{
 		this.tx = x;
 		this.ty = y;
@@ -421,10 +341,7 @@ public class ModelGenerator
 		return MinecraftForgeClient.getRenderLayer() == EnumWorldBlockLayer.TRANSLUCENT;
 	}
 
-	private float[] getFaceUvs(
+	private float[] getFaceUvs( final EnumFacing face, final Vector3f to_16, final Vector3f from_16 )
-			final EnumFacing face,
-			final Vector3f to_16,
-			final Vector3f from_16 )
 	{
 		float from_a = 0;
 		float from_b = 0;
@@ -494,10 +411,7 @@ public class ModelGenerator
 		return afloat;
 	}
 
-	public void renderFaceXNeg(
+	public void renderFaceXNeg( final Block blk, final BlockPos pos, final IAESprite lights )
-			final Block blk,
-			final BlockPos pos,
-			final IAESprite lights )
 	{
 		final boolean isEdge = this.getRenderMinX() < 0.0001;
 		final Vector3f to = new Vector3f( (float) this.getRenderMinX() * 16.0f, (float) this.getRenderMinY() * 16.0f, (float) this.getRenderMinZ() * 16.0f );
@@ -507,10 +421,7 @@ public class ModelGenerator
 		this.addFace( myFace, isEdge, to, from, this.defUVs, lights );
 	}
 
-	public void renderFaceYNeg(
+	public void renderFaceYNeg( final Block blk, final BlockPos pos, final IAESprite lights )
-			final Block blk,
-			final BlockPos pos,
-			final IAESprite lights )
 	{
 		final boolean isEdge = this.getRenderMinY() < 0.0001;
 		final Vector3f to = new Vector3f( (float) this.getRenderMinX() * 16.0f, (float) this.getRenderMinY() * 16.0f, (float) this.getRenderMinZ() * 16.0f );
@@ -520,10 +431,7 @@ public class ModelGenerator
 		this.addFace( myFace, isEdge, to, from, this.defUVs, lights );
 	}
 
-	public void renderFaceZNeg(
+	public void renderFaceZNeg( final Block blk, final BlockPos pos, final IAESprite lights )
-			final Block blk,
-			final BlockPos pos,
-			final IAESprite lights )
 	{
 		final boolean isEdge = this.getRenderMinZ() < 0.0001;
 		final Vector3f to = new Vector3f( (float) this.getRenderMinX() * 16.0f, (float) this.getRenderMinY() * 16.0f, (float) this.getRenderMinZ() * 16.0f );
@@ -533,10 +441,7 @@ public class ModelGenerator
 		this.addFace( myFace, isEdge, to, from, this.defUVs, lights );
 	}
 
-	public void renderFaceYPos(
+	public void renderFaceYPos( final Block blk, final BlockPos pos, final IAESprite lights )
-			final Block blk,
-			final BlockPos pos,
-			final IAESprite lights )
 	{
 		final boolean isEdge = this.getRenderMaxY() > 0.9999;
 		final Vector3f to = new Vector3f( (float) this.getRenderMinX() * 16.0f, (float) this.getRenderMaxY() * 16.0f, (float) this.getRenderMinZ() * 16.0f );
@@ -546,10 +451,7 @@ public class ModelGenerator
 		this.addFace( myFace, isEdge, to, from, this.defUVs, lights );
 	}
 
-	public void renderFaceZPos(
+	public void renderFaceZPos( final Block blk, final BlockPos pos, final IAESprite lights )
-			final Block blk,
-			final BlockPos pos,
-			final IAESprite lights )
 	{
 		final boolean isEdge = this.getRenderMaxZ() > 0.9999;
 		final Vector3f to = new Vector3f( (float) this.getRenderMinX() * 16.0f, (float) this.getRenderMinY() * 16.0f, (float) this.getRenderMaxZ() * 16.0f );
@@ -559,10 +461,7 @@ public class ModelGenerator
 		this.addFace( myFace, isEdge, to, from, this.defUVs, lights );
 	}
 
-	public void renderFaceXPos(
+	public void renderFaceXPos( final Block blk, final BlockPos pos, final IAESprite lights )
-			final Block blk,
-			final BlockPos pos,
-			final IAESprite lights )
 	{
 		final boolean isEdge = this.getRenderMaxX() > 0.9999;
 		final Vector3f to = new Vector3f( (float) this.getRenderMaxX() * 16.0f, (float) this.getRenderMinY() * 16.0f, (float) this.getRenderMinZ() * 16.0f );
@@ -572,12 +471,7 @@ public class ModelGenerator
 		this.addFace( myFace, isEdge, to, from, this.defUVs, lights );
 	}
 
-	private void addFace(
+	private void addFace( final EnumFacing face, final boolean isEdge, final Vector3f to, final Vector3f from, final float[] defUVs2, IAESprite texture )
-			final EnumFacing face, final boolean isEdge,
-			final Vector3f to,
-			final Vector3f from,
-			final float[] defUVs2,
-			IAESprite texture )
 	{
 		if( this.getOverrideBlockTexture() != null )
 		{
@@ -587,10 +481,7 @@ public class ModelGenerator
 		this.faces.add( new SMFace( face, isEdge, this.color, to, from, defUVs2, new IconUnwrapper( texture ) ) );
 	}
 
-	public void setNormal(
+	public void setNormal( final float x, final float y, final float z )
-			final float x,
-			final float y,
-			final float z )
 	{
 		if( x > 0.5 )
 		{
@@ -618,8 +509,7 @@ public class ModelGenerator
 		}
 	}
 
-	public void setOverrideBlockTexture(
+	public void setOverrideBlockTexture( final IAESprite object )
-			final IAESprite object )
 	{
 		this.overrideBlockTexture = object;
 	}

src/main/java/appeng/client/render/RenderBlocksWorkaround.java

@@ -36,8 +36,7 @@ public class RenderBlocksWorkaround extends ModelGenerator
 	private EnumSet<EnumFacing> renderFaces;
 	private float opacity;
 
-	public void setTexture(
+	public void setTexture( final Object object )
-			final Object object )
 	{
 		// TODO Auto-generated method stub
 	}

src/main/java/appeng/client/render/SMFace.java

@@ -23,13 +23,7 @@ public class SMFace
 
 	private final int color;
 
-	public SMFace(
+	public SMFace( final EnumFacing face, final boolean isEdge, final int color, final Vector3f to, final Vector3f from, final float[] defUVs2, final TextureAtlasSprite iconUnwrapper )
-			final EnumFacing face, final boolean isEdge,
-			final int color,
-			final Vector3f to,
-			final Vector3f from,
-			final float[] defUVs2,
-			final TextureAtlasSprite iconUnwrapper )
 	{
 		this.color = color;
 		this.face = face;

src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java

@@ -44,10 +44,7 @@ public class RenderBlockSkyChest extends BaseBlockRender<BlockSkyChest, TileSkyC
 
 	private static final ResourceLocation SKY_STONE_CHEST = new ResourceLocation( "appliedenergistics2", "textures/models/skychest.png" );
 	private static final ResourceLocation SKY_BLOCK_CHEST = new ResourceLocation( "appliedenergistics2", "textures/models/skyblockchest.png" );
-	private static final ResourceLocation[] METADATA_TO_TEXTURE = {
+	private static final ResourceLocation[] METADATA_TO_TEXTURE = { SKY_STONE_CHEST, SKY_BLOCK_CHEST };
-			SKY_STONE_CHEST,
-			SKY_BLOCK_CHEST
-	};
 
 	private final ModelChest model = new ModelChest();
 

src/main/java/appeng/client/texture/BaseIcon.java

@@ -33,8 +33,7 @@ public class BaseIcon implements IAESprite
 	}
 
 	@Override
-	public float getInterpolatedU(
+	public float getInterpolatedU( final double px )
-			final double px )
 	{
 		return this.spite.getInterpolatedU( px );
 	}
@@ -58,8 +57,7 @@ public class BaseIcon implements IAESprite
 	}
 
 	@Override
-	public float getInterpolatedV(
+	public float getInterpolatedV( final double px )
-			final double px )
 	{
 		return this.spite.getInterpolatedV( px );
 	}

src/main/java/appeng/client/texture/CableBusTextures.java

@@ -32,39 +32,128 @@ import appeng.core.AppEng;
 public enum CableBusTextures
 {
 
-	Channels00( "MECableSmart00" ), Channels01( "MECableSmart01" ), Channels02( "MECableSmart02" ), Channels03( "MECableSmart03" ), Channels10( "MECableSmart10" ), Channels11( "MECableSmart11" ), Channels12( "MECableSmart12" ), Channels13( "MECableSmart13" ), Channels14( "MECableSmart14" ), Channels04( "MECableSmart04" ),
+	Channels00( "MECableSmart00" ),
+	Channels01( "MECableSmart01" ),
+	Channels02( "MECableSmart02" ),
+	Channels03( "MECableSmart03" ),
+	Channels10( "MECableSmart10" ),
+	Channels11( "MECableSmart11" ),
+	Channels12( "MECableSmart12" ),
+	Channels13( "MECableSmart13" ),
+	Channels14( "MECableSmart14" ),
+	Channels04( "MECableSmart04" ),
 
-	LevelEmitterTorchOn( "ItemPart.LevelEmitterOn" ), BlockWirelessOn( "BlockWirelessOn" ),
+	LevelEmitterTorchOn( "ItemPart.LevelEmitterOn" ),
+	BlockWirelessOn( "BlockWirelessOn" ),
 
-	BlockP2PTunnel2( "ItemPart.P2PTunnel2" ), BlockP2PTunnel3( "ItemPart.P2PTunnel3" ),
+	BlockP2PTunnel2( "ItemPart.P2PTunnel2" ),
+	BlockP2PTunnel3( "ItemPart.P2PTunnel3" ),
 
 	// MEWaiting("MEWaiting"),
 
-	PartMonitorSides( "PartMonitorSides" ), PartMonitorBack( "PartMonitorBack" ),
+	PartMonitorSides( "PartMonitorSides" ),
+	PartMonitorBack( "PartMonitorBack" ),
 
-	Transparent( "Transparent" ), PartMonitorSidesStatus( "PartMonitorSidesStatus" ), PartMonitorSidesStatusLights( "PartMonitorSidesStatusLights" ),
+	Transparent( "Transparent" ),
+	PartMonitorSidesStatus( "PartMonitorSidesStatus" ),
+	PartMonitorSidesStatusLights( "PartMonitorSidesStatusLights" ),
 
-	PartMonitor_Colored( "PartMonitor_Colored" ), PartMonitor_Bright( "PartMonitor_Bright" ),
+	PartMonitor_Colored( "PartMonitor_Colored" ),
+	PartMonitor_Bright( "PartMonitor_Bright" ),
 
-	PartPatternTerm_Bright( "PartPatternTerm_Bright" ), PartPatternTerm_Colored( "PartPatternTerm_Colored" ), PartPatternTerm_Dark( "PartPatternTerm_Dark" ),
+	PartPatternTerm_Bright( "PartPatternTerm_Bright" ),
+	PartPatternTerm_Colored( "PartPatternTerm_Colored" ),
+	PartPatternTerm_Dark( "PartPatternTerm_Dark" ),
 
-	PartConversionMonitor_Bright( "PartConversionMonitor_Bright" ), PartConversionMonitor_Colored( "PartConversionMonitor_Colored" ), PartConversionMonitor_Dark( "PartConversionMonitor_Dark" ), PartConversionMonitor_Dark_Locked( "PartConversionMonitor_Dark_Locked" ),
+	PartConversionMonitor_Bright( "PartConversionMonitor_Bright" ),
+	PartConversionMonitor_Colored( "PartConversionMonitor_Colored" ),
+	PartConversionMonitor_Dark( "PartConversionMonitor_Dark" ),
+	PartConversionMonitor_Dark_Locked( "PartConversionMonitor_Dark_Locked" ),
 
-	PartInterfaceTerm_Bright( "PartInterfaceTerm_Bright" ), PartInterfaceTerm_Colored( "PartInterfaceTerm_Colored" ), PartInterfaceTerm_Dark( "PartInterfaceTerm_Dark" ),
+	PartInterfaceTerm_Bright( "PartInterfaceTerm_Bright" ),
+	PartInterfaceTerm_Colored( "PartInterfaceTerm_Colored" ),
+	PartInterfaceTerm_Dark( "PartInterfaceTerm_Dark" ),
 
-	PartCraftingTerm_Bright( "PartCraftingTerm_Bright" ), PartCraftingTerm_Colored( "PartCraftingTerm_Colored" ), PartCraftingTerm_Dark( "PartCraftingTerm_Dark" ), //
+	PartCraftingTerm_Bright( "PartCraftingTerm_Bright" ),
+	PartCraftingTerm_Colored( "PartCraftingTerm_Colored" ),
+	PartCraftingTerm_Dark( "PartCraftingTerm_Dark" ), //
 
-	PartStorageMonitor_Bright( "PartStorageMonitor_Bright" ), PartStorageMonitor_Colored( "PartStorageMonitor_Colored" ), PartStorageMonitor_Dark( "PartStorageMonitor_Dark" ), PartStorageMonitor_Colored_Locked( "PartStorageMonitor_Colored_Locked" ),
+	PartStorageMonitor_Bright( "PartStorageMonitor_Bright" ),
+	PartStorageMonitor_Colored( "PartStorageMonitor_Colored" ),
+	PartStorageMonitor_Dark( "PartStorageMonitor_Dark" ),
+	PartStorageMonitor_Colored_Locked( "PartStorageMonitor_Colored_Locked" ),
 
-	PartTerminal_Bright( "PartTerminal_Bright" ), PartTerminal_Colored( "PartTerminal_Colored" ), PartTerminal_Dark( "PartTerminal_Dark" ),
+	PartTerminal_Bright( "PartTerminal_Bright" ),
+	PartTerminal_Colored( "PartTerminal_Colored" ),
+	PartTerminal_Dark( "PartTerminal_Dark" ),
 
-	MECable_Green( "MECable_Green" ), MECable_Grey( "MECable_Grey" ), MECable_LightBlue( "MECable_LightBlue" ), MECable_LightGrey( "MECable_LightGrey" ), MECable_Lime( "MECable_Lime" ), MECable_Magenta( "MECable_Magenta" ), MECable_Orange( "MECable_Orange" ), MECable_Pink( "MECable_Pink" ), MECable_Purple( "MECable_Purple" ), MECable_Red( "MECable_Red" ), MECable_White( "MECable_White" ), MECable_Yellow( "MECable_Yellow" ), MECable_Black( "MECable_Black" ), MECable_Blue( "MECable_Blue" ), MECable_Brown( "MECable_Brown" ), MECable_Cyan( "MECable_Cyan" ),
+	MECable_Green( "MECable_Green" ),
+	MECable_Grey( "MECable_Grey" ),
+	MECable_LightBlue( "MECable_LightBlue" ),
+	MECable_LightGrey( "MECable_LightGrey" ),
+	MECable_Lime( "MECable_Lime" ),
+	MECable_Magenta( "MECable_Magenta" ),
+	MECable_Orange( "MECable_Orange" ),
+	MECable_Pink( "MECable_Pink" ),
+	MECable_Purple( "MECable_Purple" ),
+	MECable_Red( "MECable_Red" ),
+	MECable_White( "MECable_White" ),
+	MECable_Yellow( "MECable_Yellow" ),
+	MECable_Black( "MECable_Black" ),
+	MECable_Blue( "MECable_Blue" ),
+	MECable_Brown( "MECable_Brown" ),
+	MECable_Cyan( "MECable_Cyan" ),
 
-	MEDense_Black( "MEDense_Black" ), MEDense_Blue( "MEDense_Blue" ), MEDense_Brown( "MEDense_Brown" ), MEDense_Cyan( "MEDense_Cyan" ), MEDense_Gray( "MEDense_Gray" ), MEDense_Green( "MEDense_Green" ), MEDense_LightBlue( "MEDense_LightBlue" ), MEDense_LightGrey( "MEDense_LightGrey" ), MEDense_Lime( "MEDense_Lime" ), MEDense_Magenta( "MEDense_Magenta" ), MEDense_Orange( "MEDense_Orange" ), MEDense_Pink( "MEDense_Pink" ), MEDense_Purple( "MEDense_Purple" ), MEDense_Red( "MEDense_Red" ), MEDense_White( "MEDense_White" ), MEDense_Yellow( "MEDense_Yellow" ),
+	MEDense_Black( "MEDense_Black" ),
+	MEDense_Blue( "MEDense_Blue" ),
+	MEDense_Brown( "MEDense_Brown" ),
+	MEDense_Cyan( "MEDense_Cyan" ),
+	MEDense_Gray( "MEDense_Gray" ),
+	MEDense_Green( "MEDense_Green" ),
+	MEDense_LightBlue( "MEDense_LightBlue" ),
+	MEDense_LightGrey( "MEDense_LightGrey" ),
+	MEDense_Lime( "MEDense_Lime" ),
+	MEDense_Magenta( "MEDense_Magenta" ),
+	MEDense_Orange( "MEDense_Orange" ),
+	MEDense_Pink( "MEDense_Pink" ),
+	MEDense_Purple( "MEDense_Purple" ),
+	MEDense_Red( "MEDense_Red" ),
+	MEDense_White( "MEDense_White" ),
+	MEDense_Yellow( "MEDense_Yellow" ),
 
-	MESmart_Black( "MESmart_Black" ), MESmart_Blue( "MESmart_Blue" ), MESmart_Brown( "MESmart_Brown" ), MESmart_Cyan( "MESmart_Cyan" ), MESmart_Gray( "MESmart_Gray" ), MESmart_Green( "MESmart_Green" ), MESmart_LightBlue( "MESmart_LightBlue" ), MESmart_LightGrey( "MESmart_LightGrey" ), MESmart_Lime( "MESmart_Lime" ), MESmart_Magenta( "MESmart_Magenta" ), MESmart_Orange( "MESmart_Orange" ), MESmart_Pink( "MESmart_Pink" ), MESmart_Purple( "MESmart_Purple" ), MESmart_Red( "MESmart_Red" ), MESmart_White( "MESmart_White" ), MESmart_Yellow( "MESmart_Yellow" ),
+	MESmart_Black( "MESmart_Black" ),
+	MESmart_Blue( "MESmart_Blue" ),
+	MESmart_Brown( "MESmart_Brown" ),
+	MESmart_Cyan( "MESmart_Cyan" ),
+	MESmart_Gray( "MESmart_Gray" ),
+	MESmart_Green( "MESmart_Green" ),
+	MESmart_LightBlue( "MESmart_LightBlue" ),
+	MESmart_LightGrey( "MESmart_LightGrey" ),
+	MESmart_Lime( "MESmart_Lime" ),
+	MESmart_Magenta( "MESmart_Magenta" ),
+	MESmart_Orange( "MESmart_Orange" ),
+	MESmart_Pink( "MESmart_Pink" ),
+	MESmart_Purple( "MESmart_Purple" ),
+	MESmart_Red( "MESmart_Red" ),
+	MESmart_White( "MESmart_White" ),
+	MESmart_Yellow( "MESmart_Yellow" ),
 
-	MECovered_Black( "MECovered_Black" ), MECovered_Blue( "MECovered_Blue" ), MECovered_Brown( "MECovered_Brown" ), MECovered_Cyan( "MECovered_Cyan" ), MECovered_Gray( "MECovered_Gray" ), MECovered_Green( "MECovered_Green" ), MECovered_LightBlue( "MECovered_LightBlue" ), MECovered_LightGrey( "MECovered_LightGrey" ), MECovered_Lime( "MECovered_Lime" ), MECovered_Magenta( "MECovered_Magenta" ), MECovered_Orange( "MECovered_Orange" ), MECovered_Pink( "MECovered_Pink" ), MECovered_Purple( "MECovered_Purple" ), MECovered_Red( "MECovered_Red" ), MECovered_White( "MECovered_White" ), MECovered_Yellow( "MECovered_Yellow" ),
+	MECovered_Black( "MECovered_Black" ),
+	MECovered_Blue( "MECovered_Blue" ),
+	MECovered_Brown( "MECovered_Brown" ),
+	MECovered_Cyan( "MECovered_Cyan" ),
+	MECovered_Gray( "MECovered_Gray" ),
+	MECovered_Green( "MECovered_Green" ),
+	MECovered_LightBlue( "MECovered_LightBlue" ),
+	MECovered_LightGrey( "MECovered_LightGrey" ),
+	MECovered_Lime( "MECovered_Lime" ),
+	MECovered_Magenta( "MECovered_Magenta" ),
+	MECovered_Orange( "MECovered_Orange" ),
+	MECovered_Pink( "MECovered_Pink" ),
+	MECovered_Purple( "MECovered_Purple" ),
+	MECovered_Red( "MECovered_Red" ),
+	MECovered_White( "MECovered_White" ),
+	MECovered_Yellow( "MECovered_Yellow" ),
 
 	BlockAnnihilationPlaneOn( "BlockAnnihilationPlaneOn" ),
 
@@ -72,11 +161,17 @@ public enum CableBusTextures
 
 	BlockIdentityAnnihilationPlaneOn( "BlockIdentityAnnihilationPlaneOn" ),
 
-	ItemPartLevelEmitterOn( "ItemPart.LevelEmitterOn" ), PartTransitionPlaneBack( "PartTransitionPlaneBack" ),
+	ItemPartLevelEmitterOn( "ItemPart.LevelEmitterOn" ),
+	PartTransitionPlaneBack( "PartTransitionPlaneBack" ),
 
-	PartTunnelSides( "PartTunnelSides" ), PartPlaneSides( "PartPlaneSides" ), PartExportSides( "PartExportSides" ), PartImportSides( "PartImportSides" ),
+	PartTunnelSides( "PartTunnelSides" ),
+	PartPlaneSides( "PartPlaneSides" ),
+	PartExportSides( "PartExportSides" ),
+	PartImportSides( "PartImportSides" ),
 
-	PartWirelessSides( "PartWirelessSides" ), PartStorageSides( "PartStorageSides" ), PartStorageBack( "PartStorageBack" );
+	PartWirelessSides( "PartWirelessSides" ),
+	PartStorageSides( "PartStorageSides" ),
+	PartStorageBack( "PartStorageBack" );
 
 	private final String name;
 	public IAESprite IIcon;

src/main/java/appeng/client/texture/ExtraBlockTextures.java

@@ -36,57 +36,110 @@ public enum ExtraBlockTextures
 
 	MEChest( "BlockMEChest" ),
 
-	BlockMEChestItems_Light( "BlockMEChestItems_Light" ), BlockMEChestItems_Dark( "BlockMEChestItems_Dark" ), BlockMEChestItems_Medium( "BlockMEChestItems_Medium" ),
+	BlockMEChestItems_Light( "BlockMEChestItems_Light" ),
+	BlockMEChestItems_Dark( "BlockMEChestItems_Dark" ),
+	BlockMEChestItems_Medium( "BlockMEChestItems_Medium" ),
 
-	BlockControllerPowered( "BlockControllerPowered" ), BlockControllerColumnPowered( "BlockControllerColumnPowered" ), BlockControllerColumn( "BlockControllerColumn" ), BlockControllerLights( "BlockControllerLights" ), BlockControllerColumnLights( "BlockControllerColumnLights" ), BlockControllerColumnConflict( "BlockControllerColumnConflict" ), BlockControllerConflict( "BlockControllerConflict" ), BlockControllerInsideA( "BlockControllerInsideA" ), BlockControllerInsideB( "BlockControllerInsideB" ),
+	BlockControllerPowered( "BlockControllerPowered" ),
+	BlockControllerColumnPowered( "BlockControllerColumnPowered" ),
+	BlockControllerColumn( "BlockControllerColumn" ),
+	BlockControllerLights( "BlockControllerLights" ),
+	BlockControllerColumnLights( "BlockControllerColumnLights" ),
+	BlockControllerColumnConflict( "BlockControllerColumnConflict" ),
+	BlockControllerConflict( "BlockControllerConflict" ),
+	BlockControllerInsideA( "BlockControllerInsideA" ),
+	BlockControllerInsideB( "BlockControllerInsideB" ),
 
 	BlockMolecularAssemblerLights( "BlockMolecularAssemblerLights" ),
 
 	BlockChargerInside( "BlockChargerInside" ),
 
-	BlockInterfaceAlternate( "BlockInterfaceAlternate" ), BlockInterfaceAlternateArrow( "BlockInterfaceAlternateArrow" ),
+	BlockInterfaceAlternate( "BlockInterfaceAlternate" ),
+	BlockInterfaceAlternateArrow( "BlockInterfaceAlternateArrow" ),
 
-	MEStorageCellTextures( "MEStorageCellTextures" ), White( "White" ),
+	MEStorageCellTextures( "MEStorageCellTextures" ),
+	White( "White" ),
 
-	BlockMatterCannonParticle( "BlockMatterCannonParticle" ), BlockEnergyParticle( "BlockEnergyParticle" ),
+	BlockMatterCannonParticle( "BlockMatterCannonParticle" ),
+	BlockEnergyParticle( "BlockEnergyParticle" ),
 
 	GlassFrame( "BlockQuartzGlassFrame" ),
 
-	BlockQRingCornerLight( "BlockQRingCornerLight" ), BlockQRingEdgeLight( "BlockQRingEdgeLight" ),
+	BlockQRingCornerLight( "BlockQRingCornerLight" ),
+	BlockQRingEdgeLight( "BlockQRingEdgeLight" ),
 
-	MEDenseEnergyCell0( "BlockDenseEnergyCell0" ), MEDenseEnergyCell1( "BlockDenseEnergyCell1" ), MEDenseEnergyCell2( "BlockDenseEnergyCell2" ), MEDenseEnergyCell3( "BlockDenseEnergyCell3" ), MEDenseEnergyCell4( "BlockDenseEnergyCell4" ), MEDenseEnergyCell5( "BlockDenseEnergyCell5" ), MEDenseEnergyCell6( "BlockDenseEnergyCell6" ), MEDenseEnergyCell7( "BlockDenseEnergyCell7" ),
+	MEDenseEnergyCell0( "BlockDenseEnergyCell0" ),
+	MEDenseEnergyCell1( "BlockDenseEnergyCell1" ),
+	MEDenseEnergyCell2( "BlockDenseEnergyCell2" ),
+	MEDenseEnergyCell3( "BlockDenseEnergyCell3" ),
+	MEDenseEnergyCell4( "BlockDenseEnergyCell4" ),
+	MEDenseEnergyCell5( "BlockDenseEnergyCell5" ),
+	MEDenseEnergyCell6( "BlockDenseEnergyCell6" ),
+	MEDenseEnergyCell7( "BlockDenseEnergyCell7" ),
 
-	MEEnergyCell0( "BlockEnergyCell0" ), MEEnergyCell1( "BlockEnergyCell1" ), MEEnergyCell2( "BlockEnergyCell2" ), MEEnergyCell3( "BlockEnergyCell3" ), MEEnergyCell4( "BlockEnergyCell4" ), MEEnergyCell5( "BlockEnergyCell5" ), MEEnergyCell6( "BlockEnergyCell6" ), MEEnergyCell7( "BlockEnergyCell7" ),
+	MEEnergyCell0( "BlockEnergyCell0" ),
+	MEEnergyCell1( "BlockEnergyCell1" ),
+	MEEnergyCell2( "BlockEnergyCell2" ),
+	MEEnergyCell3( "BlockEnergyCell3" ),
+	MEEnergyCell4( "BlockEnergyCell4" ),
+	MEEnergyCell5( "BlockEnergyCell5" ),
+	MEEnergyCell6( "BlockEnergyCell6" ),
+	MEEnergyCell7( "BlockEnergyCell7" ),
 
-	BlockSpatialPylon_dim( "BlockSpatialPylon_dim" ), BlockSpatialPylon_red( "BlockSpatialPylon_red" ),
+	BlockSpatialPylon_dim( "BlockSpatialPylon_dim" ),
+	BlockSpatialPylon_red( "BlockSpatialPylon_red" ),
 
-	BlockSpatialPylonC( "BlockSpatialPylon_spanned" ), BlockSpatialPylonC_dim( "BlockSpatialPylon_spanned_dim" ), BlockSpatialPylonC_red( "BlockSpatialPylon_spanned_red" ),
+	BlockSpatialPylonC( "BlockSpatialPylon_spanned" ),
+	BlockSpatialPylonC_dim( "BlockSpatialPylon_spanned_dim" ),
+	BlockSpatialPylonC_red( "BlockSpatialPylon_spanned_red" ),
 
-	BlockQuartzGlassB( "BlockQuartzGlassB" ), BlockQuartzGlassC( "BlockQuartzGlassC" ), BlockQuartzGlassD( "BlockQuartzGlassD" ),
+	BlockQuartzGlassB( "BlockQuartzGlassB" ),
+	BlockQuartzGlassC( "BlockQuartzGlassC" ),
+	BlockQuartzGlassD( "BlockQuartzGlassD" ),
 
-	BlockSpatialPylonE( "BlockSpatialPylon_end" ), BlockSpatialPylonE_dim( "BlockSpatialPylon_end_dim" ), BlockSpatialPylonE_red( "BlockSpatialPylon_end_red" ),
+	BlockSpatialPylonE( "BlockSpatialPylon_end" ),
+	BlockSpatialPylonE_dim( "BlockSpatialPylon_end_dim" ),
+	BlockSpatialPylonE_red( "BlockSpatialPylon_end_red" ),
 
-	BlockMESecurityOn_Light( "BlockMESecurityOn_Light" ), BlockMESecurityOn_Medium( "BlockMESecurityOn_Medium" ), BlockMESecurityOn_Dark( "BlockMESecurityOn_Dark" ), BlockInscriberInside( "BlockInscriberInside" ),
+	BlockMESecurityOn_Light( "BlockMESecurityOn_Light" ),
+	BlockMESecurityOn_Medium( "BlockMESecurityOn_Medium" ),
+	BlockMESecurityOn_Dark( "BlockMESecurityOn_Dark" ),
+	BlockInscriberInside( "BlockInscriberInside" ),
 
-	BlockQuartzGrowthAcceleratorOn( "BlockQuartzGrowthAcceleratorOn" ), BlockQuartzGrowthAcceleratorSideOn( "BlockQuartzGrowthAcceleratorSideOn" ),
+	BlockQuartzGrowthAcceleratorOn( "BlockQuartzGrowthAcceleratorOn" ),
+	BlockQuartzGrowthAcceleratorSideOn( "BlockQuartzGrowthAcceleratorSideOn" ),
 
 	BlockWirelessInside( "BlockWirelessInside" ),
 
-	BlockCraftingAccelerator( "BlockCraftingAccelerator" ), BlockCraftingMonitor( "BlockCraftingMonitor" ),
+	BlockCraftingAccelerator( "BlockCraftingAccelerator" ),
+	BlockCraftingMonitor( "BlockCraftingMonitor" ),
 
-	BlockCraftingStorage1k( "BlockCraftingStorage" ), BlockCraftingStorage4k( "BlockCraftingStorage4k" ), BlockCraftingStorage16k( "BlockCraftingStorage16k" ), BlockCraftingStorage64k( "BlockCraftingStorage64k" ),
+	BlockCraftingStorage1k( "BlockCraftingStorage" ),
+	BlockCraftingStorage4k( "BlockCraftingStorage4k" ),
+	BlockCraftingStorage16k( "BlockCraftingStorage16k" ),
+	BlockCraftingStorage64k( "BlockCraftingStorage64k" ),
 
 	BlockCraftingAcceleratorFit( "BlockCraftingAcceleratorFit" ),
 
-	BlockCraftingMonitorFit_Light( "BlockCraftingMonitorFit_Light" ), BlockCraftingMonitorFit_Dark( "BlockCraftingMonitorFit_Dark" ), BlockCraftingMonitorFit_Medium( "BlockCraftingMonitorFit_Medium" ),
+	BlockCraftingMonitorFit_Light( "BlockCraftingMonitorFit_Light" ),
+	BlockCraftingMonitorFit_Dark( "BlockCraftingMonitorFit_Dark" ),
+	BlockCraftingMonitorFit_Medium( "BlockCraftingMonitorFit_Medium" ),
 
-	BlockCraftingStorage1kFit( "BlockCraftingStorageFit" ), BlockCraftingStorage4kFit( "BlockCraftingStorage4kFit" ), BlockCraftingStorage16kFit( "BlockCraftingStorage16kFit" ), BlockCraftingStorage64kFit( "BlockCraftingStorage64kFit" ),
+	BlockCraftingStorage1kFit( "BlockCraftingStorageFit" ),
+	BlockCraftingStorage4kFit( "BlockCraftingStorage4kFit" ),
+	BlockCraftingStorage16kFit( "BlockCraftingStorage16kFit" ),
+	BlockCraftingStorage64kFit( "BlockCraftingStorage64kFit" ),
 
-	BlockCraftingUnitRing( "BlockCraftingUnitRing" ), BlockCraftingUnitRingLongRotated( "BlockCraftingUnitRingLongRotated" ), BlockCraftingUnitRingLong( "BlockCraftingUnitRingLong" ), BlockCraftingUnitFit( "BlockCraftingUnitFit" ),
+	BlockCraftingUnitRing( "BlockCraftingUnitRing" ),
+	BlockCraftingUnitRingLongRotated( "BlockCraftingUnitRingLongRotated" ),
+	BlockCraftingUnitRingLong( "BlockCraftingUnitRingLong" ),
+	BlockCraftingUnitFit( "BlockCraftingUnitFit" ),
 
-	BlockCraftingMonitorOuter( "BlockCraftingMonitorOuter" ), BlockCraftingFitSolid( "BlockCraftingFitSolid" ),
+	BlockCraftingMonitorOuter( "BlockCraftingMonitorOuter" ),
+	BlockCraftingFitSolid( "BlockCraftingFitSolid" ),
 
-	BlockPaint2( "BlockPaint2" ), BlockPaint3( "BlockPaint3" );
+	BlockPaint2( "BlockPaint2" ),
+	BlockPaint3( "BlockPaint3" );
 
 	private final String name;
 	private IAESprite IIcon;

src/main/java/appeng/client/texture/IAESprite.java

@@ -14,8 +14,7 @@ public interface IAESprite
 
 	float getMaxU();
 
-	float getInterpolatedU(
+	float getInterpolatedU( double px );
-			double px );
 
 	float getMinV();
 
@@ -23,8 +22,7 @@ public interface IAESprite
 
 	String getIconName();
 
-	float getInterpolatedV(
+	float getInterpolatedV( double px );
-			double px );
 
 	float getMinU();
 

src/main/java/appeng/container/implementations/ContainerCellWorkbench.java

@@ -334,15 +334,13 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
 		}
 
 		@Override
-		public void openInventory(
+		public void openInventory( final EntityPlayer player )
-				final EntityPlayer player )
 		{
 
 		}
 
 		@Override
-		public void closeInventory(
+		public void closeInventory( final EntityPlayer player )
-				final EntityPlayer player )
 		{
 
 		}
@@ -360,16 +358,13 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
 		}
 
 		@Override
-		public int getField(
+		public int getField( final int id )
-				final int id )
 		{
 			return 0;
 		}
 
 		@Override
-		public void setField(
+		public void setField( final int id, final int value )
-				final int id,
-				final int value )
 		{
 
 		}

src/main/java/appeng/container/implementations/ContainerQuartzKnife.java

@@ -228,15 +228,13 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn
 	}
 
 	@Override
-	public void openInventory(
+	public void openInventory( final EntityPlayer player )
-			final EntityPlayer player )
 	{
 
 	}
 
 	@Override
-	public void closeInventory(
+	public void closeInventory( final EntityPlayer player )
-			final EntityPlayer player )
 	{
 
 	}
@@ -254,16 +252,13 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn
 	}
 
 	@Override
-	public int getField(
+	public int getField( final int id )
-			final int id )
 	{
 		return 0;
 	}
 
 	@Override
-	public void setField(
+	public void setField( final int id, final int value )
-			final int id,
-			final int value )
 	{
 
 	}

src/main/java/appeng/container/slot/SlotRestrictedInput.java

@@ -289,17 +289,34 @@ public class SlotRestrictedInput extends AppEngSlot
 
 	public enum PlacableItemType
 	{
-		STORAGE_CELLS( 15 ), ORE( 16 + 15 ), STORAGE_COMPONENT( 3 * 16 + 15 ),
+		STORAGE_CELLS( 15 ),
+		ORE( 16 + 15 ),
+		STORAGE_COMPONENT( 3 * 16 + 15 ),
 
-		ENCODABLE_ITEM( 4 * 16 + 15 ), TRASH( 5 * 16 + 15 ), VALID_ENCODED_PATTERN_W_OUTPUT( 7 * 16 + 15 ), ENCODED_PATTERN_W_OUTPUT( 7 * 16 + 15 ),
+		ENCODABLE_ITEM( 4 * 16 + 15 ),
+		TRASH( 5 * 16 + 15 ),
+		VALID_ENCODED_PATTERN_W_OUTPUT( 7 * 16 + 15 ),
+		ENCODED_PATTERN_W_OUTPUT( 7 * 16 + 15 ),
 
-		ENCODED_CRAFTING_PATTERN( 7 * 16 + 15 ), ENCODED_PATTERN( 7 * 16 + 15 ), PATTERN( 8 * 16 + 15 ), BLANK_PATTERN( 8 * 16 + 15 ), POWERED_TOOL( 9 * 16 + 15 ),
+		ENCODED_CRAFTING_PATTERN( 7 * 16 + 15 ),
+		ENCODED_PATTERN( 7 * 16 + 15 ),
+		PATTERN( 8 * 16 + 15 ),
+		BLANK_PATTERN( 8 * 16 + 15 ),
+		POWERED_TOOL( 9 * 16 + 15 ),
 
-		RANGE_BOOSTER( 6 * 16 + 15 ), QE_SINGULARITY( 10 * 16 + 15 ), SPATIAL_STORAGE_CELLS( 11 * 16 + 15 ),
+		RANGE_BOOSTER( 6 * 16 + 15 ),
+		QE_SINGULARITY( 10 * 16 + 15 ),
+		SPATIAL_STORAGE_CELLS( 11 * 16 + 15 ),
 
-		FUEL( 12 * 16 + 15 ), UPGRADES( 13 * 16 + 15 ), WORKBENCH_CELL( 15 ), BIOMETRIC_CARD( 14 * 16 + 15 ), VIEW_CELL( 4 * 16 + 14 ),
+		FUEL( 12 * 16 + 15 ),
+		UPGRADES( 13 * 16 + 15 ),
+		WORKBENCH_CELL( 15 ),
+		BIOMETRIC_CARD( 14 * 16 + 15 ),
+		VIEW_CELL( 4 * 16 + 14 ),
 
-		INSCRIBER_PLATE( 2 * 16 + 14 ), INSCRIBER_INPUT( 3 * 16 + 14 ), METAL_INGOTS( 3 * 16 + 14 );
+		INSCRIBER_PLATE( 2 * 16 + 14 ),
+		INSCRIBER_INPUT( 3 * 16 + 14 ),
+		METAL_INGOTS( 3 * 16 + 14 );
 
 		public final int IIcon;
 

src/main/java/appeng/core/AEConfig.java

@@ -76,13 +76,13 @@ public final class AEConfig extends Configuration implements IConfigurableObject
 	public double spatialPowerMultiplier = 1250.0;
 	public String[] grinderOres = {
 			// Vanilla Items
-			"Obsidian", "Ender", "EnderPearl", "Coal", "Iron", "Gold", "Charcoal", "NetherQuartz",
+	"Obsidian", "Ender", "EnderPearl", "Coal", "Iron", "Gold", "Charcoal", "NetherQuartz",
 			// Common Mod Ores
-			"Copper", "Tin", "Silver", "Lead", "Bronze",
+	"Copper", "Tin", "Silver", "Lead", "Bronze",
 			// AE
-			"CertusQuartz", "Wheat", "Fluix",
+	"CertusQuartz", "Wheat", "Fluix",
 			// Other Mod Ores
-			"Brass", "Platinum", "Nickel", "Invar", "Aluminium", "Electrum", "Osmium", "Zinc" };
+	"Brass", "Platinum", "Nickel", "Invar", "Aluminium", "Electrum", "Osmium", "Zinc" };
 	public double oreDoublePercentage = 90.0;
 	public boolean enableEffects = true;
 	public boolean useLargeFonts = false;

src/main/java/appeng/core/AppEng.java

@@ -70,16 +70,16 @@ public final class AppEng
 	public static final String ASSETS = "appliedenergistics2:";
 
 	public static final String MOD_DEPENDENCIES =
-			// a few mods, AE should load after, probably.
+	// a few mods, AE should load after, probably.
-			// required-after:AppliedEnergistics2API|all;
+	// required-after:AppliedEnergistics2API|all;
-			// "after:gregtech_addon;after:Mekanism;after:IC2;after:ThermalExpansion;after:BuildCraft|Core;" +
+	// "after:gregtech_addon;after:Mekanism;after:IC2;after:ThermalExpansion;after:BuildCraft|Core;" +
 
-			// depend on version of forge used for build.
+	// depend on version of forge used for build.
-			"after:appliedenergistics2-core;" + "required-after:Forge@[" // require forge.
+	"after:appliedenergistics2-core;" + "required-after:Forge@[" // require forge.
-					+ net.minecraftforge.common.ForgeVersion.majorVersion + '.' // majorVersion
+			+ net.minecraftforge.common.ForgeVersion.majorVersion + '.' // majorVersion
-					+ net.minecraftforge.common.ForgeVersion.minorVersion + '.' // minorVersion
+			+ net.minecraftforge.common.ForgeVersion.minorVersion + '.' // minorVersion
-					+ net.minecraftforge.common.ForgeVersion.revisionVersion + '.' // revisionVersion
+			+ net.minecraftforge.common.ForgeVersion.revisionVersion + '.' // revisionVersion
-					+ net.minecraftforge.common.ForgeVersion.buildVersion + ",)"; // buildVersion
+			+ net.minecraftforge.common.ForgeVersion.buildVersion + ",)"; // buildVersion
 
 	@Nonnull
 	private static final AppEng INSTANCE = new AppEng();

src/main/java/appeng/core/CommonHelper.java

@@ -74,6 +74,5 @@ public abstract class CommonHelper
 
 	public abstract void configureIcon( Object item, String name );
 
-	public abstract ResourceLocation addIcon(
+	public abstract ResourceLocation addIcon( String string );
-			String string );
 }

src/main/java/appeng/core/features/AEFeature.java

@@ -130,7 +130,8 @@ public enum AEFeature
 	InterfaceTerminal( Constants.CATEGORY_CRAFTING ),
 	EnableDisassemblyCrafting( Constants.CATEGORY_CRAFTING ),
 
-	AlphaPass( Constants.CATEGORY_RENDERING ), PaintBalls( Constants.CATEGORY_TOOLS ),
+	AlphaPass( Constants.CATEGORY_RENDERING ),
+	PaintBalls( Constants.CATEGORY_TOOLS ),
 
 	MolecularAssembler( Constants.CATEGORY_CRAFTING_FEATURES ),
 	Patterns( Constants.CATEGORY_CRAFTING_FEATURES ),

src/main/java/appeng/core/features/ActivityState.java

@@ -21,8 +21,7 @@ package appeng.core.features;
 
 public enum ActivityState
 {
-	Enabled,
+	Enabled, Disabled;
-	Disabled;
 
 	public static ActivityState from( final boolean enabled )
 	{

src/main/java/appeng/core/localization/ButtonToolTips.java

@@ -24,46 +24,120 @@ import net.minecraft.util.StatCollector;
 
 public enum ButtonToolTips
 {
-	PowerUnits, IOMode, CondenserOutput, RedstoneMode, MatchingFuzzy,
+	PowerUnits,
+	IOMode,
+	CondenserOutput,
+	RedstoneMode,
+	MatchingFuzzy,
 
-	MatchingMode, TransferDirection, SortOrder, SortBy, View,
+	MatchingMode,
+	TransferDirection,
+	SortOrder,
+	SortBy,
+	View,
 
-	PartitionStorage, Clear, FuzzyMode, OperationMode, TrashController,
+	PartitionStorage,
+	Clear,
+	FuzzyMode,
+	OperationMode,
+	TrashController,
 
-	InterfaceBlockingMode, InterfaceCraftingMode, Trash, MatterBalls,
+	InterfaceBlockingMode,
+	InterfaceCraftingMode,
+	Trash,
+	MatterBalls,
 
-	Singularity, Read, Write, ReadWrite, AlwaysActive,
+	Singularity,
+	Read,
+	Write,
+	ReadWrite,
+	AlwaysActive,
 
-	ActiveWithoutSignal, ActiveWithSignal, ActiveOnPulse,
+	ActiveWithoutSignal,
+	ActiveWithSignal,
+	ActiveOnPulse,
 
-	EmitLevelsBelow, EmitLevelAbove, MatchingExact, TransferToNetwork,
+	EmitLevelsBelow,
+	EmitLevelAbove,
+	MatchingExact,
+	TransferToNetwork,
 
-	TransferToStorageCell, ToggleSortDirection, SearchMode_Auto,
+	TransferToStorageCell,
+	ToggleSortDirection,
+	SearchMode_Auto,
 
-	SearchMode_Standard, SearchMode_NEIAuto, SearchMode_NEIStandard,
+	SearchMode_Standard,
+	SearchMode_NEIAuto,
+	SearchMode_NEIStandard,
 
-	SearchMode, ItemName, NumberOfItems, PartitionStorageHint,
+	SearchMode,
+	ItemName,
+	NumberOfItems,
+	PartitionStorageHint,
 
-	ClearSettings, StoredItems, StoredCraftable, Craftable,
+	ClearSettings,
+	StoredItems,
+	StoredCraftable,
+	Craftable,
 
-	FZPercent_25, FZPercent_50, FZPercent_75, FZPercent_99, FZIgnoreAll,
+	FZPercent_25,
+	FZPercent_50,
+	FZPercent_75,
+	FZPercent_99,
+	FZIgnoreAll,
 
-	MoveWhenEmpty, MoveWhenWorkIsDone, MoveWhenFull, Disabled, Enable,
+	MoveWhenEmpty,
+	MoveWhenWorkIsDone,
+	MoveWhenFull,
+	Disabled,
+	Enable,
 
-	Blocking, NonBlocking,
+	Blocking,
+	NonBlocking,
 
-	LevelType, LevelType_Energy, LevelType_Item, InventoryTweaks, TerminalStyle, TerminalStyle_Full, TerminalStyle_Tall, TerminalStyle_Small,
+	LevelType,
+	LevelType_Energy,
+	LevelType_Item,
+	InventoryTweaks,
+	TerminalStyle,
+	TerminalStyle_Full,
+	TerminalStyle_Tall,
+	TerminalStyle_Small,
 
-	Stash, StashDesc, Encode, EncodeDescription, Substitutions, SubstitutionsOn, SubstitutionsOff, SubstitutionsDescEnabled, SubstitutionsDescDisabled, CraftOnly, CraftEither,
+	Stash,
+	StashDesc,
+	Encode,
+	EncodeDescription,
+	Substitutions,
+	SubstitutionsOn,
+	SubstitutionsOff,
+	SubstitutionsDescEnabled,
+	SubstitutionsDescDisabled,
+	CraftOnly,
+	CraftEither,
 
-	Craft, Mod, DoesntDespawn, EmitterMode, CraftViaRedstone, EmitWhenCrafting, ReportInaccessibleItems, ReportInaccessibleItemsYes, ReportInaccessibleItemsNo,
+	Craft,
+	Mod,
+	DoesntDespawn,
+	EmitterMode,
+	CraftViaRedstone,
+	EmitWhenCrafting,
+	ReportInaccessibleItems,
+	ReportInaccessibleItemsYes,
+	ReportInaccessibleItemsNo,
 
-	BlockPlacement, BlockPlacementYes, BlockPlacementNo,
+	BlockPlacement,
+	BlockPlacementYes,
+	BlockPlacementNo,
 
 	// Used in the tooltips of the items in the terminal, when moused over
-	ItemsStored, ItemsRequestable,
+	ItemsStored,
+	ItemsRequestable,
 
-	SchedulingMode, SchedulingModeDefault, SchedulingModeRoundRobin, SchedulingModeRandom;
+	SchedulingMode,
+	SchedulingModeDefault,
+	SchedulingModeRoundRobin,
+	SchedulingModeRandom;
 
 	private final String root;
 

src/main/java/appeng/core/localization/GuiText.java

@@ -26,28 +26,76 @@ public enum GuiText
 {
 	inventory( "container" ), // mc's default Inventory localization.
 
-	Chest, StoredEnergy, Of, Condenser, Drive, GrindStone, SkyChest,
+	Chest,
+	StoredEnergy,
+	Of,
+	Condenser,
+	Drive,
+	GrindStone,
+	SkyChest,
 
-	VibrationChamber, SpatialIOPort, LevelEmitter, Terminal,
+	VibrationChamber,
+	SpatialIOPort,
+	LevelEmitter,
+	Terminal,
 
-	Interface, Config, StoredItems, Patterns, ImportBus, ExportBus,
+	Interface,
+	Config,
+	StoredItems,
+	Patterns,
+	ImportBus,
+	ExportBus,
 
-	CellWorkbench, NetworkDetails, StorageCells, IOBuses,
+	CellWorkbench,
+	NetworkDetails,
+	StorageCells,
+	IOBuses,
 
-	IOPort, BytesUsed, Types, QuantumLinkChamber, PortableCell,
+	IOPort,
+	BytesUsed,
+	Types,
+	QuantumLinkChamber,
+	PortableCell,
 
-	NetworkTool, PowerUsageRate, PowerInputRate, Installed, EnergyDrain,
+	NetworkTool,
+	PowerUsageRate,
+	PowerInputRate,
+	Installed,
+	EnergyDrain,
 
-	StorageBus, Priority, Security, Encoded, Blank, Unlinked, Linked,
+	StorageBus,
+	Priority,
+	Security,
+	Encoded,
+	Blank,
+	Unlinked,
+	Linked,
 
-	SecurityCardEditor, NoPermissions, WirelessTerminal, Wireless,
+	SecurityCardEditor,
+	NoPermissions,
+	WirelessTerminal,
+	Wireless,
 
-	CraftingTerminal, FormationPlane, Inscriber, QuartzCuttingKnife,
+	CraftingTerminal,
+	FormationPlane,
+	Inscriber,
+	QuartzCuttingKnife,
 
 	// tunnel names
-	METunnel, ItemTunnel, RedstoneTunnel, EUTunnel, FluidTunnel, OCTunnel, LightTunnel, RFTunnel, PressureTunnel,
+	METunnel,
+	ItemTunnel,
+	RedstoneTunnel,
+	EUTunnel,
+	FluidTunnel,
+	OCTunnel,
+	LightTunnel,
+	RFTunnel,
+	PressureTunnel,
 
-	StoredSize, CopyMode, CopyModeDesc, PatternTerminal,
+	StoredSize,
+	CopyMode,
+	CopyModeDesc,
+	PatternTerminal,
 
 	// Pattern tooltips
 	CraftingPattern,
@@ -62,34 +110,77 @@ public enum GuiText
 
 	MolecularAssembler,
 
-	StoredPower, MaxPower, RequiredPower, Efficiency, InWorldCrafting,
+	StoredPower,
+	MaxPower,
+	RequiredPower,
+	Efficiency,
+	InWorldCrafting,
 
-	inWorldFluix, inWorldPurificationCertus, inWorldPurificationNether,
+	inWorldFluix,
+	inWorldPurificationCertus,
+	inWorldPurificationNether,
 
-	inWorldPurificationFluix, inWorldSingularity, ChargedQuartz,
+	inWorldPurificationFluix,
+	inWorldSingularity,
+	ChargedQuartz,
 
 	NoSecondOutput,
 	OfSecondOutput,
 	MultipleOutputs,
 
-	Stores, Next, SelectAmount, Lumen, Empty,
+	Stores,
+	Next,
+	SelectAmount,
+	Lumen,
+	Empty,
 
-	ConfirmCrafting, Stored, Crafting, Scheduled, CraftingStatus, Cancel, ETA, ETAFormat,
+	ConfirmCrafting,
+	Stored,
+	Crafting,
+	Scheduled,
+	CraftingStatus,
+	Cancel,
+	ETA,
+	ETAFormat,
 
-	FromStorage, ToCraft, CraftingPlan, CalculatingWait, Start, Bytes,
+	FromStorage,
+	ToCraft,
+	CraftingPlan,
+	CalculatingWait,
+	Start,
+	Bytes,
 
-	CraftingCPU, Automatic, CoProcessors, Simulation, Missing,
+	CraftingCPU,
+	Automatic,
+	CoProcessors,
+	Simulation,
+	Missing,
 
-	InterfaceTerminal, NoCraftingCPUs, Clean, InvalidPattern,
+	InterfaceTerminal,
+	NoCraftingCPUs,
+	Clean,
+	InvalidPattern,
 
-	InterfaceTerminalHint, Range, TransparentFacades, TransparentFacadesHint,
+	InterfaceTerminalHint,
+	Range,
+	TransparentFacades,
+	TransparentFacadesHint,
 
-	NoCraftingJobs, CPUs, FacadeCrafting, inWorldCraftingPresses, ChargedQuartzFind,
+	NoCraftingJobs,
+	CPUs,
+	FacadeCrafting,
+	inWorldCraftingPresses,
+	ChargedQuartzFind,
 
-	Included, Excluded, Partitioned, Precise, Fuzzy,
+	Included,
+	Excluded,
+	Partitioned,
+	Precise,
+	Fuzzy,
 
 	// Used in a terminal to indicate that an item is craftable
-	SmallFontCraft, LargeFontCraft,
+	SmallFontCraft,
+	LargeFontCraft,
 
 	// Used in a ME Interface when no appropriate TileEntity was detected near it
 	Nothing;

src/main/java/appeng/core/localization/PlayerMessages.java

@@ -25,11 +25,21 @@ import net.minecraft.util.IChatComponent;
 
 public enum PlayerMessages
 {
-	ChestCannotReadStorageCell, InvalidMachine, LoadedSettings, SavedSettings, MachineNotPowered,
+	ChestCannotReadStorageCell,
+	InvalidMachine,
+	LoadedSettings,
+	SavedSettings,
+	MachineNotPowered,
 
-	isNowLocked, isNowUnlocked,
+	isNowLocked,
+	isNowUnlocked,
 	AmmoDepleted,
-	CommunicationError, OutOfRange, DeviceNotPowered, DeviceNotWirelessTerminal, DeviceNotLinked, StationCanNotBeLocated,
+	CommunicationError,
+	OutOfRange,
+	DeviceNotPowered,
+	DeviceNotWirelessTerminal,
+	DeviceNotLinked,
+	StationCanNotBeLocated,
 	SettingCleared, ;
 
 	public IChatComponent get()

src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java

@@ -39,11 +39,7 @@ public class AppEngClientPacketHandler extends AppEngPacketHandlerBase implement
 {
 
 	@Override
-	public void onPacketData(
+	public void onPacketData( final INetworkInfo manager, final INetHandler handler, final FMLProxyPacket packet, final EntityPlayer player )
-			final INetworkInfo manager,
-			final INetHandler handler,
-			final FMLProxyPacket packet,
-			final EntityPlayer player )
 	{
 		final ByteBuf stream = packet.payload();
 
@@ -52,16 +48,14 @@ public class AppEngClientPacketHandler extends AppEngPacketHandlerBase implement
 			final int packetType = stream.readInt();
 			final AppEngPacket pack = PacketTypes.getPacket( packetType ).parsePacket( stream );
 
-			final PacketCallState callState =
+			final PacketCallState callState = new PacketCallState(){
-					new PacketCallState(){
 
-						@Override
+				@Override
-						public void call(
+				public void call( final AppEngPacket appEngPacket )
-								final AppEngPacket appEngPacket )
+				{
-						{
+					appEngPacket.clientPacketData( manager, appEngPacket, Minecraft.getMinecraft().thePlayer );
-							appEngPacket.clientPacketData( manager, appEngPacket, Minecraft.getMinecraft().thePlayer );
+				}
-						}
+			};
-					};
 
 			pack.setCallParam( callState );
 			PacketThreadUtil.checkThreadAndEnqueue( pack, handler, Minecraft.getMinecraft() );

src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java

@@ -48,16 +48,14 @@ public final class AppEngServerPacketHandler extends AppEngPacketHandlerBase imp
 			final int packetType = stream.readInt();
 			final AppEngPacket pack = PacketTypes.getPacket( packetType ).parsePacket( stream );
 
-			final PacketCallState callState =
+			final PacketCallState callState = new PacketCallState(){
-					new PacketCallState(){
 
-						@Override
+				@Override
-						public void call(
+				public void call( final AppEngPacket appEngPacket )
-								final AppEngPacket appEngPacket )
+				{
-						{
+					appEngPacket.serverPacketData( manager, appEngPacket, player );
-							appEngPacket.serverPacketData( manager, appEngPacket, player );
+				}
-						}
+			};
-					};
 
 			pack.setCallParam( callState );
 			PacketThreadUtil.checkThreadAndEnqueue( pack, handler, ( (EntityPlayerMP) player ).getServerForPlayer() );

src/main/java/appeng/core/sync/packets/PacketCompressedNBT.java

@@ -58,8 +58,7 @@ public class PacketCompressedNBT extends AppEngPacket
 		this.data = null;
 		this.compressFrame = null;
 
-		final GZIPInputStream gzReader = new GZIPInputStream( new InputStream()
+		final GZIPInputStream gzReader = new GZIPInputStream( new InputStream(){
-		{
 
 			@Override
 			public int read() throws IOException
@@ -87,8 +86,7 @@ public class PacketCompressedNBT extends AppEngPacket
 
 		this.in = din;
 
-		this.compressFrame = new GZIPOutputStream( new OutputStream()
+		this.compressFrame = new GZIPOutputStream( new OutputStream(){
-		{
 
 			@Override
 			public void write( final int value ) throws IOException

src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java

@@ -82,8 +82,7 @@ public class PacketMEInventoryUpdate extends AppEngPacket
 
 		// int originalBytes = stream.readableBytes();
 
-		final GZIPInputStream gzReader = new GZIPInputStream( new InputStream()
+		final GZIPInputStream gzReader = new GZIPInputStream( new InputStream(){
-		{
 			@Override
 			public int read() throws IOException
 			{
@@ -133,8 +132,7 @@ public class PacketMEInventoryUpdate extends AppEngPacket
 		this.data.writeInt( this.getPacketID() );
 		this.data.writeByte( this.ref );
 
-		this.compressFrame = new GZIPOutputStream( new OutputStream()
+		this.compressFrame = new GZIPOutputStream( new OutputStream(){
-		{
 			@Override
 			public void write( final int value ) throws IOException
 			{

src/main/java/appeng/debug/BlockCubeGenerator.java

@@ -42,14 +42,7 @@ public class BlockCubeGenerator extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated(
+	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final World w,
-			final BlockPos pos,
-			final EntityPlayer player,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		final TileCubeGenerator tcg = this.getTileEntity( w, pos );
 		if( tcg != null )

src/main/java/appeng/debug/BlockPhantomNode.java

@@ -42,14 +42,7 @@ public class BlockPhantomNode extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated(
+	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final World w,
-			final BlockPos pos,
-			final EntityPlayer player,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		final TilePhantomNode tpn = this.getTileEntity( w, pos );
 		tpn.triggerCrashMode();

src/main/java/appeng/debug/TileItemGen.java

@@ -129,15 +129,13 @@ public class TileItemGen extends AEBaseTile implements IInventory
 	}
 
 	@Override
-	public void openInventory(
+	public void openInventory( final EntityPlayer player )
-			final EntityPlayer player )
 	{
 
 	}
 
 	@Override
-	public void closeInventory(
+	public void closeInventory( final EntityPlayer player )
-			final EntityPlayer player )
 	{
 
 	}
@@ -155,16 +153,13 @@ public class TileItemGen extends AEBaseTile implements IInventory
 	}
 
 	@Override
-	public int getField(
+	public int getField( final int id )
-			final int id )
 	{
 		return 0;
 	}
 
 	@Override
-	public void setField(
+	public void setField( final int id, final int value )
-			final int id,
-			final int value )
 	{
 
 	}

src/main/java/appeng/debug/ToolDebugCard.java

@@ -62,15 +62,7 @@ public class ToolDebugCard extends AEBaseItem
 	}
 
 	@Override
-	public boolean onItemUseFirst(
+	public boolean onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final ItemStack stack,
-			final EntityPlayer player,
-			final World world,
-			final BlockPos pos,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		if( Platform.isClient() )
 		{

src/main/java/appeng/debug/ToolEraser.java

@@ -47,15 +47,7 @@ public class ToolEraser extends AEBaseItem
 	}
 
 	@Override
-	public boolean onItemUseFirst(
+	public boolean onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final ItemStack stack,
-			final EntityPlayer player,
-			final World world,
-			final BlockPos pos,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		if( Platform.isClient() )
 		{

src/main/java/appeng/debug/ToolMeteoritePlacer.java

@@ -43,15 +43,7 @@ public class ToolMeteoritePlacer extends AEBaseItem
 	}
 
 	@Override
-	public boolean onItemUseFirst(
+	public boolean onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final ItemStack stack,
-			final EntityPlayer player,
-			final World world,
-			final BlockPos pos,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		if( Platform.isClient() )
 		{

src/main/java/appeng/debug/ToolReplicatorCard.java

@@ -53,15 +53,7 @@ public class ToolReplicatorCard extends AEBaseItem
 	}
 
 	@Override
-	public boolean onItemUseFirst(
+	public boolean onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final ItemStack stack,
-			final EntityPlayer player,
-			final World world,
-			final BlockPos pos,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		if( Platform.isClient() )
 		{

src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java

@@ -45,10 +45,7 @@ public final class ChargedQuartzOreBlock extends QuartzOreBlock
 	}
 
 	@Override
-	public Item getItemDropped(
+	public Item getItemDropped( final IBlockState state, final Random rand, final int fortune )
-			final IBlockState state,
-			final Random rand,
-			final int fortune )
 	{
 		for( final Item charged : AEApi.instance().definitions().materials().certusQuartzCrystalCharged().maybeItem().asSet() )
 		{
@@ -59,8 +56,7 @@ public final class ChargedQuartzOreBlock extends QuartzOreBlock
 	}
 
 	@Override
-	public int damageDropped(
+	public int damageDropped( final IBlockState state )
-			final IBlockState state )
 	{
 		for( final ItemStack crystalStack : AEApi.instance().definitions().materials().certusQuartzCrystalCharged().maybeStack( 1 ).asSet() )
 		{
@@ -71,11 +67,7 @@ public final class ChargedQuartzOreBlock extends QuartzOreBlock
 	}
 
 	@Override
-	public void randomDisplayTick(
+	public void randomDisplayTick( final World w, final BlockPos pos, final IBlockState state, final Random r )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final Random r )
 	{
 		if( !AEConfig.instance.enableEffects )
 		{

src/main/java/appeng/decorative/solid/QuartzGlassBlock.java

@@ -60,10 +60,7 @@ public class QuartzGlassBlock extends AEBaseBlock
 	}
 
 	@Override
-	public boolean shouldSideBeRendered(
+	public boolean shouldSideBeRendered( final IBlockAccess w, final BlockPos pos, final EnumFacing side )
-			final IBlockAccess w,
-			final BlockPos pos,
-			final EnumFacing side )
 	{
 		final Material mat = w.getBlockState( pos ).getBlock().getMaterial();
 		if( mat == Material.glass || mat == AEGlassMaterial.INSTANCE )

src/main/java/appeng/decorative/solid/QuartzLampBlock.java

@@ -44,11 +44,7 @@ public class QuartzLampBlock extends QuartzGlassBlock
 	}
 
 	@Override
-	public void randomDisplayTick(
+	public void randomDisplayTick( final World w, final BlockPos pos, final IBlockState state, final Random r )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final Random r )
 	{
 		if( !AEConfig.instance.enableEffects )
 		{

src/main/java/appeng/decorative/solid/QuartzOreBlock.java

@@ -77,9 +77,7 @@ public class QuartzOreBlock extends AEBaseBlock
 	}
 
 	@Override
-	public int getMixedBrightnessForBlock(
+	public int getMixedBrightnessForBlock( final IBlockAccess worldIn, final BlockPos pos )
-			final IBlockAccess worldIn,
-			final BlockPos pos )
 	{
 		int j1 = super.getMixedBrightnessForBlock( worldIn, pos );
 		if( this.enhanceBrightness )
@@ -111,10 +109,8 @@ public class QuartzOreBlock extends AEBaseBlock
 	}
 
 	@Override
-	public Item getItemDropped(
+	public Item getItemDropped( final IBlockState state, /* is null */
-			final IBlockState state, /* is null */
+			final Random rand, final int fortune )
-			final Random rand,
-			final int fortune )
 	{
 		for( final Item crystalItem : AEApi.instance().definitions().materials().certusQuartzCrystal().maybeItem().asSet() )
 		{
@@ -125,12 +121,7 @@ public class QuartzOreBlock extends AEBaseBlock
 	}
 
 	@Override
-	public void dropBlockAsItemWithChance(
+	public void dropBlockAsItemWithChance( final World w, final BlockPos pos, final IBlockState state, final float chance, final int fortune )
-			final World w,
-			final BlockPos pos,
-			final IBlockState state,
-			final float chance,
-			final int fortune )
 	{
 		super.dropBlockAsItemWithChance( w, pos, state, chance, fortune );
 
@@ -143,8 +134,7 @@ public class QuartzOreBlock extends AEBaseBlock
 	}
 
 	@Override
-	public int damageDropped(
+	public int damageDropped( final IBlockState state )
-			final IBlockState state )
 	{
 		for( final ItemStack crystalStack : AEApi.instance().definitions().materials().certusQuartzCrystal().maybeStack( 1 ).asSet() )
 		{

src/main/java/appeng/decorative/solid/QuartzPillarBlock.java

@@ -45,15 +45,13 @@ public class QuartzPillarBlock extends AEBaseBlock implements IOrientableBlock
 	}
 
 	@Override
-	public int getMetaFromState(
+	public int getMetaFromState( final IBlockState state )
-			final IBlockState state )
 	{
 		return 0;
 	}
 
 	@Override
-	public IBlockState getStateFromMeta(
+	public IBlockState getStateFromMeta( final int meta )
-			final int meta )
 	{
 		return this.getDefaultState();
 	}

src/main/java/appeng/entity/RenderFloatingItem.java

@@ -41,13 +41,7 @@ public class RenderFloatingItem extends RenderEntityItem
 	}
 
 	@Override
-	public void doRender(
+	public void doRender( final EntityItem entityItem, final double x, final double y, final double z, final float yaw, final float partialTick )
-			final EntityItem entityItem,
-			final double x,
-			final double y,
-			final double z,
-			final float yaw,
-			final float partialTick )
 	{
 		if( entityItem instanceof EntityFloatingItem )
 		{

src/main/java/appeng/helpers/DualityInterface.java

@@ -872,8 +872,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 
 		final DualityInterface di = this;
 
-		return new IStorageMonitorable()
+		return new IStorageMonitorable(){
-		{
 
 			@Override
 			public IMEMonitor<IAEItemStack> getItemInventory()

src/main/java/appeng/helpers/InventoryAction.java

@@ -22,11 +22,22 @@ package appeng.helpers;
 public enum InventoryAction
 {
 	// standard vanilla mechanics.
-	PICKUP_OR_SET_DOWN, SPLIT_OR_PLACE_SINGLE, CREATIVE_DUPLICATE, SHIFT_CLICK,
+	PICKUP_OR_SET_DOWN,
+	SPLIT_OR_PLACE_SINGLE,
+	CREATIVE_DUPLICATE,
+	SHIFT_CLICK,
 
 	// crafting term
-	CRAFT_STACK, CRAFT_ITEM, CRAFT_SHIFT,
+	CRAFT_STACK,
+	CRAFT_ITEM,
+	CRAFT_SHIFT,
 
 	// extra...
-	MOVE_REGION, PICKUP_SINGLE, UPDATE_HAND, ROLL_UP, ROLL_DOWN, AUTO_CRAFT, PLACE_SINGLE
+	MOVE_REGION,
+	PICKUP_SINGLE,
+	UPDATE_HAND,
+	ROLL_UP,
+	ROLL_DOWN,
+	AUTO_CRAFT,
+	PLACE_SINGLE
 }

src/main/java/appeng/hooks/IBlockTool.java

@@ -29,14 +29,6 @@ import net.minecraft.world.World;
 public interface IBlockTool
 {
 
-	public boolean onItemUse(
+	public boolean onItemUse( ItemStack item, EntityPlayer p, World w, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ );
-			ItemStack item,
-			EntityPlayer p,
-			World w,
-			BlockPos pos,
-			EnumFacing side,
-			float hitX,
-			float hitY,
-			float hitZ );
 
 }

src/main/java/appeng/items/AEBaseItem.java

@@ -111,21 +111,18 @@ public abstract class AEBaseItem extends Item implements IAEFeature
 	protected IAESprite myIcon = null;
 
 	@SideOnly( Side.CLIENT )
-	public void registerIcons(
+	public void registerIcons( final ClientHelper proxy, final String name )
-			final ClientHelper proxy, final String name )
 	{
 		proxy.setIcon( this, 0, name );
 	}
 
-	public IAESprite getIcon(
+	public IAESprite getIcon( final ItemStack is )
-			final ItemStack is )
 	{
 		return this.myIcon;
 	}
 
 	@SideOnly( Side.CLIENT )
-	public void registerCustomIcon(
+	public void registerCustomIcon( final TextureMap map )
-			final TextureMap map )
 	{
 
 	}

src/main/java/appeng/items/contents/NetworkToolViewer.java

@@ -67,8 +67,7 @@ public class NetworkToolViewer implements INetworkTool
 	}
 
 	@Override
-	public ItemStack removeStackFromSlot(
+	public ItemStack removeStackFromSlot( int i )
-			int i )
 	{
 		return this.inv.removeStackFromSlot( i );
 	}
@@ -141,16 +140,13 @@ public class NetworkToolViewer implements INetworkTool
 	}
 
 	@Override
-	public int getField(
+	public int getField( final int id )
-			final int id )
 	{
 		return this.inv.getField( id );
 	}
 
 	@Override
-	public void setField(
+	public void setField( final int id, final int value )
-			final int id,
-			final int value )
 	{
 		this.inv.setField( id, value );
 	}

src/main/java/appeng/items/contents/PortableCellViewer.java

@@ -97,8 +97,7 @@ public class PortableCellViewer extends MEMonitorHandler<IAEItemStack> implement
 	@Override
 	public IConfigManager getConfigManager()
 	{
-		final ConfigManager out = new ConfigManager( new IConfigManagerHost()
+		final ConfigManager out = new ConfigManager( new IConfigManagerHost(){
-		{
 
 			@Override
 			public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue )

src/main/java/appeng/items/materials/MaterialType.java

@@ -86,7 +86,8 @@ public enum MaterialType
 
 	// Adv Cards
 	AdvCard( 28 ),
-	CardFuzzy( 29 ), CardSpeed( 30 ),
+	CardFuzzy( 29 ),
+	CardSpeed( 30 ),
 	CardInverter( 31 ),
 
 	Cell2SpatialPart( 32, AEFeature.SpatialIO ),

src/main/java/appeng/items/materials/MultiItem.java

@@ -279,8 +279,7 @@ public final class MultiItem extends AEBaseItem implements IStorageComponent, IU
 	protected void getCheckedSubItems( final Item sameItem, final CreativeTabs creativeTab, final List<ItemStack> itemStacks )
 	{
 		final List<MaterialType> types = Arrays.asList( MaterialType.values() );
-		Collections.sort( types, new Comparator<MaterialType>()
+		Collections.sort( types, new Comparator<MaterialType>(){
-		{
 
 			@Override
 			public int compare( final MaterialType o1, final MaterialType o2 )

src/main/java/appeng/items/misc/ItemCrystalSeed.java

@@ -99,8 +99,7 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal
 		Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( this, new ItemMeshDefinition(){
 
 			@Override
-			public ModelResourceLocation getModelLocation(
+			public ModelResourceLocation getModelLocation( final ItemStack stack )
-					final ItemStack stack )
 			{
 				ModelResourceLocation[] list = null;
 

src/main/java/appeng/items/misc/ItemEncodedPattern.java

@@ -68,9 +68,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
 	}
 
 	@Override
-	public void registerIcons(
+	public void registerIcons( final ClientHelper proxy, final String name )
-			final ClientHelper proxy,
-			final String name )
 	{
 		this.encodedPatternModel = this.res = proxy.setIcon( this, name );
 
@@ -79,8 +77,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
 			boolean recursive = false;
 
 			@Override
-			public ModelResourceLocation getModelLocation(
+			public ModelResourceLocation getModelLocation( final ItemStack stack )
-					final ItemStack stack )
 			{
 				if( this.recursive == false )
 				{
@@ -112,15 +109,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
 	}
 
 	@Override
-	public boolean onItemUseFirst(
+	public boolean onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final ItemStack stack,
-			final EntityPlayer player,
-			final World world,
-			final BlockPos pos,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		return this.clearPattern( stack, player );
 	}

src/main/java/appeng/items/misc/ItemPaintBall.java

@@ -59,8 +59,7 @@ public class ItemPaintBall extends AEBaseItem
 		Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( this, new ItemMeshDefinition(){
 
 			@Override
-			public ModelResourceLocation getModelLocation(
+			public ModelResourceLocation getModelLocation( final ItemStack stack )
-					final ItemStack stack )
 			{
 				if( ItemPaintBall.this.isLumen( stack ) )
 				{
@@ -84,9 +83,7 @@ public class ItemPaintBall extends AEBaseItem
 	}
 
 	@Override
-	public int getColorFromItemStack(
+	public int getColorFromItemStack( final ItemStack stack, final int renderPass )
-			final ItemStack stack,
-			final int renderPass )
 	{
 		final AEColor col = this.getColor( stack );
 

src/main/java/appeng/items/parts/ItemFacade.java

@@ -68,15 +68,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
 	}
 
 	@Override
-	public boolean onItemUseFirst(
+	public boolean onItemUseFirst( final ItemStack is, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final ItemStack is,
-			final EntityPlayer player,
-			final World world,
-			final BlockPos pos,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		return AEApi.instance().partHelper().placeBus( is, pos, side, player, world );
 	}
@@ -299,8 +291,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
 	}
 
 	@Override
-	public void registerCustomIcon(
+	public void registerCustomIcon( final TextureMap map )
-			final TextureMap map )
 	{
 		this.myIcon = new BaseIcon( map.registerSprite( new ResourceLocation( AppEng.MOD_ID, "blocks/ItemFacade" ) ) );
 	}

src/main/java/appeng/items/parts/ItemMultiPart.java

@@ -195,8 +195,7 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG
 
 	@Override
 	@SideOnly( Side.CLIENT )
-	public void registerCustomIcon(
+	public void registerCustomIcon( final TextureMap map )
-			final TextureMap map )
 	{
 		for( final Entry<Integer, PartTypeWithVariant> part : this.registered.entrySet() )
 		{
@@ -391,10 +390,7 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG
 		@Override
 		public String toString()
 		{
-			return "PartTypeWithVariant{" +
+			return "PartTypeWithVariant{" + "part=" + this.part + ", variant=" + this.variant + '}';
-					"part=" + this.part +
-					", variant=" + this.variant +
-					'}';
 		}
 	}
 

src/main/java/appeng/items/storage/ItemBasicStorageCell.java

@@ -284,15 +284,7 @@ public final class ItemBasicStorageCell extends AEBaseItem implements IStorageCe
 	}
 
 	@Override
-	public boolean onItemUseFirst(
+	public boolean onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final ItemStack stack,
-			final EntityPlayer player,
-			final World world,
-			final BlockPos pos,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		return this.disassembleDrive( stack, world, player );
 	}

src/main/java/appeng/items/tools/ToolMemoryCard.java

@@ -140,15 +140,7 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard
 	}
 
 	@Override
-	public boolean onItemUse(
+	public boolean onItemUse( final ItemStack is, final EntityPlayer player, final World w, final BlockPos pos, final EnumFacing side, final float hx, final float hy, final float hz )
-			final ItemStack is,
-			final EntityPlayer player,
-			final World w,
-			final BlockPos pos,
-			final EnumFacing side,
-			final float hx,
-			final float hy,
-			final float hz )
 	{
 		if( player.isSneaking() && !w.isRemote )
 		{
@@ -164,10 +156,7 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard
 	}
 
 	@Override
-	public boolean doesSneakBypassUse(
+	public boolean doesSneakBypassUse( final World world, final BlockPos pos, final EntityPlayer player )
-			final World world,
-			final BlockPos pos,
-			final EntityPlayer player )
 	{
 		return true;
 	}

src/main/java/appeng/items/tools/ToolNetworkTool.java

@@ -98,15 +98,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench /
 	}
 
 	@Override
-	public boolean onItemUseFirst(
+	public boolean onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
-			final ItemStack stack,
-			final EntityPlayer player,
-			final World world,
-			final BlockPos pos,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
 	{
 		final MovingObjectPosition mop = new MovingObjectPosition( new Vec3( hitX, hitY, hitZ ), side, pos );
 		final TileEntity te = world.getTileEntity( pos );
@@ -134,10 +126,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench /
 	}
 
 	@Override
-	public boolean doesSneakBypassUse(
+	public boolean doesSneakBypassUse( final World world, final BlockPos pos, final EntityPlayer player )
-			final World world,
-			final BlockPos pos,
-			final EntityPlayer player )
 	{
 		return true;
 	}
@@ -200,10 +189,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench /
 	}
 
 	@Override
-	public boolean canWrench(
+	public boolean canWrench( final ItemStack wrench, final EntityPlayer player, final BlockPos pos )
-			final ItemStack wrench,
-			final EntityPlayer player,
-			final BlockPos pos )
 	{
 		return true;
 	}