diff --git a/src/network/mcpe/convert/LegacySkinAdapter.php b/src/network/mcpe/convert/LegacySkinAdapter.php index 93e476d86..898036697 100644 --- a/src/network/mcpe/convert/LegacySkinAdapter.php +++ b/src/network/mcpe/convert/LegacySkinAdapter.php @@ -25,8 +25,8 @@ namespace pocketmine\network\mcpe\convert; use pocketmine\entity\InvalidSkinException; use pocketmine\entity\Skin; -use pocketmine\network\mcpe\protocol\types\SkinData; -use pocketmine\network\mcpe\protocol\types\SkinImage; +use pocketmine\network\mcpe\protocol\types\skin\SkinData; +use pocketmine\network\mcpe\protocol\types\skin\SkinImage; use function is_array; use function is_string; use function json_decode; diff --git a/src/network/mcpe/convert/SkinAdapter.php b/src/network/mcpe/convert/SkinAdapter.php index b77b846e2..14ffc386d 100644 --- a/src/network/mcpe/convert/SkinAdapter.php +++ b/src/network/mcpe/convert/SkinAdapter.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\convert; use pocketmine\entity\InvalidSkinException; 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. diff --git a/src/network/mcpe/protocol/PlayerSkinPacket.php b/src/network/mcpe/protocol/PlayerSkinPacket.php index 99295e9e8..f97e783e3 100644 --- a/src/network/mcpe/protocol/PlayerSkinPacket.php +++ b/src/network/mcpe/protocol/PlayerSkinPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include 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; class PlayerSkinPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ diff --git a/src/network/mcpe/protocol/serializer/PacketSerializer.php b/src/network/mcpe/protocol/serializer/PacketSerializer.php index 1efd9fecb..970033666 100644 --- a/src/network/mcpe/protocol/serializer/PacketSerializer.php +++ b/src/network/mcpe/protocol/serializer/PacketSerializer.php @@ -50,12 +50,12 @@ use pocketmine\network\mcpe\protocol\types\GameRule; use pocketmine\network\mcpe\protocol\types\GameRuleType; use pocketmine\network\mcpe\protocol\types\IntGameRule; 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\SkinAnimation; -use pocketmine\network\mcpe\protocol\types\SkinData; -use pocketmine\network\mcpe\protocol\types\SkinImage; +use pocketmine\network\mcpe\protocol\types\skin\PersonaPieceTintColor; +use pocketmine\network\mcpe\protocol\types\skin\PersonaSkinPiece; +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\StructureSettings; use pocketmine\utils\BinaryDataException; diff --git a/src/network/mcpe/protocol/types/PlayerListEntry.php b/src/network/mcpe/protocol/types/PlayerListEntry.php index d90441062..9e9aa712b 100644 --- a/src/network/mcpe/protocol/types/PlayerListEntry.php +++ b/src/network/mcpe/protocol/types/PlayerListEntry.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace pocketmine\network\mcpe\protocol\types; +use pocketmine\network\mcpe\protocol\types\skin\SkinData; use pocketmine\uuid\UUID; class PlayerListEntry{ diff --git a/src/network/mcpe/protocol/types/login/ClientDataToSkinDataHelper.php b/src/network/mcpe/protocol/types/login/ClientDataToSkinDataHelper.php index 2ed495eb8..78af52ec9 100644 --- a/src/network/mcpe/protocol/types/login/ClientDataToSkinDataHelper.php +++ b/src/network/mcpe/protocol/types/login/ClientDataToSkinDataHelper.php @@ -23,11 +23,11 @@ declare(strict_types=1); namespace pocketmine\network\mcpe\protocol\types\login; -use pocketmine\network\mcpe\protocol\types\PersonaPieceTintColor; -use pocketmine\network\mcpe\protocol\types\PersonaSkinPiece; -use pocketmine\network\mcpe\protocol\types\SkinAnimation; -use pocketmine\network\mcpe\protocol\types\SkinData; -use pocketmine\network\mcpe\protocol\types\SkinImage; +use pocketmine\network\mcpe\protocol\types\skin\PersonaPieceTintColor; +use pocketmine\network\mcpe\protocol\types\skin\PersonaSkinPiece; +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\utils\SingletonTrait; use function array_map; use function base64_decode; diff --git a/src/network/mcpe/protocol/types/PersonaPieceTintColor.php b/src/network/mcpe/protocol/types/skin/PersonaPieceTintColor.php similarity index 96% rename from src/network/mcpe/protocol/types/PersonaPieceTintColor.php rename to src/network/mcpe/protocol/types/skin/PersonaPieceTintColor.php index 05231d3f1..2eaaa1fa3 100644 --- a/src/network/mcpe/protocol/types/PersonaPieceTintColor.php +++ b/src/network/mcpe/protocol/types/skin/PersonaPieceTintColor.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\skin; final class PersonaPieceTintColor{ diff --git a/src/network/mcpe/protocol/types/PersonaSkinPiece.php b/src/network/mcpe/protocol/types/skin/PersonaSkinPiece.php similarity index 97% rename from src/network/mcpe/protocol/types/PersonaSkinPiece.php rename to src/network/mcpe/protocol/types/skin/PersonaSkinPiece.php index bb22a1350..e198da964 100644 --- a/src/network/mcpe/protocol/types/PersonaSkinPiece.php +++ b/src/network/mcpe/protocol/types/skin/PersonaSkinPiece.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\skin; final class PersonaSkinPiece{ @@ -74,4 +74,4 @@ final class PersonaSkinPiece{ public function getProductId() : string{ return $this->productId; } -} \ No newline at end of file +} diff --git a/src/network/mcpe/protocol/types/SkinAnimation.php b/src/network/mcpe/protocol/types/skin/SkinAnimation.php similarity index 96% rename from src/network/mcpe/protocol/types/SkinAnimation.php rename to src/network/mcpe/protocol/types/skin/SkinAnimation.php index 40a9e9624..54f206a3e 100644 --- a/src/network/mcpe/protocol/types/SkinAnimation.php +++ b/src/network/mcpe/protocol/types/skin/SkinAnimation.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\skin; class SkinAnimation{ diff --git a/src/network/mcpe/protocol/types/SkinData.php b/src/network/mcpe/protocol/types/skin/SkinData.php similarity index 98% rename from src/network/mcpe/protocol/types/SkinData.php rename to src/network/mcpe/protocol/types/skin/SkinData.php index 4831c384f..3ad4e1e67 100644 --- a/src/network/mcpe/protocol/types/SkinData.php +++ b/src/network/mcpe/protocol/types/skin/SkinData.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\skin; use pocketmine\uuid\UUID; diff --git a/src/network/mcpe/protocol/types/SkinImage.php b/src/network/mcpe/protocol/types/skin/SkinImage.php similarity index 97% rename from src/network/mcpe/protocol/types/SkinImage.php rename to src/network/mcpe/protocol/types/skin/SkinImage.php index e6201524d..fa797cd7f 100644 --- a/src/network/mcpe/protocol/types/SkinImage.php +++ b/src/network/mcpe/protocol/types/skin/SkinImage.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\skin; use function strlen;