Merge remote-tracking branch 'origin/2.0.1' into animatedheader-fixes

# Conflicts:
#	LightlessSync/LightlessSync.csproj
#	LightlessSync/UI/Style/AnimatedHeader.cs
#	LightlessSync/UI/ZoneChatUi.cs

LightlessSync/FileCache/TransientResourceManager.cs

@@ -59,7 +59,7 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
             _playerRelatedPointers.Remove(msg.GameObjectHandler);
         });
 
-        foreach (var descriptor in _actorObjectService.ObjectDescriptors)
+        foreach (var descriptor in _actorObjectService.PlayerDescriptors)
         {
             HandleActorTracked(descriptor);
         }
@@ -291,7 +291,7 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
         }
 
         var activeDescriptors = new Dictionary<nint, ObjectKind>();
-        foreach (var descriptor in _actorObjectService.ObjectDescriptors)
+        foreach (var descriptor in _actorObjectService.PlayerDescriptors)
         {
             if (TryResolveObjectKind(descriptor, out var resolvedKind))
             {

LightlessSync/LightlessSync.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors></Authors>
     <Company></Company>
-    <Version>2.0.0.69</Version>
+    <Version>2.0.1</Version>
     <Description></Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/Light-Public-Syncshells/LightlessClient</PackageProjectUrl>

LightlessSync/PlayerData/Handlers/GameObjectHandler.cs

@@ -16,8 +16,6 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
     private readonly Func<IntPtr> _getAddress;
     private readonly bool _isOwnedObject;
     private readonly PerformanceCollectorService _performanceCollector;
-    private readonly object _frameworkUpdateGate = new();
-    private bool _frameworkUpdateSubscribed;
     private byte _classJob = 0;
     private Task? _delayedZoningTask;
     private bool _haltProcessing = false;
@@ -49,10 +47,7 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
             });
         }
 
-        if (_isOwnedObject)
-        {
-            EnableFrameworkUpdates();
-        }
+        Mediator.Subscribe<FrameworkUpdateMessage>(this, (_) => FrameworkUpdate());
 
         Mediator.Subscribe<ZoneSwitchEndMessage>(this, (_) => ZoneSwitchEnd());
         Mediator.Subscribe<ZoneSwitchStartMessage>(this, (_) => ZoneSwitchStart());
@@ -114,7 +109,7 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
     {
         while (await _dalamudUtil.RunOnFrameworkThread(() =>
                {
-                   EnsureLatestObjectState();
+                   if (_haltProcessing) CheckAndUpdateObject();
                    if (CurrentDrawCondition != DrawCondition.None) return true;
                    var gameObj = _dalamudUtil.CreateGameObject(Address);
                    if (gameObj is Dalamud.Game.ClientState.Objects.Types.ICharacter chara)
@@ -153,11 +148,6 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
         _haltProcessing = false;
     }
 
-    public void Refresh()
-    {
-        _dalamudUtil.RunOnFrameworkThread(CheckAndUpdateObject).GetAwaiter().GetResult();
-    }
-
     public async Task<bool> IsBeingDrawnRunOnFrameworkAsync()
     {
         return await _dalamudUtil.RunOnFrameworkThread(IsBeingDrawn).ConfigureAwait(false);
@@ -371,7 +361,7 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
 
     private bool IsBeingDrawn()
     {
-        EnsureLatestObjectState();
+        if (_haltProcessing) CheckAndUpdateObject();
 
         if (_dalamudUtil.IsAnythingDrawing)
         {
@@ -383,28 +373,6 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
         return CurrentDrawCondition != DrawCondition.None;
     }
 
-    private void EnsureLatestObjectState()
-    {
-        if (_haltProcessing || !_frameworkUpdateSubscribed)
-        {
-            CheckAndUpdateObject();
-        }
-    }
-
-    private void EnableFrameworkUpdates()
-    {
-        lock (_frameworkUpdateGate)
-        {
-            if (_frameworkUpdateSubscribed)
-            {
-                return;
-            }
-
-            Mediator.Subscribe<FrameworkUpdateMessage>(this, _ => FrameworkUpdate());
-            _frameworkUpdateSubscribed = true;
-        }
-    }
-
     private unsafe DrawCondition IsBeingDrawnUnsafe()
     {
         if (Address == IntPtr.Zero) return DrawCondition.ObjectZero;

LightlessSync/PlayerData/Pairs/IPairHandlerAdapter.cs

@@ -25,11 +25,6 @@
         bool IsDownloading { get; }
         int PendingDownloadCount { get; }
         int ForbiddenDownloadCount { get; }
-        bool PendingModReapply { get; }
-        bool ModApplyDeferred { get; }
-        int MissingCriticalMods { get; }
-        int MissingNonCriticalMods { get; }
-        int MissingForbiddenMods { get; }
         DateTime? InvisibleSinceUtc { get; }
         DateTime? VisibilityEvictionDueAtUtc { get; }
 

LightlessSync/PlayerData/Pairs/Pair.cs

@@ -87,25 +87,22 @@ public class Pair
             return;
         }
 
-        if (args.Target is not MenuTargetDefault target || target.TargetObjectId != handler.PlayerCharacterId)
+        if (args.Target is not MenuTargetDefault target || target.TargetObjectId != handler.PlayerCharacterId || IsPaused)
         {
             return;
         }
 
-        if (!IsPaused)
+        UiSharedService.AddContextMenuItem(args, name: "Open Profile", prefixChar: 'L', colorMenuItem: _lightlessPrefixColor, onClick: () =>
         {
-            UiSharedService.AddContextMenuItem(args, name: "Open Profile", prefixChar: 'L', colorMenuItem: _lightlessPrefixColor, onClick: () =>
-            {
-                _mediator.Publish(new ProfileOpenStandaloneMessage(this));
-                return Task.CompletedTask;
-            });
+            _mediator.Publish(new ProfileOpenStandaloneMessage(this));
+            return Task.CompletedTask;
+        });
 
-            UiSharedService.AddContextMenuItem(args, name: "Reapply last data", prefixChar: 'L', colorMenuItem: _lightlessPrefixColor, onClick: () =>
-            {
-                ApplyLastReceivedData(forced: true);
-                return Task.CompletedTask;
-            });
-        }
+        UiSharedService.AddContextMenuItem(args, name: "Reapply last data", prefixChar: 'L', colorMenuItem: _lightlessPrefixColor, onClick: () =>
+        {
+            ApplyLastReceivedData(forced: true);
+            return Task.CompletedTask;
+        });
 
         UiSharedService.AddContextMenuItem(args, name: "Change Permissions", prefixChar: 'L', colorMenuItem: _lightlessPrefixColor, onClick: () =>
         {
@@ -113,24 +110,7 @@ public class Pair
             return Task.CompletedTask;
         });
 
-        if (IsPaused)
-        {
-            UiSharedService.AddContextMenuItem(args, name: "Toggle Unpause State", prefixChar: 'L', colorMenuItem: _lightlessPrefixColor, onClick: () =>
-            {
-                _ = _apiController.Value.UnpauseAsync(UserData);
-                return Task.CompletedTask;
-            });
-        }
-        else
-        {
-            UiSharedService.AddContextMenuItem(args, name: "Toggle Pause State", prefixChar: 'L', colorMenuItem: _lightlessPrefixColor, onClick: () =>
-            {
-                _ = _apiController.Value.PauseAsync(UserData);
-                return Task.CompletedTask;
-            });
-        }
-
-        UiSharedService.AddContextMenuItem(args, name: "Cycle Pause State", prefixChar: 'L', colorMenuItem: _lightlessPrefixColor, onClick: () =>
+        UiSharedService.AddContextMenuItem(args, name: "Cycle pause state", prefixChar: 'L', colorMenuItem: _lightlessPrefixColor, onClick: () =>
         {
             TriggerCyclePause();
             return Task.CompletedTask;
@@ -238,11 +218,6 @@ public class Pair
             handler.IsApplying,
             handler.IsDownloading,
             handler.PendingDownloadCount,
-            handler.ForbiddenDownloadCount,
-            handler.PendingModReapply,
-            handler.ModApplyDeferred,
-            handler.MissingCriticalMods,
-            handler.MissingNonCriticalMods,
-            handler.MissingForbiddenMods);
+            handler.ForbiddenDownloadCount);
     }
 }

LightlessSync/PlayerData/Pairs/PairDebugInfo.cs

@@ -16,12 +16,7 @@ public sealed record PairDebugInfo(
     bool IsApplying,
     bool IsDownloading,
     int PendingDownloadCount,
-    int ForbiddenDownloadCount,
-    bool PendingModReapply,
-    bool ModApplyDeferred,
-    int MissingCriticalMods,
-    int MissingNonCriticalMods,
-    int MissingForbiddenMods)
+    int ForbiddenDownloadCount)
 {
     public static PairDebugInfo Empty { get; } = new(
         false,
@@ -39,10 +34,5 @@ public sealed record PairDebugInfo(
         false,
         false,
         0,
-        0,
-        false,
-        false,
-        0,
-        0,
         0);
 }

LightlessSync/PlayerData/Pairs/PairHandlerAdapter.cs

@@ -8,7 +8,6 @@ using LightlessSync.Interop.Ipc;
 using LightlessSync.PlayerData.Factories;
 using LightlessSync.PlayerData.Handlers;
 using LightlessSync.Services;
-using LightlessSync.Services.ActorTracking;
 using LightlessSync.Services.Events;
 using LightlessSync.Services.Mediator;
 using LightlessSync.Services.PairProcessing;
@@ -19,7 +18,6 @@ using LightlessSync.WebAPI.Files;
 using LightlessSync.WebAPI.Files.Models;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using DalamudObjectKind = Dalamud.Game.ClientState.Objects.Enums.ObjectKind;
 using ObjectKind = LightlessSync.API.Data.Enum.ObjectKind;
 using FileReplacementDataComparer = LightlessSync.PlayerData.Data.FileReplacementDataComparer;
 
@@ -33,7 +31,6 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
     private sealed record CombatData(Guid ApplicationId, CharacterData CharacterData, bool Forced);
 
     private readonly DalamudUtilService _dalamudUtil;
-    private readonly ActorObjectService _actorObjectService;
     private readonly FileDownloadManager _downloadManager;
     private readonly FileCacheManager _fileDbManager;
     private readonly GameObjectHandlerFactory _gameObjectHandlerFactory;
@@ -59,15 +56,11 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
     private bool _forceFullReapply;
     private Dictionary<(string GamePath, string? Hash), string>? _lastAppliedModdedPaths;
     private bool _needsCollectionRebuild;
-    private bool _pendingModReapply;
-    private bool _lastModApplyDeferred;
-    private int _lastMissingCriticalMods;
-    private int _lastMissingNonCriticalMods;
-    private int _lastMissingForbiddenMods;
     private bool _isVisible;
     private Guid _penumbraCollection;
     private readonly object _collectionGate = new();
     private bool _redrawOnNextApplication = false;
+    private bool _explicitRedrawQueued;
     private readonly object _initializationGate = new();
     private readonly object _pauseLock = new();
     private Task _pauseTransitionTask = Task.CompletedTask;
@@ -80,23 +73,8 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
     private readonly object _visibilityGraceGate = new();
     private CancellationTokenSource? _visibilityGraceCts;
     private static readonly TimeSpan VisibilityEvictionGrace = TimeSpan.FromMinutes(1);
-    private static readonly HashSet<string> NonPriorityModExtensions = new(StringComparer.OrdinalIgnoreCase)
-    {
-        ".tmb",
-        ".pap",
-        ".atex",
-        ".avfx",
-        ".scd"
-    };
     private DateTime? _invisibleSinceUtc;
     private DateTime? _visibilityEvictionDueAtUtc;
-    private DateTime _nextActorLookupUtc = DateTime.MinValue;
-    private static readonly TimeSpan ActorLookupInterval = TimeSpan.FromSeconds(1);
-    private static readonly SemaphoreSlim ActorInitializationLimiter = new(1, 1);
-    private readonly object _actorInitializationGate = new();
-    private ActorObjectService.ActorDescriptor? _pendingActorDescriptor;
-    private bool _actorInitializationInProgress;
-    private bool _frameworkUpdateSubscribed;
 
     public DateTime? InvisibleSinceUtc => _invisibleSinceUtc;
     public DateTime? VisibilityEvictionDueAtUtc => _visibilityEvictionDueAtUtc;
@@ -148,11 +126,6 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
     public long LastAppliedApproximateVRAMBytes { get; set; } = -1;
     public long LastAppliedApproximateEffectiveVRAMBytes { get; set; } = -1;
     public CharacterData? LastReceivedCharacterData { get; private set; }
-    public bool PendingModReapply => _pendingModReapply;
-    public bool ModApplyDeferred => _lastModApplyDeferred;
-    public int MissingCriticalMods => _lastMissingCriticalMods;
-    public int MissingNonCriticalMods => _lastMissingNonCriticalMods;
-    public int MissingForbiddenMods => _lastMissingForbiddenMods;
     public DateTime? LastDataReceivedAt => _lastDataReceivedAt;
     public DateTime? LastApplyAttemptAt => _lastApplyAttemptAt;
     public DateTime? LastSuccessfulApplyAt => _lastSuccessfulApplyAt;
@@ -173,7 +146,6 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
         FileDownloadManager transferManager,
         PluginWarningNotificationService pluginWarningNotificationManager,
         DalamudUtilService dalamudUtil,
-        ActorObjectService actorObjectService,
         IHostApplicationLifetime lifetime,
         FileCacheManager fileDbManager,
         PlayerPerformanceService playerPerformanceService,
@@ -190,7 +162,6 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
         _downloadManager = transferManager;
         _pluginWarningNotificationManager = pluginWarningNotificationManager;
         _dalamudUtil = dalamudUtil;
-        _actorObjectService = actorObjectService;
         _lifetime = lifetime;
         _fileDbManager = fileDbManager;
         _playerPerformanceService = playerPerformanceService;
@@ -214,7 +185,6 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
             return;
         }
 
-        ActorObjectService.ActorDescriptor? trackedDescriptor = null;
         lock (_initializationGate)
         {
             if (Initialized)
@@ -228,12 +198,7 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
                 _forceApplyMods = true;
             }
 
-            var useFrameworkUpdate = !_actorObjectService.HooksActive;
-            if (useFrameworkUpdate)
-            {
-                Mediator.Subscribe<FrameworkUpdateMessage>(this, _ => FrameworkUpdate());
-                _frameworkUpdateSubscribed = true;
-            }
+            Mediator.Subscribe<FrameworkUpdateMessage>(this, _ => FrameworkUpdate());
             Mediator.Subscribe<ZoneSwitchStartMessage>(this, _ =>
             {
                 _downloadCancellationTokenSource?.CancelDispose();
@@ -269,49 +234,17 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
             Mediator.Subscribe<CutsceneEndMessage>(this, _ => EnableSync());
             Mediator.Subscribe<GposeStartMessage>(this, _ => DisableSync());
             Mediator.Subscribe<GposeEndMessage>(this, _ => EnableSync());
-            Mediator.Subscribe<ActorTrackedMessage>(this, msg => HandleActorTracked(msg.Descriptor));
-            Mediator.Subscribe<ActorUntrackedMessage>(this, msg => HandleActorUntracked(msg.Descriptor));
-            Mediator.Subscribe<DownloadFinishedMessage>(this, msg =>
+        Mediator.Subscribe<DownloadFinishedMessage>(this, msg =>
+        {
+            if (_charaHandler is null || !ReferenceEquals(msg.DownloadId, _charaHandler))
             {
-                if (_charaHandler is null || !ReferenceEquals(msg.DownloadId, _charaHandler))
-                {
-                    return;
-                }
-
-                if (_pendingModReapply && IsVisible)
-                {
-                    if (LastReceivedCharacterData is not null)
-                    {
-                        Logger.LogDebug("Downloads finished for {handler}, reapplying pending mod data", GetLogIdentifier());
-                        ApplyLastReceivedData(forced: true);
-                        return;
-                    }
-
-                    if (_cachedData is not null)
-                    {
-                        Logger.LogDebug("Downloads finished for {handler}, reapplying pending mod data from cache", GetLogIdentifier());
-                        ApplyCharacterData(Guid.NewGuid(), _cachedData, forceApplyCustomization: true);
-                        return;
-                    }
-                }
-
-                TryApplyQueuedData();
-            });
-
-            if (!useFrameworkUpdate
-                && _actorObjectService.TryGetActorByHash(Ident, out var descriptor)
-                && descriptor.Address != nint.Zero)
-            {
-                trackedDescriptor = descriptor;
+                return;
             }
+            TryApplyQueuedData();
+        });
 
             Initialized = true;
         }
-
-        if (trackedDescriptor.HasValue)
-        {
-            HandleActorTracked(trackedDescriptor.Value);
-        }
     }
 
     private IReadOnlyList<PairConnection> GetCurrentPairs()
@@ -804,67 +737,6 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
         return true;
     }
 
-    private bool IsForbiddenHash(string hash)
-        => _downloadManager.ForbiddenTransfers.Exists(f => string.Equals(f.Hash, hash, StringComparison.Ordinal));
-
-    private static bool IsNonPriorityModPath(string? gamePath)
-    {
-        if (string.IsNullOrEmpty(gamePath))
-        {
-            return false;
-        }
-
-        var extension = Path.GetExtension(gamePath);
-        return !string.IsNullOrEmpty(extension) && NonPriorityModExtensions.Contains(extension);
-    }
-
-    private static bool IsCriticalModReplacement(FileReplacementData replacement)
-    {
-        foreach (var gamePath in replacement.GamePaths)
-        {
-            if (!IsNonPriorityModPath(gamePath))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private void CountMissingReplacements(IEnumerable<FileReplacementData> missing, out int critical, out int nonCritical, out int forbidden)
-    {
-        critical = 0;
-        nonCritical = 0;
-        forbidden = 0;
-
-        foreach (var replacement in missing)
-        {
-            if (IsForbiddenHash(replacement.Hash))
-            {
-                forbidden++;
-            }
-
-            if (IsCriticalModReplacement(replacement))
-            {
-                critical++;
-            }
-            else
-            {
-                nonCritical++;
-            }
-        }
-    }
-
-    private static void RemoveModApplyChanges(Dictionary<ObjectKind, HashSet<PlayerChanges>> updatedData)
-    {
-        foreach (var changes in updatedData.Values)
-        {
-            changes.Remove(PlayerChanges.ModFiles);
-            changes.Remove(PlayerChanges.ModManip);
-            changes.Remove(PlayerChanges.ForcedRedraw);
-        }
-    }
-
     private bool CanApplyNow()
     {
         return !_dalamudUtil.IsInCombat
@@ -888,16 +760,6 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
         _lastBlockingConditions = Array.Empty<string>();
     }
 
-    private void DeferApplication(Guid applicationBase, CharacterData characterData, bool forceApplyCustomization, UserData user, string reason,
-        string failureKey, LogLevel logLevel, string logMessage, params object?[] logArgs)
-    {
-        Mediator.Publish(new EventMessage(new Event(PlayerName, user, nameof(PairHandlerAdapter), EventSeverity.Warning, reason)));
-        Logger.Log(logLevel, logMessage, logArgs);
-        RecordFailure(reason, failureKey);
-        _dataReceivedInDowntime = new(applicationBase, characterData, forceApplyCustomization);
-        SetUploading(false);
-    }
-
     public void ApplyCharacterData(Guid applicationBase, CharacterData characterData, bool forceApplyCustomization = false)
     {
         _lastApplyAttemptAt = DateTime.UtcNow;
@@ -915,48 +777,72 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
         if (_dalamudUtil.IsInCombat)
         {
             const string reason = "Cannot apply character data: you are in combat, deferring application";
-            DeferApplication(applicationBase, characterData, forceApplyCustomization, user, reason, "Combat", LogLevel.Debug,
-                "[BASE-{appBase}] Received data but player is in combat", applicationBase);
+            Mediator.Publish(new EventMessage(new Event(PlayerName, user, nameof(PairHandlerAdapter), EventSeverity.Warning,
+                reason)));
+            Logger.LogDebug("[BASE-{appBase}] Received data but player is in combat", applicationBase);
+            RecordFailure(reason, "Combat");
+            _dataReceivedInDowntime = new(applicationBase, characterData, forceApplyCustomization);
+            SetUploading(false);
             return;
         }
 
         if (_dalamudUtil.IsPerforming)
         {
             const string reason = "Cannot apply character data: you are performing music, deferring application";
-            DeferApplication(applicationBase, characterData, forceApplyCustomization, user, reason, "Performance", LogLevel.Debug,
-                "[BASE-{appBase}] Received data but player is performing", applicationBase);
+            Mediator.Publish(new EventMessage(new Event(PlayerName, user, nameof(PairHandlerAdapter), EventSeverity.Warning,
+                reason)));
+            Logger.LogDebug("[BASE-{appBase}] Received data but player is performing", applicationBase);
+            RecordFailure(reason, "Performance");
+            _dataReceivedInDowntime = new(applicationBase, characterData, forceApplyCustomization);
+            SetUploading(false);
             return;
         }
 
         if (_dalamudUtil.IsInInstance)
         {
             const string reason = "Cannot apply character data: you are in an instance, deferring application";
-            DeferApplication(applicationBase, characterData, forceApplyCustomization, user, reason, "Instance", LogLevel.Debug,
-                "[BASE-{appBase}] Received data but player is in instance", applicationBase);
+            Mediator.Publish(new EventMessage(new Event(PlayerName, user, nameof(PairHandlerAdapter), EventSeverity.Warning,
+                reason)));
+            Logger.LogDebug("[BASE-{appBase}] Received data but player is in instance", applicationBase);
+            RecordFailure(reason, "Instance");
+            _dataReceivedInDowntime = new(applicationBase, characterData, forceApplyCustomization);
+            SetUploading(false);
             return;
         }
 
         if (_dalamudUtil.IsInCutscene)
         {
             const string reason = "Cannot apply character data: you are in a cutscene, deferring application";
-            DeferApplication(applicationBase, characterData, forceApplyCustomization, user, reason, "Cutscene", LogLevel.Debug,
-                "[BASE-{appBase}] Received data but player is in a cutscene", applicationBase);
+            Mediator.Publish(new EventMessage(new Event(PlayerName, user, nameof(PairHandlerAdapter), EventSeverity.Warning,
+                reason)));
+            Logger.LogDebug("[BASE-{appBase}] Received data but player is in a cutscene", applicationBase);
+            RecordFailure(reason, "Cutscene");
+            _dataReceivedInDowntime = new(applicationBase, characterData, forceApplyCustomization);
+            SetUploading(false);
             return;
         }
 
         if (_dalamudUtil.IsInGpose)
         {
             const string reason = "Cannot apply character data: you are in GPose, deferring application";
-            DeferApplication(applicationBase, characterData, forceApplyCustomization, user, reason, "GPose", LogLevel.Debug,
-                "[BASE-{appBase}] Received data but player is in GPose", applicationBase);
+            Mediator.Publish(new EventMessage(new Event(PlayerName, user, nameof(PairHandlerAdapter), EventSeverity.Warning,
+                reason)));
+            Logger.LogDebug("[BASE-{appBase}] Received data but player is in GPose", applicationBase);
+            RecordFailure(reason, "GPose");
+            _dataReceivedInDowntime = new(applicationBase, characterData, forceApplyCustomization);
+            SetUploading(false);
             return;
         }
 
         if (!_ipcManager.Penumbra.APIAvailable || !_ipcManager.Glamourer.APIAvailable)
         {
             const string reason = "Cannot apply character data: Penumbra or Glamourer is not available, deferring application";
-            DeferApplication(applicationBase, characterData, forceApplyCustomization, user, reason, "PluginUnavailable", LogLevel.Information,
-                "[BASE-{appbase}] Application of data for {player} while Penumbra/Glamourer unavailable, returning", applicationBase, GetLogIdentifier());
+            Mediator.Publish(new EventMessage(new Event(PlayerName, user, nameof(PairHandlerAdapter), EventSeverity.Warning,
+                reason)));
+            Logger.LogInformation("[BASE-{appbase}] Application of data for {player} while Penumbra/Glamourer unavailable, returning", applicationBase, GetLogIdentifier());
+            RecordFailure(reason, "PluginUnavailable");
+            _dataReceivedInDowntime = new(applicationBase, characterData, forceApplyCustomization);
+            SetUploading(false);
             return;
         }
 
@@ -999,10 +885,13 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
             _forceApplyMods = false;
         }
 
+        _explicitRedrawQueued = false;
+
         if (_redrawOnNextApplication && charaDataToUpdate.TryGetValue(ObjectKind.Player, out var player))
         {
             player.Add(PlayerChanges.ForcedRedraw);
             _redrawOnNextApplication = false;
+            _explicitRedrawQueued = true;
         }
 
         if (charaDataToUpdate.TryGetValue(ObjectKind.Player, out var playerChanges))
@@ -1196,14 +1085,7 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
 
             Logger.LogDebug("[{applicationId}] Applying Customization Data for {handler}", applicationId, handler);
             await _dalamudUtil.WaitWhileCharacterIsDrawing(Logger, handler, applicationId, 30000, token).ConfigureAwait(false);
-            if (handler.Address != nint.Zero)
-            {
-                await _actorObjectService.WaitForFullyLoadedAsync(handler.Address, token).ConfigureAwait(false);
-            }
-
             token.ThrowIfCancellationRequested();
-            var tasks = new List<Task>();
-            bool needsRedraw = false;
             foreach (var change in changes.Value.OrderBy(p => (int)p))
             {
                 Logger.LogDebug("[{applicationId}] Processing {change} for {handler}", applicationId, change, handler);
@@ -1212,39 +1094,45 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
                     case PlayerChanges.Customize:
                         if (charaData.CustomizePlusData.TryGetValue(changes.Key, out var customizePlusData))
                         {
-                            tasks.Add(ApplyCustomizeAsync(handler.Address, customizePlusData, changes.Key));
+                            _customizeIds[changes.Key] = await _ipcManager.CustomizePlus.SetBodyScaleAsync(handler.Address, customizePlusData).ConfigureAwait(false);
                         }
                         else if (_customizeIds.TryGetValue(changes.Key, out var customizeId))
                         {
-                            tasks.Add(RevertCustomizeAsync(customizeId, changes.Key));
+                            await _ipcManager.CustomizePlus.RevertByIdAsync(customizeId).ConfigureAwait(false);
+                            _customizeIds.Remove(changes.Key);
                         }
                         break;
 
                     case PlayerChanges.Heels:
-                        tasks.Add(_ipcManager.Heels.SetOffsetForPlayerAsync(handler.Address, charaData.HeelsData));
+                        await _ipcManager.Heels.SetOffsetForPlayerAsync(handler.Address, charaData.HeelsData).ConfigureAwait(false);
                         break;
 
                     case PlayerChanges.Honorific:
-                        tasks.Add(_ipcManager.Honorific.SetTitleAsync(handler.Address, charaData.HonorificData));
+                        await _ipcManager.Honorific.SetTitleAsync(handler.Address, charaData.HonorificData).ConfigureAwait(false);
                         break;
 
                     case PlayerChanges.Glamourer:
                         if (charaData.GlamourerData.TryGetValue(changes.Key, out var glamourerData))
                         {
-                            tasks.Add(_ipcManager.Glamourer.ApplyAllAsync(Logger, handler, glamourerData, applicationId, token));
+                            await _ipcManager.Glamourer.ApplyAllAsync(Logger, handler, glamourerData, applicationId, token).ConfigureAwait(false);
                         }
                         break;
 
                     case PlayerChanges.Moodles:
-                        tasks.Add(_ipcManager.Moodles.SetStatusAsync(handler.Address, charaData.MoodlesData));
+                        await _ipcManager.Moodles.SetStatusAsync(handler.Address, charaData.MoodlesData).ConfigureAwait(false);
                         break;
 
                     case PlayerChanges.PetNames:
-                        tasks.Add(_ipcManager.PetNames.SetPlayerData(handler.Address, charaData.PetNamesData));
+                        await _ipcManager.PetNames.SetPlayerData(handler.Address, charaData.PetNamesData).ConfigureAwait(false);
                         break;
 
                     case PlayerChanges.ForcedRedraw:
-                        needsRedraw = true;
+                        if (!ShouldPerformForcedRedraw(changes.Key, changes.Value, charaData))
+                        {
+                            Logger.LogTrace("[{applicationId}] Skipping forced redraw for {handler}", applicationId, handler);
+                            break;
+                        }
+                        await _ipcManager.Penumbra.RedrawAsync(Logger, handler, applicationId, token).ConfigureAwait(false);
                         break;
 
                     default:
@@ -1252,16 +1140,6 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
                 }
                 token.ThrowIfCancellationRequested();
             }
-
-            if (tasks.Count > 0)
-            {
-                await Task.WhenAll(tasks).ConfigureAwait(false);
-            }
-
-            if (needsRedraw)
-            {
-                await _ipcManager.Penumbra.RedrawAsync(Logger, handler, applicationId, token).ConfigureAwait(false);
-            }
         }
         finally
         {
@@ -1269,6 +1147,44 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
         }
     }
 
