From 844aa712d9bbee926f1a10ca636f65ad58facd9f Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Sun, 14 Jan 2024 15:44:09 -0700 Subject: [PATCH] Align parser/suggestion package names --- .../brigadier/CloudBrigadierManager.java | 2 +- .../brigadier/package-info.java | 2 +- .../CloudStringReader.java | 2 +- .../WrappedBrigadierParser.java | 2 +- .../brigadier/parser/package-info.java | 4 +++ .../CloudStringReaderTest.java | 2 +- .../bukkit/BukkitBrigadierMapper.java | 22 +++++++------- .../bukkit/BukkitCommandManager.java | 30 +++++++++---------- .../bukkit/BukkitCommandPreprocessor.java | 2 +- .../bukkit/BukkitParserParameters.java | 8 ++--- .../specifier/AllowEmptySelection.java | 4 +-- .../specifier/DefaultNamespace.java | 2 +- .../specifier/RequireExplicitNamespace.java | 2 +- .../BlockPredicateParser.java | 4 +-- .../EnchantmentParser.java | 2 +- .../{parsers => parser}/ItemStackParser.java | 4 +-- .../ItemStackPredicateParser.java | 4 +-- .../{parsers => parser}/MaterialParser.java | 2 +- .../NamespacedKeyParser.java | 2 +- .../OfflinePlayerParser.java | 2 +- .../{parsers => parser}/PlayerParser.java | 2 +- .../{parsers => parser}/WorldParser.java | 2 +- .../location/Location2D.java | 2 +- .../location/Location2DParser.java | 2 +- .../location/LocationCoordinate.java | 2 +- .../location/LocationCoordinateParser.java | 2 +- .../location/LocationCoordinateType.java | 2 +- .../location/LocationParser.java | 2 +- .../bukkit/parser/location/package-info.java | 4 +++ .../bukkit/parser/package-info.java | 4 +++ .../MultipleEntitySelectorParser.java | 2 +- .../MultiplePlayerSelectorParser.java | 4 +-- .../SelectorUnsupportedException.java | 2 +- .../selector/SelectorUtils.java | 4 +-- .../selector/SingleEntitySelectorParser.java | 2 +- .../selector/SinglePlayerSelectorParser.java | 4 +-- .../bukkit/parser/selector/package-info.java | 4 +++ .../bukkit/parsers/location/package-info.java | 4 --- .../bukkit/parsers/package-info.java | 4 --- .../bukkit/parsers/selector/package-info.java | 4 --- .../EnchantmentArgumentTest.java | 3 +- .../Location2DArgumentTest.java | 6 ++-- .../LocationArgumentTest.java | 4 +-- .../MaterialArgumentTest.java | 3 +- .../NamespacedKeyArgumentTest.java | 3 +- .../OfflinePlayerArgumentTest.java | 3 +- .../PlayerArgumentTest.java | 3 +- .../WorldArgumentTest.java | 3 +- .../bungee/BungeeCommandManager.java | 4 +-- .../{arguments => parser}/PlayerParser.java | 2 +- .../{arguments => parser}/ServerParser.java | 2 +- .../{arguments => parser}/package-info.java | 2 +- .../extras/{ => parser}/TextColorParser.java | 2 +- .../TextColorParserTest.java} | 4 +-- .../paper/PaperCommandManager.java | 4 +-- .../paper/parser/KeyedWorldParser.java | 2 +- .../AsyncCommandSuggestionListener.java | 2 +- ...igadierAsyncCommandSuggestionListener.java | 6 ++-- .../SuggestionListener.java | 2 +- .../SuggestionListenerFactory.java | 2 +- .../package-info.java | 2 +- .../tooltips/CompletionMapper.java | 2 +- .../tooltips/CompletionMapperFactory.java | 2 +- .../tooltips/NativeCompletionMapper.java | 2 +- .../tooltips/ReflectiveCompletionMapper.java | 2 +- .../suggestion/tooltips/package-info.java | 4 +++ .../suggestions/tooltips/package-info.java | 4 --- .../velocity/VelocityCommandManager.java | 4 +-- .../velocity/arguments/package-info.java | 4 --- .../{arguments => parser}/PlayerParser.java | 2 +- .../{arguments => parser}/ServerParser.java | 2 +- .../velocity/parser/package-info.java | 4 +++ .../feature/minecraft/LocationExample.java | 2 +- .../feature/AggregateCommandExample.java | 2 +- .../feature/CompoundArgumentExample.java | 2 +- .../bukkit/builder/feature/FlagExample.java | 4 +-- .../minecraft/BlockPredicateExample.java | 4 +-- .../minecraft/ItemStackPredicateExample.java | 4 +-- .../minecraft/NamespacedKeyExample.java | 2 +- .../feature/minecraft/SelectorExample.java | 2 +- .../feature/minecraft/TextColorExample.java | 2 +- .../examples/bungee/ExamplePlugin.java | 4 +-- .../velocity/ExampleVelocityPlugin.java | 4 +-- 83 files changed, 144 insertions(+), 146 deletions(-) rename cloud-brigadier/src/main/java/cloud/commandframework/brigadier/{argument => parser}/CloudStringReader.java (97%) rename cloud-brigadier/src/main/java/cloud/commandframework/brigadier/{argument => parser}/WrappedBrigadierParser.java (99%) create mode 100644 cloud-brigadier/src/main/java/cloud/commandframework/brigadier/parser/package-info.java rename cloud-brigadier/src/test/java/cloud/commandframework/brigadier/{argument => parser}/CloudStringReaderTest.java (98%) rename cloud-bukkit/src/main/java/cloud/commandframework/bukkit/{parsers => parser}/BlockPredicateParser.java (99%) rename cloud-bukkit/src/main/java/cloud/commandframework/bukkit/{parsers => parser}/EnchantmentParser.java (99%) rename cloud-bukkit/src/main/java/cloud/commandframework/bukkit/{parsers => parser}/ItemStackParser.java (99%) rename cloud-bukkit/src/main/java/cloud/commandframework/bukkit/{parsers => parser}/ItemStackPredicateParser.java (98%) rename cloud-bukkit/src/main/java/cloud/commandframework/bukkit/{parsers => parser}/MaterialParser.java (99%) rename cloud-bukkit/src/main/java/cloud/commandframework/bukkit/{parsers => parser}/NamespacedKeyParser.java (99%) rename cloud-bukkit/src/main/java/cloud/commandframework/bukkit/{parsers => parser}/OfflinePlayerParser.java (99%) rename cloud-bukkit/src/main/java/cloud/commandframework/bukkit/{parsers => parser}/PlayerParser.java (99%) rename cloud-bukkit/src/main/java/cloud/commandframework/bukkit/{parsers => parser}/WorldParser.java (98%) rename cloud-bukkit/src/main/java/cloud/commandframework/bukkit/{parsers => parser}/location/Location2D.java (97%) rename cloud-bukkit/src/main/java/cloud/commandframework/bukkit/{parsers => parser}/location/Location2DParser.java (99%) rename cloud-bukkit/src/main/java/cloud/commandframework/bukkit/{parsers => parser}/location/LocationCoordinate.java (98%) rename cloud-bukkit/src/main/java/cloud/commandframework/bukkit/{parsers => parser}/location/LocationCoordinateParser.java (98%) rename cloud-bukkit/src/main/java/cloud/commandframework/bukkit/{parsers => parser}/location/LocationCoordinateType.java (96%) rename cloud-bukkit/src/main/java/cloud/commandframework/bukkit/{parsers => parser}/location/LocationParser.java (99%) create mode 100644 cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/package-info.java create mode 100644 cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/package-info.java rename cloud-bukkit/src/main/java/cloud/commandframework/bukkit/{parsers => parser}/selector/MultipleEntitySelectorParser.java (98%) rename cloud-bukkit/src/main/java/cloud/commandframework/bukkit/{parsers => parser}/selector/MultiplePlayerSelectorParser.java (98%) rename cloud-bukkit/src/main/java/cloud/commandframework/bukkit/{parsers => parser}/selector/SelectorUnsupportedException.java (97%) rename cloud-bukkit/src/main/java/cloud/commandframework/bukkit/{parsers => parser}/selector/SelectorUtils.java (99%) rename cloud-bukkit/src/main/java/cloud/commandframework/bukkit/{parsers => parser}/selector/SingleEntitySelectorParser.java (98%) rename cloud-bukkit/src/main/java/cloud/commandframework/bukkit/{parsers => parser}/selector/SinglePlayerSelectorParser.java (97%) create mode 100644 cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/selector/package-info.java delete mode 100644 cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/package-info.java delete mode 100644 cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/package-info.java delete mode 100644 cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/package-info.java rename cloud-bukkit/src/test/java/cloud/commandframework/bukkit/{argument => parser}/EnchantmentArgumentTest.java (97%) rename cloud-bukkit/src/test/java/cloud/commandframework/bukkit/{argument => parser}/Location2DArgumentTest.java (95%) rename cloud-bukkit/src/test/java/cloud/commandframework/bukkit/{argument => parser}/LocationArgumentTest.java (97%) rename cloud-bukkit/src/test/java/cloud/commandframework/bukkit/{argument => parser}/MaterialArgumentTest.java (96%) rename cloud-bukkit/src/test/java/cloud/commandframework/bukkit/{argument => parser}/NamespacedKeyArgumentTest.java (97%) rename cloud-bukkit/src/test/java/cloud/commandframework/bukkit/{argument => parser}/OfflinePlayerArgumentTest.java (96%) rename cloud-bukkit/src/test/java/cloud/commandframework/bukkit/{argument => parser}/PlayerArgumentTest.java (96%) rename cloud-bukkit/src/test/java/cloud/commandframework/bukkit/{argument => parser}/WorldArgumentTest.java (96%) rename cloud-bungee/src/main/java/cloud/commandframework/bungee/{arguments => parser}/PlayerParser.java (98%) rename cloud-bungee/src/main/java/cloud/commandframework/bungee/{arguments => parser}/ServerParser.java (98%) rename cloud-bungee/src/main/java/cloud/commandframework/bungee/{arguments => parser}/package-info.java (95%) rename cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/{ => parser}/TextColorParser.java (99%) rename cloud-minecraft-extras/src/test/java/cloud/commandframework/minecraft/extras/{TextColorArgumentTest.java => parser/TextColorParserTest.java} (98%) rename cloud-paper/src/main/java/cloud/commandframework/paper/{suggestions => suggestion}/AsyncCommandSuggestionListener.java (98%) rename cloud-paper/src/main/java/cloud/commandframework/paper/{suggestions => suggestion}/BrigadierAsyncCommandSuggestionListener.java (94%) rename cloud-paper/src/main/java/cloud/commandframework/paper/{suggestions => suggestion}/SuggestionListener.java (96%) rename cloud-paper/src/main/java/cloud/commandframework/paper/{suggestions => suggestion}/SuggestionListenerFactory.java (98%) rename cloud-paper/src/main/java/cloud/commandframework/paper/{suggestions => suggestion}/package-info.java (52%) rename cloud-paper/src/main/java/cloud/commandframework/paper/{suggestions => suggestion}/tooltips/CompletionMapper.java (96%) rename cloud-paper/src/main/java/cloud/commandframework/paper/{suggestions => suggestion}/tooltips/CompletionMapperFactory.java (97%) rename cloud-paper/src/main/java/cloud/commandframework/paper/{suggestions => suggestion}/tooltips/NativeCompletionMapper.java (97%) rename cloud-paper/src/main/java/cloud/commandframework/paper/{suggestions => suggestion}/tooltips/ReflectiveCompletionMapper.java (98%) create mode 100644 cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/tooltips/package-info.java delete mode 100644 cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/tooltips/package-info.java delete mode 100644 cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/package-info.java rename cloud-velocity/src/main/java/cloud/commandframework/velocity/{arguments => parser}/PlayerParser.java (98%) rename cloud-velocity/src/main/java/cloud/commandframework/velocity/{arguments => parser}/ServerParser.java (98%) create mode 100644 cloud-velocity/src/main/java/cloud/commandframework/velocity/parser/package-info.java diff --git a/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/CloudBrigadierManager.java b/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/CloudBrigadierManager.java index 25925484..ef3035f0 100644 --- a/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/CloudBrigadierManager.java +++ b/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/CloudBrigadierManager.java @@ -43,7 +43,7 @@ import cloud.commandframework.brigadier.argument.BrigadierMapping; import cloud.commandframework.brigadier.argument.BrigadierMappingBuilder; import cloud.commandframework.brigadier.argument.BrigadierMappings; -import cloud.commandframework.brigadier.argument.WrappedBrigadierParser; +import cloud.commandframework.brigadier.parser.WrappedBrigadierParser; import cloud.commandframework.brigadier.node.LiteralBrigadierNodeFactory; import cloud.commandframework.brigadier.suggestion.TooltipSuggestion; import cloud.commandframework.context.CommandContext; diff --git a/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/package-info.java b/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/package-info.java index 992a73c3..bae35fce 100644 --- a/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/package-info.java +++ b/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/package-info.java @@ -5,7 +5,7 @@ * Cloud {@link cloud.commandframework.CommandTree command trees} to Brigadier nodes.

