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

Always use qualified access for fields and methods

Browse Source
This commit is contained in:
yueh
2017-07-20 21:27:22 +02:00
parent f9cad0758d
commit 15582fd1df
211 changed files with 1086 additions and 1086 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/qnb/BlockQuantumBase.java
+4 -4
View File
@@ -53,7 +53,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto
this.boundingBox = new AxisAlignedBB( shave, shave, shave, 1.0f - shave, 1.0f - shave, 1.0f - shave );
this.setLightOpacity( 0 );
this.setFullSize( this.setOpaque( false ) );
this.setDefaultState( getDefaultState().withProperty( FORMED, false ) );
this.setDefaultState( this.getDefaultState().withProperty( FORMED, false ) );
}
@Override
@@ -65,7 +65,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto
@Override
protected BlockStateContainer createBlockState()
{
return new ExtendedBlockState( this, getAEStates(), new IUnlistedProperty[] { FORMED_STATE } );
return new ExtendedBlockState( this, this.getAEStates(), new IUnlistedProperty[] { FORMED_STATE } );
}
@Override
@@ -73,7 +73,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto
{
IExtendedBlockState extState = (IExtendedBlockState) state;
TileQuantumBridge bridge = getTileEntity( world, pos );
TileQuantumBridge bridge = this.getTileEntity( world, pos );
if( bridge != null )
{
QnbFormedState formedState = new QnbFormedState( bridge.getAdjacentQuantumBridges(), bridge.isCorner(), bridge.isPowered() );
@@ -86,7 +86,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto
@Override
public IBlockState getActualState( IBlockState state, IBlockAccess worldIn, BlockPos pos )
{
TileQuantumBridge bridge = getTileEntity( worldIn, pos );
TileQuantumBridge bridge = this.getTileEntity( worldIn, pos );
if( bridge != null )
{
state = state.withProperty( FORMED, bridge.isFormed() );
src/main/java/appeng/block/qnb/QnbFormedBakedModel.java
+16 -16
View File
@@ -79,42 +79,42 @@ class QnbFormedBakedModel implements IBakedModel
// Get the correct base model
if( !( state instanceof IExtendedBlockState ) )
{
return baseModel.getQuads( state, side, rand );
return this.baseModel.getQuads( state, side, rand );
}
IExtendedBlockState extendedBlockState = (IExtendedBlockState) state;
QnbFormedState formedState = extendedBlockState.getValue( BlockQuantumBase.FORMED_STATE );
return getQuads( formedState, state, side, rand );
return this.getQuads( formedState, state, side, rand );
}
private List<BakedQuad> getQuads( QnbFormedState formedState, IBlockState state, EnumFacing side, long rand )
{
CubeBuilder builder = new CubeBuilder( vertexFormat );
CubeBuilder builder = new CubeBuilder( this.vertexFormat );
if( state.getBlock() == linkBlock )
if( state.getBlock() == this.linkBlock )
{
Set<EnumFacing> sides = formedState.getAdjacentQuantumBridges();
this.renderCableAt( builder, 0.11f * 16, glassCableTexture, 0.141f * 16, sides );
this.renderCableAt( builder, 0.11f * 16, this.glassCableTexture, 0.141f * 16, sides );
this.renderCableAt( builder, 0.188f * 16, coveredCableTexture, 0.1875f * 16, sides );
this.renderCableAt( builder, 0.188f * 16, this.coveredCableTexture, 0.1875f * 16, sides );
builder.setTexture( linkTexture );
builder.setTexture( this.linkTexture );
builder.addCube( DEFAULT_RENDER_MIN, DEFAULT_RENDER_MIN, DEFAULT_RENDER_MIN, DEFAULT_RENDER_MAX, DEFAULT_RENDER_MAX, DEFAULT_RENDER_MAX );
}
else
{
if( formedState.isCorner() )
{
this.renderCableAt( builder, 0.188f * 16, coveredCableTexture, 0.05f * 16, formedState.getAdjacentQuantumBridges() );
this.renderCableAt( builder, 0.188f * 16, this.coveredCableTexture, 0.05f * 16, formedState.getAdjacentQuantumBridges() );
builder.setTexture( ringTexture );
builder.setTexture( this.ringTexture );
builder.addCube( DEFAULT_RENDER_MIN, DEFAULT_RENDER_MIN, DEFAULT_RENDER_MIN, DEFAULT_RENDER_MAX, DEFAULT_RENDER_MAX, DEFAULT_RENDER_MAX );
if( formedState.isPowered() )
{
builder.setTexture( lightCornerTexture );
builder.setTexture( this.lightCornerTexture );
builder.setRenderFullBright( true );
for( EnumFacing facing : EnumFacing.values() )
{
@@ -133,7 +133,7 @@ class QnbFormedBakedModel implements IBakedModel
}
else
{
builder.setTexture( ringTexture );
builder.setTexture( this.ringTexture );
builder.addCube( 0, DEFAULT_RENDER_MIN, DEFAULT_RENDER_MIN, 16, DEFAULT_RENDER_MAX, DEFAULT_RENDER_MAX );
@@ -143,7 +143,7 @@ class QnbFormedBakedModel implements IBakedModel
if( formedState.isPowered() )
{
builder.setTexture( lightTexture );
builder.setTexture( this.lightTexture );
builder.setRenderFullBright( true );
for( EnumFacing facing : EnumFacing.values() )
{
@@ -203,7 +203,7 @@ class QnbFormedBakedModel implements IBakedModel
@Override
public boolean isAmbientOcclusion()
{
return baseModel.isAmbientOcclusion();
return this.baseModel.isAmbientOcclusion();
}
@Override
@@ -221,19 +221,19 @@ class QnbFormedBakedModel implements IBakedModel
@Override
public TextureAtlasSprite getParticleTexture()
{
return baseModel.getParticleTexture();
return this.baseModel.getParticleTexture();
}
@Override
public ItemCameraTransforms getItemCameraTransforms()
{
return baseModel.getItemCameraTransforms();
return this.baseModel.getItemCameraTransforms();
}
@Override
public ItemOverrideList getOverrides()
{
return baseModel.getOverrides();
return this.baseModel.getOverrides();
}
public static List<ResourceLocation> getRequiredTextures()
src/main/java/appeng/block/qnb/QnbFormedModel.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class QnbFormedModel implements IModel
@Override
public IBakedModel bake( IModelState state, VertexFormat format, Function<ResourceLocation, TextureAtlasSprite> bakedTextureGetter )
{
IBakedModel ringModel = getBaseModel( MODEL_RING, state, format, bakedTextureGetter );
IBakedModel ringModel = this.getBaseModel( MODEL_RING, state, format, bakedTextureGetter );
return new QnbFormedBakedModel( format, ringModel, bakedTextureGetter );
}
src/main/java/appeng/block/qnb/QnbFormedState.java
+3 -3
View File
@@ -25,17 +25,17 @@ public class QnbFormedState
public Set<EnumFacing> getAdjacentQuantumBridges()
{
return adjacentQuantumBridges;
return this.adjacentQuantumBridges;
}
public boolean isCorner()
{
return corner;
return this.corner;
}
public boolean isPowered()
{
return powered;
return this.powered;
}
}