Code cleanup #1

thebigcrafter · Jan 2, 2024 · 0e04a6e · 0e04a6e
1 parent c3d7093
commit 0e04a6e
Show file tree

Hide file tree

Showing 20 changed files with 461 additions and 371 deletions.
diff --git a/src/thebigcrafter/omp/OhMyPMMP.php b/src/thebigcrafter/omp/OhMyPMMP.php
@@ -27,7 +27,9 @@ class OhMyPMMP extends PluginBase
     public function onLoad() : void
     {
         self::setInstance($this);
-        Language::loadLanguages($this->getConfig()->get("language"));
+		/** @var string $selectedLanguage */
+		$selectedLanguage = $this->getConfig()->get("language");
+        Language::loadLanguages($selectedLanguage);
         $this->createFolders();
     }
 

diff --git a/src/thebigcrafter/omp/Utils.php b/src/thebigcrafter/omp/Utils.php
diff --git a/src/thebigcrafter/omp/commands/subcommands/DisableCommand.php b/src/thebigcrafter/omp/commands/subcommands/DisableCommand.php
@@ -15,19 +15,23 @@
 
 use CortexPE\Commando\args\RawStringArgument;
 use CortexPE\Commando\BaseSubCommand;
+use CortexPE\Commando\exception\ArgumentOrderException;
 use Generator;
 use pocketmine\command\CommandSender;
 use SOFe\AwaitGenerator\Await;
 use Symfony\Component\Filesystem\Exception\IOException;
 use Symfony\Component\Filesystem\Path;
 use thebigcrafter\omp\Language;
 use thebigcrafter\omp\OhMyPMMP;
-use thebigcrafter\omp\Utils;
 use thebigcrafter\omp\utils\Filesystem;
