From f1d45292762ad022693acbfcc34a4e212ac3104d Mon Sep 17 00:00:00 2001 From: Josh Taylor Date: Tue, 6 Oct 2020 11:40:35 +0100 Subject: [PATCH] :sparkles: Cleanup annotations and remove Cloud Brigs Pair (#32) --- .../jda/JDACommandListener.java | 56 +++++++++---------- .../jda/JDACommandManager.java | 3 +- .../jda/parsers/UserArgument.java | 29 +++++----- .../brigadier/CloudBrigadierManager.java | 46 ++++----------- .../bukkit/BukkitCommand.java | 10 +++- .../AsyncCommandSuggestionsListener.java | 8 +-- .../paper/PaperBrigadierListener.java | 21 ++++--- .../paper/PaperCommandManager.java | 10 ++-- .../velocity/VelocityCommandManager.java | 21 +++---- .../VelocityPluginRegistrationHandler.java | 6 +- 10 files changed, 93 insertions(+), 117 deletions(-) diff --git a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandListener.java b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandListener.java index d504ee8b..fcb5de23 100644 --- a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandListener.java +++ b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandListener.java @@ -58,14 +58,14 @@ public class JDACommandListener extends ListenerAdapter { @Override public final void onMessageReceived(final @NonNull MessageReceivedEvent event) { - Message message = event.getMessage(); - C sender = commandManager.getCommandSenderMapper().apply(event); + final Message message = event.getMessage(); + final C sender = this.commandManager.getCommandSenderMapper().apply(event); - if (commandManager.getBotId() == event.getAuthor().getIdLong()) { + if (this.commandManager.getBotId() == event.getAuthor().getIdLong()) { return; } - String prefix = commandManager.getPrefixMapper().apply(sender); + final String prefix = this.commandManager.getPrefixMapper().apply(sender); String content = message.getContentRaw(); if (!content.startsWith(prefix)) { @@ -81,40 +81,40 @@ public class JDACommandListener extends ListenerAdapter { } if (throwable instanceof InvalidSyntaxException) { - commandManager.handleException(sender, - InvalidSyntaxException.class, - (InvalidSyntaxException) throwable, (c, e) -> { - sendMessage(event, - MESSAGE_INVALID_SYNTAX + prefix + ((InvalidSyntaxException) throwable) - .getCorrectSyntax()); + this.commandManager.handleException(sender, + InvalidSyntaxException.class, + (InvalidSyntaxException) throwable, (c, e) -> { + this.sendMessage(event, + MESSAGE_INVALID_SYNTAX + prefix + ((InvalidSyntaxException) throwable) + .getCorrectSyntax()); }); } else if (throwable instanceof InvalidCommandSenderException) { - commandManager.handleException(sender, - InvalidCommandSenderException.class, - (InvalidCommandSenderException) throwable, (c, e) -> - sendMessage(event, throwable.getMessage()) + this.commandManager.handleException(sender, + InvalidCommandSenderException.class, + (InvalidCommandSenderException) throwable, (c, e) -> + this.sendMessage(event, throwable.getMessage()) ); } else if (throwable instanceof NoPermissionException) { - commandManager.handleException(sender, - NoPermissionException.class, - (NoPermissionException) throwable, (c, e) -> - sendMessage(event, MESSAGE_NO_PERMS) + this.commandManager.handleException(sender, + NoPermissionException.class, + (NoPermissionException) throwable, (c, e) -> + this.sendMessage(event, MESSAGE_NO_PERMS) ); } else if (throwable instanceof NoSuchCommandException) { - commandManager.handleException(sender, - NoSuchCommandException.class, - (NoSuchCommandException) throwable, (c, e) -> - sendMessage(event, MESSAGE_UNKNOWN_COMMAND) + this.commandManager.handleException(sender, + NoSuchCommandException.class, + (NoSuchCommandException) throwable, (c, e) -> + this.sendMessage(event, MESSAGE_UNKNOWN_COMMAND) ); } else if (throwable instanceof ArgumentParseException) { - commandManager.handleException(sender, ArgumentParseException.class, - (ArgumentParseException) throwable, (c, e) -> { - sendMessage(event, - "Invalid Command Argument: " + throwable.getCause() - .getMessage()); + this.commandManager.handleException(sender, ArgumentParseException.class, + (ArgumentParseException) throwable, (c, e) -> { + this.sendMessage(event, + "Invalid Command Argument: " + throwable.getCause() + .getMessage()); }); } else { - sendMessage(event, throwable.getMessage()); + this.sendMessage(event, throwable.getMessage()); } }); } diff --git a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandManager.java b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandManager.java index 0b405efc..9cb96624 100644 --- a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandManager.java +++ b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandManager.java @@ -53,7 +53,6 @@ public class JDACommandManager extends CommandManager { private final Function<@NonNull C, @NonNull MessageReceivedEvent> backwardsCommandSenderMapper; /** - * final * Construct a new JDA Command Manager * * @param jda JDA instance to register against @@ -86,7 +85,7 @@ public class JDACommandManager extends CommandManager { * * @return Prefix mapper */ - public final @NonNull Function getPrefixMapper() { + public final @NonNull Function<@NonNull C, @NonNull String> getPrefixMapper() { return this.prefixMapper; } diff --git a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/UserArgument.java b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/UserArgument.java index 6ff5c9c6..0727d54f 100644 --- a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/UserArgument.java +++ b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/UserArgument.java @@ -87,13 +87,6 @@ public final class UserArgument extends CommandArgument { return UserArgument.newBuilder(name, jda).asOptional().build(); } - - public enum ParserMode { - MENTION, - ID, - NAME - } - /** * Get the modes enabled on the parser * @@ -103,6 +96,14 @@ public final class UserArgument extends CommandArgument { return modes; } + + public enum ParserMode { + MENTION, + ID, + NAME + } + + public static final class Builder extends CommandArgument.Builder { private final JDA jda; private List modes = new ArrayList<>(); @@ -158,7 +159,7 @@ public final class UserArgument extends CommandArgument { if (modes.contains(ParserMode.MENTION)) { if (input.endsWith(">")) { - String id; + final String id; if (input.startsWith("<@!")) { id = input.substring(3, input.length() - 1); } else { @@ -166,10 +167,10 @@ public final class UserArgument extends CommandArgument { } try { - final ArgumentParseResult result = userFromId(input, id); + final ArgumentParseResult result = this.userFromId(input, id); inputQueue.remove(); return result; - } catch (UserNotFoundParseException | NumberFormatException e) { + } catch (final UserNotFoundParseException | NumberFormatException e) { exception = e; } } @@ -177,16 +178,16 @@ public final class UserArgument extends CommandArgument { if (modes.contains(ParserMode.ID)) { try { - final ArgumentParseResult result = userFromId(input, input); + final ArgumentParseResult result = this.userFromId(input, input); inputQueue.remove(); return result; - } catch (UserNotFoundParseException | NumberFormatException e) { + } catch (final UserNotFoundParseException | NumberFormatException e) { exception = e; } } if (modes.contains(ParserMode.NAME)) { - List users = jda.getUsersByName(input, true); + final List users = jda.getUsersByName(input, true); if (users.size() == 0) { exception = new UserNotFoundParseException(input); @@ -209,7 +210,7 @@ public final class UserArgument extends CommandArgument { private @NonNull ArgumentParseResult userFromId(final @NonNull String input, final @NonNull String id) throws UserNotFoundParseException, NumberFormatException { - User user = jda.getUserById(id); + final User user = jda.getUserById(id); if (user == null) { throw new UserNotFoundParseException(input); diff --git a/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/CloudBrigadierManager.java b/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/CloudBrigadierManager.java index 06699d55..963b279c 100644 --- a/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/CloudBrigadierManager.java +++ b/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/CloudBrigadierManager.java @@ -42,6 +42,7 @@ import cloud.commandframework.context.CommandContext; import cloud.commandframework.execution.preprocessor.CommandPreprocessingContext; import cloud.commandframework.permission.CommandPermission; import cloud.commandframework.permission.Permission; +import cloud.commandframework.types.tuples.Pair; import com.mojang.brigadier.LiteralMessage; import com.mojang.brigadier.arguments.ArgumentType; import com.mojang.brigadier.arguments.BoolArgumentType; @@ -83,8 +84,7 @@ import java.util.function.Supplier; */ public final class CloudBrigadierManager { - private final Map, cloud.commandframework.types.tuples.Pair, - ? extends ArgumentType>, Boolean>> mappers; + private final Map, Pair, ? extends ArgumentType>, Boolean>> mappers; private final Map<@NonNull Class, @NonNull Supplier<@Nullable ArgumentType>> defaultArgumentTypeSuppliers; private final Supplier> dummyContextProvider; private final CommandManager commandManager; @@ -203,8 +203,7 @@ public final class CloudBrigadierManager { final boolean nativeSuggestions, final @NonNull Function<@NonNull ? extends K, @NonNull ? extends ArgumentType> mapper) { - this.mappers.put(GenericTypeReflector.erase(argumentType.getType()), - cloud.commandframework.types.tuples.Pair.of(mapper, nativeSuggestions)); + this.mappers.put(GenericTypeReflector.erase(argumentType.getType()), Pair.of(mapper, nativeSuggestions)); } /** @@ -224,12 +223,11 @@ public final class CloudBrigadierManager { final @NonNull TypeToken argumentType, final @NonNull K argument) { final ArgumentParser commandArgument = (ArgumentParser) argument; - final cloud.commandframework.types.tuples.Pair pair - = this.mappers.get(GenericTypeReflector.erase(argumentType.getType())); + final Pair pair = this.mappers.get(GenericTypeReflector.erase(argumentType.getType())); if (pair == null || pair.getFirst() == null) { return this.createDefaultMapper(valueType, commandArgument); } - return new Pair<>((ArgumentType) ((Function) pair.getFirst()).apply(commandArgument), + return Pair.of((ArgumentType) ((Function) pair.getFirst()).apply(commandArgument), (boolean) pair.getSecond()); } @@ -245,9 +243,9 @@ public final class CloudBrigadierManager { defaultType = null; } if (defaultType != null) { - return new Pair<>(argumentTypeSupplier.get(), true); + return Pair.of(argumentTypeSupplier.get(), true); } - return new Pair<>(StringArgumentType.string(), false); + return Pair.of(StringArgumentType.string(), false); } /** @@ -339,10 +337,10 @@ public final class CloudBrigadierManager { final Pair, Boolean> pair = this.getArgument(TypeToken.get((Class) types[i]), TypeToken.get(parser.getClass()), parser); - final SuggestionProvider provider = pair.getRight() ? null : suggestionProvider; + final SuggestionProvider provider = pair.getSecond() ? null : suggestionProvider; final ArgumentBuilder fragmentBuilder = RequiredArgumentBuilder - .argument((String) names[i], (ArgumentType) pair.getLeft()) + .argument((String) names[i], (ArgumentType) pair.getFirst()) .suggests(provider) .requires(sender -> permissionChecker.test(sender, (CommandPermission) root.getNodeMeta() @@ -378,12 +376,12 @@ public final class CloudBrigadierManager { final Pair, Boolean> pair = this.getArgument(root.getValue().getValueType(), TypeToken.get(root.getValue().getParser().getClass()), root.getValue().getParser()); - final SuggestionProvider provider = pair.getRight() + final SuggestionProvider provider = pair.getSecond() ? null : (context, builder) -> this.buildSuggestions(root.getValue(), context, builder); argumentBuilder = RequiredArgumentBuilder - .argument(root.getValue().getName(), (ArgumentType) pair.getLeft()) + .argument(root.getValue().getName(), (ArgumentType) pair.getFirst()) .suggests(provider) .requires(sender -> permissionChecker.test(sender, (CommandPermission) root.getNodeMeta() @@ -440,26 +438,4 @@ public final class CloudBrigadierManager { return builder.buildFuture(); } - - private static final class Pair { - - private final L left; - private final R right; - - private Pair(final @NonNull L left, - final @NonNull R right) { - this.left = left; - this.right = right; - } - - private @NonNull L getLeft() { - return this.left; - } - - private @NonNull R getRight() { - return this.right; - } - - } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommand.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommand.java index 59e384a4..ce20b4f5 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommand.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommand.java @@ -66,7 +66,9 @@ final class BukkitCommand extends org.bukkit.command.Command implements Plugi } @Override - public boolean execute(final CommandSender commandSender, final String s, final String[] strings) { + public boolean execute(final @NonNull CommandSender commandSender, + final @NonNull String s, + final @NonNull String @NonNull [] strings) { /* Join input */ final StringBuilder builder = new StringBuilder(this.command.getName()); for (final String string : strings) { @@ -135,8 +137,10 @@ final class BukkitCommand extends org.bukkit.command.Command implements Plugi } @Override - public List tabComplete(final CommandSender sender, final String alias, final String[] args) throws - IllegalArgumentException { + public List tabComplete(final @NonNull CommandSender sender, + final @NonNull String alias, + final @NonNull String @NonNull [] args) + throws IllegalArgumentException { final StringBuilder builder = new StringBuilder(this.command.getName()); for (final String string : args) { builder.append(" ").append(string); diff --git a/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/AsyncCommandSuggestionsListener.java b/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/AsyncCommandSuggestionsListener.java index 3831ace7..8ad3c8b3 100644 --- a/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/AsyncCommandSuggestionsListener.java +++ b/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/AsyncCommandSuggestionsListener.java @@ -28,8 +28,8 @@ import com.destroystokyo.paper.event.server.AsyncTabCompleteEvent; import org.bukkit.command.CommandSender; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; +import org.checkerframework.checker.nullness.qual.NonNull; -import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -39,17 +39,17 @@ class AsyncCommandSuggestionsListener implements Listener { private final PaperCommandManager paperCommandManager; - AsyncCommandSuggestionsListener(@Nonnull final PaperCommandManager paperCommandManager) { + AsyncCommandSuggestionsListener(final @NonNull PaperCommandManager paperCommandManager) { this.paperCommandManager = paperCommandManager; } @EventHandler - void onTabCompletion(@Nonnull final AsyncTabCompleteEvent event) throws Exception { + void onTabCompletion(final @NonNull AsyncTabCompleteEvent event) throws Exception { if (event.getBuffer().isEmpty() || !event.getBuffer().startsWith("/")) { return; } final String[] arguments = event.getBuffer().substring(1).split(" "); - if (paperCommandManager.getCommandTree().getNamedNode(arguments[0]) == null) { + if (this.paperCommandManager.getCommandTree().getNamedNode(arguments[0]) == null) { return; } @SuppressWarnings("unchecked") diff --git a/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/PaperBrigadierListener.java b/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/PaperBrigadierListener.java index a51c16bd..bfdfd049 100644 --- a/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/PaperBrigadierListener.java +++ b/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/PaperBrigadierListener.java @@ -42,8 +42,8 @@ import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.EntityType; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; +import org.checkerframework.checker.nullness.qual.NonNull; -import javax.annotation.Nonnull; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.UUID; @@ -60,7 +60,7 @@ class PaperBrigadierListener implements Listener { private final PaperCommandManager paperCommandManager; private final String nmsVersion; - PaperBrigadierListener(@Nonnull final PaperCommandManager paperCommandManager) { + PaperBrigadierListener(final @NonNull PaperCommandManager paperCommandManager) { this.paperCommandManager = paperCommandManager; this.brigadierManager = new CloudBrigadierManager<>(this.paperCommandManager, () -> new CommandContext<>( @@ -120,8 +120,7 @@ class PaperBrigadierListener implements Listener { * @return Argument class * @throws Exception If the type cannot be retrieved */ - @Nonnull - private Class getNMSArgument(@Nonnull final String argument) throws Exception { + private @NonNull Class getNMSArgument(final @NonNull String argument) throws Exception { return Class.forName(String.format("net.minecraft.server.%s.Argument%s", this.nmsVersion, argument)); } @@ -131,8 +130,8 @@ class PaperBrigadierListener implements Listener { * @param type Type to map * @param constructor Constructor that construct the NMS argument type */ - public void mapSimpleNMS(@Nonnull final Class type, - @Nonnull final Constructor constructor) { + public void mapSimpleNMS(final @NonNull Class type, + final @NonNull Constructor constructor) { try { this.brigadierManager.registerDefaultArgumentTypeSupplier(type, () -> { try { @@ -156,8 +155,8 @@ class PaperBrigadierListener implements Listener { * @param type Type to map * @param argumentTypeSupplier Supplier of the NMS argument type */ - public void mapComplexNMS(@Nonnull final Class type, - @Nonnull final Supplier> argumentTypeSupplier) { + public void mapComplexNMS(final @NonNull Class type, + final @NonNull Supplier> argumentTypeSupplier) { try { this.brigadierManager.registerDefaultArgumentTypeSupplier(type, argumentTypeSupplier); } catch (final Exception e) { @@ -170,7 +169,7 @@ class PaperBrigadierListener implements Listener { @EventHandler @SuppressWarnings("deprecation") - public void onCommandRegister(@Nonnull final CommandRegisteredEvent event) { + public void onCommandRegister(final @NonNull CommandRegisteredEvent event) { if (!(event.getCommand() instanceof PluginIdentifiableCommand)) { return; } else if (!((PluginIdentifiableCommand) event.getCommand()) @@ -190,8 +189,8 @@ class PaperBrigadierListener implements Listener { return; } final BiPredicate permissionChecker = (s, p) -> { - final C sender = paperCommandManager.getCommandSenderMapper().apply(s.getBukkitSender()); - return paperCommandManager.hasPermission(sender, p); + final C sender = this.paperCommandManager.getCommandSenderMapper().apply(s.getBukkitSender()); + return this.paperCommandManager.hasPermission(sender, p); }; event.setLiteral(this.brigadierManager.createLiteralCommandNode(node, event.getLiteral(), 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 720bb068..063077b8 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 @@ -30,8 +30,8 @@ import cloud.commandframework.execution.CommandExecutionCoordinator; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.plugin.Plugin; +import org.checkerframework.checker.nullness.qual.NonNull; -import javax.annotation.Nonnull; import java.util.function.Function; /** @@ -50,11 +50,11 @@ public class PaperCommandManager extends BukkitCommandManager { * @param backwardsCommandSenderMapper Function that maps the command sender type to {@link CommandSender} * @throws Exception If the construction of the manager fails */ - public PaperCommandManager(@Nonnull final Plugin owningPlugin, - @Nonnull final Function, + public PaperCommandManager(final @NonNull Plugin owningPlugin, + final @NonNull Function, CommandExecutionCoordinator> commandExecutionCoordinator, - @Nonnull final Function commandSenderMapper, - @Nonnull final Function backwardsCommandSenderMapper) throws + final @NonNull Function commandSenderMapper, + final @NonNull Function backwardsCommandSenderMapper) throws Exception { super(owningPlugin, commandExecutionCoordinator, commandSenderMapper, backwardsCommandSenderMapper); 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 a20d542a..5acdd02b 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 @@ -30,8 +30,8 @@ import cloud.commandframework.meta.CommandMeta; import cloud.commandframework.meta.SimpleCommandMeta; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.ProxyServer; +import org.checkerframework.checker.nullness.qual.NonNull; -import javax.annotation.Nonnull; import java.util.function.Function; /** @@ -54,10 +54,10 @@ public class VelocityCommandManager extends CommandManager { * @param backwardsCommandSenderMapper Function that maps the command sender type to {@link CommandSource} */ public VelocityCommandManager( - @Nonnull final ProxyServer proxyServer, - @Nonnull final Function, CommandExecutionCoordinator> commandExecutionCoordinator, - @Nonnull final Function commandSenderMapper, - @Nonnull final Function backwardsCommandSenderMapper) { + final @NonNull ProxyServer proxyServer, + final @NonNull Function<@NonNull CommandTree, @NonNull CommandExecutionCoordinator> commandExecutionCoordinator, + final @NonNull Function<@NonNull CommandSource, @NonNull C> commandSenderMapper, + final @NonNull Function<@NonNull C, @NonNull CommandSource> backwardsCommandSenderMapper) { super(commandExecutionCoordinator, new VelocityPluginRegistrationHandler<>()); ((VelocityPluginRegistrationHandler) this.getCommandRegistrationHandler()).initialize(this); this.proxyServer = proxyServer; @@ -66,23 +66,20 @@ public class VelocityCommandManager extends CommandManager { } @Override - public final boolean hasPermission(@Nonnull final C sender, @Nonnull final String permission) { + public final boolean hasPermission(final @NonNull C sender, final @NonNull String permission) { return this.backwardsCommandSenderMapper.apply(sender).hasPermission(permission); } - @Nonnull @Override - public final CommandMeta createDefaultCommandMeta() { + public final @NonNull CommandMeta createDefaultCommandMeta() { return SimpleCommandMeta.empty(); } - @Nonnull - final ProxyServer getProxyServer() { + final @NonNull ProxyServer getProxyServer() { return this.proxyServer; } - @Nonnull - final Function getCommandSenderMapper() { + final @NonNull Function<@NonNull CommandSource, @NonNull C> getCommandSenderMapper() { return this.commandSenderMapper; } 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 5f379612..f33774c4 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 @@ -39,8 +39,8 @@ import com.velocitypowered.api.command.CommandMeta; import com.velocitypowered.api.command.CommandSource; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.format.NamedTextColor; +import org.checkerframework.checker.nullness.qual.NonNull; -import javax.annotation.Nonnull; import java.util.List; import java.util.concurrent.CompletionException; @@ -54,7 +54,7 @@ final class VelocityPluginRegistrationHandler implements CommandRegistrationH private CloudBrigadierManager brigadierManager; private VelocityCommandManager manager; - void initialize(@Nonnull final VelocityCommandManager velocityCommandManager) { + void initialize(final @NonNull VelocityCommandManager velocityCommandManager) { this.manager = velocityCommandManager; this.brigadierManager = new CloudBrigadierManager<>(velocityCommandManager, () -> new CommandContext<>( @@ -65,7 +65,7 @@ final class VelocityPluginRegistrationHandler implements CommandRegistrationH } @Override - public boolean registerCommand(@Nonnull final Command command) { + public boolean registerCommand(final @NonNull Command command) { final CommandArgument argument = command.getArguments().get(0); final List aliases = ((StaticArgument) argument).getAlternativeAliases(); final BrigadierCommand brigadierCommand = new BrigadierCommand(