Always use qualified access for fields and methods

src/main/java/appeng/client/render/model/AutoRotatingCacheKey.java

@@ -43,22 +43,22 @@ final class AutoRotatingCacheKey
 
 	public IBlockState getBlockState()
 	{
-		return blockState;
+		return this.blockState;
 	}
 
 	public EnumFacing getForward()
 	{
-		return forward;
+		return this.forward;
 	}
 
 	public EnumFacing getUp()
 	{
-		return up;
+		return this.up;
 	}
 
 	public EnumFacing getSide()
 	{
-		return side;
+		return this.side;
 	}
 
 	@Override
@@ -68,22 +68,22 @@ final class AutoRotatingCacheKey
 		{
 			return true;
 		}
-		if( o == null || getClass() != o.getClass() )
+		if( o == null || this.getClass() != o.getClass() )
 		{
 			return false;
 		}
 
 		AutoRotatingCacheKey cacheKey = (AutoRotatingCacheKey) o;
-		return blockState.equals( cacheKey.blockState ) && forward == cacheKey.forward && up == cacheKey.up && side == cacheKey.side;
+		return this.blockState.equals( cacheKey.blockState ) && this.forward == cacheKey.forward && this.up == cacheKey.up && this.side == cacheKey.side;
 	}
 
 	@Override
 	public int hashCode()
 	{
-		int result = blockState.hashCode();
-		result = 31 * result + forward.hashCode();
-		result = 31 * result + up.hashCode();
-		result = 31 * result + ( side != null ? side.hashCode() : 0 );
+		int result = this.blockState.hashCode();
+		result = 31 * result + this.forward.hashCode();
+		result = 31 * result + this.up.hashCode();
+		result = 31 * result + ( this.side != null ? this.side.hashCode() : 0 );
 		return result;
 	}
 }

src/main/java/appeng/client/render/model/AutoRotatingModel.java

@@ -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 );
 		}
 	}
 }

src/main/java/appeng/client/render/model/BiometricCardBakedModel.java

@@ -63,7 +63,7 @@ class BiometricCardBakedModel implements IBakedModel
 		this.baseModel = baseModel;
 		this.texture = texture;
 		this.hash = hash;
-		this.generalQuads = ImmutableList.copyOf( buildGeneralQuads() );
+		this.generalQuads = ImmutableList.copyOf( this.buildGeneralQuads() );
 		this.modelCache = modelCache;
 	}
 
@@ -78,16 +78,16 @@ class BiometricCardBakedModel implements IBakedModel
 	public List<BakedQuad> getQuads( @Nullable IBlockState state, @Nullable EnumFacing side, long rand )
 	{
 
-		List<BakedQuad> quads = baseModel.getQuads( state, side, rand );
+		List<BakedQuad> quads = this.baseModel.getQuads( state, side, rand );
 
 		if( side != null )
 		{
 			return quads;
 		}
 
-		List<BakedQuad> result = new ArrayList<>( quads.size() + generalQuads.size() );
+		List<BakedQuad> result = new ArrayList<>( quads.size() + this.generalQuads.size() );
 		result.addAll( quads );
-		result.addAll( generalQuads );
+		result.addAll( this.generalQuads );
 		return result;
 	}
 
@@ -95,10 +95,10 @@ class BiometricCardBakedModel implements IBakedModel
 	{
 		CubeBuilder builder = new CubeBuilder( this.format );
 
-		builder.setTexture( texture );
+		builder.setTexture( this.texture );
 
-		AEColor col = AEColor.values()[Math.abs( 3 + hash ) % AEColor.values().length];
-		if( hash == 0 )
+		AEColor col = AEColor.values()[Math.abs( 3 + this.hash ) % AEColor.values().length];
+		if( this.hash == 0 )
 		{
 			col = AEColor.BLACK;
 		}
@@ -116,7 +116,7 @@ class BiometricCardBakedModel implements IBakedModel
 				}
 				else
 				{
-					isLit = ( hash & ( 1 << x ) ) != 0 || ( hash & ( 1 << y ) ) != 0;
+					isLit = ( this.hash & ( 1 << x ) ) != 0 || ( this.hash & ( 1 << y ) ) != 0;
 				}
 
 				if( isLit )
