From 708d11854ed236a6760a17a87670e944f3b3da24 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Wed, 1 Dec 2021 22:00:40 -0800 Subject: [PATCH] Fix import order --- .checkstyle/checkstyle.xml | 7 +++ .editorconfig | 2 +- .../annotations/AnnotationParser.java | 9 +-- .../annotations/Argument.java | 3 +- .../annotations/ArgumentExtractor.java | 3 +- .../annotations/ArgumentParameterPair.java | 3 +- .../annotations/CommandDescription.java | 3 +- .../annotations/CommandMethod.java | 3 +- .../annotations/CommandMethodPair.java | 3 +- .../annotations/CommandPermission.java | 3 +- .../commandframework/annotations/Flag.java | 3 +- .../annotations/FlagExtractor.java | 3 +- .../commandframework/annotations/Hidden.java | 1 - .../annotations/MetaFactory.java | 3 +- .../MethodCommandExecutionHandler.java | 3 +- .../annotations/ProxiedBy.java | 3 +- .../commandframework/annotations/Regex.java | 3 +- .../annotations/SyntaxFragment.java | 3 +- .../annotations/SyntaxParser.java | 3 +- .../parsers/MethodArgumentParser.java | 3 +- .../MethodSuggestionsProvider.java | 3 +- .../annotations/suggestions/Suggestions.java | 3 +- .../annotations/AnnotationParserTest.java | 2 - .../annotations/SyntaxParserTest.java | 1 - .../java/cloud/commandframework/Command.java | 5 +- .../commandframework/CommandComponent.java | 3 +- .../commandframework/CommandHelpHandler.java | 5 +- .../commandframework/CommandManager.java | 5 +- .../cloud/commandframework/CommandTree.java | 5 +- .../LockableCommandManager.java | 3 +- .../annotations/AnnotatedElementAccessor.java | 5 +- .../annotations/AnnotationAccessor.java | 5 +- .../MultiDelegateAnnotationAccessor.java | 5 +- .../injection/ParameterInjectorRegistry.java | 5 +- .../annotations/specifier/Range.java | 3 +- .../arguments/CommandArgument.java | 5 +- .../arguments/CommandSuggestionEngine.java | 3 +- .../arguments/CommandSyntaxFormatter.java | 3 +- .../DelegatingCommandSuggestionEngine.java | 3 +- .../DelegatingSuggestionsProvider.java | 3 +- .../StandardCommandSyntaxFormatter.java | 5 +- .../arguments/StaticArgument.java | 3 +- .../arguments/compound/ArgumentPair.java | 3 +- .../arguments/compound/ArgumentTriplet.java | 3 +- .../arguments/compound/CompoundArgument.java | 3 +- .../arguments/compound/FlagArgument.java | 3 +- .../arguments/flags/CommandFlag.java | 5 +- .../arguments/flags/FlagContext.java | 5 +- .../arguments/parser/ArgumentParseResult.java | 3 +- .../arguments/parser/ArgumentParser.java | 3 +- .../parser/MappedArgumentParser.java | 5 +- .../arguments/parser/ParserParameter.java | 3 +- .../arguments/parser/ParserParameters.java | 3 +- .../arguments/parser/ParserRegistry.java | 3 +- .../parser/StandardParserRegistry.java | 3 +- .../preprocessor/RegexPreprocessor.java | 3 +- .../arguments/standard/BooleanArgument.java | 5 +- .../arguments/standard/ByteArgument.java | 5 +- .../arguments/standard/CharArgument.java | 5 +- .../arguments/standard/DoubleArgument.java | 5 +- .../arguments/standard/EnumArgument.java | 5 +- .../arguments/standard/FloatArgument.java | 5 +- .../arguments/standard/IntegerArgument.java | 5 +- .../arguments/standard/LongArgument.java | 5 +- .../arguments/standard/ShortArgument.java | 5 +- .../arguments/standard/StringArgument.java | 3 +- .../standard/StringArrayArgument.java | 5 +- .../arguments/standard/UUIDArgument.java | 5 +- .../commandframework/captions/Caption.java | 3 +- .../FactoryDelegatingCaptionRegistry.java | 3 +- .../captions/SimpleCaptionRegistry.java | 3 +- .../captions/StandardCaptionKeys.java | 3 +- .../context/CommandContext.java | 5 +- .../exceptions/AmbiguousNodeException.java | 5 +- .../exceptions/ArgumentParseException.java | 3 +- .../exceptions/CommandParseException.java | 3 +- .../InvalidCommandSenderException.java | 3 +- .../exceptions/InvalidSyntaxException.java | 3 +- .../exceptions/NoPermissionException.java | 3 +- .../exceptions/NoSuchCommandException.java | 3 +- .../exceptions/parsing/ParserException.java | 3 +- ...ynchronousCommandExecutionCoordinator.java | 5 +- .../CommandExecutionCoordinator.java | 5 +- .../execution/CommandExecutionHandler.java | 2 - .../execution/CommandSuggestionProcessor.java | 3 +- .../FilteringCommandSuggestionProcessor.java | 3 +- .../CommandPostprocessingContext.java | 3 +- .../CommandPreprocessingContext.java | 3 +- .../CommandConfirmationManager.java | 7 +-- .../internal/CommandInputTokenizer.java | 3 +- .../commandframework/keys/SimpleCloudKey.java | 3 +- .../commandframework/meta/CommandMeta.java | 5 +- .../meta/SimpleCommandMeta.java | 3 +- .../commandframework/meta/SimpleKey.java | 3 +- .../permission/AndPermission.java | 3 +- .../permission/CommandPermission.java | 3 +- .../permission/OrPermission.java | 3 +- .../permission/Permission.java | 3 +- .../permission/PredicatePermission.java | 3 +- .../WrappingPredicatePermission.java | 3 +- .../commandframework/types/tuples/Pair.java | 3 +- .../types/tuples/Quartet.java | 3 +- .../types/tuples/Quintet.java | 3 +- .../commandframework/types/tuples/Sextet.java | 3 +- .../types/tuples/Triplet.java | 3 +- .../AnnotationAccessorTest.java | 7 +-- .../CommandHelpHandlerTest.java | 11 ++-- .../CommandPerformanceTest.java | 5 +- .../CommandPermissionTest.java | 10 ++- .../CommandPostProcessorTest.java | 4 +- .../CommandPreProcessorTest.java | 4 +- .../CommandSuggestionsTest.java | 10 ++- .../cloud/commandframework/CommandTest.java | 4 +- .../commandframework/CommandTreeTest.java | 12 ++-- .../commandframework/ExecutionBenchmark.java | 5 +- .../ParameterInjectorRegistryTest.java | 8 +-- .../commandframework/ParserRegistryTest.java | 15 ++--- .../standard/StringArgumentTest.java | 7 +-- .../commandframework/util/TestUtils.java | 16 +++-- .../javacord/JavacordCommand.java | 3 +- .../javacord/JavacordCommandManager.java | 7 +-- .../javacord/JavacordRegistrationHandler.java | 3 +- .../sender/JavacordCommandSender.java | 3 +- .../jda/JDA4CommandManager.java | 5 +- .../jda/JDACommandManager.java | 9 ++- .../jda/JDACommandSender.java | 5 +- .../jda/parsers/ChannelArgument.java | 11 ++-- .../jda/parsers/RoleArgument.java | 11 ++-- .../jda/parsers/UserArgument.java | 13 ++-- .../pircbotx/PircBotXCommandManager.java | 5 +- .../pircbotx/arguments/UserArgument.java | 6 +- .../brigadier/BrigadierMapping.java | 3 +- .../brigadier/BrigadierMappingBuilder.java | 3 +- .../brigadier/CloudBrigadierManager.java | 5 +- .../argument/QueueAsStringReader.java | 1 - .../argument/StringReaderAsQueue.java | 3 +- .../argument/StringReaderAsQueueImpl.java | 3 +- .../argument/WrappedBrigadierParser.java | 3 +- .../argument/QueueAsStringReaderTest.java | 3 +- .../argument/StringReaderAsQueueTest.java | 3 +- .../bukkit/BukkitBrigadierMapper.java | 5 +- .../bukkit/BukkitCaptionKeys.java | 3 +- .../bukkit/BukkitCommand.java | 9 ++- .../bukkit/BukkitCommandContextKeys.java | 3 +- .../bukkit/BukkitCommandManager.java | 9 ++- .../bukkit/BukkitCommandPreprocessor.java | 3 +- .../BukkitPluginRegistrationHandler.java | 13 ++-- .../bukkit/BukkitSynchronizer.java | 3 +- .../bukkit/CloudBukkitCapabilities.java | 1 - .../bukkit/CloudCommodoreManager.java | 3 +- .../arguments/selector/EntitySelector.java | 5 +- .../selector/MultipleEntitySelector.java | 3 +- .../selector/MultiplePlayerSelector.java | 7 +-- .../selector/SingleEntitySelector.java | 3 +- .../selector/SinglePlayerSelector.java | 3 +- .../bukkit/data/BlockPredicate.java | 3 +- .../bukkit/data/ItemStackPredicate.java | 3 +- .../BukkitBackwardsBrigadierSenderMapper.java | 5 +- .../internal/CraftBukkitReflection.java | 7 +-- .../internal/MinecraftArgumentTypes.java | 5 +- .../parsers/BlockPredicateArgument.java | 9 ++- .../bukkit/parsers/EnchantmentArgument.java | 9 ++- .../bukkit/parsers/ItemStackArgument.java | 11 ++-- .../parsers/ItemStackPredicateArgument.java | 9 ++- .../bukkit/parsers/MaterialArgument.java | 7 +-- .../bukkit/parsers/OfflinePlayerArgument.java | 9 ++- .../bukkit/parsers/PlayerArgument.java | 9 ++- .../bukkit/parsers/WorldArgument.java | 9 ++- .../parsers/location/Location2DArgument.java | 11 ++-- .../parsers/location/LocationArgument.java | 13 ++-- .../parsers/location/LocationCoordinate.java | 3 +- .../location/LocationCoordinateParser.java | 3 +- .../MultipleEntitySelectorArgument.java | 7 +-- .../MultiplePlayerSelectorArgument.java | 9 ++- .../SingleEntitySelectorArgument.java | 7 +-- .../SinglePlayerSelectorArgument.java | 9 ++- .../bungee/BungeeCaptionKeys.java | 3 +- .../bungee/BungeeCommand.java | 5 +- .../bungee/BungeeCommandManager.java | 3 +- .../BungeePluginRegistrationHandler.java | 3 +- .../bungee/arguments/PlayerArgument.java | 9 ++- .../bungee/arguments/ServerArgument.java | 9 ++- .../cloudburst/CloudburstCommand.java | 5 +- .../cloudburst/CloudburstCommandManager.java | 3 +- .../CloudburstPluginRegistrationHandler.java | 5 +- .../fabric/FabricCaptionKeys.java | 3 +- .../fabric/FabricClientCommandManager.java | 3 +- .../fabric/FabricCommandManager.java | 21 +++---- .../FabricCommandRegistrationHandler.java | 5 +- .../fabric/FabricExecutor.java | 11 ++-- .../fabric/FabricServerCommandManager.java | 3 +- .../fabric/annotations/specifier/Center.java | 1 - .../fabric/argument/AngleArgument.java | 5 +- .../fabric/argument/AxisArgument.java | 9 ++- .../fabric/argument/CompoundTagArgument.java | 5 +- .../fabric/argument/EntityAnchorArgument.java | 5 +- .../argument/FabricArgumentParsers.java | 9 ++- .../fabric/argument/FloatRangeArgument.java | 5 +- .../fabric/argument/IntRangeArgument.java | 5 +- .../fabric/argument/ItemInputArgument.java | 5 +- .../fabric/argument/MobEffectArgument.java | 5 +- .../fabric/argument/NamedColorArgument.java | 5 +- .../fabric/argument/NbtPathArgument.java | 5 +- .../fabric/argument/NbtTagArgument.java | 5 +- .../argument/ObjectiveCriteriaArgument.java | 5 +- .../fabric/argument/ParticleArgument.java | 5 +- .../argument/RegistryEntryArgument.java | 11 ++-- .../argument/ResourceLocationArgument.java | 5 +- .../argument/ScoreboardOperationArgument.java | 5 +- .../fabric/argument/SidedArgumentParser.java | 3 +- .../fabric/argument/TeamArgument.java | 9 ++- .../fabric/argument/TimeArgument.java | 5 +- .../argument/server/BlockPosArgument.java | 5 +- .../argument/server/ColumnPosArgument.java | 5 +- .../argument/server/MessageArgument.java | 5 +- .../MultipleEntitySelectorArgument.java | 5 +- .../MultiplePlayerSelectorArgument.java | 5 +- .../server/SingleEntitySelectorArgument.java | 5 +- .../server/SinglePlayerSelectorArgument.java | 5 +- .../fabric/argument/server/Vec2dArgument.java | 5 +- .../fabric/argument/server/Vec3dArgument.java | 5 +- .../commandframework/fabric/data/Message.java | 3 +- .../fabric/data/MinecraftTime.java | 3 +- .../fabric/data/Selector.java | 5 +- .../fabric/mixin/CloudStringReaderMixin.java | 3 +- .../fabric/testmod/FabricClientExample.java | 11 ++-- .../fabric/testmod/FabricExample.java | 9 ++- .../testmod/mixin/GiveCommandAccess.java | 3 +- .../minecraft/extras/AudienceProvider.java | 3 +- .../minecraft/extras/ComponentHelper.java | 5 +- .../extras/MinecraftExceptionHandler.java | 13 ++-- .../minecraft/extras/MinecraftHelp.java | 17 +++--- .../minecraft/extras/Pagination.java | 5 +- .../minecraft/extras/RichDescription.java | 3 +- .../minecraft/extras/TextColorArgument.java | 7 +-- .../AsyncCommandSuggestionsListener.java | 5 +- .../paper/PaperBrigadierListener.java | 5 +- .../paper/PaperCommandManager.java | 5 +- .../paper/argument/KeyedWorldArgument.java | 9 ++- .../sponge7/CloudCommandCallable.java | 9 ++- .../sponge7/CloudInjectionModule.java | 5 +- .../sponge7/SpongeCommandManager.java | 7 +-- .../SpongePluginRegistrationHandler.java | 5 +- .../velocity/CloudInjectionModule.java | 3 +- .../velocity/VelocityCaptionKeys.java | 3 +- .../velocity/VelocityCommandManager.java | 3 +- .../velocity/VelocityExecutor.java | 5 +- .../VelocityPluginRegistrationHandler.java | 3 +- .../velocity/arguments/PlayerArgument.java | 5 +- .../velocity/arguments/ServerArgument.java | 5 +- .../services/AnnotatedMethodService.java | 5 +- .../AnnotatedMethodServiceFactory.java | 3 +- .../services/ChunkedRequestContext.java | 3 +- .../services/ServiceFilterHandler.java | 3 +- .../services/ServicePipeline.java | 3 +- .../services/ServicePipelineBuilder.java | 3 +- .../services/ServiceRepository.java | 3 +- .../services/ServiceSpigot.java | 3 +- .../services/annotations/Order.java | 1 - .../annotations/ServiceImplementation.java | 1 - .../services/types/ConsumerService.java | 3 +- .../services/types/PartialResultService.java | 5 +- .../services/types/Service.java | 3 +- .../services/ServicesTest.java | 5 +- .../services/mock/MockChunkedRequest.java | 1 - .../commandframework/tasks/TaskConsumer.java | 3 +- .../commandframework/tasks/TaskFunction.java | 3 +- .../commandframework/tasks/TaskRecipe.java | 3 +- .../tasks/TaskSynchronizer.java | 3 +- .../examples/bukkit/ExamplePlugin.java | 61 +++++++++---------- .../examples/bungee/ExamplePlugin.java | 5 +- .../examples/jda/CustomUser.java | 3 +- .../examples/jda/ExampleBot.java | 3 +- .../examples/jda/PermissionRegistry.java | 5 +- .../velocity/ExampleVelocityPlugin.java | 3 +- 275 files changed, 559 insertions(+), 834 deletions(-) diff --git a/.checkstyle/checkstyle.xml b/.checkstyle/checkstyle.xml index dd0f4e04..e36198eb 100644 --- a/.checkstyle/checkstyle.xml +++ b/.checkstyle/checkstyle.xml @@ -156,6 +156,13 @@ + + + + + + + diff --git a/.editorconfig b/.editorconfig index f72383ca..c1371075 100644 --- a/.editorconfig +++ b/.editorconfig @@ -137,7 +137,7 @@ ij_java_for_statement_wrap = off ij_java_generate_final_locals = true ij_java_generate_final_parameters = true ij_java_if_brace_force = always -ij_java_imports_layout = *, |, javax.**, java.**, |, $* +ij_java_imports_layout = *,|,$* ij_java_indent_case_from_switch = true ij_java_insert_inner_class_imports = false ij_java_insert_override_annotation = true 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 98e78a58..7094dd17 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/AnnotationParser.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/AnnotationParser.java @@ -48,12 +48,6 @@ import cloud.commandframework.extra.confirmation.CommandConfirmationManager; import cloud.commandframework.meta.CommandMeta; import cloud.commandframework.meta.SimpleCommandMeta; import io.leangen.geantyref.TypeToken; - -import java.util.function.Predicate; - -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.lang.reflect.Modifier; @@ -71,6 +65,9 @@ import java.util.Queue; import java.util.Set; import java.util.function.BiFunction; import java.util.function.Function; +import java.util.function.Predicate; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Parser that parses class instances {@link Command commands} 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 82efc9e0..231e33bc 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/Argument.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/Argument.java @@ -23,13 +23,12 @@ // package cloud.commandframework.annotations; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Annotation used to indicate that a method parameter is a command argument 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 0b655e90..8b988ecc 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/ArgumentExtractor.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/ArgumentExtractor.java @@ -23,13 +23,12 @@ // package cloud.commandframework.annotations; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.reflect.Method; import java.lang.reflect.Parameter; import java.util.ArrayList; import java.util.Collection; import java.util.function.Function; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Utility that extract {@link Argument arguments} from 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 32de9cb1..5e8b08ab 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/ArgumentParameterPair.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/ArgumentParameterPair.java @@ -23,9 +23,8 @@ // package cloud.commandframework.annotations; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.reflect.Parameter; +import org.checkerframework.checker.nullness.qual.NonNull; final class ArgumentParameterPair { 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 bfa3d895..7a8bc1e5 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandDescription.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandDescription.java @@ -24,12 +24,11 @@ package cloud.commandframework.annotations; import cloud.commandframework.arguments.parser.StandardParameters; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Maps to {@link StandardParameters#DESCRIPTION} 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 bbabd8c1..5aedca26 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandMethod.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandMethod.java @@ -23,12 +23,11 @@ // package cloud.commandframework.annotations; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Used to declare a class method as a command method 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 ed460931..693fbe19 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandMethodPair.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandMethodPair.java @@ -23,9 +23,8 @@ // package cloud.commandframework.annotations; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.reflect.Method; +import org.checkerframework.checker.nullness.qual.NonNull; final class CommandMethodPair { 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 9c4b41c3..fcd4afe3 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandPermission.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandPermission.java @@ -23,12 +23,11 @@ // package cloud.commandframework.annotations; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Equivalent to {@link cloud.commandframework.Command.Builder#permission(String)} 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 dab5d6bd..7b390077 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/Flag.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/Flag.java @@ -23,13 +23,12 @@ // package cloud.commandframework.annotations; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Indicates that the parameter should be treated like a {@link cloud.commandframework.arguments.flags.CommandFlag}. 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 1eacd3bd..4166c2cb 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/FlagExtractor.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/FlagExtractor.java @@ -31,8 +31,6 @@ import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.arguments.parser.ParserRegistry; import cloud.commandframework.permission.Permission; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.lang.reflect.Parameter; @@ -42,6 +40,7 @@ import java.util.LinkedList; import java.util.List; import java.util.function.BiFunction; import java.util.function.Function; +import org.checkerframework.checker.nullness.qual.NonNull; final class FlagExtractor implements Function<@NonNull Method, Collection<@NonNull CommandFlag>> { diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/Hidden.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/Hidden.java index 070e1ab7..903a38da 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/Hidden.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/Hidden.java @@ -24,7 +24,6 @@ package cloud.commandframework.annotations; import cloud.commandframework.Command; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; 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 401affd0..e668a986 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/MetaFactory.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/MetaFactory.java @@ -25,11 +25,10 @@ package cloud.commandframework.annotations; import cloud.commandframework.arguments.parser.ParserParameters; import cloud.commandframework.meta.CommandMeta; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.function.Function; +import org.checkerframework.checker.nullness.qual.NonNull; class MetaFactory implements Function<@NonNull Method, @NonNull CommandMeta> { 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 da44d218..83d3fc62 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/MethodCommandExecutionHandler.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/MethodCommandExecutionHandler.java @@ -29,8 +29,6 @@ import cloud.commandframework.arguments.flags.FlagContext; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.CommandExecutionException; import cloud.commandframework.execution.CommandExecutionHandler; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.reflect.Method; @@ -39,6 +37,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Optional; +import org.checkerframework.checker.nullness.qual.NonNull; /** * A command execution handler that invokes a method. 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 a6391a98..7594664d 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/ProxiedBy.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/ProxiedBy.java @@ -24,12 +24,11 @@ package cloud.commandframework.annotations; import cloud.commandframework.Command; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Creates a command proxy for the command. This is similar to 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 75a3a2d2..042c081b 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/Regex.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/Regex.java @@ -23,13 +23,12 @@ // package cloud.commandframework.annotations; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Annotation version of adding {@link cloud.commandframework.arguments.preprocessor.RegexPreprocessor} 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 304180e7..96498825 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/SyntaxFragment.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/SyntaxFragment.java @@ -23,9 +23,8 @@ // package cloud.commandframework.annotations; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.List; +import org.checkerframework.checker.nullness.qual.NonNull; final class SyntaxFragment { diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/SyntaxParser.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/SyntaxParser.java index 635e187a..db35638b 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/SyntaxParser.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/SyntaxParser.java @@ -23,8 +23,6 @@ // package cloud.commandframework.annotations; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -32,6 +30,7 @@ import java.util.StringTokenizer; import java.util.function.Function; import java.util.function.Predicate; import java.util.regex.Pattern; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Parses command syntax into syntax fragments 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 6b468632..2038ed5f 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 @@ -26,14 +26,13 @@ package cloud.commandframework.annotations.parsers; import cloud.commandframework.arguments.parser.ArgumentParseResult; import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.context.CommandContext; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.reflect.Method; import java.util.List; import java.util.Queue; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Represents a method annotated with {@link Parser} 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 f1798f22..5e3dfe21 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 @@ -24,13 +24,12 @@ package cloud.commandframework.annotations.suggestions; import cloud.commandframework.context.CommandContext; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.reflect.Method; import java.util.List; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Represents a method annotated with {@link Suggestions} diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/suggestions/Suggestions.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/suggestions/Suggestions.java index b98c1ea5..e8e41114 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/suggestions/Suggestions.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/suggestions/Suggestions.java @@ -23,12 +23,11 @@ // package cloud.commandframework.annotations.suggestions; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.checkerframework.checker.nullness.qual.NonNull; /** * This annotation allows you to create annotated methods that behave like suggestions providers. diff --git a/cloud-annotations/src/test/java/cloud/commandframework/annotations/AnnotationParserTest.java b/cloud-annotations/src/test/java/cloud/commandframework/annotations/AnnotationParserTest.java index e3023481..9778ce06 100644 --- a/cloud-annotations/src/test/java/cloud/commandframework/annotations/AnnotationParserTest.java +++ b/cloud-annotations/src/test/java/cloud/commandframework/annotations/AnnotationParserTest.java @@ -38,7 +38,6 @@ import cloud.commandframework.arguments.standard.StringArgument; import cloud.commandframework.context.CommandContext; import cloud.commandframework.meta.SimpleCommandMeta; import io.leangen.geantyref.TypeToken; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -55,7 +54,6 @@ import java.util.Queue; import java.util.Set; import java.util.concurrent.CompletionException; import java.util.function.BiFunction; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/cloud-annotations/src/test/java/cloud/commandframework/annotations/SyntaxParserTest.java b/cloud-annotations/src/test/java/cloud/commandframework/annotations/SyntaxParserTest.java index 249bf40c..bcbfefa0 100644 --- a/cloud-annotations/src/test/java/cloud/commandframework/annotations/SyntaxParserTest.java +++ b/cloud-annotations/src/test/java/cloud/commandframework/annotations/SyntaxParserTest.java @@ -26,7 +26,6 @@ package cloud.commandframework.annotations; import java.util.Arrays; import java.util.Collections; import java.util.List; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/cloud-core/src/main/java/cloud/commandframework/Command.java b/cloud-core/src/main/java/cloud/commandframework/Command.java index cbf8f396..fe83e816 100644 --- a/cloud-core/src/main/java/cloud/commandframework/Command.java +++ b/cloud-core/src/main/java/cloud/commandframework/Command.java @@ -38,9 +38,6 @@ import cloud.commandframework.permission.PredicatePermission; import cloud.commandframework.types.tuples.Pair; import cloud.commandframework.types.tuples.Triplet; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -51,6 +48,8 @@ import java.util.Optional; import java.util.function.BiFunction; import java.util.function.Consumer; import java.util.stream.Collectors; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * A command consists out of a chain of {@link CommandArgument command arguments}. diff --git a/cloud-core/src/main/java/cloud/commandframework/CommandComponent.java b/cloud-core/src/main/java/cloud/commandframework/CommandComponent.java index 90d753fe..3926dfa6 100644 --- a/cloud-core/src/main/java/cloud/commandframework/CommandComponent.java +++ b/cloud-core/src/main/java/cloud/commandframework/CommandComponent.java @@ -24,9 +24,8 @@ package cloud.commandframework; import cloud.commandframework.arguments.CommandArgument; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Objects; +import org.checkerframework.checker.nullness.qual.NonNull; /** * A single literal or argument component of a command diff --git a/cloud-core/src/main/java/cloud/commandframework/CommandHelpHandler.java b/cloud-core/src/main/java/cloud/commandframework/CommandHelpHandler.java index 36f47307..d9ecbfa7 100644 --- a/cloud-core/src/main/java/cloud/commandframework/CommandHelpHandler.java +++ b/cloud-core/src/main/java/cloud/commandframework/CommandHelpHandler.java @@ -26,9 +26,6 @@ package cloud.commandframework; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.arguments.StaticArgument; import cloud.commandframework.meta.CommandMeta; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -39,6 +36,8 @@ import java.util.Locale; import java.util.Objects; import java.util.Set; import java.util.function.Predicate; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; public final class CommandHelpHandler { diff --git a/cloud-core/src/main/java/cloud/commandframework/CommandManager.java b/cloud-core/src/main/java/cloud/commandframework/CommandManager.java index 1f00a275..09b76748 100644 --- a/cloud-core/src/main/java/cloud/commandframework/CommandManager.java +++ b/cloud-core/src/main/java/cloud/commandframework/CommandManager.java @@ -60,9 +60,6 @@ import cloud.commandframework.permission.PredicatePermission; import cloud.commandframework.services.ServicePipeline; import cloud.commandframework.services.State; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.Collection; import java.util.Collections; import java.util.EnumSet; @@ -76,6 +73,8 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiConsumer; import java.util.function.Function; import java.util.function.Predicate; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * The manager is responsible for command registration, parsing delegation, etc. diff --git a/cloud-core/src/main/java/cloud/commandframework/CommandTree.java b/cloud-core/src/main/java/cloud/commandframework/CommandTree.java index 201872de..ed1058b1 100644 --- a/cloud-core/src/main/java/cloud/commandframework/CommandTree.java +++ b/cloud-core/src/main/java/cloud/commandframework/CommandTree.java @@ -43,9 +43,6 @@ import cloud.commandframework.permission.OrPermission; import cloud.commandframework.types.tuples.Pair; import io.leangen.geantyref.GenericTypeReflector; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -63,6 +60,8 @@ import java.util.Queue; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Tree containing all commands and command paths. diff --git a/cloud-core/src/main/java/cloud/commandframework/LockableCommandManager.java b/cloud-core/src/main/java/cloud/commandframework/LockableCommandManager.java index 0cccd83b..4df27475 100644 --- a/cloud-core/src/main/java/cloud/commandframework/LockableCommandManager.java +++ b/cloud-core/src/main/java/cloud/commandframework/LockableCommandManager.java @@ -26,9 +26,8 @@ package cloud.commandframework; import cloud.commandframework.execution.AsynchronousCommandExecutionCoordinator; import cloud.commandframework.execution.CommandExecutionCoordinator; import cloud.commandframework.internal.CommandRegistrationHandler; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.function.Function; +import org.checkerframework.checker.nullness.qual.NonNull; /** * {@link CommandManager} implementation that allows you to lock command registrations. 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 bb8e2105..5a34d79b 100644 --- a/cloud-core/src/main/java/cloud/commandframework/annotations/AnnotatedElementAccessor.java +++ b/cloud-core/src/main/java/cloud/commandframework/annotations/AnnotatedElementAccessor.java @@ -23,15 +23,14 @@ // package cloud.commandframework.annotations; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Objects; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; final class AnnotatedElementAccessor implements AnnotationAccessor { 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 d7a5fb6e..0f914890 100644 --- a/cloud-core/src/main/java/cloud/commandframework/annotations/AnnotationAccessor.java +++ b/cloud-core/src/main/java/cloud/commandframework/annotations/AnnotationAccessor.java @@ -23,13 +23,12 @@ // package cloud.commandframework.annotations; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; import java.util.Collection; import java.util.Collections; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Managed access for {@link java.lang.annotation.Annotation} instances 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 eb00a146..d5f9aeb7 100644 --- a/cloud-core/src/main/java/cloud/commandframework/annotations/MultiDelegateAnnotationAccessor.java +++ b/cloud-core/src/main/java/cloud/commandframework/annotations/MultiDelegateAnnotationAccessor.java @@ -23,14 +23,13 @@ // package cloud.commandframework.annotations; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.lang.annotation.Annotation; import java.util.Collection; import java.util.Collections; import java.util.LinkedList; import java.util.List; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; final class MultiDelegateAnnotationAccessor implements 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 acedf30e..0e457a69 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 @@ -28,9 +28,6 @@ import cloud.commandframework.context.CommandContext; import cloud.commandframework.services.ServicePipeline; import cloud.commandframework.types.tuples.Triplet; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -39,6 +36,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Optional; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Registry containing mappings between {@link Class classes} and {@link ParameterInjector injectors} 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 cd8abd07..275e9de4 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 @@ -24,12 +24,11 @@ package cloud.commandframework.annotations.specifier; import cloud.commandframework.arguments.parser.ArgumentParser; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Used to specify min and max values of numerical 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 75de73c1..b98f4c7d 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java @@ -34,9 +34,6 @@ import cloud.commandframework.keys.CloudKey; import cloud.commandframework.keys.CloudKeyHolder; import cloud.commandframework.keys.SimpleCloudKey; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.Collection; import java.util.Collections; import java.util.LinkedList; @@ -45,6 +42,8 @@ import java.util.Objects; import java.util.Queue; import java.util.function.BiFunction; import java.util.regex.Pattern; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * A argument that belongs to a command 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 833a698a..992ab8a8 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/CommandSuggestionEngine.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/CommandSuggestionEngine.java @@ -24,9 +24,8 @@ package cloud.commandframework.arguments; import cloud.commandframework.context.CommandContext; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.List; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Handler that produces command suggestions depending on 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 2f50cfea..3218faf9 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/CommandSyntaxFormatter.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/CommandSyntaxFormatter.java @@ -24,11 +24,10 @@ package cloud.commandframework.arguments; import cloud.commandframework.CommandTree; +import java.util.List; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.List; - /** * Utility that formats chains of {@link CommandArgument command arguments} into syntax strings * 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 baf9d6a2..4c964a6f 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/DelegatingCommandSuggestionEngine.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/DelegatingCommandSuggestionEngine.java @@ -29,11 +29,10 @@ import cloud.commandframework.context.CommandContext; import cloud.commandframework.execution.preprocessor.CommandPreprocessingContext; import cloud.commandframework.internal.CommandInputTokenizer; import cloud.commandframework.services.State; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Collections; import java.util.LinkedList; import java.util.List; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Command suggestion engine that delegates to a {@link cloud.commandframework.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 51beb0f3..6b732d81 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/DelegatingSuggestionsProvider.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/DelegatingSuggestionsProvider.java @@ -25,10 +25,9 @@ package cloud.commandframework.arguments; import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.context.CommandContext; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.List; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; final class DelegatingSuggestionsProvider implements BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List> { 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 eec24a89..eab1b643 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/StandardCommandSyntaxFormatter.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/StandardCommandSyntaxFormatter.java @@ -27,11 +27,10 @@ import cloud.commandframework.CommandTree; import cloud.commandframework.arguments.compound.CompoundArgument; import cloud.commandframework.arguments.compound.FlagArgument; import cloud.commandframework.arguments.flags.CommandFlag; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.Iterator; import java.util.List; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * {@link CommandSyntaxFormatter} implementation that uses the following rules: 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 604b2651..267a3a9a 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/StaticArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/StaticArgument.java @@ -27,8 +27,6 @@ import cloud.commandframework.arguments.parser.ArgumentParseResult; import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -37,6 +35,7 @@ import java.util.List; import java.util.Queue; import java.util.Set; import java.util.TreeSet; +import org.checkerframework.checker.nullness.qual.NonNull; /** * {@link CommandArgument} type that recognizes fixed strings. This type does not parse variables. 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 2d47ee40..c2b4e025 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 @@ -29,9 +29,8 @@ import cloud.commandframework.arguments.parser.ParserParameters; import cloud.commandframework.arguments.parser.ParserRegistry; import cloud.commandframework.types.tuples.Pair; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; /** * A compound argument consisting of two inner arguments 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 1fd2f8af..96ce7e77 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 @@ -29,9 +29,8 @@ import cloud.commandframework.arguments.parser.ParserParameters; import cloud.commandframework.arguments.parser.ParserRegistry; import cloud.commandframework.types.tuples.Triplet; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; /** * A compound argument consisting of three inner arguments diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/CompoundArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/CompoundArgument.java index 0219be31..a03d6321 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/CompoundArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/CompoundArgument.java @@ -29,12 +29,11 @@ import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.context.CommandContext; import cloud.commandframework.types.tuples.Tuple; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.List; import java.util.Queue; import java.util.function.BiFunction; import java.util.function.Function; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Compound argument 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 1cb09468..021a1293 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 @@ -35,8 +35,6 @@ import cloud.commandframework.exceptions.parsing.ParserException; import cloud.commandframework.keys.CloudKey; import cloud.commandframework.keys.SimpleCloudKey; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Collection; import java.util.Collections; import java.util.HashSet; @@ -49,6 +47,7 @@ import java.util.Set; import java.util.function.BiFunction; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Container for flag parsing logic. This should not be be used directly. 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 74d75f24..3a4ab9c1 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 @@ -27,14 +27,13 @@ import cloud.commandframework.ArgumentDescription; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.permission.CommandPermission; import cloud.commandframework.permission.Permission; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.Objects; import java.util.Set; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * A flag is an optional command argument that may have an associated parser, 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 dcce2b03..d20d5bf1 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 @@ -23,12 +23,11 @@ // package cloud.commandframework.arguments.flags; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.HashMap; import java.util.Map; import java.util.Optional; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Flag value mappings 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 86948d75..ad4fa8f0 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 @@ -23,10 +23,9 @@ // package cloud.commandframework.arguments.parser; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Optional; import java.util.function.Function; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Result of the parsing done by a {@link ArgumentParser} 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 4abd1219..1788f302 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 @@ -24,12 +24,11 @@ package cloud.commandframework.arguments.parser; import cloud.commandframework.context.CommandContext; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Collections; import java.util.List; import java.util.Queue; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; import static java.util.Objects.requireNonNull; 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 1eff1327..330953b1 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 @@ -24,12 +24,11 @@ package cloud.commandframework.arguments.parser; import cloud.commandframework.context.CommandContext; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.List; import java.util.Queue; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * An argument parser which wraps another argument parser, converting the output type. 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 0ad4265e..37689416 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 @@ -24,9 +24,8 @@ package cloud.commandframework.arguments.parser; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Objects; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Parser parameter used when retrieving parsers from the {@link ParserRegistry} 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 43d2e8d9..a0eb393f 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 @@ -23,11 +23,10 @@ // package cloud.commandframework.arguments.parser; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Collections; import java.util.HashMap; import java.util.Map; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Collection of {@link ParserParameter parameter}-{@link Object object} pairs 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 185b96a6..5534efe6 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 @@ -25,14 +25,13 @@ package cloud.commandframework.arguments.parser; import cloud.commandframework.context.CommandContext; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.annotation.Annotation; import java.util.Collection; import java.util.List; import java.util.Optional; import java.util.function.BiFunction; import java.util.function.Function; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Registry of {@link ArgumentParser} that allows these arguments to be 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 2b8a6c33..03cf1cd5 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 @@ -42,8 +42,6 @@ import cloud.commandframework.arguments.standard.UUIDArgument; import cloud.commandframework.context.CommandContext; import io.leangen.geantyref.GenericTypeReflector; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.annotation.Annotation; import java.util.Arrays; import java.util.Collection; @@ -55,6 +53,7 @@ import java.util.Optional; import java.util.UUID; import java.util.function.BiFunction; import java.util.function.Function; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Standard implementation of {@link ParserRegistry} 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 e360fd7b..1aa0cc26 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 @@ -29,12 +29,11 @@ import cloud.commandframework.captions.CaptionVariable; import cloud.commandframework.captions.StandardCaptionKeys; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Queue; import java.util.function.BiFunction; import java.util.function.Predicate; import java.util.regex.Pattern; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Command preprocessor that filters based on regular expressions 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 f4aa42a8..f1163c5a 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 @@ -32,13 +32,12 @@ import cloud.commandframework.captions.StandardCaptionKeys; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.ParserException; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.Arrays; import java.util.List; import java.util.Queue; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; @SuppressWarnings("unused") public final class BooleanArgument extends CommandArgument { 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 04f79f4b..dfee6c01 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 @@ -30,12 +30,11 @@ import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.NumberParseException; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.List; import java.util.Queue; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; @SuppressWarnings("unused") public final class ByteArgument extends CommandArgument { 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 5dcaa101..49076bf6 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 @@ -32,12 +32,11 @@ import cloud.commandframework.captions.StandardCaptionKeys; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.ParserException; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.List; import java.util.Queue; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; @SuppressWarnings("unused") public final class CharArgument extends CommandArgument { 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 d433b477..4f93d236 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 @@ -30,12 +30,11 @@ import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.NumberParseException; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.List; import java.util.Queue; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; @SuppressWarnings("unused") public final class DoubleArgument extends CommandArgument { 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 231ad15c..4436a3c6 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 @@ -32,14 +32,13 @@ import cloud.commandframework.captions.StandardCaptionKeys; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.ParserException; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.EnumSet; import java.util.List; import java.util.Queue; import java.util.function.BiFunction; import java.util.stream.Collectors; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Argument type that recognizes enums 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 e28e0ec5..8afc891e 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 @@ -30,12 +30,11 @@ import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.NumberParseException; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.List; import java.util.Queue; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; @SuppressWarnings("unused") public final class FloatArgument extends CommandArgument { 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 dc675c09..fc71a589 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 @@ -30,9 +30,6 @@ import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.NumberParseException; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.Collections; import java.util.LinkedList; import java.util.List; @@ -40,6 +37,8 @@ import java.util.Queue; import java.util.Set; import java.util.TreeSet; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; @SuppressWarnings("unused") public final class IntegerArgument extends CommandArgument { 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 4943621d..9d123a23 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 @@ -30,12 +30,11 @@ import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.NumberParseException; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.List; import java.util.Queue; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; @SuppressWarnings("unused") public final class LongArgument extends CommandArgument { 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 4e503141..ec30166d 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 @@ -30,12 +30,11 @@ import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.NumberParseException; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.List; import java.util.Queue; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; @SuppressWarnings("unused") public final class ShortArgument extends CommandArgument { 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 b6b45f85..5578d1e1 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 @@ -33,8 +33,6 @@ import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.ParserException; import cloud.commandframework.util.StringUtils; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Collections; import java.util.List; import java.util.Queue; @@ -42,6 +40,7 @@ import java.util.StringJoiner; import java.util.function.BiFunction; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.checkerframework.checker.nullness.qual.NonNull; @SuppressWarnings("unused") public final class StringArgument extends CommandArgument { 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 3d07127d..caf326a7 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 @@ -29,12 +29,11 @@ import cloud.commandframework.arguments.parser.ArgumentParseResult; import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.context.CommandContext; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.List; import java.util.Queue; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * This is a command argument type that essentially mimics {@link StringArgument#greedy(String)}, 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 c0c8eb17..6671d9ca 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 @@ -32,13 +32,12 @@ import cloud.commandframework.captions.StandardCaptionKeys; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.ParserException; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.List; import java.util.Queue; import java.util.UUID; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; @SuppressWarnings("unused") public final class UUIDArgument extends CommandArgument { 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 9ea0c4e3..6d2eaaa8 100644 --- a/cloud-core/src/main/java/cloud/commandframework/captions/Caption.java +++ b/cloud-core/src/main/java/cloud/commandframework/captions/Caption.java @@ -23,9 +23,8 @@ // package cloud.commandframework.captions; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Objects; +import org.checkerframework.checker.nullness.qual.NonNull; /** * This is a reference to a caption and does not contain any message itself 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 aac9c860..f1d9e9ea 100644 --- a/cloud-core/src/main/java/cloud/commandframework/captions/FactoryDelegatingCaptionRegistry.java +++ b/cloud-core/src/main/java/cloud/commandframework/captions/FactoryDelegatingCaptionRegistry.java @@ -23,9 +23,8 @@ // package cloud.commandframework.captions; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Caption registry that delegates to factory methods 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 634facd5..317ae385 100644 --- a/cloud-core/src/main/java/cloud/commandframework/captions/SimpleCaptionRegistry.java +++ b/cloud-core/src/main/java/cloud/commandframework/captions/SimpleCaptionRegistry.java @@ -23,11 +23,10 @@ // package cloud.commandframework.captions; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.HashMap; import java.util.Map; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Caption registry that uses bi-functions to produce messages 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 a9584cf2..f3ee9774 100644 --- a/cloud-core/src/main/java/cloud/commandframework/captions/StandardCaptionKeys.java +++ b/cloud-core/src/main/java/cloud/commandframework/captions/StandardCaptionKeys.java @@ -23,11 +23,10 @@ // package cloud.commandframework.captions; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Collection; import java.util.Collections; import java.util.LinkedList; +import org.checkerframework.checker.nullness.qual.NonNull; /** * {@link Caption} instances for messages in cloud-core 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 2ffb8ac9..1f24c9fa 100644 --- a/cloud-core/src/main/java/cloud/commandframework/context/CommandContext.java +++ b/cloud-core/src/main/java/cloud/commandframework/context/CommandContext.java @@ -36,15 +36,14 @@ import cloud.commandframework.keys.CloudKey; import cloud.commandframework.keys.CloudKeyHolder; import cloud.commandframework.keys.SimpleCloudKey; import cloud.commandframework.permission.CommandPermission; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; import java.util.Map; import java.util.Optional; import java.util.function.Supplier; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Command context used to assist in the parsing of commands 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 2d5d7ed5..b06e18fa 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/AmbiguousNodeException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/AmbiguousNodeException.java @@ -26,11 +26,10 @@ package cloud.commandframework.exceptions; import cloud.commandframework.CommandTree; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.context.CommandContext; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.Iterator; import java.util.List; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Exception thrown when a {@link CommandContext} 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 717bb667..945f7081 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/ArgumentParseException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/ArgumentParseException.java @@ -24,9 +24,8 @@ package cloud.commandframework.exceptions; import cloud.commandframework.arguments.CommandArgument; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.List; +import org.checkerframework.checker.nullness.qual.NonNull; public class ArgumentParseException extends CommandParseException { 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 32d1b046..1feca25a 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/CommandParseException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/CommandParseException.java @@ -24,10 +24,9 @@ package cloud.commandframework.exceptions; import cloud.commandframework.arguments.CommandArgument; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Collections; import java.util.List; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Exception thrown when parsing user input into a command 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 54022b1b..02e80fe3 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidCommandSenderException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidCommandSenderException.java @@ -25,11 +25,10 @@ package cloud.commandframework.exceptions; import cloud.commandframework.Command; import cloud.commandframework.arguments.CommandArgument; +import java.util.List; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.List; - /** * Exception thrown when an invalid command sender tries to execute a 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 4a534911..84b6b1be 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidSyntaxException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidSyntaxException.java @@ -24,9 +24,8 @@ package cloud.commandframework.exceptions; import cloud.commandframework.arguments.CommandArgument; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.List; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Exception sent when a command sender inputs invalid command syntax 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 43b31d56..465e7822 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/NoPermissionException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/NoPermissionException.java @@ -26,9 +26,8 @@ package cloud.commandframework.exceptions; import cloud.commandframework.Command; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.permission.CommandPermission; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.List; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Exception thrown when a command sender misses a permission required 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 fb0e903f..f6bf074b 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/NoSuchCommandException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/NoSuchCommandException.java @@ -24,9 +24,8 @@ package cloud.commandframework.exceptions; import cloud.commandframework.arguments.CommandArgument; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.List; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Exception thrown when a command sender tries to execute 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 475e02d0..65e0568a 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 @@ -26,9 +26,8 @@ package cloud.commandframework.exceptions.parsing; import cloud.commandframework.captions.Caption; import cloud.commandframework.captions.CaptionVariable; import cloud.commandframework.context.CommandContext; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Arrays; +import org.checkerframework.checker.nullness.qual.NonNull; public class ParserException extends IllegalArgumentException { 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 c5b628f8..c4ca3d8b 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/AsynchronousCommandExecutionCoordinator.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/AsynchronousCommandExecutionCoordinator.java @@ -30,15 +30,14 @@ import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.CommandExecutionException; import cloud.commandframework.services.State; import cloud.commandframework.types.tuples.Pair; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.Queue; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; import java.util.concurrent.ForkJoinPool; import java.util.function.Consumer; import java.util.function.Function; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Execution coordinator parses and/or executes commands on a separate thread from the calling thread 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 dfe36fd0..c0387b3d 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/CommandExecutionCoordinator.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/CommandExecutionCoordinator.java @@ -29,13 +29,12 @@ import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.CommandExecutionException; import cloud.commandframework.services.State; import cloud.commandframework.types.tuples.Pair; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.Objects; import java.util.Queue; import java.util.concurrent.CompletableFuture; import java.util.function.Function; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * The command execution coordinator is responsible for 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 6ff18561..da682dce 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/CommandExecutionHandler.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/CommandExecutionHandler.java @@ -25,9 +25,7 @@ package cloud.commandframework.execution; import cloud.commandframework.Command; import cloud.commandframework.context.CommandContext; - import java.util.concurrent.CompletableFuture; - import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/cloud-core/src/main/java/cloud/commandframework/execution/CommandSuggestionProcessor.java b/cloud-core/src/main/java/cloud/commandframework/execution/CommandSuggestionProcessor.java index d2e6d089..c37fb5d3 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/CommandSuggestionProcessor.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/CommandSuggestionProcessor.java @@ -24,10 +24,9 @@ package cloud.commandframework.execution; import cloud.commandframework.execution.preprocessor.CommandPreprocessingContext; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.List; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Processor that formats command suggestions 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 fd6affcc..da018415 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/FilteringCommandSuggestionProcessor.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/FilteringCommandSuggestionProcessor.java @@ -24,10 +24,9 @@ package cloud.commandframework.execution; import cloud.commandframework.execution.preprocessor.CommandPreprocessingContext; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.LinkedList; import java.util.List; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Command suggestions processor that checks the input queue head and filters based on that 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 93ab13f4..f38ba058 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 @@ -25,9 +25,8 @@ package cloud.commandframework.execution.postprocessor; import cloud.commandframework.Command; import cloud.commandframework.context.CommandContext; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Objects; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Context for {@link CommandPostprocessor command postprocessors} 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 4f2d2cd7..b575c80e 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 @@ -24,10 +24,9 @@ package cloud.commandframework.execution.preprocessor; import cloud.commandframework.context.CommandContext; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.LinkedList; import java.util.Objects; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Context for {@link CommandPreprocessor command preprocessors} 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 fe589285..e22d12aa 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 @@ -31,16 +31,13 @@ import cloud.commandframework.meta.CommandMeta; import cloud.commandframework.meta.SimpleCommandMeta; import cloud.commandframework.services.types.ConsumerService; import cloud.commandframework.types.tuples.Pair; - -import java.util.concurrent.CompletableFuture; - -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.LinkedHashMap; import java.util.Map; import java.util.Optional; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Manager for the command confirmation system that enables the ability to add "confirmation" requirements to commands, 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 7088e430..79e57dc8 100644 --- a/cloud-core/src/main/java/cloud/commandframework/internal/CommandInputTokenizer.java +++ b/cloud-core/src/main/java/cloud/commandframework/internal/CommandInputTokenizer.java @@ -23,10 +23,9 @@ // package cloud.commandframework.internal; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.LinkedList; import java.util.StringTokenizer; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Tokenizer that splits command inputs into tokens. This will split the string 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 d5e6d2c4..3e8b2a83 100644 --- a/cloud-core/src/main/java/cloud/commandframework/keys/SimpleCloudKey.java +++ b/cloud-core/src/main/java/cloud/commandframework/keys/SimpleCloudKey.java @@ -24,9 +24,8 @@ package cloud.commandframework.keys; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Objects; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Simple immutable implementation of {@link CloudKey}. Key equality is 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 cec63554..9d11fe04 100644 --- a/cloud-core/src/main/java/cloud/commandframework/meta/CommandMeta.java +++ b/cloud-core/src/main/java/cloud/commandframework/meta/CommandMeta.java @@ -27,12 +27,11 @@ import cloud.commandframework.Command; import cloud.commandframework.keys.CloudKey; import io.leangen.geantyref.GenericTypeReflector; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.Map; import java.util.Optional; import java.util.function.Function; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; import static java.util.Objects.requireNonNull; 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 bcdb57e8..8f0c40fa 100644 --- a/cloud-core/src/main/java/cloud/commandframework/meta/SimpleCommandMeta.java +++ b/cloud-core/src/main/java/cloud/commandframework/meta/SimpleCommandMeta.java @@ -24,14 +24,13 @@ package cloud.commandframework.meta; import io.leangen.geantyref.GenericTypeReflector; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; +import org.checkerframework.checker.nullness.qual.NonNull; /** * A simple immutable string-string map containing command meta 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 551ed7ee..bbf13c4a 100644 --- a/cloud-core/src/main/java/cloud/commandframework/meta/SimpleKey.java +++ b/cloud-core/src/main/java/cloud/commandframework/meta/SimpleKey.java @@ -25,11 +25,10 @@ package cloud.commandframework.meta; import io.leangen.geantyref.GenericTypeReflector; import io.leangen.geantyref.TypeToken; +import java.util.function.Function; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.function.Function; - final class SimpleKey implements CommandMeta.Key { private final @NonNull TypeToken valueType; 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 e7ec63b1..986cd243 100644 --- a/cloud-core/src/main/java/cloud/commandframework/permission/AndPermission.java +++ b/cloud-core/src/main/java/cloud/commandframework/permission/AndPermission.java @@ -23,14 +23,13 @@ // package cloud.commandframework.permission; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.Objects; import java.util.Set; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Accepts if every single permission is accepted. 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 40cd60f5..d156e7ea 100644 --- a/cloud-core/src/main/java/cloud/commandframework/permission/CommandPermission.java +++ b/cloud-core/src/main/java/cloud/commandframework/permission/CommandPermission.java @@ -23,12 +23,11 @@ // package cloud.commandframework.permission; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.Set; +import org.checkerframework.checker.nullness.qual.NonNull; import static java.util.Objects.requireNonNull; 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 62bd3b4c..47ec80fe 100644 --- a/cloud-core/src/main/java/cloud/commandframework/permission/OrPermission.java +++ b/cloud-core/src/main/java/cloud/commandframework/permission/OrPermission.java @@ -23,14 +23,13 @@ // package cloud.commandframework.permission; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.Objects; import java.util.Set; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Accepts as long as at least one of the permissions is accepted 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 02eb0132..f327fc9c 100644 --- a/cloud-core/src/main/java/cloud/commandframework/permission/Permission.java +++ b/cloud-core/src/main/java/cloud/commandframework/permission/Permission.java @@ -23,11 +23,10 @@ // package cloud.commandframework.permission; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Collection; import java.util.Collections; import java.util.Objects; +import org.checkerframework.checker.nullness.qual.NonNull; /** * {@link cloud.commandframework.arguments.CommandArgument} permission 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 cecbe30b..3e3cf1cd 100644 --- a/cloud-core/src/main/java/cloud/commandframework/permission/PredicatePermission.java +++ b/cloud-core/src/main/java/cloud/commandframework/permission/PredicatePermission.java @@ -26,11 +26,10 @@ package cloud.commandframework.permission; import cloud.commandframework.keys.CloudKey; import cloud.commandframework.keys.CloudKeyHolder; import cloud.commandframework.keys.SimpleCloudKey; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Collection; import java.util.Collections; import java.util.function.Predicate; +import org.checkerframework.checker.nullness.qual.NonNull; /** * A functional {@link CommandPermission} implementation 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 b315452a..be3c372a 100644 --- a/cloud-core/src/main/java/cloud/commandframework/permission/WrappingPredicatePermission.java +++ b/cloud-core/src/main/java/cloud/commandframework/permission/WrappingPredicatePermission.java @@ -24,9 +24,8 @@ package cloud.commandframework.permission; import cloud.commandframework.keys.CloudKey; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.function.Predicate; +import org.checkerframework.checker.nullness.qual.NonNull; final class WrappingPredicatePermission implements PredicatePermission { 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 c66c3703..ca57a2a6 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 @@ -23,9 +23,8 @@ // package cloud.commandframework.types.tuples; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Objects; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Immutable generic 2-tuple 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 9dd8b97a..f2215665 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 @@ -23,9 +23,8 @@ // package cloud.commandframework.types.tuples; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Objects; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Immutable generic 5-tuple 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 cb7b38a1..e000b4f4 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 @@ -23,9 +23,8 @@ // package cloud.commandframework.types.tuples; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Objects; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Immutable generic 5-tuple 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 3e539fab..b0b11dc6 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 @@ -23,9 +23,8 @@ // package cloud.commandframework.types.tuples; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Objects; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Immutable generic 6-tuple 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 20ac73d4..8397c515 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 @@ -23,9 +23,8 @@ // package cloud.commandframework.types.tuples; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Objects; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Immutable generic 3-tuple diff --git a/cloud-core/src/test/java/cloud/commandframework/AnnotationAccessorTest.java b/cloud-core/src/test/java/cloud/commandframework/AnnotationAccessorTest.java index 9aeddbea..a8ac4eda 100644 --- a/cloud-core/src/test/java/cloud/commandframework/AnnotationAccessorTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/AnnotationAccessorTest.java @@ -23,17 +23,16 @@ // package cloud.commandframework; -import static com.google.common.truth.Truth.assertThat; - import cloud.commandframework.annotations.AnnotationAccessor; -import org.junit.jupiter.api.Test; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.lang.reflect.Method; import java.lang.reflect.Parameter; +import org.junit.jupiter.api.Test; + +import static com.google.common.truth.Truth.assertThat; public class AnnotationAccessorTest { diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandHelpHandlerTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandHelpHandlerTest.java index 42f3aca3..a12f1847 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandHelpHandlerTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandHelpHandlerTest.java @@ -23,8 +23,6 @@ // package cloud.commandframework; -import static cloud.commandframework.util.TestUtils.createManager; - import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.arguments.StaticArgument; import cloud.commandframework.arguments.standard.IntegerArgument; @@ -32,16 +30,17 @@ import cloud.commandframework.arguments.standard.StringArgument; import cloud.commandframework.meta.CommandMeta; import cloud.commandframework.meta.SimpleCommandMeta; import cloud.commandframework.types.tuples.Pair; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; - import java.util.Arrays; import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.function.Predicate; import java.util.stream.Collectors; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import static cloud.commandframework.util.TestUtils.createManager; class CommandHelpHandlerTest { diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandPerformanceTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandPerformanceTest.java index 8ed724dd..d6095a8c 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandPerformanceTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandPerformanceTest.java @@ -23,10 +23,9 @@ // package cloud.commandframework; -import static cloud.commandframework.util.TestUtils.createManager; - import cloud.commandframework.context.CommandContext; import cloud.commandframework.execution.CommandResult; +import java.util.Collection; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -35,7 +34,7 @@ import org.openjdk.jmh.runner.Runner; import org.openjdk.jmh.runner.options.Options; import org.openjdk.jmh.runner.options.OptionsBuilder; -import java.util.Collection; +import static cloud.commandframework.util.TestUtils.createManager; final class CommandPerformanceTest { diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandPermissionTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandPermissionTest.java index 15fa82fd..f3afef2f 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandPermissionTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandPermissionTest.java @@ -23,8 +23,6 @@ // package cloud.commandframework; -import static com.google.common.truth.Truth.assertThat; - import cloud.commandframework.arguments.standard.IntegerArgument; import cloud.commandframework.execution.CommandExecutionCoordinator; import cloud.commandframework.keys.SimpleCloudKey; @@ -35,14 +33,14 @@ import cloud.commandframework.permission.CommandPermission; import cloud.commandframework.permission.OrPermission; import cloud.commandframework.permission.Permission; import cloud.commandframework.permission.PredicatePermission; +import java.util.Arrays; +import java.util.concurrent.CompletionException; +import java.util.concurrent.atomic.AtomicBoolean; import org.checkerframework.checker.nullness.qual.NonNull; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import java.util.Arrays; -import java.util.concurrent.CompletionException; -import java.util.concurrent.atomic.AtomicBoolean; - +import static com.google.common.truth.Truth.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandPostProcessorTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandPostProcessorTest.java index df4870d6..fa5e7b0e 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandPostProcessorTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandPostProcessorTest.java @@ -23,8 +23,6 @@ // package cloud.commandframework; -import static cloud.commandframework.util.TestUtils.createManager; - import cloud.commandframework.execution.postprocessor.CommandPostprocessingContext; import cloud.commandframework.execution.postprocessor.CommandPostprocessor; import cloud.commandframework.meta.SimpleCommandMeta; @@ -34,6 +32,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import static cloud.commandframework.util.TestUtils.createManager; + public class CommandPostProcessorTest { private static final boolean[] state = new boolean[]{false}; diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandPreProcessorTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandPreProcessorTest.java index bda9e24f..fe49060b 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandPreProcessorTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandPreProcessorTest.java @@ -23,8 +23,6 @@ // package cloud.commandframework; -import static cloud.commandframework.util.TestUtils.createManager; - import cloud.commandframework.arguments.standard.EnumArgument; import cloud.commandframework.execution.preprocessor.CommandPreprocessingContext; import cloud.commandframework.execution.preprocessor.CommandPreprocessor; @@ -35,6 +33,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import static cloud.commandframework.util.TestUtils.createManager; + public class CommandPreProcessorTest { private static CommandManager manager; diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandSuggestionsTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandSuggestionsTest.java index 60834bdc..5a0d09d8 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandSuggestionsTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandSuggestionsTest.java @@ -23,8 +23,6 @@ // package cloud.commandframework; -import static cloud.commandframework.util.TestUtils.createManager; - import cloud.commandframework.arguments.compound.ArgumentTriplet; import cloud.commandframework.arguments.standard.BooleanArgument; import cloud.commandframework.arguments.standard.EnumArgument; @@ -32,14 +30,14 @@ import cloud.commandframework.arguments.standard.IntegerArgument; import cloud.commandframework.arguments.standard.StringArgument; import cloud.commandframework.types.tuples.Pair; import cloud.commandframework.types.tuples.Triplet; - +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import static cloud.commandframework.util.TestUtils.createManager; public class CommandSuggestionsTest { diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandTest.java index 260b48a1..6e187c6f 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandTest.java @@ -23,14 +23,14 @@ // package cloud.commandframework; -import static com.google.common.truth.Truth.assertThat; - import cloud.commandframework.arguments.StaticArgument; import cloud.commandframework.arguments.standard.StringArgument; import cloud.commandframework.meta.SimpleCommandMeta; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import static com.google.common.truth.Truth.assertThat; + class CommandTest { @Test() diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandTreeTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandTreeTest.java index 0815fc86..15bb7363 100644 --- a/cloud-core/src/test/java/cloud/commandframework/CommandTreeTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/CommandTreeTest.java @@ -23,8 +23,6 @@ // package cloud.commandframework; -import static cloud.commandframework.util.TestUtils.createManager; - import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.arguments.compound.ArgumentPair; import cloud.commandframework.arguments.flags.CommandFlag; @@ -39,16 +37,16 @@ import cloud.commandframework.exceptions.NoPermissionException; import cloud.commandframework.meta.SimpleCommandMeta; import cloud.commandframework.types.tuples.Pair; import io.leangen.geantyref.TypeToken; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; - import java.util.Arrays; import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.concurrent.CompletionException; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import static cloud.commandframework.util.TestUtils.createManager; class CommandTreeTest { diff --git a/cloud-core/src/test/java/cloud/commandframework/ExecutionBenchmark.java b/cloud-core/src/test/java/cloud/commandframework/ExecutionBenchmark.java index a3465b36..48617e61 100644 --- a/cloud-core/src/test/java/cloud/commandframework/ExecutionBenchmark.java +++ b/cloud-core/src/test/java/cloud/commandframework/ExecutionBenchmark.java @@ -23,8 +23,7 @@ // package cloud.commandframework; -import static cloud.commandframework.util.TestUtils.createManager; - +import java.util.concurrent.TimeUnit; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -36,7 +35,7 @@ import org.openjdk.jmh.annotations.Setup; import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.TearDown; -import java.util.concurrent.TimeUnit; +import static cloud.commandframework.util.TestUtils.createManager; @State(Scope.Thread) @OutputTimeUnit(TimeUnit.NANOSECONDS) diff --git a/cloud-core/src/test/java/cloud/commandframework/ParameterInjectorRegistryTest.java b/cloud-core/src/test/java/cloud/commandframework/ParameterInjectorRegistryTest.java index e0ca1561..66348601 100644 --- a/cloud-core/src/test/java/cloud/commandframework/ParameterInjectorRegistryTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/ParameterInjectorRegistryTest.java @@ -23,10 +23,6 @@ // package cloud.commandframework; -import static com.google.common.truth.Truth8.assertThat; - -import static cloud.commandframework.util.TestUtils.createManager; - import cloud.commandframework.annotations.AnnotationAccessor; import cloud.commandframework.annotations.injection.GuiceInjectionService; import cloud.commandframework.annotations.injection.ParameterInjectorRegistry; @@ -37,10 +33,12 @@ import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; import org.checkerframework.checker.nullness.qual.NonNull; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import static cloud.commandframework.util.TestUtils.createManager; +import static com.google.common.truth.Truth8.assertThat; + public class ParameterInjectorRegistryTest { private static final int INJECTED_INTEGER = 5; diff --git a/cloud-core/src/test/java/cloud/commandframework/ParserRegistryTest.java b/cloud-core/src/test/java/cloud/commandframework/ParserRegistryTest.java index af16909d..9d9c41ff 100644 --- a/cloud-core/src/test/java/cloud/commandframework/ParserRegistryTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/ParserRegistryTest.java @@ -23,9 +23,6 @@ // package cloud.commandframework; -import static com.google.common.truth.Truth.assertThat; -import static com.google.common.truth.Truth8.assertThat; - import cloud.commandframework.annotations.specifier.Range; import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.arguments.parser.ParserParameters; @@ -34,15 +31,15 @@ import cloud.commandframework.arguments.parser.StandardParameters; import cloud.commandframework.arguments.parser.StandardParserRegistry; import cloud.commandframework.arguments.standard.IntegerArgument; import io.leangen.geantyref.TypeToken; - -import java.util.Optional; - -import org.checkerframework.checker.nullness.qual.NonNull; -import org.junit.jupiter.api.Test; - import java.lang.annotation.Annotation; import java.util.Collections; import java.util.Objects; +import java.util.Optional; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.junit.jupiter.api.Test; + +import static com.google.common.truth.Truth.assertThat; +import static com.google.common.truth.Truth8.assertThat; public class ParserRegistryTest { 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 e7fcbbe0..03d65338 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 @@ -23,17 +23,16 @@ // package cloud.commandframework.arguments.standard; -import static com.google.common.truth.Truth.assertThat; -import static cloud.commandframework.util.TestUtils.createManager; - import cloud.commandframework.CommandManager; import cloud.commandframework.TestCommandSender; +import java.util.concurrent.CompletionException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import java.util.concurrent.CompletionException; +import static cloud.commandframework.util.TestUtils.createManager; +import static com.google.common.truth.Truth.assertThat; class StringArgumentTest { 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 e59f6e28..54b7ea04 100644 --- a/cloud-core/src/test/java/cloud/commandframework/util/TestUtils.java +++ b/cloud-core/src/test/java/cloud/commandframework/util/TestUtils.java @@ -23,25 +23,23 @@ // package cloud.commandframework.util; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import static org.mockito.Mockito.withSettings; - import cloud.commandframework.CommandManager; import cloud.commandframework.CommandTree; import cloud.commandframework.TestCommandSender; import cloud.commandframework.execution.CommandExecutionCoordinator; import cloud.commandframework.internal.CommandRegistrationHandler; import cloud.commandframework.meta.SimpleCommandMeta; - import java.util.function.Function; - import org.checkerframework.checker.nullness.qual.NonNull; import org.mockito.Mockito; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; +import static org.mockito.Mockito.withSettings; + public final class TestUtils { /** 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 4d5624b6..d51aeb9d 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 @@ -34,13 +34,12 @@ import cloud.commandframework.exceptions.NoSuchCommandException; import cloud.commandframework.javacord.sender.JavacordCommandSender; import cloud.commandframework.javacord.sender.JavacordPrivateSender; import cloud.commandframework.javacord.sender.JavacordServerSender; +import java.util.concurrent.CompletionException; import org.checkerframework.checker.nullness.qual.NonNull; import org.javacord.api.entity.message.MessageAuthor; import org.javacord.api.event.message.MessageCreateEvent; import org.javacord.api.listener.message.MessageCreateListener; -import java.util.concurrent.CompletionException; - public class JavacordCommand implements MessageCreateListener { private static final String MESSAGE_INTERNAL_ERROR = "An internal error occurred while attempting to perform this command."; 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 197375b3..5257f0ee 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 @@ -29,16 +29,15 @@ import cloud.commandframework.execution.CommandExecutionCoordinator; import cloud.commandframework.javacord.sender.JavacordCommandSender; import cloud.commandframework.javacord.sender.JavacordServerSender; import cloud.commandframework.meta.SimpleCommandMeta; +import java.util.Optional; +import java.util.function.BiFunction; +import java.util.function.Function; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import org.javacord.api.DiscordApi; import org.javacord.api.entity.permission.PermissionType; import org.javacord.api.entity.user.User; -import java.util.Optional; -import java.util.function.BiFunction; -import java.util.function.Function; - public class JavacordCommandManager extends CommandManager { private final DiscordApi discordApi; diff --git a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordRegistrationHandler.java b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordRegistrationHandler.java index ab371e0d..9e2a0bf7 100644 --- a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordRegistrationHandler.java +++ b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordRegistrationHandler.java @@ -26,10 +26,9 @@ package cloud.commandframework.javacord; import cloud.commandframework.Command; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.internal.CommandRegistrationHandler; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.HashMap; import java.util.Map; +import org.checkerframework.checker.nullness.qual.NonNull; final class JavacordRegistrationHandler implements CommandRegistrationHandler { 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 cb370740..57e9d18f 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 @@ -23,6 +23,7 @@ // package cloud.commandframework.javacord.sender; +import java.util.concurrent.CompletableFuture; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import org.javacord.api.entity.channel.TextChannel; @@ -30,8 +31,6 @@ import org.javacord.api.entity.message.Message; import org.javacord.api.entity.message.MessageAuthor; import org.javacord.api.event.message.MessageCreateEvent; -import java.util.concurrent.CompletableFuture; - public class JavacordCommandSender { private final MessageCreateEvent event; 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 730b940a..76443213 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 @@ -25,13 +25,12 @@ package cloud.commandframework.jda; import cloud.commandframework.CommandTree; import cloud.commandframework.execution.CommandExecutionCoordinator; +import java.util.function.BiFunction; +import java.util.function.Function; import net.dv8tion.jda.api.JDA; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.function.BiFunction; -import java.util.function.Function; - /** * Command manager for use with JDA 4 * 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 c3d17c0c..227c4be9 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 @@ -33,6 +33,10 @@ import cloud.commandframework.jda.parsers.UserArgument; import cloud.commandframework.meta.CommandMeta; import cloud.commandframework.meta.SimpleCommandMeta; import io.leangen.geantyref.TypeToken; +import java.util.Arrays; +import java.util.HashSet; +import java.util.function.BiFunction; +import java.util.function.Function; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.MessageChannel; @@ -42,11 +46,6 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.Arrays; -import java.util.HashSet; -import java.util.function.BiFunction; -import java.util.function.Function; - /** * Command manager for use with JDA * 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 71ee756b..20ccdb55 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 @@ -23,6 +23,8 @@ // package cloud.commandframework.jda; +import java.util.Objects; +import java.util.Optional; import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.entities.MessageChannel; import net.dv8tion.jda.api.entities.User; @@ -30,9 +32,6 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.Objects; -import java.util.Optional; - /** * Wrapper for {@link MessageReceivedEvent} */ 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 45e8f2dc..d29d57fb 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 @@ -29,6 +29,11 @@ import cloud.commandframework.arguments.parser.ArgumentParseResult; import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; +import java.util.HashSet; +import java.util.List; +import java.util.Queue; +import java.util.Set; +import java.util.function.BiFunction; import net.dv8tion.jda.api.entities.MessageChannel; import net.dv8tion.jda.api.entities.TextChannel; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; @@ -36,12 +41,6 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import org.jetbrains.annotations.NotNull; -import java.util.HashSet; -import java.util.List; -import java.util.Queue; -import java.util.Set; -import java.util.function.BiFunction; - /** * Command Argument for {@link MessageChannel} * 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 d072d922..87635897 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 @@ -29,17 +29,16 @@ import cloud.commandframework.arguments.parser.ArgumentParseResult; import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; -import net.dv8tion.jda.api.entities.Role; -import net.dv8tion.jda.api.events.message.MessageReceivedEvent; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; -import org.jetbrains.annotations.NotNull; - import java.util.HashSet; import java.util.List; import java.util.Queue; import java.util.Set; import java.util.function.BiFunction; +import net.dv8tion.jda.api.entities.Role; +import net.dv8tion.jda.api.events.message.MessageReceivedEvent; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; /** * Command Argument for {@link net.dv8tion.jda.api.entities.Role} 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 c2834407..9c8fcad0 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 @@ -29,13 +29,6 @@ import cloud.commandframework.arguments.parser.ArgumentParseResult; import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; -import net.dv8tion.jda.api.entities.Member; -import net.dv8tion.jda.api.entities.User; -import net.dv8tion.jda.api.events.message.MessageReceivedEvent; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; -import org.jetbrains.annotations.NotNull; - import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -43,6 +36,12 @@ import java.util.Queue; import java.util.Set; import java.util.function.BiFunction; import java.util.stream.Collectors; +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.User; +import net.dv8tion.jda.api.events.message.MessageReceivedEvent; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; /** * Command Argument for {@link User} 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 dae5eb64..1022d655 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 @@ -33,13 +33,12 @@ import cloud.commandframework.internal.CommandRegistrationHandler; import cloud.commandframework.meta.CommandMeta; import cloud.commandframework.pircbotx.arguments.UserArgument; import io.leangen.geantyref.TypeToken; +import java.util.function.BiFunction; +import java.util.function.Function; import org.checkerframework.checker.nullness.qual.NonNull; import org.pircbotx.PircBotX; import org.pircbotx.User; -import java.util.function.BiFunction; -import java.util.function.Function; - /** * Command manager implementation for PircBotX 2.0 * 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 12648258..5091004d 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 @@ -33,14 +33,14 @@ import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.ParserException; import cloud.commandframework.pircbotx.PircBotXCommandManager; import io.leangen.geantyref.TypeToken; +import java.util.List; +import java.util.Queue; +import java.util.function.BiFunction; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import org.pircbotx.PircBotX; import org.pircbotx.User; import org.pircbotx.exception.DaoException; -import java.util.List; -import java.util.Queue; -import java.util.function.BiFunction; /** * {@link CommandArgument Command argument} that parses PircBotX {@link User users} 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 d978bffa..b384b1af 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 @@ -26,11 +26,10 @@ package cloud.commandframework.brigadier; import cloud.commandframework.arguments.parser.ArgumentParser; import com.mojang.brigadier.arguments.ArgumentType; import com.mojang.brigadier.suggestion.SuggestionProvider; +import java.util.function.Function; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.function.Function; - import static java.util.Objects.requireNonNull; final class BrigadierMapping, S> { 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 d0387bf4..feec2244 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 @@ -26,11 +26,10 @@ package cloud.commandframework.brigadier; import cloud.commandframework.arguments.parser.ArgumentParser; import com.mojang.brigadier.arguments.ArgumentType; import com.mojang.brigadier.suggestion.SuggestionProvider; +import java.util.function.Function; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.function.Function; - import static java.util.Objects.requireNonNull; /** 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 8dcf0229..bf529ee9 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 @@ -63,9 +63,6 @@ import com.mojang.brigadier.suggestion.SuggestionsBuilder; import com.mojang.brigadier.tree.LiteralCommandNode; import io.leangen.geantyref.GenericTypeReflector; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -78,6 +75,8 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Manager used to map cloud {@link Command} 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 3904a970..9c84fc48 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 @@ -24,7 +24,6 @@ package cloud.commandframework.brigadier.argument; import com.mojang.brigadier.StringReader; - import java.util.Deque; import java.util.Queue; 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 edfc89f5..e7774017 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 @@ -24,14 +24,13 @@ package cloud.commandframework.brigadier.argument; import com.mojang.brigadier.StringReader; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Iterator; import java.util.NoSuchElementException; import java.util.Queue; +import org.checkerframework.checker.nullness.qual.NonNull; /** * An interface combining {@link Queue} behaviour with a Brigadier {@link StringReader}. 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 a3f5ab48..2bb1d1f4 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 @@ -24,10 +24,9 @@ package cloud.commandframework.brigadier.argument; import com.mojang.brigadier.StringReader; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.Objects; import java.util.Queue; +import org.checkerframework.checker.nullness.qual.Nullable; /** * A wrapper around Mojang's {@link StringReader} that implements the {@link Queue} interface. 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 c7e9ece7..4107b4ce 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 @@ -33,13 +33,12 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.suggestion.Suggestion; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Queue; import java.util.concurrent.CompletableFuture; +import org.checkerframework.checker.nullness.qual.NonNull; import static java.util.Objects.requireNonNull; 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 b8a7e801..08c26ae1 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 @@ -24,11 +24,10 @@ package cloud.commandframework.brigadier.argument; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import org.junit.jupiter.api.Test; - import java.util.Arrays; import java.util.LinkedList; import java.util.Queue; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; 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 cce5ec25..26c0aec5 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 @@ -25,12 +25,11 @@ package cloud.commandframework.brigadier.argument; import cloud.commandframework.types.tuples.Pair; import com.mojang.brigadier.StringReader; -import org.junit.jupiter.api.Test; - import java.util.Iterator; import java.util.NoSuchElementException; import java.util.Queue; import java.util.stream.Stream; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; 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 5e359383..a1097b9e 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 @@ -41,12 +41,11 @@ import com.mojang.brigadier.arguments.ArgumentType; import com.mojang.brigadier.arguments.StringArgumentType; import io.leangen.geantyref.GenericTypeReflector; import io.leangen.geantyref.TypeToken; -import org.bukkit.NamespacedKey; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.reflect.Constructor; import java.util.function.Supplier; import java.util.logging.Level; +import org.bukkit.NamespacedKey; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Class which handles mapping argument types to their NMS Brigadier counterpart on Bukkit platforms. 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 220d1e61..958a9c5b 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 @@ -24,11 +24,10 @@ package cloud.commandframework.bukkit; import cloud.commandframework.captions.Caption; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Collection; import java.util.Collections; import java.util.LinkedList; +import org.checkerframework.checker.nullness.qual.NonNull; /** * {@link Caption} instances for messages in cloud-bukkit diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommand.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommand.java index 2c7f0516..2b273608 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommand.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommand.java @@ -35,17 +35,16 @@ import cloud.commandframework.exceptions.NoSuchCommandException; import cloud.commandframework.meta.CommandMeta; import cloud.commandframework.permission.CommandPermission; import cloud.commandframework.permission.Permission; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.CompletionException; +import java.util.logging.Level; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.command.PluginIdentifiableCommand; import org.bukkit.plugin.Plugin; import org.checkerframework.checker.nullness.qual.NonNull; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.CompletionException; -import java.util.logging.Level; - final class BukkitCommand extends org.bukkit.command.Command implements PluginIdentifiableCommand { private static final String MESSAGE_INTERNAL_ERROR = ChatColor.RED 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 88471a97..2a1cdde6 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 @@ -26,9 +26,8 @@ package cloud.commandframework.bukkit; import cloud.commandframework.keys.CloudKey; import cloud.commandframework.keys.SimpleCloudKey; import io.leangen.geantyref.TypeToken; -import org.bukkit.command.CommandSender; - import java.util.Set; +import org.bukkit.command.CommandSender; /** * Bukkit related {@link cloud.commandframework.context.CommandContext} keys. 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 fb10eff4..8d82b9a4 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 @@ -51,6 +51,10 @@ import cloud.commandframework.execution.CommandExecutionCoordinator; import cloud.commandframework.tasks.TaskFactory; import cloud.commandframework.tasks.TaskRecipe; import io.leangen.geantyref.TypeToken; +import java.lang.reflect.Method; +import java.util.Set; +import java.util.function.Function; +import java.util.function.UnaryOperator; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.OfflinePlayer; @@ -62,11 +66,6 @@ import org.bukkit.plugin.Plugin; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.lang.reflect.Method; -import java.util.Set; -import java.util.function.Function; -import java.util.function.UnaryOperator; - /** * Command manager for the Bukkit platform * 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 eb3c5e32..0b312513 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 @@ -27,11 +27,10 @@ import cloud.commandframework.brigadier.argument.WrappedBrigadierParser; import cloud.commandframework.bukkit.internal.BukkitBackwardsBrigadierSenderMapper; import cloud.commandframework.execution.preprocessor.CommandPreprocessingContext; import cloud.commandframework.execution.preprocessor.CommandPreprocessor; +import java.util.Set; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.Set; - /** * Command preprocessor which decorates incoming {@link cloud.commandframework.context.CommandContext} * with Bukkit specific objects 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 4c65f531..e38ac3c9 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 @@ -28,13 +28,6 @@ import cloud.commandframework.CommandManager; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.arguments.StaticArgument; import cloud.commandframework.internal.CommandRegistrationHandler; -import org.bukkit.Bukkit; -import org.bukkit.command.CommandMap; -import org.bukkit.command.PluginIdentifiableCommand; -import org.bukkit.command.SimpleCommandMap; -import org.bukkit.help.GenericCommandHelpTopic; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; @@ -44,6 +37,12 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeSet; +import org.bukkit.Bukkit; +import org.bukkit.command.CommandMap; +import org.bukkit.command.PluginIdentifiableCommand; +import org.bukkit.command.SimpleCommandMap; +import org.bukkit.help.GenericCommandHelpTopic; +import org.checkerframework.checker.nullness.qual.NonNull; public class BukkitPluginRegistrationHandler implements CommandRegistrationHandler { 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 86b8c36c..bc79ebf3 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 @@ -26,11 +26,10 @@ package cloud.commandframework.bukkit; import cloud.commandframework.tasks.TaskConsumer; import cloud.commandframework.tasks.TaskFunction; import cloud.commandframework.tasks.TaskSynchronizer; +import java.util.concurrent.CompletableFuture; import org.bukkit.plugin.Plugin; import org.checkerframework.checker.nullness.qual.NonNull; -import java.util.concurrent.CompletableFuture; - /** * {@link TaskSynchronizer} using Bukkit's {@link org.bukkit.scheduler.BukkitScheduler} */ 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 97d4468b..5dc7cb9e 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 @@ -24,7 +24,6 @@ package cloud.commandframework.bukkit; import cloud.commandframework.bukkit.internal.CraftBukkitReflection; - import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; 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 ca181b74..cbf59b90 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 @@ -29,6 +29,7 @@ import cloud.commandframework.bukkit.internal.BukkitBackwardsBrigadierSenderMapp import cloud.commandframework.context.CommandContext; import com.mojang.brigadier.tree.CommandNode; import com.mojang.brigadier.tree.LiteralCommandNode; +import java.util.Collections; import me.lucko.commodore.Commodore; import me.lucko.commodore.CommodoreProvider; import org.bukkit.Bukkit; @@ -36,8 +37,6 @@ import org.bukkit.command.CommandSender; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.Collections; - @SuppressWarnings({"unchecked", "rawtypes"}) class CloudCommodoreManager extends BukkitPluginRegistrationHandler { diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/EntitySelector.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/EntitySelector.java index 3c2490a0..7a26bc17 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/EntitySelector.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/EntitySelector.java @@ -23,11 +23,10 @@ // package cloud.commandframework.bukkit.arguments.selector; -import org.bukkit.entity.Entity; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Collections; import java.util.List; +import org.bukkit.entity.Entity; +import org.checkerframework.checker.nullness.qual.NonNull; /** * A class to represent the result of parsing a Minecraft Entity/Target Selector argument diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/MultipleEntitySelector.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/MultipleEntitySelector.java index e6df9143..047bd05c 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/MultipleEntitySelector.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/MultipleEntitySelector.java @@ -23,11 +23,10 @@ // package cloud.commandframework.bukkit.arguments.selector; +import java.util.List; import org.bukkit.entity.Entity; import org.checkerframework.checker.nullness.qual.NonNull; -import java.util.List; - public class MultipleEntitySelector extends EntitySelector { /** diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/MultiplePlayerSelector.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/MultiplePlayerSelector.java index b5fbbc30..be96b0da 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/MultiplePlayerSelector.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/arguments/selector/MultiplePlayerSelector.java @@ -23,15 +23,14 @@ // package cloud.commandframework.bukkit.arguments.selector; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.NonNull; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - public class MultiplePlayerSelector extends MultipleEntitySelector { private final List players = new ArrayList<>(); 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 9f6886da..7560cc1d 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 @@ -23,12 +23,11 @@ // package cloud.commandframework.bukkit.arguments.selector; +import java.util.List; import org.bukkit.entity.Entity; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.List; - public final class SingleEntitySelector extends MultipleEntitySelector { /** 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 5fdc0e90..2e58a46c 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 @@ -23,13 +23,12 @@ // package cloud.commandframework.bukkit.arguments.selector; +import java.util.List; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.List; - public final class SinglePlayerSelector extends MultiplePlayerSelector { /** 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 76fc410e..9e3f5080 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 @@ -23,12 +23,11 @@ // package cloud.commandframework.bukkit.data; +import java.util.function.Predicate; import org.bukkit.World; import org.bukkit.block.Block; import org.checkerframework.checker.nullness.qual.NonNull; -import java.util.function.Predicate; - /** * A {@link Predicate} for {@link Block Blocks} in a {@link World}, parsed from user input. * diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/data/ItemStackPredicate.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/data/ItemStackPredicate.java index c1d6a9b3..ffc26e13 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/data/ItemStackPredicate.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/data/ItemStackPredicate.java @@ -23,9 +23,8 @@ // package cloud.commandframework.bukkit.data; -import org.bukkit.inventory.ItemStack; - import java.util.function.Predicate; +import org.bukkit.inventory.ItemStack; /** * {@link Predicate} for {@link ItemStack ItemStacks}, parsed from user input. 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 f67a36de..d34b9e9c 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 @@ -25,11 +25,10 @@ package cloud.commandframework.bukkit.internal; import cloud.commandframework.bukkit.BukkitCommandManager; import com.google.common.annotations.Beta; -import org.bukkit.command.CommandSender; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.reflect.Method; import java.util.function.Function; +import org.bukkit.command.CommandSender; +import org.checkerframework.checker.nullness.qual.NonNull; /** * This is not API, and as such, may break, change, or be removed without any notice. 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 4c5cff60..d76d9d13 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 @@ -24,16 +24,15 @@ package cloud.commandframework.bukkit.internal; import com.google.common.annotations.Beta; -import org.bukkit.Bukkit; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.Arrays; import java.util.function.Supplier; import java.util.stream.Stream; +import org.bukkit.Bukkit; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Utilities for doing reflection on CraftBukkit, used by the cloud implementation. 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 c17946f9..61e86fc7 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 @@ -49,13 +49,12 @@ package cloud.commandframework.bukkit.internal; import com.google.common.annotations.Beta; import com.mojang.brigadier.arguments.ArgumentType; -import org.bukkit.NamespacedKey; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.Arrays; +import org.bukkit.NamespacedKey; +import org.checkerframework.checker.nullness.qual.NonNull; /** * A registry of the {@link ArgumentType}s provided by Minecraft. 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 92b47fe1..6bd90ce6 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 @@ -35,17 +35,16 @@ import cloud.commandframework.bukkit.internal.MinecraftArgumentTypes; import cloud.commandframework.context.CommandContext; import com.mojang.brigadier.arguments.ArgumentType; import io.leangen.geantyref.TypeToken; -import org.bukkit.NamespacedKey; -import org.bukkit.block.Block; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.util.List; import java.util.Queue; import java.util.function.BiFunction; import java.util.function.Predicate; +import org.bukkit.NamespacedKey; +import org.bukkit.block.Block; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Argument type for parsing a {@link BlockPredicate}. 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 6c4db1e5..715d5cbd 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 @@ -32,15 +32,14 @@ import cloud.commandframework.captions.CaptionVariable; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.ParserException; -import org.bukkit.NamespacedKey; -import org.bukkit.enchantments.Enchantment; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.ArrayList; import java.util.List; import java.util.Queue; import java.util.function.BiFunction; +import org.bukkit.NamespacedKey; +import org.bukkit.enchantments.Enchantment; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * cloud argument type that parses Bukkit {@link Enchantment enchantments} 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 9e84c6ce..cf3bdb3f 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 @@ -35,12 +35,6 @@ import cloud.commandframework.bukkit.internal.MinecraftArgumentTypes; import cloud.commandframework.context.CommandContext; import com.mojang.brigadier.arguments.ArgumentType; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import org.bukkit.Material; -import org.bukkit.NamespacedKey; -import org.bukkit.inventory.ItemStack; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -50,6 +44,11 @@ import java.util.Locale; import java.util.Queue; import java.util.function.BiFunction; import java.util.stream.Collectors; +import org.bukkit.Material; +import org.bukkit.NamespacedKey; +import org.bukkit.inventory.ItemStack; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; import static java.util.Objects.requireNonNull; diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/ItemStackPredicateArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/ItemStackPredicateArgument.java index 162043d2..c94b4c0e 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/ItemStackPredicateArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/ItemStackPredicateArgument.java @@ -36,17 +36,16 @@ import cloud.commandframework.context.CommandContext; import com.mojang.brigadier.arguments.ArgumentType; import com.mojang.brigadier.context.StringRange; import io.leangen.geantyref.TypeToken; -import org.bukkit.NamespacedKey; -import org.bukkit.inventory.ItemStack; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.lang.reflect.Method; import java.util.Collections; import java.util.List; import java.util.Queue; import java.util.function.BiFunction; import java.util.function.Predicate; +import org.bukkit.NamespacedKey; +import org.bukkit.inventory.ItemStack; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Argument type for parsing an {@link ItemStackPredicate}. 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 ddf4be92..29e94cba 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 @@ -32,14 +32,13 @@ import cloud.commandframework.captions.CaptionVariable; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.ParserException; -import org.bukkit.Material; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.ArrayList; import java.util.List; import java.util.Queue; import java.util.function.BiFunction; +import org.bukkit.Material; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * cloud argument type that parses Bukkit {@link Material materials} 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 59f782da..0c9b9318 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 @@ -33,6 +33,10 @@ import cloud.commandframework.captions.CaptionVariable; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.ParserException; +import java.util.ArrayList; +import java.util.List; +import java.util.Queue; +import java.util.function.BiFunction; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; @@ -40,11 +44,6 @@ import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.ArrayList; -import java.util.List; -import java.util.Queue; -import java.util.function.BiFunction; - /** * Argument type that parses into {@link OfflinePlayer}. This is not thread safe. This * may also result in a blocking request to get the UUID for the offline player. diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/PlayerArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/PlayerArgument.java index fe78755a..afbd813b 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/PlayerArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/PlayerArgument.java @@ -33,17 +33,16 @@ import cloud.commandframework.captions.CaptionVariable; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.ParserException; +import java.util.ArrayList; +import java.util.List; +import java.util.Queue; +import java.util.function.BiFunction; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.ArrayList; -import java.util.List; -import java.util.Queue; -import java.util.function.BiFunction; - /** * Argument that parses into a {@link Player} * 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 3437eff9..5ace1445 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 @@ -32,15 +32,14 @@ import cloud.commandframework.captions.CaptionVariable; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.ParserException; -import org.bukkit.Bukkit; -import org.bukkit.World; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.List; import java.util.Queue; import java.util.function.BiFunction; import java.util.stream.Collectors; +import org.bukkit.Bukkit; +import org.bukkit.World; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * cloud argument type that parses Bukkit {@link org.bukkit.World worlds} 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 4969f38b..f6185378 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 @@ -31,6 +31,11 @@ import cloud.commandframework.bukkit.BukkitCommandContextKeys; import cloud.commandframework.bukkit.parsers.location.LocationArgument.LocationParseException; import cloud.commandframework.context.CommandContext; import io.leangen.geantyref.TypeToken; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; +import java.util.Queue; +import java.util.function.BiFunction; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.command.BlockCommandSender; @@ -40,12 +45,6 @@ import org.bukkit.util.Vector; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; -import java.util.Queue; -import java.util.function.BiFunction; - /** * Argument parser that parses {@link Location2D} from two doubles. This will use the command * senders world when it exists, or else it'll use the first loaded Bukkit world 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 b9fe9da7..339b6b27 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 @@ -35,6 +35,12 @@ import cloud.commandframework.captions.CaptionVariable; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.ParserException; import io.leangen.geantyref.TypeToken; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; +import java.util.Queue; +import java.util.function.BiFunction; +import java.util.stream.Collectors; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.command.BlockCommandSender; @@ -44,13 +50,6 @@ import org.bukkit.util.Vector; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; -import java.util.Queue; -import java.util.function.BiFunction; -import java.util.stream.Collectors; - /** * Argument parser that parses {@link Location} from three doubles. This will use the command * senders world when it exists, or else it'll use the first loaded Bukkit world 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 f5de70ea..cc95e89c 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 @@ -23,9 +23,8 @@ // package cloud.commandframework.bukkit.parsers.location; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Objects; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Single coordinate with a type 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 c4618e65..663299cf 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 @@ -29,9 +29,8 @@ import cloud.commandframework.arguments.standard.DoubleArgument; import cloud.commandframework.bukkit.parsers.PlayerArgument; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Queue; +import org.checkerframework.checker.nullness.qual.NonNull; /** * A single coordinate, meant to be used as an element in a position vector diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultipleEntitySelectorArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultipleEntitySelectorArgument.java index 37b0e46d..69fd7888 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultipleEntitySelectorArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultipleEntitySelectorArgument.java @@ -32,15 +32,14 @@ import cloud.commandframework.bukkit.CloudBukkitCapabilities; import cloud.commandframework.bukkit.arguments.selector.MultipleEntitySelector; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; +import java.util.List; +import java.util.Queue; +import java.util.function.BiFunction; import org.bukkit.Bukkit; import org.bukkit.entity.Entity; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.List; -import java.util.Queue; -import java.util.function.BiFunction; - public final class MultipleEntitySelectorArgument extends CommandArgument { private MultipleEntitySelectorArgument( diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultiplePlayerSelectorArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultiplePlayerSelectorArgument.java index 857e4d48..cbf1fbaf 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultiplePlayerSelectorArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultiplePlayerSelectorArgument.java @@ -34,6 +34,10 @@ import cloud.commandframework.bukkit.parsers.PlayerArgument; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import com.google.common.collect.ImmutableList; +import java.util.ArrayList; +import java.util.List; +import java.util.Queue; +import java.util.function.BiFunction; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Entity; @@ -41,11 +45,6 @@ import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.ArrayList; -import java.util.List; -import java.util.Queue; -import java.util.function.BiFunction; - public final class MultiplePlayerSelectorArgument extends CommandArgument { private MultiplePlayerSelectorArgument( diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SingleEntitySelectorArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SingleEntitySelectorArgument.java index 4f88a4a0..b5ca5086 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SingleEntitySelectorArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SingleEntitySelectorArgument.java @@ -32,15 +32,14 @@ import cloud.commandframework.bukkit.CloudBukkitCapabilities; import cloud.commandframework.bukkit.arguments.selector.SingleEntitySelector; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; +import java.util.List; +import java.util.Queue; +import java.util.function.BiFunction; import org.bukkit.Bukkit; import org.bukkit.entity.Entity; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.List; -import java.util.Queue; -import java.util.function.BiFunction; - public final class SingleEntitySelectorArgument extends CommandArgument { private SingleEntitySelectorArgument( diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SinglePlayerSelectorArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SinglePlayerSelectorArgument.java index d94f8e9f..1fc41ec0 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SinglePlayerSelectorArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SinglePlayerSelectorArgument.java @@ -34,6 +34,10 @@ import cloud.commandframework.bukkit.parsers.PlayerArgument; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import com.google.common.collect.ImmutableList; +import java.util.ArrayList; +import java.util.List; +import java.util.Queue; +import java.util.function.BiFunction; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Entity; @@ -41,11 +45,6 @@ import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.ArrayList; -import java.util.List; -import java.util.Queue; -import java.util.function.BiFunction; - public final class SinglePlayerSelectorArgument extends CommandArgument { private SinglePlayerSelectorArgument( diff --git a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCaptionKeys.java b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCaptionKeys.java index 33bb3a45..4bcebdb7 100644 --- a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCaptionKeys.java +++ b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCaptionKeys.java @@ -24,11 +24,10 @@ package cloud.commandframework.bungee; import cloud.commandframework.captions.Caption; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Collection; import java.util.Collections; import java.util.LinkedList; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Bungee specific {@link Caption caption keys} 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 60b8896a..971e8c8c 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 @@ -31,6 +31,8 @@ import cloud.commandframework.exceptions.InvalidCommandSenderException; import cloud.commandframework.exceptions.InvalidSyntaxException; import cloud.commandframework.exceptions.NoPermissionException; import cloud.commandframework.exceptions.NoSuchCommandException; +import java.util.concurrent.CompletionException; +import java.util.logging.Level; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.chat.ComponentBuilder; @@ -38,9 +40,6 @@ import net.md_5.bungee.api.plugin.Command; import net.md_5.bungee.api.plugin.TabExecutor; import org.checkerframework.checker.nullness.qual.NonNull; -import java.util.concurrent.CompletionException; -import java.util.logging.Level; - public final class BungeeCommand extends Command implements TabExecutor { private static final String MESSAGE_INTERNAL_ERROR = "An internal error occurred while attempting to perform this command."; 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 f3f06284..67ede93f 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 @@ -31,14 +31,13 @@ import cloud.commandframework.captions.FactoryDelegatingCaptionRegistry; import cloud.commandframework.execution.CommandExecutionCoordinator; import cloud.commandframework.meta.SimpleCommandMeta; import io.leangen.geantyref.TypeToken; +import java.util.function.Function; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.plugin.Plugin; import org.checkerframework.checker.nullness.qual.NonNull; -import java.util.function.Function; - public class BungeeCommandManager extends CommandManager { /** 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 6d23c42a..be334289 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 @@ -26,10 +26,9 @@ package cloud.commandframework.bungee; import cloud.commandframework.Command; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.internal.CommandRegistrationHandler; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.HashMap; import java.util.Map; +import org.checkerframework.checker.nullness.qual.NonNull; final class BungeePluginRegistrationHandler implements CommandRegistrationHandler { 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 45d28cf4..53896fc5 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 @@ -33,17 +33,16 @@ import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.ParserException; import io.leangen.geantyref.TypeToken; -import net.md_5.bungee.api.ProxyServer; -import net.md_5.bungee.api.connection.ProxiedPlayer; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Queue; import java.util.function.BiFunction; import java.util.stream.Collectors; +import net.md_5.bungee.api.ProxyServer; +import net.md_5.bungee.api.connection.ProxiedPlayer; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Argument parser for {@link ProxiedPlayer players} 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 59a6b6da..c51dd7f1 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 @@ -33,17 +33,16 @@ import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.ParserException; import io.leangen.geantyref.TypeToken; -import net.md_5.bungee.api.ProxyServer; -import net.md_5.bungee.api.config.ServerInfo; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.ArrayList; import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Queue; import java.util.function.BiFunction; +import net.md_5.bungee.api.ProxyServer; +import net.md_5.bungee.api.config.ServerInfo; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Argument parser for {@link net.md_5.bungee.api.config.ServerInfo servers} 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 e504f9be..eef30b94 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 @@ -32,15 +32,14 @@ import cloud.commandframework.exceptions.InvalidSyntaxException; import cloud.commandframework.exceptions.NoPermissionException; import cloud.commandframework.exceptions.NoSuchCommandException; import cloud.commandframework.meta.CommandMeta; +import java.util.List; +import java.util.concurrent.CompletionException; import org.checkerframework.checker.nullness.qual.NonNull; import org.cloudburstmc.server.command.CommandSender; import org.cloudburstmc.server.command.PluginCommand; import org.cloudburstmc.server.command.data.CommandData; import org.cloudburstmc.server.plugin.Plugin; -import java.util.List; -import java.util.concurrent.CompletionException; - final class CloudburstCommand extends PluginCommand { private static final String MESSAGE_INTERNAL_ERROR = "An internal error occurred while attempting to perform this command."; 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 be10391a..dd9263e6 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 @@ -28,6 +28,7 @@ import cloud.commandframework.CommandTree; import cloud.commandframework.execution.CommandExecutionCoordinator; import cloud.commandframework.meta.CommandMeta; import cloud.commandframework.meta.SimpleCommandMeta; +import java.util.function.Function; import org.checkerframework.checker.nullness.qual.NonNull; import org.cloudburstmc.server.command.CommandSender; import org.cloudburstmc.server.event.EventPriority; @@ -35,8 +36,6 @@ import org.cloudburstmc.server.event.Listener; import org.cloudburstmc.server.event.server.RegistriesClosedEvent; import org.cloudburstmc.server.plugin.Plugin; -import java.util.function.Function; - /** * Command manager for the Cloudburst platform * 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 434e2bdb..19a695de 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 @@ -27,13 +27,12 @@ import cloud.commandframework.Command; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.arguments.StaticArgument; import cloud.commandframework.internal.CommandRegistrationHandler; +import java.util.HashMap; +import java.util.Map; import org.checkerframework.checker.nullness.qual.NonNull; import org.cloudburstmc.server.Server; import org.cloudburstmc.server.plugin.Plugin; -import java.util.HashMap; -import java.util.Map; - class CloudburstPluginRegistrationHandler implements CommandRegistrationHandler { private final Map, org.cloudburstmc.server.command.Command> registeredCommands = new HashMap<>(); 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 801ee8bc..93c008cb 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 @@ -24,11 +24,10 @@ package cloud.commandframework.fabric; import cloud.commandframework.captions.Caption; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Collection; import java.util.Collections; import java.util.HashSet; +import org.checkerframework.checker.nullness.qual.NonNull; /** * {@link Caption} instances for messages in cloud-fabric 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 87423ba9..16571c47 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 @@ -27,14 +27,13 @@ import cloud.commandframework.CommandTree; import cloud.commandframework.execution.AsynchronousCommandExecutionCoordinator; import cloud.commandframework.execution.CommandExecutionCoordinator; import cloud.commandframework.permission.PredicatePermission; +import java.util.function.Function; import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource; import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientSuggestionProvider; import org.checkerframework.checker.nullness.qual.NonNull; -import java.util.function.Function; - /** * A command manager for registering client-side commands. * diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCommandManager.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCommandManager.java index ef88d515..0876f134 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCommandManager.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCommandManager.java @@ -44,6 +44,16 @@ import com.mojang.brigadier.suggestion.SuggestionProvider; import com.mojang.serialization.Codec; import io.leangen.geantyref.GenericTypeReflector; import io.leangen.geantyref.TypeToken; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.lang.reflect.WildcardType; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.Set; +import java.util.function.Function; +import java.util.function.Supplier; import net.minecraft.ChatFormatting; import net.minecraft.advancements.critereon.MinMaxBounds; import net.minecraft.commands.SharedSuggestionProvider; @@ -82,17 +92,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.checkerframework.checker.nullness.qual.NonNull; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.lang.reflect.WildcardType; -import java.util.EnumSet; -import java.util.HashSet; -import java.util.Set; -import java.util.function.Function; -import java.util.function.Supplier; - /** * A command manager for either the server or client on Fabric. * 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 8ca06038..c1cb0b9b 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 @@ -31,6 +31,8 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.tree.CommandNode; import com.mojang.brigadier.tree.LiteralCommandNode; import com.mojang.brigadier.tree.RootCommandNode; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import net.fabricmc.fabric.api.client.command.v1.ClientCommandManager; import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource; import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback; @@ -40,9 +42,6 @@ import net.minecraft.commands.SharedSuggestionProvider; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.NonNull; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; - /** * A registration handler for Fabric API. * diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricExecutor.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricExecutor.java index 10edc946..9aba38ef 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricExecutor.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricExecutor.java @@ -32,6 +32,11 @@ import cloud.commandframework.exceptions.NoSuchCommandException; import com.mojang.brigadier.Command; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandSyntaxException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.concurrent.CompletionException; +import java.util.function.BiConsumer; +import java.util.function.Function; import net.minecraft.ChatFormatting; import net.minecraft.commands.SharedSuggestionProvider; import net.minecraft.network.chat.ClickEvent; @@ -44,12 +49,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.checkerframework.checker.nullness.qual.NonNull; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.concurrent.CompletionException; -import java.util.function.BiConsumer; -import java.util.function.Function; - final class FabricExecutor implements Command { private static final Logger LOGGER = LogManager.getLogger(); 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 cb5578e8..d2c874ba 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 @@ -38,6 +38,7 @@ import cloud.commandframework.fabric.data.SinglePlayerSelector; import cloud.commandframework.fabric.internal.LateRegistrationCatcher; import cloud.commandframework.meta.CommandMeta; import io.leangen.geantyref.TypeToken; +import java.util.function.Function; import me.lucko.fabric.api.permissions.v0.Permissions; import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback; import net.minecraft.commands.CommandSource; @@ -48,8 +49,6 @@ import net.minecraft.world.phys.Vec2; import net.minecraft.world.phys.Vec3; import org.checkerframework.checker.nullness.qual.NonNull; -import java.util.function.Function; - /** * A command manager for registering server-side commands. * diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/annotations/specifier/Center.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/annotations/specifier/Center.java index a1f830a5..f2e94e90 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/annotations/specifier/Center.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/annotations/specifier/Center.java @@ -25,7 +25,6 @@ package cloud.commandframework.fabric.annotations.specifier; import cloud.commandframework.fabric.argument.server.Vec2dArgument; import cloud.commandframework.fabric.argument.server.Vec3dArgument; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/AngleArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/AngleArgument.java index f922de7d..5c9243a4 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/AngleArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/AngleArgument.java @@ -27,11 +27,10 @@ import cloud.commandframework.ArgumentDescription; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.brigadier.argument.WrappedBrigadierParser; import cloud.commandframework.context.CommandContext; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.List; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * An argument for an angle, specified in degrees. 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 7932f1e0..8eb1b700 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 @@ -28,15 +28,14 @@ import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.brigadier.argument.WrappedBrigadierParser; import cloud.commandframework.context.CommandContext; import io.leangen.geantyref.TypeToken; -import net.minecraft.commands.arguments.coordinates.SwizzleArgument; -import net.minecraft.core.Direction; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.EnumSet; import java.util.List; import java.util.Set; import java.util.function.BiFunction; +import net.minecraft.commands.arguments.coordinates.SwizzleArgument; +import net.minecraft.core.Direction; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * An argument for a set of {@link net.minecraft.core.Direction.Axis axes}, described in Vanilla as a "swizzle". diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/CompoundTagArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/CompoundTagArgument.java index 9ea5c0ba..b94cceeb 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/CompoundTagArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/CompoundTagArgument.java @@ -27,13 +27,12 @@ import cloud.commandframework.ArgumentDescription; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.brigadier.argument.WrappedBrigadierParser; import cloud.commandframework.context.CommandContext; +import java.util.List; +import java.util.function.BiFunction; import net.minecraft.nbt.CompoundTag; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.List; -import java.util.function.BiFunction; - /** * An argument for the string representation of an NBT {@link CompoundTag}. * 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 71e78e54..0d6ab331 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 @@ -27,11 +27,10 @@ import cloud.commandframework.ArgumentDescription; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.brigadier.argument.WrappedBrigadierParser; import cloud.commandframework.context.CommandContext; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.List; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * An argument parsing an {@link net.minecraft.commands.arguments.EntityAnchorArgument.Anchor}. 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 07acde9c..b7095ce9 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 @@ -39,6 +39,10 @@ import cloud.commandframework.fabric.internal.EntitySelectorAccess; import cloud.commandframework.fabric.mixin.MessageArgumentMessageAccess; import cloud.commandframework.fabric.mixin.MessageArgumentPartAccess; import com.mojang.brigadier.exceptions.CommandSyntaxException; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.function.Function; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.SharedSuggestionProvider; import net.minecraft.commands.arguments.EntityArgument; @@ -56,11 +60,6 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.phys.Vec3; import org.checkerframework.checker.nullness.qual.NonNull; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.function.Function; - /** * Parsers for Vanilla command argument types. * 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 f88d1eac..00df362b 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 @@ -27,14 +27,13 @@ import cloud.commandframework.ArgumentDescription; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.brigadier.argument.WrappedBrigadierParser; import cloud.commandframework.context.CommandContext; +import java.util.List; +import java.util.function.BiFunction; import net.minecraft.advancements.critereon.MinMaxBounds; import net.minecraft.commands.arguments.RangeArgument; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.List; -import java.util.function.BiFunction; - /** * An argument parsing an unbounded {@link net.minecraft.advancements.critereon.MinMaxBounds.Floats float range}, in the form * {@code [min]..[max]}, where both lower and upper bounds are optional. diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/IntRangeArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/IntRangeArgument.java index 9169ba79..7a30867a 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/IntRangeArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/IntRangeArgument.java @@ -27,14 +27,13 @@ import cloud.commandframework.ArgumentDescription; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.brigadier.argument.WrappedBrigadierParser; import cloud.commandframework.context.CommandContext; +import java.util.List; +import java.util.function.BiFunction; import net.minecraft.advancements.critereon.MinMaxBounds; import net.minecraft.commands.arguments.RangeArgument; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.List; -import java.util.function.BiFunction; - /** * An argument parsing an unbounded {@link net.minecraft.advancements.critereon.MinMaxBounds.Ints integer range}, in the form * {@code [min]..[max]}, where both lower and upper bounds are optional. diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ItemInputArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ItemInputArgument.java index 85f4d65e..e0f1eb0b 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ItemInputArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ItemInputArgument.java @@ -27,6 +27,8 @@ import cloud.commandframework.ArgumentDescription; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.brigadier.argument.WrappedBrigadierParser; import cloud.commandframework.context.CommandContext; +import java.util.List; +import java.util.function.BiFunction; import net.minecraft.commands.arguments.item.ItemArgument; import net.minecraft.commands.arguments.item.ItemInput; import net.minecraft.core.Registry; @@ -34,9 +36,6 @@ import net.minecraft.world.item.ItemStack; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.List; -import java.util.function.BiFunction; - /** * An argument parsing an item identifier and optional extra NBT data into an {@link ItemInput}. * 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 e1444654..f5fe9c45 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 @@ -27,14 +27,13 @@ import cloud.commandframework.ArgumentDescription; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.brigadier.argument.WrappedBrigadierParser; import cloud.commandframework.context.CommandContext; +import java.util.List; +import java.util.function.BiFunction; import net.minecraft.core.Registry; import net.minecraft.world.effect.MobEffect; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.List; -import java.util.function.BiFunction; - /** * An argument parsing a status effect from the {@link net.minecraft.core.Registry#MOB_EFFECT status effect registry}. * 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 67e32f22..7fb4b34e 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 @@ -27,13 +27,12 @@ import cloud.commandframework.ArgumentDescription; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.brigadier.argument.WrappedBrigadierParser; import cloud.commandframework.context.CommandContext; +import java.util.List; +import java.util.function.BiFunction; import net.minecraft.ChatFormatting; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.List; -import java.util.function.BiFunction; - /** * An argument for named colors in the {@link ChatFormatting} enum. * diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/NbtPathArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/NbtPathArgument.java index e50c3b55..8e73be0e 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/NbtPathArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/NbtPathArgument.java @@ -27,11 +27,10 @@ import cloud.commandframework.ArgumentDescription; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.brigadier.argument.WrappedBrigadierParser; import cloud.commandframework.context.CommandContext; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.List; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * An argument for {@link net.minecraft.commands.arguments.NbtPathArgument.NbtPath NBT paths} to locations within 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 62ed8a8b..a943b4ed 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 @@ -27,13 +27,12 @@ import cloud.commandframework.ArgumentDescription; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.brigadier.argument.WrappedBrigadierParser; import cloud.commandframework.context.CommandContext; +import java.util.List; +import java.util.function.BiFunction; import net.minecraft.nbt.Tag; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.List; -import java.util.function.BiFunction; - /** * An argument for the string representation of an NBT {@link Tag}. * 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 5a08baa0..5fe9d126 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 @@ -27,13 +27,12 @@ import cloud.commandframework.ArgumentDescription; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.brigadier.argument.WrappedBrigadierParser; import cloud.commandframework.context.CommandContext; +import java.util.List; +import java.util.function.BiFunction; import net.minecraft.world.scores.criteria.ObjectiveCriteria; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.List; -import java.util.function.BiFunction; - /** * An argument for a {@linkplain ObjectiveCriteria criterion} in a scoreboard. * 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 ab78b566..27979394 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 @@ -27,13 +27,12 @@ import cloud.commandframework.ArgumentDescription; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.brigadier.argument.WrappedBrigadierParser; import cloud.commandframework.context.CommandContext; +import java.util.List; +import java.util.function.BiFunction; import net.minecraft.core.particles.ParticleOptions; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.List; -import java.util.function.BiFunction; - /** * An argument for any {@link net.minecraft.core.particles.ParticleOptions}. * 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 5bb68186..46c1dfd1 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 @@ -36,6 +36,11 @@ import cloud.commandframework.fabric.FabricCommandContextKeys; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; import io.leangen.geantyref.TypeToken; +import java.util.ArrayList; +import java.util.List; +import java.util.Queue; +import java.util.Set; +import java.util.function.BiFunction; import net.minecraft.commands.SharedSuggestionProvider; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; @@ -43,12 +48,6 @@ import net.minecraft.resources.ResourceLocation; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.ArrayList; -import java.util.List; -import java.util.Queue; -import java.util.Set; -import java.util.function.BiFunction; - import static java.util.Objects.requireNonNull; /** 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 93773e01..3c1862e1 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 @@ -27,13 +27,12 @@ import cloud.commandframework.ArgumentDescription; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.brigadier.argument.WrappedBrigadierParser; import cloud.commandframework.context.CommandContext; +import java.util.List; +import java.util.function.BiFunction; import net.minecraft.resources.ResourceLocation; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.List; -import java.util.function.BiFunction; - /** * An argument parsing a {@link ResourceLocation}. * 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 ef7c068a..839ae63f 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 @@ -27,14 +27,13 @@ import cloud.commandframework.ArgumentDescription; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.brigadier.argument.WrappedBrigadierParser; import cloud.commandframework.context.CommandContext; +import java.util.List; +import java.util.function.BiFunction; import net.minecraft.commands.arguments.OperationArgument; import net.minecraft.commands.arguments.OperationArgument.Operation; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.List; -import java.util.function.BiFunction; - /** * An argument for selecting any of the logical operations in {@link Operation}. * diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/SidedArgumentParser.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/SidedArgumentParser.java index e0a94368..2ec43dd1 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/SidedArgumentParser.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/SidedArgumentParser.java @@ -27,13 +27,12 @@ import cloud.commandframework.arguments.parser.ArgumentParseResult; import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.context.CommandContext; import cloud.commandframework.fabric.FabricCommandContextKeys; +import java.util.Queue; import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.SharedSuggestionProvider; import org.checkerframework.checker.nullness.qual.NonNull; -import java.util.Queue; - /** * An argument parser that is resolved in different ways on the logical server and logical client. * 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 34ad371d..d20f4343 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 @@ -32,17 +32,16 @@ import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.ParserException; import cloud.commandframework.fabric.FabricCaptionKeys; import cloud.commandframework.fabric.FabricCommandContextKeys; +import java.util.ArrayList; +import java.util.List; +import java.util.Queue; +import java.util.function.BiFunction; import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.world.scores.PlayerTeam; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.ArrayList; -import java.util.List; -import java.util.Queue; -import java.util.function.BiFunction; - /** * An argument for parsing {@link PlayerTeam Teams}. * 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 3f5d811a..c30d9874 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 @@ -27,11 +27,10 @@ import cloud.commandframework.ArgumentDescription; import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.context.CommandContext; import cloud.commandframework.fabric.data.MinecraftTime; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.List; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * An argument for in-game time. 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 7809d22c..8bf2e248 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 @@ -28,13 +28,12 @@ import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.context.CommandContext; import cloud.commandframework.fabric.argument.FabricArgumentParsers; import cloud.commandframework.fabric.data.Coordinates.BlockCoordinates; +import java.util.List; +import java.util.function.BiFunction; import net.minecraft.core.BlockPos; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.List; -import java.util.function.BiFunction; - /** * An argument for resolving {@link BlockCoordinates}. * diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/ColumnPosArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/ColumnPosArgument.java index 8b875f3b..776136d9 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/ColumnPosArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/ColumnPosArgument.java @@ -28,13 +28,12 @@ import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.context.CommandContext; import cloud.commandframework.fabric.argument.FabricArgumentParsers; import cloud.commandframework.fabric.data.Coordinates.ColumnCoordinates; +import java.util.List; +import java.util.function.BiFunction; import net.minecraft.core.BlockPos; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.List; -import java.util.function.BiFunction; - /** * An argument for resolving {@link ColumnCoordinates column (xz) coordinates}. * diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MessageArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MessageArgument.java index 0bf09337..f3693a96 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MessageArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MessageArgument.java @@ -28,11 +28,10 @@ import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.context.CommandContext; import cloud.commandframework.fabric.argument.FabricArgumentParsers; import cloud.commandframework.fabric.data.Message; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.List; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * An argument similar to a greedy string, but one that resolves selectors. 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 e9662764..7e27fc28 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 @@ -28,11 +28,10 @@ import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.context.CommandContext; import cloud.commandframework.fabric.argument.FabricArgumentParsers; import cloud.commandframework.fabric.data.MultipleEntitySelector; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.List; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * An argument for selecting multiple {@link net.minecraft.world.entity.Entity entities} using an diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MultiplePlayerSelectorArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MultiplePlayerSelectorArgument.java index f6d54099..37f08ed6 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MultiplePlayerSelectorArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MultiplePlayerSelectorArgument.java @@ -28,11 +28,10 @@ import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.context.CommandContext; import cloud.commandframework.fabric.argument.FabricArgumentParsers; import cloud.commandframework.fabric.data.MultiplePlayerSelector; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.List; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * An argument for selecting multiple {@link net.minecraft.server.level.ServerPlayer players} using an diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/SingleEntitySelectorArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/SingleEntitySelectorArgument.java index 6183268b..ea75ab23 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/SingleEntitySelectorArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/SingleEntitySelectorArgument.java @@ -28,11 +28,10 @@ import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.context.CommandContext; import cloud.commandframework.fabric.argument.FabricArgumentParsers; import cloud.commandframework.fabric.data.SingleEntitySelector; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.List; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * An argument for selecting a single {@link net.minecraft.world.entity.Entity entity} using an diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/SinglePlayerSelectorArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/SinglePlayerSelectorArgument.java index 35f2b600..e8413575 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/SinglePlayerSelectorArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/SinglePlayerSelectorArgument.java @@ -28,11 +28,10 @@ import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.context.CommandContext; import cloud.commandframework.fabric.argument.FabricArgumentParsers; import cloud.commandframework.fabric.data.SinglePlayerSelector; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.List; import java.util.function.BiFunction; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * An argument for selecting a single {@link net.minecraft.server.level.ServerPlayer player} using an diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/Vec2dArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/Vec2dArgument.java index de67d98c..96500a58 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/Vec2dArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/Vec2dArgument.java @@ -28,13 +28,12 @@ import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.context.CommandContext; import cloud.commandframework.fabric.argument.FabricArgumentParsers; import cloud.commandframework.fabric.data.Coordinates; +import java.util.List; +import java.util.function.BiFunction; import net.minecraft.world.phys.Vec3; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.List; -import java.util.function.BiFunction; - /** * An argument for resolving {@link cloud.commandframework.fabric.data.Coordinates.CoordinatesXZ} from 2 doubles. * diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/Vec3dArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/Vec3dArgument.java index ed9d0495..05b70f68 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/Vec3dArgument.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/Vec3dArgument.java @@ -28,13 +28,12 @@ import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.context.CommandContext; import cloud.commandframework.fabric.argument.FabricArgumentParsers; import cloud.commandframework.fabric.data.Coordinates; +import java.util.List; +import java.util.function.BiFunction; import net.minecraft.world.phys.Vec3; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.List; -import java.util.function.BiFunction; - /** * An argument for resolving {@link Coordinates} from 3 doubles. * 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 cc5d03b4..cfdf1e4c 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 @@ -23,12 +23,11 @@ // package cloud.commandframework.fabric.data; +import java.util.Collection; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.Entity; import org.checkerframework.checker.nullness.qual.NonNull; -import java.util.Collection; - /** * A parsed message. * 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 61f7246d..570fb4be 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 @@ -23,11 +23,10 @@ // package cloud.commandframework.fabric.data; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.time.temporal.TemporalUnit; import java.util.Objects; import java.util.concurrent.TimeUnit; +import org.checkerframework.checker.nullness.qual.NonNull; import static java.util.Objects.requireNonNull; 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 fffa1479..a323d515 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 @@ -23,13 +23,12 @@ // package cloud.commandframework.fabric.data; +import java.util.Collection; +import java.util.Collections; import net.minecraft.commands.arguments.selector.EntitySelector; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.Collection; -import java.util.Collections; - /** * A selector string to query multiple entity-like values * diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/CloudStringReaderMixin.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/CloudStringReaderMixin.java index 17728dc2..409d891b 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/CloudStringReaderMixin.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/mixin/CloudStringReaderMixin.java @@ -26,11 +26,10 @@ package cloud.commandframework.fabric.mixin; import cloud.commandframework.brigadier.argument.StringReaderAsQueue; import cloud.commandframework.fabric.internal.CloudStringReader; import com.mojang.brigadier.StringReader; +import java.util.Objects; import org.checkerframework.checker.nullness.qual.Nullable; import org.spongepowered.asm.mixin.Mixin; -import java.util.Objects; - /** * Mix in to our own class in order to implement the Queue interface without signature conflicts. 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 51e298f8..cbbe3cdd 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 @@ -32,6 +32,11 @@ import com.google.gson.JsonObject; import com.google.gson.internal.Streams; import com.google.gson.stream.JsonWriter; import com.mojang.brigadier.CommandDispatcher; +import java.io.BufferedWriter; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.time.Instant; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource; import net.fabricmc.loader.api.FabricLoader; @@ -47,12 +52,6 @@ import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.realms.RealmsBridge; import org.checkerframework.checker.nullness.qual.NonNull; -import java.io.BufferedWriter; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.time.Instant; - public final class FabricClientExample implements ClientModInitializer { @Override 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 01d1b742..fc876a1c 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 @@ -42,6 +42,10 @@ import cloud.commandframework.fabric.data.MultipleEntitySelector; import cloud.commandframework.fabric.data.MultiplePlayerSelector; import cloud.commandframework.fabric.testmod.mixin.GiveCommandAccess; import com.mojang.brigadier.exceptions.CommandSyntaxException; +import java.util.Collection; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; import net.fabricmc.api.ModInitializer; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.ModContainer; @@ -62,11 +66,6 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.ChunkPos; import net.minecraft.world.phys.Vec3; -import java.util.Collection; -import java.util.Comparator; -import java.util.List; -import java.util.stream.Collectors; - public final class FabricExample implements ModInitializer { @Override 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 a023644d..39bcfcdb 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 @@ -24,6 +24,7 @@ package cloud.commandframework.fabric.testmod.mixin; import com.mojang.brigadier.Command; +import java.util.Collection; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.arguments.item.ItemInput; import net.minecraft.server.commands.GiveCommand; @@ -31,8 +32,6 @@ import net.minecraft.server.level.ServerPlayer; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Invoker; -import java.util.Collection; - @Mixin(GiveCommand.class) public interface GiveCommandAccess { 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 249d1865..663454a5 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 @@ -23,11 +23,10 @@ // package cloud.commandframework.minecraft.extras; +import java.util.function.Function; import net.kyori.adventure.audience.Audience; import org.checkerframework.checker.nullness.qual.NonNull; -import java.util.function.Function; - /** * Function that maps the command sender type to an adventure {@link net.kyori.adventure.audience.Audience} * 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 4d54f81f..c6e52186 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 @@ -23,15 +23,14 @@ // package cloud.commandframework.minecraft.extras; +import java.util.Locale; +import java.util.regex.Pattern; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.format.TextColor; import net.kyori.adventure.translation.GlobalTranslator; import org.checkerframework.checker.nullness.qual.NonNull; -import java.util.Locale; -import java.util.regex.Pattern; - final class ComponentHelper { public static final Pattern SPECIAL_CHARACTERS_PATTERN = Pattern.compile("[^\\s\\w\\-]"); 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 0985c30f..e67871d8 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 @@ -29,6 +29,12 @@ import cloud.commandframework.exceptions.CommandExecutionException; import cloud.commandframework.exceptions.InvalidCommandSenderException; import cloud.commandframework.exceptions.InvalidSyntaxException; import cloud.commandframework.exceptions.NoPermissionException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.HashMap; +import java.util.Map; +import java.util.function.BiFunction; +import java.util.function.Function; import net.kyori.adventure.audience.Audience; import net.kyori.adventure.identity.Identity; import net.kyori.adventure.text.Component; @@ -39,13 +45,6 @@ import net.kyori.adventure.text.format.TextDecoration; import net.kyori.adventure.util.ComponentMessageThrowable; import org.checkerframework.checker.nullness.qual.NonNull; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.HashMap; -import java.util.Map; -import java.util.function.BiFunction; -import java.util.function.Function; - /** * Exception handler that sends {@link Component} to the sender. All component builders * can be overridden and the handled exception types can be configured (see {@link ExceptionType} for types) 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 08a7c660..83c63a61 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 @@ -29,15 +29,6 @@ import cloud.commandframework.CommandComponent; import cloud.commandframework.CommandHelpHandler; import cloud.commandframework.CommandManager; import cloud.commandframework.arguments.CommandArgument; -import net.kyori.adventure.audience.Audience; -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.LinearComponents; -import net.kyori.adventure.text.TextComponent; -import net.kyori.adventure.text.format.NamedTextColor; -import net.kyori.adventure.text.format.TextColor; -import net.kyori.adventure.text.format.TextDecoration; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -48,6 +39,14 @@ import java.util.Optional; import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.Predicate; +import net.kyori.adventure.audience.Audience; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.LinearComponents; +import net.kyori.adventure.text.TextComponent; +import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.text.format.TextColor; +import net.kyori.adventure.text.format.TextDecoration; +import org.checkerframework.checker.nullness.qual.NonNull; import static net.kyori.adventure.text.Component.space; import static net.kyori.adventure.text.Component.text; 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 625a2399..2393768f 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 @@ -23,13 +23,12 @@ // package cloud.commandframework.minecraft.extras; -import net.kyori.adventure.text.Component; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.function.BiFunction; +import net.kyori.adventure.text.Component; +import org.checkerframework.checker.nullness.qual.NonNull; final class Pagination { 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 70ae8430..a44ffaea 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 @@ -24,13 +24,12 @@ package cloud.commandframework.minecraft.extras; import cloud.commandframework.ArgumentDescription; +import java.util.Locale; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.ComponentLike; import net.kyori.adventure.translation.GlobalTranslator; import org.checkerframework.checker.nullness.qual.NonNull; -import java.util.Locale; - import static java.util.Objects.requireNonNull; /** 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 9764de36..bc6609b2 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 @@ -33,16 +33,15 @@ import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.ParserException; import cloud.commandframework.types.tuples.Pair; import io.leangen.geantyref.TypeToken; -import net.kyori.adventure.text.format.NamedTextColor; -import net.kyori.adventure.text.format.TextColor; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Arrays; import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Queue; import java.util.regex.Pattern; +import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.text.format.TextColor; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Parser for color codes. 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 342be7fd..1c9b1988 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 @@ -25,14 +25,13 @@ package cloud.commandframework.paper; import cloud.commandframework.bukkit.BukkitPluginRegistrationHandler; import com.destroystokyo.paper.event.server.AsyncTabCompleteEvent; +import java.util.ArrayList; +import java.util.List; import org.bukkit.command.CommandSender; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.checkerframework.checker.nullness.qual.NonNull; -import java.util.ArrayList; -import java.util.List; - final class AsyncCommandSuggestionsListener implements Listener { private final PaperCommandManager paperCommandManager; 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 f2d7e94a..e40ba5b6 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 @@ -31,15 +31,14 @@ import cloud.commandframework.bukkit.internal.BukkitBackwardsBrigadierSenderMapp import cloud.commandframework.context.CommandContext; import cloud.commandframework.permission.CommandPermission; import com.destroystokyo.paper.brigadier.BukkitBrigadierCommandSource; +import java.util.function.BiPredicate; +import java.util.regex.Pattern; import org.bukkit.Bukkit; import org.bukkit.command.PluginIdentifiableCommand; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.checkerframework.checker.nullness.qual.NonNull; -import java.util.function.BiPredicate; -import java.util.regex.Pattern; - class PaperBrigadierListener implements Listener { private final CloudBrigadierManager brigadierManager; diff --git a/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/PaperCommandManager.java b/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/PaperCommandManager.java index dfb57263..a2d9654b 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 @@ -28,15 +28,14 @@ import cloud.commandframework.brigadier.CloudBrigadierManager; import cloud.commandframework.bukkit.BukkitCommandManager; import cloud.commandframework.bukkit.CloudBukkitCapabilities; import cloud.commandframework.execution.CommandExecutionCoordinator; +import java.util.function.Function; +import java.util.function.UnaryOperator; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.plugin.Plugin; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.function.Function; -import java.util.function.UnaryOperator; - /** * Paper command manager that extends {@link BukkitCommandManager} * 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 0f83bac5..53c6e3fc 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 @@ -31,17 +31,16 @@ import cloud.commandframework.bukkit.internal.CraftBukkitReflection; import cloud.commandframework.bukkit.parsers.WorldArgument; import cloud.commandframework.context.CommandContext; import cloud.commandframework.exceptions.parsing.NoInputProvidedException; +import java.util.ArrayList; +import java.util.List; +import java.util.Queue; +import java.util.function.BiFunction; import org.bukkit.Bukkit; import org.bukkit.NamespacedKey; import org.bukkit.World; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.ArrayList; -import java.util.List; -import java.util.Queue; -import java.util.function.BiFunction; - /** * Argument type that parses Bukkit {@link World worlds} from a {@link NamespacedKey}. * 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 13ffede9..cb575e05 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 @@ -32,6 +32,10 @@ import cloud.commandframework.exceptions.InvalidSyntaxException; import cloud.commandframework.exceptions.NoPermissionException; import cloud.commandframework.exceptions.NoSuchCommandException; import cloud.commandframework.meta.CommandMeta; +import java.util.Collections; +import java.util.List; +import java.util.Optional; +import java.util.concurrent.CompletionException; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import org.spongepowered.api.command.CommandCallable; @@ -43,11 +47,6 @@ import org.spongepowered.api.util.TextMessageException; import org.spongepowered.api.world.Location; import org.spongepowered.api.world.World; -import java.util.Collections; -import java.util.List; -import java.util.Optional; -import java.util.concurrent.CompletionException; - final class CloudCommandCallable implements CommandCallable { private static final Text MESSAGE_INTERNAL_ERROR = Text.of(TextColors.RED, 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 004d374f..b441b6e4 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 @@ -28,11 +28,10 @@ import cloud.commandframework.execution.CommandExecutionCoordinator; import com.google.inject.AbstractModule; import com.google.inject.Key; import com.google.inject.util.Types; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.spongepowered.api.command.CommandSource; - import java.lang.reflect.Type; import java.util.function.Function; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.spongepowered.api.command.CommandSource; /** * Injection module that allows for {@link SpongeCommandManager} to be injectable 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 750ed379..074260ce 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 @@ -29,14 +29,13 @@ import cloud.commandframework.execution.AsynchronousCommandExecutionCoordinator; import cloud.commandframework.execution.CommandExecutionCoordinator; import cloud.commandframework.meta.CommandMeta; import cloud.commandframework.meta.SimpleCommandMeta; +import java.util.function.Function; +import javax.inject.Inject; +import javax.inject.Singleton; import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.command.CommandSource; import org.spongepowered.api.plugin.PluginContainer; -import javax.inject.Inject; -import javax.inject.Singleton; -import java.util.function.Function; - import static java.util.Objects.requireNonNull; /** 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 53f99ac2..6306d916 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 @@ -28,13 +28,12 @@ import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.arguments.StaticArgument; import cloud.commandframework.internal.CommandRegistrationHandler; import com.google.common.collect.ImmutableList; +import java.util.HashMap; +import java.util.Map; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.Sponge; -import java.util.HashMap; -import java.util.Map; - final class SpongePluginRegistrationHandler implements CommandRegistrationHandler { private @MonotonicNonNull SpongeCommandManager manager; 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 64ef4053..1cac1e73 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 @@ -29,11 +29,10 @@ import com.google.inject.AbstractModule; import com.google.inject.Key; import com.google.inject.util.Types; import com.velocitypowered.api.command.CommandSource; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.reflect.Type; import java.util.function.Function; import java.util.function.UnaryOperator; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Injection module that allows for {@link VelocityCommandManager} to be injectable 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 ccf19601..65121eb7 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 @@ -24,11 +24,10 @@ package cloud.commandframework.velocity; import cloud.commandframework.captions.Caption; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Collection; import java.util.Collections; import java.util.LinkedList; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Velocity specific {@link Caption caption keys} 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 80df0ea4..d45505bd 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 @@ -43,11 +43,10 @@ import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.server.RegisteredServer; import io.leangen.geantyref.TypeToken; +import java.util.function.Function; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.function.Function; - /** * {@link CommandManager} implementation for Velocity. *

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 7d2e36bb..18180a32 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 @@ -33,14 +33,13 @@ import cloud.commandframework.execution.CommandResult; import com.mojang.brigadier.Command; import com.mojang.brigadier.context.CommandContext; import com.velocitypowered.api.command.CommandSource; +import java.util.concurrent.CompletionException; +import java.util.function.BiConsumer; import net.kyori.adventure.identity.Identity; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.checkerframework.checker.nullness.qual.NonNull; -import java.util.concurrent.CompletionException; -import java.util.function.BiConsumer; - final class VelocityExecutor implements Command { private static final String MESSAGE_INTERNAL_ERROR = "An internal error occurred while attempting to perform this 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 d636e7e3..894954db 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 @@ -32,9 +32,8 @@ import cloud.commandframework.internal.CommandRegistrationHandler; import com.velocitypowered.api.command.BrigadierCommand; import com.velocitypowered.api.command.CommandMeta; import com.velocitypowered.api.command.CommandSource; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.List; +import org.checkerframework.checker.nullness.qual.NonNull; final class VelocityPluginRegistrationHandler implements CommandRegistrationHandler { 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 ab9be8bf..4b671632 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 @@ -35,15 +35,14 @@ import cloud.commandframework.velocity.VelocityCaptionKeys; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Queue; import java.util.function.BiFunction; import java.util.stream.Collectors; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Argument parser for {@link Player players} 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 7623cf4c..bbafdc0f 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 @@ -35,15 +35,14 @@ import cloud.commandframework.velocity.VelocityCaptionKeys; import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.server.RegisteredServer; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Queue; import java.util.function.BiFunction; import java.util.stream.Collectors; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Argument parser for {@link RegisteredServer servers} diff --git a/cloud-services/src/main/java/cloud/commandframework/services/AnnotatedMethodService.java b/cloud-services/src/main/java/cloud/commandframework/services/AnnotatedMethodService.java index f0594d8d..0a5cf1a8 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/AnnotatedMethodService.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/AnnotatedMethodService.java @@ -25,13 +25,12 @@ package cloud.commandframework.services; import cloud.commandframework.services.annotations.Order; import cloud.commandframework.services.types.Service; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.reflect.Method; import java.util.Objects; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; class AnnotatedMethodService implements Service { diff --git a/cloud-services/src/main/java/cloud/commandframework/services/AnnotatedMethodServiceFactory.java b/cloud-services/src/main/java/cloud/commandframework/services/AnnotatedMethodServiceFactory.java index 5fe006d2..76821841 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/AnnotatedMethodServiceFactory.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/AnnotatedMethodServiceFactory.java @@ -26,11 +26,10 @@ package cloud.commandframework.services; import cloud.commandframework.services.annotations.ServiceImplementation; import cloud.commandframework.services.types.Service; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; +import org.checkerframework.checker.nullness.qual.NonNull; enum AnnotatedMethodServiceFactory { INSTANCE; 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 50aeeb71..b0fd5878 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ChunkedRequestContext.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ChunkedRequestContext.java @@ -23,14 +23,13 @@ // package cloud.commandframework.services; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.checkerframework.checker.nullness.qual.NonNull; /** * This class represents a request that can be fulfilled by one, or multiple services, for one or 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 41f86d1e..2469370e 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServiceFilterHandler.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServiceFilterHandler.java @@ -25,9 +25,8 @@ package cloud.commandframework.services; import cloud.commandframework.services.types.Service; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.function.Predicate; +import org.checkerframework.checker.nullness.qual.NonNull; enum ServiceFilterHandler { INSTANCE; 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 b236d72a..6a5e8e38 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServicePipeline.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServicePipeline.java @@ -25,8 +25,6 @@ package cloud.commandframework.services; import cloud.commandframework.services.types.Service; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.lang.reflect.Type; import java.util.Collection; import java.util.Collections; @@ -36,6 +34,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Executor; import java.util.function.Predicate; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Service pipeline 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 d974ea60..6398d0d8 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServicePipelineBuilder.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServicePipelineBuilder.java @@ -23,11 +23,10 @@ // package cloud.commandframework.services; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Objects; import java.util.concurrent.Executor; import java.util.concurrent.Executors; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Builder for {@link ServicePipeline} 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 74405768..18f8c770 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServiceRepository.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServiceRepository.java @@ -26,14 +26,13 @@ package cloud.commandframework.services; import cloud.commandframework.services.annotations.Order; import cloud.commandframework.services.types.Service; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.LinkedList; import java.util.List; import java.util.function.Predicate; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Repository that contains implementations for a given service type 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 5dafe485..3bbfa7d8 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServiceSpigot.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServiceSpigot.java @@ -27,11 +27,10 @@ import cloud.commandframework.services.types.ConsumerService; import cloud.commandframework.services.types.Service; import cloud.commandframework.services.types.SideEffectService; import io.leangen.geantyref.TypeToken; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.LinkedList; import java.util.concurrent.CompletableFuture; import java.util.function.BiConsumer; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Class that outputs results from the given context, using the specified service type 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 fe5ca71d..f0f6e4f6 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 @@ -24,7 +24,6 @@ package cloud.commandframework.services.annotations; import cloud.commandframework.services.ExecutionOrder; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; 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 340f2d08..83386293 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 @@ -24,7 +24,6 @@ package cloud.commandframework.services.annotations; import cloud.commandframework.services.types.Service; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; 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 a3672615..4aebdc04 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 @@ -24,9 +24,8 @@ package cloud.commandframework.services.types; import cloud.commandframework.services.State; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.function.Consumer; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Service type where each implementation gets a chance to consume the context. This service type 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 6fa8d924..0cb7a0ca 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 @@ -24,11 +24,10 @@ package cloud.commandframework.services.types; import cloud.commandframework.services.ChunkedRequestContext; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.List; import java.util.Map; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Service type that allows service to generate partial results for bigger 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 c6255954..f1973208 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 @@ -25,11 +25,10 @@ package cloud.commandframework.services.types; import cloud.commandframework.services.ExecutionOrder; import cloud.commandframework.services.PipelineException; +import java.util.function.Function; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.function.Function; - /** * A service is anything that can take in a context, and produce a response. Most service * implementations will be side effect free, although some service implementations will have side 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 a0ca86b4..bd06e2e4 100644 --- a/cloud-services/src/test/java/cloud/commandframework/services/ServicesTest.java +++ b/cloud-services/src/test/java/cloud/commandframework/services/ServicesTest.java @@ -43,9 +43,6 @@ import cloud.commandframework.services.mock.StateSettingConsumerService; import cloud.commandframework.services.types.Service; import io.leangen.geantyref.GenericTypeReflector; import io.leangen.geantyref.TypeToken; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.lang.reflect.Type; import java.util.Arrays; import java.util.Collection; @@ -53,6 +50,8 @@ import java.util.Collections; import java.util.Iterator; import java.util.Map; import java.util.UUID; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class ServicesTest { 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 5510a75a..8bed0b03 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 @@ -24,7 +24,6 @@ package cloud.commandframework.services.mock; import cloud.commandframework.services.ChunkedRequestContext; - import java.util.Collection; public class MockChunkedRequest diff --git a/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskConsumer.java b/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskConsumer.java index d50cae15..ee020286 100644 --- a/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskConsumer.java +++ b/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskConsumer.java @@ -23,9 +23,8 @@ // package cloud.commandframework.tasks; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.function.Consumer; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Task step that does not produce any output 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 81565990..1a9962a1 100644 --- a/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskFunction.java +++ b/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskFunction.java @@ -23,9 +23,8 @@ // package cloud.commandframework.tasks; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.function.Function; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Task step that produces output from given 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 72b516a0..2df2d576 100644 --- a/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskRecipe.java +++ b/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskRecipe.java @@ -23,13 +23,12 @@ // package cloud.commandframework.tasks; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.function.BiConsumer; +import org.checkerframework.checker.nullness.qual.NonNull; /** * A task recipe is a chain of tasks with optional synchronization steps, 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 3fa58e36..dca910c8 100644 --- a/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskSynchronizer.java +++ b/cloud-tasks/src/main/java/cloud/commandframework/tasks/TaskSynchronizer.java @@ -23,9 +23,8 @@ // package cloud.commandframework.tasks; -import org.checkerframework.checker.nullness.qual.NonNull; - import java.util.concurrent.CompletableFuture; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Utility responsible for synchronizing {@link TaskRecipeStep task recipe steps} 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 1972f989..28a25a83 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 @@ -67,6 +67,14 @@ import cloud.commandframework.tasks.TaskConsumer; import cloud.commandframework.types.tuples.Pair; import cloud.commandframework.types.tuples.Triplet; import io.leangen.geantyref.TypeToken; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.TimeUnit; +import java.util.function.Function; import net.kyori.adventure.identity.Identity; import net.kyori.adventure.platform.bukkit.BukkitAudiences; import net.kyori.adventure.text.format.NamedTextColor; @@ -90,15 +98,6 @@ import org.bukkit.util.Vector; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.TimeUnit; -import java.util.function.Function; - import static net.kyori.adventure.text.Component.text; /** @@ -254,28 +253,28 @@ public final class ExamplePlugin extends JavaPlugin { // Create a teleportation command // this.manager.command(builder.literal("teleport") - .literal("me") - // Require a player sender - .senderType(Player.class) - .argument(worldArgument, ArgumentDescription.of("World name")) - .argumentTriplet( - "coords", - TypeToken.get(Vector.class), - Triplet.of("x", "y", "z"), - Triplet.of(Integer.class, Integer.class, Integer.class), - (sender, triplet) -> new Vector(triplet.getFirst(), triplet.getSecond(), - triplet.getThird() - ), - ArgumentDescription.of("Coordinates") - ) - .handler(context -> this.manager.taskRecipe().begin(context) - .synchronous(commandContext -> { - final Player player = (Player) commandContext.getSender(); - final World world = commandContext.get(worldArgument); - final Vector coords = commandContext.get("coords"); - final Location location = coords.toLocation(world); - player.teleport(location); - }).execute())) + .literal("me") + // Require a player sender + .senderType(Player.class) + .argument(worldArgument, ArgumentDescription.of("World name")) + .argumentTriplet( + "coords", + TypeToken.get(Vector.class), + Triplet.of("x", "y", "z"), + Triplet.of(Integer.class, Integer.class, Integer.class), + (sender, triplet) -> new Vector(triplet.getFirst(), triplet.getSecond(), + triplet.getThird() + ), + ArgumentDescription.of("Coordinates") + ) + .handler(context -> this.manager.taskRecipe().begin(context) + .synchronous(commandContext -> { + final Player player = (Player) commandContext.getSender(); + final World world = commandContext.get(worldArgument); + final Vector coords = commandContext.get("coords"); + final Location location = coords.toLocation(world); + player.teleport(location); + }).execute())) .command(builder.literal("teleport") .literal("entity") .senderType(Player.class) 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 0e25c57b..8c4ae85c 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 @@ -36,6 +36,8 @@ import cloud.commandframework.extra.confirmation.CommandConfirmationManager; import cloud.commandframework.meta.CommandMeta; import cloud.commandframework.minecraft.extras.MinecraftExceptionHandler; import cloud.commandframework.minecraft.extras.RichDescription; +import java.util.concurrent.TimeUnit; +import java.util.function.Function; import net.kyori.adventure.platform.bungeecord.BungeeAudiences; import net.kyori.adventure.text.format.NamedTextColor; import net.md_5.bungee.api.CommandSender; @@ -43,9 +45,6 @@ import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.plugin.Plugin; -import java.util.concurrent.TimeUnit; -import java.util.function.Function; - import static net.kyori.adventure.text.Component.text; public final class ExamplePlugin extends Plugin { 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 54ee5089..e46791b4 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 @@ -23,14 +23,13 @@ // package cloud.commandframework.examples.jda; +import java.util.Optional; import net.dv8tion.jda.api.entities.MessageChannel; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.Optional; - public abstract class CustomUser { private final MessageReceivedEvent event; 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 1a1e6729..95ca68ff 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 @@ -30,6 +30,7 @@ import cloud.commandframework.jda.JDA4CommandManager; import cloud.commandframework.jda.JDAGuildSender; import cloud.commandframework.jda.JDAPrivateSender; import cloud.commandframework.jda.parsers.UserArgument; +import javax.security.auth.login.LoginException; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDABuilder; import net.dv8tion.jda.api.entities.Activity; @@ -41,8 +42,6 @@ import net.dv8tion.jda.api.utils.ChunkingFilter; import net.dv8tion.jda.api.utils.MemberCachePolicy; import org.checkerframework.checker.nullness.qual.NonNull; -import javax.security.auth.login.LoginException; - public final class ExampleBot { private ExampleBot() { 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 d05a9864..cd9c670a 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 @@ -23,13 +23,12 @@ // package cloud.commandframework.examples.jda; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; public final class PermissionRegistry { 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 0f19ce76..cea6d4d2 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 @@ -40,14 +40,13 @@ import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; import com.velocitypowered.api.plugin.Plugin; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.server.RegisteredServer; +import java.util.function.Function; import net.kyori.adventure.identity.Identity; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.TextColor; import org.checkerframework.checker.nullness.qual.NonNull; -import java.util.function.Function; - @Plugin( id = "example-plugin", name = "Cloud example plugin",