Update for cloud changes

Incendo · Jan 22, 2024 · 1ca59e3 · 1ca59e3
1 parent 9f248f5
commit 1ca59e3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/...dier/src/main/java/cloud/commandframework/brigadier/node/LiteralBrigadierNodeFactory.java b/...dier/src/main/java/cloud/commandframework/brigadier/node/LiteralBrigadierNodeFactory.java
@@ -25,7 +25,7 @@
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.CommandManager;
-import cloud.commandframework.arguments.aggregate.AggregateCommandParser;
+import cloud.commandframework.arguments.aggregate.AggregateParser;
 import cloud.commandframework.arguments.parser.ArgumentParser;
 import cloud.commandframework.arguments.parser.MappedArgumentParser;
 import cloud.commandframework.arguments.suggestion.SuggestionFactory;
@@ -148,8 +148,8 @@ public LiteralBrigadierNodeFactory(
             final @NonNull BrigadierPermissionChecker<C> permissionChecker,
             final com.mojang.brigadier.@NonNull Command<S> executor
     ) {
-        if (root.component().parser() instanceof AggregateCommandParser) {
-            final AggregateCommandParser<C, ?> aggregateParser = (AggregateCommandParser<C, ?>) root.component().parser();
+        if (root.component().parser() instanceof AggregateParser) {
+            final AggregateParser<C, ?> aggregateParser = (AggregateParser<C, ?>) root.component().parser();
             return this.constructAggregateNode(
                     aggregateParser,
                     root,
@@ -204,7 +204,7 @@ public LiteralBrigadierNodeFactory(
     }
 
     private @NonNull ArgumentBuilder<S, ?> constructAggregateNode(
-            final @NonNull AggregateCommandParser<C, ?> aggregateParser,
+            final @NonNull AggregateParser<C, ?> aggregateParser,
             final cloud.commandframework.internal.@NonNull CommandNode<C> root,
             final @NonNull BrigadierPermissionChecker<C> permissionChecker,
             final com.mojang.brigadier.@NonNull Command<S> executor

diff --git a/.../src/test/java/cloud/commandframework/brigadier/node/LiteralBrigadierNodeFactoryTest.java b/.../src/test/java/cloud/commandframework/brigadier/node/LiteralBrigadierNodeFactoryTest.java
@@ -26,7 +26,7 @@
 import cloud.commandframework.Command;
 import cloud.commandframework.CommandManager;
 import cloud.commandframework.SenderMapper;
-import cloud.commandframework.arguments.aggregate.AggregateCommandParser;
+import cloud.commandframework.arguments.aggregate.AggregateParser;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.suggestion.Suggestion;
 import cloud.commandframework.brigadier.CloudBrigadierManager;
@@ -151,7 +151,7 @@ void testAggregate() {
                 .literal("literal")
                 .required(
                         "aggregate",
-                        AggregateCommandParser.builder()
+                        AggregateParser.builder()
                                 .withComponent("integer", integerParser(0, 10))
                                 .withComponent("string", greedyStringParser())
                                 .withDirectMapper(

diff --git a/.../java/cloud/commandframework/examples/bukkit/builder/feature/AggregateCommandExample.java b/.../java/cloud/commandframework/examples/bukkit/builder/feature/AggregateCommandExample.java
@@ -25,7 +25,7 @@
 
 import cloud.commandframework.CommandManager;
 import cloud.commandframework.arguments.DefaultValue;
-import cloud.commandframework.arguments.aggregate.AggregateCommandParser;
+import cloud.commandframework.arguments.aggregate.AggregateParser;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.suggestion.BlockingSuggestionProvider;
 import cloud.commandframework.arguments.suggestion.Suggestion;
@@ -66,7 +66,7 @@ public void registerFeature(
     }
 
     private void registerLocationExample(final CommandManager<CommandSender> manager) {
-        final AggregateCommandParser<CommandSender, Location> locationParser = AggregateCommandParser.<CommandSender>builder()
+        final AggregateParser<CommandSender, Location> locationParser = AggregateParser.<CommandSender>builder()
                 .withComponent("world", worldParser())
                 .withComponent("x", integerParser())
                 .withComponent("y", integerParser())
@@ -96,8 +96,8 @@ private void registerLocationExample(final CommandManager<CommandSender> manager
     }
 
     private void registerRenameExample(final CommandManager<CommandSender> manager) {
-        final AggregateCommandParser<CommandSender, Pair<Integer, String>> parser =
-                AggregateCommandParser.<CommandSender>builder()
+        final AggregateParser<CommandSender, Pair<Integer, String>> parser =
+                AggregateParser.<CommandSender>builder()
                         .withComponent("slot", integerParser(), this.slotSuggestions())
                         .withComponent("name", stringParser(), this.nameSuggestions())
                         .withMapper(new TypeToken<Pair<Integer, String>>(){}, (commandContext, context) -> {