From f3e983b6ca300319cecec2a6266ef9ab0dcbf5bc Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 10 Sep 2016 13:57:56 +0200 Subject: [PATCH] Fix deprecation warnings --- .../java/refinedstorage/api/storage/CompareUtils.java | 2 +- .../refinedstorage/apiimpl/storage/fluid/FluidUtils.java | 1 + src/main/java/refinedstorage/block/BlockBase.java | 2 ++ src/main/java/refinedstorage/block/BlockCable.java | 1 + src/main/java/refinedstorage/block/BlockController.java | 1 + src/main/java/refinedstorage/block/BlockDetector.java | 6 ++++++ src/main/java/refinedstorage/block/BlockSolderer.java | 3 +++ .../refinedstorage/block/BlockWirelessTransmitter.java | 4 ++++ src/main/java/refinedstorage/tile/TileBase.java | 1 + src/main/java/refinedstorage/tile/TileConstructor.java | 8 ++++++-- src/main/java/refinedstorage/tile/TileDestructor.java | 2 ++ 11 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/main/java/refinedstorage/api/storage/CompareUtils.java b/src/main/java/refinedstorage/api/storage/CompareUtils.java index f0474f41f..deaf30d03 100755 --- a/src/main/java/refinedstorage/api/storage/CompareUtils.java +++ b/src/main/java/refinedstorage/api/storage/CompareUtils.java @@ -105,7 +105,7 @@ public final class CompareUtils { } if ((flags & COMPARE_NBT) == COMPARE_NBT) { - if (left.tag != null && !left.tag.equals(right)) { + if (left.tag != null && !left.tag.equals(right.tag)) { return false; } } diff --git a/src/main/java/refinedstorage/apiimpl/storage/fluid/FluidUtils.java b/src/main/java/refinedstorage/apiimpl/storage/fluid/FluidUtils.java index 0fe84dde9..a8aa79caa 100755 --- a/src/main/java/refinedstorage/apiimpl/storage/fluid/FluidUtils.java +++ b/src/main/java/refinedstorage/apiimpl/storage/fluid/FluidUtils.java @@ -24,6 +24,7 @@ public final class FluidUtils { return stack == null ? null : stack.copy(); } + @SuppressWarnings("deprecation") public static FluidStack getFluidFromStack(ItemStack stack, boolean simulate) { if (stack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null)) { return stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null).drain(Fluid.BUCKET_VOLUME, !simulate); diff --git a/src/main/java/refinedstorage/block/BlockBase.java b/src/main/java/refinedstorage/block/BlockBase.java index c8af29e6b..74fcab142 100755 --- a/src/main/java/refinedstorage/block/BlockBase.java +++ b/src/main/java/refinedstorage/block/BlockBase.java @@ -59,6 +59,7 @@ public abstract class BlockBase extends Block { } @Override + @SuppressWarnings("deprecation") public IBlockState getStateFromMeta(int meta) { return getDefaultState(); } @@ -69,6 +70,7 @@ public abstract class BlockBase extends Block { } @Override + @SuppressWarnings("deprecation") public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { if (getPlacementType() != null) { return state.withProperty(DIRECTION, ((TileBase) world.getTileEntity(pos)).getDirection()); diff --git a/src/main/java/refinedstorage/block/BlockCable.java b/src/main/java/refinedstorage/block/BlockCable.java index 1febb9233..9fc84fd31 100755 --- a/src/main/java/refinedstorage/block/BlockCable.java +++ b/src/main/java/refinedstorage/block/BlockCable.java @@ -117,6 +117,7 @@ public class BlockCable extends BlockCoverable { } @Override + @SuppressWarnings("deprecation") public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { state = super.getActualState(state, world, pos) .withProperty(NORTH, hasConnectionWith(world, pos, EnumFacing.NORTH)) diff --git a/src/main/java/refinedstorage/block/BlockController.java b/src/main/java/refinedstorage/block/BlockController.java index 84bc7cd60..c64347317 100755 --- a/src/main/java/refinedstorage/block/BlockController.java +++ b/src/main/java/refinedstorage/block/BlockController.java @@ -113,6 +113,7 @@ public class BlockController extends BlockBase { } @Override + @SuppressWarnings("deprecation") public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) { super.neighborChanged(state, world, pos, block); diff --git a/src/main/java/refinedstorage/block/BlockDetector.java b/src/main/java/refinedstorage/block/BlockDetector.java index 2b40487d9..cb6b634f6 100755 --- a/src/main/java/refinedstorage/block/BlockDetector.java +++ b/src/main/java/refinedstorage/block/BlockDetector.java @@ -40,6 +40,7 @@ public class BlockDetector extends BlockNode { } @Override + @SuppressWarnings("deprecation") public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { return AABB_DETECTOR; } @@ -50,16 +51,19 @@ public class BlockDetector extends BlockNode { } @Override + @SuppressWarnings("deprecation") public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { return ((TileDetector) world.getTileEntity(pos)).isPowered() ? 15 : 0; } @Override + @SuppressWarnings("deprecation") public int getStrongPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { return getWeakPower(state, world, pos, side); } @Override + @SuppressWarnings("deprecation") public boolean canProvidePower(IBlockState state) { return true; } @@ -74,11 +78,13 @@ public class BlockDetector extends BlockNode { } @Override + @SuppressWarnings("deprecation") public boolean isOpaqueCube(IBlockState state) { return false; } @Override + @SuppressWarnings("deprecation") public boolean isFullCube(IBlockState state) { return false; } diff --git a/src/main/java/refinedstorage/block/BlockSolderer.java b/src/main/java/refinedstorage/block/BlockSolderer.java index a1508e167..d404d3f56 100755 --- a/src/main/java/refinedstorage/block/BlockSolderer.java +++ b/src/main/java/refinedstorage/block/BlockSolderer.java @@ -40,6 +40,7 @@ public class BlockSolderer extends BlockNode { } @Override + @SuppressWarnings("deprecation") public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { return AABB_SOLDERER; } @@ -58,11 +59,13 @@ public class BlockSolderer extends BlockNode { } @Override + @SuppressWarnings("deprecation") public boolean isOpaqueCube(IBlockState state) { return false; } @Override + @SuppressWarnings("deprecation") public boolean isFullCube(IBlockState state) { return false; } diff --git a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java b/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java index 32af66cba..fe9134b8b 100755 --- a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java +++ b/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java @@ -40,6 +40,7 @@ public class BlockWirelessTransmitter extends BlockNode { } @Override + @SuppressWarnings("deprecation") public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) { if (!canPlaceBlockAt(world, pos) && world.getBlockState(pos).getBlock() == this) { dropBlockAsItem(world, pos, state, 0); @@ -49,16 +50,19 @@ public class BlockWirelessTransmitter extends BlockNode { } @Override + @SuppressWarnings("deprecation") public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return WIRELESS_TRANSMITTER_AABB; } @Override + @SuppressWarnings("deprecation") public boolean isOpaqueCube(IBlockState state) { return false; } @Override + @SuppressWarnings("deprecation") public boolean isFullCube(IBlockState state) { return false; } diff --git a/src/main/java/refinedstorage/tile/TileBase.java b/src/main/java/refinedstorage/tile/TileBase.java index fd7d853c8..c15170411 100755 --- a/src/main/java/refinedstorage/tile/TileBase.java +++ b/src/main/java/refinedstorage/tile/TileBase.java @@ -221,6 +221,7 @@ public abstract class TileBase extends TileEntity implements ITickable { return handler; } + @SuppressWarnings("deprecation") protected IFluidHandler getFluidHandler(TileEntity tile, EnumFacing side) { if (tile == null) { return null; diff --git a/src/main/java/refinedstorage/tile/TileConstructor.java b/src/main/java/refinedstorage/tile/TileConstructor.java index 8bbe6c04f..9126ed796 100755 --- a/src/main/java/refinedstorage/tile/TileConstructor.java +++ b/src/main/java/refinedstorage/tile/TileConstructor.java @@ -77,9 +77,13 @@ public class TileConstructor extends TileMultipartNode implements IComparable, I ItemStack took = network.extractItem(itemFilters.getStackInSlot(0), 1, compare); if (took != null) { - worldObj.setBlockState(front, block.getBlock().getStateFromMeta(took.getMetadata()), 1 | 2); + @SuppressWarnings("deprecation") + IBlockState state = block.getBlock().getStateFromMeta(took.getMetadata()); + + worldObj.setBlockState(front, state, 1 | 2); + // From ItemBlock.onItemUse - SoundType blockSound = block.getBlock().getSoundType(); + SoundType blockSound = block.getBlock().getSoundType(state, worldObj, pos, null); worldObj.playSound(null, front, blockSound.getPlaceSound(), SoundCategory.BLOCKS, (blockSound.getVolume() + 1.0F) / 2.0F, blockSound.getPitch() * 0.8F); } else if (upgrades.hasUpgrade(ItemUpgrade.TYPE_CRAFTING)) { ItemStack craft = itemFilters.getStackInSlot(0); diff --git a/src/main/java/refinedstorage/tile/TileDestructor.java b/src/main/java/refinedstorage/tile/TileDestructor.java index 5c99e96d0..f7e456626 100755 --- a/src/main/java/refinedstorage/tile/TileDestructor.java +++ b/src/main/java/refinedstorage/tile/TileDestructor.java @@ -73,6 +73,8 @@ public class TileDestructor extends TileMultipartNode implements IComparable, IF BlockPos front = pos.offset(getDirection()); IBlockState frontBlockState = worldObj.getBlockState(front); + + @SuppressWarnings("deprecation") ItemStack frontStack = frontBlockState.getBlock().getItem(worldObj, front, frontBlockState); if (frontStack != null) {