+    private bool ShouldPerformForcedRedraw(ObjectKind objectKind, ICollection<PlayerChanges> changeSet, CharacterData newData)
+    {
+        if (objectKind != ObjectKind.Player)
+        {
+            return true;
+        }
+
+        var hasModFiles = changeSet.Contains(PlayerChanges.ModFiles);
+        var hasManip = changeSet.Contains(PlayerChanges.ModManip);
+        var modsChanged = hasModFiles && PlayerModFilesChanged(newData, _cachedData);
+        var manipChanged = hasManip && !string.Equals(_cachedData?.ManipulationData, newData.ManipulationData, StringComparison.Ordinal);
+
+        if (modsChanged)
+        {
+            _explicitRedrawQueued = false;
+            return true;
+        }
+
+        if (manipChanged)
+        {
+            _explicitRedrawQueued = false;
+            return true;
+        }
+
+        if (_explicitRedrawQueued)
+        {
+            _explicitRedrawQueued = false;
+            return true;
+        }
+
+        if ((hasModFiles || hasManip) && (_forceFullReapply || _needsCollectionRebuild))
+        {
+            _explicitRedrawQueued = false;
+            return true;
+        }
+
+        return false;
+    }
 
     private static Dictionary<ObjectKind, HashSet<PlayerChanges>> BuildFullChangeSet(CharacterData characterData)
     {
@@ -1423,7 +1339,6 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
             bool skipDownscaleForPair = ShouldSkipDownscale();
             var user = GetPrimaryUserData();
             Dictionary<(string GamePath, string? Hash), string> moddedPaths;
-            List<FileReplacementData> missingReplacements = [];
 
             if (updateModdedPaths)
             {
@@ -1435,7 +1350,6 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
                 {
                     int attempts = 0;
                     List<FileReplacementData> toDownloadReplacements = TryCalculateModdedDictionary(applicationBase, charaData, out moddedPaths, downloadToken);
-                    missingReplacements = toDownloadReplacements;
 
                     while (toDownloadReplacements.Count > 0 && attempts++ <= 10 && !downloadToken.IsCancellationRequested)
                     {
@@ -1485,7 +1399,6 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
                         }
 
                         toDownloadReplacements = TryCalculateModdedDictionary(applicationBase, charaData, out moddedPaths, downloadToken);
-                        missingReplacements = toDownloadReplacements;
 
                         if (toDownloadReplacements.TrueForAll(c => _downloadManager.ForbiddenTransfers.Exists(f => string.Equals(f.Hash, c.Hash, StringComparison.Ordinal))))
                         {
@@ -1509,54 +1422,6 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
                     : [];
             }
 
-            var wantsModApply = updateModdedPaths || updateManip;
-            var pendingModReapply = false;
-            var deferModApply = false;
-
-            if (wantsModApply && missingReplacements.Count > 0)
-            {
-                CountMissingReplacements(missingReplacements, out var missingCritical, out var missingNonCritical, out var missingForbidden);
-                _lastMissingCriticalMods = missingCritical;
-                _lastMissingNonCriticalMods = missingNonCritical;
-                _lastMissingForbiddenMods = missingForbidden;
-
-                var hasCriticalMissing = missingCritical > 0;
-                var hasNonCriticalMissing = missingNonCritical > 0;
-                var hasDownloadableMissing = missingReplacements.Any(replacement => !IsForbiddenHash(replacement.Hash));
-                var hasDownloadableCriticalMissing = hasCriticalMissing
-                    && missingReplacements.Any(replacement => !IsForbiddenHash(replacement.Hash) && IsCriticalModReplacement(replacement));
-
-                pendingModReapply = hasDownloadableMissing;
-                _lastModApplyDeferred = false;
-
-                if (hasDownloadableCriticalMissing)
-                {
-                    deferModApply = true;
-                    _lastModApplyDeferred = true;
-                    Logger.LogDebug("[BASE-{appBase}] Critical mod files missing for {handler}, deferring mod apply ({count} missing)",
-                        applicationBase, GetLogIdentifier(), missingReplacements.Count);
-                }
-                else if (hasNonCriticalMissing && hasDownloadableMissing)
-                {
-                    Logger.LogDebug("[BASE-{appBase}] Non-critical mod files missing for {handler}, applying partial mods and reapplying after downloads ({count} missing)",
-                        applicationBase, GetLogIdentifier(), missingReplacements.Count);
-                }
-            }
-            else
-            {
-                _lastMissingCriticalMods = 0;
-                _lastMissingNonCriticalMods = 0;
-                _lastMissingForbiddenMods = 0;
-                _lastModApplyDeferred = false;
-            }
-
-            if (deferModApply)
-            {
-                updateModdedPaths = false;
-                updateManip = false;
-                RemoveModApplyChanges(updatedData);
-            }
-
             downloadToken.ThrowIfCancellationRequested();
 
             var handlerForApply = _charaHandler;
@@ -1589,7 +1454,7 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
             _applicationCancellationTokenSource = _applicationCancellationTokenSource.CancelRecreate() ?? new CancellationTokenSource();
             var token = _applicationCancellationTokenSource.Token;
 
-            _applicationTask = ApplyCharacterDataAsync(applicationBase, handlerForApply, charaData, updatedData, updateModdedPaths, updateManip, moddedPaths, wantsModApply, pendingModReapply, token);
+            _applicationTask = ApplyCharacterDataAsync(applicationBase, handlerForApply, charaData, updatedData, updateModdedPaths, updateManip, moddedPaths, token);
         }
         finally
         {
@@ -1598,7 +1463,7 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
     }
 
     private async Task ApplyCharacterDataAsync(Guid applicationBase, GameObjectHandler handlerForApply, CharacterData charaData, Dictionary<ObjectKind, HashSet<PlayerChanges>> updatedData, bool updateModdedPaths, bool updateManip,
-        Dictionary<(string GamePath, string? Hash), string> moddedPaths, bool wantsModApply, bool pendingModReapply, CancellationToken token)
+        Dictionary<(string GamePath, string? Hash), string> moddedPaths, CancellationToken token)
     {
         try
         {
@@ -1607,10 +1472,6 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
 
             Logger.LogDebug("[{applicationId}] Waiting for initial draw for for {handler}", _applicationId, handlerForApply);
             await _dalamudUtil.WaitWhileCharacterIsDrawing(Logger, handlerForApply, _applicationId, 30000, token).ConfigureAwait(false);
-            if (handlerForApply.Address != nint.Zero)
-            {
-                await _actorObjectService.WaitForFullyLoadedAsync(handlerForApply.Address, token).ConfigureAwait(false);
-            }
 
             token.ThrowIfCancellationRequested();
 
@@ -1677,11 +1538,7 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
 
             _cachedData = charaData;
             _pairStateCache.Store(Ident, charaData);
-            if (wantsModApply)
-            {
-                _pendingModReapply = pendingModReapply;
-            }
-            _forceFullReapply = _pendingModReapply;
+            _forceFullReapply = false;
             _needsCollectionRebuild = false;
             if (LastAppliedApproximateVRAMBytes < 0 || LastAppliedApproximateEffectiveVRAMBytes < 0)
             {
@@ -1727,15 +1584,8 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
 
     private void FrameworkUpdate()
     {
-        if (string.IsNullOrEmpty(PlayerName) && _charaHandler is null)
+        if (string.IsNullOrEmpty(PlayerName))
         {
-            var now = DateTime.UtcNow;
-            if (now < _nextActorLookupUtc)
-            {
-                return;
-            }
-
-            _nextActorLookupUtc = now + ActorLookupInterval;
             var pc = _dalamudUtil.FindPlayerByNameHash(Ident);
             if (pc == default((string, nint))) return;
             Logger.LogDebug("One-Time Initializing {handler}", GetLogIdentifier());
@@ -1745,11 +1595,6 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
                 $"Initializing User For Character {pc.Name}")));
         }
 
-        TryHandleVisibilityUpdate();
-    }
-
-    private void TryHandleVisibilityUpdate()
-    {
         if (_charaHandler?.Address != nint.Zero && !IsVisible && !_pauseRequested)
         {
             Guid appData = Guid.NewGuid();
@@ -1796,24 +1641,16 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
         }
         else if (_charaHandler?.Address == nint.Zero && IsVisible)
         {
-            HandleVisibilityLoss(logChange: true);
+            IsVisible = false;
+            _charaHandler.Invalidate();
+            _downloadCancellationTokenSource?.CancelDispose();
+            _downloadCancellationTokenSource = null;
+            Logger.LogTrace("{handler} visibility changed, now: {visi}", GetLogIdentifier(), IsVisible);
         }
 
         TryApplyQueuedData();
     }
 
-    private void HandleVisibilityLoss(bool logChange)
-    {
-        IsVisible = false;
-        _charaHandler?.Invalidate();
-        _downloadCancellationTokenSource?.CancelDispose();
-        _downloadCancellationTokenSource = null;
-        if (logChange)
-        {
-            Logger.LogTrace("{handler} visibility changed, now: {visi}", GetLogIdentifier(), IsVisible);
-        }
-    }
-
     private void Initialize(string name)
     {
         PlayerName = name;
@@ -2140,164 +1977,7 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
         }
 
         _dataReceivedInDowntime = null;
-        _ = Task.Run(() =>
-        {
-            try
-            {
-                ApplyCharacterData(pending.ApplicationId, pending.CharacterData, pending.Forced);
-            }
-            catch (Exception ex)
-        {
-            Logger.LogError(ex, "Failed applying queued data for {handler}", GetLogIdentifier());
-        }
-    });
-    }
-
-    private void HandleActorTracked(ActorObjectService.ActorDescriptor descriptor)
-    {
-        if (!TryResolveDescriptorHash(descriptor, out var hashedCid))
-            return;
-
-        if (!string.Equals(hashedCid, Ident, StringComparison.Ordinal))
-            return;
-
-        if (descriptor.Address == nint.Zero)
-            return;
-
-        RefreshTrackedHandler(descriptor);
-        QueueActorInitialization(descriptor);
-    }
-
-    private void QueueActorInitialization(ActorObjectService.ActorDescriptor descriptor)
-    {
-        lock (_actorInitializationGate)
-        {
-            _pendingActorDescriptor = descriptor;
-            if (_actorInitializationInProgress)
-            {
-                return;
-            }
-
-            _actorInitializationInProgress = true;
-        }
-
-        _ = Task.Run(InitializeFromTrackedAsync);
-    }
-
-    private async Task InitializeFromTrackedAsync()
-    {
-        try
-        {
-            await ActorInitializationLimiter.WaitAsync().ConfigureAwait(false);
-            while (true)
-            {
-                ActorObjectService.ActorDescriptor? descriptor;
-                lock (_actorInitializationGate)
-                {
-                    descriptor = _pendingActorDescriptor;
-                    _pendingActorDescriptor = null;
-                }
-
-                if (!descriptor.HasValue)
-                {
-                    break;
-                }
-
-                if (_frameworkUpdateSubscribed && _actorObjectService.HooksActive)
-                {
-                    Mediator.Unsubscribe<FrameworkUpdateMessage>(this);
-                    _frameworkUpdateSubscribed = false;
-                }
-
-                if (string.IsNullOrEmpty(PlayerName) || _charaHandler is null)
-                {
-                    Logger.LogDebug("Actor tracked for {handler}, initializing from hook", GetLogIdentifier());
-                    Initialize(descriptor.Value.Name);
-                    Mediator.Publish(new EventMessage(new Event(PlayerName, GetPrimaryUserData(), nameof(PairHandlerAdapter), EventSeverity.Informational,
-                        $"Initializing User For Character {descriptor.Value.Name}")));
-                }
-
-                RefreshTrackedHandler(descriptor.Value);
-                TryHandleVisibilityUpdate();
-            }
-        }
-        finally
-        {
-            ActorInitializationLimiter.Release();
-            lock (_actorInitializationGate)
-            {
-                _actorInitializationInProgress = false;
-                if (_pendingActorDescriptor.HasValue)
-                {
-                    _actorInitializationInProgress = true;
-                    _ = Task.Run(InitializeFromTrackedAsync);
-                }
-            }
-        }
-    }
-
-    private void RefreshTrackedHandler(ActorObjectService.ActorDescriptor descriptor)
-    {
-        if (_charaHandler is null)
-            return;
-
-        if (descriptor.Address == nint.Zero)
-            return;
-
-        if (_charaHandler.Address == descriptor.Address)
-            return;
-
-        _charaHandler.Refresh();
-    }
-
-    private void HandleActorUntracked(ActorObjectService.ActorDescriptor descriptor)
-    {
-        if (!TryResolveDescriptorHash(descriptor, out var hashedCid))
-        {
-            if (_charaHandler is null || _charaHandler.Address == nint.Zero)
-                return;
-
-            if (descriptor.Address != _charaHandler.Address)
-                return;
-        }
-        else if (!string.Equals(hashedCid, Ident, StringComparison.Ordinal))
-        {
-            return;
-        }
-
-        if (_charaHandler is null || _charaHandler.Address == nint.Zero)
-            return;
-
-        if (descriptor.Address != _charaHandler.Address)
-            return;
-
-        HandleVisibilityLoss(logChange: false);
-    }
-
-    private bool TryResolveDescriptorHash(ActorObjectService.ActorDescriptor descriptor, out string hashedCid)
-    {
-        hashedCid = descriptor.HashedContentId ?? string.Empty;
-        if (!string.IsNullOrEmpty(hashedCid))
-            return true;
-
-        if (descriptor.ObjectKind != DalamudObjectKind.Player || descriptor.Address == nint.Zero)
-            return false;
-
-        hashedCid = DalamudUtilService.GetHashedCIDFromPlayerPointer(descriptor.Address);
-        return !string.IsNullOrEmpty(hashedCid);
-    }
-
-    private async Task ApplyCustomizeAsync(nint address, string customizeData, ObjectKind kind)
-    {
-        _customizeIds[kind] = await _ipcManager.CustomizePlus.SetBodyScaleAsync(address, customizeData).ConfigureAwait(false);
-    }
-
-    private async Task RevertCustomizeAsync(Guid? customizeId, ObjectKind kind)
-    {
-        if (!customizeId.HasValue)
-            return;
-
-        await _ipcManager.CustomizePlus.RevertByIdAsync(customizeId.Value).ConfigureAwait(false);
-        _customizeIds.Remove(kind);
+        ApplyCharacterData(pending.ApplicationId,
+            pending.CharacterData, pending.Forced);
     }
 }

