From 63b6ab225f32f2e8af87557121e867d2c2820339 Mon Sep 17 00:00:00 2001 From: Ben Woo <30431861+benwoo1110@users.noreply.github.com> Date: Wed, 11 Dec 2024 19:47:56 +0800 Subject: [PATCH] Allow customisation of flag group prefix used --- .../multiverse/core/commands/CoreCommand.java | 2 +- .../core/commandtools/MultiverseCommand.java | 10 +++++++++- 2 files changed, 10 insertions(+), 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 index 8f225d0f..5e8419b5 100644 --- 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 @@ import org.mvplugins.multiverse.core.commandtools.MultiverseCommand; @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 index c2252565..ea2b3e5d 100644 --- 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 @@ public abstract class MultiverseCommand extends BaseCommand { */ protected 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);