Always use qualified access for fields and methods

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
@@ -64,7 +64,7 @@ public class AutoRotatingModel implements IBakedModel
@Override
public List<BakedQuad> load( AutoRotatingCacheKey key ) throws Exception
{
return getRotatedModel( key.getBlockState(), key.getSide(), key.getForward(), key.getUp() );
return AutoRotatingModel.this.getRotatedModel( key.getBlockState(), key.getSide(), key.getForward(), key.getUp() );
}
} );
}
@@ -109,37 +109,37 @@ public class AutoRotatingModel implements IBakedModel
@Override
public boolean isAmbientOcclusion()
{
return parent.isAmbientOcclusion();
return this.parent.isAmbientOcclusion();
}
@Override
public boolean isGui3d()
{
return parent.isGui3d();
return this.parent.isGui3d();
}
@Override
public boolean isBuiltInRenderer()
{
return parent.isBuiltInRenderer();
return this.parent.isBuiltInRenderer();
}
@Override
public TextureAtlasSprite getParticleTexture()
{
return parent.getParticleTexture();
return this.parent.getParticleTexture();
}
@Override
public ItemCameraTransforms getItemCameraTransforms()
{
return parent.getItemCameraTransforms();
return this.parent.getItemCameraTransforms();
}
@Override
public ItemOverrideList getOverrides()
{
return parent.getOverrides();
return this.parent.getOverrides();
}
@Override
@@ -147,7 +147,7 @@ public class AutoRotatingModel implements IBakedModel
{
if( !( state instanceof IExtendedBlockState ) )
{
return parent.getQuads( state, side, rand );
return this.parent.getQuads( state, side, rand );
}
IExtendedBlockState extState = (IExtendedBlockState) state;
@@ -157,7 +157,7 @@ public class AutoRotatingModel implements IBakedModel
if( forward == null || up == null )
{
return parent.getQuads( state, side, rand );
return this.parent.getQuads( state, side, rand );
}
// The model has other properties than just forward/up, so it would cause our cache to inadvertendly also cache
@@ -166,12 +166,12 @@ public class AutoRotatingModel implements IBakedModel
// equals/hashCode correctly
if( extState.getUnlistedProperties().size() != 2 )
{
return getRotatedModel( extState, side, forward, up );
return this.getRotatedModel( extState, side, forward, up );
}
AutoRotatingCacheKey key = new AutoRotatingCacheKey( extState.getClean(), forward, up, side );
return quadCache.getUnchecked( key );
return this.quadCache.getUnchecked( key );
}
public static class VertexRotator extends QuadGatheringTransformer
@@ -189,17 +189,17 @@ public class AutoRotatingModel implements IBakedModel
public void setParent( IVertexConsumer parent )
{
super.setParent( parent );
if( Objects.equal( getVertexFormat(), parent.getVertexFormat() ) )
if( Objects.equal( this.getVertexFormat(), parent.getVertexFormat() ) )
{
return;
}
setVertexFormat( parent.getVertexFormat() );
this.setVertexFormat( parent.getVertexFormat() );
}
@Override
protected void processQuad()
{
VertexFormat format = parent.getVertexFormat();
VertexFormat format = this.parent.getVertexFormat();
int count = format.getElementCount();
for( int v = 0; v < 4; v++ )
@@ -209,15 +209,15 @@ public class AutoRotatingModel implements IBakedModel
VertexFormatElement element = format.getElement( e );
if( element.getUsage() == VertexFormatElement.EnumUsage.POSITION )
{
parent.put( e, transform( quadData[e][v] ) );
this.parent.put( e, this.transform( this.quadData[e][v] ) );
}
else if( element.getUsage() == VertexFormatElement.EnumUsage.NORMAL )
{
parent.put( e, transformNormal( quadData[e][v] ) );
this.parent.put( e, this.transformNormal( this.quadData[e][v] ) );
}
else
{
parent.put( e, quadData[e][v] );
this.parent.put( e, this.quadData[e][v] );
}
}
}
@@ -232,7 +232,7 @@ public class AutoRotatingModel implements IBakedModel
vec.x -= 0.5f;
vec.y -= 0.5f;
vec.z -= 0.5f;
f2r.getMat().transform( vec );
this.f2r.getMat().transform( vec );
vec.x += 0.5f;
vec.y += 0.5f;
vec.z += 0.5f;
@@ -243,7 +243,7 @@ public class AutoRotatingModel implements IBakedModel
vecc.x -= 0.5f;
vecc.y -= 0.5f;
vecc.z -= 0.5f;
f2r.getMat().transform( vecc );
this.f2r.getMat().transform( vecc );
vecc.x += 0.5f;
vecc.y += 0.5f;
vecc.z += 0.5f;
@@ -257,13 +257,13 @@ public class AutoRotatingModel implements IBakedModel
private float[] transformNormal( float[] fs )
{
if( face == null )
if( this.face == null )
{
switch( fs.length )
{
case 3:
Vector3f vec = new Vector3f( fs );
f2r.getMat().transform( vec );
this.f2r.getMat().transform( vec );
return new float[] {
vec.getX(),
vec.getY(),
@@ -271,7 +271,7 @@ public class AutoRotatingModel implements IBakedModel
};
case 4:
Vector4f vec4 = new Vector4f( fs );
f2r.getMat().transform( vec4 );
this.f2r.getMat().transform( vec4 );
return new float[] {
vec4.getX(),
vec4.getY(),
@@ -288,7 +288,7 @@ public class AutoRotatingModel implements IBakedModel
switch( fs.length )
{
case 3:
Vec3i vec = f2r.rotate( face ).getDirectionVec();
Vec3i vec = this.f2r.rotate( this.face ).getDirectionVec();
return new float[] {
vec.getX(),
vec.getY(),
@@ -296,7 +296,7 @@ public class AutoRotatingModel implements IBakedModel
};
case 4:
Vector4f veccc = new Vector4f( fs[0], fs[1], fs[2], fs[3] );
Vec3i vecc = f2r.rotate( face ).getDirectionVec();
Vec3i vecc = this.f2r.rotate( this.face ).getDirectionVec();
return new float[] {
vecc.getX(),
vecc.getY(),
@@ -313,25 +313,25 @@ public class AutoRotatingModel implements IBakedModel
@Override
public void setQuadTint( int tint )
{
parent.setQuadTint( tint );
this.parent.setQuadTint( tint );
}
@Override
public void setQuadOrientation( EnumFacing orientation )
{
parent.setQuadOrientation( orientation );
this.parent.setQuadOrientation( orientation );
}
@Override
public void setApplyDiffuseLighting( boolean diffuse )
{
parent.setApplyDiffuseLighting( diffuse );
this.parent.setApplyDiffuseLighting( diffuse );
}
@Override
public void setTexture( TextureAtlasSprite texture )
{
parent.setTexture( texture );
this.parent.setTexture( texture );
}
}
}