Switch back to constants instead of enums

Author: dries-c

src/types/AbilitiesData.php

@@ -18,7 +18,6 @@
 use pmmp\encoding\ByteBufferReader;
 use pmmp\encoding\ByteBufferWriter;
 use pmmp\encoding\LE;
-use pocketmine\network\mcpe\protocol\types\command\CommandPermissions;
 use function count;
 
 final class AbilitiesData{
@@ -27,13 +26,13 @@ final class AbilitiesData{
 	 * @phpstan-param array<int, AbilitiesLayer> $abilityLayers
 	 */
 	public function __construct(
-		private CommandPermissions $commandPermission,
+		private int $commandPermission,
 		private int $playerPermission,
 		private int $targetActorUniqueId, //This is a little-endian long, NOT a var-long. (WTF Mojang)
 		private array $abilityLayers
 	){}
 
-	public function getCommandPermission() : CommandPermissions{ return $this->commandPermission; }
+	public function getCommandPermission() : int{ return $this->commandPermission; }
 
 	public function getPlayerPermission() : int{ return $this->playerPermission; }
 
@@ -48,7 +47,7 @@ public function getAbilityLayers() : array{ return $this->abilityLayers; }
 	public static function decode(ByteBufferReader $in) : self{
 		$targetActorUniqueId = LE::readSignedLong($in); //WHY IS THIS NON-STANDARD?
 		$playerPermission = Byte::readUnsigned($in);
-		$commandPermission = CommandPermissions::fromPacket(Byte::readUnsigned($in));
+		$commandPermission = Byte::readUnsigned($in);
 
 		$abilityLayers = [];
 		for($i = 0, $len = Byte::readUnsigned($in); $i < $len; $i++){
@@ -61,7 +60,7 @@ public static function decode(ByteBufferReader $in) : self{
 	public function encode(ByteBufferWriter $out) : void{
 		LE::writeSignedLong($out, $this->targetActorUniqueId);
 		Byte::writeUnsigned($out, $this->playerPermission);
-		Byte::writeUnsigned($out, $this->commandPermission->value);
+		Byte::writeUnsigned($out, $this->commandPermission);
 
 		Byte::writeUnsigned($out, count($this->abilityLayers));
 		foreach($this->abilityLayers as $abilityLayer){

src/types/command/CommandData.php

@@ -23,7 +23,7 @@ public function __construct(
 		public string $name,
 		public string $description,
 		public int $flags,
-		public CommandPermissions $permission,
+		public string $permission,
 		public ?CommandHardEnum $aliases,
 		public array $overloads,
 		public array $chainedSubCommandData
@@ -44,7 +44,7 @@ public function getFlags() : int{
 		return $this->flags;
 	}
 
-	public function getPermission() : CommandPermissions{
+	public function getPermission() : string{
 		return $this->permission;
 	}
 

src/types/command/CommandPermissions.php

@@ -18,15 +18,17 @@
 use pocketmine\network\mcpe\protocol\types\PacketIntEnumTrait;
 use function array_flip;
 
-enum CommandPermissions : int{
-	use PacketIntEnumTrait;
+final class CommandPermissions{
+	private function __construct(){
+		//NOOP
+	}
 
-	case NORMAL = 0;
-	case OPERATOR = 1;
-	case AUTOMATION = 2; //command blocks
-	case HOST = 3; //hosting player on LAN multiplayer
-	case OWNER = 4; //server terminal on BDS
-	case INTERNAL = 5;
+	public const NORMAL = 0;
+	public const OPERATOR = 1;
+	public const AUTOMATION = 2; //command blocks
+	public const HOST = 3; //hosting player on LAN multiplayer
+	public const OWNER = 4; //server terminal on BDS
+	public const INTERNAL = 5;
 
 	private const PERMISSION_NAMES = [ // enum case references requires PHP 8.2
 		0 => "any",
@@ -37,18 +39,18 @@ enum CommandPermissions : int{
 		5 => "internal",
 	];
 
-	public function getPermissionName() : string{
-		return self::PERMISSION_NAMES[$this->value];
+	public static function getPermissionName(int $value) : string{
+		return self::PERMISSION_NAMES[$value] ?? throw new PacketDecodeException("Invalid raw value $value for " . static::class);
 	}
 
-	public static function fromPermissionName(string $name) : self{
+	public static function fromPermissionName(string $name) : int{
 		static $cache = null;
 		if($cache === null){
 			$cache = array_flip(self::PERMISSION_NAMES);
 		}
 
 		$value = $cache[$name] ?? throw new PacketDecodeException("Invalid raw value $name for " . static::class);
 
-		return self::fromPacket($value);
+		return $value;
 	}
 }

src/types/command/raw/CommandRawData.php

@@ -19,7 +19,6 @@
 use pmmp\encoding\LE;
 use pmmp\encoding\VarInt;
 use pocketmine\network\mcpe\protocol\serializer\CommonTypes;
-use pocketmine\network\mcpe\protocol\types\command\CommandPermissions;
 use function count;
 
 final class CommandRawData{
@@ -34,7 +33,7 @@ public function __construct(
 		private string $name,
 		private string $description,
 		private int $flags,
-		private CommandPermissions $permission,
+		private string $permission,
 		private int $aliasEnumIndex,
 		private array $chainedSubCommandDataIndexes,
 		private array $overloads,
@@ -46,7 +45,7 @@ public function getDescription() : string{ return $this->description; }
 
 	public function getFlags() : int{ return $this->flags; }
 
-	public function getPermission() : CommandPermissions{ return $this->permission; }
+	public function getPermission() : string{ return $this->permission; }
 
 	public function getAliasEnumIndex() : int{ return $this->aliasEnumIndex; }
 
@@ -66,7 +65,7 @@ public static function read(ByteBufferReader $in) : self{
 		$name = CommonTypes::getString($in);
 		$description = CommonTypes::getString($in);
 		$flags = LE::readUnsignedShort($in);
-		$permission = CommandPermissions::fromPermissionName(CommonTypes::getString($in));
+		$permission = CommonTypes::getString($in);
 		$aliasEnumIndex = LE::readSignedInt($in); //may be -1 for not set
 
 		$chainedSubCommandDataIndexes = [];
@@ -94,7 +93,7 @@ public function write(ByteBufferWriter $out) : void{
 		CommonTypes::putString($out, $this->name);
 		CommonTypes::putString($out, $this->description);
 		LE::writeUnsignedShort($out, $this->flags);
-		CommonTypes::putString($out, $this->permission->getPermissionName());
+		CommonTypes::putString($out, $this->permission);
 		LE::writeSignedInt($out, $this->aliasEnumIndex);
 
 		VarInt::writeUnsignedInt($out, count($this->chainedSubCommandDataIndexes));