diff --git a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java index 02a8e5f..68b7e11 100644 --- a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java +++ b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java @@ -1,12 +1,15 @@ package fox.spiteful.avaritia; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import fox.spiteful.avaritia.items.LudicrousItems; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.PlayerEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; import org.apache.logging.log4j.Level; import java.util.Random; @@ -16,21 +19,17 @@ public class LudicrousEvents { private Random randy = new Random(); @SubscribeEvent - public void breakDamnit(PlayerEvent.HarvestCheck event){ - if(event.block == Blocks.bedrock) - event.success = true; - } - - @SubscribeEvent - public void onPlayerBreaking(PlayerEvent.BreakSpeed event) { - Lumberjack.log(Level.INFO, event.block.getLocalizedName()); - if(event.x == -1 || event.y == -1 || event.z == -1 || event.entityPlayer.worldObj.isRemote) + public void onPlayerMine(PlayerInteractEvent event) { + //Lumberjack.log(Level.INFO, event.block.getLocalizedName()); + if(event.face == -1 || event.world.isRemote || event.action != PlayerInteractEvent.Action.LEFT_CLICK_BLOCK || event.entityPlayer.getHeldItem() == null) return; - if(event.block.getBlockHardness(event.entityPlayer.worldObj, event.x, event.y, event.z) <= -1 && - (event.block.getMaterial() == Material.rock || event.block.getMaterial() == Material.iron)){ - dropItem(new ItemStack(event.block, 1, event.metadata), event.entityPlayer.worldObj, event.x, event.y, event.z); + Block block = event.world.getBlock(event.x, event.y, event.z); + if(block.getBlockHardness(event.entityPlayer.worldObj, event.x, event.y, event.z) <= -1 && + event.entityPlayer.getHeldItem().getItem() == LudicrousItems.infinity_pickaxe && + (block.getMaterial() == Material.rock || block.getMaterial() == Material.iron)){ + dropItem(new ItemStack(block, 1, event.world.getBlockMetadata(event.x, event.y, event.z)), event.entityPlayer.worldObj, event.x, event.y, event.z); event.entityPlayer.worldObj.setBlockToAir(event.x, event.y, event.z); - //event.setCanceled(true); + event.world.playSoundEffect(event.x, event.y, event.z, block.stepSound.getBreakSound(), block.stepSound.getVolume(), block.stepSound.getPitch()); } } diff --git a/src/main/java/fox/spiteful/avaritia/items/tools/ItemPickaxeInfinity.java b/src/main/java/fox/spiteful/avaritia/items/tools/ItemPickaxeInfinity.java index 889c47d..585bbfd 100644 --- a/src/main/java/fox/spiteful/avaritia/items/tools/ItemPickaxeInfinity.java +++ b/src/main/java/fox/spiteful/avaritia/items/tools/ItemPickaxeInfinity.java @@ -23,36 +23,4 @@ public class ItemPickaxeInfinity extends ItemPickaxe { super.setDamage(stack, 0); } - @Override - public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) { - Block block = player.worldObj.getBlock(x, y, z); - Lumberjack.log(Level.INFO, block.getLocalizedName()); - if(block.getBlockHardness(player.worldObj, x, y, z) <= -1.0F || block == Blocks.bedrock) { - ItemStack drop = new ItemStack(block, 1, player.worldObj.getBlockMetadata(x, y, z)); - float f = 0.7F; - double d0 = (double)(player.worldObj.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; - double d1 = (double)(player.worldObj.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; - double d2 = (double)(player.worldObj.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(player.worldObj, (double)x + d0, (double)y + d1, (double)z + d2, drop); - entityitem.delayBeforeCanPickup = 10; - player.worldObj.spawnEntityInWorld(entityitem); - player.worldObj.setBlockToAir(x, y, z); - return true; - } - return false; - } - - @Override - public float func_150893_a(ItemStack p_150893_1_, Block p_150893_2_) { - return (p_150893_2_ == Blocks.bedrock) ? Float.MAX_VALUE : super.func_150893_a(p_150893_1_, p_150893_2_); - } - @Override - public float getDigSpeed(ItemStack stack, Block block, int meta) { - return (block == Blocks.bedrock) ? Float.MAX_VALUE : super.getDigSpeed(stack, block, meta); - } - @Override - public boolean func_150897_b(Block p_150897_1_) { - return (p_150897_1_ == Blocks.bedrock) || super.func_150897_b(p_150897_1_); - } - }