All parameters on one line (for now)

Easier picking of 1.7 changes

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(
-			final ClientHelper proxy, final String name )
+	public void registerIcons( final ClientHelper proxy, final String name )
 	{
 		proxy.setIcon( this, 0, name );
 	}
 
-	public IAESprite getIcon(
-			final ItemStack is )
+	public IAESprite getIcon( final ItemStack is )
 	{
 		return this.myIcon;
 	}
 
 	@SideOnly( Side.CLIENT )
-	public void registerCustomIcon(
-			final TextureMap map )
+	public void registerCustomIcon( final TextureMap map )
 	{
 
 	}

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

@@ -67,8 +67,7 @@ public class NetworkToolViewer implements INetworkTool
 	}
 
 	@Override
-	public ItemStack removeStackFromSlot(
-			int i )
+	public ItemStack removeStackFromSlot( int i )
 	{
 		return this.inv.removeStackFromSlot( i );
 	}
@@ -141,16 +140,13 @@ public class NetworkToolViewer implements INetworkTool
 	}
 
 	@Override
-	public int getField(
-			final int id )
+	public int getField( final int id )
 	{
 		return this.inv.getField( id );
 	}
 
 	@Override
-	public void setField(
-			final int id,
-			final int value )
+	public void setField( 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(
-					final ItemStack stack )
+			public ModelResourceLocation getModelLocation( 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(
-			final ClientHelper proxy,
-			final String name )
+	public void registerIcons( 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(
-					final ItemStack stack )
+			public ModelResourceLocation getModelLocation( final ItemStack stack )
 			{
 				if( this.recursive == false )
 				{
@@ -112,15 +109,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
 	}
 
 	@Override
-	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 )
+	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 )
 	{
 		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(
-					final ItemStack stack )
+			public ModelResourceLocation getModelLocation( final ItemStack stack )
 			{
 				if( ItemPaintBall.this.isLumen( stack ) )
 				{
@@ -84,9 +83,7 @@ public class ItemPaintBall extends AEBaseItem
 	}
 
 	@Override
-	public int getColorFromItemStack(
-			final ItemStack stack,
-			final int renderPass )
+	public int getColorFromItemStack( 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(
-			final ItemStack is,
-			final EntityPlayer player,
-			final World world,
-			final BlockPos pos,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
+	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 )
 	{
 		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(
-			final TextureMap map )
+	public void registerCustomIcon( 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(
-			final TextureMap map )
+	public void registerCustomIcon( 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{" +
-					"part=" + this.part +
-					", variant=" + this.variant +
-					'}';
+			return "PartTypeWithVariant{" + "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(
-			final ItemStack stack,
-			final EntityPlayer player,
-			final World world,
-			final BlockPos pos,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
+	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 )
 	{
 		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(
-			final ItemStack is,
-			final EntityPlayer player,
-			final World w,
-			final BlockPos pos,
-			final EnumFacing side,
-			final float hx,
-			final float hy,
-			final float hz )
+	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 )
 	{
 		if( player.isSneaking() && !w.isRemote )
 		{
@@ -164,10 +156,7 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard
 	}
 
 	@Override
-	public boolean doesSneakBypassUse(
-			final World world,
-			final BlockPos pos,
-			final EntityPlayer player )
+	public boolean doesSneakBypassUse( 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(
-			final ItemStack stack,
-			final EntityPlayer player,
-			final World world,
-			final BlockPos pos,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
+	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 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(
-			final World world,
-			final BlockPos pos,
-			final EntityPlayer player )
+	public boolean doesSneakBypassUse( 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(
-			final ItemStack wrench,
-			final EntityPlayer player,
-			final BlockPos pos )
+	public boolean canWrench( final ItemStack wrench, final EntityPlayer player, final BlockPos pos )
 	{
 		return true;
 	}

src/main/java/appeng/items/tools/powered/ToolColorApplicator.java

@@ -121,15 +121,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
 	}
 
 	@Override
-	public boolean onItemUse(
-			final ItemStack is,
-			final EntityPlayer p,
-			final World w,
-			final BlockPos pos,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
+	public boolean onItemUse( final ItemStack is, final EntityPlayer p, final World w, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
 	{
 		final Block blk = w.getBlockState( pos ).getBlock();
 
@@ -302,8 +294,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
 					list.add( i );
 				}
 
-				Collections.sort( list, new Comparator<IAEItemStack>()
-				{
+				Collections.sort( list, new Comparator<IAEItemStack>(){
 
 					@Override
 					public int compare( final IAEItemStack a, final IAEItemStack b )

src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java

@@ -105,9 +105,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
 			this.blockOnly = false;
 		}
 
-		public InWorldToolOperationIngredient(
-				final Block blk,
-				final boolean b )
+		public InWorldToolOperationIngredient( final Block blk, final boolean b )
 		{
 			this.state = blk.getDefaultState();
 			this.blockOnly = b;
@@ -248,15 +246,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
 	}
 
 	@Override
-	public boolean onItemUse(
-			final ItemStack item,
-			final EntityPlayer p,
-			final World w,
-			final BlockPos pos,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
+	public boolean onItemUse( final ItemStack item, final EntityPlayer p, final World w, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
 	{
 		if( this.getAECurrentPower( item ) > 1600 )
 		{

src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java

@@ -120,8 +120,7 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless
 	@Override
 	public IConfigManager getConfigManager( final ItemStack target )
 	{
-		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/tools/quartz/ToolQuartzCuttingKnife.java

@@ -54,15 +54,7 @@ public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem
 	}
 
 	@Override
-	public boolean onItemUse(
-			final ItemStack stack,
-			final EntityPlayer p,
-			final World worldIn,
-			final BlockPos pos,
-			final EnumFacing side,
-			final float hitX,
-			final float hitY,
-			final float hitZ )
+	public boolean onItemUse( final ItemStack stack, final EntityPlayer p, final World worldIn, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
 	{
 		if( Platform.isServer() )
 		{

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

@@ -52,15 +52,7 @@ public class ToolQuartzWrench extends AEBaseItem implements IAEWrench /* , ITool
 	}
 
 	@Override
-	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 )
+	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 Block b = world.getBlockState( pos ).getBlock();
 		if( b != null && !player.isSneaking() && Platform.hasPermissions( new DimensionalCoord( world, pos ), player ) )
@@ -81,19 +73,13 @@ public class ToolQuartzWrench extends AEBaseItem implements IAEWrench /* , ITool
 	}
 
 	@Override
-	public boolean doesSneakBypassUse(
-			final World world,
-			final BlockPos pos,
-			final EntityPlayer player )
+	public boolean doesSneakBypassUse( final World world, final BlockPos pos, final EntityPlayer player )
 	{
 		return true;
 	}
 
 	@Override
-	public boolean canWrench(
-			final ItemStack wrench,
-			final EntityPlayer player,
-			final BlockPos pos )
+	public boolean canWrench( final ItemStack wrench, final EntityPlayer player, final BlockPos pos )
 	{
 		return true;
 	}