* *

To bridge Brigadier and Cloud argument types, an argument parser that wraps Brigadier argument types is available in - * {@link cloud.commandframework.brigadier.argument.WrappedBrigadierParser}. Other classes in that package allow constructing + * {@link cloud.commandframework.brigadier.parser.WrappedBrigadierParser}. Other classes in that package allow constructing * Brigadier {@link com.mojang.brigadier.StringReader} instances that can be used for efficient interoperability with * Brigadier.

*/ diff --git a/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/CloudStringReader.java b/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/parser/CloudStringReader.java similarity index 97% rename from cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/CloudStringReader.java rename to cloud-brigadier/src/main/java/cloud/commandframework/brigadier/parser/CloudStringReader.java index f2dcf751..9d6e554f 100644 --- a/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/CloudStringReader.java +++ b/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/parser/CloudStringReader.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.brigadier.argument; +package cloud.commandframework.brigadier.parser; import cloud.commandframework.context.CommandInput; import com.mojang.brigadier.StringReader; diff --git a/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/WrappedBrigadierParser.java b/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/parser/WrappedBrigadierParser.java similarity index 99% rename from cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/WrappedBrigadierParser.java rename to cloud-brigadier/src/main/java/cloud/commandframework/brigadier/parser/WrappedBrigadierParser.java index 7add6aa6..4b1cb447 100644 --- a/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/WrappedBrigadierParser.java +++ b/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/parser/WrappedBrigadierParser.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.brigadier.argument; +package cloud.commandframework.brigadier.parser; import cloud.commandframework.arguments.parser.ArgumentParseResult; import cloud.commandframework.arguments.parser.ArgumentParser; diff --git a/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/parser/package-info.java b/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/parser/package-info.java new file mode 100644 index 00000000..79799b04 --- /dev/null +++ b/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/parser/package-info.java @@ -0,0 +1,4 @@ +/** + * Argument parsers available on Brigadier platforms. + */ +package cloud.commandframework.brigadier.parser; diff --git a/cloud-brigadier/src/test/java/cloud/commandframework/brigadier/argument/CloudStringReaderTest.java b/cloud-brigadier/src/test/java/cloud/commandframework/brigadier/parser/CloudStringReaderTest.java similarity index 98% rename from cloud-brigadier/src/test/java/cloud/commandframework/brigadier/argument/CloudStringReaderTest.java rename to cloud-brigadier/src/test/java/cloud/commandframework/brigadier/parser/CloudStringReaderTest.java index d9028648..7b2443e9 100644 --- a/cloud-brigadier/src/test/java/cloud/commandframework/brigadier/argument/CloudStringReaderTest.java +++ b/cloud-brigadier/src/test/java/cloud/commandframework/brigadier/parser/CloudStringReaderTest.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.brigadier.argument; +package cloud.commandframework.brigadier.parser; import cloud.commandframework.context.CommandInput; import com.mojang.brigadier.StringReader; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitBrigadierMapper.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitBrigadierMapper.java index 691e9145..30430cfa 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitBrigadierMapper.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitBrigadierMapper.java @@ -29,17 +29,17 @@ import cloud.commandframework.bukkit.internal.CommandBuildContextSupplier; import cloud.commandframework.bukkit.internal.MinecraftArgumentTypes; import cloud.commandframework.bukkit.internal.RegistryReflection; -import cloud.commandframework.bukkit.parsers.BlockPredicateParser; -import cloud.commandframework.bukkit.parsers.EnchantmentParser; -import cloud.commandframework.bukkit.parsers.ItemStackParser; -import cloud.commandframework.bukkit.parsers.ItemStackPredicateParser; -import cloud.commandframework.bukkit.parsers.NamespacedKeyParser; -import cloud.commandframework.bukkit.parsers.location.Location2DParser; -import cloud.commandframework.bukkit.parsers.location.LocationParser; -import cloud.commandframework.bukkit.parsers.selector.MultipleEntitySelectorParser; -import cloud.commandframework.bukkit.parsers.selector.MultiplePlayerSelectorParser; -import cloud.commandframework.bukkit.parsers.selector.SingleEntitySelectorParser; -import cloud.commandframework.bukkit.parsers.selector.SinglePlayerSelectorParser; +import cloud.commandframework.bukkit.parser.BlockPredicateParser; +import cloud.commandframework.bukkit.parser.EnchantmentParser; +import cloud.commandframework.bukkit.parser.ItemStackParser; +import cloud.commandframework.bukkit.parser.ItemStackPredicateParser; +import cloud.commandframework.bukkit.parser.NamespacedKeyParser; +import cloud.commandframework.bukkit.parser.location.Location2DParser; +import cloud.commandframework.bukkit.parser.location.LocationParser; +import cloud.commandframework.bukkit.parser.selector.MultipleEntitySelectorParser; +import cloud.commandframework.bukkit.parser.selector.MultiplePlayerSelectorParser; +import cloud.commandframework.bukkit.parser.selector.SingleEntitySelectorParser; +import cloud.commandframework.bukkit.parser.selector.SinglePlayerSelectorParser; import com.mojang.brigadier.arguments.ArgumentType; import com.mojang.brigadier.arguments.StringArgumentType; import io.leangen.geantyref.GenericTypeReflector; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java index 40f98f72..492c85b5 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java @@ -36,21 +36,21 @@ import cloud.commandframework.bukkit.data.MultipleEntitySelector; import cloud.commandframework.bukkit.data.MultiplePlayerSelector; import cloud.commandframework.bukkit.internal.CraftBukkitReflection; -import cloud.commandframework.bukkit.parsers.BlockPredicateParser; -import cloud.commandframework.bukkit.parsers.EnchantmentParser; -import cloud.commandframework.bukkit.parsers.ItemStackParser; -import cloud.commandframework.bukkit.parsers.ItemStackPredicateParser; -import cloud.commandframework.bukkit.parsers.MaterialParser; -import cloud.commandframework.bukkit.parsers.NamespacedKeyParser; -import cloud.commandframework.bukkit.parsers.OfflinePlayerParser; -import cloud.commandframework.bukkit.parsers.PlayerParser; -import cloud.commandframework.bukkit.parsers.WorldParser; -import cloud.commandframework.bukkit.parsers.location.Location2DParser; -import cloud.commandframework.bukkit.parsers.location.LocationParser; -import cloud.commandframework.bukkit.parsers.selector.MultipleEntitySelectorParser; -import cloud.commandframework.bukkit.parsers.selector.MultiplePlayerSelectorParser; -import cloud.commandframework.bukkit.parsers.selector.SingleEntitySelectorParser; -import cloud.commandframework.bukkit.parsers.selector.SinglePlayerSelectorParser; +import cloud.commandframework.bukkit.parser.BlockPredicateParser; +import cloud.commandframework.bukkit.parser.EnchantmentParser; +import cloud.commandframework.bukkit.parser.ItemStackParser; +import cloud.commandframework.bukkit.parser.ItemStackPredicateParser; +import cloud.commandframework.bukkit.parser.MaterialParser; +import cloud.commandframework.bukkit.parser.NamespacedKeyParser; +import cloud.commandframework.bukkit.parser.OfflinePlayerParser; +import cloud.commandframework.bukkit.parser.PlayerParser; +import cloud.commandframework.bukkit.parser.WorldParser; +import cloud.commandframework.bukkit.parser.location.Location2DParser; +import cloud.commandframework.bukkit.parser.location.LocationParser; +import cloud.commandframework.bukkit.parser.selector.MultipleEntitySelectorParser; +import cloud.commandframework.bukkit.parser.selector.MultiplePlayerSelectorParser; +import cloud.commandframework.bukkit.parser.selector.SingleEntitySelectorParser; +import cloud.commandframework.bukkit.parser.selector.SinglePlayerSelectorParser; import cloud.commandframework.exceptions.ArgumentParseException; import cloud.commandframework.exceptions.CommandExecutionException; import cloud.commandframework.exceptions.InvalidCommandSenderException; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandPreprocessor.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandPreprocessor.java index 50daf9af..23d74cfb 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandPreprocessor.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandPreprocessor.java @@ -23,7 +23,7 @@ // package cloud.commandframework.bukkit; -import cloud.commandframework.brigadier.argument.WrappedBrigadierParser; +import cloud.commandframework.brigadier.parser.WrappedBrigadierParser; import cloud.commandframework.bukkit.internal.BukkitBackwardsBrigadierSenderMapper; import cloud.commandframework.execution.preprocessor.CommandPreprocessingContext; import cloud.commandframework.execution.preprocessor.CommandPreprocessor; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitParserParameters.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitParserParameters.java index a41b39b0..c279a9ff 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitParserParameters.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitParserParameters.java @@ -41,8 +41,8 @@ private BukkitParserParameters() { /** * Used to specify if an empty result is allowed for - * {@link cloud.commandframework.bukkit.parsers.selector.MultiplePlayerSelectorParser} and - * {@link cloud.commandframework.bukkit.parsers.selector.MultipleEntitySelectorParser}. + * {@link cloud.commandframework.bukkit.parser.selector.MultiplePlayerSelectorParser} and + * {@link cloud.commandframework.bukkit.parser.selector.MultipleEntitySelectorParser}. * * @since 1.8.0 */ @@ -51,7 +51,7 @@ private BukkitParserParameters() { create("allow_empty_selector_result", TypeToken.get(Boolean.class)); /** - * Sets to require explicit namespaces for {@link cloud.commandframework.bukkit.parsers.NamespacedKeyParser} + * Sets to require explicit namespaces for {@link cloud.commandframework.bukkit.parser.NamespacedKeyParser} * (i.e. 'test' will be rejected but 'test:test' will pass). * * @since 1.7.0 @@ -60,7 +60,7 @@ private BukkitParserParameters() { create("require_explicit_namespace", TypeToken.get(Boolean.class)); /** - * Sets a custom default namespace for {@link cloud.commandframework.bukkit.parsers.NamespacedKeyParser}. + * Sets a custom default namespace for {@link cloud.commandframework.bukkit.parser.NamespacedKeyParser}. * Without this annotation the default is {@link org.bukkit.NamespacedKey#MINECRAFT}. * * @since 1.7.0 diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/annotation/specifier/AllowEmptySelection.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/annotation/specifier/AllowEmptySelection.java index 45930c89..c36b37d3 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/annotation/specifier/AllowEmptySelection.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/annotation/specifier/AllowEmptySelection.java @@ -31,8 +31,8 @@ /** * Annotation used to specify if an empty result is allowed for - * {@link cloud.commandframework.bukkit.parsers.selector.MultiplePlayerSelectorParser} and - * {@link cloud.commandframework.bukkit.parsers.selector.MultipleEntitySelectorParser}. + * {@link cloud.commandframework.bukkit.parser.selector.MultiplePlayerSelectorParser} and + * {@link cloud.commandframework.bukkit.parser.selector.MultipleEntitySelectorParser}. * * @since 1.8.0 */ diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/annotation/specifier/DefaultNamespace.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/annotation/specifier/DefaultNamespace.java index 8c26d42e..c9ce1201 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/annotation/specifier/DefaultNamespace.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/annotation/specifier/DefaultNamespace.java @@ -30,7 +30,7 @@ import org.checkerframework.checker.nullness.qual.NonNull; /** - * Annotation used to set a custom namespace for {@link cloud.commandframework.bukkit.parsers.NamespacedKeyParser}. + * Annotation used to set a custom namespace for {@link cloud.commandframework.bukkit.parser.NamespacedKeyParser}. * Without this annotation, the default namespace is {@link org.bukkit.NamespacedKey#MINECRAFT}. * * @since 1.7.0 diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/annotation/specifier/RequireExplicitNamespace.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/annotation/specifier/RequireExplicitNamespace.java index cef7765d..6abd49cc 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/annotation/specifier/RequireExplicitNamespace.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/annotation/specifier/RequireExplicitNamespace.java @@ -29,7 +29,7 @@ import java.lang.annotation.Target; /** - * Annotation used to set {@link cloud.commandframework.bukkit.parsers.NamespacedKeyParser} to + * Annotation used to set {@link cloud.commandframework.bukkit.parser.NamespacedKeyParser} to * require explicit namespaces. * * @since 1.7.0 diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/BlockPredicateParser.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/BlockPredicateParser.java similarity index 99% rename from cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/BlockPredicateParser.java rename to cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/BlockPredicateParser.java index d70759b9..9b6cbc92 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/BlockPredicateParser.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/BlockPredicateParser.java @@ -21,14 +21,14 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.parsers; +package cloud.commandframework.bukkit.parser; import cloud.commandframework.CommandComponent; import cloud.commandframework.arguments.parser.ArgumentParseResult; import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.arguments.parser.ParserDescriptor; import cloud.commandframework.arguments.suggestion.SuggestionProvider; -import cloud.commandframework.brigadier.argument.WrappedBrigadierParser; +import cloud.commandframework.brigadier.parser.WrappedBrigadierParser; import cloud.commandframework.bukkit.BukkitCommandManager; import cloud.commandframework.bukkit.data.BlockPredicate; import cloud.commandframework.bukkit.internal.CommandBuildContextSupplier; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/EnchantmentParser.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/EnchantmentParser.java similarity index 99% rename from cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/EnchantmentParser.java rename to cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/EnchantmentParser.java index 395fc46f..1b4808e8 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/EnchantmentParser.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/EnchantmentParser.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.parsers; +package cloud.commandframework.bukkit.parser; import cloud.commandframework.CommandComponent; import cloud.commandframework.arguments.parser.ArgumentParseResult; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/ItemStackParser.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/ItemStackParser.java similarity index 99% rename from cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/ItemStackParser.java rename to cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/ItemStackParser.java index 3bf9b818..ad778dad 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/ItemStackParser.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/ItemStackParser.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.parsers; +package cloud.commandframework.bukkit.parser; import cloud.commandframework.CommandComponent; import cloud.commandframework.arguments.parser.ArgumentParseResult; @@ -29,7 +29,7 @@ import cloud.commandframework.arguments.parser.ParserDescriptor; import cloud.commandframework.arguments.suggestion.BlockingSuggestionProvider; import cloud.commandframework.arguments.suggestion.SuggestionProvider; -import cloud.commandframework.brigadier.argument.WrappedBrigadierParser; +import cloud.commandframework.brigadier.parser.WrappedBrigadierParser; import cloud.commandframework.bukkit.BukkitCommandManager; import cloud.commandframework.bukkit.data.ProtoItemStack; import cloud.commandframework.bukkit.internal.CommandBuildContextSupplier; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/ItemStackPredicateParser.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/ItemStackPredicateParser.java similarity index 98% rename from cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/ItemStackPredicateParser.java rename to cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/ItemStackPredicateParser.java index a8beade3..d06f0baa 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/ItemStackPredicateParser.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/ItemStackPredicateParser.java @@ -21,14 +21,14 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.parsers; +package cloud.commandframework.bukkit.parser; import cloud.commandframework.CommandComponent; import cloud.commandframework.arguments.parser.ArgumentParseResult; import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.arguments.parser.ParserDescriptor; import cloud.commandframework.arguments.suggestion.SuggestionProvider; -import cloud.commandframework.brigadier.argument.WrappedBrigadierParser; +import cloud.commandframework.brigadier.parser.WrappedBrigadierParser; import cloud.commandframework.bukkit.BukkitCommandManager; import cloud.commandframework.bukkit.data.ItemStackPredicate; import cloud.commandframework.bukkit.internal.CommandBuildContextSupplier; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/MaterialParser.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/MaterialParser.java similarity index 99% rename from cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/MaterialParser.java rename to cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/MaterialParser.java index e4891701..bce18687 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/MaterialParser.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/MaterialParser.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.parsers; +package cloud.commandframework.bukkit.parser; import cloud.commandframework.CommandComponent; import cloud.commandframework.arguments.parser.ArgumentParseResult; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/NamespacedKeyParser.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/NamespacedKeyParser.java similarity index 99% rename from cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/NamespacedKeyParser.java rename to cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/NamespacedKeyParser.java index cce059a4..97a51db6 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/NamespacedKeyParser.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/NamespacedKeyParser.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.parsers; +package cloud.commandframework.bukkit.parser; import cloud.commandframework.CommandComponent; import cloud.commandframework.arguments.parser.ArgumentParseResult; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerParser.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/OfflinePlayerParser.java similarity index 99% rename from cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerParser.java rename to cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/OfflinePlayerParser.java index d2534cef..da9deea1 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerParser.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/OfflinePlayerParser.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.parsers; +package cloud.commandframework.bukkit.parser; import cloud.commandframework.CommandComponent; import cloud.commandframework.arguments.parser.ArgumentParseResult; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/PlayerParser.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/PlayerParser.java similarity index 99% rename from cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/PlayerParser.java rename to cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/PlayerParser.java index 75fde206..14ac856c 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/PlayerParser.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/PlayerParser.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.parsers; +package cloud.commandframework.bukkit.parser; import cloud.commandframework.CommandComponent; import cloud.commandframework.arguments.parser.ArgumentParseResult; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/WorldParser.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/WorldParser.java similarity index 98% rename from cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/WorldParser.java rename to cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/WorldParser.java index 43313765..61581eb8 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/WorldParser.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/WorldParser.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.parsers; +package cloud.commandframework.bukkit.parser; import cloud.commandframework.CommandComponent; import cloud.commandframework.arguments.parser.ArgumentParseResult; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/Location2D.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/Location2D.java similarity index 97% rename from cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/Location2D.java rename to cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/Location2D.java index ae697524..a7e5d2da 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/Location2D.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/Location2D.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.parsers.location; +package cloud.commandframework.bukkit.parser.location; import org.bukkit.Location; import org.bukkit.World; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/Location2DParser.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/Location2DParser.java similarity index 99% rename from cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/Location2DParser.java rename to cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/Location2DParser.java index f0e023b4..37930062 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/Location2DParser.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/Location2DParser.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.parsers.location; +package cloud.commandframework.bukkit.parser.location; import cloud.commandframework.CommandComponent; import cloud.commandframework.arguments.parser.ArgumentParseResult; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationCoordinate.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/LocationCoordinate.java similarity index 98% rename from cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationCoordinate.java rename to cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/LocationCoordinate.java index 79034bd6..09a65b50 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationCoordinate.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/LocationCoordinate.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.parsers.location; +package cloud.commandframework.bukkit.parser.location; import java.util.Locale; import java.util.Objects; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationCoordinateParser.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/LocationCoordinateParser.java similarity index 98% rename from cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationCoordinateParser.java rename to cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/LocationCoordinateParser.java index d5709f77..8fc6dfbe 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationCoordinateParser.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/LocationCoordinateParser.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.parsers.location; +package cloud.commandframework.bukkit.parser.location; import cloud.commandframework.arguments.parser.ArgumentParseResult; import cloud.commandframework.arguments.parser.ArgumentParser; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationCoordinateType.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/LocationCoordinateType.java similarity index 96% rename from cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationCoordinateType.java rename to cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/LocationCoordinateType.java index 25f9e132..3f8579bf 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationCoordinateType.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/LocationCoordinateType.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.parsers.location; +package cloud.commandframework.bukkit.parser.location; /** * Type of location coordinates diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationParser.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/LocationParser.java similarity index 99% rename from cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationParser.java rename to cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/LocationParser.java index c0984e94..ea0968b6 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationParser.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/LocationParser.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.parsers.location; +package cloud.commandframework.bukkit.parser.location; import cloud.commandframework.CommandComponent; import cloud.commandframework.arguments.parser.ArgumentParseResult; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/package-info.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/package-info.java new file mode 100644 index 00000000..96891f60 --- /dev/null +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/package-info.java @@ -0,0 +1,4 @@ +/** + * Vanilla-like location arguments + */ +package cloud.commandframework.bukkit.parser.location; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/package-info.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/package-info.java new file mode 100644 index 00000000..d7ab220c --- /dev/null +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/package-info.java @@ -0,0 +1,4 @@ +/** + * Bukkit specific command arguments + */ +package cloud.commandframework.bukkit.parser; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultipleEntitySelectorParser.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/selector/MultipleEntitySelectorParser.java similarity index 98% rename from cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultipleEntitySelectorParser.java rename to cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/selector/MultipleEntitySelectorParser.java index 807dd9da..36c46e68 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultipleEntitySelectorParser.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/selector/MultipleEntitySelectorParser.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.parsers.selector; +package cloud.commandframework.bukkit.parser.selector; import cloud.commandframework.CommandComponent; import cloud.commandframework.arguments.parser.ParserDescriptor; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultiplePlayerSelectorParser.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/selector/MultiplePlayerSelectorParser.java similarity index 98% rename from cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultiplePlayerSelectorParser.java rename to cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/selector/MultiplePlayerSelectorParser.java index 2192550c..3d7e7833 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultiplePlayerSelectorParser.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/selector/MultiplePlayerSelectorParser.java @@ -21,13 +21,13 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.parsers.selector; +package cloud.commandframework.bukkit.parser.selector; import cloud.commandframework.CommandComponent; import cloud.commandframework.arguments.parser.ArgumentParseResult; import cloud.commandframework.arguments.parser.ParserDescriptor; import cloud.commandframework.bukkit.data.MultiplePlayerSelector; -import cloud.commandframework.bukkit.parsers.PlayerParser; +import cloud.commandframework.bukkit.parser.PlayerParser; import cloud.commandframework.context.CommandContext; import cloud.commandframework.context.CommandInput; import java.util.Collection; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SelectorUnsupportedException.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/selector/SelectorUnsupportedException.java similarity index 97% rename from cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SelectorUnsupportedException.java rename to cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/selector/SelectorUnsupportedException.java index 61d6ed04..749562d2 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SelectorUnsupportedException.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/selector/SelectorUnsupportedException.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.parsers.selector; +package cloud.commandframework.bukkit.parser.selector; import cloud.commandframework.bukkit.BukkitCaptionKeys; import cloud.commandframework.context.CommandContext; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SelectorUtils.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/selector/SelectorUtils.java similarity index 99% rename from cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SelectorUtils.java rename to cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/selector/SelectorUtils.java index e96f2d62..7a3d8dde 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SelectorUtils.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/selector/SelectorUtils.java @@ -21,13 +21,13 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.parsers.selector; +package cloud.commandframework.bukkit.parser.selector; import cloud.commandframework.arguments.parser.ArgumentParseResult; import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.arguments.suggestion.Suggestion; import cloud.commandframework.arguments.suggestion.SuggestionProvider; -import cloud.commandframework.brigadier.argument.WrappedBrigadierParser; +import cloud.commandframework.brigadier.parser.WrappedBrigadierParser; import cloud.commandframework.bukkit.BukkitCommandContextKeys; import cloud.commandframework.bukkit.internal.CraftBukkitReflection; import cloud.commandframework.bukkit.internal.MinecraftArgumentTypes; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SingleEntitySelectorParser.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/selector/SingleEntitySelectorParser.java similarity index 98% rename from cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SingleEntitySelectorParser.java rename to cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/selector/SingleEntitySelectorParser.java index aba37627..078e1a1b 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SingleEntitySelectorParser.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/selector/SingleEntitySelectorParser.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.parsers.selector; +package cloud.commandframework.bukkit.parser.selector; import cloud.commandframework.CommandComponent; import cloud.commandframework.arguments.parser.ParserDescriptor; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SinglePlayerSelectorParser.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/selector/SinglePlayerSelectorParser.java similarity index 97% rename from cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SinglePlayerSelectorParser.java rename to cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/selector/SinglePlayerSelectorParser.java index f0877e1b..964f0d72 100644 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SinglePlayerSelectorParser.java +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/selector/SinglePlayerSelectorParser.java @@ -21,13 +21,13 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.parsers.selector; +package cloud.commandframework.bukkit.parser.selector; import cloud.commandframework.CommandComponent; import cloud.commandframework.arguments.parser.ArgumentParseResult; import cloud.commandframework.arguments.parser.ParserDescriptor; import cloud.commandframework.bukkit.data.SinglePlayerSelector; -import cloud.commandframework.bukkit.parsers.PlayerParser; +import cloud.commandframework.bukkit.parser.PlayerParser; import cloud.commandframework.context.CommandContext; import cloud.commandframework.context.CommandInput; import java.util.concurrent.CompletableFuture; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/selector/package-info.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/selector/package-info.java new file mode 100644 index 00000000..4b0729c2 --- /dev/null +++ b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/selector/package-info.java @@ -0,0 +1,4 @@ +/** + * Entity Selector parsers + */ +package cloud.commandframework.bukkit.parser.selector; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/package-info.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/package-info.java deleted file mode 100644 index 384ad0b4..00000000 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Vanilla-like location arguments - */ -package cloud.commandframework.bukkit.parsers.location; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/package-info.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/package-info.java deleted file mode 100644 index 032242be..00000000 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Bukkit specific command arguments - */ -package cloud.commandframework.bukkit.parsers; diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/package-info.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/package-info.java deleted file mode 100644 index 5b22d088..00000000 --- a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Entity Selector parsers - */ -package cloud.commandframework.bukkit.parsers.selector; diff --git a/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/EnchantmentArgumentTest.java b/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/EnchantmentArgumentTest.java similarity index 97% rename from cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/EnchantmentArgumentTest.java rename to cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/EnchantmentArgumentTest.java index 69a92e58..59c26342 100644 --- a/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/EnchantmentArgumentTest.java +++ b/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/EnchantmentArgumentTest.java @@ -21,10 +21,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.argument; +package cloud.commandframework.bukkit.parser; import cloud.commandframework.arguments.parser.ArgumentParseResult; -import cloud.commandframework.bukkit.parsers.EnchantmentParser; import cloud.commandframework.bukkit.util.ServerTest; import cloud.commandframework.context.CommandInput; import java.lang.reflect.Field; diff --git a/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/Location2DArgumentTest.java b/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/Location2DArgumentTest.java similarity index 95% rename from cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/Location2DArgumentTest.java rename to cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/Location2DArgumentTest.java index 766518ad..ddda5242 100644 --- a/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/Location2DArgumentTest.java +++ b/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/Location2DArgumentTest.java @@ -21,11 +21,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.argument; +package cloud.commandframework.bukkit.parser; import cloud.commandframework.arguments.parser.ArgumentParseResult; -import cloud.commandframework.bukkit.parsers.location.Location2D; -import cloud.commandframework.bukkit.parsers.location.Location2DParser; +import cloud.commandframework.bukkit.parser.location.Location2D; +import cloud.commandframework.bukkit.parser.location.Location2DParser; import cloud.commandframework.bukkit.util.ServerTest; import cloud.commandframework.context.CommandInput; import java.util.Collections; diff --git a/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/LocationArgumentTest.java b/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/LocationArgumentTest.java similarity index 97% rename from cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/LocationArgumentTest.java rename to cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/LocationArgumentTest.java index e9c9aadd..1f933db9 100644 --- a/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/LocationArgumentTest.java +++ b/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/LocationArgumentTest.java @@ -21,10 +21,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.argument; +package cloud.commandframework.bukkit.parser; import cloud.commandframework.arguments.parser.ArgumentParseResult; -import cloud.commandframework.bukkit.parsers.location.LocationParser; +import cloud.commandframework.bukkit.parser.location.LocationParser; import cloud.commandframework.bukkit.util.ServerTest; import cloud.commandframework.context.CommandInput; import java.util.Collections; diff --git a/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/MaterialArgumentTest.java b/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/MaterialArgumentTest.java similarity index 96% rename from cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/MaterialArgumentTest.java rename to cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/MaterialArgumentTest.java index 88bce053..9a977741 100644 --- a/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/MaterialArgumentTest.java +++ b/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/MaterialArgumentTest.java @@ -21,10 +21,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.argument; +package cloud.commandframework.bukkit.parser; import cloud.commandframework.arguments.parser.ArgumentParseResult; -import cloud.commandframework.bukkit.parsers.MaterialParser; import cloud.commandframework.bukkit.util.ServerTest; import cloud.commandframework.context.CommandInput; import java.util.Locale; diff --git a/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/NamespacedKeyArgumentTest.java b/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/NamespacedKeyArgumentTest.java similarity index 97% rename from cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/NamespacedKeyArgumentTest.java rename to cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/NamespacedKeyArgumentTest.java index bc969689..793784b6 100644 --- a/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/NamespacedKeyArgumentTest.java +++ b/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/NamespacedKeyArgumentTest.java @@ -21,11 +21,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.argument; +package cloud.commandframework.bukkit.parser; import cloud.commandframework.arguments.parser.ArgumentParseResult; import cloud.commandframework.bukkit.BukkitCommandManager; -import cloud.commandframework.bukkit.parsers.NamespacedKeyParser; import cloud.commandframework.context.CommandContext; import cloud.commandframework.context.CommandInput; import cloud.commandframework.context.StandardCommandContextFactory; diff --git a/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/OfflinePlayerArgumentTest.java b/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/OfflinePlayerArgumentTest.java similarity index 96% rename from cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/OfflinePlayerArgumentTest.java rename to cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/OfflinePlayerArgumentTest.java index 5cdf4390..48484fab 100644 --- a/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/OfflinePlayerArgumentTest.java +++ b/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/OfflinePlayerArgumentTest.java @@ -21,10 +21,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.argument; +package cloud.commandframework.bukkit.parser; import cloud.commandframework.arguments.parser.ArgumentParseResult; -import cloud.commandframework.bukkit.parsers.OfflinePlayerParser; import cloud.commandframework.bukkit.util.ServerTest; import cloud.commandframework.context.CommandInput; import com.google.common.truth.Truth; diff --git a/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/PlayerArgumentTest.java b/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/PlayerArgumentTest.java similarity index 96% rename from cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/PlayerArgumentTest.java rename to cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/PlayerArgumentTest.java index f18630cc..8fbef034 100644 --- a/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/PlayerArgumentTest.java +++ b/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/PlayerArgumentTest.java @@ -21,10 +21,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.argument; +package cloud.commandframework.bukkit.parser; import cloud.commandframework.arguments.parser.ArgumentParseResult; -import cloud.commandframework.bukkit.parsers.PlayerParser; import cloud.commandframework.bukkit.util.ServerTest; import cloud.commandframework.context.CommandInput; import org.bukkit.command.CommandSender; diff --git a/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/WorldArgumentTest.java b/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/WorldArgumentTest.java similarity index 96% rename from cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/WorldArgumentTest.java rename to cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/WorldArgumentTest.java index 72a87eaa..c522d54f 100644 --- a/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/argument/WorldArgumentTest.java +++ b/cloud-bukkit/src/test/java/cloud/commandframework/bukkit/parser/WorldArgumentTest.java @@ -21,10 +21,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bukkit.argument; +package cloud.commandframework.bukkit.parser; import cloud.commandframework.arguments.parser.ArgumentParseResult; -import cloud.commandframework.bukkit.parsers.WorldParser; import cloud.commandframework.bukkit.util.ServerTest; import cloud.commandframework.context.CommandInput; import org.bukkit.World; diff --git a/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommandManager.java b/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommandManager.java index 60850946..989e536c 100644 --- a/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommandManager.java +++ b/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommandManager.java @@ -26,8 +26,8 @@ import cloud.commandframework.CommandManager; import cloud.commandframework.SenderMapper; import cloud.commandframework.SenderMapperHolder; -import cloud.commandframework.bungee.arguments.PlayerParser; -import cloud.commandframework.bungee.arguments.ServerParser; +import cloud.commandframework.bungee.parser.PlayerParser; +import cloud.commandframework.bungee.parser.ServerParser; import cloud.commandframework.captions.FactoryDelegatingCaptionRegistry; import cloud.commandframework.exceptions.ArgumentParseException; import cloud.commandframework.exceptions.CommandExecutionException; diff --git a/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/PlayerParser.java b/cloud-bungee/src/main/java/cloud/commandframework/bungee/parser/PlayerParser.java similarity index 98% rename from cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/PlayerParser.java rename to cloud-bungee/src/main/java/cloud/commandframework/bungee/parser/PlayerParser.java index 02b46792..dea5b3db 100644 --- a/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/PlayerParser.java +++ b/cloud-bungee/src/main/java/cloud/commandframework/bungee/parser/PlayerParser.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bungee.arguments; +package cloud.commandframework.bungee.parser; import cloud.commandframework.CommandComponent; import cloud.commandframework.arguments.parser.ArgumentParseResult; diff --git a/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/ServerParser.java b/cloud-bungee/src/main/java/cloud/commandframework/bungee/parser/ServerParser.java similarity index 98% rename from cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/ServerParser.java rename to cloud-bungee/src/main/java/cloud/commandframework/bungee/parser/ServerParser.java index e3cbf792..98e898c5 100644 --- a/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/ServerParser.java +++ b/cloud-bungee/src/main/java/cloud/commandframework/bungee/parser/ServerParser.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.bungee.arguments; +package cloud.commandframework.bungee.parser; import cloud.commandframework.CommandComponent; import cloud.commandframework.arguments.parser.ArgumentParseResult; diff --git a/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/package-info.java b/cloud-bungee/src/main/java/cloud/commandframework/bungee/parser/package-info.java similarity index 95% rename from cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/package-info.java rename to cloud-bungee/src/main/java/cloud/commandframework/bungee/parser/package-info.java index 6ebc2018..4417e735 100644 --- a/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/package-info.java +++ b/cloud-bungee/src/main/java/cloud/commandframework/bungee/parser/package-info.java @@ -24,4 +24,4 @@ /** * Bungee specific argument types */ -package cloud.commandframework.bungee.arguments; +package cloud.commandframework.bungee.parser; diff --git a/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/TextColorParser.java b/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/parser/TextColorParser.java similarity index 99% rename from cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/TextColorParser.java rename to cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/parser/TextColorParser.java index a137254b..e267e6e4 100644 --- a/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/TextColorParser.java +++ b/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/parser/TextColorParser.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.minecraft.extras; +package cloud.commandframework.minecraft.extras.parser; import cloud.commandframework.CommandComponent; import cloud.commandframework.arguments.parser.ArgumentParseResult; diff --git a/cloud-minecraft-extras/src/test/java/cloud/commandframework/minecraft/extras/TextColorArgumentTest.java b/cloud-minecraft-extras/src/test/java/cloud/commandframework/minecraft/extras/parser/TextColorParserTest.java similarity index 98% rename from cloud-minecraft-extras/src/test/java/cloud/commandframework/minecraft/extras/TextColorArgumentTest.java rename to cloud-minecraft-extras/src/test/java/cloud/commandframework/minecraft/extras/parser/TextColorParserTest.java index 1a85c0ce..fa258ef3 100644 --- a/cloud-minecraft-extras/src/test/java/cloud/commandframework/minecraft/extras/TextColorArgumentTest.java +++ b/cloud-minecraft-extras/src/test/java/cloud/commandframework/minecraft/extras/parser/TextColorParserTest.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.minecraft.extras; +package cloud.commandframework.minecraft.extras.parser; import cloud.commandframework.arguments.parser.ArgumentParseResult; import cloud.commandframework.context.CommandContext; @@ -44,7 +44,7 @@ import static org.junit.jupiter.params.provider.Arguments.arguments; @ExtendWith(MockitoExtension.class) -class TextColorArgumentTest { +class TextColorParserTest { @Mock private CommandContext commandContext; diff --git a/cloud-paper/src/main/java/cloud/commandframework/paper/PaperCommandManager.java b/cloud-paper/src/main/java/cloud/commandframework/paper/PaperCommandManager.java index b9028c00..62258f4f 100644 --- a/cloud-paper/src/main/java/cloud/commandframework/paper/PaperCommandManager.java +++ b/cloud-paper/src/main/java/cloud/commandframework/paper/PaperCommandManager.java @@ -30,8 +30,8 @@ import cloud.commandframework.bukkit.BukkitCommandManager; import cloud.commandframework.bukkit.CloudBukkitCapabilities; import cloud.commandframework.execution.ExecutionCoordinator; -import cloud.commandframework.paper.suggestions.SuggestionListener; -import cloud.commandframework.paper.suggestions.SuggestionListenerFactory; +import cloud.commandframework.paper.suggestion.SuggestionListener; +import cloud.commandframework.paper.suggestion.SuggestionListenerFactory; import cloud.commandframework.state.RegistrationState; import java.util.concurrent.Executor; import org.apiguardian.api.API; diff --git a/cloud-paper/src/main/java/cloud/commandframework/paper/parser/KeyedWorldParser.java b/cloud-paper/src/main/java/cloud/commandframework/paper/parser/KeyedWorldParser.java index f4df1842..02dce66d 100644 --- a/cloud-paper/src/main/java/cloud/commandframework/paper/parser/KeyedWorldParser.java +++ b/cloud-paper/src/main/java/cloud/commandframework/paper/parser/KeyedWorldParser.java @@ -30,7 +30,7 @@ import cloud.commandframework.arguments.suggestion.Suggestion; import cloud.commandframework.arguments.suggestion.SuggestionProvider; import cloud.commandframework.bukkit.internal.CraftBukkitReflection; -import cloud.commandframework.bukkit.parsers.WorldParser; +import cloud.commandframework.bukkit.parser.WorldParser; import cloud.commandframework.context.CommandContext; import cloud.commandframework.context.CommandInput; import java.util.ArrayList; diff --git a/cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/AsyncCommandSuggestionListener.java b/cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/AsyncCommandSuggestionListener.java similarity index 98% rename from cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/AsyncCommandSuggestionListener.java rename to cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/AsyncCommandSuggestionListener.java index 5ac5c1c3..add86a08 100644 --- a/cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/AsyncCommandSuggestionListener.java +++ b/cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/AsyncCommandSuggestionListener.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.paper.suggestions; +package cloud.commandframework.paper.suggestion; import cloud.commandframework.arguments.suggestion.Suggestion; import cloud.commandframework.arguments.suggestion.Suggestions; diff --git a/cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/BrigadierAsyncCommandSuggestionListener.java b/cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/BrigadierAsyncCommandSuggestionListener.java similarity index 94% rename from cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/BrigadierAsyncCommandSuggestionListener.java rename to cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/BrigadierAsyncCommandSuggestionListener.java index f139d72c..13942d6c 100644 --- a/cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/BrigadierAsyncCommandSuggestionListener.java +++ b/cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/BrigadierAsyncCommandSuggestionListener.java @@ -21,14 +21,14 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.paper.suggestions; +package cloud.commandframework.paper.suggestion; import cloud.commandframework.arguments.suggestion.SuggestionFactory; import cloud.commandframework.arguments.suggestion.Suggestions; import cloud.commandframework.brigadier.suggestion.TooltipSuggestion; import cloud.commandframework.paper.PaperCommandManager; -import cloud.commandframework.paper.suggestions.tooltips.CompletionMapper; -import cloud.commandframework.paper.suggestions.tooltips.CompletionMapperFactory; +import cloud.commandframework.paper.suggestion.tooltips.CompletionMapper; +import cloud.commandframework.paper.suggestion.tooltips.CompletionMapperFactory; import cloud.commandframework.util.StringUtils; import com.destroystokyo.paper.event.server.AsyncTabCompleteEvent; import java.util.Objects; diff --git a/cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/SuggestionListener.java b/cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/SuggestionListener.java similarity index 96% rename from cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/SuggestionListener.java rename to cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/SuggestionListener.java index ddbbd145..886f1bb5 100644 --- a/cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/SuggestionListener.java +++ b/cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/SuggestionListener.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.paper.suggestions; +package cloud.commandframework.paper.suggestion; import org.apiguardian.api.API; import org.bukkit.event.Listener; diff --git a/cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/SuggestionListenerFactory.java b/cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/SuggestionListenerFactory.java similarity index 98% rename from cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/SuggestionListenerFactory.java rename to cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/SuggestionListenerFactory.java index 4b7da54d..9cc4b367 100644 --- a/cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/SuggestionListenerFactory.java +++ b/cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/SuggestionListenerFactory.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.paper.suggestions; +package cloud.commandframework.paper.suggestion; import cloud.commandframework.paper.PaperCommandManager; import net.kyori.adventure.audience.Audience; diff --git a/cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/package-info.java b/cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/package-info.java similarity index 52% rename from cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/package-info.java rename to cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/package-info.java index d60b31d6..ed00d88b 100644 --- a/cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/package-info.java +++ b/cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/package-info.java @@ -1,4 +1,4 @@ /** * Hooks for the asynchronous completion event. */ -package cloud.commandframework.paper.suggestions; +package cloud.commandframework.paper.suggestion; diff --git a/cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/tooltips/CompletionMapper.java b/cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/tooltips/CompletionMapper.java similarity index 96% rename from cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/tooltips/CompletionMapper.java rename to cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/tooltips/CompletionMapper.java index b9d8ca73..ca2e585e 100644 --- a/cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/tooltips/CompletionMapper.java +++ b/cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/tooltips/CompletionMapper.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.paper.suggestions.tooltips; +package cloud.commandframework.paper.suggestion.tooltips; import cloud.commandframework.brigadier.suggestion.TooltipSuggestion; import com.destroystokyo.paper.event.server.AsyncTabCompleteEvent; diff --git a/cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/tooltips/CompletionMapperFactory.java b/cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/tooltips/CompletionMapperFactory.java similarity index 97% rename from cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/tooltips/CompletionMapperFactory.java rename to cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/tooltips/CompletionMapperFactory.java index 3dd25829..af519177 100644 --- a/cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/tooltips/CompletionMapperFactory.java +++ b/cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/tooltips/CompletionMapperFactory.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.paper.suggestions.tooltips; +package cloud.commandframework.paper.suggestion.tooltips; import net.kyori.adventure.audience.Audience; import org.apiguardian.api.API; diff --git a/cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/tooltips/NativeCompletionMapper.java b/cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/tooltips/NativeCompletionMapper.java similarity index 97% rename from cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/tooltips/NativeCompletionMapper.java rename to cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/tooltips/NativeCompletionMapper.java index 46c0a24d..8f31d8c8 100644 --- a/cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/tooltips/NativeCompletionMapper.java +++ b/cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/tooltips/NativeCompletionMapper.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.paper.suggestions.tooltips; +package cloud.commandframework.paper.suggestion.tooltips; import cloud.commandframework.brigadier.suggestion.TooltipSuggestion; import com.destroystokyo.paper.event.server.AsyncTabCompleteEvent; diff --git a/cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/tooltips/ReflectiveCompletionMapper.java b/cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/tooltips/ReflectiveCompletionMapper.java similarity index 98% rename from cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/tooltips/ReflectiveCompletionMapper.java rename to cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/tooltips/ReflectiveCompletionMapper.java index 6e312ce1..bc680bb2 100644 --- a/cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/tooltips/ReflectiveCompletionMapper.java +++ b/cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/tooltips/ReflectiveCompletionMapper.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.paper.suggestions.tooltips; +package cloud.commandframework.paper.suggestion.tooltips; import cloud.commandframework.brigadier.suggestion.TooltipSuggestion; import cloud.commandframework.bukkit.internal.CraftBukkitReflection; diff --git a/cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/tooltips/package-info.java b/cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/tooltips/package-info.java new file mode 100644 index 00000000..35bde9bb --- /dev/null +++ b/cloud-paper/src/main/java/cloud/commandframework/paper/suggestion/tooltips/package-info.java @@ -0,0 +1,4 @@ +/** + * Tools for providing tooltips to suggestions. + */ +package cloud.commandframework.paper.suggestion.tooltips; diff --git a/cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/tooltips/package-info.java b/cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/tooltips/package-info.java deleted file mode 100644 index 4209c17a..00000000 --- a/cloud-paper/src/main/java/cloud/commandframework/paper/suggestions/tooltips/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Tools for providing tooltips to suggestions. - */ -package cloud.commandframework.paper.suggestions.tooltips; diff --git a/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandManager.java b/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandManager.java index 38db18cc..a8274cd4 100644 --- a/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandManager.java +++ b/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandManager.java @@ -40,8 +40,8 @@ import cloud.commandframework.exceptions.handling.ExceptionContext; import cloud.commandframework.exceptions.handling.ExceptionHandler; import cloud.commandframework.execution.ExecutionCoordinator; -import cloud.commandframework.velocity.arguments.PlayerParser; -import cloud.commandframework.velocity.arguments.ServerParser; +import cloud.commandframework.velocity.parser.PlayerParser; +import cloud.commandframework.velocity.parser.ServerParser; import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.Singleton; diff --git a/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/package-info.java b/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/package-info.java deleted file mode 100644 index e221c197..00000000 --- a/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Velocity specific argument types - */ -package cloud.commandframework.velocity.arguments; diff --git a/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/PlayerParser.java b/cloud-velocity/src/main/java/cloud/commandframework/velocity/parser/PlayerParser.java similarity index 98% rename from cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/PlayerParser.java rename to cloud-velocity/src/main/java/cloud/commandframework/velocity/parser/PlayerParser.java index a772f19b..c2e7b00d 100644 --- a/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/PlayerParser.java +++ b/cloud-velocity/src/main/java/cloud/commandframework/velocity/parser/PlayerParser.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.velocity.arguments; +package cloud.commandframework.velocity.parser; import cloud.commandframework.CommandComponent; import cloud.commandframework.arguments.parser.ArgumentParseResult; diff --git a/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/ServerParser.java b/cloud-velocity/src/main/java/cloud/commandframework/velocity/parser/ServerParser.java similarity index 98% rename from cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/ServerParser.java rename to cloud-velocity/src/main/java/cloud/commandframework/velocity/parser/ServerParser.java index d71aa928..d089416e 100644 --- a/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/ServerParser.java +++ b/cloud-velocity/src/main/java/cloud/commandframework/velocity/parser/ServerParser.java @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -package cloud.commandframework.velocity.arguments; +package cloud.commandframework.velocity.parser; import cloud.commandframework.CommandComponent; import cloud.commandframework.arguments.parser.ArgumentParseResult; diff --git a/cloud-velocity/src/main/java/cloud/commandframework/velocity/parser/package-info.java b/cloud-velocity/src/main/java/cloud/commandframework/velocity/parser/package-info.java new file mode 100644 index 00000000..5c9ed5f6 --- /dev/null +++ b/cloud-velocity/src/main/java/cloud/commandframework/velocity/parser/package-info.java @@ -0,0 +1,4 @@ +/** + * Velocity specific argument types + */ +package cloud.commandframework.velocity.parser; 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 34a523c8..a4c86dcd 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 @@ -27,7 +27,7 @@ import cloud.commandframework.annotations.Argument; import cloud.commandframework.annotations.Command; import cloud.commandframework.annotations.Default; -import cloud.commandframework.bukkit.parsers.location.Location2D; +import cloud.commandframework.bukkit.parser.location.Location2D; import cloud.commandframework.examples.bukkit.ExamplePlugin; import cloud.commandframework.examples.bukkit.annotations.AnnotationFeature; import org.bukkit.Chunk; 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 d07bbc1f..c76ac817 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 @@ -49,7 +49,7 @@ 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.parsers.WorldParser.worldParser; +import static cloud.commandframework.bukkit.parser.WorldParser.worldParser; /** * Example showcasing the aggregate command parser system. 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 770f9ed9..1e64a765 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 @@ -37,7 +37,7 @@ import org.bukkit.util.Vector; import org.checkerframework.checker.nullness.qual.NonNull; -import static cloud.commandframework.bukkit.parsers.WorldParser.worldParser; +import static cloud.commandframework.bukkit.parser.WorldParser.worldParser; public final class CompoundArgumentExample implements BuilderFeature { 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 e9b41252..da0146a6 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 @@ -39,8 +39,8 @@ import static cloud.commandframework.arguments.standard.EnumParser.enumParser; import static cloud.commandframework.arguments.standard.IntegerParser.integerParser; -import static cloud.commandframework.bukkit.parsers.EnchantmentParser.enchantmentParser; -import static cloud.commandframework.bukkit.parsers.MaterialParser.materialParser; +import static cloud.commandframework.bukkit.parser.EnchantmentParser.enchantmentParser; +import static cloud.commandframework.bukkit.parser.MaterialParser.materialParser; /** * Example that showcases command flags with values. 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 614ee568..c2af7027 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 @@ -37,8 +37,8 @@ import org.checkerframework.checker.nullness.qual.NonNull; import static cloud.commandframework.arguments.standard.IntegerParser.integerParser; -import static cloud.commandframework.bukkit.parsers.BlockPredicateParser.blockPredicateParser; -import static cloud.commandframework.bukkit.parsers.MaterialParser.materialParser; +import static cloud.commandframework.bukkit.parser.BlockPredicateParser.blockPredicateParser; +import static cloud.commandframework.bukkit.parser.MaterialParser.materialParser; /** * Example showcasing the block predicate 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 7097af38..5175a5bc 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 @@ -32,8 +32,8 @@ import org.bukkit.command.CommandSender; import org.checkerframework.checker.nullness.qual.NonNull; -import static cloud.commandframework.bukkit.parsers.ItemStackParser.itemStackParser; -import static cloud.commandframework.bukkit.parsers.ItemStackPredicateParser.itemStackPredicateParser; +import static cloud.commandframework.bukkit.parser.ItemStackParser.itemStackParser; +import static cloud.commandframework.bukkit.parser.ItemStackPredicateParser.itemStackPredicateParser; /** * Example showcasing the item stack predicate parser. diff --git a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/NamespacedKeyExample.java b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/NamespacedKeyExample.java index 0f2ef67b..3c490105 100644 --- a/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/NamespacedKeyExample.java +++ b/examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/builder/feature/minecraft/NamespacedKeyExample.java @@ -30,7 +30,7 @@ import org.bukkit.command.CommandSender; import org.checkerframework.checker.nullness.qual.NonNull; -import static cloud.commandframework.bukkit.parsers.NamespacedKeyParser.namespacedKeyParser; +import static cloud.commandframework.bukkit.parser.NamespacedKeyParser.namespacedKeyParser; /** * Example showcasing the namespaced key parser. 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 0be229b1..794145f8 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 @@ -33,7 +33,7 @@ import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.NonNull; -import static cloud.commandframework.bukkit.parsers.selector.SingleEntitySelectorParser.singleEntitySelectorParser; +import static cloud.commandframework.bukkit.parser.selector.SingleEntitySelectorParser.singleEntitySelectorParser; /** * Example showcasing how to work with entity selectors. 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 2b249d9e..6d706c92 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 @@ -36,7 +36,7 @@ import org.checkerframework.checker.nullness.qual.NonNull; import static cloud.commandframework.CommandDescription.commandDescription; -import static cloud.commandframework.minecraft.extras.TextColorParser.textColorParser; +import static cloud.commandframework.minecraft.extras.parser.TextColorParser.textColorParser; import static net.kyori.adventure.text.Component.text; /** 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 510f1b36..6e5aca64 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 @@ -26,8 +26,8 @@ import cloud.commandframework.Description; import cloud.commandframework.SenderMapper; import cloud.commandframework.bungee.BungeeCommandManager; -import cloud.commandframework.bungee.arguments.PlayerParser; -import cloud.commandframework.bungee.arguments.ServerParser; +import cloud.commandframework.bungee.parser.PlayerParser; +import cloud.commandframework.bungee.parser.ServerParser; import cloud.commandframework.execution.ExecutionCoordinator; import cloud.commandframework.minecraft.extras.MinecraftExceptionHandler; import cloud.commandframework.minecraft.extras.RichDescription; 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 0b01fc1f..6afafd92 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 @@ -28,8 +28,8 @@ import cloud.commandframework.minecraft.extras.MinecraftExceptionHandler; import cloud.commandframework.velocity.CloudInjectionModule; import cloud.commandframework.velocity.VelocityCommandManager; -import cloud.commandframework.velocity.arguments.PlayerParser; -import cloud.commandframework.velocity.arguments.ServerParser; +import cloud.commandframework.velocity.parser.PlayerParser; +import cloud.commandframework.velocity.parser.ServerParser; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Key;