diff --git a/MODSRC/vazkii/botania/common/block/BlockForestDrum.java b/MODSRC/vazkii/botania/common/block/BlockForestDrum.java index 8b1000858..1613134d7 100644 --- a/MODSRC/vazkii/botania/common/block/BlockForestDrum.java +++ b/MODSRC/vazkii/botania/common/block/BlockForestDrum.java @@ -18,6 +18,7 @@ import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.item.ItemGrassHorn; import vazkii.botania.common.lib.LibBlockNames; public class BlockForestDrum extends BlockMod implements IManaTrigger { @@ -57,7 +58,12 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger { @Override public void onBurstCollision(IManaBurst burst, World world, int x, int y, int z) { - System.out.println("collide! " + world.isRemote); + ItemGrassHorn.breakGrass(world, x, y, z); + if(!world.isRemote) + for(int i = 0; i < 10; i++) + world.playSoundEffect(x, y, z, "note.bd", 1F, 1F); + else world.spawnParticle("note", x + 0.5, y + 1.2, z + 0.5D, 1.0 / 24.0, 0, 0); + } } diff --git a/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java b/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java index 809e3509e..a688b3695 100644 --- a/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java +++ b/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java @@ -514,7 +514,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { worldObj.markBlockForUpdate(tile.xCoord, tile.yCoord, tile.zCoord); } - if(block instanceof IManaTrigger) + if(!isFake() && block instanceof IManaTrigger) ((IManaTrigger) block).onBurstCollision(this, worldObj, movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ); dead = true; diff --git a/MODSRC/vazkii/botania/common/item/ItemGrassHorn.java b/MODSRC/vazkii/botania/common/item/ItemGrassHorn.java index 1b35945ad..dc20dd9c2 100644 --- a/MODSRC/vazkii/botania/common/item/ItemGrassHorn.java +++ b/MODSRC/vazkii/botania/common/item/ItemGrassHorn.java @@ -53,44 +53,47 @@ public class ItemGrassHorn extends ItemMod { @Override public void onUsingTick(ItemStack stack, EntityPlayer player, int time) { - if(time != getMaxItemUseDuration(stack) && time % 5 == 0) { - Random rand = new Random((int) player.posX ^ (int) player.posZ); - int range = 12; - List coords = new ArrayList(); - - for(int i = -range; i < range + 1; i++) - for(int j = -range; j < range + 1; j++) - for(int k = -3; k < 4; k++) { - int x = (int) player.posX + i; - int y = (int) player.posY + k; - int z = (int) player.posZ + j; - - Block block = player.worldObj.getBlock(x, y, z); - if(block instanceof BlockBush && !(block instanceof ISpecialFlower)) - coords.add(new ChunkCoordinates(x, y, z)); - } - - Collections.shuffle(coords, rand); - - int count = Math.min(coords.size(), 32); - for(int i = 0; i < count; i++) { - ChunkCoordinates currCoords = coords.get(i); - List items = new ArrayList(); - Block block = player.worldObj.getBlock(currCoords.posX, currCoords.posY, currCoords.posZ); - int meta = player.worldObj.getBlockMetadata(currCoords.posX, currCoords.posY, currCoords.posZ); - items.addAll(block.getDrops(player.worldObj, currCoords.posX, currCoords.posY, currCoords.posZ, meta, 0)); - - if(!player.worldObj.isRemote) { - player.worldObj.setBlockToAir(currCoords.posX, currCoords.posY, currCoords.posZ); - player.worldObj.playAuxSFX(2001, currCoords.posX, currCoords.posY, currCoords.posZ, Block.getIdFromBlock(block) + (meta << 12)); - - for(ItemStack stack_ : items) - player.worldObj.spawnEntityInWorld(new EntityItem(player.worldObj, currCoords.posX + 0.5, currCoords.posY + 0.5, currCoords.posZ + 0.5, stack_)); - } - } - } + if(time != getMaxItemUseDuration(stack) && time % 5 == 0) + breakGrass(player.worldObj, (int) player.posX, (int) player.posY, (int) player.posZ); if(!player.worldObj.isRemote) player.worldObj.playSoundAtEntity(player, "note.bassattack", 1F, 0.001F); } + + public static void breakGrass(World world, int srcx, int srcy, int srcz) { + Random rand = new Random((int) srcx ^ (int) srcy ^ (int) srcz); + int range = 12; + List coords = new ArrayList(); + + for(int i = -range; i < range + 1; i++) + for(int j = -range; j < range + 1; j++) + for(int k = -3; k < 4; k++) { + int x = srcx + i; + int y = srcy + k; + int z = srcz + j; + + Block block = world.getBlock(x, y, z); + if(block instanceof BlockBush && !(block instanceof ISpecialFlower)) + coords.add(new ChunkCoordinates(x, y, z)); + } + + Collections.shuffle(coords, rand); + + int count = Math.min(coords.size(), 32); + for(int i = 0; i < count; i++) { + ChunkCoordinates currCoords = coords.get(i); + List items = new ArrayList(); + Block block = world.getBlock(currCoords.posX, currCoords.posY, currCoords.posZ); + int meta = world.getBlockMetadata(currCoords.posX, currCoords.posY, currCoords.posZ); + items.addAll(block.getDrops(world, currCoords.posX, currCoords.posY, currCoords.posZ, meta, 0)); + + if(!world.isRemote) { + world.setBlockToAir(currCoords.posX, currCoords.posY, currCoords.posZ); + world.playAuxSFX(2001, currCoords.posX, currCoords.posY, currCoords.posZ, Block.getIdFromBlock(block) + (meta << 12)); + + for(ItemStack stack_ : items) + world.spawnEntityInWorld(new EntityItem(world, currCoords.posX + 0.5, currCoords.posY + 0.5, currCoords.posZ + 0.5, stack_)); + } + } + } }