+use thebigcrafter\omp\utils\Utils;
 
 class DisableCommand extends BaseSubCommand
 {
-    protected function prepare() : void
+	/**
+	 * @throws ArgumentOrderException
+	 */
+	protected function prepare() : void
     {
         $this->setPermission("oh-my-pmmp.disable");
 
@@ -40,10 +44,10 @@ protected function prepare() : void
     public function onRun(CommandSender $sender, string $aliasUsed, array $args) : void
     {
         $name = $args["name"];
-        $oldPluginFilePath = Utils::getPluginFilePath($name);
-        $newPluginFilePath = Path::join(OhMyPMMP::getInstance()->getServer()->getPluginPath(), "..", "disabled_plugins", "$name.phar");
+        $oldPluginFilePath = Utils::generatePluginFilePathWithName($name);
+        $newPluginFilePath = Path::join(OhMyPMMP::getInstance()->getServer()->getDataPath(), "disabled_plugins", "$name.phar");
 
-        if (!Utils::doesPluginExist($name)) {
+        if (!Filesystem::exists($oldPluginFilePath)) {
             $sender->sendMessage(Language::translate("commands.disable.failed", ["name" => $name]));
             return;
         }

diff --git a/src/thebigcrafter/omp/commands/subcommands/EnableCommand.php b/src/thebigcrafter/omp/commands/subcommands/EnableCommand.php
@@ -15,19 +15,23 @@
 
 use CortexPE\Commando\args\RawStringArgument;
 use CortexPE\Commando\BaseSubCommand;
+use CortexPE\Commando\exception\ArgumentOrderException;
 use Generator;
 use pocketmine\command\CommandSender;
 use SOFe\AwaitGenerator\Await;
 use Symfony\Component\Filesystem\Exception\IOException;
 use Symfony\Component\Filesystem\Path;
 use thebigcrafter\omp\Language;
 use thebigcrafter\omp\OhMyPMMP;
-use thebigcrafter\omp\Utils;
 use thebigcrafter\omp\utils\Filesystem;
+use thebigcrafter\omp\utils\Utils;
 
 class EnableCommand extends BaseSubCommand
 {
-    protected function prepare() : void
+	/**
+	 * @throws ArgumentOrderException
+	 */
+	protected function prepare() : void
     {
         $this->setPermission("oh-my-pmmp.enable");
 
@@ -40,7 +44,7 @@ protected function prepare() : void
     public function onRun(CommandSender $sender, string $aliasUsed, array $args) : void
     {
         $name = $args["name"];
-        $newPluginFilePath = Path::join(Utils::getPluginsFolder(), "$name.phar");
+        $newPluginFilePath = Utils::generatePluginFilePathWithName($name);
         $oldPluginFilePath = Path::join(OhMyPMMP::getInstance()->getServer()->getPluginPath(), "..", "disabled_plugins", "$name.phar");
 
         if (!Filesystem::exists($oldPluginFilePath)) {

diff --git a/src/thebigcrafter/omp/commands/subcommands/ExtractCommand.php b/src/thebigcrafter/omp/commands/subcommands/ExtractCommand.php
@@ -15,19 +15,22 @@
 
 use CortexPE\Commando\args\RawStringArgument;
 use CortexPE\Commando\BaseSubCommand;
+use CortexPE\Commando\exception\ArgumentOrderException;
 use Generator;
 use pocketmine\command\CommandSender;
 use SOFe\AwaitGenerator\Await;
 use Symfony\Component\Filesystem\Filesystem;
-use Symfony\Component\Filesystem\Path;
 use thebigcrafter\omp\helpers\PharHelper;
 use thebigcrafter\omp\Language;
-use thebigcrafter\omp\Utils;
+use thebigcrafter\omp\utils\Utils;
 use Throwable;
 
 class ExtractCommand extends BaseSubCommand
 {
-    protected function prepare() : void
+	/**
+	 * @throws ArgumentOrderException
+	 */
+	protected function prepare() : void
     {
         $this->setPermission("oh-my-pmmp.extract");
 
@@ -41,7 +44,7 @@ public function onRun(CommandSender $sender, string $aliasUsed, array $args) : v
     {
         $fs = new Filesystem();
         $name = $args["name"];
-        $pluginFilePath = Path::join(Utils::getPluginsFolder(), "$name.phar");
+        $pluginFilePath = Utils::generatePluginFilePathWithName($name);
 
         if (!$fs->exists($pluginFilePath)) {
             $sender->sendMessage(Language::translate("commands.extract.failed", ["name" => $name]));
@@ -50,7 +53,7 @@ public function onRun(CommandSender $sender, string $aliasUsed, array $args) : v
 
         Await::f2c(function () use ($pluginFilePath, $name, $sender) : Generator {
             try {
-                yield from PharHelper::extract($pluginFilePath, Path::join(Utils::getPluginsFolder(), $name));
+                yield from PharHelper::extract($pluginFilePath, Utils::generatePluginFolderPathWithName($name));
                 $sender->sendMessage(Language::translate("commands.extract.successfully", ["name" => $name]));
             } catch (Throwable $e) {
                 $sender->sendMessage(Language::translate("messages.operation.failed", ["reason" => $e->getMessage()]));

diff --git a/src/thebigcrafter/omp/commands/subcommands/InstallCommand.php b/src/thebigcrafter/omp/commands/subcommands/InstallCommand.php
@@ -15,12 +15,14 @@
 
 use CortexPE\Commando\args\RawStringArgument;
 use CortexPE\Commando\BaseSubCommand;
+use CortexPE\Commando\exception\ArgumentOrderException;
 use Exception;
 use Generator;
 use pocketmine\command\CommandSender;
 use SOFe\AwaitGenerator\Await;
 use Symfony\Component\Filesystem\Path;
 use thebigcrafter\omp\helpers\PharHelper;
+use thebigcrafter\omp\helpers\PoggitHelper;
 use thebigcrafter\omp\Language;
 use thebigcrafter\omp\OhMyPMMP;
 use thebigcrafter\omp\pool\PoggitPluginsPool;
@@ -39,10 +41,10 @@ public function onRun(CommandSender $sender, string $aliasUsed, array $args) : v
 
         $plugin = PoggitPluginsPool::getItem($name);
 
-        if (!isset($plugin)) {
-            $sender->sendMessage(Language::translate("commands.install.failed_1", ["name" => $name]));
-            return;
-        }
+		if(!PoggitHelper::pluginExist($name)) {
+			$sender->sendMessage(Language::translate("commands.install.failed_1", ["name" => $name]));
+			return;
+		}
 
         $pluginVersion = $plugin->getVersion($version);
 
@@ -69,7 +71,10 @@ public function onRun(CommandSender $sender, string $aliasUsed, array $args) : v
         });
     }
 
-    protected function prepare() : void
+	/**
+	 * @throws ArgumentOrderException
+	 */
+	protected function prepare() : void
     {
         $this->setPermission("oh-my-pmmp.install");
 

diff --git a/src/thebigcrafter/omp/commands/subcommands/ListCommand.php b/src/thebigcrafter/omp/commands/subcommands/ListCommand.php
@@ -1,20 +1,21 @@
 <?php
-
-/*
- * This file is part of oh-my-pmmp.
- *
- * (c) thebigcrafter <hello@thebigcrafter.team>
- *
- * This source file is subject to the GPL-3.0 license that is bundled
- * with this source code in the file LICENSE.
- */
-
-declare(strict_types=1);
-
-namespace thebigcrafter\omp\commands\subcommands;
-
+
+/*
+ * This file is part of oh-my-pmmp.
+ *
+ * (c) thebigcrafter <hello@thebigcrafter.team>
+ *
+ * This source file is subject to the GPL-3.0 license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+declare(strict_types=1);
+
+namespace thebigcrafter\omp\commands\subcommands;
+
 use CortexPE\Commando\args\IntegerArgument;
 use CortexPE\Commando\BaseSubCommand;
+use CortexPE\Commando\exception\ArgumentOrderException;
 use pocketmine\command\CommandSender;
 use thebigcrafter\omp\Language;
 use thebigcrafter\omp\OhMyPMMP;
@@ -25,19 +26,22 @@
 use function count;
 use function implode;
 use function max;
-use function min;
-
+use function min;
+
 class ListCommand extends BaseSubCommand
 {
-    protected function prepare() : void
+	/**
+	 * @throws ArgumentOrderException
+	 */
+	protected function prepare() : void
     {
-        $this->setPermission("oh-my-pmmp.list");
-
+        $this->setPermission("oh-my-pmmp.list");
+
         $this->registerArgument(0, new IntegerArgument("page", true));
-    }
-
-    /**
-     * @param array<string> $args
+    }
+
+    /**
+     * @param array<string> $args
      */
     public function onRun(CommandSender $sender, string $aliasUsed, array $args) : void
     {
@@ -48,13 +52,13 @@ public function onRun(CommandSender $sender, string $aliasUsed, array $args) : v
         $page = max(0, min($page, $totalPages - 1));
         $offset = $page * $pluginsPerPage;
         /** @var array{name: string, plugin: Plugin} $pluginsOnPage */
-        $pluginsOnPage = array_slice(PoggitPluginsPool::getPool(), $offset, $pluginsPerPage);
-
+        $pluginsOnPage = array_slice(PoggitPluginsPool::getPool(), $offset, $pluginsPerPage);
+
         foreach ($pluginsOnPage as $name => $plugin) {
             $sender->sendMessage(Language::translate("commands.list.form.name", ["name" => $name]));
             $sender->sendMessage(Language::translate("commands.list.form.license", ["license" => $plugin->getLicense()]));
             $sender->sendMessage(Language::translate("commands.list.form.versions", ["versions" => implode(", ", $plugin->getVersionsOnly())]));
             $sender->sendMessage("====================");
         }
     }
-}
+}
diff --git a/src/thebigcrafter/omp/commands/subcommands/RemoveCommand.php b/src/thebigcrafter/omp/commands/subcommands/RemoveCommand.php
@@ -16,6 +16,7 @@
 use CortexPE\Commando\args\BooleanArgument;
 use CortexPE\Commando\args\RawStringArgument;
 use CortexPE\Commando\BaseSubCommand;
+use CortexPE\Commando\exception\ArgumentOrderException;
 use Generator;
 use pocketmine\command\CommandSender;
 use SOFe\AwaitGenerator\Await;
@@ -24,7 +25,10 @@
 
 class RemoveCommand extends BaseSubCommand
 {
-    protected function prepare() : void
+	/**
+	 * @throws ArgumentOrderException
+	 */
+	protected function prepare() : void
     {
         $this->setPermission("oh-my-pmmp.remove");