Plugin: refactor FileManager and create FYamlConfiguration

Flectone · Aug 12, 2023 · 3d5c0e4 · 3d5c0e4
1 parent e05d87e
commit 3d5c0e4
Show file tree

Hide file tree

Showing 50 changed files with 492 additions and 384 deletions.
diff --git a/src/main/java/net/flectone/Main.java b/src/main/java/net/flectone/Main.java
@@ -1,6 +1,5 @@
 package net.flectone;
 
-import net.flectone.misc.commands.FTabCompleter;
 import net.flectone.integrations.discordsrv.FDiscordSRV;
 import net.flectone.integrations.expansions.FExpansion;
 import net.flectone.integrations.luckperms.FLuckPerms;
@@ -12,6 +11,7 @@
 import net.flectone.managers.FPlayerManager;
 import net.flectone.managers.FileManager;
 import net.flectone.managers.TickerManager;
+import net.flectone.misc.commands.FTabCompleter;
 import net.flectone.sqlite.Database;
 import net.flectone.sqlite.SQLite;
 import net.flectone.tickers.PlayerPingTicker;
@@ -23,18 +23,13 @@
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import java.io.File;
-import java.util.List;
-
 public final class Main extends JavaPlugin {
 
     public static boolean isHavePAPI = false;
 
     public static boolean isHavePlasmoVoice = false;
 
     public static boolean isHaveInteractiveChat = false;
-    public static FileManager config;
-    public static FileManager locale;
     private static Main instance;
     private Database database;
 
@@ -60,9 +55,7 @@ public void onEnable() {
 
         instance = this;
 
-        config = new FileManager("config.yml");
-        locale = new FileManager("language/" + config.getString("language") + ".yml");
-        loadIcons();
+        FileManager.initialize();
         FPlayerManager.setScoreBoard();
 
         this.database = new SQLite(this);
@@ -98,19 +91,6 @@ private void registerClasses() {
         });
     }
 
