From fae6289eb845cfc486b301488b97fbacc3c220c1 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 8 Aug 2019 19:58:24 +0100 Subject: [PATCH] protocol: move resource-pack related types to their own subnamespace --- src/network/mcpe/handler/ResourcePacksPacketHandler.php | 4 ++-- src/network/mcpe/protocol/ResourcePackDataInfoPacket.php | 2 +- src/network/mcpe/protocol/ResourcePackStackPacket.php | 2 +- src/network/mcpe/protocol/ResourcePacksInfoPacket.php | 2 +- .../types/{ => resourcepacks}/ResourcePackInfoEntry.php | 2 +- .../types/{ => resourcepacks}/ResourcePackStackEntry.php | 2 +- .../protocol/types/{ => resourcepacks}/ResourcePackType.php | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename src/network/mcpe/protocol/types/{ => resourcepacks}/ResourcePackInfoEntry.php (97%) rename src/network/mcpe/protocol/types/{ => resourcepacks}/ResourcePackStackEntry.php (96%) rename src/network/mcpe/protocol/types/{ => resourcepacks}/ResourcePackType.php (93%) diff --git a/src/network/mcpe/handler/ResourcePacksPacketHandler.php b/src/network/mcpe/handler/ResourcePacksPacketHandler.php index 5fe682fc0..91e389e02 100644 --- a/src/network/mcpe/handler/ResourcePacksPacketHandler.php +++ b/src/network/mcpe/handler/ResourcePacksPacketHandler.php @@ -30,8 +30,8 @@ use pocketmine\network\mcpe\protocol\ResourcePackClientResponsePacket; use pocketmine\network\mcpe\protocol\ResourcePackDataInfoPacket; use pocketmine\network\mcpe\protocol\ResourcePacksInfoPacket; use pocketmine\network\mcpe\protocol\ResourcePackStackPacket; -use pocketmine\network\mcpe\protocol\types\ResourcePackInfoEntry; -use pocketmine\network\mcpe\protocol\types\ResourcePackStackEntry; +use pocketmine\network\mcpe\protocol\types\resourcepacks\ResourcePackInfoEntry; +use pocketmine\network\mcpe\protocol\types\resourcepacks\ResourcePackStackEntry; use pocketmine\resourcepacks\ResourcePack; use pocketmine\resourcepacks\ResourcePackManager; use function array_map; diff --git a/src/network/mcpe/protocol/ResourcePackDataInfoPacket.php b/src/network/mcpe/protocol/ResourcePackDataInfoPacket.php index a9e824d47..c0bc3ad8e 100644 --- a/src/network/mcpe/protocol/ResourcePackDataInfoPacket.php +++ b/src/network/mcpe/protocol/ResourcePackDataInfoPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\handler\PacketHandler; -use pocketmine\network\mcpe\protocol\types\ResourcePackType; +use pocketmine\network\mcpe\protocol\types\resourcepacks\ResourcePackType; class ResourcePackDataInfoPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_DATA_INFO_PACKET; diff --git a/src/network/mcpe/protocol/ResourcePackStackPacket.php b/src/network/mcpe/protocol/ResourcePackStackPacket.php index 958bdc75f..ec8fd2081 100644 --- a/src/network/mcpe/protocol/ResourcePackStackPacket.php +++ b/src/network/mcpe/protocol/ResourcePackStackPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\handler\PacketHandler; -use pocketmine\network\mcpe\protocol\types\ResourcePackStackEntry; +use pocketmine\network\mcpe\protocol\types\resourcepacks\ResourcePackStackEntry; use function count; class ResourcePackStackPacket extends DataPacket implements ClientboundPacket{ diff --git a/src/network/mcpe/protocol/ResourcePacksInfoPacket.php b/src/network/mcpe/protocol/ResourcePacksInfoPacket.php index 6724d0b89..16113b7d7 100644 --- a/src/network/mcpe/protocol/ResourcePacksInfoPacket.php +++ b/src/network/mcpe/protocol/ResourcePacksInfoPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\handler\PacketHandler; -use pocketmine\network\mcpe\protocol\types\ResourcePackInfoEntry; +use pocketmine\network\mcpe\protocol\types\resourcepacks\ResourcePackInfoEntry; use function count; class ResourcePacksInfoPacket extends DataPacket implements ClientboundPacket{ diff --git a/src/network/mcpe/protocol/types/ResourcePackInfoEntry.php b/src/network/mcpe/protocol/types/resourcepacks/ResourcePackInfoEntry.php similarity index 97% rename from src/network/mcpe/protocol/types/ResourcePackInfoEntry.php rename to src/network/mcpe/protocol/types/resourcepacks/ResourcePackInfoEntry.php index f091b651f..e8331fbd3 100644 --- a/src/network/mcpe/protocol/types/ResourcePackInfoEntry.php +++ b/src/network/mcpe/protocol/types/resourcepacks/ResourcePackInfoEntry.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\resourcepacks; use pocketmine\network\mcpe\serializer\NetworkBinaryStream; diff --git a/src/network/mcpe/protocol/types/ResourcePackStackEntry.php b/src/network/mcpe/protocol/types/resourcepacks/ResourcePackStackEntry.php similarity index 96% rename from src/network/mcpe/protocol/types/ResourcePackStackEntry.php rename to src/network/mcpe/protocol/types/resourcepacks/ResourcePackStackEntry.php index 689a698c1..843a87ce5 100644 --- a/src/network/mcpe/protocol/types/ResourcePackStackEntry.php +++ b/src/network/mcpe/protocol/types/resourcepacks/ResourcePackStackEntry.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\resourcepacks; use pocketmine\network\mcpe\serializer\NetworkBinaryStream; diff --git a/src/network/mcpe/protocol/types/ResourcePackType.php b/src/network/mcpe/protocol/types/resourcepacks/ResourcePackType.php similarity index 93% rename from src/network/mcpe/protocol/types/ResourcePackType.php rename to src/network/mcpe/protocol/types/resourcepacks/ResourcePackType.php index 9efaced08..69556de60 100644 --- a/src/network/mcpe/protocol/types/ResourcePackType.php +++ b/src/network/mcpe/protocol/types/resourcepacks/ResourcePackType.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\resourcepacks; final class ResourcePackType{