LightlessSync/PlayerData/Pairs/PairHandlerAdapterFactory.cs

@@ -2,7 +2,6 @@ using LightlessSync.FileCache;
 using LightlessSync.Interop.Ipc;
 using LightlessSync.PlayerData.Factories;
 using LightlessSync.Services;
-using LightlessSync.Services.ActorTracking;
 using LightlessSync.Services.Mediator;
 using LightlessSync.Services.PairProcessing;
 using LightlessSync.Services.ServerConfiguration;
@@ -72,7 +71,6 @@ internal sealed class PairHandlerAdapterFactory : IPairHandlerAdapterFactory
     {
         var downloadManager = _fileDownloadManagerFactory.Create();
         var dalamudUtilService = _serviceProvider.GetRequiredService<DalamudUtilService>();
-        var actorObjectService = _serviceProvider.GetRequiredService<ActorObjectService>();
         return new PairHandlerAdapter(
             _loggerFactory.CreateLogger<PairHandlerAdapter>(),
             _mediator,
@@ -83,7 +81,6 @@ internal sealed class PairHandlerAdapterFactory : IPairHandlerAdapterFactory
             downloadManager,
             _pluginWarningNotificationManager,
             dalamudUtilService,
-            actorObjectService,
             _lifetime,
             _fileCacheManager,
             _playerPerformanceService,

LightlessSync/Plugin.cs

@@ -201,7 +201,6 @@ public sealed class Plugin : IDalamudPlugin
             gameInteropProvider,
             objectTable,
             clientState,
-            condition,
             sp.GetRequiredService<LightlessMediator>()));
 
         services.AddSingleton(sp => new DalamudUtilService(
@@ -268,7 +267,6 @@ public sealed class Plugin : IDalamudPlugin
             sp.GetRequiredService<ILogger<LightFinderPlateHandler>>(),
             addonLifecycle,
             gameGui,
-            clientState,
             sp.GetRequiredService<LightlessConfigService>(),
             sp.GetRequiredService<LightlessMediator>(),
             objectTable,

LightlessSync/Services/ActorTracking/ActorObjectService.cs

@@ -1,5 +1,4 @@
 using System.Collections.Concurrent;
-using Dalamud.Game.ClientState.Conditions;
 using Dalamud.Game.ClientState.Objects.SubKinds;
 using Dalamud.Hooking;
 using Dalamud.Plugin.Services;
@@ -32,18 +31,13 @@ public sealed class ActorObjectService : IHostedService, IDisposable
     private readonly IFramework _framework;
     private readonly IGameInteropProvider _interop;
     private readonly IObjectTable _objectTable;
-    private readonly IClientState _clientState;
-    private readonly ICondition _condition;
     private readonly LightlessMediator _mediator;
 
     private readonly ConcurrentDictionary<nint, ActorDescriptor> _activePlayers = new();
-    private readonly ConcurrentDictionary<nint, ActorDescriptor> _gposePlayers = new();
     private readonly ConcurrentDictionary<string, ActorDescriptor> _actorsByHash = new(StringComparer.Ordinal);
     private readonly ConcurrentDictionary<string, ConcurrentDictionary<nint, ActorDescriptor>> _actorsByName = new(StringComparer.Ordinal);
-    private readonly ConcurrentDictionary<nint, byte> _pendingHashResolutions = new();
     private readonly OwnedObjectTracker _ownedTracker = new();
     private ActorSnapshot _snapshot = ActorSnapshot.Empty;
-    private GposeSnapshot _gposeSnapshot = GposeSnapshot.Empty;
 
     private Hook<Character.Delegates.OnInitialize>? _onInitializeHook;
     private Hook<Character.Delegates.Terminate>? _onTerminateHook;
@@ -61,29 +55,21 @@ public sealed class ActorObjectService : IHostedService, IDisposable
         IGameInteropProvider interop,
         IObjectTable objectTable,
         IClientState clientState,
-        ICondition condition,
         LightlessMediator mediator)
     {
         _logger = logger;
         _framework = framework;
         _interop = interop;
         _objectTable = objectTable;
-        _clientState = clientState;
-        _condition = condition;
         _mediator = mediator;
     }
 
-    private bool IsZoning => _condition[ConditionFlag.BetweenAreas] || _condition[ConditionFlag.BetweenAreas51];
-
     private ActorSnapshot Snapshot => Volatile.Read(ref _snapshot);
-    private GposeSnapshot CurrentGposeSnapshot => Volatile.Read(ref _gposeSnapshot);
 
     public IReadOnlyList<nint> PlayerAddresses => Snapshot.PlayerAddresses;
 
-    public IEnumerable<ActorDescriptor> ObjectDescriptors => _activePlayers.Values;
-    public IReadOnlyList<ActorDescriptor> PlayerDescriptors => Snapshot.PlayerDescriptors;
-    public IReadOnlyList<ActorDescriptor> OwnedDescriptors => Snapshot.OwnedDescriptors;
-    public IReadOnlyList<ActorDescriptor> GposeDescriptors => CurrentGposeSnapshot.GposeDescriptors;
+    public IEnumerable<ActorDescriptor> PlayerDescriptors => _activePlayers.Values;
+    public IReadOnlyList<ActorDescriptor> PlayerCharacterDescriptors => Snapshot.PlayerDescriptors;
 
     public bool TryGetActorByHash(string hash, out ActorDescriptor descriptor) => _actorsByHash.TryGetValue(hash, out descriptor);
     public bool TryGetValidatedActorByHash(string hash, out ActorDescriptor descriptor)
@@ -127,7 +113,6 @@ public sealed class ActorObjectService : IHostedService, IDisposable
         return false;
     }
     public bool HooksActive => _hooksActive;
-    public bool HasPendingHashResolutions => !_pendingHashResolutions.IsEmpty;
     public IReadOnlyList<nint> RenderedPlayerAddresses => Snapshot.OwnedObjects.RenderedPlayers;
     public IReadOnlyList<nint> RenderedCompanionAddresses => Snapshot.OwnedObjects.RenderedCompanions;
     public IReadOnlyList<nint> OwnedObjectAddresses => Snapshot.OwnedObjects.OwnedAddresses;
@@ -222,7 +207,7 @@ public sealed class ActorObjectService : IHostedService, IDisposable
             cancellationToken.ThrowIfCancellationRequested();
 
             var isLoaded = await _framework.RunOnFrameworkThread(() => IsObjectFullyLoaded(address)).ConfigureAwait(false);
-            if (!IsZoning && isLoaded)
+            if (isLoaded)
                 return;
 
             await Task.Delay(100, cancellationToken).ConfigureAwait(false);
@@ -312,13 +297,10 @@ public sealed class ActorObjectService : IHostedService, IDisposable
     {
         DisposeHooks();
         _activePlayers.Clear();
-        _gposePlayers.Clear();
         _actorsByHash.Clear();
         _actorsByName.Clear();
-        _pendingHashResolutions.Clear();
         _ownedTracker.Reset();
         Volatile.Write(ref _snapshot, ActorSnapshot.Empty);
-        Volatile.Write(ref _gposeSnapshot, GposeSnapshot.Empty);
         return Task.CompletedTask;
     }
 
@@ -354,7 +336,7 @@ public sealed class ActorObjectService : IHostedService, IDisposable
         _onCompanionTerminateHook.Enable();
 
         _hooksActive = true;
-        _logger.LogTrace("ActorObjectService hooks enabled.");
+        _logger.LogDebug("ActorObjectService hooks enabled.");
     }
 
     private Task WarmupExistingActors()
