2.1.0 (#123)

# Patchnotes 2.1.0 The changes in this update are more than just "patches". With a new UI, a new feature, and a bunch of bug fixes, improvements and a new member on the dev team, we thought this was more of a minor update. We would like to introduce @tsubasahane of MareCN to the team! We’re happy to work with them to bring Lightless and its features to the CN client as well as having another talented dev bring features and ideas to us. Speaking of which: # Location Sharing (Big shout out to @tsubasahane for bringing this feature) - Are you TIRED of scrambling to find the address of the venue you're in to share with your friends? We are introducing Location Sharing! An optional feature where you can share your location with direct pairs temporarily [30 minutes, 1 hour, 3 hours] minutes or until you turn it off for them. That's up to you! [#125](<#125>) [#49](<Lightless-Sync/LightlessServer#49>) - To share your location with a pair, click the three dots beside the pair and choose a duration to share with them. [#125](<#125>) [#49](<Lightless-Sync/LightlessServer#49>) - To view the location of someone who's shared with you, simply hover over the globe icon! [#125](<#125>) [#49](<Lightless-Sync/LightlessServer#49>) [1] # Model Optimization (Mesh Decimating) - This new option can automatically “simplify” incoming character meshes to help performance by reducing triangle counts. You choose how strong the reduction is (default/recommended is 80%). [#131](<#131>) - Decimation only kicks in when a mesh is above a certain triangle threshold, and only for the items that qualify for it and you selected for. [#131](<#131>) - Hair meshes is always excluded, since simplifying hair meshes is very prone to breaking. - You can find everything under Settings → Performance → Model Optimization. [#131](<#131>) + ** IF YOU HAVE USED DECIMATION IN TESTING, PLEASE CLEAR YOUR CACHE ❗ ** [2] # Animation (PAP) Validation (Safer animations) - Lightless now checks your currently animations to see if they work with your local skeleton/bone mod. If an animation matches, it’s included in what gets sent to other players. If it doesn’t, Lightless will skip it and write a warning to your log showing how many were skipped due to skeleton changes. Its defaulted to Unsafe (off). turn it on if you experience crashes from others users. [#131](<#131>) - Lightless also does the same kind of check for incoming animation files, to make sure they match the body/skeleton they were sent with. [#131](<#131>) - Because these checks can sometimes be a little picky, you can adjust how strict they are in Settings -> General -> Animation & Bones to reduce false positives. [#131](<#131>) # UI Changes (Thanks to @kyuwu for UI Changes) - The top part of the main screen has gotten a makeover. You can adjust the colors of the gradiant in the Color settings of Lightless. [#127](<#127>) [3] - Settings have gotten some changes as well to make this change more universal, and will use the same color settings. [#127](<#127>) - The particle effects of the gradient are toggleable in 'Settings -> UI -> Behavior' [#127](<#127>) - Instead of showing download/upload on bottom of Main UI, it will show VRAM usage and triangles with their optimization options next to it [#138](<#138>) # LightFinder / ShellFinder - UI Changes that follow our new design follow the color codes for the Gradient top as the main screen does. [#127](<#127>) [4] Co-authored-by: defnotken <itsdefnotken@gmail.com> Co-authored-by: azyges <aaaaaa@aaa.aaa> Co-authored-by: cake <admin@cakeandbanana.nl> Co-authored-by: Tsubasa <tsubasa@noreply.git.lightless-sync.org> Co-authored-by: choco <choco@patat.nl> Co-authored-by: celine <aaa@aaa.aaa> Co-authored-by: celine <celine@noreply.git.lightless-sync.org> Co-authored-by: Tsubasahane <wozaiha@gmail.com> Co-authored-by: cake <cake@noreply.git.lightless-sync.org> Reviewed-on: #123
2026-01-20 19:43:00 +00:00
parent ed7932ab83
commit 72a62b7449
178 changed files with 33356 additions and 4568 deletions
--- a/LightlessSync/Services/ActorTracking/ActorObjectService.cs
+++ b/LightlessSync/Services/ActorTracking/ActorObjectService.cs
@@ -6,6 +6,7 @@ using FFXIVClientStructs.Interop;
 using FFXIVClientStructs.FFXIV.Client.Game.Character;
 using FFXIVClientStructs.FFXIV.Client.Game.Object;
 using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
+using LightlessSync.PlayerData.Handlers;
 using LightlessSync.Services.Mediator;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
@@ -16,7 +17,7 @@ using LightlessObjectKind = LightlessSync.API.Data.Enum.ObjectKind;

 namespace LightlessSync.Services.ActorTracking;

-public sealed class ActorObjectService : IHostedService, IDisposable
+public sealed class ActorObjectService : IHostedService, IDisposable, IMediatorSubscriber
 {
    public readonly record struct ActorDescriptor(
        string Name,
@@ -36,6 +37,8 @@ public sealed class ActorObjectService : IHostedService, IDisposable
    private readonly IClientState _clientState;
    private readonly ICondition _condition;
    private readonly LightlessMediator _mediator;
+    private readonly object _playerRelatedHandlerLock = new();
+    private readonly HashSet<GameObjectHandler> _playerRelatedHandlers = [];

    private readonly ConcurrentDictionary<nint, ActorDescriptor> _activePlayers = new();
    private readonly ConcurrentDictionary<nint, ActorDescriptor> _gposePlayers = new();
@@ -71,6 +74,26 @@ public sealed class ActorObjectService : IHostedService, IDisposable
        _clientState = clientState;
        _condition = condition;
        _mediator = mediator;
+
+        _mediator.Subscribe<GameObjectHandlerCreatedMessage>(this, (msg) =>
+        {
+            if (!msg.OwnedObject) return;
+            lock (_playerRelatedHandlerLock)
+            {
+                _playerRelatedHandlers.Add(msg.GameObjectHandler);
+            }
+            RefreshTrackedActors(force: true);
+        });
+        _mediator.Subscribe<GameObjectHandlerDestroyedMessage>(this, (msg) =>
+        {
+            if (!msg.OwnedObject) return;
+            lock (_playerRelatedHandlerLock)
+            {
+                _playerRelatedHandlers.Remove(msg.GameObjectHandler);
+            }
+            RefreshTrackedActors(force: true);
+        });
+        _mediator.Subscribe<DalamudLogoutMessage>(this, _ => ClearTrackingState());
    }

    private bool IsZoning => _condition[ConditionFlag.BetweenAreas] || _condition[ConditionFlag.BetweenAreas51];
@@ -84,6 +107,7 @@ public sealed class ActorObjectService : IHostedService, IDisposable
    public IReadOnlyList<ActorDescriptor> PlayerDescriptors => Snapshot.PlayerDescriptors;
    public IReadOnlyList<ActorDescriptor> OwnedDescriptors => Snapshot.OwnedDescriptors;
    public IReadOnlyList<ActorDescriptor> GposeDescriptors => CurrentGposeSnapshot.GposeDescriptors;
+    public LightlessMediator Mediator => _mediator;

    public bool TryGetActorByHash(string hash, out ActorDescriptor descriptor) => _actorsByHash.TryGetValue(hash, out descriptor);
    public bool TryGetValidatedActorByHash(string hash, out ActorDescriptor descriptor)
@@ -213,18 +237,25 @@ public sealed class ActorObjectService : IHostedService, IDisposable
        return false;
    }

-    public async Task WaitForFullyLoadedAsync(nint address, CancellationToken cancellationToken = default)
+    public async Task<bool> WaitForFullyLoadedAsync(nint address, CancellationToken cancellationToken = default, int timeOutMs = 30000)
    {
        if (address == nint.Zero)
            throw new ArgumentException("Address cannot be zero.", nameof(address));

+        var timeoutAt = timeOutMs > 0 ? Environment.TickCount64 + timeOutMs : long.MaxValue;
        while (true)
        {
            cancellationToken.ThrowIfCancellationRequested();

-            var isLoaded = await _framework.RunOnFrameworkThread(() => IsObjectFullyLoaded(address)).ConfigureAwait(false);
-            if (!IsZoning && isLoaded)
-                return;
+            var loadState = await _framework.RunOnFrameworkThread(() => GetObjectLoadState(address)).ConfigureAwait(false);
+            if (!loadState.IsValid)
+                return false;
+
+            if (!IsZoning && loadState.IsLoaded)
+                return true;
+
+            if (Environment.TickCount64 >= timeoutAt)
+                return false;

            await Task.Delay(100, cancellationToken).ConfigureAwait(false);
        }
@@ -312,13 +343,8 @@ public sealed class ActorObjectService : IHostedService, IDisposable
    public Task StopAsync(CancellationToken cancellationToken)
    {
        DisposeHooks();
-        _activePlayers.Clear();
-        _gposePlayers.Clear();
-        _actorsByHash.Clear();
-        _actorsByName.Clear();
-        _pendingHashResolutions.Clear();
-        Volatile.Write(ref _snapshot, ActorSnapshot.Empty);
-        Volatile.Write(ref _gposeSnapshot, GposeSnapshot.Empty);
+        ClearTrackingState();
+        _mediator.UnsubscribeAll(this);
        return Task.CompletedTask;
    }

@@ -493,7 +519,9 @@ public sealed class ActorObjectService : IHostedService, IDisposable
        if (objectKind is DalamudObjectKind.MountType or DalamudObjectKind.Companion)
        {
            var expectedMinionOrMount = GetMinionOrMountAddress(localPlayerAddress, localEntityId);
-            if (expectedMinionOrMount != nint.Zero && (nint)gameObject == expectedMinionOrMount)
+            if (expectedMinionOrMount != nint.Zero
+                && (nint)gameObject == expectedMinionOrMount
+                && IsPlayerRelatedOwnedAddress(expectedMinionOrMount, LightlessObjectKind.MinionOrMount))
            {
                var resolvedOwner = ownerId != 0 ? ownerId : localEntityId;
                return (LightlessObjectKind.MinionOrMount, resolvedOwner);
@@ -507,51 +535,55 @@ public sealed class ActorObjectService : IHostedService, IDisposable
            return (null, ownerId);

        var expectedPet = GetPetAddress(localPlayerAddress, localEntityId);
-        if (expectedPet != nint.Zero && (nint)gameObject == expectedPet)
+        if (expectedPet != nint.Zero
+            && (nint)gameObject == expectedPet
+            && IsPlayerRelatedOwnedAddress(expectedPet, LightlessObjectKind.Pet))
            return (LightlessObjectKind.Pet, ownerId);

        var expectedCompanion = GetCompanionAddress(localPlayerAddress, localEntityId);
-        if (expectedCompanion != nint.Zero && (nint)gameObject == expectedCompanion)
+        if (expectedCompanion != nint.Zero
+            && (nint)gameObject == expectedCompanion
+            && IsPlayerRelatedOwnedAddress(expectedCompanion, LightlessObjectKind.Companion))
            return (LightlessObjectKind.Companion, ownerId);

        return (null, ownerId);
    }

+    private bool IsPlayerRelatedOwnedAddress(nint address, LightlessObjectKind expectedKind)
+    {
+        if (address == nint.Zero)
+            return false;
+
+        lock (_playerRelatedHandlerLock)
+        {
+            foreach (var handler in _playerRelatedHandlers)
+            {
+                if (handler.Address == address && handler.ObjectKind == expectedKind)
+                    return true;
+            }
+        }
+
+        return false;
+    }
+
    private unsafe nint GetMinionOrMountAddress(nint localPlayerAddress, uint ownerEntityId)
    {
        if (localPlayerAddress == nint.Zero)
            return nint.Zero;

+        if (ownerEntityId == 0)
+            return nint.Zero;
+
        var playerObject = (GameObject*)localPlayerAddress;
        var candidateAddress = _objectTable.GetObjectAddress(playerObject->ObjectIndex + 1);
-        if (candidateAddress != nint.Zero)
-        {
-            var candidate = (GameObject*)candidateAddress;
-            var candidateKind = (DalamudObjectKind)candidate->ObjectKind;
-            if (candidateKind is DalamudObjectKind.MountType or DalamudObjectKind.Companion)
-            {
-                if (ownerEntityId == 0 || ResolveOwnerId(candidate) == ownerEntityId)
-                    return candidateAddress;
-            }
-        }
+        if (candidateAddress == nint.Zero)
+            return nint.Zero;

-        if (ownerEntityId == 0)
-            return candidateAddress;
-
-        foreach (var obj in _objectTable)
-        {
-            if (obj is null || obj.Address == nint.Zero || obj.Address == localPlayerAddress)
-                continue;
-
-            if (obj.ObjectKind is not (DalamudObjectKind.MountType or DalamudObjectKind.Companion))
-                continue;
-
-            var candidate = (GameObject*)obj.Address;
-            if (ResolveOwnerId(candidate) == ownerEntityId)
-                return obj.Address;
-        }
-
-        return candidateAddress;
+        var candidate = (GameObject*)candidateAddress;
+        var candidateKind = (DalamudObjectKind)candidate->ObjectKind;
+        return candidateKind is DalamudObjectKind.MountType or DalamudObjectKind.Companion
+            ? candidateAddress
+            : nint.Zero;
    }

    private unsafe nint GetPetAddress(nint localPlayerAddress, uint ownerEntityId)
@@ -571,22 +603,6 @@ public sealed class ActorObjectService : IHostedService, IDisposable
            }
        }

-        foreach (var obj in _objectTable)
-        {
-            if (obj is null || obj.Address == nint.Zero || obj.Address == localPlayerAddress)
-                continue;
-
-            if (obj.ObjectKind != DalamudObjectKind.BattleNpc)
-                continue;
-
-            var candidate = (GameObject*)obj.Address;
-            if (candidate->BattleNpcSubKind != BattleNpcSubKind.Pet)
-                continue;
-
-            if (ResolveOwnerId(candidate) == ownerEntityId)
-                return obj.Address;
-        }
-
        return nint.Zero;
    }

