Replaces all method parameter regarding their naming conventions

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

@@ -718,7 +718,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
 	}
 
 	@SideOnly( Side.CLIENT )
-	private FlippableIcon optionalIcon( IIconRegister ir, String Name, IIcon substitute )
+	private FlippableIcon optionalIcon( IIconRegister ir, String name, IIcon substitute )
 	{
 		// if the input is an flippable IIcon find the original.
 		while( substitute instanceof FlippableIcon )
@@ -730,13 +730,13 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
 		{
 			try
 			{
-				ResourceLocation resLoc = new ResourceLocation( Name );
+				ResourceLocation resLoc = new ResourceLocation( name );
 				resLoc = new ResourceLocation( resLoc.getResourceDomain(), String.format( "%s/%s%s", "textures/blocks", resLoc.getResourcePath(), ".png" ) );
 
 				IResource res = Minecraft.getMinecraft().getResourceManager().getResource( resLoc );
 				if( res != null )
 				{
-					return new FlippableIcon( ir.registerIcon( Name ) );
+					return new FlippableIcon( ir.registerIcon( name ) );
 				}
 			}
 			catch( Throwable e )
@@ -745,7 +745,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
 			}
 		}
 
-		return new FlippableIcon( ir.registerIcon( Name ) );
+		return new FlippableIcon( ir.registerIcon( name ) );
 	}
 
 	@SideOnly( Side.CLIENT )

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

@@ -71,13 +71,13 @@ public class BlockPaint extends AEBaseBlock
 	}
 
 	@Override
-	public AxisAlignedBB getCollisionBoundingBoxFromPool( World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_ )
+	public AxisAlignedBB getCollisionBoundingBoxFromPool( World world, int x, int y, int z )
 	{
 		return null;
 	}
 
 	@Override
-	public boolean canCollideCheck( int p_149678_1_, boolean p_149678_2_ )
+	public boolean canCollideCheck( int metadata, boolean isHoldingRightClick )
 	{
 		return false;
 	}
@@ -94,13 +94,13 @@ public class BlockPaint extends AEBaseBlock
 	}
 
 	@Override
-	public Item getItemDropped( int p_149650_1_, Random p_149650_2_, int p_149650_3_ )
+	public Item getItemDropped( int meta, Random random, int fortune )
 	{
 		return null;
 	}
 
 	@Override
-	public void dropBlockAsItemWithChance( World p_149690_1_, int p_149690_2_, int p_149690_3_, int p_149690_4_, int p_149690_5_, float p_149690_6_, int p_149690_7_ )
+	public void dropBlockAsItemWithChance( World world, int x, int y, int z, int meta, float chance, int fortune )
 	{
 
 	}

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

@@ -126,7 +126,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
 	}
 
 	@Override
-	public int colorMultiplier( IBlockAccess p_149720_1_, int p_149720_2_, int p_149720_3_, int p_149720_4_ )
+	public int colorMultiplier( IBlockAccess world, int x, int y, int z )
 	{
 		return this.myColorMultiplier;
 	}

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

@@ -44,7 +44,7 @@ public class BlockController extends AEBaseBlock
 	}
 
 	@Override
-	public void onNeighborBlockChange( World w, int x, int y, int z, Block id_junk )
+	public void onNeighborBlockChange( World w, int x, int y, int z, Block neighborBlock )
 	{
 		TileController tc = this.getTileEntity( w, x, y, z );
 		if( tc != null )

src/main/java/appeng/client/gui/AEBaseGui.java

@@ -30,6 +30,9 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
+import com.google.common.base.Joiner;
+import com.google.common.base.Stopwatch;
+
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
@@ -49,9 +52,6 @@ import net.minecraft.util.ResourceLocation;
 
 import cpw.mods.fml.common.ObfuscationReflectionHelper;
 
-import com.google.common.base.Joiner;
-import com.google.common.base.Stopwatch;
-
 import appeng.api.storage.data.IAEItemStack;
 import appeng.client.gui.widgets.GuiScrollbar;
 import appeng.client.gui.widgets.ITooltip;
@@ -156,14 +156,14 @@ public abstract class AEBaseGui extends GuiContainer
 	}
 
 	@Override