@@ -139,31 +139,31 @@ class BiometricCardBakedModel implements IBakedModel
 	@Override
 	public boolean isAmbientOcclusion()
 	{
-		return baseModel.isAmbientOcclusion();
+		return this.baseModel.isAmbientOcclusion();
 	}
 
 	@Override
 	public boolean isGui3d()
 	{
-		return baseModel.isGui3d();
+		return this.baseModel.isGui3d();
 	}
 
 	@Override
 	public boolean isBuiltInRenderer()
 	{
-		return baseModel.isBuiltInRenderer();
+		return this.baseModel.isBuiltInRenderer();
 	}
 
 	@Override
 	public TextureAtlasSprite getParticleTexture()
 	{
-		return baseModel.getParticleTexture();
+		return this.baseModel.getParticleTexture();
 	}
 
 	@Override
 	public ItemCameraTransforms getItemCameraTransforms()
 	{
-		return baseModel.getItemCameraTransforms();
+		return this.baseModel.getItemCameraTransforms();
 	}
 
 	@Override
@@ -200,7 +200,7 @@ class BiometricCardBakedModel implements IBakedModel
 
 				try
 				{
-					return modelCache.get( hash, () -> new BiometricCardBakedModel( format, baseModel, texture, hash, modelCache ) );
+					return BiometricCardBakedModel.this.modelCache.get( hash, () -> new BiometricCardBakedModel( BiometricCardBakedModel.this.format, BiometricCardBakedModel.this.baseModel, BiometricCardBakedModel.this.texture, hash, BiometricCardBakedModel.this.modelCache ) );
 				}
 				catch( ExecutionException e )
 				{
@@ -215,9 +215,9 @@ class BiometricCardBakedModel implements IBakedModel
 	public Pair<? extends IBakedModel, Matrix4f> handlePerspective( ItemCameraTransforms.TransformType type )
 	{
 		// Delegate to the base model if possible
-		if( baseModel instanceof IModel )
+		if( this.baseModel instanceof IModel )
 		{
-			IBakedModel pam = (IBakedModel) baseModel;
+			IBakedModel pam = (IBakedModel) this.baseModel;
 			Pair<? extends IBakedModel, Matrix4f> pair = pam.handlePerspective( type );
 			return Pair.of( this, pair.getValue() );
 		}

src/main/java/appeng/client/render/model/BiometricCardModel.java

@@ -45,7 +45,7 @@ public class BiometricCardModel implements IModel
 	{
 		TextureAtlasSprite texture = bakedTextureGetter.apply( TEXTURE );
 
-		IBakedModel baseModel = getBaseModel( state, format, bakedTextureGetter );
+		IBakedModel baseModel = this.getBaseModel( state, format, bakedTextureGetter );
 
 		return new BiometricCardBakedModel( format, baseModel, texture );
 	}

src/main/java/appeng/client/render/model/BuiltInModelLoader.java

@@ -53,19 +53,19 @@ public class BuiltInModelLoader implements ICustomModelLoader
 			return false;
 		}
 
-		return builtInModels.containsKey( modelLocation.getResourcePath() );
+		return this.builtInModels.containsKey( modelLocation.getResourcePath() );
 	}
 
 	@Override
 	public IModel loadModel( ResourceLocation modelLocation ) throws Exception
 	{
-		return builtInModels.get( modelLocation.getResourcePath() );
+		return this.builtInModels.get( modelLocation.getResourcePath() );
 	}
 
 	@Override
 	public void onResourceManagerReload( IResourceManager resourceManager )
 	{
-		for( IModel model : builtInModels.values() )
+		for( IModel model : this.builtInModels.values() )
 		{
 			if( model instanceof IResourceManagerReloadListener )
 			{

src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java

@@ -41,17 +41,17 @@ class ColorApplicatorBakedModel implements IBakedModel
 		this.transforms = map;
 
 		// Put the tint indices in... Since this is an item model, we are ignoring rand
-		this.generalQuads = fixQuadTint( null, texDark, texMedium, texBright );
+		this.generalQuads = this.fixQuadTint( null, texDark, texMedium, texBright );
 		this.quadsBySide = new EnumMap<>( EnumFacing.class );
 		for( EnumFacing facing : EnumFacing.values() )
 		{
-			this.quadsBySide.put( facing, fixQuadTint( facing, texDark, texMedium, texBright ) );
+			this.quadsBySide.put( facing, this.fixQuadTint( facing, texDark, texMedium, texBright ) );
 		}
 	}
 
 	private List<BakedQuad> fixQuadTint( EnumFacing facing, TextureAtlasSprite texDark, TextureAtlasSprite texMedium, TextureAtlasSprite texBright )
 	{
-		List<BakedQuad> quads = baseModel.getQuads( null, facing, 0 );
+		List<BakedQuad> quads = this.baseModel.getQuads( null, facing, 0 );
 		List<BakedQuad> result = new ArrayList<>( quads.size() );
 		for( BakedQuad quad : quads )
 		{
@@ -88,7 +88,7 @@ class ColorApplicatorBakedModel implements IBakedModel
 	{
 		if( side == null )
 		{
-			return generalQuads;
+			return this.generalQuads;
 		}
 		return this.quadsBySide.get( side );
 	}
@@ -96,42 +96,42 @@ class ColorApplicatorBakedModel implements IBakedModel
 	@Override
 	public boolean isAmbientOcclusion()
 	{
-		return baseModel.isAmbientOcclusion();
+		return this.baseModel.isAmbientOcclusion();
 	}
 
 	@Override
 	public boolean isGui3d()
 	{
-		return baseModel.isGui3d();
+		return this.baseModel.isGui3d();
 	}
 
 	@Override
 	public boolean isBuiltInRenderer()
 	{
-		return baseModel.isBuiltInRenderer();
+		return this.baseModel.isBuiltInRenderer();
 	}
 
 	@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();
 	}
 
 	@Override
 	public Pair<? extends IBakedModel, Matrix4f> handlePerspective( ItemCameraTransforms.TransformType type )
 	{
-		return PerspectiveMapWrapper.handlePerspective( this, transforms, type );
+		return PerspectiveMapWrapper.handlePerspective( this, this.transforms, type );
 	}
 }

src/main/java/appeng/client/render/model/ColorApplicatorModel.java

@@ -54,7 +54,7 @@ public class ColorApplicatorModel implements IModel
 	@Override
 	public IBakedModel bake( IModelState state, VertexFormat format, Function<ResourceLocation, TextureAtlasSprite> bakedTextureGetter )
 	{
-		IBakedModel baseModel = getBaseModel( state, format, bakedTextureGetter );
+		IBakedModel baseModel = this.getBaseModel( state, format, bakedTextureGetter );
 
 		TextureAtlasSprite texDark = bakedTextureGetter.apply( TEXTURE_DARK );
 		TextureAtlasSprite texMedium = bakedTextureGetter.apply( TEXTURE_MEDIUM );

src/main/java/appeng/client/render/model/DriveBakedModel.java

@@ -59,7 +59,7 @@ public class DriveBakedModel implements IBakedModel
 
 		List<BakedQuad> result = new ArrayList<>();
 
-		result.addAll( bakedBase.getQuads( state, side, rand ) );
+		result.addAll( this.bakedBase.getQuads( state, side, rand ) );
 
 		if( side == null && state instanceof IExtendedBlockState )
 		{
@@ -72,7 +72,7 @@ public class DriveBakedModel implements IBakedModel
 				{
 					DriveSlotState slotState = slotsState.getState( row * 2 + col );
 
-					IBakedModel bakedCell = bakedCells.get( slotState );
+					IBakedModel bakedCell = this.bakedCells.get( slotState );
 
 					Matrix4f transform = new Matrix4f();
 					transform.setIdentity();
@@ -103,36 +103,36 @@ public class DriveBakedModel implements IBakedModel
 	@Override
 	public boolean isAmbientOcclusion()
 	{
-		return bakedBase.isAmbientOcclusion();
+		return this.bakedBase.isAmbientOcclusion();
 	}
 
 	@Override
 	public boolean isGui3d()
 	{
-		return bakedBase.isGui3d();
+		return this.bakedBase.isGui3d();
 	}
 
 	@Override
 	public boolean isBuiltInRenderer()
 	{
-		return bakedBase.isGui3d();
+		return this.bakedBase.isGui3d();
 	}
 
 	@Override
 	public TextureAtlasSprite getParticleTexture()
 	{
-		return bakedBase.getParticleTexture();
+		return this.bakedBase.getParticleTexture();
 	}
 
 	@Override
 	public ItemCameraTransforms getItemCameraTransforms()
 	{
-		return bakedBase.getItemCameraTransforms();
+		return this.bakedBase.getItemCameraTransforms();
 	}
 
 	@Override
 	public ItemOverrideList getOverrides()
 	{
-		return bakedBase.getOverrides();
+		return this.bakedBase.getOverrides();
 	}
 }

src/main/java/appeng/client/render/model/GlassBakedModel.java

@@ -125,13 +125,13 @@ class GlassBakedModel implements IBakedModel
 			v /= 2;
 		}
 
-		TextureAtlasSprite glassTexture = glassTextures[texIdx];
+		TextureAtlasSprite glassTexture = this.glassTextures[texIdx];
 
 		// Render the glass side
 		List<BakedQuad> quads = new ArrayList<>( 5 ); // At most 5
 
 		List<Vec3d> corners = RenderHelper.getFaceCorners( side );
-		quads.add( createQuad( side, corners, glassTexture, u, v ) );
+		quads.add( this.createQuad( side, corners, glassTexture, u, v ) );
 
 		/*
 		 * This needs some explanation:
@@ -144,10 +144,10 @@ class GlassBakedModel implements IBakedModel
 		 * That texture had "0101" in its filename to indicate this.
 		 */
 		int edgeBitmask = makeBitmask( glassState, side );
-		TextureAtlasSprite sideSprite = frameTextures[edgeBitmask];
+		TextureAtlasSprite sideSprite = this.frameTextures[edgeBitmask];
 		if( sideSprite != null )
 		{
-			quads.add( createQuad( side, corners, sideSprite, 0, 0 ) );
+			quads.add( this.createQuad( side, corners, sideSprite, 0, 0 ) );
 		}
 
 		return quads;
@@ -203,7 +203,7 @@ class GlassBakedModel implements IBakedModel
 
 	private BakedQuad createQuad( EnumFacing side, List<Vec3d> corners, TextureAtlasSprite sprite, float uOffset, float vOffset )
 	{
-		return createQuad( side, corners.get( 0 ), corners.get( 1 ), corners.get( 2 ), corners.get( 3 ), sprite, uOffset, vOffset );
+		return this.createQuad( side, corners.get( 0 ), corners.get( 1 ), corners.get( 2 ), corners.get( 3 ), sprite, uOffset, vOffset );
 	}
 
 	private BakedQuad createQuad( EnumFacing side, Vec3d c1, Vec3d c2, Vec3d c3, Vec3d c4, TextureAtlasSprite sprite, float uOffset, float vOffset )
@@ -217,12 +217,12 @@ class GlassBakedModel implements IBakedModel
 		float v1 = MathHelper.clamp( 0 - vOffset, 0, 16 );
 		float v2 = MathHelper.clamp( 16 - vOffset, 0, 16 );
 
-		UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder( vertexFormat );
+		UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder( this.vertexFormat );
 		builder.setTexture( sprite );
-		putVertex( builder, normal, c1.x, c1.y, c1.z, sprite, u1, v1 );
-		putVertex( builder, normal, c2.x, c2.y, c2.z, sprite, u1, v2 );
-		putVertex( builder, normal, c3.x, c3.y, c3.z, sprite, u2, v2 );
-		putVertex( builder, normal, c4.x, c4.y, c4.z, sprite, u2, v1 );
+		this.putVertex( builder, normal, c1.x, c1.y, c1.z, sprite, u1, v1 );
+		this.putVertex( builder, normal, c2.x, c2.y, c2.z, sprite, u1, v2 );
+		this.putVertex( builder, normal, c3.x, c3.y, c3.z, sprite, u2, v2 );
+		this.putVertex( builder, normal, c4.x, c4.y, c4.z, sprite, u2, v1 );
 		return builder.build();
 	}
 
@@ -233,9 +233,9 @@ class GlassBakedModel implements IBakedModel
 	 */
 	private void putVertex( UnpackedBakedQuad.Builder builder, Vec3d normal, double x, double y, double z, TextureAtlasSprite sprite, float u, float v )
 	{
-		for( int e = 0; e < vertexFormat.getElementCount(); e++ )
+		for( int e = 0; e < this.vertexFormat.getElementCount(); e++ )
 		{
-			switch( vertexFormat.getElement( e ).getUsage() )
+			switch( this.vertexFormat.getElement( e ).getUsage() )
 			{
 				case POSITION:
 					builder.put( e, (float) x, (float) y, (float) z, 1.0f );
@@ -244,7 +244,7 @@ class GlassBakedModel implements IBakedModel
 					builder.put( e, 1.0f, 1.0f, 1.0f, 1.0f );
 					break;
 				case UV:
-					if( vertexFormat.getElement( e ).getIndex() == 0 )
+					if( this.vertexFormat.getElement( e ).getIndex() == 0 )
 					{
 						u = sprite.getInterpolatedU( u );
 						v = sprite.getInterpolatedV( v );
@@ -288,7 +288,7 @@ class GlassBakedModel implements IBakedModel
 	@Override
 	public TextureAtlasSprite getParticleTexture()
 	{
-		return frameTextures[frameTextures.length - 1];
+		return this.frameTextures[this.frameTextures.length - 1];
 	}
 
 	@Override

src/main/java/appeng/client/render/model/MatrixVertexTransformer.java

@@ -45,7 +45,7 @@ final class MatrixVertexTransformer extends QuadGatheringTransformer
 	@Override
 	protected void processQuad()
 	{
-		VertexFormat format = parent.getVertexFormat();
+		VertexFormat format = this.parent.getVertexFormat();
 		int count = format.getElementCount();
 
 		for( int v = 0; v < 4; v++ )
@@ -55,15 +55,15 @@ final class MatrixVertexTransformer extends QuadGatheringTransformer
 				VertexFormatElement element = format.getElement( e );
 				if( element.getUsage() == VertexFormatElement.EnumUsage.POSITION )
 				{
-					parent.put( e, transform( quadData[e][v], element.getElementCount() ) );
+					this.parent.put( e, this.transform( this.quadData[e][v], element.getElementCount() ) );
 				}
 				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] );
 				}
 			}
 		}
@@ -72,25 +72,25 @@ final class MatrixVertexTransformer extends QuadGatheringTransformer
 	@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 );
 	}
 
 	private float[] transform( float[] fs, int elemCount )
