fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1216 from yueh/cleanup-modifier-order

Browse Source 
Modifier are now using a consistent order based on the java conventions
This commit is contained in:
yueh
2015-04-06 13:31:21 +02:00
parent 8666937117 eaf57bedf6
commit 1bb8de3570
109 changed files with 268 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/AEBaseBlock.java
+8 -8
View File
@@ -196,7 +196,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
}
@Override
final public IFeatureHandler handler()
public final IFeatureHandler handler()
{
return this.handler;
}
@@ -279,7 +279,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
@Override
@SideOnly( Side.CLIENT )
final public AxisAlignedBB getSelectedBoundingBoxFromPool( World w, int x, int y, int z )
public final AxisAlignedBB getSelectedBoundingBoxFromPool( World w, int x, int y, int z )
{
ICustomCollision collisionHandler = null;
AxisAlignedBB b = null;
@@ -360,7 +360,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
}
@Override
final public boolean isOpaqueCube()
public final boolean isOpaqueCube()
{
return this.isOpaque;
}
@@ -421,7 +421,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
}
@Override
final public boolean onBlockActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ )
public final boolean onBlockActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ )
{
if( player != null )
{
@@ -566,13 +566,13 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
}
@Override
final public boolean isNormalCube( IBlockAccess world, int x, int y, int z )
public final boolean isNormalCube( IBlockAccess world, int x, int y, int z )
{
return this.isFullSize;
}
@Override
final public boolean rotateBlock( World w, int x, int y, int z, ForgeDirection axis )
public final boolean rotateBlock( World w, int x, int y, int z, ForgeDirection axis )
{
IOrientable rotatable = null;
@@ -630,7 +630,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
}
@Override
final public ForgeDirection[] getValidRotations( World w, int x, int y, int z )
public final ForgeDirection[] getValidRotations( World w, int x, int y, int z )
{
if( this.hasBlockTileEntity() )
{
@@ -787,7 +787,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
}
@Override
final public TileEntity createNewTileEntity( World var1, int var2 )
public final TileEntity createNewTileEntity( World var1, int var2 )
{
if( this.hasBlockTileEntity() )
{
src/main/java/appeng/block/networking/BlockCableBus.java
+2 -2
View File
@@ -81,8 +81,8 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
{
private static final ICableBusContainer NULL_CABLE_BUS = new NullCableBusContainer();
static public Class<? extends TileEntity> noTesrTile;
static public Class<? extends TileEntity> tesrTile;
public static Class<? extends TileEntity> noTesrTile;
public static Class<? extends TileEntity> tesrTile;
/**
* Immibis MB Support.
*/