@@ -606,23 +622,6 @@ public sealed class ActorObjectService : IHostedService, IDisposable
                    return candidate;
            }
        }
-
-        foreach (var obj in _objectTable)
-        {
-            if (obj is null || obj.Address == nint.Zero || obj.Address == localPlayerAddress)
-                continue;
-
-            if (obj.ObjectKind != DalamudObjectKind.BattleNpc)
-                continue;
-
-            var candidate = (GameObject*)obj.Address;
-            if (candidate->BattleNpcSubKind != BattleNpcSubKind.Buddy)
-                continue;
-
-            if (ResolveOwnerId(candidate) == ownerEntityId)
-                return obj.Address;
-        }
-
        return nint.Zero;
    }

@@ -1019,9 +1018,26 @@ public sealed class ActorObjectService : IHostedService, IDisposable
        }
    }

+    private void ClearTrackingState()
+    {
+        _activePlayers.Clear();
+        _gposePlayers.Clear();
+        _actorsByHash.Clear();
+        _actorsByName.Clear();
+        _pendingHashResolutions.Clear();
+        lock (_playerRelatedHandlerLock)
+        {
+            _playerRelatedHandlers.Clear();
+        }
+        Volatile.Write(ref _snapshot, ActorSnapshot.Empty);
+        Volatile.Write(ref _gposeSnapshot, GposeSnapshot.Empty);
+        _nextRefreshAllowed = DateTime.MinValue;
+    }
+
    public void Dispose()
    {
        DisposeHooks();
+        _mediator.UnsubscribeAll(this);
        GC.SuppressFinalize(this);
    }

@@ -1143,6 +1159,18 @@ public sealed class ActorObjectService : IHostedService, IDisposable
        return results;
    }

+    private LoadState GetObjectLoadState(nint address)
+    {
+        if (address == nint.Zero)
+            return LoadState.Invalid;
+
+        var obj = _objectTable.CreateObjectReference(address);
+        if (obj is null || obj.Address != address)
+            return LoadState.Invalid;
+
+        return new LoadState(true, IsObjectFullyLoaded(address));
+    }
+
    private static unsafe bool IsObjectFullyLoaded(nint address)
    {
        if (address == nint.Zero)
@@ -1169,6 +1197,11 @@ public sealed class ActorObjectService : IHostedService, IDisposable
        return true;
    }

+    private readonly record struct LoadState(bool IsValid, bool IsLoaded)
+    {
+        public static LoadState Invalid => new(false, false);
+    }
+
    private sealed record OwnedObjectSnapshot(
        IReadOnlyList<nint> RenderedPlayers,
        IReadOnlyList<nint> RenderedCompanions,