All sounds are back!

Author: inxomnyaa

src/pocketmine/block/Noteblock.php

@@ -13,6 +13,7 @@
 use pocketmine\math\Vector3;
 use pocketmine\level\sound\NoteblockSound;
 use pocketmine\tile\Music;
+use pocketmine\network\protocol\BlockEventPacket;
 
 class Noteblock extends Solid{
 
@@ -136,6 +137,15 @@ public function onActivate(Item $item, Player $player = null){
 			}
 			$tile->setNote($pitch);
 			$this->level->addSound(new NoteblockSound($this, $instrument, $pitch));
+			if($player instanceof Player){
+				$pk = new BlockEventPacket();
+				$pk->x = $this->x;
+				$pk->y = $this->y;
+				$pk->z = $this->z;
+				$pk->case1 = $this->getInstrument();
+				$pk->case2 = $pitch;
+				$player->dataPacket($pk);
+			}
 			return true;
 		}
 		return false;

src/pocketmine/level/Level.php

@@ -122,6 +122,7 @@
 
 use pocketmine\entity\ExperienceOrb;
 use pocketmine\network\protocol\ChangeDimensionPacket;
+use pocketmine\level\sound\BlockBreakSound;
 
 #include <rules/Level.h>
 
@@ -1887,6 +1888,7 @@ public function useBreakOn(Vector3 $vector, Item &$item = null, Player $player =
 			}
 
 			$this->addParticle(new DestroyBlockParticle($target->add(0.5), $target), $players);
+			$this->addSound(new BlockBreakSound($target), $players);
 		}
 
 		$target->onBreak($item);

src/pocketmine/level/sound/AnvilBreakSound.php

@@ -6,6 +6,6 @@
 
 class AnvilBreakSound extends GenericSound{
 	public function __construct(Vector3 $pos, $pitch = 0){
-		parent::__construct($pos, 'random.anvil_break', $pitch);
+		parent::__construct($pos, LevelEventPacket::EVENT_SOUND_ANVIL_BREAK, $pitch);
 	}
 }

src/pocketmine/level/sound/AnvilFallSound.php

@@ -6,6 +6,6 @@
 
 class AnvilFallSound extends GenericSound{
 	public function __construct(Vector3 $pos, $pitch = 0){
-		parent::__construct($pos, 'random.anvil_land', $pitch);
+		parent::__construct($pos, LevelEventPacket::EVENT_SOUND_ANVIL_FALL, $pitch);
 	}
 }

src/pocketmine/level/sound/AnvilUseSound.php

@@ -6,6 +6,6 @@
 
 class AnvilUseSound extends GenericSound{
 	public function __construct(Vector3 $pos, $pitch = 0){
-		parent::__construct($pos, 'random.anvil_use', $pitch);
+		parent::__construct($pos, LevelEventPacket::EVENT_SOUND_ANVIL_USE, $pitch);
 	}
 }

src/pocketmine/level/sound/BatSound.php

@@ -6,6 +6,6 @@
 
 class BatSound extends GenericSound{
 	public function __construct(Vector3 $pos, $pitch = 0){
-		parent::__construct($pos, 'mob.bat.takeoff', $pitch);
+		parent::__construct($pos, LevelEventPacket::EVENT_SOUND_BAT_FLY, $pitch);
 	}
 }

src/pocketmine/level/sound/BlazeShootSound.php

@@ -6,6 +6,6 @@
 
 class BlazeShootSound extends GenericSound{
 	public function __construct(Vector3 $pos, $pitch = 0){
-		parent::__construct($pos, 'mob.ghast.fireball', $pitch);
+		parent::__construct($pos, LevelEventPacket::EVENT_SOUND_BLAZE_SHOOT, $pitch);
 	}
 }

src/pocketmine/level/sound/BlockBreakSound.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace pocketmine\level\sound;
+
+use pocketmine\block\Block;
+
+class BlockBreakSound extends GenericSound{
+	protected $data;
+
+	public function __construct(Block $b){
+		$this->data = $b->getId();
+		parent::__construct($b, 'break', $this->data, $pitch = 0);
+	}
+}

src/pocketmine/level/sound/BlockPlaceSound.php

@@ -23,37 +23,24 @@
 
 use pocketmine\block\Block;
 use pocketmine\network\protocol\LevelEventPacket;
-use pocketmine\network\protocol\LevelSoundEventPacket;
 
 class BlockPlaceSound extends GenericSound{
 
 	protected $data;
 
 	public function __construct(Block $b){
-		parent::__construct($b, '');
-		#$this->data = $b->getId();
+		parent::__construct($b, LevelEventPacket::EVENT_SOUND_BLOCK_PLACE);
+		$this->data = $b->getId();
 	}
 
 	public function encode(){
-		/*$pk = new LevelEventPacket;
+		$pk = new LevelEventPacket;
 		$pk->evid = $this->id;
 		$pk->x = $this->x;
 		$pk->y = $this->y;
 		$pk->z = $this->z;
 		$pk->data = $this->data;
 
-		return $pk;*/
-
-		$pk = new LevelSoundEventPacket();
-		$pk->sound = 2;
-		$pk->x = $this->x;
-		$pk->y = $this->y;
-		$pk->z = $this->z;
-		$pk->volume = 100;
-		$pk->pitch = $this->pitch;
-		$pk->unknownBool = true;
-		$pk->unknownBool2 = true;
-		
 		return $pk;
 	}
 }

src/pocketmine/level/sound/ButtonClickSound.php

@@ -6,6 +6,6 @@
 
 class ButtonClickSound extends GenericSound{
 	public function __construct(Vector3 $pos, $pitch = 1000){
-		parent::__construct($pos, 'random.click', $pitch);
+		parent::__construct($pos, LevelEventPacket::EVENT_SOUND_BUTTON_CLICK, $pitch);
 	}
 }