Replaces all method parameter regarding their naming conventions

This commit is contained in:
thatsIch
2015-05-08 23:25:19 +02:00
parent a44369a272
commit f193c2adc4
76 changed files with 381 additions and 381 deletions
+4 -4
View File
@@ -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 )
@@ -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 )
{
}
@@ -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;
}
@@ -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 )