Add argument length limit.

toxicity188 · Nov 9, 2024 · ebe11d3 · ebe11d3
1 parent 168d199
commit ebe11d3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,7 +6,7 @@ allprojects {
     apply(plugin = "java")
 
     group = "kr.toxicity.command"
-    version = "1.0"
+    version = "1.1"
 
     repositories {
         mavenCentral()

diff --git a/core/src/main/java/kr/toxicity/command/CommandModule.java b/core/src/main/java/kr/toxicity/command/CommandModule.java
@@ -136,8 +136,15 @@ public final class CommandModule<W extends BetterCommandSource> implements Comma
 
     @Override
     public @NotNull Component usage(@NotNull W w) {
+        String args;
+        var size = arguments.size();
+        if (size <= 6) {
+            args = arguments.stream().map(CommandArgument::name).collect(Collectors.joining("\n"));
+        } else {
+            args = arguments.subList(0, 6).stream().map(CommandArgument::name).collect(Collectors.joining("\n")) + "\n+" + (size - 6);
+        }
         return component(w, CHILDREN)
-                .hoverEvent(HoverEvent.showText(Component.text(arguments.stream().map(CommandArgument::name).collect(Collectors.joining(", ")))));
+                .hoverEvent(HoverEvent.showText(Component.text(args)));
     }
 
     public @NotNull CommandModule<W> executes(@NotNull CommandListener executor) {

diff --git a/core/src/main/java/kr/toxicity/command/MethodExecutor.java b/core/src/main/java/kr/toxicity/command/MethodExecutor.java
@@ -252,8 +252,16 @@ private record UsageGetter<T>(@NotNull CommandMessage message, @NotNull Function
         var index = 0;
         var last = usage.size() - 1;
         for (UsageGetter<W> commandMessage : usage) {
+            var suggests = commandMessage.suggests.apply(w);
+            var size = suggests.size();
+            String args;
+            if (size <= 6) {
+                args = String.join("\n", suggests);
+            } else {
+                args = String.join("\n", suggests.subList(0, 6)) + "\n+" + (size - 6);
+            }
             builder.append(root.registry.find(w, commandMessage.message)
-                    .hoverEvent(HoverEvent.showText(Component.text(String.join(", ", commandMessage.suggests.apply(w))))));
+                    .hoverEvent(HoverEvent.showText(Component.text(args))));
             if (index++ < last) builder.append(Component.space());
         }
         return builder.build();

diff --git a/test-plugin/src/main/java/kr/toxicity/command/test/CommandTest.java b/test-plugin/src/main/java/kr/toxicity/command/test/CommandTest.java
@@ -126,6 +126,12 @@ public void die(@Source BetterCommandSource me) {
                         ((Player) me.audience()).damage(9999);
                         me.audience().sendMessage(Component.text("Good bye!"));
                     }
+                    @Command
+                    @Description(key = "test.child.test", defaultValue = "Test command.")
+                    @Permission("test.child.test")
+                    public void test(@Source BetterCommandSource me, String sender, @Vararg @Option String argus) {
+                        me.audience().sendMessage(Component.text(sender + ": " + argus));
+                    }
                 }
         ));
         for (LiteralArgumentBuilder<CommandSourceStack> builder : command.<CommandSourceStack>build(p -> {