feat: properly do the above

WiIIiam278 · Jun 19, 2024 · 6fc0a61 · 6fc0a61
1 parent 4dfabc2
commit 6fc0a61
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/bukkit/src/main/java/net/william278/uniform/bukkit/BukkitCommand.java b/bukkit/src/main/java/net/william278/uniform/bukkit/BukkitCommand.java
@@ -38,6 +38,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @SuppressWarnings("unused")
 public class BukkitCommand extends BaseCommand<CommandSender> {
@@ -78,12 +79,18 @@ public Impl(@NotNull Uniform uniform, @NotNull BukkitCommand command) {
             // Setup command properties
             this.setDescription(command.getDescription());
             this.setAliases(command.getAliases());
-            this.setUsage(command.build().getUsageText());
+            this.setUsage(getUsageText());
             if (permission != null) {
                 this.setPermission(permission.node());
             }
         }
 
+        @NotNull
+        private String getUsageText() {
+            return dispatcher.getSmartUsage(dispatcher.getRoot(), null).values().stream()
+                    .map("/%s"::formatted).collect(Collectors.joining("\n"));
+        }
+
         @SuppressWarnings("deprecation")
         @Override
         public boolean execute(@NotNull CommandSender commandSender, @NotNull String alias, @NotNull String[] args) {

diff --git a/paper/src/main/java/net/william278/uniform/paper/LegacyPaperCommand.java b/paper/src/main/java/net/william278/uniform/paper/LegacyPaperCommand.java
@@ -34,6 +34,7 @@
 
 import java.util.List;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 @SuppressWarnings("unused")
 public class LegacyPaperCommand extends BaseCommand<CommandSender> {
@@ -83,12 +84,18 @@ public Impl(@NotNull Uniform uniform, @NotNull LegacyPaperCommand command) {
             // Setup command properties
             this.setDescription(command.getDescription());
             this.setAliases(command.getAliases());
-            this.setUsage(command.build().getUsageText());
+            this.setUsage(getUsageText());
             if (permission != null) {
                 this.setPermission(permission.node());
             }
         }
 
+        @NotNull
+        private String getUsageText() {
+            return dispatcher.getSmartUsage(dispatcher.getRoot(), null).values().stream()
+                    .map("/%s"::formatted).collect(Collectors.joining("\n"));
+        }
+
         @SuppressWarnings("deprecation")
         @Override
         public boolean execute(@NotNull CommandSender commandSender, @NotNull String alias, @NotNull String[] args) {