-    private void loadIcons() {
-        String path = Main.getInstance().getDataFolder() + File.separator + "icons" + File.separator;
-
-        List<String> iconNames = Main.config.getStringList("server.icon.names");
-        iconNames.add("maintenance");
-
-        for (String iconName : iconNames) {
-            if (new File(path + iconName + ".png").exists()) continue;
-
-            Main.getInstance().saveResource("icons" + File.separator + iconName + ".png", false);
-        }
-    }
-
     private void hookPlugins() {
         if (Bukkit.getPluginManager().getPlugin("Vault") != null) {
             FVault.register();

diff --git a/src/main/java/net/flectone/commands/CommandAfk.java b/src/main/java/net/flectone/commands/CommandAfk.java
@@ -1,10 +1,9 @@
 package net.flectone.commands;
 
-import net.flectone.Main;
+import net.flectone.managers.FPlayerManager;
 import net.flectone.misc.commands.FCommand;
-import net.flectone.misc.entity.FPlayer;
 import net.flectone.misc.commands.FTabCompleter;
-import net.flectone.managers.FPlayerManager;
+import net.flectone.misc.entity.FPlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -13,6 +12,8 @@
 
 import java.util.List;
 
+import static net.flectone.managers.FileManager.locale;
+
 public class CommandAfk implements FTabCompleter {
 
     public static void setAfkFalse(@NotNull Player player) {
@@ -35,7 +36,7 @@ private static void setAfkAndSendMessage(@NotNull FCommand fCommand, boolean isA
         fPlayer.setAfk(isAfk);
 
         String afkSuffix = isAfk
-                ? Main.locale.getFormatString("command.afk.suffix", fPlayer.getPlayer())
+                ? locale.getFormatString("command.afk.suffix", fPlayer.getPlayer())
                 : "";
 
         fPlayer.setAfkSuffix(afkSuffix);

diff --git a/src/main/java/net/flectone/commands/CommandBall.java b/src/main/java/net/flectone/commands/CommandBall.java
@@ -1,6 +1,5 @@
 package net.flectone.commands;
 
-import net.flectone.Main;
 import net.flectone.misc.commands.FCommand;
 import net.flectone.misc.commands.FTabCompleter;
 import net.flectone.utils.ObjectUtil;
@@ -13,6 +12,8 @@
 import java.util.List;
 import java.util.Random;
 
+import static net.flectone.managers.FileManager.locale;
+
 public class CommandBall implements FTabCompleter {
 
     @Override
@@ -24,12 +25,12 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
                 || fCommand.isHaveCD()
                 || fCommand.isMuted()) return true;
 
-        List<String> answers = Main.locale.getStringList("command.ball.format");
+        List<String> answers = locale.getStringList("command.ball.format");
 
         Random random = new Random();
         int randomPer = random.nextInt(0, answers.size());
 
-        String formatString = Main.locale.getString("command.ball.message")
+        String formatString = locale.getString("command.ball.message")
                 .replace("<player>", fCommand.getSenderName())
                 .replace("<answer>", answers.get(randomPer));
 

diff --git a/src/main/java/net/flectone/commands/CommandBanlist.java b/src/main/java/net/flectone/commands/CommandBanlist.java
@@ -1,10 +1,9 @@
 package net.flectone.commands;
 
-import net.flectone.Main;
+import net.flectone.managers.FPlayerManager;
 import net.flectone.misc.commands.FCommand;
-import net.flectone.misc.entity.FPlayer;
 import net.flectone.misc.commands.FTabCompleter;
-import net.flectone.managers.FPlayerManager;
+import net.flectone.misc.entity.FPlayer;
 import net.flectone.utils.ObjectUtil;
 import net.md_5.bungee.api.chat.ClickEvent;
 import net.md_5.bungee.api.chat.ComponentBuilder;
@@ -22,6 +21,9 @@
 import java.util.List;
 import java.util.Set;
 
+import static net.flectone.managers.FileManager.locale;
+import static net.flectone.managers.FileManager.config;
+
 public class CommandBanlist implements FTabCompleter {
 
     @Override
@@ -31,7 +33,7 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
 
         Set<FPlayer> bannedPlayers = FPlayerManager.getBannedPlayers();
 
-        int perPage = Main.config.getInt("command.banlist.per-page");
+        int perPage = config.getInt("command.banlist.per-page");
 
         int lastPage = (int) Math.ceil((double) bannedPlayers.size() / perPage);
 
@@ -51,12 +53,12 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
 
         ComponentBuilder componentBuilder = new ComponentBuilder();
 
-        String title = Main.locale.getFormatString("command.banlist.title", commandSender)
+        String title = locale.getFormatString("command.banlist.title", commandSender)
                 .replace("<count>", String.valueOf(bannedPlayers.size()));
 
         componentBuilder.append(TextComponent.fromLegacyText(title)).append("\n\n");
 
-        String unbanButton = Main.locale.getFormatString("command.banlist.unban-button", commandSender);
+        String unbanButton = locale.getFormatString("command.banlist.unban-button", commandSender);
 
         int page = strings.length > 0 ? Math.max(1, Integer.parseInt(strings[0])) : 1;
         page = Math.min(lastPage, page);
@@ -65,13 +67,13 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
             String playerBanFormat = "command.banlist.player-ban";
             if (fPlayer.isPermanentlyBanned()) playerBanFormat += "-permanently";
 
-            playerBanFormat = Main.locale.getFormatString(playerBanFormat, commandSender)
+            playerBanFormat = locale.getFormatString(playerBanFormat, commandSender)
                     .replace("<unban>", unbanButton)
                     .replace("<player>", fPlayer.getRealName())
                     .replace("<reason>", fPlayer.getBanReason())
                     .replace("<time>", ObjectUtil.convertTimeToString(fPlayer.getTempBanTime()));
 
-            String unbanHover = Main.locale.getFormatString("command.banlist.unban-hover", commandSender)
+            String unbanHover = locale.getFormatString("command.banlist.unban-hover", commandSender)
                     .replace("<player>", fPlayer.getRealName());
 
             TextComponent textComponent = new TextComponent(TextComponent.fromLegacyText(playerBanFormat));
@@ -81,7 +83,7 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
             componentBuilder.append(textComponent).append("\n\n");
         });
 
-        String pageLine = Main.locale.getFormatString("command.banlist.page-line", commandSender)
+        String pageLine = locale.getFormatString("command.banlist.page-line", commandSender)
                 .replace("<page>", String.valueOf(page))
                 .replace("<last-page>", String.valueOf(lastPage));
 
@@ -95,11 +97,11 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
             switch (part) {
                 case "<prev-page>" -> {
                     pageNumber--;
-                    button = Main.locale.getFormatString("command.banlist.prev-page", commandSender);
+                    button = locale.getFormatString("command.banlist.prev-page", commandSender);
                 }
                 case "<next-page>" -> {
                     pageNumber++;
-                    button = Main.locale.getFormatString("command.banlist.next-page", commandSender);
+                    button = locale.getFormatString("command.banlist.next-page", commandSender);
                 }
             }
 
@@ -125,7 +127,7 @@ public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull
         wordsList.clear();
 
         if (strings.length == 1) {
-            int perPage = Main.config.getInt("command.banlist.per-page");
+            int perPage = config.getInt("command.banlist.per-page");
 
             int lastPage = (int) Math.ceil((double) FPlayerManager.getBannedPlayers().size() / perPage);
 

diff --git a/src/main/java/net/flectone/commands/CommandBroadcast.java b/src/main/java/net/flectone/commands/CommandBroadcast.java
@@ -1,6 +1,5 @@
 package net.flectone.commands;
 
-import net.flectone.Main;
 import net.flectone.misc.commands.FCommand;
 import net.flectone.misc.commands.FTabCompleter;
 import net.flectone.utils.ObjectUtil;
@@ -14,6 +13,8 @@
 import java.util.HashSet;
 import java.util.List;
 
+import static net.flectone.managers.FileManager.locale;
+
 public class CommandBroadcast implements FTabCompleter {
 
     @Override
@@ -25,7 +26,7 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
                 || fCommand.isHaveCD()
                 || fCommand.isMuted()) return true;
 
-        String formatString = Main.locale.getString("command.broadcast.message")
+        String formatString = locale.getString("command.broadcast.message")
                 .replace("<player>", fCommand.getSenderName());
 
         fCommand.sendGlobalMessage(new HashSet<>(Bukkit.getOnlinePlayers()), formatString, ObjectUtil.toString(strings), null, false);

diff --git a/src/main/java/net/flectone/commands/CommandChat.java b/src/main/java/net/flectone/commands/CommandChat.java
@@ -1,6 +1,5 @@
 package net.flectone.commands;
 
-import net.flectone.Main;
 import net.flectone.misc.commands.FCommand;
 import net.flectone.misc.commands.FTabCompleter;
 import org.bukkit.command.Command;
@@ -10,6 +9,8 @@
 
 import java.util.List;
 
+import static net.flectone.managers.FileManager.config;
+
 public class CommandChat implements FTabCompleter {
 
     @Override
@@ -32,7 +33,7 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
 
         boolean isSwitch = chatParam.equals("switch");
 
-        if (isSwitch && !Main.config.getBoolean("chat.global.enable")) {
+        if (isSwitch && !config.getBoolean("chat.global.enable")) {
             fCommand.sendMeMessage("command.disabled");
             return true;
         }
@@ -55,12 +56,15 @@ 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], "switch");
-            isStartsWith(strings[0], "hide");
-        } else if (strings.length == 2) {
-            isStartsWith(strings[1], "local");
-            isStartsWith(strings[1], "global");
+        switch (strings.length) {
+            case 1 -> {
+                isStartsWith(strings[0], "switch");
+                isStartsWith(strings[0], "hide");
+            }
+            case 2 -> {
+                isStartsWith(strings[1], "local");
+                isStartsWith(strings[1], "global");
+            }
         }
 
         return wordsList;

diff --git a/src/main/java/net/flectone/commands/CommandChatcolor.java b/src/main/java/net/flectone/commands/CommandChatcolor.java
@@ -1,10 +1,9 @@
 package net.flectone.commands;
 
-import net.flectone.Main;
+import net.flectone.managers.FPlayerManager;
 import net.flectone.misc.commands.FCommand;
-import net.flectone.misc.entity.FPlayer;
 import net.flectone.misc.commands.FTabCompleter;
-import net.flectone.managers.FPlayerManager;
+import net.flectone.misc.entity.FPlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
@@ -13,11 +12,17 @@
 import java.util.Collections;
 import java.util.List;
 
+import static net.flectone.managers.FileManager.config;
+import static net.flectone.managers.FileManager.locale;
+
 public class CommandChatcolor implements FTabCompleter {
 
     @NotNull
     public static String[] getDefaultColors() {
-        return new String[]{Main.config.getString("color.first"), Main.config.getString("color.second")};
+        return new String[]{
+                config.getString("color.first"),
+                config.getString("color.second")
+        };
     }
 
     @Override
@@ -60,7 +65,7 @@ private void setColors(@NotNull FPlayer fPlayer, @NotNull String[] strings) {
 
         if (fPlayer.isOnline() && fPlayer.getPlayer() != null) {
             fPlayer.setDisplayName();
-            fPlayer.getPlayer().sendMessage(Main.locale.getFormatString("command.chatcolor.message", fPlayer.getPlayer()));
+            fPlayer.getPlayer().sendMessage(locale.getFormatString("command.chatcolor.message", fPlayer.getPlayer()));
         }
     }