Fix friendlist display name resolving

Author: petethepossum

service.friend/src/main/java/net/swofty/service/friend/FriendCache.java

@@ -448,9 +448,11 @@ private static Map<UUID, String> fetchNamesFromCollection(String collectionName,
                 if (ign == null && doc.containsKey("ignLowercase")) {
                     ign = parseStoredName(doc.getString("ignLowercase"));
                 }
+                String rank = parseStoredName(doc.getString("rank"));
+                String prefix = rank != null ? rankToPrefix(rank) : "§7";
 
                 if (ign != null) {
-                    names.put(UUID.fromString(id), ign);
+                    names.put(UUID.fromString(id), prefix + ign);
                 }
             }
         } catch (Exception e) {
@@ -459,6 +461,25 @@ private static Map<UUID, String> fetchNamesFromCollection(String collectionName,
         return names;
     }
 
+    private static String rankToPrefix(String rank) { //display name wasn't resolving correctly if player was on a different minestom instance, this is hacky but works
+        return switch (rank.toUpperCase()) {
+            case "OWNER" -> "§c[OWNER] ";
+            case "ADMIN" -> "§c[ADMIN] ";
+            case "DEVELOPER" -> "§d[DEV] ";
+            case "GAMEMASTER" -> "§2[GM] ";
+            case "MOD" -> "§2[MOD] ";
+            case "HELPER" -> "§9[HELPER] ";
+            case "JRHELPER" -> "§9[JR HELPER] ";
+            case "BT" -> "§d[BT] ";
+            case "YOUTUBE" -> "§c[§fYOUTUBE§c] ";
+            case "MVP_PLUS" -> "§b[MVP§c+§b] ";
+            case "MVP" -> "§b[MVP] ";
+            case "VIP_PLUS" -> "§a[VIP§6+§a] ";
+            case "VIP" -> "§a[VIP] ";
+            default -> "§7";
+        };
+    }
+
     private static String parseStoredName(String raw) {
         if (raw == null) return null;
         raw = raw.trim();

type.generic/src/main/java/net/swofty/type/generic/redis/service/RedisPropagateFriendEvent.java

@@ -224,16 +224,10 @@ private void handleFriendList(HypixelPlayer player, FriendListResponseEvent even
                     sb.append("§6✦ ");
                 }
 
-                // Name (rank-colored, matches tablist). Fallback to plain name if unavailable or failure.
-                String displayName;
-                try {
-                    displayName = HypixelPlayer.getDisplayName(friend.getUuid());
-                } catch (Exception e) {
-                    displayName = "§e" + friend.getName();
-                }
-                if (displayName == null || displayName.isEmpty()) {
-                    displayName = "§e" + friend.getName();
-                }
+                // Name already comes formatted from service (rank prefix + ign).
+                String displayName = friend.getName() != null && !friend.getName().isEmpty()
+                        ? friend.getName()
+                        : "§e" + HypixelPlayer.getDisplayName(friend.getUuid());
 
                 // Append nickname if set
                 if (friend.getNickname() != null && !friend.getNickname().isEmpty()) {