Fix de l'ordre des grades dans le tablist (#1133)

* Revert "Refactor ConfirmMenu and MenuLib for improved readability and consistency"

This reverts commit f7cf2bf.

* Fix order in tablist

* ups

* Remove void line

Co-authored-by: PuppyTransGirl <74014559+PuppyTransGirl@users.noreply.github.com>

---------

Co-authored-by: PuppyTransGirl <74014559+PuppyTransGirl@users.noreply.github.com>

Author: AxenoDev

src/main/java/fr/openmc/api/hooks/LuckPermsHook.java

@@ -4,6 +4,7 @@
 import fr.openmc.core.OMCPlugin;
 import lombok.Getter;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import net.luckperms.api.LuckPerms;
 import net.luckperms.api.model.group.Group;
 import net.luckperms.api.model.user.User;
@@ -57,7 +58,8 @@ public static String getFormattedPAPIPrefix(Player player) {
         if (prefix == null || prefix.isEmpty()) return Component.empty();
 
         String formattedPrefix = prefix.replace("&", "§");
+        String finalPrefix = FontImageWrapper.replaceFontImages(formattedPrefix);
 
-        return Component.text(FontImageWrapper.replaceFontImages(formattedPrefix));
+        return LegacyComponentSerializer.legacySection().deserialize(finalPrefix);
     }
 }

src/main/java/fr/openmc/core/features/displays/scoreboards/GlobalTeamManager.java

@@ -3,8 +3,10 @@
 import fr.openmc.api.hooks.LuckPermsHook;
 import fr.openmc.api.scoreboard.SternalBoard;
 import fr.openmc.api.scoreboard.repository.ObjectCacheRepository;
+import fr.openmc.core.OMCPlugin;
 import net.kyori.adventure.text.Component;
 import net.luckperms.api.LuckPerms;
+import net.luckperms.api.event.group.GroupDataRecalculateEvent;
 import net.luckperms.api.model.group.Group;
 import net.luckperms.api.node.NodeType;
 import org.bukkit.entity.Player;
@@ -17,14 +19,18 @@
 public class GlobalTeamManager {
     private LuckPerms luckPerms = null;
     private final ObjectCacheRepository<SternalBoard> boardCache;
-    private final Map<Group, Component> groupToPrefixCache = new ConcurrentHashMap<>();
+    private final Map<String, Component> groupToPrefixCache = new ConcurrentHashMap<>();
 
     public GlobalTeamManager(ObjectCacheRepository<SternalBoard> boardCache) {
         this.boardCache = boardCache;
 
         if (LuckPermsHook.isHasLuckPerms()) {
             this.luckPerms = LuckPermsHook.getApi();
             initSortedGroups();
+
+            this.luckPerms.getEventBus().subscribe(OMCPlugin.getInstance(), GroupDataRecalculateEvent.class, e -> {
+                groupToPrefixCache.remove(e.getGroup().getName()); // Update les teams lors du recalcule des groupes
+            });
         }
     }
 
@@ -33,7 +39,7 @@ private void initSortedGroups() {
         sortedGroups.sort(Comparator.comparing(g -> -g.getWeight().orElse(0)));
 
         for (Group group : sortedGroups) {
-            groupToPrefixCache.put(group, LuckPermsHook.getFormattedPAPIPrefix(group));
+            groupToPrefixCache.put(group.getName(), LuckPermsHook.getFormattedPAPIPrefix(group));
         }
     }
 
@@ -43,7 +49,7 @@ public void updatePlayerTeam(Player player) {
         Group playerGroup = getPlayerHighestWeightGroup(player);
         if (playerGroup == null) return;
 
-        Component prefix = groupToPrefixCache.getOrDefault(playerGroup, Component.empty());
+        Component prefix = groupToPrefixCache.computeIfAbsent(playerGroup.getName(), k -> LuckPermsHook.getFormattedPAPIPrefix(playerGroup));
 
         updateScoreboardTeam(player, prefix);
         updateTabListTeam(player, prefix, playerGroup);
@@ -69,9 +75,9 @@ private void updateScoreboardTeam(Player player, Component prefix) {
     private void updateTabListTeam(Player player, Component prefix, Group group) {
         Scoreboard scoreboard = player.getScoreboard();
 
-        String teamName = "lp_" + group.getName();
+        int weight = group.getWeight().orElse(0);
+        String teamName = "lp_%05d_%s".formatted(10000 - weight, group.getName());
         Team team = scoreboard.getTeam(teamName);
-
         if (team == null) {
             team = scoreboard.registerNewTeam(teamName);
         }