From a883c35fd0a41db4bdec7e08eae7f58a5115c5c3 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 13 Jul 2019 18:15:14 +0100 Subject: [PATCH] clean up yesterday's mess --- src/pocketmine/Player.php | 4 ++-- src/pocketmine/entity/Entity.php | 2 +- src/pocketmine/entity/Human.php | 2 +- src/pocketmine/network/mcpe/NetworkBinaryStream.php | 1 - src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php | 6 +++--- .../network/mcpe/protocol/ClientCacheMissResponsePacket.php | 2 +- src/pocketmine/network/mcpe/protocol/LevelChunkPacket.php | 2 +- src/pocketmine/network/mcpe/protocol/StartGamePacket.php | 5 ++--- 8 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 574128367..beb7ab3c0 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -99,10 +99,11 @@ use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\DoubleTag; use pocketmine\nbt\tag\ListTag; use pocketmine\network\mcpe\PlayerNetworkSessionAdapter; +use pocketmine\network\mcpe\protocol\ActorEventPacket; use pocketmine\network\mcpe\protocol\AdventureSettingsPacket; use pocketmine\network\mcpe\protocol\AnimatePacket; -use pocketmine\network\mcpe\protocol\AvailableCommandsPacket; use pocketmine\network\mcpe\protocol\AvailableActorIdentifiersPacket; +use pocketmine\network\mcpe\protocol\AvailableCommandsPacket; use pocketmine\network\mcpe\protocol\BatchPacket; use pocketmine\network\mcpe\protocol\BiomeDefinitionListPacket; use pocketmine\network\mcpe\protocol\BlockActorDataPacket; @@ -112,7 +113,6 @@ use pocketmine\network\mcpe\protocol\ChunkRadiusUpdatedPacket; use pocketmine\network\mcpe\protocol\ContainerClosePacket; use pocketmine\network\mcpe\protocol\DataPacket; use pocketmine\network\mcpe\protocol\DisconnectPacket; -use pocketmine\network\mcpe\protocol\ActorEventPacket; use pocketmine\network\mcpe\protocol\InteractPacket; use pocketmine\network\mcpe\protocol\InventoryTransactionPacket; use pocketmine\network\mcpe\protocol\ItemFrameDropItemPacket; diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php index 3941f5b95..ae9fb8d8b 100644 --- a/src/pocketmine/entity/Entity.php +++ b/src/pocketmine/entity/Entity.php @@ -62,8 +62,8 @@ use pocketmine\nbt\tag\DoubleTag; use pocketmine\nbt\tag\FloatTag; use pocketmine\nbt\tag\ListTag; use pocketmine\nbt\tag\StringTag; -use pocketmine\network\mcpe\protocol\AddActorPacket; use pocketmine\network\mcpe\protocol\ActorEventPacket; +use pocketmine\network\mcpe\protocol\AddActorPacket; use pocketmine\network\mcpe\protocol\MoveActorAbsolutePacket; use pocketmine\network\mcpe\protocol\RemoveActorPacket; use pocketmine\network\mcpe\protocol\SetActorDataPacket; diff --git a/src/pocketmine/entity/Human.php b/src/pocketmine/entity/Human.php index 0bece64e6..b5fb32263 100644 --- a/src/pocketmine/entity/Human.php +++ b/src/pocketmine/entity/Human.php @@ -46,8 +46,8 @@ use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\IntTag; use pocketmine\nbt\tag\ListTag; use pocketmine\nbt\tag\StringTag; -use pocketmine\network\mcpe\protocol\AddPlayerPacket; use pocketmine\network\mcpe\protocol\ActorEventPacket; +use pocketmine\network\mcpe\protocol\AddPlayerPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelSoundEventPacket; use pocketmine\network\mcpe\protocol\PlayerListPacket; diff --git a/src/pocketmine/network/mcpe/NetworkBinaryStream.php b/src/pocketmine/network/mcpe/NetworkBinaryStream.php index 9d4edd400..cf71dfaf1 100644 --- a/src/pocketmine/network/mcpe/NetworkBinaryStream.php +++ b/src/pocketmine/network/mcpe/NetworkBinaryStream.php @@ -41,7 +41,6 @@ use pocketmine\utils\BinaryStream; use pocketmine\utils\UUID; use function count; use function strlen; -use function var_dump; class NetworkBinaryStream extends BinaryStream{ diff --git a/src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php b/src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php index 44ca2ef60..a3c8f9d65 100644 --- a/src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php +++ b/src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php @@ -25,6 +25,9 @@ namespace pocketmine\network\mcpe; use pocketmine\event\server\DataPacketReceiveEvent; +use pocketmine\network\mcpe\protocol\ActorEventPacket; +use pocketmine\network\mcpe\protocol\ActorFallPacket; +use pocketmine\network\mcpe\protocol\ActorPickRequestPacket; use pocketmine\network\mcpe\protocol\AdventureSettingsPacket; use pocketmine\network\mcpe\protocol\AnimatePacket; use pocketmine\network\mcpe\protocol\BlockActorDataPacket; @@ -37,9 +40,6 @@ use pocketmine\network\mcpe\protocol\CommandRequestPacket; use pocketmine\network\mcpe\protocol\ContainerClosePacket; use pocketmine\network\mcpe\protocol\CraftingEventPacket; use pocketmine\network\mcpe\protocol\DataPacket; -use pocketmine\network\mcpe\protocol\ActorEventPacket; -use pocketmine\network\mcpe\protocol\ActorFallPacket; -use pocketmine\network\mcpe\protocol\ActorPickRequestPacket; use pocketmine\network\mcpe\protocol\InteractPacket; use pocketmine\network\mcpe\protocol\InventoryTransactionPacket; use pocketmine\network\mcpe\protocol\ItemFrameDropItemPacket; diff --git a/src/pocketmine/network/mcpe/protocol/ClientCacheMissResponsePacket.php b/src/pocketmine/network/mcpe/protocol/ClientCacheMissResponsePacket.php index ca1bc7f53..456f29419 100644 --- a/src/pocketmine/network/mcpe/protocol/ClientCacheMissResponsePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ClientCacheMissResponsePacket.php @@ -25,9 +25,9 @@ namespace pocketmine\network\mcpe\protocol; #include -use function count; use pocketmine\network\mcpe\NetworkSession; use pocketmine\network\mcpe\protocol\types\ChunkCacheBlob; +use function count; class ClientCacheMissResponsePacket extends DataPacket/* implements ClientboundPacket*/{ public const NETWORK_ID = ProtocolInfo::CLIENT_CACHE_MISS_RESPONSE_PACKET; diff --git a/src/pocketmine/network/mcpe/protocol/LevelChunkPacket.php b/src/pocketmine/network/mcpe/protocol/LevelChunkPacket.php index 6c2cbf74d..e1d79f2f6 100644 --- a/src/pocketmine/network/mcpe/protocol/LevelChunkPacket.php +++ b/src/pocketmine/network/mcpe/protocol/LevelChunkPacket.php @@ -25,8 +25,8 @@ namespace pocketmine\network\mcpe\protocol; #include -use function count; use pocketmine\network\mcpe\NetworkSession; +use function count; class LevelChunkPacket extends DataPacket/* implements ClientboundPacket*/{ public const NETWORK_ID = ProtocolInfo::LEVEL_CHUNK_PACKET; diff --git a/src/pocketmine/network/mcpe/protocol/StartGamePacket.php b/src/pocketmine/network/mcpe/protocol/StartGamePacket.php index e9a7f1003..557dee7ca 100644 --- a/src/pocketmine/network/mcpe/protocol/StartGamePacket.php +++ b/src/pocketmine/network/mcpe/protocol/StartGamePacket.php @@ -26,15 +26,14 @@ namespace pocketmine\network\mcpe\protocol; #include -use function file_get_contents; -use function json_decode; use pocketmine\math\Vector3; use pocketmine\network\mcpe\NetworkBinaryStream; use pocketmine\network\mcpe\NetworkSession; use pocketmine\network\mcpe\protocol\types\PlayerPermissions; use pocketmine\network\mcpe\protocol\types\RuntimeBlockMapping; use function count; -use pocketmine\network\mcpe\protocol\types\RuntimeItemMapping; +use function file_get_contents; +use function json_decode; use const pocketmine\RESOURCE_PATH; class StartGamePacket extends DataPacket{