diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 28f10728..c9b9ee20 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -3,7 +3,7 @@ name: Java CI with Maven -on: [push, pull_request] +on: [ push, pull_request ] jobs: build: diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/AnnotationParser.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/AnnotationParser.java index ff094f61..7805a65c 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/AnnotationParser.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/AnnotationParser.java @@ -141,7 +141,8 @@ public final class AnnotationParser { final A inner = getAnnotationRecursively( AnnotationAccessor.of(annotation.annotationType()), clazz, - checkedAnnotations); + checkedAnnotations + ); if (inner != null) { innerCandidate = inner; } diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/MethodCommandExecutionHandler.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/MethodCommandExecutionHandler.java index 6caa1e49..e8e6a3de 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/MethodCommandExecutionHandler.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/MethodCommandExecutionHandler.java @@ -98,7 +98,7 @@ class MethodCommandExecutionHandler implements CommandExecutionHandler { this.annotationAccessor ); if (value != null) { - break; + break; } } if (value != null) { diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/injection/RawArgs.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/injection/RawArgs.java index bf85bfe4..f69c56b2 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/injection/RawArgs.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/injection/RawArgs.java @@ -33,6 +33,7 @@ import java.lang.annotation.Target; * {@link cloud.commandframework.annotations.CommandMethod} *

* This should only be used on {@code String[]} + * * @since 1.2.0 */ @Target(ElementType.METHOD) diff --git a/cloud-annotations/src/test/java/cloud/commandframework/annotations/AnnotationParserTest.java b/cloud-annotations/src/test/java/cloud/commandframework/annotations/AnnotationParserTest.java index d2c0237f..51dbe63a 100644 --- a/cloud-annotations/src/test/java/cloud/commandframework/annotations/AnnotationParserTest.java +++ b/cloud-annotations/src/test/java/cloud/commandframework/annotations/AnnotationParserTest.java @@ -97,26 +97,31 @@ class AnnotationParserTest { final Method annotatedMethod = annotatedClass.getDeclaredMethod("annotatedMethod"); System.out.println("Looking for @CommandDescription"); - final CommandDescription commandDescription = AnnotationParser.getMethodOrClassAnnotation(annotatedMethod, - CommandDescription.class); + final CommandDescription commandDescription = AnnotationParser.getMethodOrClassAnnotation( + annotatedMethod, + CommandDescription.class + ); Assertions.assertNotNull(commandDescription); Assertions.assertEquals("Hello World!", commandDescription.value()); System.out.println("Looking for @CommandPermission"); - final CommandPermission commandPermission = AnnotationParser.getMethodOrClassAnnotation(annotatedMethod, - CommandPermission.class); + final CommandPermission commandPermission = AnnotationParser.getMethodOrClassAnnotation( + annotatedMethod, + CommandPermission.class + ); Assertions.assertNotNull(commandPermission); Assertions.assertEquals("some.permission", commandPermission.value()); System.out.println("Looking for @CommandMethod"); - final CommandMethod commandMethod = AnnotationParser.getMethodOrClassAnnotation(annotatedMethod, - CommandMethod.class); + final CommandMethod commandMethod = AnnotationParser.getMethodOrClassAnnotation( + annotatedMethod, + CommandMethod.class + ); Assertions.assertNotNull(commandMethod); Assertions.assertEquals("method", commandMethod.value()); System.out.println("Looking for @Regex"); - @SuppressWarnings("unused") - final Regex regex = AnnotationParser.getMethodOrClassAnnotation(annotatedMethod, Regex.class); + @SuppressWarnings("unused") final Regex regex = AnnotationParser.getMethodOrClassAnnotation(annotatedMethod, Regex.class); } @Test @@ -162,6 +167,7 @@ class AnnotationParserTest { @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) private @interface AnnotatedAnnotation { + } @@ -181,6 +187,7 @@ class AnnotationParserTest { @Target({ElementType.METHOD, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) private @interface Bad1 { + } @@ -188,6 +195,7 @@ class AnnotationParserTest { @Target({ElementType.METHOD, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) private @interface Bad2 { + } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/flags/CommandFlag.java b/cloud-core/src/main/java/cloud/commandframework/arguments/flags/CommandFlag.java index 9ca95d48..92686f20 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/flags/CommandFlag.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/flags/CommandFlag.java @@ -170,10 +170,10 @@ public final class CommandFlag { } if (alias.length() > 1) { throw new IllegalArgumentException( - String.format( - "Alias '%s' has name longer than one character. This is not allowed", - alias - ) + String.format( + "Alias '%s' has name longer than one character. This is not allowed", + alias + ) ); } filteredAliases.add(alias); diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArgument.java index 9aad4b01..75fd6ca7 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArgument.java @@ -346,7 +346,8 @@ public final class StringArgument extends CommandArgument { inner = inputQueue.remove(); if (inner.startsWith("\"") || inner.startsWith("'")) { return ArgumentParseResult.failure(new StringParseException(sj.toString(), - StringMode.QUOTED, commandContext)); + StringMode.QUOTED, commandContext + )); } } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArrayArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArrayArgument.java index 43851bc0..141c7b50 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArrayArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArrayArgument.java @@ -62,9 +62,9 @@ public final class StringArrayArgument extends CommandArgument { /** * Create a new required string array argument * - * @param name Argument name + * @param name Argument name * @param suggestionsProvider Suggestions provider - * @param Command sender type + * @param Command sender type * @return Created argument */ public static @NonNull StringArrayArgument of( @@ -81,9 +81,9 @@ public final class StringArrayArgument extends CommandArgument { /** * Create a new optional string array argument * - * @param name Argument name + * @param name Argument name * @param suggestionsProvider Suggestions provider - * @param Command sender type + * @param Command sender type * @return Created argument */ public static @NonNull StringArrayArgument optional( diff --git a/cloud-core/src/main/java/cloud/commandframework/context/CommandContextFactory.java b/cloud-core/src/main/java/cloud/commandframework/context/CommandContextFactory.java index 48cc1170..b2e2dfdc 100644 --- a/cloud-core/src/main/java/cloud/commandframework/context/CommandContextFactory.java +++ b/cloud-core/src/main/java/cloud/commandframework/context/CommandContextFactory.java @@ -45,6 +45,6 @@ public interface CommandContextFactory { boolean suggestions, @NonNull C sender, @NonNull CaptionRegistry captionRegistry - ); + ); } diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandRegistrationStateTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandRegistrationStateTest.java index 61398607..4a8e8994 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandRegistrationStateTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandRegistrationStateTest.java @@ -41,37 +41,52 @@ public class CommandRegistrationStateTest { @Test void testRegistrationChangesState() { final TestCommandManager manager = new TestCommandManager(); - manager.command(manager.commandBuilder("test").handler(ctx -> {})); + manager.command(manager.commandBuilder("test").handler(ctx -> { + })); assertEquals(CommandManager.RegistrationState.REGISTERING, manager.getRegistrationState()); // And a second registration maintains it - manager.command(manager.commandBuilder("test2").handler(ctx -> {})); + manager.command(manager.commandBuilder("test2").handler(ctx -> { + })); assertEquals(CommandManager.RegistrationState.REGISTERING, manager.getRegistrationState()); } @Test void testChangingRegistrationHandlerFails() { final TestCommandManager manager = new TestCommandManager(); - manager.command(manager.commandBuilder("test").handler(ctx -> {})); - assertThrows(IllegalStateException.class, - () -> manager.setCommandRegistrationHandler(CommandRegistrationHandler.nullCommandRegistrationHandler())); + manager.command(manager.commandBuilder("test").handler(ctx -> { + })); + assertThrows( + IllegalStateException.class, + () -> manager.setCommandRegistrationHandler(CommandRegistrationHandler.nullCommandRegistrationHandler()) + ); } @Test void testRegistrationFailsInAfterRegistrationState() { final TestCommandManager manager = new TestCommandManager(); - manager.command(manager.commandBuilder("test").handler(ctx -> {})); + manager.command(manager.commandBuilder("test").handler(ctx -> { + })); - manager.transitionOrThrow(CommandManager.RegistrationState.REGISTERING, CommandManager.RegistrationState.AFTER_REGISTRATION); - assertThrows(IllegalStateException.class, () -> manager.command(manager.commandBuilder("test2").handler(ctx -> {}))); + manager.transitionOrThrow( + CommandManager.RegistrationState.REGISTERING, + CommandManager.RegistrationState.AFTER_REGISTRATION + ); + assertThrows(IllegalStateException.class, () -> manager.command(manager.commandBuilder("test2").handler(ctx -> { + }))); } @Test void testAllowUnsafeRegistration() { final TestCommandManager manager = new TestCommandManager(); manager.setSetting(CommandManager.ManagerSettings.ALLOW_UNSAFE_REGISTRATION, true); - manager.command(manager.commandBuilder("test").handler(ctx -> {})); - manager.transitionOrThrow(CommandManager.RegistrationState.REGISTERING, CommandManager.RegistrationState.AFTER_REGISTRATION); - manager.command(manager.commandBuilder("unsafe").handler(ctx -> {})); + manager.command(manager.commandBuilder("test").handler(ctx -> { + })); + manager.transitionOrThrow( + CommandManager.RegistrationState.REGISTERING, + CommandManager.RegistrationState.AFTER_REGISTRATION + ); + manager.command(manager.commandBuilder("unsafe").handler(ctx -> { + })); } } diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandSuggestionsTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandSuggestionsTest.java index 3f023985..0f814375 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandSuggestionsTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandSuggestionsTest.java @@ -217,8 +217,10 @@ public class CommandSuggestionsTest { Assertions.assertEquals(Arrays.asList("-1", "-2", "-3", "-4", "-5", "-6", "-7", "-8", "-9"), suggestions3); final String input4 = "numbers -1"; final List suggestions4 = manager.suggest(new TestCommandSender(), input4); - Assertions.assertEquals(Arrays.asList("-1", "-10", "-11", "-12", "-13", "-14", "-15", "-16", "-17", "-18", "-19"), - suggestions4); + Assertions.assertEquals( + Arrays.asList("-1", "-10", "-11", "-12", "-13", "-14", "-15", "-16", "-17", "-18", "-19"), + suggestions4 + ); final String input5 = "numberswithmin "; final List suggestions5 = manager.suggest(new TestCommandSender(), input5); Assertions.assertEquals(Arrays.asList("5", "6", "7", "8", "9"), suggestions5); @@ -237,8 +239,10 @@ public class CommandSuggestionsTest { Assertions.assertEquals(Arrays.asList("-1", "-2", "-3", "-4", "-5", "-6", "-7", "-8", "-9"), suggestions3); final String input4 = "numberswithfollowingargument -1"; final List suggestions4 = manager.suggest(new TestCommandSender(), input4); - Assertions.assertEquals(Arrays.asList("-1", "-10", "-11", "-12", "-13", "-14", "-15", "-16", "-17", "-18", "-19"), - suggestions4); + Assertions.assertEquals( + Arrays.asList("-1", "-10", "-11", "-12", "-13", "-14", "-15", "-16", "-17", "-18", "-19"), + suggestions4 + ); } @Test diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandTreeTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandTreeTest.java index 73477d42..82fd0959 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandTreeTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandTreeTest.java @@ -150,8 +150,8 @@ class CommandTreeTest { /* Build command for testing multiple optionals */ manager.command( manager.commandBuilder("optionals") - .argument(StringArgument.optional("opt1")) - .argument(StringArgument.optional("opt2")) + .argument(StringArgument.optional("opt1")) + .argument(StringArgument.optional("opt2")) ); } diff --git a/cloud-core/src/test/java/cloud/commandframework/ParserRegistryTest.java b/cloud-core/src/test/java/cloud/commandframework/ParserRegistryTest.java index 4637ba99..d333d9ce 100644 --- a/cloud-core/src/test/java/cloud/commandframework/ParserRegistryTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/ParserRegistryTest.java @@ -65,11 +65,11 @@ public class ParserRegistryTest { @Override public boolean equals(final Object obj) { - if (!(obj instanceof Range)) { - return false; - } - final Range range = (Range) obj; - return this.min().equals(range.min()) && this.max().equals(range.max()); + if (!(obj instanceof Range)) { + return false; + } + final Range range = (Range) obj; + return this.min().equals(range.min()) && this.max().equals(range.max()); } @Override diff --git a/cloud-core/src/test/java/cloud/commandframework/arguments/standard/StringArgumentTest.java b/cloud-core/src/test/java/cloud/commandframework/arguments/standard/StringArgumentTest.java index 1195555a..1ea6ccc0 100644 --- a/cloud-core/src/test/java/cloud/commandframework/arguments/standard/StringArgumentTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/arguments/standard/StringArgumentTest.java @@ -92,8 +92,10 @@ class StringArgumentTest { Assertions.assertEquals("quoted \" string", storage[0]); Assertions.assertEquals("unquoted", storage[1]); clear(); - Assertions.assertThrows(CompletionException.class, () -> manager.executeCommand(new TestCommandSender(), - "'quoted quoted unquoted").join()); + Assertions.assertThrows(CompletionException.class, () -> manager.executeCommand( + new TestCommandSender(), + "'quoted quoted unquoted" + ).join()); } @Test diff --git a/cloud-irc/cloud-pircbotx/build.gradle b/cloud-irc/cloud-pircbotx/build.gradle index a421c6d6..3e3a20c0 100644 --- a/cloud-irc/cloud-pircbotx/build.gradle +++ b/cloud-irc/cloud-pircbotx/build.gradle @@ -1,4 +1,4 @@ dependencies { - api project(':cloud-core') - implementation "com.github.pircbotx:pircbotx:${vers['pircbotx']}" + api project(':cloud-core') + implementation "com.github.pircbotx:pircbotx:${vers['pircbotx']}" } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationArgument.java index 571eb620..21537302 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationArgument.java @@ -80,8 +80,8 @@ public final class LocationArgument extends CommandArgument { /** * Create a new argument builder * - * @param name Argument name - * @param Command sender type + * @param name Argument name + * @param Command sender type * @return Builder instance */ public static @NonNull Builder newBuilder( @@ -93,8 +93,8 @@ public final class LocationArgument extends CommandArgument { /** * Create a new required argument * - * @param name Argument name - * @param Command sender type + * @param name Argument name + * @param Command sender type * @return Constructed argument */ public static @NonNull CommandArgument of( @@ -108,8 +108,8 @@ public final class LocationArgument extends CommandArgument { /** * Create a new optional argument * - * @param name Argument name - * @param Command sender type + * @param name Argument name + * @param Command sender type * @return Constructed argument */ public static @NonNull CommandArgument optional( diff --git a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCaptionKeys.java b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCaptionKeys.java index d2d3d607..5bc7d547 100644 --- a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCaptionKeys.java +++ b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCaptionKeys.java @@ -32,6 +32,7 @@ import java.util.LinkedList; /** * Bungee specific {@link Caption caption keys} + * * @since 1.1.0 */ public final class BungeeCaptionKeys { diff --git a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/PlayerArgument.java b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/PlayerArgument.java index d1328bee..388f9aa9 100644 --- a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/PlayerArgument.java +++ b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/PlayerArgument.java @@ -73,8 +73,8 @@ public final class PlayerArgument extends CommandArgument { /** * Create a new argument builder * - * @param name Argument name - * @param Command sender type + * @param name Argument name + * @param Command sender type * @return Constructed builder **/ public static CommandArgument.@NonNull Builder newBuilder( @@ -90,8 +90,8 @@ public final class PlayerArgument extends CommandArgument { /** * Create a new required player argument * - * @param name Argument name - * @param Command sender type + * @param name Argument name + * @param Command sender type * @return Created argument */ public static CommandArgument of( @@ -103,8 +103,8 @@ public final class PlayerArgument extends CommandArgument { /** * Create a new optional player argument * - * @param name Argument name - * @param Command sender type + * @param name Argument name + * @param Command sender type * @return Created argument */ public static CommandArgument optional( diff --git a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/ServerArgument.java b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/ServerArgument.java index eaa6006c..d7eae973 100644 --- a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/ServerArgument.java +++ b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/ServerArgument.java @@ -73,8 +73,8 @@ public final class ServerArgument extends CommandArgument { /** * Create a new argument builder * - * @param name Argument name - * @param Command sender type + * @param name Argument name + * @param Command sender type * @return Constructed builder */ public static CommandArgument.@NonNull Builder newBuilder( @@ -90,8 +90,8 @@ public final class ServerArgument extends CommandArgument { /** * Create a new required server argument * - * @param name Argument name - * @param Command sender type + * @param name Argument name + * @param Command sender type * @return Created argument */ public static @NonNull CommandArgument of( @@ -103,8 +103,8 @@ public final class ServerArgument extends CommandArgument { /** * Create a new optional server argument * - * @param name Argument name - * @param Command sender type + * @param name Argument name + * @param Command sender type * @return Created argument */ public static @NonNull CommandArgument optional( diff --git a/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstCommandManager.java b/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstCommandManager.java index 1e432d7e..60ae63f4 100644 --- a/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstCommandManager.java +++ b/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstCommandManager.java @@ -117,10 +117,12 @@ public class CloudburstCommandManager extends CommandManager { } static final class CloudListener implements Listener { + static final CloudListener INSTANCE = new CloudListener(); private CloudListener() { } + } } 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 212afdde..a81ab343 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 @@ -55,7 +55,7 @@ class PaperBrigadierListener implements Listener { ) ); this.brigadierManager.brigadierSenderMapper( - sender -> this.paperCommandManager.getCommandSenderMapper().apply(sender.getBukkitSender()) + sender -> this.paperCommandManager.getCommandSenderMapper().apply(sender.getBukkitSender()) ); new BukkitBrigadierMapper<>(this.paperCommandManager, this.brigadierManager); } diff --git a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/CloudInjectionModule.java b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/CloudInjectionModule.java index 2164dbc8..2f6ad482 100644 --- a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/CloudInjectionModule.java +++ b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/CloudInjectionModule.java @@ -71,18 +71,23 @@ public final class CloudInjectionModule extends AbstractModule { @SuppressWarnings({"unchecked", "rawtypes"}) protected void configure() { final Type commandTreeType = Types.newParameterizedType(CommandTree.class, this.commandSenderType); - final Type commandExecutionCoordinatorType = Types.newParameterizedType(CommandExecutionCoordinator.class, - this.commandSenderType); + final Type commandExecutionCoordinatorType = Types.newParameterizedType( + CommandExecutionCoordinator.class, + this.commandSenderType + ); final Type executorFunction = Types.newParameterizedType(Function.class, commandTreeType, - commandExecutionCoordinatorType); + commandExecutionCoordinatorType + ); final Key executorFunctionKey = Key.get(executorFunction); this.bind(executorFunctionKey).toInstance(this.commandExecutionCoordinator); final Type commandSenderMapperFunction = Types.newParameterizedType(Function.class, CommandSource.class, - this.commandSenderType); + this.commandSenderType + ); final Key commandSenderMapperFunctionKey = Key.get(commandSenderMapperFunction); this.bind(commandSenderMapperFunctionKey).toInstance(this.commandSenderMapper); final Type backwardsCommandSenderMapperFunction = Types.newParameterizedType(Function.class, this.commandSenderType, - CommandSource.class); + CommandSource.class + ); final Key backwardsCommandSenderMapperFunctionKey = Key.get(backwardsCommandSenderMapperFunction); this.bind(backwardsCommandSenderMapperFunctionKey).toInstance(this.backwardsCommandSenderMapper); } diff --git a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCaptionKeys.java b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCaptionKeys.java index f315c1b2..2ea22257 100644 --- a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCaptionKeys.java +++ b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCaptionKeys.java @@ -32,6 +32,7 @@ import java.util.LinkedList; /** * Velocity specific {@link Caption caption keys} + * * @since 1.1.0 */ public final class VelocityCaptionKeys { 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 a8bb2f06..2600a9d8 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 @@ -72,6 +72,7 @@ public class VelocityCommandManager extends CommandManager implements Brig private final ProxyServer proxyServer; private final Function commandSenderMapper; private final Function backwardsCommandSenderMapper; + /** * Create a new command manager instance. * diff --git a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityExecutor.java b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityExecutor.java index 66f65443..5b0ab107 100644 --- a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityExecutor.java +++ b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityExecutor.java @@ -95,7 +95,8 @@ final class VelocityExecutor implements Command { e.getCorrectSyntax(), NamedTextColor.GRAY ) - ).build()) + ).build() + ) ); } else if (throwable instanceof InvalidCommandSenderException) { this.manager.handleException( diff --git a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/PlayerArgument.java b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/PlayerArgument.java index 131f6b04..a87e11fb 100644 --- a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/PlayerArgument.java +++ b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/PlayerArgument.java @@ -73,8 +73,8 @@ public final class PlayerArgument extends CommandArgument { /** * Create a new argument builder * - * @param name Argument name - * @param Command sender type + * @param name Argument name + * @param Command sender type * @return Constructed builder */ public static CommandArgument.@NonNull Builder newBuilder( @@ -90,8 +90,8 @@ public final class PlayerArgument extends CommandArgument { /** * Create a new required player argument * - * @param name Argument name - * @param Command sender type + * @param name Argument name + * @param Command sender type * @return Created argument */ public static @NonNull CommandArgument of( @@ -103,8 +103,8 @@ public final class PlayerArgument extends CommandArgument { /** * Create a new optional player argument * - * @param name Argument name - * @param Command sender type + * @param name Argument name + * @param Command sender type * @return Created argument */ public static @NonNull CommandArgument optional( diff --git a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/ServerArgument.java b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/ServerArgument.java index 5b838d88..5cab7ad3 100644 --- a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/ServerArgument.java +++ b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/ServerArgument.java @@ -73,8 +73,8 @@ public final class ServerArgument extends CommandArgument Command sender type + * @param name Argument name + * @param Command sender type * @return Constructed builder */ public static CommandArgument.@NonNull Builder newBuilder( @@ -90,8 +90,8 @@ public final class ServerArgument extends CommandArgument Command sender type + * @param name Argument name + * @param Command sender type * @return Created argument */ public static @NonNull CommandArgument of( diff --git a/examples/example-bukkit/src/main/resources/plugin.yml b/examples/example-bukkit/src/main/resources/plugin.yml index 96114394..df7d7e3c 100644 --- a/examples/example-bukkit/src/main/resources/plugin.yml +++ b/examples/example-bukkit/src/main/resources/plugin.yml @@ -2,4 +2,4 @@ name: ExamplePlugin version: 1.2.0-SNAPSHOT api-version: 1.13 main: cloud.commandframework.examples.bukkit.ExamplePlugin -depends: [Essentials] +depends: [ Essentials ] diff --git a/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/PrivateUser.java b/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/PrivateUser.java index ea75b2e6..86f4b56d 100644 --- a/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/PrivateUser.java +++ b/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/PrivateUser.java @@ -34,7 +34,7 @@ public final class PrivateUser extends CustomUser { /** * Construct a Private user * - * @param user User that sent the message + * @param user User that sent the message * @param channel Text channel that the message was sent in */ public PrivateUser(final @NonNull User user, final @NonNull PrivateChannel channel) { diff --git a/examples/example-velocity/src/main/java/cloud/commandframework/examples/velocity/ExampleVelocityPlugin.java b/examples/example-velocity/src/main/java/cloud/commandframework/examples/velocity/ExampleVelocityPlugin.java index 3a918059..fbdfb711 100644 --- a/examples/example-velocity/src/main/java/cloud/commandframework/examples/velocity/ExampleVelocityPlugin.java +++ b/examples/example-velocity/src/main/java/cloud/commandframework/examples/velocity/ExampleVelocityPlugin.java @@ -92,8 +92,8 @@ public final class ExampleVelocityPlugin { ); commandManager.command( commandManager.commandBuilder("example-server") - .argument(ServerArgument.of("server")) - .handler(context -> { + .argument(ServerArgument.of("server")) + .handler(context -> { final RegisteredServer server = context.get("server"); context.getSender().sendMessage( Identity.nil(), @@ -103,7 +103,7 @@ public final class ExampleVelocityPlugin { Component.text(server.getServerInfo().getName(), NamedTextColor.AQUA) ).build() ); - }) + }) ); }