Commands: add mode change for visual tab-complete

Flectone · Oct 7, 2023 · f756021 · f756021
1 parent c497dd3
commit f756021
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 6 deletions.
diff --git a/src/main/java/net/flectone/commands/CommandFirstonline.java b/src/main/java/net/flectone/commands/CommandFirstonline.java
@@ -48,7 +48,7 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
         wordsList.clear();
 
         if (strings.length == 1) {
-            isOfflinePlayer(strings[0]);
+            isConfigOnlineModePlayer(strings[0]);
         }
 
         Collections.sort(wordsList);

diff --git a/src/main/java/net/flectone/commands/CommandIgnore.java b/src/main/java/net/flectone/commands/CommandIgnore.java
@@ -61,7 +61,7 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
         wordsList.clear();
 
         if (strings.length == 1) {
-            isOfflinePlayer(strings[0]);
+            isConfigOnlineModePlayer(strings[0]);
         }
 
         Collections.sort(wordsList);

diff --git a/src/main/java/net/flectone/commands/CommandMsg.java b/src/main/java/net/flectone/commands/CommandMsg.java
@@ -87,7 +87,7 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
         wordsList.clear();
 
         switch (strings.length){
-            case 1 -> isOfflinePlayer(strings[0]);
+            case 1 -> isConfigOnlineModePlayer(strings[0]);
             case 2 -> isTabCompleteMessage(strings[1]);
         }
 

diff --git a/src/main/java/net/flectone/commands/CommandMute.java b/src/main/java/net/flectone/commands/CommandMute.java
@@ -96,7 +96,7 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
         wordsList.clear();
 
         switch (strings.length){
-            case 1 -> isOfflinePlayer(strings[0]);
+            case 1 -> isConfigOnlineModePlayer(strings[0]);
             case 2 -> isFormatString(strings[1]);
             case 3 -> isTabCompleteMessage(strings[2], "tab-complete.reason");
         }

diff --git a/src/main/java/net/flectone/commands/CommandTempban.java b/src/main/java/net/flectone/commands/CommandTempban.java
@@ -95,7 +95,7 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
         wordsList.clear();
 
         switch (strings.length) {
-            case 1 -> isOfflinePlayer(strings[0]);
+            case 1 -> isConfigOnlineModePlayer(strings[0]);
             case 2 -> {
                 isFormatString(strings[1]);
                 isStartsWith(strings[1], "permanent");

diff --git a/src/main/java/net/flectone/commands/CommandWarn.java b/src/main/java/net/flectone/commands/CommandWarn.java
@@ -101,7 +101,7 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
         wordsList.clear();
 
         switch (strings.length){
-            case 1 -> isOfflinePlayer(strings[0]);
+            case 1 -> isConfigOnlineModePlayer(strings[0]);
             case 2 -> isFormatString(strings[1]);
             case 3 -> isTabCompleteMessage(strings[2], "tab-complete.reason");
         }

diff --git a/src/main/java/net/flectone/misc/commands/FTabCompleter.java b/src/main/java/net/flectone/misc/commands/FTabCompleter.java
@@ -40,6 +40,15 @@ default void isFileKey(@NotNull FYamlConfiguration file, @NotNull String arg) {
                 .forEachOrdered(key -> isStartsWith(arg, key));
     }
 
+    default void isConfigOnlineModePlayer(@NotNull String arg) {
+        if (FileManager.config.getString("command." + getCommandName() + ".tab-complete-mode").equals("offline")) {
+            isOfflinePlayer(arg);
+            return;
+        }
+
+        isOnlinePlayer(arg);
+    }
+
     default void isOfflinePlayer(@NotNull String arg) {
         offlinePlayerList.parallelStream().forEachOrdered(offlinePlayer -> isStartsWith(arg, offlinePlayer));
     }

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -235,6 +235,9 @@ command:
     announce: true
     count-for-ban: 3
 
+    # Command tab-complete mode: offline/online
+    tab-complete-mode: "offline"
+
   warnlist:
     enable: true
     per-page: 4
@@ -271,6 +274,9 @@ command:
   firstonline:
     enable: true
 
+    # Command tab-complete mode: offline/online
+    tab-complete-mode: "offline"
+
   flectonechat:
     enable: true
 
@@ -282,6 +288,9 @@ command:
   ignore:
     enable: true
 
+    # Command tab-complete mode: offline/online
+    tab-complete-mode: "offline"
+
   ignorelist:
     enable: true
     per-page: 4
@@ -312,10 +321,16 @@ command:
   msg:
     enable: true
 
+    # (only for visual) Command tab-complete mode: offline/online
+    tab-complete-mode: "offline"
+
   mute:
     enable: true
     announce: true
 
+    # (only for visual) Command tab-complete mode: offline/online
+    tab-complete-mode: "offline"
+
   mutelist:
     enable: true
     per-page: 4
@@ -350,6 +365,9 @@ command:
     enable: true
     announce: true
 
+    # (only for visual) Command tab-complete mode: offline/online
+    tab-complete-mode: "offline"
+
   tic-tac-toe:
     enable: true