From 037e1e553f95c8003700d3b43e728d19c5bd35b7 Mon Sep 17 00:00:00 2001 From: Halvor Lyche Strandvoll Date: Wed, 8 Jul 2015 12:34:02 +0200 Subject: [PATCH] Update getPickBlock() to use the new non-deprecated version. --- src/main/java/mekanism/common/block/BlockBounding.java | 4 ++-- src/main/java/mekanism/common/block/BlockCardboardBox.java | 6 +++--- src/main/java/mekanism/common/block/BlockEnergyCube.java | 7 +++---- src/main/java/mekanism/common/block/BlockGasTank.java | 6 +++--- .../mekanism/generators/common/block/BlockGenerator.java | 6 +++--- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/main/java/mekanism/common/block/BlockBounding.java b/src/main/java/mekanism/common/block/BlockBounding.java index 09e6f2d64..cc3eaae8a 100644 --- a/src/main/java/mekanism/common/block/BlockBounding.java +++ b/src/main/java/mekanism/common/block/BlockBounding.java @@ -51,11 +51,11 @@ public class BlockBounding extends Block implements IPeripheralProvider } @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) { try { TileEntityBoundingBlock tileEntity = (TileEntityBoundingBlock)world.getTileEntity(x, y, z); - return world.getBlock(tileEntity.mainX, tileEntity.mainY, tileEntity.mainZ).getPickBlock(target, world, tileEntity.mainX, tileEntity.mainY, tileEntity.mainZ); + return world.getBlock(tileEntity.mainX, tileEntity.mainY, tileEntity.mainZ).getPickBlock(target, world, tileEntity.mainX, tileEntity.mainY, tileEntity.mainZ, player); } catch(Exception e) { return null; } diff --git a/src/main/java/mekanism/common/block/BlockCardboardBox.java b/src/main/java/mekanism/common/block/BlockCardboardBox.java index 5adab71a6..f1d20d359 100644 --- a/src/main/java/mekanism/common/block/BlockCardboardBox.java +++ b/src/main/java/mekanism/common/block/BlockCardboardBox.java @@ -129,7 +129,7 @@ public class BlockCardboardBox extends BlockContainer public ItemStack dismantleBlock(World world, int x, int y, int z, boolean returnBlock) { - ItemStack itemStack = getPickBlock(null, world, x, y, z); + ItemStack itemStack = getPickBlock(null, world, x, y, z, null); world.setBlockToAir(x, y, z); @@ -149,7 +149,7 @@ public class BlockCardboardBox extends BlockContainer } @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) { TileEntityCardboardBox tileEntity = (TileEntityCardboardBox)world.getTileEntity(x, y, z); @@ -176,7 +176,7 @@ public class BlockCardboardBox extends BlockContainer double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; double motionZ = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; - EntityItem entityItem = new EntityItem(world, x + motionX, y + motionY, z + motionZ, getPickBlock(null, world, x, y, z)); + EntityItem entityItem = new EntityItem(world, x + motionX, y + motionY, z + motionZ, getPickBlock(null, world, x, y, z, player)); world.spawnEntityInWorld(entityItem); } diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index d52d06d7a..e87e16cc8 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -204,8 +204,7 @@ public class BlockEnergyCube extends BlockContainer implements IPeripheralProvid double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; double motionZ = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; - EntityItem entityItem = new EntityItem(world, x + motionX, y + motionY, z + motionZ, getPickBlock(null, world, x, y, z)); - + EntityItem entityItem = new EntityItem(world, x + motionX, y + motionY, z + motionZ, getPickBlock(null, world, x, y, z, player)); world.spawnEntityInWorld(entityItem); } @@ -238,7 +237,7 @@ public class BlockEnergyCube extends BlockContainer implements IPeripheralProvid } @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) { TileEntityEnergyCube tileEntity = (TileEntityEnergyCube)world.getTileEntity(x, y, z); ItemStack itemStack = new ItemStack(MekanismBlocks.EnergyCube); @@ -257,7 +256,7 @@ public class BlockEnergyCube extends BlockContainer implements IPeripheralProvid public ItemStack dismantleBlock(World world, int x, int y, int z, boolean returnBlock) { - ItemStack itemStack = getPickBlock(null, world, x, y, z); + ItemStack itemStack = getPickBlock(null, world, x, y, z, null); world.setBlockToAir(x, y, z); diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index e2ca814a1..9c9055f75 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -142,7 +142,7 @@ public class BlockGasTank extends BlockContainer double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; double motionZ = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; - EntityItem entityItem = new EntityItem(world, x + motionX, y + motionY, z + motionZ, getPickBlock(null, world, x, y, z)); + EntityItem entityItem = new EntityItem(world, x + motionX, y + motionY, z + motionZ, getPickBlock(null, world, x, y, z, player)); world.spawnEntityInWorld(entityItem); } @@ -152,7 +152,7 @@ public class BlockGasTank extends BlockContainer public ItemStack dismantleBlock(World world, int x, int y, int z, boolean returnBlock) { - ItemStack itemStack = getPickBlock(null, world, x, y, z); + ItemStack itemStack = getPickBlock(null, world, x, y, z, null); world.setBlockToAir(x, y, z); @@ -208,7 +208,7 @@ public class BlockGasTank extends BlockContainer } @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) { TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(x, y, z); ItemStack itemStack = new ItemStack(MekanismBlocks.GasTank); diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 532134836..9d7c6f255 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -447,7 +447,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IP double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; double motionZ = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; - EntityItem entityItem = new EntityItem(world, x + motionX, y + motionY, z + motionZ, getPickBlock(null, world, x, y, z)); + EntityItem entityItem = new EntityItem(world, x + motionX, y + motionY, z + motionZ, getPickBlock(null, world, x, y, z, player)); world.spawnEntityInWorld(entityItem); } @@ -456,7 +456,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IP } @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) { TileEntityElectricBlock tileEntity = (TileEntityElectricBlock)world.getTileEntity(x, y, z); ItemStack itemStack = new ItemStack(GeneratorsBlocks.Generator, 1, world.getBlockMetadata(x, y, z)); @@ -493,7 +493,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IP public ItemStack dismantleBlock(World world, int x, int y, int z, boolean returnBlock) { - ItemStack itemStack = getPickBlock(null, world, x, y, z); + ItemStack itemStack = getPickBlock(null, world, x, y, z, null); world.setBlockToAir(x, y, z);