diff --git a/src/pocketmine/entity/Animal.php b/src/pocketmine/entity/Animal.php index 3d5b26384..28ee08417 100644 --- a/src/pocketmine/entity/Animal.php +++ b/src/pocketmine/entity/Animal.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\entity; -use pocketmine\network\mcpe\protocol\types\EntityMetadataFlags; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataFlags; abstract class Animal extends Living implements Ageable{ diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php index 3aafc2b0b..8bd71020a 100644 --- a/src/pocketmine/entity/Entity.php +++ b/src/pocketmine/entity/Entity.php @@ -51,10 +51,10 @@ use pocketmine\network\mcpe\protocol\MoveActorAbsolutePacket; use pocketmine\network\mcpe\protocol\RemoveActorPacket; use pocketmine\network\mcpe\protocol\SetActorDataPacket; use pocketmine\network\mcpe\protocol\SetActorMotionPacket; -use pocketmine\network\mcpe\protocol\types\EntityMetadataCollection; -use pocketmine\network\mcpe\protocol\types\EntityMetadataFlags; -use pocketmine\network\mcpe\protocol\types\EntityMetadataProperties; -use pocketmine\network\mcpe\protocol\types\EntityMetadataTypes; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataCollection; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataFlags; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataProperties; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataTypes; use pocketmine\player\Player; use pocketmine\Server; use pocketmine\timings\Timings; diff --git a/src/pocketmine/entity/EntityFactory.php b/src/pocketmine/entity/EntityFactory.php index 4441ed274..b4b17fafb 100644 --- a/src/pocketmine/entity/EntityFactory.php +++ b/src/pocketmine/entity/EntityFactory.php @@ -42,7 +42,7 @@ use pocketmine\nbt\tag\FloatTag; use pocketmine\nbt\tag\IntTag; use pocketmine\nbt\tag\ListTag; use pocketmine\nbt\tag\StringTag; -use pocketmine\network\mcpe\protocol\types\EntityLegacyIds; +use pocketmine\network\mcpe\protocol\types\entity\EntityLegacyIds; use pocketmine\utils\Utils; use pocketmine\world\World; use function array_keys; diff --git a/src/pocketmine/entity/Human.php b/src/pocketmine/entity/Human.php index e72a5b494..daacc7264 100644 --- a/src/pocketmine/entity/Human.php +++ b/src/pocketmine/entity/Human.php @@ -45,10 +45,10 @@ use pocketmine\network\mcpe\protocol\ActorEventPacket; use pocketmine\network\mcpe\protocol\AddPlayerPacket; use pocketmine\network\mcpe\protocol\PlayerListPacket; use pocketmine\network\mcpe\protocol\PlayerSkinPacket; -use pocketmine\network\mcpe\protocol\types\EntityMetadataProperties; -use pocketmine\network\mcpe\protocol\types\EntityMetadataTypes; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataProperties; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataTypes; +use pocketmine\network\mcpe\protocol\types\entity\PlayerMetadataFlags; use pocketmine\network\mcpe\protocol\types\PlayerListEntry; -use pocketmine\network\mcpe\protocol\types\PlayerMetadataFlags; use pocketmine\player\Player; use pocketmine\utils\UUID; use pocketmine\world\sound\TotemUseSound; diff --git a/src/pocketmine/entity/Living.php b/src/pocketmine/entity/Living.php index b56b484b7..b10231c12 100644 --- a/src/pocketmine/entity/Living.php +++ b/src/pocketmine/entity/Living.php @@ -46,8 +46,8 @@ use pocketmine\nbt\tag\FloatTag; use pocketmine\nbt\tag\ListTag; use pocketmine\nbt\tag\ShortTag; use pocketmine\network\mcpe\protocol\ActorEventPacket; -use pocketmine\network\mcpe\protocol\types\EntityMetadataFlags; -use pocketmine\network\mcpe\protocol\types\EntityMetadataProperties; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataFlags; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataProperties; use pocketmine\player\Player; use pocketmine\timings\Timings; use pocketmine\utils\Binary; diff --git a/src/pocketmine/entity/Squid.php b/src/pocketmine/entity/Squid.php index dd6935d57..d2e5cc00e 100644 --- a/src/pocketmine/entity/Squid.php +++ b/src/pocketmine/entity/Squid.php @@ -29,7 +29,7 @@ use pocketmine\item\VanillaItems; use pocketmine\math\Vector3; use pocketmine\nbt\tag\CompoundTag; use pocketmine\network\mcpe\protocol\ActorEventPacket; -use pocketmine\network\mcpe\protocol\types\EntityLegacyIds; +use pocketmine\network\mcpe\protocol\types\entity\EntityLegacyIds; use function atan2; use function mt_rand; use function sqrt; diff --git a/src/pocketmine/entity/Villager.php b/src/pocketmine/entity/Villager.php index 9d684c835..417964eba 100644 --- a/src/pocketmine/entity/Villager.php +++ b/src/pocketmine/entity/Villager.php @@ -24,9 +24,9 @@ declare(strict_types=1); namespace pocketmine\entity; use pocketmine\nbt\tag\CompoundTag; -use pocketmine\network\mcpe\protocol\types\EntityLegacyIds; -use pocketmine\network\mcpe\protocol\types\EntityMetadataFlags; -use pocketmine\network\mcpe\protocol\types\EntityMetadataProperties; +use pocketmine\network\mcpe\protocol\types\entity\EntityLegacyIds; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataFlags; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataProperties; class Villager extends Living implements Ageable{ public const PROFESSION_FARMER = 0; diff --git a/src/pocketmine/entity/WaterAnimal.php b/src/pocketmine/entity/WaterAnimal.php index fc724462e..a98f8b192 100644 --- a/src/pocketmine/entity/WaterAnimal.php +++ b/src/pocketmine/entity/WaterAnimal.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\entity; use pocketmine\event\entity\EntityDamageEvent; -use pocketmine\network\mcpe\protocol\types\EntityMetadataFlags; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataFlags; abstract class WaterAnimal extends Living implements Ageable{ diff --git a/src/pocketmine/entity/Zombie.php b/src/pocketmine/entity/Zombie.php index b1cf5cd47..a33b191d7 100644 --- a/src/pocketmine/entity/Zombie.php +++ b/src/pocketmine/entity/Zombie.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\entity; use pocketmine\item\VanillaItems; -use pocketmine\network\mcpe\protocol\types\EntityLegacyIds; +use pocketmine\network\mcpe\protocol\types\entity\EntityLegacyIds; use function mt_rand; class Zombie extends Living{ diff --git a/src/pocketmine/entity/effect/EffectManager.php b/src/pocketmine/entity/effect/EffectManager.php index 3885b2cef..b8f88ac29 100644 --- a/src/pocketmine/entity/effect/EffectManager.php +++ b/src/pocketmine/entity/effect/EffectManager.php @@ -26,7 +26,7 @@ namespace pocketmine\entity\effect; use pocketmine\entity\Living; use pocketmine\event\entity\EntityEffectAddEvent; use pocketmine\event\entity\EntityEffectRemoveEvent; -use pocketmine\network\mcpe\protocol\types\EntityMetadataProperties; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataProperties; use pocketmine\utils\Color; use function abs; diff --git a/src/pocketmine/entity/object/ExperienceOrb.php b/src/pocketmine/entity/object/ExperienceOrb.php index 9c7e83020..6d89b372e 100644 --- a/src/pocketmine/entity/object/ExperienceOrb.php +++ b/src/pocketmine/entity/object/ExperienceOrb.php @@ -28,8 +28,8 @@ use pocketmine\entity\Human; use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\IntTag; use pocketmine\nbt\tag\ShortTag; -use pocketmine\network\mcpe\protocol\types\EntityLegacyIds; -use pocketmine\network\mcpe\protocol\types\EntityMetadataProperties; +use pocketmine\network\mcpe\protocol\types\entity\EntityLegacyIds; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataProperties; use pocketmine\player\Player; use function sqrt; diff --git a/src/pocketmine/entity/object/FallingBlock.php b/src/pocketmine/entity/object/FallingBlock.php index 7f6debc0a..db7ef94b6 100644 --- a/src/pocketmine/entity/object/FallingBlock.php +++ b/src/pocketmine/entity/object/FallingBlock.php @@ -32,8 +32,8 @@ use pocketmine\event\entity\EntityDamageEvent; use pocketmine\nbt\tag\ByteTag; use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\IntTag; -use pocketmine\network\mcpe\protocol\types\EntityLegacyIds; -use pocketmine\network\mcpe\protocol\types\EntityMetadataProperties; +use pocketmine\network\mcpe\protocol\types\entity\EntityLegacyIds; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataProperties; use function get_class; class FallingBlock extends Entity{ diff --git a/src/pocketmine/entity/object/ItemEntity.php b/src/pocketmine/entity/object/ItemEntity.php index 9aa18233b..085c5a754 100644 --- a/src/pocketmine/entity/object/ItemEntity.php +++ b/src/pocketmine/entity/object/ItemEntity.php @@ -31,7 +31,7 @@ use pocketmine\item\Item; use pocketmine\nbt\tag\CompoundTag; use pocketmine\network\mcpe\protocol\AddItemActorPacket; use pocketmine\network\mcpe\protocol\TakeItemActorPacket; -use pocketmine\network\mcpe\protocol\types\EntityLegacyIds; +use pocketmine\network\mcpe\protocol\types\entity\EntityLegacyIds; use pocketmine\player\Player; use function get_class; use function max; diff --git a/src/pocketmine/entity/object/Painting.php b/src/pocketmine/entity/object/Painting.php index eb0318a1d..a67804069 100644 --- a/src/pocketmine/entity/object/Painting.php +++ b/src/pocketmine/entity/object/Painting.php @@ -34,7 +34,7 @@ use pocketmine\math\Vector3; use pocketmine\nbt\tag\ByteTag; use pocketmine\nbt\tag\CompoundTag; use pocketmine\network\mcpe\protocol\AddPaintingPacket; -use pocketmine\network\mcpe\protocol\types\EntityLegacyIds; +use pocketmine\network\mcpe\protocol\types\entity\EntityLegacyIds; use pocketmine\player\Player; use pocketmine\world\particle\DestroyBlockParticle; use pocketmine\world\World; diff --git a/src/pocketmine/entity/object/PrimedTNT.php b/src/pocketmine/entity/object/PrimedTNT.php index 0a4f8364c..755325c58 100644 --- a/src/pocketmine/entity/object/PrimedTNT.php +++ b/src/pocketmine/entity/object/PrimedTNT.php @@ -29,9 +29,9 @@ use pocketmine\event\entity\EntityDamageEvent; use pocketmine\event\entity\ExplosionPrimeEvent; use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\ShortTag; -use pocketmine\network\mcpe\protocol\types\EntityLegacyIds; -use pocketmine\network\mcpe\protocol\types\EntityMetadataFlags; -use pocketmine\network\mcpe\protocol\types\EntityMetadataProperties; +use pocketmine\network\mcpe\protocol\types\entity\EntityLegacyIds; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataFlags; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataProperties; use pocketmine\world\Explosion; use pocketmine\world\Position; use pocketmine\world\sound\IgniteSound; diff --git a/src/pocketmine/entity/projectile/Arrow.php b/src/pocketmine/entity/projectile/Arrow.php index f38551b9e..25a32e35a 100644 --- a/src/pocketmine/entity/projectile/Arrow.php +++ b/src/pocketmine/entity/projectile/Arrow.php @@ -32,8 +32,8 @@ use pocketmine\math\RayTraceResult; use pocketmine\nbt\tag\CompoundTag; use pocketmine\network\mcpe\protocol\ActorEventPacket; use pocketmine\network\mcpe\protocol\TakeItemActorPacket; -use pocketmine\network\mcpe\protocol\types\EntityLegacyIds; -use pocketmine\network\mcpe\protocol\types\EntityMetadataFlags; +use pocketmine\network\mcpe\protocol\types\entity\EntityLegacyIds; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataFlags; use pocketmine\player\Player; use pocketmine\world\sound\ArrowHitSound; use pocketmine\world\World; diff --git a/src/pocketmine/entity/projectile/Egg.php b/src/pocketmine/entity/projectile/Egg.php index c736bf288..367dc2e7b 100644 --- a/src/pocketmine/entity/projectile/Egg.php +++ b/src/pocketmine/entity/projectile/Egg.php @@ -25,7 +25,7 @@ namespace pocketmine\entity\projectile; use pocketmine\event\entity\ProjectileHitEvent; use pocketmine\item\VanillaItems; -use pocketmine\network\mcpe\protocol\types\EntityLegacyIds; +use pocketmine\network\mcpe\protocol\types\entity\EntityLegacyIds; use pocketmine\world\particle\ItemBreakParticle; class Egg extends Throwable{ diff --git a/src/pocketmine/entity/projectile/EnderPearl.php b/src/pocketmine/entity/projectile/EnderPearl.php index c438903dc..bf7d6d2f7 100644 --- a/src/pocketmine/entity/projectile/EnderPearl.php +++ b/src/pocketmine/entity/projectile/EnderPearl.php @@ -30,7 +30,7 @@ use pocketmine\event\entity\ProjectileHitEvent; use pocketmine\math\AxisAlignedBB; use pocketmine\math\RayTraceResult; use pocketmine\math\Vector3; -use pocketmine\network\mcpe\protocol\types\EntityLegacyIds; +use pocketmine\network\mcpe\protocol\types\entity\EntityLegacyIds; use pocketmine\world\particle\EndermanTeleportParticle; use pocketmine\world\sound\EndermanTeleportSound; diff --git a/src/pocketmine/entity/projectile/ExperienceBottle.php b/src/pocketmine/entity/projectile/ExperienceBottle.php index 879eb627d..95c0a9465 100644 --- a/src/pocketmine/entity/projectile/ExperienceBottle.php +++ b/src/pocketmine/entity/projectile/ExperienceBottle.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\entity\projectile; use pocketmine\event\entity\ProjectileHitEvent; -use pocketmine\network\mcpe\protocol\types\EntityLegacyIds; +use pocketmine\network\mcpe\protocol\types\entity\EntityLegacyIds; use pocketmine\world\particle\PotionSplashParticle; use pocketmine\world\sound\PotionSplashSound; use function mt_rand; diff --git a/src/pocketmine/entity/projectile/Snowball.php b/src/pocketmine/entity/projectile/Snowball.php index ccaab4598..6e7d09084 100644 --- a/src/pocketmine/entity/projectile/Snowball.php +++ b/src/pocketmine/entity/projectile/Snowball.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\entity\projectile; use pocketmine\event\entity\ProjectileHitEvent; -use pocketmine\network\mcpe\protocol\types\EntityLegacyIds; +use pocketmine\network\mcpe\protocol\types\entity\EntityLegacyIds; use pocketmine\world\particle\SnowballPoofParticle; class Snowball extends Throwable{ diff --git a/src/pocketmine/entity/projectile/SplashPotion.php b/src/pocketmine/entity/projectile/SplashPotion.php index 343037f01..7d589dd20 100644 --- a/src/pocketmine/entity/projectile/SplashPotion.php +++ b/src/pocketmine/entity/projectile/SplashPotion.php @@ -33,9 +33,9 @@ use pocketmine\event\entity\ProjectileHitEntityEvent; use pocketmine\event\entity\ProjectileHitEvent; use pocketmine\item\Potion; use pocketmine\nbt\tag\CompoundTag; -use pocketmine\network\mcpe\protocol\types\EntityLegacyIds; -use pocketmine\network\mcpe\protocol\types\EntityMetadataFlags; -use pocketmine\network\mcpe\protocol\types\EntityMetadataProperties; +use pocketmine\network\mcpe\protocol\types\entity\EntityLegacyIds; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataFlags; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataProperties; use pocketmine\utils\Color; use pocketmine\world\particle\PotionSplashParticle; use pocketmine\world\sound\PotionSplashSound; diff --git a/src/pocketmine/inventory/transaction/CraftingTransaction.php b/src/pocketmine/inventory/transaction/CraftingTransaction.php index 6ea0a3640..8b710278f 100644 --- a/src/pocketmine/inventory/transaction/CraftingTransaction.php +++ b/src/pocketmine/inventory/transaction/CraftingTransaction.php @@ -27,7 +27,7 @@ use pocketmine\crafting\CraftingRecipe; use pocketmine\event\inventory\CraftItemEvent; use pocketmine\item\Item; use pocketmine\network\mcpe\protocol\ContainerClosePacket; -use pocketmine\network\mcpe\protocol\types\ContainerIds; +use pocketmine\network\mcpe\protocol\types\inventory\ContainerIds; use function array_pop; use function count; use function intdiv; diff --git a/src/pocketmine/network/mcpe/InventoryManager.php b/src/pocketmine/network/mcpe/InventoryManager.php index b88e240ed..f98a46b5a 100644 --- a/src/pocketmine/network/mcpe/InventoryManager.php +++ b/src/pocketmine/network/mcpe/InventoryManager.php @@ -37,8 +37,8 @@ use pocketmine\network\mcpe\protocol\ContainerSetDataPacket; use pocketmine\network\mcpe\protocol\InventoryContentPacket; use pocketmine\network\mcpe\protocol\InventorySlotPacket; use pocketmine\network\mcpe\protocol\PlayerHotbarPacket; -use pocketmine\network\mcpe\protocol\types\ContainerIds; -use pocketmine\network\mcpe\protocol\types\WindowTypes; +use pocketmine\network\mcpe\protocol\types\inventory\ContainerIds; +use pocketmine\network\mcpe\protocol\types\inventory\WindowTypes; use pocketmine\player\Player; use function array_search; use function max; diff --git a/src/pocketmine/network/mcpe/NetworkSession.php b/src/pocketmine/network/mcpe/NetworkSession.php index 048d2e778..5acf0394b 100644 --- a/src/pocketmine/network/mcpe/NetworkSession.php +++ b/src/pocketmine/network/mcpe/NetworkSession.php @@ -66,10 +66,10 @@ use pocketmine\network\mcpe\protocol\SetPlayerGameTypePacket; use pocketmine\network\mcpe\protocol\SetSpawnPositionPacket; use pocketmine\network\mcpe\protocol\TextPacket; use pocketmine\network\mcpe\protocol\TransferPacket; -use pocketmine\network\mcpe\protocol\types\CommandData; -use pocketmine\network\mcpe\protocol\types\CommandEnum; -use pocketmine\network\mcpe\protocol\types\CommandParameter; -use pocketmine\network\mcpe\protocol\types\ContainerIds; +use pocketmine\network\mcpe\protocol\types\command\CommandData; +use pocketmine\network\mcpe\protocol\types\command\CommandEnum; +use pocketmine\network\mcpe\protocol\types\command\CommandParameter; +use pocketmine\network\mcpe\protocol\types\inventory\ContainerIds; use pocketmine\network\mcpe\protocol\types\PlayerListEntry; use pocketmine\network\mcpe\protocol\types\PlayerPermissions; use pocketmine\network\mcpe\protocol\UpdateAttributesPacket; diff --git a/src/pocketmine/network/mcpe/handler/InGamePacketHandler.php b/src/pocketmine/network/mcpe/handler/InGamePacketHandler.php index a9ea0ac49..7478472ae 100644 --- a/src/pocketmine/network/mcpe/handler/InGamePacketHandler.php +++ b/src/pocketmine/network/mcpe/handler/InGamePacketHandler.php @@ -75,11 +75,11 @@ use pocketmine\network\mcpe\protocol\ShowCreditsPacket; use pocketmine\network\mcpe\protocol\SpawnExperienceOrbPacket; use pocketmine\network\mcpe\protocol\SubClientLoginPacket; use pocketmine\network\mcpe\protocol\TextPacket; -use pocketmine\network\mcpe\protocol\types\MismatchTransactionData; -use pocketmine\network\mcpe\protocol\types\NormalTransactionData; -use pocketmine\network\mcpe\protocol\types\ReleaseItemTransactionData; -use pocketmine\network\mcpe\protocol\types\UseItemOnEntityTransactionData; -use pocketmine\network\mcpe\protocol\types\UseItemTransactionData; +use pocketmine\network\mcpe\protocol\types\inventory\MismatchTransactionData; +use pocketmine\network\mcpe\protocol\types\inventory\NormalTransactionData; +use pocketmine\network\mcpe\protocol\types\inventory\ReleaseItemTransactionData; +use pocketmine\network\mcpe\protocol\types\inventory\UseItemOnEntityTransactionData; +use pocketmine\network\mcpe\protocol\types\inventory\UseItemTransactionData; use pocketmine\network\mcpe\serializer\NetworkNbtSerializer; use pocketmine\player\Player; use function array_push; diff --git a/src/pocketmine/network/mcpe/protocol/AddActorPacket.php b/src/pocketmine/network/mcpe/protocol/AddActorPacket.php index 6a875d336..e854484f2 100644 --- a/src/pocketmine/network/mcpe/protocol/AddActorPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddActorPacket.php @@ -29,8 +29,8 @@ use pocketmine\entity\Attribute; use pocketmine\math\Vector3; use pocketmine\network\BadPacketException; use pocketmine\network\mcpe\handler\PacketHandler; -use pocketmine\network\mcpe\protocol\types\EntityLegacyIds; -use pocketmine\network\mcpe\protocol\types\EntityLink; +use pocketmine\network\mcpe\protocol\types\entity\EntityLegacyIds; +use pocketmine\network\mcpe\protocol\types\entity\EntityLink; use function array_search; use function count; diff --git a/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php b/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php index cc2c172b5..10a5964c3 100644 --- a/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\item\Item; use pocketmine\math\Vector3; use pocketmine\network\mcpe\handler\PacketHandler; -use pocketmine\network\mcpe\protocol\types\EntityLink; +use pocketmine\network\mcpe\protocol\types\entity\EntityLink; use pocketmine\utils\UUID; use function count; diff --git a/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php b/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php index a1d165c21..efcda29ed 100644 --- a/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php @@ -27,9 +27,9 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\BadPacketException; use pocketmine\network\mcpe\handler\PacketHandler; -use pocketmine\network\mcpe\protocol\types\CommandData; -use pocketmine\network\mcpe\protocol\types\CommandEnum; -use pocketmine\network\mcpe\protocol\types\CommandParameter; +use pocketmine\network\mcpe\protocol\types\command\CommandData; +use pocketmine\network\mcpe\protocol\types\command\CommandEnum; +use pocketmine\network\mcpe\protocol\types\command\CommandParameter; use pocketmine\utils\BinaryDataException; use function count; use function dechex; diff --git a/src/pocketmine/network/mcpe/protocol/CommandOutputPacket.php b/src/pocketmine/network/mcpe/protocol/CommandOutputPacket.php index b05450d28..36ac89a2c 100644 --- a/src/pocketmine/network/mcpe/protocol/CommandOutputPacket.php +++ b/src/pocketmine/network/mcpe/protocol/CommandOutputPacket.php @@ -26,8 +26,8 @@ namespace pocketmine\network\mcpe\protocol; #include use pocketmine\network\mcpe\handler\PacketHandler; -use pocketmine\network\mcpe\protocol\types\CommandOriginData; -use pocketmine\network\mcpe\protocol\types\CommandOutputMessage; +use pocketmine\network\mcpe\protocol\types\command\CommandOriginData; +use pocketmine\network\mcpe\protocol\types\command\CommandOutputMessage; use pocketmine\utils\BinaryDataException; use function count; diff --git a/src/pocketmine/network/mcpe/protocol/CommandRequestPacket.php b/src/pocketmine/network/mcpe/protocol/CommandRequestPacket.php index a0d009a03..293acb1db 100644 --- a/src/pocketmine/network/mcpe/protocol/CommandRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/CommandRequestPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include use pocketmine\network\mcpe\handler\PacketHandler; -use pocketmine\network\mcpe\protocol\types\CommandOriginData; +use pocketmine\network\mcpe\protocol\types\command\CommandOriginData; class CommandRequestPacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::COMMAND_REQUEST_PACKET; diff --git a/src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php b/src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php index 9eed4cd8f..a4cb59f83 100644 --- a/src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php +++ b/src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php @@ -27,12 +27,12 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\BadPacketException; use pocketmine\network\mcpe\handler\PacketHandler; -use pocketmine\network\mcpe\protocol\types\MismatchTransactionData; -use pocketmine\network\mcpe\protocol\types\NormalTransactionData; -use pocketmine\network\mcpe\protocol\types\ReleaseItemTransactionData; -use pocketmine\network\mcpe\protocol\types\TransactionData; -use pocketmine\network\mcpe\protocol\types\UseItemOnEntityTransactionData; -use pocketmine\network\mcpe\protocol\types\UseItemTransactionData; +use pocketmine\network\mcpe\protocol\types\inventory\MismatchTransactionData; +use pocketmine\network\mcpe\protocol\types\inventory\NormalTransactionData; +use pocketmine\network\mcpe\protocol\types\inventory\ReleaseItemTransactionData; +use pocketmine\network\mcpe\protocol\types\inventory\TransactionData; +use pocketmine\network\mcpe\protocol\types\inventory\UseItemOnEntityTransactionData; +use pocketmine\network\mcpe\protocol\types\inventory\UseItemTransactionData; /** * This packet effectively crams multiple packets into one. diff --git a/src/pocketmine/network/mcpe/protocol/PlayerHotbarPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerHotbarPacket.php index 02a98a81e..e0c9e53fb 100644 --- a/src/pocketmine/network/mcpe/protocol/PlayerHotbarPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayerHotbarPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include use pocketmine\network\mcpe\handler\PacketHandler; -use pocketmine\network\mcpe\protocol\types\ContainerIds; +use pocketmine\network\mcpe\protocol\types\inventory\ContainerIds; class PlayerHotbarPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::PLAYER_HOTBAR_PACKET; diff --git a/src/pocketmine/network/mcpe/protocol/SetActorLinkPacket.php b/src/pocketmine/network/mcpe/protocol/SetActorLinkPacket.php index 91b3a91ee..a8cfbb421 100644 --- a/src/pocketmine/network/mcpe/protocol/SetActorLinkPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetActorLinkPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\handler\PacketHandler; -use pocketmine\network\mcpe\protocol\types\EntityLink; +use pocketmine\network\mcpe\protocol\types\entity\EntityLink; class SetActorLinkPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::SET_ACTOR_LINK_PACKET; diff --git a/src/pocketmine/network/mcpe/protocol/UpdateTradePacket.php b/src/pocketmine/network/mcpe/protocol/UpdateTradePacket.php index 28c65d259..bfb0537f0 100644 --- a/src/pocketmine/network/mcpe/protocol/UpdateTradePacket.php +++ b/src/pocketmine/network/mcpe/protocol/UpdateTradePacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\handler\PacketHandler; -use pocketmine\network\mcpe\protocol\types\WindowTypes; +use pocketmine\network\mcpe\protocol\types\inventory\WindowTypes; class UpdateTradePacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::UPDATE_TRADE_PACKET; diff --git a/src/pocketmine/network/mcpe/protocol/types/CommandData.php b/src/pocketmine/network/mcpe/protocol/types/command/CommandData.php similarity index 92% rename from src/pocketmine/network/mcpe/protocol/types/CommandData.php rename to src/pocketmine/network/mcpe/protocol/types/command/CommandData.php index 95bab2253..5cb462813 100644 --- a/src/pocketmine/network/mcpe/protocol/types/CommandData.php +++ b/src/pocketmine/network/mcpe/protocol/types/command/CommandData.php @@ -21,7 +21,10 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\command; + +use pocketmine\network\mcpe\protocol\types\command\CommandEnum; +use pocketmine\network\mcpe\protocol\types\command\CommandParameter; class CommandData{ /** @var string */ diff --git a/src/pocketmine/network/mcpe/protocol/types/CommandEnum.php b/src/pocketmine/network/mcpe/protocol/types/command/CommandEnum.php similarity index 95% rename from src/pocketmine/network/mcpe/protocol/types/CommandEnum.php rename to src/pocketmine/network/mcpe/protocol/types/command/CommandEnum.php index 02597e90e..2a46c260b 100644 --- a/src/pocketmine/network/mcpe/protocol/types/CommandEnum.php +++ b/src/pocketmine/network/mcpe/protocol/types/command/CommandEnum.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\command; class CommandEnum{ /** @var string */ diff --git a/src/pocketmine/network/mcpe/protocol/types/CommandOriginData.php b/src/pocketmine/network/mcpe/protocol/types/command/CommandOriginData.php similarity index 96% rename from src/pocketmine/network/mcpe/protocol/types/CommandOriginData.php rename to src/pocketmine/network/mcpe/protocol/types/command/CommandOriginData.php index ca35b39f7..4214f8a0e 100644 --- a/src/pocketmine/network/mcpe/protocol/types/CommandOriginData.php +++ b/src/pocketmine/network/mcpe/protocol/types/command/CommandOriginData.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\command; use pocketmine\utils\UUID; diff --git a/src/pocketmine/network/mcpe/protocol/types/CommandOutputMessage.php b/src/pocketmine/network/mcpe/protocol/types/command/CommandOutputMessage.php similarity index 93% rename from src/pocketmine/network/mcpe/protocol/types/CommandOutputMessage.php rename to src/pocketmine/network/mcpe/protocol/types/command/CommandOutputMessage.php index a2434f990..1bb18c2a3 100644 --- a/src/pocketmine/network/mcpe/protocol/types/CommandOutputMessage.php +++ b/src/pocketmine/network/mcpe/protocol/types/command/CommandOutputMessage.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\command; class CommandOutputMessage{ /** @var bool */ diff --git a/src/pocketmine/network/mcpe/protocol/types/CommandParameter.php b/src/pocketmine/network/mcpe/protocol/types/command/CommandParameter.php similarity index 94% rename from src/pocketmine/network/mcpe/protocol/types/CommandParameter.php rename to src/pocketmine/network/mcpe/protocol/types/command/CommandParameter.php index d19c7b9a8..8234e099b 100644 --- a/src/pocketmine/network/mcpe/protocol/types/CommandParameter.php +++ b/src/pocketmine/network/mcpe/protocol/types/command/CommandParameter.php @@ -21,9 +21,10 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\command; use pocketmine\network\mcpe\protocol\AvailableCommandsPacket; +use pocketmine\network\mcpe\protocol\types\command\CommandEnum; class CommandParameter{ /** @var string */ diff --git a/src/pocketmine/network/mcpe/protocol/types/EntityLegacyIds.php b/src/pocketmine/network/mcpe/protocol/types/entity/EntityLegacyIds.php similarity index 98% rename from src/pocketmine/network/mcpe/protocol/types/EntityLegacyIds.php rename to src/pocketmine/network/mcpe/protocol/types/entity/EntityLegacyIds.php index caa93bb2a..a59e0a628 100644 --- a/src/pocketmine/network/mcpe/protocol/types/EntityLegacyIds.php +++ b/src/pocketmine/network/mcpe/protocol/types/entity/EntityLegacyIds.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\entity; final class EntityLegacyIds{ diff --git a/src/pocketmine/network/mcpe/protocol/types/EntityLink.php b/src/pocketmine/network/mcpe/protocol/types/entity/EntityLink.php similarity index 95% rename from src/pocketmine/network/mcpe/protocol/types/EntityLink.php rename to src/pocketmine/network/mcpe/protocol/types/entity/EntityLink.php index c5386e682..1f35615b0 100644 --- a/src/pocketmine/network/mcpe/protocol/types/EntityLink.php +++ b/src/pocketmine/network/mcpe/protocol/types/entity/EntityLink.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\entity; class EntityLink{ diff --git a/src/pocketmine/network/mcpe/protocol/types/EntityMetadataCollection.php b/src/pocketmine/network/mcpe/protocol/types/entity/EntityMetadataCollection.php similarity index 98% rename from src/pocketmine/network/mcpe/protocol/types/EntityMetadataCollection.php rename to src/pocketmine/network/mcpe/protocol/types/entity/EntityMetadataCollection.php index 1fca87d66..c56f5be5c 100644 --- a/src/pocketmine/network/mcpe/protocol/types/EntityMetadataCollection.php +++ b/src/pocketmine/network/mcpe/protocol/types/entity/EntityMetadataCollection.php @@ -21,10 +21,11 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\entity; use pocketmine\item\Item; use pocketmine\math\Vector3; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataTypes; use function assert; use function is_float; use function is_int; diff --git a/src/pocketmine/network/mcpe/protocol/types/EntityMetadataFlags.php b/src/pocketmine/network/mcpe/protocol/types/entity/EntityMetadataFlags.php similarity index 98% rename from src/pocketmine/network/mcpe/protocol/types/EntityMetadataFlags.php rename to src/pocketmine/network/mcpe/protocol/types/entity/EntityMetadataFlags.php index 566cf5ae1..906ab3252 100644 --- a/src/pocketmine/network/mcpe/protocol/types/EntityMetadataFlags.php +++ b/src/pocketmine/network/mcpe/protocol/types/entity/EntityMetadataFlags.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\entity; final class EntityMetadataFlags{ diff --git a/src/pocketmine/network/mcpe/protocol/types/EntityMetadataProperties.php b/src/pocketmine/network/mcpe/protocol/types/entity/EntityMetadataProperties.php similarity index 99% rename from src/pocketmine/network/mcpe/protocol/types/EntityMetadataProperties.php rename to src/pocketmine/network/mcpe/protocol/types/entity/EntityMetadataProperties.php index 7318f118f..67b4e6e01 100644 --- a/src/pocketmine/network/mcpe/protocol/types/EntityMetadataProperties.php +++ b/src/pocketmine/network/mcpe/protocol/types/entity/EntityMetadataProperties.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\entity; final class EntityMetadataProperties{ diff --git a/src/pocketmine/network/mcpe/protocol/types/EntityMetadataTypes.php b/src/pocketmine/network/mcpe/protocol/types/entity/EntityMetadataTypes.php similarity index 94% rename from src/pocketmine/network/mcpe/protocol/types/EntityMetadataTypes.php rename to src/pocketmine/network/mcpe/protocol/types/entity/EntityMetadataTypes.php index d3d9f1569..5aeaccf78 100644 --- a/src/pocketmine/network/mcpe/protocol/types/EntityMetadataTypes.php +++ b/src/pocketmine/network/mcpe/protocol/types/entity/EntityMetadataTypes.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\entity; final class EntityMetadataTypes{ diff --git a/src/pocketmine/network/mcpe/protocol/types/PlayerMetadataFlags.php b/src/pocketmine/network/mcpe/protocol/types/entity/PlayerMetadataFlags.php similarity index 93% rename from src/pocketmine/network/mcpe/protocol/types/PlayerMetadataFlags.php rename to src/pocketmine/network/mcpe/protocol/types/entity/PlayerMetadataFlags.php index 015229ecc..65f73abc3 100644 --- a/src/pocketmine/network/mcpe/protocol/types/PlayerMetadataFlags.php +++ b/src/pocketmine/network/mcpe/protocol/types/entity/PlayerMetadataFlags.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\entity; final class PlayerMetadataFlags{ diff --git a/src/pocketmine/network/mcpe/protocol/types/ContainerIds.php b/src/pocketmine/network/mcpe/protocol/types/inventory/ContainerIds.php similarity index 94% rename from src/pocketmine/network/mcpe/protocol/types/ContainerIds.php rename to src/pocketmine/network/mcpe/protocol/types/inventory/ContainerIds.php index 3b55065e5..6a9e70ba3 100644 --- a/src/pocketmine/network/mcpe/protocol/types/ContainerIds.php +++ b/src/pocketmine/network/mcpe/protocol/types/inventory/ContainerIds.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\inventory; interface ContainerIds{ diff --git a/src/pocketmine/network/mcpe/protocol/types/MismatchTransactionData.php b/src/pocketmine/network/mcpe/protocol/types/inventory/MismatchTransactionData.php similarity index 91% rename from src/pocketmine/network/mcpe/protocol/types/MismatchTransactionData.php rename to src/pocketmine/network/mcpe/protocol/types/inventory/MismatchTransactionData.php index 3cf69f5c2..d34d6c4b0 100644 --- a/src/pocketmine/network/mcpe/protocol/types/MismatchTransactionData.php +++ b/src/pocketmine/network/mcpe/protocol/types/inventory/MismatchTransactionData.php @@ -21,10 +21,11 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\inventory; use pocketmine\network\BadPacketException; use pocketmine\network\mcpe\protocol\InventoryTransactionPacket; +use pocketmine\network\mcpe\protocol\types\inventory\TransactionData; use pocketmine\network\mcpe\serializer\NetworkBinaryStream; use function count; diff --git a/src/pocketmine/network/mcpe/protocol/types/NetworkInventoryAction.php b/src/pocketmine/network/mcpe/protocol/types/inventory/NetworkInventoryAction.php similarity index 99% rename from src/pocketmine/network/mcpe/protocol/types/NetworkInventoryAction.php rename to src/pocketmine/network/mcpe/protocol/types/inventory/NetworkInventoryAction.php index 4a195f58c..00b05f4f3 100644 --- a/src/pocketmine/network/mcpe/protocol/types/NetworkInventoryAction.php +++ b/src/pocketmine/network/mcpe/protocol/types/inventory/NetworkInventoryAction.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\inventory; use pocketmine\inventory\AnvilInventory; use pocketmine\inventory\EnchantInventory; diff --git a/src/pocketmine/network/mcpe/protocol/types/NormalTransactionData.php b/src/pocketmine/network/mcpe/protocol/types/inventory/NormalTransactionData.php similarity index 86% rename from src/pocketmine/network/mcpe/protocol/types/NormalTransactionData.php rename to src/pocketmine/network/mcpe/protocol/types/inventory/NormalTransactionData.php index cb4e8c3ba..70cc89305 100644 --- a/src/pocketmine/network/mcpe/protocol/types/NormalTransactionData.php +++ b/src/pocketmine/network/mcpe/protocol/types/inventory/NormalTransactionData.php @@ -21,9 +21,11 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\inventory; use pocketmine\network\mcpe\protocol\InventoryTransactionPacket; +use pocketmine\network\mcpe\protocol\types\inventory\TransactionData; +use pocketmine\network\mcpe\protocol\types\inventory\NetworkInventoryAction; use pocketmine\network\mcpe\serializer\NetworkBinaryStream; class NormalTransactionData extends TransactionData{ diff --git a/src/pocketmine/network/mcpe/protocol/types/ReleaseItemTransactionData.php b/src/pocketmine/network/mcpe/protocol/types/inventory/ReleaseItemTransactionData.php similarity index 95% rename from src/pocketmine/network/mcpe/protocol/types/ReleaseItemTransactionData.php rename to src/pocketmine/network/mcpe/protocol/types/inventory/ReleaseItemTransactionData.php index 9e5d374fa..70e081c1d 100644 --- a/src/pocketmine/network/mcpe/protocol/types/ReleaseItemTransactionData.php +++ b/src/pocketmine/network/mcpe/protocol/types/inventory/ReleaseItemTransactionData.php @@ -21,11 +21,12 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\inventory; use pocketmine\item\Item; use pocketmine\math\Vector3; use pocketmine\network\mcpe\protocol\InventoryTransactionPacket; +use pocketmine\network\mcpe\protocol\types\inventory\TransactionData; use pocketmine\network\mcpe\serializer\NetworkBinaryStream; class ReleaseItemTransactionData extends TransactionData{ diff --git a/src/pocketmine/network/mcpe/protocol/types/TransactionData.php b/src/pocketmine/network/mcpe/protocol/types/inventory/TransactionData.php similarity index 93% rename from src/pocketmine/network/mcpe/protocol/types/TransactionData.php rename to src/pocketmine/network/mcpe/protocol/types/inventory/TransactionData.php index b2e084cb8..2f37b629c 100644 --- a/src/pocketmine/network/mcpe/protocol/types/TransactionData.php +++ b/src/pocketmine/network/mcpe/protocol/types/inventory/TransactionData.php @@ -21,9 +21,10 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\inventory; use pocketmine\network\BadPacketException; +use pocketmine\network\mcpe\protocol\types\inventory\NetworkInventoryAction; use pocketmine\network\mcpe\serializer\NetworkBinaryStream; use pocketmine\utils\BinaryDataException; use function count; diff --git a/src/pocketmine/network/mcpe/protocol/types/UseItemOnEntityTransactionData.php b/src/pocketmine/network/mcpe/protocol/types/inventory/UseItemOnEntityTransactionData.php similarity index 96% rename from src/pocketmine/network/mcpe/protocol/types/UseItemOnEntityTransactionData.php rename to src/pocketmine/network/mcpe/protocol/types/inventory/UseItemOnEntityTransactionData.php index c3e7c6117..7cd1c3d83 100644 --- a/src/pocketmine/network/mcpe/protocol/types/UseItemOnEntityTransactionData.php +++ b/src/pocketmine/network/mcpe/protocol/types/inventory/UseItemOnEntityTransactionData.php @@ -21,11 +21,12 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\inventory; use pocketmine\item\Item; use pocketmine\math\Vector3; use pocketmine\network\mcpe\protocol\InventoryTransactionPacket; +use pocketmine\network\mcpe\protocol\types\inventory\TransactionData; use pocketmine\network\mcpe\serializer\NetworkBinaryStream; class UseItemOnEntityTransactionData extends TransactionData{ diff --git a/src/pocketmine/network/mcpe/protocol/types/UseItemTransactionData.php b/src/pocketmine/network/mcpe/protocol/types/inventory/UseItemTransactionData.php similarity index 96% rename from src/pocketmine/network/mcpe/protocol/types/UseItemTransactionData.php rename to src/pocketmine/network/mcpe/protocol/types/inventory/UseItemTransactionData.php index 0959687a3..893ea2505 100644 --- a/src/pocketmine/network/mcpe/protocol/types/UseItemTransactionData.php +++ b/src/pocketmine/network/mcpe/protocol/types/inventory/UseItemTransactionData.php @@ -21,11 +21,12 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\inventory; use pocketmine\item\Item; use pocketmine\math\Vector3; use pocketmine\network\mcpe\protocol\InventoryTransactionPacket; +use pocketmine\network\mcpe\protocol\types\inventory\TransactionData; use pocketmine\network\mcpe\serializer\NetworkBinaryStream; class UseItemTransactionData extends TransactionData{ diff --git a/src/pocketmine/network/mcpe/protocol/types/WindowTypes.php b/src/pocketmine/network/mcpe/protocol/types/inventory/WindowTypes.php similarity index 96% rename from src/pocketmine/network/mcpe/protocol/types/WindowTypes.php rename to src/pocketmine/network/mcpe/protocol/types/inventory/WindowTypes.php index b13fd191f..1f1edbdf7 100644 --- a/src/pocketmine/network/mcpe/protocol/types/WindowTypes.php +++ b/src/pocketmine/network/mcpe/protocol/types/inventory/WindowTypes.php @@ -22,7 +22,7 @@ declare(strict_types=1); -namespace pocketmine\network\mcpe\protocol\types; +namespace pocketmine\network\mcpe\protocol\types\inventory; interface WindowTypes{ diff --git a/src/pocketmine/network/mcpe/serializer/NetworkBinaryStream.php b/src/pocketmine/network/mcpe/serializer/NetworkBinaryStream.php index a9eabe378..7a4cd1318 100644 --- a/src/pocketmine/network/mcpe/serializer/NetworkBinaryStream.php +++ b/src/pocketmine/network/mcpe/serializer/NetworkBinaryStream.php @@ -36,9 +36,9 @@ use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\IntTag; use pocketmine\nbt\TreeRoot; use pocketmine\network\BadPacketException; -use pocketmine\network\mcpe\protocol\types\CommandOriginData; -use pocketmine\network\mcpe\protocol\types\EntityLink; -use pocketmine\network\mcpe\protocol\types\EntityMetadataTypes; +use pocketmine\network\mcpe\protocol\types\command\CommandOriginData; +use pocketmine\network\mcpe\protocol\types\entity\EntityLink; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataTypes; use pocketmine\utils\BinaryDataException; use pocketmine\utils\BinaryStream; use pocketmine\utils\UUID; @@ -595,7 +595,7 @@ class NetworkBinaryStream extends BinaryStream{ } /** - * @return EntityLink + * @return \pocketmine\network\mcpe\protocol\types\entity\EntityLink * * @throws BinaryDataException */ @@ -611,7 +611,7 @@ class NetworkBinaryStream extends BinaryStream{ } /** - * @param EntityLink $link + * @param \pocketmine\network\mcpe\protocol\types\entity\EntityLink $link */ protected function putEntityLink(EntityLink $link) : void{ $this->putEntityUniqueId($link->fromEntityUniqueId); @@ -621,7 +621,7 @@ class NetworkBinaryStream extends BinaryStream{ } /** - * @return CommandOriginData + * @return \pocketmine\network\mcpe\protocol\types\command\CommandOriginData * @throws BinaryDataException */ protected function getCommandOriginData() : CommandOriginData{ diff --git a/src/pocketmine/player/Player.php b/src/pocketmine/player/Player.php index 3f9d189a9..1e883c137 100644 --- a/src/pocketmine/player/Player.php +++ b/src/pocketmine/player/Player.php @@ -88,9 +88,9 @@ use pocketmine\network\mcpe\protocol\ClientboundPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\MovePlayerPacket; use pocketmine\network\mcpe\protocol\SetTitlePacket; -use pocketmine\network\mcpe\protocol\types\EntityMetadataFlags; -use pocketmine\network\mcpe\protocol\types\EntityMetadataProperties; -use pocketmine\network\mcpe\protocol\types\PlayerMetadataFlags; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataFlags; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataProperties; +use pocketmine\network\mcpe\protocol\types\entity\PlayerMetadataFlags; use pocketmine\permission\PermissibleBase; use pocketmine\permission\PermissibleDelegateTrait; use pocketmine\permission\PermissionManager; diff --git a/src/pocketmine/world/particle/FloatingTextParticle.php b/src/pocketmine/world/particle/FloatingTextParticle.php index 5ad9d78d3..6deb6b6ac 100644 --- a/src/pocketmine/world/particle/FloatingTextParticle.php +++ b/src/pocketmine/world/particle/FloatingTextParticle.php @@ -30,9 +30,9 @@ use pocketmine\math\Vector3; use pocketmine\network\mcpe\protocol\AddPlayerPacket; use pocketmine\network\mcpe\protocol\PlayerListPacket; use pocketmine\network\mcpe\protocol\RemoveActorPacket; -use pocketmine\network\mcpe\protocol\types\EntityMetadataFlags; -use pocketmine\network\mcpe\protocol\types\EntityMetadataProperties; -use pocketmine\network\mcpe\protocol\types\EntityMetadataTypes; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataFlags; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataProperties; +use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataTypes; use pocketmine\network\mcpe\protocol\types\PlayerListEntry; use pocketmine\utils\UUID; use function str_repeat;