Modernize property declarations in src/world/sound

src/world/sound/BlockBreakSound.php

@@ -30,13 +30,7 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
 
 class BlockBreakSound implements Sound{
-
+	public function __construct(private Block $block){}
-	/** @var Block */
-	private $block;
-
-	public function __construct(Block $block){
-		$this->block = $block;
-	}
 
 	public function encode(Vector3 $pos) : array{
 		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::BREAK, $pos, false, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId()))];

src/world/sound/BlockPlaceSound.php

@@ -30,13 +30,7 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
 
 class BlockPlaceSound implements Sound{
-
+	public function __construct(private Block $block){}
-	/** @var Block */
-	private $block;
-
-	public function __construct(Block $block){
-		$this->block = $block;
-	}
 
 	public function encode(Vector3 $pos) : array{
 		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::PLACE, $pos, false, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId()))];

src/world/sound/BlockPunchSound.php

@@ -33,13 +33,7 @@ use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
  * Played when a player attacks a block in survival, attempting to break it.
  */
 class BlockPunchSound implements Sound{
-
+	public function __construct(private Block $block){}
-	/** @var Block */
-	private $block;
-
-	public function __construct(Block $block){
-		$this->block = $block;
-	}
 
 	public function encode(Vector3 $pos) : array{
 		return [LevelSoundEventPacket::nonActorSound(

src/world/sound/ClickSound.php

@@ -28,13 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelEventPacket;
 use pocketmine\network\mcpe\protocol\types\LevelEvent;
 
 class ClickSound implements Sound{
-
+	public function __construct(private float $pitch = 0){}
-	/** @var float */
-	private $pitch;
-
-	public function __construct(float $pitch = 0){
-		$this->pitch = $pitch;
-	}
 
 	public function getPitch() : float{
 		return $this->pitch;

src/world/sound/DoorSound.php

@@ -28,13 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelEventPacket;
 use pocketmine\network\mcpe\protocol\types\LevelEvent;
 
 class DoorSound implements Sound{
-
+	public function __construct(private float $pitch = 0){}
-	/** @var float */
-	private $pitch;
-
-	public function __construct(float $pitch = 0){
-		$this->pitch = $pitch;
-	}
 
 	public function getPitch() : float{
 		return $this->pitch;

src/world/sound/EntityLandSound.php

@@ -34,16 +34,10 @@ use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
  * Played when an entity hits the ground after falling a distance that doesn't cause damage, e.g. due to jumping.
  */
 class EntityLandSound implements Sound{
-
+	public function __construct(
-	/** @var Entity */
+		private Entity $entity,
-	private $entity;
+		private Block $blockLandedOn
-	/** @var Block */
+	){}
-	private $blockLandedOn;
-
-	public function __construct(Entity $entity, Block $blockLandedOn){
-		$this->entity = $entity;
-		$this->blockLandedOn = $blockLandedOn;
-	}
 
 	public function encode(Vector3 $pos) : array{
 		return [LevelSoundEventPacket::create(

src/world/sound/EntityLongFallSound.php

@@ -33,13 +33,7 @@ use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
  * This is the bone-breaker "crunch" sound.
  */
 class EntityLongFallSound implements Sound{
-
+	public function __construct(private Entity $entity){}
-	/** @var Entity */
-	private $entity;
-
-	public function __construct(Entity $entity){
-		$this->entity = $entity;
-	}
 
 	public function encode(Vector3 $pos) : array{
 		return [LevelSoundEventPacket::create(

src/world/sound/EntityShortFallSound.php

@@ -32,13 +32,7 @@ use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
  * Played when an entity hits the ground after falling a short distance.
  */
 class EntityShortFallSound implements Sound{
-
+	public function __construct(private Entity $entity){}
-	/** @var Entity */
-	private $entity;
-
-	public function __construct(Entity $entity){
-		$this->entity = $entity;
-	}
 
 	public function encode(Vector3 $pos) : array{
 		return [LevelSoundEventPacket::create(

src/world/sound/FizzSound.php

@@ -28,13 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelEventPacket;
 use pocketmine\network\mcpe\protocol\types\LevelEvent;
 
 class FizzSound implements Sound{
-
+	public function __construct(private float $pitch = 0){}
-	/** @var float */
-	private $pitch;
-
-	public function __construct(float $pitch = 0){
-		$this->pitch = $pitch;
-	}
 
 	public function getPitch() : float{
 		return $this->pitch;

src/world/sound/LaunchSound.php

@@ -28,13 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelEventPacket;
 use pocketmine\network\mcpe\protocol\types\LevelEvent;
 
 class LaunchSound implements Sound{
-
+	public function __construct(private float $pitch = 0){}
-	/** @var float */
-	private $pitch;
-
-	public function __construct(float $pitch = 0){
-		$this->pitch = $pitch;
-	}
 
 	public function getPitch() : float{
 		return $this->pitch;

src/world/sound/NoteInstrument.php

@@ -52,12 +52,11 @@ final class NoteInstrument{
 		);
 	}
 
-	/** @var int */
+	private function __construct(
-	private $magicNumber;
+		string $name,
-
+		private int $magicNumber
-	private function __construct(string $name, int $magicNumber){
+	){
 		$this->Enum___construct($name);
-		$this->magicNumber = $magicNumber;
 	}
 
 	public function getMagicNumber() : int{

src/world/sound/NoteSound.php

@@ -28,18 +28,13 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
 
 class NoteSound implements Sound{
-
+	public function __construct(
-	/** @var NoteInstrument */
+		private NoteInstrument $instrument,
-	private $instrument;
+		private int $note
-	/** @var int */
+	){
-	private $note;
+		if($this->note < 0 || $this->note > 255){
-
-	public function __construct(NoteInstrument $instrument, int $note){
-		if($note < 0 || $note > 255){
 			throw new \InvalidArgumentException("Note $note is outside accepted range");
 		}
-		$this->instrument = $instrument;
-		$this->note = $note;
 	}
 
 	public function encode(Vector3 $pos) : array{

src/world/sound/PopSound.php

@@ -28,13 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelEventPacket;
 use pocketmine\network\mcpe\protocol\types\LevelEvent;
 
 class PopSound implements Sound{
-
+	public function __construct(private float $pitch = 0){}
-	/** @var float */
-	private $pitch;
-
-	public function __construct(float $pitch = 0){
-		$this->pitch = $pitch;
-	}
 
 	public function getPitch() : float{
 		return $this->pitch;

src/world/sound/RecordSound.php

@@ -28,13 +28,7 @@ use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 
 class RecordSound implements Sound{
-
+	public function __construct(private RecordType $recordType){}
-	/** @var RecordType */
-	private $recordType;
-
-	public function __construct(RecordType $recordType){
-		$this->recordType = $recordType;
-	}
 
 	public function encode(Vector3 $pos) : array{
 		return [LevelSoundEventPacket::nonActorSound($this->recordType->getSoundId(), $pos, false)];

src/world/sound/XpLevelUpSound.php

@@ -30,13 +30,7 @@ use function intdiv;
 use function min;
 
 class XpLevelUpSound implements Sound{
-
+	public function __construct(private int $xpLevel){}
-	/** @var int */
-	private $xpLevel;
-
-	public function __construct(int $xpLevel){
-		$this->xpLevel = $xpLevel;
-	}
 
 	public function getXpLevel() : int{
 		return $this->xpLevel;