move SkinAdapter stuff to convert package

src/network/mcpe/convert/LegacySkinAdapter.php

@@ -0,0 +1,71 @@
+<?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\convert;
+
+use pocketmine\entity\Skin;
+
+use pocketmine\network\mcpe\protocol\types\SkinData;
+use pocketmine\network\mcpe\protocol\types\SkinImage;
+use function is_string;
+use function json_decode;
+use function json_encode;
+use function random_bytes;
+use function str_repeat;
+
+class LegacySkinAdapter implements SkinAdapter{
+
+	public function toSkinData(Skin $skin) : SkinData{
+		$capeData = $skin->getCapeData();
+		$capeImage = $capeData === "" ? new SkinImage(0, 0, "") : new SkinImage(32, 64, $capeData);
+		$geometryName = $skin->getGeometryName();
+		if($geometryName === ""){
+			$geometryName = "geometry.humanoid.custom";
+		}
+		return new SkinData(
+			$skin->getSkinId(),
+			json_encode(["geometry" => ["default" => $geometryName]]),
+			SkinImage::fromLegacy($skin->getSkinData()), [],
+			$capeImage,
+			$skin->getGeometryData()
+		);
+	}
+
+	public function fromSkinData(SkinData $data) : Skin{
+		if($data->isPersona()){
+			return new Skin("Standard_Custom", str_repeat(random_bytes(3) . "\xff", 2048));
+		}
+
+		$capeData = $data->isPersonaCapeOnClassic() ? "" : $data->getCapeImage()->getData();
+
+		$geometryName = "";
+		$resourcePatch = json_decode($data->getResourcePatch(), true);
+		if(isset($resourcePatch["geometry"]["default"]) && is_string($resourcePatch["geometry"]["default"])){
+			$geometryName = $resourcePatch["geometry"]["default"];
+		}else{
+			//TODO: Kick for invalid skin
+		}
+
+		return new Skin($data->getSkinId(), $data->getSkinImage()->getData(), $capeData, $geometryName, $data->getGeometryData());
+	}
+}

src/network/mcpe/convert/SkinAdapter.php

@@ -0,0 +1,43 @@
+<?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\convert;
+
+use pocketmine\entity\Skin;
+use pocketmine\network\mcpe\protocol\types\SkinData;
+
+/**
+ * Used to convert new skin data to the skin entity or old skin entity to skin data.
+ */
+interface SkinAdapter{
+
+	/**
+	 * Allows you to convert a skin entity to skin data.
+	 */
+	public function toSkinData(Skin $skin) : SkinData;
+
+	/**
+	 * Allows you to convert skin data to a skin entity.
+	 */
+	public function fromSkinData(SkinData $data) : Skin;
+}

src/network/mcpe/convert/SkinAdapterSingleton.php

@@ -0,0 +1,43 @@
+<?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\convert;
+
+/**
+ * Accessor for SkinAdapter
+ */
+class SkinAdapterSingleton{
+	/** @var SkinAdapter|null */
+	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) : void{
+		self::$skinAdapter = $adapter;
+	}
+}