From 89ec3fbf29ebcdf53f89fae3a665f295b1a38486 Mon Sep 17 00:00:00 2001 From: Citymonstret Date: Fri, 10 Jun 2022 10:24:50 +0200 Subject: [PATCH] chore: make code style consistent --- .editorconfig | 4 +- .gitignore | 3 + .../annotations/AnnotationParser.java | 20 +-- .../annotations/Argument.java | 3 +- .../annotations/ArgumentExtractor.java | 1 - .../annotations/ArgumentParameterPair.java | 1 - .../annotations/CommandDescription.java | 1 - .../annotations/CommandMethod.java | 2 +- .../annotations/CommandMethodPair.java | 1 - .../annotations/CommandPermission.java | 1 - .../commandframework/annotations/Flag.java | 1 - .../annotations/FlagExtractor.java | 1 - .../annotations/MetaFactory.java | 1 - .../MethodCommandExecutionHandler.java | 2 - .../annotations/ProxiedBy.java | 1 - .../commandframework/annotations/Regex.java | 1 - .../annotations/SyntaxFragment.java | 1 - .../parsers/MethodArgumentParser.java | 1 - .../annotations/parsers/Parser.java | 1 - .../processing/CommandContainer.java | 2 +- .../MethodSuggestionsProvider.java | 1 - .../annotations/suggestions/Suggestions.java | 1 - .../annotations/AnnotationParserTest.java | 7 - .../annotations/NoOpStringProcessorTest.java | 7 +- .../annotations/TestCommandManager.java | 1 - .../feature/StringProcessingTest.java | 1 - .../CommandMethodProcessorTest.java | 4 +- .../commandframework/ArgumentDescription.java | 1 - .../commandframework/CloudCapability.java | 3 +- .../java/cloud/commandframework/Command.java | 16 +- .../commandframework/CommandComponent.java | 13 +- .../commandframework/CommandHelpHandler.java | 7 +- .../commandframework/CommandManager.java | 1 - .../cloud/commandframework/CommandTree.java | 25 ++- .../cloud/commandframework/Description.java | 1 - .../LockableCommandManager.java | 1 - .../annotations/AnnotatedElementAccessor.java | 1 - .../annotations/AnnotationAccessor.java | 6 +- .../MultiDelegateAnnotationAccessor.java | 3 +- .../injection/GuiceInjectionService.java | 3 +- .../injection/ParameterInjector.java | 1 - .../injection/ParameterInjectorRegistry.java | 7 +- .../annotations/injection/package-info.java | 2 +- .../annotations/specifier/Completions.java | 1 - .../annotations/specifier/Range.java | 1 - .../arguments/CommandArgument.java | 23 ++- .../arguments/CommandSuggestionEngine.java | 1 - .../arguments/CommandSyntaxFormatter.java | 1 - .../DelegatingCommandSuggestionEngine.java | 1 - ...egatingCommandSuggestionEngineFactory.java | 1 - .../DelegatingSuggestionsProvider.java | 1 - .../StandardCommandSyntaxFormatter.java | 2 - .../arguments/StaticArgument.java | 2 - .../arguments/compound/ArgumentPair.java | 2 - .../arguments/compound/ArgumentTriplet.java | 2 - .../arguments/compound/CompoundArgument.java | 2 - .../arguments/compound/FlagArgument.java | 10 +- .../arguments/flags/CommandFlag.java | 2 - .../arguments/flags/FlagContext.java | 9 +- .../arguments/parser/ArgumentParseResult.java | 8 +- .../arguments/parser/ArgumentParser.java | 3 +- .../parser/MappedArgumentParser.java | 2 +- .../arguments/parser/ParserParameter.java | 1 - .../arguments/parser/ParserParameters.java | 1 - .../arguments/parser/ParserRegistry.java | 1 - .../arguments/parser/StandardParameters.java | 3 +- .../parser/StandardParserRegistry.java | 9 +- .../preprocessor/RegexPreprocessor.java | 2 - .../arguments/standard/BooleanArgument.java | 4 - .../arguments/standard/ByteArgument.java | 4 - .../arguments/standard/CharArgument.java | 6 +- .../arguments/standard/DoubleArgument.java | 4 - .../arguments/standard/DurationArgument.java | 4 - .../arguments/standard/EnumArgument.java | 4 - .../arguments/standard/FloatArgument.java | 4 - .../arguments/standard/IntegerArgument.java | 4 - .../arguments/standard/LongArgument.java | 4 - .../arguments/standard/ShortArgument.java | 4 - .../arguments/standard/StringArgument.java | 4 - .../standard/StringArrayArgument.java | 2 - .../arguments/standard/UUIDArgument.java | 6 +- .../commandframework/captions/Caption.java | 1 - .../captions/CaptionRegistry.java | 1 - .../captions/CaptionVariable.java | 1 - .../CaptionVariableReplacementHandler.java | 1 - .../FactoryDelegatingCaptionRegistry.java | 1 - .../captions/SimpleCaptionRegistry.java | 1 - .../SimpleCaptionRegistryFactory.java | 1 - ...mpleCaptionVariableReplacementHandler.java | 1 - .../captions/StandardCaptionKeys.java | 1 - .../context/CommandContext.java | 6 +- .../context/CommandContextFactory.java | 1 - .../StandardCommandContextFactory.java | 1 - .../exceptions/AmbiguousNodeException.java | 1 - .../exceptions/ArgumentParseException.java | 1 - .../exceptions/CommandExecutionException.java | 3 +- .../exceptions/CommandParseException.java | 1 - .../InvalidCommandSenderException.java | 1 - .../exceptions/InvalidSyntaxException.java | 1 - .../exceptions/NoCommandInLeafException.java | 1 - .../exceptions/NoPermissionException.java | 1 - .../exceptions/NoSuchCommandException.java | 1 - .../parsing/NoInputProvidedException.java | 1 - .../parsing/NumberParseException.java | 1 - .../exceptions/parsing/ParserException.java | 1 - ...ynchronousCommandExecutionCoordinator.java | 2 - .../CommandExecutionCoordinator.java | 2 - .../execution/CommandExecutionHandler.java | 4 - .../execution/CommandResult.java | 1 - .../FilteringCommandSuggestionProcessor.java | 1 - .../AcceptingCommandPostprocessor.java | 1 - .../CommandPostprocessingContext.java | 1 - .../AcceptingCommandPreprocessor.java | 1 - .../CommandPreprocessingContext.java | 1 - .../CommandConfirmationManager.java | 2 - .../internal/CommandInputTokenizer.java | 2 - .../internal/CommandRegistrationHandler.java | 1 - .../cloud/commandframework/keys/CloudKey.java | 1 - .../commandframework/keys/CloudKeyHolder.java | 1 - .../commandframework/keys/SimpleCloudKey.java | 1 - .../commandframework/meta/CommandMeta.java | 46 +++--- .../meta/SimpleCommandMeta.java | 6 +- .../commandframework/meta/SimpleKey.java | 7 +- .../permission/AndPermission.java | 1 - .../permission/CommandPermission.java | 1 - .../permission/OrPermission.java | 1 - .../permission/Permission.java | 1 - .../permission/PredicatePermission.java | 5 +- .../WrappingPredicatePermission.java | 1 - .../types/tuples/DynamicTuple.java | 1 - .../commandframework/types/tuples/Pair.java | 1 - .../types/tuples/Quartet.java | 1 - .../types/tuples/Quintet.java | 1 - .../commandframework/types/tuples/Sextet.java | 10 +- .../types/tuples/Triplet.java | 1 - .../commandframework/types/tuples/Tuple.java | 1 - .../commandframework/util/StringUtils.java | 1 - .../AnnotationAccessorTest.java | 2 - .../CommandHelpHandlerTest.java | 14 +- .../commandframework/CommandManagerTest.java | 14 +- .../CommandPerformanceTest.java | 2 - .../CommandPermissionTest.java | 30 ++-- .../CommandPreProcessorTest.java | 2 - .../CommandRegistrationStateTest.java | 1 - .../CommandSuggestionsTest.java | 12 +- .../cloud/commandframework/CommandTest.java | 1 - .../commandframework/CommandTreeTest.java | 35 ++-- .../commandframework/ExecutionBenchmark.java | 2 - .../ParameterInjectorRegistryTest.java | 2 - .../commandframework/ParserRegistryTest.java | 5 +- .../commandframework/TestCommandSender.java | 2 +- .../arguments/standard/BooleanParserTest.java | 2 +- .../DurationArgumentSuggestionsTest.java | 2 - .../standard/DurationArgumentTest.java | 1 - .../arguments/standard/FloatParserTest.java | 2 - .../standard/StringArgumentTest.java | 1 - .../standard/StringArrayParserTest.java | 5 +- .../commandframework/issue/Issue281.java | 1 + .../commandframework/issue/Issue321.java | 4 +- .../commandframework/util/TestUtils.java | 2 - .../javacord/JavacordCommand.java | 1 - .../javacord/JavacordCommandManager.java | 1 - .../sender/JavacordCommandSender.java | 1 - .../sender/JavacordPrivateSender.java | 1 - .../javacord/sender/JavacordServerSender.java | 1 - .../jda/JDA4CommandManager.java | 1 - .../jda/JDACommandListener.java | 1 - .../jda/JDACommandManager.java | 1 - .../jda/JDACommandPreprocessor.java | 5 +- .../jda/JDACommandSender.java | 1 - .../commandframework/jda/JDAGuildSender.java | 1 - .../jda/JDAPrivateSender.java | 1 - .../jda/parsers/ChannelArgument.java | 6 - .../jda/parsers/RoleArgument.java | 6 - .../jda/parsers/UserArgument.java | 6 - .../pircbotx/CloudListenerAdapter.java | 1 - .../pircbotx/PircBotXCommandManager.java | 1 - .../pircbotx/arguments/UserArgument.java | 4 - .../brigadier/BrigadierManagerHolder.java | 1 - .../brigadier/BrigadierMapping.java | 8 +- .../brigadier/BrigadierMappingBuilder.java | 2 - .../brigadier/CloudBrigadierManager.java | 12 +- .../argument/QueueAsStringReader.java | 2 +- .../argument/StringReaderAsQueue.java | 2 +- .../argument/StringReaderAsQueueImpl.java | 3 +- .../argument/WrappedBrigadierParser.java | 5 +- .../argument/QueueAsStringReaderTest.java | 1 - .../argument/StringReaderAsQueueTest.java | 5 +- .../bukkit/BukkitBrigadierMapper.java | 1 - .../bukkit/BukkitCaptionKeys.java | 1 - .../bukkit/BukkitCaptionRegistry.java | 1 - .../bukkit/BukkitCaptionRegistryFactory.java | 1 - .../bukkit/BukkitCommandContextKeys.java | 1 - .../bukkit/BukkitCommandManager.java | 2 - .../bukkit/BukkitCommandMeta.java | 1 - .../bukkit/BukkitCommandMetaBuilder.java | 3 - .../bukkit/BukkitCommandPreprocessor.java | 1 - .../bukkit/BukkitCommandSender.java | 1 - .../bukkit/BukkitConsoleSender.java | 1 - .../bukkit/BukkitParserParameters.java | 1 - .../bukkit/BukkitPlayerSender.java | 1 - .../BukkitPluginRegistrationHandler.java | 6 +- .../bukkit/BukkitSynchronizer.java | 1 - .../bukkit/CloudBukkitCapabilities.java | 2 +- .../bukkit/CloudCommodoreManager.java | 5 +- .../argument/NamespacedKeyArgument.java | 4 - .../arguments/selector/EntitySelector.java | 1 - .../selector/MultipleEntitySelector.java | 1 - .../selector/MultiplePlayerSelector.java | 1 - .../selector/SingleEntitySelector.java | 1 - .../selector/SinglePlayerSelector.java | 1 - .../bukkit/data/BlockPredicate.java | 1 - .../bukkit/data/ProtoItemStack.java | 1 - .../BukkitBackwardsBrigadierSenderMapper.java | 1 - .../internal/CommandBuildContextSupplier.java | 1 - .../internal/CraftBukkitReflection.java | 1 - .../internal/MinecraftArgumentTypes.java | 4 +- .../bukkit/internal/RegistryReflection.java | 1 + .../parsers/BlockPredicateArgument.java | 4 - .../bukkit/parsers/EnchantmentArgument.java | 16 +- .../bukkit/parsers/ItemStackArgument.java | 7 - .../parsers/ItemStackPredicateArgument.java | 4 - .../bukkit/parsers/MaterialArgument.java | 6 +- .../bukkit/parsers/OfflinePlayerArgument.java | 4 - .../bukkit/parsers/PlayerArgument.java | 4 - .../bukkit/parsers/WorldArgument.java | 4 - .../bukkit/parsers/location/Location2D.java | 1 - .../parsers/location/Location2DArgument.java | 3 - .../parsers/location/LocationArgument.java | 5 - .../parsers/location/LocationCoordinate.java | 1 - .../location/LocationCoordinateParser.java | 1 - .../MultipleEntitySelectorArgument.java | 3 - .../MultiplePlayerSelectorArgument.java | 3 - .../selector/SelectorParseException.java | 2 - .../SingleEntitySelectorArgument.java | 3 - .../SinglePlayerSelectorArgument.java | 3 - .../bungee/BungeeCaptionKeys.java | 1 - .../bungee/BungeeCommand.java | 7 +- .../bungee/BungeeCommandManager.java | 1 - .../bungee/BungeeCommandPreprocessor.java | 1 - .../bungee/BungeeContextKeys.java | 1 - .../BungeePluginRegistrationHandler.java | 1 - .../bungee/arguments/PlayerArgument.java | 4 - .../bungee/arguments/ServerArgument.java | 4 - .../cloudburst/CloudburstCommand.java | 7 +- .../cloudburst/CloudburstCommandManager.java | 2 - .../CloudburstPluginRegistrationHandler.java | 1 - .../fabric/FabricCaptionKeys.java | 1 - .../fabric/FabricCaptionRegistry.java | 2 - .../fabric/FabricClientCommandManager.java | 5 +- .../fabric/FabricCommandContextKeys.java | 1 - .../fabric/FabricCommandManager.java | 32 ++-- .../fabric/FabricCommandPreprocessor.java | 7 +- .../FabricCommandRegistrationHandler.java | 47 +++--- .../fabric/FabricExecutor.java | 2 +- .../fabric/FabricParserParameters.java | 1 - .../fabric/FabricServerCommandManager.java | 1 - .../fabric/argument/AngleArgument.java | 5 +- .../fabric/argument/AxisArgument.java | 2 - .../fabric/argument/CompoundTagArgument.java | 2 - .../fabric/argument/EntityAnchorArgument.java | 11 +- .../argument/FabricArgumentParsers.java | 41 +++-- .../fabric/argument/FloatRangeArgument.java | 2 - .../fabric/argument/IntRangeArgument.java | 2 - .../fabric/argument/ItemInputArgument.java | 3 - .../fabric/argument/MobEffectArgument.java | 2 - .../fabric/argument/NamedColorArgument.java | 2 - .../fabric/argument/NbtPathArgument.java | 8 +- .../fabric/argument/NbtTagArgument.java | 2 - .../argument/ObjectiveCriteriaArgument.java | 2 - .../fabric/argument/ParticleArgument.java | 2 - .../argument/RegistryEntryArgument.java | 4 - .../argument/ResourceLocationArgument.java | 2 - .../argument/ScoreboardOperationArgument.java | 2 - .../fabric/argument/SidedArgumentParser.java | 1 - .../fabric/argument/TeamArgument.java | 4 - .../fabric/argument/TimeArgument.java | 2 - .../argument/server/BlockPosArgument.java | 2 - .../argument/server/ColumnPosArgument.java | 2 - .../argument/server/MessageArgument.java | 2 - .../MultipleEntitySelectorArgument.java | 2 - .../MultiplePlayerSelectorArgument.java | 2 - .../server/SingleEntitySelectorArgument.java | 2 - .../server/SinglePlayerSelectorArgument.java | 2 - .../fabric/argument/server/Vec2dArgument.java | 2 - .../fabric/argument/server/Vec3dArgument.java | 2 - .../fabric/data/Coordinates.java | 1 - .../commandframework/fabric/data/Message.java | 1 - .../fabric/data/MinecraftTime.java | 1 - .../fabric/data/Selector.java | 2 - .../fabric/internal/CloudStringReader.java | 1 - .../fabric/internal/EntitySelectorAccess.java | 1 - .../internal/LateRegistrationCatcher.java | 1 - .../fabric/mixin/CommandsMixin.java | 1 - .../fabric/mixin/EntitySelectorMixin.java | 1 - .../mixin/EntitySelectorParserMixin.java | 1 - .../mixin/MessageArgumentMessageAccess.java | 4 +- .../mixin/MessageArgumentPartAccess.java | 4 +- .../fabric/testmod/FabricClientExample.java | 1 - .../fabric/testmod/FabricExample.java | 11 +- .../testmod/mixin/GiveCommandAccess.java | 1 - .../minecraft/extras/AudienceProvider.java | 1 - .../minecraft/extras/ComponentHelper.java | 1 - .../extras/MinecraftExceptionHandler.java | 1 - .../extras/MinecraftExtrasMetaKeys.java | 1 - .../minecraft/extras/MinecraftHelp.java | 19 +-- .../extras/NativeAudienceProvider.java | 1 - .../minecraft/extras/Pagination.java | 1 - .../minecraft/extras/RichDescription.java | 6 +- .../minecraft/extras/TextColorArgument.java | 3 - .../AsyncCommandSuggestionsListener.java | 1 - .../paper/PaperBrigadierListener.java | 1 - .../paper/PaperBrigadierMapper.java | 1 - .../paper/PaperCommandManager.java | 1 - .../paper/argument/KeyedWorldArgument.java | 3 - .../sponge7/CloudCommandCallable.java | 153 ++++++++++-------- .../sponge7/CloudInjectionModule.java | 1 - .../sponge7/SpongeCommandManager.java | 9 +- .../sponge7/SpongeMetaKeys.java | 1 - .../SpongePluginRegistrationHandler.java | 14 +- .../velocity/CloudInjectionModule.java | 1 - .../velocity/VelocityCaptionKeys.java | 1 - .../velocity/VelocityCommandManager.java | 1 - .../velocity/VelocityCommandPreprocessor.java | 1 - .../velocity/VelocityContextKeys.java | 1 - .../velocity/VelocityExecutor.java | 11 +- .../VelocityPluginRegistrationHandler.java | 1 - .../velocity/arguments/PlayerArgument.java | 4 - .../velocity/arguments/ServerArgument.java | 4 - .../services/AnnotatedMethodService.java | 1 - .../AnnotatedMethodServiceFactory.java | 2 - .../services/ChunkedRequestContext.java | 1 - .../services/PipelineException.java | 1 - .../services/ServiceFilterHandler.java | 1 - .../services/ServicePipeline.java | 1 - .../services/ServicePipelineBuilder.java | 1 - .../services/ServicePump.java | 1 - .../services/ServiceRepository.java | 8 +- .../services/ServiceSpigot.java | 1 - .../services/annotations/Order.java | 1 - .../annotations/ServiceImplementation.java | 1 - .../services/types/ConsumerService.java | 2 - .../services/types/PartialResultService.java | 1 - .../services/types/Service.java | 1 - .../services/types/SideEffectService.java | 1 - .../services/ServicesTest.java | 16 +- .../services/mock/AnnotatedMethodTest.java | 1 - .../mock/CompletingPartialResultService.java | 1 - .../services/mock/DefaultMockService.java | 2 - .../mock/DefaultPartialRequestService.java | 1 - .../mock/DefaultSideEffectService.java | 1 - .../mock/InterruptingMockConsumer.java | 1 - .../services/mock/MockChunkedRequest.java | 3 - .../services/mock/MockOrderedFirst.java | 1 - .../services/mock/MockOrderedLast.java | 1 - .../services/mock/MockResultConsumer.java | 1 - .../services/mock/MockService.java | 3 - .../services/mock/MockSideEffectService.java | 2 - .../services/mock/SecondaryMockService.java | 1 - .../mock/SecondaryMockSideEffectService.java | 1 - .../mock/StateSettingConsumerService.java | 1 - .../commandframework/tasks/TaskConsumer.java | 1 - .../commandframework/tasks/TaskFactory.java | 1 - .../commandframework/tasks/TaskFunction.java | 1 - .../commandframework/tasks/TaskRecipe.java | 3 - .../tasks/TaskSynchronizer.java | 1 - .../examples/bukkit/ExamplePlugin.java | 2 - .../examples/bukkit/Mc113.java | 2 +- .../examples/bungee/ExamplePlugin.java | 1 - .../examples/javacord/ExampleBot.java | 1 - .../application/ExampleApplication.java | 1 - .../components/CommandsComponent.java | 1 - .../components/DiscordApiComponent.java | 1 - .../javacord/modules/ExampleModule.java | 1 - .../examples/jda/CustomUser.java | 1 - .../examples/jda/ExampleBot.java | 1 - .../examples/jda/GuildUser.java | 7 +- .../examples/jda/PermissionRegistry.java | 1 - .../examples/jda/PrivateUser.java | 7 +- .../velocity/ExampleVelocityPlugin.java | 1 - 380 files changed, 479 insertions(+), 936 deletions(-) diff --git a/.editorconfig b/.editorconfig index c1371075..c47b54d5 100644 --- a/.editorconfig +++ b/.editorconfig @@ -88,7 +88,7 @@ ij_java_blank_lines_around_field_in_interface = 0 ij_java_blank_lines_around_initializer = 1 ij_java_blank_lines_around_method = 1 ij_java_blank_lines_around_method_in_interface = 1 -ij_java_blank_lines_before_class_end = 1 +ij_java_blank_lines_before_class_end = 0 ij_java_blank_lines_before_imports = 1 ij_java_blank_lines_before_method_body = 0 ij_java_blank_lines_before_package = 0 @@ -141,7 +141,7 @@ ij_java_imports_layout = *,|,$* ij_java_indent_case_from_switch = true ij_java_insert_inner_class_imports = false ij_java_insert_override_annotation = true -ij_java_keep_blank_lines_before_right_brace = 2 +ij_java_keep_blank_lines_before_right_brace = 0 ij_java_keep_blank_lines_between_package_declaration_and_header = 2 ij_java_keep_blank_lines_in_code = 2 ij_java_keep_blank_lines_in_declarations = 2 diff --git a/.gitignore b/.gitignore index 28960dbe..dfea27d5 100644 --- a/.gitignore +++ b/.gitignore @@ -227,3 +227,6 @@ gradle-app.setting /run/ /cloud-minecraft/cloud-fabric/run/ + +# MacOS +**/.DS_Store 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 279ec181..8a0fbbe6 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/AnnotationParser.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/AnnotationParser.java @@ -214,7 +214,7 @@ public final class AnnotationParser { * custom command method execution strategies. * * @param predicate The predicate that decides whether or not to apply the custom execution handler to the given method - * @param function The function that produces the command execution handler + * @param function The function that produces the command execution handler * @since 1.6.0 */ public void registerCommandExecutionMethodFactory( @@ -331,8 +331,8 @@ public final class AnnotationParser { * * @return Collection of parsed commands * @throws Exception re-throws all encountered exceptions. - * @since 1.7.0 * @see cloud.commandframework.annotations.processing.CommandContainer CommandContainer for more information. + * @since 1.7.0 */ public @NonNull Collection<@NonNull Command> parseContainers() throws Exception { final List> commands = new LinkedList<>(); @@ -600,11 +600,11 @@ public final class AnnotationParser { try { final MethodCommandExecutionHandler.CommandMethodContext context = new MethodCommandExecutionHandler.CommandMethodContext<>( - instance, - commandArguments, - method, - this /* annotationParser */ - ); + instance, + commandArguments, + method, + this /* annotationParser */ + ); /* Create the command execution handler */ CommandExecutionHandler commandExecutionHandler = new MethodCommandExecutionHandler<>(context); @@ -635,8 +635,9 @@ public final class AnnotationParser { /* Apply builder modifiers */ for (final Annotation annotation : AnnotationAccessor.of(classAnnotations, AnnotationAccessor.of(method)).annotations()) { - @SuppressWarnings("rawtypes") - final BiFunction builderModifier = this.builderModifiers.get(annotation.annotationType()); + @SuppressWarnings("rawtypes") final BiFunction builderModifier = this.builderModifiers.get( + annotation.annotationType() + ); if (builderModifier == null) { continue; } @@ -774,5 +775,4 @@ public final class AnnotationParser { @NonNull Function<@NonNull ? extends Annotation, @NonNull ParserParameters>> getAnnotationMappers() { return this.annotationMappers; } - } diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/Argument.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/Argument.java index 231e33bc..6ce78650 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/Argument.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/Argument.java @@ -41,7 +41,7 @@ public @interface Argument { * The name of the argument that this parameter is bound to. * This value must be overridden unless you have explicitly enabled * the preservation of parameter names in your compiler options. - * + *