@@ -102,7 +102,7 @@ final class MatrixVertexTransformer extends QuadGatheringTransformer
 				vec.x -= 0.5f;
 				vec.y -= 0.5f;
 				vec.z -= 0.5f;
-				transform.transform( vec );
+				this.transform.transform( vec );
 				vec.x += 0.5f;
 				vec.y += 0.5f;
 				vec.z += 0.5f;
@@ -121,7 +121,7 @@ final class MatrixVertexTransformer extends QuadGatheringTransformer
 				vecc.x -= 0.5f;
 				vecc.y -= 0.5f;
 				vecc.z -= 0.5f;
-				transform.transform( vecc );
+				this.transform.transform( vecc );
 				vecc.x += 0.5f;
 				vecc.y += 0.5f;
 				vecc.z += 0.5f;

src/main/java/appeng/client/render/model/SkyCompassBakedModel.java

@@ -83,13 +83,13 @@ public class SkyCompassBakedModel implements IBakedModel
 		else if( state == null )
 		{
 			// This is used to render a compass pointing in a specific direction when being held in hand
-			rotation = fallbackRotation;
+			rotation = this.fallbackRotation;
 		}
 
 		// Pre-compute the quad count to avoid list resizes
 		List<BakedQuad> quads = new ArrayList<>();
 
