add pmmp#5232

README.md

@@ -35,6 +35,7 @@ Additions
 > https://github.com/pmmp/PocketMine-MP/pull/4742
 > https://github.com/pmmp/PocketMine-MP/pull/5095
 > https://github.com/pmmp/PocketMine-MP/pull/5122
+> https://github.com/pmmp/PocketMine-MP/pull/5232
 
 
 ## What is this?

src/data/bedrock/GoatHornTypeIdMap.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace pocketmine\data\bedrock;
+
+use pocketmine\item\GoatHornType;
+use pocketmine\utils\SingletonTrait;
+
+final class GoatHornTypeIdMap{
+	use SingletonTrait;
+	/** @phpstan-use IntSaveIdMapTrait<GoatHornType> */
+	use IntSaveIdMapTrait;
+
+	private function __construct(){
+		foreach(GoatHornType::cases() as $case){
+			$this->register(match($case){
+				GoatHornType::PONDER => GoatHornTypeIds::PONDER,
+				GoatHornType::SING => GoatHornTypeIds::SING,
+				GoatHornType::SEEK => GoatHornTypeIds::SEEK,
+				GoatHornType::FEEL => GoatHornTypeIds::FEEL,
+				GoatHornType::ADMIRE => GoatHornTypeIds::ADMIRE,
+				GoatHornType::CALL => GoatHornTypeIds::CALL,
+				GoatHornType::YEARN => GoatHornTypeIds::YEARN,
+				GoatHornType::DREAM => GoatHornTypeIds::DREAM
+			}, $case);
+		}
+	}
+}

src/data/bedrock/GoatHornTypeIds.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace pocketmine\data\bedrock;
+
+final class GoatHornTypeIds{
+	public const PONDER = 0;
+	public const SING = 1;
+	public const SEEK = 2;
+	public const FEEL = 3;
+	public const ADMIRE = 4;
+	public const CALL = 5;
+	public const YEARN = 6;
+	public const DREAM = 7;
+}

src/data/bedrock/item/ItemSerializerDeserializerRegistrar.php

@@ -30,6 +30,7 @@
 use pocketmine\block\VanillaBlocks as Blocks;
 use pocketmine\data\bedrock\CompoundTypeIds;
 use pocketmine\data\bedrock\DyeColorIdMap;
+use pocketmine\data\bedrock\GoatHornTypeIdMap;
 use pocketmine\data\bedrock\item\ItemTypeNames as Ids;
 use pocketmine\data\bedrock\item\SavedItemData as Data;
 use pocketmine\data\bedrock\MedicineTypeIdMap;
@@ -38,6 +39,7 @@
 use pocketmine\data\bedrock\SuspiciousStewTypeIdMap;
 use pocketmine\item\Banner;
 use pocketmine\item\Dye;
+use pocketmine\item\GoatHorn;
 use pocketmine\item\Item;
 use pocketmine\item\Medicine;
 use pocketmine\item\Potion;
@@ -489,6 +491,14 @@ function(Banner $item, int $meta) : void{
 			},
 			fn(Banner $item) => DyeColorIdMap::getInstance()->toInvertedId($item->getColor())
 		);
