Commands: set FTabCompleter to interface

Flectone · Aug 8, 2023 · f4cb7d0 · f4cb7d0
1 parent 1ed620a
commit f4cb7d0
Show file tree

Hide file tree

Showing 32 changed files with 239 additions and 184 deletions.
diff --git a/src/main/java/net/flectone/commands/CommandAfk.java b/src/main/java/net/flectone/commands/CommandAfk.java
@@ -13,11 +13,7 @@
 
 import java.util.List;
 
-public class CommandAfk extends FTabCompleter {
-
-    public CommandAfk() {
-        super.commandName = "afk";
-    }
+public class CommandAfk implements FTabCompleter {
 
     public static void setAfkFalse(@NotNull Player player) {
         FPlayer afkPlayer = FPlayerManager.getPlayer(player);
@@ -65,4 +61,10 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
     public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
         return wordsList;
     }
+
+    @NotNull
+    @Override
+    public String getCommandName() {
+        return "afk";
+    }
 }
diff --git a/src/main/java/net/flectone/commands/CommandBall.java b/src/main/java/net/flectone/commands/CommandBall.java
@@ -13,11 +13,7 @@
 import java.util.List;
 import java.util.Random;
 
-public class CommandBall extends FTabCompleter {
-
-    public CommandBall() {
-        super.commandName = "ball";
-    }
+public class CommandBall implements FTabCompleter {
 
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
@@ -55,4 +51,10 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
 
         return wordsList;
     }
+
+    @NotNull
+    @Override
+    public String getCommandName() {
+        return "ball";
+    }
 }
diff --git a/src/main/java/net/flectone/commands/CommandBanlist.java b/src/main/java/net/flectone/commands/CommandBanlist.java
@@ -22,11 +22,7 @@
 import java.util.List;
 import java.util.Set;
 
-public class CommandBanlist extends FTabCompleter {
-
-    public CommandBanlist() {
-        super.commandName = "banlist";
-    }
+public class CommandBanlist implements FTabCompleter {
 
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
@@ -143,4 +139,10 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
 
         return wordsList;
     }
+
+    @NotNull
+    @Override
+    public String getCommandName() {
+        return "banlist";
+    }
 }
diff --git a/src/main/java/net/flectone/commands/CommandBroadcast.java b/src/main/java/net/flectone/commands/CommandBroadcast.java
@@ -14,11 +14,7 @@
 import java.util.HashSet;
 import java.util.List;
 
-public class CommandBroadcast extends FTabCompleter {
-
-    public CommandBroadcast() {
-        super.commandName = "broadcast";
-    }
+public class CommandBroadcast implements FTabCompleter {
 
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
@@ -50,4 +46,10 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
 
         return wordsList;
     }
+
+    @NotNull
+    @Override
+    public String getCommandName() {
+        return "broadcast";
+    }
 }
diff --git a/src/main/java/net/flectone/commands/CommandChat.java b/src/main/java/net/flectone/commands/CommandChat.java
@@ -10,11 +10,7 @@
 
 import java.util.List;
 
-public class CommandChat extends FTabCompleter {
-
-    public CommandChat() {
-        super.commandName = "chat";
-    }
+public class CommandChat implements FTabCompleter {
 
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
@@ -69,4 +65,10 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
 
         return wordsList;
     }
+
+    @NotNull
+    @Override
+    public String getCommandName() {
+        return "try";
+    }
 }
diff --git a/src/main/java/net/flectone/commands/CommandChatcolor.java b/src/main/java/net/flectone/commands/CommandChatcolor.java
@@ -13,11 +13,7 @@
 import java.util.Collections;
 import java.util.List;
 
-public class CommandChatcolor extends FTabCompleter {
-
-    public CommandChatcolor() {
-        super.commandName = "chatcolor";
-    }
+public class CommandChatcolor implements FTabCompleter {
 
     @NotNull
     public static String[] getDefaultColors() {
@@ -88,4 +84,10 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
 
         return wordsList;
     }
+
+    @NotNull
+    @Override
+    public String getCommandName() {
+        return "chatcolor";
+    }
 }
diff --git a/src/main/java/net/flectone/commands/CommandClearChat.java b/src/main/java/net/flectone/commands/CommandClearChat.java
@@ -9,11 +9,7 @@
 
 import java.util.List;
 
-public class CommandClearChat extends FTabCompleter {
-
-    public CommandClearChat() {
-        super.commandName = "clear-chat";
-    }
+public class CommandClearChat implements FTabCompleter {
 
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
@@ -35,4 +31,10 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
     public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
         return wordsList;
     }
+
+    @NotNull
+    @Override
+    public String getCommandName() {
+        return "clear-chat";
+    }
 }
diff --git a/...flectone/commands/CommandFirstOnline.java → ...flectone/commands/CommandFirstonline.java b/...flectone/commands/CommandFirstOnline.java → ...flectone/commands/CommandFirstonline.java
@@ -13,11 +13,7 @@
 import java.util.Collections;
 import java.util.List;
 
-public class CommandFirstOnline extends FTabCompleter {
-
-    public CommandFirstOnline() {
-        super.commandName = "firstonline";
-    }
+public class CommandFirstonline implements FTabCompleter {
 
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
@@ -59,4 +55,10 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
 
         return wordsList;
     }
+
+    @NotNull
+    @Override
+    public String getCommandName() {
+        return "firstonline";
+    }
 }
diff --git a/src/main/java/net/flectone/commands/CommandFlectonechat.java b/src/main/java/net/flectone/commands/CommandFlectonechat.java
@@ -19,11 +19,7 @@
 import java.util.Collections;
 import java.util.List;
 
-public class CommandFlectonechat extends FTabCompleter {
-
-    public CommandFlectonechat() {
-        super.commandName = "flectonechat";
-    }
+public class CommandFlectonechat implements FTabCompleter {
 
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
@@ -95,25 +91,23 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
     public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
         wordsList.clear();
 
-        if (strings.length == 1) {
-            isStartsWith(strings[0], "reload");
-            isStartsWith(strings[0], "config");
-            isStartsWith(strings[0], "locale");
-        } else if (strings.length == 2) {
-
-            if (strings[0].equalsIgnoreCase("config")) {
-                addKeysFile(Main.config, strings[1]);
+        switch (strings.length) {
+            case 1 -> {
+                isStartsWith(strings[0], "reload");
+                isStartsWith(strings[0], "config");
+                isStartsWith(strings[0], "locale");
             }
-            if (strings[0].equalsIgnoreCase("locale")) {
-                addKeysFile(Main.locale, strings[1]);
+            case 2 -> {
+                switch (strings[0].toLowerCase()) {
+                    case "config", "locale" -> addKeysFile(Main.config, strings[1]);
+                }
+            }
+            case 3 -> isStartsWith(strings[2], "set");
+            case 4 -> {
+                isStartsWith(strings[3], "string");
+                isStartsWith(strings[3], "integer");
+                isStartsWith(strings[3], "boolean");
             }
-
-        } else if (strings.length == 3) {
-            isStartsWith(strings[2], "set");
-        } else if (strings.length == 4) {
-            isStartsWith(strings[3], "string");
-            isStartsWith(strings[3], "integer");
-            isStartsWith(strings[3], "boolean");
         }
 
         Collections.sort(wordsList);
@@ -128,4 +122,10 @@ private Object getObject(String objectName, String arg) {
             default -> arg;
         };
     }
+
+    @NotNull
+    @Override
+    public String getCommandName() {
+        return "flectonechat";
+    }
 }
diff --git a/src/main/java/net/flectone/commands/CommandHelper.java b/src/main/java/net/flectone/commands/CommandHelper.java
@@ -16,11 +16,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-public class CommandHelper extends FTabCompleter {
-
-    public CommandHelper() {
-        super.commandName = "helper";
-    }
+public class CommandHelper implements FTabCompleter {
 
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
@@ -65,4 +61,10 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
 
         return wordsList;
     }
+
+    @NotNull
+    @Override
+    public String getCommandName() {
+        return "helper";
+    }
 }
diff --git a/src/main/java/net/flectone/commands/CommandIgnore.java b/src/main/java/net/flectone/commands/CommandIgnore.java
@@ -13,11 +13,7 @@
 import java.util.Collections;
 import java.util.List;
 
-public class CommandIgnore extends FTabCompleter {
-
-    public CommandIgnore() {
-        super.commandName = "ignore";
-    }
+public class CommandIgnore implements FTabCompleter {
 
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
@@ -69,4 +65,10 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
 
         return wordsList;
     }
+
+    @NotNull
+    @Override
+    public String getCommandName() {
+        return "ignore";
+    }
 }
diff --git a/src/main/java/net/flectone/commands/CommandIgnoreList.java b/src/main/java/net/flectone/commands/CommandIgnoreList.java
@@ -13,11 +13,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class CommandIgnoreList extends FTabCompleter {
-
-    public CommandIgnoreList() {
-        super.commandName = "ignore-list";
-    }
+public class CommandIgnoreList implements FTabCompleter {
 
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
@@ -58,4 +54,10 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
     public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
         return wordsList;
     }
+
+    @NotNull
+    @Override
+    public String getCommandName() {
+        return "ignore-list";
+    }
 }
diff --git a/src/main/java/net/flectone/commands/CommandLastOnline.java b/src/main/java/net/flectone/commands/CommandLastOnline.java
@@ -13,11 +13,7 @@
 import java.util.Collections;
 import java.util.List;
 
-public class CommandLastOnline extends FTabCompleter {
-
-    public CommandLastOnline() {
-        super.commandName = "lastonline";
-    }
+public class CommandLastOnline implements FTabCompleter {
 
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
@@ -64,4 +60,10 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
 
         return wordsList;
     }
+
+    @NotNull
+    @Override
+    public String getCommandName() {
+        return "lastonline";
+    }
 }
diff --git a/src/main/java/net/flectone/commands/CommandMail.java b/src/main/java/net/flectone/commands/CommandMail.java
@@ -16,11 +16,7 @@
 import java.util.Collections;
 import java.util.List;
 
-public class CommandMail extends FTabCompleter {
-
-    public CommandMail() {
-        super.commandName = "mail";
-    }
+public class CommandMail implements FTabCompleter {
 
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
@@ -83,4 +79,10 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
 
         return wordsList;
     }
+
+    @NotNull
+    @Override
+    public String getCommandName() {
+        return "mail";
+    }
 }