diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java index a72552fa..5e91a475 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java @@ -323,6 +323,8 @@ public class BukkitCommandManager extends CommandManager implements Brigad /** * {@inheritDoc} + * + * @since 1.2.0 */ @Override public @Nullable CloudBrigadierManager brigadierManager() { diff --git a/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/PaperCommandManager.java b/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/PaperCommandManager.java index 8218d9c0..bda5c4c3 100644 --- a/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/PaperCommandManager.java +++ b/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/PaperCommandManager.java @@ -114,6 +114,8 @@ public class PaperCommandManager extends BukkitCommandManager { /** * {@inheritDoc} + * + * @since 1.2.0 */ @Override public @Nullable CloudBrigadierManager brigadierManager() { diff --git a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandManager.java b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandManager.java index 7972bcf2..0f2b12ff 100644 --- a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandManager.java +++ b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandManager.java @@ -25,6 +25,8 @@ package cloud.commandframework.velocity; import cloud.commandframework.CommandManager; import cloud.commandframework.CommandTree; +import cloud.commandframework.brigadier.BrigadierManagerHolder; +import cloud.commandframework.brigadier.CloudBrigadierManager; import cloud.commandframework.captions.FactoryDelegatingCaptionRegistry; import cloud.commandframework.execution.CommandExecutionCoordinator; import cloud.commandframework.meta.CommandMeta; @@ -52,7 +54,7 @@ import java.util.function.Function; * @param Command sender type */ @Singleton -public class VelocityCommandManager extends CommandManager { +public class VelocityCommandManager extends CommandManager implements BrigadierManagerHolder { /** * Default caption for {@link VelocityCaptionKeys#ARGUMENT_PARSE_FAILURE_PLAYER} @@ -124,6 +126,20 @@ public class VelocityCommandManager extends CommandManager { return SimpleCommandMeta.empty(); } + /** + * {@inheritDoc} + *

+ * In the case of the {@link VelocityCommandManager}, Brigadier is always used for command registration, + * and therefore this method will never return {@code null}. + * + * @since 1.2.0 + */ + @SuppressWarnings("unchecked") + @Override + public @NonNull CloudBrigadierManager brigadierManager() { + return ((VelocityPluginRegistrationHandler) this.getCommandRegistrationHandler()).brigadierManager(); + } + final @NonNull ProxyServer getProxyServer() { return this.proxyServer; } diff --git a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityPluginRegistrationHandler.java b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityPluginRegistrationHandler.java index 41f91a06..93457322 100644 --- a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityPluginRegistrationHandler.java +++ b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityPluginRegistrationHandler.java @@ -79,4 +79,8 @@ final class VelocityPluginRegistrationHandler implements CommandRegistrationH return true; } + @NonNull CloudBrigadierManager brigadierManager() { + return this.brigadierManager; + } + }