Commands: add tab complete locale message

Flectone · Aug 14, 2023 · 69d1fbd · 69d1fbd
1 parent 1d94777
commit 69d1fbd
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 12 deletions.
diff --git a/src/main/java/net/flectone/commands/CommandBall.java b/src/main/java/net/flectone/commands/CommandBall.java
@@ -45,7 +45,7 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
         wordsList.clear();
 
         if (strings.length == 1) {
-            isStartsWith(strings[0], "(message)");
+            isTabCompleteMessage(strings[0]);
         }
 
         Collections.sort(wordsList);

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

diff --git a/src/main/java/net/flectone/commands/CommandFlectonechat.java b/src/main/java/net/flectone/commands/CommandFlectonechat.java
@@ -99,8 +99,8 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
             }
             case 2 -> {
                 switch (strings[0].toLowerCase()) {
-                    case "config" -> addKeysFile(config, strings[1]);
-                    case "locale" -> addKeysFile(locale, strings[1]);
+                    case "config" -> isFileKey(config, strings[1]);
+                    case "locale" -> isFileKey(locale, strings[1]);
                 }
             }
             case 3 -> isStartsWith(strings[2], "set");

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

diff --git a/src/main/java/net/flectone/commands/CommandMail.java b/src/main/java/net/flectone/commands/CommandMail.java
@@ -72,7 +72,7 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
 
         switch (strings.length){
             case 1 -> isOfflinePlayer(strings[0]);
-            case 2 -> isStartsWith(strings[1], "(message)");
+            case 2 -> isTabCompleteMessage(strings[1]);
         }
 
         Collections.sort(wordsList);

diff --git a/src/main/java/net/flectone/commands/CommandMe.java b/src/main/java/net/flectone/commands/CommandMe.java
@@ -38,7 +38,7 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
         wordsList.clear();
 
         if (strings.length == 1) {
-            isStartsWith(strings[0], "(message)");
+            isTabCompleteMessage(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
@@ -73,7 +73,7 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
 
         switch (strings.length){
             case 1 -> isOfflinePlayer(strings[0]);
-            case 2 -> isStartsWith(strings[1], "(message)");
+            case 2 -> isTabCompleteMessage(strings[1]);
         }
 
         Collections.sort(wordsList);

diff --git a/src/main/java/net/flectone/commands/CommandPoll.java b/src/main/java/net/flectone/commands/CommandPoll.java
@@ -109,7 +109,7 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
                     isStartsWith(strings[0], "create");
             }
             case 2 -> {
-                if (strings[0].equalsIgnoreCase("create")) isStartsWith(strings[1], "(message)");
+                if (strings[0].equalsIgnoreCase("create")) isTabCompleteMessage(strings[1]);
                 else PollManager.getPollList()
                             .parallelStream()
                             .filter(poll -> !poll.isExpired())

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

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

diff --git a/src/main/java/net/flectone/misc/commands/FTabCompleter.java b/src/main/java/net/flectone/misc/commands/FTabCompleter.java
@@ -2,6 +2,7 @@
 
 import net.flectone.integrations.supervanish.FSuperVanish;
 import net.flectone.managers.FPlayerManager;
+import net.flectone.managers.FileManager;
 import net.flectone.misc.files.FYamlConfiguration;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Bukkit;
@@ -25,7 +26,7 @@ default void isStartsWith(@NotNull String arg, @NotNull String string) {
         }
     }
 
-    default void addKeysFile(@NotNull FYamlConfiguration file, @NotNull String arg) {
+    default void isFileKey(@NotNull FYamlConfiguration file, @NotNull String arg) {
         file.getKeys(true).parallelStream()
                 .filter(key -> !file.getString(key).contains("root='FYamlConfiguration'"))
                 .forEachOrdered(key -> isStartsWith(arg, key));
@@ -54,4 +55,8 @@ default void isFormatString(@NotNull String arg) {
                     }
                 });
     }
+
+    default void isTabCompleteMessage(@NotNull String arg) {
+        isStartsWith(arg, FileManager.locale.getString("tab-complete.message"));
+    }
 }
diff --git a/src/main/resources/language/en.yml b/src/main/resources/language/en.yml
@@ -90,6 +90,9 @@ chat:
     prefix: "!"
     message: "<player>&&2 » <message>"
 
+tab-complete:
+  message: "(message)"
+
 command:
   null-player: "#ff4e4e⁉ This player does not exist"
   not-support-console: "#ff4e4e⁉ This command is not possible in console"

diff --git a/src/main/resources/language/ru.yml b/src/main/resources/language/ru.yml
@@ -90,6 +90,9 @@ chat:
     prefix: "!"
     message: "<player>&&2 » <message>"
 
+tab-complete:
+  message: "(сообщение)"
+
 command:
   null-player: "#ff4e4e⁉ Этот игрок не существует"
   not-support-console: "#ff4e4e⁉ Данная команда невозможна в консоли"