@@ -368,21 +350,36 @@ public sealed class ActorObjectService : IHostedService, IDisposable
 
     private unsafe void OnCharacterInitialized(Character* chara)
     {
-        ExecuteOriginal(() => _onInitializeHook!.Original(chara), "Error invoking original character initialize.");
-        QueueTrack((GameObject*)chara);
+        try
+        {
+            _onInitializeHook!.Original(chara);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error invoking original character initialize.");
+        }
+
+        QueueFrameworkUpdate(() => TrackGameObject((GameObject*)chara));
     }
 
     private unsafe void OnCharacterTerminated(Character* chara)
     {
         var address = (nint)chara;
-        QueueUntrack(address);
-        ExecuteOriginal(() => _onTerminateHook!.Original(chara), "Error invoking original character terminate.");
+        QueueFrameworkUpdate(() => UntrackGameObject(address));
+        try
+        {
+            _onTerminateHook!.Original(chara);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error invoking original character terminate.");
+        }
     }
 
     private unsafe GameObject* OnCharacterDisposed(Character* chara, byte freeMemory)
     {
         var address = (nint)chara;
-        QueueUntrack(address);
+        QueueFrameworkUpdate(() => UntrackGameObject(address));
         try
         {
             return _onDestructorHook!.Original(chara, freeMemory);
@@ -419,7 +416,7 @@ public sealed class ActorObjectService : IHostedService, IDisposable
 
         if (_logger.IsEnabled(LogLevel.Debug))
         {
-            _logger.LogTrace("Actor tracked: {Name} addr={Address:X} idx={Index} owned={OwnedKind} local={Local} gpose={Gpose}",
+            _logger.LogDebug("Actor tracked: {Name} addr={Address:X} idx={Index} owned={OwnedKind} local={Local} gpose={Gpose}",
                 descriptor.Name,
                 descriptor.Address,
                 descriptor.ObjectIndex,
@@ -537,7 +534,7 @@ public sealed class ActorObjectService : IHostedService, IDisposable
             RemoveDescriptor(descriptor);
             if (_logger.IsEnabled(LogLevel.Debug))
             {
-                _logger.LogTrace("Actor untracked: {Name} addr={Address:X} idx={Index} owned={OwnedKind}",
+                _logger.LogDebug("Actor untracked: {Name} addr={Address:X} idx={Index} owned={OwnedKind}",
                     descriptor.Name,
                     descriptor.Address,
                     descriptor.ObjectIndex,
@@ -561,14 +558,10 @@ public sealed class ActorObjectService : IHostedService, IDisposable
             if (!seen.Add(address))
                 continue;
 
-            var gameObject = (GameObject*)address;
-            if (_activePlayers.TryGetValue(address, out var existing))
-            {
-                RefreshDescriptorIfNeeded(existing, gameObject);
+            if (_activePlayers.ContainsKey(address))
                 continue;
-            }
 
-            TrackGameObject(gameObject);
+            TrackGameObject((GameObject*)address);
         }
 
         var stale = _activePlayers.Keys.Where(addr => !seen.Contains(addr)).ToList();
@@ -581,50 +574,6 @@ public sealed class ActorObjectService : IHostedService, IDisposable
         {
             _nextRefreshAllowed = DateTime.UtcNow + SnapshotRefreshInterval;
         }
-
-        if (_clientState.IsGPosing)
-        {
-            RefreshGposeActorsInternal();
-        }
-        else if (!_gposePlayers.IsEmpty)
-        {
-            _gposePlayers.Clear();
-            PublishGposeSnapshot();
-        }
-    }
-
-    private unsafe void RefreshDescriptorIfNeeded(ActorDescriptor existing, GameObject* gameObject)
-    {
-        if (gameObject == null)
-            return;
-
-        if (existing.ObjectKind != DalamudObjectKind.Player || !string.IsNullOrEmpty(existing.HashedContentId))
-            return;
-
-        var objectKind = (DalamudObjectKind)gameObject->ObjectKind;
-        if (!IsSupportedObjectKind(objectKind))
-            return;
-
-        if (BuildDescriptor(gameObject, objectKind) is not { } updated)
-            return;
-
-        if (string.IsNullOrEmpty(updated.HashedContentId))
-            return;
-
-        ReplaceDescriptor(existing, updated);
-        _mediator.Publish(new ActorTrackedMessage(updated));
-    }
-
-    private void ReplaceDescriptor(ActorDescriptor existing, ActorDescriptor updated)
-    {
-        RemoveDescriptorFromIndexes(existing);
-        _ownedTracker.OnDescriptorRemoved(existing);
-
-        _activePlayers[updated.Address] = updated;
-        IndexDescriptor(updated);
-        _ownedTracker.OnDescriptorAdded(updated);
-        UpdatePendingHashResolutions(updated);
-        PublishSnapshot();
     }
 
     private void IndexDescriptor(ActorDescriptor descriptor)
@@ -656,15 +605,30 @@ public sealed class ActorObjectService : IHostedService, IDisposable
 
     private unsafe void OnCompanionInitialized(Companion* companion)
     {
-        ExecuteOriginal(() => _onCompanionInitializeHook!.Original(companion), "Error invoking original companion initialize.");
-        QueueTrack((GameObject*)companion);
+        try
+        {
+            _onCompanionInitializeHook!.Original(companion);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error invoking original companion initialize.");
+        }
+
+        QueueFrameworkUpdate(() => TrackGameObject((GameObject*)companion));
     }
 
     private unsafe void OnCompanionTerminated(Companion* companion)
     {
         var address = (nint)companion;
-        QueueUntrack(address);
-        ExecuteOriginal(() => _onCompanionTerminateHook!.Original(companion), "Error invoking original companion terminate.");
+        QueueFrameworkUpdate(() => UntrackGameObject(address));
+        try
+        {
+            _onCompanionTerminateHook!.Original(companion);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error invoking original companion terminate.");
+        }
     }
 
     private void RemoveDescriptorFromIndexes(ActorDescriptor descriptor)
@@ -691,7 +655,6 @@ public sealed class ActorObjectService : IHostedService, IDisposable
         _activePlayers[descriptor.Address] = descriptor;
         IndexDescriptor(descriptor);
         _ownedTracker.OnDescriptorAdded(descriptor);
-        UpdatePendingHashResolutions(descriptor);
         PublishSnapshot();
     }
 
@@ -699,42 +662,21 @@ public sealed class ActorObjectService : IHostedService, IDisposable
     {
         RemoveDescriptorFromIndexes(descriptor);
         _ownedTracker.OnDescriptorRemoved(descriptor);
-        _pendingHashResolutions.TryRemove(descriptor.Address, out _);
         PublishSnapshot();
     }
 
-    private void UpdatePendingHashResolutions(ActorDescriptor descriptor)
-    {
-        if (descriptor.ObjectKind != DalamudObjectKind.Player)
-        {
-            _pendingHashResolutions.TryRemove(descriptor.Address, out _);
-            return;
-        }
-
-        if (string.IsNullOrEmpty(descriptor.HashedContentId))
-        {
-            _pendingHashResolutions[descriptor.Address] = 1;
-            return;
-        }
-
-        _pendingHashResolutions.TryRemove(descriptor.Address, out _);
-    }
-
     private void PublishSnapshot()
     {
         var playerDescriptors = _activePlayers.Values
             .Where(descriptor => descriptor.ObjectKind == DalamudObjectKind.Player)
             .ToArray();
-        var ownedDescriptors = _activePlayers.Values
-            .Where(descriptor => descriptor.OwnedKind is not null)
-            .ToArray();
         var playerAddresses = new nint[playerDescriptors.Length];
         for (var i = 0; i < playerDescriptors.Length; i++)
             playerAddresses[i] = playerDescriptors[i].Address;
 
         var ownedSnapshot = _ownedTracker.CreateSnapshot();
         var nextGeneration = Snapshot.Generation + 1;
-        var snapshot = new ActorSnapshot(playerDescriptors, ownedDescriptors, playerAddresses, ownedSnapshot, nextGeneration);
+        var snapshot = new ActorSnapshot(playerDescriptors, playerAddresses, ownedSnapshot, nextGeneration);
         Volatile.Write(ref _snapshot, snapshot);
     }
 
@@ -752,24 +694,6 @@ public sealed class ActorObjectService : IHostedService, IDisposable
         _ = _framework.RunOnFrameworkThread(action);
     }
 
-    private void ExecuteOriginal(Action action, string errorMessage)
-    {
-        try
-        {
-            action();
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, errorMessage);
-        }
-    }
-
-    private unsafe void QueueTrack(GameObject* gameObject)
-        => QueueFrameworkUpdate(() => TrackGameObject(gameObject));
-
-    private void QueueUntrack(nint address)
-        => QueueFrameworkUpdate(() => UntrackGameObject(address));
-
     private void DisposeHooks()
     {
         var hadHooks = _hooksActive
@@ -801,7 +725,7 @@ public sealed class ActorObjectService : IHostedService, IDisposable
 
         if (hadHooks)
         {
-            _logger.LogTrace("ActorObjectService hooks disabled.");
+            _logger.LogDebug("ActorObjectService hooks disabled.");
         }
     }
 
@@ -846,89 +770,6 @@ public sealed class ActorObjectService : IHostedService, IDisposable
         return results;
     }
 
-    private unsafe void RefreshGposeActorsInternal()
-    {
-        var addresses = EnumerateGposeCharacterAddresses();
-        HashSet<nint> seen = new(addresses.Count);
-
-        foreach (var address in addresses)
-        {
-            if (address == nint.Zero)
-                continue;
-
-            if (!seen.Add(address))
-                continue;
-
-            if (_gposePlayers.ContainsKey(address))
-                continue;
-
-            TrackGposeObject((GameObject*)address);
-        }
-
-        var stale = _gposePlayers.Keys.Where(addr => !seen.Contains(addr)).ToList();
-        foreach (var staleAddress in stale)
-        {
-            UntrackGposeObject(staleAddress);
-        }
-
-        PublishGposeSnapshot();
-    }
-
-    private unsafe void TrackGposeObject(GameObject* gameObject)
-    {
-        if (gameObject == null)
-            return;
-
-        var objectKind = (DalamudObjectKind)gameObject->ObjectKind;
-        if (objectKind != DalamudObjectKind.Player)
-            return;
-
-        if (BuildDescriptor(gameObject, objectKind) is not { } descriptor)
-            return;
-
-        if (!descriptor.IsInGpose)
-            return;
-
-        _gposePlayers[descriptor.Address] = descriptor;
-    }
-
-    private void UntrackGposeObject(nint address)
-    {
-        if (address == nint.Zero)
-            return;
-
-        _gposePlayers.TryRemove(address, out _);
-    }
-
-    private void PublishGposeSnapshot()
-    {
-        var gposeDescriptors = _gposePlayers.Values.ToArray();
-        var gposeAddresses = new nint[gposeDescriptors.Length];
-        for (var i = 0; i < gposeDescriptors.Length; i++)
-            gposeAddresses[i] = gposeDescriptors[i].Address;
-
-        var nextGeneration = CurrentGposeSnapshot.Generation + 1;
-        var snapshot = new GposeSnapshot(gposeDescriptors, gposeAddresses, nextGeneration);
-        Volatile.Write(ref _gposeSnapshot, snapshot);
-    }
-
-    private List<nint> EnumerateGposeCharacterAddresses()
-    {
-        var results = new List<nint>(16);
-        foreach (var obj in _objectTable)
-        {
-            if (obj.ObjectKind != DalamudObjectKind.Player)
-                continue;
-
-            if (obj.ObjectIndex < 200)
-                continue;
-
-            results.Add(obj.Address);
-        }
-
-        return results;
-    }
-
     private static unsafe bool IsObjectFullyLoaded(nint address)
     {
         if (address == nint.Zero)
@@ -942,10 +783,13 @@ public sealed class ActorObjectService : IHostedService, IDisposable
         if (drawObject == null)
             return false;
 
-        if ((ulong)gameObject->RenderFlags == 2048)
+        if ((gameObject->RenderFlags & VisibilityFlags.Nameplate) != VisibilityFlags.None)
             return false;
 
         var characterBase = (CharacterBase*)drawObject;
+        if (characterBase == null)
+            return false;
+
         if (characterBase->HasModelInSlotLoaded != 0)
             return false;
 
@@ -1081,27 +925,14 @@ public sealed class ActorObjectService : IHostedService, IDisposable
 
     private sealed record ActorSnapshot(
         IReadOnlyList<ActorDescriptor> PlayerDescriptors,
-        IReadOnlyList<ActorDescriptor> OwnedDescriptors,
         IReadOnlyList<nint> PlayerAddresses,
         OwnedObjectSnapshot OwnedObjects,
         int Generation)
     {
         public static ActorSnapshot Empty { get; } = new(
-            Array.Empty<ActorDescriptor>(),
             Array.Empty<ActorDescriptor>(),
             Array.Empty<nint>(),
             OwnedObjectSnapshot.Empty,
             0);
     }
-
-    private sealed record GposeSnapshot(
-        IReadOnlyList<ActorDescriptor> GposeDescriptors,
-        IReadOnlyList<nint> GposeAddresses,
-        int Generation)
-    {
-        public static GposeSnapshot Empty { get; } = new(
-            Array.Empty<ActorDescriptor>(),
-            Array.Empty<nint>(),
-            0);
-    }
 }

LightlessSync/Services/Chat/ZoneChatService.cs

@@ -1,5 +1,4 @@
 using LightlessSync.API.Dto.Chat;
-using LightlessSync.API.Data.Extensions;
 using LightlessSync.Services.ActorTracking;
 using LightlessSync.Services.Mediator;
 using LightlessSync.WebAPI;
@@ -37,8 +36,6 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
     private readonly Dictionary<string, bool> _lastPresenceStates = new(StringComparer.Ordinal);
     private readonly Dictionary<string, string> _selfTokens = new(StringComparer.Ordinal);
     private readonly List<PendingSelfMessage> _pendingSelfMessages = new();
-    private List<ChatChannelSnapshot>? _cachedChannelSnapshots;
-    private bool _channelsSnapshotDirty = true;
 
     private bool _isLoggedIn;
     private bool _isConnected;
@@ -72,11 +69,6 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
     {
         using (_sync.EnterScope())
         {
-            if (!_channelsSnapshotDirty && _cachedChannelSnapshots is not null)
-            {
-                return _cachedChannelSnapshots;
-            }
-
             var snapshots = new List<ChatChannelSnapshot>(_channelOrder.Count);
             foreach (var key in _channelOrder)
             {
@@ -106,8 +98,6 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
                     state.Messages.ToList()));
             }
 
-            _cachedChannelSnapshots = snapshots;
-            _channelsSnapshotDirty = false;
             return snapshots;
         }
     }
@@ -145,8 +135,6 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
                 state.UnreadCount = 0;
                 _lastReadCounts[key] = state.Messages.Count;
             }
-
-            MarkChannelsSnapshotDirtyLocked();
         }
     }
 
@@ -198,7 +186,6 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
             if (!wasEnabled)
             {
                 _chatEnabled = true;
-                MarkChannelsSnapshotDirtyLocked();
             }
         }
 
@@ -244,8 +231,6 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
                 state.IsAvailable = false;
                 state.StatusText = "Chat services disabled";
             }
-
-            MarkChannelsSnapshotDirtyLocked();
         }
 
         UnregisterChatHandler();
@@ -732,7 +717,7 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
                 _zoneDefinitions[key] = new ZoneChannelDefinition(key, info.DisplayName ?? key, descriptor, territories);
             }
 
-            var territoryData = _dalamudUtilService.TerritoryDataEnglish.Value;
+            var territoryData = _dalamudUtilService.TerritoryData.Value;
             foreach (var kvp in territoryData)
             {
                 foreach (var variant in EnumerateTerritoryKeys(kvp.Value))
@@ -868,12 +853,6 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
         var infos = new List<GroupChatChannelInfoDto>(groups.Count);
         foreach (var group in groups)
         {
-            // basically prune the channel if it's disabled
-            if (group.GroupPermissions.IsDisableChat())
-            {
-                continue;
-            }
-
             var descriptor = new ChatChannelDescriptor
             {
                 Type = ChatChannelType.Group,
@@ -1044,8 +1023,6 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
                 state.UnreadCount = Math.Min(Math.Max(unreadFromHistory, incrementalUnread), MaxUnreadCount);
                 state.HasUnread = state.UnreadCount > 0;
             }
-
-            MarkChannelsSnapshotDirtyLocked();
         }
 
         Mediator.Publish(new ChatChannelMessageAdded(key, message));
@@ -1227,25 +1204,9 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
         {
             _activeChannelKey = _channelOrder.Count > 0 ? _channelOrder[0] : null;
         }
-
-        MarkChannelsSnapshotDirtyLocked();
     }
 
-    private void MarkChannelsSnapshotDirty()
-    {
-        using (_sync.EnterScope())
-        {
-            _channelsSnapshotDirty = true;
-        }
-    }
-
-    private void MarkChannelsSnapshotDirtyLocked() => _channelsSnapshotDirty = true;
-
-    private void PublishChannelListChanged()
-    {
-        MarkChannelsSnapshotDirty();
-        Mediator.Publish(new ChatChannelsUpdated());
-    }
+    private void PublishChannelListChanged() => Mediator.Publish(new ChatChannelsUpdated());
 
     private static IEnumerable<string> EnumerateTerritoryKeys(string? value)
     {

LightlessSync/Services/ContextMenuService.cs

@@ -129,6 +129,7 @@ internal class ContextMenuService : IHostedService
 
         var snapshot = _pairUiService.GetSnapshot();
         var pair = snapshot.PairsByUid.Values.FirstOrDefault(p =>
+            p.IsVisible &&
             p.PlayerCharacterId != uint.MaxValue &&
             p.PlayerCharacterId == target.TargetObjectId);
 

LightlessSync/Services/DalamudUtilService.cs

@@ -91,10 +91,43 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
             return gameData.GetExcelSheet<ClassJob>(Dalamud.Game.ClientLanguage.English)!
                 .ToDictionary(k => k.RowId, k => k.NameEnglish.ToString());
         });