-		quads.addAll( base.getQuads( state, side, rand ) );
+		quads.addAll( this.base.getQuads( state, side, rand ) );
 
 		// We'll add the pointer as "sideless"
 		if( side == null )
@@ -100,7 +100,7 @@ public class SkyCompassBakedModel implements IBakedModel
 			matrix.setRotation( new AxisAngle4f( 0, 1, 0, rotation ) );
 
 			MatrixVertexTransformer transformer = new MatrixVertexTransformer( matrix );
-			for( BakedQuad bakedQuad : pointer.getQuads( state, side, rand ) )
+			for( BakedQuad bakedQuad : this.pointer.getQuads( state, side, rand ) )
 			{
 				UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder( bakedQuad.getFormat() );
 
@@ -120,7 +120,7 @@ public class SkyCompassBakedModel implements IBakedModel
 	@Override
 	public boolean isAmbientOcclusion()
 	{
-		return base.isAmbientOcclusion();
+		return this.base.isAmbientOcclusion();
 	}
 
 	@Override
@@ -138,13 +138,13 @@ public class SkyCompassBakedModel implements IBakedModel
 	@Override
 	public TextureAtlasSprite getParticleTexture()
 	{
-		return base.getParticleTexture();
+		return this.base.getParticleTexture();
 	}
 
 	@Override
 	public ItemCameraTransforms getItemCameraTransforms()
 	{
-		return base.getItemCameraTransforms();
+		return this.base.getItemCameraTransforms();
 	}
 
 	@Override
@@ -167,11 +167,11 @@ public class SkyCompassBakedModel implements IBakedModel
 
 					float offRads = (float) ( player.rotationYaw / 180.0f * (float) Math.PI + Math.PI );
 
-					fallbackRotation = offRads + getAnimatedRotation( player.getPosition(), true );
+					SkyCompassBakedModel.this.fallbackRotation = offRads + getAnimatedRotation( player.getPosition(), true );
 				}
 				else
 				{
-					fallbackRotation = getAnimatedRotation( null, false );
+					SkyCompassBakedModel.this.fallbackRotation = getAnimatedRotation( null, false );
 				}
 
 				return originalModel;