-	public void drawScreen( int mouse_x, int mouse_y, float btn )
+	public void drawScreen( int mouseX, int mouseY, float btn )
 	{
-		super.drawScreen( mouse_x, mouse_y, btn );
+		super.drawScreen( mouseX, mouseY, btn );
 
 		boolean hasClicked = Mouse.isButtonDown( 0 );
 		if( hasClicked && this.myScrollBar != null )
 		{
-			this.myScrollBar.click( this, mouse_x - this.guiLeft, mouse_y - this.guiTop );
+			this.myScrollBar.click( this, mouseX - this.guiLeft, mouseY - this.guiTop );
 		}
 
 		for( Object c : this.buttonList )
@@ -174,9 +174,9 @@ public abstract class AEBaseGui extends GuiContainer
 				int x = tooltip.xPos(); // ((GuiImgButton) c).xPosition;
 				int y = tooltip.yPos(); // ((GuiImgButton) c).yPosition;
 
-				if( x < mouse_x && x + tooltip.getWidth() > mouse_x && tooltip.isVisible() )
+				if( x < mouseX && x + tooltip.getWidth() > mouseX && tooltip.isVisible() )
 				{
-					if( y < mouse_y && y + tooltip.getHeight() > mouse_y )
+					if( y < mouseY && y + tooltip.getHeight() > mouseY )
 					{
 						if( y < 15 )
 						{
@@ -194,14 +194,14 @@ public abstract class AEBaseGui extends GuiContainer
 		}
 	}
 
-	public void drawTooltip( int par2, int par3, int forceWidth, String Msg )
+	public void drawTooltip( int par2, int par3, int forceWidth, String message )
 	{
 		GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
 		GL11.glDisable( GL12.GL_RESCALE_NORMAL );
 		RenderHelper.disableStandardItemLighting();
 		GL11.glDisable( GL11.GL_LIGHTING );
 		GL11.glDisable( GL11.GL_DEPTH_TEST );
-		String[] var4 = Msg.split( "\n" );
+		String[] var4 = message.split( "\n" );
 
 		if( var4.length > 0 )
 		{
@@ -590,7 +590,7 @@ public abstract class AEBaseGui extends GuiContainer
 	}
 
 	@Override
-	protected boolean checkHotbarKeys( int p_146983_1_ )
+	protected boolean checkHotbarKeys( int keyCode )
 	{
 		Slot theSlot;
 
@@ -607,7 +607,7 @@ public abstract class AEBaseGui extends GuiContainer
 		{
 			for( int j = 0; j < 9; ++j )
 			{
-				if( p_146983_1_ == this.mc.gameSettings.keyBindsHotbar[j].getKeyCode() )
+				if( keyCode == this.mc.gameSettings.keyBindsHotbar[j].getKeyCode() )
 				{
 					final List<Slot> slots = this.getInventorySlots();
 					for( Slot s : slots )

src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java

@@ -26,6 +26,8 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
+import com.google.common.base.Joiner;
+
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
 
@@ -33,8 +35,6 @@ import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 
-import com.google.common.base.Joiner;
-
 import appeng.api.AEApi;
 import appeng.api.storage.ITerminalHost;
 import appeng.api.storage.data.IAEItemStack;
@@ -131,7 +131,7 @@ public class GuiCraftConfirm extends AEBaseGui
 	}
 
 	@Override
-	public void drawScreen( int mouse_x, int mouse_y, float btn )
+	public void drawScreen( int mouseX, int mouseY, float btn )
 	{
 		this.updateCPUButtonText();
 
@@ -152,9 +152,9 @@ public class GuiCraftConfirm extends AEBaseGui
 			int minX = gx + 9 + x * 67;
 			int minY = gy + 22 + y * offY;
 
-			if( minX < mouse_x && minX + 67 > mouse_x )
+			if( minX < mouseX && minX + 67 > mouseX )
 			{
-				if( minY < mouse_y && minY + offY - 2 > mouse_y )
+				if( minY < mouseY && minY + offY - 2 > mouseY )
 				{
 					this.tooltip = z;
 					break;
@@ -170,7 +170,7 @@ public class GuiCraftConfirm extends AEBaseGui
 			}
 		}
 
-		super.drawScreen( mouse_x, mouse_y, btn );
+		super.drawScreen( mouseX, mouseY, btn );
 	}
 
 	private void updateCPUButtonText()

src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java

@@ -25,14 +25,14 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
+import com.google.common.base.Joiner;
+
 import org.lwjgl.opengl.GL11;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 
-import com.google.common.base.Joiner;
-
 import appeng.api.AEApi;
 import appeng.api.config.SortDir;
 import appeng.api.config.SortOrder;
@@ -122,7 +122,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
 	}
 
 	@Override
-	public void drawScreen( int mouse_x, int mouse_y, float btn )
+	public void drawScreen( int mouseX, int mouseY, float btn )
 	{
 		this.cancel.enabled = !this.visual.isEmpty();
 
@@ -140,9 +140,9 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
 			int minX = gx + 9 + x * 67;
 			int minY = gy + 22 + y * offY;
 
-			if( minX < mouse_x && minX + 67 > mouse_x )
+			if( minX < mouseX && minX + 67 > mouseX )
 			{
-				if( minY < mouse_y && minY + offY - 2 > mouse_y )
+				if( minY < mouseY && minY + offY - 2 > mouseY )
 				{
 					this.tooltip = z;
 					break;
@@ -158,7 +158,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
 			}
 		}
 
-		super.drawScreen( mouse_x, mouse_y, btn );
+		super.drawScreen( mouseX, mouseY, btn );
 	}
 
 	@Override

src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java

@@ -89,7 +89,7 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
 	}
 
 	@Override
-	public void drawScreen( int mouse_x, int mouse_y, float btn )
+	public void drawScreen( int mouseX, int mouseY, float btn )
 	{
 		int x = 0;
 		int y = 0;
@@ -104,9 +104,9 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
 			int minX = gx + 14 + x * 31;
 			int minY = gy + 41 + y * 18;
 
-			if( minX < mouse_x && minX + 28 > mouse_x )
+			if( minX < mouseX && minX + 28 > mouseX )
 			{
-				if( minY < mouse_y && minY + 20 > mouse_y )
+				if( minY < mouseY && minY + 20 > mouseY )
 				{
 					this.tooltip = z;
 					break;
@@ -122,7 +122,7 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
 			}
 		}
 
-		super.drawScreen( mouse_x, mouse_y, btn );
+		super.drawScreen( mouseX, mouseY, btn );
 	}
 
 	@Override

src/main/java/appeng/client/gui/widgets/GuiNumberBox.java

@@ -28,9 +28,9 @@ public class GuiNumberBox extends GuiTextField
 
 	final Class type;
 
-	public GuiNumberBox( FontRenderer p_i1032_1_, int p_i1032_2_, int p_i1032_3_, int p_i1032_4_, int p_i1032_5_, Class type )
+	public GuiNumberBox( FontRenderer fontRenderer, int x, int y, int width, int height, Class type )
 	{
-		super( p_i1032_1_, p_i1032_2_, p_i1032_3_, p_i1032_4_, p_i1032_5_ );
+		super( fontRenderer, x, y, width, height );
 		this.type = type;
 	}
 

src/main/java/appeng/client/gui/widgets/GuiProgressBar.java

@@ -38,20 +38,20 @@ public class GuiProgressBar extends GuiButton implements ITooltip
 	private final String titleName;
 	private String fullMsg;
 
-	public GuiProgressBar( IProgressProvider source, String texture, int posX, int posY, int u, int y, int _width, int _height, Direction dir )
+	public GuiProgressBar( IProgressProvider source, String texture, int posX, int posY, int u, int y, int width, int height, Direction dir )
 	{
-		this( source, texture, posX, posY, u, y, _width, _height, dir, null );
+		this( source, texture, posX, posY, u, y, width, height, dir, null );
 	}
 
-	public GuiProgressBar( IProgressProvider source, String texture, int posX, int posY, int u, int y, int _width, int _height, Direction dir, String title )
+	public GuiProgressBar( IProgressProvider source, String texture, int posX, int posY, int u, int y, int width, int height, Direction dir, String title )
 	{
-		super( posX, posY, _width, "" );
+		super( posX, posY, width, "" );
 		this.source = source;
 		this.xPosition = posX;
 		this.yPosition = posY;
 		this.texture = new ResourceLocation( "appliedenergistics2", "textures/" + texture );
-		this.width = _width;
+		this.width = width;
-		this.height = _height;
+		this.height = height;
 		this.fill_u = u;
 		this.fill_v = y;
 		this.layout = dir;

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

@@ -70,10 +70,10 @@ public class BaseBlockRender
 		this( false, 20 );
 	}
 
-	public BaseBlockRender( boolean enableTESR, double tileEntitySpecialRendererRange )
+	public BaseBlockRender( boolean enableTESR, double renderDistance )
 	{
 		this.hasTESR = enableTESR;
-		this.renderDistance = tileEntitySpecialRendererRange;
+		this.renderDistance = renderDistance;
 		setOriMap();
 	}
 

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

@@ -49,31 +49,31 @@ public class BlockRenderInfo
 		this.rendererInstance = inst;
 	}
 
-	public void updateIcons( FlippableIcon Bottom, FlippableIcon Top, FlippableIcon North, FlippableIcon South, FlippableIcon East, FlippableIcon West )
+	public void updateIcons( FlippableIcon bottom, FlippableIcon top, FlippableIcon north, FlippableIcon south, FlippableIcon east, FlippableIcon west )
 	{
-		this.topIcon = Top;
+		this.topIcon = top;
-		this.bottomIcon = Bottom;
+		this.bottomIcon = bottom;
-		this.southIcon = South;
+		this.southIcon = south;
-		this.northIcon = North;
+		this.northIcon = north;
-		this.eastIcon = East;
+		this.eastIcon = east;
-		this.westIcon = West;
+		this.westIcon = west;
 	}
 
-	public void setTemporaryRenderIcon( IIcon IIcon )
+	public void setTemporaryRenderIcon( IIcon icon )
 	{
-		if( IIcon == null )
+		if( icon == null )
 		{
 			this.useTmp = false;
 		}
 		else
 		{
 			this.useTmp = true;
-			this.tmpTopIcon.setOriginal( IIcon );
+			this.tmpTopIcon.setOriginal( icon );
-			this.tmpBottomIcon.setOriginal( IIcon );
+			this.tmpBottomIcon.setOriginal( icon );
-			this.tmpSouthIcon.setOriginal( IIcon );
+			this.tmpSouthIcon.setOriginal( icon );
-			this.tmpNorthIcon.setOriginal( IIcon );
+			this.tmpNorthIcon.setOriginal( icon );
-			this.tmpEastIcon.setOriginal( IIcon );
+			this.tmpEastIcon.setOriginal( icon );
-			this.tmpWestIcon.setOriginal( IIcon );
+			this.tmpWestIcon.setOriginal( icon );
 		}
 	}
 

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

@@ -22,6 +22,9 @@ package appeng.client.render;
 import java.util.EnumSet;
 import javax.annotation.Nullable;
 
+import com.google.common.base.Function;
+import com.google.common.base.Optional;
+
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
@@ -31,9 +34,6 @@ import net.minecraftforge.common.util.ForgeDirection;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
-
 import appeng.api.AEApi;
 import appeng.api.exceptions.MissingDefinition;
 import appeng.api.parts.IBoxProvider;
@@ -374,16 +374,16 @@ public final class BusRenderHelper implements IPartRenderHelper
 	}
 
 	@Override
-	public void setTexture( IIcon Down, IIcon Up, IIcon North, IIcon South, IIcon West, IIcon East )
+	public void setTexture( IIcon down, IIcon up, IIcon north, IIcon south, IIcon west, IIcon east )
 	{
 		IIcon[] list = new IIcon[6];
 
-		list[0] = Down;
+		list[0] = down;
-		list[1] = Up;
+		list[1] = up;
-		list[2] = North;
+		list[2] = north;
-		list[3] = South;
+		list[3] = south;
-		list[4] = West;
+		list[4] = west;
-		list[5] = East;
+		list[5] = east;
 
 		for( AEBaseBlock baseBlock : this.maybeBaseBlock.asSet() )
 		{

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

@@ -201,49 +201,49 @@ public class RenderBlockAssembler extends BaseBlockRender implements IBoxProvide
 		return true;
 	}
 
-	public void renderCableAt( double Thickness, IBlockAccess world, int x, int y, int z, AEBaseBlock block, RenderBlocks renderer, double pull, boolean covered )
+	public void renderCableAt( double thickness, IBlockAccess world, int x, int y, int z, AEBaseBlock block, RenderBlocks renderer, double pull, boolean covered )
 	{
 		IIcon texture = null;
 
 		block.getRendererInstance().setTemporaryRenderIcon( texture = this.getConnectedCable( world, x, y, z, ForgeDirection.WEST, covered ) );
 		if( texture != null )
 		{
-			renderer.setRenderBounds( 0.0D, 0.5D - Thickness, 0.5D - Thickness, 0.5D - Thickness - pull, 0.5D + Thickness, 0.5D + Thickness );
+			renderer.setRenderBounds( 0.0D, 0.5D - thickness, 0.5D - thickness, 0.5D - thickness - pull, 0.5D + thickness, 0.5D + thickness );
 			renderer.renderStandardBlock( block, x, y, z );
 		}
 
 		block.getRendererInstance().setTemporaryRenderIcon( texture = this.getConnectedCable( world, x, y, z, ForgeDirection.EAST, covered ) );
 		if( texture != null )
 		{
-			renderer.setRenderBounds( 0.5D + Thickness + pull, 0.5D - Thickness, 0.5D - Thickness, 1.0D, 0.5D + Thickness, 0.5D + Thickness );
+			renderer.setRenderBounds( 0.5D + thickness + pull, 0.5D - thickness, 0.5D - thickness, 1.0D, 0.5D + thickness, 0.5D + thickness );
 			renderer.renderStandardBlock( block, x, y, z );
 		}
 
 		block.getRendererInstance().setTemporaryRenderIcon( texture = this.getConnectedCable( world, x, y, z, ForgeDirection.NORTH, covered ) );
 		if( texture != null )
 		{
-			renderer.setRenderBounds( 0.5D - Thickness, 0.5D - Thickness, 0.0D, 0.5D + Thickness, 0.5D + Thickness, 0.5D - Thickness - pull );
+			renderer.setRenderBounds( 0.5D - thickness, 0.5D - thickness, 0.0D, 0.5D + thickness, 0.5D + thickness, 0.5D - thickness - pull );
 			renderer.renderStandardBlock( block, x, y, z );
 		}
 
 		block.getRendererInstance().setTemporaryRenderIcon( texture = this.getConnectedCable( world, x, y, z, ForgeDirection.SOUTH, covered ) );
 		if( texture != null )
 		{
-			renderer.setRenderBounds( 0.5D - Thickness, 0.5D - Thickness, 0.5D + Thickness + pull, 0.5D + Thickness, 0.5D + Thickness, 1.0D );
+			renderer.setRenderBounds( 0.5D - thickness, 0.5D - thickness, 0.5D + thickness + pull, 0.5D + thickness, 0.5D + thickness, 1.0D );
 			renderer.renderStandardBlock( block, x, y, z );
 		}
 
 		block.getRendererInstance().setTemporaryRenderIcon( texture = this.getConnectedCable( world, x, y, z, ForgeDirection.DOWN, covered ) );
 		if( texture != null )
 		{
-			renderer.setRenderBounds( 0.5D - Thickness, 0.0D, 0.5D - Thickness, 0.5D + Thickness, 0.5D - Thickness - pull, 0.5D + Thickness );
+			renderer.setRenderBounds( 0.5D - thickness, 0.0D, 0.5D - thickness, 0.5D + thickness, 0.5D - thickness - pull, 0.5D + thickness );
 			renderer.renderStandardBlock( block, x, y, z );
 		}
 
 		block.getRendererInstance().setTemporaryRenderIcon( texture = this.getConnectedCable( world, x, y, z, ForgeDirection.UP, covered ) );
 		if( texture != null )
 		{
-			renderer.setRenderBounds( 0.5D - Thickness, 0.5D + Thickness + pull, 0.5D - Thickness, 0.5D + Thickness, 1.0D, 0.5D + Thickness );
+			renderer.setRenderBounds( 0.5D - thickness, 0.5D + thickness + pull, 0.5D - thickness, 0.5D + thickness, 1.0D, 0.5D + thickness );
 			renderer.renderStandardBlock( block, x, y, z );
 		}
 

src/main/java/appeng/container/AEBaseContainer.java

@@ -384,7 +384,7 @@ public abstract class AEBaseContainer extends Container
 		}
 	}
 
-	protected void bindPlayerInventory( InventoryPlayer inventoryPlayer, int offset_x, int offset_y )
+	protected void bindPlayerInventory( InventoryPlayer inventoryPlayer, int offsetX, int offsetY )
 	{
 		// bind player inventory
 		for( int i = 0; i < 3; i++ )
@@ -393,11 +393,11 @@ public abstract class AEBaseContainer extends Container
 			{
 				if( this.locked.contains( j + i * 9 + 9 ) )
 				{
-					this.addSlotToContainer( new SlotDisabled( inventoryPlayer, j + i * 9 + 9, 8 + j * 18 + offset_x, offset_y + i * 18 ) );
+					this.addSlotToContainer( new SlotDisabled( inventoryPlayer, j + i * 9 + 9, 8 + j * 18 + offsetX, offsetY + i * 18 ) );
 				}
 				else
 				{
-					this.addSlotToContainer( new SlotPlayerInv( inventoryPlayer, j + i * 9 + 9, 8 + j * 18 + offset_x, offset_y + i * 18 ) );
+					this.addSlotToContainer( new SlotPlayerInv( inventoryPlayer, j + i * 9 + 9, 8 + j * 18 + offsetX, offsetY + i * 18 ) );
 				}
 			}
 		}
@@ -407,11 +407,11 @@ public abstract class AEBaseContainer extends Container
 		{
 			if( this.locked.contains( i ) )
 			{
-				this.addSlotToContainer( new SlotDisabled( inventoryPlayer, i, 8 + i * 18 + offset_x, 58 + offset_y ) );
+				this.addSlotToContainer( new SlotDisabled( inventoryPlayer, i, 8 + i * 18 + offsetX, 58 + offsetY ) );
 			}
 			else
 			{
-				this.addSlotToContainer( new SlotPlayerHotBar( inventoryPlayer, i, 8 + i * 18 + offset_x, 58 + offset_y ) );
+				this.addSlotToContainer( new SlotPlayerHotBar( inventoryPlayer, i, 8 + i * 18 + offsetX, 58 + offsetY ) );
 			}
 		}
 	}

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

@@ -32,10 +32,10 @@ public class ContainerWirelessTerm extends ContainerMEPortableCell
 
 	final WirelessTerminalGuiObject wirelessTerminalGUIObject;
 
-	public ContainerWirelessTerm( InventoryPlayer ip, WirelessTerminalGuiObject wirelessTerminalGUIObject )
+	public ContainerWirelessTerm( InventoryPlayer ip, WirelessTerminalGuiObject gui )
 	{
-		super( ip, wirelessTerminalGUIObject );
+		super( ip, gui );
-		this.wirelessTerminalGUIObject = wirelessTerminalGUIObject;
+		this.wirelessTerminalGUIObject = gui;
 	}
 
 	@Override

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

@@ -408,12 +408,12 @@ public final class AEConfig extends Configuration implements IConfigurableObject
 		return this.getFreeIDSLot( varID, "materials" );
 	}
 