-        var clientLanguage = _clientState.ClientLanguage;
-        TerritoryData = new(() => BuildTerritoryData(clientLanguage));
-        TerritoryDataEnglish = new(() => BuildTerritoryData(Dalamud.Game.ClientLanguage.English));
-        MapData = new(() => BuildMapData(clientLanguage));
+        TerritoryData = new(() =>
+        {
+            return gameData.GetExcelSheet<TerritoryType>(Dalamud.Game.ClientLanguage.English)!
+            .Where(w => w.RowId != 0)
+            .ToDictionary(w => w.RowId, w =>
+            {
+                StringBuilder sb = new();
+                sb.Append(w.PlaceNameRegion.Value.Name);
+                if (w.PlaceName.ValueNullable != null)
+                {
+                    sb.Append(" - ");
+                    sb.Append(w.PlaceName.Value.Name);
+                }
+                return sb.ToString();
+            });
+        });
+        MapData = new(() =>
+        {
+            return gameData.GetExcelSheet<Map>(Dalamud.Game.ClientLanguage.English)!
+            .Where(w => w.RowId != 0)
+            .ToDictionary(w => w.RowId, w =>
+            {
+                StringBuilder sb = new();
+                sb.Append(w.PlaceNameRegion.Value.Name);
+                if (w.PlaceName.ValueNullable != null)
+                {
+                    sb.Append(" - ");
+                    sb.Append(w.PlaceName.Value.Name);
+                }
+                if (w.PlaceNameSub.ValueNullable != null && !string.IsNullOrEmpty(w.PlaceNameSub.Value.Name.ToString()))
+                {
+                    sb.Append(" - ");
+                    sb.Append(w.PlaceNameSub.Value.Name);
+                }
+                return (w, sb.ToString());
+            });
+        });
         mediator.Subscribe<TargetPairMessage>(this, (msg) =>
         {
             if (clientState.IsPvP) return;
@@ -125,71 +158,6 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     private Lazy<ulong> RebuildCID() => new(GetCID);
 
     public bool IsWine { get; init; }
-    private Dictionary<uint, string> BuildTerritoryData(Dalamud.Game.ClientLanguage language)
-    {
-        var placeNames = _gameData.GetExcelSheet<PlaceName>(language)!;
-        return _gameData.GetExcelSheet<TerritoryType>(language)!
-            .Where(w => w.RowId != 0)
-            .ToDictionary(w => w.RowId, w =>
-            {
-                var regionName = GetPlaceName(placeNames, w.PlaceNameRegion.RowId);
-                var placeName = GetPlaceName(placeNames, w.PlaceName.RowId);
-                return BuildPlaceName(regionName, placeName, string.Empty);
-            });
-    }
-
-    private Dictionary<uint, (Map Map, string MapName)> BuildMapData(Dalamud.Game.ClientLanguage language)
-    {
-        var placeNames = _gameData.GetExcelSheet<PlaceName>(language)!;
-        return _gameData.GetExcelSheet<Map>(language)!
-            .Where(w => w.RowId != 0)
-            .ToDictionary(w => w.RowId, w =>
-            {
-                var regionName = GetPlaceName(placeNames, w.PlaceNameRegion.RowId);
-                var placeName = GetPlaceName(placeNames, w.PlaceName.RowId);
-                var subPlaceName = GetPlaceName(placeNames, w.PlaceNameSub.RowId);
-                var displayName = BuildPlaceName(regionName, placeName, subPlaceName);
-                return (w, displayName);
-            });
-    }
-    private static string GetPlaceName(Lumina.Excel.ExcelSheet<PlaceName> placeNames, uint rowId)
-    {
-        if (rowId == 0)
-        {
-            return string.Empty;
-        }
-
-        return placeNames.GetRow(rowId).Name.ToString();
-    }
-
-    private static string BuildPlaceName(string regionName, string placeName, string subPlaceName)
-    {
-        StringBuilder sb = new();
-        if (!string.IsNullOrWhiteSpace(regionName))
-        {
-            sb.Append(regionName);
-        }
-
-        if (!string.IsNullOrWhiteSpace(placeName))
-        {
-            if (sb.Length > 0)
-            {
-                sb.Append(" - ");
-            }
-            sb.Append(placeName);
-        }
-
-        if (!string.IsNullOrWhiteSpace(subPlaceName))
-        {
-            if (sb.Length > 0)
-            {
-                sb.Append(" - ");
-            }
-            sb.Append(subPlaceName);
-        }
-
-        return sb.ToString();
-    }
     private bool ResolvePairAddress(Pair pair, out Pair resolvedPair, out nint address)
     {
         resolvedPair = _pairFactory.Value.Create(pair.UniqueIdent) ?? pair;
@@ -277,7 +245,6 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     public Lazy<Dictionary<uint, string>> JobData { get; private set; }
     public Lazy<Dictionary<ushort, string>> WorldData { get; private set; }
     public Lazy<Dictionary<uint, string>> TerritoryData { get; private set; }
-    public Lazy<Dictionary<uint, string>> TerritoryDataEnglish { get; private set; }
     public Lazy<Dictionary<uint, (Map Map, string MapName)>> MapData { get; private set; }
     public bool IsLodEnabled { get; private set; }
     public LightlessMediator Mediator { get; }
@@ -297,7 +264,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                 return false;
             }
 
-            if (!TerritoryDataEnglish.Value.TryGetValue(territoryId, out var name) || string.IsNullOrWhiteSpace(name))
+            if (!TerritoryData.Value.TryGetValue(territoryId, out var name) || string.IsNullOrWhiteSpace(name))
             {
                 return false;
             }
@@ -360,8 +327,8 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
 
     public IEnumerable<ICharacter?> GetGposeCharactersFromObjectTable()
     {
-        foreach (var actor in _objectTable
-                     .Where(a => a.ObjectIndex > 200 && a.ObjectKind == DalamudObjectKind.Player))
+        foreach (var actor in _actorObjectService.PlayerDescriptors
+                     .Where(a => a.ObjectKind == DalamudObjectKind.Player && a.ObjectIndex > 200))
         {
             var character = _objectTable.CreateObjectReference(actor.Address) as ICharacter;
             if (character != null)
@@ -388,8 +355,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
 
         var playerAddress = playerPointer.Value;
         var ownerEntityId = ((Character*)playerAddress)->EntityId;
-        var candidateAddress = _objectTable.GetObjectAddress(((GameObject*)playerAddress)->ObjectIndex + 1);
-        if (ownerEntityId == 0) return candidateAddress;
+        if (ownerEntityId == 0) return IntPtr.Zero;
 
         if (playerAddress == _actorObjectService.LocalPlayerAddress)
         {
@@ -400,17 +366,6 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
             }
         }
 
-        if (candidateAddress != nint.Zero)
-        {
-            var candidate = (GameObject*)candidateAddress;
-            var candidateKind = (DalamudObjectKind)candidate->ObjectKind;
-            if ((candidateKind == DalamudObjectKind.MountType || candidateKind == DalamudObjectKind.Companion)
-                && ResolveOwnerId(candidate) == ownerEntityId)
-            {
-                return candidateAddress;
-            }
-        }
-
         var ownedObject = FindOwnedObject(ownerEntityId, playerAddress, static kind =>
             kind == DalamudObjectKind.MountType || kind == DalamudObjectKind.Companion);
         if (ownedObject != nint.Zero)
@@ -418,7 +373,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
             return ownedObject;
         }
 
-        return candidateAddress;
+        return _objectTable.GetObjectAddress(((GameObject*)playerAddress)->ObjectIndex + 1);
     }
 
     public async Task<IntPtr> GetMinionOrMountAsync(IntPtr? playerPointer = null)
@@ -535,10 +490,6 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     {
         EnsureIsOnFramework();
         var playerChar = GetPlayerCharacter();
-
-        if (playerChar == null || playerChar.Address == IntPtr.Zero)
-            return 0;
-
         return ((BattleChara*)playerChar.Address)->Character.ContentId;
     }
 
@@ -829,7 +780,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         bool isDrawingChanged = false;
         if ((nint)drawObj != IntPtr.Zero)
         {
-            isDrawing = gameObj->RenderFlags == (VisibilityFlags)0b100000000000;
+            isDrawing = (gameObj->RenderFlags & VisibilityFlags.Nameplate) != VisibilityFlags.None;
             if (!isDrawing)
             {
                 isDrawing = ((CharacterBase*)drawObj)->HasModelInSlotLoaded != 0;
@@ -895,12 +846,9 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
             _performanceCollector.LogPerformance(this, $"TrackedActorsToState",
                 () =>
                 {
-                    if (!_actorObjectService.HooksActive || !isNormalFrameworkUpdate || _actorObjectService.HasPendingHashResolutions)
-                    {
-                        _actorObjectService.RefreshTrackedActors();
-                    }
+                    _actorObjectService.RefreshTrackedActors();
 
-                    var playerDescriptors = _actorObjectService.PlayerDescriptors;
+                    var playerDescriptors = _actorObjectService.PlayerCharacterDescriptors;
                     for (var i = 0; i < playerDescriptors.Count; i++)
                     {
                         var actor = playerDescriptors[i];

LightlessSync/Services/LightFinder/LightFinderPlateHandler.cs

@@ -4,7 +4,6 @@ using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
 using Dalamud.Game.ClientState.Objects.Enums;
 using Dalamud.Game.Text;
 using Dalamud.Interface;
-using Dalamud.Interface.Utility;
 using Dalamud.Plugin;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.System.Framework;
@@ -17,27 +16,22 @@ using LightlessSync.UI;
 using LightlessSync.UI.Services;
 using LightlessSync.Utils;
 using LightlessSync.UtilsEnum.Enum;
-using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Hosting;
 using Pictomancy;
 using System.Collections.Immutable;
 using System.Globalization;
 using System.Numerics;
-using System.Runtime.InteropServices;
 using Task = System.Threading.Tasks.Task;
 
 namespace LightlessSync.Services.LightFinder;
 
-/// <summary>
-/// The new lightfinder nameplate handler using ImGUI (pictomancy) for rendering the icon/labels.
-/// </summary>
 public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscriber
 {
     private readonly ILogger<LightFinderPlateHandler> _logger;
     private readonly IAddonLifecycle _addonLifecycle;
     private readonly IGameGui _gameGui;
     private readonly IObjectTable _objectTable;
-    private readonly IClientState _clientState;
     private readonly LightlessConfigService _configService;
     private readonly PairUiService _pairUiService;
     private readonly LightlessMediator _mediator;
@@ -48,33 +42,21 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
     private bool _needsLabelRefresh;
     private bool _drawSubscribed;
     private AddonNamePlate* _mpNameplateAddon;
-    private readonly Lock _labelLock = new();
+    private readonly object _labelLock = new();
     private readonly NameplateBuffers _buffers = new();
     private int _labelRenderCount;
 
-    private const string _defaultLabelText = "LightFinder";
-    private const SeIconChar _defaultIcon = SeIconChar.Hyadelyn;
-    private static readonly string _defaultIconGlyph = SeIconCharExtensions.ToIconString(_defaultIcon);
-    private static readonly Vector2 _defaultPivot = new(0.5f, 1f);
-    private uint _lastNamePlateDrawFrame;
+    private const string DefaultLabelText = "LightFinder";
+    private const SeIconChar DefaultIcon = SeIconChar.Hyadelyn;
+    private static readonly string DefaultIconGlyph = SeIconCharExtensions.ToIconString(DefaultIcon);
+    private static readonly Vector2 DefaultPivot = new(0.5f, 1f);
 
-    // / Overlay window flags
-    private const ImGuiWindowFlags _overlayFlags =
-    ImGuiWindowFlags.NoDecoration |
-    ImGuiWindowFlags.NoBackground |
-    ImGuiWindowFlags.NoMove |
-    ImGuiWindowFlags.NoSavedSettings |
-    ImGuiWindowFlags.NoNav |
-    ImGuiWindowFlags.NoInputs;
-
-    private readonly List<RectF> _uiRects = new(128);
     private ImmutableHashSet<string> _activeBroadcastingCids = [];
 
     public LightFinderPlateHandler(
         ILogger<LightFinderPlateHandler> logger,
         IAddonLifecycle addonLifecycle,
         IGameGui gameGui,
-        IClientState clientState,
         LightlessConfigService configService,
         LightlessMediator mediator,
         IObjectTable objectTable,
@@ -85,7 +67,6 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
         _logger = logger;
         _addonLifecycle = addonLifecycle;
         _gameGui = gameGui;
-        _clientState = clientState;
         _configService = configService;
         _mediator = mediator;
         _objectTable = objectTable;
@@ -120,9 +101,6 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
         _mpNameplateAddon = null;
     }
 
-    /// <summary>
-    /// Enable nameplate handling.
-    /// </summary>
     internal void EnableNameplate()
     {
         if (!_mEnabled)
@@ -140,9 +118,6 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
         }
     }
 
-    /// <summary>
-    /// Disable nameplate handling.
-    /// </summary>
     internal void DisableNameplate()
     {
         if (_mEnabled)
@@ -161,21 +136,8 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
         }
     }
 
-    /// <summary>
-    /// Draw detour for nameplate addon.
-    /// </summary>
-    /// <param name="type"></param>
-    /// <param name="args"></param>
     private void NameplateDrawDetour(AddonEvent type, AddonArgs args)
     {
-        if (_clientState.IsGPosing)
-        {
-            ClearLabelBuffer();
-            Array.Clear(_buffers.HasSmoothed, 0, _buffers.HasSmoothed.Length);
-            _lastNamePlateDrawFrame = 0;
-            return;
-        }
-
         if (args.Addon.Address == nint.Zero)
         {
             if (_logger.IsEnabled(LogLevel.Warning))
@@ -183,10 +145,6 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
             return;
         }
 
-        var fw = Framework.Instance();
-        if (fw != null)
-            _lastNamePlateDrawFrame = fw->FrameCounter;
-
         var pNameplateAddon = (AddonNamePlate*)args.Addon.Address;
 
         if (_mpNameplateAddon != pNameplateAddon)
@@ -198,9 +156,6 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
         UpdateNameplateNodes();
     }
 
-    /// <summary>
-    /// Updates the nameplate nodes with LightFinder objects.
-    /// </summary>
     private void UpdateNameplateNodes()
     {
         var currentHandle = _gameGui.GetAddonByName("NamePlate");
@@ -220,12 +175,6 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
             return;
         }
 
-        if (!IsNamePlateAddonVisible())
-        {
-            ClearLabelBuffer();
-            return;
-        }
-
         var framework = Framework.Instance();
         if (framework == null)
         {
@@ -258,7 +207,7 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
         }
 
         var visibleUserIdsSnapshot = VisibleUserIds;
-        var safeCount = Math.Min(ui3DModule->NamePlateObjectInfoCount, vec.Length);
+        var safeCount = System.Math.Min(ui3DModule->NamePlateObjectInfoCount, vec.Length);
         var currentConfig = _configService.Current;
         var labelColor = UIColors.Get("Lightfinder");
         var edgeColor = UIColors.Get("LightfinderEdge");
@@ -266,7 +215,6 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
 
         for (int i = 0; i < safeCount; ++i)
         {
-
             var objectInfoPtr = vec[i];
             if (objectInfoPtr == null)
                 continue;
@@ -302,6 +250,7 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
             var root = nameplateObject.RootComponentNode;
             var nameContainer = nameplateObject.NameContainer;
             var nameText = nameplateObject.NameText;
+            var marker = nameplateObject.MarkerIcon;
 
             if (root == null || root->Component == null || nameContainer == null || nameText == null)
             {
@@ -312,14 +261,14 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
 
             root->Component->UldManager.UpdateDrawNodeList();
 
-            bool isNameplateVisible =
-                nameContainer->IsVisible() &&
-                nameText->AtkResNode.IsVisible();
+            bool isVisible =
+                (marker != null && marker->AtkResNode.IsVisible()) ||
+                (nameContainer->IsVisible() && nameText->AtkResNode.IsVisible()) ||
+                currentConfig.LightfinderLabelShowHidden;
 
-            if (!currentConfig.LightfinderLabelShowHidden && !isNameplateVisible)
+            if (!isVisible)
                 continue;
 
-            // Prepare label content and scaling
             var scaleMultiplier = System.Math.Clamp(currentConfig.LightfinderLabelScale, 0.5f, 2.0f);
             var baseScale = currentConfig.LightfinderLabelUseIcon ? 1.0f : 0.5f;
             var effectiveScale = baseScale * scaleMultiplier;
@@ -327,10 +276,10 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
             var targetFontSize = (int)System.Math.Round(baseFontSize * scaleMultiplier);
             var labelContent = currentConfig.LightfinderLabelUseIcon
                 ? NormalizeIconGlyph(currentConfig.LightfinderLabelIconGlyph)
-                : _defaultLabelText;
+                : DefaultLabelText;
 
             if (!currentConfig.LightfinderLabelUseIcon && (string.IsNullOrWhiteSpace(labelContent) || string.Equals(labelContent, "-", StringComparison.Ordinal)))
-                labelContent = _defaultLabelText;
+                labelContent = DefaultLabelText;
 
             var nodeWidth = (int)System.Math.Round(AtkNodeHelpers.DefaultTextNodeWidth * effectiveScale);
             var nodeHeight = (int)System.Math.Round(AtkNodeHelpers.DefaultTextNodeHeight * effectiveScale);
@@ -373,7 +322,6 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
                 () => GetScaledTextWidth(nameText),
                 nodeWidth);
 
-            // Text offset caching
             var textOffset = (int)System.Math.Round(nameText->AtkResNode.X);
             var hasValidOffset = TryCacheTextOffset(nameplateIndex, rawTextWidth, textOffset);
 
@@ -384,93 +332,65 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
                 continue;
             }
 
-            var res = nameContainer;
-
-            // X scale
-            var worldScaleX = GetWorldScaleX(res);
-            if (worldScaleX <= 0f) worldScaleX = 1f;
-
-            // Y scale
-            var worldScaleY = GetWorldScaleY(res);
-            if (worldScaleY <= 0f) worldScaleY = 1f;
-
-            positionY += currentConfig.LightfinderLabelOffsetY;
-            var positionYScreen = positionY * worldScaleY;
-
             float finalX;
             if (currentConfig.LightfinderAutoAlign)
             {
-                // auto X positioning
-                var measuredWidth = Math.Max(1, textWidth > 0 ? textWidth : nodeWidth);
+                var measuredWidth = System.Math.Max(1, textWidth > 0 ? textWidth : nodeWidth);
                 var measuredWidthF = (float)measuredWidth;
+                var alignmentType = currentConfig.LabelAlignment;
 
-                // consider icon width
-                var containerWidthLocal = res->Width > 0 ? res->Width : measuredWidthF;
-                var containerWidthScreen = containerWidthLocal * worldScaleX;
+                var containerScale = nameContainer->ScaleX;
+                if (containerScale <= 0f)
+                    containerScale = 1f;
+                var containerWidthRaw = (float)nameContainer->Width;
+                if (containerWidthRaw <= 0f)
+                    containerWidthRaw = measuredWidthF;
+                var containerWidth = containerWidthRaw * containerScale;
+                if (containerWidth <= 0f)
+                    containerWidth = measuredWidthF;
 
-                // container bounds for positions
-                var containerLeft = res->ScreenX;
-                var containerRight = containerLeft + containerWidthScreen;
-                var containerCenter = containerLeft + (containerWidthScreen * 0.5f);
+                var containerLeft = nameContainer->ScreenX;
+                var containerRight = containerLeft + containerWidth;
+                var containerCenter = containerLeft + (containerWidth * 0.5f);
 
                 var iconMargin = currentConfig.LightfinderLabelUseIcon
-                    ? MathF.Min(containerWidthScreen * 0.1f, 14f * worldScaleX)
+                    ? System.Math.Min(containerWidth * 0.1f, 14f * containerScale)
                     : 0f;
 
-                var offsetXScreen = currentConfig.LightfinderLabelOffsetX * worldScaleX;
-
-                // alignment based on config
-                switch (currentConfig.LabelAlignment)
+                switch (alignmentType)
                 {
                     case LabelAlignment.Left:
-                        finalX = containerLeft + iconMargin + offsetXScreen;
+                        finalX = containerLeft + iconMargin;
                         alignment = AlignmentType.BottomLeft;
                         break;
                     case LabelAlignment.Right:
-                        finalX = containerRight - iconMargin + offsetXScreen;
+                        finalX = containerRight - iconMargin;
                         alignment = AlignmentType.BottomRight;
                         break;
                     default:
-                        finalX = containerCenter + offsetXScreen;
+                        finalX = containerCenter;
                         alignment = AlignmentType.Bottom;
                         break;
                 }
+
+                finalX += currentConfig.LightfinderLabelOffsetX;
             }
             else
             {
-                // manual X positioning
                 var cachedTextOffset = _buffers.TextOffsets[nameplateIndex];
                 var hasCachedOffset = cachedTextOffset != int.MinValue;
-                var baseOffsetXLocal = (!currentConfig.LightfinderLabelUseIcon && hasValidOffset && hasCachedOffset)
-                    ? cachedTextOffset
-                    : 0;
-
-                finalX =
-                    res->ScreenX
-                    + (baseOffsetXLocal * worldScaleX)
-                    + (58f * worldScaleX)
-                    + (currentConfig.LightfinderLabelOffsetX * worldScaleX);
-
+                var baseOffsetX = (!currentConfig.LightfinderLabelUseIcon && hasValidOffset && hasCachedOffset) ? cachedTextOffset : 0;
+                finalX = nameContainer->ScreenX + baseOffsetX + 58 + currentConfig.LightfinderLabelOffsetX;
                 alignment = AlignmentType.Bottom;
             }
 
-            alignment = (AlignmentType)Math.Clamp((int)alignment, 0, 8);
+            positionY += currentConfig.LightfinderLabelOffsetY;
+            alignment = (AlignmentType)System.Math.Clamp((int)alignment, 0, 8);
 
-            // final position before smoothing
-            var finalPosition = new Vector2(finalX, res->ScreenY + positionYScreen);
-            var dpiScale = ImGui.GetIO().DisplayFramebufferScale.X; // often same for Y
-            var fw = Framework.Instance();
-            float dt = fw->RealFrameDeltaTime;
-
-            //smoothing..
-            finalPosition = SnapToPixels(finalPosition, dpiScale);
-            finalPosition = SmoothPosition(nameplateIndex, finalPosition, dt);
-            finalPosition = SnapToPixels(finalPosition, dpiScale);
-
-            // prepare label info
+            var finalPosition = new Vector2(finalX, nameContainer->ScreenY + positionY);
             var pivot = (currentConfig.LightfinderAutoAlign || currentConfig.LightfinderLabelUseIcon)
                 ? AlignmentToPivot(alignment)
-                : _defaultPivot;
+                : DefaultPivot;
             var textColorPacked = PackColor(labelColor);
             var edgeColorPacked = PackColor(edgeColor);
 
@@ -498,42 +418,11 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
         }
     }
 
-    /// <summary>
-    /// On each tick, process any needed updates for the UI Builder.
-    /// </summary>
     private void OnUiBuilderDraw()
     {
         if (!_mEnabled)
             return;
 
-        var fw = Framework.Instance();
-        if (fw == null)
-            return;
-
-        // Frame skip check
-        var frame = fw->FrameCounter;
-
-        if (_lastNamePlateDrawFrame == 0 || (frame - _lastNamePlateDrawFrame) > 1)
-        {
-            ClearLabelBuffer();
-            Array.Clear(_buffers.HasSmoothed, 0, _buffers.HasSmoothed.Length);
-
-            return;
-        }
-
-        //Gpose Check
-        if (_clientState.IsGPosing)
-        {
-            ClearLabelBuffer();
-            Array.Clear(_buffers.HasSmoothed, 0, _buffers.HasSmoothed.Length);
-            _lastNamePlateDrawFrame = 0;
-            return;
-        }
-
-        // If nameplate addon is not visible, skip rendering
-        if (!IsNamePlateAddonVisible())
-            return;
-
         int copyCount;
         lock (_labelLock)
         {
@@ -544,84 +433,21 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
             Array.Copy(_buffers.LabelRender, _buffers.LabelCopy, copyCount);
         }
 
-        var uiModule = fw != null ? fw->GetUIModule() : null;
-
-        if (uiModule != null)
-        {
-            var rapture = uiModule->GetRaptureAtkModule();
-            if (rapture != null)
-                RefreshUiRects(&rapture->RaptureAtkUnitManager);
-            else
-                _uiRects.Clear();
-        }
-        else
-        {
-            _uiRects.Clear();
-        }
-
-        // Needed for imgui overlay viewport for the multi window view.
-        var vp = ImGui.GetMainViewport();
-        var vpPos = vp.Pos;
-
-        ImGuiHelpers.ForceNextWindowMainViewport();
-
-        ImGui.SetNextWindowPos(vp.Pos);
-        ImGui.SetNextWindowSize(vp.Size);
-
-        ImGui.PushStyleVar(ImGuiStyleVar.WindowRounding, 0);
-        ImGui.PushStyleVar(ImGuiStyleVar.WindowBorderSize, 0);
-
-        ImGui.Begin("##LightFinderOverlay", _overlayFlags);
-
-        ImGui.PopStyleVar(2);
-
         using var drawList = PictoService.Draw();
         if (drawList == null)
-        {
-            ImGui.End();
             return;
-        }
 
         for (int i = 0; i < copyCount; ++i)
         {
             ref var info = ref _buffers.LabelCopy[i];
-
-            // final draw position with viewport offset
-            var drawPos = info.ScreenPosition + vpPos;
             var font = default(ImFontPtr);
             if (info.UseIcon)
             {
                 var ioFonts = ImGui.GetIO().Fonts;
                 font = ioFonts.Fonts.Size > 1 ? new ImFontPtr(ioFonts.Fonts[1]) : ImGui.GetFont();
             }
-            else
-            {
-                font = ImGui.GetFont();
-            }
 
-            if (!font.IsNull)
-                ImGui.PushFont(font);
-
-            // calculate size for occlusion checking
-            var baseSize = ImGui.CalcTextSize(info.Text); 
-            var baseFontSize = ImGui.GetFontSize();
-
-            if (!font.IsNull)
-                ImGui.PopFont();
-
-            // scale size based on font size
-            var scale = baseFontSize > 0 ? (info.FontSize / baseFontSize) : 1f;
-            var size = baseSize * scale;
-
-            // label rect for occlusion checking
-            var topLeft = info.ScreenPosition - new Vector2(size.X * info.Pivot.X, size.Y * info.Pivot.Y);
-            var labelRect = new RectF(topLeft.X, topLeft.Y, topLeft.X + size.X, topLeft.Y + size.Y);
-
-            // occlusion check
-            if (IsOccludedByAnyUi(labelRect))
-                continue;
-            
-            drawList.AddScreenText(drawPos, info.Text, info.TextColor, info.FontSize, info.Pivot, info.EdgeColor, font);
+            drawList.AddScreenText(info.ScreenPosition, info.Text, info.TextColor, info.FontSize, info.Pivot, info.EdgeColor, font);
         }
     }
 
@@ -634,15 +460,15 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
         AlignmentType.Top => new Vector2(0.5f, 0f),
         AlignmentType.Left => new Vector2(0f, 0.5f),
         AlignmentType.Right => new Vector2(1f, 0.5f),
-        _ => _defaultPivot
+        _ => DefaultPivot
     };
 
     private static uint PackColor(Vector4 color)
     {
-        var r = (byte)Math.Clamp(color.X * 255f, 0f, 255f);
-        var g = (byte)Math.Clamp(color.Y * 255f, 0f, 255f);
-        var b = (byte)Math.Clamp(color.Z * 255f, 0f, 255f);
-        var a = (byte)Math.Clamp(color.W * 255f, 0f, 255f);
+        var r = (byte)System.Math.Clamp(color.X * 255f, 0f, 255f);
+        var g = (byte)System.Math.Clamp(color.Y * 255f, 0f, 255f);
+        var b = (byte)System.Math.Clamp(color.Z * 255f, 0f, 255f);
+        var a = (byte)System.Math.Clamp(color.W * 255f, 0f, 255f);
         return (uint)((a << 24) | (b << 16) | (g << 8) | r);
     }
 
@@ -688,19 +514,10 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
         if (scale <= 0f)
             scale = 1f;
 
-        var computed = (int)Math.Round(rawWidth * scale);
-        return Math.Max(1, computed);
+        var computed = (int)System.Math.Round(rawWidth * scale);
+        return System.Math.Max(1, computed);
     }
 
-    /// <summary>
-    /// Resolves a cached value for the given index.
-    /// </summary>
-    /// <param name="cache"></param>
-    /// <param name="index"></param>
-    /// <param name="rawValue"></param>
-    /// <param name="fallback"></param>
-    /// <param name="fallbackWhenZero"></param>
-    /// <returns></returns>
     private static int ResolveCache(
         int[] cache,
         int index,
@@ -728,7 +545,7 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
 
     private bool TryCacheTextOffset(int nameplateIndex, int measuredTextWidth, int textOffset)
     {
-        if (Math.Abs(measuredTextWidth) > 0 || textOffset != 0)
+        if (System.Math.Abs(measuredTextWidth) > 0 || textOffset != 0)
         {
             _buffers.TextOffsets[nameplateIndex] = textOffset;
             return true;
@@ -737,193 +554,10 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
         return false;
     }
 
-    /// <summary>
-    /// Snapping a position to pixel grid based on DPI scale.
-    /// </summary>
-    /// <param name="p">Position</param>
-    /// <param name="dpiScale">DPI Scale</param>
-    /// <returns></returns>
-    private static Vector2 SnapToPixels(Vector2 p, float dpiScale)
-    {
-        // snap to pixel grid
-        var x = MathF.Round(p.X * dpiScale) / dpiScale;
-        var y = MathF.Round(p.Y * dpiScale) / dpiScale;
-        return new Vector2(x, y);
-    }
-
-
-    /// <summary>
-    /// Smooths the position using exponential smoothing.
-    /// </summary>
-    /// <param name="idx">Nameplate Index</param>
-    /// <param name="target">Final position</param>
-    /// <param name="dt">Delta Time</param>
-    /// <param name="responsiveness">How responssive the smooting should be</param>
-    /// <returns></returns>
-    private Vector2 SmoothPosition(int idx, Vector2 target, float dt, float responsiveness = 24f)
-    {
-        // exponential smoothing
-        if (!_buffers.HasSmoothed[idx])
-        {
-            _buffers.HasSmoothed[idx] = true;
-            _buffers.SmoothedPos[idx] = target;
-            return target;
-        }
-
-        // get current smoothed position
-        var cur = _buffers.SmoothedPos[idx];
-
-        // compute smoothing factor
-        var a = 1f - MathF.Exp(-responsiveness * dt);
-
-        // snap if close enough
-        if (Vector2.DistanceSquared(cur, target) < 0.25f) 
-            return cur;
-
-        // lerp towards target
-        cur = Vector2.Lerp(cur, target, a);
-        _buffers.SmoothedPos[idx] = cur;
-        return cur;
-    }
-
-    /// <summary>
-    /// Tries to get a valid screen rect for the given addon.
-    /// </summary>
-    /// <param name="addon">Addon UI</param>
-    /// <param name="screen">Screen positioning/param>
-    /// <param name="rect">RectF of Addon</param>
-    /// <returns></returns>
-    private static bool TryGetAddonRect(AtkUnitBase* addon, Vector2 screen, out RectF rect)
-    {
-        // Addon existence
-        rect = default;
-        if (addon == null)
-            return false;
-
-        // Visibility check
-        var root = addon->RootNode;
-        if (root == null || !root->IsVisible())
-            return false;
-
-        // Size check
-        float w = root->Width;
-        float h = root->Height;
-        if (w <= 0 || h <= 0)
-            return false;
-
-        // Local scale
-        float sx = root->ScaleX; if (sx <= 0f) sx = 1f;
-        float sy = root->ScaleY; if (sy <= 0f) sy = 1f;
-
-        // World/composed scale from Transform
-        float wsx = GetWorldScaleX(root);
-        float wsy = GetWorldScaleY(root);
-        if (wsx <= 0f) wsx = 1f;
-        if (wsy <= 0f) wsy = 1f;
-
-        // World scale may include parent scaling; use it if meaningfully different.
-        float useX = MathF.Abs(wsx - sx) > 0.01f ? wsx : sx;
-        float useY = MathF.Abs(wsy - sy) > 0.01f ? wsy : sy;
-
-        w *= useX;
-        h *= useY;
-
-        if (w < 4f || h < 4f)
-            return false;
-
-        // Screen coords
-        float l = root->ScreenX;
-        float t = root->ScreenY;
-        float r = l + w;
-        float b = t + h;
-
-        // Drop fullscreen-ish / insane rects
-        if (w >= screen.X * 0.98f && h >= screen.Y * 0.98f)
-            return false;
-
-        // Drop offscreen rects
-        if (l < -screen.X || t < -screen.Y || r > screen.X * 2f || b > screen.Y * 2f)
-            return false;
-
-        rect = new RectF(l, t, r, b);
-        return true;
-    }
-
-    /// <summary>
-    /// Refreshes the cached UI rects for occlusion checking.
-    /// </summary>
-    /// <param name="unitMgr">Unit Manager</param>
-    private void RefreshUiRects(RaptureAtkUnitManager* unitMgr)
-    {
-        _uiRects.Clear();
-        if (unitMgr == null)
-            return;
-
-        var screen = ImGui.GetIO().DisplaySize;
-
-        ref var list = ref unitMgr->AllLoadedUnitsList;
-        var count = (int)list.Count;
-
-        for (int i = 0; i < count; i++)
-        {
-            var addon = list.Entries[i].Value;
-            if (addon == null)
-                continue;
-
-            if (_mpNameplateAddon != null && addon == (AtkUnitBase*)_mpNameplateAddon)
-                continue;
-
-            if (TryGetAddonRect(addon, screen, out var r))
-                _uiRects.Add(r);
-        }
-    }
-
-    /// <summary>
-    /// Is the given label rect occluded by any UI rects?
-    /// </summary>
-    /// <param name="labelRect">UI/Label Rect</param>
-    /// <returns>Is occluded or not</returns>
-    private bool IsOccludedByAnyUi(RectF labelRect)
-    {
-        for (int i = 0; i < _uiRects.Count; i++)
-        {
-            if (_uiRects[i].Intersects(labelRect))
-                return true;
-        }
-        return false;
-    }
-
-    /// <summary>
-    /// Gets the world scale X of the given node.
-    /// </summary>
-    /// <param name="n">Node</param>
-    /// <returns>World Scale of node</returns>
-    private static float GetWorldScaleX(AtkResNode* n)
-    {
-        var t = n->Transform;
-        return MathF.Sqrt(t.M11 * t.M11 + t.M12 * t.M12);
-    }
-
-    /// <summary>
-    /// Gets the world scale Y of the given node.
-    /// </summary>
-    /// <param name="n">Node</param>
-    /// <returns>World Scale of node</returns>
-    private static float GetWorldScaleY(AtkResNode* n)
-    {
-        var t = n->Transform;
-        return MathF.Sqrt(t.M21 * t.M21 + t.M22 * t.M22);
-    }
-
-    /// <summary>
-    /// Normalize an icon glyph input into a valid string.
-    /// </summary>
-    /// <param name="rawInput">Raw glyph input</param>
-    /// <returns>Normalized glyph input</returns>
     internal static string NormalizeIconGlyph(string? rawInput)
     {
         if (string.IsNullOrWhiteSpace(rawInput))
-            return _defaultIconGlyph;
+            return DefaultIconGlyph;
 
         var trimmed = rawInput.Trim();
 
@@ -941,36 +575,17 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
         if (enumerator.MoveNext())
             return enumerator.Current.ToString();
 
-        return _defaultIconGlyph;
+        return DefaultIconGlyph;
     }
 
-    /// <summary>
-    /// Is the nameplate addon visible?
-    /// </summary>
-    /// <returns>Is it visible?</returns>
-    private bool IsNamePlateAddonVisible()
-    {
-        if (_mpNameplateAddon == null)
-            return false;
-
-        var root = _mpNameplateAddon->AtkUnitBase.RootNode;
-        return root != null && root->IsVisible();
-    }
-
-    /// <summary>
-    /// Converts raw icon glyph input into an icon editor string.
-    /// </summary>
-    /// <param name="rawInput">Raw icon glyph input</param>
-    /// <returns>Icon editor string</returns>
     internal static string ToIconEditorString(string? rawInput)
     {
         var normalized = NormalizeIconGlyph(rawInput);
         var runeEnumerator = normalized.EnumerateRunes();
         return runeEnumerator.MoveNext()
             ? runeEnumerator.Current.Value.ToString("X4", CultureInfo.InvariantCulture)
-            : _defaultIconGlyph;
+            : DefaultIconGlyph;
     }
-
     private readonly struct NameplateLabelInfo
     {
         public NameplateLabelInfo(
@@ -1000,9 +615,6 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
         public bool UseIcon { get; }
     }
 
-    /// <summary>
-    /// Visible paired user IDs snapshot.
-    /// </summary>
     private HashSet<ulong> VisibleUserIds
         => [.. _pairUiService.GetSnapshot().PairsByUid.Values
             .Where(u => u.IsVisible && u.PlayerCharacterId != uint.MaxValue)
@@ -1022,10 +634,6 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
         }
     }
 
-    /// <summary>
-    /// Update the active broadcasting CIDs.
-    /// </summary>
-    /// <param name="cids">Inbound new CIDs</param>
     public void UpdateBroadcastingCids(IEnumerable<string> cids)
     {
         var newSet = cids.ToImmutableHashSet(StringComparer.Ordinal);
@@ -1038,16 +646,10 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
         FlagRefresh();
     }
 
-    /// <summary>
-    /// Clears all nameplate related caches.
-    /// </summary>
     public void ClearNameplateCaches()
     {
         _buffers.Clear();
         ClearLabelBuffer();
-
-        Array.Clear(_buffers.HasSmoothed, 0, _buffers.HasSmoothed.Length);
-        Array.Clear(_buffers.SmoothedPos, 0, _buffers.SmoothedPos.Length);
     }
 
     private sealed class NameplateBuffers
@@ -1066,10 +668,6 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
         public NameplateLabelInfo[] LabelRender { get; } = new NameplateLabelInfo[AddonNamePlate.NumNamePlateObjects];
         public NameplateLabelInfo[] LabelCopy { get; } = new NameplateLabelInfo[AddonNamePlate.NumNamePlateObjects];
 
-        public Vector2[] SmoothedPos = new Vector2[AddonNamePlate.NumNamePlateObjects];
-
-        public bool[] HasSmoothed = new bool[AddonNamePlate.NumNamePlateObjects];
-
         public void Clear()
         {
             System.Array.Clear(TextWidths, 0, TextWidths.Length);
@@ -1079,38 +677,16 @@ public unsafe class LightFinderPlateHandler : IHostedService, IMediatorSubscribe
         }
     }
 
-    /// <summary>
-    /// Starts the LightFinder Plate Handler.
-    /// </summary>
-    /// <param name="cancellationToken">Cancellation Token</param>
-    /// <returns>Task Completed</returns>
     public Task StartAsync(CancellationToken cancellationToken)
     {
         Init();
         return Task.CompletedTask;
     }
 
-    /// <summary>
-    /// Stops the LightFinder Plate Handler.
-    /// </summary>
-    /// <param name="cancellationToken">Cancellation Token</param>
-    /// <returns>Task Completed</returns>
     public Task StopAsync(CancellationToken cancellationToken)
     {
         Uninit();
         return Task.CompletedTask;
     }
 
-    /// <summary>
-    /// Rectangle with float coordinates for intersection testing.
-    /// </summary>
-    [StructLayout(LayoutKind.Auto)]
-    private readonly struct RectF
-    {
-        public readonly float L, T, R, B;
-        public RectF(float l, float t, float r, float b) { L = l; T = t; R = r; B = b; }
-
-        public bool Intersects(in RectF o) =>
-            !(R <= o.L || o.R <= L || B <= o.T || o.B <= T);
-    }
 }

LightlessSync/Services/LightFinder/LightFinderScannerService.cs

@@ -148,14 +148,10 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
     private void UpdateSyncshellBroadcasts()
     {
         var now = DateTime.UtcNow;
-        var nearbyCids = GetNearbyHashedCids(out _);
-        var newSet = nearbyCids.Count == 0
-            ? new HashSet<string>(StringComparer.Ordinal)
-            : _broadcastCache
-                .Where(e => e.Value.IsBroadcasting && e.Value.ExpiryTime > now && !string.IsNullOrEmpty(e.Value.GID))
-                .Where(e => nearbyCids.Contains(e.Key))
-                .Select(e => e.Key)
-                .ToHashSet(StringComparer.Ordinal);
+        var newSet = _broadcastCache
+            .Where(e => e.Value.IsBroadcasting && e.Value.ExpiryTime > now && !string.IsNullOrEmpty(e.Value.GID))
+            .Select(e => e.Key)
+            .ToHashSet(StringComparer.Ordinal);
 
         if (!_syncshellCids.SetEquals(newSet))
         {
@@ -167,17 +163,12 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
         }
     }
 
-    public List<BroadcastStatusInfoDto> GetActiveSyncshellBroadcasts(bool excludeLocal = false)
+    public List<BroadcastStatusInfoDto> GetActiveSyncshellBroadcasts()
     {
         var now = DateTime.UtcNow;
-        var nearbyCids = GetNearbyHashedCids(out var localCid);
-        if (nearbyCids.Count == 0)
-            return [];
 
         return [.. _broadcastCache
             .Where(e => e.Value.IsBroadcasting && e.Value.ExpiryTime > now && !string.IsNullOrEmpty(e.Value.GID))
-            .Where(e => nearbyCids.Contains(e.Key))
-            .Where(e => !excludeLocal || !string.Equals(e.Key, localCid, StringComparison.Ordinal))
             .Select(e => new BroadcastStatusInfoDto
             {
                 HashedCID = e.Key,
@@ -187,47 +178,6 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
             })];
     }
 
-    public bool TryGetLocalHashedCid(out string hashedCid)
-    {
-        hashedCid = string.Empty;
-        var descriptors = _actorTracker.PlayerDescriptors;
-        if (descriptors.Count == 0)
-            return false;
-
-        foreach (var descriptor in descriptors)
-        {
-            if (!descriptor.IsLocalPlayer || string.IsNullOrWhiteSpace(descriptor.HashedContentId))
-                continue;
-
-            hashedCid = descriptor.HashedContentId;
-            return true;
-        }
-
-        return false;
-    }
-
-    private HashSet<string> GetNearbyHashedCids(out string? localCid)
-    {
-        localCid = null;
-        var descriptors = _actorTracker.PlayerDescriptors;
-        if (descriptors.Count == 0)
-            return new HashSet<string>(StringComparer.Ordinal);
-
-        var set = new HashSet<string>(StringComparer.Ordinal);
-        foreach (var descriptor in descriptors)
-        {
-            if (string.IsNullOrWhiteSpace(descriptor.HashedContentId))
-                continue;
-
-            if (descriptor.IsLocalPlayer)
-                localCid = descriptor.HashedContentId;
-
-            set.Add(descriptor.HashedContentId);
-        }
-
-        return set;
-    }
-
     private async Task ExpiredBroadcastCleanupLoop()
     {
         var token = _cleanupCts.Token;

LightlessSync/UI/Components/DrawUserPair.cs

@@ -133,26 +133,6 @@ public class DrawUserPair
             UiSharedService.AttachToolTip("This reapplies the last received character data to this character");
         }
 
-        var isPaused = _pair.UserPair!.OwnPermissions.IsPaused();
-        if (!isPaused)
-        {
-            if (_uiSharedService.IconTextButton(FontAwesomeIcon.Pause, "Toggle Pause State", _menuWidth, true))
-            {
-                _ = _apiController.PauseAsync(_pair.UserData);
-                ImGui.CloseCurrentPopup();
-            }
-            UiSharedService.AttachToolTip("Pauses syncing with this user.");
-        }
-        else
-        {
-            if (_uiSharedService.IconTextButton(FontAwesomeIcon.Play, "Toggle Unpause State", _menuWidth, true))
-            {
-                _ = _apiController.UnpauseAsync(_pair.UserData);
-                ImGui.CloseCurrentPopup();
-            }
-            UiSharedService.AttachToolTip("Resumes syncing with this user.");
-        }
-
         if (_uiSharedService.IconTextButton(FontAwesomeIcon.PlayCircle, "Cycle pause state", _menuWidth, true))
         {
             _ = _apiController.CyclePauseAsync(_pair);

LightlessSync/UI/SyncshellAdminUI.cs

@@ -297,25 +297,6 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
             var ownerTab = ImRaii.TabItem("Owner Settings");
             if (ownerTab)
             {
-                bool isChatDisabled = perm.IsDisableChat();
-                ImGui.AlignTextToFramePadding();
-                ImGui.TextUnformatted("Syncshell Chat");
-                _uiSharedService.BooleanToColoredIcon(!isChatDisabled);
-                ImGui.SameLine(230);
-                using (ImRaii.PushColor(ImGuiCol.Text, isChatDisabled ? UIColors.Get("PairBlue") : UIColors.Get("DimRed")))
-                {
-                    if (_uiSharedService.IconTextButton(
-                        isChatDisabled ? FontAwesomeIcon.Comment : FontAwesomeIcon.Ban,
-                        isChatDisabled ? "Enable syncshell chat" : "Disable syncshell chat"))
-                    {
-                        perm.SetDisableChat(!isChatDisabled);
-                        _ = _apiController.GroupChangeGroupPermissionState(new(GroupFullInfo.Group, perm));
-                    }
-                }
-                UiSharedService.AttachToolTip("Disables syncshell chat for all members.");
-
-                ImGuiHelpers.ScaledDummy(6f);
-
                 ImGui.AlignTextToFramePadding();
                 ImGui.TextUnformatted("New Password");
                 var availableWidth = ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X;

LightlessSync/UI/SyncshellFinderUI.cs

@@ -140,10 +140,19 @@ public class SyncshellFinderUI : WindowMediatorSubscriberBase
             return;
         }
 
-        var broadcasts = _broadcastScannerService.GetActiveSyncshellBroadcasts().ToList() ?? [];
-        _broadcastScannerService.TryGetLocalHashedCid(out var localHashedCid);
+        string? myHashedCid = null;
+        try
+        {
+            var cid = _dalamudUtilService.GetCID();
+            myHashedCid = cid.ToString().GetHash256();
+        }
+        catch (Exception ex)
+        {
+            _logger.LogDebug(ex, "Failed to get CID, not excluding own broadcast.");
+        }
+        var broadcasts = _broadcastScannerService.GetActiveSyncshellBroadcasts().Where(b => !string.Equals(b.HashedCID, myHashedCid, StringComparison.Ordinal)).ToList() ?? [];
 
-        var cardData = new List<(GroupJoinDto Shell, string BroadcasterName, bool IsSelfBroadcast)>();
+        var cardData = new List<(GroupJoinDto Shell, string BroadcasterName)>();
 
         foreach (var shell in _nearbySyncshells)
         {
@@ -176,15 +185,9 @@ public class SyncshellFinderUI : WindowMediatorSubscriberBase
                 broadcasterName = !string.IsNullOrEmpty(worldName)
                     ? $"{name} ({worldName})"
                     : name;
-
-                var isSelfBroadcast = !string.IsNullOrEmpty(localHashedCid)
-                    && string.Equals(broadcast.HashedCID, localHashedCid, StringComparison.Ordinal);
-
-                cardData.Add((shell, broadcasterName, isSelfBroadcast));
-                continue;
             }
 
-            cardData.Add((shell, broadcasterName, false));
+            cardData.Add((shell, broadcasterName));
         }
 
         if (cardData.Count == 0)
@@ -207,7 +210,7 @@ public class SyncshellFinderUI : WindowMediatorSubscriberBase
             DrawConfirmation();
     }
 
