Use DI for command classes.

src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java

@@ -22,21 +22,8 @@ import com.onarandombox.MultiverseCore.api.MVCore;
 import com.onarandombox.MultiverseCore.api.MVWorld;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
-import com.onarandombox.MultiverseCore.commands.CheckCommand;
-import com.onarandombox.MultiverseCore.commands.CloneCommand;
-import com.onarandombox.MultiverseCore.commands.ConfirmCommand;
-import com.onarandombox.MultiverseCore.commands.CreateCommand;
-import com.onarandombox.MultiverseCore.commands.DebugCommand;
-import com.onarandombox.MultiverseCore.commands.DeleteCommand;
-import com.onarandombox.MultiverseCore.commands.ImportCommand;
-import com.onarandombox.MultiverseCore.commands.GameruleCommand;
-import com.onarandombox.MultiverseCore.commands.LoadCommand;
-import com.onarandombox.MultiverseCore.commands.RegenCommand;
-import com.onarandombox.MultiverseCore.commands.ReloadCommand;
-import com.onarandombox.MultiverseCore.commands.RemoveCommand;
-import com.onarandombox.MultiverseCore.commands.TeleportCommand;
-import com.onarandombox.MultiverseCore.commands.UnloadCommand;
 import com.onarandombox.MultiverseCore.commandtools.MVCommandManager;
+import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand;
 import com.onarandombox.MultiverseCore.config.MVCoreConfigProvider;
 import com.onarandombox.MultiverseCore.destination.DestinationsProvider;
 import com.onarandombox.MultiverseCore.destination.core.AnchorDestination;
@@ -223,22 +210,7 @@ public class MultiverseCore extends JavaPlugin implements MVCore {
      */
     private void registerCommands() {
         var commandManager = getMVCommandManager();
-        
-        commandManager = new MVCommandManager(this);
-        commandManager.registerCommand(new CheckCommand(this));
-        commandManager.registerCommand(new CloneCommand(this));
-        commandManager.registerCommand(new ConfirmCommand(this));
-        commandManager.registerCommand(new CreateCommand(this));
-        commandManager.registerCommand(new DebugCommand(this));
-        commandManager.registerCommand(new DeleteCommand(this));
-        commandManager.registerCommand(new ImportCommand(this));
-        commandManager.registerCommand(new GameruleCommand(this));
-        commandManager.registerCommand(new LoadCommand(this));
-        commandManager.registerCommand(new RegenCommand(this));
-        commandManager.registerCommand(new ReloadCommand(this));
-        commandManager.registerCommand(new RemoveCommand(this));
-        commandManager.registerCommand(new TeleportCommand(this));
-        commandManager.registerCommand(new UnloadCommand(this));
+        serviceLocator.getAllServices(MultiverseCommand.class).forEach(commandManager::registerCommand);
     }
 
     /**
@@ -608,9 +580,28 @@ public class MultiverseCore extends JavaPlugin implements MVCore {
      * @param qualifiers The set of qualifiers that must match this service definition
      * @return An instance of the contract or impl. May return null if there is no provider that provides the given
      * implementation or contract
+     * @throws MultiException if there was an error during service creation
      */
     @Nullable
     public <T> T getService(@NotNull Class<T> contractOrImpl, Annotation... qualifiers) throws MultiException {
         return serviceLocator.getService(contractOrImpl, qualifiers);
     }
+
+    /**
+     * Gets all services from this locator that implement this contract or have this implementation and have the
+     * provided qualifiers.
+     *
+     * @param contractOrImpl The contract or concrete implementation to get the best instance of
+     * @param qualifiers The set of qualifiers that must match this service definition
+     * @return A list of services implementing this contract or concrete implementation. May not return null, but may
+     * return an empty list
+     * @throws MultiException if there was an error during service creation
+     */
+    @NotNull
+    public <T> List<T> getAllServices(
+            @NotNull Class<T> contractOrImpl,
+            Annotation... qualifiers
+    ) throws MultiException {
+        return serviceLocator.getAllServices(contractOrImpl, qualifiers);
+    }
 }

src/main/java/com/onarandombox/MultiverseCore/commands/CheckCommand.java

