From d184838ba0196305a0f1ab6a9f46734292516551 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Tue, 2 Nov 2021 17:10:07 +0000 Subject: [PATCH] Move Promise classes to their own namespace --- src/Server.php | 4 ++-- src/{utils => promise}/Promise.php | 2 +- src/{utils => promise}/PromiseResolver.php | 2 +- src/{utils => promise}/PromiseSharedData.php | 2 +- src/world/World.php | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) rename src/{utils => promise}/Promise.php (98%) rename src/{utils => promise}/PromiseResolver.php (98%) rename src/{utils => promise}/PromiseSharedData.php (97%) diff --git a/src/Server.php b/src/Server.php index 69cdc9f18..753556ff8 100644 --- a/src/Server.php +++ b/src/Server.php @@ -82,6 +82,8 @@ use pocketmine\plugin\PluginGraylist; use pocketmine\plugin\PluginManager; use pocketmine\plugin\PluginOwned; use pocketmine\plugin\ScriptPluginLoader; +use pocketmine\promise\Promise; +use pocketmine\promise\PromiseResolver; use pocketmine\resourcepacks\ResourcePackManager; use pocketmine\scheduler\AsyncPool; use pocketmine\snooze\SleeperHandler; @@ -98,8 +100,6 @@ use pocketmine\utils\MainLogger; use pocketmine\utils\NotCloneable; use pocketmine\utils\NotSerializable; use pocketmine\utils\Process; -use pocketmine\utils\Promise; -use pocketmine\utils\PromiseResolver; use pocketmine\utils\SignalHandler; use pocketmine\utils\Terminal; use pocketmine\utils\TextFormat; diff --git a/src/utils/Promise.php b/src/promise/Promise.php similarity index 98% rename from src/utils/Promise.php rename to src/promise/Promise.php index d9ae9c563..28666917e 100644 --- a/src/utils/Promise.php +++ b/src/promise/Promise.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\utils; +namespace pocketmine\promise; use function spl_object_id; diff --git a/src/utils/PromiseResolver.php b/src/promise/PromiseResolver.php similarity index 98% rename from src/utils/PromiseResolver.php rename to src/promise/PromiseResolver.php index 81ed05201..0f447693f 100644 --- a/src/utils/PromiseResolver.php +++ b/src/promise/PromiseResolver.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\utils; +namespace pocketmine\promise; /** * @phpstan-template TValue diff --git a/src/utils/PromiseSharedData.php b/src/promise/PromiseSharedData.php similarity index 97% rename from src/utils/PromiseSharedData.php rename to src/promise/PromiseSharedData.php index 05c5ab007..bccf56cc2 100644 --- a/src/utils/PromiseSharedData.php +++ b/src/promise/PromiseSharedData.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\utils; +namespace pocketmine\promise; /** * @internal diff --git a/src/world/World.php b/src/world/World.php index 6d3af4190..978bd8a42 100644 --- a/src/world/World.php +++ b/src/world/World.php @@ -66,13 +66,13 @@ use pocketmine\network\mcpe\protocol\ClientboundPacket; use pocketmine\network\mcpe\protocol\types\BlockPosition; use pocketmine\network\mcpe\protocol\UpdateBlockPacket; use pocketmine\player\Player; +use pocketmine\promise\Promise; +use pocketmine\promise\PromiseResolver; use pocketmine\scheduler\AsyncPool; use pocketmine\Server; use pocketmine\timings\Timings; use pocketmine\utils\AssumptionFailedError; use pocketmine\utils\Limits; -use pocketmine\utils\Promise; -use pocketmine\utils\PromiseResolver; use pocketmine\utils\ReversePriorityQueue; use pocketmine\world\biome\Biome; use pocketmine\world\biome\BiomeRegistry;