Fix Commando subcommand init and bump version

Author: TerminalKyle

plugin.yml

@@ -1,7 +1,7 @@
 name: MCSets-PMMP
 main: MCSets\Loader
 api: 5.0.0
-version: 1.0.4
+version: 1.0.5
 
 website: https://mcsets.com
 author: MCSets - Remminiscent
@@ -11,4 +11,4 @@ permissions:
   mcsets.admin:
     default: op
   mcsets.verify:
-    default: true
+    default: true

src/MCSets/command/SetStoreCommand.php

@@ -5,6 +5,7 @@
 namespace MCSets\command;
 
 use CortexPE\Commando\BaseCommand;
+use CortexPE\Commando\BaseSubCommand;
 use MCSets\command\subcommand\APIKeySubCommand;
 use MCSets\command\subcommand\DebugSubCommand;
 use MCSets\command\subcommand\HelpSubCommand;
@@ -13,6 +14,8 @@
 use MCSets\command\subcommand\ReloadSubCommand;
 use MCSets\command\subcommand\StatusSubCommand;
 use pocketmine\command\CommandSender;
+use pocketmine\plugin\Plugin;
+use pocketmine\plugin\PluginBase;
 use pocketmine\utils\TextFormat;
 
 class SetStoreCommand extends BaseCommand
@@ -21,15 +24,41 @@ public function getPermission(): string
     {
         return "mcsets.admin";
     }
+
+    private function createSubCommand(string $class, string $name, string $description = "", array $aliases = []): BaseSubCommand
+    {
+        $plugin = $this->getOwningPlugin();
+        $ctor = (new \ReflectionClass($class))->getConstructor();
+
+        if ($ctor !== null) {
+            $params = $ctor->getParameters();
+            if (isset($params[0]) && $params[0]->hasType()) {
+                $type = $params[0]->getType();
+                if ($type instanceof \ReflectionNamedType) {
+                    $typeName = $type->getName();
+                    if (
+                        $typeName === Plugin::class ||
+                        $typeName === PluginBase::class ||
+                        is_subclass_of($typeName, Plugin::class)
+                    ) {
+                        return new $class($plugin, $name, $description, $aliases);
+                    }
+                }
+            }
+        }
+
+        return new $class($name, $description, $aliases);
+    }
+
     protected function prepare(): void
     {
-        $this->registerSubCommand(new APIKeySubCommand("apikey", "Set your API key", ["key", "token", "secret"]));
-        $this->registerSubCommand(new DebugSubCommand("debug", "Toggle debug logging"));
-        $this->registerSubCommand(new HelpSubCommand("help", "Show available commands"));
-        $this->registerSubCommand(new QueueSubCommand("queue", "Process pending deliveries"));
-        $this->registerSubCommand(new ReconnectSubCommand("reconnect", "Reconnect to MCSets"));
-        $this->registerSubCommand(new ReloadSubCommand("reload", "Reload configuration"));
-        $this->registerSubCommand(new StatusSubCommand("status", "View connection status"));
+        $this->registerSubCommand($this->createSubCommand(APIKeySubCommand::class, "apikey", "Set your API key", ["key", "token", "secret"]));
+        $this->registerSubCommand($this->createSubCommand(DebugSubCommand::class, "debug", "Toggle debug logging"));
+        $this->registerSubCommand($this->createSubCommand(HelpSubCommand::class, "help", "Show available commands"));
+        $this->registerSubCommand($this->createSubCommand(QueueSubCommand::class, "queue", "Process pending deliveries"));
+        $this->registerSubCommand($this->createSubCommand(ReconnectSubCommand::class, "reconnect", "Reconnect to MCSets"));
+        $this->registerSubCommand($this->createSubCommand(ReloadSubCommand::class, "reload", "Reload configuration"));
+        $this->registerSubCommand($this->createSubCommand(StatusSubCommand::class, "status", "View connection status"));
     }
     public function onRun(CommandSender $sender, string $aliasUsed, array $args): void
     {