src/main/java/appeng/client/render/model/UVLModelLoader.java

@@ -234,7 +234,7 @@ public enum UVLModelLoader implements ICustomModelLoader
 				modelPath = modelPath.substring( "models/".length() );
 			}
 			ResourceLocation armatureLocation = new ResourceLocation( modelLocation.getResourceDomain(), "armatures/" + modelPath + ".json" );
-			ModelBlockAnimation animation = ModelBlockAnimation.loadVanillaAnimation( resourceManager, armatureLocation );
+			ModelBlockAnimation animation = ModelBlockAnimation.loadVanillaAnimation( UVLModelLoader.this.resourceManager, armatureLocation );
 			ModelBlock model;
 			{
 				Reader reader = null;
@@ -249,7 +249,7 @@ public enum UVLModelLoader implements ICustomModelLoader
 							new ResourceLocation( modelLocation.getResourceDomain(), "models/" + modelPath + ".json" ) );
 					reader = new InputStreamReader( iresource.getInputStream(), Charsets.UTF_8 );
 
-					lvt_5_1_ = JsonUtils.gsonDeserialize( UVLSERIALIZER, reader, ModelBlock.class, false );
+					lvt_5_1_ = JsonUtils.gsonDeserialize( this.UVLSERIALIZER, reader, ModelBlock.class, false );
 					lvt_5_1_.name = modelLocation.toString();
 				}
 				catch( IOException e )
