From b18bd4f33ce606ad594b56dd4785b650d21cd695 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Tue, 18 Jun 2019 16:02:46 +0100 Subject: [PATCH] rename SessionHandler -> PacketHandler --- .../network/mcpe/NetworkSession.php | 38 +++++++++---------- ...sionHandler.php => DeathPacketHandler.php} | 2 +- ...Handler.php => HandshakePacketHandler.php} | 2 +- ...ionHandler.php => InGamePacketHandler.php} | 2 +- ...sionHandler.php => LoginPacketHandler.php} | 4 +- ...ssionHandler.php => NullPacketHandler.php} | 2 +- .../{SessionHandler.php => PacketHandler.php} | 2 +- ...nHandler.php => PreSpawnPacketHandler.php} | 2 +- ...ler.php => ResourcePacksPacketHandler.php} | 2 +- .../mcpe/protocol/AddBehaviorTreePacket.php | 4 +- .../network/mcpe/protocol/AddEntityPacket.php | 4 +- .../mcpe/protocol/AddItemEntityPacket.php | 4 +- .../mcpe/protocol/AddPaintingPacket.php | 4 +- .../network/mcpe/protocol/AddPlayerPacket.php | 4 +- .../mcpe/protocol/AdventureSettingsPacket.php | 4 +- .../network/mcpe/protocol/AnimatePacket.php | 4 +- .../AutomationClientConnectPacket.php | 4 +- .../mcpe/protocol/AvailableCommandsPacket.php | 4 +- .../AvailableEntityIdentifiersPacket.php | 4 +- .../protocol/BiomeDefinitionListPacket.php | 4 +- .../mcpe/protocol/BlockEntityDataPacket.php | 4 +- .../mcpe/protocol/BlockEventPacket.php | 4 +- .../mcpe/protocol/BlockPickRequestPacket.php | 4 +- .../network/mcpe/protocol/BookEditPacket.php | 4 +- .../network/mcpe/protocol/BossEventPacket.php | 4 +- .../network/mcpe/protocol/CameraPacket.php | 4 +- .../mcpe/protocol/ChangeDimensionPacket.php | 4 +- .../protocol/ChunkRadiusUpdatedPacket.php | 4 +- .../ClientToServerHandshakePacket.php | 4 +- .../protocol/ClientboundMapItemDataPacket.php | 4 +- .../protocol/CommandBlockUpdatePacket.php | 4 +- .../mcpe/protocol/CommandOutputPacket.php | 4 +- .../mcpe/protocol/CommandRequestPacket.php | 4 +- .../mcpe/protocol/ContainerClosePacket.php | 4 +- .../mcpe/protocol/ContainerOpenPacket.php | 4 +- .../mcpe/protocol/ContainerSetDataPacket.php | 4 +- .../mcpe/protocol/CraftingDataPacket.php | 4 +- .../mcpe/protocol/CraftingEventPacket.php | 4 +- .../mcpe/protocol/DisconnectPacket.php | 4 +- .../mcpe/protocol/EntityEventPacket.php | 4 +- .../mcpe/protocol/EntityFallPacket.php | 4 +- .../mcpe/protocol/EntityPickRequestPacket.php | 4 +- .../network/mcpe/protocol/EventPacket.php | 4 +- .../network/mcpe/protocol/ExplodePacket.php | 4 +- .../mcpe/protocol/FullChunkDataPacket.php | 4 +- .../mcpe/protocol/GameRulesChangedPacket.php | 4 +- .../mcpe/protocol/GuiDataPickItemPacket.php | 4 +- .../network/mcpe/protocol/HurtArmorPacket.php | 4 +- .../network/mcpe/protocol/InteractPacket.php | 4 +- .../mcpe/protocol/InventoryContentPacket.php | 4 +- .../mcpe/protocol/InventorySlotPacket.php | 4 +- .../protocol/InventoryTransactionPacket.php | 4 +- .../mcpe/protocol/ItemFrameDropItemPacket.php | 4 +- .../network/mcpe/protocol/LabTablePacket.php | 4 +- .../mcpe/protocol/LecternUpdatePacket.php | 4 +- .../mcpe/protocol/LevelEventPacket.php | 4 +- .../mcpe/protocol/LevelSoundEventPacket.php | 4 +- .../mcpe/protocol/LevelSoundEventPacketV1.php | 4 +- .../mcpe/protocol/LevelSoundEventPacketV2.php | 4 +- .../network/mcpe/protocol/LoginPacket.php | 4 +- .../protocol/MapCreateLockedCopyPacket.php | 4 +- .../mcpe/protocol/MapInfoRequestPacket.php | 4 +- .../mcpe/protocol/MobArmorEquipmentPacket.php | 4 +- .../network/mcpe/protocol/MobEffectPacket.php | 4 +- .../mcpe/protocol/MobEquipmentPacket.php | 4 +- .../mcpe/protocol/ModalFormRequestPacket.php | 4 +- .../mcpe/protocol/ModalFormResponsePacket.php | 4 +- .../protocol/MoveEntityAbsolutePacket.php | 4 +- .../mcpe/protocol/MoveEntityDeltaPacket.php | 4 +- .../mcpe/protocol/MovePlayerPacket.php | 4 +- .../NetworkChunkPublisherUpdatePacket.php | 4 +- .../protocol/NetworkStackLatencyPacket.php | 4 +- .../mcpe/protocol/NpcRequestPacket.php | 4 +- .../OnScreenTextureAnimationPacket.php | 4 +- .../network/mcpe/protocol/Packet.php | 8 ++-- .../mcpe/protocol/PhotoTransferPacket.php | 4 +- .../network/mcpe/protocol/PlaySoundPacket.php | 4 +- .../mcpe/protocol/PlayStatusPacket.php | 4 +- .../mcpe/protocol/PlayerActionPacket.php | 4 +- .../mcpe/protocol/PlayerHotbarPacket.php | 4 +- .../mcpe/protocol/PlayerInputPacket.php | 4 +- .../mcpe/protocol/PlayerListPacket.php | 4 +- .../mcpe/protocol/PlayerSkinPacket.php | 4 +- .../mcpe/protocol/PurchaseReceiptPacket.php | 4 +- .../mcpe/protocol/RemoveEntityPacket.php | 4 +- .../mcpe/protocol/RemoveObjectivePacket.php | 4 +- .../protocol/RequestChunkRadiusPacket.php | 4 +- .../protocol/ResourcePackChunkDataPacket.php | 4 +- .../ResourcePackChunkRequestPacket.php | 4 +- .../ResourcePackClientResponsePacket.php | 4 +- .../protocol/ResourcePackDataInfoPacket.php | 4 +- .../mcpe/protocol/ResourcePackStackPacket.php | 4 +- .../mcpe/protocol/ResourcePacksInfoPacket.php | 4 +- .../network/mcpe/protocol/RespawnPacket.php | 4 +- .../network/mcpe/protocol/RiderJumpPacket.php | 4 +- .../mcpe/protocol/ScriptCustomEventPacket.php | 4 +- .../protocol/ServerSettingsRequestPacket.php | 4 +- .../protocol/ServerSettingsResponsePacket.php | 4 +- .../ServerToClientHandshakePacket.php | 4 +- .../protocol/SetCommandsEnabledPacket.php | 4 +- .../protocol/SetDefaultGameTypePacket.php | 4 +- .../mcpe/protocol/SetDifficultyPacket.php | 4 +- .../protocol/SetDisplayObjectivePacket.php | 4 +- .../mcpe/protocol/SetEntityDataPacket.php | 4 +- .../mcpe/protocol/SetEntityLinkPacket.php | 4 +- .../mcpe/protocol/SetEntityMotionPacket.php | 4 +- .../network/mcpe/protocol/SetHealthPacket.php | 4 +- .../mcpe/protocol/SetLastHurtByPacket.php | 4 +- .../SetLocalPlayerAsInitializedPacket.php | 4 +- .../mcpe/protocol/SetPlayerGameTypePacket.php | 4 +- .../network/mcpe/protocol/SetScorePacket.php | 4 +- .../protocol/SetScoreboardIdentityPacket.php | 4 +- .../mcpe/protocol/SetSpawnPositionPacket.php | 4 +- .../network/mcpe/protocol/SetTimePacket.php | 4 +- .../network/mcpe/protocol/SetTitlePacket.php | 4 +- .../mcpe/protocol/ShowCreditsPacket.php | 4 +- .../mcpe/protocol/ShowProfilePacket.php | 4 +- .../mcpe/protocol/ShowStoreOfferPacket.php | 4 +- .../mcpe/protocol/SimpleEventPacket.php | 4 +- .../protocol/SpawnExperienceOrbPacket.php | 4 +- .../protocol/SpawnParticleEffectPacket.php | 4 +- .../network/mcpe/protocol/StartGamePacket.php | 4 +- .../network/mcpe/protocol/StopSoundPacket.php | 4 +- .../protocol/StructureBlockUpdatePacket.php | 4 +- .../mcpe/protocol/SubClientLoginPacket.php | 4 +- .../mcpe/protocol/TakeItemEntityPacket.php | 4 +- .../network/mcpe/protocol/TextPacket.php | 4 +- .../network/mcpe/protocol/TransferPacket.php | 4 +- .../network/mcpe/protocol/UnknownPacket.php | 4 +- .../mcpe/protocol/UpdateAttributesPacket.php | 4 +- .../mcpe/protocol/UpdateBlockPacket.php | 4 +- .../mcpe/protocol/UpdateBlockSyncedPacket.php | 4 +- .../mcpe/protocol/UpdateEquipPacket.php | 4 +- .../mcpe/protocol/UpdateSoftEnumPacket.php | 4 +- .../mcpe/protocol/UpdateTradePacket.php | 4 +- .../protocol/VideoStreamConnectPacket.php | 4 +- 136 files changed, 284 insertions(+), 284 deletions(-) rename src/pocketmine/network/mcpe/handler/{DeathSessionHandler.php => DeathPacketHandler.php} (97%) rename src/pocketmine/network/mcpe/handler/{HandshakeSessionHandler.php => HandshakePacketHandler.php} (95%) rename src/pocketmine/network/mcpe/handler/{InGameSessionHandler.php => InGamePacketHandler.php} (99%) rename src/pocketmine/network/mcpe/handler/{LoginSessionHandler.php => LoginPacketHandler.php} (96%) rename src/pocketmine/network/mcpe/handler/{NullSessionHandler.php => NullPacketHandler.php} (95%) rename src/pocketmine/network/mcpe/handler/{SessionHandler.php => PacketHandler.php} (99%) rename src/pocketmine/network/mcpe/handler/{PreSpawnSessionHandler.php => PreSpawnPacketHandler.php} (98%) rename src/pocketmine/network/mcpe/handler/{ResourcePacksSessionHandler.php => ResourcePacksPacketHandler.php} (99%) diff --git a/src/pocketmine/network/mcpe/NetworkSession.php b/src/pocketmine/network/mcpe/NetworkSession.php index 72d114b7c..96e56d1db 100644 --- a/src/pocketmine/network/mcpe/NetworkSession.php +++ b/src/pocketmine/network/mcpe/NetworkSession.php @@ -34,14 +34,14 @@ use pocketmine\inventory\CreativeInventory; use pocketmine\inventory\Inventory; use pocketmine\math\Vector3; use pocketmine\network\BadPacketException; -use pocketmine\network\mcpe\handler\DeathSessionHandler; -use pocketmine\network\mcpe\handler\HandshakeSessionHandler; -use pocketmine\network\mcpe\handler\InGameSessionHandler; -use pocketmine\network\mcpe\handler\LoginSessionHandler; -use pocketmine\network\mcpe\handler\NullSessionHandler; -use pocketmine\network\mcpe\handler\PreSpawnSessionHandler; -use pocketmine\network\mcpe\handler\ResourcePacksSessionHandler; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\DeathPacketHandler; +use pocketmine\network\mcpe\handler\HandshakePacketHandler; +use pocketmine\network\mcpe\handler\InGamePacketHandler; +use pocketmine\network\mcpe\handler\LoginPacketHandler; +use pocketmine\network\mcpe\handler\NullPacketHandler; +use pocketmine\network\mcpe\handler\PreSpawnPacketHandler; +use pocketmine\network\mcpe\handler\ResourcePacksPacketHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\AdventureSettingsPacket; use pocketmine\network\mcpe\protocol\AvailableCommandsPacket; use pocketmine\network\mcpe\protocol\ChunkRadiusUpdatedPacket; @@ -116,7 +116,7 @@ class NetworkSession{ /** @var int */ private $ping; - /** @var SessionHandler */ + /** @var PacketHandler */ private $handler; /** @var bool */ @@ -152,7 +152,7 @@ class NetworkSession{ $this->connectTime = time(); - $this->setHandler(new LoginSessionHandler($this->server, $this)); + $this->setHandler(new LoginPacketHandler($this->server, $this)); $this->manager->add($this); $this->logger->info("Session opened"); @@ -245,11 +245,11 @@ class NetworkSession{ $this->ping = $ping; } - public function getHandler() : SessionHandler{ + public function getHandler() : PacketHandler{ return $this->handler; } - public function setHandler(SessionHandler $handler) : void{ + public function setHandler(PacketHandler $handler) : void{ if($this->connected){ //TODO: this is fine since we can't handle anything from a disconnected session, but it might produce surprises in some cases $this->handler = $handler; $this->handler->setUp(); @@ -439,7 +439,7 @@ class NetworkSession{ $this->disconnectGuard = true; $func(); $this->disconnectGuard = false; - $this->setHandler(NullSessionHandler::getInstance()); + $this->setHandler(NullPacketHandler::getInstance()); $this->connected = false; $this->manager->remove($this); $this->logger->info("Session closed due to $reason"); @@ -554,7 +554,7 @@ class NetworkSession{ $this->cipher = new NetworkCipher($encryptionKey); - $this->setHandler(new HandshakeSessionHandler($this)); + $this->setHandler(new HandshakePacketHandler($this)); $this->logger->debug("Enabled encryption"); } @@ -564,13 +564,13 @@ class NetworkSession{ $this->sendDataPacket(PlayStatusPacket::create(PlayStatusPacket::LOGIN_SUCCESS)); $this->logger->debug("Initiating resource packs phase"); - $this->setHandler(new ResourcePacksSessionHandler($this, $this->server->getResourcePackManager())); + $this->setHandler(new ResourcePacksPacketHandler($this, $this->server->getResourcePackManager())); } public function onResourcePacksDone() : void{ $this->createPlayer(); - $this->setHandler(new PreSpawnSessionHandler($this->server, $this->player, $this)); + $this->setHandler(new PreSpawnPacketHandler($this->server, $this->player, $this)); $this->logger->debug("Waiting for spawn chunks"); } @@ -582,11 +582,11 @@ class NetworkSession{ public function onSpawn() : void{ $this->logger->debug("Received spawn response, entering in-game phase"); $this->player->doFirstSpawn(); - $this->setHandler(new InGameSessionHandler($this->player, $this)); + $this->setHandler(new InGamePacketHandler($this->player, $this)); } public function onDeath() : void{ - $this->setHandler(new DeathSessionHandler($this->player, $this)); + $this->setHandler(new DeathPacketHandler($this->player, $this)); } public function onRespawn() : void{ @@ -595,7 +595,7 @@ class NetworkSession{ $this->syncAdventureSettings($this->player); $this->syncAllInventoryContents(); - $this->setHandler(new InGameSessionHandler($this->player, $this)); + $this->setHandler(new InGamePacketHandler($this->player, $this)); } public function syncMovement(Vector3 $pos, ?float $yaw = null, ?float $pitch = null, int $mode = MovePlayerPacket::MODE_NORMAL) : void{ diff --git a/src/pocketmine/network/mcpe/handler/DeathSessionHandler.php b/src/pocketmine/network/mcpe/handler/DeathPacketHandler.php similarity index 97% rename from src/pocketmine/network/mcpe/handler/DeathSessionHandler.php rename to src/pocketmine/network/mcpe/handler/DeathPacketHandler.php index e7096d0ac..81b7e86ff 100644 --- a/src/pocketmine/network/mcpe/handler/DeathSessionHandler.php +++ b/src/pocketmine/network/mcpe/handler/DeathPacketHandler.php @@ -28,7 +28,7 @@ use pocketmine\network\mcpe\protocol\PlayerActionPacket; use pocketmine\network\mcpe\protocol\RespawnPacket; use pocketmine\Player; -class DeathSessionHandler extends SessionHandler{ +class DeathPacketHandler extends PacketHandler{ /** @var Player */ private $player; diff --git a/src/pocketmine/network/mcpe/handler/HandshakeSessionHandler.php b/src/pocketmine/network/mcpe/handler/HandshakePacketHandler.php similarity index 95% rename from src/pocketmine/network/mcpe/handler/HandshakeSessionHandler.php rename to src/pocketmine/network/mcpe/handler/HandshakePacketHandler.php index 8c2cb2be7..451351941 100644 --- a/src/pocketmine/network/mcpe/handler/HandshakeSessionHandler.php +++ b/src/pocketmine/network/mcpe/handler/HandshakePacketHandler.php @@ -29,7 +29,7 @@ use pocketmine\network\mcpe\protocol\ClientToServerHandshakePacket; /** * Handler responsible for awaiting client response from crypto handshake. */ -class HandshakeSessionHandler extends SessionHandler{ +class HandshakePacketHandler extends PacketHandler{ /** @var NetworkSession */ private $session; diff --git a/src/pocketmine/network/mcpe/handler/InGameSessionHandler.php b/src/pocketmine/network/mcpe/handler/InGamePacketHandler.php similarity index 99% rename from src/pocketmine/network/mcpe/handler/InGameSessionHandler.php rename to src/pocketmine/network/mcpe/handler/InGamePacketHandler.php index 76eb636c4..25415d759 100644 --- a/src/pocketmine/network/mcpe/handler/InGameSessionHandler.php +++ b/src/pocketmine/network/mcpe/handler/InGamePacketHandler.php @@ -93,7 +93,7 @@ use function trim; /** * This handler handles packets related to general gameplay. */ -class InGameSessionHandler extends SessionHandler{ +class InGamePacketHandler extends PacketHandler{ /** @var Player */ private $player; diff --git a/src/pocketmine/network/mcpe/handler/LoginSessionHandler.php b/src/pocketmine/network/mcpe/handler/LoginPacketHandler.php similarity index 96% rename from src/pocketmine/network/mcpe/handler/LoginSessionHandler.php rename to src/pocketmine/network/mcpe/handler/LoginPacketHandler.php index 203e0f77a..c9c4c19ad 100644 --- a/src/pocketmine/network/mcpe/handler/LoginSessionHandler.php +++ b/src/pocketmine/network/mcpe/handler/LoginPacketHandler.php @@ -40,7 +40,7 @@ use function base64_decode; /** * Handles the initial login phase of the session. This handler is used as the initial state. */ -class LoginSessionHandler extends SessionHandler{ +class LoginPacketHandler extends PacketHandler{ /** @var Server */ private $server; @@ -134,7 +134,7 @@ class LoginSessionHandler extends SessionHandler{ */ protected function processLogin(LoginPacket $packet, bool $authRequired) : void{ $this->server->getAsyncPool()->submitTask(new ProcessLoginTask($this->session, $packet, $authRequired, NetworkCipher::$ENABLED)); - $this->session->setHandler(NullSessionHandler::getInstance()); //drop packets received during login verification + $this->session->setHandler(NullPacketHandler::getInstance()); //drop packets received during login verification } protected function isCompatibleProtocol(int $protocolVersion) : bool{ diff --git a/src/pocketmine/network/mcpe/handler/NullSessionHandler.php b/src/pocketmine/network/mcpe/handler/NullPacketHandler.php similarity index 95% rename from src/pocketmine/network/mcpe/handler/NullSessionHandler.php rename to src/pocketmine/network/mcpe/handler/NullPacketHandler.php index ac61c359e..17cbf200b 100644 --- a/src/pocketmine/network/mcpe/handler/NullSessionHandler.php +++ b/src/pocketmine/network/mcpe/handler/NullPacketHandler.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\handler; /** * Handler which simply ignores all packets received. */ -final class NullSessionHandler extends SessionHandler{ +final class NullPacketHandler extends PacketHandler{ /** @var self|null */ private static $instance = null; diff --git a/src/pocketmine/network/mcpe/handler/SessionHandler.php b/src/pocketmine/network/mcpe/handler/PacketHandler.php similarity index 99% rename from src/pocketmine/network/mcpe/handler/SessionHandler.php rename to src/pocketmine/network/mcpe/handler/PacketHandler.php index d0c2053f9..a552d7329 100644 --- a/src/pocketmine/network/mcpe/handler/SessionHandler.php +++ b/src/pocketmine/network/mcpe/handler/PacketHandler.php @@ -155,7 +155,7 @@ use pocketmine\network\mcpe\protocol\VideoStreamConnectPacket; * * This class is an automatically generated stub. Do not edit it manually. */ -abstract class SessionHandler{ +abstract class PacketHandler{ public function setUp() : void{ diff --git a/src/pocketmine/network/mcpe/handler/PreSpawnSessionHandler.php b/src/pocketmine/network/mcpe/handler/PreSpawnPacketHandler.php similarity index 98% rename from src/pocketmine/network/mcpe/handler/PreSpawnSessionHandler.php rename to src/pocketmine/network/mcpe/handler/PreSpawnPacketHandler.php index 63f8a1121..701c117b0 100644 --- a/src/pocketmine/network/mcpe/handler/PreSpawnSessionHandler.php +++ b/src/pocketmine/network/mcpe/handler/PreSpawnPacketHandler.php @@ -36,7 +36,7 @@ use pocketmine\Server; /** * Handler used for the pre-spawn phase of the session. */ -class PreSpawnSessionHandler extends SessionHandler{ +class PreSpawnPacketHandler extends PacketHandler{ /** @var Server */ private $server; diff --git a/src/pocketmine/network/mcpe/handler/ResourcePacksSessionHandler.php b/src/pocketmine/network/mcpe/handler/ResourcePacksPacketHandler.php similarity index 99% rename from src/pocketmine/network/mcpe/handler/ResourcePacksSessionHandler.php rename to src/pocketmine/network/mcpe/handler/ResourcePacksPacketHandler.php index d879f239b..95ac7a2c6 100644 --- a/src/pocketmine/network/mcpe/handler/ResourcePacksSessionHandler.php +++ b/src/pocketmine/network/mcpe/handler/ResourcePacksPacketHandler.php @@ -42,7 +42,7 @@ use function substr; * Handler used for the resource packs sequence phase of the session. This handler takes care of downloading resource * packs to the client. */ -class ResourcePacksSessionHandler extends SessionHandler{ +class ResourcePacksPacketHandler extends PacketHandler{ private const PACK_CHUNK_SIZE = 1048576; //1MB /** @var NetworkSession */ diff --git a/src/pocketmine/network/mcpe/protocol/AddBehaviorTreePacket.php b/src/pocketmine/network/mcpe/protocol/AddBehaviorTreePacket.php index 863880bef..0ce5e4dd4 100644 --- a/src/pocketmine/network/mcpe/protocol/AddBehaviorTreePacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddBehaviorTreePacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class AddBehaviorTreePacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::ADD_BEHAVIOR_TREE_PACKET; @@ -41,7 +41,7 @@ class AddBehaviorTreePacket extends DataPacket implements ClientboundPacket{ $this->putString($this->behaviorTreeJson); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleAddBehaviorTree($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/AddEntityPacket.php b/src/pocketmine/network/mcpe/protocol/AddEntityPacket.php index 56b95fcb2..3d2a17089 100644 --- a/src/pocketmine/network/mcpe/protocol/AddEntityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddEntityPacket.php @@ -29,7 +29,7 @@ use pocketmine\entity\Attribute; use pocketmine\entity\EntityIds; use pocketmine\math\Vector3; use pocketmine\network\BadPacketException; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\EntityLink; use function array_search; use function count; @@ -239,7 +239,7 @@ class AddEntityPacket extends DataPacket implements ClientboundPacket{ } } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleAddEntity($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/AddItemEntityPacket.php b/src/pocketmine/network/mcpe/protocol/AddItemEntityPacket.php index 9ee9a2d10..a42afad5b 100644 --- a/src/pocketmine/network/mcpe/protocol/AddItemEntityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddItemEntityPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\item\Item; use pocketmine\math\Vector3; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class AddItemEntityPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::ADD_ITEM_ENTITY_PACKET; @@ -67,7 +67,7 @@ class AddItemEntityPacket extends DataPacket implements ClientboundPacket{ $this->putBool($this->isFromFishing); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleAddItemEntity($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/AddPaintingPacket.php b/src/pocketmine/network/mcpe/protocol/AddPaintingPacket.php index 53311713c..4e2851474 100644 --- a/src/pocketmine/network/mcpe/protocol/AddPaintingPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddPaintingPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class AddPaintingPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::ADD_PAINTING_PACKET; @@ -62,7 +62,7 @@ class AddPaintingPacket extends DataPacket implements ClientboundPacket{ $this->putString($this->title); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleAddPainting($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php b/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php index 693009353..cc2c172b5 100644 --- a/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\item\Item; use pocketmine\math\Vector3; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\EntityLink; use pocketmine\utils\UUID; use function count; @@ -135,7 +135,7 @@ class AddPlayerPacket extends DataPacket implements ClientboundPacket{ $this->putString($this->deviceId); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleAddPlayer($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/AdventureSettingsPacket.php b/src/pocketmine/network/mcpe/protocol/AdventureSettingsPacket.php index 43eaa4e9f..a1f76b552 100644 --- a/src/pocketmine/network/mcpe/protocol/AdventureSettingsPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AdventureSettingsPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\PlayerPermissions; class AdventureSettingsPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ @@ -116,7 +116,7 @@ class AdventureSettingsPacket extends DataPacket implements ClientboundPacket, S } } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleAdventureSettings($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/AnimatePacket.php b/src/pocketmine/network/mcpe/protocol/AnimatePacket.php index 86fc70124..a32ffe693 100644 --- a/src/pocketmine/network/mcpe/protocol/AnimatePacket.php +++ b/src/pocketmine/network/mcpe/protocol/AnimatePacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class AnimatePacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::ANIMATE_PACKET; @@ -72,7 +72,7 @@ class AnimatePacket extends DataPacket implements ClientboundPacket, Serverbound } } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleAnimate($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/AutomationClientConnectPacket.php b/src/pocketmine/network/mcpe/protocol/AutomationClientConnectPacket.php index 518fc1429..ee968cff1 100644 --- a/src/pocketmine/network/mcpe/protocol/AutomationClientConnectPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AutomationClientConnectPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class AutomationClientConnectPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::AUTOMATION_CLIENT_CONNECT_PACKET; @@ -41,7 +41,7 @@ class AutomationClientConnectPacket extends DataPacket implements ClientboundPac $this->putString($this->serverUri); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleAutomationClientConnect($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php b/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php index f89697fbb..a1d165c21 100644 --- a/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include use pocketmine\network\BadPacketException; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\CommandData; use pocketmine\network\mcpe\protocol\types\CommandEnum; use pocketmine\network\mcpe\protocol\types\CommandParameter; @@ -412,7 +412,7 @@ class AvailableCommandsPacket extends DataPacket implements ClientboundPacket{ } } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleAvailableCommands($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/AvailableEntityIdentifiersPacket.php b/src/pocketmine/network/mcpe/protocol/AvailableEntityIdentifiersPacket.php index d84bef9fc..a95215d77 100644 --- a/src/pocketmine/network/mcpe/protocol/AvailableEntityIdentifiersPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AvailableEntityIdentifiersPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use function base64_decode; class AvailableEntityIdentifiersPacket extends DataPacket implements ClientboundPacket{ @@ -47,7 +47,7 @@ class AvailableEntityIdentifiersPacket extends DataPacket implements Clientbound $this->put($this->namedtag ?? base64_decode(self::HARDCODED_NBT_BLOB)); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleAvailableEntityIdentifiers($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/BiomeDefinitionListPacket.php b/src/pocketmine/network/mcpe/protocol/BiomeDefinitionListPacket.php index 8027548ec..eac86fcdc 100644 --- a/src/pocketmine/network/mcpe/protocol/BiomeDefinitionListPacket.php +++ b/src/pocketmine/network/mcpe/protocol/BiomeDefinitionListPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class BiomeDefinitionListPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::BIOME_DEFINITION_LIST_PACKET; @@ -42,7 +42,7 @@ class BiomeDefinitionListPacket extends DataPacket implements ClientboundPacket{ $this->put($this->namedtag ?? self::HARDCODED_NBT_BLOB); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleBiomeDefinitionList($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/BlockEntityDataPacket.php b/src/pocketmine/network/mcpe/protocol/BlockEntityDataPacket.php index c60faaca5..102419323 100644 --- a/src/pocketmine/network/mcpe/protocol/BlockEntityDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/BlockEntityDataPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class BlockEntityDataPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::BLOCK_ENTITY_DATA_PACKET; @@ -57,7 +57,7 @@ class BlockEntityDataPacket extends DataPacket implements ClientboundPacket, Ser $this->put($this->namedtag); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleBlockEntityData($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/BlockEventPacket.php b/src/pocketmine/network/mcpe/protocol/BlockEventPacket.php index 58dae3a62..9badd3036 100644 --- a/src/pocketmine/network/mcpe/protocol/BlockEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/BlockEventPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\math\Vector3; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class BlockEventPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::BLOCK_EVENT_PACKET; @@ -65,7 +65,7 @@ class BlockEventPacket extends DataPacket implements ClientboundPacket{ $this->putVarInt($this->eventData); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleBlockEvent($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/BlockPickRequestPacket.php b/src/pocketmine/network/mcpe/protocol/BlockPickRequestPacket.php index 8bd44a725..cc6ea483e 100644 --- a/src/pocketmine/network/mcpe/protocol/BlockPickRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/BlockPickRequestPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class BlockPickRequestPacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::BLOCK_PICK_REQUEST_PACKET; @@ -55,7 +55,7 @@ class BlockPickRequestPacket extends DataPacket implements ServerboundPacket{ $this->putByte($this->hotbarSlot); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleBlockPickRequest($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/BookEditPacket.php b/src/pocketmine/network/mcpe/protocol/BookEditPacket.php index 38eed556a..4d54cf8cb 100644 --- a/src/pocketmine/network/mcpe/protocol/BookEditPacket.php +++ b/src/pocketmine/network/mcpe/protocol/BookEditPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include use pocketmine\network\BadPacketException; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class BookEditPacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::BOOK_EDIT_PACKET; @@ -114,7 +114,7 @@ class BookEditPacket extends DataPacket implements ServerboundPacket{ } } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleBookEdit($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/BossEventPacket.php b/src/pocketmine/network/mcpe/protocol/BossEventPacket.php index 3b58f3387..dcd33587b 100644 --- a/src/pocketmine/network/mcpe/protocol/BossEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/BossEventPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class BossEventPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::BOSS_EVENT_PACKET; @@ -177,7 +177,7 @@ class BossEventPacket extends DataPacket implements ClientboundPacket, Serverbou } } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleBossEvent($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/CameraPacket.php b/src/pocketmine/network/mcpe/protocol/CameraPacket.php index ddca6dd15..06ce1cd03 100644 --- a/src/pocketmine/network/mcpe/protocol/CameraPacket.php +++ b/src/pocketmine/network/mcpe/protocol/CameraPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class CameraPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::CAMERA_PACKET; @@ -45,7 +45,7 @@ class CameraPacket extends DataPacket implements ClientboundPacket{ $this->putEntityUniqueId($this->playerUniqueId); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleCamera($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ChangeDimensionPacket.php b/src/pocketmine/network/mcpe/protocol/ChangeDimensionPacket.php index 6e13a7296..95b66d4d4 100644 --- a/src/pocketmine/network/mcpe/protocol/ChangeDimensionPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ChangeDimensionPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\math\Vector3; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class ChangeDimensionPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::CHANGE_DIMENSION_PACKET; @@ -51,7 +51,7 @@ class ChangeDimensionPacket extends DataPacket implements ClientboundPacket{ $this->putBool($this->respawn); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleChangeDimension($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php b/src/pocketmine/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php index 8dfd37080..3ff77d51a 100644 --- a/src/pocketmine/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class ChunkRadiusUpdatedPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::CHUNK_RADIUS_UPDATED_PACKET; @@ -48,7 +48,7 @@ class ChunkRadiusUpdatedPacket extends DataPacket implements ClientboundPacket{ $this->putVarInt($this->radius); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleChunkRadiusUpdated($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ClientToServerHandshakePacket.php b/src/pocketmine/network/mcpe/protocol/ClientToServerHandshakePacket.php index e744ff0ff..99e2d0545 100644 --- a/src/pocketmine/network/mcpe/protocol/ClientToServerHandshakePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ClientToServerHandshakePacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class ClientToServerHandshakePacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::CLIENT_TO_SERVER_HANDSHAKE_PACKET; @@ -43,7 +43,7 @@ class ClientToServerHandshakePacket extends DataPacket implements ServerboundPac //No payload } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleClientToServerHandshake($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php b/src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php index b7070cd63..503fec530 100644 --- a/src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\BadPacketException; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\DimensionIds; use pocketmine\network\mcpe\protocol\types\MapTrackedObject; use pocketmine\utils\Color; @@ -207,7 +207,7 @@ class ClientboundMapItemDataPacket extends DataPacket implements ClientboundPack } } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleClientboundMapItemData($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/CommandBlockUpdatePacket.php b/src/pocketmine/network/mcpe/protocol/CommandBlockUpdatePacket.php index bdb04ce4a..818b312ad 100644 --- a/src/pocketmine/network/mcpe/protocol/CommandBlockUpdatePacket.php +++ b/src/pocketmine/network/mcpe/protocol/CommandBlockUpdatePacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class CommandBlockUpdatePacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::COMMAND_BLOCK_UPDATE_PACKET; @@ -99,7 +99,7 @@ class CommandBlockUpdatePacket extends DataPacket implements ServerboundPacket{ $this->putBool($this->shouldTrackOutput); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleCommandBlockUpdate($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/CommandOutputPacket.php b/src/pocketmine/network/mcpe/protocol/CommandOutputPacket.php index e310b0ac0..b05450d28 100644 --- a/src/pocketmine/network/mcpe/protocol/CommandOutputPacket.php +++ b/src/pocketmine/network/mcpe/protocol/CommandOutputPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\CommandOriginData; use pocketmine\network\mcpe\protocol\types\CommandOutputMessage; use pocketmine\utils\BinaryDataException; @@ -101,7 +101,7 @@ class CommandOutputPacket extends DataPacket implements ClientboundPacket{ } } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleCommandOutput($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/CommandRequestPacket.php b/src/pocketmine/network/mcpe/protocol/CommandRequestPacket.php index cdb5d7577..a0d009a03 100644 --- a/src/pocketmine/network/mcpe/protocol/CommandRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/CommandRequestPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\CommandOriginData; class CommandRequestPacket extends DataPacket implements ServerboundPacket{ @@ -50,7 +50,7 @@ class CommandRequestPacket extends DataPacket implements ServerboundPacket{ $this->putBool($this->isInternal); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleCommandRequest($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ContainerClosePacket.php b/src/pocketmine/network/mcpe/protocol/ContainerClosePacket.php index 5cc935168..d60ae7952 100644 --- a/src/pocketmine/network/mcpe/protocol/ContainerClosePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ContainerClosePacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class ContainerClosePacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::CONTAINER_CLOSE_PACKET; @@ -48,7 +48,7 @@ class ContainerClosePacket extends DataPacket implements ClientboundPacket, Serv $this->putByte($this->windowId); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleContainerClose($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ContainerOpenPacket.php b/src/pocketmine/network/mcpe/protocol/ContainerOpenPacket.php index de24c6055..3addd12bb 100644 --- a/src/pocketmine/network/mcpe/protocol/ContainerOpenPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ContainerOpenPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class ContainerOpenPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::CONTAINER_OPEN_PACKET; @@ -74,7 +74,7 @@ class ContainerOpenPacket extends DataPacket implements ClientboundPacket{ $this->putEntityUniqueId($this->entityUniqueId); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleContainerOpen($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ContainerSetDataPacket.php b/src/pocketmine/network/mcpe/protocol/ContainerSetDataPacket.php index 46cb1b920..1782b66f5 100644 --- a/src/pocketmine/network/mcpe/protocol/ContainerSetDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ContainerSetDataPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class ContainerSetDataPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::CONTAINER_SET_DATA_PACKET; @@ -68,7 +68,7 @@ class ContainerSetDataPacket extends DataPacket implements ClientboundPacket{ $this->putVarInt($this->value); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleContainerSetData($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php b/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php index cfbcf8ddb..910c863dc 100644 --- a/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php @@ -32,7 +32,7 @@ use pocketmine\inventory\ShapelessRecipe; use pocketmine\item\Item; use pocketmine\item\ItemFactory; use pocketmine\network\BadPacketException; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\NetworkBinaryStream; use function count; use function str_repeat; @@ -226,7 +226,7 @@ class CraftingDataPacket extends DataPacket implements ClientboundPacket{ $this->putBool($this->cleanRecipes); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleCraftingData($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/CraftingEventPacket.php b/src/pocketmine/network/mcpe/protocol/CraftingEventPacket.php index 62df96753..53371d75e 100644 --- a/src/pocketmine/network/mcpe/protocol/CraftingEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/CraftingEventPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include use pocketmine\item\Item; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\utils\UUID; use function count; @@ -76,7 +76,7 @@ class CraftingEventPacket extends DataPacket implements ServerboundPacket{ } } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleCraftingEvent($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/DisconnectPacket.php b/src/pocketmine/network/mcpe/protocol/DisconnectPacket.php index 513f8f8ec..d02619341 100644 --- a/src/pocketmine/network/mcpe/protocol/DisconnectPacket.php +++ b/src/pocketmine/network/mcpe/protocol/DisconnectPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class DisconnectPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::DISCONNECT_PACKET; @@ -67,7 +67,7 @@ class DisconnectPacket extends DataPacket implements ClientboundPacket, Serverbo } } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleDisconnect($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/EntityEventPacket.php b/src/pocketmine/network/mcpe/protocol/EntityEventPacket.php index 86e33d3be..6e84401af 100644 --- a/src/pocketmine/network/mcpe/protocol/EntityEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/EntityEventPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class EntityEventPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::ENTITY_EVENT_PACKET; @@ -110,7 +110,7 @@ class EntityEventPacket extends DataPacket implements ClientboundPacket, Serverb $this->putVarInt($this->data); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleEntityEvent($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/EntityFallPacket.php b/src/pocketmine/network/mcpe/protocol/EntityFallPacket.php index 0eede0be9..d457d56c0 100644 --- a/src/pocketmine/network/mcpe/protocol/EntityFallPacket.php +++ b/src/pocketmine/network/mcpe/protocol/EntityFallPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class EntityFallPacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::ENTITY_FALL_PACKET; @@ -50,7 +50,7 @@ class EntityFallPacket extends DataPacket implements ServerboundPacket{ $this->putBool($this->isInVoid); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleEntityFall($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/EntityPickRequestPacket.php b/src/pocketmine/network/mcpe/protocol/EntityPickRequestPacket.php index bb167e3d0..8e43cd30a 100644 --- a/src/pocketmine/network/mcpe/protocol/EntityPickRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/EntityPickRequestPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class EntityPickRequestPacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::ENTITY_PICK_REQUEST_PACKET; @@ -45,7 +45,7 @@ class EntityPickRequestPacket extends DataPacket implements ServerboundPacket{ $this->putByte($this->hotbarSlot); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleEntityPickRequest($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/EventPacket.php b/src/pocketmine/network/mcpe/protocol/EventPacket.php index 67a518af6..56786952d 100644 --- a/src/pocketmine/network/mcpe/protocol/EventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/EventPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class EventPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::EVENT_PACKET; @@ -67,7 +67,7 @@ class EventPacket extends DataPacket implements ClientboundPacket{ //TODO: also nice confusing mess } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleEvent($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ExplodePacket.php b/src/pocketmine/network/mcpe/protocol/ExplodePacket.php index c1f4f813f..189c9ff8c 100644 --- a/src/pocketmine/network/mcpe/protocol/ExplodePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ExplodePacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\math\Vector3; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use function count; class ExplodePacket extends DataPacket implements ClientboundPacket{ @@ -77,7 +77,7 @@ class ExplodePacket extends DataPacket implements ClientboundPacket{ } } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleExplode($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/FullChunkDataPacket.php b/src/pocketmine/network/mcpe/protocol/FullChunkDataPacket.php index abe1c936a..f3f2300c2 100644 --- a/src/pocketmine/network/mcpe/protocol/FullChunkDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/FullChunkDataPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class FullChunkDataPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::FULL_CHUNK_DATA_PACKET; @@ -58,7 +58,7 @@ class FullChunkDataPacket extends DataPacket implements ClientboundPacket{ $this->putString($this->data); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleFullChunkData($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/GameRulesChangedPacket.php b/src/pocketmine/network/mcpe/protocol/GameRulesChangedPacket.php index c6d9ce488..d53082b9d 100644 --- a/src/pocketmine/network/mcpe/protocol/GameRulesChangedPacket.php +++ b/src/pocketmine/network/mcpe/protocol/GameRulesChangedPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class GameRulesChangedPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::GAME_RULES_CHANGED_PACKET; @@ -41,7 +41,7 @@ class GameRulesChangedPacket extends DataPacket implements ClientboundPacket{ $this->putGameRules($this->gameRules); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleGameRulesChanged($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/GuiDataPickItemPacket.php b/src/pocketmine/network/mcpe/protocol/GuiDataPickItemPacket.php index 58ddf7810..cdba42aae 100644 --- a/src/pocketmine/network/mcpe/protocol/GuiDataPickItemPacket.php +++ b/src/pocketmine/network/mcpe/protocol/GuiDataPickItemPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class GuiDataPickItemPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::GUI_DATA_PICK_ITEM_PACKET; @@ -49,7 +49,7 @@ class GuiDataPickItemPacket extends DataPacket implements ClientboundPacket{ $this->putLInt($this->hotbarSlot); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleGuiDataPickItem($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/HurtArmorPacket.php b/src/pocketmine/network/mcpe/protocol/HurtArmorPacket.php index a4d01bc45..6dbef6649 100644 --- a/src/pocketmine/network/mcpe/protocol/HurtArmorPacket.php +++ b/src/pocketmine/network/mcpe/protocol/HurtArmorPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class HurtArmorPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::HURT_ARMOR_PACKET; @@ -42,7 +42,7 @@ class HurtArmorPacket extends DataPacket implements ClientboundPacket{ $this->putVarInt($this->health); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleHurtArmor($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/InteractPacket.php b/src/pocketmine/network/mcpe/protocol/InteractPacket.php index 10a87d787..5ae4d1fe8 100644 --- a/src/pocketmine/network/mcpe/protocol/InteractPacket.php +++ b/src/pocketmine/network/mcpe/protocol/InteractPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class InteractPacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::INTERACT_PACKET; @@ -71,7 +71,7 @@ class InteractPacket extends DataPacket implements ServerboundPacket{ } } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleInteract($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/InventoryContentPacket.php b/src/pocketmine/network/mcpe/protocol/InventoryContentPacket.php index 2db67c3cc..5aaa29b15 100644 --- a/src/pocketmine/network/mcpe/protocol/InventoryContentPacket.php +++ b/src/pocketmine/network/mcpe/protocol/InventoryContentPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include use pocketmine\item\Item; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use function count; class InventoryContentPacket extends DataPacket implements ClientboundPacket{ @@ -66,7 +66,7 @@ class InventoryContentPacket extends DataPacket implements ClientboundPacket{ } } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleInventoryContent($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/InventorySlotPacket.php b/src/pocketmine/network/mcpe/protocol/InventorySlotPacket.php index e34adbeba..5fc2f76c9 100644 --- a/src/pocketmine/network/mcpe/protocol/InventorySlotPacket.php +++ b/src/pocketmine/network/mcpe/protocol/InventorySlotPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include use pocketmine\item\Item; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class InventorySlotPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::INVENTORY_SLOT_PACKET; @@ -58,7 +58,7 @@ class InventorySlotPacket extends DataPacket implements ClientboundPacket{ $this->putSlot($this->item); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleInventorySlot($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php b/src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php index 4e009d1c8..9eed4cd8f 100644 --- a/src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php +++ b/src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include use pocketmine\network\BadPacketException; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\MismatchTransactionData; use pocketmine\network\mcpe\protocol\types\NormalTransactionData; use pocketmine\network\mcpe\protocol\types\ReleaseItemTransactionData; @@ -80,7 +80,7 @@ class InventoryTransactionPacket extends DataPacket implements ClientboundPacket $this->trData->encode($this); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleInventoryTransaction($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ItemFrameDropItemPacket.php b/src/pocketmine/network/mcpe/protocol/ItemFrameDropItemPacket.php index 8890149cd..c0a16b1ee 100644 --- a/src/pocketmine/network/mcpe/protocol/ItemFrameDropItemPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ItemFrameDropItemPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class ItemFrameDropItemPacket extends DataPacket implements ServerboundPacket{ @@ -46,7 +46,7 @@ class ItemFrameDropItemPacket extends DataPacket implements ServerboundPacket{ $this->putBlockPosition($this->x, $this->y, $this->z); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleItemFrameDropItem($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/LabTablePacket.php b/src/pocketmine/network/mcpe/protocol/LabTablePacket.php index f87385311..70e0640cf 100644 --- a/src/pocketmine/network/mcpe/protocol/LabTablePacket.php +++ b/src/pocketmine/network/mcpe/protocol/LabTablePacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class LabTablePacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::LAB_TABLE_PACKET; @@ -55,7 +55,7 @@ class LabTablePacket extends DataPacket implements ClientboundPacket, Serverboun $this->putByte($this->reactionType); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleLabTable($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/LecternUpdatePacket.php b/src/pocketmine/network/mcpe/protocol/LecternUpdatePacket.php index e6333142d..a3ddf31d5 100644 --- a/src/pocketmine/network/mcpe/protocol/LecternUpdatePacket.php +++ b/src/pocketmine/network/mcpe/protocol/LecternUpdatePacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class LecternUpdatePacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::LECTERN_UPDATE_PACKET; @@ -57,7 +57,7 @@ class LecternUpdatePacket extends DataPacket implements ServerboundPacket{ $this->putBool($this->dropBook); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleLecternUpdate($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/LevelEventPacket.php b/src/pocketmine/network/mcpe/protocol/LevelEventPacket.php index 9d2254726..d05402fe4 100644 --- a/src/pocketmine/network/mcpe/protocol/LevelEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/LevelEventPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include use pocketmine\math\Vector3; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class LevelEventPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::LEVEL_EVENT_PACKET; @@ -141,7 +141,7 @@ class LevelEventPacket extends DataPacket implements ClientboundPacket{ $this->putVarInt($this->data); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleLevelEvent($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacket.php b/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacket.php index 086069d91..957e4da4b 100644 --- a/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include use pocketmine\math\Vector3; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class LevelSoundEventPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::LEVEL_SOUND_EVENT_PACKET; @@ -346,7 +346,7 @@ class LevelSoundEventPacket extends DataPacket implements ClientboundPacket, Ser $this->putBool($this->disableRelativeVolume); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleLevelSoundEvent($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacketV1.php b/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacketV1.php index 28ad585bb..ae45de3e4 100644 --- a/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacketV1.php +++ b/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacketV1.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include use pocketmine\math\Vector3; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; /** * Useless leftover from a 1.8 refactor, does nothing @@ -65,7 +65,7 @@ class LevelSoundEventPacketV1 extends DataPacket{ $this->putBool($this->disableRelativeVolume); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleLevelSoundEventPacketV1($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacketV2.php b/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacketV2.php index c7a7d58e0..d540c4111 100644 --- a/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacketV2.php +++ b/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacketV2.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include use pocketmine\math\Vector3; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; /** * Useless leftover from a 1.9 refactor, does nothing @@ -65,7 +65,7 @@ class LevelSoundEventPacketV2 extends DataPacket{ $this->putBool($this->disableRelativeVolume); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleLevelSoundEventPacketV2($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/LoginPacket.php b/src/pocketmine/network/mcpe/protocol/LoginPacket.php index 9deef9bb4..0031a20ea 100644 --- a/src/pocketmine/network/mcpe/protocol/LoginPacket.php +++ b/src/pocketmine/network/mcpe/protocol/LoginPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use Particle\Validator\Validator; use pocketmine\network\BadPacketException; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\utils\BinaryDataException; use pocketmine\utils\BinaryStream; use pocketmine\utils\Utils; @@ -178,7 +178,7 @@ class LoginPacket extends DataPacket implements ServerboundPacket{ //TODO } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleLogin($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/MapCreateLockedCopyPacket.php b/src/pocketmine/network/mcpe/protocol/MapCreateLockedCopyPacket.php index fd65e8f42..92b8e9d46 100644 --- a/src/pocketmine/network/mcpe/protocol/MapCreateLockedCopyPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MapCreateLockedCopyPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class MapCreateLockedCopyPacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::MAP_CREATE_LOCKED_COPY_PACKET; @@ -45,7 +45,7 @@ class MapCreateLockedCopyPacket extends DataPacket implements ServerboundPacket{ $this->putEntityUniqueId($this->newMapId); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleMapCreateLockedCopy($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/MapInfoRequestPacket.php b/src/pocketmine/network/mcpe/protocol/MapInfoRequestPacket.php index b6500c36f..a1bc4144f 100644 --- a/src/pocketmine/network/mcpe/protocol/MapInfoRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MapInfoRequestPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class MapInfoRequestPacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::MAP_INFO_REQUEST_PACKET; @@ -43,7 +43,7 @@ class MapInfoRequestPacket extends DataPacket implements ServerboundPacket{ $this->putEntityUniqueId($this->mapId); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleMapInfoRequest($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/MobArmorEquipmentPacket.php b/src/pocketmine/network/mcpe/protocol/MobArmorEquipmentPacket.php index 0888c9f2f..38f9305c5 100644 --- a/src/pocketmine/network/mcpe/protocol/MobArmorEquipmentPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MobArmorEquipmentPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\item\Item; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class MobArmorEquipmentPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::MOB_ARMOR_EQUIPMENT_PACKET; @@ -72,7 +72,7 @@ class MobArmorEquipmentPacket extends DataPacket implements ClientboundPacket, S $this->putSlot($this->feet); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleMobArmorEquipment($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/MobEffectPacket.php b/src/pocketmine/network/mcpe/protocol/MobEffectPacket.php index 108b57ad7..15c8c8a39 100644 --- a/src/pocketmine/network/mcpe/protocol/MobEffectPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MobEffectPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class MobEffectPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::MOB_EFFECT_PACKET; @@ -85,7 +85,7 @@ class MobEffectPacket extends DataPacket implements ClientboundPacket{ $this->putVarInt($this->duration); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleMobEffect($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/MobEquipmentPacket.php b/src/pocketmine/network/mcpe/protocol/MobEquipmentPacket.php index 9676e966f..d4cad955d 100644 --- a/src/pocketmine/network/mcpe/protocol/MobEquipmentPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MobEquipmentPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\item\Item; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class MobEquipmentPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::MOB_EQUIPMENT_PACKET; @@ -69,7 +69,7 @@ class MobEquipmentPacket extends DataPacket implements ClientboundPacket, Server $this->putByte($this->windowId); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleMobEquipment($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ModalFormRequestPacket.php b/src/pocketmine/network/mcpe/protocol/ModalFormRequestPacket.php index cd1c9d42a..b60fb8cdf 100644 --- a/src/pocketmine/network/mcpe/protocol/ModalFormRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ModalFormRequestPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class ModalFormRequestPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::MODAL_FORM_REQUEST_PACKET; @@ -52,7 +52,7 @@ class ModalFormRequestPacket extends DataPacket implements ClientboundPacket{ $this->putString($this->formData); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleModalFormRequest($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ModalFormResponsePacket.php b/src/pocketmine/network/mcpe/protocol/ModalFormResponsePacket.php index 0ed1a2064..f97a7c0c3 100644 --- a/src/pocketmine/network/mcpe/protocol/ModalFormResponsePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ModalFormResponsePacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class ModalFormResponsePacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::MODAL_FORM_RESPONSE_PACKET; @@ -45,7 +45,7 @@ class ModalFormResponsePacket extends DataPacket implements ServerboundPacket{ $this->putString($this->formData); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleModalFormResponse($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/MoveEntityAbsolutePacket.php b/src/pocketmine/network/mcpe/protocol/MoveEntityAbsolutePacket.php index 63d550f16..d0e220e8b 100644 --- a/src/pocketmine/network/mcpe/protocol/MoveEntityAbsolutePacket.php +++ b/src/pocketmine/network/mcpe/protocol/MoveEntityAbsolutePacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\math\Vector3; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class MoveEntityAbsolutePacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::MOVE_ENTITY_ABSOLUTE_PACKET; @@ -66,7 +66,7 @@ class MoveEntityAbsolutePacket extends DataPacket implements ClientboundPacket, $this->putByteRotation($this->zRot); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleMoveEntityAbsolute($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/MoveEntityDeltaPacket.php b/src/pocketmine/network/mcpe/protocol/MoveEntityDeltaPacket.php index 929b9f831..0b1851202 100644 --- a/src/pocketmine/network/mcpe/protocol/MoveEntityDeltaPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MoveEntityDeltaPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\utils\BinaryDataException; class MoveEntityDeltaPacket extends DataPacket implements ClientboundPacket{ @@ -115,7 +115,7 @@ class MoveEntityDeltaPacket extends DataPacket implements ClientboundPacket{ $this->maybeWriteRotation(self::FLAG_HAS_ROT_Z, $this->zRot); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleMoveEntityDelta($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/MovePlayerPacket.php b/src/pocketmine/network/mcpe/protocol/MovePlayerPacket.php index 801e6de92..6f6c6c06f 100644 --- a/src/pocketmine/network/mcpe/protocol/MovePlayerPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MovePlayerPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\math\Vector3; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class MovePlayerPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::MOVE_PLAYER_PACKET; @@ -88,7 +88,7 @@ class MovePlayerPacket extends DataPacket implements ClientboundPacket, Serverbo } } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleMovePlayer($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/NetworkChunkPublisherUpdatePacket.php b/src/pocketmine/network/mcpe/protocol/NetworkChunkPublisherUpdatePacket.php index 1d39454d6..fc78a0b9f 100644 --- a/src/pocketmine/network/mcpe/protocol/NetworkChunkPublisherUpdatePacket.php +++ b/src/pocketmine/network/mcpe/protocol/NetworkChunkPublisherUpdatePacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class NetworkChunkPublisherUpdatePacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::NETWORK_CHUNK_PUBLISHER_UPDATE_PACKET; @@ -58,7 +58,7 @@ class NetworkChunkPublisherUpdatePacket extends DataPacket implements Clientboun $this->putUnsignedVarInt($this->radius); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleNetworkChunkPublisherUpdate($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/NetworkStackLatencyPacket.php b/src/pocketmine/network/mcpe/protocol/NetworkStackLatencyPacket.php index 454b73055..27add3d3c 100644 --- a/src/pocketmine/network/mcpe/protocol/NetworkStackLatencyPacket.php +++ b/src/pocketmine/network/mcpe/protocol/NetworkStackLatencyPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class NetworkStackLatencyPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::NETWORK_STACK_LATENCY_PACKET; @@ -45,7 +45,7 @@ class NetworkStackLatencyPacket extends DataPacket implements ClientboundPacket, $this->putBool($this->needResponse); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleNetworkStackLatency($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/NpcRequestPacket.php b/src/pocketmine/network/mcpe/protocol/NpcRequestPacket.php index d0a33b902..7e9e6c69a 100644 --- a/src/pocketmine/network/mcpe/protocol/NpcRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/NpcRequestPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class NpcRequestPacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::NPC_REQUEST_PACKET; @@ -53,7 +53,7 @@ class NpcRequestPacket extends DataPacket implements ServerboundPacket{ $this->putByte($this->actionType); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleNpcRequest($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/OnScreenTextureAnimationPacket.php b/src/pocketmine/network/mcpe/protocol/OnScreenTextureAnimationPacket.php index e98fda292..e4cf44940 100644 --- a/src/pocketmine/network/mcpe/protocol/OnScreenTextureAnimationPacket.php +++ b/src/pocketmine/network/mcpe/protocol/OnScreenTextureAnimationPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class OnScreenTextureAnimationPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::ON_SCREEN_TEXTURE_ANIMATION_PACKET; @@ -41,7 +41,7 @@ class OnScreenTextureAnimationPacket extends DataPacket implements ClientboundPa $this->putLInt($this->effectId); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleOnScreenTextureAnimation($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/Packet.php b/src/pocketmine/network/mcpe/protocol/Packet.php index 71bd3a5c4..2c754240a 100644 --- a/src/pocketmine/network/mcpe/protocol/Packet.php +++ b/src/pocketmine/network/mcpe/protocol/Packet.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\network\mcpe\protocol; use pocketmine\network\BadPacketException; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; interface Packet{ @@ -62,13 +62,13 @@ interface Packet{ * This method returns a bool to indicate whether the packet was handled or not. If the packet was unhandled, a * debug message will be logged with a hexdump of the packet. * - * Typically this method returns the return value of the handler in the supplied SessionHandler. See other packets + * Typically this method returns the return value of the handler in the supplied PacketHandler. See other packets * for examples how to implement this. * - * @param SessionHandler $handler + * @param PacketHandler $handler * * @return bool true if the packet was handled successfully, false if not. * @throws BadPacketException if broken data was found in the packet */ - public function handle(SessionHandler $handler) : bool; + public function handle(PacketHandler $handler) : bool; } diff --git a/src/pocketmine/network/mcpe/protocol/PhotoTransferPacket.php b/src/pocketmine/network/mcpe/protocol/PhotoTransferPacket.php index c278adc62..cf32d1472 100644 --- a/src/pocketmine/network/mcpe/protocol/PhotoTransferPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PhotoTransferPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class PhotoTransferPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::PHOTO_TRANSFER_PACKET; @@ -49,7 +49,7 @@ class PhotoTransferPacket extends DataPacket implements ClientboundPacket{ $this->putString($this->bookId); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handlePhotoTransfer($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/PlaySoundPacket.php b/src/pocketmine/network/mcpe/protocol/PlaySoundPacket.php index 4fe95ae5c..952a97fb8 100644 --- a/src/pocketmine/network/mcpe/protocol/PlaySoundPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlaySoundPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class PlaySoundPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::PLAY_SOUND_PACKET; @@ -62,7 +62,7 @@ class PlaySoundPacket extends DataPacket implements ClientboundPacket{ $this->putLFloat($this->pitch); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handlePlaySound($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/PlayStatusPacket.php b/src/pocketmine/network/mcpe/protocol/PlayStatusPacket.php index f2c435461..9084a3fa2 100644 --- a/src/pocketmine/network/mcpe/protocol/PlayStatusPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayStatusPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class PlayStatusPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::PLAY_STATUS_PACKET; @@ -61,7 +61,7 @@ class PlayStatusPacket extends DataPacket implements ClientboundPacket{ $this->putInt($this->status); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handlePlayStatus($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/PlayerActionPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerActionPacket.php index a4d6af775..2d9e662e4 100644 --- a/src/pocketmine/network/mcpe/protocol/PlayerActionPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayerActionPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class PlayerActionPacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::PLAYER_ACTION_PACKET; @@ -84,7 +84,7 @@ class PlayerActionPacket extends DataPacket implements ServerboundPacket{ $this->putVarInt($this->face); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handlePlayerAction($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/PlayerHotbarPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerHotbarPacket.php index 2d6a31063..9cf8dc2f0 100644 --- a/src/pocketmine/network/mcpe/protocol/PlayerHotbarPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayerHotbarPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\ContainerIds; /** @@ -53,7 +53,7 @@ class PlayerHotbarPacket extends DataPacket implements ClientboundPacket, Server $this->putBool($this->selectHotbarSlot); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handlePlayerHotbar($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/PlayerInputPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerInputPacket.php index f2e4a69ea..1d4fd0b97 100644 --- a/src/pocketmine/network/mcpe/protocol/PlayerInputPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayerInputPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class PlayerInputPacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::PLAYER_INPUT_PACKET; @@ -54,7 +54,7 @@ class PlayerInputPacket extends DataPacket implements ServerboundPacket{ $this->putBool($this->sneaking); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handlePlayerInput($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/PlayerListPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerListPacket.php index 1e8b78143..3d171d5eb 100644 --- a/src/pocketmine/network/mcpe/protocol/PlayerListPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayerListPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\entity\Skin; use pocketmine\network\BadPacketException; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\PlayerListEntry; use function count; @@ -116,7 +116,7 @@ class PlayerListPacket extends DataPacket implements ClientboundPacket{ } } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handlePlayerList($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/PlayerSkinPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerSkinPacket.php index e6c56bf20..1912c2de8 100644 --- a/src/pocketmine/network/mcpe/protocol/PlayerSkinPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayerSkinPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\entity\Skin; use pocketmine\network\BadPacketException; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\utils\UUID; class PlayerSkinPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ @@ -78,7 +78,7 @@ class PlayerSkinPacket extends DataPacket implements ClientboundPacket, Serverbo $this->putBool($this->premiumSkin); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handlePlayerSkin($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/PurchaseReceiptPacket.php b/src/pocketmine/network/mcpe/protocol/PurchaseReceiptPacket.php index f34a5535e..8b6b02b86 100644 --- a/src/pocketmine/network/mcpe/protocol/PurchaseReceiptPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PurchaseReceiptPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use function count; class PurchaseReceiptPacket extends DataPacket implements ServerboundPacket{ @@ -48,7 +48,7 @@ class PurchaseReceiptPacket extends DataPacket implements ServerboundPacket{ } } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handlePurchaseReceipt($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/RemoveEntityPacket.php b/src/pocketmine/network/mcpe/protocol/RemoveEntityPacket.php index e9b1c32cc..956a9f063 100644 --- a/src/pocketmine/network/mcpe/protocol/RemoveEntityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/RemoveEntityPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class RemoveEntityPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::REMOVE_ENTITY_PACKET; @@ -48,7 +48,7 @@ class RemoveEntityPacket extends DataPacket implements ClientboundPacket{ $this->putEntityUniqueId($this->entityUniqueId); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleRemoveEntity($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/RemoveObjectivePacket.php b/src/pocketmine/network/mcpe/protocol/RemoveObjectivePacket.php index 13872bfd8..e05e1ed33 100644 --- a/src/pocketmine/network/mcpe/protocol/RemoveObjectivePacket.php +++ b/src/pocketmine/network/mcpe/protocol/RemoveObjectivePacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class RemoveObjectivePacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::REMOVE_OBJECTIVE_PACKET; @@ -41,7 +41,7 @@ class RemoveObjectivePacket extends DataPacket implements ClientboundPacket{ $this->putString($this->objectiveName); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleRemoveObjective($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/RequestChunkRadiusPacket.php b/src/pocketmine/network/mcpe/protocol/RequestChunkRadiusPacket.php index 25117c3d4..cc3caa251 100644 --- a/src/pocketmine/network/mcpe/protocol/RequestChunkRadiusPacket.php +++ b/src/pocketmine/network/mcpe/protocol/RequestChunkRadiusPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class RequestChunkRadiusPacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::REQUEST_CHUNK_RADIUS_PACKET; @@ -42,7 +42,7 @@ class RequestChunkRadiusPacket extends DataPacket implements ServerboundPacket{ $this->putVarInt($this->radius); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleRequestChunkRadius($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePackChunkDataPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackChunkDataPacket.php index f51384d7f..eb7ab7268 100644 --- a/src/pocketmine/network/mcpe/protocol/ResourcePackChunkDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ResourcePackChunkDataPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use function strlen; class ResourcePackChunkDataPacket extends DataPacket implements ClientboundPacket{ @@ -66,7 +66,7 @@ class ResourcePackChunkDataPacket extends DataPacket implements ClientboundPacke $this->put($this->data); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleResourcePackChunkData($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePackChunkRequestPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackChunkRequestPacket.php index a343768ea..d414ba1b4 100644 --- a/src/pocketmine/network/mcpe/protocol/ResourcePackChunkRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ResourcePackChunkRequestPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class ResourcePackChunkRequestPacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_CHUNK_REQUEST_PACKET; @@ -47,7 +47,7 @@ class ResourcePackChunkRequestPacket extends DataPacket implements ServerboundPa $this->putLInt($this->chunkIndex); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleResourcePackChunkRequest($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePackClientResponsePacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackClientResponsePacket.php index d757441b4..833c3982c 100644 --- a/src/pocketmine/network/mcpe/protocol/ResourcePackClientResponsePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ResourcePackClientResponsePacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use function count; class ResourcePackClientResponsePacket extends DataPacket implements ServerboundPacket{ @@ -58,7 +58,7 @@ class ResourcePackClientResponsePacket extends DataPacket implements Serverbound } } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleResourcePackClientResponse($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePackDataInfoPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackDataInfoPacket.php index e28abefb7..d4f773830 100644 --- a/src/pocketmine/network/mcpe/protocol/ResourcePackDataInfoPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ResourcePackDataInfoPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class ResourcePackDataInfoPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_DATA_INFO_PACKET; @@ -69,7 +69,7 @@ class ResourcePackDataInfoPacket extends DataPacket implements ClientboundPacket $this->putString($this->sha256); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleResourcePackDataInfo($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePackStackPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackStackPacket.php index bc19caf01..ec8e604ea 100644 --- a/src/pocketmine/network/mcpe/protocol/ResourcePackStackPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ResourcePackStackPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\resourcepacks\ResourcePack; use function count; @@ -101,7 +101,7 @@ class ResourcePackStackPacket extends DataPacket implements ClientboundPacket{ $this->putBool($this->isExperimental); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleResourcePackStack($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php index 4a305d259..5da110a68 100644 --- a/src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\resourcepacks\ResourcePack; use function count; @@ -110,7 +110,7 @@ class ResourcePacksInfoPacket extends DataPacket implements ClientboundPacket{ } } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleResourcePacksInfo($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/RespawnPacket.php b/src/pocketmine/network/mcpe/protocol/RespawnPacket.php index b4f79446a..2c739c763 100644 --- a/src/pocketmine/network/mcpe/protocol/RespawnPacket.php +++ b/src/pocketmine/network/mcpe/protocol/RespawnPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\math\Vector3; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class RespawnPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::RESPAWN_PACKET; @@ -49,7 +49,7 @@ class RespawnPacket extends DataPacket implements ClientboundPacket{ $this->putVector3($this->position); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleRespawn($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/RiderJumpPacket.php b/src/pocketmine/network/mcpe/protocol/RiderJumpPacket.php index 8b5f922c9..fad394c4f 100644 --- a/src/pocketmine/network/mcpe/protocol/RiderJumpPacket.php +++ b/src/pocketmine/network/mcpe/protocol/RiderJumpPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class RiderJumpPacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::RIDER_JUMP_PACKET; @@ -43,7 +43,7 @@ class RiderJumpPacket extends DataPacket implements ServerboundPacket{ $this->putVarInt($this->jumpStrength); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleRiderJump($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ScriptCustomEventPacket.php b/src/pocketmine/network/mcpe/protocol/ScriptCustomEventPacket.php index 64301aff8..999dad4f9 100644 --- a/src/pocketmine/network/mcpe/protocol/ScriptCustomEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ScriptCustomEventPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class ScriptCustomEventPacket extends DataPacket{ //TODO: this doesn't have handlers in either client or server in the game as of 1.8 public const NETWORK_ID = ProtocolInfo::SCRIPT_CUSTOM_EVENT_PACKET; @@ -45,7 +45,7 @@ class ScriptCustomEventPacket extends DataPacket{ //TODO: this doesn't have hand $this->putString($this->eventData); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleScriptCustomEvent($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ServerSettingsRequestPacket.php b/src/pocketmine/network/mcpe/protocol/ServerSettingsRequestPacket.php index 003c02b8e..53243e44d 100644 --- a/src/pocketmine/network/mcpe/protocol/ServerSettingsRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ServerSettingsRequestPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class ServerSettingsRequestPacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::SERVER_SETTINGS_REQUEST_PACKET; @@ -38,7 +38,7 @@ class ServerSettingsRequestPacket extends DataPacket implements ServerboundPacke //No payload } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleServerSettingsRequest($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ServerSettingsResponsePacket.php b/src/pocketmine/network/mcpe/protocol/ServerSettingsResponsePacket.php index e05b02c13..9bff90f31 100644 --- a/src/pocketmine/network/mcpe/protocol/ServerSettingsResponsePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ServerSettingsResponsePacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class ServerSettingsResponsePacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::SERVER_SETTINGS_RESPONSE_PACKET; @@ -45,7 +45,7 @@ class ServerSettingsResponsePacket extends DataPacket implements ClientboundPack $this->putString($this->formData); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleServerSettingsResponse($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ServerToClientHandshakePacket.php b/src/pocketmine/network/mcpe/protocol/ServerToClientHandshakePacket.php index 1759999ea..78ce6ad82 100644 --- a/src/pocketmine/network/mcpe/protocol/ServerToClientHandshakePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ServerToClientHandshakePacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class ServerToClientHandshakePacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::SERVER_TO_CLIENT_HANDSHAKE_PACKET; @@ -55,7 +55,7 @@ class ServerToClientHandshakePacket extends DataPacket implements ClientboundPac $this->putString($this->jwt); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleServerToClientHandshake($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/SetCommandsEnabledPacket.php b/src/pocketmine/network/mcpe/protocol/SetCommandsEnabledPacket.php index 0f91d88cf..986350d05 100644 --- a/src/pocketmine/network/mcpe/protocol/SetCommandsEnabledPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetCommandsEnabledPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class SetCommandsEnabledPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::SET_COMMANDS_ENABLED_PACKET; @@ -42,7 +42,7 @@ class SetCommandsEnabledPacket extends DataPacket implements ClientboundPacket{ $this->putBool($this->enabled); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleSetCommandsEnabled($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/SetDefaultGameTypePacket.php b/src/pocketmine/network/mcpe/protocol/SetDefaultGameTypePacket.php index 3fb28d464..de16f014b 100644 --- a/src/pocketmine/network/mcpe/protocol/SetDefaultGameTypePacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetDefaultGameTypePacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class SetDefaultGameTypePacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::SET_DEFAULT_GAME_TYPE_PACKET; @@ -41,7 +41,7 @@ class SetDefaultGameTypePacket extends DataPacket implements ClientboundPacket, $this->putUnsignedVarInt($this->gamemode); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleSetDefaultGameType($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/SetDifficultyPacket.php b/src/pocketmine/network/mcpe/protocol/SetDifficultyPacket.php index 79f71b10a..cec01b77d 100644 --- a/src/pocketmine/network/mcpe/protocol/SetDifficultyPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetDifficultyPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class SetDifficultyPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::SET_DIFFICULTY_PACKET; @@ -42,7 +42,7 @@ class SetDifficultyPacket extends DataPacket implements ClientboundPacket, Serve $this->putUnsignedVarInt($this->difficulty); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleSetDifficulty($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/SetDisplayObjectivePacket.php b/src/pocketmine/network/mcpe/protocol/SetDisplayObjectivePacket.php index ed9406f16..9a0ba7bac 100644 --- a/src/pocketmine/network/mcpe/protocol/SetDisplayObjectivePacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetDisplayObjectivePacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class SetDisplayObjectivePacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::SET_DISPLAY_OBJECTIVE_PACKET; @@ -57,7 +57,7 @@ class SetDisplayObjectivePacket extends DataPacket implements ClientboundPacket{ $this->putVarInt($this->sortOrder); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleSetDisplayObjective($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/SetEntityDataPacket.php b/src/pocketmine/network/mcpe/protocol/SetEntityDataPacket.php index d92cb057a..8a329f4c3 100644 --- a/src/pocketmine/network/mcpe/protocol/SetEntityDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetEntityDataPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class SetEntityDataPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ //TODO: check why this is serverbound public const NETWORK_ID = ProtocolInfo::SET_ENTITY_DATA_PACKET; @@ -53,7 +53,7 @@ class SetEntityDataPacket extends DataPacket implements ClientboundPacket, Serve $this->putEntityMetadata($this->metadata); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleSetEntityData($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/SetEntityLinkPacket.php b/src/pocketmine/network/mcpe/protocol/SetEntityLinkPacket.php index 58667275b..d0ddf7054 100644 --- a/src/pocketmine/network/mcpe/protocol/SetEntityLinkPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetEntityLinkPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\EntityLink; class SetEntityLinkPacket extends DataPacket implements ClientboundPacket{ @@ -43,7 +43,7 @@ class SetEntityLinkPacket extends DataPacket implements ClientboundPacket{ $this->putEntityLink($this->link); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleSetEntityLink($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/SetEntityMotionPacket.php b/src/pocketmine/network/mcpe/protocol/SetEntityMotionPacket.php index 451483893..3901baeac 100644 --- a/src/pocketmine/network/mcpe/protocol/SetEntityMotionPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetEntityMotionPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\math\Vector3; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; /** * TODO: This packet is (erroneously) sent to the server when the client is riding a vehicle. @@ -57,7 +57,7 @@ class SetEntityMotionPacket extends DataPacket implements ClientboundPacket, Gar $this->putVector3($this->motion); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleSetEntityMotion($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/SetHealthPacket.php b/src/pocketmine/network/mcpe/protocol/SetHealthPacket.php index afb40982f..e11b05a84 100644 --- a/src/pocketmine/network/mcpe/protocol/SetHealthPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetHealthPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class SetHealthPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::SET_HEALTH_PACKET; @@ -42,7 +42,7 @@ class SetHealthPacket extends DataPacket implements ClientboundPacket{ $this->putVarInt($this->health); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleSetHealth($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/SetLastHurtByPacket.php b/src/pocketmine/network/mcpe/protocol/SetLastHurtByPacket.php index e8fb632d3..ab2b703e0 100644 --- a/src/pocketmine/network/mcpe/protocol/SetLastHurtByPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetLastHurtByPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class SetLastHurtByPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::SET_LAST_HURT_BY_PACKET; @@ -41,7 +41,7 @@ class SetLastHurtByPacket extends DataPacket implements ClientboundPacket{ $this->putVarInt($this->entityTypeId); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleSetLastHurtBy($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/SetLocalPlayerAsInitializedPacket.php b/src/pocketmine/network/mcpe/protocol/SetLocalPlayerAsInitializedPacket.php index 5f278a286..7b15c525b 100644 --- a/src/pocketmine/network/mcpe/protocol/SetLocalPlayerAsInitializedPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetLocalPlayerAsInitializedPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class SetLocalPlayerAsInitializedPacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::SET_LOCAL_PLAYER_AS_INITIALIZED_PACKET; @@ -41,7 +41,7 @@ class SetLocalPlayerAsInitializedPacket extends DataPacket implements Serverboun $this->putEntityRuntimeId($this->entityRuntimeId); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleSetLocalPlayerAsInitialized($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/SetPlayerGameTypePacket.php b/src/pocketmine/network/mcpe/protocol/SetPlayerGameTypePacket.php index 6e1652773..5385ec6a5 100644 --- a/src/pocketmine/network/mcpe/protocol/SetPlayerGameTypePacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetPlayerGameTypePacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class SetPlayerGameTypePacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::SET_PLAYER_GAME_TYPE_PACKET; @@ -48,7 +48,7 @@ class SetPlayerGameTypePacket extends DataPacket implements ClientboundPacket, S $this->putVarInt($this->gamemode); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleSetPlayerGameType($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/SetScorePacket.php b/src/pocketmine/network/mcpe/protocol/SetScorePacket.php index f0a912dee..9caa3e04e 100644 --- a/src/pocketmine/network/mcpe/protocol/SetScorePacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetScorePacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include use pocketmine\network\BadPacketException; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\ScorePacketEntry; use function count; @@ -89,7 +89,7 @@ class SetScorePacket extends DataPacket implements ClientboundPacket{ } } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleSetScore($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/SetScoreboardIdentityPacket.php b/src/pocketmine/network/mcpe/protocol/SetScoreboardIdentityPacket.php index 9a5f7f219..2d8a39961 100644 --- a/src/pocketmine/network/mcpe/protocol/SetScoreboardIdentityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetScoreboardIdentityPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\ScoreboardIdentityPacketEntry; use function count; @@ -64,7 +64,7 @@ class SetScoreboardIdentityPacket extends DataPacket implements ClientboundPacke } } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleSetScoreboardIdentity($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/SetSpawnPositionPacket.php b/src/pocketmine/network/mcpe/protocol/SetSpawnPositionPacket.php index 8c1231cdf..41b2aeaf3 100644 --- a/src/pocketmine/network/mcpe/protocol/SetSpawnPositionPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetSpawnPositionPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class SetSpawnPositionPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::SET_SPAWN_POSITION_PACKET; @@ -72,7 +72,7 @@ class SetSpawnPositionPacket extends DataPacket implements ClientboundPacket{ $this->putBool($this->spawnForced); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleSetSpawnPosition($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/SetTimePacket.php b/src/pocketmine/network/mcpe/protocol/SetTimePacket.php index 80acfeebb..afc7cd2dc 100644 --- a/src/pocketmine/network/mcpe/protocol/SetTimePacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetTimePacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class SetTimePacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::SET_TIME_PACKET; @@ -47,7 +47,7 @@ class SetTimePacket extends DataPacket implements ClientboundPacket{ $this->putVarInt($this->time); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleSetTime($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/SetTitlePacket.php b/src/pocketmine/network/mcpe/protocol/SetTitlePacket.php index d9227b8ef..f6afe5b6d 100644 --- a/src/pocketmine/network/mcpe/protocol/SetTitlePacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetTitlePacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class SetTitlePacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::SET_TITLE_PACKET; @@ -66,7 +66,7 @@ class SetTitlePacket extends DataPacket implements ClientboundPacket{ $this->putVarInt($this->fadeOutTime); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleSetTitle($this); } diff --git a/src/pocketmine/network/mcpe/protocol/ShowCreditsPacket.php b/src/pocketmine/network/mcpe/protocol/ShowCreditsPacket.php index b74e92ac2..959f88c8b 100644 --- a/src/pocketmine/network/mcpe/protocol/ShowCreditsPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ShowCreditsPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class ShowCreditsPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::SHOW_CREDITS_PACKET; @@ -50,7 +50,7 @@ class ShowCreditsPacket extends DataPacket implements ClientboundPacket, Serverb $this->putVarInt($this->status); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleShowCredits($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ShowProfilePacket.php b/src/pocketmine/network/mcpe/protocol/ShowProfilePacket.php index b527e1c17..e9e4a900c 100644 --- a/src/pocketmine/network/mcpe/protocol/ShowProfilePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ShowProfilePacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class ShowProfilePacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::SHOW_PROFILE_PACKET; @@ -41,7 +41,7 @@ class ShowProfilePacket extends DataPacket implements ClientboundPacket{ $this->putString($this->xuid); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleShowProfile($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/ShowStoreOfferPacket.php b/src/pocketmine/network/mcpe/protocol/ShowStoreOfferPacket.php index 2ba88fe2e..7cf83dc08 100644 --- a/src/pocketmine/network/mcpe/protocol/ShowStoreOfferPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ShowStoreOfferPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class ShowStoreOfferPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::SHOW_STORE_OFFER_PACKET; @@ -45,7 +45,7 @@ class ShowStoreOfferPacket extends DataPacket implements ClientboundPacket{ $this->putBool($this->showAll); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleShowStoreOffer($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/SimpleEventPacket.php b/src/pocketmine/network/mcpe/protocol/SimpleEventPacket.php index d801f0a4c..94a43dac2 100644 --- a/src/pocketmine/network/mcpe/protocol/SimpleEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SimpleEventPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class SimpleEventPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::SIMPLE_EVENT_PACKET; @@ -44,7 +44,7 @@ class SimpleEventPacket extends DataPacket implements ClientboundPacket, Serverb $this->putLShort($this->eventType); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleSimpleEvent($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/SpawnExperienceOrbPacket.php b/src/pocketmine/network/mcpe/protocol/SpawnExperienceOrbPacket.php index 5a8983806..c7dcd25fb 100644 --- a/src/pocketmine/network/mcpe/protocol/SpawnExperienceOrbPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SpawnExperienceOrbPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\math\Vector3; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class SpawnExperienceOrbPacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::SPAWN_EXPERIENCE_ORB_PACKET; @@ -47,7 +47,7 @@ class SpawnExperienceOrbPacket extends DataPacket implements ServerboundPacket{ $this->putVarInt($this->amount); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleSpawnExperienceOrb($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/SpawnParticleEffectPacket.php b/src/pocketmine/network/mcpe/protocol/SpawnParticleEffectPacket.php index 7f5470582..36374e519 100644 --- a/src/pocketmine/network/mcpe/protocol/SpawnParticleEffectPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SpawnParticleEffectPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include use pocketmine\math\Vector3; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\DimensionIds; class SpawnParticleEffectPacket extends DataPacket implements ClientboundPacket{ @@ -55,7 +55,7 @@ class SpawnParticleEffectPacket extends DataPacket implements ClientboundPacket{ $this->putString($this->particleName); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleSpawnParticleEffect($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/StartGamePacket.php b/src/pocketmine/network/mcpe/protocol/StartGamePacket.php index 8f0ab85e9..c4bccc88e 100644 --- a/src/pocketmine/network/mcpe/protocol/StartGamePacket.php +++ b/src/pocketmine/network/mcpe/protocol/StartGamePacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\math\Vector3; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\NetworkBinaryStream; use pocketmine\network\mcpe\protocol\types\PlayerPermissions; use pocketmine\network\mcpe\protocol\types\RuntimeBlockMapping; @@ -277,7 +277,7 @@ class StartGamePacket extends DataPacket implements ClientboundPacket{ return $stream->getBuffer(); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleStartGame($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/StopSoundPacket.php b/src/pocketmine/network/mcpe/protocol/StopSoundPacket.php index 117261386..83d44d806 100644 --- a/src/pocketmine/network/mcpe/protocol/StopSoundPacket.php +++ b/src/pocketmine/network/mcpe/protocol/StopSoundPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class StopSoundPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::STOP_SOUND_PACKET; @@ -47,7 +47,7 @@ class StopSoundPacket extends DataPacket implements ClientboundPacket{ $this->putBool($this->stopAll); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleStopSound($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/StructureBlockUpdatePacket.php b/src/pocketmine/network/mcpe/protocol/StructureBlockUpdatePacket.php index 4af7f8c78..422ad3a43 100644 --- a/src/pocketmine/network/mcpe/protocol/StructureBlockUpdatePacket.php +++ b/src/pocketmine/network/mcpe/protocol/StructureBlockUpdatePacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class StructureBlockUpdatePacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::STRUCTURE_BLOCK_UPDATE_PACKET; @@ -38,7 +38,7 @@ class StructureBlockUpdatePacket extends DataPacket implements ServerboundPacket //TODO } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleStructureBlockUpdate($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/SubClientLoginPacket.php b/src/pocketmine/network/mcpe/protocol/SubClientLoginPacket.php index 834c40682..8be6b0e98 100644 --- a/src/pocketmine/network/mcpe/protocol/SubClientLoginPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SubClientLoginPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class SubClientLoginPacket extends DataPacket implements ServerboundPacket{ public const NETWORK_ID = ProtocolInfo::SUB_CLIENT_LOGIN_PACKET; @@ -41,7 +41,7 @@ class SubClientLoginPacket extends DataPacket implements ServerboundPacket{ $this->putString($this->connectionRequestData); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleSubClientLogin($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/TakeItemEntityPacket.php b/src/pocketmine/network/mcpe/protocol/TakeItemEntityPacket.php index 549ee4d28..bc1ff36ae 100644 --- a/src/pocketmine/network/mcpe/protocol/TakeItemEntityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/TakeItemEntityPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class TakeItemEntityPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::TAKE_ITEM_ENTITY_PACKET; @@ -53,7 +53,7 @@ class TakeItemEntityPacket extends DataPacket implements ClientboundPacket{ $this->putEntityRuntimeId($this->eid); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleTakeItemEntity($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/TextPacket.php b/src/pocketmine/network/mcpe/protocol/TextPacket.php index b0f24fc97..de646852d 100644 --- a/src/pocketmine/network/mcpe/protocol/TextPacket.php +++ b/src/pocketmine/network/mcpe/protocol/TextPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use function count; class TextPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ @@ -178,7 +178,7 @@ class TextPacket extends DataPacket implements ClientboundPacket, ServerboundPac $this->putString($this->platformChatId); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleText($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/TransferPacket.php b/src/pocketmine/network/mcpe/protocol/TransferPacket.php index c1cadb556..58170bd86 100644 --- a/src/pocketmine/network/mcpe/protocol/TransferPacket.php +++ b/src/pocketmine/network/mcpe/protocol/TransferPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class TransferPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::TRANSFER_PACKET; @@ -52,7 +52,7 @@ class TransferPacket extends DataPacket implements ClientboundPacket{ $this->putLShort($this->port); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleTransfer($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/UnknownPacket.php b/src/pocketmine/network/mcpe/protocol/UnknownPacket.php index a49d317bd..129a29f84 100644 --- a/src/pocketmine/network/mcpe/protocol/UnknownPacket.php +++ b/src/pocketmine/network/mcpe/protocol/UnknownPacket.php @@ -25,7 +25,7 @@ declare(strict_types=1); namespace pocketmine\network\mcpe\protocol; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use function ord; use function strlen; @@ -62,7 +62,7 @@ class UnknownPacket extends DataPacket{ $this->put($this->payload); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return false; } } diff --git a/src/pocketmine/network/mcpe/protocol/UpdateAttributesPacket.php b/src/pocketmine/network/mcpe/protocol/UpdateAttributesPacket.php index 0b1fffbef..576671903 100644 --- a/src/pocketmine/network/mcpe/protocol/UpdateAttributesPacket.php +++ b/src/pocketmine/network/mcpe/protocol/UpdateAttributesPacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\entity\Attribute; -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use function array_values; class UpdateAttributesPacket extends DataPacket implements ClientboundPacket{ @@ -61,7 +61,7 @@ class UpdateAttributesPacket extends DataPacket implements ClientboundPacket{ $this->putAttributeList(...array_values($this->entries)); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleUpdateAttributes($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/UpdateBlockPacket.php b/src/pocketmine/network/mcpe/protocol/UpdateBlockPacket.php index dbad6185f..306d0ad25 100644 --- a/src/pocketmine/network/mcpe/protocol/UpdateBlockPacket.php +++ b/src/pocketmine/network/mcpe/protocol/UpdateBlockPacket.php @@ -26,7 +26,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class UpdateBlockPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::UPDATE_BLOCK_PACKET; @@ -73,7 +73,7 @@ class UpdateBlockPacket extends DataPacket implements ClientboundPacket{ $this->putUnsignedVarInt($this->dataLayerId); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleUpdateBlock($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/UpdateBlockSyncedPacket.php b/src/pocketmine/network/mcpe/protocol/UpdateBlockSyncedPacket.php index 0ac93c3bf..f5c6fdc22 100644 --- a/src/pocketmine/network/mcpe/protocol/UpdateBlockSyncedPacket.php +++ b/src/pocketmine/network/mcpe/protocol/UpdateBlockSyncedPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class UpdateBlockSyncedPacket extends UpdateBlockPacket{ public const NETWORK_ID = ProtocolInfo::UPDATE_BLOCK_SYNCED_PACKET; @@ -47,7 +47,7 @@ class UpdateBlockSyncedPacket extends UpdateBlockPacket{ $this->putUnsignedVarLong($this->uvarint64_2); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleUpdateBlockSynced($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/UpdateEquipPacket.php b/src/pocketmine/network/mcpe/protocol/UpdateEquipPacket.php index 9cca5632c..594a50516 100644 --- a/src/pocketmine/network/mcpe/protocol/UpdateEquipPacket.php +++ b/src/pocketmine/network/mcpe/protocol/UpdateEquipPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class UpdateEquipPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::UPDATE_EQUIP_PACKET; @@ -57,7 +57,7 @@ class UpdateEquipPacket extends DataPacket implements ClientboundPacket{ $this->put($this->namedtag); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleUpdateEquip($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/UpdateSoftEnumPacket.php b/src/pocketmine/network/mcpe/protocol/UpdateSoftEnumPacket.php index c1bee5e4e..d20f186d7 100644 --- a/src/pocketmine/network/mcpe/protocol/UpdateSoftEnumPacket.php +++ b/src/pocketmine/network/mcpe/protocol/UpdateSoftEnumPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use function count; class UpdateSoftEnumPacket extends DataPacket implements ClientboundPacket{ @@ -59,7 +59,7 @@ class UpdateSoftEnumPacket extends DataPacket implements ClientboundPacket{ $this->putByte($this->type); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleUpdateSoftEnum($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/UpdateTradePacket.php b/src/pocketmine/network/mcpe/protocol/UpdateTradePacket.php index fecbd45ff..28c65d259 100644 --- a/src/pocketmine/network/mcpe/protocol/UpdateTradePacket.php +++ b/src/pocketmine/network/mcpe/protocol/UpdateTradePacket.php @@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\WindowTypes; class UpdateTradePacket extends DataPacket implements ClientboundPacket{ @@ -82,7 +82,7 @@ class UpdateTradePacket extends DataPacket implements ClientboundPacket{ $this->put($this->offers); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleUpdateTrade($this); } } diff --git a/src/pocketmine/network/mcpe/protocol/VideoStreamConnectPacket.php b/src/pocketmine/network/mcpe/protocol/VideoStreamConnectPacket.php index b0b817c4d..4059579ee 100644 --- a/src/pocketmine/network/mcpe/protocol/VideoStreamConnectPacket.php +++ b/src/pocketmine/network/mcpe/protocol/VideoStreamConnectPacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\protocol; #include -use pocketmine\network\mcpe\handler\SessionHandler; +use pocketmine\network\mcpe\handler\PacketHandler; class VideoStreamConnectPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::VIDEO_STREAM_CONNECT_PACKET; @@ -52,7 +52,7 @@ class VideoStreamConnectPacket extends DataPacket implements ClientboundPacket{ $this->putByte($this->action); } - public function handle(SessionHandler $handler) : bool{ + public function handle(PacketHandler $handler) : bool{ return $handler->handleVideoStreamConnect($this); } }