did a few things

2025-05-28 01:21:24 +02:00
parent 5b8dcb282f
commit c4ff84e8b6
10 changed files with 367 additions and 28 deletions
@@ -1,4 +1,5 @@
 using HintServiceMeow.Core.Enum;
+using HintServiceMeow.Core.Models.HintContent;
 using HintServiceMeow.Core.Models.Hints;
 using HintServiceMeow.Core.Utilities;
 using LabApi.Events.Arguments.PlayerEvents;
@@ -8,6 +9,7 @@ using LabApi.Features.Console;
 using LabApi.Features.Wrappers;
 using LabApi.Loader.Features.Plugins;
 using PlayerRoles;
+using PlayerRoles.Spectating;
 using Timer = System.Timers.Timer;

 namespace VisibleSpectators
@@ -20,6 +22,7 @@ namespace VisibleSpectators
        public override string Description => "See your spectators";
        public override Version RequiredApiVersion { get; } = new (LabApiProperties.CompiledVersion);

+        public int YCoordinate { get; set; } = 100;

        private static Plugin _singleton;
        private Timer _timer;
@@ -60,12 +63,111 @@ namespace VisibleSpectators
            }
        }

+        private void AddPlayerHint(Player player)
+        {
+            if (player == null) return;
+            
+            var hint = new Hint
+            {
+                Text = $"{Config!.HeaderMessage}\n{Config!.NoSpectatorsMessage}",
+                Alignment = HintAlignment.Right,
+                YCoordinate = YCoordinate,
+                Hide = true
+            };
+
+            var playerDisplay = PlayerDisplay.Get(player);
+            playerDisplay.AddHint(hint);
+        
+            _spectatorHints[player] = hint;
+        }
+
+        private static readonly Dictionary<string, string> GetColorMap = new()
+        {
+            { "DEFAULT", "FFFFFF" },
+            { "PUMPKIN", "EE7600" },
+            { "ARMY_GREEN", "4B5320" },
+            { "MINT", "98FB98" },
+            { "NICKEL", "727472" },
+            { "CARMINE", "960018" },
+            { "EMERALD", "50C878" },
+            { "GREEN", "228B22" },
+            { "LIME", "BFFF00" },
+            { "POLICE_BLUE", "002DB3" },
+            { "ORANGE", "FF9966" },
+            { "SILVER_BLUE", "666699" },
+            { "BLUE_GREEN", "4DFFB8" },
+            { "MAGENTA", "FF0090" },
+            { "YELLOW", "FAFF86" },
+            { "TOMATO", "FF6448" },
+            { "DEEP_PINK", "FF1493" },
+            { "AQUA", "00FFFF" },
+            { "CYAN", "00B7EB" },
+            { "CRIMSON", "DC143C" },
+            { "LIGHT_GREEN", "32CD32" },
+            { "SILVER", "A0A0A0" },
+            { "BROWN", "944710" },
+            { "RED", "C50000" },
+            { "PINK", "FF96DE" },
+            { "LIGHT_RED", "FD8272" },
+            { "PURPLE", "8137CE" },
+            { "BLUE", "005EBC" },
+            { "TEAL", "008080" },
+            { "GOLD", "EFC01A" }
+        };
+
+        private static string PlayerToDisplay(Player player)
+        {
+            if (player == null) return "";
+            
+            // Default color if GroupColor is null or not found in the map
+            const string defaultColor = "FFFFFF";
+            
+            try
+            {
+                var groupColor = player.GroupColor;
+                if (string.IsNullOrEmpty(groupColor))
+                    return $"<color=#{defaultColor}FF>{player.DisplayName}</color>";
+            
+                return GetColorMap.TryGetValue(groupColor.ToUpper(), out var color) ? $"<color=#{color}FF>{player.DisplayName}</color>" : $"<color=#{defaultColor}FF>{player.DisplayName}</color>";
+            }
+            catch
+            {
+                return $"<color=#{defaultColor}FF>{player.DisplayName}</color>";
+            }
+        }
+
+        private static bool IsNotOverwatch(Player player)
+        {
+            return player != null && player.Role != RoleTypeId.Overwatch;
+        }
+
        private void UpdateSpectators(Player player)
        {
-            var spectators = string.Join("\n",player.CurrentSpectators.Select(x => x.DisplayName));
-            if (player.Role == RoleTypeId.Spectator)
+            if (player == null)
            {
-                spectators = string.Join("\n",player.CurrentlySpectating?.CurrentSpectators.Select(x => x.DisplayName) ?? Array.Empty<string>());
+                return;
+            }
+            
+            // Safety check - if player doesn't have a hint, create one
+            if (!_spectatorHints.ContainsKey(player))
+            {
+                AddPlayerHint(player);
+            }
+
+            var spectators = Config!.NoSpectatorsMessage;
+            
+            try
+            {
+                spectators = string.Join("\n",player.CurrentSpectators.Where(IsNotOverwatch).Select(PlayerToDisplay));
+                if (player.Role == RoleTypeId.Spectator)
+                    spectators = player.CurrentlySpectating == null
+                        ? Config!.NoSpectatorsMessage
+                        : string.Join("\n",
+                            player.CurrentlySpectating?.CurrentSpectators.Where(IsNotOverwatch)
+                                .Select(PlayerToDisplay) ?? Array.Empty<string>());
+            }  catch (Exception e)
+            {
+                Logger.Error(e);
            }
            
            if (spectators.Length < 2)
@@ -74,9 +176,11 @@ namespace VisibleSpectators
            }


-            _spectatorHints[player].Text = $"{Config!.HeaderMessage}\n{spectators}\n{DateTime.UtcNow:HH:mm:ss}";
+            _spectatorHints[player].Text = $"{Config!.HeaderMessage}\n{spectators}";

-            _spectatorHints[player].Hide = player.Role is RoleTypeId.Overwatch or RoleTypeId.Destroyed or RoleTypeId.None;
+            _spectatorHints[player].Hide = player.Role is RoleTypeId.Destroyed or RoleTypeId.None;
+
+            _spectatorHints[player].YCoordinate = YCoordinate + player.CurrentSpectators.Count * 10;
        }

        private static Player[] GetPlayers()
@@ -88,22 +192,12 @@ namespace VisibleSpectators
        {
            _singleton.UpdateSpectators(ev.OldTarget);
            _singleton.UpdateSpectators(ev.NewTarget);
+            _singleton.UpdateSpectators(ev.Player);
        }

        private void OnJoin(PlayerJoinedEventArgs ev)
        {
-            var hint = new Hint
-            {
-                Text = $"{Config!.HeaderMessage}\n{Config!.NoSpectatorsMessage}",
-                Alignment = HintAlignment.Right,
-                YCoordinate = 100,
-                Hide = true
-            };
-
-            var playerDisplay = PlayerDisplay.Get(ev.Player);
-            playerDisplay.AddHint(hint);
-            
-            _spectatorHints[ev.Player] = hint;
+            AddPlayerHint(ev.Player);
        }
    }