Final fields, params and variables

This commit is contained in:
yueh 2015-12-24 02:09:38 +01:00
parent 99215e1701
commit a6ee559723
21 changed files with 89 additions and 89 deletions

View File

@ -694,13 +694,13 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
return isFullSize;
}
public boolean setFullSize( boolean isFullSize )
public boolean setFullSize( final boolean isFullSize )
{
this.isFullSize = isFullSize;
return isFullSize;
}
public boolean setOpaque( boolean isOpaque )
public boolean setOpaque( final boolean isOpaque )
{
this.isOpaque = isOpaque;
return isOpaque;
@ -716,12 +716,12 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
return isInventory;
}
public void setInventory( boolean isInventory )
public void setInventory( final boolean isInventory )
{
this.isInventory = isInventory;
}
public void setHasSubtypes( boolean hasSubtypes )
public void setHasSubtypes( final boolean hasSubtypes )
{
this.hasSubtypes = hasSubtypes;
}

View File

@ -104,9 +104,9 @@ public class ClientHelper extends ServerHelper
private static final ModelGenerator BLOCK_RENDERER = new ModelGenerator();
private final ModelResourceLocation partRenderer = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, "DynamicPartRenderer" ), "inventory" );
private Map<Object, List<IconReg>> iconRegistrations = new HashMap<>();
private List<IconReg> iconTmp = new ArrayList<>();
private List<ResourceLocation> extraIcons = new ArrayList<>();
private final Map<Object, List<IconReg>> iconRegistrations = new HashMap<>();
private final List<IconReg> iconTmp = new ArrayList<>();
private final List<ResourceLocation> extraIcons = new ArrayList<>();
@Override
public void configureIcon( final Object item, final String name )

View File

