diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java
index 78500de4..a57686a5 100644
--- a/src/main/java/appeng/block/AEBaseBlock.java
+++ b/src/main/java/appeng/block/AEBaseBlock.java
@@ -691,7 +691,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
 
 	public boolean isFullSize()
 	{
-		return isFullSize;
+		return this.isFullSize;
 	}
 
 	public boolean setFullSize( final boolean isFullSize )
@@ -708,12 +708,12 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
 
 	public Optional<String> getFeatureSubName()
 	{
-		return featureSubName;
+		return this.featureSubName;
 	}
 
 	public boolean isInventory()
 	{
-		return isInventory;
+		return this.isInventory;
 	}
 
 	public void setInventory( final boolean isInventory )
diff --git a/src/main/java/appeng/client/render/ModelGenerator.java b/src/main/java/appeng/client/render/ModelGenerator.java
index 20d6c67d..33c9c904 100644
--- a/src/main/java/appeng/client/render/ModelGenerator.java
+++ b/src/main/java/appeng/client/render/ModelGenerator.java
@@ -628,12 +628,12 @@ public class ModelGenerator
 
 	public IAESprite getOverrideBlockTexture()
 	{
-		return overrideBlockTexture;
+		return this.overrideBlockTexture;
 	}
 
 	public IBlockAccess getBlockAccess()
 	{
-		return blockAccess;
+		return this.blockAccess;
 	}
 
 	public void setBlockAccess( final IBlockAccess blockAccess )
@@ -643,7 +643,7 @@ public class ModelGenerator
 
 	public boolean isRenderAllFaces()
 	{
-		return renderAllFaces;
+		return this.renderAllFaces;
 	}
 
 	public void setRenderAllFaces( final boolean renderAllFaces )
@@ -653,7 +653,7 @@ public class ModelGenerator
 
 	public int getUvRotateBottom()
 	{
-		return uvRotateBottom;
+		return this.uvRotateBottom;
 	}
 
 	public int setUvRotateBottom( final int uvRotateBottom )
@@ -664,7 +664,7 @@ public class ModelGenerator
 
 	public int getUvRotateEast()
 	{
-		return uvRotateEast;
+		return this.uvRotateEast;
 	}
 
 	public int setUvRotateEast( final int uvRotateEast )
@@ -675,7 +675,7 @@ public class ModelGenerator
 
 	public int getUvRotateNorth()
 	{
-		return uvRotateNorth;
+		return this.uvRotateNorth;
 	}
 
 	public int setUvRotateNorth( final int uvRotateNorth )
@@ -686,7 +686,7 @@ public class ModelGenerator
 
 	public int getUvRotateSouth()
 	{
-		return uvRotateSouth;
+		return this.uvRotateSouth;
 	}
 
 	public int setUvRotateSouth( final int uvRotateSouth )
@@ -697,7 +697,7 @@ public class ModelGenerator
 
 	public int getUvRotateTop()
 	{
-		return uvRotateTop;
+		return this.uvRotateTop;
 	}
 
 	public int setUvRotateTop( final int uvRotateTop )
@@ -708,7 +708,7 @@ public class ModelGenerator
 
 	public int getUvRotateWest()
 	{
-		return uvRotateWest;
+		return this.uvRotateWest;
 	}
 
 	public int setUvRotateWest( final int uvRotateWest )
@@ -719,7 +719,7 @@ public class ModelGenerator
 
 	public double getRenderMinX()
 	{
-		return renderMinX;
+		return this.renderMinX;
 	}
 
 	public void setRenderMinX( final double renderMinX )
@@ -729,7 +729,7 @@ public class ModelGenerator
 
 	public double getRenderMinY()
 	{
-		return renderMinY;
+		return this.renderMinY;
 	}
 
 	public void setRenderMinY( final double renderMinY )
@@ -739,7 +739,7 @@ public class ModelGenerator
 
 	public double getRenderMinZ()
 	{
-		return renderMinZ;
+		return this.renderMinZ;
 	}
 
 	public void setRenderMinZ( final double renderMinZ )
@@ -749,7 +749,7 @@ public class ModelGenerator
 
 	public double getRenderMaxX()
 	{
-		return renderMaxX;
+		return this.renderMaxX;
 	}
 
 	public void setRenderMaxX( final double renderMaxX )
@@ -759,7 +759,7 @@ public class ModelGenerator
 
 	public double getRenderMaxY()
 	{
-		return renderMaxY;
+		return this.renderMaxY;
 	}
 
 	public void setRenderMaxY( final double renderMaxY )
@@ -769,7 +769,7 @@ public class ModelGenerator
 
 	public double getRenderMaxZ()
 	{
-		return renderMaxZ;
+		return this.renderMaxZ;
 	}
 
 	public void setRenderMaxZ( final double renderMaxZ )
@@ -779,7 +779,7 @@ public class ModelGenerator
 
 	public boolean isFlipTexture()
 	{
-		return flipTexture;
+		return this.flipTexture;
 	}
 
 	public void setFlipTexture( final boolean flipTexture )
@@ -789,7 +789,7 @@ public class ModelGenerator
 
 	public EnumSet<EnumFacing> getRenderFaces()
 	{
-		return renderFaces;
+		return this.renderFaces;
 	}
 
 	public void setRenderFaces( final EnumSet<EnumFacing> renderFaces )
diff --git a/src/main/java/appeng/client/render/RenderBlocksWorkaround.java b/src/main/java/appeng/client/render/RenderBlocksWorkaround.java
index 957e6f26..f8367716 100644
--- a/src/main/java/appeng/client/render/RenderBlocksWorkaround.java
+++ b/src/main/java/appeng/client/render/RenderBlocksWorkaround.java
@@ -49,7 +49,7 @@ public class RenderBlocksWorkaround extends ModelGenerator
 
 	public EnumSet<EnumFacing> getFaces()
 	{
-		return faces;
+		return this.faces;
 	}
 
 	public void setFaces( final EnumSet<EnumFacing> faces )
diff --git a/src/main/java/appeng/client/render/SMFace.java b/src/main/java/appeng/client/render/SMFace.java
index 050dc9df..292377b6 100644
--- a/src/main/java/appeng/client/render/SMFace.java
+++ b/src/main/java/appeng/client/render/SMFace.java
@@ -42,32 +42,32 @@ public class SMFace
 
 	public int getColor()
 	{
-		return color;
+		return this.color;
 	}
 
 	public EnumFacing getFace()
 	{
-		return face;
+		return this.face;
 	}
 
 	public Vector3f getFrom()
 	{
-		return from;
+		return this.from;
 	}
 
 	public Vector3f getTo()
 	{
-		return to;
+		return this.to;
 	}
 
 	public TextureAtlasSprite getSpite()
 	{
-		return spite;
+		return this.spite;
 	}
 
 	public boolean isEdge()
 	{
-		return isEdge;
+		return this.isEdge;
 	}
 
 }
diff --git a/src/main/java/appeng/crafting/CraftingLinkNexus.java b/src/main/java/appeng/crafting/CraftingLinkNexus.java
index a65d5225..1f8eb8a7 100644
--- a/src/main/java/appeng/crafting/CraftingLinkNexus.java
+++ b/src/main/java/appeng/crafting/CraftingLinkNexus.java
@@ -164,7 +164,7 @@ public class CraftingLinkNexus
 
 	public CraftingLink getRequest()
 	{
-		return req;
+		return this.req;
 	}
 
 	public void setRequest( final CraftingLink req )