From 56990eb28b454c4c8203847e6fb0eb9631771e47 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sun, 26 Feb 2017 16:21:01 +0000 Subject: [PATCH] MCPE protocol gets its own namespace --- src/pocketmine/CrashDump.php | 6 +- src/pocketmine/Player.php | 150 +++++++++--------- src/pocketmine/Server.php | 12 +- .../command/defaults/DifficultyCommand.php | 2 +- .../command/defaults/VersionCommand.php | 4 +- src/pocketmine/entity/Arrow.php | 2 +- src/pocketmine/entity/Effect.php | 2 +- src/pocketmine/entity/Entity.php | 6 +- src/pocketmine/entity/FallingSand.php | 2 +- src/pocketmine/entity/Human.php | 4 +- src/pocketmine/entity/Item.php | 2 +- src/pocketmine/entity/Living.php | 2 +- src/pocketmine/entity/PrimedTNT.php | 2 +- src/pocketmine/entity/Snowball.php | 2 +- src/pocketmine/entity/Squid.php | 4 +- src/pocketmine/entity/Villager.php | 2 +- src/pocketmine/entity/Zombie.php | 2 +- src/pocketmine/event/Timings.php | 2 +- .../event/server/DataPacketReceiveEvent.php | 2 +- .../event/server/DataPacketSendEvent.php | 2 +- src/pocketmine/inventory/BaseInventory.php | 4 +- src/pocketmine/inventory/ChestInventory.php | 2 +- .../inventory/ContainerInventory.php | 4 +- src/pocketmine/inventory/CraftingManager.php | 2 +- .../inventory/DoubleChestInventory.php | 2 +- src/pocketmine/inventory/PlayerInventory.php | 8 +- src/pocketmine/item/Food.php | 2 +- src/pocketmine/level/Explosion.php | 2 +- src/pocketmine/level/Level.php | 16 +- .../level/format/io/leveldb/LevelDB.php | 6 +- .../level/particle/DestroyBlockParticle.php | 2 +- .../level/particle/FloatingTextParticle.php | 4 +- .../level/particle/GenericParticle.php | 2 +- .../level/particle/MobSpawnParticle.php | 2 +- src/pocketmine/level/particle/Particle.php | 2 +- .../level/sound/AnvilBreakSound.php | 2 +- src/pocketmine/level/sound/AnvilFallSound.php | 2 +- src/pocketmine/level/sound/AnvilUseSound.php | 2 +- .../level/sound/BlazeShootSound.php | 2 +- src/pocketmine/level/sound/ClickSound.php | 2 +- src/pocketmine/level/sound/DoorBumpSound.php | 2 +- src/pocketmine/level/sound/DoorCrashSound.php | 2 +- src/pocketmine/level/sound/DoorSound.php | 2 +- .../level/sound/EndermanTeleportSound.php | 2 +- src/pocketmine/level/sound/FizzSound.php | 2 +- src/pocketmine/level/sound/GenericSound.php | 2 +- .../level/sound/GhastShootSound.php | 2 +- src/pocketmine/level/sound/GhastSound.php | 2 +- src/pocketmine/level/sound/LaunchSound.php | 2 +- src/pocketmine/level/sound/PopSound.php | 2 +- src/pocketmine/level/sound/Sound.php | 2 +- src/pocketmine/network/Network.php | 143 +++++++++-------- src/pocketmine/network/SourceInterface.php | 2 +- .../{ => mcpe}/CachedEncapsulatedPacket.php | 2 +- .../NetworkSession.php} | 146 ++++++++--------- .../network/{ => mcpe}/RakLibInterface.php | 13 +- .../{ => mcpe}/protocol/AddEntityPacket.php | 8 +- .../protocol/AddHangingEntityPacket.php | 8 +- .../protocol/AddItemEntityPacket.php | 8 +- .../{ => mcpe}/protocol/AddItemPacket.php | 8 +- .../{ => mcpe}/protocol/AddPaintingPacket.php | 8 +- .../{ => mcpe}/protocol/AddPlayerPacket.php | 8 +- .../protocol/AdventureSettingsPacket.php | 8 +- .../{ => mcpe}/protocol/AnimatePacket.php | 8 +- .../protocol/AvailableCommandsPacket.php | 8 +- .../{ => mcpe}/protocol/BatchPacket.php | 8 +- .../protocol/BlockEntityDataPacket.php | 8 +- .../{ => mcpe}/protocol/BlockEventPacket.php | 8 +- .../protocol/ChangeDimensionPacket.php | 8 +- .../protocol/ChunkRadiusUpdatedPacket.php | 8 +- .../{ => mcpe}/protocol/CommandStepPacket.php | 8 +- .../protocol/ContainerClosePacket.php | 8 +- .../protocol/ContainerOpenPacket.php | 8 +- .../protocol/ContainerSetContentPacket.php | 8 +- .../protocol/ContainerSetDataPacket.php | 8 +- .../protocol/ContainerSetSlotPacket.php | 8 +- .../protocol/CraftingDataPacket.php | 9 +- .../protocol/CraftingEventPacket.php | 8 +- .../{ => mcpe}/protocol/DataPacket.php | 6 +- .../{ => mcpe}/protocol/DisconnectPacket.php | 8 +- .../{ => mcpe}/protocol/DropItemPacket.php | 8 +- .../{ => mcpe}/protocol/EntityEventPacket.php | 8 +- .../{ => mcpe}/protocol/ExplodePacket.php | 8 +- .../protocol/FullChunkDataPacket.php | 8 +- .../{ => mcpe}/protocol/HurtArmorPacket.php | 8 +- .../{ => mcpe}/protocol/InteractPacket.php | 8 +- .../protocol/InventoryActionPacket.php | 8 +- .../protocol/ItemFrameDropItemPacket.php | 8 +- .../{ => mcpe}/protocol/LevelEventPacket.php | 8 +- .../protocol/LevelSoundEventPacket.php | 8 +- .../{ => mcpe}/protocol/LoginPacket.php | 10 +- .../protocol/MobArmorEquipmentPacket.php | 8 +- .../{ => mcpe}/protocol/MobEffectPacket.php | 8 +- .../protocol/MobEquipmentPacket.php | 8 +- .../{ => mcpe}/protocol/MoveEntityPacket.php | 8 +- .../{ => mcpe}/protocol/MovePlayerPacket.php | 8 +- .../{ => mcpe}/protocol/PlayStatusPacket.php | 8 +- .../protocol/PlayerActionPacket.php | 8 +- .../{ => mcpe}/protocol/PlayerFallPacket.php | 8 +- .../{ => mcpe}/protocol/PlayerInputPacket.php | 8 +- .../{ => mcpe}/protocol/PlayerListPacket.php | 8 +- .../protocol/ProtocolInfo.php} | 4 +- .../{ => mcpe}/protocol/RemoveBlockPacket.php | 8 +- .../protocol/RemoveEntityPacket.php | 8 +- .../protocol/ReplaceItemInSlotPacket.php | 8 +- .../protocol/RequestChunkRadiusPacket.php | 8 +- .../ResourcePackClientResponsePacket.php | 8 +- .../protocol/ResourcePackStackPacket.php | 10 +- .../protocol/ResourcePacksInfoPacket.php | 8 +- .../{ => mcpe}/protocol/RespawnPacket.php | 8 +- .../{ => mcpe}/protocol/RiderJumpPacket.php | 8 +- .../protocol/SetCommandsEnabledPacket.php | 8 +- .../protocol/SetDifficultyPacket.php | 8 +- .../protocol/SetEntityDataPacket.php | 8 +- .../protocol/SetEntityLinkPacket.php | 8 +- .../protocol/SetEntityMotionPacket.php | 8 +- .../{ => mcpe}/protocol/SetHealthPacket.php | 8 +- .../protocol/SetPlayerGameTypePacket.php | 8 +- .../protocol/SetSpawnPositionPacket.php | 8 +- .../{ => mcpe}/protocol/SetTimePacket.php | 8 +- .../{ => mcpe}/protocol/ShowCreditsPacket.php | 8 +- .../protocol/SpawnExperienceOrbPacket.php | 8 +- .../{ => mcpe}/protocol/StartGamePacket.php | 8 +- .../protocol/TakeItemEntityPacket.php | 8 +- .../{ => mcpe}/protocol/TextPacket.php | 8 +- .../{ => mcpe}/protocol/TransferPacket.php | 8 +- .../protocol/UpdateAttributesPacket.php | 8 +- .../{ => mcpe}/protocol/UpdateBlockPacket.php | 8 +- .../{ => mcpe}/protocol/UseItemPacket.php | 8 +- src/pocketmine/scheduler/SendUsageTask.php | 4 +- src/pocketmine/tile/Furnace.php | 2 +- src/pocketmine/tile/Spawnable.php | 2 +- 132 files changed, 600 insertions(+), 601 deletions(-) rename src/pocketmine/network/{ => mcpe}/CachedEncapsulatedPacket.php (96%) rename src/pocketmine/network/{PocketEditionNetworkSession.php => mcpe/NetworkSession.php} (62%) rename src/pocketmine/network/{ => mcpe}/RakLibInterface.php (95%) rename src/pocketmine/network/{ => mcpe}/protocol/AddEntityPacket.php (90%) rename src/pocketmine/network/{ => mcpe}/protocol/AddHangingEntityPacket.php (85%) rename src/pocketmine/network/{ => mcpe}/protocol/AddItemEntityPacket.php (85%) rename src/pocketmine/network/{ => mcpe}/protocol/AddItemPacket.php (82%) rename src/pocketmine/network/{ => mcpe}/protocol/AddPaintingPacket.php (85%) rename src/pocketmine/network/{ => mcpe}/protocol/AddPlayerPacket.php (88%) rename src/pocketmine/network/{ => mcpe}/protocol/AdventureSettingsPacket.php (93%) rename src/pocketmine/network/{ => mcpe}/protocol/AnimatePacket.php (84%) rename src/pocketmine/network/{ => mcpe}/protocol/AvailableCommandsPacket.php (83%) rename src/pocketmine/network/{ => mcpe}/protocol/BatchPacket.php (83%) rename src/pocketmine/network/{ => mcpe}/protocol/BlockEntityDataPacket.php (84%) rename src/pocketmine/network/{ => mcpe}/protocol/BlockEventPacket.php (84%) rename src/pocketmine/network/{ => mcpe}/protocol/ChangeDimensionPacket.php (84%) rename src/pocketmine/network/{ => mcpe}/protocol/ChunkRadiusUpdatedPacket.php (82%) rename src/pocketmine/network/{ => mcpe}/protocol/CommandStepPacket.php (89%) rename src/pocketmine/network/{ => mcpe}/protocol/ContainerClosePacket.php (82%) rename src/pocketmine/network/{ => mcpe}/protocol/ContainerOpenPacket.php (85%) rename src/pocketmine/network/{ => mcpe}/protocol/ContainerSetContentPacket.php (90%) rename src/pocketmine/network/{ => mcpe}/protocol/ContainerSetDataPacket.php (83%) rename src/pocketmine/network/{ => mcpe}/protocol/ContainerSetSlotPacket.php (86%) rename src/pocketmine/network/{ => mcpe}/protocol/CraftingDataPacket.php (95%) rename src/pocketmine/network/{ => mcpe}/protocol/CraftingEventPacket.php (87%) rename src/pocketmine/network/{ => mcpe}/protocol/DataPacket.php (96%) rename src/pocketmine/network/{ => mcpe}/protocol/DisconnectPacket.php (84%) rename src/pocketmine/network/{ => mcpe}/protocol/DropItemPacket.php (82%) rename src/pocketmine/network/{ => mcpe}/protocol/EntityEventPacket.php (88%) rename src/pocketmine/network/{ => mcpe}/protocol/ExplodePacket.php (86%) rename src/pocketmine/network/{ => mcpe}/protocol/FullChunkDataPacket.php (83%) rename src/pocketmine/network/{ => mcpe}/protocol/HurtArmorPacket.php (82%) rename src/pocketmine/network/{ => mcpe}/protocol/InteractPacket.php (85%) rename src/pocketmine/network/{ => mcpe}/protocol/InventoryActionPacket.php (82%) rename src/pocketmine/network/{ => mcpe}/protocol/ItemFrameDropItemPacket.php (82%) rename src/pocketmine/network/{ => mcpe}/protocol/LevelEventPacket.php (93%) rename src/pocketmine/network/{ => mcpe}/protocol/LevelSoundEventPacket.php (95%) rename src/pocketmine/network/{ => mcpe}/protocol/LoginPacket.php (90%) rename src/pocketmine/network/{ => mcpe}/protocol/MobArmorEquipmentPacket.php (86%) rename src/pocketmine/network/{ => mcpe}/protocol/MobEffectPacket.php (86%) rename src/pocketmine/network/{ => mcpe}/protocol/MobEquipmentPacket.php (87%) rename src/pocketmine/network/{ => mcpe}/protocol/MoveEntityPacket.php (87%) rename src/pocketmine/network/{ => mcpe}/protocol/MovePlayerPacket.php (89%) rename src/pocketmine/network/{ => mcpe}/protocol/PlayStatusPacket.php (84%) rename src/pocketmine/network/{ => mcpe}/protocol/PlayerActionPacket.php (89%) rename src/pocketmine/network/{ => mcpe}/protocol/PlayerFallPacket.php (82%) rename src/pocketmine/network/{ => mcpe}/protocol/PlayerInputPacket.php (84%) rename src/pocketmine/network/{ => mcpe}/protocol/PlayerListPacket.php (87%) rename src/pocketmine/network/{protocol/Info.php => mcpe/protocol/ProtocolInfo.php} (98%) rename src/pocketmine/network/{ => mcpe}/protocol/RemoveBlockPacket.php (82%) rename src/pocketmine/network/{ => mcpe}/protocol/RemoveEntityPacket.php (82%) rename src/pocketmine/network/{ => mcpe}/protocol/ReplaceItemInSlotPacket.php (81%) rename src/pocketmine/network/{ => mcpe}/protocol/RequestChunkRadiusPacket.php (81%) rename src/pocketmine/network/{ => mcpe}/protocol/ResourcePackClientResponsePacket.php (86%) rename src/pocketmine/network/{ => mcpe}/protocol/ResourcePackStackPacket.php (88%) rename src/pocketmine/network/{ => mcpe}/protocol/ResourcePacksInfoPacket.php (91%) rename src/pocketmine/network/{ => mcpe}/protocol/RespawnPacket.php (84%) rename src/pocketmine/network/{ => mcpe}/protocol/RiderJumpPacket.php (83%) rename src/pocketmine/network/{ => mcpe}/protocol/SetCommandsEnabledPacket.php (82%) rename src/pocketmine/network/{ => mcpe}/protocol/SetDifficultyPacket.php (83%) rename src/pocketmine/network/{ => mcpe}/protocol/SetEntityDataPacket.php (83%) rename src/pocketmine/network/{ => mcpe}/protocol/SetEntityLinkPacket.php (83%) rename src/pocketmine/network/{ => mcpe}/protocol/SetEntityMotionPacket.php (83%) rename src/pocketmine/network/{ => mcpe}/protocol/SetHealthPacket.php (82%) rename src/pocketmine/network/{ => mcpe}/protocol/SetPlayerGameTypePacket.php (82%) rename src/pocketmine/network/{ => mcpe}/protocol/SetSpawnPositionPacket.php (84%) rename src/pocketmine/network/{ => mcpe}/protocol/SetTimePacket.php (83%) rename src/pocketmine/network/{ => mcpe}/protocol/ShowCreditsPacket.php (84%) rename src/pocketmine/network/{ => mcpe}/protocol/SpawnExperienceOrbPacket.php (83%) rename src/pocketmine/network/{ => mcpe}/protocol/StartGamePacket.php (92%) rename src/pocketmine/network/{ => mcpe}/protocol/TakeItemEntityPacket.php (82%) rename src/pocketmine/network/{ => mcpe}/protocol/TextPacket.php (91%) rename src/pocketmine/network/{ => mcpe}/protocol/TransferPacket.php (83%) rename src/pocketmine/network/{ => mcpe}/protocol/UpdateAttributesPacket.php (86%) rename src/pocketmine/network/{ => mcpe}/protocol/UpdateBlockPacket.php (87%) rename src/pocketmine/network/{ => mcpe}/protocol/UseItemPacket.php (87%) diff --git a/src/pocketmine/CrashDump.php b/src/pocketmine/CrashDump.php index abf7db96b..5d30473d4 100644 --- a/src/pocketmine/CrashDump.php +++ b/src/pocketmine/CrashDump.php @@ -21,7 +21,7 @@ namespace pocketmine; -use pocketmine\network\protocol\Info; +use pocketmine\network\mcpe\protocol\ProtocolInfo; use pocketmine\plugin\PluginBase; use pocketmine\plugin\PluginLoadOrder; use pocketmine\utils\Utils; @@ -226,7 +226,7 @@ class CrashDump{ $this->data["general"] = []; $this->data["general"]["version"] = $version->get(false); $this->data["general"]["build"] = $version->getBuild(); - $this->data["general"]["protocol"] = Info::CURRENT_PROTOCOL; + $this->data["general"]["protocol"] = ProtocolInfo::CURRENT_PROTOCOL; $this->data["general"]["api"] = \pocketmine\API_VERSION; $this->data["general"]["git"] = \pocketmine\GIT_COMMIT; $this->data["general"]["raklib"] = RakLib::VERSION; @@ -235,7 +235,7 @@ class CrashDump{ $this->data["general"]["zend"] = zend_version(); $this->data["general"]["php_os"] = PHP_OS; $this->data["general"]["os"] = Utils::getOS(); - $this->addLine("PocketMine-MP version: " . $version->get(false) . " #" . $version->getBuild() . " [Protocol " . Info::CURRENT_PROTOCOL . "; API " . API_VERSION . "]"); + $this->addLine("PocketMine-MP version: " . $version->get(false) . " #" . $version->getBuild() . " [Protocol " . ProtocolInfo::CURRENT_PROTOCOL . "; API " . API_VERSION . "]"); $this->addLine("Git commit: " . GIT_COMMIT); $this->addLine("uname -a: " . php_uname("a")); $this->addLine("PHP Version: " . phpversion()); diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index cef80e0d9..1efdb7790 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -101,80 +101,80 @@ use pocketmine\nbt\tag\ListTag; use pocketmine\nbt\tag\LongTag; use pocketmine\nbt\tag\ShortTag; use pocketmine\nbt\tag\StringTag; -use pocketmine\network\PocketEditionNetworkSession; -use pocketmine\network\protocol\AddEntityPacket; -use pocketmine\network\protocol\AddHangingEntityPacket; -use pocketmine\network\protocol\AddItemEntityPacket; -use pocketmine\network\protocol\AddItemPacket; -use pocketmine\network\protocol\AddPaintingPacket; -use pocketmine\network\protocol\AddPlayerPacket; -use pocketmine\network\protocol\AdventureSettingsPacket; -use pocketmine\network\protocol\AnimatePacket; -use pocketmine\network\protocol\AvailableCommandsPacket; -use pocketmine\network\protocol\BatchPacket; -use pocketmine\network\protocol\BlockEntityDataPacket; -use pocketmine\network\protocol\BlockEventPacket; -use pocketmine\network\protocol\ChangeDimensionPacket; -use pocketmine\network\protocol\ChunkRadiusUpdatedPacket; -use pocketmine\network\protocol\CommandStepPacket; -use pocketmine\network\protocol\ContainerClosePacket; -use pocketmine\network\protocol\ContainerOpenPacket; -use pocketmine\network\protocol\ContainerSetContentPacket; -use pocketmine\network\protocol\ContainerSetDataPacket; -use pocketmine\network\protocol\ContainerSetSlotPacket; -use pocketmine\network\protocol\CraftingDataPacket; -use pocketmine\network\protocol\CraftingEventPacket; -use pocketmine\network\protocol\DataPacket; -use pocketmine\network\protocol\DisconnectPacket; -use pocketmine\network\protocol\DropItemPacket; -use pocketmine\network\protocol\EntityEventPacket; -use pocketmine\network\protocol\ExplodePacket; -use pocketmine\network\protocol\FullChunkDataPacket; -use pocketmine\network\protocol\HurtArmorPacket; -use pocketmine\network\protocol\Info as ProtocolInfo; -use pocketmine\network\protocol\InteractPacket; -use pocketmine\network\protocol\InventoryActionPacket; -use pocketmine\network\protocol\ItemFrameDropItemPacket; -use pocketmine\network\protocol\LevelEventPacket; -use pocketmine\network\protocol\LevelSoundEventPacket; -use pocketmine\network\protocol\LoginPacket; -use pocketmine\network\protocol\MobArmorEquipmentPacket; -use pocketmine\network\protocol\MobEffectPacket; -use pocketmine\network\protocol\MobEquipmentPacket; -use pocketmine\network\protocol\MoveEntityPacket; -use pocketmine\network\protocol\MovePlayerPacket; -use pocketmine\network\protocol\PlayerActionPacket; -use pocketmine\network\protocol\PlayerFallPacket; -use pocketmine\network\protocol\PlayerInputPacket; -use pocketmine\network\protocol\PlayerListPacket; -use pocketmine\network\protocol\PlayStatusPacket; -use pocketmine\network\protocol\RemoveBlockPacket; -use pocketmine\network\protocol\RemoveEntityPacket; -use pocketmine\network\protocol\ReplaceItemInSlotPacket; -use pocketmine\network\protocol\RequestChunkRadiusPacket; -use pocketmine\network\protocol\ResourcePackClientResponsePacket; -use pocketmine\network\protocol\ResourcePacksInfoPacket; -use pocketmine\network\protocol\ResourcePackStackPacket; -use pocketmine\network\protocol\RespawnPacket; -use pocketmine\network\protocol\RiderJumpPacket; -use pocketmine\network\protocol\SetCommandsEnabledPacket; -use pocketmine\network\protocol\SetDifficultyPacket; -use pocketmine\network\protocol\SetEntityDataPacket; -use pocketmine\network\protocol\SetEntityLinkPacket; -use pocketmine\network\protocol\SetEntityMotionPacket; -use pocketmine\network\protocol\SetHealthPacket; -use pocketmine\network\protocol\SetPlayerGameTypePacket; -use pocketmine\network\protocol\SetSpawnPositionPacket; -use pocketmine\network\protocol\SetTimePacket; -use pocketmine\network\protocol\ShowCreditsPacket; -use pocketmine\network\protocol\SpawnExperienceOrbPacket; -use pocketmine\network\protocol\StartGamePacket; -use pocketmine\network\protocol\TakeItemEntityPacket; -use pocketmine\network\protocol\TextPacket; -use pocketmine\network\protocol\TransferPacket; -use pocketmine\network\protocol\UpdateAttributesPacket; -use pocketmine\network\protocol\UpdateBlockPacket; -use pocketmine\network\protocol\UseItemPacket; +use pocketmine\network\mcpe\NetworkSession; +use pocketmine\network\mcpe\protocol\AddEntityPacket; +use pocketmine\network\mcpe\protocol\AddHangingEntityPacket; +use pocketmine\network\mcpe\protocol\AddItemEntityPacket; +use pocketmine\network\mcpe\protocol\AddItemPacket; +use pocketmine\network\mcpe\protocol\AddPaintingPacket; +use pocketmine\network\mcpe\protocol\AddPlayerPacket; +use pocketmine\network\mcpe\protocol\AdventureSettingsPacket; +use pocketmine\network\mcpe\protocol\AnimatePacket; +use pocketmine\network\mcpe\protocol\AvailableCommandsPacket; +use pocketmine\network\mcpe\protocol\BatchPacket; +use pocketmine\network\mcpe\protocol\BlockEntityDataPacket; +use pocketmine\network\mcpe\protocol\BlockEventPacket; +use pocketmine\network\mcpe\protocol\ChangeDimensionPacket; +use pocketmine\network\mcpe\protocol\ChunkRadiusUpdatedPacket; +use pocketmine\network\mcpe\protocol\CommandStepPacket; +use pocketmine\network\mcpe\protocol\ContainerClosePacket; +use pocketmine\network\mcpe\protocol\ContainerOpenPacket; +use pocketmine\network\mcpe\protocol\ContainerSetContentPacket; +use pocketmine\network\mcpe\protocol\ContainerSetDataPacket; +use pocketmine\network\mcpe\protocol\ContainerSetSlotPacket; +use pocketmine\network\mcpe\protocol\CraftingDataPacket; +use pocketmine\network\mcpe\protocol\CraftingEventPacket; +use pocketmine\network\mcpe\protocol\DataPacket; +use pocketmine\network\mcpe\protocol\DisconnectPacket; +use pocketmine\network\mcpe\protocol\DropItemPacket; +use pocketmine\network\mcpe\protocol\EntityEventPacket; +use pocketmine\network\mcpe\protocol\ExplodePacket; +use pocketmine\network\mcpe\protocol\FullChunkDataPacket; +use pocketmine\network\mcpe\protocol\HurtArmorPacket; +use pocketmine\network\mcpe\protocol\ProtocolInfo; +use pocketmine\network\mcpe\protocol\InteractPacket; +use pocketmine\network\mcpe\protocol\InventoryActionPacket; +use pocketmine\network\mcpe\protocol\ItemFrameDropItemPacket; +use pocketmine\network\mcpe\protocol\LevelEventPacket; +use pocketmine\network\mcpe\protocol\LevelSoundEventPacket; +use pocketmine\network\mcpe\protocol\LoginPacket; +use pocketmine\network\mcpe\protocol\MobArmorEquipmentPacket; +use pocketmine\network\mcpe\protocol\MobEffectPacket; +use pocketmine\network\mcpe\protocol\MobEquipmentPacket; +use pocketmine\network\mcpe\protocol\MoveEntityPacket; +use pocketmine\network\mcpe\protocol\MovePlayerPacket; +use pocketmine\network\mcpe\protocol\PlayerActionPacket; +use pocketmine\network\mcpe\protocol\PlayerFallPacket; +use pocketmine\network\mcpe\protocol\PlayerInputPacket; +use pocketmine\network\mcpe\protocol\PlayerListPacket; +use pocketmine\network\mcpe\protocol\PlayStatusPacket; +use pocketmine\network\mcpe\protocol\RemoveBlockPacket; +use pocketmine\network\mcpe\protocol\RemoveEntityPacket; +use pocketmine\network\mcpe\protocol\ReplaceItemInSlotPacket; +use pocketmine\network\mcpe\protocol\RequestChunkRadiusPacket; +use pocketmine\network\mcpe\protocol\ResourcePackClientResponsePacket; +use pocketmine\network\mcpe\protocol\ResourcePacksInfoPacket; +use pocketmine\network\mcpe\protocol\ResourcePackStackPacket; +use pocketmine\network\mcpe\protocol\RespawnPacket; +use pocketmine\network\mcpe\protocol\RiderJumpPacket; +use pocketmine\network\mcpe\protocol\SetCommandsEnabledPacket; +use pocketmine\network\mcpe\protocol\SetDifficultyPacket; +use pocketmine\network\mcpe\protocol\SetEntityDataPacket; +use pocketmine\network\mcpe\protocol\SetEntityLinkPacket; +use pocketmine\network\mcpe\protocol\SetEntityMotionPacket; +use pocketmine\network\mcpe\protocol\SetHealthPacket; +use pocketmine\network\mcpe\protocol\SetPlayerGameTypePacket; +use pocketmine\network\mcpe\protocol\SetSpawnPositionPacket; +use pocketmine\network\mcpe\protocol\SetTimePacket; +use pocketmine\network\mcpe\protocol\ShowCreditsPacket; +use pocketmine\network\mcpe\protocol\SpawnExperienceOrbPacket; +use pocketmine\network\mcpe\protocol\StartGamePacket; +use pocketmine\network\mcpe\protocol\TakeItemEntityPacket; +use pocketmine\network\mcpe\protocol\TextPacket; +use pocketmine\network\mcpe\protocol\TransferPacket; +use pocketmine\network\mcpe\protocol\UpdateAttributesPacket; +use pocketmine\network\mcpe\protocol\UpdateBlockPacket; +use pocketmine\network\mcpe\protocol\UseItemPacket; use pocketmine\network\SourceInterface; use pocketmine\permission\PermissibleBase; use pocketmine\permission\PermissionAttachment; @@ -188,7 +188,7 @@ use pocketmine\utils\UUID; /** * Main class that handles networking, recovery, and packet sending to the server part */ -class Player extends Human implements CommandSender, InventoryHolder, ChunkLoader, IPlayer, PocketEditionNetworkSession{ +class Player extends Human implements CommandSender, InventoryHolder, ChunkLoader, IPlayer, NetworkSession{ const SURVIVAL = 0; const CREATIVE = 1; diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index b386ce6d5..4474cdaef 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -48,8 +48,8 @@ use pocketmine\inventory\Recipe; use pocketmine\item\enchantment\Enchantment; use pocketmine\item\Item; use pocketmine\lang\BaseLang; -use pocketmine\level\format\io\LevelProviderManager; use pocketmine\level\format\io\leveldb\LevelDB; +use pocketmine\level\format\io\LevelProviderManager; use pocketmine\level\format\io\region\Anvil; use pocketmine\level\format\io\region\McRegion; use pocketmine\level\format\io\region\PMAnvil; @@ -74,13 +74,13 @@ use pocketmine\nbt\tag\LongTag; use pocketmine\nbt\tag\ShortTag; use pocketmine\nbt\tag\StringTag; use pocketmine\network\CompressBatchedTask; +use pocketmine\network\mcpe\protocol\BatchPacket; +use pocketmine\network\mcpe\protocol\DataPacket; +use pocketmine\network\mcpe\protocol\ProtocolInfo; +use pocketmine\network\mcpe\protocol\PlayerListPacket; +use pocketmine\network\mcpe\RakLibInterface; use pocketmine\network\Network; -use pocketmine\network\protocol\BatchPacket; -use pocketmine\network\protocol\DataPacket; -use pocketmine\network\protocol\Info as ProtocolInfo; -use pocketmine\network\protocol\PlayerListPacket; use pocketmine\network\query\QueryHandler; -use pocketmine\network\RakLibInterface; use pocketmine\network\rcon\RCON; use pocketmine\network\upnp\UPnP; use pocketmine\permission\BanList; diff --git a/src/pocketmine/command/defaults/DifficultyCommand.php b/src/pocketmine/command/defaults/DifficultyCommand.php index e49784fde..64650a47f 100644 --- a/src/pocketmine/command/defaults/DifficultyCommand.php +++ b/src/pocketmine/command/defaults/DifficultyCommand.php @@ -24,7 +24,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\event\TranslationContainer; -use pocketmine\network\protocol\SetDifficultyPacket; +use pocketmine\network\mcpe\protocol\SetDifficultyPacket; use pocketmine\Server; class DifficultyCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/VersionCommand.php b/src/pocketmine/command/defaults/VersionCommand.php index 54d091fdf..e18651b56 100644 --- a/src/pocketmine/command/defaults/VersionCommand.php +++ b/src/pocketmine/command/defaults/VersionCommand.php @@ -23,7 +23,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\event\TranslationContainer; -use pocketmine\network\protocol\Info; +use pocketmine\network\mcpe\protocol\ProtocolInfo; use pocketmine\plugin\Plugin; use pocketmine\utils\TextFormat; @@ -51,7 +51,7 @@ class VersionCommand extends VanillaCommand{ $sender->getServer()->getCodename(), $sender->getServer()->getApiVersion(), $sender->getServer()->getVersion(), - Info::CURRENT_PROTOCOL + ProtocolInfo::CURRENT_PROTOCOL ])); }else{ $pluginName = implode(" ", $args); diff --git a/src/pocketmine/entity/Arrow.php b/src/pocketmine/entity/Arrow.php index 969021323..a31a66b9e 100644 --- a/src/pocketmine/entity/Arrow.php +++ b/src/pocketmine/entity/Arrow.php @@ -24,7 +24,7 @@ namespace pocketmine\entity; use pocketmine\level\Level; use pocketmine\level\particle\CriticalParticle; use pocketmine\nbt\tag\CompoundTag; -use pocketmine\network\protocol\AddEntityPacket; +use pocketmine\network\mcpe\protocol\AddEntityPacket; use pocketmine\Player; class Arrow extends Projectile{ diff --git a/src/pocketmine/entity/Effect.php b/src/pocketmine/entity/Effect.php index 9837894e0..5511ef205 100644 --- a/src/pocketmine/entity/Effect.php +++ b/src/pocketmine/entity/Effect.php @@ -26,7 +26,7 @@ use pocketmine\event\entity\EntityEffectAddEvent; use pocketmine\event\entity\EntityEffectRemoveEvent; use pocketmine\event\entity\EntityRegainHealthEvent; use pocketmine\event\player\PlayerExhaustEvent; -use pocketmine\network\protocol\MobEffectPacket; +use pocketmine\network\mcpe\protocol\MobEffectPacket; use pocketmine\Player; class Effect{ diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php index fef279be9..010d846de 100644 --- a/src/pocketmine/entity/Entity.php +++ b/src/pocketmine/entity/Entity.php @@ -52,9 +52,9 @@ use pocketmine\nbt\tag\IntTag; use pocketmine\nbt\tag\ListTag; use pocketmine\nbt\tag\ShortTag; use pocketmine\nbt\tag\StringTag; -use pocketmine\network\protocol\MobEffectPacket; -use pocketmine\network\protocol\RemoveEntityPacket; -use pocketmine\network\protocol\SetEntityDataPacket; +use pocketmine\network\mcpe\protocol\MobEffectPacket; +use pocketmine\network\mcpe\protocol\RemoveEntityPacket; +use pocketmine\network\mcpe\protocol\SetEntityDataPacket; use pocketmine\Player; use pocketmine\plugin\Plugin; use pocketmine\Server; diff --git a/src/pocketmine/entity/FallingSand.php b/src/pocketmine/entity/FallingSand.php index 3a7c9f8e7..945892eb4 100644 --- a/src/pocketmine/entity/FallingSand.php +++ b/src/pocketmine/entity/FallingSand.php @@ -29,7 +29,7 @@ use pocketmine\item\Item as ItemItem; use pocketmine\math\Vector3; use pocketmine\nbt\tag\ByteTag; use pocketmine\nbt\tag\IntTag; -use pocketmine\network\protocol\AddEntityPacket; +use pocketmine\network\mcpe\protocol\AddEntityPacket; use pocketmine\Player; class FallingSand extends Entity{ diff --git a/src/pocketmine/entity/Human.php b/src/pocketmine/entity/Human.php index a91aef9c2..563eaf955 100644 --- a/src/pocketmine/entity/Human.php +++ b/src/pocketmine/entity/Human.php @@ -35,8 +35,8 @@ use pocketmine\nbt\tag\IntTag; use pocketmine\nbt\tag\ListTag; use pocketmine\nbt\tag\ShortTag; use pocketmine\nbt\tag\StringTag; -use pocketmine\network\protocol\AddPlayerPacket; -use pocketmine\network\protocol\RemoveEntityPacket; +use pocketmine\network\mcpe\protocol\AddPlayerPacket; +use pocketmine\network\mcpe\protocol\RemoveEntityPacket; use pocketmine\Player; use pocketmine\utils\UUID; diff --git a/src/pocketmine/entity/Item.php b/src/pocketmine/entity/Item.php index e67cf26fd..9ddb289dc 100644 --- a/src/pocketmine/entity/Item.php +++ b/src/pocketmine/entity/Item.php @@ -28,7 +28,7 @@ use pocketmine\item\Item as ItemItem; use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\ShortTag; use pocketmine\nbt\tag\StringTag; -use pocketmine\network\protocol\AddItemEntityPacket; +use pocketmine\network\mcpe\protocol\AddItemEntityPacket; use pocketmine\Player; class Item extends Entity{ diff --git a/src/pocketmine/entity/Living.php b/src/pocketmine/entity/Living.php index 6da49eb88..e9b8d2429 100644 --- a/src/pocketmine/entity/Living.php +++ b/src/pocketmine/entity/Living.php @@ -31,7 +31,7 @@ use pocketmine\event\Timings; use pocketmine\item\Item as ItemItem; use pocketmine\math\Vector3; use pocketmine\nbt\tag\ShortTag; -use pocketmine\network\protocol\EntityEventPacket; +use pocketmine\network\mcpe\protocol\EntityEventPacket; use pocketmine\utils\BlockIterator; abstract class Living extends Entity implements Damageable{ diff --git a/src/pocketmine/entity/PrimedTNT.php b/src/pocketmine/entity/PrimedTNT.php index a098909c4..c03ef1772 100644 --- a/src/pocketmine/entity/PrimedTNT.php +++ b/src/pocketmine/entity/PrimedTNT.php @@ -25,7 +25,7 @@ use pocketmine\event\entity\EntityDamageEvent; use pocketmine\event\entity\ExplosionPrimeEvent; use pocketmine\level\Explosion; use pocketmine\nbt\tag\ByteTag; -use pocketmine\network\protocol\AddEntityPacket; +use pocketmine\network\mcpe\protocol\AddEntityPacket; use pocketmine\Player; class PrimedTNT extends Entity implements Explosive{ diff --git a/src/pocketmine/entity/Snowball.php b/src/pocketmine/entity/Snowball.php index cc9b1aabf..e7d4cc4a6 100644 --- a/src/pocketmine/entity/Snowball.php +++ b/src/pocketmine/entity/Snowball.php @@ -23,7 +23,7 @@ namespace pocketmine\entity; use pocketmine\level\Level; use pocketmine\nbt\tag\CompoundTag; -use pocketmine\network\protocol\AddEntityPacket; +use pocketmine\network\mcpe\protocol\AddEntityPacket; use pocketmine\Player; class Snowball extends Projectile{ diff --git a/src/pocketmine/entity/Squid.php b/src/pocketmine/entity/Squid.php index 8167d58fa..9ad26640b 100644 --- a/src/pocketmine/entity/Squid.php +++ b/src/pocketmine/entity/Squid.php @@ -25,8 +25,8 @@ use pocketmine\event\entity\EntityDamageByEntityEvent; use pocketmine\event\entity\EntityDamageEvent; use pocketmine\item\Item as ItemItem; use pocketmine\math\Vector3; -use pocketmine\network\protocol\AddEntityPacket; -use pocketmine\network\protocol\EntityEventPacket; +use pocketmine\network\mcpe\protocol\AddEntityPacket; +use pocketmine\network\mcpe\protocol\EntityEventPacket; use pocketmine\Player; class Squid extends WaterAnimal implements Ageable{ diff --git a/src/pocketmine/entity/Villager.php b/src/pocketmine/entity/Villager.php index 50c0df314..dff059ef4 100644 --- a/src/pocketmine/entity/Villager.php +++ b/src/pocketmine/entity/Villager.php @@ -22,7 +22,7 @@ namespace pocketmine\entity; use pocketmine\nbt\tag\IntTag; -use pocketmine\network\protocol\AddEntityPacket; +use pocketmine\network\mcpe\protocol\AddEntityPacket; use pocketmine\Player; class Villager extends Creature implements NPC, Ageable{ diff --git a/src/pocketmine/entity/Zombie.php b/src/pocketmine/entity/Zombie.php index ea7ec1f5a..633631cdc 100644 --- a/src/pocketmine/entity/Zombie.php +++ b/src/pocketmine/entity/Zombie.php @@ -23,7 +23,7 @@ namespace pocketmine\entity; use pocketmine\event\entity\EntityDamageByEntityEvent; use pocketmine\item\Item as ItemItem; -use pocketmine\network\protocol\AddEntityPacket; +use pocketmine\network\mcpe\protocol\AddEntityPacket; use pocketmine\Player; class Zombie extends Monster{ diff --git a/src/pocketmine/event/Timings.php b/src/pocketmine/event/Timings.php index 5052c848e..636ac1cba 100644 --- a/src/pocketmine/event/Timings.php +++ b/src/pocketmine/event/Timings.php @@ -22,7 +22,7 @@ namespace pocketmine\event; use pocketmine\entity\Entity; -use pocketmine\network\protocol\DataPacket; +use pocketmine\network\mcpe\protocol\DataPacket; use pocketmine\Player; use pocketmine\plugin\PluginManager; use pocketmine\scheduler\PluginTask; diff --git a/src/pocketmine/event/server/DataPacketReceiveEvent.php b/src/pocketmine/event/server/DataPacketReceiveEvent.php index 84a58e274..cc5b89360 100644 --- a/src/pocketmine/event/server/DataPacketReceiveEvent.php +++ b/src/pocketmine/event/server/DataPacketReceiveEvent.php @@ -22,7 +22,7 @@ namespace pocketmine\event\server; use pocketmine\event\Cancellable; -use pocketmine\network\protocol\DataPacket; +use pocketmine\network\mcpe\protocol\DataPacket; use pocketmine\Player; class DataPacketReceiveEvent extends ServerEvent implements Cancellable{ diff --git a/src/pocketmine/event/server/DataPacketSendEvent.php b/src/pocketmine/event/server/DataPacketSendEvent.php index b0b70b850..16848e499 100644 --- a/src/pocketmine/event/server/DataPacketSendEvent.php +++ b/src/pocketmine/event/server/DataPacketSendEvent.php @@ -22,7 +22,7 @@ namespace pocketmine\event\server; use pocketmine\event\Cancellable; -use pocketmine\network\protocol\DataPacket; +use pocketmine\network\mcpe\protocol\DataPacket; use pocketmine\Player; class DataPacketSendEvent extends ServerEvent implements Cancellable{ diff --git a/src/pocketmine/inventory/BaseInventory.php b/src/pocketmine/inventory/BaseInventory.php index 98781b5a5..4bd1d9431 100644 --- a/src/pocketmine/inventory/BaseInventory.php +++ b/src/pocketmine/inventory/BaseInventory.php @@ -25,8 +25,8 @@ use pocketmine\entity\Entity; use pocketmine\event\entity\EntityInventoryChangeEvent; use pocketmine\event\inventory\InventoryOpenEvent; use pocketmine\item\Item; -use pocketmine\network\protocol\ContainerSetContentPacket; -use pocketmine\network\protocol\ContainerSetSlotPacket; +use pocketmine\network\mcpe\protocol\ContainerSetContentPacket; +use pocketmine\network\mcpe\protocol\ContainerSetSlotPacket; use pocketmine\Player; use pocketmine\Server; diff --git a/src/pocketmine/inventory/ChestInventory.php b/src/pocketmine/inventory/ChestInventory.php index cc2839896..74cc9910d 100644 --- a/src/pocketmine/inventory/ChestInventory.php +++ b/src/pocketmine/inventory/ChestInventory.php @@ -22,7 +22,7 @@ namespace pocketmine\inventory; use pocketmine\level\Level; -use pocketmine\network\protocol\BlockEventPacket; +use pocketmine\network\mcpe\protocol\BlockEventPacket; use pocketmine\Player; use pocketmine\tile\Chest; diff --git a/src/pocketmine/inventory/ContainerInventory.php b/src/pocketmine/inventory/ContainerInventory.php index a11f6011f..e17c96964 100644 --- a/src/pocketmine/inventory/ContainerInventory.php +++ b/src/pocketmine/inventory/ContainerInventory.php @@ -22,8 +22,8 @@ namespace pocketmine\inventory; use pocketmine\math\Vector3; -use pocketmine\network\protocol\ContainerClosePacket; -use pocketmine\network\protocol\ContainerOpenPacket; +use pocketmine\network\mcpe\protocol\ContainerClosePacket; +use pocketmine\network\mcpe\protocol\ContainerOpenPacket; use pocketmine\Player; abstract class ContainerInventory extends BaseInventory{ diff --git a/src/pocketmine/inventory/CraftingManager.php b/src/pocketmine/inventory/CraftingManager.php index af0c56665..56f63f591 100644 --- a/src/pocketmine/inventory/CraftingManager.php +++ b/src/pocketmine/inventory/CraftingManager.php @@ -23,7 +23,7 @@ namespace pocketmine\inventory; use pocketmine\event\Timings; use pocketmine\item\Item; -use pocketmine\network\protocol\CraftingDataPacket; +use pocketmine\network\mcpe\protocol\CraftingDataPacket; use pocketmine\Server; use pocketmine\utils\Config; use pocketmine\utils\MainLogger; diff --git a/src/pocketmine/inventory/DoubleChestInventory.php b/src/pocketmine/inventory/DoubleChestInventory.php index a0a471916..deee9b58f 100644 --- a/src/pocketmine/inventory/DoubleChestInventory.php +++ b/src/pocketmine/inventory/DoubleChestInventory.php @@ -23,7 +23,7 @@ namespace pocketmine\inventory; use pocketmine\item\Item; use pocketmine\level\Level; -use pocketmine\network\protocol\BlockEventPacket; +use pocketmine\network\mcpe\protocol\BlockEventPacket; use pocketmine\Player; use pocketmine\tile\Chest; diff --git a/src/pocketmine/inventory/PlayerInventory.php b/src/pocketmine/inventory/PlayerInventory.php index 03ce4c8ff..d7bb9dde8 100644 --- a/src/pocketmine/inventory/PlayerInventory.php +++ b/src/pocketmine/inventory/PlayerInventory.php @@ -26,10 +26,10 @@ use pocketmine\event\entity\EntityArmorChangeEvent; use pocketmine\event\entity\EntityInventoryChangeEvent; use pocketmine\event\player\PlayerItemHeldEvent; use pocketmine\item\Item; -use pocketmine\network\protocol\ContainerSetContentPacket; -use pocketmine\network\protocol\ContainerSetSlotPacket; -use pocketmine\network\protocol\MobArmorEquipmentPacket; -use pocketmine\network\protocol\MobEquipmentPacket; +use pocketmine\network\mcpe\protocol\ContainerSetContentPacket; +use pocketmine\network\mcpe\protocol\ContainerSetSlotPacket; +use pocketmine\network\mcpe\protocol\MobArmorEquipmentPacket; +use pocketmine\network\mcpe\protocol\MobEquipmentPacket; use pocketmine\Player; use pocketmine\Server; diff --git a/src/pocketmine/item/Food.php b/src/pocketmine/item/Food.php index 8fc692017..c9c97aa7c 100644 --- a/src/pocketmine/item/Food.php +++ b/src/pocketmine/item/Food.php @@ -24,7 +24,7 @@ namespace pocketmine\item; use pocketmine\entity\Entity; use pocketmine\entity\Human; use pocketmine\event\entity\EntityEatItemEvent; -use pocketmine\network\protocol\EntityEventPacket; +use pocketmine\network\mcpe\protocol\EntityEventPacket; use pocketmine\Player; abstract class Food extends Item implements FoodSource{ diff --git a/src/pocketmine/level/Explosion.php b/src/pocketmine/level/Explosion.php index 301c52808..5ece506e2 100644 --- a/src/pocketmine/level/Explosion.php +++ b/src/pocketmine/level/Explosion.php @@ -38,7 +38,7 @@ use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\DoubleTag; use pocketmine\nbt\tag\FloatTag; use pocketmine\nbt\tag\ListTag; -use pocketmine\network\protocol\ExplodePacket; +use pocketmine\network\mcpe\protocol\ExplodePacket; use pocketmine\utils\Random; class Explosion{ diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php index 8641622b4..e16d13ad8 100644 --- a/src/pocketmine/level/Level.php +++ b/src/pocketmine/level/Level.php @@ -90,14 +90,14 @@ use pocketmine\nbt\tag\FloatTag; use pocketmine\nbt\tag\ListTag; use pocketmine\nbt\tag\ShortTag; use pocketmine\nbt\tag\StringTag; -use pocketmine\network\protocol\BatchPacket; -use pocketmine\network\protocol\DataPacket; -use pocketmine\network\protocol\FullChunkDataPacket; -use pocketmine\network\protocol\LevelEventPacket; -use pocketmine\network\protocol\MoveEntityPacket; -use pocketmine\network\protocol\SetEntityMotionPacket; -use pocketmine\network\protocol\SetTimePacket; -use pocketmine\network\protocol\UpdateBlockPacket; +use pocketmine\network\mcpe\protocol\BatchPacket; +use pocketmine\network\mcpe\protocol\DataPacket; +use pocketmine\network\mcpe\protocol\FullChunkDataPacket; +use pocketmine\network\mcpe\protocol\LevelEventPacket; +use pocketmine\network\mcpe\protocol\MoveEntityPacket; +use pocketmine\network\mcpe\protocol\SetEntityMotionPacket; +use pocketmine\network\mcpe\protocol\SetTimePacket; +use pocketmine\network\mcpe\protocol\UpdateBlockPacket; use pocketmine\Player; use pocketmine\plugin\Plugin; use pocketmine\Server; diff --git a/src/pocketmine/level/format/io/leveldb/LevelDB.php b/src/pocketmine/level/format/io/leveldb/LevelDB.php index 1107d8b02..67a1eebbe 100644 --- a/src/pocketmine/level/format/io/leveldb/LevelDB.php +++ b/src/pocketmine/level/format/io/leveldb/LevelDB.php @@ -22,18 +22,18 @@ namespace pocketmine\level\format\io\leveldb; use pocketmine\level\format\Chunk; -use pocketmine\level\format\SubChunk; use pocketmine\level\format\io\BaseLevelProvider; use pocketmine\level\format\io\ChunkUtils; -use pocketmine\level\generator\Generator; +use pocketmine\level\format\SubChunk; use pocketmine\level\generator\Flat; +use pocketmine\level\generator\Generator; use pocketmine\level\Level; use pocketmine\level\LevelException; use pocketmine\nbt\NBT; use pocketmine\nbt\tag\{ ByteTag, CompoundTag, FloatTag, IntTag, LongTag, StringTag }; -use pocketmine\network\protocol\Info as ProtocolInfo; +use pocketmine\network\mcpe\protocol\ProtocolInfo; use pocketmine\utils\Binary; use pocketmine\utils\MainLogger; diff --git a/src/pocketmine/level/particle/DestroyBlockParticle.php b/src/pocketmine/level/particle/DestroyBlockParticle.php index 783159c27..5ced4462f 100644 --- a/src/pocketmine/level/particle/DestroyBlockParticle.php +++ b/src/pocketmine/level/particle/DestroyBlockParticle.php @@ -23,7 +23,7 @@ namespace pocketmine\level\particle; use pocketmine\block\Block; use pocketmine\math\Vector3; -use pocketmine\network\protocol\LevelEventPacket; +use pocketmine\network\mcpe\protocol\LevelEventPacket; class DestroyBlockParticle extends Particle{ diff --git a/src/pocketmine/level/particle/FloatingTextParticle.php b/src/pocketmine/level/particle/FloatingTextParticle.php index d42e2735f..9ef93bc50 100644 --- a/src/pocketmine/level/particle/FloatingTextParticle.php +++ b/src/pocketmine/level/particle/FloatingTextParticle.php @@ -24,8 +24,8 @@ namespace pocketmine\level\particle; use pocketmine\entity\Entity; use pocketmine\entity\Item as ItemEntity; use pocketmine\math\Vector3; -use pocketmine\network\protocol\AddEntityPacket; -use pocketmine\network\protocol\RemoveEntityPacket; +use pocketmine\network\mcpe\protocol\AddEntityPacket; +use pocketmine\network\mcpe\protocol\RemoveEntityPacket; class FloatingTextParticle extends Particle{ //TODO: HACK! diff --git a/src/pocketmine/level/particle/GenericParticle.php b/src/pocketmine/level/particle/GenericParticle.php index 657e03475..698d42bb1 100644 --- a/src/pocketmine/level/particle/GenericParticle.php +++ b/src/pocketmine/level/particle/GenericParticle.php @@ -22,7 +22,7 @@ namespace pocketmine\level\particle; use pocketmine\math\Vector3; -use pocketmine\network\protocol\LevelEventPacket; +use pocketmine\network\mcpe\protocol\LevelEventPacket; class GenericParticle extends Particle{ diff --git a/src/pocketmine/level/particle/MobSpawnParticle.php b/src/pocketmine/level/particle/MobSpawnParticle.php index 0b5001158..98527129a 100644 --- a/src/pocketmine/level/particle/MobSpawnParticle.php +++ b/src/pocketmine/level/particle/MobSpawnParticle.php @@ -22,7 +22,7 @@ namespace pocketmine\level\particle; use pocketmine\math\Vector3; -use pocketmine\network\protocol\LevelEventPacket; +use pocketmine\network\mcpe\protocol\LevelEventPacket; class MobSpawnParticle extends Particle{ diff --git a/src/pocketmine/level/particle/Particle.php b/src/pocketmine/level/particle/Particle.php index a0a8e8016..b95817990 100644 --- a/src/pocketmine/level/particle/Particle.php +++ b/src/pocketmine/level/particle/Particle.php @@ -22,7 +22,7 @@ namespace pocketmine\level\particle; use pocketmine\math\Vector3; -use pocketmine\network\protocol\DataPacket; +use pocketmine\network\mcpe\protocol\DataPacket; abstract class Particle extends Vector3{ diff --git a/src/pocketmine/level/sound/AnvilBreakSound.php b/src/pocketmine/level/sound/AnvilBreakSound.php index 7418976cb..246c44c52 100644 --- a/src/pocketmine/level/sound/AnvilBreakSound.php +++ b/src/pocketmine/level/sound/AnvilBreakSound.php @@ -22,7 +22,7 @@ namespace pocketmine\level\sound; use pocketmine\math\Vector3; -use pocketmine\network\protocol\LevelEventPacket; +use pocketmine\network\mcpe\protocol\LevelEventPacket; class AnvilBreakSound extends GenericSound{ public function __construct(Vector3 $pos, $pitch = 0){ diff --git a/src/pocketmine/level/sound/AnvilFallSound.php b/src/pocketmine/level/sound/AnvilFallSound.php index c5b901495..f84b50e8d 100644 --- a/src/pocketmine/level/sound/AnvilFallSound.php +++ b/src/pocketmine/level/sound/AnvilFallSound.php @@ -22,7 +22,7 @@ namespace pocketmine\level\sound; use pocketmine\math\Vector3; -use pocketmine\network\protocol\LevelEventPacket; +use pocketmine\network\mcpe\protocol\LevelEventPacket; class AnvilFallSound extends GenericSound{ public function __construct(Vector3 $pos, $pitch = 0){ diff --git a/src/pocketmine/level/sound/AnvilUseSound.php b/src/pocketmine/level/sound/AnvilUseSound.php index 8be6d62ef..024ad017b 100644 --- a/src/pocketmine/level/sound/AnvilUseSound.php +++ b/src/pocketmine/level/sound/AnvilUseSound.php @@ -22,7 +22,7 @@ namespace pocketmine\level\sound; use pocketmine\math\Vector3; -use pocketmine\network\protocol\LevelEventPacket; +use pocketmine\network\mcpe\protocol\LevelEventPacket; class AnvilUseSound extends GenericSound{ public function __construct(Vector3 $pos, $pitch = 0){ diff --git a/src/pocketmine/level/sound/BlazeShootSound.php b/src/pocketmine/level/sound/BlazeShootSound.php index e020230fd..68d15dd93 100644 --- a/src/pocketmine/level/sound/BlazeShootSound.php +++ b/src/pocketmine/level/sound/BlazeShootSound.php @@ -22,7 +22,7 @@ namespace pocketmine\level\sound; use pocketmine\math\Vector3; -use pocketmine\network\protocol\LevelEventPacket; +use pocketmine\network\mcpe\protocol\LevelEventPacket; class BlazeShootSound extends GenericSound{ public function __construct(Vector3 $pos, $pitch = 0){ diff --git a/src/pocketmine/level/sound/ClickSound.php b/src/pocketmine/level/sound/ClickSound.php index 993d9eefd..3261fe9b0 100644 --- a/src/pocketmine/level/sound/ClickSound.php +++ b/src/pocketmine/level/sound/ClickSound.php @@ -22,7 +22,7 @@ namespace pocketmine\level\sound; use pocketmine\math\Vector3; -use pocketmine\network\protocol\LevelEventPacket; +use pocketmine\network\mcpe\protocol\LevelEventPacket; class ClickSound extends GenericSound{ public function __construct(Vector3 $pos, $pitch = 0){ diff --git a/src/pocketmine/level/sound/DoorBumpSound.php b/src/pocketmine/level/sound/DoorBumpSound.php index 8b0146791..0278ad4d5 100644 --- a/src/pocketmine/level/sound/DoorBumpSound.php +++ b/src/pocketmine/level/sound/DoorBumpSound.php @@ -22,7 +22,7 @@ namespace pocketmine\level\sound; use pocketmine\math\Vector3; -use pocketmine\network\protocol\LevelEventPacket; +use pocketmine\network\mcpe\protocol\LevelEventPacket; class DoorBumpSound extends GenericSound{ public function __construct(Vector3 $pos, $pitch = 0){ diff --git a/src/pocketmine/level/sound/DoorCrashSound.php b/src/pocketmine/level/sound/DoorCrashSound.php index 9468d9e28..2fc713f46 100644 --- a/src/pocketmine/level/sound/DoorCrashSound.php +++ b/src/pocketmine/level/sound/DoorCrashSound.php @@ -22,7 +22,7 @@ namespace pocketmine\level\sound; use pocketmine\math\Vector3; -use pocketmine\network\protocol\LevelEventPacket; +use pocketmine\network\mcpe\protocol\LevelEventPacket; class DoorCrashSound extends GenericSound{ public function __construct(Vector3 $pos, $pitch = 0){ diff --git a/src/pocketmine/level/sound/DoorSound.php b/src/pocketmine/level/sound/DoorSound.php index e6361f3ee..486d371e2 100644 --- a/src/pocketmine/level/sound/DoorSound.php +++ b/src/pocketmine/level/sound/DoorSound.php @@ -22,7 +22,7 @@ namespace pocketmine\level\sound; use pocketmine\math\Vector3; -use pocketmine\network\protocol\LevelEventPacket; +use pocketmine\network\mcpe\protocol\LevelEventPacket; class DoorSound extends GenericSound{ public function __construct(Vector3 $pos, $pitch = 0){ diff --git a/src/pocketmine/level/sound/EndermanTeleportSound.php b/src/pocketmine/level/sound/EndermanTeleportSound.php index c4e43130e..98f1b2e94 100644 --- a/src/pocketmine/level/sound/EndermanTeleportSound.php +++ b/src/pocketmine/level/sound/EndermanTeleportSound.php @@ -22,7 +22,7 @@ namespace pocketmine\level\sound; use pocketmine\math\Vector3; -use pocketmine\network\protocol\LevelEventPacket; +use pocketmine\network\mcpe\protocol\LevelEventPacket; class EndermanTeleportSound extends GenericSound{ public function __construct(Vector3 $pos){ diff --git a/src/pocketmine/level/sound/FizzSound.php b/src/pocketmine/level/sound/FizzSound.php index 241f0c7a0..32fd9a004 100644 --- a/src/pocketmine/level/sound/FizzSound.php +++ b/src/pocketmine/level/sound/FizzSound.php @@ -22,7 +22,7 @@ namespace pocketmine\level\sound; use pocketmine\math\Vector3; -use pocketmine\network\protocol\LevelEventPacket; +use pocketmine\network\mcpe\protocol\LevelEventPacket; class FizzSound extends GenericSound{ public function __construct(Vector3 $pos, $pitch = 0){ diff --git a/src/pocketmine/level/sound/GenericSound.php b/src/pocketmine/level/sound/GenericSound.php index e9f5fdcf2..f3e399cf1 100644 --- a/src/pocketmine/level/sound/GenericSound.php +++ b/src/pocketmine/level/sound/GenericSound.php @@ -22,7 +22,7 @@ namespace pocketmine\level\sound; use pocketmine\math\Vector3; -use pocketmine\network\protocol\LevelEventPacket; +use pocketmine\network\mcpe\protocol\LevelEventPacket; class GenericSound extends Sound{ diff --git a/src/pocketmine/level/sound/GhastShootSound.php b/src/pocketmine/level/sound/GhastShootSound.php index 215a0c178..d7dd0581f 100644 --- a/src/pocketmine/level/sound/GhastShootSound.php +++ b/src/pocketmine/level/sound/GhastShootSound.php @@ -22,7 +22,7 @@ namespace pocketmine\level\sound; use pocketmine\math\Vector3; -use pocketmine\network\protocol\LevelEventPacket; +use pocketmine\network\mcpe\protocol\LevelEventPacket; class GhastShootSound extends GenericSound{ public function __construct(Vector3 $pos, $pitch = 0){ diff --git a/src/pocketmine/level/sound/GhastSound.php b/src/pocketmine/level/sound/GhastSound.php index 46ad47783..0178c5302 100644 --- a/src/pocketmine/level/sound/GhastSound.php +++ b/src/pocketmine/level/sound/GhastSound.php @@ -22,7 +22,7 @@ namespace pocketmine\level\sound; use pocketmine\math\Vector3; -use pocketmine\network\protocol\LevelEventPacket; +use pocketmine\network\mcpe\protocol\LevelEventPacket; class GhastSound extends GenericSound{ public function __construct(Vector3 $pos, $pitch = 0){ diff --git a/src/pocketmine/level/sound/LaunchSound.php b/src/pocketmine/level/sound/LaunchSound.php index 4240f5c4c..3245c2da4 100644 --- a/src/pocketmine/level/sound/LaunchSound.php +++ b/src/pocketmine/level/sound/LaunchSound.php @@ -22,7 +22,7 @@ namespace pocketmine\level\sound; use pocketmine\math\Vector3; -use pocketmine\network\protocol\LevelEventPacket; +use pocketmine\network\mcpe\protocol\LevelEventPacket; class LaunchSound extends GenericSound{ public function __construct(Vector3 $pos, $pitch = 0){ diff --git a/src/pocketmine/level/sound/PopSound.php b/src/pocketmine/level/sound/PopSound.php index 6adf740ea..5d2862588 100644 --- a/src/pocketmine/level/sound/PopSound.php +++ b/src/pocketmine/level/sound/PopSound.php @@ -22,7 +22,7 @@ namespace pocketmine\level\sound; use pocketmine\math\Vector3; -use pocketmine\network\protocol\LevelEventPacket; +use pocketmine\network\mcpe\protocol\LevelEventPacket; class PopSound extends GenericSound{ public function __construct(Vector3 $pos, $pitch = 0){ diff --git a/src/pocketmine/level/sound/Sound.php b/src/pocketmine/level/sound/Sound.php index 9ec5ec4e5..2e84ad113 100644 --- a/src/pocketmine/level/sound/Sound.php +++ b/src/pocketmine/level/sound/Sound.php @@ -22,7 +22,7 @@ namespace pocketmine\level\sound; use pocketmine\math\Vector3; -use pocketmine\network\protocol\DataPacket; +use pocketmine\network\mcpe\protocol\DataPacket; abstract class Sound extends Vector3{ diff --git a/src/pocketmine/network/Network.php b/src/pocketmine/network/Network.php index 4ee22988a..f29cc153b 100644 --- a/src/pocketmine/network/Network.php +++ b/src/pocketmine/network/Network.php @@ -24,77 +24,76 @@ */ namespace pocketmine\network; -use pocketmine\network\protocol\AddEntityPacket; -use pocketmine\network\protocol\AddHangingEntityPacket; -use pocketmine\network\protocol\AddItemEntityPacket; -use pocketmine\network\protocol\AddItemPacket; -use pocketmine\network\protocol\AddPaintingPacket; -use pocketmine\network\protocol\AddPlayerPacket; -use pocketmine\network\protocol\AdventureSettingsPacket; -use pocketmine\network\protocol\AnimatePacket; -use pocketmine\network\protocol\AvailableCommandsPacket; -use pocketmine\network\protocol\BatchPacket; -use pocketmine\network\protocol\BlockEntityDataPacket; -use pocketmine\network\protocol\BlockEventPacket; -use pocketmine\network\protocol\ChangeDimensionPacket; -use pocketmine\network\protocol\ChunkRadiusUpdatedPacket; -use pocketmine\network\protocol\CommandStepPacket; -use pocketmine\network\protocol\ContainerClosePacket; -use pocketmine\network\protocol\ContainerOpenPacket; -use pocketmine\network\protocol\ContainerSetContentPacket; -use pocketmine\network\protocol\ContainerSetDataPacket; -use pocketmine\network\protocol\ContainerSetSlotPacket; -use pocketmine\network\protocol\CraftingDataPacket; -use pocketmine\network\protocol\CraftingEventPacket; -use pocketmine\network\protocol\DataPacket; -use pocketmine\network\protocol\DisconnectPacket; -use pocketmine\network\protocol\DropItemPacket; -use pocketmine\network\protocol\EntityEventPacket; -use pocketmine\network\protocol\ExplodePacket; -use pocketmine\network\protocol\FullChunkDataPacket; -use pocketmine\network\protocol\HurtArmorPacket; -use pocketmine\network\protocol\Info; -use pocketmine\network\protocol\Info as ProtocolInfo; -use pocketmine\network\protocol\InteractPacket; -use pocketmine\network\protocol\InventoryActionPacket; -use pocketmine\network\protocol\ItemFrameDropItemPacket; -use pocketmine\network\protocol\LevelEventPacket; -use pocketmine\network\protocol\LevelSoundEventPacket; -use pocketmine\network\protocol\LoginPacket; -use pocketmine\network\protocol\MobArmorEquipmentPacket; -use pocketmine\network\protocol\MobEquipmentPacket; -use pocketmine\network\protocol\MoveEntityPacket; -use pocketmine\network\protocol\MovePlayerPacket; -use pocketmine\network\protocol\PlayerActionPacket; -use pocketmine\network\protocol\PlayerFallPacket; -use pocketmine\network\protocol\PlayerInputPacket; -use pocketmine\network\protocol\PlayerListPacket; -use pocketmine\network\protocol\PlayStatusPacket; -use pocketmine\network\protocol\RemoveBlockPacket; -use pocketmine\network\protocol\RemoveEntityPacket; -use pocketmine\network\protocol\ReplaceItemInSlotPacket; -use pocketmine\network\protocol\RequestChunkRadiusPacket; -use pocketmine\network\protocol\ResourcePackClientResponsePacket; -use pocketmine\network\protocol\ResourcePacksInfoPacket; -use pocketmine\network\protocol\RespawnPacket; -use pocketmine\network\protocol\RiderJumpPacket; -use pocketmine\network\protocol\SetCommandsEnabledPacket; -use pocketmine\network\protocol\SetDifficultyPacket; -use pocketmine\network\protocol\SetEntityDataPacket; -use pocketmine\network\protocol\SetEntityLinkPacket; -use pocketmine\network\protocol\SetEntityMotionPacket; -use pocketmine\network\protocol\SetHealthPacket; -use pocketmine\network\protocol\SetPlayerGameTypePacket; -use pocketmine\network\protocol\SetSpawnPositionPacket; -use pocketmine\network\protocol\SetTimePacket; -use pocketmine\network\protocol\ShowCreditsPacket; -use pocketmine\network\protocol\SpawnExperienceOrbPacket; -use pocketmine\network\protocol\StartGamePacket; -use pocketmine\network\protocol\TakeItemEntityPacket; -use pocketmine\network\protocol\TextPacket; -use pocketmine\network\protocol\TransferPacket; -use pocketmine\network\protocol\UpdateBlockPacket; -use pocketmine\network\protocol\UseItemPacket; +use pocketmine\network\mcpe\protocol\AddEntityPacket; +use pocketmine\network\mcpe\protocol\AddHangingEntityPacket; +use pocketmine\network\mcpe\protocol\AddItemEntityPacket; +use pocketmine\network\mcpe\protocol\AddItemPacket; +use pocketmine\network\mcpe\protocol\AddPaintingPacket; +use pocketmine\network\mcpe\protocol\AddPlayerPacket; +use pocketmine\network\mcpe\protocol\AdventureSettingsPacket; +use pocketmine\network\mcpe\protocol\AnimatePacket; +use pocketmine\network\mcpe\protocol\AvailableCommandsPacket; +use pocketmine\network\mcpe\protocol\BatchPacket; +use pocketmine\network\mcpe\protocol\BlockEntityDataPacket; +use pocketmine\network\mcpe\protocol\BlockEventPacket; +use pocketmine\network\mcpe\protocol\ChangeDimensionPacket; +use pocketmine\network\mcpe\protocol\ChunkRadiusUpdatedPacket; +use pocketmine\network\mcpe\protocol\CommandStepPacket; +use pocketmine\network\mcpe\protocol\ContainerClosePacket; +use pocketmine\network\mcpe\protocol\ContainerOpenPacket; +use pocketmine\network\mcpe\protocol\ContainerSetContentPacket; +use pocketmine\network\mcpe\protocol\ContainerSetDataPacket; +use pocketmine\network\mcpe\protocol\ContainerSetSlotPacket; +use pocketmine\network\mcpe\protocol\CraftingDataPacket; +use pocketmine\network\mcpe\protocol\CraftingEventPacket; +use pocketmine\network\mcpe\protocol\DataPacket; +use pocketmine\network\mcpe\protocol\DisconnectPacket; +use pocketmine\network\mcpe\protocol\DropItemPacket; +use pocketmine\network\mcpe\protocol\EntityEventPacket; +use pocketmine\network\mcpe\protocol\ExplodePacket; +use pocketmine\network\mcpe\protocol\FullChunkDataPacket; +use pocketmine\network\mcpe\protocol\HurtArmorPacket; +use pocketmine\network\mcpe\protocol\ProtocolInfo; +use pocketmine\network\mcpe\protocol\InteractPacket; +use pocketmine\network\mcpe\protocol\InventoryActionPacket; +use pocketmine\network\mcpe\protocol\ItemFrameDropItemPacket; +use pocketmine\network\mcpe\protocol\LevelEventPacket; +use pocketmine\network\mcpe\protocol\LevelSoundEventPacket; +use pocketmine\network\mcpe\protocol\LoginPacket; +use pocketmine\network\mcpe\protocol\MobEquipmentPacket; +use pocketmine\network\mcpe\protocol\MobArmorEquipmentPacket; +use pocketmine\network\mcpe\protocol\MoveEntityPacket; +use pocketmine\network\mcpe\protocol\MovePlayerPacket; +use pocketmine\network\mcpe\protocol\PlayerActionPacket; +use pocketmine\network\mcpe\protocol\PlayerFallPacket; +use pocketmine\network\mcpe\protocol\PlayerInputPacket; +use pocketmine\network\mcpe\protocol\PlayerListPacket; +use pocketmine\network\mcpe\protocol\PlayStatusPacket; +use pocketmine\network\mcpe\protocol\RemoveBlockPacket; +use pocketmine\network\mcpe\protocol\RemoveEntityPacket; +use pocketmine\network\mcpe\protocol\ReplaceItemInSlotPacket; +use pocketmine\network\mcpe\protocol\RequestChunkRadiusPacket; +use pocketmine\network\mcpe\protocol\ResourcePackClientResponsePacket; +use pocketmine\network\mcpe\protocol\ResourcePacksInfoPacket; +use pocketmine\network\mcpe\protocol\RespawnPacket; +use pocketmine\network\mcpe\protocol\RiderJumpPacket; +use pocketmine\network\mcpe\protocol\SetCommandsEnabledPacket; +use pocketmine\network\mcpe\protocol\SetDifficultyPacket; +use pocketmine\network\mcpe\protocol\SetEntityDataPacket; +use pocketmine\network\mcpe\protocol\SetEntityLinkPacket; +use pocketmine\network\mcpe\protocol\SetEntityMotionPacket; +use pocketmine\network\mcpe\protocol\SetHealthPacket; +use pocketmine\network\mcpe\protocol\SetPlayerGameTypePacket; +use pocketmine\network\mcpe\protocol\SetSpawnPositionPacket; +use pocketmine\network\mcpe\protocol\SetTimePacket; +use pocketmine\network\mcpe\protocol\ShowCreditsPacket; +use pocketmine\network\mcpe\protocol\SpawnExperienceOrbPacket; +use pocketmine\network\mcpe\protocol\StartGamePacket; +use pocketmine\network\mcpe\protocol\TakeItemEntityPacket; +use pocketmine\network\mcpe\protocol\TextPacket; +use pocketmine\network\mcpe\protocol\TransferPacket; +use pocketmine\network\mcpe\protocol\UpdateBlockPacket; +use pocketmine\network\mcpe\protocol\UseItemPacket; use pocketmine\Player; use pocketmine\Server; use pocketmine\utils\BinaryStream; @@ -244,7 +243,7 @@ class Network{ $buf = $stream->getString(); if(($pk = $this->getPacket(ord($buf{0}))) !== null){ - if($pk::NETWORK_ID === Info::BATCH_PACKET){ + if($pk::NETWORK_ID === ProtocolInfo::BATCH_PACKET){ throw new \InvalidStateException("Invalid BatchPacket inside BatchPacket"); } diff --git a/src/pocketmine/network/SourceInterface.php b/src/pocketmine/network/SourceInterface.php index f662992a0..492c5b60c 100644 --- a/src/pocketmine/network/SourceInterface.php +++ b/src/pocketmine/network/SourceInterface.php @@ -24,7 +24,7 @@ */ namespace pocketmine\network; -use pocketmine\network\protocol\DataPacket; +use pocketmine\network\mcpe\protocol\DataPacket; use pocketmine\Player; /** diff --git a/src/pocketmine/network/CachedEncapsulatedPacket.php b/src/pocketmine/network/mcpe/CachedEncapsulatedPacket.php similarity index 96% rename from src/pocketmine/network/CachedEncapsulatedPacket.php rename to src/pocketmine/network/mcpe/CachedEncapsulatedPacket.php index 0ddcff4b7..57545d57c 100644 --- a/src/pocketmine/network/CachedEncapsulatedPacket.php +++ b/src/pocketmine/network/mcpe/CachedEncapsulatedPacket.php @@ -19,7 +19,7 @@ * */ -namespace pocketmine\network; +namespace pocketmine\network\mcpe; use raklib\protocol\EncapsulatedPacket; diff --git a/src/pocketmine/network/PocketEditionNetworkSession.php b/src/pocketmine/network/mcpe/NetworkSession.php similarity index 62% rename from src/pocketmine/network/PocketEditionNetworkSession.php rename to src/pocketmine/network/mcpe/NetworkSession.php index 7c8706798..bb86fe2d8 100644 --- a/src/pocketmine/network/PocketEditionNetworkSession.php +++ b/src/pocketmine/network/mcpe/NetworkSession.php @@ -20,82 +20,82 @@ */ -namespace pocketmine\network; +namespace pocketmine\network\mcpe; -use pocketmine\network\protocol\AddEntityPacket; -use pocketmine\network\protocol\AddHangingEntityPacket; -use pocketmine\network\protocol\AddItemEntityPacket; -use pocketmine\network\protocol\AddItemPacket; -use pocketmine\network\protocol\AddPaintingPacket; -use pocketmine\network\protocol\AddPlayerPacket; -use pocketmine\network\protocol\AdventureSettingsPacket; -use pocketmine\network\protocol\AnimatePacket; -use pocketmine\network\protocol\AvailableCommandsPacket; -use pocketmine\network\protocol\BatchPacket; -use pocketmine\network\protocol\BlockEntityDataPacket; -use pocketmine\network\protocol\BlockEventPacket; -use pocketmine\network\protocol\ChangeDimensionPacket; -use pocketmine\network\protocol\ChunkRadiusUpdatedPacket; -use pocketmine\network\protocol\CommandStepPacket; -use pocketmine\network\protocol\ContainerClosePacket; -use pocketmine\network\protocol\ContainerOpenPacket; -use pocketmine\network\protocol\ContainerSetContentPacket; -use pocketmine\network\protocol\ContainerSetDataPacket; -use pocketmine\network\protocol\ContainerSetSlotPacket; -use pocketmine\network\protocol\CraftingDataPacket; -use pocketmine\network\protocol\CraftingEventPacket; -use pocketmine\network\protocol\DisconnectPacket; -use pocketmine\network\protocol\DropItemPacket; -use pocketmine\network\protocol\EntityEventPacket; -use pocketmine\network\protocol\ExplodePacket; -use pocketmine\network\protocol\FullChunkDataPacket; -use pocketmine\network\protocol\HurtArmorPacket; -use pocketmine\network\protocol\InteractPacket; -use pocketmine\network\protocol\InventoryActionPacket; -use pocketmine\network\protocol\ItemFrameDropItemPacket; -use pocketmine\network\protocol\LevelEventPacket; -use pocketmine\network\protocol\LevelSoundEventPacket; -use pocketmine\network\protocol\LoginPacket; -use pocketmine\network\protocol\MobArmorEquipmentPacket; -use pocketmine\network\protocol\MobEffectPacket; -use pocketmine\network\protocol\MobEquipmentPacket; -use pocketmine\network\protocol\MoveEntityPacket; -use pocketmine\network\protocol\MovePlayerPacket; -use pocketmine\network\protocol\PlayerActionPacket; -use pocketmine\network\protocol\PlayerFallPacket; -use pocketmine\network\protocol\PlayerInputPacket; -use pocketmine\network\protocol\PlayerListPacket; -use pocketmine\network\protocol\PlayStatusPacket; -use pocketmine\network\protocol\RemoveBlockPacket; -use pocketmine\network\protocol\RemoveEntityPacket; -use pocketmine\network\protocol\ReplaceItemInSlotPacket; -use pocketmine\network\protocol\RequestChunkRadiusPacket; -use pocketmine\network\protocol\ResourcePackClientResponsePacket; -use pocketmine\network\protocol\ResourcePacksInfoPacket; -use pocketmine\network\protocol\ResourcePackStackPacket; -use pocketmine\network\protocol\RespawnPacket; -use pocketmine\network\protocol\RiderJumpPacket; -use pocketmine\network\protocol\SetCommandsEnabledPacket; -use pocketmine\network\protocol\SetDifficultyPacket; -use pocketmine\network\protocol\SetEntityDataPacket; -use pocketmine\network\protocol\SetEntityLinkPacket; -use pocketmine\network\protocol\SetEntityMotionPacket; -use pocketmine\network\protocol\SetHealthPacket; -use pocketmine\network\protocol\SetPlayerGameTypePacket; -use pocketmine\network\protocol\SetSpawnPositionPacket; -use pocketmine\network\protocol\SetTimePacket; -use pocketmine\network\protocol\ShowCreditsPacket; -use pocketmine\network\protocol\SpawnExperienceOrbPacket; -use pocketmine\network\protocol\StartGamePacket; -use pocketmine\network\protocol\TakeItemEntityPacket; -use pocketmine\network\protocol\TextPacket; -use pocketmine\network\protocol\TransferPacket; -use pocketmine\network\protocol\UpdateAttributesPacket; -use pocketmine\network\protocol\UpdateBlockPacket; -use pocketmine\network\protocol\UseItemPacket; +use pocketmine\network\mcpe\protocol\AddEntityPacket; +use pocketmine\network\mcpe\protocol\AddHangingEntityPacket; +use pocketmine\network\mcpe\protocol\AddItemEntityPacket; +use pocketmine\network\mcpe\protocol\AddItemPacket; +use pocketmine\network\mcpe\protocol\AddPaintingPacket; +use pocketmine\network\mcpe\protocol\AddPlayerPacket; +use pocketmine\network\mcpe\protocol\AdventureSettingsPacket; +use pocketmine\network\mcpe\protocol\AnimatePacket; +use pocketmine\network\mcpe\protocol\AvailableCommandsPacket; +use pocketmine\network\mcpe\protocol\BatchPacket; +use pocketmine\network\mcpe\protocol\BlockEntityDataPacket; +use pocketmine\network\mcpe\protocol\BlockEventPacket; +use pocketmine\network\mcpe\protocol\ChangeDimensionPacket; +use pocketmine\network\mcpe\protocol\ChunkRadiusUpdatedPacket; +use pocketmine\network\mcpe\protocol\CommandStepPacket; +use pocketmine\network\mcpe\protocol\ContainerClosePacket; +use pocketmine\network\mcpe\protocol\ContainerOpenPacket; +use pocketmine\network\mcpe\protocol\ContainerSetContentPacket; +use pocketmine\network\mcpe\protocol\ContainerSetDataPacket; +use pocketmine\network\mcpe\protocol\ContainerSetSlotPacket; +use pocketmine\network\mcpe\protocol\CraftingDataPacket; +use pocketmine\network\mcpe\protocol\CraftingEventPacket; +use pocketmine\network\mcpe\protocol\DisconnectPacket; +use pocketmine\network\mcpe\protocol\DropItemPacket; +use pocketmine\network\mcpe\protocol\EntityEventPacket; +use pocketmine\network\mcpe\protocol\ExplodePacket; +use pocketmine\network\mcpe\protocol\FullChunkDataPacket; +use pocketmine\network\mcpe\protocol\HurtArmorPacket; +use pocketmine\network\mcpe\protocol\InteractPacket; +use pocketmine\network\mcpe\protocol\InventoryActionPacket; +use pocketmine\network\mcpe\protocol\ItemFrameDropItemPacket; +use pocketmine\network\mcpe\protocol\LevelEventPacket; +use pocketmine\network\mcpe\protocol\LevelSoundEventPacket; +use pocketmine\network\mcpe\protocol\LoginPacket; +use pocketmine\network\mcpe\protocol\MobArmorEquipmentPacket; +use pocketmine\network\mcpe\protocol\MobEffectPacket; +use pocketmine\network\mcpe\protocol\MobEquipmentPacket; +use pocketmine\network\mcpe\protocol\MoveEntityPacket; +use pocketmine\network\mcpe\protocol\MovePlayerPacket; +use pocketmine\network\mcpe\protocol\PlayerActionPacket; +use pocketmine\network\mcpe\protocol\PlayerFallPacket; +use pocketmine\network\mcpe\protocol\PlayerInputPacket; +use pocketmine\network\mcpe\protocol\PlayerListPacket; +use pocketmine\network\mcpe\protocol\PlayStatusPacket; +use pocketmine\network\mcpe\protocol\RemoveBlockPacket; +use pocketmine\network\mcpe\protocol\RemoveEntityPacket; +use pocketmine\network\mcpe\protocol\ReplaceItemInSlotPacket; +use pocketmine\network\mcpe\protocol\RequestChunkRadiusPacket; +use pocketmine\network\mcpe\protocol\ResourcePackClientResponsePacket; +use pocketmine\network\mcpe\protocol\ResourcePacksInfoPacket; +use pocketmine\network\mcpe\protocol\ResourcePackStackPacket; +use pocketmine\network\mcpe\protocol\RespawnPacket; +use pocketmine\network\mcpe\protocol\RiderJumpPacket; +use pocketmine\network\mcpe\protocol\SetCommandsEnabledPacket; +use pocketmine\network\mcpe\protocol\SetDifficultyPacket; +use pocketmine\network\mcpe\protocol\SetEntityDataPacket; +use pocketmine\network\mcpe\protocol\SetEntityLinkPacket; +use pocketmine\network\mcpe\protocol\SetEntityMotionPacket; +use pocketmine\network\mcpe\protocol\SetHealthPacket; +use pocketmine\network\mcpe\protocol\SetPlayerGameTypePacket; +use pocketmine\network\mcpe\protocol\SetSpawnPositionPacket; +use pocketmine\network\mcpe\protocol\SetTimePacket; +use pocketmine\network\mcpe\protocol\ShowCreditsPacket; +use pocketmine\network\mcpe\protocol\SpawnExperienceOrbPacket; +use pocketmine\network\mcpe\protocol\StartGamePacket; +use pocketmine\network\mcpe\protocol\TakeItemEntityPacket; +use pocketmine\network\mcpe\protocol\TextPacket; +use pocketmine\network\mcpe\protocol\TransferPacket; +use pocketmine\network\mcpe\protocol\UpdateAttributesPacket; +use pocketmine\network\mcpe\protocol\UpdateBlockPacket; +use pocketmine\network\mcpe\protocol\UseItemPacket; -interface PocketEditionNetworkSession{ +interface NetworkSession{ public function handleLogin(LoginPacket $packet) : bool; diff --git a/src/pocketmine/network/RakLibInterface.php b/src/pocketmine/network/mcpe/RakLibInterface.php similarity index 95% rename from src/pocketmine/network/RakLibInterface.php rename to src/pocketmine/network/mcpe/RakLibInterface.php index 9920a0f0d..b723c8acb 100644 --- a/src/pocketmine/network/RakLibInterface.php +++ b/src/pocketmine/network/mcpe/RakLibInterface.php @@ -19,12 +19,13 @@ * */ -namespace pocketmine\network; +namespace pocketmine\network\mcpe; use pocketmine\event\player\PlayerCreationEvent; -use pocketmine\network\protocol\DataPacket; -use pocketmine\network\protocol\Info; -use pocketmine\network\protocol\Info as ProtocolInfo; +use pocketmine\network\AdvancedSourceInterface; +use pocketmine\network\mcpe\protocol\DataPacket; +use pocketmine\network\mcpe\protocol\ProtocolInfo; +use pocketmine\network\Network; use pocketmine\Player; use pocketmine\Server; use raklib\protocol\EncapsulatedPacket; @@ -175,8 +176,8 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{ $this->interface->sendOption("name", "MCPE;" . rtrim(addcslashes($name, ";"), '\\') . ";" . - Info::CURRENT_PROTOCOL . ";" . - Info::MINECRAFT_VERSION_NETWORK . ";" . + ProtocolInfo::CURRENT_PROTOCOL . ";" . + ProtocolInfo::MINECRAFT_VERSION_NETWORK . ";" . $info->getPlayerCount() . ";" . $info->getMaxPlayerCount() ); diff --git a/src/pocketmine/network/protocol/AddEntityPacket.php b/src/pocketmine/network/mcpe/protocol/AddEntityPacket.php similarity index 90% rename from src/pocketmine/network/protocol/AddEntityPacket.php rename to src/pocketmine/network/mcpe/protocol/AddEntityPacket.php index 7bc018bcc..cbb5a974c 100644 --- a/src/pocketmine/network/protocol/AddEntityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddEntityPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include use pocketmine\entity\Attribute; -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class AddEntityPacket extends DataPacket{ - const NETWORK_ID = Info::ADD_ENTITY_PACKET; + const NETWORK_ID = ProtocolInfo::ADD_ENTITY_PACKET; public $eid; public $type; @@ -73,7 +73,7 @@ class AddEntityPacket extends DataPacket{ } } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleAddEntity($this); } diff --git a/src/pocketmine/network/protocol/AddHangingEntityPacket.php b/src/pocketmine/network/mcpe/protocol/AddHangingEntityPacket.php similarity index 85% rename from src/pocketmine/network/protocol/AddHangingEntityPacket.php rename to src/pocketmine/network/mcpe/protocol/AddHangingEntityPacket.php index 5ed7b32f5..4550e9823 100644 --- a/src/pocketmine/network/protocol/AddHangingEntityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddHangingEntityPacket.php @@ -19,14 +19,14 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class AddHangingEntityPacket extends DataPacket{ - const NETWORK_ID = Info::ADD_HANGING_ENTITY_PACKET; + const NETWORK_ID = ProtocolInfo::ADD_HANGING_ENTITY_PACKET; public $entityUniqueId; public $entityRuntimeId; @@ -47,7 +47,7 @@ class AddHangingEntityPacket extends DataPacket{ $this->putVarInt($this->unknown); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleAddHangingEntity($this); } diff --git a/src/pocketmine/network/protocol/AddItemEntityPacket.php b/src/pocketmine/network/mcpe/protocol/AddItemEntityPacket.php similarity index 85% rename from src/pocketmine/network/protocol/AddItemEntityPacket.php rename to src/pocketmine/network/mcpe/protocol/AddItemEntityPacket.php index fc38ec153..f1fd7930e 100644 --- a/src/pocketmine/network/protocol/AddItemEntityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddItemEntityPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class AddItemEntityPacket extends DataPacket{ - const NETWORK_ID = Info::ADD_ITEM_ENTITY_PACKET; + const NETWORK_ID = ProtocolInfo::ADD_ITEM_ENTITY_PACKET; public $eid; public $item; @@ -51,7 +51,7 @@ class AddItemEntityPacket extends DataPacket{ $this->putVector3f($this->speedX, $this->speedY, $this->speedZ); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleAddItemEntity($this); } diff --git a/src/pocketmine/network/protocol/AddItemPacket.php b/src/pocketmine/network/mcpe/protocol/AddItemPacket.php similarity index 82% rename from src/pocketmine/network/protocol/AddItemPacket.php rename to src/pocketmine/network/mcpe/protocol/AddItemPacket.php index a67aa7170..397d87f9d 100644 --- a/src/pocketmine/network/protocol/AddItemPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddItemPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class AddItemPacket extends DataPacket{ - const NETWORK_ID = Info::ADD_ITEM_PACKET; + const NETWORK_ID = ProtocolInfo::ADD_ITEM_PACKET; public $item; @@ -40,7 +40,7 @@ class AddItemPacket extends DataPacket{ $this->putSlot($this->item); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleAddItem($this); } diff --git a/src/pocketmine/network/protocol/AddPaintingPacket.php b/src/pocketmine/network/mcpe/protocol/AddPaintingPacket.php similarity index 85% rename from src/pocketmine/network/protocol/AddPaintingPacket.php rename to src/pocketmine/network/mcpe/protocol/AddPaintingPacket.php index eff76d0f1..c2af0e398 100644 --- a/src/pocketmine/network/protocol/AddPaintingPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddPaintingPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class AddPaintingPacket extends DataPacket{ - const NETWORK_ID = Info::ADD_PAINTING_PACKET; + const NETWORK_ID = ProtocolInfo::ADD_PAINTING_PACKET; public $eid; public $x; @@ -49,7 +49,7 @@ class AddPaintingPacket extends DataPacket{ $this->putString($this->title); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleAddPainting($this); } diff --git a/src/pocketmine/network/protocol/AddPlayerPacket.php b/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php similarity index 88% rename from src/pocketmine/network/protocol/AddPlayerPacket.php rename to src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php index 7b6fbd8c2..aad154a7d 100644 --- a/src/pocketmine/network/protocol/AddPlayerPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php @@ -19,14 +19,14 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class AddPlayerPacket extends DataPacket{ - const NETWORK_ID = Info::ADD_PLAYER_PACKET; + const NETWORK_ID = ProtocolInfo::ADD_PLAYER_PACKET; public $uuid; public $username; @@ -62,7 +62,7 @@ class AddPlayerPacket extends DataPacket{ $this->putEntityMetadata($this->metadata); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleAddPlayer($this); } diff --git a/src/pocketmine/network/protocol/AdventureSettingsPacket.php b/src/pocketmine/network/mcpe/protocol/AdventureSettingsPacket.php similarity index 93% rename from src/pocketmine/network/protocol/AdventureSettingsPacket.php rename to src/pocketmine/network/mcpe/protocol/AdventureSettingsPacket.php index b5612f187..8cc7989ac 100644 --- a/src/pocketmine/network/protocol/AdventureSettingsPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AdventureSettingsPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class AdventureSettingsPacket extends DataPacket{ - const NETWORK_ID = Info::ADVENTURE_SETTINGS_PACKET; + const NETWORK_ID = ProtocolInfo::ADVENTURE_SETTINGS_PACKET; const PERMISSION_NORMAL = 0; const PERMISSION_OPERATOR = 1; @@ -97,7 +97,7 @@ class AdventureSettingsPacket extends DataPacket{ $this->putUnsignedVarInt($this->userPermission); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleAdventureSettings($this); } diff --git a/src/pocketmine/network/protocol/AnimatePacket.php b/src/pocketmine/network/mcpe/protocol/AnimatePacket.php similarity index 84% rename from src/pocketmine/network/protocol/AnimatePacket.php rename to src/pocketmine/network/mcpe/protocol/AnimatePacket.php index 7b713fa3a..ecd0e64de 100644 --- a/src/pocketmine/network/protocol/AnimatePacket.php +++ b/src/pocketmine/network/mcpe/protocol/AnimatePacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class AnimatePacket extends DataPacket{ - const NETWORK_ID = Info::ANIMATE_PACKET; + const NETWORK_ID = ProtocolInfo::ANIMATE_PACKET; public $action; public $eid; @@ -43,7 +43,7 @@ class AnimatePacket extends DataPacket{ $this->putEntityId($this->eid); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleAnimate($this); } diff --git a/src/pocketmine/network/protocol/AvailableCommandsPacket.php b/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php similarity index 83% rename from src/pocketmine/network/protocol/AvailableCommandsPacket.php rename to src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php index ef1907ade..fc458e074 100644 --- a/src/pocketmine/network/protocol/AvailableCommandsPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php @@ -19,14 +19,14 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class AvailableCommandsPacket extends DataPacket{ - const NETWORK_ID = Info::AVAILABLE_COMMANDS_PACKET; + const NETWORK_ID = ProtocolInfo::AVAILABLE_COMMANDS_PACKET; public $commands; //JSON-encoded command data public $unknown; @@ -41,7 +41,7 @@ class AvailableCommandsPacket extends DataPacket{ $this->putString($this->unknown); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleAvailableCommands($this); } diff --git a/src/pocketmine/network/protocol/BatchPacket.php b/src/pocketmine/network/mcpe/protocol/BatchPacket.php similarity index 83% rename from src/pocketmine/network/protocol/BatchPacket.php rename to src/pocketmine/network/mcpe/protocol/BatchPacket.php index ed7d475db..6eb101479 100644 --- a/src/pocketmine/network/protocol/BatchPacket.php +++ b/src/pocketmine/network/mcpe/protocol/BatchPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class BatchPacket extends DataPacket{ - const NETWORK_ID = Info::BATCH_PACKET; + const NETWORK_ID = ProtocolInfo::BATCH_PACKET; public $payload; @@ -40,7 +40,7 @@ class BatchPacket extends DataPacket{ $this->putString($this->payload); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleBatch($this); } diff --git a/src/pocketmine/network/protocol/BlockEntityDataPacket.php b/src/pocketmine/network/mcpe/protocol/BlockEntityDataPacket.php similarity index 84% rename from src/pocketmine/network/protocol/BlockEntityDataPacket.php rename to src/pocketmine/network/mcpe/protocol/BlockEntityDataPacket.php index 0527a9006..9a5eeea48 100644 --- a/src/pocketmine/network/protocol/BlockEntityDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/BlockEntityDataPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class BlockEntityDataPacket extends DataPacket{ - const NETWORK_ID = Info::BLOCK_ENTITY_DATA_PACKET; + const NETWORK_ID = ProtocolInfo::BLOCK_ENTITY_DATA_PACKET; public $x; public $y; @@ -45,7 +45,7 @@ class BlockEntityDataPacket extends DataPacket{ $this->put($this->namedtag); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleBlockEntityData($this); } diff --git a/src/pocketmine/network/protocol/BlockEventPacket.php b/src/pocketmine/network/mcpe/protocol/BlockEventPacket.php similarity index 84% rename from src/pocketmine/network/protocol/BlockEventPacket.php rename to src/pocketmine/network/mcpe/protocol/BlockEventPacket.php index da3ff64e8..bae6ae7ae 100644 --- a/src/pocketmine/network/protocol/BlockEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/BlockEventPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class BlockEventPacket extends DataPacket{ - const NETWORK_ID = Info::BLOCK_EVENT_PACKET; + const NETWORK_ID = ProtocolInfo::BLOCK_EVENT_PACKET; public $x; public $y; @@ -46,7 +46,7 @@ class BlockEventPacket extends DataPacket{ $this->putVarInt($this->case2); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleBlockEvent($this); } diff --git a/src/pocketmine/network/protocol/ChangeDimensionPacket.php b/src/pocketmine/network/mcpe/protocol/ChangeDimensionPacket.php similarity index 84% rename from src/pocketmine/network/protocol/ChangeDimensionPacket.php rename to src/pocketmine/network/mcpe/protocol/ChangeDimensionPacket.php index da422c0a4..93f85494d 100644 --- a/src/pocketmine/network/protocol/ChangeDimensionPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ChangeDimensionPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class ChangeDimensionPacket extends DataPacket{ - const NETWORK_ID = Info::CHANGE_DIMENSION_PACKET; + const NETWORK_ID = ProtocolInfo::CHANGE_DIMENSION_PACKET; const DIMENSION_OVERWORLD = 0; const DIMENSION_NETHER = 1; @@ -49,7 +49,7 @@ class ChangeDimensionPacket extends DataPacket{ $this->putBool($this->unknown); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleChangeDimension($this); } diff --git a/src/pocketmine/network/protocol/ChunkRadiusUpdatedPacket.php b/src/pocketmine/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php similarity index 82% rename from src/pocketmine/network/protocol/ChunkRadiusUpdatedPacket.php rename to src/pocketmine/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php index 029de4d60..9c6b6dc7c 100644 --- a/src/pocketmine/network/protocol/ChunkRadiusUpdatedPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class ChunkRadiusUpdatedPacket extends DataPacket{ - const NETWORK_ID = Info::CHUNK_RADIUS_UPDATED_PACKET; + const NETWORK_ID = ProtocolInfo::CHUNK_RADIUS_UPDATED_PACKET; public $radius; @@ -39,7 +39,7 @@ class ChunkRadiusUpdatedPacket extends DataPacket{ $this->putVarInt($this->radius); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleChunkRadiusUpdated($this); } diff --git a/src/pocketmine/network/protocol/CommandStepPacket.php b/src/pocketmine/network/mcpe/protocol/CommandStepPacket.php similarity index 89% rename from src/pocketmine/network/protocol/CommandStepPacket.php rename to src/pocketmine/network/mcpe/protocol/CommandStepPacket.php index 6d76dbc8d..1678fc431 100644 --- a/src/pocketmine/network/protocol/CommandStepPacket.php +++ b/src/pocketmine/network/mcpe/protocol/CommandStepPacket.php @@ -19,14 +19,14 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class CommandStepPacket extends DataPacket{ - const NETWORK_ID = Info::COMMAND_STEP_PACKET; + const NETWORK_ID = ProtocolInfo::COMMAND_STEP_PACKET; /** * unknown (string) @@ -67,7 +67,7 @@ class CommandStepPacket extends DataPacket{ } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleCommandStep($this); } diff --git a/src/pocketmine/network/protocol/ContainerClosePacket.php b/src/pocketmine/network/mcpe/protocol/ContainerClosePacket.php similarity index 82% rename from src/pocketmine/network/protocol/ContainerClosePacket.php rename to src/pocketmine/network/mcpe/protocol/ContainerClosePacket.php index 9af31d553..c566152fd 100644 --- a/src/pocketmine/network/protocol/ContainerClosePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ContainerClosePacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class ContainerClosePacket extends DataPacket{ - const NETWORK_ID = Info::CONTAINER_CLOSE_PACKET; + const NETWORK_ID = ProtocolInfo::CONTAINER_CLOSE_PACKET; public $windowid; @@ -40,7 +40,7 @@ class ContainerClosePacket extends DataPacket{ $this->putByte($this->windowid); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleContainerClose($this); } } \ No newline at end of file diff --git a/src/pocketmine/network/protocol/ContainerOpenPacket.php b/src/pocketmine/network/mcpe/protocol/ContainerOpenPacket.php similarity index 85% rename from src/pocketmine/network/protocol/ContainerOpenPacket.php rename to src/pocketmine/network/mcpe/protocol/ContainerOpenPacket.php index 5d9ebc730..ee6356d2f 100644 --- a/src/pocketmine/network/protocol/ContainerOpenPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ContainerOpenPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class ContainerOpenPacket extends DataPacket{ - const NETWORK_ID = Info::CONTAINER_OPEN_PACKET; + const NETWORK_ID = ProtocolInfo::CONTAINER_OPEN_PACKET; public $windowid; public $type; @@ -50,7 +50,7 @@ class ContainerOpenPacket extends DataPacket{ $this->putEntityId($this->entityId); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleContainerOpen($this); } diff --git a/src/pocketmine/network/protocol/ContainerSetContentPacket.php b/src/pocketmine/network/mcpe/protocol/ContainerSetContentPacket.php similarity index 90% rename from src/pocketmine/network/protocol/ContainerSetContentPacket.php rename to src/pocketmine/network/mcpe/protocol/ContainerSetContentPacket.php index d105d3862..ade1394d4 100644 --- a/src/pocketmine/network/protocol/ContainerSetContentPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ContainerSetContentPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class ContainerSetContentPacket extends DataPacket{ - const NETWORK_ID = Info::CONTAINER_SET_CONTENT_PACKET; + const NETWORK_ID = ProtocolInfo::CONTAINER_SET_CONTENT_PACKET; const SPECIAL_INVENTORY = 0; const SPECIAL_ARMOR = 0x78; @@ -75,7 +75,7 @@ class ContainerSetContentPacket extends DataPacket{ } } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleContainerSetContent($this); } diff --git a/src/pocketmine/network/protocol/ContainerSetDataPacket.php b/src/pocketmine/network/mcpe/protocol/ContainerSetDataPacket.php similarity index 83% rename from src/pocketmine/network/protocol/ContainerSetDataPacket.php rename to src/pocketmine/network/mcpe/protocol/ContainerSetDataPacket.php index 235fec96d..a8faaeab4 100644 --- a/src/pocketmine/network/protocol/ContainerSetDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ContainerSetDataPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class ContainerSetDataPacket extends DataPacket{ - const NETWORK_ID = Info::CONTAINER_SET_DATA_PACKET; + const NETWORK_ID = ProtocolInfo::CONTAINER_SET_DATA_PACKET; public $windowid; public $property; @@ -44,7 +44,7 @@ class ContainerSetDataPacket extends DataPacket{ $this->putVarInt($this->value); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleContainerSetData($this); } diff --git a/src/pocketmine/network/protocol/ContainerSetSlotPacket.php b/src/pocketmine/network/mcpe/protocol/ContainerSetSlotPacket.php similarity index 86% rename from src/pocketmine/network/protocol/ContainerSetSlotPacket.php rename to src/pocketmine/network/mcpe/protocol/ContainerSetSlotPacket.php index f91da7d9d..d364c3bb0 100644 --- a/src/pocketmine/network/protocol/ContainerSetSlotPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ContainerSetSlotPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include use pocketmine\item\Item; -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class ContainerSetSlotPacket extends DataPacket{ - const NETWORK_ID = Info::CONTAINER_SET_SLOT_PACKET; + const NETWORK_ID = ProtocolInfo::CONTAINER_SET_SLOT_PACKET; public $windowid; public $slot; @@ -53,7 +53,7 @@ class ContainerSetSlotPacket extends DataPacket{ $this->putByte($this->unknown); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleContainerSetSlot($this); } diff --git a/src/pocketmine/network/protocol/CraftingDataPacket.php b/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php similarity index 95% rename from src/pocketmine/network/protocol/CraftingDataPacket.php rename to src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php index 601aae635..f183510c6 100644 --- a/src/pocketmine/network/protocol/CraftingDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php @@ -19,21 +19,20 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include use pocketmine\inventory\FurnaceRecipe; -use pocketmine\inventory\MultiRecipe; use pocketmine\inventory\ShapedRecipe; use pocketmine\inventory\ShapelessRecipe; use pocketmine\item\Item; -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; use pocketmine\utils\BinaryStream; class CraftingDataPacket extends DataPacket{ - const NETWORK_ID = Info::CRAFTING_DATA_PACKET; + const NETWORK_ID = ProtocolInfo::CRAFTING_DATA_PACKET; const ENTRY_SHAPELESS = 0; const ENTRY_SHAPED = 1; @@ -199,7 +198,7 @@ class CraftingDataPacket extends DataPacket{ $this->putBool($this->cleanRecipes); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleCraftingData($this); } diff --git a/src/pocketmine/network/protocol/CraftingEventPacket.php b/src/pocketmine/network/mcpe/protocol/CraftingEventPacket.php similarity index 87% rename from src/pocketmine/network/protocol/CraftingEventPacket.php rename to src/pocketmine/network/mcpe/protocol/CraftingEventPacket.php index 4db2e113c..e45d42410 100644 --- a/src/pocketmine/network/protocol/CraftingEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/CraftingEventPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include use pocketmine\item\Item; -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class CraftingEventPacket extends DataPacket{ - const NETWORK_ID = Info::CRAFTING_EVENT_PACKET; + const NETWORK_ID = ProtocolInfo::CRAFTING_EVENT_PACKET; public $windowId; public $type; @@ -63,7 +63,7 @@ class CraftingEventPacket extends DataPacket{ } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleCraftingEvent($this); } diff --git a/src/pocketmine/network/protocol/DataPacket.php b/src/pocketmine/network/mcpe/protocol/DataPacket.php similarity index 96% rename from src/pocketmine/network/protocol/DataPacket.php rename to src/pocketmine/network/mcpe/protocol/DataPacket.php index 7f0890de6..7404f3a76 100644 --- a/src/pocketmine/network/protocol/DataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/DataPacket.php @@ -19,13 +19,13 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include use pocketmine\entity\Entity; use pocketmine\item\Item; -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; use pocketmine\utils\BinaryStream; use pocketmine\utils\Utils; @@ -44,7 +44,7 @@ abstract class DataPacket extends BinaryStream{ abstract public function decode(); - abstract public function handle(PocketEditionNetworkSession $session) : bool; + abstract public function handle(NetworkSession $session) : bool; public function reset(){ $this->buffer = chr($this::NETWORK_ID); diff --git a/src/pocketmine/network/protocol/DisconnectPacket.php b/src/pocketmine/network/mcpe/protocol/DisconnectPacket.php similarity index 84% rename from src/pocketmine/network/protocol/DisconnectPacket.php rename to src/pocketmine/network/mcpe/protocol/DisconnectPacket.php index 5a9531c0b..94fcc6d39 100644 --- a/src/pocketmine/network/protocol/DisconnectPacket.php +++ b/src/pocketmine/network/mcpe/protocol/DisconnectPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class DisconnectPacket extends DataPacket{ - const NETWORK_ID = Info::DISCONNECT_PACKET; + const NETWORK_ID = ProtocolInfo::DISCONNECT_PACKET; public $hideDisconnectionScreen = false; public $message; @@ -43,7 +43,7 @@ class DisconnectPacket extends DataPacket{ $this->putString($this->message); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleDisconnect($this); } diff --git a/src/pocketmine/network/protocol/DropItemPacket.php b/src/pocketmine/network/mcpe/protocol/DropItemPacket.php similarity index 82% rename from src/pocketmine/network/protocol/DropItemPacket.php rename to src/pocketmine/network/mcpe/protocol/DropItemPacket.php index ff4e48606..98fff9df9 100644 --- a/src/pocketmine/network/protocol/DropItemPacket.php +++ b/src/pocketmine/network/mcpe/protocol/DropItemPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class DropItemPacket extends DataPacket{ - const NETWORK_ID = Info::DROP_ITEM_PACKET; + const NETWORK_ID = ProtocolInfo::DROP_ITEM_PACKET; public $type; public $item; @@ -41,7 +41,7 @@ class DropItemPacket extends DataPacket{ } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleDropItem($this); } diff --git a/src/pocketmine/network/protocol/EntityEventPacket.php b/src/pocketmine/network/mcpe/protocol/EntityEventPacket.php similarity index 88% rename from src/pocketmine/network/protocol/EntityEventPacket.php rename to src/pocketmine/network/mcpe/protocol/EntityEventPacket.php index 68f31a1aa..388aab8b9 100644 --- a/src/pocketmine/network/protocol/EntityEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/EntityEventPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class EntityEventPacket extends DataPacket{ - const NETWORK_ID = Info::ENTITY_EVENT_PACKET; + const NETWORK_ID = ProtocolInfo::ENTITY_EVENT_PACKET; const HURT_ANIMATION = 2; const DEATH_ANIMATION = 3; @@ -64,7 +64,7 @@ class EntityEventPacket extends DataPacket{ $this->putVarInt($this->unknown); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleEntityEvent($this); } diff --git a/src/pocketmine/network/protocol/ExplodePacket.php b/src/pocketmine/network/mcpe/protocol/ExplodePacket.php similarity index 86% rename from src/pocketmine/network/protocol/ExplodePacket.php rename to src/pocketmine/network/mcpe/protocol/ExplodePacket.php index 46906ef26..6892308cc 100644 --- a/src/pocketmine/network/protocol/ExplodePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ExplodePacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class ExplodePacket extends DataPacket{ - const NETWORK_ID = Info::EXPLODE_PACKET; + const NETWORK_ID = ProtocolInfo::EXPLODE_PACKET; public $x; public $y; @@ -56,7 +56,7 @@ class ExplodePacket extends DataPacket{ } } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleExplode($this); } diff --git a/src/pocketmine/network/protocol/FullChunkDataPacket.php b/src/pocketmine/network/mcpe/protocol/FullChunkDataPacket.php similarity index 83% rename from src/pocketmine/network/protocol/FullChunkDataPacket.php rename to src/pocketmine/network/mcpe/protocol/FullChunkDataPacket.php index 171719c82..6610492b6 100644 --- a/src/pocketmine/network/protocol/FullChunkDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/FullChunkDataPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class FullChunkDataPacket extends DataPacket{ - const NETWORK_ID = Info::FULL_CHUNK_DATA_PACKET; + const NETWORK_ID = ProtocolInfo::FULL_CHUNK_DATA_PACKET; public $chunkX; public $chunkZ; @@ -44,7 +44,7 @@ class FullChunkDataPacket extends DataPacket{ $this->putString($this->data); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleFullChunkData($this); } diff --git a/src/pocketmine/network/protocol/HurtArmorPacket.php b/src/pocketmine/network/mcpe/protocol/HurtArmorPacket.php similarity index 82% rename from src/pocketmine/network/protocol/HurtArmorPacket.php rename to src/pocketmine/network/mcpe/protocol/HurtArmorPacket.php index 5c6265935..644c0bf82 100644 --- a/src/pocketmine/network/protocol/HurtArmorPacket.php +++ b/src/pocketmine/network/mcpe/protocol/HurtArmorPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class HurtArmorPacket extends DataPacket{ - const NETWORK_ID = Info::HURT_ARMOR_PACKET; + const NETWORK_ID = ProtocolInfo::HURT_ARMOR_PACKET; public $health; @@ -40,7 +40,7 @@ class HurtArmorPacket extends DataPacket{ $this->putVarInt($this->health); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleHurtArmor($this); } diff --git a/src/pocketmine/network/protocol/InteractPacket.php b/src/pocketmine/network/mcpe/protocol/InteractPacket.php similarity index 85% rename from src/pocketmine/network/protocol/InteractPacket.php rename to src/pocketmine/network/mcpe/protocol/InteractPacket.php index 4200e9ee6..08c026112 100644 --- a/src/pocketmine/network/protocol/InteractPacket.php +++ b/src/pocketmine/network/mcpe/protocol/InteractPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class InteractPacket extends DataPacket{ - const NETWORK_ID = Info::INTERACT_PACKET; + const NETWORK_ID = ProtocolInfo::INTERACT_PACKET; const ACTION_RIGHT_CLICK = 1; const ACTION_LEFT_CLICK = 2; @@ -48,7 +48,7 @@ class InteractPacket extends DataPacket{ $this->putEntityId($this->target); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleInteract($this); } diff --git a/src/pocketmine/network/protocol/InventoryActionPacket.php b/src/pocketmine/network/mcpe/protocol/InventoryActionPacket.php similarity index 82% rename from src/pocketmine/network/protocol/InventoryActionPacket.php rename to src/pocketmine/network/mcpe/protocol/InventoryActionPacket.php index 86cb3db3a..ac13818f7 100644 --- a/src/pocketmine/network/protocol/InventoryActionPacket.php +++ b/src/pocketmine/network/mcpe/protocol/InventoryActionPacket.php @@ -19,14 +19,14 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class InventoryActionPacket extends DataPacket{ - const NETWORK_ID = Info::INVENTORY_ACTION_PACKET; + const NETWORK_ID = ProtocolInfo::INVENTORY_ACTION_PACKET; public $unknown; public $item; @@ -40,7 +40,7 @@ class InventoryActionPacket extends DataPacket{ $this->putSlot($this->item); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleInventoryAction($this); } } \ No newline at end of file diff --git a/src/pocketmine/network/protocol/ItemFrameDropItemPacket.php b/src/pocketmine/network/mcpe/protocol/ItemFrameDropItemPacket.php similarity index 82% rename from src/pocketmine/network/protocol/ItemFrameDropItemPacket.php rename to src/pocketmine/network/mcpe/protocol/ItemFrameDropItemPacket.php index 4dc3bb8ba..e9cca9b7e 100644 --- a/src/pocketmine/network/protocol/ItemFrameDropItemPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ItemFrameDropItemPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class ItemFrameDropItemPacket extends DataPacket{ - const NETWORK_ID = Info::ITEM_FRAME_DROP_ITEM_PACKET; + const NETWORK_ID = ProtocolInfo::ITEM_FRAME_DROP_ITEM_PACKET; public $x; public $y; @@ -41,7 +41,7 @@ class ItemFrameDropItemPacket extends DataPacket{ } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleItemFrameDropItem($this); } diff --git a/src/pocketmine/network/protocol/LevelEventPacket.php b/src/pocketmine/network/mcpe/protocol/LevelEventPacket.php similarity index 93% rename from src/pocketmine/network/protocol/LevelEventPacket.php rename to src/pocketmine/network/mcpe/protocol/LevelEventPacket.php index 0ff2677ee..a044a9954 100644 --- a/src/pocketmine/network/protocol/LevelEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/LevelEventPacket.php @@ -19,14 +19,14 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class LevelEventPacket extends DataPacket{ - const NETWORK_ID = Info::LEVEL_EVENT_PACKET; + const NETWORK_ID = ProtocolInfo::LEVEL_EVENT_PACKET; const EVENT_SOUND_CLICK = 1000; const EVENT_SOUND_CLICK_FAIL = 1001; @@ -109,7 +109,7 @@ class LevelEventPacket extends DataPacket{ $this->putVarInt($this->data); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleLevelEvent($this); } diff --git a/src/pocketmine/network/protocol/LevelSoundEventPacket.php b/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacket.php similarity index 95% rename from src/pocketmine/network/protocol/LevelSoundEventPacket.php rename to src/pocketmine/network/mcpe/protocol/LevelSoundEventPacket.php index 357a8913f..f55d936fa 100644 --- a/src/pocketmine/network/protocol/LevelSoundEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacket.php @@ -19,14 +19,14 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class LevelSoundEventPacket extends DataPacket{ - const NETWORK_ID = Info::LEVEL_SOUND_EVENT_PACKET; + const NETWORK_ID = ProtocolInfo::LEVEL_SOUND_EVENT_PACKET; const SOUND_ITEM_USE_ON = 0; const SOUND_HIT = 1; @@ -149,7 +149,7 @@ class LevelSoundEventPacket extends DataPacket{ $this->putBool($this->unknownBool2); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleLevelSoundEvent($this); } } \ No newline at end of file diff --git a/src/pocketmine/network/protocol/LoginPacket.php b/src/pocketmine/network/mcpe/protocol/LoginPacket.php similarity index 90% rename from src/pocketmine/network/protocol/LoginPacket.php rename to src/pocketmine/network/mcpe/protocol/LoginPacket.php index dfd1d0fef..462388d4a 100644 --- a/src/pocketmine/network/protocol/LoginPacket.php +++ b/src/pocketmine/network/mcpe/protocol/LoginPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class LoginPacket extends DataPacket{ - const NETWORK_ID = Info::LOGIN_PACKET; + const NETWORK_ID = ProtocolInfo::LOGIN_PACKET; const EDITION_POCKET = 0; @@ -47,7 +47,7 @@ class LoginPacket extends DataPacket{ public function decode(){ $this->protocol = $this->getInt(); - if($this->protocol !== Info::CURRENT_PROTOCOL){ + if($this->protocol !== ProtocolInfo::CURRENT_PROTOCOL){ $this->buffer = null; return; //Do not attempt to decode for non-accepted protocols } @@ -96,7 +96,7 @@ class LoginPacket extends DataPacket{ return json_decode(base64_decode($payloadB64), true); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleLogin($this); } } \ No newline at end of file diff --git a/src/pocketmine/network/protocol/MobArmorEquipmentPacket.php b/src/pocketmine/network/mcpe/protocol/MobArmorEquipmentPacket.php similarity index 86% rename from src/pocketmine/network/protocol/MobArmorEquipmentPacket.php rename to src/pocketmine/network/mcpe/protocol/MobArmorEquipmentPacket.php index 0f5c8bf75..8464ad9c4 100644 --- a/src/pocketmine/network/protocol/MobArmorEquipmentPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MobArmorEquipmentPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class MobArmorEquipmentPacket extends DataPacket{ - const NETWORK_ID = Info::MOB_ARMOR_EQUIPMENT_PACKET; + const NETWORK_ID = ProtocolInfo::MOB_ARMOR_EQUIPMENT_PACKET; public $eid; public $slots = []; @@ -49,7 +49,7 @@ class MobArmorEquipmentPacket extends DataPacket{ $this->putSlot($this->slots[3]); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleMobArmorEquipment($this); } diff --git a/src/pocketmine/network/protocol/MobEffectPacket.php b/src/pocketmine/network/mcpe/protocol/MobEffectPacket.php similarity index 86% rename from src/pocketmine/network/protocol/MobEffectPacket.php rename to src/pocketmine/network/mcpe/protocol/MobEffectPacket.php index 266af8daa..512a25d3d 100644 --- a/src/pocketmine/network/protocol/MobEffectPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MobEffectPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class MobEffectPacket extends DataPacket{ - const NETWORK_ID = Info::MOB_EFFECT_PACKET; + const NETWORK_ID = ProtocolInfo::MOB_EFFECT_PACKET; const EVENT_ADD = 1; const EVENT_MODIFY = 2; @@ -54,7 +54,7 @@ class MobEffectPacket extends DataPacket{ $this->putVarInt($this->duration); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleMobEffect($this); } diff --git a/src/pocketmine/network/protocol/MobEquipmentPacket.php b/src/pocketmine/network/mcpe/protocol/MobEquipmentPacket.php similarity index 87% rename from src/pocketmine/network/protocol/MobEquipmentPacket.php rename to src/pocketmine/network/mcpe/protocol/MobEquipmentPacket.php index c43241760..7091181e5 100644 --- a/src/pocketmine/network/protocol/MobEquipmentPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MobEquipmentPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class MobEquipmentPacket extends DataPacket{ - const NETWORK_ID = Info::MOB_EQUIPMENT_PACKET; + const NETWORK_ID = ProtocolInfo::MOB_EQUIPMENT_PACKET; public $eid; public $item; @@ -52,7 +52,7 @@ class MobEquipmentPacket extends DataPacket{ $this->putByte($this->unknownByte); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleMobEquipment($this); } diff --git a/src/pocketmine/network/protocol/MoveEntityPacket.php b/src/pocketmine/network/mcpe/protocol/MoveEntityPacket.php similarity index 87% rename from src/pocketmine/network/protocol/MoveEntityPacket.php rename to src/pocketmine/network/mcpe/protocol/MoveEntityPacket.php index b04f9881d..1f7d0e9ff 100644 --- a/src/pocketmine/network/protocol/MoveEntityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MoveEntityPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class MoveEntityPacket extends DataPacket{ - const NETWORK_ID = Info::MOVE_ENTITY_PACKET; + const NETWORK_ID = ProtocolInfo::MOVE_ENTITY_PACKET; public $eid; public $x; @@ -54,7 +54,7 @@ class MoveEntityPacket extends DataPacket{ $this->putByte($this->headYaw / (360.0 / 256)); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleMoveEntity($this); } diff --git a/src/pocketmine/network/protocol/MovePlayerPacket.php b/src/pocketmine/network/mcpe/protocol/MovePlayerPacket.php similarity index 89% rename from src/pocketmine/network/protocol/MovePlayerPacket.php rename to src/pocketmine/network/mcpe/protocol/MovePlayerPacket.php index ad3e3ce33..608dbd94b 100644 --- a/src/pocketmine/network/protocol/MovePlayerPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MovePlayerPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class MovePlayerPacket extends DataPacket{ - const NETWORK_ID = Info::MOVE_PLAYER_PACKET; + const NETWORK_ID = ProtocolInfo::MOVE_PLAYER_PACKET; const MODE_NORMAL = 0; const MODE_RESET = 1; @@ -64,7 +64,7 @@ class MovePlayerPacket extends DataPacket{ $this->putBool($this->onGround); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleMovePlayer($this); } diff --git a/src/pocketmine/network/protocol/PlayStatusPacket.php b/src/pocketmine/network/mcpe/protocol/PlayStatusPacket.php similarity index 84% rename from src/pocketmine/network/protocol/PlayStatusPacket.php rename to src/pocketmine/network/mcpe/protocol/PlayStatusPacket.php index 0a4dee85f..47ac4e574 100644 --- a/src/pocketmine/network/protocol/PlayStatusPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayStatusPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class PlayStatusPacket extends DataPacket{ - const NETWORK_ID = Info::PLAY_STATUS_PACKET; + const NETWORK_ID = ProtocolInfo::PLAY_STATUS_PACKET; const LOGIN_SUCCESS = 0; const LOGIN_FAILED_CLIENT = 1; @@ -47,7 +47,7 @@ class PlayStatusPacket extends DataPacket{ $this->putInt($this->status); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handlePlayStatus($this); } diff --git a/src/pocketmine/network/protocol/PlayerActionPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerActionPacket.php similarity index 89% rename from src/pocketmine/network/protocol/PlayerActionPacket.php rename to src/pocketmine/network/mcpe/protocol/PlayerActionPacket.php index bc15bddda..741d5a035 100644 --- a/src/pocketmine/network/protocol/PlayerActionPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayerActionPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class PlayerActionPacket extends DataPacket{ - const NETWORK_ID = Info::PLAYER_ACTION_PACKET; + const NETWORK_ID = ProtocolInfo::PLAYER_ACTION_PACKET; const ACTION_START_BREAK = 0; const ACTION_ABORT_BREAK = 1; @@ -69,7 +69,7 @@ class PlayerActionPacket extends DataPacket{ $this->putVarInt($this->face); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handlePlayerAction($this); } diff --git a/src/pocketmine/network/protocol/PlayerFallPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerFallPacket.php similarity index 82% rename from src/pocketmine/network/protocol/PlayerFallPacket.php rename to src/pocketmine/network/mcpe/protocol/PlayerFallPacket.php index fd6d324b6..d254f21ed 100644 --- a/src/pocketmine/network/protocol/PlayerFallPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayerFallPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class PlayerFallPacket extends DataPacket{ - const NETWORK_ID = Info::PLAYER_FALL_PACKET; + const NETWORK_ID = ProtocolInfo::PLAYER_FALL_PACKET; public $fallDistance; @@ -39,7 +39,7 @@ class PlayerFallPacket extends DataPacket{ } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handlePlayerFall($this); } } diff --git a/src/pocketmine/network/protocol/PlayerInputPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerInputPacket.php similarity index 84% rename from src/pocketmine/network/protocol/PlayerInputPacket.php rename to src/pocketmine/network/mcpe/protocol/PlayerInputPacket.php index df746b253..f80d636c4 100644 --- a/src/pocketmine/network/protocol/PlayerInputPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayerInputPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class PlayerInputPacket extends DataPacket{ - const NETWORK_ID = Info::PLAYER_INPUT_PACKET; + const NETWORK_ID = ProtocolInfo::PLAYER_INPUT_PACKET; public $motionX; public $motionY; @@ -45,7 +45,7 @@ class PlayerInputPacket extends DataPacket{ } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handlePlayerInput($this); } diff --git a/src/pocketmine/network/protocol/PlayerListPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerListPacket.php similarity index 87% rename from src/pocketmine/network/protocol/PlayerListPacket.php rename to src/pocketmine/network/mcpe/protocol/PlayerListPacket.php index eb0cbf49e..bca812beb 100644 --- a/src/pocketmine/network/protocol/PlayerListPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayerListPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class PlayerListPacket extends DataPacket{ - const NETWORK_ID = Info::PLAYER_LIST_PACKET; + const NETWORK_ID = ProtocolInfo::PLAYER_LIST_PACKET; const TYPE_ADD = 0; const TYPE_REMOVE = 1; @@ -63,7 +63,7 @@ class PlayerListPacket extends DataPacket{ } } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handlePlayerList($this); } diff --git a/src/pocketmine/network/protocol/Info.php b/src/pocketmine/network/mcpe/protocol/ProtocolInfo.php similarity index 98% rename from src/pocketmine/network/protocol/Info.php rename to src/pocketmine/network/mcpe/protocol/ProtocolInfo.php index 644191ae9..5ef62ca06 100644 --- a/src/pocketmine/network/protocol/Info.php +++ b/src/pocketmine/network/mcpe/protocol/ProtocolInfo.php @@ -22,10 +22,10 @@ /** * Minecraft: PE multiplayer protocol implementation */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; -interface Info{ +interface ProtocolInfo{ /** * Actual Minecraft: PE protocol version diff --git a/src/pocketmine/network/protocol/RemoveBlockPacket.php b/src/pocketmine/network/mcpe/protocol/RemoveBlockPacket.php similarity index 82% rename from src/pocketmine/network/protocol/RemoveBlockPacket.php rename to src/pocketmine/network/mcpe/protocol/RemoveBlockPacket.php index f9b7281a1..d9312cb1a 100644 --- a/src/pocketmine/network/protocol/RemoveBlockPacket.php +++ b/src/pocketmine/network/mcpe/protocol/RemoveBlockPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class RemoveBlockPacket extends DataPacket{ - const NETWORK_ID = Info::REMOVE_BLOCK_PACKET; + const NETWORK_ID = ProtocolInfo::REMOVE_BLOCK_PACKET; public $x; public $y; @@ -41,7 +41,7 @@ class RemoveBlockPacket extends DataPacket{ } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleRemoveBlock($this); } diff --git a/src/pocketmine/network/protocol/RemoveEntityPacket.php b/src/pocketmine/network/mcpe/protocol/RemoveEntityPacket.php similarity index 82% rename from src/pocketmine/network/protocol/RemoveEntityPacket.php rename to src/pocketmine/network/mcpe/protocol/RemoveEntityPacket.php index 250a15e89..8ec65467e 100644 --- a/src/pocketmine/network/protocol/RemoveEntityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/RemoveEntityPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class RemoveEntityPacket extends DataPacket{ - const NETWORK_ID = Info::REMOVE_ENTITY_PACKET; + const NETWORK_ID = ProtocolInfo::REMOVE_ENTITY_PACKET; public $eid; @@ -40,7 +40,7 @@ class RemoveEntityPacket extends DataPacket{ $this->putEntityId($this->eid); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleRemoveEntity($this); } diff --git a/src/pocketmine/network/protocol/ReplaceItemInSlotPacket.php b/src/pocketmine/network/mcpe/protocol/ReplaceItemInSlotPacket.php similarity index 81% rename from src/pocketmine/network/protocol/ReplaceItemInSlotPacket.php rename to src/pocketmine/network/mcpe/protocol/ReplaceItemInSlotPacket.php index af0ac6d51..1a2c9317b 100644 --- a/src/pocketmine/network/protocol/ReplaceItemInSlotPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ReplaceItemInSlotPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class ReplaceItemInSlotPacket extends DataPacket{ - const NETWORK_ID = Info::REPLACE_ITEM_IN_SLOT_PACKET; + const NETWORK_ID = ProtocolInfo::REPLACE_ITEM_IN_SLOT_PACKET; public $item; @@ -40,7 +40,7 @@ class ReplaceItemInSlotPacket extends DataPacket{ $this->putSlot($this->item); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleReplaceItemInSlot($this); } } \ No newline at end of file diff --git a/src/pocketmine/network/protocol/RequestChunkRadiusPacket.php b/src/pocketmine/network/mcpe/protocol/RequestChunkRadiusPacket.php similarity index 81% rename from src/pocketmine/network/protocol/RequestChunkRadiusPacket.php rename to src/pocketmine/network/mcpe/protocol/RequestChunkRadiusPacket.php index 35d728010..5a3d1bbe6 100644 --- a/src/pocketmine/network/protocol/RequestChunkRadiusPacket.php +++ b/src/pocketmine/network/mcpe/protocol/RequestChunkRadiusPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class RequestChunkRadiusPacket extends DataPacket{ - const NETWORK_ID = Info::REQUEST_CHUNK_RADIUS_PACKET; + const NETWORK_ID = ProtocolInfo::REQUEST_CHUNK_RADIUS_PACKET; public $radius; @@ -39,7 +39,7 @@ class RequestChunkRadiusPacket extends DataPacket{ } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleRequestChunkRadius($this); } diff --git a/src/pocketmine/network/protocol/ResourcePackClientResponsePacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackClientResponsePacket.php similarity index 86% rename from src/pocketmine/network/protocol/ResourcePackClientResponsePacket.php rename to src/pocketmine/network/mcpe/protocol/ResourcePackClientResponsePacket.php index d3dfad043..2aa8b14ac 100644 --- a/src/pocketmine/network/protocol/ResourcePackClientResponsePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ResourcePackClientResponsePacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class ResourcePackClientResponsePacket extends DataPacket{ - const NETWORK_ID = Info::RESOURCE_PACK_CLIENT_RESPONSE_PACKET; + const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_CLIENT_RESPONSE_PACKET; const STATUS_REFUSED = 1; const STATUS_SEND_PACKS = 2; @@ -54,7 +54,7 @@ class ResourcePackClientResponsePacket extends DataPacket{ } } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleResourcePackClientResponse($this); } diff --git a/src/pocketmine/network/protocol/ResourcePackStackPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackStackPacket.php similarity index 88% rename from src/pocketmine/network/protocol/ResourcePackStackPacket.php rename to src/pocketmine/network/mcpe/protocol/ResourcePackStackPacket.php index 9965a6b77..d2ab98c2e 100644 --- a/src/pocketmine/network/protocol/ResourcePackStackPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ResourcePackStackPacket.php @@ -20,16 +20,16 @@ */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; use pocketmine\resourcepacks\ResourcePackInfoEntry; class ResourcePackStackPacket extends DataPacket{ - const NETWORK_ID = Info::RESOURCE_PACK_STACK_PACKET; + const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_STACK_PACKET; public $mustAccept = false; @@ -41,7 +41,7 @@ class ResourcePackStackPacket extends DataPacket{ public function decode(){ $this->mustAccept = $this->getBool(); $behaviorPackCount = $this->getLShort(); - while($behaviorPackCountCount-- > 0){ + while($behaviorPackCount-- > 0){ $packId = $this->getString(); $version = $this->getString(); $this->behaviorPackStack[] = new ResourcePackInfoEntry($packId, $version); @@ -72,7 +72,7 @@ class ResourcePackStackPacket extends DataPacket{ } } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleResourcePackStack($this); } } \ No newline at end of file diff --git a/src/pocketmine/network/protocol/ResourcePacksInfoPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php similarity index 91% rename from src/pocketmine/network/protocol/ResourcePacksInfoPacket.php rename to src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php index e9f247627..8f03c1136 100644 --- a/src/pocketmine/network/protocol/ResourcePacksInfoPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php @@ -19,16 +19,16 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; use pocketmine\resourcepacks\ResourcePackInfoEntry; class ResourcePacksInfoPacket extends DataPacket{ - const NETWORK_ID = Info::RESOURCE_PACKS_INFO_PACKET; + const NETWORK_ID = ProtocolInfo::RESOURCE_PACKS_INFO_PACKET; public $mustAccept = false; //if true, forces client to use selected resource packs /** @var ResourcePackInfoEntry[] */ @@ -73,7 +73,7 @@ class ResourcePacksInfoPacket extends DataPacket{ } } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleResourcePacksInfo($this); } } \ No newline at end of file diff --git a/src/pocketmine/network/protocol/RespawnPacket.php b/src/pocketmine/network/mcpe/protocol/RespawnPacket.php similarity index 84% rename from src/pocketmine/network/protocol/RespawnPacket.php rename to src/pocketmine/network/mcpe/protocol/RespawnPacket.php index d6da04814..1af41d7e8 100644 --- a/src/pocketmine/network/protocol/RespawnPacket.php +++ b/src/pocketmine/network/mcpe/protocol/RespawnPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class RespawnPacket extends DataPacket{ - const NETWORK_ID = Info::RESPAWN_PACKET; + const NETWORK_ID = ProtocolInfo::RESPAWN_PACKET; public $x; public $y; @@ -46,7 +46,7 @@ class RespawnPacket extends DataPacket{ $this->putLFloat($this->z); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleRespawn($this); } diff --git a/src/pocketmine/network/protocol/RiderJumpPacket.php b/src/pocketmine/network/mcpe/protocol/RiderJumpPacket.php similarity index 83% rename from src/pocketmine/network/protocol/RiderJumpPacket.php rename to src/pocketmine/network/mcpe/protocol/RiderJumpPacket.php index 120bb14b7..f13917fc8 100644 --- a/src/pocketmine/network/protocol/RiderJumpPacket.php +++ b/src/pocketmine/network/mcpe/protocol/RiderJumpPacket.php @@ -20,15 +20,15 @@ */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class RiderJumpPacket extends DataPacket{ - const NETWORK_ID = Info::RIDER_JUMP_PACKET; + const NETWORK_ID = ProtocolInfo::RIDER_JUMP_PACKET; public $unknown; @@ -41,7 +41,7 @@ class RiderJumpPacket extends DataPacket{ $this->putVarInt($this->unknown); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleRiderJump($this); } } \ No newline at end of file diff --git a/src/pocketmine/network/protocol/SetCommandsEnabledPacket.php b/src/pocketmine/network/mcpe/protocol/SetCommandsEnabledPacket.php similarity index 82% rename from src/pocketmine/network/protocol/SetCommandsEnabledPacket.php rename to src/pocketmine/network/mcpe/protocol/SetCommandsEnabledPacket.php index 6bf0762cb..7c7529bcb 100644 --- a/src/pocketmine/network/protocol/SetCommandsEnabledPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetCommandsEnabledPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class SetCommandsEnabledPacket extends DataPacket{ - const NETWORK_ID = Info::SET_COMMANDS_ENABLED_PACKET; + const NETWORK_ID = ProtocolInfo::SET_COMMANDS_ENABLED_PACKET; public $enabled; @@ -40,7 +40,7 @@ class SetCommandsEnabledPacket extends DataPacket{ $this->putBool($this->enabled); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleSetCommandsEnabled($this); } diff --git a/src/pocketmine/network/protocol/SetDifficultyPacket.php b/src/pocketmine/network/mcpe/protocol/SetDifficultyPacket.php similarity index 83% rename from src/pocketmine/network/protocol/SetDifficultyPacket.php rename to src/pocketmine/network/mcpe/protocol/SetDifficultyPacket.php index 8d89d33c8..700a37d22 100644 --- a/src/pocketmine/network/protocol/SetDifficultyPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetDifficultyPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class SetDifficultyPacket extends DataPacket{ - const NETWORK_ID = Info::SET_DIFFICULTY_PACKET; + const NETWORK_ID = ProtocolInfo::SET_DIFFICULTY_PACKET; public $difficulty; @@ -40,7 +40,7 @@ class SetDifficultyPacket extends DataPacket{ $this->putUnsignedVarInt($this->difficulty); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleSetDifficulty($this); } diff --git a/src/pocketmine/network/protocol/SetEntityDataPacket.php b/src/pocketmine/network/mcpe/protocol/SetEntityDataPacket.php similarity index 83% rename from src/pocketmine/network/protocol/SetEntityDataPacket.php rename to src/pocketmine/network/mcpe/protocol/SetEntityDataPacket.php index 99fbb572d..705eaec10 100644 --- a/src/pocketmine/network/protocol/SetEntityDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetEntityDataPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class SetEntityDataPacket extends DataPacket{ - const NETWORK_ID = Info::SET_ENTITY_DATA_PACKET; + const NETWORK_ID = ProtocolInfo::SET_ENTITY_DATA_PACKET; public $eid; public $metadata; @@ -42,7 +42,7 @@ class SetEntityDataPacket extends DataPacket{ $this->putEntityMetadata($this->metadata); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleSetEntityData($this); } } diff --git a/src/pocketmine/network/protocol/SetEntityLinkPacket.php b/src/pocketmine/network/mcpe/protocol/SetEntityLinkPacket.php similarity index 83% rename from src/pocketmine/network/protocol/SetEntityLinkPacket.php rename to src/pocketmine/network/mcpe/protocol/SetEntityLinkPacket.php index fff314e19..288faf95c 100644 --- a/src/pocketmine/network/protocol/SetEntityLinkPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetEntityLinkPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class SetEntityLinkPacket extends DataPacket{ - const NETWORK_ID = Info::SET_ENTITY_LINK_PACKET; + const NETWORK_ID = ProtocolInfo::SET_ENTITY_LINK_PACKET; public $from; public $to; @@ -44,7 +44,7 @@ class SetEntityLinkPacket extends DataPacket{ $this->putByte($this->type); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleSetEntityLink($this); } diff --git a/src/pocketmine/network/protocol/SetEntityMotionPacket.php b/src/pocketmine/network/mcpe/protocol/SetEntityMotionPacket.php similarity index 83% rename from src/pocketmine/network/protocol/SetEntityMotionPacket.php rename to src/pocketmine/network/mcpe/protocol/SetEntityMotionPacket.php index 529fbde53..3b7f2d51e 100644 --- a/src/pocketmine/network/protocol/SetEntityMotionPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetEntityMotionPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class SetEntityMotionPacket extends DataPacket{ - const NETWORK_ID = Info::SET_ENTITY_MOTION_PACKET; + const NETWORK_ID = ProtocolInfo::SET_ENTITY_MOTION_PACKET; public $eid; public $motionX; @@ -44,7 +44,7 @@ class SetEntityMotionPacket extends DataPacket{ $this->putVector3f($this->motionX, $this->motionY, $this->motionZ); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleSetEntityMotion($this); } diff --git a/src/pocketmine/network/protocol/SetHealthPacket.php b/src/pocketmine/network/mcpe/protocol/SetHealthPacket.php similarity index 82% rename from src/pocketmine/network/protocol/SetHealthPacket.php rename to src/pocketmine/network/mcpe/protocol/SetHealthPacket.php index e9efa13fc..cc3d1b582 100644 --- a/src/pocketmine/network/protocol/SetHealthPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetHealthPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class SetHealthPacket extends DataPacket{ - const NETWORK_ID = Info::SET_HEALTH_PACKET; + const NETWORK_ID = ProtocolInfo::SET_HEALTH_PACKET; public $health; @@ -40,7 +40,7 @@ class SetHealthPacket extends DataPacket{ $this->putVarInt($this->health); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleSetHealth($this); } diff --git a/src/pocketmine/network/protocol/SetPlayerGameTypePacket.php b/src/pocketmine/network/mcpe/protocol/SetPlayerGameTypePacket.php similarity index 82% rename from src/pocketmine/network/protocol/SetPlayerGameTypePacket.php rename to src/pocketmine/network/mcpe/protocol/SetPlayerGameTypePacket.php index 31d633ab8..66373af8f 100644 --- a/src/pocketmine/network/protocol/SetPlayerGameTypePacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetPlayerGameTypePacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class SetPlayerGameTypePacket extends DataPacket{ - const NETWORK_ID = Info::SET_PLAYER_GAME_TYPE_PACKET; + const NETWORK_ID = ProtocolInfo::SET_PLAYER_GAME_TYPE_PACKET; public $gamemode; @@ -40,7 +40,7 @@ class SetPlayerGameTypePacket extends DataPacket{ $this->putVarInt($this->gamemode); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleSetPlayerGameType($this); } diff --git a/src/pocketmine/network/protocol/SetSpawnPositionPacket.php b/src/pocketmine/network/mcpe/protocol/SetSpawnPositionPacket.php similarity index 84% rename from src/pocketmine/network/protocol/SetSpawnPositionPacket.php rename to src/pocketmine/network/mcpe/protocol/SetSpawnPositionPacket.php index 1669674f7..086f68ee8 100644 --- a/src/pocketmine/network/protocol/SetSpawnPositionPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetSpawnPositionPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class SetSpawnPositionPacket extends DataPacket{ - const NETWORK_ID = Info::SET_SPAWN_POSITION_PACKET; + const NETWORK_ID = ProtocolInfo::SET_SPAWN_POSITION_PACKET; public $unknown; public $x; @@ -46,7 +46,7 @@ class SetSpawnPositionPacket extends DataPacket{ $this->putBool($this->unknownBool); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleSetSpawnPosition($this); } diff --git a/src/pocketmine/network/protocol/SetTimePacket.php b/src/pocketmine/network/mcpe/protocol/SetTimePacket.php similarity index 83% rename from src/pocketmine/network/protocol/SetTimePacket.php rename to src/pocketmine/network/mcpe/protocol/SetTimePacket.php index c3d78152c..1aa00412c 100644 --- a/src/pocketmine/network/protocol/SetTimePacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetTimePacket.php @@ -19,14 +19,14 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class SetTimePacket extends DataPacket{ - const NETWORK_ID = Info::SET_TIME_PACKET; + const NETWORK_ID = ProtocolInfo::SET_TIME_PACKET; public $time; public $started = true; @@ -41,7 +41,7 @@ class SetTimePacket extends DataPacket{ $this->putBool($this->started); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleSetTime($this); } diff --git a/src/pocketmine/network/protocol/ShowCreditsPacket.php b/src/pocketmine/network/mcpe/protocol/ShowCreditsPacket.php similarity index 84% rename from src/pocketmine/network/protocol/ShowCreditsPacket.php rename to src/pocketmine/network/mcpe/protocol/ShowCreditsPacket.php index 6b5dddaad..ed82bc0e7 100644 --- a/src/pocketmine/network/protocol/ShowCreditsPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ShowCreditsPacket.php @@ -20,15 +20,15 @@ */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class ShowCreditsPacket extends DataPacket{ - const NETWORK_ID = Info::SHOW_CREDITS_PACKET; + const NETWORK_ID = ProtocolInfo::SHOW_CREDITS_PACKET; const STATUS_START_CREDITS = 0; const STATUS_END_CREDITS = 1; @@ -47,7 +47,7 @@ class ShowCreditsPacket extends DataPacket{ $this->putVarInt($this->status); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleShowCredits($this); } } \ No newline at end of file diff --git a/src/pocketmine/network/protocol/SpawnExperienceOrbPacket.php b/src/pocketmine/network/mcpe/protocol/SpawnExperienceOrbPacket.php similarity index 83% rename from src/pocketmine/network/protocol/SpawnExperienceOrbPacket.php rename to src/pocketmine/network/mcpe/protocol/SpawnExperienceOrbPacket.php index afc7b8dc2..a29fc4bd9 100644 --- a/src/pocketmine/network/protocol/SpawnExperienceOrbPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SpawnExperienceOrbPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class SpawnExperienceOrbPacket extends DataPacket{ - const NETWORK_ID = Info::SPAWN_EXPERIENCE_ORB_PACKET; + const NETWORK_ID = ProtocolInfo::SPAWN_EXPERIENCE_ORB_PACKET; public $x; public $y; @@ -44,7 +44,7 @@ class SpawnExperienceOrbPacket extends DataPacket{ $this->putVarInt($this->amount); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleSpawnExperienceOrb($this); } } \ No newline at end of file diff --git a/src/pocketmine/network/protocol/StartGamePacket.php b/src/pocketmine/network/mcpe/protocol/StartGamePacket.php similarity index 92% rename from src/pocketmine/network/protocol/StartGamePacket.php rename to src/pocketmine/network/mcpe/protocol/StartGamePacket.php index 6dccecd7e..25d85314b 100644 --- a/src/pocketmine/network/protocol/StartGamePacket.php +++ b/src/pocketmine/network/mcpe/protocol/StartGamePacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class StartGamePacket extends DataPacket{ - const NETWORK_ID = Info::START_GAME_PACKET; + const NETWORK_ID = ProtocolInfo::START_GAME_PACKET; public $entityUniqueId; public $entityRuntimeId; @@ -80,7 +80,7 @@ class StartGamePacket extends DataPacket{ $this->putString($this->worldName); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleStartGame($this); } diff --git a/src/pocketmine/network/protocol/TakeItemEntityPacket.php b/src/pocketmine/network/mcpe/protocol/TakeItemEntityPacket.php similarity index 82% rename from src/pocketmine/network/protocol/TakeItemEntityPacket.php rename to src/pocketmine/network/mcpe/protocol/TakeItemEntityPacket.php index dead24ad9..80d446b6e 100644 --- a/src/pocketmine/network/protocol/TakeItemEntityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/TakeItemEntityPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class TakeItemEntityPacket extends DataPacket{ - const NETWORK_ID = Info::TAKE_ITEM_ENTITY_PACKET; + const NETWORK_ID = ProtocolInfo::TAKE_ITEM_ENTITY_PACKET; public $target; public $eid; @@ -42,7 +42,7 @@ class TakeItemEntityPacket extends DataPacket{ $this->putEntityId($this->eid); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleTakeItemEntity($this); } } diff --git a/src/pocketmine/network/protocol/TextPacket.php b/src/pocketmine/network/mcpe/protocol/TextPacket.php similarity index 91% rename from src/pocketmine/network/protocol/TextPacket.php rename to src/pocketmine/network/mcpe/protocol/TextPacket.php index 850fd18cd..f0c4d39d6 100644 --- a/src/pocketmine/network/protocol/TextPacket.php +++ b/src/pocketmine/network/mcpe/protocol/TextPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class TextPacket extends DataPacket{ - const NETWORK_ID = Info::TEXT_PACKET; + const NETWORK_ID = ProtocolInfo::TEXT_PACKET; const TYPE_RAW = 0; const TYPE_CHAT = 1; @@ -89,7 +89,7 @@ class TextPacket extends DataPacket{ } } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleText($this); } diff --git a/src/pocketmine/network/protocol/TransferPacket.php b/src/pocketmine/network/mcpe/protocol/TransferPacket.php similarity index 83% rename from src/pocketmine/network/protocol/TransferPacket.php rename to src/pocketmine/network/mcpe/protocol/TransferPacket.php index 0292b74ba..1e6da8000 100644 --- a/src/pocketmine/network/protocol/TransferPacket.php +++ b/src/pocketmine/network/mcpe/protocol/TransferPacket.php @@ -19,14 +19,14 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class TransferPacket extends DataPacket{ - const NETWORK_ID = Info::TRANSFER_PACKET; + const NETWORK_ID = ProtocolInfo::TRANSFER_PACKET; public $address; public $port = 19132; @@ -41,7 +41,7 @@ class TransferPacket extends DataPacket{ $this->putLShort($this->port); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleTransfer($this); } diff --git a/src/pocketmine/network/protocol/UpdateAttributesPacket.php b/src/pocketmine/network/mcpe/protocol/UpdateAttributesPacket.php similarity index 86% rename from src/pocketmine/network/protocol/UpdateAttributesPacket.php rename to src/pocketmine/network/mcpe/protocol/UpdateAttributesPacket.php index f91282803..d3da0bb78 100644 --- a/src/pocketmine/network/protocol/UpdateAttributesPacket.php +++ b/src/pocketmine/network/mcpe/protocol/UpdateAttributesPacket.php @@ -19,16 +19,16 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include use pocketmine\entity\Attribute; -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class UpdateAttributesPacket extends DataPacket{ - const NETWORK_ID = Info::UPDATE_ATTRIBUTES_PACKET; + const NETWORK_ID = ProtocolInfo::UPDATE_ATTRIBUTES_PACKET; public $entityId; @@ -52,7 +52,7 @@ class UpdateAttributesPacket extends DataPacket{ } } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleUpdateAttributes($this); } diff --git a/src/pocketmine/network/protocol/UpdateBlockPacket.php b/src/pocketmine/network/mcpe/protocol/UpdateBlockPacket.php similarity index 87% rename from src/pocketmine/network/protocol/UpdateBlockPacket.php rename to src/pocketmine/network/mcpe/protocol/UpdateBlockPacket.php index 6e557085b..2a29ba5d6 100644 --- a/src/pocketmine/network/protocol/UpdateBlockPacket.php +++ b/src/pocketmine/network/mcpe/protocol/UpdateBlockPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class UpdateBlockPacket extends DataPacket{ - const NETWORK_ID = Info::UPDATE_BLOCK_PACKET; + const NETWORK_ID = ProtocolInfo::UPDATE_BLOCK_PACKET; const FLAG_NONE = 0b0000; const FLAG_NEIGHBORS = 0b0001; @@ -56,7 +56,7 @@ class UpdateBlockPacket extends DataPacket{ $this->putUnsignedVarInt(($this->flags << 4) | $this->blockData); } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleUpdateBlock($this); } diff --git a/src/pocketmine/network/protocol/UseItemPacket.php b/src/pocketmine/network/mcpe/protocol/UseItemPacket.php similarity index 87% rename from src/pocketmine/network/protocol/UseItemPacket.php rename to src/pocketmine/network/mcpe/protocol/UseItemPacket.php index 0aab03f2d..0a2b726bb 100644 --- a/src/pocketmine/network/protocol/UseItemPacket.php +++ b/src/pocketmine/network/mcpe/protocol/UseItemPacket.php @@ -19,15 +19,15 @@ * */ -namespace pocketmine\network\protocol; +namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\PocketEditionNetworkSession; +use pocketmine\network\mcpe\NetworkSession; class UseItemPacket extends DataPacket{ - const NETWORK_ID = Info::USE_ITEM_PACKET; + const NETWORK_ID = ProtocolInfo::USE_ITEM_PACKET; public $x; public $y; @@ -57,7 +57,7 @@ class UseItemPacket extends DataPacket{ } - public function handle(PocketEditionNetworkSession $session) : bool{ + public function handle(NetworkSession $session) : bool{ return $session->handleUseItem($this); } diff --git a/src/pocketmine/scheduler/SendUsageTask.php b/src/pocketmine/scheduler/SendUsageTask.php index bd7d3003d..688ed7432 100644 --- a/src/pocketmine/scheduler/SendUsageTask.php +++ b/src/pocketmine/scheduler/SendUsageTask.php @@ -21,7 +21,7 @@ namespace pocketmine\scheduler; -use pocketmine\network\protocol\Info; +use pocketmine\network\mcpe\protocol\ProtocolInfo; use pocketmine\Server; use pocketmine\utils\Utils; use pocketmine\utils\UUID; @@ -58,7 +58,7 @@ class SendUsageTask extends AsyncTask{ "build" => $version->getBuild(), "api" => $server->getApiVersion(), "minecraftVersion" => $server->getVersion(), - "protocol" => Info::CURRENT_PROTOCOL + "protocol" => ProtocolInfo::CURRENT_PROTOCOL ]; $data["system"] = [ diff --git a/src/pocketmine/tile/Furnace.php b/src/pocketmine/tile/Furnace.php index b97b95adb..d0c3e0806 100644 --- a/src/pocketmine/tile/Furnace.php +++ b/src/pocketmine/tile/Furnace.php @@ -35,7 +35,7 @@ use pocketmine\nbt\tag\IntTag; use pocketmine\nbt\tag\ListTag; use pocketmine\nbt\tag\ShortTag; use pocketmine\nbt\tag\StringTag; -use pocketmine\network\protocol\ContainerSetDataPacket; +use pocketmine\network\mcpe\protocol\ContainerSetDataPacket; class Furnace extends Spawnable implements InventoryHolder, Container, Nameable{ /** @var FurnaceInventory */ diff --git a/src/pocketmine/tile/Spawnable.php b/src/pocketmine/tile/Spawnable.php index 07f0ffaa4..33048b00f 100644 --- a/src/pocketmine/tile/Spawnable.php +++ b/src/pocketmine/tile/Spawnable.php @@ -24,7 +24,7 @@ namespace pocketmine\tile; use pocketmine\level\Level; use pocketmine\nbt\NBT; use pocketmine\nbt\tag\CompoundTag; -use pocketmine\network\protocol\BlockEntityDataPacket; +use pocketmine\network\mcpe\protocol\BlockEntityDataPacket; use pocketmine\Player; abstract class Spawnable extends Tile{