From 035dc244ff193e4a63ac0029d9c4e9ce18d9a95e Mon Sep 17 00:00:00 2001 From: yueh Date: Sat, 17 Sep 2016 17:00:10 +0200 Subject: [PATCH] Added missing @Override annotations --- src/api/java/appeng/api/client/BakingPipeline.java | 1 + src/api/java/appeng/api/parts/IPart.java | 1 + src/main/java/appeng/block/AEBaseBlock.java | 1 + src/main/java/appeng/block/misc/BlockLightDetector.java | 1 + src/main/java/appeng/block/misc/BlockQuartzFixture.java | 1 + src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java | 1 + src/main/java/appeng/bootstrap/BlockRendering.java | 1 + src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java | 1 + .../java/appeng/client/render/model/AutoRotatingModel.java | 1 + src/main/java/appeng/client/render/model/UVLModelLoader.java | 1 + src/main/java/appeng/tile/AEBaseTile.java | 1 + src/test/java/appeng/client/render/UVLightmapJsonTest.java | 4 ++++ 12 files changed, 15 insertions(+) diff --git a/src/api/java/appeng/api/client/BakingPipeline.java b/src/api/java/appeng/api/client/BakingPipeline.java index ac6dd153..37418c08 100644 --- a/src/api/java/appeng/api/client/BakingPipeline.java +++ b/src/api/java/appeng/api/client/BakingPipeline.java @@ -51,6 +51,7 @@ public class BakingPipeline implements BakingPipelineElement /** * TODO: fix generics */ + @Override public List pipe( List things, IBakedModel parent, IBlockState state, EnumFacing side, long rand ) { for( BakingPipelineElement pipe : pipeline ) diff --git a/src/api/java/appeng/api/parts/IPart.java b/src/api/java/appeng/api/parts/IPart.java index 5518b105..a5227b9d 100644 --- a/src/api/java/appeng/api/parts/IPart.java +++ b/src/api/java/appeng/api/parts/IPart.java @@ -234,6 +234,7 @@ public interface IPart extends IBoxProvider, ICustomCableConnection * @return 0 - 8, reasonable default 3-4, this controls the cable connection to the node. -1 to render connection * yourself. */ + @Override public float getCableConnectionLength( AECableType cable ); /** diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index 01e0acaf..823bd188 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -409,6 +409,7 @@ public abstract class AEBaseBlock extends Block return this.getUnlocalizedName(); } + @Override public void addInformation( final ItemStack is, final EntityPlayer player, final List lines, final boolean advancedItemTooltips ) { diff --git a/src/main/java/appeng/block/misc/BlockLightDetector.java b/src/main/java/appeng/block/misc/BlockLightDetector.java index ed1f9fca..052faed1 100644 --- a/src/main/java/appeng/block/misc/BlockLightDetector.java +++ b/src/main/java/appeng/block/misc/BlockLightDetector.java @@ -189,6 +189,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl return false; } + @Override @SideOnly( Side.CLIENT) public BlockRenderLayer getBlockLayer() { diff --git a/src/main/java/appeng/block/misc/BlockQuartzFixture.java b/src/main/java/appeng/block/misc/BlockQuartzFixture.java index 95a643da..14fffc64 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzFixture.java +++ b/src/main/java/appeng/block/misc/BlockQuartzFixture.java @@ -214,6 +214,7 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock, return false; } + @Override @SideOnly(Side.CLIENT) public BlockRenderLayer getBlockLayer() { diff --git a/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java b/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java index 40c5bd00..59131167 100644 --- a/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java +++ b/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java @@ -129,6 +129,7 @@ class BlockDefinitionBuilder implements IBlockBuilder return this; } + @Override public BlockDefinitionBuilder rendering( BlockRenderingCustomizer callback ) { if( Platform.isClient() ) diff --git a/src/main/java/appeng/bootstrap/BlockRendering.java b/src/main/java/appeng/bootstrap/BlockRendering.java index 9c027126..a798beeb 100644 --- a/src/main/java/appeng/bootstrap/BlockRendering.java +++ b/src/main/java/appeng/bootstrap/BlockRendering.java @@ -58,6 +58,7 @@ class BlockRendering implements IBlockRendering @SideOnly( Side.CLIENT ) private Map builtInModels = new HashMap<>(); + @Override @SideOnly( Side.CLIENT ) public IBlockRendering modelCustomizer( BiFunction customizer ) { diff --git a/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java b/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java index c43b37d9..0e5fb0ff 100644 --- a/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java +++ b/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java @@ -144,6 +144,7 @@ class ItemDefinitionBuilder implements IItemBuilder callback.customize( itemRendering ); } + @Override public ItemDefinition build() { if( !AEConfig.instance.areFeaturesEnabled( features ) ) diff --git a/src/main/java/appeng/client/render/model/AutoRotatingModel.java b/src/main/java/appeng/client/render/model/AutoRotatingModel.java index e10464ae..5994ed64 100644 --- a/src/main/java/appeng/client/render/model/AutoRotatingModel.java +++ b/src/main/java/appeng/client/render/model/AutoRotatingModel.java @@ -254,6 +254,7 @@ public class AutoRotatingModel implements IBakedModel } } + @Override public void setQuadTint( int tint ) { parent.setQuadTint( tint ); diff --git a/src/main/java/appeng/client/render/model/UVLModelLoader.java b/src/main/java/appeng/client/render/model/UVLModelLoader.java index 14e944c9..69b8fbf4 100644 --- a/src/main/java/appeng/client/render/model/UVLModelLoader.java +++ b/src/main/java/appeng/client/render/model/UVLModelLoader.java @@ -283,6 +283,7 @@ public enum UVLModelLoader implements ICustomModelLoader public class BlockPartFaceOverrideSerializer implements JsonDeserializer { + @Override public BlockPartFace deserialize( JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_ ) throws JsonParseException { JsonObject jsonobject = p_deserialize_1_.getAsJsonObject(); diff --git a/src/main/java/appeng/tile/AEBaseTile.java b/src/main/java/appeng/tile/AEBaseTile.java index 608162c4..ccb13680 100644 --- a/src/main/java/appeng/tile/AEBaseTile.java +++ b/src/main/java/appeng/tile/AEBaseTile.java @@ -194,6 +194,7 @@ public class AEBaseTile extends TileEntity implements ITickable, IOrientable, IC return data; } + @Override public final void update() { for( final AETileEventHandler h : this.getHandlerListFor( TileEventType.TICK ) ) diff --git a/src/test/java/appeng/client/render/UVLightmapJsonTest.java b/src/test/java/appeng/client/render/UVLightmapJsonTest.java index fffe8f3c..729763a2 100644 --- a/src/test/java/appeng/client/render/UVLightmapJsonTest.java +++ b/src/test/java/appeng/client/render/UVLightmapJsonTest.java @@ -39,21 +39,25 @@ public class UVLightmapJsonTest final AxisAlignedBB box = new AxisAlignedBB( 0.25, 0, 7 / 16d, 0.75, 1, 9 / 16d ); + @Override public boolean isFullBlock( IBlockState state ) { return false; } + @Override public boolean isOpaqueCube( IBlockState state ) { return false; } + @Override public AxisAlignedBB getBoundingBox( IBlockState state, IBlockAccess source, BlockPos pos ) { return box; } + @Override public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.CUTOUT;