-    private void DrawSyncshellList(List<(GroupJoinDto Shell, string BroadcasterName, bool IsSelfBroadcast)> listData)
+    private void DrawSyncshellList(List<(GroupJoinDto Shell, string BroadcasterName)> listData)
     {
         const int shellsPerPage = 3;
         var totalPages = (int)Math.Ceiling(listData.Count / (float)shellsPerPage);
@@ -224,10 +227,7 @@ public class SyncshellFinderUI : WindowMediatorSubscriberBase
 
         for (int index = firstIndex; index < lastExclusive; index++)
         {
-            var (shell, broadcasterName, isSelfBroadcast) = listData[index];
-            var broadcasterLabel = string.IsNullOrEmpty(broadcasterName)
-                ? (isSelfBroadcast ? "You" : string.Empty)
-                : (isSelfBroadcast ? $"{broadcasterName} (You)" : broadcasterName);
+            var (shell, broadcasterName) = listData[index];
 
             ImGui.PushID(shell.Group.GID);
             float rowHeight = 74f * ImGuiHelpers.GlobalScale;
@@ -239,7 +239,7 @@ public class SyncshellFinderUI : WindowMediatorSubscriberBase
             var style = ImGui.GetStyle();
             float startX = ImGui.GetCursorPosX();
             float regionW = ImGui.GetContentRegionAvail().X;
-            float rightTxtW = ImGui.CalcTextSize(broadcasterLabel).X;
+            float rightTxtW = ImGui.CalcTextSize(broadcasterName).X;
 
             _uiSharedService.MediumText(displayName, UIColors.Get("LightlessPurple"));
             if (ImGui.IsItemHovered())
@@ -252,7 +252,7 @@ public class SyncshellFinderUI : WindowMediatorSubscriberBase
             float rightX = startX + regionW - rightTxtW - style.ItemSpacing.X;
             ImGui.SameLine();
             ImGui.SetCursorPosX(rightX);
-            ImGui.TextUnformatted(broadcasterLabel);
+            ImGui.TextUnformatted(broadcasterName);
             if (ImGui.IsItemHovered())
                 ImGui.SetTooltip("Broadcaster of the syncshell.");
 
@@ -291,7 +291,7 @@ public class SyncshellFinderUI : WindowMediatorSubscriberBase
             float joinX = rowStartLocal.X + (tagsWidth > 0 ? tagsWidth + style.ItemSpacing.X : 0f);
 
             ImGui.SetCursorPos(new Vector2(joinX, btnBaselineY));
-            DrawJoinButton(shell, isSelfBroadcast);
+            DrawJoinButton(shell);
 
             float btnHeight = ImGui.GetFrameHeightWithSpacing();
             float rowHeightUsed = MathF.Max(tagsHeight, btnHeight);
@@ -311,7 +311,7 @@ public class SyncshellFinderUI : WindowMediatorSubscriberBase
         DrawPagination(totalPages);
     }
 
-    private void DrawSyncshellGrid(List<(GroupJoinDto Shell, string BroadcasterName, bool IsSelfBroadcast)> cardData)
+    private void DrawSyncshellGrid(List<(GroupJoinDto Shell, string BroadcasterName)> cardData)
     {
         const int shellsPerPage = 4;
         var totalPages = (int)Math.Ceiling(cardData.Count / (float)shellsPerPage);
@@ -336,10 +336,7 @@ public class SyncshellFinderUI : WindowMediatorSubscriberBase
         for (int index = firstIndex; index < lastExclusive; index++)
         {
             var localIndex = index - firstIndex;
-            var (shell, broadcasterName, isSelfBroadcast) = cardData[index];
-            var broadcasterLabel = string.IsNullOrEmpty(broadcasterName)
-                ? (isSelfBroadcast ? "You" : string.Empty)
-                : (isSelfBroadcast ? $"{broadcasterName} (You)" : broadcasterName);
+            var (shell, broadcasterName) = cardData[index];
 
             if (localIndex % 2 != 0)
                 ImGui.SameLine();
@@ -376,17 +373,17 @@ public class SyncshellFinderUI : WindowMediatorSubscriberBase
 
             float maxBroadcasterWidth = regionRightX - minBroadcasterX;
 
-            string broadcasterToShow = broadcasterLabel;
+            string broadcasterToShow = broadcasterName;
 
-            if (!string.IsNullOrEmpty(broadcasterLabel) && maxBroadcasterWidth > 0f)
+            if (!string.IsNullOrEmpty(broadcasterName) && maxBroadcasterWidth > 0f)
             {
-                float bcFullWidth = ImGui.CalcTextSize(broadcasterLabel).X;
+                float bcFullWidth = ImGui.CalcTextSize(broadcasterName).X;
                 string toolTip;
 
                 if (bcFullWidth > maxBroadcasterWidth)
                 {
-                    broadcasterToShow = TruncateTextToWidth(broadcasterLabel, maxBroadcasterWidth);
-                    toolTip = broadcasterLabel + Environment.NewLine + Environment.NewLine + "Broadcaster of the syncshell.";
+                    broadcasterToShow = TruncateTextToWidth(broadcasterName, maxBroadcasterWidth);
+                    toolTip = broadcasterName + Environment.NewLine + Environment.NewLine + "Broadcaster of the syncshell.";
                 } 
                 else
                 {
@@ -446,7 +443,7 @@ public class SyncshellFinderUI : WindowMediatorSubscriberBase
             if (remainingY > 0)
                 ImGui.Dummy(new Vector2(0, remainingY));
 
-            DrawJoinButton(shell, isSelfBroadcast);
+            DrawJoinButton(shell);
 
             ImGui.EndChild();
             ImGui.EndGroup();
@@ -492,7 +489,7 @@ public class SyncshellFinderUI : WindowMediatorSubscriberBase
         }
     }
 
-    private void DrawJoinButton(GroupJoinDto shell, bool isSelfBroadcast)
+    private void DrawJoinButton(dynamic shell)
     {
         const string visibleLabel = "Join";
         var label = $"{visibleLabel}##{shell.Group.GID}";
@@ -520,7 +517,7 @@ public class SyncshellFinderUI : WindowMediatorSubscriberBase
             buttonSize = new Vector2(-1, 0);
         }
 
-        if (!isAlreadyMember && !isRecentlyJoined && !isSelfBroadcast)
+        if (!isAlreadyMember && !isRecentlyJoined)
         {
             ImGui.PushStyleColor(ImGuiCol.Button, UIColors.Get("LightlessGreen"));
             ImGui.PushStyleColor(ImGuiCol.ButtonHovered, UIColors.Get("LightlessGreen").WithAlpha(0.85f));
@@ -570,9 +567,7 @@ public class SyncshellFinderUI : WindowMediatorSubscriberBase
                 ImGui.Button(label, buttonSize);
             }
 
-            UiSharedService.AttachToolTip(isSelfBroadcast
-                ? "This is your own Syncshell."
-                : "Already a member or owner of this Syncshell.");
+            UiSharedService.AttachToolTip("Already a member or owner of this Syncshell.");
         }
 
         ImGui.PopStyleColor(3);

LightlessSync/UI/TopTabMenu.cs

@@ -800,9 +800,22 @@ public class TopTabMenu
         if (!_lightFinderService.IsBroadcasting)
             return "Syncshell Finder";
 
+        string? myHashedCid = null;
+        try
+        {
+            var cid = _dalamudUtilService.GetCID();
+            myHashedCid = cid.ToString().GetHash256();
+        }
+        catch (Exception)
+        {
+            // Couldnt get own CID, log and return default table
+        }
+
         var nearbyCount = _lightFinderScannerService
-            .GetActiveSyncshellBroadcasts(excludeLocal: true)
-            .Where(b => !string.IsNullOrEmpty(b.GID))
+            .GetActiveSyncshellBroadcasts()
+            .Where(b =>
+                !string.IsNullOrEmpty(b.GID) &&
+                !string.Equals(b.HashedCID, myHashedCid, StringComparison.Ordinal))
             .Select(b => b.GID!)
             .Distinct(StringComparer.Ordinal)
             .Count();

LightlessSync/UI/UISharedService.cs

@@ -947,16 +947,13 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
                 }
             }
 