+		$this->map1to1ItemWithMeta(
+			Ids::GOAT_HORN,
+			Items::GOAT_HORN(),
+			function(GoatHorn $item, int $meta): void {
+				$item->setHornType(GoatHornTypeIdMap::getInstance()->fromId($meta) ?? throw new ItemTypeDeserializeException("Unknown goat horn type ID $meta"));
+			},
+			fn(GoatHorn $item) => GoatHornTypeIdMap::getInstance()->toId($item->getHornType())
+		);
 		$this->map1to1ItemWithMeta(
 			Ids::MEDICINE,
 			Items::MEDICINE(),

src/item/GoatHorn.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace pocketmine\item;
+
+use pocketmine\data\runtime\RuntimeDataDescriber;
+use pocketmine\math\Vector3;
+use pocketmine\player\Player;
+use pocketmine\world\sound\GoatHornSound;
+
+class GoatHorn extends Item implements Releasable{
+
+	private GoatHornType $goatHornType = GoatHornType::PONDER;
+
+	protected function describeState(RuntimeDataDescriber $w) : void{
+		$w->enum($this->goatHornType);
+	}
+
+	public function getHornType() : GoatHornType{
+		return $this->goatHornType;
+	}
+
+	/** @return $this */
+	public function setHornType(GoatHornType $type) : self{
+		$this->goatHornType = $type;
+		return $this;
+	}
+
+	public function getMaxStackSize() : int{
+		return 1;
+	}
+
+	public function getCooldownTicks() : int{
+		return 140;
+	}
+
+	public function canStartUsingItem(Player $player) : bool{
+		return true;
+	}
+
+	public function onClickAir(Player $player, Vector3 $directionVector, array &$returnedItems) : ItemUseResult{
+		$position = $player->getPosition();
+		$position->getWorld()->addSound($position, new GoatHornSound($this->goatHornType));
+
+		return ItemUseResult::SUCCESS;
+	}
+
+}

src/item/GoatHornType.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace pocketmine\item;
+
+enum GoatHornType{
+
+	case PONDER;
+	case SING;
+	case SEEK;
+	case FEEL;
+	case ADMIRE;
+	case CALL;
+	case YEARN;
+	case DREAM;
+}

src/item/ItemTypeIds.php

@@ -325,8 +325,9 @@ private function __construct(){
 	public const PITCHER_POD = 20286;
 	public const NAME_TAG = 20287;
 	public const END_CRYSTAL = 20288;
+	public const GOAT_HORN = 20289;
 
-	public const FIRST_UNUSED_ITEM_ID = 20289;
+	public const FIRST_UNUSED_ITEM_ID = 20290;
 
 	private static int $nextDynamicId = self::FIRST_UNUSED_ITEM_ID;
 

src/item/StringToItemParser.php

@@ -1174,6 +1174,11 @@ private static function registerDynamicItems(self $result) : void{
 
 			$result->register($prefix("dye"), fn() => Items::DYE()->setColor($color));
 		}
+		foreach(GoatHornType::cases() as $goatHornType) {
+			$prefix = fn(string $name) => strtolower($goatHornType->name) . "_" . $name;
+
+			$result->register($prefix("goat_horn"), fn() => Items::GOAT_HORN()->setHornType($goatHornType));
+		}
 		foreach(SuspiciousStewType::cases() as $suspiciousStewType){
 			$prefix = fn(string $name) => strtolower($suspiciousStewType->name) . "_" . $name;
 
@@ -1332,6 +1337,7 @@ private static function registerItems(self $result) : void{
 		$result->register("glow_berries", fn() => Items::GLOW_BERRIES());
 		$result->register("glow_ink_sac", fn() => Items::GLOW_INK_SAC());
 		$result->register("glowstone_dust", fn() => Items::GLOWSTONE_DUST());
+		$result->register("goat_horn", fn() => Items::GOAT_HORN());
 		$result->register("gold_axe", fn() => Items::GOLDEN_AXE());
 		$result->register("gold_boots", fn() => Items::GOLDEN_BOOTS());
 		$result->register("gold_chestplate", fn() => Items::GOLDEN_CHESTPLATE());

src/item/VanillaItems.php

@@ -172,6 +172,7 @@
  * @method static Item GLOWSTONE_DUST()
  * @method static GlowBerries GLOW_BERRIES()
  * @method static Item GLOW_INK_SAC()
+ * @method static GoatHorn GOAT_HORN()
  * @method static GoldenApple GOLDEN_APPLE()
  * @method static Axe GOLDEN_AXE()
  * @method static Armor GOLDEN_BOOTS()
@@ -470,6 +471,7 @@ protected static function setup() : void{
 		self::register("glow_berries", new GlowBerries(new IID(Ids::GLOW_BERRIES), "Glow Berries"));
 		self::register("glow_ink_sac", new Item(new IID(Ids::GLOW_INK_SAC), "Glow Ink Sac"));
 		self::register("glowstone_dust", new Item(new IID(Ids::GLOWSTONE_DUST), "Glowstone Dust"));
+		self::register("goat_horn", new GoatHorn(new IID(Ids::GOAT_HORN), "Goat Horn"));
 		self::register("gold_ingot", new Item(new IID(Ids::GOLD_INGOT), "Gold Ingot"));
 		self::register("gold_nugget", new Item(new IID(Ids::GOLD_NUGGET), "Gold Nugget"));
 		self::register("golden_apple", new GoldenApple(new IID(Ids::GOLDEN_APPLE), "Golden Apple"));

src/world/sound/GoatHornSound.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace pocketmine\world\sound;
+
+use pocketmine\item\GoatHornType;
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
+
+class GoatHornSound implements Sound{
+	public function __construct(private GoatHornType $goatHornType){
+	}
+
+	public function encode(Vector3 $pos) : array{
+		return [LevelSoundEventPacket::nonActorSound(match ($this->goatHornType) {
+			GoatHornType::PONDER => LevelSoundEvent::HORN_CALL0,
+			GoatHornType::SING => LevelSoundEvent::HORN_CALL1,
+			GoatHornType::SEEK => LevelSoundEvent::HORN_CALL2,
+			GoatHornType::FEEL => LevelSoundEvent::HORN_CALL3,
+			GoatHornType::ADMIRE => LevelSoundEvent::HORN_CALL4,
+			GoatHornType::CALL => LevelSoundEvent::HORN_CALL5,
+			GoatHornType::YEARN => LevelSoundEvent::HORN_CALL6,
+			GoatHornType::DREAM => LevelSoundEvent::HORN_CALL7
+		}, $pos, false)];
+	}
+}