add Deprecated annotation to methods overriding a deprecated method

mekanism · Mar 12, 2019 · b2f8a3a · b2f8a3a
1 parent c1aaf24
commit b2f8a3a
Show file tree

Hide file tree

Showing 19 changed files with 99 additions and 8 deletions.
diff --git a/src/main/java/mekanism/client/jei/GasStackHelper.java b/src/main/java/mekanism/client/jei/GasStackHelper.java
@@ -70,6 +70,7 @@ public String getResourceId(GasStack ingredient)
 		return ingredient.getGas().getUnlocalizedName();
 	}
 
+	@Deprecated
 	@Override
 	public ItemStack cheatIngredient(GasStack ingredient, boolean fullStack)
 	{

diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java
@@ -499,6 +499,7 @@ public TextureAtlasSprite getParticleTexture()
 		return baseModel.getParticleTexture();
 	}
 
+	@Deprecated
 	@Override
 	public ItemCameraTransforms getItemCameraTransforms()
 	{

diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java
@@ -135,6 +135,7 @@ public BlockStateContainer createBlockState()
 		return new BlockStateBasic(this, getTypeProperty());
 	}
 
+	@Deprecated
 	@Override
 	public IBlockState getStateFromMeta(int meta)
 	{
@@ -150,6 +151,7 @@ public int getMetaFromState(IBlockState state)
 		return type.meta;
 	}
 
+	@Deprecated
 	@Override
 	public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
 	{
@@ -201,6 +203,7 @@ public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, Block
 		return state;
 	}
 
+	@Deprecated
 	@Override
 	public void neighborChanged(IBlockState state, World world, BlockPos pos, Block neighborBlock, BlockPos fromPos)
 	{
@@ -524,6 +527,7 @@ else if(tile instanceof IStructuralMultiblock)
 		return false;
 	}
 
+	@Deprecated
 	@Override
 	public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side)
 	{
@@ -656,18 +660,21 @@ else if(itemStack.getCount() > 1 && player.inventory.addItemStackToInventory(cop
 		return false;
 	}
 
+	@Deprecated
 	@Override
 	public boolean isOpaqueCube(IBlockState state)
 	{
 		return false;
 	}
 
+	@Deprecated
 	@Override
 	public boolean isFullCube(IBlockState state)
 	{
 		return false;
 	}
 
+	@Deprecated
 	@Override
 	public EnumBlockRenderType getRenderType(IBlockState state)
 	{
@@ -903,6 +910,7 @@ public ItemStack dismantleBlock(IBlockState state, World world, BlockPos pos, bo
 		return itemStack;
 	}
 
+	@Deprecated
 	@Override
 	@SideOnly(Side.CLIENT)
 	public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side)

diff --git a/src/main/java/mekanism/common/block/BlockBounding.java b/src/main/java/mekanism/common/block/BlockBounding.java
@@ -35,6 +35,7 @@ public BlockStateContainer createBlockState()
 		return new BlockStateBounding(this);
 	}
 
+	@Deprecated
 	@Override
 	public IBlockState getStateFromMeta(int meta)
 	{
@@ -92,6 +93,7 @@ public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, Ent
 		}
 	}
 
+	@Deprecated
 	@Override
 	public void neighborChanged(IBlockState state, World world, BlockPos pos, Block neighborBlock, BlockPos neighborPos)
 	{
@@ -103,6 +105,7 @@ public void neighborChanged(IBlockState state, World world, BlockPos pos, Block
 		} catch(Exception e) {}
 	}
 
+	@Deprecated
 	@Override
 	public float getPlayerRelativeBlockHardness(IBlockState state, EntityPlayer player, World world, BlockPos pos)
 	{
@@ -127,18 +130,21 @@ public Item getItemDropped(IBlockState state, Random random, int fortune)
 		return null;
 	}
 
+	@Deprecated
 	@Override
 	public EnumBlockRenderType getRenderType(IBlockState state)
 	{
 		return EnumBlockRenderType.INVISIBLE;
 	}
 
+	@Deprecated
 	@Override
 	public boolean isOpaqueCube(IBlockState state)
 	{
 		return false;
 	}
 
+	@Deprecated
 	@Override
 	public boolean isFullCube(IBlockState state)
 	{

diff --git a/src/main/java/mekanism/common/block/BlockCardboardBox.java b/src/main/java/mekanism/common/block/BlockCardboardBox.java
@@ -52,6 +52,7 @@ protected BlockStateContainer createBlockState()
 		return new BlockStateCardboardBox(this);
 	}
 
+	@Deprecated
 	@Override
 	public IBlockState getStateFromMeta(int meta)
 	{

diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java
@@ -78,12 +78,14 @@ public int getMetaFromState(IBlockState state)
 		return 0;
 	}
 
+	@Deprecated
 	@Override
 	public IBlockState getStateFromMeta(int meta)
 	{
 		return getDefaultState();
 	}
 
+	@Deprecated
 	@Override
 	public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
 	{
@@ -107,6 +109,7 @@ public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, Block
 		return state;
 	}
 
