mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-29 22:59:59 +00:00
Code Issues Projects Releases Wiki Activity

remove LevelEventSound, remove pitch from sounds that don't support it (most of them)

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-08-21 17:59:00 +01:00
parent ea2c418a77
commit e9fd57275a
16 changed files with 131 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/world/sound/AnvilBreakSound.php
View File

@ -23,11 +23,12 @@ declare(strict_types=1);
namespace pocketmine\world\sound;
use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\LevelEventPacket;
class AnvilBreakSound extends LevelEventSound{
class AnvilBreakSound implements Sound{
protected function getLevelEventId() : int{
return LevelEventPacket::EVENT_SOUND_ANVIL_BREAK;
public function encode(?Vector3 $pos){
return LevelEventPacket::create(LevelEventPacket::EVENT_SOUND_ANVIL_BREAK, 0, $pos);
}
}

7
src/world/sound/AnvilFallSound.php
View File

@ -23,11 +23,12 @@ declare(strict_types=1);
namespace pocketmine\world\sound;
use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\LevelEventPacket;
class AnvilFallSound extends LevelEventSound{
class AnvilFallSound implements Sound{
protected function getLevelEventId() : int{
return LevelEventPacket::EVENT_SOUND_ANVIL_FALL;
public function encode(?Vector3 $pos){
return LevelEventPacket::create(LevelEventPacket::EVENT_SOUND_ANVIL_FALL, 0, $pos);
}
}

7
src/world/sound/AnvilUseSound.php
View File

@ -23,11 +23,12 @@ declare(strict_types=1);
namespace pocketmine\world\sound;
use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\LevelEventPacket;
class AnvilUseSound extends LevelEventSound{
class AnvilUseSound implements Sound{
protected function getLevelEventId() : int{
return LevelEventPacket::EVENT_SOUND_ANVIL_USE;
public function encode(?Vector3 $pos){
return LevelEventPacket::create(LevelEventPacket::EVENT_SOUND_ANVIL_USE, 0, $pos);
}
}

7
src/world/sound/BlazeShootSound.php
View File

@ -23,11 +23,12 @@ declare(strict_types=1);
namespace pocketmine\world\sound;
use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\LevelEventPacket;
class BlazeShootSound extends LevelEventSound{
class BlazeShootSound implements Sound{
protected function getLevelEventId() : int{
return LevelEventPacket::EVENT_SOUND_BLAZE_SHOOT;
public function encode(?Vector3 $pos){
return LevelEventPacket::create(LevelEventPacket::EVENT_SOUND_BLAZE_SHOOT, 0, $pos);
}
}

21
src/world/sound/ClickSound.php
View File

@ -23,11 +23,26 @@ declare(strict_types=1);
namespace pocketmine\world\sound;
use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\LevelEventPacket;
class ClickSound extends LevelEventSound{
class ClickSound implements Sound{
protected function getLevelEventId() : int{
return LevelEventPacket::EVENT_SOUND_CLICK;
/** @var float */
private $pitch;
public function __construct(float $pitch = 0){
$this->pitch = $pitch;
}
/**
* @return float
*/
public function getPitch() : float{
return $this->pitch;
}
public function encode(?Vector3 $pos){
return LevelEventPacket::create(LevelEventPacket::EVENT_SOUND_CLICK, (int) ($this->pitch * 1000), $pos);
}
}

7
src/world/sound/DoorBumpSound.php
View File

@ -23,11 +23,12 @@ declare(strict_types=1);
namespace pocketmine\world\sound;
use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\LevelEventPacket;
class DoorBumpSound extends LevelEventSound{
class DoorBumpSound implements Sound{
protected function getLevelEventId() : int{
return LevelEventPacket::EVENT_SOUND_DOOR_BUMP;
public function encode(?Vector3 $pos){
return LevelEventPacket::create(LevelEventPacket::EVENT_SOUND_DOOR_BUMP, 0, $pos);
}
}

7
src/world/sound/DoorCrashSound.php
View File

@ -23,11 +23,12 @@ declare(strict_types=1);
namespace pocketmine\world\sound;
use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\LevelEventPacket;
class DoorCrashSound extends LevelEventSound{
class DoorCrashSound implements Sound{
protected function getLevelEventId() : int{
return LevelEventPacket::EVENT_SOUND_DOOR_CRASH;
public function encode(?Vector3 $pos){
return LevelEventPacket::create(LevelEventPacket::EVENT_SOUND_DOOR_CRASH, 0, $pos);
}
}

21
src/world/sound/DoorSound.php
View File

@ -23,11 +23,26 @@ declare(strict_types=1);
namespace pocketmine\world\sound;
use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\LevelEventPacket;
class DoorSound extends LevelEventSound{
class DoorSound implements Sound{
protected function getLevelEventId() : int{
return LevelEventPacket::EVENT_SOUND_DOOR;
/** @var float */
private $pitch;
public function __construct(float $pitch = 0){
$this->pitch = $pitch;
}
/**
* @return float
*/
public function getPitch() : float{
return $this->pitch;
}
public function encode(?Vector3 $pos){
return LevelEventPacket::create(LevelEventPacket::EVENT_SOUND_DOOR, (int) ($this->pitch * 1000), $pos);
}
}

10
src/world/sound/EndermanTeleportSound.php
View File

@ -23,14 +23,12 @@ declare(strict_types=1);
namespace pocketmine\world\sound;
use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\LevelEventPacket;
class EndermanTeleportSound extends LevelEventSound{
public function __construct(){ //don't allow specifying a pitch - TODO: remove pitch from sounds that don't have it
parent::__construct();
}
class EndermanTeleportSound implements Sound{
protected function getLevelEventId() : int{
return LevelEventPacket::EVENT_SOUND_ENDERMAN_TELEPORT;
public function encode(?Vector3 $pos){
return LevelEventPacket::create(LevelEventPacket::EVENT_SOUND_ENDERMAN_TELEPORT, 0, $pos);
}
}

21
src/world/sound/FizzSound.php
View File

@ -23,11 +23,26 @@ declare(strict_types=1);
namespace pocketmine\world\sound;
use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\LevelEventPacket;
class FizzSound extends LevelEventSound{
class FizzSound implements Sound{
protected function getLevelEventId() : int{
return LevelEventPacket::EVENT_SOUND_FIZZ;
/** @var float */
private $pitch;
public function __construct(float $pitch = 0){
$this->pitch = $pitch;
}
/**
* @return float
*/
public function getPitch() : float{
return $this->pitch;
}
public function encode(?Vector3 $pos){
return LevelEventPacket::create(LevelEventPacket::EVENT_SOUND_FIZZ, (int) ($this->pitch * 1000), $pos);
}
}

7
src/world/sound/GhastShootSound.php
View File

@ -23,11 +23,12 @@ declare(strict_types=1);
namespace pocketmine\world\sound;
use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\LevelEventPacket;
class GhastShootSound extends LevelEventSound{
class GhastShootSound implements Sound{
protected function getLevelEventId() : int{
return LevelEventPacket::EVENT_SOUND_GHAST_SHOOT;
public function encode(?Vector3 $pos){
return LevelEventPacket::create(LevelEventPacket::EVENT_SOUND_GHAST_SHOOT, 0, $pos);
}
}

7
src/world/sound/GhastSound.php
View File

@ -23,11 +23,12 @@ declare(strict_types=1);
namespace pocketmine\world\sound;
use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\LevelEventPacket;
class GhastSound extends LevelEventSound{
class GhastSound implements Sound{
protected function getLevelEventId() : int{
return LevelEventPacket::EVENT_SOUND_GHAST;
public function encode(?Vector3 $pos){
return LevelEventPacket::create(LevelEventPacket::EVENT_SOUND_GHAST, 0, $pos);
}
}

21
src/world/sound/LaunchSound.php
View File

@ -23,11 +23,26 @@ declare(strict_types=1);
namespace pocketmine\world\sound;
use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\LevelEventPacket;
class LaunchSound extends LevelEventSound{
class LaunchSound implements Sound{
protected function getLevelEventId() : int{
return LevelEventPacket::EVENT_SOUND_SHOOT;
/** @var float */
private $pitch;
public function __construct(float $pitch = 0){
$this->pitch = $pitch;
}
/**
* @return float
*/
public function getPitch() : float{
return $this->pitch;
}
public function encode(?Vector3 $pos){
return LevelEventPacket::create(LevelEventPacket::EVENT_SOUND_SHOOT, (int) ($this->pitch * 1000), $pos);
}
}

54
src/world/sound/LevelEventSound.php
View File

@ -1,54 +0,0 @@
<?php
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
declare(strict_types=1);
namespace pocketmine\world\sound;
use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\LevelEventPacket;
/**
* @internal
*/
abstract class LevelEventSound implements Sound{
/** @var float */
protected $pitch = 0;
public function __construct(float $pitch = 0){
$this->pitch = $pitch * 1000;
}
abstract protected function getLevelEventId() : int;
public function getPitch() : float{
return $this->pitch / 1000;
}
public function setPitch(float $pitch) : void{
$this->pitch = $pitch * 1000;
}
public function encode(?Vector3 $pos){
return LevelEventPacket::create($this->getLevelEventId(), (int) $this->pitch, $pos);
}
}

8
src/world/sound/PaintingPlaceSound.php
View File

@ -23,11 +23,13 @@ declare(strict_types=1);
namespace pocketmine\world\sound;
use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\LevelEventPacket;
class PaintingPlaceSound extends LevelEventSound{
class PaintingPlaceSound implements Sound{
protected function getLevelEventId() : int{
return LevelEventPacket::EVENT_SOUND_ITEMFRAME_PLACE; //item frame and painting have the same sound
public function encode(?Vector3 $pos){
//item frame and painting have the same sound
return LevelEventPacket::create(LevelEventPacket::EVENT_SOUND_ITEMFRAME_PLACE, 0, $pos);
}
}

21
src/world/sound/PopSound.php
View File

@ -23,11 +23,26 @@ declare(strict_types=1);
namespace pocketmine\world\sound;
use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\LevelEventPacket;
class PopSound extends LevelEventSound{
class PopSound implements Sound{
protected function getLevelEventId() : int{
return LevelEventPacket::EVENT_SOUND_POP;
/** @var float */
private $pitch;
public function __construct(float $pitch = 0){
$this->pitch = $pitch;
}
/**
* @return float
*/
public function getPitch() : float{
return $this->pitch;
}
public function encode(?Vector3 $pos){
return LevelEventPacket::create(LevelEventPacket::EVENT_SOUND_POP, (int) ($this->pitch * 1000), $pos);
}
}