Added network components for skins, to collect instead of throw out data

src/pocketmine/network/mcpe/NetworkBinaryStream.php

@@ -38,6 +38,7 @@ use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\IntTag;
 use pocketmine\network\mcpe\protocol\types\CommandOriginData;
 use pocketmine\network\mcpe\protocol\types\EntityLink;
+use pocketmine\network\mcpe\protocol\types\SkinData;
 use pocketmine\network\mcpe\protocol\types\SkinImage;
 use pocketmine\network\mcpe\protocol\types\SkinAnimation;
 use pocketmine\network\mcpe\protocol\types\StructureSettings;
@@ -77,7 +78,7 @@ class NetworkBinaryStream extends BinaryStream{
 		$this->putLInt($uuid->getPart(2));
 	}
 
-	public function getSkin() : Skin{
+	public function getSkin() : SkinData{
 		$skinId = $this->getString();
 		$skinResourcePatch = $this->getString();
 		$skinData = $this->getSkinImage();
@@ -99,32 +100,26 @@ class NetworkBinaryStream extends BinaryStream{
 		$capeId = $this->getString();
 		$fullSkinId = $this->getString();
 
-		return new Skin($skinId, $skinData->getData(), $capeData->getData(), $skinResourcePatch, $geometryData);
+		return new SkinData($skinId, $skinResourcePatch, $skinData, $animations, $capeData, $geometryData, $animationData, $premium, $persona, $capeOnClassic, $capeId);
 	}
 
-	public function putSkin(Skin $skin){
-		$this->putString($skin->getSkinId());
-		$this->putString($skin->getGeometryName()); //resource patch
-		$this->putSkinImage(SkinImage::fromLegacy($skin->getSkinData()));
-		/** @var SkinAnimation[] $animations */
-		$animations = [];
-		$this->putLInt(count($animations));
-		foreach($animations as $animation){
+	public function putSkin(SkinData $skin){
+		$this->putString($skin->skinId);
+		$this->putString($skin->resourcePatch); //resource patch
+		$this->putSkinImage($skin->skinImage);
+		$this->putLInt(count($skin->animations));
+		foreach($skin->animations as $animation){
 			$this->putSkinImage($animation->getImage());
 			$this->putLInt($animation->getType());
 			$this->putLFloat($animation->getFrames());
 		}
-		if($skin->getCapeData() !== ""){
-			$this->putSkinImage(new SkinImage(32, 64, $skin->getCapeData()));
-		}else{
-			$this->putSkinImage(new SkinImage(0, 0, ""));
-		}
-		$this->putString($skin->getGeometryData());
-		$this->putString(""); //animation data
-		$this->putBool(false); //isPremium
-		$this->putBool(false); //isPersona
-		$this->putBool(false); //isCapeOnClassic
-		$this->putString(""); //capeId
+		$this->putSkinImage($skin->capeImage);
+		$this->putString($skin->geometryData);
+		$this->putString($skin->animationData);
+		$this->putBool($skin->premium);
+		$this->putBool($skin->persona);
+		$this->putBool($skin->capeOnClassic);
+		$this->putString($skin->capeId);
 
 		//this has to be unique or the client will do stupid things
 		$this->putString(UUID::fromRandom()->toString()); //full skin ID

src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php

@@ -66,6 +66,8 @@ use pocketmine\network\mcpe\protocol\SetPlayerGameTypePacket;
 use pocketmine\network\mcpe\protocol\ShowCreditsPacket;
 use pocketmine\network\mcpe\protocol\SpawnExperienceOrbPacket;
 use pocketmine\network\mcpe\protocol\TextPacket;
+use pocketmine\network\mcpe\protocol\types\SkinAdapterSingleton;
+use pocketmine\network\mcpe\protocol\types\SkinData;
 use pocketmine\Player;
 use pocketmine\Server;
 use pocketmine\timings\Timings;
@@ -253,7 +255,7 @@ class PlayerNetworkSessionAdapter extends NetworkSession{
 	}
 
 	public function handlePlayerSkin(PlayerSkinPacket $packet) : bool{
-		return $this->player->changeSkin($packet->skin, $packet->newSkinName, $packet->oldSkinName);
+		return $this->player->changeSkin(SkinAdapterSingleton::get()->fromSkinData($packet->skin), $packet->newSkinName, $packet->oldSkinName);
 	}
 
 	public function handleBookEdit(BookEditPacket $packet) : bool{

src/pocketmine/network/mcpe/protocol/PlayerListPacket.php

@@ -27,6 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 
 use pocketmine\network\mcpe\NetworkSession;
+use pocketmine\network\mcpe\protocol\types\SkinData;
 use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
 use function count;
 
@@ -81,7 +82,7 @@ class PlayerListPacket extends DataPacket{
 				$this->putString($entry->xboxUserId);
 				$this->putString($entry->platformChatId);
 				$this->putLInt($entry->buildPlatform);
-				$this->putSkin($entry->skin);
+				$this->putSkin($entry->skinData);
 				$this->putBool($entry->isTeacher);
 				$this->putBool($entry->isHost);
 			}else{

src/pocketmine/network/mcpe/protocol/PlayerSkinPacket.php

@@ -25,8 +25,8 @@ namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
-use pocketmine\entity\Skin;
 use pocketmine\network\mcpe\NetworkSession;
+use pocketmine\network\mcpe\protocol\types\SkinData;
 use pocketmine\utils\UUID;
 
 class PlayerSkinPacket extends DataPacket{
@@ -38,7 +38,7 @@ class PlayerSkinPacket extends DataPacket{
 	public $oldSkinName = "";
 	/** @var string */
 	public $newSkinName = "";
-	/** @var Skin */
+	/** @var SkinData */
 	public $skin;
 
 	protected function decodePayload(){

src/pocketmine/network/mcpe/protocol/types/LegacySkinAdapter.php

@@ -0,0 +1,37 @@
+<?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\network\mcpe\protocol\types;
+
+use pocketmine\entity\Skin;
+
+class LegacySkinAdapter implements SkinAdapter{
+
+	public function toSkinData(Skin $skin) : SkinData{
+		return new SkinData($skin->getSkinId(), $skin->getGeometryName(), SkinImage::fromLegacy($skin->getSkinData()), [], new SkinImage(32, 64, $skin->getCapeData()), $skin->getGeometryData());
+	}
+
+	public function fromSkinData(SkinData $data) : Skin{
+		return new Skin($data->skinId, $data->skinImage->getData(), $data->capeImage->getData(), $data->resourcePatch, $data->geometryData);
+	}
+}

src/pocketmine/network/mcpe/protocol/types/PlayerListEntry.php

@@ -34,8 +34,8 @@ class PlayerListEntry{
 	public $entityUniqueId;
 	/** @var string */
 	public $username;
-	/** @var Skin */
-	public $skin;
+	/** @var SkinData */
+	public $skinData;
 	/** @var string */
 	public $xboxUserId;
 	/** @var string */
@@ -54,12 +54,12 @@ class PlayerListEntry{
 		return $entry;
 	}
 
-	public static function createAdditionEntry(UUID $uuid, int $entityUniqueId, string $username, Skin $skin, string $xboxUserId = "", string $platformChatId = "", int $buildPlatform = -1, bool $isTeacher = false, bool $isHost = false) : PlayerListEntry{
+	public static function createAdditionEntry(UUID $uuid, int $entityUniqueId, string $username, SkinData $skinData, string $xboxUserId = "", string $platformChatId = "", int $buildPlatform = -1, bool $isTeacher = false, bool $isHost = false) : PlayerListEntry{
 		$entry = new PlayerListEntry();
 		$entry->uuid = $uuid;
 		$entry->entityUniqueId = $entityUniqueId;
 		$entry->username = $username;
-		$entry->skin = $skin;
+		$entry->skinData = $skinData;
 		$entry->xboxUserId = $xboxUserId;
 		$entry->platformChatId = $platformChatId;
 		$entry->buildPlatform = $buildPlatform;

src/pocketmine/network/mcpe/protocol/types/SkinAdapter.php

@@ -0,0 +1,33 @@
+<?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\network\mcpe\protocol\types;
+
+use pocketmine\entity\Skin;
+
+interface SkinAdapter{
+
+	public function toSkinData(Skin $skin) : SkinData;
+
+	public function fromSkinData(SkinData $data) : Skin;
+}

src/pocketmine/network/mcpe/protocol/types/SkinAdapterSingleton.php

@@ -0,0 +1,40 @@
+<?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\network\mcpe\protocol\types;
+
+class SkinAdapterSingleton{
+
+	private static $skinAdapter = null;
+
+	public static function get() : SkinAdapter{
+		if(self::$skinAdapter === null){
+			self::$skinAdapter = new LegacySkinAdapter();
+		}
+		return self::$skinAdapter;
+	}
+
+	public static function set(SkinAdapter $adapter){
+		self::$skinAdapter = $adapter;
+	}
+}

src/pocketmine/network/mcpe/protocol/types/SkinData.php

@@ -0,0 +1,64 @@
+<?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\network\mcpe\protocol\types;
+
+class SkinData{
+
+	/** @var string */
+	public $skinId;
+	/** @var string */
+	public $resourcePatch;
+	/** @var SkinImage */
+	public $skinImage;
+	/** @var SkinAnimation[] */
+	public $animations;
+	/** @var SkinImage */
+	public $capeImage;
+	/** @var string */
+	public $geometryData;
+	/** @var string */
+	public $animationData;
+	/** @var bool */
+	public $persona;
+	/** @var bool */
+	public $premium;
+	/** @var bool */
+	public $capeOnClassic;
+	/** @var string */
+	public $capeId;
+
+	public function __construct(string $skinId, string $resourcePatch, SkinImage $skinImage, array $animations = [], SkinImage $capeImage = null, string $geometryData = "", string $animationData = "",  bool $premium = false, bool $persona = false, bool $capeOnClassic = false, string $capeId = ""){
+		$this->skinId = $skinId;
+		$this->resourcePatch = $resourcePatch;
+		$this->skinImage = $skinImage;
+		$this->animations = $animations;
+		$this->capeImage = $capeImage;
+		$this->geometryData = $geometryData;
+		$this->animationData = $animationData;
+		$this->premium = $premium;
+		$this->persona = $persona;
+		$this->capeOnClassic = $capeOnClassic;
+		$this->capeId = $capeId;
+	}
+}