From f9a587d40e8f425846317b38ac302c4563d75454 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Tue, 28 Apr 2020 17:27:38 +0100 Subject: [PATCH] imports cleanup --- src/Server.php | 3 +-- src/crafting/CraftingManager.php | 2 +- src/entity/Human.php | 2 +- src/item/ChorusFruit.php | 1 - src/item/FlintSteel.php | 1 - src/network/mcpe/convert/RuntimeBlockMapping.php | 2 +- src/network/mcpe/handler/InGamePacketHandler.php | 2 +- src/plugin/PluginManager.php | 1 + src/scheduler/AsyncTask.php | 1 + src/stats/SendUsageTask.php | 1 + src/thread/Thread.php | 1 + src/thread/Worker.php | 1 + src/utils/Internet.php | 1 + src/utils/Terminal.php | 1 + src/utils/TextFormat.php | 2 ++ src/utils/Timezone.php | 2 -- src/utils/Utils.php | 1 - 17 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/Server.php b/src/Server.php index 3e4e71397..71012b4e1 100644 --- a/src/Server.php +++ b/src/Server.php @@ -52,9 +52,9 @@ use pocketmine\network\mcpe\compression\Compressor; use pocketmine\network\mcpe\compression\ZlibCompressor; use pocketmine\network\mcpe\encryption\NetworkCipher; use pocketmine\network\mcpe\NetworkSession; -use pocketmine\network\mcpe\protocol\serializer\PacketBatch; use pocketmine\network\mcpe\protocol\ClientboundPacket; use pocketmine\network\mcpe\protocol\ProtocolInfo; +use pocketmine\network\mcpe\protocol\serializer\PacketBatch; use pocketmine\network\mcpe\raklib\RakLibInterface; use pocketmine\network\Network; use pocketmine\network\query\QueryHandler; @@ -113,7 +113,6 @@ use function get_class; use function getmypid; use function getopt; use function implode; -use function ini_get; use function ini_set; use function is_a; use function is_array; diff --git a/src/crafting/CraftingManager.php b/src/crafting/CraftingManager.php index 8fec8b922..c97dc10f0 100644 --- a/src/crafting/CraftingManager.php +++ b/src/crafting/CraftingManager.php @@ -27,8 +27,8 @@ use pocketmine\item\Item; use pocketmine\network\mcpe\compression\CompressBatchPromise; use pocketmine\network\mcpe\compression\Compressor; use pocketmine\network\mcpe\convert\TypeConverter; -use pocketmine\network\mcpe\protocol\serializer\PacketBatch; use pocketmine\network\mcpe\protocol\CraftingDataPacket; +use pocketmine\network\mcpe\protocol\serializer\PacketBatch; use pocketmine\network\mcpe\protocol\types\inventory\ItemStack; use pocketmine\network\mcpe\protocol\types\recipe\FurnaceRecipe as ProtocolFurnaceRecipe; use pocketmine\network\mcpe\protocol\types\recipe\RecipeIngredient; diff --git a/src/entity/Human.php b/src/entity/Human.php index 54ef3de9c..3b99ba8da 100644 --- a/src/entity/Human.php +++ b/src/entity/Human.php @@ -23,12 +23,12 @@ declare(strict_types=1); namespace pocketmine\entity; +use pocketmine\block\inventory\EnderChestInventory; use pocketmine\entity\effect\EffectInstance; use pocketmine\entity\effect\VanillaEffects; use pocketmine\entity\projectile\ProjectileSource; use pocketmine\event\entity\EntityDamageEvent; use pocketmine\event\player\PlayerExhaustEvent; -use pocketmine\block\inventory\EnderChestInventory; use pocketmine\inventory\InventoryHolder; use pocketmine\inventory\PlayerInventory; use pocketmine\item\Consumable; diff --git a/src/item/ChorusFruit.php b/src/item/ChorusFruit.php index ac1e10188..8ba82d281 100644 --- a/src/item/ChorusFruit.php +++ b/src/item/ChorusFruit.php @@ -27,7 +27,6 @@ use pocketmine\block\Liquid; use pocketmine\entity\Living; use pocketmine\math\Vector3; use pocketmine\world\sound\EndermanTeleportSound; -use function assert; use function min; use function mt_rand; diff --git a/src/item/FlintSteel.php b/src/item/FlintSteel.php index def28d56e..0ddac5cc2 100644 --- a/src/item/FlintSteel.php +++ b/src/item/FlintSteel.php @@ -29,7 +29,6 @@ use pocketmine\block\VanillaBlocks; use pocketmine\math\Vector3; use pocketmine\player\Player; use pocketmine\world\sound\FlintSteelSound; -use function assert; class FlintSteel extends Tool{ diff --git a/src/network/mcpe/convert/RuntimeBlockMapping.php b/src/network/mcpe/convert/RuntimeBlockMapping.php index 83ff78d21..0f0445251 100644 --- a/src/network/mcpe/convert/RuntimeBlockMapping.php +++ b/src/network/mcpe/convert/RuntimeBlockMapping.php @@ -28,8 +28,8 @@ use pocketmine\data\bedrock\LegacyBlockIdToStringIdMap; use pocketmine\nbt\NBT; use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\ListTag; -use pocketmine\network\mcpe\protocol\types\CacheableNbt; use pocketmine\network\mcpe\protocol\serializer\NetworkNbtSerializer; +use pocketmine\network\mcpe\protocol\types\CacheableNbt; use pocketmine\utils\SingletonTrait; use function file_get_contents; use function getmypid; diff --git a/src/network/mcpe/handler/InGamePacketHandler.php b/src/network/mcpe/handler/InGamePacketHandler.php index 766ff5136..29eee96ae 100644 --- a/src/network/mcpe/handler/InGamePacketHandler.php +++ b/src/network/mcpe/handler/InGamePacketHandler.php @@ -71,6 +71,7 @@ use pocketmine\network\mcpe\protocol\PlayerHotbarPacket; use pocketmine\network\mcpe\protocol\PlayerInputPacket; use pocketmine\network\mcpe\protocol\PlayerSkinPacket; use pocketmine\network\mcpe\protocol\RequestChunkRadiusPacket; +use pocketmine\network\mcpe\protocol\serializer\NetworkNbtSerializer; use pocketmine\network\mcpe\protocol\ServerSettingsRequestPacket; use pocketmine\network\mcpe\protocol\SetPlayerGameTypePacket; use pocketmine\network\mcpe\protocol\ShowCreditsPacket; @@ -84,7 +85,6 @@ use pocketmine\network\mcpe\protocol\types\inventory\NormalTransactionData; use pocketmine\network\mcpe\protocol\types\inventory\ReleaseItemTransactionData; use pocketmine\network\mcpe\protocol\types\inventory\UseItemOnEntityTransactionData; use pocketmine\network\mcpe\protocol\types\inventory\UseItemTransactionData; -use pocketmine\network\mcpe\protocol\serializer\NetworkNbtSerializer; use pocketmine\player\Player; use function array_push; use function base64_encode; diff --git a/src/plugin/PluginManager.php b/src/plugin/PluginManager.php index 1d939bc3d..ea193ed20 100644 --- a/src/plugin/PluginManager.php +++ b/src/plugin/PluginManager.php @@ -51,6 +51,7 @@ use function in_array; use function is_a; use function is_array; use function is_dir; +use function is_string; use function is_subclass_of; use function iterator_to_array; use function mkdir; diff --git a/src/scheduler/AsyncTask.php b/src/scheduler/AsyncTask.php index 89a410539..29ff9a3bd 100644 --- a/src/scheduler/AsyncTask.php +++ b/src/scheduler/AsyncTask.php @@ -25,6 +25,7 @@ namespace pocketmine\scheduler; use pocketmine\utils\AssumptionFailedError; use function is_scalar; +use function is_string; use function serialize; use function spl_object_id; use function unserialize; diff --git a/src/stats/SendUsageTask.php b/src/stats/SendUsageTask.php index 2d9cf557e..afa69ed6b 100644 --- a/src/stats/SendUsageTask.php +++ b/src/stats/SendUsageTask.php @@ -37,6 +37,7 @@ use function array_map; use function array_values; use function count; use function json_encode; +use function json_last_error_msg; use function md5; use function microtime; use function php_uname; diff --git a/src/thread/Thread.php b/src/thread/Thread.php index 26c2037b2..140dba225 100644 --- a/src/thread/Thread.php +++ b/src/thread/Thread.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace pocketmine\thread; + use const PTHREADS_INHERIT_ALL; /** diff --git a/src/thread/Worker.php b/src/thread/Worker.php index 1d473e95f..0874ad547 100644 --- a/src/thread/Worker.php +++ b/src/thread/Worker.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace pocketmine\thread; + use const PTHREADS_INHERIT_ALL; /** diff --git a/src/utils/Internet.php b/src/utils/Internet.php index ccdfad21f..1fba58924 100644 --- a/src/utils/Internet.php +++ b/src/utils/Internet.php @@ -31,6 +31,7 @@ use function curl_getinfo; use function curl_init; use function curl_setopt_array; use function explode; +use function is_string; use function preg_match; use function socket_close; use function socket_connect; diff --git a/src/utils/Terminal.php b/src/utils/Terminal.php index 08bd2caff..61df61dc7 100644 --- a/src/utils/Terminal.php +++ b/src/utils/Terminal.php @@ -28,6 +28,7 @@ use function fopen; use function function_exists; use function getenv; use function is_array; +use function sapi_windows_vt100_support; use function stream_isatty; use const PHP_EOL; diff --git a/src/utils/TextFormat.php b/src/utils/TextFormat.php index 6d106db1c..86662aa8e 100644 --- a/src/utils/TextFormat.php +++ b/src/utils/TextFormat.php @@ -25,7 +25,9 @@ namespace pocketmine\utils; use function is_array; use function json_encode; +use function json_last_error_msg; use function mb_scrub; +use function preg_last_error; use function preg_quote; use function preg_replace; use function preg_split; diff --git a/src/utils/Timezone.php b/src/utils/Timezone.php index 4e6031c0a..404f2bb23 100644 --- a/src/utils/Timezone.php +++ b/src/utils/Timezone.php @@ -27,12 +27,10 @@ use function abs; use function date_default_timezone_set; use function date_parse; use function exec; -use function file_exists; use function file_get_contents; use function implode; use function ini_get; use function ini_set; -use function is_link; use function is_string; use function json_decode; use function parse_ini_file; diff --git a/src/utils/Utils.php b/src/utils/Utils.php index 6b2217555..1e30358d5 100644 --- a/src/utils/Utils.php +++ b/src/utils/Utils.php @@ -51,7 +51,6 @@ use function gettype; use function implode; use function is_array; use function is_object; -use function is_readable; use function is_string; use function json_decode; use function json_last_error_msg;