From 10678d64697bc82a08644595282d9c9939d9da61 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 15 Jan 2015 22:50:33 -0800 Subject: [PATCH] Fix deprecation warnings from Forge --- .../java/forestry/arboriculture/gadgets/BlockArbStairs.java | 4 ++-- .../java/forestry/arboriculture/gadgets/BlockSapling.java | 2 +- src/main/java/forestry/farming/gadgets/BlockFarm.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java b/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java index c75d86afe..79e379ba1 100755 --- a/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java @@ -107,8 +107,8 @@ public class BlockArbStairs extends BlockStairs { } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - ItemStack itemStack = super.getPickBlock(target, world, x, y, z); + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) { + ItemStack itemStack = super.getPickBlock(target, world, x, y, z, player); NBTTagCompound stairsNBT = getTagCompoundForStairs(world, x, y, z); itemStack.setTagCompound(stairsNBT); return itemStack; diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockSapling.java b/src/main/java/forestry/arboriculture/gadgets/BlockSapling.java index cf5cc876f..2b043f5ae 100755 --- a/src/main/java/forestry/arboriculture/gadgets/BlockSapling.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockSapling.java @@ -145,7 +145,7 @@ public class BlockSapling extends BlockTreeContainer { } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) { TileSapling sapling = getSaplingTile(world, x, y, z); if (sapling == null || sapling.getTree() == null) return null; diff --git a/src/main/java/forestry/farming/gadgets/BlockFarm.java b/src/main/java/forestry/farming/gadgets/BlockFarm.java index 2028e48a2..270f55bd1 100755 --- a/src/main/java/forestry/farming/gadgets/BlockFarm.java +++ b/src/main/java/forestry/farming/gadgets/BlockFarm.java @@ -61,10 +61,10 @@ public class BlockFarm extends BlockStructure { } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) { ArrayList drops = getDrops(world, x, y, z, 0, 0); if (drops.isEmpty()) - return super.getPickBlock(target, world, x, y, z); + return super.getPickBlock(target, world, x, y, z, player); return drops.get(0); }