@ -34,7 +34,7 @@ import appeng.client.texture.MissingIcon;
public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemModel
{
private BlockRenderInfo aeRenderer;
private final BlockRenderInfo aeRenderer;
private class DefState implements IModelState
{

View File

@ -93,7 +93,7 @@ public abstract class AEBaseGui extends GuiContainer
private Stopwatch dbl_clickTimer = Stopwatch.createStarted();
private ItemStack dbl_whichItem;
private Slot bl_clicked;
private boolean useNEI = false;
private final boolean useNEI = false;
private boolean subGui;
public AEBaseGui( final Container container )

View File

@ -187,7 +187,7 @@ public class BusRenderer implements IItemRenderer
return this.renderer;
}
public void setRenderer( ModelGenerator renderer )
public void setRenderer( final ModelGenerator renderer )
{
this.renderer = renderer;
}

View File

@ -10,13 +10,13 @@ import appeng.client.texture.IAESprite;
public class IconUnwrapper extends TextureAtlasSprite
{
private int width;
private int height;
private final int width;
private final int height;
private float max_u;
private float min_u;
private float min_v;
private float max_v;
private final float max_u;
private final float min_u;
private final float min_v;
private final float max_v;
protected IconUnwrapper(
final IAESprite src )

View File

@ -41,8 +41,8 @@ public class ModelGenerator
private static final class CachedModel implements IBakedModel
{
private List<BakedQuad>[] faces = new List[6];
private List<BakedQuad> general;
private final List<BakedQuad>[] faces = new List[6];
private final List<BakedQuad> general;
public CachedModel()
{
@ -115,7 +115,7 @@ public class ModelGenerator
private IBlockAccess blockAccess;
private CachedModel generatedModel = new CachedModel();
private final CachedModel generatedModel = new CachedModel();
// used to create faces...
private final FaceBakery faceBakery = new FaceBakery();
@ -135,11 +135,11 @@ public class ModelGenerator
};
private EnumSet<EnumFacing> renderFaces = EnumSet.allOf( EnumFacing.class );
private boolean flipTexture = false;
private List<SMFace> faces = new ArrayList();
private final List<SMFace> faces = new ArrayList();
private int point = 0;
private int brightness = -1;
private float[][] points = new float[4][];
private final float[][] points = new float[4][];
private EnumFacing currentFace = EnumFacing.UP;
private int color = -1;
@ -636,7 +636,7 @@ public class ModelGenerator
return blockAccess;
}
public void setBlockAccess( IBlockAccess blockAccess )
public void setBlockAccess( final IBlockAccess blockAccess )
{
this.blockAccess = blockAccess;
}
@ -646,7 +646,7 @@ public class ModelGenerator
return renderAllFaces;
}
public void setRenderAllFaces( boolean renderAllFaces )
public void setRenderAllFaces( final boolean renderAllFaces )
{
this.renderAllFaces = renderAllFaces;
}
@ -656,7 +656,7 @@ public class ModelGenerator
return uvRotateBottom;
}
public int setUvRotateBottom( int uvRotateBottom )
public int setUvRotateBottom( final int uvRotateBottom )
{
this.uvRotateBottom = uvRotateBottom;
return uvRotateBottom;
@ -667,7 +667,7 @@ public class ModelGenerator
return uvRotateEast;
}
public int setUvRotateEast( int uvRotateEast )
public int setUvRotateEast( final int uvRotateEast )
{
this.uvRotateEast = uvRotateEast;
return uvRotateEast;
@ -678,7 +678,7 @@ public class ModelGenerator
return uvRotateNorth;
}
public int setUvRotateNorth( int uvRotateNorth )
public int setUvRotateNorth( final int uvRotateNorth )
{
this.uvRotateNorth = uvRotateNorth;
return uvRotateNorth;
@ -689,7 +689,7 @@ public class ModelGenerator
return uvRotateSouth;
}
public int setUvRotateSouth( int uvRotateSouth )
public int setUvRotateSouth( final int uvRotateSouth )
{
this.uvRotateSouth = uvRotateSouth;
return uvRotateSouth;
@ -700,7 +700,7 @@ public class ModelGenerator
return uvRotateTop;
}
public int setUvRotateTop( int uvRotateTop )
public int setUvRotateTop( final int uvRotateTop )
{
this.uvRotateTop = uvRotateTop;
return uvRotateTop;
@ -711,7 +711,7 @@ public class ModelGenerator
return uvRotateWest;
}
public int setUvRotateWest( int uvRotateWest )
public int setUvRotateWest( final int uvRotateWest )
{
this.uvRotateWest = uvRotateWest;
return uvRotateWest;
@ -722,7 +722,7 @@ public class ModelGenerator
return renderMinX;
}
public void setRenderMinX( double renderMinX )
public void setRenderMinX( final double renderMinX )
{
this.renderMinX = renderMinX;
}
@ -732,7 +732,7 @@ public class ModelGenerator
return renderMinY;
}
public void setRenderMinY( double renderMinY )
public void setRenderMinY( final double renderMinY )
{
this.renderMinY = renderMinY;
}
@ -742,7 +742,7 @@ public class ModelGenerator
return renderMinZ;
}
public void setRenderMinZ( double renderMinZ )
public void setRenderMinZ( final double renderMinZ )
{
this.renderMinZ = renderMinZ;
}
@ -752,7 +752,7 @@ public class ModelGenerator
return renderMaxX;
}
public void setRenderMaxX( double renderMaxX )
public void setRenderMaxX( final double renderMaxX )
{
this.renderMaxX = renderMaxX;
}
@ -762,7 +762,7 @@ public class ModelGenerator
return renderMaxY;
}
public void setRenderMaxY( double renderMaxY )
public void setRenderMaxY( final double renderMaxY )
{
this.renderMaxY = renderMaxY;
}
@ -772,7 +772,7 @@ public class ModelGenerator
return renderMaxZ;
}
public void setRenderMaxZ( double renderMaxZ )
public void setRenderMaxZ( final double renderMaxZ )
{
this.renderMaxZ = renderMaxZ;
}
@ -782,7 +782,7 @@ public class ModelGenerator
return flipTexture;
}
public void setFlipTexture( boolean flipTexture )
public void setFlipTexture( final boolean flipTexture )
{
this.flipTexture = flipTexture;
}
@ -792,7 +792,7 @@ public class ModelGenerator
return renderFaces;
}
public void setRenderFaces( EnumSet<EnumFacing> renderFaces )
public void setRenderFaces( final EnumSet<EnumFacing> renderFaces )
{
this.renderFaces = renderFaces;
}