-            if (_discordOAuthCheck != null && _discordOAuthCheck.IsCompleted && _discordOAuthCheck.Result != null)
+            if (_discordOAuthCheck != null && _discordOAuthCheck.IsCompleted)
             {
-                if (_discordOAuthGetCode == null)
+                if (IconTextButton(FontAwesomeIcon.ArrowRight, "Authenticate with Server"))
                 {
-                    if (IconTextButton(FontAwesomeIcon.ArrowRight, "Authenticate with Server"))
-                    {
-                        _discordOAuthGetCode = _serverConfigurationManager.GetDiscordOAuthToken(_discordOAuthCheck.Result, selectedServer.ServerUri, _discordOAuthGetCts.Token);
-                    }
+                    _discordOAuthGetCode = _serverConfigurationManager.GetDiscordOAuthToken(_discordOAuthCheck.Result!, selectedServer.ServerUri, _discordOAuthGetCts.Token);
                 }
-                else if (!_discordOAuthGetCode.IsCompleted)
+                else if (_discordOAuthGetCode != null && !_discordOAuthGetCode.IsCompleted)
                 {
                     TextWrapped("A browser window has been opened, follow it to authenticate. Click the button below if you accidentally closed the window and need to restart the authentication.");
                     if (IconTextButton(FontAwesomeIcon.Ban, "Cancel Authentication"))
@@ -965,7 +962,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
                         _discordOAuthGetCode = null;
                     }
                 }