-	public int getFreeIDSLot( int varID, String Category )
+	public int getFreeIDSLot( int varID, String category )
 	{
 		boolean alreadyUsed = false;
 		int min = 0;
 
-		for( Property p : this.getCategory( Category ).getValues().values() )
+		for( Property p : this.getCategory( category ).getValues().values() )
 		{
 			int thisInt = p.getInt();
 
@@ -469,10 +469,10 @@ public final class AEConfig extends Configuration implements IConfigurableObject
 		return this.levelByStacks[i];
 	}
 
-	public Enum getSetting( String Category, Class<? extends Enum> class1, Enum myDefault )
+	public Enum getSetting( String category, Class<? extends Enum> class1, Enum myDefault )
 	{
 		String name = class1.getSimpleName();
-		Property p = this.get( Category, name, myDefault.name() );
+		Property p = this.get( category, name, myDefault.name() );
 
 		try
 		{
@@ -486,10 +486,10 @@ public final class AEConfig extends Configuration implements IConfigurableObject
 		return myDefault;
 	}
 
-	public void setSetting( String Category, Enum s )
+	public void setSetting( String category, Enum s )
 	{
 		String name = s.getClass().getSimpleName();
-		this.get( Category, name, s.name() ).set( s.name() );
+		this.get( category, name, s.name() ).set( s.name() );
 		this.save();
 	}
 

src/main/java/appeng/core/api/ApiPart.java

@@ -28,6 +28,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import com.google.common.base.Joiner;
+
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.commons.Remapper;
@@ -44,8 +46,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 
-import com.google.common.base.Joiner;
-
 import appeng.api.parts.CableRenderMode;
 import appeng.api.parts.IPartHelper;
 import appeng.api.parts.IPartItem;
@@ -146,7 +146,7 @@ public class ApiPart implements IPartHelper
 		return myCLass;
 	}
 
-	public Class getClassByDesc( String Addendum, String fullPath, String root, String next )
+	public Class getClassByDesc( String addendum, String fullPath, String root, String next )
 	{
 		if( this.roots.get( fullPath ) != null )
 		{
@@ -159,7 +159,7 @@ public class ApiPart implements IPartHelper
 
 		try
 		{
-			n.name = n.name + '_' + Addendum;
+			n.name = n.name + '_' + addendum;
 			n.superName = Class.forName( root ).getName().replace( ".", "/" );
 		}
 		catch( Throwable t )
@@ -268,7 +268,7 @@ public class ApiPart implements IPartHelper
 		}
 	}
 
-	private Class loadClass( String Name, byte[] b )
+	private Class loadClass( String name, byte[] b )
 	{
 		// override classDefine (as it is protected) and define the class.
 		Class clazz = null;
@@ -284,10 +284,10 @@ public class ApiPart implements IPartHelper
 			defineClassMethod.setAccessible( true );
 			try
 			{
-				Object[] argsA = new Object[] { Name, Name, b };
+				Object[] argsA = new Object[] { name, name, b };
 				b = (byte[]) runTransformersMethod.invoke( loader, argsA );
 
-				Object[] args = new Object[] { Name, b, 0, b.length };
+				Object[] args = new Object[] { name, b, 0, b.length };
 				clazz = (Class) defineClassMethod.invoke( loader, args );
 			}
 			finally

src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java

@@ -141,9 +141,9 @@ public class MatterCannonAmmoRegistry implements IOreListener, IMatterCannonAmmo
 		this.considerItem( name, item, "Electrum", ( 107.8682 + 196.96655 ) / 2.0 );
 	}
 
-	private void considerItem( String ore, ItemStack item, String Name, double weight )
+	private void considerItem( String ore, ItemStack item, String name, double weight )
 	{
-		if( ore.equals( "berry" + Name ) || ore.equals( "nugget" + Name ) )
+		if( ore.equals( "berry" + name ) || ore.equals( "nugget" + name ) )
 		{
 			this.registerAmmo( item, weight );
 		}

src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java

@@ -122,9 +122,9 @@ public class P2PTunnelRegistry implements IP2PTunnelRegistry
 		this.Tunnels.put( trigger, type );
 	}
 
-	public ItemStack getModItem( String modID, String Name, int meta )
+	public ItemStack getModItem( String modID, String name, int meta )
 	{
-		ItemStack myItemStack = GameRegistry.findItemStack( modID, Name, 1 );
+		ItemStack myItemStack = GameRegistry.findItemStack( modID, name, 1 );
 
 		if( myItemStack == null )
 		{

src/main/java/appeng/core/sync/GuiBridge.java

@@ -22,6 +22,8 @@ package appeng.core.sync;
 import java.lang.reflect.Constructor;
 import java.util.List;
 
+import com.google.common.collect.Lists;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;
@@ -33,8 +35,6 @@ import net.minecraftforge.common.util.ForgeDirection;
 import cpw.mods.fml.common.network.IGuiHandler;
 import cpw.mods.fml.relauncher.ReflectionHelper;
 
-import com.google.common.collect.Lists;
-
 import appeng.api.AEApi;
 import appeng.api.config.SecurityPermissions;
 import appeng.api.definitions.IComparableDefinition;
@@ -195,24 +195,24 @@ public enum GuiBridge implements IGuiHandler
 
 	GUI_CRAFTING_STATUS( ContainerCraftingStatus.class, ITerminalHost.class, ITEM_OR_WORLD, SecurityPermissions.CRAFT );
 
-	private final Class Tile;
+	private final Class tileClass;
-	private final Class Container;
+	private final Class containerClass;
-	private Class Gui;
+	private Class guiClass;
 	private GuiHostType type;
 	private SecurityPermissions requiredPermission;
 
 	GuiBridge()
 	{
-		this.Tile = null;
+		this.tileClass = null;
-		this.Gui = null;
+		this.guiClass = null;
-		this.Container = null;
+		this.containerClass = null;
 	}
 
-	GuiBridge( Class _Container, SecurityPermissions requiredPermission )
+	GuiBridge( Class containerClass, SecurityPermissions requiredPermission )
 	{
 		this.requiredPermission = requiredPermission;
-		this.Container = _Container;
+		this.containerClass = containerClass;
-		this.Tile = null;
+		this.tileClass = null;
 		this.getGui();
 	}
 
@@ -224,36 +224,36 @@ public enum GuiBridge implements IGuiHandler
 	{
 		if( Platform.isClient() )
 		{
-			final String start = this.Container.getName();
+			final String start = this.containerClass.getName();
 			String guiClass = start.replaceFirst( "container.", "client.gui." ).replace( ".Container", ".Gui" );
 
 			if( start.equals( guiClass ) )
 			{
 				throw new IllegalStateException( "Unable to find gui class" );
 			}
-			this.Gui = ReflectionHelper.getClass( this.getClass().getClassLoader(), guiClass );
+			this.guiClass = ReflectionHelper.getClass( this.getClass().getClassLoader(), guiClass );
-			if( this.Gui == null )
+			if( this.guiClass == null )
 			{
 				throw new IllegalStateException( "Cannot Load class: " + guiClass );
 			}
 		}
 	}
 
-	GuiBridge( Class _Container, Class _Tile, GuiHostType type, SecurityPermissions requiredPermission )
+	GuiBridge( Class containerClass, Class tileClass, GuiHostType type, SecurityPermissions requiredPermission )
 	{
 		this.requiredPermission = requiredPermission;
-		this.Container = _Container;
+		this.containerClass = containerClass;
 		this.type = type;
-		this.Tile = _Tile;
+		this.tileClass = tileClass;
 		this.getGui();
 	}
 
 	@Override
-	public Object getServerGuiElement( int ID_ORDINAL, EntityPlayer player, World w, int x, int y, int z )
+	public Object getServerGuiElement( int ordinal, EntityPlayer player, World w, int x, int y, int z )
 	{
-		ForgeDirection side = ForgeDirection.getOrientation( ID_ORDINAL & 0x07 );
+		ForgeDirection side = ForgeDirection.getOrientation( ordinal & 0x07 );
-		GuiBridge ID = values()[ID_ORDINAL >> 4];
+		GuiBridge ID = values()[ordinal >> 4];
-		boolean stem = ( ( ID_ORDINAL >> 3 ) & 1 ) == 1;
+		boolean stem = ( ( ordinal >> 3 ) & 1 ) == 1;
 		if( ID.type.isItem() )
 		{
 			ItemStack it = null;
@@ -315,12 +315,12 @@ public enum GuiBridge implements IGuiHandler
 
 	public boolean CorrectTileOrPart( Object tE )
 	{
-		if( this.Tile == null )
+		if( this.tileClass == null )
 		{
 			throw new IllegalArgumentException( "This Gui Cannot use the standard Handler." );
 		}
 
-		return this.Tile.isInstance( tE );
+		return this.tileClass.isInstance( tE );
 	}
 
 	private Object updateGui( Object newContainer, World w, int x, int y, int z, ForgeDirection side, Object myItem )
@@ -343,7 +343,7 @@ public enum GuiBridge implements IGuiHandler
 	{
 		try
 		{
-			Constructor[] c = this.Container.getConstructors();
+			Constructor[] c = this.containerClass.getConstructors();
 			if( c.length == 0 )
 			{
 				throw new AppEngException( "Invalid Gui Class" );
@@ -353,7 +353,7 @@ public enum GuiBridge implements IGuiHandler
 
 			if( target == null )
 			{
-				throw new IllegalStateException( "Cannot find " + this.Container.getName() + "( " + this.typeName( inventory ) + ", " + this.typeName( tE ) + " )" );
+				throw new IllegalStateException( "Cannot find " + this.containerClass.getName() + "( " + this.typeName( inventory ) + ", " + this.typeName( tE ) + " )" );
 			}
 
 			Object o = target.newInstance( inventory, tE );
@@ -431,11 +431,11 @@ public enum GuiBridge implements IGuiHandler
 	}
 
 	@Override
-	public Object getClientGuiElement( int ID_ORDINAL, EntityPlayer player, World w, int x, int y, int z )
+	public Object getClientGuiElement( int ordinal, EntityPlayer player, World w, int x, int y, int z )
 	{
-		ForgeDirection side = ForgeDirection.getOrientation( ID_ORDINAL & 0x07 );
+		ForgeDirection side = ForgeDirection.getOrientation( ordinal & 0x07 );
-		GuiBridge ID = values()[ID_ORDINAL >> 4];
+		GuiBridge ID = values()[ordinal >> 4];
-		boolean stem = ( ( ID_ORDINAL >> 3 ) & 1 ) == 1;
+		boolean stem = ( ( ordinal >> 3 ) & 1 ) == 1;
 		if( ID.type.isItem() )
 		{
 			ItemStack it = null;
@@ -480,7 +480,7 @@ public enum GuiBridge implements IGuiHandler
 	{
 		try
 		{
-			Constructor[] c = this.Gui.getConstructors();
+			Constructor[] c = this.guiClass.getConstructors();
 			if( c.length == 0 )
 			{
 				throw new AppEngException( "Invalid Gui Class" );
@@ -490,7 +490,7 @@ public enum GuiBridge implements IGuiHandler
 
 			if( target == null )
 			{
-				throw new IllegalStateException( "Cannot find " + this.Container.getName() + "( " + this.typeName( inventory ) + ", " + this.typeName( tE ) + " )" );
+				throw new IllegalStateException( "Cannot find " + this.containerClass.getName() + "( " + this.typeName( inventory ) + ", " + this.typeName( tE ) + " )" );
 			}
 
 			return target.newInstance( inventory, tE );

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

@@ -44,15 +44,15 @@ public class PacketProgressBar extends AppEngPacket
 	}
 
 	// api
-	public PacketProgressBar( int short_id, long value )
+	public PacketProgressBar( int shortID, long value )
 	{
-		this.id = (short) short_id;
+		this.id = (short) shortID;
 		this.value = value;
 
 		ByteBuf data = Unpooled.buffer();
 
 		data.writeInt( this.getPacketID() );
-		data.writeShort( short_id );
+		data.writeShort( shortID );
 		data.writeLong( value );
 
 		this.configureWrite( data );

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

@@ -72,10 +72,10 @@ public class PacketValueConfig extends AppEngPacket
 	}
 
 	// api
-	public PacketValueConfig( String Name, String Value ) throws IOException
+	public PacketValueConfig( String name, String value ) throws IOException
 	{
-		this.Name = Name;
+		this.Name = name;
-		this.Value = Value;
+		this.Value = value;
 
 		ByteBuf data = Unpooled.buffer();
 
@@ -83,8 +83,8 @@ public class PacketValueConfig extends AppEngPacket
 
 		ByteArrayOutputStream bos = new ByteArrayOutputStream();
 		DataOutputStream dos = new DataOutputStream( bos );
-		dos.writeUTF( Name );
+		dos.writeUTF( name );
-		dos.writeUTF( Value );
+		dos.writeUTF( value );
 		// dos.close();
 
 		data.writeBytes( bos.toByteArray() );

src/main/java/appeng/entity/EntityFloatingItem.java

@@ -33,9 +33,9 @@ public final class EntityFloatingItem extends EntityItem
 	int superDeath = 0;
 	float progress = 0;
 
-	public EntityFloatingItem( Entity parent, World p_i1710_1_, double p_i1710_2_, double p_i1710_4_, double p_i1710_6_, ItemStack p_i1710_8_ )
+	public EntityFloatingItem( Entity parent, World world, double x, double y, double z, ItemStack stack )
 	{
-		super( p_i1710_1_, p_i1710_2_, p_i1710_4_, p_i1710_6_, p_i1710_8_ );
+		super( world, x, y, z, stack );
 		this.motionX = this.motionY = this.motionZ = 0.0d;
 		this.hoverStart = 0.5f;
 		this.rotationYaw = 0;

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

@@ -46,11 +46,11 @@ public class RenderFloatingItem extends RenderItem
 	}
 
 	@Override
-	public void doRender( EntityItem p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_ )
+	public void doRender( EntityItem entityItem, double x, double y, double z, float yaw, float partialTick )
 	{
-		if( p_76986_1_ instanceof EntityFloatingItem )
+		if( entityItem instanceof EntityFloatingItem )
 		{
-			EntityFloatingItem efi = (EntityFloatingItem) p_76986_1_;
+			EntityFloatingItem efi = (EntityFloatingItem) entityItem;
 			if( efi.progress > 0.0 )
 			{
 				GL11.glPushMatrix();
@@ -60,7 +60,7 @@ public class RenderFloatingItem extends RenderItem
 					GL11.glTranslatef( 0, -0.15f, 0 );
 				}
 
-				super.doRender( efi, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_ );
+				super.doRender( efi, x, y, z, yaw, partialTick );
 				GL11.glPopMatrix();
 			}
 		}

src/main/java/appeng/helpers/AEGlassMaterial.java

@@ -28,9 +28,9 @@ public class AEGlassMaterial extends Material
 
 	public static final AEGlassMaterial INSTANCE = ( new AEGlassMaterial( MapColor.airColor ) );
 
-	public AEGlassMaterial( MapColor p_i2116_1_ )
+	public AEGlassMaterial( MapColor color )
 	{
-		super( p_i2116_1_ );
+		super( color );
 	}
 
 	@Override

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

@@ -26,6 +26,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
+import com.google.common.collect.ImmutableSet;
+
 import net.minecraft.block.Block;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.ISidedInventory;
@@ -40,8 +42,6 @@ import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import com.google.common.collect.ImmutableSet;
-
 import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.config.Settings;
@@ -540,7 +540,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 	}
 
 	@Override
-	public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall )
+	public TickRateModulation tickingRequest( IGridNode node, int ticksSinceLastCall )
 	{
 		if( !this.gridProxy.isActive() )
 		{

src/main/java/appeng/helpers/LocationRotation.java

@@ -65,7 +65,7 @@ public class LocationRotation implements IOrientable
 	}
 
 	@Override
-	public void setOrientation( ForgeDirection Forward, ForgeDirection Up )
+	public void setOrientation( ForgeDirection foward, ForgeDirection up )
 	{
 
 	}

src/main/java/appeng/helpers/MetaRotation.java

@@ -65,11 +65,11 @@ public class MetaRotation implements IOrientable
 	}
 
 	@Override
-	public void setOrientation( ForgeDirection Forward, ForgeDirection Up )
+	public void setOrientation( ForgeDirection foward, ForgeDirection up )
 	{
 		if( this.w instanceof World )
 		{
-			( (World) this.w ).setBlockMetadataWithNotify( this.x, this.y, this.z, Up.ordinal(), 1 + 2 );
+			( (World) this.w ).setBlockMetadataWithNotify( this.x, this.y, this.z, up.ordinal(), 1 + 2 );
 		}
 		else
 		{

src/main/java/appeng/helpers/NullRotation.java

@@ -51,7 +51,7 @@ public class NullRotation implements IOrientable
 	}
 
 	@Override
-	public void setOrientation( ForgeDirection Forward, ForgeDirection Up )
+	public void setOrientation( ForgeDirection forward, ForgeDirection up )
 	{
 
 	}

src/main/java/appeng/helpers/PlayerSecurityWrapper.java

@@ -37,8 +37,8 @@ public class PlayerSecurityWrapper implements ISecurityRegistry
 	}
 
 	@Override
-	public void addPlayer( int PlayerID, EnumSet<SecurityPermissions> permissions )
+	public void addPlayer( int playerID, EnumSet<SecurityPermissions> permissions )
 	{
-		this.target.put( PlayerID, permissions );
+		this.target.put( playerID, permissions );
 	}
 }

src/main/java/appeng/helpers/Splotch.java

@@ -35,7 +35,7 @@ public class Splotch
 	public final AEColor color;
 	private final int pos;
 
-	public Splotch( AEColor col, boolean lit, ForgeDirection side, Vec3 Pos )
+	public Splotch( AEColor col, boolean lit, ForgeDirection side, Vec3 position )
 	{
 		this.color = col;
 		this.lumen = lit;
@@ -45,20 +45,20 @@ public class Splotch
 
 		if( side == ForgeDirection.SOUTH || side == ForgeDirection.NORTH )
 		{
-			x = Pos.xCoord;
+			x = position.xCoord;
-			y = Pos.yCoord;
+			y = position.yCoord;
 		}
 
 		else if( side == ForgeDirection.UP || side == ForgeDirection.DOWN )
 		{
-			x = Pos.xCoord;
+			x = position.xCoord;
-			y = Pos.zCoord;
+			y = position.zCoord;
 		}
 
 		else
 		{
-			x = Pos.yCoord;
+			x = position.yCoord;
-			y = Pos.zCoord;
+			y = position.zCoord;
 		}
 
 		int a = (int) ( x * 0xF );

src/main/java/appeng/integration/IntegrationType.java

@@ -63,10 +63,10 @@ public enum IntegrationType
 	public final String dspName;
 	public final String modID;
 
-	IntegrationType( IntegrationSide side, String Name, String modid )
+	IntegrationType( IntegrationSide side, String name, String modid )
 	{
 		this.side = side;
-		this.dspName = Name;
+		this.dspName = name;
 		this.modID = modid;
 	}
 

src/main/java/appeng/integration/modules/BCHelpers/BCPipeInventory.java

@@ -35,12 +35,12 @@ public class BCPipeInventory implements IMEInventory<IAEItemStack>
 {
 
 	final TileEntity te;
-	final ForgeDirection dir;
+	final ForgeDirection direction;
 
-	public BCPipeInventory( TileEntity _te, ForgeDirection _dir )
+	public BCPipeInventory( TileEntity te, ForgeDirection direction )
 	{
-		this.te = _te;
+		this.te = te;
-		this.dir = _dir;
+		this.direction = direction;
 	}
 
 	@Override
@@ -48,14 +48,14 @@ public class BCPipeInventory implements IMEInventory<IAEItemStack>
 	{
 		if( mode == Actionable.SIMULATE )
 		{
-			if( BC.instance.canAddItemsToPipe( this.te, input.getItemStack(), this.dir ) )
+			if( BC.instance.canAddItemsToPipe( this.te, input.getItemStack(), this.direction ) )
 			{
 				return null;
 			}
 			return input;
 		}
 
-		if( BC.instance.addItemsToPipe( this.te, input.getItemStack(), this.dir ) )
+		if( BC.instance.addItemsToPipe( this.te, input.getItemStack(), this.direction ) )
 		{
 			return null;
 		}

src/main/java/appeng/integration/modules/CraftGuide.java

@@ -175,9 +175,9 @@ public class CraftGuide extends CraftGuideAPIObject implements IIntegrationModul
 	}
 
 	@Override
-	public RecipeTemplate createRecipeTemplate( Slot[] slots, ItemStack craftingType, String backgroundTexture, int backgroundX, int backgroundY, String backgroundSelectedTexture, int backgroundSelectedX, int backgroundSelectedY )
+	public RecipeTemplate createRecipeTemplate( Slot[] slots, ItemStack craftingType, String bgTexture, int bgX, int bgY, String selectedBGTexture, int selectedBGX, int selectedBGY )
 	{
-		return this.parent.createRecipeTemplate( slots, craftingType, backgroundTexture, backgroundX, backgroundY, backgroundSelectedTexture, backgroundSelectedX, backgroundSelectedY );
+		return this.parent.createRecipeTemplate( slots, craftingType, bgTexture, bgX, bgY, selectedBGTexture, selectedBGX, selectedBGY );
 	}
 
 	@Override

src/main/java/appeng/items/tools/quartz/ToolQuartzAxe.java

@@ -21,11 +21,11 @@ package appeng.items.tools.quartz;
 
 import java.util.EnumSet;
 
+import com.google.common.base.Optional;
+
 import net.minecraft.item.ItemAxe;
 import net.minecraft.item.ItemStack;
 
-import com.google.common.base.Optional;
-
 import appeng.core.features.AEFeature;
 import appeng.core.features.IAEFeature;
 import appeng.core.features.IFeatureHandler;
@@ -38,10 +38,10 @@ public class ToolQuartzAxe extends ItemAxe implements IAEFeature
 	private final AEFeature type;
 	private final IFeatureHandler feature;
 
-	public ToolQuartzAxe( AEFeature Type )
+	public ToolQuartzAxe( AEFeature type )
 	{
 		super( ToolMaterial.IRON );
-		this.feature = new ItemFeatureHandler( EnumSet.of( this.type = Type, AEFeature.QuartzAxe ), this, this, Optional.of( Type.name() ) );
+		this.feature = new ItemFeatureHandler( EnumSet.of( this.type = type, AEFeature.QuartzAxe ), this, this, Optional.of( type.name() ) );
 	}
 
 	@Override

src/main/java/appeng/items/tools/quartz/ToolQuartzPickaxe.java

@@ -21,11 +21,11 @@ package appeng.items.tools.quartz;
 
 import java.util.EnumSet;
 
+import com.google.common.base.Optional;
+
 import net.minecraft.item.ItemPickaxe;
 import net.minecraft.item.ItemStack;
 
-import com.google.common.base.Optional;
-
 import appeng.core.features.AEFeature;
 import appeng.core.features.IAEFeature;
 import appeng.core.features.IFeatureHandler;
@@ -38,12 +38,12 @@ public class ToolQuartzPickaxe extends ItemPickaxe implements IAEFeature
 	private final AEFeature type;
 	private final IFeatureHandler feature;
 
-	public ToolQuartzPickaxe( AEFeature Type )
+	public ToolQuartzPickaxe( AEFeature type )
 	{
 		super( ToolMaterial.IRON );
 
-		this.type = Type;
+		this.type = type;
-		this.feature = new ItemFeatureHandler( EnumSet.of( Type, AEFeature.QuartzPickaxe ), this, this, Optional.of( Type.name() ) );
+		this.feature = new ItemFeatureHandler( EnumSet.of( type, AEFeature.QuartzPickaxe ), this, this, Optional.of( type.name() ) );
 	}
 
 	@Override

src/main/java/appeng/items/tools/quartz/ToolQuartzSpade.java

@@ -21,11 +21,11 @@ package appeng.items.tools.quartz;
 
 import java.util.EnumSet;
 
+import com.google.common.base.Optional;
+
 import net.minecraft.item.ItemSpade;
 import net.minecraft.item.ItemStack;
 
-import com.google.common.base.Optional;
-
 import appeng.core.features.AEFeature;
 import appeng.core.features.IAEFeature;
 import appeng.core.features.IFeatureHandler;
@@ -38,11 +38,11 @@ public class ToolQuartzSpade extends ItemSpade implements IAEFeature
 	private final AEFeature type;
 	private final IFeatureHandler handler;
 
-	public ToolQuartzSpade( AEFeature Type )
+	public ToolQuartzSpade( AEFeature type )
 	{
 		super( ToolMaterial.IRON );
 
-		this.handler = new ItemFeatureHandler( EnumSet.of( this.type = Type, AEFeature.QuartzSpade ), this, this, Optional.of( Type.name() ) );
+		this.handler = new ItemFeatureHandler( EnumSet.of( this.type = type, AEFeature.QuartzSpade ), this, this, Optional.of( type.name() ) );
 	}
 
 	@Override

src/main/java/appeng/items/tools/quartz/ToolQuartzSword.java

@@ -21,11 +21,11 @@ package appeng.items.tools.quartz;
 
 import java.util.EnumSet;
 
+import com.google.common.base.Optional;
+
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemSword;
 
-import com.google.common.base.Optional;
-
 import appeng.core.features.AEFeature;
 import appeng.core.features.IAEFeature;
 import appeng.core.features.IFeatureHandler;
@@ -38,10 +38,10 @@ public class ToolQuartzSword extends ItemSword implements IAEFeature
 	private final AEFeature type;
 	private final IFeatureHandler feature;
 
-	public ToolQuartzSword( AEFeature Type )
+	public ToolQuartzSword( AEFeature type )
 	{
 		super( ToolMaterial.IRON );
-		this.feature = new ItemFeatureHandler( EnumSet.of( this.type = Type, AEFeature.QuartzSword ), this, this, Optional.of( Type.name() ) );
+		this.feature = new ItemFeatureHandler( EnumSet.of( this.type = type, AEFeature.QuartzSword ), this, this, Optional.of( type.name() ) );
 	}
 
 	@Override

src/main/java/appeng/me/cache/GridStorageCache.java

@@ -245,15 +245,15 @@ public class GridStorageCache implements IStorageGrid
 		tracker.applyChanges();
 	}
 
-	private void postChangesToNetwork( StorageChannel chan, int up_or_down, IItemList availableItems, BaseActionSource src )
+	private void postChangesToNetwork( StorageChannel chan, int upOrDown, IItemList availableItems, BaseActionSource src )
 	{
 		switch( chan )
 		{
 			case FLUIDS:
-				this.fluidMonitor.postChange( up_or_down > 0, availableItems, src );
+				this.fluidMonitor.postChange( upOrDown > 0, availableItems, src );
 				break;
 			case ITEMS:
-				this.itemMonitor.postChange( up_or_down > 0, availableItems, src );
+				this.itemMonitor.postChange( upOrDown > 0, availableItems, src );
 				break;
 			default:
 		}

src/main/java/appeng/me/cache/NetworkMonitor.java

@@ -101,7 +101,7 @@ public class NetworkMonitor<T extends IAEStack<T>> extends MEMonitorHandler<T>
 		this.postChange( true, changes, src );
 	}
 
-	protected void postChange( boolean Add, Iterable<T> changes, BaseActionSource src )
+	protected void postChange( boolean add, Iterable<T> changes, BaseActionSource src )
 	{
 		if( DEPTH.contains( this ) )
 		{
@@ -119,7 +119,7 @@ public class NetworkMonitor<T extends IAEStack<T>> extends MEMonitorHandler<T>
 		{
 			T difference = changedItem;
 
-			if( !Add && changedItem != null )
+			if( !add && changedItem != null )
 			{
 				( difference = changedItem.copy() ).setStackSize( -changedItem.getStackSize() );
 			}

src/main/java/appeng/me/cache/P2PCache.java

@@ -184,7 +184,7 @@ public class P2PCache implements IGridCache
 		}
 	}
 
-	public void updateFreq( PartP2PTunnel t, long NewFreq )
+	public void updateFreq( PartP2PTunnel t, long newFrequency )
 	{
 		if( this.outputs.containsValue( t ) )
 		{
@@ -196,7 +196,7 @@ public class P2PCache implements IGridCache
 			this.inputs.remove( t.freq );
 		}
 
-		t.freq = NewFreq;
+		t.freq = newFrequency;
 
 		if( t.output )
 		{

src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java

@@ -26,6 +26,9 @@ import java.util.LinkedList;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -35,9 +38,6 @@ import net.minecraft.world.WorldServer;
 
 import cpw.mods.fml.common.FMLCommonHandler;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-
 import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.config.FuzzyMode;
@@ -109,10 +109,10 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
 	private int remainingOperations;
 	private boolean somethingChanged;
 
-	public CraftingCPUCluster( WorldCoord _min, WorldCoord _max )
+	public CraftingCPUCluster( WorldCoord min, WorldCoord max )
 	{
-		this.min = _min;
+		this.min = min;
-		this.max = _max;
+		this.max = max;
 	}
 
 	/**

src/main/java/appeng/me/cluster/implementations/QuantumCluster.java

@@ -59,10 +59,10 @@ public class QuantumCluster implements ILocatable, IAECluster
 	private long otherSide;
 	private TileQuantumBridge center;
 
-	public QuantumCluster( WorldCoord _min, WorldCoord _max )
+	public QuantumCluster( WorldCoord min, WorldCoord max )
 	{
-		this.min = _min;
+		this.min = min;
-		this.max = _max;
+		this.max = max;
 		this.Ring = new TileQuantumBridge[8];
 	}
 

src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java

@@ -42,10 +42,10 @@ public class SpatialPylonCluster implements IAECluster
 	public boolean hasPower;
 	public boolean hasChannel;
 
-	public SpatialPylonCluster( DimensionalCoord _min, DimensionalCoord _max )
+	public SpatialPylonCluster( DimensionalCoord min, DimensionalCoord max )
 	{
-		this.min = _min.copy();
+		this.min = min.copy();
-		this.max = _max.copy();
+		this.max = max.copy();
 
 		if( this.min.x != this.max.x )
 		{

src/main/java/appeng/me/storage/CellInventory.java

@@ -180,9 +180,9 @@ public class CellInventory implements ICellInventory
 		return false;
 	}
 
-	public static void addBasicBlackList( int itemID, int Meta )
+	public static void addBasicBlackList( int itemID, int meta )
 	{
-		BLACK_LIST.add( ( Meta << Platform.DEF_OFFSET ) | itemID );
+		BLACK_LIST.add( ( meta << Platform.DEF_OFFSET ) | itemID );
 	}
 
 	public static boolean isBlackListed( IAEItemStack input )

src/main/java/appeng/parts/CableBusContainer.java

@@ -715,7 +715,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
 		}
 	}
 
-	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( boolean ignoreCableConnections, boolean includeFacades, Entity e, boolean visual )
+	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( boolean ignoreConnections, boolean includeFacades, Entity e, boolean visual )
 	{
 		List<AxisAlignedBB> boxes = new LinkedList<AxisAlignedBB>();
 
@@ -727,7 +727,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
 			IPart part = this.getPart( s );
 			if( part != null )
 			{
-				if( ignoreCableConnections && part instanceof IPartCable )
+				if( ignoreConnections && part instanceof IPartCable )
 				{
 					bch.addBox( 6.0, 6.0, 6.0, 10.0, 10.0, 10.0 );
 				}

src/main/java/appeng/parts/CableBusStorage.java

@@ -101,14 +101,14 @@ public class CableBusStorage
 		return newArray;
 	}
 
-	private <T> T[] grow( T[] in, int new_value, boolean parts )
+	private <T> T[] grow( T[] in, int newValue, boolean parts )
 	{
-		if( in != null && in.length > new_value )
+		if( in != null && in.length > newValue )
 		{
 			return in;
 		}
 
-		int newSize = new_value + 1;
+		int newSize = newValue + 1;
 
 		T[] newArray = (T[]) ( parts ? new IPart[newSize] : new IFacadePart[newSize] );
 		if( in != null )

src/main/java/appeng/parts/automation/PartExportBus.java

@@ -19,6 +19,9 @@
 package appeng.parts.automation;
 
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -28,9 +31,6 @@ import net.minecraft.util.Vec3;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-
 import appeng.api.config.Actionable;
 import appeng.api.config.FuzzyMode;
 import appeng.api.config.PowerMultiplier;
@@ -274,7 +274,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
 	}
 
 	@Override
-	public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall )
+	public TickRateModulation tickingRequest( IGridNode node, int ticksSinceLastCall )
 	{
 		return this.doBusWork();
 	}

src/main/java/appeng/parts/automation/PartImportBus.java

@@ -167,7 +167,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
 	}
 
 	@Override
-	public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall )
+	public TickRateModulation tickingRequest( IGridNode node, int ticksSinceLastCall )
 	{
 		return this.doBusWork();
 	}

src/main/java/appeng/parts/misc/PartInterface.java

@@ -22,6 +22,8 @@ package appeng.parts.misc;
 import java.util.EnumSet;
 import java.util.List;
 
+import com.google.common.collect.ImmutableSet;
+
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
@@ -37,8 +39,6 @@ import net.minecraftforge.common.util.ForgeDirection;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-import com.google.common.collect.ImmutableSet;
-
 import appeng.api.config.Actionable;
 import appeng.api.config.Upgrades;
 import appeng.api.implementations.tiles.ITileStorageMonitorable;
@@ -246,9 +246,9 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto
 	}
 
 	@Override
-	public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall )
+	public TickRateModulation tickingRequest( IGridNode node, int ticksSinceLastCall )
 	{
-		return this.duality.tickingRequest( node, TicksSinceLastCall );
+		return this.duality.tickingRequest( node, ticksSinceLastCall );
 	}
 
 	@Override

src/main/java/appeng/parts/misc/PartStorageBus.java

@@ -342,7 +342,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 	}
 
 	@Override
-	public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall )
+	public TickRateModulation tickingRequest( IGridNode node, int ticksSinceLastCall )
 	{
 		if( this.resetCacheLogic != 0 )
 		{

src/main/java/appeng/parts/p2p/PartP2PItems.java

@@ -194,7 +194,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IPipeCo
 	}
 
 	@Override
-	public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall )
+	public TickRateModulation tickingRequest( IGridNode node, int ticksSinceLastCall )
 	{
 		boolean wasReq = this.requested;
 

src/main/java/appeng/parts/p2p/PartP2PLight.java

@@ -216,7 +216,7 @@ public class PartP2PLight extends PartP2PTunnel<PartP2PLight> implements IGridTi
 	}
 
 	@Override
-	public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall )
+	public TickRateModulation tickingRequest( IGridNode node, int ticksSinceLastCall )
 	{
 		return this.doWork() ? TickRateModulation.FASTER : TickRateModulation.SLOWER;
 	}

src/main/java/appeng/parts/p2p/PartP2PTunnelME.java

@@ -138,7 +138,7 @@ public class PartP2PTunnelME extends PartP2PTunnel<PartP2PTunnelME> implements I
 	}
 
 	@Override
-	public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall )
+	public TickRateModulation tickingRequest( IGridNode node, int ticksSinceLastCall )
 	{
 		// just move on...
 		try

src/main/java/appeng/spatial/CachedPlane.java

@@ -262,12 +262,12 @@ public class CachedPlane
 		}
 	}
 
-	private void markForUpdate( int src_x, int src_y, int src_z )
+	private void markForUpdate( int x, int y, int z )
 	{
-		this.updates.add( new WorldCoord( src_x, src_y, src_z ) );
+		this.updates.add( new WorldCoord( x, y, z ) );
 		for( ForgeDirection d : ForgeDirection.VALID_DIRECTIONS )
 		{
-			this.updates.add( new WorldCoord( src_x + d.offsetX, src_y + d.offsetY, src_z + d.offsetZ ) );
+			this.updates.add( new WorldCoord( x + d.offsetX, y + d.offsetY, z + d.offsetZ ) );
 		}
 	}
 
@@ -366,17 +366,17 @@ public class CachedPlane
 		private final ExtendedBlockStorage[] storage;
 		private List<Integer> skipThese = null;
 
-		public Column( Chunk _c, int _x, int _z, int cy, int chunkHeight )
+		public Column( Chunk chunk, int x, int z, int chunkY, int chunkHeight )
 		{
-			this.x = _x;
+			this.x = x;
-			this.z = _z;
+			this.z = z;
-			this.c = _c;
+			this.c = chunk;
 			this.storage = this.c.getBlockStorageArray();
 
 			// make sure storage exists before hand...
 			for( int ay = 0; ay < chunkHeight; ay++ )
 			{
-				int by = ( ay + cy );
+				int by = ( ay + chunkY );
 				ExtendedBlockStorage extendedblockstorage = this.storage[by];
 				if( extendedblockstorage == null )
 				{

src/main/java/appeng/spatial/StorageHelper.java

@@ -314,12 +314,12 @@ public class StorageHelper
 		final int yOff;
 		final int zOff;
 
-		TelDestination( World _dim, AxisAlignedBB srcBox, double _x, double _y, double _z, int tileX, int tileY, int tileZ )
+		TelDestination( World dimension, AxisAlignedBB srcBox, double x, double y, double z, int tileX, int tileY, int tileZ )
 		{
-			this.dim = _dim;
+			this.dim = dimension;
-			this.x = Math.min( srcBox.maxX - 0.5, Math.max( srcBox.minX + 0.5, _x + tileX ) );
+			this.x = Math.min( srcBox.maxX - 0.5, Math.max( srcBox.minX + 0.5, x + tileX ) );
-			this.y = Math.min( srcBox.maxY - 0.5, Math.max( srcBox.minY + 0.5, _y + tileY ) );
+			this.y = Math.min( srcBox.maxY - 0.5, Math.max( srcBox.minY + 0.5, y + tileY ) );
-			this.z = Math.min( srcBox.maxZ - 0.5, Math.max( srcBox.minZ + 0.5, _z + tileZ ) );
+			this.z = Math.min( srcBox.maxZ - 0.5, Math.max( srcBox.minZ + 0.5, z + tileZ ) );
 			this.xOff = tileX;
 			this.yOff = tileY;
 			this.zOff = tileZ;

src/main/java/appeng/spatial/StorageWorldProvider.java

@@ -69,7 +69,7 @@ public class StorageWorldProvider extends WorldProvider
 
 	@Override
 	@SideOnly( Side.CLIENT )
-	public float[] calcSunriseSunsetColors( float p_76560_1_, float p_76560_2_ )
+	public float[] calcSunriseSunsetColors( float celestialAngle, float partialTicks )
 	{
 		return null;
 	}

src/main/java/appeng/tile/crafting/TileMolecularAssembler.java

@@ -421,7 +421,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
 	}
 
 	@Override
-	public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall )
+	public TickRateModulation tickingRequest( IGridNode node, int ticksSinceLastCall )
 	{
 		if( this.inv.getStackInSlot( 9 ) != null )
 		{
@@ -447,7 +447,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
 
 		if( this.reboot )
 		{
-			TicksSinceLastCall = 1;
+			ticksSinceLastCall = 1;
 		}
 
 		if( !this.isAwake )
@@ -460,22 +460,22 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
 		switch( this.upgrades.getInstalledUpgrades( Upgrades.SPEED ) )
 		{
 			case 0:
-				this.progress += this.userPower( TicksSinceLastCall, speed = 10, 1.0 );
+				this.progress += this.userPower( ticksSinceLastCall, speed = 10, 1.0 );
 				break;
 			case 1:
-				this.progress += this.userPower( TicksSinceLastCall, speed = 13, 1.3 );
+				this.progress += this.userPower( ticksSinceLastCall, speed = 13, 1.3 );
 				break;
 			case 2:
-				this.progress += this.userPower( TicksSinceLastCall, speed = 17, 1.7 );
+				this.progress += this.userPower( ticksSinceLastCall, speed = 17, 1.7 );
 				break;
 			case 3:
-				this.progress += this.userPower( TicksSinceLastCall, speed = 20, 2.0 );
+				this.progress += this.userPower( ticksSinceLastCall, speed = 20, 2.0 );
 				break;
 			case 4:
-				this.progress += this.userPower( TicksSinceLastCall, speed = 25, 2.5 );
+				this.progress += this.userPower( ticksSinceLastCall, speed = 25, 2.5 );
 				break;
 			case 5:
-				this.progress += this.userPower( TicksSinceLastCall, speed = 50, 5.0 );
+				this.progress += this.userPower( ticksSinceLastCall, speed = 50, 5.0 );
 				break;
 		}
 

src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java

@@ -43,9 +43,9 @@ public class AppEngInternalAEInventory implements IInventory, Iterable<ItemStack
 	final int size;
 	int maxStack;
 
-	public AppEngInternalAEInventory( IAEAppEngInventory _te, int s )
+	public AppEngInternalAEInventory( IAEAppEngInventory te, int s )
 	{
-		this.te = _te;
+		this.te = te;
 		this.size = s;
 		this.maxStack = 64;
 		this.inv = new IAEItemStack[s];

src/main/java/appeng/tile/misc/TileInscriber.java

@@ -25,6 +25,8 @@ import java.util.EnumSet;
 import java.util.List;
 import javax.annotation.Nullable;
 
+import com.google.common.collect.Lists;
+
 import io.netty.buffer.ByteBuf;
 
 import net.minecraft.inventory.IInventory;
@@ -33,8 +35,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import com.google.common.collect.Lists;
-
 import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.config.PowerMultiplier;
@@ -418,7 +418,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
 	}
 
 	@Override
-	public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall )
+	public TickRateModulation tickingRequest( IGridNode node, int ticksSinceLastCall )
 	{
 		if( this.smash )
 		{
@@ -482,7 +482,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
 					}
 					else
 					{
-						this.processingTime += TicksSinceLastCall * speedFactor;
+						this.processingTime += ticksSinceLastCall * speedFactor;
 					}
 				}
 			}

src/main/java/appeng/tile/misc/TileInterface.java

@@ -22,6 +22,8 @@ package appeng.tile.misc;
 import java.util.ArrayList;
 import java.util.EnumSet;
 
+import com.google.common.collect.ImmutableSet;
+
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
@@ -30,8 +32,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import com.google.common.collect.ImmutableSet;
-
 import appeng.api.config.Actionable;
 import appeng.api.config.Upgrades;
 import appeng.api.implementations.tiles.ITileStorageMonitorable;
@@ -213,9 +213,9 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, IT
 	}
 
 	@Override
-	public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall )
+	public TickRateModulation tickingRequest( IGridNode node, int ticksSinceLastCall )
 	{
-		return this.duality.tickingRequest( node, TicksSinceLastCall );
+		return this.duality.tickingRequest( node, ticksSinceLastCall );
 	}
 
 	@Override

src/main/java/appeng/tile/networking/TileController.java

@@ -141,11 +141,11 @@ public class TileController extends AENetworkPowerTile
 	}
 
 	@Override
-	protected double funnelPowerIntoStorage( double AEUnits, Actionable mode )
+	protected double funnelPowerIntoStorage( double power, Actionable mode )
 	{
 		try
 		{
-			double ret = this.gridProxy.getEnergy().injectPower( AEUnits, mode );
+			double ret = this.gridProxy.getEnergy().injectPower( power, mode );
 			if( mode == Actionable.SIMULATE )
 			{
 				return ret;
@@ -155,7 +155,7 @@ public class TileController extends AENetworkPowerTile
 		catch( GridAccessException e )
 		{
 			// no grid? use local...
-			return super.funnelPowerIntoStorage( AEUnits, mode );
+			return super.funnelPowerIntoStorage( power, mode );
 		}
 	}
 

src/main/java/appeng/tile/networking/TileEnergyAcceptor.java

@@ -82,12 +82,12 @@ public class TileEnergyAcceptor extends AENetworkPowerTile
 	}
 
 	@Override
-	protected double funnelPowerIntoStorage( double newPower, Actionable mode )
+	protected double funnelPowerIntoStorage( double power, Actionable mode )
 	{
 		try
 		{
 			IEnergyGrid grid = this.gridProxy.getEnergy();
-			double leftOver = grid.injectPower( newPower, mode );
+			double leftOver = grid.injectPower( power, mode );
 			if( mode == Actionable.SIMULATE )
 			{
 				return leftOver;
@@ -96,7 +96,7 @@ public class TileEnergyAcceptor extends AENetworkPowerTile
 		}
 		catch( GridAccessException e )
 		{
-			return super.funnelPowerIntoStorage( newPower, mode );
+			return super.funnelPowerIntoStorage( power, mode );
 		}
 	}
 

src/main/java/appeng/tile/powersink/AERootPoweredTile.java

@@ -86,9 +86,9 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe
 		return PowerUnits.AE.convertTo( input, this.funnelPowerIntoStorage( input.convertTo( PowerUnits.AE, amt ), Actionable.MODULATE ) );
 	}
 
-	protected double funnelPowerIntoStorage( double AEUnits, Actionable mode )
+	protected double funnelPowerIntoStorage( double power, Actionable mode )
 	{
-		return this.injectAEPower( AEUnits, mode );
+		return this.injectAEPower( power, mode );
 	}
 
 	@Override

src/main/java/appeng/tile/storage/TileIOPort.java

@@ -311,7 +311,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
 	}
 
 	@Override
-	public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall )
+	public TickRateModulation tickingRequest( IGridNode node, int ticksSinceLastCall )
 	{
 		if( !this.gridProxy.isActive() )
 		{

src/main/java/appeng/util/Platform.java

@@ -243,7 +243,7 @@ public class Platform
 		return ForgeDirection.UNKNOWN;
 	}
 
-	public static <T extends Enum> T rotateEnum( T ce, boolean backwards, EnumSet ValidOptions )
+	public static <T extends Enum> T rotateEnum( T ce, boolean backwards, EnumSet validOptions )
 	{
 		do
 		{
@@ -256,7 +256,7 @@ public class Platform
 				ce = nextEnum( ce );
 			}
 		}
-		while( !ValidOptions.contains( ce ) || isNotValidSetting( ce ) );
+		while( !validOptions.contains( ce ) || isNotValidSetting( ce ) );
 
 		return ce;
 	}
@@ -455,18 +455,18 @@ public class Platform
 	 * then the vanilla version which likes to fail when NBT Compound data changes order, it is pretty expensive
 	 * performance wise, so try an use shared tag compounds as long as the system remains in AE.
 	 */
-	public static boolean NBTEqualityTest( NBTBase A, NBTBase B )
+	public static boolean NBTEqualityTest( NBTBase left, NBTBase right )
 	{
 		// same type?
-		byte id = A.getId();
+		byte id = left.getId();
-		if( id == B.getId() )
+		if( id == right.getId() )
 		{
 			switch( id )
 			{
 				case 10:
 				{
-					NBTTagCompound ctA = (NBTTagCompound) A;
+					NBTTagCompound ctA = (NBTTagCompound) left;
-					NBTTagCompound ctB = (NBTTagCompound) B;
+					NBTTagCompound ctB = (NBTTagCompound) right;
 
 					Set<String> cA = ctA.func_150296_c();
 					Set<String> cB = ctB.func_150296_c();
@@ -496,8 +496,8 @@ public class Platform
 
 				case 9: // ) // A instanceof NBTTagList )
 				{
-					NBTTagList lA = (NBTTagList) A;
+					NBTTagList lA = (NBTTagList) left;
-					NBTTagList lB = (NBTTagList) B;
+					NBTTagList lB = (NBTTagList) right;
 					if( lA.tagCount() != lB.tagCount() )
 					{
 						return false;
@@ -527,25 +527,25 @@ public class Platform
 				}
 
 				case 1: // ( A instanceof NBTTagByte )
-					return ( (NBTTagByte) A ).func_150287_d() == ( (NBTTagByte) B ).func_150287_d();
+					return ( (NBTTagByte) left ).func_150287_d() == ( (NBTTagByte) right ).func_150287_d();
 
 				case 4: // else if ( A instanceof NBTTagLong )
-					return ( (NBTTagLong) A ).func_150291_c() == ( (NBTTagLong) B ).func_150291_c();
+					return ( (NBTTagLong) left ).func_150291_c() == ( (NBTTagLong) right ).func_150291_c();
 
 				case 8: // else if ( A instanceof NBTTagString )
-					return ( (NBTTagString) A ).func_150285_a_().equals( ( (NBTTagString) B ).func_150285_a_() ) || ( (NBTTagString) A ).func_150285_a_().equals( ( (NBTTagString) B ).func_150285_a_() );
+					return ( (NBTTagString) left ).func_150285_a_().equals( ( (NBTTagString) right ).func_150285_a_() ) || ( (NBTTagString) left ).func_150285_a_().equals( ( (NBTTagString) right ).func_150285_a_() );
 
 				case 6: // else if ( A instanceof NBTTagDouble )
-					return ( (NBTTagDouble) A ).func_150286_g() == ( (NBTTagDouble) B ).func_150286_g();
+					return ( (NBTTagDouble) left ).func_150286_g() == ( (NBTTagDouble) right ).func_150286_g();
 
 				case 5: // else if ( A instanceof NBTTagFloat )
-					return ( (NBTTagFloat) A ).func_150288_h() == ( (NBTTagFloat) B ).func_150288_h();
+					return ( (NBTTagFloat) left ).func_150288_h() == ( (NBTTagFloat) right ).func_150288_h();
 
 				case 3: // else if ( A instanceof NBTTagInt )
-					return ( (NBTTagInt) A ).func_150287_d() == ( (NBTTagInt) B ).func_150287_d();
+					return ( (NBTTagInt) left ).func_150287_d() == ( (NBTTagInt) right ).func_150287_d();
 
 				default:
-					return A.equals( B );
+					return left.equals( right );
 			}
 		}
 
@@ -591,17 +591,17 @@ public class Platform
 	 * Orderless hash on NBT Data, used to work thought huge piles fast, but ignores the order just in case MC decided
 	 * to change it... WHICH IS BAD...
 	 */
-	public static int NBTOrderlessHash( NBTBase A )
+	public static int NBTOrderlessHash( NBTBase nbt )
 	{
 		// same type?
 		int hash = 0;
-		byte id = A.getId();
+		byte id = nbt.getId();
 		hash += id;
 		switch( id )
 		{
 			case 10:
 			{
-				NBTTagCompound ctA = (NBTTagCompound) A;
+				NBTTagCompound ctA = (NBTTagCompound) nbt;
 
 				Set<String> cA = ctA.func_150296_c();
 
@@ -615,7 +615,7 @@ public class Platform
 
 			case 9: // ) // A instanceof NBTTagList )
 			{
-				NBTTagList lA = (NBTTagList) A;
+				NBTTagList lA = (NBTTagList) nbt;
 				hash += 9 * lA.tagCount();
 
 				List<NBTBase> l = tagList( lA );
@@ -628,22 +628,22 @@ public class Platform
 			}
 
 			case 1: // ( A instanceof NBTTagByte )
-				return hash + ( (NBTTagByte) A ).func_150290_f();
+				return hash + ( (NBTTagByte) nbt ).func_150290_f();
 
 			case 4: // else if ( A instanceof NBTTagLong )
-				return hash + (int) ( (NBTTagLong) A ).func_150291_c();
+				return hash + (int) ( (NBTTagLong) nbt ).func_150291_c();
 
 			case 8: // else if ( A instanceof NBTTagString )
-				return hash + ( (NBTTagString) A ).func_150285_a_().hashCode();
+				return hash + ( (NBTTagString) nbt ).func_150285_a_().hashCode();
 
 			case 6: // else if ( A instanceof NBTTagDouble )
-				return hash + (int) ( (NBTTagDouble) A ).func_150286_g();
+				return hash + (int) ( (NBTTagDouble) nbt ).func_150286_g();
 
 			case 5: // else if ( A instanceof NBTTagFloat )
-				return hash + (int) ( (NBTTagFloat) A ).func_150288_h();
+				return hash + (int) ( (NBTTagFloat) nbt ).func_150288_h();
 
 			case 3: // else if ( A instanceof NBTTagInt )
-				return hash + ( (NBTTagInt) A ).func_150287_d();
+				return hash + ( (NBTTagInt) nbt ).func_150287_d();
 
 			default:
 				return hash;
@@ -653,14 +653,14 @@ public class Platform
 	/*
 	 * The usual version of this returns an ItemStack, this version returns the recipe.
 	 */
-	public static IRecipe findMatchingRecipe( InventoryCrafting par1InventoryCrafting, World par2World )
+	public static IRecipe findMatchingRecipe( InventoryCrafting inventoryCrafting, World par2World )
 	{
 		CraftingManager cm = CraftingManager.getInstance();
 		List<IRecipe> rl = cm.getRecipeList();
 
 		for( IRecipe r : rl )
 		{
-			if( r.matches( par1InventoryCrafting, par2World ) )
+			if( r.matches( inventoryCrafting, par2World ) )
 			{
 				return r;
 			}
@@ -1236,7 +1236,7 @@ public class Platform
 		return isSameItem( is, filter ) && sameStackStags( is, filter );
 	}
 
-	public static boolean isSameItemFuzzy( ItemStack a, ItemStack b, FuzzyMode Mode )
+	public static boolean isSameItemFuzzy( ItemStack a, ItemStack b, FuzzyMode mode )
 	{
 		if( a == null && b == null )
 		{
@@ -1263,11 +1263,11 @@ public class Platform
 		{
 			try
 			{
-				if( Mode == FuzzyMode.IGNORE_ALL )
+				if( mode == FuzzyMode.IGNORE_ALL )
 				{
 					return true;
 				}
-				else if( Mode == FuzzyMode.PERCENT_99 )
+				else if( mode == FuzzyMode.PERCENT_99 )
 				{
 					return ( a.getItemDamageForDisplay() > 1 ) == ( b.getItemDamageForDisplay() > 1 );
 				}
@@ -1276,16 +1276,16 @@ public class Platform
 					float APercentDamaged = 1.0f - (float) a.getItemDamageForDisplay() / (float) a.getMaxDamage();
 					float BPercentDamaged = 1.0f - (float) b.getItemDamageForDisplay() / (float) b.getMaxDamage();
 
-					return ( APercentDamaged > Mode.breakPoint ) == ( BPercentDamaged > Mode.breakPoint );
+					return ( APercentDamaged > mode.breakPoint ) == ( BPercentDamaged > mode.breakPoint );
 				}
 			}
 			catch( Throwable e )
 			{
-				if( Mode == FuzzyMode.IGNORE_ALL )
+				if( mode == FuzzyMode.IGNORE_ALL )
 				{
 					return true;
 				}
-				else if( Mode == FuzzyMode.PERCENT_99 )
+				else if( mode == FuzzyMode.PERCENT_99 )
 				{
 					return ( a.getItemDamage() > 1 ) == ( b.getItemDamage() > 1 );
 				}
@@ -1294,7 +1294,7 @@ public class Platform
 					float APercentDamaged = (float) a.getItemDamage() / (float) a.getMaxDamage();
 					float BPercentDamaged = (float) b.getItemDamage() / (float) b.getMaxDamage();
 
-					return ( APercentDamaged > Mode.breakPoint ) == ( BPercentDamaged > Mode.breakPoint );
+					return ( APercentDamaged > mode.breakPoint ) == ( BPercentDamaged > mode.breakPoint );
 				}
 			}
 		}

src/main/java/appeng/util/inv/AdaptorList.java

@@ -105,7 +105,7 @@ public class AdaptorList extends InventoryAdaptor
 	}
 
 	@Override
-	public ItemStack removeSimilarItems( int how_many, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination )
+	public ItemStack removeSimilarItems( int amount, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination )
 	{
 		int s = this.i.size();
 		for( int x = 0; x < s; x++ )
@@ -113,20 +113,20 @@ public class AdaptorList extends InventoryAdaptor
 			ItemStack is = this.i.get( x );
 			if( is != null && ( filter == null || Platform.isSameItemFuzzy( is, filter, fuzzyMode ) ) )
 			{
-				if( how_many > is.stackSize )
+				if( amount > is.stackSize )
 				{
-					how_many = is.stackSize;
+					amount = is.stackSize;
 				}
 				if( destination != null && !destination.canInsert( is ) )
 				{
-					how_many = 0;
+					amount = 0;
 				}
 
-				if( how_many > 0 )
+				if( amount > 0 )
 				{
 					ItemStack rv = is.copy();
-					rv.stackSize = how_many;
+					rv.stackSize = amount;
-					is.stackSize -= how_many;
+					is.stackSize -= amount;
 
 					// remove it..
 					if( is.stackSize <= 0 )

src/main/java/appeng/util/inv/AdaptorPlayerHand.java

@@ -36,17 +36,17 @@ import appeng.util.iterators.NullIterator;
 public class AdaptorPlayerHand extends InventoryAdaptor
 {
 
-	private final EntityPlayer p;
+	private final EntityPlayer player;
 
-	public AdaptorPlayerHand( EntityPlayer _p )
+	public AdaptorPlayerHand( EntityPlayer player )
 	{
-		this.p = _p;
+		this.player = player;
 	}
 
 	@Override
 	public ItemStack removeItems( int amount, ItemStack filter, IInventoryDestination destination )
 	{
-		ItemStack hand = this.p.inventory.getItemStack();
+		ItemStack hand = this.player.inventory.getItemStack();
 		if( hand == null )
 		{
 			return null;
@@ -59,7 +59,7 @@ public class AdaptorPlayerHand extends InventoryAdaptor
 			hand.stackSize -= amount;
 			if( hand.stackSize <= 0 )
 			{
-				this.p.inventory.setItemStack( null );
+				this.player.inventory.setItemStack( null );
 			}
 			return result;
 		}
@@ -71,7 +71,7 @@ public class AdaptorPlayerHand extends InventoryAdaptor
 	public ItemStack simulateRemove( int amount, ItemStack filter, IInventoryDestination destination )
 	{
 
-		ItemStack hand = this.p.inventory.getItemStack();
+		ItemStack hand = this.player.inventory.getItemStack();
 		if( hand == null )
 		{
 			return null;
@@ -88,22 +88,22 @@ public class AdaptorPlayerHand extends InventoryAdaptor
 	}
 
 	@Override
-	public ItemStack removeSimilarItems( int how_many, ItemStack Filter, FuzzyMode fuzzyMode, IInventoryDestination destination )
+	public ItemStack removeSimilarItems( int amount, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination )
 	{
-		ItemStack hand = this.p.inventory.getItemStack();
+		ItemStack hand = this.player.inventory.getItemStack();
 		if( hand == null )
 		{
 			return null;
 		}
 
-		if( Filter == null || Platform.isSameItemFuzzy( Filter, hand, fuzzyMode ) )
+		if( filter == null || Platform.isSameItemFuzzy( filter, hand, fuzzyMode ) )
 		{
 			ItemStack result = hand.copy();
-			result.stackSize = hand.stackSize > how_many ? how_many : hand.stackSize;
+			result.stackSize = hand.stackSize > amount ? amount : hand.stackSize;
-			hand.stackSize -= how_many;
+			hand.stackSize -= amount;
 			if( hand.stackSize <= 0 )
 			{
-				this.p.inventory.setItemStack( null );
+				this.player.inventory.setItemStack( null );
 			}
 			return result;
 		}
@@ -112,16 +112,16 @@ public class AdaptorPlayerHand extends InventoryAdaptor
 	}
 
 	@Override
-	public ItemStack simulateSimilarRemove( int amount, ItemStack Filter, FuzzyMode fuzzyMode, IInventoryDestination destination )
+	public ItemStack simulateSimilarRemove( int amount, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination )
 	{
 
-		ItemStack hand = this.p.inventory.getItemStack();
+		ItemStack hand = this.player.inventory.getItemStack();
 		if( hand == null )
 		{
 			return null;
 		}
 
-		if( Filter == null || Platform.isSameItemFuzzy( Filter, hand, fuzzyMode ) )
+		if( filter == null || Platform.isSameItemFuzzy( filter, hand, fuzzyMode ) )
 		{
 			ItemStack result = hand.copy();
 			result.stackSize = hand.stackSize > amount ? amount : hand.stackSize;
@@ -143,16 +143,16 @@ public class AdaptorPlayerHand extends InventoryAdaptor
 		{
 			return null;
 		}
-		if( this.p == null )
+		if( this.player == null )
 		{
 			return toBeAdded;
 		}
-		if( this.p.inventory == null )
+		if( this.player.inventory == null )
 		{
 			return toBeAdded;
 		}
 
-		ItemStack hand = this.p.inventory.getItemStack();
+		ItemStack hand = this.player.inventory.getItemStack();
 
 		if( hand != null && !Platform.isSameItemPrecise( toBeAdded, hand ) )
 		{
@@ -177,18 +177,18 @@ public class AdaptorPlayerHand extends InventoryAdaptor
 			newHand.stackSize = newHand.getMaxStackSize();
 			ItemStack B = toBeAdded.copy();
 			B.stackSize -= newHand.stackSize - original;
-			this.p.inventory.setItemStack( newHand );
+			this.player.inventory.setItemStack( newHand );
 			return B;
 		}
 
-		this.p.inventory.setItemStack( newHand );
+		this.player.inventory.setItemStack( newHand );
 		return null;
 	}
 
 	@Override
 	public ItemStack simulateAdd( ItemStack toBeSimulated )
 	{
-		ItemStack hand = this.p.inventory.getItemStack();
+		ItemStack hand = this.player.inventory.getItemStack();
 		if( toBeSimulated == null )
 		{
 			return null;
@@ -226,7 +226,7 @@ public class AdaptorPlayerHand extends InventoryAdaptor
 	@Override
 	public boolean containsItems()
 	{
-		return this.p.inventory.getItemStack() != null;
+		return this.player.inventory.getItemStack() != null;
 	}
 
 	@Override

src/main/java/appeng/util/inv/IMEAdaptor.java

@@ -21,10 +21,10 @@ package appeng.util.inv;
 
 import java.util.Iterator;
 
-import net.minecraft.item.ItemStack;
-
 import com.google.common.collect.ImmutableList;
 
+import net.minecraft.item.ItemStack;
+
 import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.config.FuzzyMode;
@@ -66,11 +66,11 @@ public class IMEAdaptor extends InventoryAdaptor
 		return this.doRemoveItems( amount, filter, destination, Actionable.MODULATE );
 	}
 
-	public ItemStack doRemoveItems( int how_many, ItemStack Filter, IInventoryDestination destination, Actionable type )
+	public ItemStack doRemoveItems( int amount, ItemStack filter, IInventoryDestination destination, Actionable type )
 	{
 		IAEItemStack req = null;
 
-		if( Filter == null )
+		if( filter == null )
 		{
 			IItemList<IAEItemStack> list = this.getList();
 			if( !list.isEmpty() )
@@ -80,14 +80,14 @@ public class IMEAdaptor extends InventoryAdaptor
 		}
 		else
 		{
-			req = AEItemStack.create( Filter );
+			req = AEItemStack.create( filter );
 		}
 
 		IAEItemStack out = null;
 
 		if( req != null )
 		{
-			req.setStackSize( how_many );
+			req.setStackSize( amount );
 			out = this.target.extractItems( req, type, this.src );
 		}
 
@@ -106,18 +106,18 @@ public class IMEAdaptor extends InventoryAdaptor
 	}
 
 	@Override
-	public ItemStack removeSimilarItems( int how_many, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination )
+	public ItemStack removeSimilarItems( int amount, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination )
 	{
 		if( filter == null )
 		{
-			return this.doRemoveItems( how_many, null, destination, Actionable.MODULATE );
+			return this.doRemoveItems( amount, null, destination, Actionable.MODULATE );
 		}
-		return this.doRemoveItemsFuzzy( how_many, filter, destination, Actionable.MODULATE, fuzzyMode );
+		return this.doRemoveItemsFuzzy( amount, filter, destination, Actionable.MODULATE, fuzzyMode );
 	}
 
-	public ItemStack doRemoveItemsFuzzy( int how_many, ItemStack Filter, IInventoryDestination destination, Actionable type, FuzzyMode fuzzyMode )
+	public ItemStack doRemoveItemsFuzzy( int amount, ItemStack filter, IInventoryDestination destination, Actionable type, FuzzyMode fuzzyMode )
 	{
-		IAEItemStack reqFilter = AEItemStack.create( Filter );
+		IAEItemStack reqFilter = AEItemStack.create( filter );
 		if( reqFilter == null )
 		{
 			return null;
@@ -129,7 +129,7 @@ public class IMEAdaptor extends InventoryAdaptor
 		{
 			if( req != null )
 			{
-				req.setStackSize( how_many );
+				req.setStackSize( amount );
 				out = this.target.extractItems( req, type, this.src );
 				if( out != null )
 				{

src/main/java/appeng/util/inv/WrapperInventoryRange.java

@@ -44,13 +44,13 @@ public class WrapperInventoryRange implements IInventory
 		this.ignoreValidItems = ignoreValid;
 	}
 
-	public WrapperInventoryRange( IInventory a, int _min, int _size, boolean ignoreValid )
+	public WrapperInventoryRange( IInventory a, int min, int size, boolean ignoreValid )
 	{
 		this.src = a;
-		this.slots = new int[_size];
+		this.slots = new int[size];
-		for( int x = 0; x < _size; x++ )
+		for( int x = 0; x < size; x++ )
 		{
-			this.slots[x] = _min + x;
+			this.slots[x] = min + x;
 		}
 		this.ignoreValidItems = ignoreValid;
 	}

src/main/java/appeng/util/item/AEItemStack.java

@@ -259,7 +259,7 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
 	}
 
 	@Override
-	public boolean fuzzyComparison( Object st, FuzzyMode Mode )
+	public boolean fuzzyComparison( Object st, FuzzyMode mode )
 	{
 		if( st instanceof IAEItemStack )
 		{
@@ -279,11 +279,11 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
 
 					try
 					{
-						if( Mode == FuzzyMode.IGNORE_ALL )
+						if( mode == FuzzyMode.IGNORE_ALL )
 						{
 							return true;
 						}
-						else if( Mode == FuzzyMode.PERCENT_99 )
+						else if( mode == FuzzyMode.PERCENT_99 )
 						{
 							return ( a.getItemDamageForDisplay() > 1 ) == ( b.getItemDamageForDisplay() > 1 );
 						}
@@ -292,16 +292,16 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
 							float APercentDamaged = 1.0f - (float) a.getItemDamageForDisplay() / (float) a.getMaxDamage();
 							float BPercentDamaged = 1.0f - (float) b.getItemDamageForDisplay() / (float) b.getMaxDamage();
 
-							return ( APercentDamaged > Mode.breakPoint ) == ( BPercentDamaged > Mode.breakPoint );
+							return ( APercentDamaged > mode.breakPoint ) == ( BPercentDamaged > mode.breakPoint );
 						}
 					}
 					catch( Throwable e )
 					{
-						if( Mode == FuzzyMode.IGNORE_ALL )
+						if( mode == FuzzyMode.IGNORE_ALL )
 						{
 							return true;
 						}
-						else if( Mode == FuzzyMode.PERCENT_99 )
+						else if( mode == FuzzyMode.PERCENT_99 )
 						{
 							return ( a.getItemDamage() > 1 ) == ( b.getItemDamage() > 1 );
 						}
@@ -310,7 +310,7 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
 							float APercentDamaged = (float) a.getItemDamage() / (float) a.getMaxDamage();
 							float BPercentDamaged = (float) b.getItemDamage() / (float) b.getMaxDamage();
 
-							return ( APercentDamaged > Mode.breakPoint ) == ( BPercentDamaged > Mode.breakPoint );
+							return ( APercentDamaged > mode.breakPoint ) == ( BPercentDamaged > mode.breakPoint );
 						}
 					}
 				}
@@ -333,11 +333,11 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
 
 					try
 					{
-						if( Mode == FuzzyMode.IGNORE_ALL )
+						if( mode == FuzzyMode.IGNORE_ALL )
 						{
 							return true;
 						}
-						else if( Mode == FuzzyMode.PERCENT_99 )
+						else if( mode == FuzzyMode.PERCENT_99 )
 						{
 							return ( a.getItemDamageForDisplay() > 1 ) == ( o.getItemDamageForDisplay() > 1 );
 						}
@@ -346,16 +346,16 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
 							float APercentDamaged = 1.0f - (float) a.getItemDamageForDisplay() / (float) a.getMaxDamage();
 							float BPercentDamaged = 1.0f - (float) o.getItemDamageForDisplay() / (float) o.getMaxDamage();
 
-							return ( APercentDamaged > Mode.breakPoint ) == ( BPercentDamaged > Mode.breakPoint );
+							return ( APercentDamaged > mode.breakPoint ) == ( BPercentDamaged > mode.breakPoint );
 						}
 					}
 					catch( Throwable e )
 					{
-						if( Mode == FuzzyMode.IGNORE_ALL )
+						if( mode == FuzzyMode.IGNORE_ALL )
 						{
 							return true;
 						}
-						else if( Mode == FuzzyMode.PERCENT_99 )
+						else if( mode == FuzzyMode.PERCENT_99 )
 						{
 							return ( a.getItemDamage() > 1 ) == ( o.getItemDamage() > 1 );
 						}
@@ -364,7 +364,7 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
 							float APercentDamaged = (float) a.getItemDamage() / (float) a.getMaxDamage();
 							float BPercentDamaged = (float) o.getItemDamage() / (float) o.getMaxDamage();
 
-							return ( APercentDamaged > Mode.breakPoint ) == ( BPercentDamaged > Mode.breakPoint );
+							return ( APercentDamaged > mode.breakPoint ) == ( BPercentDamaged > mode.breakPoint );
 						}
 					}
 				}

src/main/java/appeng/util/item/OreHelper.java

@@ -26,14 +26,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+
 import appeng.api.storage.data.IAEItemStack;
 
 
@@ -59,13 +59,13 @@ public class OreHelper
 	/**
 	 * Test if the passed {@link ItemStack} is an ore.
 	 *
-	 * @param ItemStack the itemstack to test
+	 * @param itemStack the itemstack to test
 	 *
 	 * @return true if an ore entry exists, false otherwise
 	 */
-	public OreReference isOre( ItemStack ItemStack )
+	public OreReference isOre( ItemStack itemStack )
 	{
-		ItemRef ir = new ItemRef( ItemStack );
+		ItemRef ir = new ItemRef( itemStack );
 
 		if( !this.references.containsKey( ir ) )
 		{
@@ -85,7 +85,7 @@ public class OreHelper
 
 				for( ItemStack oreItem : this.oreDictCache.getUnchecked( ore ) )
 				{
-					if( OreDictionary.itemMatches( oreItem, ItemStack, false ) )
+					if( OreDictionary.itemMatches( oreItem, itemStack, false ) )
 					{
 						toAdd.add( ore );
 						break;

src/main/java/appeng/worldgen/meteorite/ChunkOnly.java

@@ -79,12 +79,12 @@ public class ChunkOnly extends StandardWorld
 	}
 
 	@Override
-	public void setBlock( int x, int y, int z, Block blk, int metadata, int flags )
+	public void setBlock( int x, int y, int z, Block block, int meta, int flags )
 	{
 		if( this.range( x, y, z ) )
 		{
 			this.verticalBits |= 1 << ( y >> 4 );
-			this.w.setBlock( x, y, z, blk, metadata, flags & ( ~2 ) );
+			this.w.setBlock( x, y, z, block, meta, flags & ( ~2 ) );
 		}
 	}
 

src/main/java/appeng/worldgen/meteorite/IMeteoriteWorld.java

@@ -30,7 +30,7 @@ public interface IMeteoriteWorld
 
 	void setBlock( int i, int j, int k, Block blk );
 
-	void setBlock( int i, int j, int k, Block blk_b, int meta_b, int l );
+	void setBlock( int i, int j, int k, Block block, int meta, int l );
 
 	void done();
 }

src/main/java/appeng/worldgen/meteorite/StandardWorld.java

@@ -104,11 +104,11 @@ public class StandardWorld implements IMeteoriteWorld
 	}
 
 	@Override
-	public void setBlock( int x, int y, int z, Block blk, int metadata, int flags )
+	public void setBlock( int x, int y, int z, Block block, int meta, int flags )
 	{
 		if( this.range( x, y, z ) )
 		{
-			this.w.setBlock( x, y, z, blk, metadata, flags );
+			this.w.setBlock( x, y, z, block, meta, flags );
 		}
 	}