View File

@ -42,7 +42,7 @@ public class RenderBlocksWorkaround extends ModelGenerator
// TODO Auto-generated method stub
}
public void setOpacity( float f )
public void setOpacity( final float f )
{
this.opacity = f;
}
@ -52,7 +52,7 @@ public class RenderBlocksWorkaround extends ModelGenerator
return faces;
}
public void setFaces( EnumSet<EnumFacing> faces )
public void setFaces( final EnumSet<EnumFacing> faces )
{
this.faces = faces;
}

View File

@ -167,7 +167,7 @@ public class CraftingLinkNexus
return req;
}
public void setRequest( CraftingLink req )
public void setRequest( final CraftingLink req )
{
this.req = req;
}

View File

@ -97,7 +97,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
private static class InWorldToolOperationIngredient
{
private final IBlockState state;
private boolean blockOnly;
private final boolean blockOnly;
public InWorldToolOperationIngredient( final IBlockState state )
{

View File

@ -38,14 +38,14 @@ public class InvLayerData
private final List<ISidedInventory> inventories;
private final List<InvSot> slots;
public InvLayerData( int[][] a, List<ISidedInventory> b, List<InvSot> c )
public InvLayerData( final int[][] a, final List<ISidedInventory> b, final List<InvSot> c )
{
this.sides = a;
this.inventories = b;
this.slots = c;
}
public ItemStack decreaseStackSize( int slot, int amount )
public ItemStack decreaseStackSize( final int slot, final int amount )
{
if( this.isSlotValid( slot ) )
{
@ -62,7 +62,7 @@ public class InvLayerData
*
* @return true, if the slot exists.
*/
boolean isSlotValid( int slot )
boolean isSlotValid( final int slot )
{
return this.slots != null && slot >= 0 && slot < this.slots.size();
}
@ -77,7 +77,7 @@ public class InvLayerData
return this.slots.size();
}
public ItemStack getStackInSlot( int slot )
public ItemStack getStackInSlot( final int slot )
{
if( this.isSlotValid( slot ) )
{
@ -87,7 +87,7 @@ public class InvLayerData
return null;
}
public boolean isItemValidForSlot( int slot, ItemStack itemstack )
public boolean isItemValidForSlot( final int slot, final ItemStack itemstack )
{
if( this.isSlotValid( slot ) )
{
@ -97,7 +97,7 @@ public class InvLayerData
return false;
}
public void setInventorySlotContents( int slot, ItemStack itemstack )
public void setInventorySlotContents( final int slot, final ItemStack itemstack )
{
if( this.isSlotValid( slot ) )
{
@ -105,7 +105,7 @@ public class InvLayerData
}
}
public boolean canExtractItem( int slot, ItemStack itemstack, EnumFacing side )
public boolean canExtractItem( final int slot, final ItemStack itemstack, final EnumFacing side )
{
if( this.isSlotValid( slot ) )
{
@ -115,7 +115,7 @@ public class InvLayerData
return false;
}
public boolean canInsertItem( int slot, ItemStack itemstack, EnumFacing side )
public boolean canInsertItem( final int slot, final ItemStack itemstack, final EnumFacing side )
{
if( this.isSlotValid( slot ) )
{
@ -129,14 +129,14 @@ public class InvLayerData
{
if( this.inventories != null )
{
for( IInventory inv : this.inventories )
for( final IInventory inv : this.inventories )
{
inv.markDirty();
}
}
}
public int[] getSlotsForFace( EnumFacing side )
public int[] getSlotsForFace( final EnumFacing side )
{
if( this.sides == null || side == null )
{

View File

@ -30,13 +30,13 @@ public class InvSot
private final ISidedInventory partInv;
private final int index;
public InvSot( ISidedInventory part, int slot )
public InvSot( final ISidedInventory part, final int slot )
{
this.partInv = part;
this.index = slot;
}
public ItemStack decreaseStackSize( int j )
public ItemStack decreaseStackSize( final int j )
{
return this.partInv.decrStackSize( this.index, j );
}
@ -46,22 +46,22 @@ public class InvSot
return this.partInv.getStackInSlot( this.index );
}
public boolean isItemValidForSlot( ItemStack itemstack )
public boolean isItemValidForSlot( final ItemStack itemstack )
{
return this.partInv.isItemValidForSlot( this.index, itemstack );
}
public void setInventorySlotContents( ItemStack itemstack )
public void setInventorySlotContents( final ItemStack itemstack )
{
this.partInv.setInventorySlotContents( this.index, itemstack );
}
public boolean canExtractItem( ItemStack itemstack, EnumFacing side )
public boolean canExtractItem( final ItemStack itemstack, final EnumFacing side )
{
return this.partInv.canExtractItem( this.index, itemstack, side );
}
public boolean canInsertItem( ItemStack itemstack, EnumFacing side )
public boolean canInsertItem( final ItemStack itemstack, final EnumFacing side )
{
return this.partInv.canInsertItem( this.index, itemstack, side );
}

View File

@ -68,12 +68,12 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
inventories = new ArrayList<ISidedInventory>();
int slotCount = 0;
for( AEPartLocation side : AEPartLocation.SIDE_LOCATIONS )
for( final AEPartLocation side : AEPartLocation.SIDE_LOCATIONS )
{
IPart bp = this.getPart( side );
final IPart bp = this.getPart( side );
if( bp instanceof ISidedInventory )
{
ISidedInventory part = (ISidedInventory) bp;
final ISidedInventory part = (ISidedInventory) bp;
slotCount += part.getSizeInventory();
inventories.add( part );
}
@ -90,13 +90,13 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
int offsetForLayer = 0;
int offsetForPart = 0;
for( ISidedInventory sides : inventories )
for( final ISidedInventory sides : inventories )
{
offsetForPart = 0;
slotCount = sides.getSizeInventory();
AEPartLocation currentSide = AEPartLocation.INTERNAL;
for( AEPartLocation side : AEPartLocation.SIDE_LOCATIONS )
for( final AEPartLocation side : AEPartLocation.SIDE_LOCATIONS )
{
if( this.getPart( side ) == sides )
{
@ -105,7 +105,7 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
}
}
int[] cSidesList = sideData[currentSide.ordinal()] = new int[slotCount];
final int[] cSidesList = sideData[currentSide.ordinal()] = new int[slotCount];
for( int cSlot = 0; cSlot < slotCount; cSlot++ )
{
cSidesList[cSlot] = offsetForLayer;
@ -141,7 +141,7 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
}
@Override
public ItemStack getStackInSlot( int slot )
public ItemStack getStackInSlot( final int slot )
{
if( this.invLayer == null )
{
@ -152,7 +152,7 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
}
@Override
public ItemStack decrStackSize( int slot, int amount )
public ItemStack decrStackSize( final int slot, final int amount )
{
if( this.invLayer == null )
{
@ -163,13 +163,13 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
}
@Override
public ItemStack getStackInSlotOnClosing( int slot )
public ItemStack getStackInSlotOnClosing( final int slot )
{
return null;
}
@Override
public void setInventorySlotContents( int slot, ItemStack itemstack )
public void setInventorySlotContents( final int slot, final ItemStack itemstack )
{
if( this.invLayer == null )
{
@ -198,23 +198,23 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
}
@Override
public boolean isUseableByPlayer( EntityPlayer entityplayer )
public boolean isUseableByPlayer( final EntityPlayer entityplayer )
{
return false;
}
@Override
public void openInventory( EntityPlayer player )
public void openInventory( final EntityPlayer player )
{
}
@Override
public void closeInventory( EntityPlayer player )
public void closeInventory( final EntityPlayer player )
{
}
@Override
public boolean isItemValidForSlot( int slot, ItemStack itemstack )
public boolean isItemValidForSlot( final int slot, final ItemStack itemstack )
{
if( this.invLayer == null )
{
@ -236,7 +236,7 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
}
@Override
public int[] getSlotsForFace( EnumFacing side )
public int[] getSlotsForFace( final EnumFacing side )
{
if( this.invLayer != null )
{
@ -247,7 +247,7 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
}
@Override
public boolean canInsertItem( int slot, ItemStack itemstack, EnumFacing side )
public boolean canInsertItem( final int slot, final ItemStack itemstack, final EnumFacing side )
{
if( this.invLayer == null )
{
@ -258,7 +258,7 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
}
@Override
public boolean canExtractItem( int slot, ItemStack itemstack, EnumFacing side )
public boolean canExtractItem( final int slot, final ItemStack itemstack, final EnumFacing side )
{
if( this.invLayer == null )
{
@ -270,15 +270,15 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
@Override
public int getField(
int id )
final int id )
{
return 0;
}
@Override
public void setField(
int id,
int value )
final int id,
final int value )
{
}

View File

@ -32,9 +32,9 @@ public class LayerITileStorageMonitorable extends LayerBase implements ITileStor
{
@Override
public IStorageMonitorable getMonitorable( EnumFacing side, BaseActionSource src )
public IStorageMonitorable getMonitorable( final EnumFacing side, final BaseActionSource src )
{
IPart part = this.getPart( side );
final IPart part = this.getPart( side );
if( part instanceof ITileStorageMonitorable )
{
return ( (ITileStorageMonitorable) part ).getMonitorable( side, src );

View File

@ -1060,12 +1060,12 @@ public class PartCable extends AEBasePart implements IPartCable
rh.renderFace( pos, blk.getRendererInstance().getTexture( AEPartLocation.UP ), EnumFacing.UP, renderer );
}
int getChannelsOnSide( int i )
int getChannelsOnSide( final int i )
{
return this.channelsOnSide[i];
}
void setChannelsOnSide( int i, int channels )
void setChannelsOnSide( final int i, final int channels )
{
this.channelsOnSide[i] = channels;
}

View File

@ -177,7 +177,7 @@ public class PartPatternTerminal extends AbstractPartTerminal
return this.substitute;
}
public void setSubstitution( boolean canSubstitute )
public void setSubstitution( final boolean canSubstitute )
{
this.substitute = canSubstitute;
}

View File

@ -98,7 +98,7 @@ public final class VersionChecker implements Runnable
this.processInterval( nowInMs, lastAfterInterval );
}
catch( Exception exception )
catch( final Exception exception )
{
// Log any unhandled exception to prevent the JVM from reporting them as unhandled.
AELog.error( exception );

View File

@ -29,7 +29,7 @@ public class VersionCheckerException extends Exception
{
private static final long serialVersionUID = 4582501864800542884L;
public VersionCheckerException( @Nonnull String string )
public VersionCheckerException( @Nonnull final String string )
{
super( string );
}

View File

@ -77,11 +77,11 @@ public final class ReleaseFetcher
{
AELog.error( e );
}
catch( MalformedURLException e )
catch( final MalformedURLException e )
{
AELog.error( e );
}
catch( IOException e )
catch( final IOException e )
{
AELog.error( e );
}

View File

@ -66,7 +66,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
/**
* Immibis MB Support
*/
private boolean ImmibisMicroblocks_TransformableTileEntityMarker = true;
private final boolean ImmibisMicroblocks_TransformableTileEntityMarker = true;
private int oldLV = -1; // on re-calculate light when it changes
@TileEvent( TileEventType.WORLD_NBT_READ )

View File

@ -47,8 +47,8 @@ import appeng.util.Platform;
public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFluidStack, Comparable<AEFluidStack>
{
private int myHash;
private Fluid fluid;
private final int myHash;
private final Fluid fluid;
private IAETagCompound tagCompound;
private AEFluidStack( final AEFluidStack is )