* If the parameter names are preserved and the name of the bound * argument is the same as the parameter name, the default value * may be used. @@ -86,5 +86,4 @@ public @interface Argument { * @return Argument description */ @NonNull String description() default ""; - } diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/ArgumentExtractor.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/ArgumentExtractor.java index 8b988ecc..910c6569 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/ArgumentExtractor.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/ArgumentExtractor.java @@ -47,5 +47,4 @@ class ArgumentExtractor implements Function<@NonNull Method, @NonNull Collection } return arguments; } - } diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/ArgumentParameterPair.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/ArgumentParameterPair.java index 5e8b08ab..67e0bcf3 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/ArgumentParameterPair.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/ArgumentParameterPair.java @@ -54,5 +54,4 @@ final class ArgumentParameterPair { return this.argument.value(); } } - } diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandDescription.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandDescription.java index 7a8bc1e5..32dcbabc 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandDescription.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandDescription.java @@ -43,5 +43,4 @@ public @interface CommandDescription { * @return Command syntax */ @NonNull String value() default ""; - } diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandMethod.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandMethod.java index ca831331..7fa28b78 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandMethod.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandMethod.java @@ -35,6 +35,7 @@ import org.checkerframework.checker.nullness.qual.NonNull; @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD, ElementType.TYPE}) public @interface CommandMethod { + String ANNOTATION_PATH = "cloud.commandframework.annotations.CommandMethod"; /** @@ -50,5 +51,4 @@ public @interface CommandMethod { * @return Required sender */ @NonNull Class requiredSender() default Object.class; - } diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandMethodPair.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandMethodPair.java index 693fbe19..b892bee9 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandMethodPair.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandMethodPair.java @@ -46,5 +46,4 @@ final class CommandMethodPair { @NonNull CommandMethod getCommandMethod() { return this.commandMethod; } - } diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandPermission.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandPermission.java index fcd4afe3..d420a2be 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandPermission.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandPermission.java @@ -42,5 +42,4 @@ public @interface CommandPermission { * @return Command permission */ @NonNull String value() default ""; - } diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/Flag.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/Flag.java index 7b390077..faf9a680 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/Flag.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/Flag.java @@ -94,5 +94,4 @@ public @interface Flag { * @since 1.6.0 */ @NonNull String permission() default ""; - } diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/FlagExtractor.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/FlagExtractor.java index 4dfc1da3..59c4bed7 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/FlagExtractor.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/FlagExtractor.java @@ -116,5 +116,4 @@ final class FlagExtractor implements Function<@NonNull Method, Collection<@NonNu } return flags; } - } diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/MetaFactory.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/MetaFactory.java index e668a986..c9b40530 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/MetaFactory.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/MetaFactory.java @@ -55,5 +55,4 @@ class MetaFactory implements Function<@NonNull Method, @NonNull CommandMeta> { }); return this.metaMapper.apply(parameters); } - } 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 12854e44..92143e9e 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/MethodCommandExecutionHandler.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/MethodCommandExecutionHandler.java @@ -273,7 +273,5 @@ public class MethodCommandExecutionHandler implements CommandExecutionHandler public @NonNull AnnotationParser annotationParser() { return this.annotationParser; } - } - } diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/ProxiedBy.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/ProxiedBy.java index 7594664d..ada09adf 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/ProxiedBy.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/ProxiedBy.java @@ -51,5 +51,4 @@ public @interface ProxiedBy { * @return {@code true} if the proxying command should be hidden, {@code false} if not */ boolean hidden() default false; - } diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/Regex.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/Regex.java index 042c081b..a25dcde3 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/Regex.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/Regex.java @@ -52,5 +52,4 @@ public @interface Regex { * @return Failure caption key */ @NonNull String failureCaption() default "argument.parse.failure.regex"; - } diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/SyntaxFragment.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/SyntaxFragment.java index 3252204d..ce35854b 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/SyntaxFragment.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/SyntaxFragment.java @@ -75,5 +75,4 @@ public final class SyntaxFragment { public @NonNull ArgumentMode getArgumentMode() { return this.argumentMode; } - } diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/parsers/MethodArgumentParser.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/parsers/MethodArgumentParser.java index 2038ed5f..7f2d1503 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/parsers/MethodArgumentParser.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/parsers/MethodArgumentParser.java @@ -85,5 +85,4 @@ public final class MethodArgumentParser implements ArgumentParser { ) { return this.suggestionProvider.apply(commandContext, input); } - } diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/parsers/Parser.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/parsers/Parser.java index 976bddca..00c0c52a 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/parsers/Parser.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/parsers/Parser.java @@ -66,5 +66,4 @@ public @interface Parser { * @return The name of the suggestion provider, or {@code ""} */ String suggestions() default ""; - } diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/processing/CommandContainer.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/processing/CommandContainer.java index ddb73026..14c27937 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/processing/CommandContainer.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/processing/CommandContainer.java @@ -51,6 +51,6 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface CommandContainer { - String ANNOTATION_PATH = "cloud.commandframework.annotations.processing.CommandContainer"; + String ANNOTATION_PATH = "cloud.commandframework.annotations.processing.CommandContainer"; } diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/suggestions/MethodSuggestionsProvider.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/suggestions/MethodSuggestionsProvider.java index 5e3dfe21..693901d2 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/suggestions/MethodSuggestionsProvider.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/suggestions/MethodSuggestionsProvider.java @@ -64,5 +64,4 @@ public final class MethodSuggestionsProvider implements BiFunction { ) { return !permission.equalsIgnoreCase("no"); } - } diff --git a/cloud-annotations/src/test/java/cloud/commandframework/annotations/feature/StringProcessingTest.java b/cloud-annotations/src/test/java/cloud/commandframework/annotations/feature/StringProcessingTest.java index 83ab7e31..cb224df7 100644 --- a/cloud-annotations/src/test/java/cloud/commandframework/annotations/feature/StringProcessingTest.java +++ b/cloud-annotations/src/test/java/cloud/commandframework/annotations/feature/StringProcessingTest.java @@ -41,7 +41,6 @@ import cloud.commandframework.meta.CommandMeta; import com.google.common.collect.ImmutableMap; import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.concurrent.ThreadLocalRandom; import java.util.stream.Collectors; import org.junit.jupiter.api.BeforeEach; diff --git a/cloud-annotations/src/test/java/cloud/commandframework/annotations/processing/CommandMethodProcessorTest.java b/cloud-annotations/src/test/java/cloud/commandframework/annotations/processing/CommandMethodProcessorTest.java index 1ca25bcc..77200989 100644 --- a/cloud-annotations/src/test/java/cloud/commandframework/annotations/processing/CommandMethodProcessorTest.java +++ b/cloud-annotations/src/test/java/cloud/commandframework/annotations/processing/CommandMethodProcessorTest.java @@ -74,7 +74,9 @@ public class CommandMethodProcessorTest { // Assert assertThat(compilation).failed(); - assertThat(compilation).hadErrorContaining("Required argument 'required' cannot succeed an optional argument (commandMethod)"); + assertThat(compilation).hadErrorContaining( + "Required argument 'required' cannot succeed an optional argument (commandMethod)" + ); } @Test diff --git a/cloud-core/src/main/java/cloud/commandframework/ArgumentDescription.java b/cloud-core/src/main/java/cloud/commandframework/ArgumentDescription.java index c6d52329..b48007a1 100644 --- a/cloud-core/src/main/java/cloud/commandframework/ArgumentDescription.java +++ b/cloud-core/src/main/java/cloud/commandframework/ArgumentDescription.java @@ -77,5 +77,4 @@ public interface ArgumentDescription { default boolean isEmpty() { return this.getDescription().isEmpty(); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/CloudCapability.java b/cloud-core/src/main/java/cloud/commandframework/CloudCapability.java index 98090007..b5e24204 100644 --- a/cloud-core/src/main/java/cloud/commandframework/CloudCapability.java +++ b/cloud-core/src/main/java/cloud/commandframework/CloudCapability.java @@ -39,7 +39,8 @@ public interface CloudCapability { * * @return the name of the capability */ - @Override @NonNull String toString(); + @Override + @NonNull String toString(); /** diff --git a/cloud-core/src/main/java/cloud/commandframework/Command.java b/cloud-core/src/main/java/cloud/commandframework/Command.java index e3544d4c..5cdc4202 100644 --- a/cloud-core/src/main/java/cloud/commandframework/Command.java +++ b/cloud-core/src/main/java/cloud/commandframework/Command.java @@ -158,8 +158,8 @@ public class Command { * @param senderType Required sender type. May be {@code null} * @param commandPermission Command permission * @param commandMeta Command meta instance - * @deprecated Map does not allow for the same literal or variable argument name to repeat * @see #Command(List, CommandExecutionHandler, Class, CommandPermission, CommandMeta) + * @deprecated Map does not allow for the same literal or variable argument name to repeat */ @Deprecated @API(status = API.Status.DEPRECATED) @@ -180,8 +180,8 @@ public class Command { * @param commandExecutionHandler Execution handler * @param senderType Required sender type. May be {@code null} * @param commandMeta Command meta instance - * @deprecated Map does not allow for the same literal or variable argument name to repeat * @see #Command(List, CommandExecutionHandler, Class, CommandMeta) + * @deprecated Map does not allow for the same literal or variable argument name to repeat */ @Deprecated @API(status = API.Status.DEPRECATED) @@ -201,8 +201,8 @@ public class Command { * @param commandExecutionHandler Execution handler * @param commandPermission Command permission * @param commandMeta Command meta instance - * @deprecated Map does not allow for the same literal or variable argument name to repeat * @see #Command(List, CommandExecutionHandler, CommandPermission, CommandMeta) + * @deprecated Map does not allow for the same literal or variable argument name to repeat */ @Deprecated @API(status = API.Status.DEPRECATED) @@ -372,7 +372,7 @@ public class Command { * @return Argument description * @throws IllegalArgumentException If the command argument does not exist * @deprecated More than one matching command argument may exist per command. - * Use {@link #getArguments()} and search in that, instead. + * Use {@link #getArguments()} and search in that, instead. */ @Deprecated @API(status = API.Status.DEPRECATED) @@ -807,7 +807,7 @@ public class Command { * @param Output type * @return Builder instance with the argument inserted * @deprecated for removal since 1.4.0. Use - * {@link #argumentPair(String, TypeToken, Pair, Pair, BiFunction, ArgumentDescription)} instead. + * {@link #argumentPair(String, TypeToken, Pair, Pair, BiFunction, ArgumentDescription)} instead. */ @Deprecated @API(status = API.Status.DEPRECATED, since = "1.4.0") @@ -879,7 +879,7 @@ public class Command { * @param Third type * @return Builder instance with the argument inserted * @deprecated for removal since 1.4.0. Use {@link #argumentTriplet(String, Triplet, Triplet, ArgumentDescription)} - * instead. + * instead. */ @Deprecated @API(status = API.Status.DEPRECATED, since = "1.4.0") @@ -945,7 +945,7 @@ public class Command { * @param Output type * @return Builder instance with the argument inserted * @deprecated for removal since 1.4.0, use - * {@link #argumentTriplet(String, TypeToken, Triplet, Triplet, BiFunction, ArgumentDescription)} instead. + * {@link #argumentTriplet(String, TypeToken, Triplet, Triplet, BiFunction, ArgumentDescription)} instead. */ @Deprecated @API(status = API.Status.DEPRECATED, since = "1.4.0") @@ -1199,7 +1199,5 @@ public class Command { this.commandMeta ); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/CommandComponent.java b/cloud-core/src/main/java/cloud/commandframework/CommandComponent.java index c2581512..e348c9d2 100644 --- a/cloud-core/src/main/java/cloud/commandframework/CommandComponent.java +++ b/cloud-core/src/main/java/cloud/commandframework/CommandComponent.java @@ -43,7 +43,7 @@ public final class CommandComponent { /** * Initializes a new CommandComponent * - * @param commandArgument Command Component Argument + * @param commandArgument Command Component Argument * @param commandDescription Command Component Description */ private CommandComponent( @@ -111,14 +111,15 @@ public final class CommandComponent { @Override public @NonNull String toString() { return String.format("%s{argument=%s,description=%s}", this.getClass().getSimpleName(), - this.argument, this.description); + this.argument, this.description + ); } /** * Creates a new CommandComponent with the provided argument and description * - * @param Command sender type - * @param commandArgument Command Component Argument + * @param Command sender type + * @param commandArgument Command Component Argument * @param commandDescription Command Component Description * @return new CommandComponent * @deprecated for removal since 1.4.0. Use {@link #of(CommandArgument, ArgumentDescription)} instead. @@ -135,8 +136,8 @@ public final class CommandComponent { /** * Creates a new CommandComponent with the provided argument and description * - * @param Command sender type - * @param commandArgument Command Component Argument + * @param Command sender type + * @param commandArgument Command Component Argument * @param commandDescription Command Component Description * @return new CommandComponent */ diff --git a/cloud-core/src/main/java/cloud/commandframework/CommandHelpHandler.java b/cloud-core/src/main/java/cloud/commandframework/CommandHelpHandler.java index 7d05d775..d58542c8 100644 --- a/cloud-core/src/main/java/cloud/commandframework/CommandHelpHandler.java +++ b/cloud-core/src/main/java/cloud/commandframework/CommandHelpHandler.java @@ -381,7 +381,6 @@ public final class CommandHelpHandler { public int hashCode() { return Objects.hash(this.command, this.syntaxString, this.description); } - } @@ -440,7 +439,6 @@ public final class CommandHelpHandler { public int hashCode() { return Objects.hash(this.entries); } - } @@ -483,7 +481,7 @@ public final class CommandHelpHandler { public String toString() { return "VerboseHelpTopic{" + "command=" + this.command - + ", description='" +this.description + '\'' + + ", description='" + this.description + '\'' + '}'; } @@ -503,7 +501,6 @@ public final class CommandHelpHandler { public int hashCode() { return Objects.hash(this.command, this.description); } - } @@ -568,7 +565,5 @@ public final class CommandHelpHandler { public int hashCode() { return Objects.hash(this.longestPath, this.childSuggestions); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/CommandManager.java b/cloud-core/src/main/java/cloud/commandframework/CommandManager.java index 96678f10..e0767bbe 100644 --- a/cloud-core/src/main/java/cloud/commandframework/CommandManager.java +++ b/cloud-core/src/main/java/cloud/commandframework/CommandManager.java @@ -1210,5 +1210,4 @@ public abstract class CommandManager { */ AFTER_REGISTRATION } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/CommandTree.java b/cloud-core/src/main/java/cloud/commandframework/CommandTree.java index 60f79a4d..cad141e6 100644 --- a/cloud-core/src/main/java/cloud/commandframework/CommandTree.java +++ b/cloud-core/src/main/java/cloud/commandframework/CommandTree.java @@ -139,11 +139,10 @@ public final class CommandTree { return Pair.of( null, new NoSuchCommandException( - commandContext.getSender(), - new ArrayList<>(), - this.stringOrEmpty(args.peek() + commandContext.getSender(), + new ArrayList<>(), + this.stringOrEmpty(args.peek()) ) - ) ); } @@ -304,10 +303,10 @@ public final class CommandTree { if (!commandQueue.isEmpty()) { final String literal = commandQueue.peek(); final boolean matchesLiteral = children.stream() - .filter(n -> n.getValue() instanceof StaticArgument) - .map(n -> (StaticArgument) n.getValue()) - .flatMap(arg -> Stream.concat(Stream.of(arg.getName()), arg.getAliases().stream())) - .anyMatch(arg -> arg.equals(literal)); + .filter(n -> n.getValue() instanceof StaticArgument) + .map(n -> (StaticArgument) n.getValue()) + .flatMap(arg -> Stream.concat(Stream.of(arg.getName()), arg.getAliases().stream())) + .anyMatch(arg -> arg.equals(literal)); if (matchesLiteral) { return Pair.of(null, null); @@ -381,8 +380,8 @@ public final class CommandTree { return Pair.of(null, new InvalidSyntaxException( this.commandManager.getCommandSyntaxFormatter() .apply(Objects.requireNonNull( - child.getValue() - .getOwningCommand()) + child.getValue() + .getOwningCommand()) .getArguments(), child), commandContext.getSender(), this.getChain(root) .stream() @@ -849,8 +848,8 @@ public final class CommandTree { } // List of child nodes that are static arguments, with fixed values - @SuppressWarnings({ "rawtypes", "unchecked" }) - final List>> childStaticArguments = node.children.stream() + @SuppressWarnings({"rawtypes", "unchecked"}) final List>> childStaticArguments = node.children + .stream() .filter(n -> n.getValue() instanceof StaticArgument) .map(n -> (Node>) ((Node) n)) .collect(Collectors.toList()); @@ -1091,7 +1090,5 @@ public final class CommandTree { public String toString() { return "Node{value=" + this.value + '}'; } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/Description.java b/cloud-core/src/main/java/cloud/commandframework/Description.java index 4c954b7c..a33dd5c3 100644 --- a/cloud-core/src/main/java/cloud/commandframework/Description.java +++ b/cloud-core/src/main/java/cloud/commandframework/Description.java @@ -89,5 +89,4 @@ public final class Description implements ArgumentDescription { public @NonNull String toString() { return this.description; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/LockableCommandManager.java b/cloud-core/src/main/java/cloud/commandframework/LockableCommandManager.java index a4858260..4269ca5b 100644 --- a/cloud-core/src/main/java/cloud/commandframework/LockableCommandManager.java +++ b/cloud-core/src/main/java/cloud/commandframework/LockableCommandManager.java @@ -73,5 +73,4 @@ public abstract class LockableCommandManager extends CommandManager { protected final void lockWrites() { this.lockRegistration(); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/annotations/AnnotatedElementAccessor.java b/cloud-core/src/main/java/cloud/commandframework/annotations/AnnotatedElementAccessor.java index 0cee8fbc..4fe59d93 100644 --- a/cloud-core/src/main/java/cloud/commandframework/annotations/AnnotatedElementAccessor.java +++ b/cloud-core/src/main/java/cloud/commandframework/annotations/AnnotatedElementAccessor.java @@ -53,5 +53,4 @@ final class AnnotatedElementAccessor implements AnnotationAccessor { public @NonNull Collection<@NonNull Annotation> annotations() { return Collections.unmodifiableCollection(Arrays.asList(this.element.getAnnotations())); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/annotations/AnnotationAccessor.java b/cloud-core/src/main/java/cloud/commandframework/annotations/AnnotationAccessor.java index ce7633a1..f60c7330 100644 --- a/cloud-core/src/main/java/cloud/commandframework/annotations/AnnotationAccessor.java +++ b/cloud-core/src/main/java/cloud/commandframework/annotations/AnnotationAccessor.java @@ -71,7 +71,7 @@ public interface AnnotationAccessor { * @since 1.4.0 */ @API(status = API.Status.STABLE, since = "1.4.0") - static @NonNull AnnotationAccessor of(final @NonNull AnnotationAccessor@NonNull... accessors) { + static @NonNull AnnotationAccessor of(final @NonNull AnnotationAccessor @NonNull... accessors) { return new MultiDelegateAnnotationAccessor(accessors); } @@ -104,14 +104,12 @@ public interface AnnotationAccessor { @Override public @Nullable A annotation(final @NonNull Class clazz) { - return null; + return null; } @Override public @NonNull Collection<@NonNull Annotation> annotations() { return Collections.emptyList(); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/annotations/MultiDelegateAnnotationAccessor.java b/cloud-core/src/main/java/cloud/commandframework/annotations/MultiDelegateAnnotationAccessor.java index 790be4a7..74cd7ade 100644 --- a/cloud-core/src/main/java/cloud/commandframework/annotations/MultiDelegateAnnotationAccessor.java +++ b/cloud-core/src/main/java/cloud/commandframework/annotations/MultiDelegateAnnotationAccessor.java @@ -37,7 +37,7 @@ final class MultiDelegateAnnotationAccessor implements AnnotationAccessor { private final AnnotationAccessor[] accessors; - MultiDelegateAnnotationAccessor(final @NonNull AnnotationAccessor@NonNull... accessors) { + MultiDelegateAnnotationAccessor(final @NonNull AnnotationAccessor @NonNull... accessors) { this.accessors = accessors; } @@ -61,5 +61,4 @@ final class MultiDelegateAnnotationAccessor implements AnnotationAccessor { } return Collections.unmodifiableCollection(annotationList); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/annotations/injection/GuiceInjectionService.java b/cloud-core/src/main/java/cloud/commandframework/annotations/injection/GuiceInjectionService.java index c6be597b..4a6f219c 100644 --- a/cloud-core/src/main/java/cloud/commandframework/annotations/injection/GuiceInjectionService.java +++ b/cloud-core/src/main/java/cloud/commandframework/annotations/injection/GuiceInjectionService.java @@ -51,7 +51,7 @@ public final class GuiceInjectionService implements InjectionService { * Create a new Guice injection service that wraps the given injector * * @param injector Injector to wrap - * @param Command sender type + * @param Command sender type * @return the created injection service */ public static GuiceInjectionService create(final @NonNull Injector injector) { @@ -67,5 +67,4 @@ public final class GuiceInjectionService implements InjectionService { } return null; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/annotations/injection/ParameterInjector.java b/cloud-core/src/main/java/cloud/commandframework/annotations/injection/ParameterInjector.java index 49249abf..c276fa3e 100644 --- a/cloud-core/src/main/java/cloud/commandframework/annotations/injection/ParameterInjector.java +++ b/cloud-core/src/main/java/cloud/commandframework/annotations/injection/ParameterInjector.java @@ -51,5 +51,4 @@ public interface ParameterInjector { * by this particular injector */ @Nullable T create(@NonNull CommandContext context, @NonNull AnnotationAccessor annotationAccessor); - } diff --git a/cloud-core/src/main/java/cloud/commandframework/annotations/injection/ParameterInjectorRegistry.java b/cloud-core/src/main/java/cloud/commandframework/annotations/injection/ParameterInjectorRegistry.java index 4977fa2f..eb1dab60 100644 --- a/cloud-core/src/main/java/cloud/commandframework/annotations/injection/ParameterInjectorRegistry.java +++ b/cloud-core/src/main/java/cloud/commandframework/annotations/injection/ParameterInjectorRegistry.java @@ -117,11 +117,11 @@ public final class ParameterInjectorRegistry implements InjectionService { * {@link InjectionService injection services}, and not just the {@link ParameterInjector injectors} * registered using {@link #registerInjector(Class, ParameterInjector)}. * - * @param clazz Class of the to inject - * @param context The command context that requests the injection + * @param clazz Class of the to inject + * @param context The command context that requests the injection * @param annotationAccessor Annotation accessor for the injection. If the object is requested without access to annotations, * use {@link AnnotationAccessor#empty()} - * @param Type to inject + * @param Type to inject * @return The injected value, if an injector was able to provide a value * @since 1.4.0 */ @@ -153,5 +153,4 @@ public final class ParameterInjectorRegistry implements InjectionService { this.servicePipeline.registerServiceImplementation(new TypeToken>() { }, service, Collections.emptyList()); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/annotations/injection/package-info.java b/cloud-core/src/main/java/cloud/commandframework/annotations/injection/package-info.java index 6a4dee33..008450eb 100644 --- a/cloud-core/src/main/java/cloud/commandframework/annotations/injection/package-info.java +++ b/cloud-core/src/main/java/cloud/commandframework/annotations/injection/package-info.java @@ -1,6 +1,6 @@ /** * Classes related to parameter injection - * + *

* This package will be moved in a future release */ package cloud.commandframework.annotations.injection; diff --git a/cloud-core/src/main/java/cloud/commandframework/annotations/specifier/Completions.java b/cloud-core/src/main/java/cloud/commandframework/annotations/specifier/Completions.java index 433f1133..1739d397 100644 --- a/cloud-core/src/main/java/cloud/commandframework/annotations/specifier/Completions.java +++ b/cloud-core/src/main/java/cloud/commandframework/annotations/specifier/Completions.java @@ -44,5 +44,4 @@ public @interface Completions { * @return Command completions */ String value() default ""; - } diff --git a/cloud-core/src/main/java/cloud/commandframework/annotations/specifier/Range.java b/cloud-core/src/main/java/cloud/commandframework/annotations/specifier/Range.java index 3c098024..a076ec15 100644 --- a/cloud-core/src/main/java/cloud/commandframework/annotations/specifier/Range.java +++ b/cloud-core/src/main/java/cloud/commandframework/annotations/specifier/Range.java @@ -53,5 +53,4 @@ public @interface Range { * @return String serialized number */ @NonNull String max() default ""; - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java index 0713a4e6..f14090de 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java @@ -178,14 +178,14 @@ public class CommandArgument implements Comparable>, @NonNull ArgumentParseResult>> argumentPreprocessors ) { this( - required, - name, - parser, - defaultValue, - valueType, - suggestionsProvider, - ArgumentDescription.empty(), - argumentPreprocessors + required, + name, + parser, + defaultValue, + valueType, + suggestionsProvider, + ArgumentDescription.empty(), + argumentPreprocessors ); } @@ -219,7 +219,7 @@ public class CommandArgument implements Comparable>, * @param defaultValue Default value used when no value is provided by the command sender * @param valueType Type produced by the parser * @param suggestionsProvider Suggestions provider - * @param defaultDescription Default description to use when registering + * @param defaultDescription Default description to use when registering * @since 1.4.0 */ @API(status = API.Status.STABLE, since = "1.4.0") @@ -266,7 +266,7 @@ public class CommandArgument implements Comparable>, * @param defaultValue Default value used when no value is provided by the command sender * @param valueType Type produced by the parser * @param suggestionsProvider Suggestions provider - * @param defaultDescription Default description to use when registering + * @param defaultDescription Default description to use when registering * @since 1.4.0 */ @API(status = API.Status.STABLE, since = "1.4.0") @@ -748,7 +748,6 @@ public class CommandArgument implements Comparable>, protected final @NonNull TypeToken getValueType() { return this.valueType; } - } /** @@ -837,7 +836,5 @@ public class CommandArgument implements Comparable>, super.withSuggestionsProvider(suggestionsProvider); return this.self(); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/CommandSuggestionEngine.java b/cloud-core/src/main/java/cloud/commandframework/arguments/CommandSuggestionEngine.java index 7db8be5f..5d7bbc5e 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/CommandSuggestionEngine.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/CommandSuggestionEngine.java @@ -48,5 +48,4 @@ public interface CommandSuggestionEngine { @NonNull CommandContext context, @NonNull String input ); - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/CommandSyntaxFormatter.java b/cloud-core/src/main/java/cloud/commandframework/arguments/CommandSyntaxFormatter.java index 8141aadd..84d222df 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/CommandSyntaxFormatter.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/CommandSyntaxFormatter.java @@ -53,5 +53,4 @@ public interface CommandSyntaxFormatter { @NonNull List<@NonNull CommandArgument> commandArguments, CommandTree.@Nullable Node<@Nullable CommandArgument> node ); - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/DelegatingCommandSuggestionEngine.java b/cloud-core/src/main/java/cloud/commandframework/arguments/DelegatingCommandSuggestionEngine.java index 6063724d..522eb35a 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/DelegatingCommandSuggestionEngine.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/DelegatingCommandSuggestionEngine.java @@ -87,5 +87,4 @@ public final class DelegatingCommandSuggestionEngine implements CommandSugges } return suggestions; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/DelegatingCommandSuggestionEngineFactory.java b/cloud-core/src/main/java/cloud/commandframework/arguments/DelegatingCommandSuggestionEngineFactory.java index 5608d758..211d1e03 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/DelegatingCommandSuggestionEngineFactory.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/DelegatingCommandSuggestionEngineFactory.java @@ -60,5 +60,4 @@ public final class DelegatingCommandSuggestionEngineFactory { this.commandTree ); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/DelegatingSuggestionsProvider.java b/cloud-core/src/main/java/cloud/commandframework/arguments/DelegatingSuggestionsProvider.java index b02fa769..02b27d1c 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/DelegatingSuggestionsProvider.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/DelegatingSuggestionsProvider.java @@ -53,5 +53,4 @@ final class DelegatingSuggestionsProvider implements BiFunction<@NonNull Comm this.parser.getClass().getCanonicalName() ); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/StandardCommandSyntaxFormatter.java b/cloud-core/src/main/java/cloud/commandframework/arguments/StandardCommandSyntaxFormatter.java index 2a8acc38..33a811b5 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/StandardCommandSyntaxFormatter.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/StandardCommandSyntaxFormatter.java @@ -294,7 +294,5 @@ public class StandardCommandSyntaxFormatter implements CommandSyntaxFormatter public void appendBlankSpace() { this.builder.append(' '); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/StaticArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/StaticArgument.java index d920ccbe..81b6d54a 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/StaticArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/StaticArgument.java @@ -152,7 +152,5 @@ public final class StaticArgument extends CommandArgument { this.allAcceptedAliases.add(alias); this.alternativeAliases.add(alias); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentPair.java b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentPair.java index a7b6cdcc..1fb1c5df 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentPair.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentPair.java @@ -180,7 +180,5 @@ public class ArgumentPair extends CompoundArgument, C, O> ) { return this.withMapper(TypeToken.get(clazz), mapper); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentTriplet.java b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentTriplet.java index 34d93cc4..3070c4b9 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentTriplet.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentTriplet.java @@ -200,7 +200,5 @@ public class ArgumentTriplet extends CompoundArgument extends CommandArgument) this.parsers[argument]).suggestions(commandContext, input); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/FlagArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/FlagArgument.java index e4340dee..9cc312f9 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/FlagArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/FlagArgument.java @@ -133,7 +133,7 @@ public final class FlagArgument extends CommandArgument { * Will consume all but the last element from the input queue. * * @param commandContext Command context - * @param inputQueue The input queue of arguments + * @param inputQueue The input queue of arguments * @return current flag being typed, or {@code empty()} if none is */ public @NonNull Optional parseCurrentFlag( @@ -299,7 +299,10 @@ public final class FlagArgument extends CommandArgument { * can be obtained, which are used for providing suggestions. */ private class FlagParser { - /** The current flag whose value is being parsed */ + + /** + * The current flag whose value is being parsed + */ @SuppressWarnings("unused") private Optional> currentFlagBeingParsed = Optional.empty(); /** @@ -516,7 +519,6 @@ public final class FlagArgument extends CommandArgument { public String getInput() { return this.input; } - } @@ -546,7 +548,5 @@ public final class FlagArgument extends CommandArgument { public @NonNull Caption getCaption() { return this.caption; } - } - } 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 a3965a67..b08a04c2 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 @@ -292,7 +292,5 @@ public final class CommandFlag { public @NonNull CommandFlag build() { return new CommandFlag<>(this.name, this.aliases, this.description, this.permission, this.commandArgument); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/flags/FlagContext.java b/cloud-core/src/main/java/cloud/commandframework/arguments/flags/FlagContext.java index ea31c055..ecaf4514 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/flags/FlagContext.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/flags/FlagContext.java @@ -236,8 +236,8 @@ public final class FlagContext { /** * Get a flag value * - * @param name Flag name - * @param Value type + * @param name Flag name + * @param Value type * @return Stored value if present, else {@code null} * @since 1.3.0 */ @@ -252,8 +252,8 @@ public final class FlagContext { /** * Get a flag value * - * @param flag Flag name - * @param Value type + * @param flag Flag name + * @param Value type * @return Stored value if present, else {@code null} * @since 1.4.0 */ @@ -263,5 +263,4 @@ public final class FlagContext { ) { return this.getValue(flag).orElse(null); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ArgumentParseResult.java b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ArgumentParseResult.java index c4e9e408..1e5a3383 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ArgumentParseResult.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ArgumentParseResult.java @@ -73,7 +73,7 @@ public abstract class ArgumentParseResult { * If this result is successful, transform the output value. * * @param mapper the transformation - * @param the result type + * @param the result type * @return a new result if successful, otherwise a failure * @since 1.5.0 */ @@ -84,7 +84,7 @@ public abstract class ArgumentParseResult { * If this result is successful, transform the output value, returning another parse result. * * @param mapper the transformation - * @param the result type + * @param the result type * @return a new result if successful, otherwise a failure * @since 1.5.0 */ @@ -132,7 +132,7 @@ public abstract class ArgumentParseResult { @Override public @NonNull ArgumentParseResult flatMapParsedValue(final Function> mapper) { - return mapper.apply(this.value); + return mapper.apply(this.value); } @Override @@ -144,7 +144,6 @@ public abstract class ArgumentParseResult { public @NonNull @This ArgumentParseResult mapFailure(final Function mapper) { return this; } - } private static final class ParseFailure extends ArgumentParseResult { @@ -185,5 +184,4 @@ public abstract class ArgumentParseResult { return new ParseFailure<>(mapper.apply(this.failure)); } } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ArgumentParser.java b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ArgumentParser.java index 1181a0e3..fcb09911 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ArgumentParser.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ArgumentParser.java @@ -97,7 +97,7 @@ public interface ArgumentParser { * Create a derived argument parser preserving all properties of this parser, but converting the output type. * * @param mapper the mapper to apply - * @param the result type + * @param the result type * @return a derived parser. * @since 1.5.0 */ @@ -127,5 +127,4 @@ public interface ArgumentParser { default int getRequestedArgumentCount() { return DEFAULT_ARGUMENT_COUNT; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/MappedArgumentParser.java b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/MappedArgumentParser.java index 3d50da0e..749c9bd6 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/MappedArgumentParser.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/MappedArgumentParser.java @@ -41,6 +41,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; */ @API(status = API.Status.STABLE, since = "1.5.0") public final class MappedArgumentParser implements ArgumentParser { + private final ArgumentParser base; private final BiFunction, I, ArgumentParseResult> mapper; @@ -119,5 +120,4 @@ public final class MappedArgumentParser implements ArgumentParser + "base=" + this.base + ',' + "mapper=" + this.mapper + '}'; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserParameter.java b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserParameter.java index 4d9b870b..16ceb1ec 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserParameter.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserParameter.java @@ -88,5 +88,4 @@ public class ParserParameter { public final int hashCode() { return Objects.hash(this.key, this.expectedType); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserParameters.java b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserParameters.java index 7ab2c672..a53a3ad5 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserParameters.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserParameters.java @@ -122,5 +122,4 @@ public final class ParserParameters { public @NonNull Map<@NonNull ParserParameter, @NonNull Object> getAll() { return Collections.unmodifiableMap(this.internalMap); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserRegistry.java b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserRegistry.java index 7e50171f..cb9fb809 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserRegistry.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserRegistry.java @@ -151,5 +151,4 @@ public interface ParserRegistry { @NonNull Optional, @NonNull String, @NonNull List>> getSuggestionProvider( @NonNull String name ); - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/StandardParameters.java b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/StandardParameters.java index f5a16d89..880d5bf3 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/StandardParameters.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/StandardParameters.java @@ -64,8 +64,8 @@ public final class StandardParameters { /** * Indicates that an argument should stop parsing when encountering a potential flag. * - * @since 1.7.0 * @see cloud.commandframework.annotations.specifier.FlagYielding + * @since 1.7.0 */ @API(status = API.Status.STABLE, since = "1.7.0") public static final ParserParameter FLAG_YIELDING = create( @@ -96,5 +96,4 @@ public final class StandardParameters { ) { return new ParserParameter<>(key, expectedType); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/StandardParserRegistry.java b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/StandardParserRegistry.java index 18c1f14e..c4aa0249 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/StandardParserRegistry.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/StandardParserRegistry.java @@ -247,9 +247,9 @@ public final class StandardParserRegistry implements ParserRegistry { if (producer == null) { /* Give enums special treatment */ if (GenericTypeReflector.isSuperType(Enum.class, actualType.getType())) { - @SuppressWarnings("rawtypes") - final EnumArgument.EnumParser enumArgument - = new EnumArgument.EnumParser(GenericTypeReflector.erase(actualType.getType())); + @SuppressWarnings("rawtypes") final EnumArgument.EnumParser enumArgument = new EnumArgument.EnumParser( + GenericTypeReflector.erase(actualType.getType()) + ); return Optional.of(enumArgument); } return Optional.empty(); @@ -359,7 +359,6 @@ public final class StandardParserRegistry implements ParserRegistry { } return parserParameters; } - } @@ -370,7 +369,5 @@ public final class StandardParserRegistry implements ParserRegistry { public @NonNull ParserParameters apply(final @NonNull Greedy greedy, final @NonNull TypeToken typeToken) { return ParserParameters.single(StandardParameters.GREEDY, true); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/preprocessor/RegexPreprocessor.java b/cloud-core/src/main/java/cloud/commandframework/arguments/preprocessor/RegexPreprocessor.java index 2fea44f9..6b574aa4 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/preprocessor/RegexPreprocessor.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/preprocessor/RegexPreprocessor.java @@ -168,7 +168,5 @@ public final class RegexPreprocessor implements BiFunction<@NonNull CommandCo public @NonNull String getPattern() { return this.pattern; } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/BooleanArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/BooleanArgument.java index 179e8bc5..7118a14c 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/BooleanArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/BooleanArgument.java @@ -157,7 +157,6 @@ public final class BooleanArgument extends CommandArgument { this.getDefaultDescription() ); } - } @@ -243,7 +242,6 @@ public final class BooleanArgument extends CommandArgument { public boolean isContextFree() { return true; } - } @@ -314,7 +312,5 @@ public final class BooleanArgument extends CommandArgument { public int hashCode() { return Objects.hash(this.input, this.liberal); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ByteArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ByteArgument.java index 8b772db2..fba9f7d8 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ByteArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ByteArgument.java @@ -184,7 +184,6 @@ public final class ByteArgument extends CommandArgument { this.getDefaultValue(), this.getSuggestionsProvider(), this.getDefaultDescription() ); } - } @@ -296,7 +295,6 @@ public final class ByteArgument extends CommandArgument { public boolean hasMin() { return this.min != DEFAULT_MINIMUM; } - } @@ -379,7 +377,5 @@ public final class ByteArgument extends CommandArgument { public int hashCode() { return Objects.hash(this.parser); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/CharArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/CharArgument.java index c2685fe9..0d2c835e 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/CharArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/CharArgument.java @@ -51,7 +51,7 @@ public final class CharArgument extends CommandArgument { final @Nullable BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider, final @NonNull ArgumentDescription defaultDescription - ) { + ) { super(required, name, new CharacterParser<>(), defaultValue, Character.class, suggestionsProvider, defaultDescription); } @@ -122,7 +122,6 @@ public final class CharArgument extends CommandArgument { this.getDefaultValue(), this.getSuggestionsProvider(), this.getDefaultDescription() ); } - } @@ -154,7 +153,6 @@ public final class CharArgument extends CommandArgument { public boolean isContextFree() { return true; } - } @@ -208,7 +206,5 @@ public final class CharArgument extends CommandArgument { public int hashCode() { return Objects.hash(this.input); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/DoubleArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/DoubleArgument.java index 82160519..546eb854 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/DoubleArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/DoubleArgument.java @@ -184,7 +184,6 @@ public final class DoubleArgument extends CommandArgument { this.getDefaultValue(), this.getSuggestionsProvider(), this.getDefaultDescription() ); } - } @@ -286,7 +285,6 @@ public final class DoubleArgument extends CommandArgument { public boolean hasMin() { return this.min != DEFAULT_MINIMUM; } - } @@ -365,7 +363,5 @@ public final class DoubleArgument extends CommandArgument { public int hashCode() { return Objects.hash(this.parser); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/DurationArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/DurationArgument.java index 94b4c08a..7336c380 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/DurationArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/DurationArgument.java @@ -190,7 +190,6 @@ public final class DurationArgument extends CommandArgument { this.getDefaultDescription() ); } - } @@ -277,7 +276,6 @@ public final class DurationArgument extends CommandArgument { .map(unit -> input + unit) .collect(Collectors.toList()); } - } /** @@ -320,7 +318,5 @@ public final class DurationArgument extends CommandArgument { public @NonNull String getInput() { return this.input; } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/EnumArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/EnumArgument.java index 79469253..7f957891 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/EnumArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/EnumArgument.java @@ -147,7 +147,6 @@ public class EnumArgument> extends CommandArgument { this.getDefaultValue(), this.getSuggestionsProvider(), this.getDefaultDescription() ); } - } @@ -202,7 +201,6 @@ public class EnumArgument> extends CommandArgument { public boolean isContextFree() { return true; } - } @@ -278,7 +276,5 @@ public class EnumArgument> extends CommandArgument { public int hashCode() { return Objects.hash(this.input, this.enumClass); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/FloatArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/FloatArgument.java index f53d74db..6bd79c6f 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/FloatArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/FloatArgument.java @@ -179,7 +179,6 @@ public final class FloatArgument extends CommandArgument { this.getDefaultValue(), this.getSuggestionsProvider(), this.getDefaultDescription() ); } - } @@ -283,7 +282,6 @@ public final class FloatArgument extends CommandArgument { public boolean hasMin() { return this.min != DEFAULT_MINIMUM; } - } @@ -364,7 +362,5 @@ public final class FloatArgument extends CommandArgument { public int hashCode() { return Objects.hash(this.parser); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/IntegerArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/IntegerArgument.java index 1792ec75..ef08be83 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/IntegerArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/IntegerArgument.java @@ -191,7 +191,6 @@ public final class IntegerArgument extends CommandArgument { this.getDefaultValue(), this.getSuggestionsProvider(), this.getDefaultDescription() ); } - } @@ -344,7 +343,6 @@ public final class IntegerArgument extends CommandArgument { ) { return getSuggestions(this.min, this.max, input); } - } @@ -425,7 +423,5 @@ public final class IntegerArgument extends CommandArgument { public int hashCode() { return Objects.hash(this.parser); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/LongArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/LongArgument.java index 154f8e4b..55e50ed9 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/LongArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/LongArgument.java @@ -179,7 +179,6 @@ public final class LongArgument extends CommandArgument { this.max, this.getDefaultValue(), this.getSuggestionsProvider(), this.getDefaultDescription() ); } - } @@ -291,7 +290,6 @@ public final class LongArgument extends CommandArgument { ) { return IntegerArgument.IntegerParser.getSuggestions(this.min, this.max, input); } - } @@ -372,7 +370,5 @@ public final class LongArgument extends CommandArgument { public int hashCode() { return Objects.hash(this.parser); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ShortArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ShortArgument.java index 26f6b886..d2d8e4ef 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ShortArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ShortArgument.java @@ -176,7 +176,6 @@ public final class ShortArgument extends CommandArgument { this.getDefaultValue(), this.getSuggestionsProvider(), this.getDefaultDescription() ); } - } @@ -288,7 +287,6 @@ public final class ShortArgument extends CommandArgument { public boolean hasMin() { return this.min != DEFAULT_MINIMUM; } - } @@ -369,7 +367,5 @@ public final class ShortArgument extends CommandArgument { public int hashCode() { return Objects.hash(this.parser); } - } - } 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 6a8195ce..9c3816eb 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 @@ -306,7 +306,6 @@ public final class StringArgument extends CommandArgument { this.getDefaultValue(), this.suggestionsProvider, this.getDefaultDescription() ); } - } @@ -465,7 +464,6 @@ public final class StringArgument extends CommandArgument { public @NonNull StringMode getStringMode() { return this.stringMode; } - } @@ -517,7 +515,5 @@ public final class StringArgument extends CommandArgument { public @NonNull StringMode getStringMode() { return this.stringMode; } - } - } 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 812805a6..4352c59f 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 @@ -217,7 +217,5 @@ public final class StringArrayArgument extends CommandArgument { return ArgumentParseResult.success(result); } } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/UUIDArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/UUIDArgument.java index ed57d182..bf2d1e79 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/UUIDArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/UUIDArgument.java @@ -127,7 +127,6 @@ public final class UUIDArgument extends CommandArgument { this.getDefaultDescription() ); } - } @@ -160,7 +159,6 @@ public final class UUIDArgument extends CommandArgument { public boolean isContextFree() { return true; } - } @@ -203,7 +201,7 @@ public final class UUIDArgument extends CommandArgument { if (this == o) { return true; } - if (o == null ||this.getClass() != o.getClass()) { + if (o == null || this.getClass() != o.getClass()) { return false; } final UUIDParseException that = (UUIDParseException) o; @@ -214,7 +212,5 @@ public final class UUIDArgument extends CommandArgument { public int hashCode() { return Objects.hash(this.input); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/captions/Caption.java b/cloud-core/src/main/java/cloud/commandframework/captions/Caption.java index 13bd7deb..ab8f200e 100644 --- a/cloud-core/src/main/java/cloud/commandframework/captions/Caption.java +++ b/cloud-core/src/main/java/cloud/commandframework/captions/Caption.java @@ -82,5 +82,4 @@ public final class Caption { this.key ); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/captions/CaptionRegistry.java b/cloud-core/src/main/java/cloud/commandframework/captions/CaptionRegistry.java index 9057804d..c22f09dc 100644 --- a/cloud-core/src/main/java/cloud/commandframework/captions/CaptionRegistry.java +++ b/cloud-core/src/main/java/cloud/commandframework/captions/CaptionRegistry.java @@ -42,5 +42,4 @@ public interface CaptionRegistry { * @return Caption */ @NonNull String getCaption(@NonNull Caption caption, @NonNull C sender); - } diff --git a/cloud-core/src/main/java/cloud/commandframework/captions/CaptionVariable.java b/cloud-core/src/main/java/cloud/commandframework/captions/CaptionVariable.java index d434cc76..b224c144 100644 --- a/cloud-core/src/main/java/cloud/commandframework/captions/CaptionVariable.java +++ b/cloud-core/src/main/java/cloud/commandframework/captions/CaptionVariable.java @@ -68,5 +68,4 @@ public final class CaptionVariable { public @NonNull String getValue() { return this.value; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/captions/CaptionVariableReplacementHandler.java b/cloud-core/src/main/java/cloud/commandframework/captions/CaptionVariableReplacementHandler.java index 90fcf247..d37b59c6 100644 --- a/cloud-core/src/main/java/cloud/commandframework/captions/CaptionVariableReplacementHandler.java +++ b/cloud-core/src/main/java/cloud/commandframework/captions/CaptionVariableReplacementHandler.java @@ -40,5 +40,4 @@ public interface CaptionVariableReplacementHandler { * @return Transformed message */ @NonNull String replaceVariables(@NonNull String string, @NonNull CaptionVariable... variables); - } diff --git a/cloud-core/src/main/java/cloud/commandframework/captions/FactoryDelegatingCaptionRegistry.java b/cloud-core/src/main/java/cloud/commandframework/captions/FactoryDelegatingCaptionRegistry.java index 9ce5159a..277eb3d9 100644 --- a/cloud-core/src/main/java/cloud/commandframework/captions/FactoryDelegatingCaptionRegistry.java +++ b/cloud-core/src/main/java/cloud/commandframework/captions/FactoryDelegatingCaptionRegistry.java @@ -45,5 +45,4 @@ public interface FactoryDelegatingCaptionRegistry extends CaptionRegistry @NonNull Caption caption, @NonNull BiFunction factory ); - } diff --git a/cloud-core/src/main/java/cloud/commandframework/captions/SimpleCaptionRegistry.java b/cloud-core/src/main/java/cloud/commandframework/captions/SimpleCaptionRegistry.java index 16603f8e..60ce9c0f 100644 --- a/cloud-core/src/main/java/cloud/commandframework/captions/SimpleCaptionRegistry.java +++ b/cloud-core/src/main/java/cloud/commandframework/captions/SimpleCaptionRegistry.java @@ -187,5 +187,4 @@ public class SimpleCaptionRegistry implements FactoryDelegatingCaptionRegistr ) { this.messageFactories.put(caption, messageFactory); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/captions/SimpleCaptionRegistryFactory.java b/cloud-core/src/main/java/cloud/commandframework/captions/SimpleCaptionRegistryFactory.java index 1006ff20..87cbaba9 100644 --- a/cloud-core/src/main/java/cloud/commandframework/captions/SimpleCaptionRegistryFactory.java +++ b/cloud-core/src/main/java/cloud/commandframework/captions/SimpleCaptionRegistryFactory.java @@ -42,5 +42,4 @@ public final class SimpleCaptionRegistryFactory { public @NonNull SimpleCaptionRegistry create() { return new SimpleCaptionRegistry<>(); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/captions/SimpleCaptionVariableReplacementHandler.java b/cloud-core/src/main/java/cloud/commandframework/captions/SimpleCaptionVariableReplacementHandler.java index ea697d32..cbf9f0fc 100644 --- a/cloud-core/src/main/java/cloud/commandframework/captions/SimpleCaptionVariableReplacementHandler.java +++ b/cloud-core/src/main/java/cloud/commandframework/captions/SimpleCaptionVariableReplacementHandler.java @@ -43,5 +43,4 @@ public final class SimpleCaptionVariableReplacementHandler implements CaptionVar } return replacedString; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/captions/StandardCaptionKeys.java b/cloud-core/src/main/java/cloud/commandframework/captions/StandardCaptionKeys.java index b1e35c53..77d9bafc 100644 --- a/cloud-core/src/main/java/cloud/commandframework/captions/StandardCaptionKeys.java +++ b/cloud-core/src/main/java/cloud/commandframework/captions/StandardCaptionKeys.java @@ -115,5 +115,4 @@ public final class StandardCaptionKeys { public static @NonNull Collection<@NonNull Caption> getStandardCaptionKeys() { return Collections.unmodifiableCollection(RECOGNIZED_CAPTIONS); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/context/CommandContext.java b/cloud-core/src/main/java/cloud/commandframework/context/CommandContext.java index 1fdbd6b2..56780b60 100644 --- a/cloud-core/src/main/java/cloud/commandframework/context/CommandContext.java +++ b/cloud-core/src/main/java/cloud/commandframework/context/CommandContext.java @@ -454,7 +454,7 @@ public class CommandContext { * if there's no value associated with the given argument * * @param keyHolder Holder of the identifying key - * @param Argument type + * @param Argument type * @return Stored value * @throws NullPointerException If no such value is stored */ @@ -467,7 +467,7 @@ public class CommandContext { * if there's no value associated with the given argument * * @param keyHolder Holder of the identifying key - * @param Argument type + * @param Argument type * @return Stored value * @throws NullPointerException If no such value is stored * @since 1.4.0 @@ -740,7 +740,5 @@ public class CommandContext { public boolean wasSuccess() { return this.success; } - } - } 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 d9fa478d..c1d9cc31 100644 --- a/cloud-core/src/main/java/cloud/commandframework/context/CommandContextFactory.java +++ b/cloud-core/src/main/java/cloud/commandframework/context/CommandContextFactory.java @@ -68,5 +68,4 @@ public interface CommandContextFactory { @NonNull C sender, @NonNull CommandManager commandManager ); - } diff --git a/cloud-core/src/main/java/cloud/commandframework/context/StandardCommandContextFactory.java b/cloud-core/src/main/java/cloud/commandframework/context/StandardCommandContextFactory.java index 4718fdff..65aecfc1 100644 --- a/cloud-core/src/main/java/cloud/commandframework/context/StandardCommandContextFactory.java +++ b/cloud-core/src/main/java/cloud/commandframework/context/StandardCommandContextFactory.java @@ -57,5 +57,4 @@ public final class StandardCommandContextFactory implements CommandContextFac commandManager ); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/AmbiguousNodeException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/AmbiguousNodeException.java index f74438ac..c1a2fb75 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/AmbiguousNodeException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/AmbiguousNodeException.java @@ -108,5 +108,4 @@ public final class AmbiguousNodeException extends IllegalStateException { return stringBuilder.append(")") .toString(); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/ArgumentParseException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/ArgumentParseException.java index 9c89d876..6c6d0989 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/ArgumentParseException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/ArgumentParseException.java @@ -60,5 +60,4 @@ public class ArgumentParseException extends CommandParseException { public synchronized @NonNull Throwable getCause() { return this.cause; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/CommandExecutionException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/CommandExecutionException.java index a37ac96f..30cbe05a 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/CommandExecutionException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/CommandExecutionException.java @@ -53,7 +53,7 @@ public class CommandExecutionException extends IllegalArgumentException { /** * Exception thrown when there is an exception during execution of a command handler * - * @param cause Exception thrown during the execution of a command handler + * @param cause Exception thrown during the execution of a command handler * @param commandContext Command context * @since 1.4.0 */ @@ -73,5 +73,4 @@ public class CommandExecutionException extends IllegalArgumentException { public @Nullable CommandContext getCommandContext() { return this.commandContext; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/CommandParseException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/CommandParseException.java index 5ae2e6cb..938f01dc 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/CommandParseException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/CommandParseException.java @@ -72,5 +72,4 @@ public class CommandParseException extends IllegalArgumentException { public @NonNull List<@NonNull CommandArgument> getCurrentChain() { return Collections.unmodifiableList(this.currentChain); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidCommandSenderException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidCommandSenderException.java index 13d178ae..1d3b6f68 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidCommandSenderException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidCommandSenderException.java @@ -106,5 +106,4 @@ public final class InvalidCommandSenderException extends CommandParseException { public @Nullable Command getCommand() { return this.command; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidSyntaxException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidSyntaxException.java index 2863137b..3accd115 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidSyntaxException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidSyntaxException.java @@ -69,5 +69,4 @@ public class InvalidSyntaxException extends CommandParseException { public final String getMessage() { return String.format("Invalid command syntax. Correct syntax is: %s", this.correctSyntax); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/NoCommandInLeafException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/NoCommandInLeafException.java index 56124271..fc7d187a 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/NoCommandInLeafException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/NoCommandInLeafException.java @@ -58,5 +58,4 @@ public final class NoCommandInLeafException extends IllegalStateException { public @NonNull CommandArgument getCommandArgument() { return this.commandArgument; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/NoPermissionException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/NoPermissionException.java index 44d45984..d56e7a17 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/NoPermissionException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/NoPermissionException.java @@ -81,5 +81,4 @@ public class NoPermissionException extends CommandParseException { public final synchronized Throwable initCause(final Throwable cause) { return this; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/NoSuchCommandException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/NoSuchCommandException.java index ceb32d99..a7599e63 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/NoSuchCommandException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/NoSuchCommandException.java @@ -87,5 +87,4 @@ public final class NoSuchCommandException extends CommandParseException { public synchronized Throwable initCause(final Throwable cause) { return this; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/parsing/NoInputProvidedException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/parsing/NoInputProvidedException.java index 7c046072..90be4ccf 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/parsing/NoInputProvidedException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/parsing/NoInputProvidedException.java @@ -54,5 +54,4 @@ public class NoInputProvidedException extends ParserException { StandardCaptionKeys.ARGUMENT_PARSE_FAILURE_NO_INPUT_PROVIDED ); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/parsing/NumberParseException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/parsing/NumberParseException.java index 6062198f..9b3210c8 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/parsing/NumberParseException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/parsing/NumberParseException.java @@ -113,5 +113,4 @@ public abstract class NumberParseException extends ParserException { public Number getMax() { return this.max; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/parsing/ParserException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/parsing/ParserException.java index 673dacf4..8e4ae370 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/parsing/ParserException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/parsing/ParserException.java @@ -100,5 +100,4 @@ public class ParserException extends IllegalArgumentException { public final @NonNull CommandContext getContext() { return this.context; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/execution/AsynchronousCommandExecutionCoordinator.java b/cloud-core/src/main/java/cloud/commandframework/execution/AsynchronousCommandExecutionCoordinator.java index b108ab5d..5ba76a90 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/AsynchronousCommandExecutionCoordinator.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/AsynchronousCommandExecutionCoordinator.java @@ -181,7 +181,5 @@ public final class AsynchronousCommandExecutionCoordinator extends CommandExe public @NonNull Function<@NonNull CommandTree, @NonNull CommandExecutionCoordinator> build() { return tree -> new AsynchronousCommandExecutionCoordinator<>(this.executor, this.synchronizeParsing, tree); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/execution/CommandExecutionCoordinator.java b/cloud-core/src/main/java/cloud/commandframework/execution/CommandExecutionCoordinator.java index 0b1fdc9d..19df6ce7 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/CommandExecutionCoordinator.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/CommandExecutionCoordinator.java @@ -141,7 +141,5 @@ public abstract class CommandExecutionCoordinator { } return completableFuture; } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/execution/CommandExecutionHandler.java b/cloud-core/src/main/java/cloud/commandframework/execution/CommandExecutionHandler.java index 74e4297a..6dd1571e 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/CommandExecutionHandler.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/CommandExecutionHandler.java @@ -112,7 +112,6 @@ public interface CommandExecutionHandler { @Override public void execute(final @NonNull CommandContext commandContext) { } - } /** @@ -137,7 +136,6 @@ public interface CommandExecutionHandler { CompletableFuture<@Nullable Void> executeFuture( @NonNull CommandContext commandContext ); - } /** @@ -180,7 +178,5 @@ public interface CommandExecutionHandler { return composedHandler; } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/execution/CommandResult.java b/cloud-core/src/main/java/cloud/commandframework/execution/CommandResult.java index d7312e16..aac5cd99 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/CommandResult.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/CommandResult.java @@ -54,5 +54,4 @@ public class CommandResult { public @NonNull CommandContext getCommandContext() { return this.commandContext; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/execution/FilteringCommandSuggestionProcessor.java b/cloud-core/src/main/java/cloud/commandframework/execution/FilteringCommandSuggestionProcessor.java index ebe228d1..76d9e6ef 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/FilteringCommandSuggestionProcessor.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/FilteringCommandSuggestionProcessor.java @@ -56,5 +56,4 @@ public final class FilteringCommandSuggestionProcessor implements CommandSugg } return suggestions; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/execution/postprocessor/AcceptingCommandPostprocessor.java b/cloud-core/src/main/java/cloud/commandframework/execution/postprocessor/AcceptingCommandPostprocessor.java index 9058a19d..dede65cd 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/postprocessor/AcceptingCommandPostprocessor.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/postprocessor/AcceptingCommandPostprocessor.java @@ -44,5 +44,4 @@ public final class AcceptingCommandPostprocessor implements CommandPostproces public void accept(final @NonNull CommandPostprocessingContext context) { context.getCommandContext().store(PROCESSED_INDICATOR_KEY, "true"); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/execution/postprocessor/CommandPostprocessingContext.java b/cloud-core/src/main/java/cloud/commandframework/execution/postprocessor/CommandPostprocessingContext.java index e7f3a10c..796e2418 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/postprocessor/CommandPostprocessingContext.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/postprocessor/CommandPostprocessingContext.java @@ -89,5 +89,4 @@ public final class CommandPostprocessingContext { public int hashCode() { return Objects.hash(this.getCommandContext(), this.getCommand()); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/execution/preprocessor/AcceptingCommandPreprocessor.java b/cloud-core/src/main/java/cloud/commandframework/execution/preprocessor/AcceptingCommandPreprocessor.java index 78db155c..1d25e20b 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/preprocessor/AcceptingCommandPreprocessor.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/preprocessor/AcceptingCommandPreprocessor.java @@ -44,5 +44,4 @@ public final class AcceptingCommandPreprocessor implements CommandPreprocesso public void accept(final @NonNull CommandPreprocessingContext context) { context.getCommandContext().store(PROCESSED_INDICATOR_KEY, "true"); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/execution/preprocessor/CommandPreprocessingContext.java b/cloud-core/src/main/java/cloud/commandframework/execution/preprocessor/CommandPreprocessingContext.java index f866c640..eaa91672 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/preprocessor/CommandPreprocessingContext.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/preprocessor/CommandPreprocessingContext.java @@ -90,5 +90,4 @@ public final class CommandPreprocessingContext { public int hashCode() { return Objects.hash(this.getCommandContext(), this.getInputQueue()); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/extra/confirmation/CommandConfirmationManager.java b/cloud-core/src/main/java/cloud/commandframework/extra/confirmation/CommandConfirmationManager.java index 8aa67119..46007deb 100644 --- a/cloud-core/src/main/java/cloud/commandframework/extra/confirmation/CommandConfirmationManager.java +++ b/cloud-core/src/main/java/cloud/commandframework/extra/confirmation/CommandConfirmationManager.java @@ -191,7 +191,5 @@ public class CommandConfirmationManager { /* Interrupt */ ConsumerService.interrupt(); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/internal/CommandInputTokenizer.java b/cloud-core/src/main/java/cloud/commandframework/internal/CommandInputTokenizer.java index 469a46f6..3042e4ab 100644 --- a/cloud-core/src/main/java/cloud/commandframework/internal/CommandInputTokenizer.java +++ b/cloud-core/src/main/java/cloud/commandframework/internal/CommandInputTokenizer.java @@ -77,7 +77,5 @@ public final class CommandInputTokenizer { private @NonNull StringTokenizer createStringTokenizer() { return new StringTokenizer(CommandInputTokenizer.this.input, DELIMITER); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/internal/CommandRegistrationHandler.java b/cloud-core/src/main/java/cloud/commandframework/internal/CommandRegistrationHandler.java index c577f992..ea7c3551 100644 --- a/cloud-core/src/main/java/cloud/commandframework/internal/CommandRegistrationHandler.java +++ b/cloud-core/src/main/java/cloud/commandframework/internal/CommandRegistrationHandler.java @@ -80,5 +80,4 @@ public interface CommandRegistrationHandler { public void unregisterRootCommand(final @NonNull StaticArgument rootCommand) { } } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/keys/CloudKey.java b/cloud-core/src/main/java/cloud/commandframework/keys/CloudKey.java index 2538b7df..bc550976 100644 --- a/cloud-core/src/main/java/cloud/commandframework/keys/CloudKey.java +++ b/cloud-core/src/main/java/cloud/commandframework/keys/CloudKey.java @@ -51,5 +51,4 @@ public interface CloudKey { * @return The type of the key value. */ @NonNull TypeToken<@NonNull T> getType(); - } diff --git a/cloud-core/src/main/java/cloud/commandframework/keys/CloudKeyHolder.java b/cloud-core/src/main/java/cloud/commandframework/keys/CloudKeyHolder.java index dcb7426b..e744b00a 100644 --- a/cloud-core/src/main/java/cloud/commandframework/keys/CloudKeyHolder.java +++ b/cloud-core/src/main/java/cloud/commandframework/keys/CloudKeyHolder.java @@ -42,5 +42,4 @@ public interface CloudKeyHolder { * @return Identifying key. */ @NonNull CloudKey getKey(); - } diff --git a/cloud-core/src/main/java/cloud/commandframework/keys/SimpleCloudKey.java b/cloud-core/src/main/java/cloud/commandframework/keys/SimpleCloudKey.java index 8c1b48e2..b146a881 100644 --- a/cloud-core/src/main/java/cloud/commandframework/keys/SimpleCloudKey.java +++ b/cloud-core/src/main/java/cloud/commandframework/keys/SimpleCloudKey.java @@ -106,5 +106,4 @@ public final class SimpleCloudKey<@NonNull T> implements CloudKey { public String toString() { return this.name; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/meta/CommandMeta.java b/cloud-core/src/main/java/cloud/commandframework/meta/CommandMeta.java index 1d6f154b..e3a9709d 100644 --- a/cloud-core/src/main/java/cloud/commandframework/meta/CommandMeta.java +++ b/cloud-core/src/main/java/cloud/commandframework/meta/CommandMeta.java @@ -49,9 +49,9 @@ public abstract class CommandMeta { public static final Key DESCRIPTION = Key.of(String.class, "description"); public static final Key LONG_DESCRIPTION = Key.of(String.class, "long-description"); public static final Key HIDDEN = Key.of( - Boolean.class, - "cloud:hidden", - meta -> Boolean.valueOf(meta.getOrDefault(LEGACY_HIDDEN, "false")) + Boolean.class, + "cloud:hidden", + meta -> Boolean.valueOf(meta.getOrDefault(LEGACY_HIDDEN, "false")) ); /** @@ -147,8 +147,8 @@ public abstract class CommandMeta { * Create a new metadata key. * * @param type the value type - * @param key the name for the key - * @param the value type + * @param key the name for the key + * @param the value type * @return a new key */ static @NonNull Key of(final @NonNull Class type, final @NonNull String key) { @@ -157,9 +157,9 @@ public abstract class CommandMeta { } return new SimpleKey<>( - TypeToken.get(requireNonNull(type, "type")), - requireNonNull(key, "key"), - null + TypeToken.get(requireNonNull(type, "type")), + requireNonNull(key, "key"), + null ); } @@ -167,31 +167,32 @@ public abstract class CommandMeta { * Create a new metadata key. * * @param type the value type - * @param key the name for the key - * @param the value type + * @param key the name for the key + * @param the value type * @return a new key */ static @NonNull Key of(final @NonNull TypeToken type, final @NonNull String key) { return new SimpleKey<>( - requireNonNull(type, "type"), - requireNonNull(key, "key"), - null + requireNonNull(type, "type"), + requireNonNull(key, "key"), + null ); } /** * Create a new metadata key. * - * @param type the value type - * @param key the name for the key + * @param type the value type + * @param key the name for the key * @param fallbackDerivation A function that will be called if no value is present for the key - * @param the value type + * @param the value type * @return a new key */ static @NonNull Key of( final @NonNull Class type, final @NonNull String key, - final @NonNull Function<@NonNull CommandMeta, @Nullable T> fallbackDerivation) { + final @NonNull Function<@NonNull CommandMeta, @Nullable T> fallbackDerivation + ) { return new SimpleKey<>( TypeToken.get(requireNonNull(type, "type")), requireNonNull(key, "key"), @@ -202,10 +203,10 @@ public abstract class CommandMeta { /** * Create a new metadata key. * - * @param type the value type - * @param key the name for the key + * @param type the value type + * @param key the name for the key * @param fallbackDerivation A function that will be called if no value is present for the key - * @param the value type + * @param the value type * @return a new key */ static @NonNull Key of( @@ -238,7 +239,8 @@ public abstract class CommandMeta { * * @return the key type */ - @Override @NonNull String getName(); + @Override + @NonNull String getName(); /** * Get a function that can be used to compute a fallback based on existing meta. @@ -248,7 +250,5 @@ public abstract class CommandMeta { * @return the fallback derivation */ @Nullable Function<@NonNull CommandMeta, @Nullable V> getFallbackDerivation(); - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/meta/SimpleCommandMeta.java b/cloud-core/src/main/java/cloud/commandframework/meta/SimpleCommandMeta.java index 8bb60fc6..e70b66e9 100644 --- a/cloud-core/src/main/java/cloud/commandframework/meta/SimpleCommandMeta.java +++ b/cloud-core/src/main/java/cloud/commandframework/meta/SimpleCommandMeta.java @@ -209,8 +209,8 @@ public class SimpleCommandMeta extends CommandMeta { final @NonNull Key key, final @NonNull V value ) { - this.map.put(key.getName(), value); - return this; + this.map.put(key.getName(), value); + return this; } /** @@ -221,7 +221,5 @@ public class SimpleCommandMeta extends CommandMeta { public @NonNull SimpleCommandMeta build() { return new SimpleCommandMeta(this.map, false); } - } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/meta/SimpleKey.java b/cloud-core/src/main/java/cloud/commandframework/meta/SimpleKey.java index 112894a4..45a312d4 100644 --- a/cloud-core/src/main/java/cloud/commandframework/meta/SimpleKey.java +++ b/cloud-core/src/main/java/cloud/commandframework/meta/SimpleKey.java @@ -38,9 +38,9 @@ final class SimpleKey implements CommandMeta.Key { private final @Nullable Function<@NonNull CommandMeta, @Nullable V> derivationFunction; SimpleKey( - final @NonNull TypeToken valueType, - final @NonNull String name, - final @Nullable Function<@NonNull CommandMeta, @Nullable V> derivationFunction + final @NonNull TypeToken valueType, + final @NonNull String name, + final @Nullable Function<@NonNull CommandMeta, @Nullable V> derivationFunction ) { this.valueType = valueType; this.name = name; @@ -80,5 +80,4 @@ final class SimpleKey implements CommandMeta.Key { return 7 * GenericTypeReflector.hashCode(this.valueType.getAnnotatedType()) + 31 * this.name.hashCode(); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/permission/AndPermission.java b/cloud-core/src/main/java/cloud/commandframework/permission/AndPermission.java index d4dac859..9dfc5b60 100644 --- a/cloud-core/src/main/java/cloud/commandframework/permission/AndPermission.java +++ b/cloud-core/src/main/java/cloud/commandframework/permission/AndPermission.java @@ -97,5 +97,4 @@ public final class AndPermission implements CommandPermission { public int hashCode() { return Objects.hash(this.getPermissions()); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/permission/CommandPermission.java b/cloud-core/src/main/java/cloud/commandframework/permission/CommandPermission.java index 239c583d..87319ee0 100644 --- a/cloud-core/src/main/java/cloud/commandframework/permission/CommandPermission.java +++ b/cloud-core/src/main/java/cloud/commandframework/permission/CommandPermission.java @@ -116,5 +116,4 @@ public interface CommandPermission { permission.addAll(Arrays.asList(other)); return AndPermission.of(permission); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/permission/OrPermission.java b/cloud-core/src/main/java/cloud/commandframework/permission/OrPermission.java index 5a074ccb..82ac0e06 100644 --- a/cloud-core/src/main/java/cloud/commandframework/permission/OrPermission.java +++ b/cloud-core/src/main/java/cloud/commandframework/permission/OrPermission.java @@ -97,5 +97,4 @@ public final class OrPermission implements CommandPermission { public int hashCode() { return Objects.hash(this.getPermissions()); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/permission/Permission.java b/cloud-core/src/main/java/cloud/commandframework/permission/Permission.java index e07832f5..f079a1cf 100644 --- a/cloud-core/src/main/java/cloud/commandframework/permission/Permission.java +++ b/cloud-core/src/main/java/cloud/commandframework/permission/Permission.java @@ -105,5 +105,4 @@ public final class Permission implements CommandPermission { public int hashCode() { return Objects.hash(this.getPermission()); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/permission/PredicatePermission.java b/cloud-core/src/main/java/cloud/commandframework/permission/PredicatePermission.java index 57e9bea5..deed7ee3 100644 --- a/cloud-core/src/main/java/cloud/commandframework/permission/PredicatePermission.java +++ b/cloud-core/src/main/java/cloud/commandframework/permission/PredicatePermission.java @@ -45,9 +45,9 @@ public interface PredicatePermission extends CommandPermission, CloudKeyHolde /** * Create a new predicate permission * - * @param key Key that identifies the permission node + * @param key Key that identifies the permission node * @param predicate Predicate that determines whether or not the sender has the permission - * @param Command sender type + * @param Command sender type * @return Created permission node */ static PredicatePermission of(final @NonNull CloudKey key, final @NonNull Predicate predicate) { @@ -72,5 +72,4 @@ public interface PredicatePermission extends CommandPermission, CloudKeyHolde default @NonNull Collection<@NonNull CommandPermission> getPermissions() { return Collections.singleton(this); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/permission/WrappingPredicatePermission.java b/cloud-core/src/main/java/cloud/commandframework/permission/WrappingPredicatePermission.java index 26edc60d..7a0ddbd9 100644 --- a/cloud-core/src/main/java/cloud/commandframework/permission/WrappingPredicatePermission.java +++ b/cloud-core/src/main/java/cloud/commandframework/permission/WrappingPredicatePermission.java @@ -56,5 +56,4 @@ final class WrappingPredicatePermission implements PredicatePermission { public String toString() { return this.key.getName(); } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/types/tuples/DynamicTuple.java b/cloud-core/src/main/java/cloud/commandframework/types/tuples/DynamicTuple.java index 4a9205fa..f6ee968f 100644 --- a/cloud-core/src/main/java/cloud/commandframework/types/tuples/DynamicTuple.java +++ b/cloud-core/src/main/java/cloud/commandframework/types/tuples/DynamicTuple.java @@ -59,5 +59,4 @@ public final class DynamicTuple implements Tuple { System.arraycopy(this.internalArray, 0, newArray, 0, this.internalArray.length); return newArray; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Pair.java b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Pair.java index ac02e9f9..2988c0b3 100644 --- a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Pair.java +++ b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Pair.java @@ -116,5 +116,4 @@ public class Pair implements Tuple { array[1] = this.second; return array; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quartet.java b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quartet.java index 8f14ea78..57ada961 100644 --- a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quartet.java +++ b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quartet.java @@ -152,5 +152,4 @@ public class Quartet implements Tuple { array[3] = this.fourth; return array; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quintet.java b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quintet.java index 55057c4f..66a0c5b4 100644 --- a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quintet.java +++ b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quintet.java @@ -170,5 +170,4 @@ public class Quintet implements Tuple { array[4] = this.fifth; return array; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Sextet.java b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Sextet.java index a98dbe18..3a39f8c4 100644 --- a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Sextet.java +++ b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Sextet.java @@ -164,7 +164,14 @@ public class Sextet implements Tuple { @Override public final int hashCode() { - return Objects.hash(this.getFirst(), this.getSecond(), this.getThird(), this.getFourth(), this.getFifth(), this.getSixth()); + return Objects.hash( + this.getFirst(), + this.getSecond(), + this.getThird(), + this.getFourth(), + this.getFifth(), + this.getSixth() + ); } @Override @@ -190,5 +197,4 @@ public class Sextet implements Tuple { array[5] = this.sixth; return array; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Triplet.java b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Triplet.java index cc5071e3..7a1ddbde 100644 --- a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Triplet.java +++ b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Triplet.java @@ -134,5 +134,4 @@ public class Triplet implements Tuple { array[2] = this.third; return array; } - } diff --git a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Tuple.java b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Tuple.java index 9c560823..0ccfc813 100644 --- a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Tuple.java +++ b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Tuple.java @@ -45,5 +45,4 @@ public interface Tuple { * @return Created array */ @NonNull Object @NonNull [] toArray(); - } diff --git a/cloud-core/src/main/java/cloud/commandframework/util/StringUtils.java b/cloud-core/src/main/java/cloud/commandframework/util/StringUtils.java index 2a53b74a..61c2b973 100644 --- a/cloud-core/src/main/java/cloud/commandframework/util/StringUtils.java +++ b/cloud-core/src/main/java/cloud/commandframework/util/StringUtils.java @@ -51,5 +51,4 @@ public final class StringUtils { } return occurrences; } - } diff --git a/cloud-core/src/test/java/cloud/commandframework/AnnotationAccessorTest.java b/cloud-core/src/test/java/cloud/commandframework/AnnotationAccessorTest.java index a8ac4eda..012f8fff 100644 --- a/cloud-core/src/test/java/cloud/commandframework/AnnotationAccessorTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/AnnotationAccessorTest.java @@ -66,7 +66,5 @@ public class AnnotationAccessorTest { private @interface Qualifier { String value(); - } - } diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandHelpHandlerTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandHelpHandlerTest.java index a12f1847..5a4582ca 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandHelpHandlerTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandHelpHandlerTest.java @@ -49,9 +49,15 @@ class CommandHelpHandlerTest { @BeforeAll static void setup() { manager = createManager(); - final SimpleCommandMeta meta1 = SimpleCommandMeta.builder().with(CommandMeta.DESCRIPTION, "Command with only literals").build(); + final SimpleCommandMeta meta1 = SimpleCommandMeta + .builder() + .with(CommandMeta.DESCRIPTION, "Command with only literals") + .build(); manager.command(manager.commandBuilder("test", meta1).literal("this").literal("thing").build()); - final SimpleCommandMeta meta2 = SimpleCommandMeta.builder().with(CommandMeta.DESCRIPTION, "Command with variables").build(); + final SimpleCommandMeta meta2 = SimpleCommandMeta + .builder() + .with(CommandMeta.DESCRIPTION, "Command with variables") + .build(); manager.command(manager.commandBuilder("test", meta2).literal("int"). argument(IntegerArgument.of("int"), ArgumentDescription.of("A number")).build()); manager.command(manager.commandBuilder("test").argument(StringArgument.of("potato"))); @@ -129,7 +135,8 @@ class CommandHelpHandlerTest { * List all commands from /test int, which should show only: * - /test int */ - final CommandHelpHandler.HelpTopic query3 = manager.getCommandHelpHandler(predicate).queryHelp("test int"); + final CommandHelpHandler.HelpTopic query3 = manager.getCommandHelpHandler(predicate).queryHelp( + "test int"); Assertions.assertTrue(query3 instanceof CommandHelpHandler.VerboseHelpTopic); Assertions.assertEquals(Collections.singletonList("test int "), getSortedSyntaxStrings(query3)); @@ -249,5 +256,4 @@ class CommandHelpHandlerTest { Collections.singletonList(component.getArgument()), null), description); } } - } diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandManagerTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandManagerTest.java index 258db4dd..abe2c74d 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandManagerTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandManagerTest.java @@ -152,7 +152,7 @@ class CommandManagerTest { List> arguments = command.getArguments(); List> components = command.getComponents(); assertThat(arguments.size()).isEqualTo(components.size()); - assertThat(components.size()).isEqualTo(4);; + assertThat(components.size()).isEqualTo(4); // Arguments should exactly match the component getArgument() result, in same order for (int i = 0; i < components.size(); i++) { @@ -161,10 +161,10 @@ class CommandManagerTest { // Argument configuration, we know component has the same argument so no need to test those // TODO: Aliases - assertThat(arguments.get(0).getName()).isEqualTo("component");; - assertThat(arguments.get(1).getName()).isEqualTo("literal");; - assertThat(arguments.get(2).getName()).isEqualTo("detail");; - assertThat(arguments.get(3).getName()).isEqualTo("argument");; + assertThat(arguments.get(0).getName()).isEqualTo("component"); + assertThat(arguments.get(1).getName()).isEqualTo("literal"); + assertThat(arguments.get(2).getName()).isEqualTo("detail"); + assertThat(arguments.get(3).getName()).isEqualTo("argument"); // Check argument is indeed a command argument assertThat(TypeToken.get(int.class)).isEqualTo(arguments.get(3).getValueType()); @@ -172,7 +172,7 @@ class CommandManagerTest { // Check description is set for all components, is empty when not specified assertThat(components.get(0).getArgumentDescription().getDescription()).isEmpty(); assertThat(components.get(1).getArgumentDescription().getDescription()).isEmpty(); - assertThat(components.get(2).getArgumentDescription().getDescription()).isEqualTo("detaildescription");; - assertThat(components.get(3).getArgumentDescription().getDescription()).isEqualTo("argumentdescription");; + assertThat(components.get(2).getArgumentDescription().getDescription()).isEqualTo("detaildescription"); + assertThat(components.get(3).getArgumentDescription().getDescription()).isEqualTo("argumentdescription"); } } diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandPerformanceTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandPerformanceTest.java index d6095a8c..51e87fa3 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandPerformanceTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandPerformanceTest.java @@ -56,7 +56,6 @@ final class CommandPerformanceTest { } manager.command(builder.build()); literalChain = literalBuilder.toString(); - } @Test @@ -89,5 +88,4 @@ final class CommandPerformanceTest { final Collection results = new Runner(options).run(); Assertions.assertFalse(results.isEmpty()); } - } diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandPermissionTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandPermissionTest.java index f3afef2f..bbfbaf69 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandPermissionTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandPermissionTest.java @@ -59,8 +59,8 @@ class CommandPermissionTest { @Test void testCompoundPermission() { - assertThat(manager.suggest(new TestCommandSender(), "t")).isEmpty(); - assertThat(manager.suggest(new TestCommandSender("test.permission.four"), "t")).isNotEmpty(); + assertThat(manager.suggest(new TestCommandSender(), "t")).isEmpty(); + assertThat(manager.suggest(new TestCommandSender("test.permission.four"), "t")).isNotEmpty(); } @Test @@ -99,10 +99,14 @@ class CommandPermissionTest { @Test void testComplexOrPermissions() { - final CommandPermission andOne = AndPermission.of(Arrays.asList(Permission.of("perm.one"), - Permission.of("perm.two"))); - final CommandPermission andTwo = AndPermission.of(Arrays.asList(Permission.of("perm.three"), - (PredicatePermission) (s) -> false)); + final CommandPermission andOne = AndPermission.of(Arrays.asList( + Permission.of("perm.one"), + Permission.of("perm.two") + )); + final CommandPermission andTwo = AndPermission.of(Arrays.asList( + Permission.of("perm.three"), + (PredicatePermission) (s) -> false + )); final CommandPermission orPermission = OrPermission.of(Arrays.asList(andOne, andTwo)); assertFalse(manager.hasPermission(new TestCommandSender("does.have", "also.does.have"), orPermission)); assertFalse(manager.hasPermission(new TestCommandSender("perm.one", "perm.three"), orPermission)); @@ -111,10 +115,14 @@ class CommandPermissionTest { @Test void testComplexAndPermissions() { - final CommandPermission orOne = OrPermission.of(Arrays.asList(Permission.of("perm.one"), - (PredicatePermission) (s) -> false)); - final CommandPermission orTwo = OrPermission.of(Arrays.asList(Permission.of("perm.two"), - Permission.of("perm.three"))); + final CommandPermission orOne = OrPermission.of(Arrays.asList( + Permission.of("perm.one"), + (PredicatePermission) (s) -> false + )); + final CommandPermission orTwo = OrPermission.of(Arrays.asList( + Permission.of("perm.two"), + Permission.of("perm.three") + )); final CommandPermission andPermission = AndPermission.of(Arrays.asList(orOne, orTwo)); assertFalse(manager.hasPermission(new TestCommandSender("perm.one"), andPermission)); assertTrue(manager.hasPermission(new TestCommandSender("perm.one", "perm.two"), andPermission)); @@ -162,7 +170,5 @@ class CommandPermissionTest { public @NonNull CommandMeta createDefaultCommandMeta() { return SimpleCommandMeta.empty(); } - } - } diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandPreProcessorTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandPreProcessorTest.java index fe49060b..9cee7bda 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandPreProcessorTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandPreProcessorTest.java @@ -84,7 +84,5 @@ public class CommandPreProcessorTest { ConsumerService.interrupt(); } } - } - } diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandRegistrationStateTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandRegistrationStateTest.java index 8f35f9ba..0cfd7d61 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandRegistrationStateTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandRegistrationStateTest.java @@ -98,5 +98,4 @@ public class CommandRegistrationStateTest { 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 bd492669..42b9bdf1 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandSuggestionsTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandSuggestionsTest.java @@ -94,10 +94,13 @@ public class CommandSuggestionsTest { manager.command(manager.commandBuilder("flags3") .flag(manager.flagBuilder("compound") - .withArgument(ArgumentTriplet.of(manager, "triplet", - Triplet.of("x", "y", "z"), - Triplet.of(int.class, int.class, int.class)) - .simple())) + .withArgument( + ArgumentTriplet.of(manager, "triplet", + Triplet.of("x", "y", "z"), + Triplet.of(int.class, int.class, int.class) + ).simple() + ) + ) .flag(manager.flagBuilder("presence").withAliases("p")) .flag(manager.flagBuilder("single") .withArgument(IntegerArgument.of("value")))); @@ -501,5 +504,4 @@ public class CommandSuggestionsTest { FOO, BAR } - } diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandTest.java index 6e187c6f..8eb123fe 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandTest.java @@ -53,5 +53,4 @@ class CommandTest { .build() ); } - } diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandTreeTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandTreeTest.java index 9ff3f20e..bcdea938 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandTreeTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandTreeTest.java @@ -343,7 +343,7 @@ class CommandTreeTest { // Act assertThrows( CompletionException.class, () -> - this.commandManager.executeCommand(new TestCommandSender(), "flags --test test2").join() + this.commandManager.executeCommand(new TestCommandSender(), "flags --test test2").join() ); } @@ -454,11 +454,16 @@ class CommandTreeTest { // Verify built command has the repeat argument twice List> args = command.getArguments(); - assertThat(args.size()).isEqualTo(4);; - assertThat(args.get(0).getName()).isEqualTo("repeatingargscommand");; - assertThat(args.get(1).getName()).isEqualTo("repeat");; - assertThat(args.get(2).getName()).isEqualTo("middle");; - assertThat(args.get(3).getName()).isEqualTo("repeat");; + assertThat(args.size()).isEqualTo(4); + ; + assertThat(args.get(0).getName()).isEqualTo("repeatingargscommand"); + ; + assertThat(args.get(1).getName()).isEqualTo("repeat"); + ; + assertThat(args.get(2).getName()).isEqualTo("middle"); + ; + assertThat(args.get(3).getName()).isEqualTo("repeat"); + ; // Register this.commandManager.command(command); @@ -492,8 +497,10 @@ class CommandTreeTest { new LinkedList<>(Arrays.asList("literalwithvariable", "argthatdoesnotmatch")) ); assertThat(variableResult.getSecond()).isNull(); - assertThat(variableResult.getFirst().getArguments().get(0).getName()).isEqualTo("literalwithvariable");; - assertThat(variableResult.getFirst().getArguments().get(1).getName()).isEqualTo("variable");; + assertThat(variableResult.getFirst().getArguments().get(0).getName()).isEqualTo("literalwithvariable"); + ; + assertThat(variableResult.getFirst().getArguments().get(1).getName()).isEqualTo("variable"); + ; /* Try parsing with the main name literal, which should match the literal command */ final Pair, Exception> literalResult = this.commandManager.getCommandTree().parse( @@ -501,8 +508,10 @@ class CommandTreeTest { new LinkedList<>(Arrays.asList("literalwithvariable", "literal")) ); assertThat(literalResult.getSecond()).isNull(); - assertThat(literalResult.getFirst().getArguments().get(0).getName()).isEqualTo("literalwithvariable");; - assertThat(literalResult.getFirst().getArguments().get(1).getName()).isEqualTo("literal");; + assertThat(literalResult.getFirst().getArguments().get(0).getName()).isEqualTo("literalwithvariable"); + ; + assertThat(literalResult.getFirst().getArguments().get(1).getName()).isEqualTo("literal"); + ; /* Try parsing with the alias of the literal, which should match the literal command */ final Pair, Exception> literalAliasResult = this.commandManager.getCommandTree().parse( @@ -510,8 +519,10 @@ class CommandTreeTest { new LinkedList<>(Arrays.asList("literalwithvariable", "literalalias")) ); assertThat(literalAliasResult.getSecond()).isNull(); - assertThat(literalAliasResult.getFirst().getArguments().get(0).getName()).isEqualTo("literalwithvariable");; - assertThat(literalAliasResult.getFirst().getArguments().get(1).getName()).isEqualTo("literal");; + assertThat(literalAliasResult.getFirst().getArguments().get(0).getName()).isEqualTo("literalwithvariable"); + ; + assertThat(literalAliasResult.getFirst().getArguments().get(1).getName()).isEqualTo("literal"); + ; } @Test diff --git a/cloud-core/src/test/java/cloud/commandframework/ExecutionBenchmark.java b/cloud-core/src/test/java/cloud/commandframework/ExecutionBenchmark.java index 48617e61..01727c98 100644 --- a/cloud-core/src/test/java/cloud/commandframework/ExecutionBenchmark.java +++ b/cloud-core/src/test/java/cloud/commandframework/ExecutionBenchmark.java @@ -60,7 +60,6 @@ public class ExecutionBenchmark { } manager.command(builder.build()); literalChain = literalBuilder.toString(); - } @TearDown @@ -72,5 +71,4 @@ public class ExecutionBenchmark { public void testCommandParsing() { manager.executeCommand(new TestCommandSender(), literalChain).join(); } - } diff --git a/cloud-core/src/test/java/cloud/commandframework/ParameterInjectorRegistryTest.java b/cloud-core/src/test/java/cloud/commandframework/ParameterInjectorRegistryTest.java index 66348601..54dd7163 100644 --- a/cloud-core/src/test/java/cloud/commandframework/ParameterInjectorRegistryTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/ParameterInjectorRegistryTest.java @@ -107,7 +107,5 @@ public class ParameterInjectorRegistryTest { protected void configure() { bind(Integer.class).toInstance(INJECTED_INTEGER); } - } - } diff --git a/cloud-core/src/test/java/cloud/commandframework/ParserRegistryTest.java b/cloud-core/src/test/java/cloud/commandframework/ParserRegistryTest.java index 9d9c41ff..cc8f60e7 100644 --- a/cloud-core/src/test/java/cloud/commandframework/ParserRegistryTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/ParserRegistryTest.java @@ -101,8 +101,8 @@ public class ParserRegistryTest { parserParameters.store(StandardParameters.RANGE_MAX, RANGE_MAX); final ArgumentParser parser = parserRegistry.createParser( - parsedType, - parserParameters + parsedType, + parserParameters ).orElseThrow(() -> new NullPointerException("No parser found")); assertThat(parser).isInstanceOf(IntegerArgument.IntegerParser.class); @@ -143,5 +143,4 @@ public class ParserRegistryTest { // Then assertThat(parserOptional).isPresent(); } - } diff --git a/cloud-core/src/test/java/cloud/commandframework/TestCommandSender.java b/cloud-core/src/test/java/cloud/commandframework/TestCommandSender.java index 07368e91..f1b38cf8 100644 --- a/cloud-core/src/test/java/cloud/commandframework/TestCommandSender.java +++ b/cloud-core/src/test/java/cloud/commandframework/TestCommandSender.java @@ -28,6 +28,7 @@ import java.util.HashSet; import java.util.Set; public class TestCommandSender { + private final Set permissions = new HashSet<>(); public TestCommandSender() { @@ -48,5 +49,4 @@ public class TestCommandSender { public void removePermission(final String permission) { this.permissions.remove(permission); } - } diff --git a/cloud-core/src/test/java/cloud/commandframework/arguments/standard/BooleanParserTest.java b/cloud-core/src/test/java/cloud/commandframework/arguments/standard/BooleanParserTest.java index f5bff39f..45f6f5f2 100644 --- a/cloud-core/src/test/java/cloud/commandframework/arguments/standard/BooleanParserTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/arguments/standard/BooleanParserTest.java @@ -110,7 +110,7 @@ class BooleanParserTest { } @ParameterizedTest - @ValueSource(booleans = { true, false }) + @ValueSource(booleans = {true, false}) void Parse_NonBooleanInput_FailedParse(final boolean liberal) { // Arrange final BooleanArgument.BooleanParser parser = new BooleanArgument.BooleanParser<>(liberal); diff --git a/cloud-core/src/test/java/cloud/commandframework/arguments/standard/DurationArgumentSuggestionsTest.java b/cloud-core/src/test/java/cloud/commandframework/arguments/standard/DurationArgumentSuggestionsTest.java index 8106bdf8..eedd118c 100644 --- a/cloud-core/src/test/java/cloud/commandframework/arguments/standard/DurationArgumentSuggestionsTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/arguments/standard/DurationArgumentSuggestionsTest.java @@ -86,6 +86,4 @@ public class DurationArgumentSuggestionsTest { final List suggestions8 = manager.suggest(new TestCommandSender(), input8); Assertions.assertEquals(Collections.emptyList(), suggestions8); } - - } diff --git a/cloud-core/src/test/java/cloud/commandframework/arguments/standard/DurationArgumentTest.java b/cloud-core/src/test/java/cloud/commandframework/arguments/standard/DurationArgumentTest.java index f55f0ced..104ebf49 100644 --- a/cloud-core/src/test/java/cloud/commandframework/arguments/standard/DurationArgumentTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/arguments/standard/DurationArgumentTest.java @@ -91,5 +91,4 @@ public class DurationArgumentTest { "duration 1x" ).join()); } - } diff --git a/cloud-core/src/test/java/cloud/commandframework/arguments/standard/FloatParserTest.java b/cloud-core/src/test/java/cloud/commandframework/arguments/standard/FloatParserTest.java index 1970a23e..c0dc81aa 100644 --- a/cloud-core/src/test/java/cloud/commandframework/arguments/standard/FloatParserTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/arguments/standard/FloatParserTest.java @@ -26,9 +26,7 @@ package cloud.commandframework.arguments.standard; import cloud.commandframework.TestCommandSender; import cloud.commandframework.arguments.parser.ArgumentParseResult; import cloud.commandframework.context.CommandContext; -import java.util.ArrayList; import java.util.LinkedList; -import java.util.List; import java.util.concurrent.ThreadLocalRandom; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; 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 03d65338..c1c89096 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 @@ -118,5 +118,4 @@ class StringArgumentTest { assertThat(storage[0]).isEqualTo("greedy string content"); } - } diff --git a/cloud-core/src/test/java/cloud/commandframework/arguments/standard/StringArrayParserTest.java b/cloud-core/src/test/java/cloud/commandframework/arguments/standard/StringArrayParserTest.java index ab7c9c21..da85d9db 100644 --- a/cloud-core/src/test/java/cloud/commandframework/arguments/standard/StringArrayParserTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/arguments/standard/StringArrayParserTest.java @@ -26,7 +26,6 @@ package cloud.commandframework.arguments.standard; import cloud.commandframework.TestCommandSender; import cloud.commandframework.arguments.parser.ArgumentParseResult; import cloud.commandframework.context.CommandContext; -import java.util.Collections; import java.util.LinkedList; import java.util.concurrent.ThreadLocalRandom; import java.util.stream.Collectors; @@ -103,7 +102,7 @@ class StringArrayParserTest { // Assert assertThat(result.getFailure()).isEmpty(); - assertThat(result.getParsedValue()).hasValue(new String[] {"this", "is", "a", "string"}); + assertThat(result.getParsedValue()).hasValue(new String[]{"this", "is", "a", "string"}); assertThat(input).containsExactly("--flag", "more", "flag", "content"); } @@ -131,7 +130,7 @@ class StringArrayParserTest { // Assert assertThat(result.getFailure()).isEmpty(); - assertThat(result.getParsedValue()).hasValue(new String[] {"this", "is", "a", "string"}); + assertThat(result.getParsedValue()).hasValue(new String[]{"this", "is", "a", "string"}); assertThat(input).containsExactly("-f", "-l", "-a", "-g"); } diff --git a/cloud-core/src/test/java/cloud/commandframework/issue/Issue281.java b/cloud-core/src/test/java/cloud/commandframework/issue/Issue281.java index 7b2f0201..2ce48376 100644 --- a/cloud-core/src/test/java/cloud/commandframework/issue/Issue281.java +++ b/cloud-core/src/test/java/cloud/commandframework/issue/Issue281.java @@ -87,5 +87,6 @@ class Issue281 { @SuppressWarnings("serial") private static final class CustomException extends RuntimeException { + } } diff --git a/cloud-core/src/test/java/cloud/commandframework/issue/Issue321.java b/cloud-core/src/test/java/cloud/commandframework/issue/Issue321.java index 459cb191..be716dab 100644 --- a/cloud-core/src/test/java/cloud/commandframework/issue/Issue321.java +++ b/cloud-core/src/test/java/cloud/commandframework/issue/Issue321.java @@ -77,7 +77,7 @@ class Issue321 { final CommandContext context = result.getCommandContext(); final FlagContext flags = context.flags(); - assertThat(flags.getValue("flag1")).hasValue(new String[] {"one", "two", "three"}); - assertThat(flags.getValue("flag2")).hasValue(new String[] {"1", "2", "3"}); + assertThat(flags.getValue("flag1")).hasValue(new String[]{"one", "two", "three"}); + assertThat(flags.getValue("flag2")).hasValue(new String[]{"1", "2", "3"}); } } diff --git a/cloud-core/src/test/java/cloud/commandframework/util/TestUtils.java b/cloud-core/src/test/java/cloud/commandframework/util/TestUtils.java index 54b7ea04..b63302c1 100644 --- a/cloud-core/src/test/java/cloud/commandframework/util/TestUtils.java +++ b/cloud-core/src/test/java/cloud/commandframework/util/TestUtils.java @@ -58,7 +58,6 @@ public final class TestUtils { ) { super(commandExecutionCoordinator, commandRegistrationHandler); } - } /** @@ -84,5 +83,4 @@ public final class TestUtils { return manager; } - } diff --git a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordCommand.java b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordCommand.java index d51aeb9d..ba468256 100644 --- a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordCommand.java +++ b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordCommand.java @@ -173,5 +173,4 @@ public class JavacordCommand implements MessageCreateListener { throwable.printStackTrace(); }); } - } diff --git a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordCommandManager.java b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordCommandManager.java index da95f3df..0b3fcb0a 100644 --- a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordCommandManager.java +++ b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordCommandManager.java @@ -135,5 +135,4 @@ public class JavacordCommandManager extends CommandManager { public @NonNull DiscordApi getDiscordApi() { return this.discordApi; } - } diff --git a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordCommandSender.java b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordCommandSender.java index 57e9d18f..a3b2f667 100644 --- a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordCommandSender.java +++ b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordCommandSender.java @@ -116,5 +116,4 @@ public class JavacordCommandSender { public CompletableFuture sendSuccessMessage(final @Nullable String message) { return this.sendMessage(":white_check_mark: " + message); } - } diff --git a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordPrivateSender.java b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordPrivateSender.java index 0db20082..c77eb277 100644 --- a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordPrivateSender.java +++ b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordPrivateSender.java @@ -49,5 +49,4 @@ public class JavacordPrivateSender extends JavacordCommandSender { .orElseThrow(() -> new UnsupportedOperationException( "PrivateTextChannel not present even though message was sent in a private channel")); } - } diff --git a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordServerSender.java b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordServerSender.java index c3674439..c7600068 100644 --- a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordServerSender.java +++ b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordServerSender.java @@ -62,5 +62,4 @@ public class JavacordServerSender extends JavacordCommandSender { .orElseThrow(() -> new UnsupportedOperationException( "Server not present even though message was sent on a server")); } - } diff --git a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDA4CommandManager.java b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDA4CommandManager.java index 76443213..7ba9e958 100644 --- a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDA4CommandManager.java +++ b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDA4CommandManager.java @@ -76,5 +76,4 @@ public class JDA4CommandManager extends JDACommandManager { backwardsCommandSenderMapper.andThen((sender) -> sender.getEvent().orElseThrow(IllegalStateException::new)) ); } - } 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 687c2f4b..8288eaa2 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 @@ -137,5 +137,4 @@ public class JDACommandListener extends ListenerAdapter { private void sendMessage(final @NonNull MessageReceivedEvent event, final @NonNull String message) { event.getChannel().sendMessage(message).queue(); } - } 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 b5ff0ca0..03be6bd7 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 @@ -193,5 +193,4 @@ public class JDACommandManager extends CommandManager { public final @NonNull CommandMeta createDefaultCommandMeta() { return SimpleCommandMeta.empty(); } - } diff --git a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandPreprocessor.java b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandPreprocessor.java index 290ebae9..002d2194 100644 --- a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandPreprocessor.java +++ b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandPreprocessor.java @@ -54,11 +54,11 @@ final class JDACommandPreprocessor implements CommandPreprocessor { * Stores the {@link net.dv8tion.jda.api.JDA} in the context with the key "JDA", * the {@link net.dv8tion.jda.api.events.message.MessageReceivedEvent} with the key "MessageReceivedEvent", and * the {@link net.dv8tion.jda.api.entities.MessageChannel} with the key "MessageChannel". - * + *

* If the message was sent in a guild, the {@link net.dv8tion.jda.api.entities.Guild} will be stored in the context with the * key "Guild". If the message was also sent in a text channel, the {@link net.dv8tion.jda.api.entities.TextChannel} will be * stored in the context with the key "TextChannel". - * + *

* If the message was sent in a DM instead of in a guild, the {@link net.dv8tion.jda.api.entities.PrivateChannel} will be * stored in the context with the key "PrivateChannel". */ @@ -88,5 +88,4 @@ final class JDACommandPreprocessor implements CommandPreprocessor { context.getCommandContext().store("PrivateChannel", event.getPrivateChannel()); } } - } diff --git a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandSender.java b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandSender.java index 20ccdb55..49d5130e 100644 --- a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandSender.java +++ b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandSender.java @@ -102,5 +102,4 @@ public class JDACommandSender { public final @NonNull MessageChannel getChannel() { return this.channel; } - } diff --git a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDAGuildSender.java b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDAGuildSender.java index 3ad10b74..2d7bbd66 100644 --- a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDAGuildSender.java +++ b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDAGuildSender.java @@ -73,5 +73,4 @@ public class JDAGuildSender extends JDACommandSender { public @NonNull TextChannel getTextChannel() { return this.channel; } - } diff --git a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDAPrivateSender.java b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDAPrivateSender.java index b0336a4c..7994ae30 100644 --- a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDAPrivateSender.java +++ b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDAPrivateSender.java @@ -61,5 +61,4 @@ public class JDAPrivateSender extends JDACommandSender { public @NonNull PrivateChannel getPrivateChannel() { return this.channel; } - } diff --git a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/ChannelArgument.java b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/ChannelArgument.java index d29d57fb..f84ea6e0 100644 --- a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/ChannelArgument.java +++ b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/ChannelArgument.java @@ -157,7 +157,6 @@ public final class ChannelArgument extends CommandArgument this.modes ); } - } @@ -269,7 +268,6 @@ public final class ChannelArgument extends CommandArgument return ArgumentParseResult.success(channel); } - } @@ -295,7 +293,6 @@ public final class ChannelArgument extends CommandArgument public final @NonNull String getInput() { return this.input; } - } @@ -316,7 +313,6 @@ public final class ChannelArgument extends CommandArgument public @NonNull String getMessage() { return String.format("Too many channels found for '%s'.", getInput()); } - } @@ -337,7 +333,5 @@ public final class ChannelArgument extends CommandArgument public @NonNull String getMessage() { return String.format("Channel not found for '%s'.", getInput()); } - } - } diff --git a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/RoleArgument.java b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/RoleArgument.java index 87635897..483640c7 100644 --- a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/RoleArgument.java +++ b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/RoleArgument.java @@ -148,7 +148,6 @@ public final class RoleArgument extends CommandArgument { this.modes ); } - } @@ -260,7 +259,6 @@ public final class RoleArgument extends CommandArgument { return ArgumentParseResult.success(role); } - } @@ -286,7 +284,6 @@ public final class RoleArgument extends CommandArgument { public final @NonNull String getInput() { return this.input; } - } @@ -307,7 +304,6 @@ public final class RoleArgument extends CommandArgument { public @NonNull String getMessage() { return String.format("Too many roles found for '%s'.", getInput()); } - } @@ -328,7 +324,5 @@ public final class RoleArgument extends CommandArgument { public @NonNull String getMessage() { return String.format("Role not found for '%s'.", getInput()); } - } - } 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 9c8fcad0..fc7f5033 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 @@ -192,7 +192,6 @@ public final class UserArgument extends CommandArgument { this.isolationLevel ); } - } @@ -343,7 +342,6 @@ public final class UserArgument extends CommandArgument { return ArgumentParseResult.success(user); } } - } @@ -369,7 +367,6 @@ public final class UserArgument extends CommandArgument { public final @NonNull String getInput() { return this.input; } - } @@ -390,7 +387,6 @@ public final class UserArgument extends CommandArgument { public @NonNull String getMessage() { return String.format("Too many users found for '%s'.", getInput()); } - } @@ -411,7 +407,5 @@ public final class UserArgument extends CommandArgument { public @NonNull String getMessage() { return String.format("User not found for '%s'.", getInput()); } - } - } diff --git a/cloud-irc/cloud-pircbotx/src/main/java/cloud/commandframework/pircbotx/CloudListenerAdapter.java b/cloud-irc/cloud-pircbotx/src/main/java/cloud/commandframework/pircbotx/CloudListenerAdapter.java index a0e48673..e08979c1 100644 --- a/cloud-irc/cloud-pircbotx/src/main/java/cloud/commandframework/pircbotx/CloudListenerAdapter.java +++ b/cloud-irc/cloud-pircbotx/src/main/java/cloud/commandframework/pircbotx/CloudListenerAdapter.java @@ -105,5 +105,4 @@ final class CloudListenerAdapter extends ListenerAdapter { } }); } - } diff --git a/cloud-irc/cloud-pircbotx/src/main/java/cloud/commandframework/pircbotx/PircBotXCommandManager.java b/cloud-irc/cloud-pircbotx/src/main/java/cloud/commandframework/pircbotx/PircBotXCommandManager.java index f5ccf7c8..619a8576 100644 --- a/cloud-irc/cloud-pircbotx/src/main/java/cloud/commandframework/pircbotx/PircBotXCommandManager.java +++ b/cloud-irc/cloud-pircbotx/src/main/java/cloud/commandframework/pircbotx/PircBotXCommandManager.java @@ -146,5 +146,4 @@ public class PircBotXCommandManager extends CommandManager { final @NonNull Function getUserMapper() { return this.userMapper; } - } diff --git a/cloud-irc/cloud-pircbotx/src/main/java/cloud/commandframework/pircbotx/arguments/UserArgument.java b/cloud-irc/cloud-pircbotx/src/main/java/cloud/commandframework/pircbotx/arguments/UserArgument.java index 5091004d..165bdcb4 100644 --- a/cloud-irc/cloud-pircbotx/src/main/java/cloud/commandframework/pircbotx/arguments/UserArgument.java +++ b/cloud-irc/cloud-pircbotx/src/main/java/cloud/commandframework/pircbotx/arguments/UserArgument.java @@ -124,7 +124,6 @@ public final class UserArgument extends CommandArgument { this.getDefaultDescription() ); } - } @@ -157,7 +156,6 @@ public final class UserArgument extends CommandArgument { } return ArgumentParseResult.success(user); } - } @@ -179,7 +177,5 @@ public final class UserArgument extends CommandArgument { ) ); } - } - } diff --git a/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/BrigadierManagerHolder.java b/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/BrigadierManagerHolder.java index 84faebd6..b7b97788 100644 --- a/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/BrigadierManagerHolder.java +++ b/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/BrigadierManagerHolder.java @@ -45,5 +45,4 @@ public interface BrigadierManagerHolder { * @since 1.2.0 */ @Nullable CloudBrigadierManager brigadierManager(); - } diff --git a/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/BrigadierMapping.java b/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/BrigadierMapping.java index b384b1af..8f22f5aa 100644 --- a/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/BrigadierMapping.java +++ b/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/BrigadierMapping.java @@ -33,6 +33,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import static java.util.Objects.requireNonNull; final class BrigadierMapping, S> { + private final boolean cloudSuggestions; private final BrigadierMappingBuilder.@Nullable SuggestionProviderSupplier suggestionsOverride; private final @Nullable Function> mapper; @@ -67,11 +68,15 @@ final class BrigadierMapping, S> { } return this.suggestionsOverride == null ? null - : (SuggestionProvider) this.suggestionsOverride.provide(commandArgument, CloudBrigadierManager.delegateSuggestions()); + : (SuggestionProvider) this.suggestionsOverride.provide( + commandArgument, + CloudBrigadierManager.delegateSuggestions() + ); } static final class BuilderImpl, S> implements BrigadierMappingBuilder { + private Function> mapper; private boolean cloudSuggestions = false; private SuggestionProviderSupplier suggestionsOverride; @@ -118,6 +123,5 @@ final class BrigadierMapping, S> { public BrigadierMapping build() { return new BrigadierMapping<>(this.cloudSuggestions, this.suggestionsOverride, this.mapper); } - } } diff --git a/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/BrigadierMappingBuilder.java b/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/BrigadierMappingBuilder.java index feec2244..4cb93d5a 100644 --- a/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/BrigadierMappingBuilder.java +++ b/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/BrigadierMappingBuilder.java @@ -114,7 +114,5 @@ public interface BrigadierMappingBuilder, S> { * @since 1.5.0 */ @Nullable SuggestionProvider provide(@NonNull K argument, SuggestionProvider useCloud); - } - } 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 bf529ee9..8a17e492 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 @@ -357,7 +357,6 @@ public final class CloudBrigadierManager { final BrigadierMapping.BuilderImpl builder = new BrigadierMapping.BuilderImpl<>(); configurer.accept(builder); this.mappers.put(GenericTypeReflector.erase(parserType.getType()), builder.build()); - } /** @@ -569,11 +568,11 @@ public final class CloudBrigadierManager { ); final SuggestionProvider provider = pair.getSecond() == delegateSuggestions() ? (context, builder) -> this.buildSuggestions( - context, - root.getParent(), - root.getValue(), - builder - ) : pair.getSecond(); + context, + root.getParent(), + root.getValue(), + builder + ) : pair.getSecond(); argumentBuilder = RequiredArgumentBuilder .argument(root.getValue().getName(), (ArgumentType) pair.getFirst()) .suggests(provider) @@ -665,5 +664,4 @@ public final class CloudBrigadierManager { return suggestionsBuilder.buildFuture(); } - } diff --git a/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/QueueAsStringReader.java b/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/QueueAsStringReader.java index 9c84fc48..a8a7cdd8 100644 --- a/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/QueueAsStringReader.java +++ b/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/QueueAsStringReader.java @@ -28,6 +28,7 @@ import java.util.Deque; import java.util.Queue; final class QueueAsStringReader extends StringReader { + private boolean closed; private final Queue input; @@ -65,5 +66,4 @@ final class QueueAsStringReader extends StringReader { } } } - } diff --git a/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/StringReaderAsQueue.java b/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/StringReaderAsQueue.java index e7774017..3eab5319 100644 --- a/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/StringReaderAsQueue.java +++ b/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/StringReaderAsQueue.java @@ -44,6 +44,7 @@ public interface StringReaderAsQueue extends Queue { /** * Given an existing Brigadier {@code StringReader}, get a view of it as a {@link Queue} + * * @param reader the input reader * @return a view of the contents of the reader as a {@link Queue} split by word. */ @@ -205,5 +206,4 @@ public interface StringReaderAsQueue extends Queue { default void clear() { // consume all this.getOriginal().setCursor(this.getOriginal().getTotalLength()); } - } diff --git a/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/StringReaderAsQueueImpl.java b/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/StringReaderAsQueueImpl.java index 2bb1d1f4..5ebfcb97 100644 --- a/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/StringReaderAsQueueImpl.java +++ b/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/StringReaderAsQueueImpl.java @@ -52,6 +52,7 @@ final class StringReaderAsQueueImpl { * Extending variant is only implementable with Mixin, because of clashing return types on the two interfaces (on `peek`). */ static final class Wrapping implements StringReaderAsQueue { + private final StringReader original; private int nextSpaceIdx; /* the character before the start of a new word */ private @Nullable String nextWord; @@ -128,7 +129,5 @@ final class StringReaderAsQueueImpl { this.nextWord = null; this.nextSpaceIdx = -1; } - } - } diff --git a/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/WrappedBrigadierParser.java b/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/WrappedBrigadierParser.java index 71900510..ace9ee22 100644 --- a/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/WrappedBrigadierParser.java +++ b/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/WrappedBrigadierParser.java @@ -85,8 +85,8 @@ public final class WrappedBrigadierParser implements ArgumentParser * @since 1.5.0 */ public WrappedBrigadierParser( - final ArgumentType nativeType, - final int expectedArgumentCount + final ArgumentType nativeType, + final int expectedArgumentCount ) { this(() -> nativeType, expectedArgumentCount); } @@ -191,5 +191,4 @@ public final class WrappedBrigadierParser implements ArgumentParser public int getRequestedArgumentCount() { return this.expectedArgumentCount; } - } diff --git a/cloud-minecraft/cloud-brigadier/src/test/java/cloud/commandframework/brigadier/argument/QueueAsStringReaderTest.java b/cloud-minecraft/cloud-brigadier/src/test/java/cloud/commandframework/brigadier/argument/QueueAsStringReaderTest.java index 08c26ae1..9db2dff8 100644 --- a/cloud-minecraft/cloud-brigadier/src/test/java/cloud/commandframework/brigadier/argument/QueueAsStringReaderTest.java +++ b/cloud-minecraft/cloud-brigadier/src/test/java/cloud/commandframework/brigadier/argument/QueueAsStringReaderTest.java @@ -94,5 +94,4 @@ public class QueueAsStringReaderTest { assertEquals(words("pig"), contents); } - } diff --git a/cloud-minecraft/cloud-brigadier/src/test/java/cloud/commandframework/brigadier/argument/StringReaderAsQueueTest.java b/cloud-minecraft/cloud-brigadier/src/test/java/cloud/commandframework/brigadier/argument/StringReaderAsQueueTest.java index 26c0aec5..e3d2b78c 100644 --- a/cloud-minecraft/cloud-brigadier/src/test/java/cloud/commandframework/brigadier/argument/StringReaderAsQueueTest.java +++ b/cloud-minecraft/cloud-brigadier/src/test/java/cloud/commandframework/brigadier/argument/StringReaderAsQueueTest.java @@ -40,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * Tests for {@link StringReaderAsQueue} - * + *

* Most operations have 4 cases: 0 arguments, 1 argument, 2 arguments, and 3 or more arguments. * At that point every whitespace handling path should be exercised. */ @@ -162,7 +162,7 @@ class StringReaderAsQueueTest { @Test void testToArrayMultiple() { final Queue elements = StringReaderAsQueue.from(new StringReader("one two three four")); - assertArrayEquals(new String[] { "one", "two", "three", "four" }, elements.toArray()); + assertArrayEquals(new String[]{"one", "two", "three", "four"}, elements.toArray()); } @Test @@ -177,5 +177,4 @@ class StringReaderAsQueueTest { assertEquals(pair.getSecond(), StringReaderAsQueue.from(new StringReader(pair.getFirst())).size()); }); } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitBrigadierMapper.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitBrigadierMapper.java index 1b199a1a..89a62aa2 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitBrigadierMapper.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitBrigadierMapper.java @@ -315,5 +315,4 @@ public final class BukkitBrigadierMapper { ) { this.brigadierManager.registerDefaultArgumentTypeSupplier(type, argumentTypeSupplier); } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCaptionKeys.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCaptionKeys.java index 615f36d4..407527af 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCaptionKeys.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCaptionKeys.java @@ -128,5 +128,4 @@ public final class BukkitCaptionKeys { public static @NonNull Collection<@NonNull Caption> getBukkitCaptionKeys() { return Collections.unmodifiableCollection(RECOGNIZED_CAPTIONS); } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCaptionRegistry.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCaptionRegistry.java index 2fe0fd5f..066c8d60 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCaptionRegistry.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCaptionRegistry.java @@ -169,5 +169,4 @@ public class BukkitCaptionRegistry extends SimpleCaptionRegistry { (caption, sender) -> ARGUMENT_PARSE_FAILURE_NAMESPACED_KEY_NEED_NAMESPACE ); } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCaptionRegistryFactory.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCaptionRegistryFactory.java index df9a7a3e..4ee7e72b 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCaptionRegistryFactory.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCaptionRegistryFactory.java @@ -40,5 +40,4 @@ public final class BukkitCaptionRegistryFactory { public @NonNull BukkitCaptionRegistry create() { return new BukkitCaptionRegistry<>(); } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandContextKeys.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandContextKeys.java index 2a1cdde6..93c32eb9 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandContextKeys.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandContextKeys.java @@ -59,5 +59,4 @@ public final class BukkitCommandContextKeys { private BukkitCommandContextKeys() { } - } 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 d114c6cf..695d4a00 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 @@ -454,7 +454,5 @@ public class BukkitCommandManager extends CommandManager implements Brigad this.getCause() == null ? "" : this.getCause().getMessage() ); } - } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandMeta.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandMeta.java index 0e8bbecf..f3ded996 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandMeta.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandMeta.java @@ -42,5 +42,4 @@ public class BukkitCommandMeta extends SimpleCommandMeta { public BukkitCommandMeta(final @NonNull SimpleCommandMeta simpleCommandMeta) { super(simpleCommandMeta); } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandMetaBuilder.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandMetaBuilder.java index 1d7e59fa..6b2e301a 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandMetaBuilder.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandMetaBuilder.java @@ -62,7 +62,6 @@ public final class BukkitCommandMetaBuilder { public @NonNull BuilderStage2 withDescription(final @NonNull String description) { return new BuilderStage2(description); } - } @@ -82,7 +81,5 @@ public final class BukkitCommandMetaBuilder { public @NonNull BukkitCommandMeta build() { return new BukkitCommandMeta(CommandMeta.simple().with(CommandMeta.DESCRIPTION, this.description).build()); } - } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandPreprocessor.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandPreprocessor.java index e9deebbb..ebbc1340 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandPreprocessor.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandPreprocessor.java @@ -77,5 +77,4 @@ final class BukkitCommandPreprocessor implements CommandPreprocessor { this.commandManager.queryCapabilities() ); } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandSender.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandSender.java index 8fbb3ed0..567216b6 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandSender.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandSender.java @@ -127,5 +127,4 @@ public abstract class BukkitCommandSender { public void sendMessage(final @NonNull String message) { this.internalSender.sendMessage(message); } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitConsoleSender.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitConsoleSender.java index a4f266df..47600a7a 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitConsoleSender.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitConsoleSender.java @@ -43,5 +43,4 @@ final class BukkitConsoleSender extends BukkitCommandSender { public @NonNull Player asPlayer() { throw new UnsupportedOperationException("Cannot convert console to player"); } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitParserParameters.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitParserParameters.java index 1651fea1..6bd4c8f8 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitParserParameters.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitParserParameters.java @@ -61,5 +61,4 @@ public final class BukkitParserParameters { ) { return new ParserParameter<>(key, expectedType); } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPlayerSender.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPlayerSender.java index 9fb65415..9091793e 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPlayerSender.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPlayerSender.java @@ -42,5 +42,4 @@ final class BukkitPlayerSender extends BukkitCommandSender { public @NonNull Player asPlayer() { return (Player) this.getInternalSender(); } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPluginRegistrationHandler.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPluginRegistrationHandler.java index e1365ff1..08143edb 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPluginRegistrationHandler.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPluginRegistrationHandler.java @@ -82,8 +82,9 @@ public class BukkitPluginRegistrationHandler implements CommandRegistrationHa final String label = commandArgument.getName(); final String namespacedLabel = this.getNamespacedLabel(label); - @SuppressWarnings("unchecked") - final List aliases = new ArrayList<>(((StaticArgument) commandArgument).getAlternativeAliases()); + @SuppressWarnings("unchecked") final List aliases = new ArrayList<>( + ((StaticArgument) commandArgument).getAlternativeAliases() + ); @SuppressWarnings("unchecked") final BukkitCommand bukkitCommand = new BukkitCommand<>( label, @@ -226,5 +227,4 @@ public class BukkitPluginRegistrationHandler implements CommandRegistrationHa } return command != null; } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitSynchronizer.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitSynchronizer.java index bc79ebf3..e91c30d3 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitSynchronizer.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitSynchronizer.java @@ -79,5 +79,4 @@ public final class BukkitSynchronizer implements TaskSynchronizer { this.plugin.getServer().getScheduler().runTaskAsynchronously(this.plugin, () -> future.complete(function.apply(input))); return future; } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudBukkitCapabilities.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudBukkitCapabilities.java index a83cf907..4df50d2a 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudBukkitCapabilities.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudBukkitCapabilities.java @@ -35,7 +35,7 @@ import org.checkerframework.checker.nullness.qual.NonNull; */ public enum CloudBukkitCapabilities implements CloudCapability { BRIGADIER(CraftBukkitReflection.classExists("com.mojang.brigadier.tree.CommandNode") - && CraftBukkitReflection.findOBCClass("command.BukkitCommandWrapper") != null), + && CraftBukkitReflection.findOBCClass("command.BukkitCommandWrapper") != null), NATIVE_BRIGADIER(CraftBukkitReflection.classExists( "com.destroystokyo.paper.event.brigadier.CommandRegisteredEvent")), diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudCommodoreManager.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudCommodoreManager.java index ebdabcb9..cee6cb85 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudCommodoreManager.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudCommodoreManager.java @@ -118,7 +118,9 @@ class CloudCommodoreManager extends BukkitPluginRegistrationHandler { } try { - final Class commodoreImpl = (Class) Class.forName("me.lucko.commodore.CommodoreImpl"); + final Class commodoreImpl = (Class) Class.forName( + "me.lucko.commodore.CommodoreImpl" + ); final Method removeChild = commodoreImpl.getDeclaredMethod("removeChild", RootCommandNode.class, String.class); removeChild.setAccessible(true); @@ -148,5 +150,4 @@ class CloudCommodoreManager extends BukkitPluginRegistrationHandler { } } } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/argument/NamespacedKeyArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/argument/NamespacedKeyArgument.java index 25da7ece..fb217d09 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/argument/NamespacedKeyArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/argument/NamespacedKeyArgument.java @@ -199,7 +199,6 @@ public final class NamespacedKeyArgument extends CommandArgument extends CommandArgument extends CommandArgument extends CommandArgument getPlayers() { return Collections.unmodifiableList(this.players); } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/SingleEntitySelector.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/SingleEntitySelector.java index 7560cc1d..50b60b1a 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/SingleEntitySelector.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/SingleEntitySelector.java @@ -57,5 +57,4 @@ public final class SingleEntitySelector extends MultipleEntitySelector { } return this.getEntities().get(0); } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/SinglePlayerSelector.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/SinglePlayerSelector.java index 2e58a46c..8fe859a2 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/SinglePlayerSelector.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/SinglePlayerSelector.java @@ -58,5 +58,4 @@ public final class SinglePlayerSelector extends MultiplePlayerSelector { } return this.getPlayers().get(0); } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/data/BlockPredicate.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/data/BlockPredicate.java index 9e3f5080..7869bbdd 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/data/BlockPredicate.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/data/BlockPredicate.java @@ -50,5 +50,4 @@ public interface BlockPredicate extends Predicate { * @since 1.5.0 */ @NonNull BlockPredicate loadChunks(); - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/data/ProtoItemStack.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/data/ProtoItemStack.java index 36e74e7a..de045a48 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/data/ProtoItemStack.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/data/ProtoItemStack.java @@ -61,5 +61,4 @@ public interface ProtoItemStack { */ @NonNull ItemStack createItemStack(int stackSize, boolean respectMaximumStackSize) throws IllegalArgumentException; - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/BukkitBackwardsBrigadierSenderMapper.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/BukkitBackwardsBrigadierSenderMapper.java index d34b9e9c..3bc622d6 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/BukkitBackwardsBrigadierSenderMapper.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/BukkitBackwardsBrigadierSenderMapper.java @@ -56,5 +56,4 @@ public final class BukkitBackwardsBrigadierSenderMapper implements Functio throw new RuntimeException(e); } } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/CommandBuildContextSupplier.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/CommandBuildContextSupplier.java index 5404e6b6..e15fc5c1 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/CommandBuildContextSupplier.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/CommandBuildContextSupplier.java @@ -65,5 +65,4 @@ public final class CommandBuildContextSupplier { throw new RuntimeException(e); } } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/CraftBukkitReflection.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/CraftBukkitReflection.java index d76d9d13..c734585b 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/CraftBukkitReflection.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/CraftBukkitReflection.java @@ -209,5 +209,4 @@ public final class CraftBukkitReflection { private CraftBukkitReflection() { } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/MinecraftArgumentTypes.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/MinecraftArgumentTypes.java index d8f58d91..f009ca55 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/MinecraftArgumentTypes.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/MinecraftArgumentTypes.java @@ -95,11 +95,13 @@ public final class MinecraftArgumentTypes { } private interface ArgumentTypeGetter { + Class> getClassByKey(@NonNull NamespacedKey key) throws IllegalArgumentException; } @SuppressWarnings("unchecked") private static final class ArgumentTypeGetterImpl implements MinecraftArgumentTypes.ArgumentTypeGetter { + private final Object argumentRegistry; private final Map byClassMap; @@ -129,6 +131,7 @@ public final class MinecraftArgumentTypes { @SuppressWarnings("unchecked") private static final class LegacyArgumentTypeGetter implements ArgumentTypeGetter { + private static final Constructor MINECRAFT_KEY_CONSTRUCTOR; private static final Method ARGUMENT_REGISTRY_GET_BY_KEY_METHOD; private static final Field BY_CLASS_MAP_FIELD; @@ -201,5 +204,4 @@ public final class MinecraftArgumentTypes { } } } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/RegistryReflection.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/RegistryReflection.java index 3e512de8..0812b258 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/RegistryReflection.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/RegistryReflection.java @@ -36,6 +36,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; */ @Beta public final class RegistryReflection { + public static final @Nullable Field REGISTRY_REGISTRY; public static final @Nullable Method REGISTRY_GET; diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/BlockPredicateArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/BlockPredicateArgument.java index 25af7069..38fbcbe5 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/BlockPredicateArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/BlockPredicateArgument.java @@ -132,7 +132,6 @@ public final class BlockPredicateArgument extends CommandArgument extends CommandArgument extends CommandArgument new BlockPredicateArgument.Parser<>()); } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/EnchantmentArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/EnchantmentArgument.java index 715d5cbd..ad3f4a5a 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/EnchantmentArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/EnchantmentArgument.java @@ -55,8 +55,16 @@ public class EnchantmentArgument extends CommandArgument { final @Nullable BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider, final @NonNull ArgumentDescription defaultDescription - ) { - super(required, name, new EnchantmentParser<>(), defaultValue, Enchantment.class, suggestionsProvider, defaultDescription); + ) { + super( + required, + name, + new EnchantmentParser<>(), + defaultValue, + Enchantment.class, + suggestionsProvider, + defaultDescription + ); } /** @@ -123,7 +131,6 @@ public class EnchantmentArgument extends CommandArgument { this.getDefaultDescription() ); } - } public static final class EnchantmentParser implements ArgumentParser { @@ -177,7 +184,6 @@ public class EnchantmentArgument extends CommandArgument { } return completions; } - } @@ -213,7 +219,5 @@ public class EnchantmentArgument extends CommandArgument { public @NonNull String getInput() { return this.input; } - } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/ItemStackArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/ItemStackArgument.java index 1c38172e..7debb1b2 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/ItemStackArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/ItemStackArgument.java @@ -136,7 +136,6 @@ public final class ItemStackArgument extends CommandArgument extends CommandArgument findItemInputClass() { @@ -332,9 +330,7 @@ public final class ItemStackArgument extends CommandArgument implements ArgumentParser { @@ -391,9 +387,6 @@ public final class ItemStackArgument extends CommandArgument extends CommandArgument extends CommandArgument extends CommandArgument new ItemStackPredicateArgument.Parser<>() ); } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/MaterialArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/MaterialArgument.java index 0b5c5755..c711c508 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/MaterialArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/MaterialArgument.java @@ -54,7 +54,7 @@ public class MaterialArgument extends CommandArgument { final @Nullable BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider, final @NonNull ArgumentDescription defaultDescription - ) { + ) { super(required, name, new MaterialParser<>(), defaultValue, Material.class, suggestionsProvider, defaultDescription); } @@ -122,7 +122,6 @@ public class MaterialArgument extends CommandArgument { this.getDefaultDescription() ); } - } public static final class MaterialParser implements ArgumentParser { @@ -160,7 +159,6 @@ public class MaterialArgument extends CommandArgument { } return completions; } - } @@ -196,7 +194,5 @@ public class MaterialArgument extends CommandArgument { public @NonNull String getInput() { return this.input; } - } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerArgument.java index b463f1f7..d9985eed 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerArgument.java @@ -140,7 +140,6 @@ public final class OfflinePlayerArgument extends CommandArgument extends CommandArgument extends CommandArgument extends CommandArgument { this.getDefaultDescription() ); } - } @@ -179,7 +178,6 @@ public final class PlayerArgument extends CommandArgument { return output; } - } @@ -218,7 +216,5 @@ public final class PlayerArgument extends CommandArgument { public @NonNull String getInput() { return this.input; } - } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/WorldArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/WorldArgument.java index 5ace1445..6ae75bd8 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/WorldArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/WorldArgument.java @@ -123,7 +123,6 @@ public class WorldArgument extends CommandArgument { this.getDefaultDescription() ); } - } @@ -155,7 +154,6 @@ public class WorldArgument extends CommandArgument { public @NonNull List suggestions(final @NonNull CommandContext commandContext, final @NonNull String input) { return Bukkit.getWorlds().stream().map(World::getName).collect(Collectors.toList()); } - } @@ -191,7 +189,5 @@ public class WorldArgument extends CommandArgument { public @NonNull String getInput() { return this.input; } - } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/Location2D.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/Location2D.java index 4aeae5c5..2b52a640 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/Location2D.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/Location2D.java @@ -50,5 +50,4 @@ public class Location2D extends Location { public static @NonNull Location2D from(final @Nullable World world, final double x, final double z) { return new Location2D(world, x, z); } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/Location2DArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/Location2DArgument.java index f6185378..363bed7c 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/Location2DArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/Location2DArgument.java @@ -141,7 +141,6 @@ public final class Location2DArgument extends CommandArgument new LinkedList<>() ); } - } @@ -246,7 +245,5 @@ public final class Location2DArgument extends CommandArgument public int getRequestedArgumentCount() { return EXPECTED_PARAMETER_COUNT; } - } - } 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 339b6b27..affcb713 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 @@ -146,7 +146,6 @@ public final class LocationArgument extends CommandArgument { new LinkedList<>() ); } - } @@ -303,7 +302,6 @@ public final class LocationArgument extends CommandArgument { public int getRequestedArgumentCount() { return EXPECTED_PARAMETER_COUNT; } - } @@ -348,9 +346,6 @@ public final class LocationArgument extends CommandArgument { public @NonNull Caption getCaption() { return this.caption; } - } - } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationCoordinate.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationCoordinate.java index cc95e89c..e8c1698c 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationCoordinate.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationCoordinate.java @@ -98,5 +98,4 @@ public final class LocationCoordinate { public String toString() { return String.format("LocationCoordinate{type=%s, coordinate=%f}", this.type.name().toLowerCase(), this.coordinate); } - } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationCoordinateParser.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationCoordinateParser.java index 663299cf..52ce15c8 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationCoordinateParser.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationCoordinateParser.java @@ -88,5 +88,4 @@ public final class LocationCoordinateParser implements ArgumentParser extends CommandArgument extends CommandArgument extends CommandArgument extends CommandArgument extends CommandArgument extends CommandArgument extends CommandArgument extends CommandArgument getBungeeCaptionKeys() { return Collections.unmodifiableCollection(RECOGNIZED_CAPTIONS); } - } diff --git a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommand.java b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommand.java index 971e8c8c..96d75f5f 100644 --- a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommand.java +++ b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommand.java @@ -75,9 +75,9 @@ public final class BungeeCommand extends Command implements TabExecutor { } final C sender = this.manager.getCommandSenderMapper().apply(commandSender); this.manager.executeCommand( - sender, - builder.toString() - ) + sender, + builder.toString() + ) .whenComplete((commandResult, throwable) -> { if (throwable != null) { if (throwable instanceof CompletionException) { @@ -180,5 +180,4 @@ public final class BungeeCommand extends Command implements TabExecutor { builder.toString() ); } - } diff --git a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommandManager.java b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommandManager.java index 67ede93f..f85dc138 100644 --- a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommandManager.java +++ b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommandManager.java @@ -128,5 +128,4 @@ public class BungeeCommandManager extends CommandManager { public @NonNull Plugin getOwningPlugin() { return this.owningPlugin; } - } diff --git a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommandPreprocessor.java b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommandPreprocessor.java index aa574fef..fb2fab08 100644 --- a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommandPreprocessor.java +++ b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommandPreprocessor.java @@ -51,5 +51,4 @@ final class BungeeCommandPreprocessor implements CommandPreprocessor { public void accept(final @NonNull CommandPreprocessingContext context) { context.getCommandContext().store(BungeeContextKeys.PROXY_SERVER_KEY, this.mgr.getOwningPlugin().getProxy()); } - } diff --git a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeContextKeys.java b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeContextKeys.java index 879d019a..75f66c0b 100644 --- a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeContextKeys.java +++ b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeContextKeys.java @@ -46,5 +46,4 @@ public final class BungeeContextKeys { private BungeeContextKeys() { } - } diff --git a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeePluginRegistrationHandler.java b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeePluginRegistrationHandler.java index be334289..608bb11b 100644 --- a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeePluginRegistrationHandler.java +++ b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeePluginRegistrationHandler.java @@ -60,5 +60,4 @@ final class BungeePluginRegistrationHandler implements CommandRegistrationHan .registerCommand(this.bungeeCommandManager.getOwningPlugin(), bungeeCommand); return true; } - } 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 53896fc5..88a0f8de 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 @@ -136,7 +136,6 @@ public final class PlayerArgument extends CommandArgument { new LinkedList<>() ); } - } @@ -183,7 +182,6 @@ public final class PlayerArgument extends CommandArgument { public boolean isContextFree() { return true; } - } @@ -202,7 +200,5 @@ public final class PlayerArgument extends CommandArgument { CaptionVariable.of("input", input) ); } - } - } 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 c51dd7f1..92495dad 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 @@ -135,7 +135,6 @@ public final class ServerArgument extends CommandArgument { new LinkedList<>() ); } - } public static final class ServerParser implements ArgumentParser { @@ -172,7 +171,6 @@ public final class ServerArgument extends CommandArgument { ) { return new ArrayList<>(commandContext.get("ProxyServer").getServers().keySet()); } - } public static final class ServerParseException extends ParserException { @@ -190,7 +188,5 @@ public final class ServerArgument extends CommandArgument { CaptionVariable.of("input", input) ); } - } - } diff --git a/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstCommand.java b/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstCommand.java index eef30b94..6ec71859 100644 --- a/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstCommand.java +++ b/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstCommand.java @@ -80,9 +80,9 @@ final class CloudburstCommand extends PluginCommand { } final C sender = this.manager.getCommandSenderMapper().apply(commandSender); this.manager.executeCommand( - sender, - builder.toString() - ) + sender, + builder.toString() + ) .whenComplete((commandResult, throwable) -> { if (throwable != null) { if (throwable instanceof CompletionException) { @@ -148,5 +148,4 @@ final class CloudburstCommand extends PluginCommand { }); return true; } - } 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 dd9263e6..7d1dad5c 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,7 +117,5 @@ public class CloudburstCommandManager extends CommandManager { private CloudListener() { } - } - } diff --git a/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstPluginRegistrationHandler.java b/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstPluginRegistrationHandler.java index 19a695de..c6138984 100644 --- a/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstPluginRegistrationHandler.java +++ b/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstPluginRegistrationHandler.java @@ -66,5 +66,4 @@ class CloudburstPluginRegistrationHandler implements CommandRegistrationHandl Server.getInstance().getCommandRegistry().register(plugin, cloudburstCommand); return true; } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCaptionKeys.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCaptionKeys.java index 93c008cb..c671eaef 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCaptionKeys.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCaptionKeys.java @@ -73,5 +73,4 @@ public final class FabricCaptionKeys { public static @NonNull Collection<@NonNull Caption> fabricCaptionKeys() { return Collections.unmodifiableCollection(RECOGNIZED_CAPTIONS); } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCaptionRegistry.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCaptionRegistry.java index f516aa07..7017416b 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCaptionRegistry.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCaptionRegistry.java @@ -60,6 +60,4 @@ public class FabricCaptionRegistry extends SimpleCaptionRegistry { (caption, sender) -> ARGUMENT_PARSE_FAILURE_TEAM_UNKNOWN ); } - - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricClientCommandManager.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricClientCommandManager.java index 04bfe0ee..a9acd513 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricClientCommandManager.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricClientCommandManager.java @@ -166,7 +166,7 @@ public final class FabricClientCommandManager extends FabricCommandManager extends FabricCommandManager>() { }, builder -> builder.toConstant(net.minecraft.commands.arguments.TeamArgument.team())); - this.getParserRegistry().registerParserSupplier(TypeToken.get(PlayerTeam.class), params -> new TeamArgument.TeamParser<>()); + this.getParserRegistry().registerParserSupplier( + TypeToken.get(PlayerTeam.class), + params -> new TeamArgument.TeamParser<>() + ); /* Wrapped/Constant Brigadier types, native value type */ this.registerConstantNativeParserSupplier(ChatFormatting.class, ColorArgument.color()); @@ -176,7 +179,8 @@ public abstract class FabricCommandManager>() {}, SwizzleArgument.swizzle()); + this.registerConstantNativeParserSupplier(new TypeToken>() { + }, SwizzleArgument.swizzle()); this.registerConstantNativeParserSupplier(ResourceLocation.class, ResourceLocationArgument.id()); this.registerConstantNativeParserSupplier(EntityAnchorArgument.Anchor.class, EntityAnchorArgument.anchor()); this.registerConstantNativeParserSupplier(MinMaxBounds.Ints.class, RangeArgument.intRange()); @@ -186,16 +190,20 @@ public abstract class FabricCommandManager FabricArgumentParsers.time()); + this.getParserRegistry().registerParserSupplier( + TypeToken.get(MinecraftTime.class), + params -> FabricArgumentParsers.time() + ); } @SuppressWarnings({"unchecked", "rawtypes"}) private void registerRegistryEntryMappings() { this.brigadierManager.registerMapping( - new TypeToken>() {}, - builder -> { - builder.to(argument -> ResourceOrTagLocationArgument.resourceOrTag((ResourceKey) argument.registryKey())); - } + new TypeToken>() { + }, + builder -> { + builder.to(argument -> ResourceOrTagLocationArgument.resourceOrTag((ResourceKey) argument.registryKey())); + } ); /* Find all fields of RegistryKey> and register those */ @@ -259,10 +267,13 @@ public abstract class FabricCommandManager void registerContextualNativeParserSupplier( - final @NonNull Class type, - final @NonNull Function> argument + final @NonNull Class type, + final @NonNull Function> argument ) { - this.getParserRegistry().registerParserSupplier(TypeToken.get(type), params -> FabricArgumentParsers.contextual(argument)); + this.getParserRegistry().registerParserSupplier( + TypeToken.get(type), + params -> FabricArgumentParsers.contextual(argument) + ); } /** @@ -339,5 +350,4 @@ public abstract class FabricCommandManager implements CommandPreprocessor { - private final FabricCommandManager manager; + private final FabricCommandManager manager; FabricCommandPreprocessor(final FabricCommandManager manager) { this.manager = manager; @@ -38,9 +38,8 @@ final class FabricCommandPreprocessor implements CommandPreprocessor { @Override public void accept(@NonNull final CommandPreprocessingContext context) { context.getCommandContext().store( - FabricCommandContextKeys.NATIVE_COMMAND_SOURCE, - this.manager.backwardsCommandSourceMapper().apply(context.getCommandContext().getSender()) + FabricCommandContextKeys.NATIVE_COMMAND_SOURCE, + this.manager.backwardsCommandSourceMapper().apply(context.getCommandContext().getSender()) ); } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCommandRegistrationHandler.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCommandRegistrationHandler.java index ef048b88..6f6f90a0 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCommandRegistrationHandler.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCommandRegistrationHandler.java @@ -139,8 +139,8 @@ abstract class FabricCommandRegistrationHandler dispatcher, - final CommandBuildContext commandBuildContext + final CommandDispatcher dispatcher, + final CommandBuildContext commandBuildContext ) { this.registerEventFired = true; FabricArgumentParsers.ContextualArgumentTypeProvider.withBuildContext( @@ -157,8 +157,8 @@ abstract class FabricCommandRegistrationHandler dispatcher, - final Command command + final CommandDispatcher dispatcher, + final Command command ) { final RootCommandNode rootNode = dispatcher.getRoot(); final StaticArgument first = ((StaticArgument) command.getArguments().get(0)); @@ -204,36 +204,35 @@ abstract class FabricCommandRegistrationHandler dispatcher, - final CommandBuildContext access, - final Commands.CommandSelection side + final CommandDispatcher dispatcher, + final CommandBuildContext access, + final Commands.CommandSelection side ) { this.commandManager().registrationCalled(); FabricArgumentParsers.ContextualArgumentTypeProvider.withBuildContext( this.commandManager(), - access, - true, - () -> { - for (final Command command : this.registeredCommands) { - /* Only register commands in the declared environment */ - final Commands.CommandSelection env = command.getCommandMeta().getOrDefault( - FabricServerCommandManager.META_REGISTRATION_ENVIRONMENT, - Commands.CommandSelection.ALL - ); + access, + true, + () -> { + for (final Command command : this.registeredCommands) { + /* Only register commands in the declared environment */ + final Commands.CommandSelection env = command.getCommandMeta().getOrDefault( + FabricServerCommandManager.META_REGISTRATION_ENVIRONMENT, + Commands.CommandSelection.ALL + ); - if ((env == Commands.CommandSelection.INTEGRATED && !side.includeIntegrated) - || (env == Commands.CommandSelection.DEDICATED && !side.includeDedicated)) { - continue; + if ((env == Commands.CommandSelection.INTEGRATED && !side.includeIntegrated) + || (env == Commands.CommandSelection.DEDICATED && !side.includeDedicated)) { + continue; + } + this.registerCommand(dispatcher.getRoot(), command); } - this.registerCommand(dispatcher.getRoot(), command); } - } ); } private void registerCommand(final RootCommandNode dispatcher, final Command command) { - @SuppressWarnings("unchecked") - final StaticArgument first = ((StaticArgument) command.getArguments().get(0)); + @SuppressWarnings("unchecked") final StaticArgument first = ((StaticArgument) command.getArguments().get(0)); final CommandNode baseNode = this.commandManager().brigadierManager().createLiteralCommandNode( first.getName(), command, @@ -251,7 +250,5 @@ abstract class FabricCommandRegistrationHandler implements Command { + private static final Logger LOGGER = LogUtils.getLogger(); private static final Component NEWLINE = Component.literal("\n"); @@ -192,5 +193,4 @@ final class FabricExecutor implements Com stackTrace ))); } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricParserParameters.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricParserParameters.java index 4b7a33ec..316f0e4a 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricParserParameters.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricParserParameters.java @@ -50,5 +50,4 @@ public final class FabricParserParameters { ) { return new ParserParameter<>(key, expectedType); } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricServerCommandManager.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricServerCommandManager.java index 305b1bef..57dffa04 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricServerCommandManager.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricServerCommandManager.java @@ -201,5 +201,4 @@ public final class FabricServerCommandManager extends FabricCommandManager extends CommandArgument sender type * @since 1.5.0 */ - public static final class Builder extends TypedBuilder> { + public static final class Builder extends + TypedBuilder> { Builder(final @NonNull String name) { super(net.minecraft.commands.arguments.AngleArgument.SingleAngle.class, name); @@ -151,7 +152,5 @@ public final class AngleArgument extends CommandArgument asOptionalWithDefault(final float defaultValue) { return this.asOptionalWithDefault(Float.toString(defaultValue)); } - } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/AxisArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/AxisArgument.java index 8eb1b700..95d75ea2 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/AxisArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/AxisArgument.java @@ -166,7 +166,5 @@ public final class AxisArgument extends CommandArgument extends CommandArgument asOptionalWithDefault(final @NonNull CompoundTag defaultValue) { return this.asOptionalWithDefault(defaultValue.toString()); } - } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/EntityAnchorArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/EntityAnchorArgument.java index 0d6ab331..cee3a655 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/EntityAnchorArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/EntityAnchorArgument.java @@ -38,7 +38,8 @@ import org.checkerframework.checker.nullness.qual.Nullable; * @param the sender type * @since 1.5.0 */ -public final class EntityAnchorArgument extends CommandArgument { +public final class EntityAnchorArgument extends + CommandArgument { EntityAnchorArgument( final boolean required, @@ -117,7 +118,8 @@ public final class EntityAnchorArgument extends CommandArgument sender type * @since 1.5.0 */ - public static final class Builder extends TypedBuilder> { + public static final class Builder extends + TypedBuilder> { Builder(final @NonNull String name) { super(net.minecraft.commands.arguments.EntityAnchorArgument.Anchor.class, name); @@ -149,10 +151,9 @@ public final class EntityAnchorArgument extends CommandArgument asOptionalWithDefault( - final net.minecraft.commands.arguments.EntityAnchorArgument.@NonNull Anchor defaultValue) { + final net.minecraft.commands.arguments.EntityAnchorArgument.@NonNull Anchor defaultValue + ) { return this.asOptionalWithDefault(defaultValue.name()); } - } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/FabricArgumentParsers.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/FabricArgumentParsers.java index 9123787a..eb85cf33 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/FabricArgumentParsers.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/FabricArgumentParsers.java @@ -80,8 +80,9 @@ public final class FabricArgumentParsers { /** * A parser that wraps Brigadier argument types which need a {@link CommandBuildContext} - * @param sender type - * @param argument value type + * + * @param sender type + * @param argument value type * @param factory factory that creates these arguments * @return the parser */ @@ -132,7 +133,8 @@ public final class FabricArgumentParsers { * @return a parser instance */ public static @NonNull ArgumentParser vec2(final boolean centerIntegers) { - return new WrappedBrigadierParser(new Vec2Argument(centerIntegers)) + return new WrappedBrigadierParser(new Vec2Argument( + centerIntegers)) .map(FabricArgumentParsers::mapToCoordinates); } @@ -144,7 +146,8 @@ public final class FabricArgumentParsers { * @return a parser instance */ public static @NonNull ArgumentParser vec3(final boolean centerIntegers) { - return new WrappedBrigadierParser(Vec3Argument.vec3(centerIntegers)) + return new WrappedBrigadierParser(Vec3Argument.vec3( + centerIntegers)) .map(FabricArgumentParsers::mapToCoordinates); } @@ -271,7 +274,6 @@ public final class FabricArgumentParsers { private interface CommandSyntaxExceptionThrowingParseResultSupplier { @NonNull ArgumentParseResult result() throws CommandSyntaxException; - } private static @NonNull ArgumentParseResult handleCommandSyntaxExceptionAsFailure( @@ -341,7 +343,6 @@ public final class FabricArgumentParsers { public @NonNull Component contents() { return this.contents; } - } static final class CoordinatesImpl implements Coordinates, @@ -389,7 +390,6 @@ public final class FabricArgumentParsers { public net.minecraft.commands.arguments.coordinates.@NonNull Coordinates wrappedCoordinates() { return this.posArgument; } - } static final class SingleEntitySelectorImpl implements SingleEntitySelector { @@ -422,7 +422,6 @@ public final class FabricArgumentParsers { public @NonNull Entity getSingle() { return this.selectedEntity; } - } static final class MultipleEntitySelectorImpl implements MultipleEntitySelector { @@ -455,7 +454,6 @@ public final class FabricArgumentParsers { public @NonNull Collection get() { return this.selectedEntities; } - } static final class SinglePlayerSelectorImpl implements SinglePlayerSelector { @@ -488,7 +486,6 @@ public final class FabricArgumentParsers { public @NonNull ServerPlayer getSingle() { return this.selectedPlayer; } - } static final class MultiplePlayerSelectorImpl implements MultiplePlayerSelector { @@ -521,14 +518,14 @@ public final class FabricArgumentParsers { public @NonNull Collection get() { return this.selectedPlayers; } - } @ApiStatus.Internal public static final class ContextualArgumentTypeProvider implements Supplier> { + private static final ThreadLocal CONTEXT = new ThreadLocal<>(); private static final Map, Set>> INSTANCES = - new WeakHashMap<>(); + new WeakHashMap<>(); private final Function> provider; private volatile ArgumentType provided; @@ -536,17 +533,17 @@ public final class FabricArgumentParsers { /** * Temporarily expose a command build context to providers called from this thread. * - * @param ctx the context + * @param ctx the context * @param commandManager command manager to use - * @param resetExisting whether to clear cached state from existing provider instances for this command type - * @param action an action to perform while the context is exposed + * @param resetExisting whether to clear cached state from existing provider instances for this command type + * @param action an action to perform while the context is exposed * @since 1.7.0 */ public static void withBuildContext( - final FabricCommandManager commandManager, - final CommandBuildContext ctx, - final boolean resetExisting, - final Runnable action + final FabricCommandManager commandManager, + final CommandBuildContext ctx, + final boolean resetExisting, + final Runnable action ) { final ThreadLocalContext context = new ThreadLocalContext(commandManager, ctx); CONTEXT.set(context); @@ -567,6 +564,7 @@ public final class FabricArgumentParsers { } private static final class ThreadLocalContext { + private final FabricCommandManager commandManager; private final CommandBuildContext commandBuildContext; @@ -602,7 +600,8 @@ public final class FabricArgumentParsers { synchronized (this) { if (this.provided == null) { if (ctx == null) { - throw new IllegalStateException("No build context was available while trying to compute an argument type"); + throw new IllegalStateException( + "No build context was available while trying to compute an argument type"); } provided = this.provider.apply(ctx.commandBuildContext); this.provided = provided; @@ -611,7 +610,5 @@ public final class FabricArgumentParsers { } return provided; } - } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/FloatRangeArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/FloatRangeArgument.java index cd285416..546e1cf7 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/FloatRangeArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/FloatRangeArgument.java @@ -162,7 +162,5 @@ public final class FloatRangeArgument extends CommandArgument extends CommandArgument extends CommandArgument { */ public static @NonNull ItemInputArgument optional(final @NonNull String name, final @NonNull ItemStack defaultValue) { return ItemInputArgument.builder(name).asOptionalWithDefault(defaultValue).build(); - } /** @@ -157,7 +156,5 @@ public final class ItemInputArgument extends CommandArgument { } return this.asOptionalWithDefault(serializedDefault); } - } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/MobEffectArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/MobEffectArgument.java index f5fe9c45..6be48ad9 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/MobEffectArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/MobEffectArgument.java @@ -153,7 +153,5 @@ public final class MobEffectArgument extends CommandArgument { public @NonNull Builder asOptionalWithDefault(final @NonNull MobEffect defaultValue) { return this.asOptionalWithDefault(Registry.MOB_EFFECT.getKey(defaultValue).toString()); } - } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/NamedColorArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/NamedColorArgument.java index 7fb4b34e..652262d0 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/NamedColorArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/NamedColorArgument.java @@ -155,7 +155,5 @@ public final class NamedColorArgument extends CommandArgument extends CommandArgument sender type * @since 1.5.0 */ - public static final class Builder extends TypedBuilder> { + public static final class Builder extends + TypedBuilder> { Builder(final @NonNull String name) { super(net.minecraft.commands.arguments.NbtPathArgument.NbtPath.class, name); @@ -150,10 +151,9 @@ public final class NbtPathArgument extends CommandArgument asOptionalWithDefault( - final net.minecraft.commands.arguments.NbtPathArgument.@NonNull NbtPath defaultValue) { + final net.minecraft.commands.arguments.NbtPathArgument.@NonNull NbtPath defaultValue + ) { return this.asOptionalWithDefault(defaultValue.toString()); } - } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/NbtTagArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/NbtTagArgument.java index a943b4ed..35078240 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/NbtTagArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/NbtTagArgument.java @@ -149,7 +149,5 @@ public final class NbtTagArgument extends CommandArgument { public @NonNull Builder asOptionalWithDefault(final @NonNull Tag defaultValue) { return this.asOptionalWithDefault(defaultValue.toString()); } - } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ObjectiveCriteriaArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ObjectiveCriteriaArgument.java index 5fe9d126..3870f031 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ObjectiveCriteriaArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ObjectiveCriteriaArgument.java @@ -152,7 +152,5 @@ public final class ObjectiveCriteriaArgument extends CommandArgument asOptionalWithDefault(final @NonNull ObjectiveCriteria defaultValue) { return this.asOptionalWithDefault(defaultValue.getName()); } - } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ParticleArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ParticleArgument.java index 27979394..a8aaafed 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ParticleArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ParticleArgument.java @@ -152,7 +152,5 @@ public final class ParticleArgument extends CommandArgument asOptionalWithDefault(final @NonNull ParticleOptions defaultValue) { return this.asOptionalWithDefault(defaultValue.writeToString()); } - } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/RegistryEntryArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/RegistryEntryArgument.java index 46c1dfd1..b29263d0 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/RegistryEntryArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/RegistryEntryArgument.java @@ -277,7 +277,6 @@ public class RegistryEntryArgument extends CommandArgument { public ResourceKey> registryKey() { return this.registryIdent; } - } /** @@ -333,7 +332,6 @@ public class RegistryEntryArgument extends CommandArgument { public @NonNull Builder asOptionalWithDefault(final @NonNull ResourceKey defaultValue) { return this.asOptionalWithDefault(defaultValue.location().toString()); } - } /** @@ -358,7 +356,5 @@ public class RegistryEntryArgument extends CommandArgument { CaptionVariable.of("registry", registry.toString()) ); } - } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ResourceLocationArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ResourceLocationArgument.java index 3c1862e1..a7877382 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ResourceLocationArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ResourceLocationArgument.java @@ -152,7 +152,5 @@ public final class ResourceLocationArgument extends CommandArgument asOptionalWithDefault(final @NonNull ResourceLocation defaultValue) { return this.asOptionalWithDefault(defaultValue.toString()); } - } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ScoreboardOperationArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ScoreboardOperationArgument.java index 839ae63f..81e27999 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ScoreboardOperationArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ScoreboardOperationArgument.java @@ -126,7 +126,5 @@ public final class ScoreboardOperationArgument extends CommandArgument implements ArgumentParser { @NonNull CommandSourceStack source, @NonNull I value ); - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/TeamArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/TeamArgument.java index cecb830f..cf114373 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/TeamArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/TeamArgument.java @@ -173,7 +173,6 @@ public final class TeamArgument extends CommandArgument { } return ArgumentParseResult.success(result); } - } /** @@ -216,7 +215,6 @@ public final class TeamArgument extends CommandArgument { public @NonNull Builder asOptionalWithDefault(final @NonNull PlayerTeam defaultValue) { return this.asOptionalWithDefault(defaultValue.getName()); } - } /** @@ -239,7 +237,5 @@ public final class TeamArgument extends CommandArgument { CaptionVariable.of("input", input) ); } - } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/TimeArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/TimeArgument.java index c30d9874..4fbb8613 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/TimeArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/TimeArgument.java @@ -151,7 +151,5 @@ public final class TimeArgument extends CommandArgument { public @NonNull Builder asOptionalWithDefault(final @NonNull MinecraftTime defaultValue) { return this.asOptionalWithDefault(defaultValue.toString()); } - } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/BlockPosArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/BlockPosArgument.java index 8bf2e248..c67122e8 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/BlockPosArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/BlockPosArgument.java @@ -156,7 +156,5 @@ public final class BlockPosArgument extends CommandArgument extends CommandArgument extends CommandArgument { this.getDefaultDescription() ); } - } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MultipleEntitySelectorArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MultipleEntitySelectorArgument.java index 7e27fc28..7f6fab0c 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MultipleEntitySelectorArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MultipleEntitySelectorArgument.java @@ -124,7 +124,5 @@ public final class MultipleEntitySelectorArgument extends CommandArgument extends CommandArgument extends CommandArgument extends CommandArgument extends CommandArgument extends CommandArgument { this.centerIntegers() ); } - } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/data/Coordinates.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/data/Coordinates.java index 2d63986d..19c596ab 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/data/Coordinates.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/data/Coordinates.java @@ -112,5 +112,4 @@ public interface Coordinates { interface ColumnCoordinates extends Coordinates { } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/data/Message.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/data/Message.java index cfdf1e4c..c72e31bb 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/data/Message.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/data/Message.java @@ -50,5 +50,4 @@ public interface Message { * @since 1.5.0 */ @NonNull Component contents(); - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/data/MinecraftTime.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/data/MinecraftTime.java index 570fb4be..03f692fa 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/data/MinecraftTime.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/data/MinecraftTime.java @@ -151,5 +151,4 @@ public final class MinecraftTime { public String toString() { return Long.toString(this.ticks); } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/data/Selector.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/data/Selector.java index a323d515..c0cfb7b2 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/data/Selector.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/data/Selector.java @@ -83,7 +83,5 @@ public interface Selector { * @since 1.5.0 */ @NonNull V getSingle(); - } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/internal/CloudStringReader.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/internal/CloudStringReader.java index a07ed85b..c4b2a200 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/internal/CloudStringReader.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/internal/CloudStringReader.java @@ -41,5 +41,4 @@ public final class CloudStringReader extends StringReader { public CloudStringReader(final String input) { super(input); } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/internal/EntitySelectorAccess.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/internal/EntitySelectorAccess.java index 76b075c3..e70bb5e4 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/internal/EntitySelectorAccess.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/internal/EntitySelectorAccess.java @@ -40,5 +40,4 @@ public interface EntitySelectorAccess { * @param inputString input string */ void inputString(@NonNull String inputString); - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/internal/LateRegistrationCatcher.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/internal/LateRegistrationCatcher.java index e1cb139a..21ba9984 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/internal/LateRegistrationCatcher.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/internal/LateRegistrationCatcher.java @@ -49,5 +49,4 @@ public final class LateRegistrationCatcher implements ModInitializer { public static boolean hasServerAlreadyStarted() { return LateRegistrationCatcher.serverStartingCalled; } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/CommandsMixin.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/CommandsMixin.java index f37e2b21..f040e025 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/CommandsMixin.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/CommandsMixin.java @@ -38,5 +38,4 @@ public class CommandsMixin { private StringReader cloud$newStringReader(final String arguments) { return new CloudStringReader(arguments); } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/EntitySelectorMixin.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/EntitySelectorMixin.java index 0d29cf16..d80d7abe 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/EntitySelectorMixin.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/EntitySelectorMixin.java @@ -45,5 +45,4 @@ abstract class EntitySelectorMixin { public void cloud$inputString(final @NonNull String inputString) { this.inputString = inputString; } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/EntitySelectorParserMixin.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/EntitySelectorParserMixin.java index 26ea7e8c..d59f14e9 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/EntitySelectorParserMixin.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/EntitySelectorParserMixin.java @@ -51,5 +51,4 @@ abstract class EntitySelectorParserMixin { final String inputString = this.reader.getString().substring(this.startPosition, this.reader.getCursor()); ((EntitySelectorAccess) selector).inputString(inputString); } - } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/MessageArgumentMessageAccess.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/MessageArgumentMessageAccess.java index b506f3fd..c0d15d41 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/MessageArgumentMessageAccess.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/MessageArgumentMessageAccess.java @@ -29,5 +29,7 @@ import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(MessageArgument.Message.class) public interface MessageArgumentMessageAccess { - @Accessor("parts") MessageArgument.Part[] accessor$parts(); + + @Accessor("parts") + MessageArgument.Part[] accessor$parts(); } diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/MessageArgumentPartAccess.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/MessageArgumentPartAccess.java index ec1ce8b9..cfca06c0 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/MessageArgumentPartAccess.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/MessageArgumentPartAccess.java @@ -30,5 +30,7 @@ import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(MessageArgument.Part.class) public interface MessageArgumentPartAccess { - @Accessor("selector") EntitySelector accessor$selector(); + + @Accessor("selector") + EntitySelector accessor$selector(); } diff --git a/cloud-minecraft/cloud-fabric/src/testmod/java/cloud/commandframework/fabric/testmod/FabricClientExample.java b/cloud-minecraft/cloud-fabric/src/testmod/java/cloud/commandframework/fabric/testmod/FabricClientExample.java index 6848c335..5ffe8748 100644 --- a/cloud-minecraft/cloud-fabric/src/testmod/java/cloud/commandframework/fabric/testmod/FabricClientExample.java +++ b/cloud-minecraft/cloud-fabric/src/testmod/java/cloud/commandframework/fabric/testmod/FabricClientExample.java @@ -143,5 +143,4 @@ public final class FabricClientExample implements ClientModInitializer { client.setScreen(new JoinMultiplayerScreen(new TitleScreen())); } } - } diff --git a/cloud-minecraft/cloud-fabric/src/testmod/java/cloud/commandframework/fabric/testmod/FabricExample.java b/cloud-minecraft/cloud-fabric/src/testmod/java/cloud/commandframework/fabric/testmod/FabricExample.java index 1ed476cc..0304a2e0 100644 --- a/cloud-minecraft/cloud-fabric/src/testmod/java/cloud/commandframework/fabric/testmod/FabricExample.java +++ b/cloud-minecraft/cloud-fabric/src/testmod/java/cloud/commandframework/fabric/testmod/FabricExample.java @@ -108,9 +108,9 @@ public final class FabricExample implements ModInitializer { final Collection selected = selector.get(); selected.forEach(selectedPlayer -> selectedPlayer.sendSystemMessage( - Component.literal("Wave from ") - .withStyle(style -> style.withColor(ctx.get(textColor))) - .append(ctx.getSender().getDisplayName()) + Component.literal("Wave from ") + .withStyle(style -> style.withColor(ctx.get(textColor))) + .append(ctx.getSender().getDisplayName()) )); ctx.getSender().sendSuccess( Component.literal(String.format("Waved at %d players (%s)", selected.size(), @@ -163,7 +163,9 @@ public final class FabricExample implements ModInitializer { HoverEvent.Action.SHOW_TEXT, Component.literal("Click for more info") ))) - .append(Component.literal(mod.getName()).withStyle(style -> style.withColor(ChatFormatting.GREEN))) + .append(Component + .literal(mod.getName()) + .withStyle(style -> style.withColor(ChatFormatting.GREEN))) .append(Component.literal(String.format(" (%s) ", mod.getId())) .withStyle(style -> style .withColor(ChatFormatting.GRAY) @@ -251,5 +253,4 @@ public final class FabricExample implements ModInitializer { player.teleportToWithTicket(pos.getMinBlockX(), 128, pos.getMinBlockZ()); })); } - } diff --git a/cloud-minecraft/cloud-fabric/src/testmod/java/cloud/commandframework/fabric/testmod/mixin/GiveCommandAccess.java b/cloud-minecraft/cloud-fabric/src/testmod/java/cloud/commandframework/fabric/testmod/mixin/GiveCommandAccess.java index 39bcfcdb..818655b4 100644 --- a/cloud-minecraft/cloud-fabric/src/testmod/java/cloud/commandframework/fabric/testmod/mixin/GiveCommandAccess.java +++ b/cloud-minecraft/cloud-fabric/src/testmod/java/cloud/commandframework/fabric/testmod/mixin/GiveCommandAccess.java @@ -44,5 +44,4 @@ public interface GiveCommandAccess { ) { return Command.SINGLE_SUCCESS; } - } diff --git a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/AudienceProvider.java b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/AudienceProvider.java index 663454a5..54b7765a 100644 --- a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/AudienceProvider.java +++ b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/AudienceProvider.java @@ -55,5 +55,4 @@ public interface AudienceProvider extends Function<@NonNull C, @NonNull Audie static AudienceProvider nativeAudience() { return (AudienceProvider) NativeAudienceProvider.INSTANCE; } - } diff --git a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/ComponentHelper.java b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/ComponentHelper.java index c6e52186..5cfd61de 100644 --- a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/ComponentHelper.java +++ b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/ComponentHelper.java @@ -70,5 +70,4 @@ final class ComponentHelper { } return length; } - } diff --git a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/MinecraftExceptionHandler.java b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/MinecraftExceptionHandler.java index e67871d8..4fd585e9 100644 --- a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/MinecraftExceptionHandler.java +++ b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/MinecraftExceptionHandler.java @@ -326,5 +326,4 @@ public final class MinecraftExceptionHandler { */ COMMAND_EXECUTION } - } diff --git a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/MinecraftExtrasMetaKeys.java b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/MinecraftExtrasMetaKeys.java index 89d09375..9767290c 100644 --- a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/MinecraftExtrasMetaKeys.java +++ b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/MinecraftExtrasMetaKeys.java @@ -55,5 +55,4 @@ public final class MinecraftExtrasMetaKeys { private MinecraftExtrasMetaKeys() { } - } diff --git a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/MinecraftHelp.java b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/MinecraftHelp.java index 826556c3..dc9085bb 100644 --- a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/MinecraftHelp.java +++ b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/MinecraftHelp.java @@ -412,9 +412,9 @@ public final class MinecraftHelp { .append(text(" ")) .append(lastBranch ? this.lastBranch() : this.branch()) .append(this.highlight(text( - String.format(" /%s", helpEntry.getSyntaxString()), - this.colors.highlight - )) + String.format(" /%s", helpEntry.getSyntaxString()), + this.colors.highlight + )) .hoverEvent(description.color(this.colors.text)) .clickEvent(runCommand(this.commandPrefix + " " + helpEntry.getSyntaxString())) ) @@ -688,11 +688,11 @@ public final class MinecraftHelp { ) { return this.highlight( this.messageProvider.provide( - sender, - MESSAGE_PAGE_OUT_OF_RANGE, - String.valueOf(attemptedPage), - String.valueOf(maxPages) - ) + sender, + MESSAGE_PAGE_OUT_OF_RANGE, + String.valueOf(attemptedPage), + String.valueOf(maxPages) + ) .color(this.colors.text) .replaceText(config -> { config.matchLiteral(""); @@ -717,7 +717,6 @@ public final class MinecraftHelp { * @return component */ @NonNull Component provide(@NonNull C sender, @NonNull String key, @NonNull String... args); - } /** @@ -809,7 +808,5 @@ public final class MinecraftHelp { ) { return new HelpColors(primary, highlight, alternateHighlight, text, accent); } - } - } diff --git a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/NativeAudienceProvider.java b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/NativeAudienceProvider.java index a19bf5bf..466e8dc7 100644 --- a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/NativeAudienceProvider.java +++ b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/NativeAudienceProvider.java @@ -37,5 +37,4 @@ final class NativeAudienceProvider implements AudienceProvid public @NonNull Audience apply(@NonNull final C sender) { return sender; } - } diff --git a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/Pagination.java b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/Pagination.java index 2393768f..7f3be213 100644 --- a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/Pagination.java +++ b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/Pagination.java @@ -74,5 +74,4 @@ final class Pagination { return Collections.unmodifiableList(renderedContent); } - } diff --git a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/RichDescription.java b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/RichDescription.java index a44ffaea..fd7f3b44 100644 --- a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/RichDescription.java +++ b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/RichDescription.java @@ -38,6 +38,7 @@ import static java.util.Objects.requireNonNull; * @since 1.4.0 */ public final class RichDescription implements ArgumentDescription { + private static final RichDescription EMPTY = new RichDescription(Component.empty()); private final Component contents; @@ -87,7 +88,7 @@ public final class RichDescription implements ArgumentDescription { /** * Create a rich description pointing to a translation key. * - * @param key the translation key + * @param key the translation key * @param args the arguments to use with the translation key * @return a new rich description */ @@ -105,7 +106,7 @@ public final class RichDescription implements ArgumentDescription { * {@inheritDoc} * * @deprecated to discourage use. A plain serialization is a somewhat expensive and lossy operation, use - * {@link #getContents()} instead. + * {@link #getContents()} instead. */ @Override @Deprecated @@ -127,5 +128,4 @@ public final class RichDescription implements ArgumentDescription { public boolean isEmpty() { return Component.empty().equals(this.contents); } - } diff --git a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/TextColorArgument.java b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/TextColorArgument.java index bc6609b2..d7f871b1 100644 --- a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/TextColorArgument.java +++ b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/TextColorArgument.java @@ -212,7 +212,6 @@ public final class TextColorArgument extends CommandArgument { suggestions.addAll(NamedTextColor.NAMES.keys()); return suggestions; } - } @@ -231,7 +230,5 @@ public final class TextColorArgument extends CommandArgument { CaptionVariable.of("input", input) ); } - } - } 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 f8cc7d54..177fe8b2 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 @@ -72,5 +72,4 @@ final class AsyncCommandSuggestionsListener implements Listener { event.setCompletions(suggestions); event.setHandled(true); } - } 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 0a9b3b23..36c66a15 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 @@ -108,5 +108,4 @@ class PaperBrigadierListener implements Listener { permissionChecker )); } - } diff --git a/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/PaperBrigadierMapper.java b/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/PaperBrigadierMapper.java index 42604d42..22f7838e 100644 --- a/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/PaperBrigadierMapper.java +++ b/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/PaperBrigadierMapper.java @@ -52,5 +52,4 @@ final class PaperBrigadierMapper { }, "resource_location", true); } } - } 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 115aabcc..711210e7 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 @@ -166,5 +166,4 @@ public class PaperCommandManager extends BukkitCommandManager { this.getOwningPlugin() ); } - } diff --git a/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/argument/KeyedWorldArgument.java b/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/argument/KeyedWorldArgument.java index 45adac78..7b953bde 100644 --- a/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/argument/KeyedWorldArgument.java +++ b/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/argument/KeyedWorldArgument.java @@ -154,7 +154,6 @@ public final class KeyedWorldArgument extends CommandArgument { this.getDefaultDescription() ); } - } /** @@ -230,7 +229,5 @@ public final class KeyedWorldArgument extends CommandArgument { } return completions; } - } - } diff --git a/cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/CloudCommandCallable.java b/cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/CloudCommandCallable.java index cb575e05..97b482b5 100644 --- a/cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/CloudCommandCallable.java +++ b/cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/CloudCommandCallable.java @@ -49,11 +49,15 @@ import org.spongepowered.api.world.World; final class CloudCommandCallable implements CommandCallable { - private static final Text MESSAGE_INTERNAL_ERROR = Text.of(TextColors.RED, - "An internal error occurred while attempting to perform this command."); - private static final Text MESSAGE_NO_PERMS = Text.of(TextColors.RED, - "I'm sorry, but you do not have permission to perform this command. " - + "Please contact the server administrators if you believe that this is in error."); + private static final Text MESSAGE_INTERNAL_ERROR = Text.of( + TextColors.RED, + "An internal error occurred while attempting to perform this command." + ); + private static final Text MESSAGE_NO_PERMS = Text.of( + TextColors.RED, + "I'm sorry, but you do not have permission to perform this command. " + + "Please contact the server administrators if you believe that this is in error." + ); private static final Text MESSAGE_UNKNOWN_COMMAND = Text.of("Unknown command. Type \"/help\" for help."); private final CommandArgument command; @@ -61,9 +65,9 @@ final class CloudCommandCallable implements CommandCallable { private final SpongeCommandManager manager; CloudCommandCallable( - final CommandArgument command, - final Command cloudCommand, - final SpongeCommandManager manager + final CommandArgument command, + final Command cloudCommand, + final SpongeCommandManager manager ) { this.command = command; this.cloudCommand = cloudCommand; @@ -75,65 +79,72 @@ final class CloudCommandCallable implements CommandCallable { final C cloudSender = this.manager.getCommandSourceMapper().apply(source); this.manager.executeCommand(cloudSender, this.formatCommand(arguments)) - .whenComplete((result, throwable) -> { - if (throwable != null) { - if (throwable instanceof CompletionException) { - throwable = throwable.getCause(); + .whenComplete((result, throwable) -> { + if (throwable != null) { + if (throwable instanceof CompletionException) { + throwable = throwable.getCause(); + } + final Throwable finalThrowable = throwable; + if (throwable instanceof InvalidSyntaxException) { + this.manager.handleException(cloudSender, + InvalidSyntaxException.class, + (InvalidSyntaxException) throwable, (c, e) -> + source.sendMessage(Text.of( + TextColors.RED, + "Invalid Command Syntax. Correct command syntax is: ", + Text.of( + TextColors.GRAY, + ((InvalidSyntaxException) finalThrowable).getCorrectSyntax() + ) + )) + ); + } else if (throwable instanceof InvalidCommandSenderException) { + this.manager.handleException(cloudSender, + InvalidCommandSenderException.class, + (InvalidCommandSenderException) throwable, (c, e) -> + source.sendMessage(Text.of(TextColors.RED, finalThrowable.getMessage())) + ); + } else if (throwable instanceof NoPermissionException) { + this.manager.handleException(cloudSender, + NoPermissionException.class, + (NoPermissionException) throwable, (c, e) -> + source.sendMessage(MESSAGE_NO_PERMS) + ); + } else if (throwable instanceof NoSuchCommandException) { + this.manager.handleException(cloudSender, + NoSuchCommandException.class, + (NoSuchCommandException) throwable, (c, e) -> + source.sendMessage(MESSAGE_UNKNOWN_COMMAND) + ); + } else if (throwable instanceof ArgumentParseException) { + this.manager.handleException(cloudSender, + ArgumentParseException.class, + (ArgumentParseException) throwable, (c, e) -> + source.sendMessage(Text.of( + "Invalid Command Argument: ", + this.formatMessage(finalThrowable.getCause()) + )) + ); + } else if (throwable instanceof CommandExecutionException) { + this.manager.handleException(cloudSender, + CommandExecutionException.class, + (CommandExecutionException) throwable, (c, e) -> { + source.sendMessage(MESSAGE_INTERNAL_ERROR); + this.manager.getOwningPlugin().getLogger().error( + "Exception executing command handler", + finalThrowable.getCause() + ); + } + ); + } else { + source.sendMessage(MESSAGE_INTERNAL_ERROR); + this.manager.getOwningPlugin().getLogger().error( + "An unhandled exception was thrown during command execution", + throwable + ); + } } - final Throwable finalThrowable = throwable; - if (throwable instanceof InvalidSyntaxException) { - this.manager.handleException(cloudSender, - InvalidSyntaxException.class, - (InvalidSyntaxException) throwable, (c, e) -> - source.sendMessage(Text.of(TextColors.RED, - "Invalid Command Syntax. Correct command syntax is: ", - Text.of(TextColors.GRAY, ((InvalidSyntaxException) finalThrowable).getCorrectSyntax()))) - ); - } else if (throwable instanceof InvalidCommandSenderException) { - this.manager.handleException(cloudSender, - InvalidCommandSenderException.class, - (InvalidCommandSenderException) throwable, (c, e) -> - source.sendMessage(Text.of(TextColors.RED, finalThrowable.getMessage())) - ); - } else if (throwable instanceof NoPermissionException) { - this.manager.handleException(cloudSender, - NoPermissionException.class, - (NoPermissionException) throwable, (c, e) -> - source.sendMessage(MESSAGE_NO_PERMS) - ); - } else if (throwable instanceof NoSuchCommandException) { - this.manager.handleException(cloudSender, - NoSuchCommandException.class, - (NoSuchCommandException) throwable, (c, e) -> - source.sendMessage(MESSAGE_UNKNOWN_COMMAND) - ); - } else if (throwable instanceof ArgumentParseException) { - this.manager.handleException(cloudSender, - ArgumentParseException.class, - (ArgumentParseException) throwable, (c, e) -> - source.sendMessage(Text.of("Invalid Command Argument: ", - this.formatMessage(finalThrowable.getCause()))) - ); - } else if (throwable instanceof CommandExecutionException) { - this.manager.handleException(cloudSender, - CommandExecutionException.class, - (CommandExecutionException) throwable, (c, e) -> { - source.sendMessage(MESSAGE_INTERNAL_ERROR); - this.manager.getOwningPlugin().getLogger().error( - "Exception executing command handler", - finalThrowable.getCause() - ); - } - ); - } else { - source.sendMessage(MESSAGE_INTERNAL_ERROR); - this.manager.getOwningPlugin().getLogger().error( - "An unhandled exception was thrown during command execution", - throwable - ); - } - } - }); + }); return CommandResult.success(); } @@ -171,7 +182,10 @@ final class CloudCommandCallable implements CommandCallable { @Override public boolean testPermission(final @NonNull CommandSource source) { - return this.manager.hasPermission(this.manager.getCommandSourceMapper().apply(source), this.cloudCommand.getCommandPermission()); + return this.manager.hasPermission( + this.manager.getCommandSourceMapper().apply(source), + this.cloudCommand.getCommandPermission() + ); } @Override @@ -197,9 +211,8 @@ final class CloudCommandCallable implements CommandCallable { @Override public Text getUsage(final @NonNull CommandSource source) { return Text.of(this.manager.getCommandSyntaxFormatter().apply( - Collections.emptyList(), - this.manager.getCommandTree().getNamedNode(this.command.getName()) + Collections.emptyList(), + this.manager.getCommandTree().getNamedNode(this.command.getName()) )); } - } diff --git a/cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/CloudInjectionModule.java b/cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/CloudInjectionModule.java index b441b6e4..45b29816 100644 --- a/cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/CloudInjectionModule.java +++ b/cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/CloudInjectionModule.java @@ -90,5 +90,4 @@ public final class CloudInjectionModule extends AbstractModule { final Key backwardsCommandSenderMapperFunctionKey = Key.get(backwardsCommandSenderMapperFunction); this.bind(backwardsCommandSenderMapperFunctionKey).toInstance(this.backwardsCommandSenderMapper); } - } diff --git a/cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/SpongeCommandManager.java b/cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/SpongeCommandManager.java index 074260ce..13a6d06c 100644 --- a/cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/SpongeCommandManager.java +++ b/cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/SpongeCommandManager.java @@ -69,10 +69,10 @@ public class SpongeCommandManager extends CommandManager { @Inject @SuppressWarnings("unchecked") public SpongeCommandManager( - final @NonNull PluginContainer container, - final @NonNull Function, CommandExecutionCoordinator> commandExecutionCoordinator, - final Function forwardMapper, - final Function reverseMapper + final @NonNull PluginContainer container, + final @NonNull Function, CommandExecutionCoordinator> commandExecutionCoordinator, + final Function forwardMapper, + final Function reverseMapper ) { super(commandExecutionCoordinator, new SpongePluginRegistrationHandler<>()); this.owningPlugin = requireNonNull(container, "container"); @@ -112,5 +112,4 @@ public class SpongeCommandManager extends CommandManager { final PluginContainer getOwningPlugin() { return this.owningPlugin; } - } diff --git a/cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/SpongeMetaKeys.java b/cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/SpongeMetaKeys.java index d9c7cd39..e60d7916 100644 --- a/cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/SpongeMetaKeys.java +++ b/cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/SpongeMetaKeys.java @@ -48,5 +48,4 @@ public final class SpongeMetaKeys { Text.class, "cloud:sponge7/rich_long_description" ); - } diff --git a/cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/SpongePluginRegistrationHandler.java b/cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/SpongePluginRegistrationHandler.java index 6306d916..a18bd37e 100644 --- a/cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/SpongePluginRegistrationHandler.java +++ b/cloud-minecraft/cloud-sponge7/src/main/java/cloud/commandframework/sponge7/SpongePluginRegistrationHandler.java @@ -52,16 +52,16 @@ final class SpongePluginRegistrationHandler implements CommandRegistrationHan } final CloudCommandCallable callable = new CloudCommandCallable<>( - commandArgument, - (Command) command, - this.manager); + commandArgument, + (Command) command, + this.manager + ); this.registeredCommands.put(commandArgument, callable); return Sponge.getGame().getCommandManager().register( - this.manager.getOwningPlugin(), - callable, - ImmutableList.copyOf(commandArgument.getAliases()) + this.manager.getOwningPlugin(), + callable, + ImmutableList.copyOf(commandArgument.getAliases()) ).isPresent(); } - } 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 1cac1e73..d5198c87 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 @@ -110,5 +110,4 @@ public final class CloudInjectionModule extends AbstractModule { 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 65121eb7..3d6bb898 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 @@ -65,5 +65,4 @@ public final class VelocityCaptionKeys { public static @NonNull Collection<@NonNull Caption> getVelocityCaptionKeys() { return Collections.unmodifiableCollection(RECOGNIZED_CAPTIONS); } - } 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 d45505bd..26694248 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 @@ -177,5 +177,4 @@ public class VelocityCommandManager extends CommandManager implements Brig final @NonNull Function<@NonNull C, @NonNull CommandSource> backwardsCommandSenderMapper() { return this.backwardsCommandSenderMapper; } - } diff --git a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandPreprocessor.java b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandPreprocessor.java index 0aac58c5..ef18e342 100644 --- a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandPreprocessor.java +++ b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandPreprocessor.java @@ -54,5 +54,4 @@ final class VelocityCommandPreprocessor implements CommandPreprocessor { this.mgr.proxyServer() ); } - } diff --git a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityContextKeys.java b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityContextKeys.java index 2309367d..cfa527be 100644 --- a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityContextKeys.java +++ b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityContextKeys.java @@ -46,5 +46,4 @@ public final class VelocityContextKeys { private VelocityContextKeys() { } - } 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 18180a32..0c090c40 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 @@ -90,11 +90,11 @@ final class VelocityExecutor implements Command { NamedTextColor.RED ) ).append( - Component.text( - e.getCorrectSyntax(), - NamedTextColor.GRAY - ) - ).build() + Component.text( + e.getCorrectSyntax(), + NamedTextColor.GRAY + ) + ).build() ) ); } else if (throwable instanceof InvalidCommandSenderException) { @@ -169,5 +169,4 @@ final class VelocityExecutor implements Command { } }; } - } 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 894954db..094e8f34 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 @@ -85,5 +85,4 @@ final class VelocityPluginRegistrationHandler implements CommandRegistrationH @NonNull CloudBrigadierManager brigadierManager() { return this.brigadierManager; } - } 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 4b671632..45f5d9a4 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 @@ -134,7 +134,6 @@ public final class PlayerArgument extends CommandArgument { new LinkedList<>() ); } - } @@ -178,7 +177,6 @@ public final class PlayerArgument extends CommandArgument { public boolean isContextFree() { return true; } - } @@ -197,7 +195,5 @@ public final class PlayerArgument extends CommandArgument { CaptionVariable.of("input", input) ); } - } - } 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 bbafdc0f..084f2f2e 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 @@ -131,7 +131,6 @@ public final class ServerArgument extends CommandArgument() ); } - } public static final class ServerParser implements ArgumentParser { @@ -172,7 +171,6 @@ public final class ServerArgument extends CommandArgument s.getServerInfo().getName()) .collect(Collectors.toList()); } - } public static final class ServerParseException extends ParserException { @@ -190,7 +188,5 @@ public final class ServerArgument extends CommandArgument implements Service(instance, method), @@ -60,5 +59,4 @@ enum AnnotatedMethodServiceFactory { } return map; } - } diff --git a/cloud-services/src/main/java/cloud/commandframework/services/ChunkedRequestContext.java b/cloud-services/src/main/java/cloud/commandframework/services/ChunkedRequestContext.java index b0fd5878..ab2e08f0 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ChunkedRequestContext.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ChunkedRequestContext.java @@ -99,5 +99,4 @@ public abstract class ChunkedRequestContext<@NonNull Context, @NonNull Result> { return this.requests.isEmpty(); } } - } diff --git a/cloud-services/src/main/java/cloud/commandframework/services/PipelineException.java b/cloud-services/src/main/java/cloud/commandframework/services/PipelineException.java index 44e1c757..32779bba 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/PipelineException.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/PipelineException.java @@ -52,5 +52,4 @@ public final class PipelineException extends RuntimeException { public PipelineException(final @NonNull String message, final @NonNull Exception cause) { super(message, cause); } - } diff --git a/cloud-services/src/main/java/cloud/commandframework/services/ServiceFilterHandler.java b/cloud-services/src/main/java/cloud/commandframework/services/ServiceFilterHandler.java index 2469370e..531f9015 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServiceFilterHandler.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServiceFilterHandler.java @@ -51,5 +51,4 @@ enum ServiceFilterHandler { } return true; } - } diff --git a/cloud-services/src/main/java/cloud/commandframework/services/ServicePipeline.java b/cloud-services/src/main/java/cloud/commandframework/services/ServicePipeline.java index 6a5e8e38..d758c585 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServicePipeline.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServicePipeline.java @@ -245,5 +245,4 @@ public final class ServicePipeline { Executor getExecutor() { return this.executor; } - } diff --git a/cloud-services/src/main/java/cloud/commandframework/services/ServicePipelineBuilder.java b/cloud-services/src/main/java/cloud/commandframework/services/ServicePipelineBuilder.java index 6398d0d8..570fc070 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServicePipelineBuilder.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServicePipelineBuilder.java @@ -59,5 +59,4 @@ public final class ServicePipelineBuilder { this.executor = Objects.requireNonNull(executor, "Executor may not be null"); return this; } - } diff --git a/cloud-services/src/main/java/cloud/commandframework/services/ServicePump.java b/cloud-services/src/main/java/cloud/commandframework/services/ServicePump.java index 2bc46250..b96909a3 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServicePump.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServicePump.java @@ -70,5 +70,4 @@ public final class ServicePump { ) { return this.through(TypeToken.get(clazz)); } - } diff --git a/cloud-services/src/main/java/cloud/commandframework/services/ServiceRepository.java b/cloud-services/src/main/java/cloud/commandframework/services/ServiceRepository.java index 18f8c770..56359237 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServiceRepository.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServiceRepository.java @@ -147,12 +147,10 @@ public final class ServiceRepository { @Override public int compareTo(final @NonNull ServiceWrapper other) { return Comparator.>comparingInt( - wrapper -> wrapper.isDefaultImplementation() - ? Integer.MIN_VALUE - : Integer.MAX_VALUE).thenComparingInt(wrapper -> wrapper.executionOrder.ordinal()) + wrapper -> wrapper.isDefaultImplementation() + ? Integer.MIN_VALUE + : Integer.MAX_VALUE).thenComparingInt(wrapper -> wrapper.executionOrder.ordinal()) .thenComparingInt(wrapper -> wrapper.registrationOrder).compare(this, other); } - } - } diff --git a/cloud-services/src/main/java/cloud/commandframework/services/ServiceSpigot.java b/cloud-services/src/main/java/cloud/commandframework/services/ServiceSpigot.java index 3bbfa7d8..c8d53a0e 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServiceSpigot.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServiceSpigot.java @@ -166,5 +166,4 @@ public final class ServiceSpigot { public @NonNull CompletableFuture> forwardAsynchronously() { return this.getResultAsynchronously().thenApply(this.pipeline::pump); } - } diff --git a/cloud-services/src/main/java/cloud/commandframework/services/annotations/Order.java b/cloud-services/src/main/java/cloud/commandframework/services/annotations/Order.java index f0f6e4f6..9f4f1cad 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/annotations/Order.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/annotations/Order.java @@ -42,5 +42,4 @@ public @interface Order { * @return Priority */ ExecutionOrder value() default ExecutionOrder.SOON; - } diff --git a/cloud-services/src/main/java/cloud/commandframework/services/annotations/ServiceImplementation.java b/cloud-services/src/main/java/cloud/commandframework/services/annotations/ServiceImplementation.java index 83386293..33ae7e89 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/annotations/ServiceImplementation.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/annotations/ServiceImplementation.java @@ -50,5 +50,4 @@ public @interface ServiceImplementation { * @return Service to implement */ Class> value(); - } diff --git a/cloud-services/src/main/java/cloud/commandframework/services/types/ConsumerService.java b/cloud-services/src/main/java/cloud/commandframework/services/types/ConsumerService.java index 4aebdc04..9eba2523 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/types/ConsumerService.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/types/ConsumerService.java @@ -86,7 +86,5 @@ public interface ConsumerService public synchronized Throwable initCause(final Throwable cause) { return this; } - } - } diff --git a/cloud-services/src/main/java/cloud/commandframework/services/types/PartialResultService.java b/cloud-services/src/main/java/cloud/commandframework/services/types/PartialResultService.java index 0cb7a0ca..c09c2069 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/types/PartialResultService.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/types/PartialResultService.java @@ -58,5 +58,4 @@ public interface PartialResultService handleRequests(@NonNull List requests); - } diff --git a/cloud-services/src/main/java/cloud/commandframework/services/types/Service.java b/cloud-services/src/main/java/cloud/commandframework/services/types/Service.java index f1973208..ded8b3bf 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/types/Service.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/types/Service.java @@ -72,5 +72,4 @@ public interface Service extends Function<@NonNull Context, @Nu default @Nullable ExecutionOrder order() { return null; } - } diff --git a/cloud-services/src/main/java/cloud/commandframework/services/types/SideEffectService.java b/cloud-services/src/main/java/cloud/commandframework/services/types/SideEffectService.java index 816783bc..1c450413 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/types/SideEffectService.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/types/SideEffectService.java @@ -49,5 +49,4 @@ public interface SideEffectService extends Service { */ @Override @NonNull State handle(@NonNull Context context) throws Exception; - } diff --git a/cloud-services/src/test/java/cloud/commandframework/services/ServicesTest.java b/cloud-services/src/test/java/cloud/commandframework/services/ServicesTest.java index bd06e2e4..405a1714 100644 --- a/cloud-services/src/test/java/cloud/commandframework/services/ServicesTest.java +++ b/cloud-services/src/test/java/cloud/commandframework/services/ServicesTest.java @@ -94,7 +94,6 @@ public class ServicesTest { Assertions.assertNotNull( servicePipeline.pump(new MockService.MockContext("oi")).through(MockService.class) .getResultAsynchronously().get()); - } @Test @@ -281,13 +280,12 @@ public class ServicesTest { ); servicePipeline.pump(new MockService.MockContext("pls throw exception")) .through(MockService.class).getResult((result, throwable) -> { - Assertions.assertNotNull(throwable); - Assertions.assertEquals( - DefaultMockService.TotallyIntentionalException.class, - throwable.getClass() - ); - Assertions.assertNull(result); - }); + Assertions.assertNotNull(throwable); + Assertions.assertEquals( + DefaultMockService.TotallyIntentionalException.class, + throwable.getClass() + ); + Assertions.assertNull(result); + }); } - } diff --git a/cloud-services/src/test/java/cloud/commandframework/services/mock/AnnotatedMethodTest.java b/cloud-services/src/test/java/cloud/commandframework/services/mock/AnnotatedMethodTest.java index 866e9514..f931d465 100644 --- a/cloud-services/src/test/java/cloud/commandframework/services/mock/AnnotatedMethodTest.java +++ b/cloud-services/src/test/java/cloud/commandframework/services/mock/AnnotatedMethodTest.java @@ -31,5 +31,4 @@ public class AnnotatedMethodTest { public MockService.MockResult handle(final MockService.MockContext context) { return new MockService.MockResult(context.getString().length()); } - } diff --git a/cloud-services/src/test/java/cloud/commandframework/services/mock/CompletingPartialResultService.java b/cloud-services/src/test/java/cloud/commandframework/services/mock/CompletingPartialResultService.java index 66d704a1..eb4d8354 100644 --- a/cloud-services/src/test/java/cloud/commandframework/services/mock/CompletingPartialResultService.java +++ b/cloud-services/src/test/java/cloud/commandframework/services/mock/CompletingPartialResultService.java @@ -41,5 +41,4 @@ public class CompletingPartialResultService implements MockPartialResultService } return map; } - } diff --git a/cloud-services/src/test/java/cloud/commandframework/services/mock/DefaultMockService.java b/cloud-services/src/test/java/cloud/commandframework/services/mock/DefaultMockService.java index 4d9fe7c1..696e7396 100644 --- a/cloud-services/src/test/java/cloud/commandframework/services/mock/DefaultMockService.java +++ b/cloud-services/src/test/java/cloud/commandframework/services/mock/DefaultMockService.java @@ -38,7 +38,5 @@ public final class DefaultMockService implements MockService { public static class TotallyIntentionalException extends Exception { private static final long serialVersionUID = -6277471288867949574L; - } - } diff --git a/cloud-services/src/test/java/cloud/commandframework/services/mock/DefaultPartialRequestService.java b/cloud-services/src/test/java/cloud/commandframework/services/mock/DefaultPartialRequestService.java index 7c922565..5690a4c8 100644 --- a/cloud-services/src/test/java/cloud/commandframework/services/mock/DefaultPartialRequestService.java +++ b/cloud-services/src/test/java/cloud/commandframework/services/mock/DefaultPartialRequestService.java @@ -38,5 +38,4 @@ public class DefaultPartialRequestService implements MockPartialResultService { } return map; } - } diff --git a/cloud-services/src/test/java/cloud/commandframework/services/mock/DefaultSideEffectService.java b/cloud-services/src/test/java/cloud/commandframework/services/mock/DefaultSideEffectService.java index 4d171424..8da5851d 100644 --- a/cloud-services/src/test/java/cloud/commandframework/services/mock/DefaultSideEffectService.java +++ b/cloud-services/src/test/java/cloud/commandframework/services/mock/DefaultSideEffectService.java @@ -32,5 +32,4 @@ public class DefaultSideEffectService implements MockSideEffectService { mockPlayer.setHealth(0); return State.ACCEPTED; } - } diff --git a/cloud-services/src/test/java/cloud/commandframework/services/mock/InterruptingMockConsumer.java b/cloud-services/src/test/java/cloud/commandframework/services/mock/InterruptingMockConsumer.java index fb54499c..6f5a1985 100644 --- a/cloud-services/src/test/java/cloud/commandframework/services/mock/InterruptingMockConsumer.java +++ b/cloud-services/src/test/java/cloud/commandframework/services/mock/InterruptingMockConsumer.java @@ -31,5 +31,4 @@ public class InterruptingMockConsumer implements MockConsumerService { public void accept(final MockService.MockContext mockContext) { ConsumerService.interrupt(); } - } diff --git a/cloud-services/src/test/java/cloud/commandframework/services/mock/MockChunkedRequest.java b/cloud-services/src/test/java/cloud/commandframework/services/mock/MockChunkedRequest.java index 8bed0b03..14d5bbf6 100644 --- a/cloud-services/src/test/java/cloud/commandframework/services/mock/MockChunkedRequest.java +++ b/cloud-services/src/test/java/cloud/commandframework/services/mock/MockChunkedRequest.java @@ -44,7 +44,6 @@ public class MockChunkedRequest public String getName() { return this.name; } - } @@ -59,7 +58,5 @@ public class MockChunkedRequest public String getSound() { return this.sound; } - } - } diff --git a/cloud-services/src/test/java/cloud/commandframework/services/mock/MockOrderedFirst.java b/cloud-services/src/test/java/cloud/commandframework/services/mock/MockOrderedFirst.java index 814f3789..d0eb99f0 100644 --- a/cloud-services/src/test/java/cloud/commandframework/services/mock/MockOrderedFirst.java +++ b/cloud-services/src/test/java/cloud/commandframework/services/mock/MockOrderedFirst.java @@ -33,5 +33,4 @@ public class MockOrderedFirst implements MockService { public MockResult handle(final MockContext mockContext) { return new MockResult(1); } - } diff --git a/cloud-services/src/test/java/cloud/commandframework/services/mock/MockOrderedLast.java b/cloud-services/src/test/java/cloud/commandframework/services/mock/MockOrderedLast.java index c580b1db..70a79044 100644 --- a/cloud-services/src/test/java/cloud/commandframework/services/mock/MockOrderedLast.java +++ b/cloud-services/src/test/java/cloud/commandframework/services/mock/MockOrderedLast.java @@ -33,5 +33,4 @@ public class MockOrderedLast implements MockService { public MockResult handle(final MockContext mockContext) { return new MockResult(2); } - } diff --git a/cloud-services/src/test/java/cloud/commandframework/services/mock/MockResultConsumer.java b/cloud-services/src/test/java/cloud/commandframework/services/mock/MockResultConsumer.java index b3f09ca3..69b72ec9 100644 --- a/cloud-services/src/test/java/cloud/commandframework/services/mock/MockResultConsumer.java +++ b/cloud-services/src/test/java/cloud/commandframework/services/mock/MockResultConsumer.java @@ -32,5 +32,4 @@ public class MockResultConsumer implements SideEffectService extends Consumer<@NonNull I>, TaskRecipeStep { */ @Override void accept(@NonNull I input); - } diff --git a/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskFactory.java b/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskFactory.java index c8c17bde..624e0c98 100644 --- a/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskFactory.java +++ b/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskFactory.java @@ -49,5 +49,4 @@ public final class TaskFactory { public @NonNull TaskRecipe recipe() { return new TaskRecipe(this.synchronizer); } - } diff --git a/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskFunction.java b/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskFunction.java index 1a9962a1..1fe5e870 100644 --- a/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskFunction.java +++ b/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskFunction.java @@ -49,5 +49,4 @@ public interface TaskFunction extends Function<@NonNull I, @NonNull O>, Ta */ @Override @NonNull O apply(@NonNull I input); - } diff --git a/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskRecipe.java b/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskRecipe.java index 2df2d576..ea1eef27 100644 --- a/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskRecipe.java +++ b/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskRecipe.java @@ -180,7 +180,6 @@ public final class TaskRecipe { this.execute(() -> { }); } - } /** @@ -234,7 +233,5 @@ public final class TaskRecipe { this.execute(() -> { }); } - } - } diff --git a/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskSynchronizer.java b/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskSynchronizer.java index dca910c8..9cd4472b 100644 --- a/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskSynchronizer.java +++ b/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskSynchronizer.java @@ -72,5 +72,4 @@ public interface TaskSynchronizer { * @return Future that completes with the output */ CompletableFuture runAsynchronous(@NonNull I input, @NonNull TaskFunction function); - } diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/ExamplePlugin.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/ExamplePlugin.java index 1c65115b..831945f1 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/ExamplePlugin.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/ExamplePlugin.java @@ -601,7 +601,5 @@ public final class ExamplePlugin extends JavaPlugin { * @return Required game mode */ GameMode value(); - } - } diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/Mc113.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/Mc113.java index 6d49e7b5..e8af6779 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/Mc113.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/Mc113.java @@ -45,6 +45,7 @@ import org.checkerframework.framework.qual.DefaultQualifier; @DefaultQualifier(NonNull.class) final class Mc113 { + private final BukkitCommandManager manager; Mc113(final BukkitCommandManager manager) { @@ -98,5 +99,4 @@ final class Mc113 { ctx.getSender().sendMessage("result: " + predicate.test( protoItemStack.createItemStack(1, true))); } - } diff --git a/examples/example-bungee/src/main/java/cloud/commandframework/examples/bungee/ExamplePlugin.java b/examples/example-bungee/src/main/java/cloud/commandframework/examples/bungee/ExamplePlugin.java index 8c4ae85c..e27a7650 100644 --- a/examples/example-bungee/src/main/java/cloud/commandframework/examples/bungee/ExamplePlugin.java +++ b/examples/example-bungee/src/main/java/cloud/commandframework/examples/bungee/ExamplePlugin.java @@ -148,5 +148,4 @@ public final class ExamplePlugin extends Plugin { }) ); } - } diff --git a/examples/example-javacord/src/main/java/cloud/commandframework/examples/javacord/ExampleBot.java b/examples/example-javacord/src/main/java/cloud/commandframework/examples/javacord/ExampleBot.java index baf47f6c..1506de0e 100644 --- a/examples/example-javacord/src/main/java/cloud/commandframework/examples/javacord/ExampleBot.java +++ b/examples/example-javacord/src/main/java/cloud/commandframework/examples/javacord/ExampleBot.java @@ -57,5 +57,4 @@ public final class ExampleBot { SimplixInstaller.instance().install(Platform.STANDALONE); } - } diff --git a/examples/example-javacord/src/main/java/cloud/commandframework/examples/javacord/application/ExampleApplication.java b/examples/example-javacord/src/main/java/cloud/commandframework/examples/javacord/application/ExampleApplication.java index aca3c0b1..26565f01 100644 --- a/examples/example-javacord/src/main/java/cloud/commandframework/examples/javacord/application/ExampleApplication.java +++ b/examples/example-javacord/src/main/java/cloud/commandframework/examples/javacord/application/ExampleApplication.java @@ -119,5 +119,4 @@ public class ExampleApplication { this.discordApiComponent.shutdown(); System.exit(0); } - } diff --git a/examples/example-javacord/src/main/java/cloud/commandframework/examples/javacord/components/CommandsComponent.java b/examples/example-javacord/src/main/java/cloud/commandframework/examples/javacord/components/CommandsComponent.java index 37c629c5..99afbbaa 100644 --- a/examples/example-javacord/src/main/java/cloud/commandframework/examples/javacord/components/CommandsComponent.java +++ b/examples/example-javacord/src/main/java/cloud/commandframework/examples/javacord/components/CommandsComponent.java @@ -100,5 +100,4 @@ public class CommandsComponent { Preconditions.checkNotNull(this.commandManager, "Command Manager has not been initialized yet"); return this.commandManager; } - } diff --git a/examples/example-javacord/src/main/java/cloud/commandframework/examples/javacord/components/DiscordApiComponent.java b/examples/example-javacord/src/main/java/cloud/commandframework/examples/javacord/components/DiscordApiComponent.java index 4ffa0602..9245f929 100644 --- a/examples/example-javacord/src/main/java/cloud/commandframework/examples/javacord/components/DiscordApiComponent.java +++ b/examples/example-javacord/src/main/java/cloud/commandframework/examples/javacord/components/DiscordApiComponent.java @@ -99,5 +99,4 @@ public class DiscordApiComponent { CONNECTED, DISCONNECTED } - } diff --git a/examples/example-javacord/src/main/java/cloud/commandframework/examples/javacord/modules/ExampleModule.java b/examples/example-javacord/src/main/java/cloud/commandframework/examples/javacord/modules/ExampleModule.java index 714370f8..a2dccb49 100644 --- a/examples/example-javacord/src/main/java/cloud/commandframework/examples/javacord/modules/ExampleModule.java +++ b/examples/example-javacord/src/main/java/cloud/commandframework/examples/javacord/modules/ExampleModule.java @@ -47,5 +47,4 @@ public class ExampleModule extends AbstractSimplixModule { public final @NonNull ScheduledExecutorService provideExecutorService() { return Executors.newScheduledThreadPool(0); } - } diff --git a/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/CustomUser.java b/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/CustomUser.java index e46791b4..d4d529ce 100644 --- a/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/CustomUser.java +++ b/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/CustomUser.java @@ -79,5 +79,4 @@ public abstract class CustomUser { public final @NonNull MessageChannel getChannel() { return this.channel; } - } diff --git a/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/ExampleBot.java b/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/ExampleBot.java index 95ca68ff..94f97116 100644 --- a/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/ExampleBot.java +++ b/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/ExampleBot.java @@ -148,5 +148,4 @@ public final class ExampleBot { textChannel.sendMessage(user.getName() + " kicked").complete(); })); } - } diff --git a/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/GuildUser.java b/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/GuildUser.java index 7d9d75a2..745b011e 100644 --- a/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/GuildUser.java +++ b/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/GuildUser.java @@ -41,7 +41,11 @@ public final class GuildUser extends CustomUser { * @param member Guild member that sent the message * @param channel Text channel that the message was sent in */ - public GuildUser(final @Nullable MessageReceivedEvent event, final @NonNull Member member, final @NonNull TextChannel channel) { + public GuildUser( + final @Nullable MessageReceivedEvent event, + final @NonNull Member member, + final @NonNull TextChannel channel + ) { super(event, member.getUser(), channel); this.member = member; this.channel = channel; @@ -64,5 +68,4 @@ public final class GuildUser extends CustomUser { public @NonNull TextChannel getTextChannel() { return this.channel; } - } diff --git a/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/PermissionRegistry.java b/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/PermissionRegistry.java index cd9c670a..aae01365 100644 --- a/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/PermissionRegistry.java +++ b/examples/example-jda/src/main/java/cloud/commandframework/examples/jda/PermissionRegistry.java @@ -73,5 +73,4 @@ public final class PermissionRegistry { this.permissions.putIfAbsent(userId, new HashSet<>()); return this.permissions.get(userId); } - } 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 7ba4862d..7a12e80f 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 @@ -40,7 +40,11 @@ public final class PrivateUser extends CustomUser { * @param user User that sent the message * @param channel Text channel that the message was sent in */ - public PrivateUser(final @Nullable MessageReceivedEvent event, final @NonNull User user, final @NonNull PrivateChannel channel) { + public PrivateUser( + final @Nullable MessageReceivedEvent event, + final @NonNull User user, + final @NonNull PrivateChannel channel + ) { super(event, user, channel); this.privateChannel = channel; } @@ -53,5 +57,4 @@ public final class PrivateUser extends CustomUser { public @NonNull PrivateChannel getPrivateChannel() { return this.privateChannel; } - } 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 cea6d4d2..ba665dc9 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 @@ -118,5 +118,4 @@ public final class ExampleVelocityPlugin { }) ); } - }