+	@Deprecated
 	@Override
 	public void neighborChanged(IBlockState state, World world, BlockPos pos, Block neighborBlock, BlockPos neighborPos)
 	{
@@ -178,6 +181,7 @@ public void getSubBlocks(CreativeTabs creativetabs, NonNullList<ItemStack> list)
 		}
 	}
 
+	@Deprecated
 	@Override
 	public float getPlayerRelativeBlockHardness(IBlockState state, EntityPlayer player, World world, BlockPos pos)
 	{
@@ -272,6 +276,7 @@ public TileEntity createNewTileEntity(World world, int meta)
 		return new TileEntityEnergyCube();
 	}
 
+	@Deprecated
 	@Override
 	public boolean isOpaqueCube(IBlockState state)
 	{
@@ -347,19 +352,22 @@ public ItemStack dismantleBlock(IBlockState state, World world, BlockPos pos, bo
 		return itemStack;
 	}
 
+	@Deprecated
 	@Override
 	public boolean hasComparatorInputOverride(IBlockState state)
 	{
 		return true;
 	}
 
+	@Deprecated
 	@Override
 	public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos)
 	{
 		TileEntityEnergyCube tileEntity = (TileEntityEnergyCube)world.getTileEntity(pos);
 		return tileEntity.getRedstoneLevel();
 	}
 
+	@Deprecated
 	@Override
 	public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side)
 	{

diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java
@@ -61,6 +61,7 @@ protected BlockStateContainer createBlockState()
 		return new BlockStateGasTank(this);
 	}
 
+	@Deprecated
 	@Override
 	public IBlockState getStateFromMeta(int meta)
 	{
@@ -73,6 +74,7 @@ public int getMetaFromState(IBlockState state)
 		return 0;
 	}
 
+	@Deprecated
 	@Override
 	public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
 	{
@@ -116,6 +118,7 @@ public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, Entity
 		tileEntity.redstone = world.isBlockIndirectlyGettingPowered(pos) > 0;
 	}
 
+	@Deprecated
 	@Override
 	public void neighborChanged(IBlockState state, World world, BlockPos pos, Block neighborBlock, BlockPos neighborPos)
 	{
@@ -130,6 +133,7 @@ public void neighborChanged(IBlockState state, World world, BlockPos pos, Block
 		}
 	}
 
+	@Deprecated
 	@Override
 	public float getPlayerRelativeBlockHardness(IBlockState state, EntityPlayer player, World world, BlockPos pos)
 	{
@@ -255,6 +259,7 @@ public Item getItemDropped(IBlockState state, Random random, int fortune)
 		return null;
 	}
 
+	@Deprecated
 	@Override
 	public boolean isOpaqueCube(IBlockState state)
 	{
@@ -267,6 +272,7 @@ public EnumBlockRenderType getRenderType(IBlockState state)
 		return EnumBlockRenderType.MODEL;
 	}
 
+	@Deprecated
 	@Override
 	public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos)
 	{
@@ -321,12 +327,14 @@ public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World wo
 		return itemStack;
 	}
 
+	@Deprecated
 	@Override
 	public boolean hasComparatorInputOverride(IBlockState state)
 	{
 		return true;
 	}
 
+	@Deprecated
 	@Override
 	public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos)
 	{
@@ -375,12 +383,14 @@ public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis)
 		return false;
 	}
 
+	@Deprecated
 	@Override
 	public boolean isFullBlock(IBlockState state) 
 	{
 		return false;
 	}
 
+	@Deprecated
 	@Override
 	public boolean isFullCube(IBlockState state) 
 	{

diff --git a/src/main/java/mekanism/common/block/BlockGlowPanel.java b/src/main/java/mekanism/common/block/BlockGlowPanel.java
@@ -70,6 +70,7 @@ public BlockStateContainer createBlockState()
 		return new BlockStateGlowPanel(this);
 	}
 
+	@Deprecated
 	@Override
 	public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos)
 	{
@@ -96,6 +97,7 @@ public IBlockState getExtendedState(IBlockState state, IBlockAccess world, Block
 		return state;
 	}
 
+	@Deprecated
 	@Override
 	public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos neighbor)
 	{
@@ -136,6 +138,7 @@ public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor
 		}
 	}
 
+	@Deprecated
 	@Override
 	public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos)
 	{
@@ -227,31 +230,36 @@ public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer)
 		return true;
 	}
 
+	@Deprecated
 	@Override
     public EnumBlockRenderType getRenderType(IBlockState state) 
 	{
         return EnumBlockRenderType.MODEL;
     }
 
-    @Override
+    @Deprecated
+	@Override
     public boolean isBlockNormalCube(IBlockState state) 
     {
         return false;
     }
 
-    @Override
+    @Deprecated
+	@Override
     public boolean isOpaqueCube(IBlockState state) 
     {
         return false;
     }
 
-    @Override
+    @Deprecated
+	@Override
     public boolean isFullCube(IBlockState state)
     {
         return false;
     }
 
-    @Override
+    @Deprecated
+	@Override
     public boolean isFullBlock(IBlockState state)
     {
         return false;