Modifier are now using a consistent order based on the java conventions

This commit is contained in:
yueh
2015-04-06 00:35:42 +02:00
parent e2d0e5d424
commit eaf57bedf6
109 changed files with 268 additions and 268 deletions
@@ -270,7 +270,7 @@ public abstract class AEBaseGui extends GuiContainer
}
@Override
final protected void drawGuiContainerForegroundLayer( int x, int y )
protected final void drawGuiContainerForegroundLayer( int x, int y )
{
int ox = this.guiLeft; // (width - xSize) / 2;
int oy = this.guiTop; // (height - ySize) / 2;
@@ -285,7 +285,7 @@ public abstract class AEBaseGui extends GuiContainer
public abstract void drawFG( int offsetX, int offsetY, int mouseX, int mouseY );
@Override
final protected void drawGuiContainerBackgroundLayer( float f, int x, int y )
protected final void drawGuiContainerBackgroundLayer( float f, int x, int y )
{
int ox = this.guiLeft; // (width - xSize) / 2;
int oy = this.guiTop; // (height - ySize) / 2;
@@ -28,10 +28,10 @@ import appeng.util.ItemSorters;
public class ClientDCInternalInv implements Comparable<ClientDCInternalInv>
{
final public String unlocalizedName;
final public AppEngInternalInventory inv;
final public long id;
final public long sortBy;
public final String unlocalizedName;
public final AppEngInternalInventory inv;
public final long id;
public final long sortBy;
public ClientDCInternalInv( int size, long id, long sortBy, String unlocalizedName )
{
+5 -5
View File
@@ -49,11 +49,11 @@ import appeng.util.prioitylist.IPartitionList;
public class ItemRepo
{
final private IItemList<IAEItemStack> list = AEApi.instance().storage().createItemList();
final private ArrayList<IAEItemStack> view = new ArrayList<IAEItemStack>();
final private ArrayList<ItemStack> dsp = new ArrayList<ItemStack>();
final private IScrollSource src;
final private ISortSource sortSrc;
private final IItemList<IAEItemStack> list = AEApi.instance().storage().createItemList();
private final ArrayList<IAEItemStack> view = new ArrayList<IAEItemStack>();
private final ArrayList<ItemStack> dsp = new ArrayList<ItemStack>();
private final IScrollSource src;
private final ISortSource sortSrc;
public int rowSize = 9;
@@ -77,7 +77,7 @@ public class BaseBlockRender
setOriMap();
}
static public void setOriMap()
public static void setOriMap()
{
// pointed up...
ORIENTATION_MAP[0][3][1] = 0;
@@ -309,7 +309,7 @@ public class BaseBlockRender
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
}
static public int getOrientation( ForgeDirection in, ForgeDirection forward, ForgeDirection up )
public static int getOrientation( ForgeDirection in, ForgeDirection forward, ForgeDirection up )
{
if( in == null || in == ForgeDirection.UNKNOWN // 1
|| forward == null || forward == ForgeDirection.UNKNOWN // 2
@@ -29,7 +29,7 @@ import appeng.client.texture.TmpFlippableIcon;
public class BlockRenderInfo
{
final public BaseBlockRender rendererInstance;
public final BaseBlockRender rendererInstance;
private final TmpFlippableIcon tmpTopIcon = new TmpFlippableIcon();
private final TmpFlippableIcon tmpBottomIcon = new TmpFlippableIcon();
private final TmpFlippableIcon tmpSouthIcon = new TmpFlippableIcon();
@@ -40,7 +40,7 @@ import appeng.util.Platform;
public class TESRWrapper extends TileEntitySpecialRenderer
{
final public RenderBlocks renderBlocksInstance = new RenderBlocks();
public final RenderBlocks renderBlocksInstance = new RenderBlocks();
final BaseBlockRender blkRender;
final double MAX_DISTANCE;
@@ -52,7 +52,7 @@ public class TESRWrapper extends TileEntitySpecialRenderer
}
@Override
final public void renderTileEntityAt( TileEntity te, double x, double y, double z, float f )
public final void renderTileEntityAt( TileEntity te, double x, double y, double z, float f )
{
if( te instanceof AEBaseTile )
{
@@ -75,7 +75,7 @@ public enum CableBusTextures
PartWirelessSides( "PartWirelessSides" ), PartStorageSides( "PartStorageSides" ), PartStorageBack( "PartStorageBack" );
final private String name;
private final String name;
public IIcon IIcon;
CableBusTextures( String name )
@@ -88,7 +88,7 @@ public enum ExtraBlockTextures
BlockPaint2( "BlockPaint2" ), BlockPaint3( "BlockPaint3" );
final private String name;
private final String name;
public IIcon IIcon;
ExtraBlockTextures( String name )
@@ -38,7 +38,7 @@ public enum ExtraItemTextures
ToolColorApplicatorTip_Light( "ToolColorApplicatorTip_Light" );
final private String name;
private final String name;
public IIcon IIcon;
ExtraItemTextures( String name )