From 6b61efcfc8fe2a4bd3cb6353b0626d918cca42d6 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 9 Dec 2019 19:49:21 +0000 Subject: [PATCH 1/5] remove unused imports --- src/pocketmine/Server.php | 1 - src/pocketmine/entity/object/FallingBlock.php | 1 - src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php | 1 - .../network/mcpe/protocol/AvailableActorIdentifiersPacket.php | 1 - src/pocketmine/network/mcpe/protocol/PlayerListPacket.php | 1 - .../network/mcpe/protocol/ResourcePackChunkDataPacket.php | 1 - src/pocketmine/network/mcpe/protocol/StartGamePacket.php | 2 -- src/pocketmine/network/mcpe/protocol/types/PlayerListEntry.php | 1 - .../network/mcpe/protocol/types/RuntimeBlockMapping.php | 2 -- 9 files changed, 11 deletions(-) diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index bcc068d7a..c2ea76c77 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -128,7 +128,6 @@ use function getmypid; use function getopt; use function gettype; use function implode; -use function ini_get; use function ini_set; use function is_array; use function is_bool; diff --git a/src/pocketmine/entity/object/FallingBlock.php b/src/pocketmine/entity/object/FallingBlock.php index 87e408d1f..c96723a61 100644 --- a/src/pocketmine/entity/object/FallingBlock.php +++ b/src/pocketmine/entity/object/FallingBlock.php @@ -34,7 +34,6 @@ use pocketmine\level\Position; use pocketmine\nbt\tag\ByteTag; use pocketmine\nbt\tag\IntTag; use function abs; -use function floor; use function get_class; class FallingBlock extends Entity{ diff --git a/src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php b/src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php index b064ae803..6b8297e75 100644 --- a/src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php +++ b/src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php @@ -67,7 +67,6 @@ use pocketmine\network\mcpe\protocol\ShowCreditsPacket; use pocketmine\network\mcpe\protocol\SpawnExperienceOrbPacket; use pocketmine\network\mcpe\protocol\TextPacket; use pocketmine\network\mcpe\protocol\types\SkinAdapterSingleton; -use pocketmine\network\mcpe\protocol\types\SkinData; use pocketmine\Player; use pocketmine\Server; use pocketmine\timings\Timings; diff --git a/src/pocketmine/network/mcpe/protocol/AvailableActorIdentifiersPacket.php b/src/pocketmine/network/mcpe/protocol/AvailableActorIdentifiersPacket.php index e1c3baea7..933b212f7 100644 --- a/src/pocketmine/network/mcpe/protocol/AvailableActorIdentifiersPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AvailableActorIdentifiersPacket.php @@ -26,7 +26,6 @@ namespace pocketmine\network\mcpe\protocol; #include use pocketmine\network\mcpe\NetworkSession; -use function base64_decode; use function file_get_contents; class AvailableActorIdentifiersPacket extends DataPacket{ diff --git a/src/pocketmine/network/mcpe/protocol/PlayerListPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerListPacket.php index f73abb254..b15f7b413 100644 --- a/src/pocketmine/network/mcpe/protocol/PlayerListPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayerListPacket.php @@ -27,7 +27,6 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; -use pocketmine\network\mcpe\protocol\types\SkinData; use pocketmine\network\mcpe\protocol\types\PlayerListEntry; use function count; diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePackChunkDataPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackChunkDataPacket.php index 07d34affd..500a878c9 100644 --- a/src/pocketmine/network/mcpe/protocol/ResourcePackChunkDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ResourcePackChunkDataPacket.php @@ -28,7 +28,6 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; -use function strlen; class ResourcePackChunkDataPacket extends DataPacket{ public const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_CHUNK_DATA_PACKET; diff --git a/src/pocketmine/network/mcpe/protocol/StartGamePacket.php b/src/pocketmine/network/mcpe/protocol/StartGamePacket.php index 8d3611c8f..b3273ddd0 100644 --- a/src/pocketmine/network/mcpe/protocol/StartGamePacket.php +++ b/src/pocketmine/network/mcpe/protocol/StartGamePacket.php @@ -28,9 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\math\Vector3; use pocketmine\nbt\NetworkLittleEndianNBTStream; -use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\ListTag; -use pocketmine\nbt\tag\StringTag; use pocketmine\network\mcpe\NetworkBinaryStream; use pocketmine\network\mcpe\NetworkSession; use pocketmine\network\mcpe\protocol\types\PlayerPermissions; diff --git a/src/pocketmine/network/mcpe/protocol/types/PlayerListEntry.php b/src/pocketmine/network/mcpe/protocol/types/PlayerListEntry.php index ee46417a9..1393bf48b 100644 --- a/src/pocketmine/network/mcpe/protocol/types/PlayerListEntry.php +++ b/src/pocketmine/network/mcpe/protocol/types/PlayerListEntry.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\network\mcpe\protocol\types; -use pocketmine\entity\Skin; use pocketmine\utils\UUID; class PlayerListEntry{ diff --git a/src/pocketmine/network/mcpe/protocol/types/RuntimeBlockMapping.php b/src/pocketmine/network/mcpe/protocol/types/RuntimeBlockMapping.php index 5fedc28b6..5a1bd7141 100644 --- a/src/pocketmine/network/mcpe/protocol/types/RuntimeBlockMapping.php +++ b/src/pocketmine/network/mcpe/protocol/types/RuntimeBlockMapping.php @@ -28,8 +28,6 @@ use pocketmine\nbt\NBT; use pocketmine\nbt\NetworkLittleEndianNBTStream; use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\ListTag; -use pocketmine\nbt\tag\StringTag; -use pocketmine\utils\BinaryDataException; use function file_get_contents; use function getmypid; use function json_decode; From 50a4c42f3f20a432aca74e0f79375e63e8eae3af Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 9 Dec 2019 19:53:32 +0000 Subject: [PATCH 2/5] NetworkBinaryStream: fix misplaced import --- src/pocketmine/network/mcpe/NetworkBinaryStream.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/network/mcpe/NetworkBinaryStream.php b/src/pocketmine/network/mcpe/NetworkBinaryStream.php index 0b6b8a097..b8cd85838 100644 --- a/src/pocketmine/network/mcpe/NetworkBinaryStream.php +++ b/src/pocketmine/network/mcpe/NetworkBinaryStream.php @@ -38,9 +38,9 @@ use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\IntTag; use pocketmine\network\mcpe\protocol\types\CommandOriginData; use pocketmine\network\mcpe\protocol\types\EntityLink; +use pocketmine\network\mcpe\protocol\types\SkinAnimation; use pocketmine\network\mcpe\protocol\types\SkinData; use pocketmine\network\mcpe\protocol\types\SkinImage; -use pocketmine\network\mcpe\protocol\types\SkinAnimation; use pocketmine\network\mcpe\protocol\types\StructureSettings; use pocketmine\utils\BinaryStream; use pocketmine\utils\UUID; From f00c69c5130eb40ddf1926398dbf01848286a1e9 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 9 Dec 2019 20:13:02 +0000 Subject: [PATCH 3/5] added missing function imports --- src/pocketmine/network/mcpe/VerifyLoginTask.php | 1 + .../network/mcpe/protocol/AvailableCommandsPacket.php | 1 + .../network/mcpe/protocol/types/LegacySkinAdapter.php | 4 ++++ src/pocketmine/network/mcpe/protocol/types/SkinImage.php | 1 + 4 files changed, 7 insertions(+) diff --git a/src/pocketmine/network/mcpe/VerifyLoginTask.php b/src/pocketmine/network/mcpe/VerifyLoginTask.php index b56f8efe8..620cdae08 100644 --- a/src/pocketmine/network/mcpe/VerifyLoginTask.php +++ b/src/pocketmine/network/mcpe/VerifyLoginTask.php @@ -37,6 +37,7 @@ use function openssl_verify; use function ord; use function str_split; use function strlen; +use function strtr; use function time; use function wordwrap; use const OPENSSL_ALGO_SHA384; diff --git a/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php b/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php index d4ef733e9..67c2e691a 100644 --- a/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php @@ -31,6 +31,7 @@ use pocketmine\network\mcpe\protocol\types\CommandEnum; use pocketmine\network\mcpe\protocol\types\CommandEnumConstraint; use pocketmine\network\mcpe\protocol\types\CommandParameter; use pocketmine\utils\BinaryDataException; +use function array_search; use function count; use function dechex; diff --git a/src/pocketmine/network/mcpe/protocol/types/LegacySkinAdapter.php b/src/pocketmine/network/mcpe/protocol/types/LegacySkinAdapter.php index 639e1adcf..e36a9493b 100644 --- a/src/pocketmine/network/mcpe/protocol/types/LegacySkinAdapter.php +++ b/src/pocketmine/network/mcpe/protocol/types/LegacySkinAdapter.php @@ -27,6 +27,10 @@ use pocketmine\entity\Skin; use function is_array; use function is_string; +use function json_decode; +use function json_encode; +use function random_bytes; +use function str_repeat; class LegacySkinAdapter implements SkinAdapter{ diff --git a/src/pocketmine/network/mcpe/protocol/types/SkinImage.php b/src/pocketmine/network/mcpe/protocol/types/SkinImage.php index 0c0dea6df..a588184db 100644 --- a/src/pocketmine/network/mcpe/protocol/types/SkinImage.php +++ b/src/pocketmine/network/mcpe/protocol/types/SkinImage.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace pocketmine\network\mcpe\protocol\types; +use function strlen; class SkinImage{ From 7e98aa1497e50dd4e1efd9ff2e34f337ce739023 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 9 Dec 2019 20:28:02 +0000 Subject: [PATCH 4/5] leveldb: remove usage of multi-import statement this doesn't conform to the code style. --- src/pocketmine/level/format/io/leveldb/LevelDB.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pocketmine/level/format/io/leveldb/LevelDB.php b/src/pocketmine/level/format/io/leveldb/LevelDB.php index 6c3e5ec7d..10229f49c 100644 --- a/src/pocketmine/level/format/io/leveldb/LevelDB.php +++ b/src/pocketmine/level/format/io/leveldb/LevelDB.php @@ -33,7 +33,12 @@ use pocketmine\level\generator\GeneratorManager; use pocketmine\level\Level; use pocketmine\level\LevelException; use pocketmine\nbt\LittleEndianNBTStream; -use pocketmine\nbt\tag\{ByteTag, CompoundTag, FloatTag, IntTag, LongTag, StringTag}; +use pocketmine\nbt\tag\ByteTag; +use pocketmine\nbt\tag\CompoundTag; +use pocketmine\nbt\tag\FloatTag; +use pocketmine\nbt\tag\IntTag; +use pocketmine\nbt\tag\LongTag; +use pocketmine\nbt\tag\StringTag; use pocketmine\network\mcpe\protocol\ProtocolInfo; use pocketmine\utils\Binary; use pocketmine\utils\BinaryStream; From 73d4ff6b52189c0a15ea7a2c9bd57af178d234f2 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 9 Dec 2019 21:16:35 +0000 Subject: [PATCH 5/5] more missed function imports --- src/pocketmine/Server.php | 1 + src/pocketmine/plugin/PluginDescription.php | 1 + src/pocketmine/plugin/PluginManager.php | 1 + src/pocketmine/resourcepacks/ZippedResourcePack.php | 1 + src/pocketmine/utils/Utils.php | 3 +++ 5 files changed, 7 insertions(+) diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index c2ea76c77..a1e2e6821 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -114,6 +114,7 @@ use function asort; use function assert; use function base64_encode; use function class_exists; +use function cli_set_process_title; use function count; use function define; use function explode; diff --git a/src/pocketmine/plugin/PluginDescription.php b/src/pocketmine/plugin/PluginDescription.php index 7cdd1e95a..153c37752 100644 --- a/src/pocketmine/plugin/PluginDescription.php +++ b/src/pocketmine/plugin/PluginDescription.php @@ -38,6 +38,7 @@ use function strlen; use function strtoupper; use function substr; use function version_compare; +use function yaml_parse; class PluginDescription{ private $map; diff --git a/src/pocketmine/plugin/PluginManager.php b/src/pocketmine/plugin/PluginManager.php index 0c2abdb27..48e8e12a1 100644 --- a/src/pocketmine/plugin/PluginManager.php +++ b/src/pocketmine/plugin/PluginManager.php @@ -40,6 +40,7 @@ use pocketmine\timings\TimingsHandler; use pocketmine\utils\Utils; use function array_intersect; use function array_map; +use function array_merge; use function array_pad; use function class_exists; use function count; diff --git a/src/pocketmine/resourcepacks/ZippedResourcePack.php b/src/pocketmine/resourcepacks/ZippedResourcePack.php index 0364ccd37..6a12ad12b 100644 --- a/src/pocketmine/resourcepacks/ZippedResourcePack.php +++ b/src/pocketmine/resourcepacks/ZippedResourcePack.php @@ -34,6 +34,7 @@ use function filesize; use function fopen; use function fread; use function fseek; +use function gettype; use function hash_file; use function implode; diff --git a/src/pocketmine/utils/Utils.php b/src/pocketmine/utils/Utils.php index 5f388c592..c9e36d72c 100644 --- a/src/pocketmine/utils/Utils.php +++ b/src/pocketmine/utils/Utils.php @@ -58,6 +58,7 @@ use function is_object; use function is_readable; use function is_string; use function json_decode; +use function ltrim; use function memory_get_usage; use function ob_end_clean; use function ob_get_contents; @@ -72,6 +73,7 @@ use function preg_match_all; use function preg_replace; use function proc_close; use function proc_open; +use function rtrim; use function sha1; use function spl_object_hash; use function str_pad; @@ -82,6 +84,7 @@ use function stripos; use function strlen; use function strpos; use function strtolower; +use function strtr; use function substr; use function sys_get_temp_dir; use function trim;