diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/AnnotationFeature.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/AnnotationFeature.java index c0626731..2a25d96d 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/AnnotationFeature.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/AnnotationFeature.java @@ -23,10 +23,10 @@ // package cloud.commandframework.examples.bukkit.annotations; -import cloud.commandframework.annotations.AnnotationParser; import cloud.commandframework.examples.bukkit.ExamplePlugin; import org.bukkit.command.CommandSender; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.annotations.AnnotationParser; /** * Some feature of the annotation system that we want to showcase. diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/AnnotationParserExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/AnnotationParserExample.java index cf7ee5e8..5d2265ef 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/AnnotationParserExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/AnnotationParserExample.java @@ -23,8 +23,6 @@ // package cloud.commandframework.examples.bukkit.annotations; -import cloud.commandframework.CommandManager; -import cloud.commandframework.annotations.AnnotationParser; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.annotations.feature.BuilderModifierExample; import cloud.commandframework.examples.bukkit.annotations.feature.CommandContainerExample; @@ -44,6 +42,8 @@ import java.util.List; import org.bukkit.command.CommandSender; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.CommandManager; +import org.incendo.cloud.annotations.AnnotationParser; /** * Main entrypoint for all annotation related examples. This class is responsible for creating and configuring diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/ExampleCommandContainer.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/ExampleCommandContainer.java index aacd24f5..e4dc7d99 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/ExampleCommandContainer.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/ExampleCommandContainer.java @@ -23,13 +23,13 @@ // package cloud.commandframework.examples.bukkit.annotations; -import cloud.commandframework.annotations.AnnotationParser; -import cloud.commandframework.annotations.Argument; -import cloud.commandframework.annotations.Command; -import cloud.commandframework.annotations.processing.CommandContainer; import org.bukkit.command.CommandSender; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; +import org.incendo.cloud.annotations.AnnotationParser; +import org.incendo.cloud.annotations.Argument; +import org.incendo.cloud.annotations.Command; +import org.incendo.cloud.annotations.processing.CommandContainer; /** * Example of a command container. diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/ExampleSuggestionContainer.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/ExampleSuggestionContainer.java index 36e65f8f..047dabdb 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/ExampleSuggestionContainer.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/ExampleSuggestionContainer.java @@ -23,12 +23,12 @@ // package cloud.commandframework.examples.bukkit.annotations; -import cloud.commandframework.annotations.processing.CommandContainer; -import cloud.commandframework.annotations.suggestions.Suggestions; -import cloud.commandframework.context.CommandContext; import java.util.stream.Stream; import org.bukkit.command.CommandSender; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.annotations.processing.CommandContainer; +import org.incendo.cloud.annotations.suggestion.Suggestions; +import org.incendo.cloud.context.CommandContext; /** * Example of a command container with a higher-than-default priority. diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/BuilderModifierExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/BuilderModifierExample.java index 0e484820..8801f6a5 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/BuilderModifierExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/BuilderModifierExample.java @@ -23,11 +23,8 @@ // package cloud.commandframework.examples.bukkit.annotations.feature; -import cloud.commandframework.annotations.AnnotationParser; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.annotations.AnnotationFeature; -import cloud.commandframework.keys.CloudKey; -import cloud.commandframework.permission.PredicatePermission; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -37,6 +34,9 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.annotations.AnnotationParser; +import org.incendo.cloud.key.CloudKey; +import org.incendo.cloud.permission.PredicatePermission; /** * Example of a command builder modifier that gets triggered on the `@GameModeRequirement` annotation diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/CommandContainerExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/CommandContainerExample.java index d30c7a95..17946972 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/CommandContainerExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/CommandContainerExample.java @@ -23,11 +23,11 @@ // package cloud.commandframework.examples.bukkit.annotations.feature; -import cloud.commandframework.annotations.AnnotationParser; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.annotations.AnnotationFeature; import org.bukkit.command.CommandSender; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.annotations.AnnotationParser; /** * Example showcasing how to use command containers. Command containers are recognized at compile-type by diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/EitherExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/EitherExample.java index 1fa56c42..6f9b6466 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/EitherExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/EitherExample.java @@ -23,22 +23,22 @@ // package cloud.commandframework.examples.bukkit.annotations.feature; -import cloud.commandframework.annotations.AnnotationParser; -import cloud.commandframework.annotations.Command; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.annotations.AnnotationFeature; -import cloud.commandframework.types.Either; import java.util.UUID; import net.kyori.adventure.platform.bukkit.BukkitAudiences; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.annotations.AnnotationParser; +import org.incendo.cloud.annotations.Command; +import org.incendo.cloud.type.Either; import static net.kyori.adventure.text.Component.text; /** - * Example of a command accepting {@link Either}. + * Example of a command accepting {@link org.incendo.cloud.type.Either}. */ public final class EitherExample implements AnnotationFeature { diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/EnumExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/EnumExample.java index ba544201..8ff57e8e 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/EnumExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/EnumExample.java @@ -23,9 +23,6 @@ // package cloud.commandframework.examples.bukkit.annotations.feature; -import cloud.commandframework.annotations.AnnotationParser; -import cloud.commandframework.annotations.Argument; -import cloud.commandframework.annotations.Command; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.annotations.AnnotationFeature; import org.bukkit.Location; @@ -33,6 +30,9 @@ import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.annotations.AnnotationParser; +import org.incendo.cloud.annotations.Argument; +import org.incendo.cloud.annotations.Command; /** * Example showcasing enums using the enum parser. These enums do not have diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/FlagExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/FlagExample.java index fadf5dff..01d8f5e8 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/FlagExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/FlagExample.java @@ -23,11 +23,6 @@ // package cloud.commandframework.examples.bukkit.annotations.feature; -import cloud.commandframework.annotations.AnnotationParser; -import cloud.commandframework.annotations.Argument; -import cloud.commandframework.annotations.Command; -import cloud.commandframework.annotations.CommandDescription; -import cloud.commandframework.annotations.Flag; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.annotations.AnnotationFeature; import java.util.Locale; @@ -40,6 +35,11 @@ import org.bukkit.inventory.meta.ItemMeta; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; +import org.incendo.cloud.annotations.AnnotationParser; +import org.incendo.cloud.annotations.Argument; +import org.incendo.cloud.annotations.Command; +import org.incendo.cloud.annotations.CommandDescription; +import org.incendo.cloud.annotations.Flag; /** * Example that showcases command flags with values. diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/HelpExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/HelpExample.java index f4e9eb5d..1257e670 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/HelpExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/HelpExample.java @@ -23,23 +23,23 @@ // package cloud.commandframework.examples.bukkit.annotations.feature; -import cloud.commandframework.CommandManager; -import cloud.commandframework.annotations.AnnotationParser; -import cloud.commandframework.annotations.Argument; -import cloud.commandframework.annotations.Command; -import cloud.commandframework.annotations.CommandDescription; -import cloud.commandframework.annotations.specifier.Greedy; -import cloud.commandframework.annotations.suggestions.Suggestions; -import cloud.commandframework.context.CommandContext; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.annotations.AnnotationFeature; -import cloud.commandframework.help.result.CommandEntry; import cloud.commandframework.minecraft.extras.MinecraftHelp; import java.util.List; import net.kyori.adventure.platform.bukkit.BukkitAudiences; import org.bukkit.command.CommandSender; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; +import org.incendo.cloud.CommandManager; +import org.incendo.cloud.annotation.specifier.Greedy; +import org.incendo.cloud.annotations.AnnotationParser; +import org.incendo.cloud.annotations.Argument; +import org.incendo.cloud.annotations.Command; +import org.incendo.cloud.annotations.CommandDescription; +import org.incendo.cloud.annotations.suggestion.Suggestions; +import org.incendo.cloud.context.CommandContext; +import org.incendo.cloud.help.result.CommandEntry; /** * Example that uses an annotated command to query commands, and a `@Suggestions` annotated method to provide diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/InjectionExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/InjectionExample.java index 1ef12df6..6964adfa 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/InjectionExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/InjectionExample.java @@ -23,16 +23,8 @@ // package cloud.commandframework.examples.bukkit.annotations.feature; -import cloud.commandframework.annotations.AnnotationAccessor; -import cloud.commandframework.annotations.AnnotationParser; -import cloud.commandframework.annotations.Command; -import cloud.commandframework.annotations.injection.ParameterInjector; -import cloud.commandframework.context.CommandContext; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.annotations.AnnotationFeature; -import cloud.commandframework.exceptions.CommandExecutionException; -import cloud.commandframework.exceptions.InjectionException; -import cloud.commandframework.exceptions.handling.ExceptionHandler; import net.kyori.adventure.platform.bukkit.BukkitAudiences; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.GameMode; @@ -40,6 +32,14 @@ import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; +import org.incendo.cloud.annotations.AnnotationParser; +import org.incendo.cloud.annotations.Command; +import org.incendo.cloud.context.CommandContext; +import org.incendo.cloud.exception.CommandExecutionException; +import org.incendo.cloud.exception.InjectionException; +import org.incendo.cloud.exception.handling.ExceptionHandler; +import org.incendo.cloud.injection.ParameterInjector; +import org.incendo.cloud.util.annotation.AnnotationAccessor; import static net.kyori.adventure.text.Component.text; diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/PermissionExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/PermissionExample.java index 12a4ca47..edc6dfc2 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/PermissionExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/PermissionExample.java @@ -23,14 +23,14 @@ // package cloud.commandframework.examples.bukkit.annotations.feature; -import cloud.commandframework.annotations.AnnotationParser; -import cloud.commandframework.annotations.Command; -import cloud.commandframework.annotations.Permission; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.annotations.AnnotationFeature; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.annotations.AnnotationParser; +import org.incendo.cloud.annotations.Command; +import org.incendo.cloud.annotations.Permission; /** * Example of a command with a permission attached to it. diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/RegexExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/RegexExample.java index 9fba58c9..0754e849 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/RegexExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/RegexExample.java @@ -23,19 +23,19 @@ // package cloud.commandframework.examples.bukkit.annotations.feature; -import cloud.commandframework.annotations.AnnotationParser; -import cloud.commandframework.annotations.Argument; -import cloud.commandframework.annotations.Command; -import cloud.commandframework.annotations.CommandDescription; -import cloud.commandframework.annotations.Regex; -import cloud.commandframework.captions.Caption; -import cloud.commandframework.captions.CaptionProvider; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.annotations.AnnotationFeature; import net.kyori.adventure.platform.bukkit.BukkitAudiences; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.command.CommandSender; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.annotations.AnnotationParser; +import org.incendo.cloud.annotations.Argument; +import org.incendo.cloud.annotations.Command; +import org.incendo.cloud.annotations.CommandDescription; +import org.incendo.cloud.annotations.Regex; +import org.incendo.cloud.caption.Caption; +import org.incendo.cloud.caption.CaptionProvider; import static net.kyori.adventure.text.Component.text; diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/RootCommandDeletionExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/RootCommandDeletionExample.java index bf14b408..bf3d08ea 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/RootCommandDeletionExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/RootCommandDeletionExample.java @@ -23,18 +23,18 @@ // package cloud.commandframework.examples.bukkit.annotations.feature; -import cloud.commandframework.CommandManager; -import cloud.commandframework.annotations.AnnotationParser; -import cloud.commandframework.annotations.Argument; -import cloud.commandframework.annotations.Command; -import cloud.commandframework.annotations.suggestions.Suggestions; -import cloud.commandframework.context.CommandContext; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.annotations.AnnotationFeature; import java.util.ArrayList; import java.util.List; import org.bukkit.command.CommandSender; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.CommandManager; +import org.incendo.cloud.annotations.AnnotationParser; +import org.incendo.cloud.annotations.Argument; +import org.incendo.cloud.annotations.Command; +import org.incendo.cloud.annotations.suggestion.Suggestions; +import org.incendo.cloud.context.CommandContext; /** * Example of the deletion of root commands. Us showcasing this does NOT mean that we recommend this. Do this at your own risk. diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/StringArrayExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/StringArrayExample.java index 34730476..241d2232 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/StringArrayExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/StringArrayExample.java @@ -23,14 +23,14 @@ // package cloud.commandframework.examples.bukkit.annotations.feature; -import cloud.commandframework.annotations.AnnotationParser; -import cloud.commandframework.annotations.Argument; -import cloud.commandframework.annotations.Command; -import cloud.commandframework.annotations.Default; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.annotations.AnnotationFeature; import org.bukkit.command.CommandSender; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.annotations.AnnotationParser; +import org.incendo.cloud.annotations.Argument; +import org.incendo.cloud.annotations.Command; +import org.incendo.cloud.annotations.Default; /** * Example of a command that consumes the entire input in the form of an array. This is useful when delegating to existing diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/minecraft/LocationExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/minecraft/LocationExample.java index a4c86dcd..a9e55361 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/minecraft/LocationExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/minecraft/LocationExample.java @@ -23,10 +23,6 @@ // package cloud.commandframework.examples.bukkit.annotations.feature.minecraft; -import cloud.commandframework.annotations.AnnotationParser; -import cloud.commandframework.annotations.Argument; -import cloud.commandframework.annotations.Command; -import cloud.commandframework.annotations.Default; import cloud.commandframework.bukkit.parser.location.Location2D; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.annotations.AnnotationFeature; @@ -35,6 +31,10 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.annotations.AnnotationParser; +import org.incendo.cloud.annotations.Argument; +import org.incendo.cloud.annotations.Command; +import org.incendo.cloud.annotations.Default; /** * Example of the Bukkit location parsers. diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/minecraft/NamespacedKeyExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/minecraft/NamespacedKeyExample.java index b34664a1..08c4b47e 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/minecraft/NamespacedKeyExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/minecraft/NamespacedKeyExample.java @@ -23,18 +23,18 @@ // package cloud.commandframework.examples.bukkit.annotations.feature.minecraft; -import cloud.commandframework.annotations.AnnotationParser; -import cloud.commandframework.annotations.Argument; -import cloud.commandframework.annotations.Command; -import cloud.commandframework.annotations.specifier.Greedy; -import cloud.commandframework.annotations.suggestions.Suggestions; -import cloud.commandframework.context.CommandContext; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.annotations.AnnotationFeature; import java.util.stream.Stream; import org.bukkit.NamespacedKey; import org.bukkit.command.CommandSender; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.annotation.specifier.Greedy; +import org.incendo.cloud.annotations.AnnotationParser; +import org.incendo.cloud.annotations.Argument; +import org.incendo.cloud.annotations.Command; +import org.incendo.cloud.annotations.suggestion.Suggestions; +import org.incendo.cloud.context.CommandContext; /** * Example showcasing namespaced keys. diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/minecraft/SelectorExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/minecraft/SelectorExample.java index 3847df7f..b02acfa1 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/minecraft/SelectorExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/annotations/feature/minecraft/SelectorExample.java @@ -23,9 +23,6 @@ // package cloud.commandframework.examples.bukkit.annotations.feature.minecraft; -import cloud.commandframework.annotations.AnnotationParser; -import cloud.commandframework.annotations.Argument; -import cloud.commandframework.annotations.Command; import cloud.commandframework.bukkit.data.SingleEntitySelector; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.annotations.AnnotationFeature; @@ -33,6 +30,9 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.annotations.AnnotationParser; +import org.incendo.cloud.annotations.Argument; +import org.incendo.cloud.annotations.Command; /** * Example showcasing how to work with entity selectors. diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/BuilderExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/BuilderExample.java index 3bca3476..eda99f09 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/BuilderExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/BuilderExample.java @@ -23,8 +23,6 @@ // package cloud.commandframework.examples.bukkit.builder; -import cloud.commandframework.CommandManager; -import cloud.commandframework.Description; import cloud.commandframework.bukkit.BukkitCommandManager; import cloud.commandframework.bukkit.CloudBukkitCapabilities; import cloud.commandframework.examples.bukkit.ExamplePlugin; @@ -49,6 +47,8 @@ import java.util.List; import org.bukkit.command.CommandSender; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.CommandManager; +import org.incendo.cloud.description.Description; /** * Main entrypoint for all builder-related examples. It registers a bunch of {@link #FEATURES features} diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/AggregateCommandExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/AggregateCommandExample.java index c20a8b57..fc7a8d7e 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/AggregateCommandExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/AggregateCommandExample.java @@ -23,16 +23,9 @@ // package cloud.commandframework.examples.bukkit.builder.feature; -import cloud.commandframework.CommandManager; -import cloud.commandframework.arguments.DefaultValue; -import cloud.commandframework.arguments.aggregate.AggregateParser; -import cloud.commandframework.arguments.parser.ArgumentParseResult; -import cloud.commandframework.arguments.suggestion.BlockingSuggestionProvider; -import cloud.commandframework.arguments.suggestion.Suggestion; import cloud.commandframework.bukkit.BukkitCommandManager; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.builder.BuilderFeature; -import cloud.commandframework.types.tuples.Pair; import io.leangen.geantyref.TypeToken; import java.util.concurrent.CompletableFuture; import java.util.stream.IntStream; @@ -44,11 +37,18 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.CommandManager; +import org.incendo.cloud.component.DefaultValue; +import org.incendo.cloud.parser.ArgumentParseResult; +import org.incendo.cloud.parser.aggregate.AggregateParser; +import org.incendo.cloud.suggestion.BlockingSuggestionProvider; +import org.incendo.cloud.suggestion.Suggestion; +import org.incendo.cloud.type.tuple.Pair; -import static cloud.commandframework.arguments.standard.BooleanParser.booleanParser; -import static cloud.commandframework.arguments.standard.IntegerParser.integerParser; -import static cloud.commandframework.arguments.standard.StringParser.stringParser; import static cloud.commandframework.bukkit.parser.WorldParser.worldParser; +import static org.incendo.cloud.parser.standard.BooleanParser.booleanParser; +import static org.incendo.cloud.parser.standard.IntegerParser.integerParser; +import static org.incendo.cloud.parser.standard.StringParser.stringParser; /** * Example showcasing the aggregate command parser system. diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/CommandBeanExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/CommandBeanExample.java index 27d1039d..dd8165d0 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/CommandBeanExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/CommandBeanExample.java @@ -23,18 +23,18 @@ // package cloud.commandframework.examples.bukkit.builder.feature; -import cloud.commandframework.Command; -import cloud.commandframework.CommandBean; -import cloud.commandframework.CommandProperties; import cloud.commandframework.bukkit.BukkitCommandManager; -import cloud.commandframework.context.CommandContext; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.builder.BuilderFeature; -import cloud.commandframework.keys.CloudKey; import org.bukkit.command.CommandSender; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.Command; +import org.incendo.cloud.bean.CommandBean; +import org.incendo.cloud.bean.CommandProperties; +import org.incendo.cloud.context.CommandContext; +import org.incendo.cloud.key.CloudKey; -import static cloud.commandframework.arguments.standard.IntegerParser.integerParser; +import static org.incendo.cloud.parser.standard.IntegerParser.integerParser; /** * Example of using {@link CommandBean command beans} to register a command. diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/CompoundArgumentExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/CompoundArgumentExample.java index 1e64a765..4cadac97 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/CompoundArgumentExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/CompoundArgumentExample.java @@ -23,12 +23,9 @@ // package cloud.commandframework.examples.bukkit.builder.feature; -import cloud.commandframework.Description; import cloud.commandframework.bukkit.BukkitCommandManager; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.builder.BuilderFeature; -import cloud.commandframework.keys.CloudKey; -import cloud.commandframework.types.tuples.Triplet; import io.leangen.geantyref.TypeToken; import org.bukkit.Location; import org.bukkit.World; @@ -36,6 +33,9 @@ import org.bukkit.entity.Player; import org.bukkit.util.Vector; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.description.Description; +import org.incendo.cloud.key.CloudKey; +import org.incendo.cloud.type.tuple.Triplet; import static cloud.commandframework.bukkit.parser.WorldParser.worldParser; diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/EitherExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/EitherExample.java index 8a11b8ce..6cd43037 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/EitherExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/EitherExample.java @@ -23,20 +23,20 @@ // package cloud.commandframework.examples.bukkit.builder.feature; -import cloud.commandframework.arguments.parser.ArgumentParser; -import cloud.commandframework.arguments.standard.UUIDParser; import cloud.commandframework.bukkit.BukkitCommandManager; import cloud.commandframework.bukkit.parser.PlayerParser; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.builder.BuilderFeature; -import cloud.commandframework.keys.CloudKey; -import cloud.commandframework.types.Either; import io.leangen.geantyref.TypeToken; import java.util.UUID; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.key.CloudKey; +import org.incendo.cloud.parser.ArgumentParser; +import org.incendo.cloud.parser.standard.UUIDParser; +import org.incendo.cloud.type.Either; import static net.kyori.adventure.text.Component.text; diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/EnumExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/EnumExample.java index 632281e5..fe6a2864 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/EnumExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/EnumExample.java @@ -32,7 +32,7 @@ import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.NonNull; -import static cloud.commandframework.arguments.standard.EnumParser.enumParser; +import static org.incendo.cloud.parser.standard.EnumParser.enumParser; /** * Example showcasing enums using the enum parser. These enums do not have diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/FlagExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/FlagExample.java index da0146a6..84f0cb3f 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/FlagExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/FlagExample.java @@ -37,10 +37,10 @@ import org.bukkit.inventory.meta.ItemMeta; import org.checkerframework.checker.nullness.qual.NonNull; -import static cloud.commandframework.arguments.standard.EnumParser.enumParser; -import static cloud.commandframework.arguments.standard.IntegerParser.integerParser; import static cloud.commandframework.bukkit.parser.EnchantmentParser.enchantmentParser; import static cloud.commandframework.bukkit.parser.MaterialParser.materialParser; +import static org.incendo.cloud.parser.standard.EnumParser.enumParser; +import static org.incendo.cloud.parser.standard.IntegerParser.integerParser; /** * Example that showcases command flags with values. diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/HelpExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/HelpExample.java index 583231ee..1237752b 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/HelpExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/HelpExample.java @@ -23,18 +23,18 @@ // package cloud.commandframework.examples.bukkit.builder.feature; -import cloud.commandframework.arguments.DefaultValue; -import cloud.commandframework.arguments.suggestion.Suggestion; -import cloud.commandframework.arguments.suggestion.SuggestionProvider; import cloud.commandframework.bukkit.BukkitCommandManager; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.builder.BuilderFeature; -import cloud.commandframework.help.result.CommandEntry; import cloud.commandframework.minecraft.extras.MinecraftHelp; import org.bukkit.command.CommandSender; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.component.DefaultValue; +import org.incendo.cloud.help.result.CommandEntry; +import org.incendo.cloud.suggestion.Suggestion; +import org.incendo.cloud.suggestion.SuggestionProvider; -import static cloud.commandframework.arguments.standard.StringParser.greedyStringParser; +import static org.incendo.cloud.parser.standard.StringParser.greedyStringParser; /** * Example that uses an annotated command to query commands. diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/PermissionExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/PermissionExample.java index 583f2b56..9829aac7 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/PermissionExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/PermissionExample.java @@ -24,13 +24,13 @@ package cloud.commandframework.examples.bukkit.builder.feature; import cloud.commandframework.bukkit.BukkitCommandManager; -import cloud.commandframework.context.CommandContext; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.builder.BuilderFeature; -import cloud.commandframework.execution.CommandExecutionHandler; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.context.CommandContext; +import org.incendo.cloud.execution.CommandExecutionHandler; /** * Example of a command with a permission attached to it. diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/RegexExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/RegexExample.java index 6bb00e70..996b5e1b 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/RegexExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/RegexExample.java @@ -23,16 +23,16 @@ // package cloud.commandframework.examples.bukkit.builder.feature; -import cloud.commandframework.arguments.preprocessor.RegexPreprocessor; import cloud.commandframework.bukkit.BukkitCommandManager; -import cloud.commandframework.captions.Caption; -import cloud.commandframework.captions.CaptionProvider; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.builder.BuilderFeature; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.caption.Caption; +import org.incendo.cloud.caption.CaptionProvider; +import org.incendo.cloud.component.preprocessor.RegexPreprocessor; import static net.kyori.adventure.text.Component.text; diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/StringArrayExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/StringArrayExample.java index cd76b41c..59b7e607 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/StringArrayExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/StringArrayExample.java @@ -23,14 +23,14 @@ // package cloud.commandframework.examples.bukkit.builder.feature; -import cloud.commandframework.Description; import cloud.commandframework.bukkit.BukkitCommandManager; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.builder.BuilderFeature; import org.bukkit.command.CommandSender; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.description.Description; -import static cloud.commandframework.arguments.standard.StringArrayParser.stringArrayParser; +import static org.incendo.cloud.parser.standard.StringArrayParser.stringArrayParser; /** * Example of a command that consumes the entire input in the form of an array. This is useful when delegating to existing diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/BlockPredicateExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/BlockPredicateExample.java index c2af7027..3b4657ed 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/BlockPredicateExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/BlockPredicateExample.java @@ -25,7 +25,6 @@ import cloud.commandframework.bukkit.BukkitCommandManager; import cloud.commandframework.bukkit.data.BlockPredicate; -import cloud.commandframework.context.CommandContext; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.builder.BuilderFeature; import org.bukkit.Location; @@ -35,10 +34,11 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.context.CommandContext; -import static cloud.commandframework.arguments.standard.IntegerParser.integerParser; import static cloud.commandframework.bukkit.parser.BlockPredicateParser.blockPredicateParser; import static cloud.commandframework.bukkit.parser.MaterialParser.materialParser; +import static org.incendo.cloud.parser.standard.IntegerParser.integerParser; /** * Example showcasing the block predicate parser. diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/ItemStackExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/ItemStackExample.java index 7fe2fc2b..e2a967c0 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/ItemStackExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/ItemStackExample.java @@ -23,17 +23,17 @@ // package cloud.commandframework.examples.bukkit.builder.feature.minecraft; -import cloud.commandframework.Description; import cloud.commandframework.bukkit.BukkitCommandManager; import cloud.commandframework.bukkit.data.ProtoItemStack; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.builder.BuilderFeature; -import cloud.commandframework.types.tuples.Pair; import io.leangen.geantyref.TypeToken; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.description.Description; +import org.incendo.cloud.type.tuple.Pair; /** * Example showcasing the use of the native item stack parser. diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/ItemStackPredicateExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/ItemStackPredicateExample.java index 5175a5bc..4995ced1 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/ItemStackPredicateExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/ItemStackPredicateExample.java @@ -26,11 +26,11 @@ import cloud.commandframework.bukkit.BukkitCommandManager; import cloud.commandframework.bukkit.data.ItemStackPredicate; import cloud.commandframework.bukkit.data.ProtoItemStack; -import cloud.commandframework.context.CommandContext; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.builder.BuilderFeature; import org.bukkit.command.CommandSender; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.context.CommandContext; import static cloud.commandframework.bukkit.parser.ItemStackParser.itemStackParser; import static cloud.commandframework.bukkit.parser.ItemStackPredicateParser.itemStackPredicateParser; diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/SelectorExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/SelectorExample.java index 794145f8..d5a89c04 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/SelectorExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/SelectorExample.java @@ -23,7 +23,6 @@ // package cloud.commandframework.examples.bukkit.builder.feature.minecraft; -import cloud.commandframework.Description; import cloud.commandframework.bukkit.BukkitCommandManager; import cloud.commandframework.bukkit.data.SingleEntitySelector; import cloud.commandframework.examples.bukkit.ExamplePlugin; @@ -32,6 +31,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.description.Description; import static cloud.commandframework.bukkit.parser.selector.SingleEntitySelectorParser.singleEntitySelectorParser; diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/TextColorExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/TextColorExample.java index 3399a42e..bb373b71 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/TextColorExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/TextColorExample.java @@ -35,7 +35,7 @@ import org.bukkit.command.CommandSender; import org.checkerframework.checker.nullness.qual.NonNull; -import static cloud.commandframework.CommandDescription.commandDescription; +import static cloud.commandframework.minecraft.extras.RichDescription.richDescription; import static cloud.commandframework.minecraft.extras.parser.TextColorParser.textColorParser; import static net.kyori.adventure.text.Component.text; @@ -52,12 +52,10 @@ public void registerFeature( manager.command( manager.commandBuilder("builder") .commandDescription( - commandDescription( - RichDescription.of(text( - "Sets the color scheme for '/example help'", - NamedTextColor.GREEN - )) - ) + richDescription(text( + "Sets the color scheme for '/example help'", + NamedTextColor.GREEN + )) ) .literal("helpcolors") .required( diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/feature/ProcessorExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/feature/ProcessorExample.java index 8dc7787f..12a19a70 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/feature/ProcessorExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/feature/ProcessorExample.java @@ -23,18 +23,18 @@ // package cloud.commandframework.examples.bukkit.feature; -import cloud.commandframework.Command; -import cloud.commandframework.CommandManager; -import cloud.commandframework.execution.postprocessor.CommandPostprocessingContext; -import cloud.commandframework.execution.postprocessor.CommandPostprocessor; -import cloud.commandframework.execution.preprocessor.CommandPreprocessingContext; -import cloud.commandframework.execution.preprocessor.CommandPreprocessor; -import cloud.commandframework.keys.CloudKey; -import cloud.commandframework.services.types.ConsumerService; import java.util.logging.Logger; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.Command; +import org.incendo.cloud.CommandManager; +import org.incendo.cloud.execution.postprocessor.CommandPostprocessingContext; +import org.incendo.cloud.execution.postprocessor.CommandPostprocessor; +import org.incendo.cloud.execution.preprocessor.CommandPreprocessingContext; +import org.incendo.cloud.execution.preprocessor.CommandPreprocessor; +import org.incendo.cloud.key.CloudKey; +import org.incendo.cloud.services.type.ConsumerService; /** * Example showcasing how to use the pre- & post-processing systems. 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 6afafd92..c28e287d 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 @@ -23,8 +23,6 @@ // package cloud.commandframework.examples.velocity; -import cloud.commandframework.SenderMapper; -import cloud.commandframework.execution.ExecutionCoordinator; import cloud.commandframework.minecraft.extras.MinecraftExceptionHandler; import cloud.commandframework.velocity.CloudInjectionModule; import cloud.commandframework.velocity.VelocityCommandManager; @@ -44,6 +42,8 @@ import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.TextColor; import org.checkerframework.checker.nullness.qual.NonNull; +import org.incendo.cloud.SenderMapper; +import org.incendo.cloud.execution.ExecutionCoordinator; @Plugin( id = "example-plugin",