-                else
+                else if (_discordOAuthGetCode != null && _discordOAuthGetCode.IsCompleted)
                 {
                     TextWrapped("Discord OAuth is completed, status: ");
                     ImGui.SameLine();

LightlessSync/UI/ZoneChatUi.cs

@@ -17,7 +17,6 @@ using LightlessSync.Services.ServerConfiguration;
 using LightlessSync.UI.Services;
 using LightlessSync.UI.Style;
 using LightlessSync.Utils;
-using OtterGui.Text;
 using LightlessSync.WebAPI;
 using LightlessSync.WebAPI.SignalR.Utils;
 using Microsoft.Extensions.Logging;
@@ -212,6 +211,12 @@ public sealed class ZoneChatUi : WindowMediatorSubscriberBase
 
     protected override void DrawInternal()
     {
+        if (_titleBarStylePopCount > 0)
+        {
+            ImGui.PopStyleColor(_titleBarStylePopCount);
+            _titleBarStylePopCount = 0;
+        }
+
         var config = _chatConfigService.Current;
         var isFocused = ImGui.IsWindowFocused(ImGuiFocusedFlags.RootAndChildWindows);
         var isHovered = ImGui.IsWindowHovered(ImGuiHoveredFlags.RootAndChildWindows);
@@ -395,57 +400,52 @@ public sealed class ZoneChatUi : WindowMediatorSubscriberBase
         }
         else
         {
-            var itemHeight = ImGui.GetTextLineHeightWithSpacing();
-            using var clipper = ImUtf8.ListClipper(channel.Messages.Count, itemHeight);
-            while (clipper.Step())
+            for (var i = 0; i < channel.Messages.Count; i++)
             {
-                for (var i = clipper.DisplayStart; i < clipper.DisplayEnd; i++)
+                var message = channel.Messages[i];
+                ImGui.PushID(i);
+
+                if (message.IsSystem)
                 {
-                    var message = channel.Messages[i];
-                    ImGui.PushID(i);
-
-                    if (message.IsSystem)
-                    {
-                        DrawSystemEntry(message);
-                        ImGui.PopID();
-                        continue;
-                    }
-
-                    if (message.Payload is not { } payload)
-                    {
-                        ImGui.PopID();
-                        continue;
-                    }
-
-                    var timestampText = string.Empty;
-                    if (showTimestamps)
-                    {
-                        timestampText = $"[{message.ReceivedAtUtc.ToLocalTime().ToString("HH:mm", CultureInfo.InvariantCulture)}] ";
-                    }
-                    var color = message.FromSelf ? UIColors.Get("LightlessBlue") : ImGuiColors.DalamudWhite;
-
-                    ImGui.PushStyleColor(ImGuiCol.Text, color);
-                    ImGui.TextWrapped($"{timestampText}{message.DisplayName}: {payload.Message}");
-                    ImGui.PopStyleColor();
-
-                    if (ImGui.BeginPopupContextItem($"chat_msg_ctx##{channel.Key}_{i}"))
-                    {
-                        var contextLocalTimestamp = payload.SentAtUtc.ToLocalTime();
-                        var contextTimestampText = contextLocalTimestamp.ToString("yyyy-MM-dd HH:mm:ss 'UTC'z", CultureInfo.InvariantCulture);
-                        ImGui.TextDisabled(contextTimestampText);
-                        ImGui.Separator();
-
-                        var actionIndex = 0;
-                        foreach (var action in GetContextMenuActions(channel, message))
-                        {
-                            DrawContextMenuAction(action, actionIndex++);
-                        }
-
-                        ImGui.EndPopup();
-                    }
-
+                    DrawSystemEntry(message);
                     ImGui.PopID();
+                    continue;
                 }
+
+                if (message.Payload is not { } payload)
+                {
+                    ImGui.PopID();
+                    continue;
+                }
+
+                var timestampText = string.Empty;
+                if (showTimestamps)
+                {
+                    timestampText = $"[{message.ReceivedAtUtc.ToLocalTime().ToString("HH:mm", CultureInfo.InvariantCulture)}] ";
+                }
+                var color = message.FromSelf ? UIColors.Get("LightlessBlue") : ImGuiColors.DalamudWhite;
+
+                ImGui.PushStyleColor(ImGuiCol.Text, color);
+                ImGui.TextWrapped($"{timestampText}{message.DisplayName}: {payload.Message}");
+                ImGui.PopStyleColor();
+
+                if (ImGui.BeginPopupContextItem($"chat_msg_ctx##{channel.Key}_{i}"))
+                {
+                    var contextLocalTimestamp = payload.SentAtUtc.ToLocalTime();
+                    var contextTimestampText = contextLocalTimestamp.ToString("yyyy-MM-dd HH:mm:ss 'UTC'z", CultureInfo.InvariantCulture);
+                    ImGui.TextDisabled(contextTimestampText);
+                    ImGui.Separator();
+
+                    var actionIndex = 0;
+                    foreach (var action in GetContextMenuActions(channel, message))
+                    {
+                        DrawContextMenuAction(action, actionIndex++);
+                    }
+
+                    ImGui.EndPopup();
+                }
+
+                ImGui.PopID();
             }
         }
 
@@ -833,11 +833,6 @@ public sealed class ZoneChatUi : WindowMediatorSubscriberBase
             ImGui.PopStyleVar(1);
             _pushedStyle = false;
         }
-        if (_titleBarStylePopCount > 0)
-        {
-            ImGui.PopStyleColor(_titleBarStylePopCount);
-            _titleBarStylePopCount = 0;
-        }
         base.PostDraw();
     }
 

LightlessSync/Utils/VariousExtensions.cs

@@ -60,6 +60,16 @@ public static class VariousExtensions
         CharacterData? oldData, ILogger logger, IPairPerformanceSubject cachedPlayer, bool forceApplyCustomization, bool forceApplyMods)
     {
         oldData ??= new();
+        static bool FileReplacementsEquivalent(ICollection<FileReplacementData> left, ICollection<FileReplacementData> right)
+        {
+            if (left.Count != right.Count)
+            {
+                return false;
+            }
+
+            var comparer = LightlessSync.PlayerData.Data.FileReplacementDataComparer.Instance;
+            return !left.Except(right, comparer).Any() && !right.Except(left, comparer).Any();
+        }
 
         var charaDataToUpdate = new Dictionary<ObjectKind, HashSet<PlayerChanges>>();
         foreach (ObjectKind objectKind in Enum.GetValues<ObjectKind>())
@@ -95,7 +105,7 @@ public static class VariousExtensions
                 {
                     var oldList = oldData.FileReplacements[objectKind];
                     var newList = newData.FileReplacements[objectKind];
-                    var listsAreEqual = oldList.SequenceEqual(newList, PlayerData.Data.FileReplacementDataComparer.Instance);
+                    var listsAreEqual = FileReplacementsEquivalent(oldList, newList);
                     if (!listsAreEqual || forceApplyMods)
                     {
                         logger.LogDebug("[BASE-{appBase}] Updating {object}/{kind} (FileReplacements not equal) => {change}", applicationBase, cachedPlayer, objectKind, PlayerChanges.ModFiles);
@@ -118,9 +128,9 @@ public static class VariousExtensions
                                 .OrderBy(g => string.IsNullOrEmpty(g.Hash) ? g.FileSwapPath : g.Hash, StringComparer.OrdinalIgnoreCase).ToList();
                             var newTail = newFileReplacements.Where(g => g.GamePaths.Any(p => p.Contains("/tail/", StringComparison.OrdinalIgnoreCase)))
                                 .OrderBy(g => string.IsNullOrEmpty(g.Hash) ? g.FileSwapPath : g.Hash, StringComparer.OrdinalIgnoreCase).ToList();
-                            var existingTransients = existingFileReplacements.Where(g => g.GamePaths.Any(g => !g.EndsWith("mdl") && !g.EndsWith("tex") && !g.EndsWith("mtrl")))
+                            var existingTransients = existingFileReplacements.Where(g => g.GamePaths.Any(g => !g.EndsWith("mdl", StringComparison.OrdinalIgnoreCase) && !g.EndsWith("tex", StringComparison.OrdinalIgnoreCase) && !g.EndsWith("mtrl", StringComparison.OrdinalIgnoreCase)))
                                 .OrderBy(g => string.IsNullOrEmpty(g.Hash) ? g.FileSwapPath : g.Hash, StringComparer.OrdinalIgnoreCase).ToList();
-                            var newTransients = newFileReplacements.Where(g => g.GamePaths.Any(g => !g.EndsWith("mdl") && !g.EndsWith("tex") && !g.EndsWith("mtrl")))
+                            var newTransients = newFileReplacements.Where(g => g.GamePaths.Any(g => !g.EndsWith("mdl", StringComparison.OrdinalIgnoreCase) && !g.EndsWith("tex", StringComparison.OrdinalIgnoreCase) && !g.EndsWith("mtrl", StringComparison.OrdinalIgnoreCase)))
                                 .OrderBy(g => string.IsNullOrEmpty(g.Hash) ? g.FileSwapPath : g.Hash, StringComparer.OrdinalIgnoreCase).ToList();
 
                             logger.LogTrace("[BASE-{appbase}] ExistingFace: {of}, NewFace: {fc}; ExistingHair: {eh}, NewHair: {nh}; ExistingTail: {et}, NewTail: {nt}; ExistingTransient: {etr}, NewTransient: {ntr}", applicationBase,
@@ -167,7 +177,8 @@ public static class VariousExtensions
             if (objectKind != ObjectKind.Player) continue;
 
             bool manipDataDifferent = !string.Equals(oldData.ManipulationData, newData.ManipulationData, StringComparison.Ordinal);
-            if (manipDataDifferent || forceApplyMods)
+            var hasManipulationData = !string.IsNullOrEmpty(newData.ManipulationData);
+            if (manipDataDifferent || (forceApplyMods && hasManipulationData))
             {
                 logger.LogDebug("[BASE-{appBase}] Updating {object}/{kind} (Diff manip data) => {change}", applicationBase, cachedPlayer, objectKind, PlayerChanges.ModManip);
                 charaDataToUpdate[objectKind].Add(PlayerChanges.ModManip);

LightlessSync/WebAPI/Files/FileDownloadManager.cs

@@ -563,7 +563,7 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
 
         if (directDownloads.Count > 0 || downloadBatches.Length > 0)
         {
-            Logger.LogInformation("Downloading {direct} files directly, and {batchtotal} in {batches} batches.", directDownloads.Count, batchDownloads.Count, downloadBatches.Length);
+            Logger.LogWarning("Downloading {direct} files directly, and {batchtotal} in {batches} batches.", directDownloads.Count, batchDownloads.Count, downloadBatches.Length);
         }
 
         if (gameObjectHandler is not null)

LightlessSync/WebAPI/SignalR/ApiController.cs

@@ -418,7 +418,7 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL
 
     public Task CyclePauseAsync(PairUniqueIdentifier ident)
     {
-        var timeoutCts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
+        var timeoutCts = new CancellationTokenSource(TimeSpan.FromSeconds(8));
         _ = Task.Run(async () =>
         {
             var token = timeoutCts.Token;
@@ -430,19 +430,20 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL
                     return;
                 }
 
-                var targetPermissions = entry.SelfPermissions;
-                targetPermissions.SetPaused(paused: true);
+                var originalPermissions = entry.SelfPermissions;
+                var targetPermissions = originalPermissions;
+                targetPermissions.SetPaused(!originalPermissions.IsPaused());
 
                 await UserSetPairPermissions(new UserPermissionsDto(entry.User, targetPermissions)).ConfigureAwait(false);
 
-                var pauseApplied = false;
+                var applied = false;
                 while (!token.IsCancellationRequested)
                 {
                     if (_pairCoordinator.Ledger.TryGetEntry(ident, out var updated) && updated is not null)
                     {
                         if (updated.SelfPermissions == targetPermissions)
                         {
-                            pauseApplied = true;
+                            applied = true;
                             entry = updated;
                             break;
                         }
@@ -452,16 +453,13 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL
                     Logger.LogTrace("Waiting for permissions change for {uid}", ident.UserId);
                 }
 
-                if (!pauseApplied)
+                if (!applied)
                 {
                     Logger.LogWarning("CyclePauseAsync timed out waiting for pause acknowledgement for {uid}", ident.UserId);
                     return;
                 }
 
-                targetPermissions.SetPaused(paused: false);
-                await UserSetPairPermissions(new UserPermissionsDto(entry.User, targetPermissions)).ConfigureAwait(false);
-
-                Logger.LogDebug("CyclePauseAsync completed pause cycle for {uid}", ident.UserId);
+                Logger.LogDebug("CyclePauseAsync toggled paused for {uid} to {state}", ident.UserId, targetPermissions.IsPaused());
             }
             catch (OperationCanceledException)
             {
@@ -481,26 +479,16 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL
     }
 
     public async Task PauseAsync(UserData userData)
-    {
-        await SetPausedStateAsync(userData, paused: true).ConfigureAwait(false);
-    }
-
-    public async Task UnpauseAsync(UserData userData)
-    {
-        await SetPausedStateAsync(userData, paused: false).ConfigureAwait(false);
-    }
-
-    private async Task SetPausedStateAsync(UserData userData, bool paused)
     {
         var pairIdent = new PairUniqueIdentifier(userData.UID);
         if (!_pairCoordinator.Ledger.TryGetEntry(pairIdent, out var entry) || entry is null)
         {
-            Logger.LogWarning("SetPausedStateAsync: pair {uid} not found in ledger", userData.UID);
+            Logger.LogWarning("PauseAsync: pair {uid} not found in ledger", userData.UID);
             return;
         }
 
         var permissions = entry.SelfPermissions;
-        permissions.SetPaused(paused);
+        permissions.SetPaused(paused: true);
         await UserSetPairPermissions(new UserPermissionsDto(userData, permissions)).ConfigureAwait(false);
     }