Merge pull request #3141 from Multiverse/ben/mv5/flag-group

Allow customisation of flag group prefix used
Multiverse · Dec 20, 2024 · a5009bf · a5009bf
2 parents 8e64b18 + 63b6ab2
commit a5009bf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/CoreCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/CoreCommand.java
@@ -8,6 +8,6 @@
 @Contract
 public abstract class CoreCommand extends MultiverseCommand {
     protected CoreCommand(@NotNull MVCommandManager commandManager) {
-        super(commandManager);
+        super(commandManager, "mv");
     }
 }
diff --git a/src/main/java/org/mvplugins/multiverse/core/commandtools/MultiverseCommand.java b/src/main/java/org/mvplugins/multiverse/core/commandtools/MultiverseCommand.java
@@ -25,12 +25,20 @@ public abstract class MultiverseCommand extends BaseCommand {
      * The flags manager for the above command manager.
      */
     protected final CommandFlagsManager flagsManager;
+    private final String flagGroupPrefix;
     private String flagGroupName;
     private CommandFlagGroup.Builder flagGroupBuilder;
 
+    // todo: Remove after sub-modules are updated
+    @Deprecated
     protected MultiverseCommand(@NotNull MVCommandManager commandManager) {
+        this(commandManager, "mv");
+    }
+
+    protected MultiverseCommand(@NotNull MVCommandManager commandManager, @NotNull String flagGroupPrefix) {
         this.commandManager = commandManager;
         this.flagsManager = commandManager.getFlagsManager();
+        this.flagGroupPrefix = flagGroupPrefix;
     }
 
     @PostConstruct
@@ -59,7 +67,7 @@ private void registerFlagGroup(@NotNull CommandFlagGroup flagGroup) {
      */
     protected <T extends CommandFlag> T flag(T flag) {
         if (flagGroupBuilder == null) {
-            flagGroupBuilder = CommandFlagGroup.builder("mv" + getClass().getSimpleName().toLowerCase());
+            flagGroupBuilder = CommandFlagGroup.builder(flagGroupPrefix + getClass().getSimpleName().toLowerCase());
         }
         flagGroupBuilder.add(flag);
         Logging.finest("Registered flag: " + flag);