@@ -9,11 +9,16 @@ import co.aikar.commands.annotation.Subcommand;
 import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.destination.ParsedDestination;
+import jakarta.inject.Inject;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import org.jvnet.hk2.annotations.Service;
 
+@Service
 @CommandAlias("mv")
 public class CheckCommand extends MultiverseCoreCommand {
+
+    @Inject
     public CheckCommand(@NotNull MultiverseCore plugin) {
         super(plugin);
     }

src/main/java/com/onarandombox/MultiverseCore/commands/CloneCommand.java

@@ -10,11 +10,16 @@ import co.aikar.commands.annotation.Single;
 import co.aikar.commands.annotation.Subcommand;
 import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
+import jakarta.inject.Inject;
 import org.bukkit.ChatColor;
 import org.jetbrains.annotations.NotNull;
+import org.jvnet.hk2.annotations.Service;
 
+@Service
 @CommandAlias("mv")
 public class CloneCommand extends MultiverseCoreCommand {
+
+    @Inject
     public CloneCommand(@NotNull MultiverseCore plugin) {
         super(plugin);
     }

src/main/java/com/onarandombox/MultiverseCore/commands/ConfirmCommand.java

@@ -6,10 +6,15 @@ import co.aikar.commands.annotation.CommandPermission;
 import co.aikar.commands.annotation.Description;
 import co.aikar.commands.annotation.Subcommand;
 import com.onarandombox.MultiverseCore.MultiverseCore;
+import jakarta.inject.Inject;
 import org.jetbrains.annotations.NotNull;
+import org.jvnet.hk2.annotations.Service;
 
+@Service
 @CommandAlias("mv")
 public class ConfirmCommand extends MultiverseCoreCommand {
+
+    @Inject
     public ConfirmCommand(@NotNull MultiverseCore plugin) {
         super(plugin);
     }

src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java

@@ -23,14 +23,19 @@ import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup;
 import com.onarandombox.MultiverseCore.commandtools.flags.CommandValueFlag;
 import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags;
 import com.onarandombox.MultiverseCore.utils.MVCorei18n;
+import jakarta.inject.Inject;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.WorldType;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
+import org.jvnet.hk2.annotations.Service;
 
+@Service
 @CommandAlias("mv")
 public class CreateCommand extends MultiverseCoreCommand {
+
+    @Inject
     public CreateCommand(@NotNull MultiverseCore plugin) {
         super(plugin);
 

src/main/java/com/onarandombox/MultiverseCore/commands/DebugCommand.java

@@ -10,10 +10,15 @@ import co.aikar.commands.annotation.Syntax;
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.utils.MVCorei18n;
+import jakarta.inject.Inject;
 import org.jetbrains.annotations.NotNull;
+import org.jvnet.hk2.annotations.Service;
 
+@Service
 @CommandAlias("mv")
 public class DebugCommand extends MultiverseCoreCommand {
+
+    @Inject
     public DebugCommand(@NotNull MultiverseCore plugin) {
         super(plugin);
     }

src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java

@@ -11,11 +11,16 @@ import co.aikar.commands.annotation.Subcommand;
 import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
+import jakarta.inject.Inject;
 import org.bukkit.ChatColor;
 import org.jetbrains.annotations.NotNull;
+import org.jvnet.hk2.annotations.Service;
 
+@Service
 @CommandAlias("mv")
 public class DeleteCommand extends MultiverseCoreCommand {
+
+    @Inject
     public DeleteCommand(@NotNull MultiverseCore plugin) {
         super(plugin);
     }

src/main/java/com/onarandombox/MultiverseCore/commands/GameruleCommand.java

@@ -11,12 +11,17 @@ import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorld;
 import com.onarandombox.MultiverseCore.commandtools.context.GameRuleValue;
+import jakarta.inject.Inject;
 import org.bukkit.ChatColor;
 import org.bukkit.GameRule;
 import org.jetbrains.annotations.NotNull;
+import org.jvnet.hk2.annotations.Service;
 
+@Service
 @CommandAlias("mv")
 public class GameruleCommand extends MultiverseCoreCommand {
+
+    @Inject
     public GameruleCommand(@NotNull MultiverseCore plugin) {
         super(plugin);
     }

src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java

@@ -17,14 +17,19 @@ import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlag;
 import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup;
 import com.onarandombox.MultiverseCore.commandtools.flags.CommandValueFlag;
 import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags;
+import jakarta.inject.Inject;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.World;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
+import org.jvnet.hk2.annotations.Service;
 
+@Service
 @CommandAlias("mv")
 public class ImportCommand extends MultiverseCoreCommand {
+
+    @Inject
     public ImportCommand(@NotNull MultiverseCore plugin) {
         super(plugin);
 

src/main/java/com/onarandombox/MultiverseCore/commands/LoadCommand.java

@@ -10,10 +10,15 @@ import co.aikar.commands.annotation.Single;
 import co.aikar.commands.annotation.Subcommand;
 import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
+import jakarta.inject.Inject;
 import org.jetbrains.annotations.NotNull;
+import org.jvnet.hk2.annotations.Service;
 
+@Service
 @CommandAlias("mv")
 public class LoadCommand extends MultiverseCoreCommand {
+
+    @Inject
     public LoadCommand(@NotNull MultiverseCore plugin) {
         super(plugin);
     }

src/main/java/com/onarandombox/MultiverseCore/commands/MultiverseCoreCommand.java

@@ -4,10 +4,12 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand;
 import org.jetbrains.annotations.NotNull;
+import org.jvnet.hk2.annotations.Contract;
 
 /**
  * A base command for Multiverse.
  */
+@Contract
 abstract class MultiverseCoreCommand extends MultiverseCommand {
     protected final MultiverseCore plugin;
     protected final MVWorldManager worldManager;

src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java

@@ -18,11 +18,16 @@ import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup;
 import com.onarandombox.MultiverseCore.commandtools.flags.CommandValueFlag;
 import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags;
 import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
+import jakarta.inject.Inject;
 import org.bukkit.ChatColor;
 import org.jetbrains.annotations.NotNull;
+import org.jvnet.hk2.annotations.Service;
 
+@Service
 @CommandAlias("mv")
 public class RegenCommand extends MultiverseCoreCommand {
+
+    @Inject
     public RegenCommand(@NotNull MultiverseCore plugin) {
         super(plugin);
 

src/main/java/com/onarandombox/MultiverseCore/commands/ReloadCommand.java

@@ -10,11 +10,16 @@ import co.aikar.commands.annotation.Description;
 import co.aikar.commands.annotation.Subcommand;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.event.MVConfigReloadEvent;
+import jakarta.inject.Inject;
 import org.bukkit.ChatColor;
 import org.jetbrains.annotations.NotNull;
+import org.jvnet.hk2.annotations.Service;
 
+@Service
 @CommandAlias("mv")
 public class ReloadCommand extends MultiverseCoreCommand {
+
+    @Inject
     public ReloadCommand(@NotNull MultiverseCore plugin) {
         super(plugin);
     }

src/main/java/com/onarandombox/MultiverseCore/commands/RemoveCommand.java

@@ -10,11 +10,16 @@ import co.aikar.commands.annotation.Single;
 import co.aikar.commands.annotation.Subcommand;
 import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
+import jakarta.inject.Inject;
 import org.bukkit.ChatColor;
 import org.jetbrains.annotations.NotNull;
+import org.jvnet.hk2.annotations.Service;
 
+@Service
 @CommandAlias("mv")
 public class RemoveCommand extends MultiverseCoreCommand {
+
+    @Inject
     public RemoveCommand(@NotNull MultiverseCore plugin) {
         super(plugin);
     }

src/main/java/com/onarandombox/MultiverseCore/commands/RootCommand.java

@@ -3,11 +3,16 @@ package com.onarandombox.MultiverseCore.commands;
 import co.aikar.commands.CommandIssuer;
 import co.aikar.commands.annotation.CommandAlias;
 import com.onarandombox.MultiverseCore.MultiverseCore;
+import jakarta.inject.Inject;
 import org.bukkit.ChatColor;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.jetbrains.annotations.NotNull;
+import org.jvnet.hk2.annotations.Service;
 
+@Service
 public class RootCommand extends MultiverseCoreCommand {
+
+    @Inject
     public RootCommand(@NotNull MultiverseCore plugin) {
         super(plugin);
     }

src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java

@@ -10,10 +10,15 @@ import co.aikar.commands.annotation.Subcommand;
 import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.destination.ParsedDestination;
+import jakarta.inject.Inject;
 import org.bukkit.entity.Player;
+import org.jvnet.hk2.annotations.Service;
 
+@Service
 @CommandAlias("mv")
 public class TeleportCommand extends MultiverseCoreCommand {
+
+    @Inject
     public TeleportCommand(MultiverseCore plugin) {
         super(plugin);
     }

src/main/java/com/onarandombox/MultiverseCore/commands/UnloadCommand.java

@@ -9,10 +9,15 @@ import co.aikar.commands.annotation.Subcommand;
 import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorld;
+import jakarta.inject.Inject;
 import org.jetbrains.annotations.NotNull;
+import org.jvnet.hk2.annotations.Service;
 
+@Service
 @CommandAlias("mv")
 public class UnloadCommand extends MultiverseCoreCommand {
+
+    @Inject
     public UnloadCommand(@NotNull MultiverseCore plugin) {
         super(plugin);
     }

src/main/java/com/onarandombox/MultiverseCore/commands/UsageCommand.java

@@ -9,10 +9,15 @@ import co.aikar.commands.annotation.HelpCommand;
 import co.aikar.commands.annotation.Subcommand;
 import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
+import jakarta.inject.Inject;
 import org.jetbrains.annotations.NotNull;
+import org.jvnet.hk2.annotations.Service;
 
+@Service
 @CommandAlias("mv")
 public class UsageCommand extends MultiverseCoreCommand {
+
+    @Inject
     public UsageCommand(@NotNull MultiverseCore plugin) {
         super(plugin);
     }

src/main/java/com/onarandombox/MultiverseCore/commandtools/MultiverseCommand.java

@@ -6,7 +6,9 @@ import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup;
 import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagsManager;
 import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags;
 import org.jetbrains.annotations.NotNull;
+import org.jvnet.hk2.annotations.Contract;
 
+@Contract
 public abstract class MultiverseCommand extends BaseCommand {
     protected final CommandFlagsManager flagsManager;
     private String flagGroupName;

src/test/java/org/mvplugins/multiverse/core/inject/InjectionTest.kt

@@ -9,6 +9,7 @@ import com.onarandombox.MultiverseCore.api.MVPlugin
 import com.onarandombox.MultiverseCore.api.MVWorldManager
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter
 import com.onarandombox.MultiverseCore.commandtools.MVCommandManager
+import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand
 import com.onarandombox.MultiverseCore.config.MVCoreConfigProvider
 import com.onarandombox.MultiverseCore.economy.MVEconomist
 import com.onarandombox.MultiverseCore.inject.wrapper.PluginDataFolder
@@ -26,11 +27,13 @@ import com.onarandombox.MultiverseCore.utils.MVPermissions
 import com.onarandombox.MultiverseCore.utils.UnsafeCallWrapper
 import com.onarandombox.MultiverseCore.world.SimpleMVWorldManager
 import org.bukkit.Server
+import org.bukkit.command.Command
 import org.bukkit.plugin.PluginManager
 import org.junit.jupiter.api.Test
 import org.mvplugins.multiverse.core.TestWithMockBukkit
 import java.io.File
 import java.util.logging.Logger
+import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 import kotlin.test.assertSame
@@ -162,4 +165,11 @@ class InjectionTest : TestWithMockBukkit() {
     fun `MVCoreConfigProvider is available as a service`() {
         assertNotNull(multiverseCore.getService(MVCoreConfigProvider::class.java))
     }
+
+    @Test
+    fun `Commands are available as services`() {
+        val commands = multiverseCore.getAllServices(MultiverseCommand::class.java)
+        // TODO come up with a better way to test this like via actually testing the effect of calling each command
+        assertEquals(16, commands.size)
+    }
 }