@@ -265,34 +265,34 @@ public enum UVLModelLoader implements ICustomModelLoader
 				model = lvt_5_1_;
 			}
 
-			this.parent = vanillaModelWrapper( getLoader(), modelLocation, model, false, animation );
+			this.parent = vanillaModelWrapper( UVLModelLoader.this.getLoader(), modelLocation, model, false, animation );
 		}
 
 		@Override
 		public Collection<ResourceLocation> getDependencies()
 		{
-			return parent.getDependencies();
+			return this.parent.getDependencies();
 		}
 
 		@Override
 		public Collection<ResourceLocation> getTextures()
 		{
-			return parent.getTextures();
+			return this.parent.getTextures();
 		}
 
 		@Override
 		public IBakedModel bake( IModelState state, VertexFormat format, Function<ResourceLocation, TextureAtlasSprite> bakedTextureGetter )
 		{
-			setFaceBakery( getLoader(), new FaceBakeryOverride() );
-			IBakedModel model = parent.bake( state, format, bakedTextureGetter );
-			setFaceBakery( getLoader(), new FaceBakery() );
+			setFaceBakery( UVLModelLoader.this.getLoader(), new FaceBakeryOverride() );
+			IBakedModel model = this.parent.bake( state, format, bakedTextureGetter );
+			setFaceBakery( UVLModelLoader.this.getLoader(), new FaceBakery() );
 			return model;
 		}
 
 		@Override
 		public IModelState getDefaultState()
 		{
-			return parent.getDefaultState();
+			return this.parent.getDefaultState();
 		}
 
 		public class BlockPartFaceOverrideSerializer implements JsonDeserializer<BlockPartFace>
@@ -306,7 +306,7 @@ public enum UVLModelLoader implements ICustomModelLoader
 				String s = this.parseTexture( jsonobject );
 				BlockFaceUV blockfaceuv = (BlockFaceUV) p_deserialize_3_.deserialize( jsonobject, BlockFaceUV.class );
 				BlockPartFace blockFace = new BlockPartFace( enumfacing, i, s, blockfaceuv );
-				uvlightmap.put( blockFace, parseUVL( jsonobject ) );
+				UVLModelWrapper.this.uvlightmap.put( blockFace, this.parseUVL( jsonobject ) );
 				return blockFace;
 			}
 
@@ -346,7 +346,7 @@ public enum UVLModelLoader implements ICustomModelLoader
 			{
 				BakedQuad quad = super.makeBakedQuad( posFrom, posTo, face, sprite, facing, modelRotationIn, partRotation, uvLocked, shade );
 
-				Pair<Float, Float> brightness = uvlightmap.get( face );
+				Pair<Float, Float> brightness = UVLModelWrapper.this.uvlightmap.get( face );
 				if( brightness != null )
 				{
 					VertexFormat newFormat = VertexFormats.getFormatWithLightMap( quad.getFormat() );