Fixed Network Protocol Error & Rewrote GroupManager

Author: SyntaxJason

luckprefix-common/src/main/java/de/eztxm/luckprefix/common/config/AbstractConfig.java

@@ -37,19 +37,22 @@ public final Path path() {
         return filePath;
     }
 
+
     public final DebugLog getDebugLog() {
         return debugLog;
     }
 
     public synchronized void load() {
         debugLog.info(getClass().getSimpleName() + ".load: begin - " + filePath);
+        boolean existed = filePath.toFile().exists();
         ensureParentDirectoryExists();
         dataTree = loadYamlToMap(filePath.toFile(), debugLog);
 
         if (!defaultsWereApplied) {
             debugLog.debug(getClass().getSimpleName() + ".load: applying defaults (first run)");
             defineDefaults();
             defaultsWereApplied = true;
+            if(!existed) save();
         }
         try {
             afterLoad();

luckprefix-common/src/main/java/de/eztxm/luckprefix/common/config/GroupsConfig.java

@@ -26,7 +26,6 @@ protected void defineDefaults() {
         addDefault("default.SortID", 999);
         addDefault("default.NameColor", "gray");
 
-        saveDefaults();
         getDebugLog().debug("GroupsConfig.defineDefaults: defaults saved to disk");
 
         setComments("default", List.of("The name of the group"));
@@ -40,7 +39,6 @@ protected void defineDefaults() {
         ));
         setComments("default.NameColor", List.of("Name color above the player"));
 
-        saveComments();
         getDebugLog().debug("GroupsConfig.defineDefaults: comments saved");
     }
 
@@ -131,6 +129,10 @@ public void setNameColor(String rawGroupName, String colorName) {
         set(path, colorName);
     }
 
+    public void removeGroup(String group) {
+        set(group, null);
+    }
+
     public void ensureGroupDefaults(String rawGroupName,
                                     boolean autoAdd,
                                     boolean warn,

luckprefix-common/src/main/java/de/eztxm/luckprefix/common/config/MainConfig.java

@@ -44,7 +44,6 @@ protected void defineDefaults() {
         addDefault("Logging.Debug.Enabled", true);
         addDefault("Logging.Debug.File", "luckprefix-debug.log");
 
-        saveDefaults();
         getDebugLog().debug("MainConfig.defineDefaults: defaults saved");
 
         setComments("Update-Channel", List.of(
@@ -72,7 +71,6 @@ protected void defineDefaults() {
         setComments("Logging.Debug.Enabled", List.of("Deprecated toggle; debug file logger is always active"));
         setComments("Logging.Debug.File", List.of("Debug log file path"));
 
-        saveComments();
         getDebugLog().debug("MainConfig.defineDefaults: comments saved");
     }
 
@@ -88,6 +86,15 @@ public String getColoredPermission() {
         return value;
     }
 
+    public Long getUpdateTime() {
+        Long value = Long.parseLong(getString("UpdateTime", "5"));
+        getDebugLog().debug("MainConfig.UpdateTime -> " + value);
+        if(value <= 0) {
+            return 5L;
+        }
+        return value;
+    }
+
     public boolean isAutoReloadEnabled() {
         boolean value = getBoolean("AutoReloadConfig.Enabled", false);
         getDebugLog().debug("MainConfig.isAutoReloadEnabled -> " + value);

luckprefix-modern-paper/src/main/java/de/eztxm/luckprefix/LuckPrefix.java

@@ -6,12 +6,12 @@
 import de.eztxm.luckprefix.common.logging.DebugLog;
 import de.eztxm.luckprefix.common.util.UpdateChecker;
 import de.eztxm.luckprefix.depend.LuckPrefixPlaceholderExtension;
+import de.eztxm.luckprefix.group.GroupManager;
 import de.eztxm.luckprefix.listener.ChatListener;
 import de.eztxm.luckprefix.listener.GroupListener;
 import de.eztxm.luckprefix.listener.JoinListener;
 import de.eztxm.luckprefix.listener.QuitListener;
 import de.eztxm.luckprefix.util.DependUtil;
-import de.eztxm.luckprefix.util.GroupManager;
 import de.eztxm.luckprefix.util.PlayerManager;
 import de.eztxm.luckprefix.util.Text;
 import lombok.Getter;
@@ -20,6 +20,7 @@
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.SimplePie;
 import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitTask;
 
@@ -29,7 +30,7 @@
 public final class LuckPrefix extends JavaPlugin {
 
     @Getter
-    private static final boolean development = false;
+    private static final boolean development = true;
     @Getter
     private static LuckPrefix instance;
     @Getter
@@ -51,6 +52,8 @@ public final class LuckPrefix extends JavaPlugin {
     private BukkitTask autoReloadConfigTask;
     private Metrics metrics;
 
+    private BukkitTask tabUpdateTask;
+
     @SuppressWarnings("UnstableApiUsage")
     @Override
     public void onEnable() {
@@ -82,6 +85,7 @@ public void onEnable() {
         groupListener.onUpdateGroup();
         groupListener.onUpdateUserGroup();
         groupManager.loadGroups();
+        updateGroups();
         if (dependUtil.isPlaceholderAPIEnabled()) {
             new LuckPrefixPlaceholderExtension(this.getPluginMeta()).register();
             this.getServer().sendMessage(new Text("<#33ffff>PlaceholderAPI <gray>was detected successfully.").prefixMiniMessage());
@@ -121,6 +125,21 @@ private void setupConfigs() {
         startConfigWatcher(config);
     }
 
+    private void updateGroups() {
+        long periodTicks = getConfigService().of(MainConfig.class).getUpdateTime();
+        if(periodTicks < 5L) periodTicks = 5L;
+
+        this.tabUpdateTask = Bukkit.getScheduler().runTaskTimer(this, () -> {
+            try {
+                for(Player viewer : Bukkit.getOnlinePlayers()) {
+                    getGroupManager().setGroups(viewer, viewer.getScoreboard());
+                }
+            } catch (Exception exception) {
+                getDebugLog().error("tabUpdateTask failed", exception);
+            }
+        }, 1L, periodTicks);
+    }
+
     public void startConfigWatcher(MainConfig config) {
         if (config.isAutoReloadEnabled()) {
             this.configWatcher = new ConfigWatcher(getDataPath().toFile(), path -> {
@@ -168,6 +187,10 @@ public void onDisable() {
         playerManager = null;
         groupManager = null;
         groupListener = null;
+        if(tabUpdateTask != null) {
+            tabUpdateTask.cancel();
+            tabUpdateTask = null;
+        }
         updateChecker = null;
         configService = null;
         if (configWatcher != null) {

luckprefix-modern-paper/src/main/java/de/eztxm/luckprefix/command/subcommand/ReloadConfigsSubCommand.java

@@ -2,20 +2,11 @@
 
 import de.eztxm.luckprefix.LuckPrefix;
 import de.eztxm.luckprefix.common.config.ConfigService;
-import de.eztxm.luckprefix.common.config.DatabaseConfig;
-import de.eztxm.luckprefix.common.config.GroupsConfig;
 import de.eztxm.luckprefix.common.config.MainConfig;
-import de.eztxm.luckprefix.util.GroupManager;
+import de.eztxm.luckprefix.group.GroupManager;
 import de.eztxm.luckprefix.util.Text;
 import lombok.SneakyThrows;
 import net.kyori.adventure.audience.Audience;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.scoreboard.Team;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
 
 public class ReloadConfigsSubCommand {
 

luckprefix-modern-paper/src/main/java/de/eztxm/luckprefix/depend/LuckPrefixPlaceholderExtension.java

@@ -1,7 +1,7 @@
 package de.eztxm.luckprefix.depend;
 
 import de.eztxm.luckprefix.LuckPrefix;
-import de.eztxm.luckprefix.util.GroupManager;
+import de.eztxm.luckprefix.group.GroupManager;
 import io.papermc.paper.plugin.configuration.PluginMeta;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import net.luckperms.api.LuckPerms;
@@ -39,22 +39,22 @@ public LuckPrefixPlaceholderExtension(PluginMeta pluginMeta) {
         String playerGroup = luckPerms.getUserManager().getUser(player.getUniqueId()).getPrimaryGroup().toLowerCase();
         switch (params.toLowerCase()) {
             case "prefix" -> {
-                return groupManager.getPrefixByGroup().get(playerGroup);
+                return groupManager.getPrefixByGroup(playerGroup);
             }
             case "suffix" -> {
-                return groupManager.getSuffixByGroup().get(playerGroup);
+                return groupManager.getSuffixByGroup(playerGroup);
             }
             case "tabformat" -> {
-                return groupManager.getTabFormatByGroup().get(playerGroup);
+                return groupManager.getTabFormatByGroup(playerGroup);
             }
             case "chatformat" -> {
-                return groupManager.getChatFormatByGroup().get(playerGroup);
+                return groupManager.getChatFormatByGroup(playerGroup);
             }
             case "sortid" -> {
-                return groupManager.getSortIdByGroup().get(playerGroup);
+                return groupManager.getSortIdAsStringByGroup(playerGroup);
             }
             case "namecolor" -> {
-                return groupManager.getNameColorByGroup().get(playerGroup).asHexString();
+                return groupManager.getNameColorByGroup(playerGroup).asHexString();
             }
         }
         return null;