protocol: moved skin data types to their own namespace

This commit is contained in:
Dylan K. Taylor 2020-10-08 21:20:57 +01:00
parent 94c58c00b5
commit 01b44ab0bc
11 changed files with 21 additions and 20 deletions

View File

@ -25,8 +25,8 @@ namespace pocketmine\network\mcpe\convert;
use pocketmine\entity\InvalidSkinException; use pocketmine\entity\InvalidSkinException;
use pocketmine\entity\Skin; use pocketmine\entity\Skin;
use pocketmine\network\mcpe\protocol\types\SkinData; use pocketmine\network\mcpe\protocol\types\skin\SkinData;
use pocketmine\network\mcpe\protocol\types\SkinImage; use pocketmine\network\mcpe\protocol\types\skin\SkinImage;
use function is_array; use function is_array;
use function is_string; use function is_string;
use function json_decode; use function json_decode;

View File

@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\convert;
use pocketmine\entity\InvalidSkinException; use pocketmine\entity\InvalidSkinException;
use pocketmine\entity\Skin; use pocketmine\entity\Skin;
use pocketmine\network\mcpe\protocol\types\SkinData; use pocketmine\network\mcpe\protocol\types\skin\SkinData;
/** /**
* Used to convert new skin data to the skin entity or old skin entity to skin data. * Used to convert new skin data to the skin entity or old skin entity to skin data.

View File

@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\mcpe\protocol\serializer\PacketSerializer; use pocketmine\network\mcpe\protocol\serializer\PacketSerializer;
use pocketmine\network\mcpe\protocol\types\SkinData; use pocketmine\network\mcpe\protocol\types\skin\SkinData;
use pocketmine\uuid\UUID; use pocketmine\uuid\UUID;
class PlayerSkinPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ class PlayerSkinPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{

View File

@ -50,12 +50,12 @@ use pocketmine\network\mcpe\protocol\types\GameRule;
use pocketmine\network\mcpe\protocol\types\GameRuleType; use pocketmine\network\mcpe\protocol\types\GameRuleType;
use pocketmine\network\mcpe\protocol\types\IntGameRule; use pocketmine\network\mcpe\protocol\types\IntGameRule;
use pocketmine\network\mcpe\protocol\types\inventory\ItemStack; use pocketmine\network\mcpe\protocol\types\inventory\ItemStack;
use pocketmine\network\mcpe\protocol\types\PersonaPieceTintColor;
use pocketmine\network\mcpe\protocol\types\PersonaSkinPiece;
use pocketmine\network\mcpe\protocol\types\recipe\RecipeIngredient; use pocketmine\network\mcpe\protocol\types\recipe\RecipeIngredient;
use pocketmine\network\mcpe\protocol\types\SkinAnimation; use pocketmine\network\mcpe\protocol\types\skin\PersonaPieceTintColor;
use pocketmine\network\mcpe\protocol\types\SkinData; use pocketmine\network\mcpe\protocol\types\skin\PersonaSkinPiece;
use pocketmine\network\mcpe\protocol\types\SkinImage; use pocketmine\network\mcpe\protocol\types\skin\SkinAnimation;
use pocketmine\network\mcpe\protocol\types\skin\SkinData;
use pocketmine\network\mcpe\protocol\types\skin\SkinImage;
use pocketmine\network\mcpe\protocol\types\StructureEditorData; use pocketmine\network\mcpe\protocol\types\StructureEditorData;
use pocketmine\network\mcpe\protocol\types\StructureSettings; use pocketmine\network\mcpe\protocol\types\StructureSettings;
use pocketmine\utils\BinaryDataException; use pocketmine\utils\BinaryDataException;

View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace pocketmine\network\mcpe\protocol\types; namespace pocketmine\network\mcpe\protocol\types;
use pocketmine\network\mcpe\protocol\types\skin\SkinData;
use pocketmine\uuid\UUID; use pocketmine\uuid\UUID;
class PlayerListEntry{ class PlayerListEntry{

View File

@ -23,11 +23,11 @@ declare(strict_types=1);
namespace pocketmine\network\mcpe\protocol\types\login; namespace pocketmine\network\mcpe\protocol\types\login;
use pocketmine\network\mcpe\protocol\types\PersonaPieceTintColor; use pocketmine\network\mcpe\protocol\types\skin\PersonaPieceTintColor;
use pocketmine\network\mcpe\protocol\types\PersonaSkinPiece; use pocketmine\network\mcpe\protocol\types\skin\PersonaSkinPiece;
use pocketmine\network\mcpe\protocol\types\SkinAnimation; use pocketmine\network\mcpe\protocol\types\skin\SkinAnimation;
use pocketmine\network\mcpe\protocol\types\SkinData; use pocketmine\network\mcpe\protocol\types\skin\SkinData;
use pocketmine\network\mcpe\protocol\types\SkinImage; use pocketmine\network\mcpe\protocol\types\skin\SkinImage;
use pocketmine\utils\SingletonTrait; use pocketmine\utils\SingletonTrait;
use function array_map; use function array_map;
use function base64_decode; use function base64_decode;

View File

@ -21,7 +21,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace pocketmine\network\mcpe\protocol\types; namespace pocketmine\network\mcpe\protocol\types\skin;
final class PersonaPieceTintColor{ final class PersonaPieceTintColor{

View File

@ -21,7 +21,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace pocketmine\network\mcpe\protocol\types; namespace pocketmine\network\mcpe\protocol\types\skin;
final class PersonaSkinPiece{ final class PersonaSkinPiece{
@ -74,4 +74,4 @@ final class PersonaSkinPiece{
public function getProductId() : string{ public function getProductId() : string{
return $this->productId; return $this->productId;
} }
} }

View File

@ -21,7 +21,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace pocketmine\network\mcpe\protocol\types; namespace pocketmine\network\mcpe\protocol\types\skin;
class SkinAnimation{ class SkinAnimation{

View File

@ -21,7 +21,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace pocketmine\network\mcpe\protocol\types; namespace pocketmine\network\mcpe\protocol\types\skin;
use pocketmine\uuid\UUID; use pocketmine\uuid\UUID;

View File

@ -21,7 +21,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace pocketmine\network\mcpe\protocol\types; namespace pocketmine\network\mcpe\protocol\types\skin;
use function strlen; use function strlen;