Merge pull request #37 from C0D3-M4513R/command-suggestion

funkemunky · Oct 17, 2023 · 9f66570 · 9f66570
2 parents 5f0b279 + dde81b0
commit 9f66570
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 11 deletions.
diff --git a/Assembly/pom.xml b/Assembly/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.9.1</version>
+        <version>1.9.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/Bukkit/pom.xml b/Bukkit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.9.1</version>
+        <version>1.9.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>dev.brighten.antivpn</groupId>
             <artifactId>Common</artifactId>
-            <version>1.9.1</version>
+            <version>1.9.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/Bungee/pom.xml b/Bungee/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.9.1</version>
+        <version>1.9.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>dev.brighten.antivpn</groupId>
             <artifactId>Common</artifactId>
-            <version>1.9.1</version>
+            <version>1.9.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/Common/pom.xml b/Common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.9.1</version>
+        <version>1.9.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/Sponge/pom.xml b/Sponge/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.9.1</version>
+        <version>1.9.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>dev.brighten.antivpn</groupId>
             <artifactId>Common</artifactId>
-            <version>1.9.1</version>
+            <version>1.9.2</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/Velocity/pom.xml b/Velocity/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.9.1</version>
+        <version>1.9.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>dev.brighten.antivpn</groupId>
             <artifactId>Common</artifactId>
-            <version>1.9.1</version>
+            <version>1.9.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/Velocity/src/main/java/dev/brighten/antivpn/velocity/command/VelocityCommand.java b/Velocity/src/main/java/dev/brighten/antivpn/velocity/command/VelocityCommand.java
@@ -12,6 +12,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 public class VelocityCommand implements SimpleCommand {
@@ -78,7 +79,10 @@ public List<String> suggest(Invocation invocation) {
                             .mapToObj(i -> args[i + 1]).toArray(String[]::new));
                 }
             }
+        }else if (children.length > 0){ // && args.length == 0 is always true here
+            return Arrays.stream(children).map(Command::name).collect(Collectors.toList());
         }
+
         return command.tabComplete(new VelocityCommandExecutor(sender), "alias", args);
     }
 

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>dev.brighten.antivpn</groupId>
     <artifactId>AntiVPN</artifactId>
     <packaging>pom</packaging>
-    <version>1.9.1</version>
+    <version>1.9.2</version>
 
     <modules>
         <module>Common</module>