diff --git a/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java b/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java
index e9734217f..c8a37aca6 100644
--- a/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java
+++ b/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java
@@ -90,6 +90,7 @@ public class BlockMolecularAssembler extends AEBaseTileBlock
 		return layer == BlockRenderLayer.TRANSLUCENT;
 	}
 
+	@Override
 	public boolean isFullCube( IBlockState state )
 	{
 		return false;
diff --git a/src/main/java/appeng/bootstrap/components/ModelRegComponent.java b/src/main/java/appeng/bootstrap/components/ModelRegComponent.java
index 3bbad4332..4943c7675 100644
--- a/src/main/java/appeng/bootstrap/components/ModelRegComponent.java
+++ b/src/main/java/appeng/bootstrap/components/ModelRegComponent.java
@@ -15,6 +15,7 @@ import appeng.bootstrap.IBootstrapComponent;
 public interface ModelRegComponent extends IBootstrapComponent
 {
 
+	@Override
 	void modelReg( Side side );
 
 }
diff --git a/src/main/java/appeng/core/api/definitions/ApiParts.java b/src/main/java/appeng/core/api/definitions/ApiParts.java
index b5f31289a..61868d4ae 100644
--- a/src/main/java/appeng/core/api/definitions/ApiParts.java
+++ b/src/main/java/appeng/core/api/definitions/ApiParts.java
@@ -301,6 +301,7 @@ public final class ApiParts implements IParts
 		return this.p2PTunnelRF;
 	}
 
+	@Override
 	public IItemDefinition p2PTunnelFE()
 	{
 		return this.p2PTunnelFE;
diff --git a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java
index d07c7e58d..5abada2be 100644
--- a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java
+++ b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java
@@ -187,6 +187,7 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry
 
 	}
 
+	@Override
 	public void addNewAttunement( @Nonnull final String modId, @Nullable final TunnelType type )
 	{
 		if( type == null || modId == null )
diff --git a/src/main/java/appeng/decorative/slab/BlockSlabCommon.java b/src/main/java/appeng/decorative/slab/BlockSlabCommon.java
index 71c38ebf2..d067f5efb 100644
--- a/src/main/java/appeng/decorative/slab/BlockSlabCommon.java
+++ b/src/main/java/appeng/decorative/slab/BlockSlabCommon.java
@@ -45,6 +45,7 @@ public abstract class BlockSlabCommon extends BlockSlab
 	/**
 	 * Convert the given metadata into a BlockState for this Block
 	 */
+	@Override
 	public IBlockState getStateFromMeta( int meta )
 	{
 		IBlockState iblockstate = this.getDefaultState().withProperty( VARIANT, Variant.DEFAULT );
@@ -60,6 +61,7 @@ public abstract class BlockSlabCommon extends BlockSlab
 	/**
 	 * Convert the BlockState into the correct metadata value
 	 */
+	@Override
 	public int getMetaFromState( IBlockState state )
 	{
 		int i = 0;
@@ -72,17 +74,20 @@ public abstract class BlockSlabCommon extends BlockSlab
 		return i;
 	}
 
+	@Override
 	protected BlockStateContainer createBlockState()
 	{
 		return this.isDouble() ? new BlockStateContainer( this, VARIANT ) : new BlockStateContainer( this, HALF, VARIANT );
 	}
 
+	@Override
 	@Nullable
 	public Item getItemDropped( IBlockState state, Random rand, int fortune )
 	{
 		return Item.getItemFromBlock( this );
 	}
 
+	@Override
 	public ItemStack getItem( World worldIn, BlockPos pos, IBlockState state )
 	{
 		return new ItemStack( this, 1, 0 );
@@ -117,17 +122,20 @@ public abstract class BlockSlabCommon extends BlockSlab
 			this.halfSlabBlock = halfSlabBlock;
 		}
 
+		@Override
 		public boolean isDouble()
 		{
 			return true;
 		}
 
+		@Override
 		@Nullable
 		public Item getItemDropped( IBlockState state, Random rand, int fortune )
 		{
 			return Item.getItemFromBlock( this.halfSlabBlock );
 		}
 
+		@Override
 		public ItemStack getItem( World worldIn, BlockPos pos, IBlockState state )
 		{
 			return new ItemStack( this.halfSlabBlock, 1, 0 );
@@ -143,6 +151,7 @@ public abstract class BlockSlabCommon extends BlockSlab
 			super( block );
 		}
 
+		@Override
 		public boolean isDouble()
 		{
 			return false;
@@ -153,6 +162,7 @@ public abstract class BlockSlabCommon extends BlockSlab
 	{
 		DEFAULT;
 
+		@Override
 		public String getName()
 		{
 			return "default";
diff --git a/src/main/java/appeng/integration/modules/jei/GrinderRecipeHandler.java b/src/main/java/appeng/integration/modules/jei/GrinderRecipeHandler.java
index 4d6e3b8ec..96c783019 100644
--- a/src/main/java/appeng/integration/modules/jei/GrinderRecipeHandler.java
+++ b/src/main/java/appeng/integration/modules/jei/GrinderRecipeHandler.java
@@ -34,6 +34,7 @@ class GrinderRecipeHandler implements IRecipeHandler<IGrinderRecipe>
 		return IGrinderRecipe.class;
 	}
 
+	@Override
 	public String getRecipeCategoryUid( IGrinderRecipe recipe )
 	{
 		return GrinderRecipeCategory.UID;
diff --git a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java
index cf8ce6cc3..5869b4406 100644
--- a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java
+++ b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java
@@ -52,6 +52,7 @@ public class AppEngInternalAEInventory implements IInventory, Iterable<ItemStack
 		this.inv = new IAEItemStack[s];
 	}
 
+	@Override
 	public boolean isEmpty()
 	{
 		for( int x = 0; x < this.size; x++ )
diff --git a/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java b/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java
index 2504c3b0f..e67d9d077 100644
--- a/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java
+++ b/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java
@@ -48,6 +48,7 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
 		this.inv = new ItemStack[size];
 	}
 
+	@Override
 	public boolean isEmpty()
 	{
 		for( int x = 0; x < this.size; x++ )