Code cleanup

Added missing this, annotations, etc.

src/main/java/appeng/core/Registration.java

@@ -349,7 +349,7 @@ final class Registration
 		final IBlocks blocks = definitions.blocks();
 		final IItems items = definitions.items();
 
-		registerSpatialDimension();
+		this.registerSpatialDimension();
 
 		// default settings..
 		( (P2PTunnelRegistry) registries.p2pTunnel() ).configure();
@@ -562,7 +562,7 @@ final class Registration
 		CriterionTrigggerRegistry()
 		{
 			this.method = ReflectionHelper.findMethod( CriteriaTriggers.class, "register", "func_192118_a", ICriterionTrigger.class );
-			method.setAccessible( true );
+			this.method.setAccessible( true );
 		}
 
 		@Override
@@ -570,7 +570,7 @@ final class Registration
 		{
 			try
 			{
-				method.invoke( null, trigger );
+				this.method.invoke( null, trigger );
 			}
 			catch( IllegalAccessException | IllegalArgumentException | InvocationTargetException e )
 			{

src/main/java/appeng/core/api/definitions/ApiBlocks.java

@@ -1067,6 +1067,6 @@ public final class ApiBlocks implements IBlocks
 
 	public IBlockDefinition energyGenerator()
 	{
-		return energyGenerator;
+		return this.energyGenerator;
 	}
 }

src/main/java/appeng/core/features/registries/grinder/GrinderRecipeManager.java

@@ -372,7 +372,7 @@ public final class GrinderRecipeManager implements IGrinderRegistry, IOreListene
 			{
 				return true;
 			}
-			if( obj == null || getClass() != obj.getClass() )
+			if( obj == null || this.getClass() != obj.getClass() )
 			{
 				return false;
 			}

src/main/java/appeng/core/stats/AdvancementTriggers.java

@@ -31,10 +31,10 @@ public class AdvancementTriggers
 
 	public AdvancementTriggers( ICriterionTriggerRegistry registry )
 	{
-		registry.register( networkApprentice );
-		registry.register( networkEngineer );
-		registry.register( networkAdmin );
-		registry.register( spatialExplorer );
+		registry.register( this.networkApprentice );
+		registry.register( this.networkEngineer );
+		registry.register( this.networkAdmin );
+		registry.register( this.spatialExplorer );
 	}
 
 	public IAdvancementTrigger getNetworkApprentice()

src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java

@@ -46,13 +46,13 @@ public class AppEngAdvancementTrigger implements ICriterionTrigger<AppEngAdvance
 	public AppEngAdvancementTrigger( String parString )
 	{
 		super();
-		ID = new ResourceLocation( AppEng.MOD_ID, parString );
+		this.ID = new ResourceLocation( AppEng.MOD_ID, parString );
 	}
 
 	@Override
 	public ResourceLocation getId()
 	{
-		return ID;
+		return this.ID;
 	}
 
 	@Override
@@ -97,6 +97,7 @@ public class AppEngAdvancementTrigger implements ICriterionTrigger<AppEngAdvance
 		return new AppEngAdvancementTrigger.Instance( this.getId() );
 	}
 
+	@Override
 	public void trigger( EntityPlayerMP parPlayer )
 	{
 		AppEngAdvancementTrigger.Listeners l = this.listeners.get( parPlayer.getAdvancements() );

src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java

@@ -150,7 +150,7 @@ public class PacketJEIRecipe extends AppEngPacket
 				if( !currentItem.isEmpty() )
 				{
 					// already the correct item?
-					ItemStack newItem = canUseInSlot( x, currentItem );
+					ItemStack newItem = this.canUseInSlot( x, currentItem );
 
 					// put away old item
 					if( newItem != currentItem && security.hasPermission( player, SecurityPermissions.INJECT ) )

src/main/java/appeng/core/worlddata/SpatialDimensionManager.java

@@ -73,7 +73,7 @@ public class SpatialDimensionManager implements ISpatialDimension, ICapabilitySe
 	@Override
 	public void deleteCellDimension( int cellStorageId )
 	{
-		StorageCellData removed = spatialData.remove( cellStorageId );
+		StorageCellData removed = this.spatialData.remove( cellStorageId );
 		if( removed != null )
 		{
 			this.clearCellArea( cellStorageId, removed );
@@ -102,7 +102,7 @@ public class SpatialDimensionManager implements ISpatialDimension, ICapabilitySe
 	{
 		if( this.isCellDimension( cellStorageId ) )
 		{
-			return getBlockPosFromId( cellStorageId );
+			return this.getBlockPosFromId( cellStorageId );
 		}
 		return null;
 	}
@@ -228,18 +228,18 @@ public class SpatialDimensionManager implements ISpatialDimension, ICapabilitySe
 		public NBTTagCompound serializeNBT()
 		{
 			NBTTagCompound nbt = new NBTTagCompound();
-			nbt.setInteger( NBT_DIM_X_KEY, contentDimension.getX() );
-			nbt.setInteger( NBT_DIM_Y_KEY, contentDimension.getY() );
-			nbt.setInteger( NBT_DIM_Z_KEY, contentDimension.getZ() );
-			nbt.setInteger( NBT_OWNER_KEY, owner );
+			nbt.setInteger( NBT_DIM_X_KEY, this.contentDimension.getX() );
+			nbt.setInteger( NBT_DIM_Y_KEY, this.contentDimension.getY() );
+			nbt.setInteger( NBT_DIM_Z_KEY, this.contentDimension.getZ() );
+			nbt.setInteger( NBT_OWNER_KEY, this.owner );
 			return nbt;
 		}
 
 		@Override
 		public void deserializeNBT( NBTTagCompound nbt )
 		{
-			contentDimension = new BlockPos( nbt.getInteger( NBT_DIM_X_KEY ), nbt.getInteger( NBT_DIM_Y_KEY ), nbt.getInteger( NBT_DIM_Z_KEY ) );
-			owner = nbt.getInteger( NBT_OWNER_KEY );
+			this.contentDimension = new BlockPos( nbt.getInteger( NBT_DIM_X_KEY ), nbt.getInteger( NBT_DIM_Y_KEY ), nbt.getInteger( NBT_DIM_Z_KEY ) );
+			this.owner = nbt.getInteger( NBT_OWNER_KEY );
 		}
 	}
 }