fixes to plugin.

Reviewed-on: #98
Reviewed-by: defnotken <defnotken@noreply.git.lightless-sync.org>

.gitea/workflows/lightless-tag-and-release.yml

@@ -9,8 +9,7 @@ env:
   DOTNET_VERSION: |
       10.x.x
       9.x.x
-  DOTNET_CLI_TELEMETRY_OPTOUT: true
-  
+
 jobs:
   tag-and-release:
     runs-on: ubuntu-22.04
@@ -33,14 +32,16 @@ jobs:
 
     - name: Download Dalamud
       run: |
-        mkdir -p ~/.xlcore/dalamud/Hooks/dev
+        cd /
+        mkdir -p root/.xlcore/dalamud/Hooks/dev
         curl -O https://goatcorp.github.io/dalamud-distrib/stg/latest.zip
-        unzip latest.zip -d ~/.xlcore/dalamud/Hooks/dev
+        unzip latest.zip -d /root/.xlcore/dalamud/Hooks/dev
 
     - name: Lets Build Lightless!
       run: | 
-        dotnet publish --configuration Release
-        mv LightlessSync/bin/x64/Release/LightlessSync/latest.zip LightlessClient.zip
+          dotnet restore
+          dotnet build --configuration Release --no-restore
+          dotnet publish --configuration Release --no-build
 
     - name: Get version
       id: package_version
@@ -52,6 +53,19 @@ jobs:
       run: | 
           echo "Version: ${{ steps.package_version.outputs.version }}"
 
+    - name: Prepare Lightless Client
+      run: |
+        PUBLISH_PATH="/workspace/Lightless-Sync/LightlessClient/LightlessSync/bin/x64/Release/publish/"
+        if [ -d "$PUBLISH_PATH" ]; then
+          rm -rf "$PUBLISH_PATH"
+          echo "Removed $PUBLISH_PATH"
+        else
+          echo "$PUBLISH_PATH does not exist, nothing to remove."
+        fi
+
+        mkdir -p output
+        (cd /workspace/Lightless-Sync/LightlessClient/LightlessSync/bin/x64/Release/ && zip -r $OLDPWD/output/LightlessClient.zip *)
+
     - name: Create Git tag if not exists (master)
       if: github.ref == 'refs/heads/master'
       run: |
@@ -148,7 +162,14 @@ jobs:
         echo "release_id=$release_id"
         echo "release_id=$release_id" >> $GITHUB_OUTPUT || echo "::set-output name=release_id::$release_id"
         echo "RELEASE_ID=$release_id" >> $GITHUB_ENV
-
+        
+    - name: Check asset exists
+      run: |
+        if [ ! -f output/LightlessClient.zip ]; then
+          echo "output/LightlessClient.zip does not exist!"
+          exit 1
+        fi
+        
     - name: Upload Assets to release
       env:
          RELEASE_ID: ${{ env.RELEASE_ID }}
@@ -156,7 +177,7 @@ jobs:
           echo "Uploading to release ID: $RELEASE_ID"
           curl --fail-with-body -s -X POST \
             -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
-            -F "attachment=@LightlessClient.zip" \
+            -F "attachment=@output/LightlessClient.zip" \
            "https://git.lightless-sync.org/api/v1/repos/${GITHUB_REPOSITORY}/releases/$RELEASE_ID/assets"
 
     - name: Clone plugin hosting repo
@@ -165,7 +186,7 @@ jobs:
           cd LightlessSyncRepo
           git clone https://git.lightless-sync.org/${{ gitea.repository_owner }}/LightlessSync.git
       env:
-          GIT_TERMINAL_PROMPT: 0
+        GIT_TERMINAL_PROMPT: 0
 
     - name: Update plogonmaster.json with version (master)
       if: github.ref == 'refs/heads/master'
@@ -261,8 +282,8 @@ jobs:
     - name: Commit and push to LightlessSync
       run: |
           cd LightlessSyncRepo/LightlessSync
-          git config user.name "Gitea-Automation"
-          git config user.email "aaa@aaaaaaa.aaa"
+          git config user.name "github-actions"
+          git config user.email "github-actions@github.com"
           git add .
           git diff-index --quiet HEAD || git commit -m "Update ${{ env.PLUGIN_NAME }} to ${{ steps.package_version.outputs.version }}"
           git push https://x-access-token:${{ secrets.AUTOMATION_TOKEN }}@git.lightless-sync.org/${{ gitea.repository_owner }}/LightlessSync.git HEAD:main

.gitignore

@@ -348,6 +348,3 @@ MigrationBackup/
 
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
-
-# idea
-/.idea

LightlessSync/Changelog/changelog.yaml

@@ -1,72 +1,11 @@
-tagline: "Lightless Sync v2.0.1"
+tagline: "Lightless Sync v2.0.0"
 subline: "LIGHTLESS IS EVOLVING!!"
 changelog:
-  - name: "v2.0.2"
-    tagline: "Last update of 2025!... ... ... If Nothing breaks"
-    date: "December 28 2025"
-   # be sure to set this every new version
-    isCurrent: true
-    versions:
-      - number: "Chat"
-        icon: ""
-        items:
-          - "Added a 7TV emote picker to chat. You’ll now see a new button next to Send that opens an emote selector."
-          - "Pin User, Remove User, and Ban User (including Syncshell) have been added when you right click a user in chat."
-          - "Chatters now show status icons/labels in the Syncshell (e.g., Owner, Moderator, and Pinned when applicable)."
-          - "The Rules page no longer blocks input for other open Lightless UI windows."
-      - number: "LightFinder"
-        icon: ""
-        items:
-          - "If the ImGui Lightfinder icons aren’t working correctly, you can switch back to the Nameplate signature hook. Important warning - USE AT YOUR OWN RISK: The native nameplate hook can crash the game if multiple plugins hook the nameplate function at the same time. We will not provide support about Nameplate crashes, nor will the Dalamud team, **DO NOT BOTHER THEM.**"
-          - "The LightFinder label in the menu has a counter next to it showing the number of broadcasting users."
-          - "There is less interference of hidden UI elements for the imGui renderer of LightFinder."
-      - number: "Miscellaneous fixes"
-        icon: ""
-        items:
-          - "Overhauled transient resources in an attempt to mitigate mount and minion problems."
-          - "Some file cache entries will now be cached to reduce load on your game."
-          - "Downloading and decompressing have been redone to fix the locking issues."
-          - "Disabling the context menu will now hide the context menu on right clicks again. (Thanks @infiniti)"
-          - "Temporary collections that were not cleared before will now be cleared when the plugin starts."
-          - "Pair requests will now appear in chat if notifications are not enabled or on chat mode."
-          - "Fixed an instance were an object may be null in the Download UI."
-          - "API 14 - Migrate to IPlayerState service"
-  - name: "v2.0.1"
-    tagline: "Some Fixes"
-    date: "December 23 2025"
-    versions:
-      - number: "Chat"
-        icon: ""
-        items:
-          - "You can turn off the syncshell chat as Owner by going to the Syncshell Admin panel -> Owner -> Enable/Disable Chat."
-          - "Fixed an issue where you can't chat due to regions being in a different language."
-      - number: "LightFinder"
-        icon: ""
-        items:
-          - "The icon/Lightfinder Text will be hidden when Game UI is hidden and behind game elements/UI"
-          - "Able to select an icon for the selected list or a custom glyph if you know the code."
-          - "Smoothing and reducing jitter on the icon/Lightfinder Text."
-          - "Fixed so higher scaled UI options (100/150/200% UI scale) wouldn't break the element."
-          - "Detects if GPose is active, wouldn't render the elements"
-      - number: "Miscellaneous fixes"
-        icon: ""
-        items:
-          - "Fixed the null error given on GetCID when transferring between zones/housing."
-          - "Added push/pop on certain ImGUI elements to remove them after being used. "
-          - "Having all tabs open in the Main UI wouldn't lag out the game anymore."
-          - "Cycle pause has been adjusted to the old function. There is a separate button to pause normally, now called 'Toggle (Un)Pause State'."
-          - "Changes have been made to the character redraw to address the issues with the building character data constantly being redrawn and the redrawn behavior with Honorific titles."
-          - "GPose characters should appear again in the actor screen"
-          - "Lightspeed download console messages are no longer shown as warnings."
-      - number: "Server Updates"
-        icon: ""
-        items:
-          - "Changes have been made to the disabling of your profile. It should save again."
-          - "Ability added to toggle chats from syncshell to be disabled."
-          - "Files are continuously being deleted due to high volumes in storage, potentially causing MCDOs to have missing files. We have increased the limit of the storage in our configurations to see if that helps."
   - name: "v2.0.0"
     tagline: "Thank you for 4 months!"
     date: "December 2025"
+    # be sure to set this every new version
+    isCurrent: true
     versions:
       - number: "Lightless Chat"
         icon: ""

LightlessSync/FileCache/FileCacheEntity.cs

@@ -1,23 +1,15 @@
 #nullable disable
 
-using System.Text.Json.Serialization;
-
 namespace LightlessSync.FileCache;
 
 public class FileCacheEntity
 {
-    [JsonConstructor]
-    public FileCacheEntity(
-        string hash,
-        string prefixedFilePath,
-        string lastModifiedDateTicks,
-        long? size = null,
-        long? compressedSize = null)
+    public FileCacheEntity(string hash, string path, string lastModifiedDateTicks, long? size = null, long? compressedSize = null)
     {
         Size = size;
         CompressedSize = compressedSize;
         Hash = hash;
-        PrefixedFilePath = prefixedFilePath;
+        PrefixedFilePath = path;
         LastModifiedDateTicks = lastModifiedDateTicks;
     }
 
@@ -31,5 +23,7 @@ public class FileCacheEntity
     public long? Size { get; set; }
 
     public void SetResolvedFilePath(string filePath)
-        => ResolvedFilepath = filePath.ToLowerInvariant().Replace("\\\\", "\\", StringComparison.Ordinal);
+    {
+        ResolvedFilepath = filePath.ToLowerInvariant().Replace("\\\\", "\\", StringComparison.Ordinal);
+    }
 }

LightlessSync/FileCache/FileCacheManager.cs

@@ -7,8 +7,6 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using System.Collections.Concurrent;
 using System.Globalization;
-using System.IO;
-using System.Runtime.InteropServices;
 using System.Text;
 
 namespace LightlessSync.FileCache;
@@ -27,21 +25,12 @@ public sealed class FileCacheManager : IHostedService
     private readonly ConcurrentDictionary<string, ConcurrentDictionary<string, FileCacheEntity>> _fileCaches = new(StringComparer.Ordinal);
     private readonly ConcurrentDictionary<string, FileCacheEntity> _fileCachesByPrefixedPath = new(StringComparer.OrdinalIgnoreCase);
     private readonly SemaphoreSlim _getCachesByPathsSemaphore = new(1, 1);
-    private readonly SemaphoreSlim _evictSemaphore = new(1, 1);
     private readonly Lock _fileWriteLock = new();
     private readonly IpcManager _ipcManager;
     private readonly ILogger<FileCacheManager> _logger;
     private bool _csvHeaderEnsured;
     public string CacheFolder => _configService.Current.CacheFolder;
 
-    private const string _compressedCacheExtension = ".llz4";
-    private readonly ConcurrentDictionary<string, SemaphoreSlim> _compressLocks = new(StringComparer.OrdinalIgnoreCase);
-    private readonly ConcurrentDictionary<string, SizeInfo> _sizeCache =
-        new(StringComparer.OrdinalIgnoreCase); 
-
-    [StructLayout(LayoutKind.Auto)]
-    public readonly record struct SizeInfo(long Original, long Compressed);
-
     public FileCacheManager(ILogger<FileCacheManager> logger, IpcManager ipcManager, LightlessConfigService configService, LightlessMediator lightlessMediator)
     {
         _logger = logger;
@@ -56,18 +45,6 @@ public sealed class FileCacheManager : IHostedService
     private static string NormalizeSeparators(string path) => path.Replace("/", "\\", StringComparison.Ordinal)
             .Replace("\\\\", "\\", StringComparison.Ordinal);
 
-    private SemaphoreSlim GetCompressLock(string hash)
-    => _compressLocks.GetOrAdd(hash, _ => new SemaphoreSlim(1, 1));
-
-    public void SetSizeInfo(string hash, long original, long compressed)
-        => _sizeCache[hash] = new SizeInfo(original, compressed);
-
-    public bool TryGetSizeInfo(string hash, out SizeInfo info)
-        => _sizeCache.TryGetValue(hash, out info);
-
-    private string GetCompressedCachePath(string hash)
-    => Path.Combine(CacheFolder, hash + _compressedCacheExtension);
-
     private static string NormalizePrefixedPathKey(string prefixedPath)
     {
         if (string.IsNullOrEmpty(prefixedPath))
@@ -134,124 +111,6 @@ public sealed class FileCacheManager : IHostedService
         return int.TryParse(versionSpan, NumberStyles.Integer, CultureInfo.InvariantCulture, out version);
     }
 
-    public void UpdateSizeInfo(string hash, long? original = null, long? compressed = null)
-    {
-        _sizeCache.AddOrUpdate(
-            hash,
-            _ => new SizeInfo(original ?? 0, compressed ?? 0),
-            (_, old) => new SizeInfo(original ?? old.Original, compressed ?? old.Compressed));
-    }
-
-    private void UpdateEntitiesSizes(string hash, long original, long compressed)
-    {
-        if (_fileCaches.TryGetValue(hash, out var dict))
-        {
-            foreach (var e in dict.Values)
-            {
-                e.Size = original;
-                e.CompressedSize = compressed;
-            }
-        }
-    }
-
-    public static void ApplySizesToEntries(IEnumerable<FileCacheEntity?> entries, long original, long compressed)
-    {
-        foreach (var e in entries)
-        {
-            if (e == null) continue;
-            e.Size = original;
-            e.CompressedSize = compressed > 0 ? compressed : null;
-        }
-    }
-
-    public async Task<long> GetCompressedSizeAsync(string hash, CancellationToken token)
-    {
-        if (_sizeCache.TryGetValue(hash, out var info) && info.Compressed > 0)
-            return info.Compressed;
-
-        if (_fileCaches.TryGetValue(hash, out var dict))
-        {
-            var any = dict.Values.FirstOrDefault();
-            if (any != null && any.CompressedSize > 0)
-            {
-                UpdateSizeInfo(hash, original: any.Size > 0 ? any.Size : null, compressed: any.CompressedSize);
-                return (long)any.CompressedSize;
-            }
-        }
-
-        if (!string.IsNullOrWhiteSpace(CacheFolder))
-        {
-            var path = GetCompressedCachePath(hash);
-            if (File.Exists(path))
-            {
-                var len = new FileInfo(path).Length;
-                UpdateSizeInfo(hash, compressed: len);
-                return len;
-            }
-
-            var bytes = await EnsureCompressedCacheBytesAsync(hash, token).ConfigureAwait(false);
-            return bytes.LongLength;
-        }
-
-        var fallback = await GetCompressedFileData(hash, token).ConfigureAwait(false);
-        return fallback.Item2.LongLength;
-    }
-
-    private async Task<byte[]> EnsureCompressedCacheBytesAsync(string hash, CancellationToken token)
-    {
-        if (string.IsNullOrWhiteSpace(CacheFolder))
-            throw new InvalidOperationException("CacheFolder is not set; cannot persist compressed cache.");
-
-        Directory.CreateDirectory(CacheFolder);
-
-        var compressedPath = GetCompressedCachePath(hash);
-
-        if (File.Exists(compressedPath))
-            return await File.ReadAllBytesAsync(compressedPath, token).ConfigureAwait(false);
-
-        var sem = GetCompressLock(hash);
-        await sem.WaitAsync(token).ConfigureAwait(false);
-        try
-        {
-            if (File.Exists(compressedPath))
-                return await File.ReadAllBytesAsync(compressedPath, token).ConfigureAwait(false);
-
-            var entity = GetFileCacheByHash(hash);
-            if (entity == null || string.IsNullOrWhiteSpace(entity.ResolvedFilepath))
-                throw new InvalidOperationException($"No local file cache found for hash {hash}.");
-
-            var sourcePath = entity.ResolvedFilepath;
-            var originalSize = new FileInfo(sourcePath).Length;
-
-            var raw = await File.ReadAllBytesAsync(sourcePath, token).ConfigureAwait(false);
-            var compressed = LZ4Wrapper.WrapHC(raw, 0, raw.Length);
-
-            var tmpPath = compressedPath + ".tmp";
-            try
-            {
-                await File.WriteAllBytesAsync(tmpPath, compressed, token).ConfigureAwait(false);
-                File.Move(tmpPath, compressedPath, overwrite: true);
-            }
-            finally
-            {
-                try { if (File.Exists(tmpPath)) File.Delete(tmpPath); } catch { /* ignore */ }
-            }
-
-            var compressedSize = new FileInfo(compressedPath).Length;
-            SetSizeInfo(hash, originalSize, compressedSize);
-            UpdateEntitiesSizes(hash, originalSize, compressedSize);
-
-            var maxBytes = GiBToBytes(_configService.Current.MaxLocalCacheInGiB);
-            await EnforceCacheLimitAsync(maxBytes, token).ConfigureAwait(false);
-
-            return compressed;
-        }
-        finally
-        {
-            sem.Release();
-        }
-    }
-
     private string NormalizeToPrefixedPath(string path)
     {
         if (string.IsNullOrEmpty(path)) return string.Empty;
@@ -291,26 +150,6 @@ public sealed class FileCacheManager : IHostedService
         return CreateFileEntity(cacheFolder, CachePrefix, fi);
     }
 
-    public FileCacheEntity? CreateCacheEntryWithKnownHash(string path, string hash)
-    {
-        if (string.IsNullOrWhiteSpace(hash))
-        {
-            return CreateCacheEntry(path);
-        }
-
-        FileInfo fi = new(path);
-        if (!fi.Exists) return null;
-        _logger.LogTrace("Creating cache entry for {path} using provided hash", path);
-        var cacheFolder = _configService.Current.CacheFolder;
-        if (string.IsNullOrEmpty(cacheFolder)) return null;
-        if (!TryBuildPrefixedPath(fi.FullName, cacheFolder, CachePrefix, out var prefixedPath, out _))
-        {
-            return null;
-        }
-
-        return CreateFileCacheEntity(fi, prefixedPath, hash);
-    }
-
     public FileCacheEntity? CreateFileEntry(string path)
     {
         FileInfo fi = new(path);
@@ -479,18 +318,9 @@ public sealed class FileCacheManager : IHostedService
 
     public async Task<(string, byte[])> GetCompressedFileData(string fileHash, CancellationToken uploadToken)
     {
-        if (!string.IsNullOrWhiteSpace(CacheFolder))
-        {
-            var bytes = await EnsureCompressedCacheBytesAsync(fileHash, uploadToken).ConfigureAwait(false);
-            UpdateSizeInfo(fileHash, compressed: bytes.LongLength);
-            return (fileHash, bytes);
-        }
-
         var fileCache = GetFileCacheByHash(fileHash)!.ResolvedFilepath;
-        var raw = await File.ReadAllBytesAsync(fileCache, uploadToken).ConfigureAwait(false);
-        var compressed = LZ4Wrapper.WrapHC(raw, 0, raw.Length);
-        UpdateSizeInfo(fileHash, original: raw.LongLength, compressed: compressed.LongLength);
-        return (fileHash, compressed);
+        return (fileHash, LZ4Wrapper.WrapHC(await File.ReadAllBytesAsync(fileCache, uploadToken).ConfigureAwait(false), 0,
+            (int)new FileInfo(fileCache).Length));
     }
 
     public FileCacheEntity? GetFileCacheByHash(string hash)
@@ -593,10 +423,9 @@ public sealed class FileCacheManager : IHostedService
         }
     }
 
-    public void RemoveHashedFile(string hash, string prefixedFilePath, bool removeDerivedFiles = true)
+    public void RemoveHashedFile(string hash, string prefixedFilePath)
     {
         var normalizedPath = NormalizePrefixedPathKey(prefixedFilePath);
-        var removedHash = false;
 
         if (_fileCaches.TryGetValue(hash, out var caches))
         {
@@ -609,16 +438,11 @@ public sealed class FileCacheManager : IHostedService
 
             if (caches.IsEmpty)
             {
-                removedHash = _fileCaches.TryRemove(hash, out _);
+                _fileCaches.TryRemove(hash, out _);
             }
         }
 
         _fileCachesByPrefixedPath.TryRemove(normalizedPath, out _);
-
-        if (removeDerivedFiles && removedHash)
-        {
-            RemoveDerivedCacheFiles(hash);
-        }
     }
 
     public void UpdateHashedFile(FileCacheEntity fileCache, bool computeProperties = true)
@@ -634,8 +458,7 @@ public sealed class FileCacheManager : IHostedService
             fileCache.Hash = Crypto.ComputeFileHash(fileCache.ResolvedFilepath, Crypto.HashAlgo.Sha1);
             fileCache.LastModifiedDateTicks = fi.LastWriteTimeUtc.Ticks.ToString(CultureInfo.InvariantCulture);
         }
-        var removeDerivedFiles = !string.Equals(oldHash, fileCache.Hash, StringComparison.OrdinalIgnoreCase);
-        RemoveHashedFile(oldHash, prefixedPath, removeDerivedFiles);
+        RemoveHashedFile(oldHash, prefixedPath);
         AddHashedFile(fileCache);
     }
 
@@ -785,7 +608,7 @@ public sealed class FileCacheManager : IHostedService
     {
         try
         {
-            RemoveHashedFile(fileCache.Hash, fileCache.PrefixedFilePath, removeDerivedFiles: false);
+            RemoveHashedFile(fileCache.Hash, fileCache.PrefixedFilePath);
             var extensionPath = fileCache.ResolvedFilepath.ToUpper(CultureInfo.InvariantCulture) + "." + ext;
             File.Move(fileCache.ResolvedFilepath, extensionPath, overwrite: true);
             var newHashedEntity = new FileCacheEntity(fileCache.Hash, fileCache.PrefixedFilePath + "." + ext, DateTime.UtcNow.Ticks.ToString(CultureInfo.InvariantCulture));
@@ -802,33 +625,6 @@ public sealed class FileCacheManager : IHostedService
         }
     }
 
-    private void RemoveDerivedCacheFiles(string hash)
-    {
-        var cacheFolder = _configService.Current.CacheFolder;
-        if (string.IsNullOrWhiteSpace(cacheFolder))
-        {
-            return;
-        }
-
-        TryDeleteDerivedCacheFile(Path.Combine(cacheFolder, "downscaled", $"{hash}.tex"));
-        TryDeleteDerivedCacheFile(Path.Combine(cacheFolder, "decimated", $"{hash}.mdl"));
-    }
-
-    private void TryDeleteDerivedCacheFile(string path)
-    {
-        try
-        {
-            if (File.Exists(path))
-            {
-                File.Delete(path);
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogTrace(ex, "Failed to delete derived cache file {path}", path);
-        }
-    }
-
     private void AddHashedFile(FileCacheEntity fileCache)
     {
         var normalizedPath = NormalizePrefixedPathKey(fileCache.PrefixedFilePath);
@@ -942,83 +738,6 @@ public sealed class FileCacheManager : IHostedService
         }, token).ConfigureAwait(false);
     }
 
-    private async Task EnforceCacheLimitAsync(long maxBytes, CancellationToken token)
-    {
-        if (string.IsNullOrWhiteSpace(CacheFolder) || maxBytes <= 0) return;
-
-        await _evictSemaphore.WaitAsync(token).ConfigureAwait(false);
-        try
-        {
-            Directory.CreateDirectory(CacheFolder);
-
-            foreach (var tmp in Directory.EnumerateFiles(CacheFolder, "*" + _compressedCacheExtension + ".tmp"))
-            {
-                try { File.Delete(tmp); } catch { /* ignore */ }
-            }
-
-            var files = Directory.EnumerateFiles(CacheFolder, "*" + _compressedCacheExtension, SearchOption.TopDirectoryOnly)
-                .Select(p => new FileInfo(p))
-                .Where(fi => fi.Exists)
-                .OrderBy(fi => fi.LastWriteTimeUtc)
-                .ToList();
-
-            long total = files.Sum(f => f.Length);
-            if (total <= maxBytes) return;
-
-            foreach (var fi in files)
-            {
-                token.ThrowIfCancellationRequested();
-                if (total <= maxBytes) break;
-
-                var hash = Path.GetFileNameWithoutExtension(fi.Name);
-
-                try
-                {
-                    var len = fi.Length;
-                    fi.Delete();
-                    total -= len;
-                    _sizeCache.TryRemove(hash, out _);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogWarning(ex, "Failed to evict cache file {file}", fi.FullName);
-                }
-            }
-        }
-        finally
-        {
-            _evictSemaphore.Release();
-        }
-    }
-
-    private static long GiBToBytes(double gib)
-    {
-        if (double.IsNaN(gib) || double.IsInfinity(gib) || gib <= 0)
-            return 0;
-
-        var bytes = gib * 1024d * 1024d * 1024d;
-
-        if (bytes >= long.MaxValue) return long.MaxValue;
-
-        return (long)Math.Round(bytes, MidpointRounding.AwayFromZero);
-    }
-
-    private void CleanupOrphanCompressedCache()
-    {
-        if (string.IsNullOrWhiteSpace(CacheFolder) || !Directory.Exists(CacheFolder))
-            return;
-
-        foreach (var path in Directory.EnumerateFiles(CacheFolder, "*" + _compressedCacheExtension))
-        {
-            var hash = Path.GetFileNameWithoutExtension(path);
-            if (!_fileCaches.ContainsKey(hash))
-            {
-                try { File.Delete(path); }
-                catch (Exception ex) { _logger.LogWarning(ex, "Failed deleting orphan {file}", path); }
-            }
-        }
-    }
-
     public async Task StartAsync(CancellationToken cancellationToken)
     {
         _logger.LogInformation("Starting FileCacheManager");
@@ -1172,14 +891,6 @@ public sealed class FileCacheManager : IHostedService
                                 compressed = resultCompressed;
                             }
                         }
-
-                        if (size > 0 || compressed > 0)
-                        {
-                            UpdateSizeInfo(hash,
-                                original: size > 0 ? size : null,
-                                compressed: compressed > 0 ? compressed : null);
-                        }
-
                         AddHashedFile(ReplacePathPrefixes(new FileCacheEntity(hash, path, time, size, compressed)));
                     }
                     catch (Exception ex)
@@ -1202,8 +913,6 @@ public sealed class FileCacheManager : IHostedService
             {
                 await WriteOutFullCsvAsync(cancellationToken).ConfigureAwait(false);
             }
-
-            CleanupOrphanCompressedCache();
         }
 
         _logger.LogInformation("Started FileCacheManager");

LightlessSync/FileCache/FileCompactor.cs

@@ -213,7 +213,7 @@ public sealed partial class FileCompactor : IDisposable
     /// <param name="bytes">Bytes that have to be written</param>
     /// <param name="token">Cancellation Token for interupts</param>
     /// <returns>Writing Task</returns>
-    public async Task WriteAllBytesAsync(string filePath, byte[] bytes, CancellationToken token, bool enqueueCompaction = true)
+    public async Task WriteAllBytesAsync(string filePath, byte[] bytes, CancellationToken token)
     {
         var dir = Path.GetDirectoryName(filePath);
         if (!string.IsNullOrEmpty(dir) && !Directory.Exists(dir))
@@ -221,12 +221,6 @@ public sealed partial class FileCompactor : IDisposable
 
         await File.WriteAllBytesAsync(filePath, bytes, token).ConfigureAwait(false);
 
-        if (enqueueCompaction && _lightlessConfigService.Current.UseCompactor)
-            EnqueueCompaction(filePath);
-    }
-
-    public void RequestCompaction(string filePath)
-    {
         if (_lightlessConfigService.Current.UseCompactor)
             EnqueueCompaction(filePath);
     }

LightlessSync/FileCache/TransientResourceManager.cs

@@ -10,6 +10,9 @@ using LightlessSync.Services.Mediator;
 using LightlessSync.Utils;
 using Microsoft.Extensions.Logging;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Linq;
 using DalamudObjectKind = Dalamud.Game.ClientState.Objects.Enums.ObjectKind;
 
 namespace LightlessSync.FileCache;
@@ -25,10 +28,7 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
     private readonly object _ownedHandlerLock = new();
     private readonly string[] _handledFileTypes = ["tmb", "pap", "avfx", "atex", "sklb", "eid", "phyb", "scd", "skp", "shpk", "kdb"];
     private readonly string[] _handledRecordingFileTypes = ["tex", "mdl", "mtrl"];
-    private readonly string[] _handledFileTypesWithRecording;
     private readonly HashSet<GameObjectHandler> _playerRelatedPointers = [];
-    private readonly object _playerRelatedLock = new();
-    private readonly ConcurrentDictionary<nint, GameObjectHandler> _playerRelatedByAddress = new();
     private readonly Dictionary<nint, GameObjectHandler> _ownedHandlers = new();
     private ConcurrentDictionary<nint, ObjectKind> _cachedFrameAddresses = new();
     private ConcurrentDictionary<ObjectKind, HashSet<string>>? _semiTransientResources = null;
@@ -42,7 +42,6 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
         _dalamudUtil = dalamudUtil;
         _actorObjectService = actorObjectService;
         _gameObjectHandlerFactory = gameObjectHandlerFactory;
-        _handledFileTypesWithRecording = _handledRecordingFileTypes.Concat(_handledFileTypes).ToArray();
 
         Mediator.Subscribe<PenumbraResourceLoadMessage>(this, Manager_PenumbraResourceLoadEvent);
         Mediator.Subscribe<ActorTrackedMessage>(this, msg => HandleActorTracked(msg.Descriptor));
@@ -52,21 +51,15 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
         Mediator.Subscribe<GameObjectHandlerCreatedMessage>(this, (msg) =>
         {
             if (!msg.OwnedObject) return;
-            lock (_playerRelatedLock)
-            {
-                _playerRelatedPointers.Add(msg.GameObjectHandler);
-            }
+            _playerRelatedPointers.Add(msg.GameObjectHandler);
         });
         Mediator.Subscribe<GameObjectHandlerDestroyedMessage>(this, (msg) =>
         {
             if (!msg.OwnedObject) return;
-            lock (_playerRelatedLock)
-            {
-                _playerRelatedPointers.Remove(msg.GameObjectHandler);
-            }
+            _playerRelatedPointers.Remove(msg.GameObjectHandler);
         });
 
-        foreach (var descriptor in _actorObjectService.ObjectDescriptors)
+        foreach (var descriptor in _actorObjectService.PlayerDescriptors)
         {
             HandleActorTracked(descriptor);
         }
@@ -85,7 +78,7 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
         }
     }
 
-    private string PlayerPersistentDataKey => _dalamudUtil.GetPlayerName() + "_" + _dalamudUtil.GetHomeWorldId();
+    private string PlayerPersistentDataKey => _dalamudUtil.GetPlayerNameAsync().GetAwaiter().GetResult() + "_" + _dalamudUtil.GetHomeWorldIdAsync().GetAwaiter().GetResult();
     private ConcurrentDictionary<ObjectKind, HashSet<string>> SemiTransientResources
     {
         get
@@ -94,12 +87,9 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
             {
                 _semiTransientResources = new();
                 PlayerConfig.JobSpecificCache.TryGetValue(_dalamudUtil.ClassJobId, out var jobSpecificData);
-                _semiTransientResources[ObjectKind.Player] = PlayerConfig.GlobalPersistentCache.Concat(jobSpecificData ?? [])
-                    .ToHashSet(StringComparer.OrdinalIgnoreCase);
+                _semiTransientResources[ObjectKind.Player] = PlayerConfig.GlobalPersistentCache.Concat(jobSpecificData ?? []).ToHashSet(StringComparer.Ordinal);
                 PlayerConfig.JobSpecificPetCache.TryGetValue(_dalamudUtil.ClassJobId, out var petSpecificData);
-                _semiTransientResources[ObjectKind.Pet] = new HashSet<string>(
-                    petSpecificData ?? [],
-                    StringComparer.OrdinalIgnoreCase);
+                _semiTransientResources[ObjectKind.Pet] = [.. petSpecificData ?? []];
             }
 
             return _semiTransientResources;
@@ -137,14 +127,14 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
     {
         SemiTransientResources.TryGetValue(objectKind, out var result);
 
-        return result ?? new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        return result ?? new HashSet<string>(StringComparer.Ordinal);
     }
 
     public void PersistTransientResources(ObjectKind objectKind)
     {
         if (!SemiTransientResources.TryGetValue(objectKind, out HashSet<string>? semiTransientResources))
         {
-            SemiTransientResources[objectKind] = semiTransientResources = new(StringComparer.OrdinalIgnoreCase);
+            SemiTransientResources[objectKind] = semiTransientResources = new(StringComparer.Ordinal);
         }
 
         if (!TransientResources.TryGetValue(objectKind, out var resources))
@@ -162,7 +152,7 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
         List<string> newlyAddedGamePaths;
         lock (semiTransientResources)
         {
-            newlyAddedGamePaths = transientResources.Except(semiTransientResources, StringComparer.OrdinalIgnoreCase).ToList();
+            newlyAddedGamePaths = transientResources.Except(semiTransientResources, StringComparer.Ordinal).ToList();
             foreach (var gamePath in transientResources)
             {
                 semiTransientResources.Add(gamePath);
@@ -207,13 +197,12 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
 
     public void RemoveTransientResource(ObjectKind objectKind, string path)
     {
-        var normalizedPath = NormalizeGamePath(path);
         if (SemiTransientResources.TryGetValue(objectKind, out var resources))
         {
-            resources.Remove(normalizedPath);
+            resources.RemoveWhere(f => string.Equals(path, f, StringComparison.Ordinal));
             if (objectKind == ObjectKind.Player)
             {
-                PlayerConfig.RemovePath(normalizedPath, objectKind);
+                PlayerConfig.RemovePath(path, objectKind);
                 Logger.LogTrace("Saving transient.json from {method}", nameof(RemoveTransientResource));
                 _configurationService.Save();
             }
@@ -222,17 +211,16 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
 
     internal bool AddTransientResource(ObjectKind objectKind, string item)
     {
-        var normalizedItem = NormalizeGamePath(item);
-        if (SemiTransientResources.TryGetValue(objectKind, out var semiTransient) && semiTransient != null && semiTransient.Contains(normalizedItem))
+        if (SemiTransientResources.TryGetValue(objectKind, out var semiTransient) && semiTransient != null && semiTransient.Contains(item))
             return false;
 
         if (!TransientResources.TryGetValue(objectKind, out HashSet<string>? transientResource))
         {
-            transientResource = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            transientResource = new HashSet<string>(StringComparer.Ordinal);
             TransientResources[objectKind] = transientResource;
         }
 
-        return transientResource.Add(normalizedItem);
+        return transientResource.Add(item.ToLowerInvariant());
     }
 
     internal void ClearTransientPaths(ObjectKind objectKind, List<string> list)
@@ -297,73 +285,47 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
 
     private void DalamudUtil_FrameworkUpdate()
     {
-        _ = Task.Run(() => RefreshPlayerRelatedAddressMap());
-
         lock (_cacheAdditionLock)
         {
             _cachedHandledPaths.Clear();
         }
 
-        if (_lastClassJobId != _dalamudUtil.ClassJobId)
+        var activeDescriptors = new Dictionary<nint, ObjectKind>();
+        foreach (var descriptor in _actorObjectService.PlayerDescriptors)
         {
-            UpdateClassJobCache();
-        }
-
-        CleanupAbsentObjects();
-    }
-
-    private void RefreshPlayerRelatedAddressMap()
-    {
-        var tempMap = new ConcurrentDictionary<nint, GameObjectHandler>();
-        var updatedFrameAddresses = new ConcurrentDictionary<nint, ObjectKind>();
-
-        lock (_playerRelatedLock)
-        {
-            foreach (var handler in _playerRelatedPointers)
+            if (TryResolveObjectKind(descriptor, out var resolvedKind))
             {
-                var address =   handler.Address;
-                if (address != nint.Zero)
-                {
-                    tempMap[address] = handler;
-                    updatedFrameAddresses[address] = handler.ObjectKind;
-                }
+                activeDescriptors[descriptor.Address] = resolvedKind;
             }
         }
 
-        _playerRelatedByAddress.Clear();
-        foreach (var kvp in tempMap)
+        foreach (var address in _cachedFrameAddresses.Keys.ToList())
         {
-            _playerRelatedByAddress[kvp.Key] = kvp.Value;
+            if (!activeDescriptors.ContainsKey(address))
+            {
+                _cachedFrameAddresses.TryRemove(address, out _);
+            }
         }
 
-        _cachedFrameAddresses.Clear();
-        foreach (var kvp in updatedFrameAddresses)
+        foreach (var descriptor in activeDescriptors)
         {
-            _cachedFrameAddresses[kvp.Key] = kvp.Value;
-        }
-    }
-
-    private void UpdateClassJobCache()
-    {
-        _lastClassJobId = _dalamudUtil.ClassJobId;
-        if (SemiTransientResources.TryGetValue(ObjectKind.Pet, out HashSet<string>? value))
-        {
-            value?.Clear();
+            _cachedFrameAddresses[descriptor.Key] = descriptor.Value;
         }
 
-        PlayerConfig.JobSpecificCache.TryGetValue(_dalamudUtil.ClassJobId, out var jobSpecificData);
-        SemiTransientResources[ObjectKind.Player] = PlayerConfig.GlobalPersistentCache
-            .Concat(jobSpecificData ?? [])
-            .ToHashSet(StringComparer.OrdinalIgnoreCase);
+        if (_lastClassJobId != _dalamudUtil.ClassJobId)
+        {
+            _lastClassJobId = _dalamudUtil.ClassJobId;
+            if (SemiTransientResources.TryGetValue(ObjectKind.Pet, out HashSet<string>? value))
+            {
+                value?.Clear();
+            }
 
-        PlayerConfig.JobSpecificPetCache.TryGetValue(_dalamudUtil.ClassJobId, out var petSpecificData);
-        SemiTransientResources[ObjectKind.Pet] = new HashSet<string>(
-            petSpecificData ?? [],
-            StringComparer.OrdinalIgnoreCase);
-    }
+            PlayerConfig.JobSpecificCache.TryGetValue(_dalamudUtil.ClassJobId, out var jobSpecificData);
+            SemiTransientResources[ObjectKind.Player] = PlayerConfig.GlobalPersistentCache.Concat(jobSpecificData ?? []).ToHashSet(StringComparer.OrdinalIgnoreCase);
+            PlayerConfig.JobSpecificPetCache.TryGetValue(_dalamudUtil.ClassJobId, out var petSpecificData);
+            SemiTransientResources[ObjectKind.Pet] = [.. petSpecificData ?? []];
+        }
 
-    private void CleanupAbsentObjects()
-    {
         foreach (var kind in Enum.GetValues(typeof(ObjectKind)).Cast<ObjectKind>())
         {
             if (!_cachedFrameAddresses.Any(k => k.Value == kind) && TransientResources.Remove(kind, out _))
@@ -378,12 +340,9 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
         _ = Task.Run(() =>
         {
             Logger.LogDebug("Penumbra Mod Settings changed, verifying SemiTransientResources");
-            lock (_playerRelatedLock)
+            foreach (var item in _playerRelatedPointers)
             {
-                foreach (var item in _playerRelatedPointers)
-                {
-                    Mediator.Publish(new TransientResourceChangedMessage(item.Address));
-                }
+                Mediator.Publish(new TransientResourceChangedMessage(item.Address));
             }
         });
     }
@@ -393,20 +352,38 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
         _semiTransientResources = null;
     }
 
+    private static bool TryResolveObjectKind(ActorObjectService.ActorDescriptor descriptor, out ObjectKind resolvedKind)
+    {
+        if (descriptor.OwnedKind is ObjectKind ownedKind)
+        {
+            resolvedKind = ownedKind;
+            return true;
+        }
+
+        if (descriptor.ObjectKind == DalamudObjectKind.Player)
+        {
+            resolvedKind = ObjectKind.Player;
+            return true;
+        }
+
+        resolvedKind = default;
+        return false;
+    }
+
     private void HandleActorTracked(ActorObjectService.ActorDescriptor descriptor)
     {
-        if (descriptor.IsInGpose)
-            return;
-
-        if (descriptor.OwnedKind is not ObjectKind ownedKind)
+        if (!TryResolveObjectKind(descriptor, out var resolvedKind))
             return;
 
         if (Logger.IsEnabled(LogLevel.Debug))
         {
-            Logger.LogDebug("ActorObject tracked: {kind} addr={address:X} name={name}", ownedKind, descriptor.Address, descriptor.Name);
+            Logger.LogDebug("ActorObject tracked: {kind} addr={address:X} name={name}", resolvedKind, descriptor.Address, descriptor.Name);
         }
 
-        _cachedFrameAddresses[descriptor.Address] = ownedKind;
+        _cachedFrameAddresses[descriptor.Address] = resolvedKind;
+
+        if (descriptor.OwnedKind is not ObjectKind ownedKind)
+            return;
 
         lock (_ownedHandlerLock)
         {
@@ -485,84 +462,53 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
         }
     }
 
-    private static string NormalizeGamePath(string path)
-    {
-        if (string.IsNullOrEmpty(path))
-            return string.Empty;
-
-        return path.Replace("\\", "/", StringComparison.Ordinal).ToLowerInvariant();
-    }
-
-    private static string NormalizeFilePath(string path)
-    {
-        if (string.IsNullOrEmpty(path))
-            return string.Empty;
-
-        if (path.StartsWith("|", StringComparison.Ordinal))
-        {
-            var lastPipe = path.LastIndexOf('|');
-            if (lastPipe >= 0 && lastPipe + 1 < path.Length)
-            {
-                path = path[(lastPipe + 1)..];
-            }
-        }
-
-        return NormalizeGamePath(path);
-    }
-
-    private static bool HasHandledFileType(string gamePath, string[] handledTypes)
-    {
-        for (var i = 0; i < handledTypes.Length; i++)
-        {
-            if (gamePath.EndsWith(handledTypes[i], StringComparison.Ordinal))
-                return true;
-        }
-
-        return false;
-    }
-
     private void Manager_PenumbraResourceLoadEvent(PenumbraResourceLoadMessage msg)
     {
+        var gamePath = msg.GamePath.ToLowerInvariant();
         var gameObjectAddress = msg.GameObject;
-        if (!_cachedFrameAddresses.TryGetValue(gameObjectAddress, out var objectKind))
-        {
-            if (_actorObjectService.TryGetOwnedKind(gameObjectAddress, out var ownedKind))
-            {
-                objectKind = ownedKind;
-            }
-            else
-            {
-                return;
-            }
-        }
-
-        var gamePath = NormalizeGamePath(msg.GamePath);
-        if (string.IsNullOrEmpty(gamePath))
-        {
-            return;
-        }
+        var filePath = msg.FilePath;
 
         // ignore files already processed this frame
+        if (_cachedHandledPaths.Contains(gamePath)) return;
+
         lock (_cacheAdditionLock)
         {
-            if (!_cachedHandledPaths.Add(gamePath))
-            {
-                return;
-            }
+            _cachedHandledPaths.Add(gamePath);
+        }
+
+        // replace individual mtrl stuff
+        if (filePath.StartsWith("|", StringComparison.OrdinalIgnoreCase))
+        {
+            filePath = filePath.Split("|")[2];
+        }
+        // replace filepath
+        filePath = filePath.ToLowerInvariant().Replace("\\", "/", StringComparison.OrdinalIgnoreCase);
+
+        // ignore files that are the same
+        var replacedGamePath = gamePath.ToLowerInvariant().Replace("\\", "/", StringComparison.OrdinalIgnoreCase);
+        if (string.Equals(filePath, replacedGamePath, StringComparison.OrdinalIgnoreCase))
+        {
+            return;
         }
 
         // ignore files to not handle
-        var handledTypes = IsTransientRecording ? _handledFileTypesWithRecording : _handledFileTypes;
-        if (!HasHandledFileType(gamePath, handledTypes))
+        var handledTypes = IsTransientRecording ? _handledRecordingFileTypes.Concat(_handledFileTypes) : _handledFileTypes;
+        if (!handledTypes.Any(type => gamePath.EndsWith(type, StringComparison.OrdinalIgnoreCase)))
         {
+            lock (_cacheAdditionLock)
+            {
+                _cachedHandledPaths.Add(gamePath);
+            }
             return;
         }
 
-        var filePath = NormalizeFilePath(msg.FilePath);
-
-        // ignore files that are the same
-        if (string.Equals(filePath, gamePath, StringComparison.Ordinal))
+        // ignore files not belonging to anything player related
+        if (!_cachedFrameAddresses.TryGetValue(gameObjectAddress, out var objectKind))
         {
+            lock (_cacheAdditionLock)
+            {
+                _cachedHandledPaths.Add(gamePath);
+            }
             return;
         }
 
@@ -574,15 +520,15 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
             TransientResources[objectKind] = transientResources;
         }
 
-        _playerRelatedByAddress.TryGetValue(gameObjectAddress, out var owner);
+        var owner = _playerRelatedPointers.FirstOrDefault(f => f.Address == gameObjectAddress);
         bool alreadyTransient = false;
 
-        bool transientContains = transientResources.Contains(gamePath);
-        bool semiTransientContains = SemiTransientResources.Values.Any(value => value.Contains(gamePath));
+        bool transientContains = transientResources.Contains(replacedGamePath);
+        bool semiTransientContains = SemiTransientResources.SelectMany(k => k.Value).Any(f => string.Equals(f, gamePath, StringComparison.OrdinalIgnoreCase));
         if (transientContains || semiTransientContains)
         {
             if (!IsTransientRecording)
-                Logger.LogTrace("Not adding {replacedPath} => {filePath}, Reason: Transient: {contains}, SemiTransient: {contains2}", gamePath, filePath,
+                Logger.LogTrace("Not adding {replacedPath} => {filePath}, Reason: Transient: {contains}, SemiTransient: {contains2}", replacedGamePath, filePath,
                     transientContains, semiTransientContains);
             alreadyTransient = true;
         }
@@ -590,10 +536,10 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
         {
             if (!IsTransientRecording)
             {
-                bool isAdded = transientResources.Add(gamePath);
+                bool isAdded = transientResources.Add(replacedGamePath);
                 if (isAdded)
                 {
-                    Logger.LogDebug("Adding {replacedGamePath} for {gameObject} ({filePath})", gamePath, owner?.ToString() ?? gameObjectAddress.ToString("X"), filePath);
+                    Logger.LogDebug("Adding {replacedGamePath} for {gameObject} ({filePath})", replacedGamePath, owner?.ToString() ?? gameObjectAddress.ToString("X"), filePath);
                     SendTransients(gameObjectAddress, objectKind);
                 }
             }
@@ -601,7 +547,7 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
 
         if (owner != null && IsTransientRecording)
         {
-            _recordedTransients.Add(new TransientRecord(owner, gamePath, filePath, alreadyTransient) { AddTransient = !alreadyTransient });
+            _recordedTransients.Add(new TransientRecord(owner, replacedGamePath, filePath, alreadyTransient) { AddTransient = !alreadyTransient });
         }
     }
 
@@ -673,7 +619,7 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
             if (!item.AddTransient || item.AlreadyTransient) continue;
             if (!TransientResources.TryGetValue(item.Owner.ObjectKind, out var transient))
             {
-                TransientResources[item.Owner.ObjectKind] = transient = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+                TransientResources[item.Owner.ObjectKind] = transient = [];
             }
 
             Logger.LogTrace("Adding recorded: {gamePath} => {filePath}", item.GamePath, item.FilePath);

LightlessSync/Interop/BlockedCharacterHandler.cs

@@ -1,5 +1,4 @@
 using Dalamud.Plugin.Services;
-using Dalamud.Game.ClientState.Objects.SubKinds;
 using FFXIVClientStructs.FFXIV.Client.Game.Character;
 using FFXIVClientStructs.FFXIV.Client.UI.Info;
 using Microsoft.Extensions.Logging;
@@ -12,35 +11,24 @@ public unsafe class BlockedCharacterHandler
     private readonly Dictionary<CharaData, bool> _blockedCharacterCache = new();
 
     private readonly ILogger<BlockedCharacterHandler> _logger;
-    private readonly IObjectTable _objectTable;
 
-    public BlockedCharacterHandler(ILogger<BlockedCharacterHandler> logger, IGameInteropProvider gameInteropProvider, IObjectTable objectTable)
+    public BlockedCharacterHandler(ILogger<BlockedCharacterHandler> logger, IGameInteropProvider gameInteropProvider)
     {
         gameInteropProvider.InitializeFromAttributes(this);
         _logger = logger;
-        _objectTable = objectTable;
     }
 
-    private CharaData? TryGetIdsFromPlayerPointer(nint ptr, ushort objectIndex)
+    private static CharaData GetIdsFromPlayerPointer(nint ptr)
     {
-        if (ptr == nint.Zero || objectIndex >= 200)
-            return null;
-
-        var obj = _objectTable[objectIndex];
-        if (obj is not IPlayerCharacter player || player.Address != ptr)
-            return null;
-
-        var castChar = (BattleChara*)player.Address;
+        if (ptr == nint.Zero) return new(0, 0);
+        var castChar = ((BattleChara*)ptr);
         return new(castChar->Character.AccountId, castChar->Character.ContentId);
     }
 
-    public bool IsCharacterBlocked(nint ptr, ushort objectIndex, out bool firstTime)
+    public bool IsCharacterBlocked(nint ptr, out bool firstTime)
     {
         firstTime = false;
-        var combined = TryGetIdsFromPlayerPointer(ptr, objectIndex);
-        if (combined == null)
-            return false;
-
+        var combined = GetIdsFromPlayerPointer(ptr);
         if (_blockedCharacterCache.TryGetValue(combined, out var isBlocked))
             return isBlocked;
 

LightlessSync/Interop/InteropModel/Enums/ResidentialAetheryteKind.cs

@@ -1,11 +0,0 @@
-namespace Lifestream.Enums;
-
-public enum ResidentialAetheryteKind
-{
-    None = -1,
-    Uldah = 9,
-    Gridania = 2,
-    Limsa = 8,
-    Foundation = 70,
-    Kugane = 111,
-}

LightlessSync/Interop/InteropModel/GlobalModels.cs

@@ -1 +0,0 @@
-global using AddressBookEntryTuple = (string Name, int World, int City, int Ward, int PropertyType, int Plot, int Apartment, bool ApartmentSubdivision, bool AliasEnabled, string Alias);

LightlessSync/Interop/Ipc/IpcCallerBrio.cs

@@ -13,7 +13,7 @@ namespace LightlessSync.Interop.Ipc;
 
 public sealed class IpcCallerBrio : IpcServiceBase
 {
-    private static readonly IpcServiceDescriptor BrioDescriptor = new("Brio", "Brio", new Version(0, 0, 0, 0));
+    private static readonly IpcServiceDescriptor BrioDescriptor = new("Brio", "Brio", new Version(3, 0, 0, 0));
 
     private readonly ILogger<IpcCallerBrio> _logger;
     private readonly DalamudUtilService _dalamudUtilService;
@@ -144,7 +144,7 @@ public sealed class IpcCallerBrio : IpcServiceBase
         try
         {
             var version = _apiVersion.Invoke();
-            return version.Breaking == 3 && version.Feature >= 0
+            return version.Item1 == 3 && version.Item2 >= 0
                 ? IpcConnectionState.Available
                 : IpcConnectionState.VersionMismatch;
         }

LightlessSync/Interop/Ipc/IpcCallerLifestream.cs

@@ -1,129 +0,0 @@
-using Dalamud.Plugin;
-using Dalamud.Plugin.Ipc;
-using Lifestream.Enums;
-using LightlessSync.Interop.Ipc.Framework;
-using LightlessSync.Services.Mediator;
-using Microsoft.Extensions.Logging;
-
-
-namespace LightlessSync.Interop.Ipc;
-
-public sealed class IpcCallerLifestream : IpcServiceBase
-{
-    private static readonly IpcServiceDescriptor LifestreamDescriptor = new("Lifestream", "Lifestream", new Version(0, 0, 0, 0));
-
-    private readonly ICallGateSubscriber<string, object> _executeLifestreamCommand;
-    private readonly ICallGateSubscriber<AddressBookEntryTuple, bool> _isHere;
-    private readonly ICallGateSubscriber<AddressBookEntryTuple, object> _goToHousingAddress;
-    private readonly ICallGateSubscriber<bool> _isBusy;
-    private readonly ICallGateSubscriber<object> _abort;
-    private readonly ICallGateSubscriber<string, bool> _changeWorld;
-    private readonly ICallGateSubscriber<uint, bool> _changeWorldById;
-    private readonly ICallGateSubscriber<string, bool> _aetheryteTeleport;
-    private readonly ICallGateSubscriber<uint, bool> _aetheryteTeleportById;
-    private readonly ICallGateSubscriber<bool> _canChangeInstance;
-    private readonly ICallGateSubscriber<int> _getCurrentInstance;
-    private readonly ICallGateSubscriber<int> _getNumberOfInstances;
-    private readonly ICallGateSubscriber<int, object> _changeInstance;
-    private readonly ICallGateSubscriber<(ResidentialAetheryteKind, int, int)> _getCurrentPlotInfo;
-
-    public IpcCallerLifestream(IDalamudPluginInterface pi, LightlessMediator lightlessMediator, ILogger<IpcCallerLifestream> logger)
-        : base(logger, lightlessMediator, pi, LifestreamDescriptor)
-    {
-        _executeLifestreamCommand = pi.GetIpcSubscriber<string, object>("Lifestream.ExecuteCommand");
-        _isHere = pi.GetIpcSubscriber<AddressBookEntryTuple, bool>("Lifestream.IsHere");
-        _goToHousingAddress = pi.GetIpcSubscriber<AddressBookEntryTuple, object>("Lifestream.GoToHousingAddress");
-        _isBusy = pi.GetIpcSubscriber<bool>("Lifestream.IsBusy");
-        _abort = pi.GetIpcSubscriber<object>("Lifestream.Abort");
-        _changeWorld = pi.GetIpcSubscriber<string, bool>("Lifestream.ChangeWorld");
-        _changeWorldById = pi.GetIpcSubscriber<uint, bool>("Lifestream.ChangeWorldById");
-        _aetheryteTeleport = pi.GetIpcSubscriber<string, bool>("Lifestream.AetheryteTeleport");
-        _aetheryteTeleportById = pi.GetIpcSubscriber<uint, bool>("Lifestream.AetheryteTeleportById");
-        _canChangeInstance = pi.GetIpcSubscriber<bool>("Lifestream.CanChangeInstance");
-        _getCurrentInstance = pi.GetIpcSubscriber<int>("Lifestream.GetCurrentInstance");
-        _getNumberOfInstances = pi.GetIpcSubscriber<int>("Lifestream.GetNumberOfInstances");
-        _changeInstance = pi.GetIpcSubscriber<int, object>("Lifestream.ChangeInstance");
-        _getCurrentPlotInfo = pi.GetIpcSubscriber<(ResidentialAetheryteKind, int, int)>("Lifestream.GetCurrentPlotInfo");
-        CheckAPI();
-    }
-
-    public void ExecuteLifestreamCommand(string command)
-    {
-        if (!APIAvailable) return;
-        _executeLifestreamCommand.InvokeAction(command);
-    }
-
-    public bool IsHere(AddressBookEntryTuple entry)
-    {
-        if (!APIAvailable) return false;
-        return _isHere.InvokeFunc(entry);
-    }
-
-    public void GoToHousingAddress(AddressBookEntryTuple entry)
-    {
-        if (!APIAvailable) return;
-        _goToHousingAddress.InvokeAction(entry);
-    }
-
-    public bool IsBusy()
-    {
-        if (!APIAvailable) return false;
-        return _isBusy.InvokeFunc();
-    }
-
-    public void Abort()
-    {
-        if (!APIAvailable) return;
-        _abort.InvokeAction();
-    }
-
-    public bool ChangeWorld(string worldName)
-    {
-        if (!APIAvailable) return false;
-        return _changeWorld.InvokeFunc(worldName);
-    }
-
-    public bool AetheryteTeleport(string aetheryteName)
-    {
-        if (!APIAvailable) return false;
-        return _aetheryteTeleport.InvokeFunc(aetheryteName);
-    }
-
-    public bool ChangeWorldById(uint worldId)
-    {
-        if (!APIAvailable) return false;
-        return _changeWorldById.InvokeFunc(worldId);
-    }
-
-    public bool AetheryteTeleportById(uint aetheryteId)
-    {
-        if (!APIAvailable) return false;
-        return _aetheryteTeleportById.InvokeFunc(aetheryteId);
-    }
-
-    public bool CanChangeInstance()
-    {
-        if (!APIAvailable) return false;
-        return _canChangeInstance.InvokeFunc();
-    }
-    public int GetCurrentInstance()
-    {
-        if (!APIAvailable) return -1;
-        return _getCurrentInstance.InvokeFunc();
-    }
-    public int GetNumberOfInstances()
-    {
-        if (!APIAvailable) return -1;
-        return _getNumberOfInstances.InvokeFunc();
-    }
-    public void ChangeInstance(int instanceNumber)
-    {
-        if (!APIAvailable) return;
-        _changeInstance.InvokeAction(instanceNumber);
-    }
-    public (ResidentialAetheryteKind, int, int)? GetCurrentPlotInfo()
-    {
-        if (!APIAvailable) return (ResidentialAetheryteKind.None, -1, -1);
-        return _getCurrentPlotInfo.InvokeFunc();
-    }
-}

LightlessSync/Interop/Ipc/IpcCallerMoodles.cs

@@ -1,4 +1,5 @@
-using Dalamud.Plugin;
+using Dalamud.Game.ClientState.Objects.SubKinds;
+using Dalamud.Plugin;
 using Dalamud.Plugin.Ipc;
 using LightlessSync.Interop.Ipc.Framework;
 using LightlessSync.Services;
@@ -12,7 +13,7 @@ public sealed class IpcCallerMoodles : IpcServiceBase
     private static readonly IpcServiceDescriptor MoodlesDescriptor = new("Moodles", "Moodles", new Version(0, 0, 0, 0));
 
     private readonly ICallGateSubscriber<int> _moodlesApiVersion;
-    private readonly ICallGateSubscriber<nint, object> _moodlesOnChange;
+    private readonly ICallGateSubscriber<IPlayerCharacter, object> _moodlesOnChange;
     private readonly ICallGateSubscriber<nint, string> _moodlesGetStatus;
     private readonly ICallGateSubscriber<nint, string, object> _moodlesSetStatus;
     private readonly ICallGateSubscriber<nint, object> _moodlesRevertStatus;
@@ -28,7 +29,7 @@ public sealed class IpcCallerMoodles : IpcServiceBase
         _lightlessMediator = lightlessMediator;
 
         _moodlesApiVersion = pi.GetIpcSubscriber<int>("Moodles.Version");
-        _moodlesOnChange = pi.GetIpcSubscriber<nint, object>("Moodles.StatusManagerModified");
+        _moodlesOnChange = pi.GetIpcSubscriber<IPlayerCharacter, object>("Moodles.StatusManagerModified");
         _moodlesGetStatus = pi.GetIpcSubscriber<nint, string>("Moodles.GetStatusManagerByPtrV2");
         _moodlesSetStatus = pi.GetIpcSubscriber<nint, string, object>("Moodles.SetStatusManagerByPtrV2");
         _moodlesRevertStatus = pi.GetIpcSubscriber<nint, object>("Moodles.ClearStatusManagerByPtrV2");
@@ -38,9 +39,9 @@ public sealed class IpcCallerMoodles : IpcServiceBase
         CheckAPI();
     }
 
-    private void OnMoodlesChange(nint address)
+    private void OnMoodlesChange(IPlayerCharacter character)
     {
-        _lightlessMediator.Publish(new MoodlesMessage(address));
+        _lightlessMediator.Publish(new MoodlesMessage(character.Address));
     }
 
     protected override void Dispose(bool disposing)
@@ -106,7 +107,7 @@ public sealed class IpcCallerMoodles : IpcServiceBase
 
         try
         {
-            return _moodlesApiVersion.InvokeFunc() >= 4
+            return _moodlesApiVersion.InvokeFunc() == 3
                 ? IpcConnectionState.Available
                 : IpcConnectionState.VersionMismatch;
         }

LightlessSync/Interop/Ipc/IpcCallerPenumbra.cs

@@ -81,10 +81,7 @@ public sealed class IpcCallerPenumbra : IpcServiceBase
         => _collections.RemoveTemporaryCollectionAsync(logger, applicationId, collectionId);
 
     public Task SetTemporaryModsAsync(ILogger logger, Guid applicationId, Guid collectionId, Dictionary<string, string> modPaths)
-    => _collections.SetTemporaryModsAsync(logger, applicationId, collectionId, modPaths, "Player");
-
-    public Task SetTemporaryModsAsync(ILogger logger, Guid applicationId, Guid collectionId, Dictionary<string, string> modPaths, string scope)
-        => _collections.SetTemporaryModsAsync(logger, applicationId, collectionId, modPaths, scope);
+        => _collections.SetTemporaryModsAsync(logger, applicationId, collectionId, modPaths);
 
     public Task SetManipulationDataAsync(ILogger logger, Guid applicationId, Guid collectionId, string manipulationData)
         => _collections.SetManipulationDataAsync(logger, applicationId, collectionId, manipulationData);
@@ -98,12 +95,6 @@ public sealed class IpcCallerPenumbra : IpcServiceBase
     public Task<(string[] forward, string[][] reverse)> ResolvePathsAsync(string[] forward, string[] reverse)
         => _resources.ResolvePathsAsync(forward, reverse);
 
-    public string ResolveGameObjectPath(string gamePath, int objectIndex)
-        => _resources.ResolveGameObjectPath(gamePath, objectIndex);
-
-    public string[] ReverseResolveGameObjectPath(string moddedPath, int objectIndex)
-        => _resources.ReverseResolveGameObjectPath(moddedPath, objectIndex);
-
     public Task RedrawAsync(ILogger logger, GameObjectHandler handler, Guid applicationId, CancellationToken token)
         => _redraw.RedrawAsync(logger, handler, applicationId, token);
 
@@ -180,6 +171,11 @@ public sealed class IpcCallerPenumbra : IpcServiceBase
         });
 
         Mediator.Subscribe<DalamudLoginMessage>(this, _ => _shownPenumbraUnavailable = false);
+
+        Mediator.Subscribe<ActorTrackedMessage>(this, msg => _resources.TrackActor(msg.Descriptor.Address));
+        Mediator.Subscribe<ActorUntrackedMessage>(this, msg => _resources.UntrackActor(msg.Descriptor.Address));
+        Mediator.Subscribe<GameObjectHandlerCreatedMessage>(this, msg => _resources.TrackActor(msg.GameObjectHandler.Address));
+        Mediator.Subscribe<GameObjectHandlerDestroyedMessage>(this, msg => _resources.UntrackActor(msg.GameObjectHandler.Address));
     }
 
     private void HandlePenumbraInitialized()

LightlessSync/Interop/Ipc/IpcManager.cs

@@ -5,12 +5,9 @@ namespace LightlessSync.Interop.Ipc;
 
 public sealed partial class IpcManager : DisposableMediatorSubscriberBase
 {
-    private bool _wasInitialized;
-
     public IpcManager(ILogger<IpcManager> logger, LightlessMediator mediator,
         IpcCallerPenumbra penumbraIpc, IpcCallerGlamourer glamourerIpc, IpcCallerCustomize customizeIpc, IpcCallerHeels heelsIpc,
-        IpcCallerHonorific honorificIpc, IpcCallerMoodles moodlesIpc, IpcCallerPetNames ipcCallerPetNames, IpcCallerBrio ipcCallerBrio,
-        IpcCallerLifestream ipcCallerLifestream) : base(logger, mediator)
+        IpcCallerHonorific honorificIpc, IpcCallerMoodles moodlesIpc, IpcCallerPetNames ipcCallerPetNames, IpcCallerBrio ipcCallerBrio) : base(logger, mediator)
     {
         CustomizePlus = customizeIpc;
         Heels = heelsIpc;
@@ -20,10 +17,8 @@ public sealed partial class IpcManager : DisposableMediatorSubscriberBase
         Moodles = moodlesIpc;
         PetNames = ipcCallerPetNames;
         Brio = ipcCallerBrio;
-        Lifestream = ipcCallerLifestream;
 
-        _wasInitialized = Initialized;
-        if (_wasInitialized)
+        if (Initialized)
         {
             Mediator.Publish(new PenumbraInitializedMessage());
         }
@@ -49,8 +44,8 @@ public sealed partial class IpcManager : DisposableMediatorSubscriberBase
     public IpcCallerPenumbra Penumbra { get; }
     public IpcCallerMoodles Moodles { get; }
     public IpcCallerPetNames PetNames { get; }
+
     public IpcCallerBrio Brio { get; }
-    public IpcCallerLifestream Lifestream { get; }
 
     private void PeriodicApiStateCheck()
     {
@@ -63,14 +58,5 @@ public sealed partial class IpcManager : DisposableMediatorSubscriberBase
         Moodles.CheckAPI();
         PetNames.CheckAPI();
         Brio.CheckAPI();
-
-        var initialized = Initialized;
-        if (initialized && !_wasInitialized)
-        {
-            Mediator.Publish(new PenumbraInitializedMessage());
-        }
-
-        _wasInitialized = initialized;
-        Lifestream.CheckAPI();
     }
 }

LightlessSync/Interop/Ipc/Penumbra/PenumbraCollections.cs

@@ -92,43 +92,25 @@ public sealed class PenumbraCollections : PenumbraBase
         _activeTemporaryCollections.TryRemove(collectionId, out _);
     }
 
-    public async Task SetTemporaryModsAsync(
-        ILogger logger,
-        Guid applicationId,
-        Guid collectionId,
-        Dictionary<string, string> modPaths,
-        string scope)
+    public async Task SetTemporaryModsAsync(ILogger logger, Guid applicationId, Guid collectionId, IReadOnlyDictionary<string, string> modPaths)
     {
         if (!IsAvailable || collectionId == Guid.Empty)
-            return;
-
-        var modName = $"LightlessChara_Files_{applicationId:N}_{scope}";
-
-        var normalized = new Dictionary<string, string>(modPaths.Count, StringComparer.OrdinalIgnoreCase);
-        foreach (var kvp in modPaths)
         {
-            if (string.IsNullOrWhiteSpace(kvp.Key) || string.IsNullOrWhiteSpace(kvp.Value))
-                continue;
-
-            var gamePath = kvp.Key.Replace('\\', '/').ToLowerInvariant();
-            normalized[gamePath] = kvp.Value;
+            return;
         }
 
         await DalamudUtil.RunOnFrameworkThread(() =>
         {
-            foreach (var mod in normalized)
-                logger.LogTrace("[{ApplicationId}] {ModName}: {From} => {To}", applicationId, modName, mod.Key, mod.Value);
+            foreach (var mod in modPaths)
+            {
+                logger.LogTrace("[{ApplicationId}] Change: {From} => {To}", applicationId, mod.Key, mod.Value);
+            }
 
-            var removeResult = _removeTemporaryMod.Invoke(modName, collectionId, 0);
-            logger.LogTrace("[{ApplicationId}] Removing temp mod {ModName} for {CollectionId}, Success: {Result}",
-                applicationId, modName, collectionId, removeResult);
+            var removeResult = _removeTemporaryMod.Invoke("LightlessChara_Files", collectionId, 0);
+            logger.LogTrace("[{ApplicationId}] Removing temp files mod for {CollectionId}, Success: {Result}", applicationId, collectionId, removeResult);
 
-            if (normalized.Count == 0)
-                return;
-
-            var addResult = _addTemporaryMod.Invoke(modName, collectionId, normalized, string.Empty, 0);
-            logger.LogTrace("[{ApplicationId}] Setting temp mod {ModName} for {CollectionId}, Success: {Result}",
-                applicationId, modName, collectionId, addResult);
+            var addResult = _addTemporaryMod.Invoke("LightlessChara_Files", collectionId, new Dictionary<string, string>(modPaths), string.Empty, 0);
+            logger.LogTrace("[{ApplicationId}] Setting temp files mod for {CollectionId}, Success: {Result}", applicationId, collectionId, addResult);
         }).ConfigureAwait(false);
     }
 
@@ -189,7 +171,7 @@ public sealed class PenumbraCollections : PenumbraBase
                 Logger.LogDebug("Cleaning up stale temporary collection {CollectionName} ({CollectionId})", name, collectionId);
                 var deleteResult = await DalamudUtil.RunOnFrameworkThread(() =>
                 {
-                    var result = _removeTemporaryCollection.Invoke(collectionId);
+                    var result = (PenumbraApiEc)_removeTemporaryCollection.Invoke(collectionId);
                     Logger.LogTrace("Cleanup RemoveTemporaryCollection result for {CollectionName} ({CollectionId}): {Result}", name, collectionId, result);
                     return result;
                 }).ConfigureAwait(false);

LightlessSync/Interop/Ipc/Penumbra/PenumbraResource.cs

@@ -1,3 +1,4 @@
+using System.Collections.Concurrent;
 using Dalamud.Plugin;
 using LightlessSync.Interop.Ipc.Framework;
 using LightlessSync.PlayerData.Handlers;
@@ -14,11 +15,10 @@ public sealed class PenumbraResource : PenumbraBase
 {
     private readonly ActorObjectService _actorObjectService;
     private readonly GetGameObjectResourcePaths _gameObjectResourcePaths;
-    private readonly ResolveGameObjectPath _resolveGameObjectPath;
-    private readonly ReverseResolveGameObjectPath _reverseResolveGameObjectPath;
     private readonly ResolvePlayerPathsAsync _resolvePlayerPaths;
     private readonly GetPlayerMetaManipulations _getPlayerMetaManipulations;
     private readonly EventSubscriber<nint, string, string> _gameObjectResourcePathResolved;
+    private readonly ConcurrentDictionary<IntPtr, byte> _trackedActors = new();
 
     public PenumbraResource(
         ILogger logger,
@@ -29,11 +29,14 @@ public sealed class PenumbraResource : PenumbraBase
     {
         _actorObjectService = actorObjectService;
         _gameObjectResourcePaths = new GetGameObjectResourcePaths(pluginInterface);
-        _resolveGameObjectPath = new ResolveGameObjectPath(pluginInterface);
-        _reverseResolveGameObjectPath = new ReverseResolveGameObjectPath(pluginInterface);
         _resolvePlayerPaths = new ResolvePlayerPathsAsync(pluginInterface);
         _getPlayerMetaManipulations = new GetPlayerMetaManipulations(pluginInterface);
         _gameObjectResourcePathResolved = GameObjectResourcePathResolved.Subscriber(pluginInterface, HandleResourceLoaded);
+
+        foreach (var descriptor in _actorObjectService.PlayerDescriptors)
+        {
+            TrackActor(descriptor.Address);
+        }
     }
 
     public override string Name => "Penumbra.Resources";
@@ -71,34 +74,63 @@ public sealed class PenumbraResource : PenumbraBase
         return await _resolvePlayerPaths.Invoke(forwardPaths, reversePaths).ConfigureAwait(false);
     }
 
-    public string ResolveGameObjectPath(string gamePath, int gameObjectIndex)
-        => IsAvailable ? _resolveGameObjectPath.Invoke(gamePath, gameObjectIndex) : gamePath;
+    public void TrackActor(nint address)
+    {
+        if (address != nint.Zero)
+        {
+            _trackedActors[(IntPtr)address] = 0;
+        }
+    }
 
-    public string[] ReverseResolveGameObjectPath(string moddedPath, int gameObjectIndex)
-        => IsAvailable ? _reverseResolveGameObjectPath.Invoke(moddedPath, gameObjectIndex) : Array.Empty<string>();
+    public void UntrackActor(nint address)
+    {
+        if (address != nint.Zero)
+        {
+            _trackedActors.TryRemove((IntPtr)address, out _);
+        }
+    }
 
-    private void HandleResourceLoaded(nint ptr, string gamePath, string resolvedPath)
+    private void HandleResourceLoaded(nint ptr, string resolvedPath, string gamePath)
     {
         if (ptr == nint.Zero)
         {
             return;
         }
 
-        if (!_actorObjectService.TryGetOwnedKind(ptr, out _))
+        if (!_trackedActors.ContainsKey(ptr))
+        {
+            var descriptor = _actorObjectService.PlayerDescriptors.FirstOrDefault(d => d.Address == ptr);
+            if (descriptor.Address != nint.Zero)
+            {
+                _trackedActors[ptr] = 0;
+            }
+            else
+            {
+                return;
+            }
+        }
+
+        if (string.Compare(resolvedPath, gamePath, StringComparison.OrdinalIgnoreCase) == 0)
         {
             return;
         }
 
-        if (string.Compare(gamePath, resolvedPath, StringComparison.OrdinalIgnoreCase) == 0)
-        {
-            return;
-        }
-
-        Mediator.Publish(new PenumbraResourceLoadMessage(ptr, gamePath, resolvedPath));
+        Mediator.Publish(new PenumbraResourceLoadMessage(ptr, resolvedPath, gamePath));
     }
 
     protected override void HandleStateChange(IpcConnectionState previous, IpcConnectionState current)
     {
+        if (current != IpcConnectionState.Available)
+        {
+            _trackedActors.Clear();
+        }
+        else
+        {
+            foreach (var descriptor in _actorObjectService.PlayerDescriptors)
+            {
+                TrackActor(descriptor.Address);
+            }
+        }
     }
 
     public override void Dispose()

LightlessSync/LightlessConfiguration/ConfigurationMigrator.cs

@@ -19,27 +19,6 @@ public class ConfigurationMigrator(ILogger<ConfigurationMigrator> logger, Transi
             transientConfigService.Save();
         }
 
-        if (transientConfigService.Current.Version == 1)
-        {
-            _logger.LogInformation("Migrating Transient Config V1 => V2");
-            var totalRemoved = 0;
-            var configCount = 0;
-            var changedCount = 0;
-            foreach (var config in transientConfigService.Current.TransientConfigs.Values)
-            {
-                if (config.NormalizePaths(out var removed))
-                    changedCount++;
-
-                totalRemoved += removed;
-
-                configCount++;
-            }
-
-            _logger.LogInformation("Transient config normalization: processed {count} entries, updated {updated}, removed {removed} paths", configCount, changedCount, totalRemoved);
-            transientConfigService.Current.Version = 2;
-            transientConfigService.Save();
-        }
-
         if (serverConfigService.Current.Version == 1)
         {
             _logger.LogInformation("Migrating Server Config V1 => V2");

LightlessSync/LightlessConfiguration/Configurations/ChatConfig.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 
 namespace LightlessSync.LightlessConfiguration.Configurations;
 
@@ -10,19 +9,8 @@ public sealed class ChatConfig : ILightlessConfiguration
     public bool AutoEnableChatOnLogin { get; set; } = false;
     public bool ShowRulesOverlayOnOpen { get; set; } = true;
     public bool ShowMessageTimestamps { get; set; } = true;
-    public bool ShowNotesInSyncshellChat { get; set; } = true;
-    public bool EnableAnimatedEmotes { get; set; } = true;
     public float ChatWindowOpacity { get; set; } = .97f;
-    public bool FadeWhenUnfocused { get; set; } = false;
-    public float UnfocusedWindowOpacity { get; set; } = 0.6f;
     public bool IsWindowPinned { get; set; } = false;
     public bool AutoOpenChatOnPluginLoad { get; set; } = false;
     public float ChatFontScale { get; set; } = 1.0f;
-    public bool HideInCombat { get; set; } = false;
-    public bool HideInDuty { get; set; } = false;
-    public bool ShowWhenUiHidden { get; set; } = true;
-    public bool ShowInCutscenes { get; set; } = true;
-    public bool ShowInGpose { get; set; } = true;
-    public List<string> ChannelOrder { get; set; } = new();
-    public Dictionary<string, bool> PreferNotesForChannels { get; set; } = new(StringComparer.Ordinal);
 }

LightlessSync/LightlessConfiguration/Configurations/LightlessConfig.cs

@@ -4,7 +4,6 @@ using LightlessSync.LightlessConfiguration.Models;
 using LightlessSync.UI;
 using LightlessSync.UI.Models;
 using Microsoft.Extensions.Logging;
-using LightlessSync.PlayerData.Factories;
 
 namespace LightlessSync.LightlessConfiguration.Configurations;
 
@@ -50,9 +49,7 @@ public class LightlessConfig : ILightlessConfiguration
     public int DownloadSpeedLimitInBytes { get; set; } = 0;
     public DownloadSpeeds DownloadSpeedType { get; set; } = DownloadSpeeds.MBps;
     public bool PreferNotesOverNamesForVisible { get; set; } = false;
-    public VisiblePairSortMode VisiblePairSortMode { get; set; } = VisiblePairSortMode.Alphabetical;
-    public OnlinePairSortMode OnlinePairSortMode { get; set; } = OnlinePairSortMode.Alphabetical;
-    public TextureFormatSortMode TextureFormatSortMode { get; set; } = TextureFormatSortMode.None;
+    public VisiblePairSortMode VisiblePairSortMode { get; set; } = VisiblePairSortMode.Default;
     public float ProfileDelay { get; set; } = 1.5f;
     public bool ProfilePopoutRight { get; set; } = false;
     public bool ProfilesAllowNsfw { get; set; } = false;
@@ -142,7 +139,6 @@ public class LightlessConfig : ILightlessConfiguration
     public bool useColoredUIDs { get; set; } = true;
     public bool BroadcastEnabled { get; set; } = false;
     public bool LightfinderAutoEnableOnConnect { get; set; } = false;
-    public LightfinderLabelRenderer LightfinderLabelRenderer { get; set; } = LightfinderLabelRenderer.Pictomancy;
     public short LightfinderLabelOffsetX { get; set; } = 0;
     public short LightfinderLabelOffsetY { get; set; } = 0;
     public bool LightfinderLabelUseIcon { get; set; } = false;
@@ -157,9 +153,4 @@ public class LightlessConfig : ILightlessConfiguration
     public bool SyncshellFinderEnabled { get; set; } = false;
     public string? SelectedFinderSyncshell { get; set; } = null;
     public string LastSeenVersion { get; set; } = string.Empty;
-    public bool EnableParticleEffects { get; set; } = true;
-    public AnimationValidationMode AnimationValidationMode { get; set; } = AnimationValidationMode.Unsafe;
-    public bool AnimationAllowOneBasedShift { get; set; } = false;
-
-    public bool AnimationAllowNeighborIndexTolerance { get; set; } = false;
 }

LightlessSync/LightlessConfiguration/Configurations/PenumbraJanitorConfig.cs

@@ -1,8 +0,0 @@
-namespace LightlessSync.LightlessConfiguration.Configurations;
-
-public class PenumbraJanitorConfig : ILightlessConfiguration
-{
-    public int Version { get; set; } = 0;
-
-    public HashSet<Guid> OrphanableTempCollections { get; set; } = [];
-}

LightlessSync/LightlessConfiguration/Configurations/PlayerPerformanceConfig.cs

@@ -22,15 +22,4 @@ public class PlayerPerformanceConfig : ILightlessConfiguration
     public int TextureDownscaleMaxDimension { get; set; } = 2048;
     public bool OnlyDownscaleUncompressedTextures { get; set; } = true;
     public bool KeepOriginalTextureFiles { get; set; } = false;
-    public bool SkipTextureDownscaleForPreferredPairs { get; set; } = true;
-    public bool EnableModelDecimation { get; set; } = false;
-    public int ModelDecimationTriangleThreshold { get; set; } = 20_000;
-    public double ModelDecimationTargetRatio { get; set; } = 0.8;
-    public bool KeepOriginalModelFiles { get; set; } = true;
-    public bool SkipModelDecimationForPreferredPairs { get; set; } = true;
-    public bool ModelDecimationAllowBody { get; set; } = false;
-    public bool ModelDecimationAllowFaceHead { get; set; } = false;
-    public bool ModelDecimationAllowTail { get; set; } = false;
-    public bool ModelDecimationAllowClothing { get; set; } = true;
-    public bool ModelDecimationAllowAccessories { get; set; } = true;
 }

LightlessSync/LightlessConfiguration/Configurations/TransientConfig.cs

@@ -5,7 +5,7 @@ namespace LightlessSync.LightlessConfiguration.Configurations;
 public class TransientConfig : ILightlessConfiguration
 {
     public Dictionary<string, TransientPlayerConfig> TransientConfigs { get; set; } = [];
-    public int Version { get; set; } = 2;
+    public int Version { get; set; } = 1;
 
     public class TransientPlayerConfig
     {
@@ -88,70 +88,5 @@ public class TransientConfig : ILightlessConfiguration
                 }
             }
         }
-
-        public bool NormalizePaths(out int removedEntries)
-        {
-            bool changed = false;
-            removedEntries = 0;
-
-            GlobalPersistentCache = NormalizeList(GlobalPersistentCache, ref changed, ref removedEntries);
-
-            foreach (var jobId in JobSpecificCache.Keys.ToList())
-            {
-                JobSpecificCache[jobId] = NormalizeList(JobSpecificCache[jobId], ref changed, ref removedEntries);
-            }
-
-            foreach (var jobId in JobSpecificPetCache.Keys.ToList())
-            {
-                JobSpecificPetCache[jobId] = NormalizeList(JobSpecificPetCache[jobId], ref changed, ref removedEntries);
-            }
-
-            return changed;
-        }
-
-        private static List<string> NormalizeList(List<string> entries, ref bool changed, ref int removedEntries)
-        {
-            if (entries.Count == 0)
-                return entries;
-
-            var result = new List<string>(entries.Count);
-            var seen = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-
-            foreach (var entry in entries)
-            {
-                var normalized = NormalizePath(entry);
-                if (string.IsNullOrEmpty(normalized))
-                {
-                    changed = true;
-                    continue;
-                }
-
-                if (!string.Equals(entry, normalized, StringComparison.Ordinal))
-                {
-                    changed = true;
-                }
-
-                if (seen.Add(normalized))
-                {
-                    result.Add(normalized);
-                }
-                else
-                {
-                    changed = true;
-                }
-            }
-
-            removedEntries += entries.Count - result.Count;
-
-            return result;
-        }
-
-        private static string NormalizePath(string path)
-        {
-            if (string.IsNullOrEmpty(path))
-                return string.Empty;
-
-            return path.Replace("\\", "/", StringComparison.Ordinal).ToLowerInvariant();
-        }
     }
 }

LightlessSync/LightlessConfiguration/Configurations/XivDataStorageConfig.cs

@@ -5,7 +5,6 @@ namespace LightlessSync.LightlessConfiguration.Configurations;
 public class XivDataStorageConfig : ILightlessConfiguration
 {
     public ConcurrentDictionary<string, long> TriangleDictionary { get; set; } = new(StringComparer.OrdinalIgnoreCase);
-    public ConcurrentDictionary<string, long> EffectiveTriangleDictionary { get; set; } = new(StringComparer.OrdinalIgnoreCase);
     public ConcurrentDictionary<string, Dictionary<string, List<ushort>>> BonesDictionary { get; set; } = new(StringComparer.OrdinalIgnoreCase);
     public int Version { get; set; } = 0;
 }

LightlessSync/LightlessConfiguration/PenumbraJanitorConfigService.cs

@@ -1,14 +0,0 @@
-using LightlessSync.LightlessConfiguration.Configurations;
-
-namespace LightlessSync.LightlessConfiguration;
-
-public class PenumbraJanitorConfigService : ConfigurationServiceBase<PenumbraJanitorConfig>
-{
-    public const string ConfigName = "penumbra-collections.json";
-
-    public PenumbraJanitorConfigService(string configDir) : base(configDir)
-    {
-    }
-
-    public override string ConfigurationName => ConfigName;
-}

LightlessSync/LightlessPlugin.cs

@@ -74,7 +74,6 @@ public class LightlessPlugin : MediatorSubscriberBase, IHostedService
     private readonly DalamudUtilService _dalamudUtil;
     private readonly LightlessConfigService _lightlessConfigService;
     private readonly ServerConfigurationManager _serverConfigurationManager;
-    private readonly PairHandlerRegistry _pairHandlerRegistry;
     private readonly IServiceScopeFactory _serviceScopeFactory;
     private IServiceScope? _runtimeServiceScope;
     private Task? _launchTask = null;
@@ -82,13 +81,11 @@ public class LightlessPlugin : MediatorSubscriberBase, IHostedService
     public LightlessPlugin(ILogger<LightlessPlugin> logger, LightlessConfigService lightlessConfigService,
         ServerConfigurationManager serverConfigurationManager,
         DalamudUtilService dalamudUtil,
-        PairHandlerRegistry pairHandlerRegistry,
         IServiceScopeFactory serviceScopeFactory, LightlessMediator mediator) : base(logger, mediator)
     {
         _lightlessConfigService = lightlessConfigService;
         _serverConfigurationManager = serverConfigurationManager;
         _dalamudUtil = dalamudUtil;
-        _pairHandlerRegistry = pairHandlerRegistry;
         _serviceScopeFactory = serviceScopeFactory;
     }
 
@@ -111,20 +108,12 @@ public class LightlessPlugin : MediatorSubscriberBase, IHostedService
 
     public Task StopAsync(CancellationToken cancellationToken)
     {
-        Logger.LogDebug("Halting LightlessPlugin");
-        try
-        {
-            _pairHandlerRegistry.ResetAllHandlers();
-        }
-        catch (Exception ex)
-        {
-            Logger.LogWarning(ex, "Failed to reset pair handlers on shutdown");
-        }
-
         UnsubscribeAll();
 
         DalamudUtilOnLogOut();
 
+        Logger.LogDebug("Halting LightlessPlugin");
+
         return Task.CompletedTask;
     }
     

LightlessSync/LightlessSync.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors></Authors>
     <Company></Company>
-    <Version>2.0.3</Version>
+    <Version>1.42.0.70</Version>
     <Description></Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/Light-Public-Syncshells/LightlessClient</PackageProjectUrl>
@@ -24,15 +24,6 @@
     <Compile Remove="PlayerData\Export\**" />
     <EmbeddedResource Remove="PlayerData\Export\**" />
     <None Remove="PlayerData\Export\**" />
-    <EmbeddedResource Update="Resources\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <Compile Update="Resources\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
   </ItemGroup>
 
   <ItemGroup>
@@ -46,7 +37,6 @@
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="10.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
     <PackageReference Include="Glamourer.Api" Version="2.8.0" />
     <PackageReference Include="NReco.Logging.File" Version="1.3.1" />
@@ -77,6 +67,8 @@
     </None>
     <EmbeddedResource Include="Changelog\changelog.yaml" />
     <EmbeddedResource Include="Changelog\credits.yaml" />
+    <EmbeddedResource Include="Localization\de.json" />
+    <EmbeddedResource Include="Localization\fr.json" />
   </ItemGroup>
 
   <ItemGroup>

LightlessSync/LightlessSync.csproj.DotSettings

@@ -1,3 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeEditing/Localization/Localizable/@EntryValue">Yes</s:String>
-	<s:String x:Key="/Default/CodeEditing/Localization/LocalizableInspector/@EntryValue">Pessimistic</s:String></wpf:ResourceDictionary>

LightlessSync/Localization/Strings.cs

@@ -0,0 +1,44 @@
+using CheapLoc;
+
+namespace LightlessSync.Localization;
+
+public static class Strings
+{
+    public static ToSStrings ToS { get; set; } = new();
+
+    public class ToSStrings
+    {
+        public readonly string AgreeLabel = Loc.Localize("AgreeLabel", "I agree");
+        public readonly string AgreementLabel = Loc.Localize("AgreementLabel", "Agreement of Usage of Service");
+        public readonly string ButtonWillBeAvailableIn = Loc.Localize("ButtonWillBeAvailableIn", "'I agree' button will be available in");
+        public readonly string LanguageLabel = Loc.Localize("LanguageLabel", "Language");
+
+        public readonly string Paragraph1 = Loc.Localize("Paragraph1",
+            "All of the mod files currently active on your character as well as your current character state will be uploaded to the service you registered yourself at automatically. " +
+            "The plugin will exclusively upload the necessary mod files and not the whole mod.");
+
+        public readonly string Paragraph2 = Loc.Localize("Paragraph2",
+            "If you are on a data capped internet connection, higher fees due to data usage depending on the amount of downloaded and uploaded mod files might occur. " +
+            "Mod files will be compressed on up- and download to save on bandwidth usage. Due to varying up- and download speeds, changes in characters might not be visible immediately. " +
+            "Files present on the service that already represent your active mod files will not be uploaded again.");
+
+        public readonly string Paragraph3 = Loc.Localize("Paragraph3",
+            "The mod files you are uploading are confidential and will not be distributed to parties other than the ones who are requesting the exact same mod files. " +
+            "Please think about who you are going to pair since it is unavoidable that they will receive and locally cache the necessary mod files that you have currently in use. " +
+            "Locally cached mod files will have arbitrary file names to discourage attempts at replicating the original mod.");
+
+        public readonly string Paragraph4 = Loc.Localize("Paragraph4",
+            "The plugin creator tried their best to keep you secure. However, there is no guarantee for 100% security. Do not blindly pair your client with everyone.");
+
+        public readonly string Paragraph5 = Loc.Localize("Paragraph5",
+            "Mod files that are saved on the service will remain on the service as long as there are requests for the files from clients. " +
+            "After a period of not being used, the mod files will be automatically deleted. " +
+            "You will also be able to wipe all the files you have personally uploaded on request. " +
+            "The service holds no information about which mod files belong to which mod.");
+
+        public readonly string Paragraph6 = Loc.Localize("Paragraph6",
+            "This service is provided as-is. In case of abuse join the Lightless Sync Discord.");
+
+        public readonly string ReadLabel = Loc.Localize("ReadLabel", "READ THIS CAREFULLY");
+    }
+}

LightlessSync/Localization/de.json

@@ -0,0 +1,46 @@
+{
+  "LanguageLabel": {
+    "message": "Language",
+    "description": "ToSStrings..ctor"
+  },
+  "AgreementLabel": {
+    "message": "Nutzungsbedingungen",
+    "description": "ToSStrings..ctor"
+  },
+  "ReadLabel": {
+    "message": "BITTE LIES DIES SORGFÄLTIG",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph1": {
+    "message": "Alle Moddateien, die aktuell auf deinem Charakter aktiv sind und dein Charakterzustand werden automatisch zu dem Service, an dem du dich registriert hast, hochgeladen. Das Plugin wird ausschließlich die nötigen Moddateien hochladen und nicht die gesamte Modifikation.",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph2": {
+    "message": "Falls du mit einer getakteten Internetverbindung verbunden bist, können durch den Datentransfer von Hoch- und Runtergeladenen Moddateien höhere Kosten entstehen. Moddateien werden beim Hoch- und Runterladen komprimiert um Bandbreite zu sparen. Durch unterschiedliche Hoch- und Runterladgeschwindigkeiten ist es möglich, dass Änderungen an Charakteren nicht sofort sichtbar sind. Dateien die bereits auf dem Service existieren, werden nicht nochmals hochgeladen.",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph3": {
+    "message": "Die Moddateien die du hochlädst sind vertraulich und werden nicht mit anderen Nutzern geteilt, die nicht die exakt selben Dateien anfordern. Bitte überlege dir sorgfältig mit wem du deinen Identifikationscode teilst, da es unvermeidlich ist, dass die andere Person deine Moddateien erhält und lokal zwischenspeichert. Lokal zwischengespeicherte Dateien haben willkürrliche Namen um vor Versuchen abzuschrecken die originalen Moddateien aus diesen wiederherzustellen.",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph4": {
+    "message": "Der Ersteller des Plugins hat sein Bestes getan, um deine Sicherheit zu gewährleisten. Es gibt jedoch keine Garantie für 100%ige Sicherheit. Teile deinen Identifikationscode nicht blind mit jedem.",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph5": {
+    "message": "Moddateien, die auf dem Service gespeichert sind, verbleiben auf dem Service, solange es Anforderungen für diese Dateien gibt. Nach einer Zeitspanne in der die Dateien nicht verwendet wurden, werden diese automatisch gelöscht. Du hast auch die Möglichkeit manuell alle Dateien auf dem Service zu löschen. Der Service hat keine Informationen welche Moddateien zu welcher Modifikation gehören.",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph6": {
+    "message": "Dieser Dienst wird ohne Gewähr angeboten. Im Falle eines Missbrauchs tretet dem Lightless Sync Discord bei.",
+    "description": "ToSStrings..ctor"
+  },
+  "AgreeLabel": {
+    "message": "Ich Stimme zu",
+    "description": "ToSStrings..ctor"
+  },
+  "ButtonWillBeAvailableIn": {
+    "message": "\"Ich stimme zu\" Knopf verfügbar in",
+    "description": "ToSStrings..ctor"
+  }
+}

LightlessSync/Localization/fr.json

@@ -0,0 +1,46 @@
+{
+  "LanguageLabel": {
+    "message": "Language",
+    "description": "ToSStrings..ctor"
+  },
+  "AgreementLabel": {
+    "message": "Conditions d'Utilisation",
+    "description": "ToSStrings..ctor"
+  },
+  "ReadLabel": {
+    "message": "LISEZ CES INFORMATIONS ATTENTIVEMENT",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph1": {
+    "message": "Tous les fichiers moddés actuellement en cours d'utilisation ainsi que le statut actuel de votre personnage vont être mix en ligne via le service sur lequel vous vous êtes automatiquement enregistré. Seuls les fichiers nécessaires seront téléversés par le plugin et non pas le mod en entier.",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph2": {
+    "message": "Si le débit de votre connexion internet est limité, le téléchargement et téléversement d'un grand nombre de fichiers peut entraîner des coûts supplémentaires. Les fichiers seront compressés au chargement et versement pour réduire l'impact sur votre bande passants. Selon la rapidité de vos téléchargements et téléversements, les changements ne seront peut-être pas visibles instantanément sur les personnages. Les fichiers déja présents sur le service qui correspondent à ceux de vos mods en cours d'utilisation ne seront pas remis en ligne.",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph3": {
+    "message": "Les fichiers que vous allez partager sont confidentiels et ne seront envoyés qu'aux utilisateurs qui feront une requête exacte de ceux-çi. Nous vous demandons de (re)considérer qui sera synchronisé avec vous, puisqu'ils recevront et stockeront inévitablement en local les fichiers nécéssaires utilisés à cet instant. Les noms des fichiers stockés localement sont changés de manière arbitraire afin de décourager toute tentative de réplication des originaux.",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph4": {
+    "message": "Le créateur de ce plugin a tenté de sécuriser l'application du mieux possible. Cependant, il ne peut pas garantir une protection 100% infaillible. Pour votre sécurité, ne vous synchronisez pas aveuglément et avec n'importe qui.",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph5": {
+    "message": "Les fichiers sauvegardés sur le service resteront en ligne tant que des utilisateurs en feront usage. Ils seront effacés automatiquement après une certaine période d'inactivité. Vous pouvez également demander l'effacement de tous les fichiers que vous avez mis en ligne vous-même. Le service en soi ne contient aucune information pouvant identifier quel fichier appartient à quel mod.",
+    "description": "ToSStrings..ctor"
+  },
+  "Paragraph6": {
+    "message": "Ce service et ses composants vous sont fournis en l'état. En cas d'abus rejoindre le serveur Discord Lightless Sync.",
+    "description": "ToSStrings..ctor"
+  },
+  "AgreeLabel": {
+    "message": "J'accept",
+    "description": "ToSStrings..ctor"
+  },
+  "ButtonWillBeAvailableIn": {
+    "message": "Bouton \"J'accept\" disposible dans",
+    "description": "ToSStrings..ctor"
+  }
+}

LightlessSync/PlayerData/Factories/AnimationValidationMode.cs

@@ -1,9 +0,0 @@
-namespace LightlessSync.PlayerData.Factories
-{
-    public enum AnimationValidationMode
-    {
-        Unsafe = 0,
-        Safe = 1,
-        Safest = 2,
-    }
-}

LightlessSync/PlayerData/Factories/FileDownloadManagerFactory.cs

@@ -1,7 +1,6 @@
 using LightlessSync.FileCache;
 using LightlessSync.LightlessConfiguration;
 using LightlessSync.Services.Mediator;
-using LightlessSync.Services.ModelDecimation;
 using LightlessSync.Services.TextureCompression;
 using LightlessSync.WebAPI.Files;
 using Microsoft.Extensions.Logging;
@@ -17,7 +16,6 @@ public class FileDownloadManagerFactory
     private readonly FileCompactor _fileCompactor;
     private readonly LightlessConfigService _configService;
     private readonly TextureDownscaleService _textureDownscaleService;
-    private readonly ModelDecimationService _modelDecimationService;
     private readonly TextureMetadataHelper _textureMetadataHelper;
 
     public FileDownloadManagerFactory(
@@ -28,7 +26,6 @@ public class FileDownloadManagerFactory
         FileCompactor fileCompactor,
         LightlessConfigService configService,
         TextureDownscaleService textureDownscaleService,
-        ModelDecimationService modelDecimationService,
         TextureMetadataHelper textureMetadataHelper)
     {
         _loggerFactory = loggerFactory;
@@ -38,7 +35,6 @@ public class FileDownloadManagerFactory
         _fileCompactor = fileCompactor;
         _configService = configService;
         _textureDownscaleService = textureDownscaleService;
-        _modelDecimationService = modelDecimationService;
         _textureMetadataHelper = textureMetadataHelper;
     }
 
@@ -52,7 +48,6 @@ public class FileDownloadManagerFactory
             _fileCompactor,
             _configService,
             _textureDownscaleService,
-            _modelDecimationService,
             _textureMetadataHelper);
     }
 }

LightlessSync/PlayerData/Factories/GameObjectHandlerFactory.cs

@@ -1,5 +1,4 @@
-using Dalamud.Plugin.Services;
-using LightlessSync.API.Data.Enum;
+using LightlessSync.API.Data.Enum;
 using LightlessSync.PlayerData.Handlers;
 using LightlessSync.Services;
 using LightlessSync.Services.Mediator;
@@ -12,7 +11,6 @@ public class GameObjectHandlerFactory
 {
     private readonly IServiceProvider _serviceProvider;
     private readonly ILoggerFactory _loggerFactory;
-    private readonly IObjectTable _objectTable;
     private readonly LightlessMediator _lightlessMediator;
     private readonly PerformanceCollectorService _performanceCollectorService;
 
@@ -20,14 +18,12 @@ public class GameObjectHandlerFactory
         ILoggerFactory loggerFactory,
         PerformanceCollectorService performanceCollectorService,
         LightlessMediator lightlessMediator,
-        IServiceProvider serviceProvider,
-        IObjectTable objectTable)
+        IServiceProvider serviceProvider)
     {
         _loggerFactory = loggerFactory;
         _performanceCollectorService = performanceCollectorService;
         _lightlessMediator = lightlessMediator;
         _serviceProvider = serviceProvider;
-        _objectTable = objectTable;
     }
 
     public async Task<GameObjectHandler> Create(ObjectKind objectKind, Func<nint> getAddressFunc, bool isWatched = false)
@@ -40,7 +36,6 @@ public class GameObjectHandlerFactory
             dalamudUtilService,
             objectKind,
             getAddressFunc,
-            _objectTable,
             isWatched)).ConfigureAwait(false);
     }
 }

LightlessSync/PlayerData/Factories/PairFactory.cs

@@ -1,4 +1,4 @@
-    using LightlessSync.API.Data.Enum;
+using LightlessSync.API.Data.Enum;
 using LightlessSync.API.Dto.User;
 using LightlessSync.PlayerData.Pairs;
 using LightlessSync.Services.Mediator;

LightlessSync/PlayerData/Factories/PlayerDataFactory.cs

@@ -1,20 +1,13 @@
-using Dalamud.Utility;
-using FFXIVClientStructs.FFXIV.Client.Game.Character;
-using FFXIVClientStructs.FFXIV.Client.Game.Object;
+using FFXIVClientStructs.FFXIV.Client.Game.Character;
+using LightlessSync.API.Data.Enum;
 using LightlessSync.FileCache;
 using LightlessSync.Interop.Ipc;
-using LightlessSync.LightlessConfiguration;
 using LightlessSync.LightlessConfiguration.Models;
 using LightlessSync.PlayerData.Data;
 using LightlessSync.PlayerData.Handlers;
 using LightlessSync.Services;
 using LightlessSync.Services.Mediator;
-using LightlessSync.Utils;
 using Microsoft.Extensions.Logging;
-using System.Collections.Concurrent;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using ObjectKind = LightlessSync.API.Data.Enum.ObjectKind;
 
 namespace LightlessSync.PlayerData.Factories;
 
@@ -25,34 +18,13 @@ public class PlayerDataFactory
     private readonly IpcManager _ipcManager;
     private readonly ILogger<PlayerDataFactory> _logger;
     private readonly PerformanceCollectorService _performanceCollector;
-    private readonly LightlessConfigService _configService;
     private readonly XivDataAnalyzer _modelAnalyzer;
     private readonly LightlessMediator _lightlessMediator;
     private readonly TransientResourceManager _transientResourceManager;
-    private static readonly SemaphoreSlim _papParseLimiter = new(1, 1);
 
-    // Transient resolved entries threshold
-    private const int _maxTransientResolvedEntries = 1000;
-
-    // Character build caches
-    private readonly ConcurrentDictionary<nint, Task<CharacterDataFragment>> _characterBuildInflight = new();
-    private readonly ConcurrentDictionary<nint, CacheEntry> _characterBuildCache = new();
-
-    // Time out thresholds
-    private static readonly TimeSpan _characterCacheTtl = TimeSpan.FromMilliseconds(750);
-    private static readonly TimeSpan _softReturnIfBusyAfter = TimeSpan.FromMilliseconds(250);
-    private static readonly TimeSpan _hardBuildTimeout = TimeSpan.FromSeconds(30);
-
-    public PlayerDataFactory(
-        ILogger<PlayerDataFactory> logger,
-        DalamudUtilService dalamudUtil,
-        IpcManager ipcManager,
-        TransientResourceManager transientResourceManager,
-        FileCacheManager fileReplacementFactory,
-        PerformanceCollectorService performanceCollector,
-        XivDataAnalyzer modelAnalyzer,
-        LightlessMediator lightlessMediator,
-        LightlessConfigService configService)
+    public PlayerDataFactory(ILogger<PlayerDataFactory> logger, DalamudUtilService dalamudUtil, IpcManager ipcManager,
+        TransientResourceManager transientResourceManager, FileCacheManager fileReplacementFactory,
+        PerformanceCollectorService performanceCollector, XivDataAnalyzer modelAnalyzer, LightlessMediator lightlessMediator)
     {
         _logger = logger;
         _dalamudUtil = dalamudUtil;
@@ -62,15 +34,15 @@ public class PlayerDataFactory
         _performanceCollector = performanceCollector;
         _modelAnalyzer = modelAnalyzer;
         _lightlessMediator = lightlessMediator;
-        _configService = configService;
         _logger.LogTrace("Creating {this}", nameof(PlayerDataFactory));
     }
-    private sealed record CacheEntry(CharacterDataFragment Fragment, DateTime CreatedUtc);
 
     public async Task<CharacterDataFragment?> BuildCharacterData(GameObjectHandler playerRelatedObject, CancellationToken token)
     {
         if (!_ipcManager.Initialized)
+        {
             throw new InvalidOperationException("Penumbra or Glamourer is not connected");
+        }
 
         if (playerRelatedObject == null) return null;
 
@@ -95,17 +67,16 @@ public class PlayerDataFactory
 
         if (pointerIsZero)
         {
-            _logger.LogTrace("Pointer was zero for {objectKind}; couldn't build character", playerRelatedObject.ObjectKind);
+            _logger.LogTrace("Pointer was zero for {objectKind}", playerRelatedObject.ObjectKind);
             return null;
         }
 
         try
         {
-            return await _performanceCollector.LogPerformance(
-                this,
-                $"CreateCharacterData>{playerRelatedObject.ObjectKind}",
-                async () => await CreateCharacterData(playerRelatedObject, token).ConfigureAwait(false)
-            ).ConfigureAwait(false);
+            return await _performanceCollector.LogPerformance(this, $"CreateCharacterData>{playerRelatedObject.ObjectKind}", async () =>
+            {
+                return await CreateCharacterData(playerRelatedObject, token).ConfigureAwait(false);
+            }).ConfigureAwait(true);
         }
         catch (OperationCanceledException)
         {
@@ -120,259 +91,172 @@ public class PlayerDataFactory
         return null;
     }
 
-    private static readonly int _characterGameObjectOffset =
-        (int)Marshal.OffsetOf<Character>(nameof(Character.GameObject));
-
-    private static readonly int _gameObjectDrawObjectOffset =
-        (int)Marshal.OffsetOf<GameObject>(nameof(GameObject.DrawObject));
-
     private async Task<bool> CheckForNullDrawObject(IntPtr playerPointer)
-        => await _dalamudUtil.RunOnFrameworkThread(() => CheckForNullDrawObjectSafe(playerPointer))
-            .ConfigureAwait(false);
-
-    private static bool CheckForNullDrawObjectSafe(nint playerPointer)
     {
-        if (playerPointer == nint.Zero)
+        return await _dalamudUtil.RunOnFrameworkThread(() => CheckForNullDrawObjectUnsafe(playerPointer)).ConfigureAwait(false);
+    }
+
+    private unsafe bool CheckForNullDrawObjectUnsafe(IntPtr playerPointer)
+    {
+        if (playerPointer == IntPtr.Zero)
             return true;
 
-        var drawObjPtrAddress = playerPointer + _characterGameObjectOffset + _gameObjectDrawObjectOffset;
+        var character = (Character*)playerPointer;
 
-        // Read the DrawObject pointer from memory
-        if (!MemoryProcessProbe.TryReadIntPtr(drawObjPtrAddress, out var drawObj))
+        if (character == null)
             return true;
 
-        return drawObj == nint.Zero;
+        var gameObject = &character->GameObject;
+        if (gameObject == null)
+            return true;
+
+        return gameObject->DrawObject == null;
     }
 
-    private static bool IsCacheFresh(CacheEntry entry)
-        => (DateTime.UtcNow - entry.CreatedUtc) <= _characterCacheTtl;
-
-    private Task<CharacterDataFragment> CreateCharacterData(GameObjectHandler playerRelatedObject, CancellationToken ct)
-        => CreateCharacterDataCoalesced(playerRelatedObject, ct);
-
-    private async Task<CharacterDataFragment> CreateCharacterDataCoalesced(GameObjectHandler obj, CancellationToken ct)
-    {
-        var key = obj.Address;
-
-        if (_characterBuildCache.TryGetValue(key, out var cached) && IsCacheFresh(cached) && !_characterBuildInflight.ContainsKey(key))
-            return cached.Fragment;
-
-        var buildTask = _characterBuildInflight.GetOrAdd(key, valueFactory: k => BuildAndCacheAsync(obj, k));
-
-        if (_characterBuildCache.TryGetValue(key, out cached))
-        {
-            var completed = await Task.WhenAny(buildTask, Task.Delay(_softReturnIfBusyAfter, ct)).ConfigureAwait(false);
-            if (completed != buildTask && (DateTime.UtcNow - cached.CreatedUtc) <= TimeSpan.FromSeconds(5))
-            {
-                return cached.Fragment;
-            }
-        }
-
-        return await WithCancellation(buildTask, ct).ConfigureAwait(false);
-    }
-
-    private async Task<CharacterDataFragment> BuildAndCacheAsync(GameObjectHandler obj, nint key)
-    {
-        try
-        {
-            using var cts = new CancellationTokenSource(_hardBuildTimeout);
-            var fragment = await CreateCharacterDataInternal(obj, cts.Token).ConfigureAwait(false);
-
-            _characterBuildCache[key] = new CacheEntry(fragment, DateTime.UtcNow);
-            PruneCharacterCacheIfNeeded();
-
-            return fragment;
-        }
-        finally
-        {
-            _characterBuildInflight.TryRemove(key, out _);
-        }
-    }
-
-    private void PruneCharacterCacheIfNeeded()
-    {
-        if (_characterBuildCache.Count < 2048) return;
-
-        var cutoff = DateTime.UtcNow - TimeSpan.FromSeconds(10);
-        foreach (var kv in _characterBuildCache)
-        {
-            if (kv.Value.CreatedUtc < cutoff)
-                _characterBuildCache.TryRemove(kv.Key, out _);
-        }
-    }
-
-    private static async Task<T> WithCancellation<T>(Task<T> task, CancellationToken ct)
-        => await task.WaitAsync(ct).ConfigureAwait(false);
-
-    private async Task<CharacterDataFragment> CreateCharacterDataInternal(GameObjectHandler playerRelatedObject, CancellationToken ct)
+    private async Task<CharacterDataFragment> CreateCharacterData(GameObjectHandler playerRelatedObject, CancellationToken ct)
     {
         var objectKind = playerRelatedObject.ObjectKind;
         CharacterDataFragment fragment = objectKind == ObjectKind.Player ? new CharacterDataFragmentPlayer() : new();
 
-        var logDebug = _logger.IsEnabled(LogLevel.Debug);
-        var sw = Stopwatch.StartNew();
-
         _logger.LogDebug("Building character data for {obj}", playerRelatedObject);
 
-        await EnsureObjectPresentAsync(playerRelatedObject, ct).ConfigureAwait(false);
+        // wait until chara is not drawing and present so nothing spontaneously explodes
+        await _dalamudUtil.WaitWhileCharacterIsDrawing(_logger, playerRelatedObject, Guid.NewGuid(), 30000, ct: ct).ConfigureAwait(false);
+        int totalWaitTime = 10000;
+        while (!await _dalamudUtil.IsObjectPresentAsync(await _dalamudUtil.CreateGameObjectAsync(playerRelatedObject.Address).ConfigureAwait(false)).ConfigureAwait(false) && totalWaitTime > 0)
+        {
+            _logger.LogTrace("Character is null but it shouldn't be, waiting");
+            await Task.Delay(50, ct).ConfigureAwait(false);
+            totalWaitTime -= 50;
+        }
+
         ct.ThrowIfCancellationRequested();
 
-        var waitRecordingTask = _transientResourceManager.WaitForRecording(ct);
+        Dictionary<string, List<ushort>>? boneIndices =
+            objectKind != ObjectKind.Player
+            ? null
+            : await _dalamudUtil.RunOnFrameworkThread(() => _modelAnalyzer.GetSkeletonBoneIndices(playerRelatedObject)).ConfigureAwait(false);
 
-        await _dalamudUtil.WaitWhileCharacterIsDrawing(_logger, playerRelatedObject, Guid.NewGuid(), 30000, ct: ct)
-            .ConfigureAwait(false);
+        DateTime start = DateTime.UtcNow;
+
+        // penumbra call, it's currently broken
+        Dictionary<string, HashSet<string>>? resolvedPaths;
+
+        resolvedPaths = (await _ipcManager.Penumbra.GetCharacterData(_logger, playerRelatedObject).ConfigureAwait(false));
+        if (resolvedPaths == null) throw new InvalidOperationException("Penumbra returned null data");
+
+        ct.ThrowIfCancellationRequested();
+
+        fragment.FileReplacements =
+                new HashSet<FileReplacement>(resolvedPaths.Select(c => new FileReplacement([.. c.Value], c.Key)), FileReplacementComparer.Instance)
+                .Where(p => p.HasFileReplacement).ToHashSet();
+        fragment.FileReplacements.RemoveWhere(c => c.GamePaths.Any(g => !CacheMonitor.AllowedFileExtensions.Any(e => g.EndsWith(e, StringComparison.OrdinalIgnoreCase))));
+
+        ct.ThrowIfCancellationRequested();
+
+        _logger.LogDebug("== Static Replacements ==");
+        foreach (var replacement in fragment.FileReplacements.Where(i => i.HasFileReplacement).OrderBy(i => i.GamePaths.First(), StringComparer.OrdinalIgnoreCase))
+        {
+            _logger.LogDebug("=> {repl}", replacement);
+            ct.ThrowIfCancellationRequested();
+        }
+
+        await _transientResourceManager.WaitForRecording(ct).ConfigureAwait(false);
+
+        // if it's pet then it's summoner, if it's summoner we actually want to keep all filereplacements alive at all times
+        // or we get into redraw city for every change and nothing works properly
+        if (objectKind == ObjectKind.Pet)
+        {
+            foreach (var item in fragment.FileReplacements.Where(i => i.HasFileReplacement).SelectMany(p => p.GamePaths))
+            {
+                if (_transientResourceManager.AddTransientResource(objectKind, item))
+                {
+                    _logger.LogDebug("Marking static {item} for Pet as transient", item);
+                }
+            }
+
+            _logger.LogTrace("Clearing {count} Static Replacements for Pet", fragment.FileReplacements.Count);
+            fragment.FileReplacements.Clear();
+        }
+
+        ct.ThrowIfCancellationRequested();
+
+        _logger.LogDebug("Handling transient update for {obj}", playerRelatedObject);
+
+        // remove all potentially gathered paths from the transient resource manager that are resolved through static resolving
+        _transientResourceManager.ClearTransientPaths(objectKind, fragment.FileReplacements.SelectMany(c => c.GamePaths).ToList());
 
         // get all remaining paths and resolve them
+        var transientPaths = ManageSemiTransientData(objectKind);
+        var resolvedTransientPaths = await GetFileReplacementsFromPaths(transientPaths, new HashSet<string>(StringComparer.Ordinal)).ConfigureAwait(false);
+
+        _logger.LogDebug("== Transient Replacements ==");
+        foreach (var replacement in resolvedTransientPaths.Select(c => new FileReplacement([.. c.Value], c.Key)).OrderBy(f => f.ResolvedPath, StringComparer.Ordinal))
+        {
+            _logger.LogDebug("=> {repl}", replacement);
+            fragment.FileReplacements.Add(replacement);
+        }
+
+        // clean up all semi transient resources that don't have any file replacement (aka null resolve)
+        _transientResourceManager.CleanUpSemiTransientResources(objectKind, [.. fragment.FileReplacements]);
+
         ct.ThrowIfCancellationRequested();
 
-        if (await CheckForNullDrawObject(playerRelatedObject.Address).ConfigureAwait(false))
-            throw new InvalidOperationException("DrawObject became null during build (actor despawned)");
+        // make sure we only return data that actually has file replacements
+        fragment.FileReplacements = new HashSet<FileReplacement>(fragment.FileReplacements.Where(v => v.HasFileReplacement).OrderBy(v => v.ResolvedPath, StringComparer.Ordinal), FileReplacementComparer.Instance);
 
+        // gather up data from ipc
+        Task<string> getHeelsOffset = _ipcManager.Heels.GetOffsetAsync();
         Task<string> getGlamourerData = _ipcManager.Glamourer.GetCharacterCustomizationAsync(playerRelatedObject.Address);
         Task<string?> getCustomizeData = _ipcManager.CustomizePlus.GetScaleAsync(playerRelatedObject.Address);
-        Task<string?>? getMoodlesData = null;
-        Task<string>? getHeelsOffset = null;
-        Task<string>? getHonorificTitle = null;
-
-        if (objectKind == ObjectKind.Player)
-        {
-            getHeelsOffset = _ipcManager.Heels.GetOffsetAsync();
-            getHonorificTitle = _ipcManager.Honorific.GetTitle();
-            getMoodlesData = _ipcManager.Moodles.GetStatusAsync(playerRelatedObject.Address);
-        }
-
-        var resolvedPaths = await _ipcManager.Penumbra.GetCharacterData(_logger, playerRelatedObject).ConfigureAwait(false) ?? throw new InvalidOperationException("Penumbra returned null data; couldn't proceed with character");
-        ct.ThrowIfCancellationRequested();
-
-        var staticBuildTask = Task.Run(() => BuildStaticReplacements(resolvedPaths), ct);
-
-        fragment.FileReplacements = await staticBuildTask.ConfigureAwait(false);
-
-        if (logDebug)
-        {
-            _logger.LogDebug("== Static Replacements ==");
-            foreach (var replacement in fragment.FileReplacements
-                         .Where(i => i.HasFileReplacement)
-                         .OrderBy(i => i.GamePaths.First(), StringComparer.OrdinalIgnoreCase))
-            {
-                _logger.LogDebug("=> {repl}", replacement);
-                ct.ThrowIfCancellationRequested();
-            }
-        }
-
-        var staticReplacements = new HashSet<FileReplacement>(fragment.FileReplacements, FileReplacementComparer.Instance);
-
-        var transientTask = ResolveTransientReplacementsAsync(
-            playerRelatedObject,
-            objectKind,
-            staticReplacements,
-            waitRecordingTask,
-            ct);
-
+        Task<string> getHonorificTitle = _ipcManager.Honorific.GetTitle();
         fragment.GlamourerString = await getGlamourerData.ConfigureAwait(false);
         _logger.LogDebug("Glamourer is now: {data}", fragment.GlamourerString);
-
         var customizeScale = await getCustomizeData.ConfigureAwait(false);
         fragment.CustomizePlusScale = customizeScale ?? string.Empty;
         _logger.LogDebug("Customize is now: {data}", fragment.CustomizePlusScale);
 
         if (objectKind == ObjectKind.Player)
         {
-            CharacterDataFragmentPlayer? playerFragment = fragment as CharacterDataFragmentPlayer ?? throw new InvalidOperationException("Failed to cast CharacterDataFragment to Player variant");
-
+            var playerFragment = (fragment as CharacterDataFragmentPlayer)!;
             playerFragment.ManipulationString = _ipcManager.Penumbra.GetMetaManipulations();
-            playerFragment.HonorificData = await getHonorificTitle!.ConfigureAwait(false);
+
+            playerFragment!.HonorificData = await getHonorificTitle.ConfigureAwait(false);
             _logger.LogDebug("Honorific is now: {data}", playerFragment!.HonorificData);
 
-            playerFragment.PetNamesData = _ipcManager.PetNames.GetLocalNames();
-            _logger.LogDebug("Pet Nicknames is now: {petnames}", playerFragment!.PetNamesData);
-
-            playerFragment.HeelsData = await getHeelsOffset!.ConfigureAwait(false);
+            playerFragment!.HeelsData = await getHeelsOffset.ConfigureAwait(false);
             _logger.LogDebug("Heels is now: {heels}", playerFragment!.HeelsData);
 
-            playerFragment.MoodlesData = (await getMoodlesData!.ConfigureAwait(false)) ?? string.Empty;
+            playerFragment!.MoodlesData = await _ipcManager.Moodles.GetStatusAsync(playerRelatedObject.Address).ConfigureAwait(false) ?? string.Empty;
             _logger.LogDebug("Moodles is now: {moodles}", playerFragment!.MoodlesData);
+
+            playerFragment!.PetNamesData = _ipcManager.PetNames.GetLocalNames();
+            _logger.LogDebug("Pet Nicknames is now: {petnames}", playerFragment!.PetNamesData);
         }
 
         ct.ThrowIfCancellationRequested();
 
-        var (resolvedTransientPaths, clearedForPet) = await transientTask.ConfigureAwait(false);
-        if (clearedForPet != null)
-            fragment.FileReplacements.Clear();
-
-        if (logDebug)
-        {
-            _logger.LogDebug("== Transient Replacements ==");
-            foreach (var replacement in resolvedTransientPaths
-                         .Select(c => new FileReplacement([.. c.Value], c.Key))
-                         .OrderBy(f => f.ResolvedPath, StringComparer.Ordinal))
-            {
-                _logger.LogDebug("=> {repl}", replacement);
-                fragment.FileReplacements.Add(replacement);
-            }
-        }
-        else
-        {
-            foreach (var replacement in resolvedTransientPaths.Select(c => new FileReplacement([.. c.Value], c.Key)))
-                fragment.FileReplacements.Add(replacement);
-        }
-
-        _transientResourceManager.CleanUpSemiTransientResources(objectKind, [.. fragment.FileReplacements]);
-
-        fragment.FileReplacements = new HashSet<FileReplacement>(
-            fragment.FileReplacements
-                .Where(v => v.HasFileReplacement)
-                .OrderBy(v => v.ResolvedPath, StringComparer.Ordinal),
-            FileReplacementComparer.Instance);
-
-        ct.ThrowIfCancellationRequested();
-
         var toCompute = fragment.FileReplacements.Where(f => !f.IsFileSwap).ToArray();
         _logger.LogDebug("Getting Hashes for {amount} Files", toCompute.Length);
-
-        await Task.Run(() =>
+        var computedPaths = _fileCacheManager.GetFileCachesByPaths(toCompute.Select(c => c.ResolvedPath).ToArray());
+        foreach (var file in toCompute)
         {
-            var computedPaths = _fileCacheManager.GetFileCachesByPaths([.. toCompute.Select(c => c.ResolvedPath)]);
-            foreach (var file in toCompute)
-            {
-                ct.ThrowIfCancellationRequested();
-                file.Hash = computedPaths[file.ResolvedPath]?.Hash ?? string.Empty;
-            }
-        }, ct).ConfigureAwait(false);
-
+            ct.ThrowIfCancellationRequested();
+            file.Hash = computedPaths[file.ResolvedPath]?.Hash ?? string.Empty;
+        }
         var removed = fragment.FileReplacements.RemoveWhere(f => !f.IsFileSwap && string.IsNullOrEmpty(f.Hash));
         if (removed > 0)
+        {
             _logger.LogDebug("Removed {amount} of invalid files", removed);
+        }
 
         ct.ThrowIfCancellationRequested();
 
-        Dictionary<string, List<ushort>>? boneIndices = null;
-        var hasPapFiles = false;
-
         if (objectKind == ObjectKind.Player)
         {
-            hasPapFiles = fragment.FileReplacements.Any(f =>
-                !f.IsFileSwap && f.GamePaths.Any(p => p.EndsWith(".pap", StringComparison.OrdinalIgnoreCase)));
-
-            if (hasPapFiles)
-            {
-                boneIndices = await _dalamudUtil
-                    .RunOnFrameworkThread(() => _modelAnalyzer.GetSkeletonBoneIndices(playerRelatedObject))
-                    .ConfigureAwait(false);
-            }
-
             try
             {
-#if DEBUG
-                if (hasPapFiles && boneIndices != null)
-                    _modelAnalyzer.DumpLocalSkeletonIndices(playerRelatedObject);
-#endif
-
-                if (hasPapFiles)
-                {
-                    await VerifyPlayerAnimationBones(boneIndices, (CharacterDataFragmentPlayer)fragment, ct)
-                        .ConfigureAwait(false);
-                }
+                await VerifyPlayerAnimationBones(boneIndices, (fragment as CharacterDataFragmentPlayer)!, ct).ConfigureAwait(false);
             }
             catch (OperationCanceledException e)
             {
@@ -385,374 +269,104 @@ public class PlayerDataFactory
             }
         }
 
-        _logger.LogInformation("Building character data for {obj} took {time}ms",
-            objectKind, sw.Elapsed.TotalMilliseconds);
+        _logger.LogInformation("Building character data for {obj} took {time}ms", objectKind, TimeSpan.FromTicks(DateTime.UtcNow.Ticks - start.Ticks).TotalMilliseconds);
 
         return fragment;
     }
 
-    private async Task EnsureObjectPresentAsync(GameObjectHandler handler, CancellationToken ct)
+    private async Task VerifyPlayerAnimationBones(Dictionary<string, List<ushort>>? boneIndices, CharacterDataFragmentPlayer fragment, CancellationToken ct)
     {
-        var remaining = 10000;
-        while (remaining > 0)
+        if (boneIndices == null) return;
+
+        foreach (var kvp in boneIndices)
         {
-            ct.ThrowIfCancellationRequested();
-
-            var obj = await _dalamudUtil.CreateGameObjectAsync(handler.Address).ConfigureAwait(false);
-            if (await _dalamudUtil.IsObjectPresentAsync(obj).ConfigureAwait(false))
-                return;
-
-            _logger.LogTrace("Character is null but it shouldn't be, waiting");
-            await Task.Delay(50, ct).ConfigureAwait(false);
-            remaining -= 50;
-        }
-    }
-
-    private static HashSet<FileReplacement> BuildStaticReplacements(Dictionary<string, HashSet<string>> resolvedPaths)
-    {
-        var set = new HashSet<FileReplacement>(FileReplacementComparer.Instance);
-
-        foreach (var kvp in resolvedPaths)
-        {
-            var fr = new FileReplacement([.. kvp.Value], kvp.Key);
-            if (!fr.HasFileReplacement) continue;
-
-            var allAllowed = fr.GamePaths.All(g =>
-                CacheMonitor.AllowedFileExtensions.Any(e => g.EndsWith(e, StringComparison.OrdinalIgnoreCase)));
-
-            if (!allAllowed) continue;
-
-            set.Add(fr);
+            _logger.LogDebug("Found {skellyname} ({idx} bone indices) on player: {bones}", kvp.Key, kvp.Value.Any() ? kvp.Value.Max() : 0, string.Join(',', kvp.Value));
         }
 
-        return set;
-    }
-
-    private async Task<(IReadOnlyDictionary<string, string[]> ResolvedPaths, HashSet<FileReplacement>? ClearedReplacements)>
-        ResolveTransientReplacementsAsync(
-            GameObjectHandler obj,
-            ObjectKind objectKind,
-            HashSet<FileReplacement> staticReplacements,
-            Task waitRecordingTask,
-            CancellationToken ct)
-    {
-        await waitRecordingTask.ConfigureAwait(false);
-
-        HashSet<FileReplacement>? clearedReplacements = null;
-
-        if (objectKind == ObjectKind.Pet)
-        {
-            foreach (var item in staticReplacements.Where(i => i.HasFileReplacement).SelectMany(p => p.GamePaths))
-            {
-                if (_transientResourceManager.AddTransientResource(objectKind, item))
-                    _logger.LogDebug("Marking static {item} for Pet as transient", item);
-            }
-
-            _logger.LogTrace("Clearing {count} Static Replacements for Pet", staticReplacements.Count);
-            clearedReplacements = staticReplacements;
-        }
-
-        ct.ThrowIfCancellationRequested();
-
-        _transientResourceManager.ClearTransientPaths(objectKind, [.. staticReplacements.SelectMany(c => c.GamePaths)]);
-
-        var transientPaths = ManageSemiTransientData(objectKind);
-        if (transientPaths.Count == 0)
-            return (new Dictionary<string, string[]>(StringComparer.Ordinal), clearedReplacements);
-
-        var resolved = await GetFileReplacementsFromPaths(obj, transientPaths, new HashSet<string>(StringComparer.Ordinal))
-            .ConfigureAwait(false);
-
-        if (_maxTransientResolvedEntries > 0 && resolved.Count > _maxTransientResolvedEntries)
-        {
-            _logger.LogWarning("Transient entries ({resolved}) are above the threshold {max}; Please consider disable some mods (VFX have heavy load) to reduce transient load",
-                resolved.Count,
-                _maxTransientResolvedEntries);
-        }
-
-        return (resolved, clearedReplacements);
-    }
-
-
-    private async Task VerifyPlayerAnimationBones(
-        Dictionary<string, List<ushort>>? playerBoneIndices,
-        CharacterDataFragmentPlayer fragment,
-        CancellationToken ct)
-    {
-        var mode = _configService.Current.AnimationValidationMode;
-        var allowBasedShift = _configService.Current.AnimationAllowOneBasedShift;
-        var allownNightIndex = _configService.Current.AnimationAllowNeighborIndexTolerance;
-
-        if (mode == AnimationValidationMode.Unsafe)
-            return;
-
-        if (playerBoneIndices == null || playerBoneIndices.Count == 0)
-            return;
-
-        var localBoneSets = new Dictionary<string, HashSet<ushort>>(StringComparer.OrdinalIgnoreCase);
-
-        foreach (var (rawLocalKey, indices) in playerBoneIndices)
-        {
-            if (indices is not { Count: > 0 })
-                continue;
-
-            var key = XivDataAnalyzer.CanonicalizeSkeletonKey(rawLocalKey);
-            if (string.IsNullOrEmpty(key))
-                continue;
-
-            if (!localBoneSets.TryGetValue(key, out var set))
-                localBoneSets[key] = set = [];
-
-            foreach (var idx in indices)
-                set.Add(idx);
-        }
-
-        if (localBoneSets.Count == 0)
-            return;
-
-        if (_logger.IsEnabled(LogLevel.Debug))
-        {
-            _logger.LogDebug("SEND local buckets: {b}",
-                string.Join(", ", localBoneSets.Keys.Order(StringComparer.Ordinal)));
-
-            foreach (var kvp in localBoneSets.OrderBy(k => k.Key, StringComparer.OrdinalIgnoreCase))
-            {
-                var min = kvp.Value.Count > 0 ? kvp.Value.Min() : 0;
-                var max = kvp.Value.Count > 0 ? kvp.Value.Max() : 0;
-                _logger.LogDebug("Local bucket {bucket}: count={count} min={min} max={max}",
-                    kvp.Key, kvp.Value.Count, min, max);
-            }
-        }
-
-        var papGroups = fragment.FileReplacements
-            .Where(f => !f.IsFileSwap
-                        && !string.IsNullOrEmpty(f.Hash)
-                        && f.GamePaths is { Count: > 0 }
-                        && f.GamePaths.Any(p => p.EndsWith(".pap", StringComparison.OrdinalIgnoreCase)))
-            .GroupBy(f => f.Hash!, StringComparer.OrdinalIgnoreCase)
-            .ToList();
+        if (boneIndices.All(u => u.Value.Count == 0)) return;
 
         int noValidationFailed = 0;
-
-        foreach (var g in papGroups)
+        foreach (var file in fragment.FileReplacements.Where(f => !f.IsFileSwap && f.GamePaths.First().EndsWith("pap", StringComparison.OrdinalIgnoreCase)).ToList())
         {
             ct.ThrowIfCancellationRequested();
 
-            var hash = g.Key;
-
-            var resolvedPath = g.Select(f => f.ResolvedPath).Distinct(StringComparer.OrdinalIgnoreCase);
-            var papPathSummary = string.Join(", ", resolvedPath);
-            if (papPathSummary.IsNullOrEmpty())
-                papPathSummary = "<unknown pap path>";
-
-            Dictionary<string, List<ushort>>? papIndices = null;
-
-            await _papParseLimiter.WaitAsync(ct).ConfigureAwait(false);
-            try
+            var skeletonIndices = await _dalamudUtil.RunOnFrameworkThread(() => _modelAnalyzer.GetBoneIndicesFromPap(file.Hash)).ConfigureAwait(false);
+            bool validationFailed = false;
+            if (skeletonIndices != null)
             {
-                var cacheEntity = _fileCacheManager.GetFileCacheByHash(hash);
-                var papPath = cacheEntity?.ResolvedFilepath;
-
-                if (!string.IsNullOrEmpty(papPath) && File.Exists(papPath))
+                // 105 is the maximum vanilla skellington spoopy bone index
+                if (skeletonIndices.All(k => k.Value.Max() <= 105))
                 {
-                    var havokBytes = await Task.Run(() => XivDataAnalyzer.ReadHavokBytesFromPap(papPath), ct)
-                        .ConfigureAwait(false);
+                    _logger.LogTrace("All indices of {path} are <= 105, ignoring", file.ResolvedPath);
+                    continue;
+                }
 
-                    if (havokBytes is { Length: > 8 })
+                _logger.LogDebug("Verifying bone indices for {path}, found {x} skeletons", file.ResolvedPath, skeletonIndices.Count);
+
+                foreach (var boneCount in skeletonIndices.Select(k => k).ToList())
+                {
+                    if (boneCount.Value.Max() > boneIndices.SelectMany(b => b.Value).Max())
                     {
-                        papIndices = await _dalamudUtil.RunOnFrameworkThread(
-                                () => _modelAnalyzer.ParseHavokBytesOnFrameworkThread(havokBytes, hash, persistToConfig: false))
-                            .ConfigureAwait(false);
+                        _logger.LogWarning("Found more bone indices on the animation {path} skeleton {skl} (max indice {idx}) than on any player related skeleton (max indice {idx2})",
+                            file.ResolvedPath, boneCount.Key, boneCount.Value.Max(), boneIndices.SelectMany(b => b.Value).Max());
+                        validationFailed = true;
+                        break;
                     }
                 }
             }
-            finally
+
+            if (validationFailed)
             {
-                _papParseLimiter.Release();
-            }
-
-            if (papIndices == null || papIndices.Count == 0)
-                continue;
-
-            if (_logger.IsEnabled(LogLevel.Debug))
-            {
-                try
+                noValidationFailed++;
+                _logger.LogDebug("Removing {file} from sent file replacements and transient data", file.ResolvedPath);
+                fragment.FileReplacements.Remove(file);
+                foreach (var gamePath in file.GamePaths)
                 {
-                    var papBuckets = papIndices
-                        .Where(kvp => kvp.Value is { Count: > 0 })
-                        .Select(kvp => new
-                        {
-                            Raw = kvp.Key,
-                            Key = XivDataAnalyzer.CanonicalizeSkeletonKey(kvp.Key),
-                            Indices = kvp.Value
-                        })
-                        .Where(x => x.Indices is { Count: > 0 })
-                        .GroupBy(x => string.IsNullOrEmpty(x.Key) ? x.Raw : x.Key!, StringComparer.OrdinalIgnoreCase)
-                        .Select(grp =>
-                        {
-                            var all = grp.SelectMany(v => v.Indices).ToList();
-                            var min = all.Count > 0 ? all.Min() : 0;
-                            var max = all.Count > 0 ? all.Max() : 0;
-                            var raws = string.Join(',', grp.Select(v => v.Raw).Distinct(StringComparer.OrdinalIgnoreCase));
-                            return $"{grp.Key}(min={min},max={max},raw=[{raws}])";
-                        })
-                        .ToList();
-
-                    _logger.LogDebug("SEND pap buckets for hash={hash}: {b}",
-                        hash,
-                        string.Join(" | ", papBuckets));
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogDebug(ex, "Error logging PAP bucket details for hash={hash}", hash);
+                    _transientResourceManager.RemoveTransientResource(ObjectKind.Player, gamePath);
                 }
             }
 
-            bool isCompatible = false;
-            string reason = string.Empty;
-            try
-            {
-                isCompatible = XivDataAnalyzer.IsPapCompatible(localBoneSets, papIndices, mode, allowBasedShift, allownNightIndex, out reason);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning(ex, "Error checking PAP compatibility for hash={hash}, path={path}. Treating as incompatible.", hash, papPathSummary);
-                reason = $"Exception during compatibility check: {ex.Message}";
-                isCompatible = false;
-            }
-
-            if (isCompatible)
-                continue;
-
-            noValidationFailed++;
-
-            _logger.LogWarning(
-                "Animation PAP is not compatible with local skeletons; dropping mappings for {papPath}. Reason: {reason}",
-                papPathSummary,
-                reason);
-
-            var removedGamePaths = fragment.FileReplacements
-                .Where(fr => !fr.IsFileSwap
-                             && string.Equals(fr.Hash, hash, StringComparison.OrdinalIgnoreCase)
-                             && fr.GamePaths.Any(p => p.EndsWith(".pap", StringComparison.OrdinalIgnoreCase)))
-                .SelectMany(fr => fr.GamePaths.Where(p => p.EndsWith(".pap", StringComparison.OrdinalIgnoreCase)))
-                .Distinct(StringComparer.OrdinalIgnoreCase)
-                .ToList();
-
-            fragment.FileReplacements.RemoveWhere(fr =>
-                !fr.IsFileSwap
-                && string.Equals(fr.Hash, hash, StringComparison.OrdinalIgnoreCase)
-                && fr.GamePaths.Any(p => p.EndsWith(".pap", StringComparison.OrdinalIgnoreCase)));
-
-            foreach (var gp in removedGamePaths)
-                _transientResourceManager.RemoveTransientResource(ObjectKind.Player, gp);
         }
 
         if (noValidationFailed > 0)
         {
-            _lightlessMediator.Publish(new NotificationMessage(
-                "Invalid Skeleton Setup",
-                $"Your client is attempting to send {noValidationFailed} animation files that don't match your current skeleton validation mode ({mode}). " +
-                "Please adjust your skeleton/mods or change the validation mode if this is unexpected. " +
-                "Those animation files have been removed from your sent (player) data. (Check /xllog for details).",
-                NotificationType.Warning,
-                TimeSpan.FromSeconds(10)));
+            _lightlessMediator.Publish(new NotificationMessage("Invalid Skeleton Setup",
+                $"Your client is attempting to send {noValidationFailed} animation files with invalid bone data. Those animation files have been removed from your sent data. " +
+                $"Verify that you are using the correct skeleton for those animation files (Check /xllog for more information).",
+                NotificationType.Warning, TimeSpan.FromSeconds(10)));
         }
     }
 
-
-    private async Task<IReadOnlyDictionary<string, string[]>> GetFileReplacementsFromPaths(
-        GameObjectHandler handler,
-        HashSet<string> forwardResolve,
-        HashSet<string> reverseResolve)
+    private async Task<IReadOnlyDictionary<string, string[]>> GetFileReplacementsFromPaths(HashSet<string> forwardResolve, HashSet<string> reverseResolve)
     {
         var forwardPaths = forwardResolve.ToArray();
         var reversePaths = reverseResolve.ToArray();
-        if (forwardPaths.Length == 0 && reversePaths.Length == 0)
-        {
-            return new Dictionary<string, string[]>(StringComparer.OrdinalIgnoreCase).AsReadOnly();
-        }
-
-        var forwardPathsLower = forwardPaths.Length == 0 ? [] : forwardPaths.Select(p => p.ToLowerInvariant()).ToArray();
-        var reversePathsLower = reversePaths.Length == 0 ? [] : reversePaths.Select(p => p.ToLowerInvariant()).ToArray();
-
-        Dictionary<string, List<string>> resolvedPaths = new(forwardPaths.Length + reversePaths.Length, StringComparer.Ordinal);
-        if (handler.ObjectKind != ObjectKind.Player)
-        {
-            var (objectIndex, forwardResolved, reverseResolved) = await _dalamudUtil.RunOnFrameworkThread(() =>
-            {
-                var idx = handler.GetGameObject()?.ObjectIndex;
-                if (!idx.HasValue)
-                    return ((int?)null, Array.Empty<string>(), Array.Empty<string[]>());
-
-                var resolvedForward = new string[forwardPaths.Length];
-                for (int i = 0; i < forwardPaths.Length; i++)
-                    resolvedForward[i] = _ipcManager.Penumbra.ResolveGameObjectPath(forwardPaths[i], idx.Value);
-
-                var resolvedReverse = new string[reversePaths.Length][];
-                for (int i = 0; i < reversePaths.Length; i++)
-                    resolvedReverse[i] = _ipcManager.Penumbra.ReverseResolveGameObjectPath(reversePaths[i], idx.Value);
-
-                return (idx, resolvedForward, resolvedReverse);
-            }).ConfigureAwait(false);
-
-            if (objectIndex.HasValue)
-            {
-                for (int i = 0; i < forwardPaths.Length; i++)
-                {
-                    var filePath = forwardResolved[i]?.ToLowerInvariant();
-                    if (string.IsNullOrEmpty(filePath))
-                        continue;
-
-                    if (resolvedPaths.TryGetValue(filePath, out var list))
-                        list.Add(forwardPaths[i].ToLowerInvariant());
-                    else
-                    {
-                        resolvedPaths[filePath] = [forwardPathsLower[i]];
-                    }
-                }
-
-                for (int i = 0; i < reversePaths.Length; i++)
-                {
-                    var filePath = reversePathsLower[i];
-                    var reverseResolvedLower = new string[reverseResolved[i].Length];
-                    for (var j = 0; j < reverseResolvedLower.Length; j++)
-                    {
-                        reverseResolvedLower[j] = reverseResolved[i][j].ToLowerInvariant();
-                    }
-                    if (resolvedPaths.TryGetValue(filePath, out var list))
-                        list.AddRange(reverseResolved[i].Select(c => c.ToLowerInvariant()));
-                    else
-                        resolvedPaths[filePath] = [.. reverseResolved[i].Select(c => c.ToLowerInvariant()).ToList()];
-                }
-
-                return resolvedPaths.ToDictionary(k => k.Key, k => k.Value.ToArray(), StringComparer.OrdinalIgnoreCase).AsReadOnly();
-            }
-        }
-
+        Dictionary<string, List<string>> resolvedPaths = new(StringComparer.Ordinal);
         var (forward, reverse) = await _ipcManager.Penumbra.ResolvePathsAsync(forwardPaths, reversePaths).ConfigureAwait(false);
-
         for (int i = 0; i < forwardPaths.Length; i++)
         {
             var filePath = forward[i].ToLowerInvariant();
             if (resolvedPaths.TryGetValue(filePath, out var list))
+            {
                 list.Add(forwardPaths[i].ToLowerInvariant());
+            }
             else
+            {
                 resolvedPaths[filePath] = [forwardPaths[i].ToLowerInvariant()];
+            }
         }
 
         for (int i = 0; i < reversePaths.Length; i++)
         {
-            var filePath = reversePathsLower[i];
-            var reverseResolvedLower = new string[reverse[i].Length];
-            for (var j = 0; j < reverseResolvedLower.Length; j++)
-            {
-                reverseResolvedLower[j] = reverse[i][j].ToLowerInvariant();
-            }
+            var filePath = reversePaths[i].ToLowerInvariant();
             if (resolvedPaths.TryGetValue(filePath, out var list))
+            {
                 list.AddRange(reverse[i].Select(c => c.ToLowerInvariant()));
+            }
             else
-                resolvedPaths[filePath] = [.. reverse[i].Select(c => c.ToLowerInvariant()).ToList()];
+            {
+                resolvedPaths[filePath] = new List<string>(reverse[i].Select(c => c.ToLowerInvariant()).ToList());
+            }
         }
 
         return resolvedPaths.ToDictionary(k => k.Key, k => k.Value.ToArray(), StringComparer.OrdinalIgnoreCase).AsReadOnly();
@@ -763,29 +377,11 @@ public class PlayerDataFactory
         _transientResourceManager.PersistTransientResources(objectKind);
 
         HashSet<string> pathsToResolve = new(StringComparer.Ordinal);
-
-        int scanned = 0, skippedEmpty = 0, skippedVfx = 0;
-
-        foreach (var path in _transientResourceManager.GetSemiTransientResources(objectKind))
+        foreach (var path in _transientResourceManager.GetSemiTransientResources(objectKind).Where(path => !string.IsNullOrEmpty(path)))
         {
-            scanned++;
-
-            if (string.IsNullOrEmpty(path))
-            {
-                skippedEmpty++;
-                continue;
-            }
-
             pathsToResolve.Add(path);
         }
 
-        if (_logger.IsEnabled(LogLevel.Debug))
-        {
-            _logger.LogDebug(
-                "ManageSemiTransientData({kind}): scanned={scanned}, added={added}, skippedEmpty={skippedEmpty}, skippedVfx={skippedVfx}",
-                objectKind, scanned, pathsToResolve.Count, skippedEmpty, skippedVfx);
-        }
-
         return pathsToResolve;
     }
-}
+}

LightlessSync/PlayerData/Handlers/GameObjectHandler.cs

@@ -1,68 +1,43 @@
-using Dalamud.Game.ClientState.Objects.Enums;
-using Dalamud.Game.ClientState.Objects.Types;
-using Dalamud.Plugin.Services;
+using FFXIVClientStructs.FFXIV.Client.Game.Character;
+using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
 using LightlessSync.Services;
 using LightlessSync.Services.Mediator;
 using Microsoft.Extensions.Logging;
+using System.Runtime.CompilerServices;
+using static FFXIVClientStructs.FFXIV.Client.Game.Character.DrawDataContainer;
+using VisibilityFlags = FFXIVClientStructs.FFXIV.Client.Game.Object.VisibilityFlags;
 using ObjectKind = LightlessSync.API.Data.Enum.ObjectKind;
 
 namespace LightlessSync.PlayerData.Handlers;
 
-/// <summary>
-/// Game object handler for managing game object state and updates
-/// </summary>
 public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighPriorityMediatorSubscriber
 {
     private readonly DalamudUtilService _dalamudUtil;
-    private readonly IObjectTable _objectTable;
     private readonly Func<IntPtr> _getAddress;
     private readonly bool _isOwnedObject;
     private readonly PerformanceCollectorService _performanceCollector;
-    private readonly Lock _frameworkUpdateGate = new();
-    private bool _frameworkUpdateSubscribed;
     private byte _classJob = 0;
     private Task? _delayedZoningTask;
     private bool _haltProcessing = false;
     private CancellationTokenSource _zoningCts = new();
 
-    /// <summary>
-    /// Constructor for GameObjectHandler
-    /// </summary>
-    /// <param name="logger">Logger</param>
-    /// <param name="performanceCollector">Performance Collector</param>
-    /// <param name="mediator">Lightless Mediator</param>
-    /// <param name="dalamudUtil">Dalamud Utilties Service</param>
-    /// <param name="objectKind">Object kind of Object</param>
-    /// <param name="getAddress">Get Adress</param>
-    /// <param name="objectTable">Object table of Dalamud</param>
-    /// <param name="ownedObject">Object is owned by user</param>
-    public GameObjectHandler(
-        ILogger<GameObjectHandler> logger,
-        PerformanceCollectorService performanceCollector,
-        LightlessMediator mediator,
-        DalamudUtilService dalamudUtil,
-        ObjectKind objectKind,
-        Func<IntPtr> getAddress,
-        IObjectTable objectTable,
-        bool ownedObject = true) : base(logger, mediator)
+    public GameObjectHandler(ILogger<GameObjectHandler> logger, PerformanceCollectorService performanceCollector,
+        LightlessMediator mediator, DalamudUtilService dalamudUtil, ObjectKind objectKind, Func<IntPtr> getAddress, bool ownedObject = true) : base(logger, mediator)
     {
         _performanceCollector = performanceCollector;
         ObjectKind = objectKind;
         _dalamudUtil = dalamudUtil;
-        _objectTable = objectTable;
-
         _getAddress = () =>
         {
             _dalamudUtil.EnsureIsOnFramework();
             return getAddress.Invoke();
         };
-
         _isOwnedObject = ownedObject;
         Name = string.Empty;
 
         if (ownedObject)
         {
-            Mediator.Subscribe<TransientResourceChangedMessage>(this, msg =>
+            Mediator.Subscribe<TransientResourceChangedMessage>(this, (msg) =>
             {
                 if (_delayedZoningTask?.IsCompleted ?? true)
                 {
@@ -72,36 +47,40 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
             });
         }
 
-        EnableFrameworkUpdates();
+        Mediator.Subscribe<FrameworkUpdateMessage>(this, (_) => FrameworkUpdate());
 
-        Mediator.Subscribe<ZoneSwitchEndMessage>(this, _ => ZoneSwitchEnd());
-        Mediator.Subscribe<ZoneSwitchStartMessage>(this, _ => ZoneSwitchStart());
+        Mediator.Subscribe<ZoneSwitchEndMessage>(this, (_) => ZoneSwitchEnd());
+        Mediator.Subscribe<ZoneSwitchStartMessage>(this, (_) => ZoneSwitchStart());
 
-        Mediator.Subscribe<CutsceneStartMessage>(this, _ => _haltProcessing = true);
-        Mediator.Subscribe<CutsceneEndMessage>(this, _ =>
+        Mediator.Subscribe<CutsceneStartMessage>(this, (_) =>
+        {
+            _haltProcessing = true;
+        });
+        Mediator.Subscribe<CutsceneEndMessage>(this, (_) =>
         {
             _haltProcessing = false;
             ZoneSwitchEnd();
         });
-
-        Mediator.Subscribe<PenumbraStartRedrawMessage>(this, msg =>
+        Mediator.Subscribe<PenumbraStartRedrawMessage>(this, (msg) =>
         {
-            if (msg.Address == Address) _haltProcessing = true;
+            if (msg.Address == Address)
+            {
+                _haltProcessing = true;
+            }
         });
-        Mediator.Subscribe<PenumbraEndRedrawMessage>(this, msg =>
+        Mediator.Subscribe<PenumbraEndRedrawMessage>(this, (msg) =>
         {
-            if (msg.Address == Address) _haltProcessing = false;
+            if (msg.Address == Address)
+            {
+                _haltProcessing = false;
+            }
         });
 
         Mediator.Publish(new GameObjectHandlerCreatedMessage(this, _isOwnedObject));
 
-        _dalamudUtil.EnsureIsOnFramework();
-        CheckAndUpdateObject(allowPublish: true);
+        _dalamudUtil.RunOnFrameworkThread(CheckAndUpdateObject).GetAwaiter().GetResult();
     }
 
-    /// <summary>
-    /// Draw Condition Enum
-    /// </summary>
     public enum DrawCondition
     {
         None,
@@ -112,7 +91,6 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
         ModelFilesInSlotLoaded
     }
 
-    // Properties
     public IntPtr Address { get; private set; }
     public DrawCondition CurrentDrawCondition { get; set; } = DrawCondition.None;
     public byte Gender { get; private set; }
@@ -123,36 +101,28 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
     public byte TribeId { get; private set; }
     private byte[] CustomizeData { get; set; } = new byte[26];
     private IntPtr DrawObjectAddress { get; set; }
+    private byte[] EquipSlotData { get; set; } = new byte[40];
+    private ushort[] MainHandData { get; set; } = new ushort[3];
+    private ushort[] OffHandData { get; set; } = new ushort[3];
 
-    /// <summary>
-    /// Act on framework thread after ensuring no draw condition
-    /// </summary>
-    /// <param name="act">Action of Character</param>
-    /// <param name="token">Cancellation Token</param>
-    /// <returns>Task Completion</returns>
-    public async Task ActOnFrameworkAfterEnsureNoDrawAsync(Action<ICharacter> act, CancellationToken token)
+    public async Task ActOnFrameworkAfterEnsureNoDrawAsync(Action<Dalamud.Game.ClientState.Objects.Types.ICharacter> act, CancellationToken token)
     {
         while (await _dalamudUtil.RunOnFrameworkThread(() =>
-        {
-            EnsureLatestObjectState();
-            if (CurrentDrawCondition != DrawCondition.None) return true;
-            var gameObj = _dalamudUtil.CreateGameObject(Address);
-            if (gameObj is ICharacter chara)
-            {
-                act.Invoke(chara);
-            }
-            return false;
-        }).ConfigureAwait(false))
+               {
+                   if (_haltProcessing) CheckAndUpdateObject();
+                   if (CurrentDrawCondition != DrawCondition.None) return true;
+                   var gameObj = _dalamudUtil.CreateGameObject(Address);
+                   if (gameObj is Dalamud.Game.ClientState.Objects.Types.ICharacter chara)
+                   {
+                       act.Invoke(chara);
+                   }
+                   return false;
+               }).ConfigureAwait(false))
         {
             await Task.Delay(250, token).ConfigureAwait(false);
         }
     }
 
-    /// <summary>
-    /// Compare Name And Throw if not equal 
-    /// </summary>
-    /// <param name="name">Name that will be compared to Object Handler.</param>
-    /// <exception cref="InvalidOperationException">Not equal if thrown</exception>
     public void CompareNameAndThrow(string name)
     {
         if (!string.Equals(Name, name, StringComparison.OrdinalIgnoreCase))
@@ -165,18 +135,11 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
         }
     }
 
-    /// <summary>
-    /// Gets the game object from the address
-    /// </summary>
-    /// <returns>Gane object</returns>
-    public IGameObject? GetGameObject()
+    public Dalamud.Game.ClientState.Objects.Types.IGameObject? GetGameObject()
     {
         return _dalamudUtil.CreateGameObject(Address);
     }
 
-    /// <summary>
-    /// Invalidate the object handler
-    /// </summary>
     public void Invalidate()
     {
         Address = IntPtr.Zero;
@@ -185,203 +148,148 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
         _haltProcessing = false;
     }
 
-    /// <summary>
-    /// Refresh the object handler state
-    /// </summary>
-    public void Refresh()
-    {
-        _dalamudUtil.RunOnFrameworkThread(CheckAndUpdateObject).GetAwaiter().GetResult();
-    }
-
-    /// <summary>
-    /// Is Being Drawn Run On Framework Asyncronously
-    /// </summary>
-    /// <returns>Object is being run in framework</returns>
     public async Task<bool> IsBeingDrawnRunOnFrameworkAsync()
     {
         return await _dalamudUtil.RunOnFrameworkThread(IsBeingDrawn).ConfigureAwait(false);
     }
 
-    /// <summary>
-    /// Override ToString method for GameObjectHandler
-    /// </summary>
-    /// <returns>String</returns>
     public override string ToString()
     {
         var owned = _isOwnedObject ? "Self" : "Other";
         return $"{owned}/{ObjectKind}:{Name} ({Address:X},{DrawObjectAddress:X})";
     }
 
-    /// <summary>
-    /// Try Get Object By Address from Object Table
-    /// </summary>
-    /// <param name="address">Object address</param>
-    /// <returns>Game Object of adress</returns>
-    private IGameObject? TryGetObjectByAddress(nint address)
+    protected override void Dispose(bool disposing)
     {
-        if (address == nint.Zero) return null;
+        base.Dispose(disposing);
 
-        // Search object table
-        foreach (var obj in _objectTable)
-        {
-            if (obj is null) continue;
-            if (obj.Address == address)
-                return obj;
-        }
-        return null;
+        Mediator.Publish(new GameObjectHandlerDestroyedMessage(this, _isOwnedObject));
     }
 
-    /// <summary>
-    /// Checks and updates the object state
-    /// </summary>
-    private void CheckAndUpdateObject() => CheckAndUpdateObject(allowPublish: true);
-
-    /// <summary>
-    /// Checks and updates the object state with option to allow publish
-    /// </summary>
-    /// <param name="allowPublish">Allows to publish the object</param>
-    private void CheckAndUpdateObject(bool allowPublish)
+    private unsafe void CheckAndUpdateObject()
     {
         var prevAddr = Address;
         var prevDrawObj = DrawObjectAddress;
-        string? nameString = null;
 
         Address = _getAddress();
-
-        IGameObject? obj = null;
-        ICharacter? chara = null;
-
-        if (Address != nint.Zero)
+        if (Address != IntPtr.Zero)
         {
-            // Try get object
-            obj = TryGetObjectByAddress(Address);
-
-            if (obj is not null)
-            {
-                EntityId = obj.EntityId;
-
-                DrawObjectAddress = Address;
-
-                // Name update
-                nameString = obj.Name.TextValue ?? string.Empty;
-                if (!string.IsNullOrEmpty(nameString) && !string.Equals(nameString, Name, StringComparison.Ordinal))
-                    Name = nameString;
-
-                chara = obj as ICharacter;
-            }
-            else
-            {
-                DrawObjectAddress = nint.Zero;
-                EntityId = uint.MaxValue;
-            }
+            var gameObject = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)Address;
+            var drawObjAddr = (IntPtr)gameObject->DrawObject;
+            DrawObjectAddress = drawObjAddr;
+            EntityId = gameObject->EntityId;
+            CurrentDrawCondition = DrawCondition.None;
         }
         else
         {
-            DrawObjectAddress = nint.Zero;
+            DrawObjectAddress = IntPtr.Zero;
             EntityId = uint.MaxValue;
+            CurrentDrawCondition = DrawCondition.DrawObjectZero;
         }
 
-        // Update draw condition
-        CurrentDrawCondition = IsBeingDrawnSafe(obj, chara);
+        CurrentDrawCondition = IsBeingDrawnUnsafe();
 
-        if (_haltProcessing || !allowPublish) return;
+        if (_haltProcessing) return;
 
-        // Determine differences
         bool drawObjDiff = DrawObjectAddress != prevDrawObj;
         bool addrDiff = Address != prevAddr;
 
-        // Name change check
-        bool nameChange = false;
-        if (nameString is not null)
+        if (Address != IntPtr.Zero && DrawObjectAddress != IntPtr.Zero)
         {
-            nameChange = !string.Equals(nameString, Name, StringComparison.Ordinal);
-            if (nameChange) Name = nameString;
-        }
-
-        // Customize data change check
-        bool customizeDiff = false;
-        if (chara is not null)
-        {
-            // Class job change check
-            var classJob = chara.ClassJob.RowId;
-            if (classJob != _classJob)
+            var chara = (Character*)Address;
+            var name = chara->GameObject.NameString;
+            bool nameChange = !string.Equals(name, Name, StringComparison.Ordinal);
+            if (nameChange)
             {
-                Logger.LogTrace("[{this}] classjob changed from {old} to {new}", this, _classJob, classJob);
-                _classJob = (byte)classJob;
-                Mediator.Publish(new ClassJobChangedMessage(this));
+                Name = name;
+            }
+            bool equipDiff = false;
+
+            if (((DrawObject*)DrawObjectAddress)->Object.GetObjectType() == ObjectType.CharacterBase
+                && ((CharacterBase*)DrawObjectAddress)->GetModelType() == CharacterBase.ModelType.Human)
+            {
+                var classJob = chara->CharacterData.ClassJob;
+                if (classJob != _classJob)
+                {
+                    Logger.LogTrace("[{this}] classjob changed from {old} to {new}", this, _classJob, classJob);
+                    _classJob = classJob;
+                    Mediator.Publish(new ClassJobChangedMessage(this));
+                }
+
+                equipDiff = CompareAndUpdateEquipByteData((byte*)&((Human*)DrawObjectAddress)->Head);
+
+                ref var mh = ref chara->DrawData.Weapon(WeaponSlot.MainHand);
+                ref var oh = ref chara->DrawData.Weapon(WeaponSlot.OffHand);
+                equipDiff |= CompareAndUpdateMainHand((Weapon*)mh.DrawObject);
+                equipDiff |= CompareAndUpdateOffHand((Weapon*)oh.DrawObject);
+
+                if (equipDiff)
+                    Logger.LogTrace("Checking [{this}] equip data as human from draw obj, result: {diff}", this, equipDiff);
+            }
+            else
+            {
+                equipDiff = CompareAndUpdateEquipByteData((byte*)Unsafe.AsPointer(ref chara->DrawData.EquipmentModelIds[0]));
+                if (equipDiff)
+                    Logger.LogTrace("Checking [{this}] equip data from game obj, result: {diff}", this, equipDiff);
             }
 
-            // Customize data comparison
-            customizeDiff = CompareAndUpdateCustomizeData(chara.Customize);
-
-            // Census update publish
-            if (_isOwnedObject && ObjectKind == ObjectKind.Player && chara.Customize.Length > (int)CustomizeIndex.Tribe)
+            if (equipDiff && !_isOwnedObject) // send the message out immediately and cancel out, no reason to continue if not self
             {
-                var gender = chara.Customize[(int)CustomizeIndex.Gender];
-                var raceId = chara.Customize[(int)CustomizeIndex.Race];
-                var tribeId = chara.Customize[(int)CustomizeIndex.Tribe];
+                Logger.LogTrace("[{this}] Changed", this);
+                return;
+            }
 
-                if (gender != Gender || raceId != RaceId || tribeId != TribeId)
+            bool customizeDiff = false;
+
+            if (((DrawObject*)DrawObjectAddress)->Object.GetObjectType() == ObjectType.CharacterBase
+                && ((CharacterBase*)DrawObjectAddress)->GetModelType() == CharacterBase.ModelType.Human)
+            {
+                var gender = ((Human*)DrawObjectAddress)->Customize.Sex;
+                var raceId = ((Human*)DrawObjectAddress)->Customize.Race;
+                var tribeId = ((Human*)DrawObjectAddress)->Customize.Tribe;
+
+                if (_isOwnedObject && ObjectKind == ObjectKind.Player
+                    && (gender != Gender || raceId != RaceId || tribeId != TribeId))
                 {
                     Mediator.Publish(new CensusUpdateMessage(gender, raceId, tribeId));
                     Gender = gender;
                     RaceId = raceId;
                     TribeId = tribeId;
                 }
+
+                customizeDiff = CompareAndUpdateCustomizeData(((Human*)DrawObjectAddress)->Customize.Data);
+                if (customizeDiff)
+                    Logger.LogTrace("Checking [{this}] customize data as human from draw obj, result: {diff}", this, customizeDiff);
+            }
+            else
+            {
+                customizeDiff = CompareAndUpdateCustomizeData(chara->DrawData.CustomizeData.Data);
+                if (customizeDiff)
+                    Logger.LogTrace("Checking [{this}] customize data from game obj, result: {diff}", this, equipDiff);
             }
-        }
 
-
-        if ((addrDiff || drawObjDiff || customizeDiff || nameChange) && _isOwnedObject)
-        {
-            Logger.LogDebug("[{this}] Changed, Sending CreateCacheObjectMessage", this);
-            Mediator.Publish(new CreateCacheForObjectMessage(this));
+            if ((addrDiff || drawObjDiff || equipDiff || customizeDiff || nameChange) && _isOwnedObject)
+            {
+                Logger.LogDebug("[{this}] Changed, Sending CreateCacheObjectMessage", this);
+                Mediator.Publish(new CreateCacheForObjectMessage(this));
+            }
         }
         else if (addrDiff || drawObjDiff)
         {
-            if (Address == nint.Zero)
-                CurrentDrawCondition = DrawCondition.ObjectZero;
-            else if (DrawObjectAddress == nint.Zero)
-                CurrentDrawCondition = DrawCondition.DrawObjectZero;
-
+            CurrentDrawCondition = DrawCondition.DrawObjectZero;
             Logger.LogTrace("[{this}] Changed", this);
-
             if (_isOwnedObject && ObjectKind != ObjectKind.Player)
+            {
                 Mediator.Publish(new ClearCacheForObjectMessage(this));
+            }
         }
     }
 
-    /// <summary>
-    /// Is object being drawn safe check
-    /// </summary>
-    /// <param name="obj">Object thats being checked</param>
-    /// <param name="chara">Character of the object</param>
-    /// <returns>Draw Condition of character</returns>
-    private DrawCondition IsBeingDrawnSafe(IGameObject? obj, ICharacter? chara)
-    {
-        // Object zero check
-        if (Address == nint.Zero) return DrawCondition.ObjectZero;
-        if (obj is null) return DrawCondition.DrawObjectZero;
-
-        // Draw Object check
-        if (chara is not null && (chara.Customize is null || chara.Customize.Length == 0))
-            return DrawCondition.DrawObjectZero;
-
-        return DrawCondition.None;
-    }
-
-    /// <summary>
-    /// Compare and update customize data of character
-    /// </summary>
-    /// <param name="customizeData">Customize+ data of object</param>
-    /// <returns>Successfully applied or not</returns>
-    private bool CompareAndUpdateCustomizeData(ReadOnlySpan<byte> customizeData)
+    private unsafe bool CompareAndUpdateCustomizeData(Span<byte> customizeData)
     {
         bool hasChanges = false;
 
-        // Resize if needed
-        var len = Math.Min(customizeData.Length, CustomizeData.Length);
-        for (int i = 0; i < len; i++)
+        for (int i = 0; i < customizeData.Length; i++)
         {
             var data = customizeData[i];
             if (CustomizeData[i] != data)
@@ -394,15 +302,56 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
         return hasChanges;
     }
 
-    /// <summary>
-    /// Framework update method
-    /// </summary>
+    private unsafe bool CompareAndUpdateEquipByteData(byte* equipSlotData)
+    {
+        bool hasChanges = false;
+        for (int i = 0; i < EquipSlotData.Length; i++)
+        {
+            var data = equipSlotData[i];
+            if (EquipSlotData[i] != data)
+            {
+                EquipSlotData[i] = data;
+                hasChanges = true;
+            }
+        }
+
+        return hasChanges;
+    }
+
+    private unsafe bool CompareAndUpdateMainHand(Weapon* weapon)
+    {
+        if ((nint)weapon == nint.Zero) return false;
+        bool hasChanges = false;
+        hasChanges |= weapon->ModelSetId != MainHandData[0];
+        MainHandData[0] = weapon->ModelSetId;
+        hasChanges |= weapon->Variant != MainHandData[1];
+        MainHandData[1] = weapon->Variant;
+        hasChanges |= weapon->SecondaryId != MainHandData[2];
+        MainHandData[2] = weapon->SecondaryId;
+        return hasChanges;
+    }
+
+    private unsafe bool CompareAndUpdateOffHand(Weapon* weapon)
+    {
+        if ((nint)weapon == nint.Zero) return false;
+        bool hasChanges = false;
+        hasChanges |= weapon->ModelSetId != OffHandData[0];
+        OffHandData[0] = weapon->ModelSetId;
+        hasChanges |= weapon->Variant != OffHandData[1];
+        OffHandData[1] = weapon->Variant;
+        hasChanges |= weapon->SecondaryId != OffHandData[2];
+        OffHandData[2] = weapon->SecondaryId;
+        return hasChanges;
+    }
+
     private void FrameworkUpdate()
     {
+        if (!_delayedZoningTask?.IsCompleted ?? false) return;
+
         try
         {
-            var zoningDelayActive = !(_delayedZoningTask?.IsCompleted ?? true);
-            _performanceCollector.LogPerformance(this, $"CheckAndUpdateObject>{(_isOwnedObject ? "Self" : "Other")}+{ObjectKind}/{(string.IsNullOrEmpty(Name) ? "Unk" : Name)}", () => CheckAndUpdateObject(allowPublish: !zoningDelayActive));
+            _performanceCollector.LogPerformance(this, $"CheckAndUpdateObject>{(_isOwnedObject ? "Self" : "Other")}+{ObjectKind}/{(string.IsNullOrEmpty(Name) ? "Unk" : Name)}"
+                + $"+{Address.ToString("X")}", CheckAndUpdateObject);
         }
         catch (Exception ex)
         {
@@ -410,13 +359,9 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
         }
     }
 
-    /// <summary>
-    /// Is object being drawn check
-    /// </summary>
-    /// <returns>Is being drawn</returns>
     private bool IsBeingDrawn()
     {
-        EnsureLatestObjectState();
+        if (_haltProcessing) CheckAndUpdateObject();
 
         if (_dalamudUtil.IsAnythingDrawing)
         {
@@ -428,37 +373,24 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
         return CurrentDrawCondition != DrawCondition.None;
     }
 
-    /// <summary>
-    /// Ensures the latest object state
-    /// </summary>
-    private void EnsureLatestObjectState()
+    private unsafe DrawCondition IsBeingDrawnUnsafe()
     {
-        if (_haltProcessing || !_frameworkUpdateSubscribed)
+        if (Address == IntPtr.Zero) return DrawCondition.ObjectZero;
+        if (DrawObjectAddress == IntPtr.Zero) return DrawCondition.DrawObjectZero;
+        var visibilityFlags = ((FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)Address)->RenderFlags;
+        if (visibilityFlags != VisibilityFlags.None) return DrawCondition.RenderFlags;
+
+        if (ObjectKind == ObjectKind.Player)
         {
-            CheckAndUpdateObject();
+            var modelInSlotLoaded = (((CharacterBase*)DrawObjectAddress)->HasModelInSlotLoaded != 0);
+            if (modelInSlotLoaded) return DrawCondition.ModelInSlotLoaded;
+            var modelFilesInSlotLoaded = (((CharacterBase*)DrawObjectAddress)->HasModelFilesInSlotLoaded != 0);
+            if (modelFilesInSlotLoaded) return DrawCondition.ModelFilesInSlotLoaded;
         }
+
+        return DrawCondition.None;
     }
 
-    /// <summary>
-    /// Enables framework updates for the object handler
-    /// </summary>
-    private void EnableFrameworkUpdates()
-    {
-        lock (_frameworkUpdateGate)
-        {
-            if (_frameworkUpdateSubscribed)
-            {
-                return;
-            }
-
-            Mediator.Subscribe<FrameworkUpdateMessage>(this, _ => FrameworkUpdate());
-            _frameworkUpdateSubscribed = true;
-        }
-    }
-
-    /// <summary>
-    /// Zone switch end handling
-    /// </summary>
     private void ZoneSwitchEnd()
     {
         if (!_isOwnedObject) return;
@@ -469,7 +401,7 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
         }
         catch (ObjectDisposedException)
         {
-            // ignore canelled after disposed
+            // ignore
         }
         catch (Exception ex)
         {
@@ -477,9 +409,6 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
         }
     }
 
-    /// <summary>
-    /// Zone switch start handling
-    /// </summary>
     private void ZoneSwitchStart()
     {
         if (!_isOwnedObject) return;
@@ -501,6 +430,6 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
                 Logger.LogDebug("[{this}] Delay after zoning complete", this);
                 _zoningCts.Dispose();
             }
-        }, _zoningCts.Token);
+        });
     }
 }

LightlessSync/PlayerData/Handlers/OwnedObjectHandler.cs

@@ -1,461 +0,0 @@
-using Dalamud.Game.ClientState.Objects.Enums;
-using Dalamud.Game.ClientState.Objects.Types;
-using Dalamud.Plugin.Services;
-using LightlessSync.API.Data;
-using LightlessSync.Interop.Ipc;
-using LightlessSync.PlayerData.Factories;
-using LightlessSync.PlayerData.Pairs;
-using LightlessSync.Services;
-using LightlessSync.Services.ActorTracking;
-using Microsoft.Extensions.Logging;
-using DalamudObjectKind = Dalamud.Game.ClientState.Objects.Enums.ObjectKind;
-using ObjectKind = LightlessSync.API.Data.Enum.ObjectKind;
-
-namespace LightlessSync.PlayerData.Handlers;
-
-/// <summary>
-/// Owned object handler for applying changes to owned objects.
-/// </summary>
-internal sealed class OwnedObjectHandler
-{
-    // Debug information for owned object resolution
-    internal readonly record struct OwnedResolveDebug(
-    DateTime? ResolvedAtUtc,
-    nint Address,
-    ushort? ObjectIndex,
-    string Stage,
-    string? FailureReason)
-    {
-        public string? AddressHex => Address == nint.Zero ? null : $"0x{Address:X}";
-        public static OwnedResolveDebug Empty => new(null, nint.Zero, null, string.Empty, null);
-    }
-
-    private OwnedResolveDebug _minionResolveDebug = OwnedResolveDebug.Empty;
-    public OwnedResolveDebug MinionResolveDebug => _minionResolveDebug;
-
-    // Dependencies
-    private readonly ILogger _logger;
-    private readonly DalamudUtilService _dalamudUtil;
-    private readonly GameObjectHandlerFactory _handlerFactory;
-    private readonly IpcManager _ipc;
-    private readonly ActorObjectService _actorObjectService;
-    private readonly IObjectTable _objectTable;
-
-    // Timeouts for fully loaded checks
-    private const int _fullyLoadedTimeoutMsPlayer = 30000;
-    private const int _fullyLoadedTimeoutMsOther = 5000;
-
-    public OwnedObjectHandler(
-        ILogger logger,
-        DalamudUtilService dalamudUtil,
-        GameObjectHandlerFactory handlerFactory,
-        IpcManager ipc,
-        ActorObjectService actorObjectService,
-        IObjectTable objectTable)
-    {
-        _logger = logger;
-        _dalamudUtil = dalamudUtil;
-        _handlerFactory = handlerFactory;
-        _ipc = ipc;
-        _actorObjectService = actorObjectService;
-        _objectTable = objectTable;
-    }
-
-    /// <summary>
-    /// Applies the specified changes to the owned object of the given kind.
-    /// </summary>
-    /// <param name="applicationId">Application ID of the Character Object</param>
-    /// <param name="kind">Object Kind of the given object</param>
-    /// <param name="changes">Changes of the object</param>
-    /// <param name="data">Data of the object</param>
-    /// <param name="playerHandler">Owner of the object</param>
-    /// <param name="penumbraCollection">Collection if needed</param>
-    /// <param name="customizeIds">Customizing identications for the object</param>
-    /// <param name="token">Cancellation Token</param>
-    /// <returns>Successfully applied or not</returns>
-    public async Task<bool> ApplyAsync(
-        Guid applicationId,
-        ObjectKind kind,
-        HashSet<PlayerChanges> changes,
-        CharacterData data,
-        GameObjectHandler playerHandler,
-        Guid penumbraCollection,
-        Dictionary<ObjectKind, Guid?> customizeIds,
-        CancellationToken token)
-    {
-        // Validate player handler
-        if (playerHandler.Address == nint.Zero)
-            return false;
-
-        // Create handler for owned object
-        var handler = await CreateHandlerAsync(kind, playerHandler, token).ConfigureAwait(false);
-        if (handler is null || handler.Address == nint.Zero)
-            return false;
-
-        try
-        {
-            token.ThrowIfCancellationRequested();
-
-            // Determine if we have file replacements for this kind
-            bool hasFileReplacements =
-                kind != ObjectKind.Player
-                && data.FileReplacements.TryGetValue(kind, out var repls)
-                && repls is { Count: > 0 };
-
-            // Determine if we should assign a Penumbra collection
-            bool shouldAssignCollection =
-                kind != ObjectKind.Player
-                && hasFileReplacements
-                && penumbraCollection != Guid.Empty
-                && _ipc.Penumbra.APIAvailable;
-
-            // Determine if only IPC-only changes are being made for player
-            bool isPlayerIpcOnly =
-                kind == ObjectKind.Player
-                && changes.Count > 0
-                && changes.All(c => c is PlayerChanges.Honorific
-                                  or PlayerChanges.Moodles
-                                  or PlayerChanges.PetNames
-                                  or PlayerChanges.Heels);
-
-            // Wait for drawing to complete 
-            await handler.IsBeingDrawnRunOnFrameworkAsync().ConfigureAwait(false);
-
-            // Determine timeouts
-            var drawTimeoutMs = handler.ObjectKind == ObjectKind.Player ? 30000 : 5000;
-            var fullyLoadedTimeoutMs = handler.ObjectKind == ObjectKind.Player ? _fullyLoadedTimeoutMsPlayer : _fullyLoadedTimeoutMsOther;
-
-            // Wait for drawing to complete
-            await _dalamudUtil
-                .WaitWhileCharacterIsDrawing(_logger, handler, applicationId, drawTimeoutMs, token)
-                .ConfigureAwait(false);
-
-            if (handler.Address != nint.Zero)
-            {
-                // Wait for fully loaded
-                var loaded = await _actorObjectService
-                    .WaitForFullyLoadedAsync(handler.Address, token, fullyLoadedTimeoutMs)
-                    .ConfigureAwait(false);
-
-                if (!loaded)
-                {
-                    _logger.LogTrace("[{appId}] {kind}: not fully loaded in time, skipping for now", applicationId, kind);
-                    return false;
-                }
-            }
-
-            token.ThrowIfCancellationRequested();
-
-            // Assign Penumbra collection if needed
-            if (shouldAssignCollection)
-            {
-                // Get object index
-                var objIndex = await _dalamudUtil
-                    .RunOnFrameworkThread(() => handler.GetGameObject()?.ObjectIndex)
-                    .ConfigureAwait(false);
-
-                if (!objIndex.HasValue)
-                {
-                    _logger.LogTrace("[{appId}] {kind}: ObjectIndex not available yet, cannot assign collection", applicationId, kind);
-                    return false;
-                }
-
-                // Assign collection
-                await _ipc.Penumbra
-                    .AssignTemporaryCollectionAsync(_logger, penumbraCollection, objIndex.Value)
-                    .ConfigureAwait(false);
-            }
-
-            var tasks = new List<Task>();
-
-            // Apply each change
-            foreach (var change in changes.OrderBy(c => (int)c))
-            {
-                token.ThrowIfCancellationRequested();
-
-                // Handle each change type
-                switch (change)
-                {
-                    case PlayerChanges.Customize:
-                        if (data.CustomizePlusData.TryGetValue(kind, out var customizeData) && !string.IsNullOrEmpty(customizeData))
-                            tasks.Add(ApplyCustomizeAsync(handler.Address, customizeData, kind, customizeIds));
-                        else if (customizeIds.TryGetValue(kind, out var existingId))
-                            tasks.Add(RevertCustomizeAsync(existingId, kind, customizeIds));
-                        break;
-                        
-                    case PlayerChanges.Glamourer:
-                        if (data.GlamourerData.TryGetValue(kind, out var glamourerData) && !string.IsNullOrEmpty(glamourerData))
-                            tasks.Add(_ipc.Glamourer.ApplyAllAsync(_logger, handler, glamourerData, applicationId, token));
-                        break;
-
-                    case PlayerChanges.Heels:
-                        if (kind == ObjectKind.Player && !string.IsNullOrEmpty(data.HeelsData))
-                            tasks.Add(_ipc.Heels.SetOffsetForPlayerAsync(handler.Address, data.HeelsData));
-                        break;
-
-                    case PlayerChanges.Honorific:
-                        if (kind == ObjectKind.Player && !string.IsNullOrEmpty(data.HonorificData))
-                            tasks.Add(_ipc.Honorific.SetTitleAsync(handler.Address, data.HonorificData));
-                        break;
-
-                    case PlayerChanges.Moodles:
-                        if (kind == ObjectKind.Player && !string.IsNullOrEmpty(data.MoodlesData))
-                            tasks.Add(_ipc.Moodles.SetStatusAsync(handler.Address, data.MoodlesData));
-                        break;
-
-                    case PlayerChanges.PetNames:
-                        if (kind == ObjectKind.Player && !string.IsNullOrEmpty(data.PetNamesData))
-                            tasks.Add(_ipc.PetNames.SetPlayerData(handler.Address, data.PetNamesData));
-                        break;
-
-                    case PlayerChanges.ModFiles:
-                    case PlayerChanges.ModManip:
-                    case PlayerChanges.ForcedRedraw:
-                    default:
-                        break;
-                }
-            }
-
-            // Await all tasks for change applications
-            if (tasks.Count > 0)
-                await Task.WhenAll(tasks).ConfigureAwait(false);
-
-            token.ThrowIfCancellationRequested();
-
-            // Determine if redraw is needed
-            bool needsRedraw =
-                _ipc.Penumbra.APIAvailable
-                && (
-                    shouldAssignCollection
-                    || changes.Contains(PlayerChanges.ForcedRedraw)
-                    || changes.Contains(PlayerChanges.ModFiles)
-                    || changes.Contains(PlayerChanges.ModManip)
-                    || changes.Contains(PlayerChanges.Glamourer)
-                    || changes.Contains(PlayerChanges.Customize)
-                );
-
-            // Skip redraw for player if only IPC-only changes were made
-            if (isPlayerIpcOnly)
-                needsRedraw = false;
-
-            // Perform redraw if needed
-            if (needsRedraw && _ipc.Penumbra.APIAvailable)
-            {
-                _logger.LogWarning(
-                    "[{appId}] {kind}: Redrawing ownedTarget={isOwned} (needsRedraw={needsRedraw})",
-                    applicationId, kind, kind != ObjectKind.Player, needsRedraw);
-
-                await _ipc.Penumbra
-                    .RedrawAsync(_logger, handler, applicationId, token)
-                    .ConfigureAwait(false);
-            }
-
-            return true;
-        }
-        finally
-        {
-            if (!ReferenceEquals(handler, playerHandler))
-                handler.Dispose();
-        }
-    }
-
-    /// <summary>
-    /// Creates a GameObjectHandler for the owned object of the specified kind.
-    /// </summary>
-    /// <param name="kind">Object kind of the handler</param>
-    /// <param name="playerHandler">Owner of the given object</param>
-    /// <param name="token">Cancellation Token</param>
-    /// <returns>Handler for the GameObject with the handler</returns>
-    private async Task<GameObjectHandler?> CreateHandlerAsync(ObjectKind kind, GameObjectHandler playerHandler, CancellationToken token)
-    {
-        token.ThrowIfCancellationRequested();
-
-        // Debug info setter
-        void SetMinionDebug(string stage, string? failure, nint addr = default, ushort? objIndex = null)
-        {
-            if (kind != ObjectKind.MinionOrMount)
-                return;
-
-            _minionResolveDebug = new OwnedResolveDebug(
-                DateTime.UtcNow,
-                addr,
-                objIndex,
-                stage,
-                failure);
-        }
-
-        // Direct return for player
-        if (kind == ObjectKind.Player)
-            return playerHandler;
-
-        // First, try direct retrieval via Dalamud API
-        var playerPtr = playerHandler.Address;
-        if (playerPtr == nint.Zero)
-        {
-            SetMinionDebug("player_ptr_zero", "playerHandler.Address == 0");
-            return null;
-        }
-
-        // Try direct retrieval
-        nint ownedPtr = kind switch
-        {
-            ObjectKind.Companion => await _dalamudUtil.GetCompanionAsync(playerPtr).ConfigureAwait(false),
-            ObjectKind.MinionOrMount => await _dalamudUtil.GetMinionOrMountAsync(playerPtr).ConfigureAwait(false),
-            ObjectKind.Pet => await _dalamudUtil.GetPetAsync(playerPtr).ConfigureAwait(false),
-            _ => nint.Zero
-        };
-
-        // If that fails, scan the object table for owned objects
-        var stage = ownedPtr != nint.Zero ? "direct" : "direct_miss";
-
-        // Owner ID based scan
-        if (ownedPtr == nint.Zero)
-        {
-            token.ThrowIfCancellationRequested();
-
-            // Get owner entity ID
-            var ownerEntityId = playerHandler.EntityId;
-            if (ownerEntityId == 0 || ownerEntityId == uint.MaxValue)
-            {
-                // Read unsafe
-                ownerEntityId = await _dalamudUtil
-                    .RunOnFrameworkThread(() => ReadEntityIdSafe(playerHandler))
-                    .ConfigureAwait(false);
-            }
-
-            if (ownerEntityId != 0 && ownerEntityId != uint.MaxValue)
-            {
-                // Scan for owned object
-                ownedPtr = await _dalamudUtil
-                    .RunOnFrameworkThread(() => FindOwnedByOwnerIdSafe(kind, ownerEntityId))
-                    .ConfigureAwait(false);
-
-                stage = ownedPtr != nint.Zero ? "owner_scan" : "owner_scan_miss";
-            }
-            else
-            {
-                stage = "owner_id_unavailable";
-            }
-        }
-
-        if (ownedPtr == nint.Zero)
-        {
-            SetMinionDebug(stage, "ownedPtr == 0");
-            return null;
-        }
-
-        token.ThrowIfCancellationRequested();
-
-        // Create handler
-        var handler = await _handlerFactory.Create(kind, () => ownedPtr, isWatched: false).ConfigureAwait(false);
-        if (handler is null || handler.Address == nint.Zero)
-        {
-            SetMinionDebug(stage, "handlerFactory returned null/zero", ownedPtr);
-            return null;
-        }
-
-        // Get object index for debug
-        ushort? objIndex = await _dalamudUtil.RunOnFrameworkThread(() => handler.GetGameObject()?.ObjectIndex)
-            .ConfigureAwait(false);
-
-        SetMinionDebug(stage, failure: null, handler.Address, objIndex);
-        return handler;
-    }
-
-    /// <summary>
-    /// Entity ID reader with safety checks.
-    /// </summary>
-    /// <param name="playerHandler">Handler of the Object</param>
-    /// <returns>Entity Id</returns>
-    private static uint ReadEntityIdSafe(GameObjectHandler playerHandler) => playerHandler.GetGameObject()?.EntityId ?? 0;
-
-    /// <summary>
-    /// Finds an owned object by scanning the object table for the specified owner entity ID.
-    /// </summary>
-    /// <param name="kind">Object kind to find of owned object</param>
-    /// <param name="ownerEntityId">Owner Id</param>
-    /// <returns>Object Id</returns>
-    private nint FindOwnedByOwnerIdSafe(ObjectKind kind, uint ownerEntityId)
-    {
-        // Validate owner ID
-        if (ownerEntityId == 0 || ownerEntityId == uint.MaxValue)
-            return nint.Zero;
-
-        // Scan object table
-        foreach (var obj in _objectTable)
-        {
-            // Validate object
-            if (obj is null || obj.Address == nint.Zero)
-                continue;
-
-            // Check owner ID match
-            if (obj.OwnerId != ownerEntityId)
-                continue;
-
-            // Check kind match
-            if (!IsOwnedKindMatch(obj, kind))
-                continue;
-
-            return obj.Address;
-        }
-
-        return nint.Zero;
-    }
-
-    /// <summary>
-    /// Determines if the given object matches the specified owned kind.
-    /// </summary>
-    /// <param name="obj">Game Object</param>
-    /// <param name="kind">Object Kind</param>
-    /// <returns></returns>
-    private static bool IsOwnedKindMatch(IGameObject obj, ObjectKind kind) => kind switch
-    {
-        // Match minion or mount
-        ObjectKind.MinionOrMount =>
-            obj.ObjectKind is DalamudObjectKind.MountType
-                        or DalamudObjectKind.Companion,
-
-        // Match pet
-        ObjectKind.Pet =>
-            obj.ObjectKind == DalamudObjectKind.BattleNpc
-            && obj is IBattleNpc bnPet
-            && bnPet.BattleNpcKind == BattleNpcSubKind.Pet,
-
-        // Match companion
-        ObjectKind.Companion =>
-            obj.ObjectKind == DalamudObjectKind.BattleNpc
-            && obj is IBattleNpc bnBuddy
-            && bnBuddy.BattleNpcKind == BattleNpcSubKind.Chocobo,
-
-        _ => false
-    };
-
-    /// <summary>
-    /// Applies Customize Plus data to the specified object.
-    /// </summary>
-    /// <param name="address">Object Address</param>
-    /// <param name="customizeData">Data of the Customize+ that has to be applied</param>
-    /// <param name="kind">Object Kind</param>
-    /// <param name="customizeIds">Customize+ Ids</param>
-    /// <returns>Task</returns>
-    private async Task ApplyCustomizeAsync(nint address, string customizeData, ObjectKind kind, Dictionary<ObjectKind, Guid?> customizeIds)
-    {
-        customizeIds[kind] = await _ipc.CustomizePlus.SetBodyScaleAsync(address, customizeData).ConfigureAwait(false);
-    }
-
-    /// <summary>
-    /// Reverts Customize Plus changes for the specified object.
-    /// </summary>
-    /// <param name="customizeId">Customize+ Id</param>
-    /// <param name="kind">Object Id</param>
-    /// <param name="customizeIds">List of Customize+ ids</param>
-    /// <returns></returns>
-    private async Task RevertCustomizeAsync(Guid? customizeId, ObjectKind kind, Dictionary<ObjectKind, Guid?> customizeIds)
-    {
-        if (!customizeId.HasValue)
-            return;
-
-        await _ipc.CustomizePlus.RevertByIdAsync(customizeId.Value).ConfigureAwait(false);
-        customizeIds.Remove(kind);
-    }
-}

LightlessSync/PlayerData/Pairs/IPairHandlerAdapter.cs

@@ -1,5 +1,4 @@
 using LightlessSync.API.Data;
-using LightlessSync.API.Data.Enum;
 
 namespace LightlessSync.PlayerData.Pairs;
 
@@ -17,51 +16,19 @@ public interface IPairHandlerAdapter : IDisposable, IPairPerformanceSubject
     new string? PlayerName { get; }
     string PlayerNameHash { get; }
     uint PlayerCharacterId { get; }
-
     DateTime? LastDataReceivedAt { get; }
     DateTime? LastApplyAttemptAt { get; }
     DateTime? LastSuccessfulApplyAt { get; }
-
     string? LastFailureReason { get; }
     IReadOnlyList<string> LastBlockingConditions { get; }
-
     bool IsApplying { get; }
     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; }
-
-    string? MinionAddressHex { get; }
-
-    ushort? MinionObjectIndex { get; }
-
-    DateTime? MinionResolvedAtUtc { get; }
-    string? MinionResolveStage { get; }
-    string? MinionResolveFailureReason { get; }
-
-    bool MinionPendingRetry { get; }
-    IReadOnlyList<string> MinionPendingRetryChanges { get; }
-    bool MinionHasAppearanceData { get; }
-
-    Guid OwnedPenumbraCollectionId { get; }
-    bool NeedsCollectionRebuildDebug { get; }
-
-    uint MinionOrMountCharacterId { get; }
-    uint PetCharacterId { get; }
-    uint CompanionCharacterId { get; }
-
     void Initialize();
     void ApplyData(CharacterData data);
     void ApplyLastReceivedData(bool forced = false);
-    void HardReapplyLastData();
     bool FetchPerformanceMetricsFromCache();
     void LoadCachedCharacterData(CharacterData data);
     void SetUploading(bool uploading);

LightlessSync/PlayerData/Pairs/IPairPerformanceSubject.cs

@@ -16,5 +16,4 @@ public interface IPairPerformanceSubject
     long LastAppliedApproximateVRAMBytes { get; set; }
     long LastAppliedApproximateEffectiveVRAMBytes { get; set; }
     long LastAppliedDataTris { get; set; }
-    long LastAppliedApproximateEffectiveTris { get; set; }
 }

LightlessSync/PlayerData/Pairs/Pair.cs

@@ -69,7 +69,6 @@ public class Pair
     public string? PlayerName => TryGetHandler()?.PlayerName ?? UserPair.User.AliasOrUID;
     public long LastAppliedDataBytes => TryGetHandler()?.LastAppliedDataBytes ?? -1;
     public long LastAppliedDataTris => TryGetHandler()?.LastAppliedDataTris ?? -1;
-    public long LastAppliedApproximateEffectiveTris => TryGetHandler()?.LastAppliedApproximateEffectiveTris ?? -1;
     public long LastAppliedApproximateVRAMBytes => TryGetHandler()?.LastAppliedApproximateVRAMBytes ?? -1;
     public long LastAppliedApproximateEffectiveVRAMBytes => TryGetHandler()?.LastAppliedApproximateEffectiveVRAMBytes ?? -1;
     public string Ident => TryGetHandler()?.Ident ?? TryGetConnection()?.Ident ?? string.Empty;
@@ -82,114 +81,40 @@ public class Pair
 
     public void AddContextMenu(IMenuOpenedArgs args)
     {
-
         var handler = TryGetHandler();
         if (handler is null)
-            return;
-
-        if (args.Target is not MenuTargetDefault target)
-            return;
-
-        var obj = target.TargetObject;
-        if (obj is null)
-            return;
-
-        var eid = obj.EntityId;
-
-        var isPlayerTarget = eid != 0 && eid != uint.MaxValue && eid == handler.PlayerCharacterId;
-
-        if (!(isPlayerTarget))
-            return;
-
-        if (isPlayerTarget)
         {
-            if (!IsPaused)
-            {
-                UiSharedService.AddContextMenuItem(
-                    args,
-                    name: "Open Profile",
-                    prefixChar: 'L',
-                    colorMenuItem: _lightlessPrefixColor,
-                    onClick: () =>
-                    {
-                        _mediator.Publish(new ProfileOpenStandaloneMessage(this));
-                        return Task.CompletedTask;
-                    });
-
-                UiSharedService.AddContextMenuItem(
-                    args,
-                    name: "(Soft) - Reapply last data",
-                    prefixChar: 'L',
-                    colorMenuItem: _lightlessPrefixColor,
-                    onClick: () =>
-                    {
-                        ApplyLastReceivedData(forced: true);
-                        return Task.CompletedTask;
-                    });
-
-                UiSharedService.AddContextMenuItem(
-                    args,
-                    name: "(Hard) - Reapply last data",
-                    prefixChar: 'L',
-                    colorMenuItem: _lightlessPrefixColor,
-                    onClick: () =>
-                    {
-                        HardApplyLastReceivedData();
-                        return Task.CompletedTask;
-                    });
-            }
-
-            UiSharedService.AddContextMenuItem(
-                args,
-                name: "Change Permissions",
-                prefixChar: 'L',
-                colorMenuItem: _lightlessPrefixColor,
-                onClick: () =>
-                {
-                    _mediator.Publish(new OpenPermissionWindow(this));
-                    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: () =>
-                {
-                    TriggerCyclePause();
-                    return Task.CompletedTask;
-                });
-
             return;
         }
+
+        if (args.Target is not MenuTargetDefault target || target.TargetObjectId != handler.PlayerCharacterId || IsPaused)
+        {
+            return;
+        }
+
+        UiSharedService.AddContextMenuItem(args, name: "Open Profile", prefixChar: 'L', colorMenuItem: _lightlessPrefixColor, onClick: () =>
+        {
+            _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: "Change Permissions", prefixChar: 'L', colorMenuItem: _lightlessPrefixColor, onClick: () =>
+        {
+            _mediator.Publish(new OpenPermissionWindow(this));
+            return Task.CompletedTask;
+        });
+
+        UiSharedService.AddContextMenuItem(args, name: "Cycle pause state", prefixChar: 'L', colorMenuItem: _lightlessPrefixColor, onClick: () =>
+        {
+            TriggerCyclePause();
+            return Task.CompletedTask;
+        });
     }
 
     public void ApplyData(OnlineUserCharaDataDto data)
@@ -214,18 +139,6 @@ public class Pair
         handler.ApplyLastReceivedData(forced);
     }
 
-    public void HardApplyLastReceivedData()
-    {
-        var handler = TryGetHandler();
-        if (handler is null)
-        {
-            _logger.LogTrace("ApplyLastReceivedData skipped for {Uid}: handler missing.", UserData.UID);
-            return;
-        }
-
-        handler.HardReapplyLastData();
-    }
-
     public void CreateCachedPlayer(OnlineUserIdentDto? dto = null)
     {
         var handler = TryGetHandler();
@@ -281,13 +194,9 @@ public class Pair
     {
         var handler = TryGetHandler();
         if (handler is null)
+        {
             return PairDebugInfo.Empty;
-
-        var now = DateTime.UtcNow;
-        var dueAt = handler.VisibilityEvictionDueAtUtc;
-        var remainingSeconds = dueAt.HasValue
-            ? Math.Max(0, (dueAt.Value - now).TotalSeconds)
-            : (double?)null;
+        }
 
         return new PairDebugInfo(
             true,
@@ -297,30 +206,11 @@ public class Pair
             handler.LastDataReceivedAt,
             handler.LastApplyAttemptAt,
             handler.LastSuccessfulApplyAt,
-            handler.InvisibleSinceUtc,
-            handler.VisibilityEvictionDueAtUtc,
-            remainingSeconds,
             handler.LastFailureReason,
             handler.LastBlockingConditions,
             handler.IsApplying,
             handler.IsDownloading,
             handler.PendingDownloadCount,
-            handler.ForbiddenDownloadCount,
-            handler.PendingModReapply,
-            handler.ModApplyDeferred,
-            handler.MissingCriticalMods,
-            handler.MissingNonCriticalMods,
-            handler.MissingForbiddenMods,
-
-            handler.MinionAddressHex,
-            handler.MinionObjectIndex,
-            handler.MinionResolvedAtUtc,
-            handler.MinionResolveStage,
-            handler.MinionResolveFailureReason,
-            handler.MinionPendingRetry,
-            handler.MinionPendingRetryChanges,
-            handler.MinionHasAppearanceData,
-            handler.OwnedPenumbraCollectionId,
-            handler.NeedsCollectionRebuildDebug);
+            handler.ForbiddenDownloadCount);
     }
 }

LightlessSync/PlayerData/Pairs/PairCoordinator.Users.cs

@@ -125,7 +125,6 @@ public sealed partial class PairCoordinator
             }
         }
 
-        _mediator.Publish(new PairOnlineMessage(new PairUniqueIdentifier(dto.User.UID)));
         PublishPairDataChanged();
     }
 

LightlessSync/PlayerData/Pairs/PairDebugInfo.cs

@@ -8,63 +8,25 @@ public sealed record PairDebugInfo(
     DateTime? LastDataReceivedAt,
     DateTime? LastApplyAttemptAt,
     DateTime? LastSuccessfulApplyAt,
-    DateTime? InvisibleSinceUtc,
-    DateTime? VisibilityEvictionDueAtUtc,
-    double? VisibilityEvictionRemainingSeconds,
     string? LastFailureReason,
     IReadOnlyList<string> BlockingConditions,
     bool IsApplying,
     bool IsDownloading,
     int PendingDownloadCount,
-    int ForbiddenDownloadCount,
-    bool PendingModReapply,
-    bool ModApplyDeferred,
-    int MissingCriticalMods,
-    int MissingNonCriticalMods,
-    int MissingForbiddenMods,
-
-    string? MinionAddressHex,
-    ushort? MinionObjectIndex,
-    DateTime? MinionResolvedAtUtc,
-    string? MinionResolveStage,
-    string? MinionResolveFailureReason,
-    bool MinionPendingRetry,
-    IReadOnlyList<string> MinionPendingRetryChanges,
-    bool MinionHasAppearanceData,
-    Guid OwnedPenumbraCollectionId,
-    bool NeedsCollectionRebuild)
+    int ForbiddenDownloadCount)
 {
     public static PairDebugInfo Empty { get; } = new(
-        HasHandler: false,
-        HandlerInitialized: false,
-        HandlerVisible: false,
-        HandlerScheduledForDeletion: false,
-        LastDataReceivedAt: null,
-        LastApplyAttemptAt: null,
-        LastSuccessfulApplyAt: null,
-        InvisibleSinceUtc: null,
-        VisibilityEvictionDueAtUtc: null,
-        VisibilityEvictionRemainingSeconds: null,
-        LastFailureReason: null,
-        BlockingConditions: [],
-        IsApplying: false,
-        IsDownloading: false,
-        PendingDownloadCount: 0,
-        ForbiddenDownloadCount: 0,
-        PendingModReapply: false,
-        ModApplyDeferred: false,
-        MissingCriticalMods: 0,
-        MissingNonCriticalMods: 0,
-        MissingForbiddenMods: 0,
-
-        MinionAddressHex: null,
-        MinionObjectIndex: null,
-        MinionResolvedAtUtc: null,
-        MinionResolveStage: null,
-        MinionResolveFailureReason: null,
-        MinionPendingRetry: false,
-        MinionPendingRetryChanges: [],
-        MinionHasAppearanceData: false,
-        OwnedPenumbraCollectionId: Guid.Empty,
-        NeedsCollectionRebuild: false);
+        false,
+        false,
+        false,
+        false,
+        null,
+        null,
+        null,
+        null,
+        Array.Empty<string>(),
+        false,
+        false,
+        0,
+        0);
 }

LightlessSync/PlayerData/Pairs/PairHandlerAdapterFactory.cs

@@ -1,15 +1,11 @@
 using LightlessSync.FileCache;
 using LightlessSync.Interop.Ipc;
-using LightlessSync.LightlessConfiguration;
 using LightlessSync.PlayerData.Factories;
 using LightlessSync.Services;
-using LightlessSync.Services.ActorTracking;
 using LightlessSync.Services.Mediator;
-using LightlessSync.Services.ModelDecimation;
 using LightlessSync.Services.PairProcessing;
 using LightlessSync.Services.ServerConfiguration;
 using LightlessSync.Services.TextureCompression;
-using Dalamud.Plugin.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
@@ -28,19 +24,12 @@ internal sealed class PairHandlerAdapterFactory : IPairHandlerAdapterFactory
     private readonly IServiceProvider _serviceProvider;
     private readonly IHostApplicationLifetime _lifetime;
     private readonly FileCacheManager _fileCacheManager;
-    private readonly PlayerPerformanceConfigService _playerPerformanceConfigService;
     private readonly PlayerPerformanceService _playerPerformanceService;
     private readonly PairProcessingLimiter _pairProcessingLimiter;
     private readonly ServerConfigurationManager _serverConfigManager;
     private readonly TextureDownscaleService _textureDownscaleService;
-    private readonly ModelDecimationService _modelDecimationService;
     private readonly PairStateCache _pairStateCache;
     private readonly PairPerformanceMetricsCache _pairPerformanceMetricsCache;
-    private readonly PenumbraTempCollectionJanitor _tempCollectionJanitor;
-    private readonly LightlessConfigService _configService;
-    private readonly XivDataAnalyzer _modelAnalyzer;
-    private readonly IFramework _framework;
-    private readonly IObjectTable _objectTable;
 
     public PairHandlerAdapterFactory(
         ILoggerFactory loggerFactory,
@@ -51,21 +40,14 @@ internal sealed class PairHandlerAdapterFactory : IPairHandlerAdapterFactory
         FileDownloadManagerFactory fileDownloadManagerFactory,
         PluginWarningNotificationService pluginWarningNotificationManager,
         IServiceProvider serviceProvider,
-        IFramework framework,
         IHostApplicationLifetime lifetime,
         FileCacheManager fileCacheManager,
-        PlayerPerformanceConfigService playerPerformanceConfigService,
         PlayerPerformanceService playerPerformanceService,
         PairProcessingLimiter pairProcessingLimiter,
         ServerConfigurationManager serverConfigManager,
         TextureDownscaleService textureDownscaleService,
-        ModelDecimationService modelDecimationService,
         PairStateCache pairStateCache,
-        PairPerformanceMetricsCache pairPerformanceMetricsCache,
-        PenumbraTempCollectionJanitor tempCollectionJanitor,
-        XivDataAnalyzer modelAnalyzer,
-        LightlessConfigService configService,
-        IObjectTable objectTable)
+        PairPerformanceMetricsCache pairPerformanceMetricsCache)
     {
         _loggerFactory = loggerFactory;
         _mediator = mediator;
@@ -75,28 +57,20 @@ internal sealed class PairHandlerAdapterFactory : IPairHandlerAdapterFactory
         _fileDownloadManagerFactory = fileDownloadManagerFactory;
         _pluginWarningNotificationManager = pluginWarningNotificationManager;
         _serviceProvider = serviceProvider;
-        _framework = framework;
         _lifetime = lifetime;
         _fileCacheManager = fileCacheManager;
-        _playerPerformanceConfigService = playerPerformanceConfigService;
         _playerPerformanceService = playerPerformanceService;
         _pairProcessingLimiter = pairProcessingLimiter;
         _serverConfigManager = serverConfigManager;
         _textureDownscaleService = textureDownscaleService;
-        _modelDecimationService = modelDecimationService;
         _pairStateCache = pairStateCache;
         _pairPerformanceMetricsCache = pairPerformanceMetricsCache;
-        _tempCollectionJanitor = tempCollectionJanitor;
-        _modelAnalyzer = modelAnalyzer;
-        _configService = configService;
-        _objectTable = objectTable;
     }
 
     public IPairHandlerAdapter Create(string ident)
     {
         var downloadManager = _fileDownloadManagerFactory.Create();
         var dalamudUtilService = _serviceProvider.GetRequiredService<DalamudUtilService>();
-        var actorObjectService = _serviceProvider.GetRequiredService<ActorObjectService>();
         return new PairHandlerAdapter(
             _loggerFactory.CreateLogger<PairHandlerAdapter>(),
             _mediator,
@@ -107,21 +81,13 @@ internal sealed class PairHandlerAdapterFactory : IPairHandlerAdapterFactory
             downloadManager,
             _pluginWarningNotificationManager,
             dalamudUtilService,
-            _framework,
-            _objectTable,
-            actorObjectService,
             _lifetime,
             _fileCacheManager,
-            _playerPerformanceConfigService,
             _playerPerformanceService,
             _pairProcessingLimiter,
             _serverConfigManager,
             _textureDownscaleService,
-            _modelDecimationService,
             _pairStateCache,
-            _pairPerformanceMetricsCache,
-            _tempCollectionJanitor,
-            _modelAnalyzer,
-            _configService);
+            _pairPerformanceMetricsCache);
     }
 }

LightlessSync/PlayerData/Pairs/PairHandlerRegistry.cs

@@ -11,9 +11,7 @@ public sealed class PairHandlerRegistry : IDisposable
 {
     private readonly object _gate = new();
     private readonly object _pendingGate = new();
-    private readonly object _visibilityGate = new();
     private readonly Dictionary<string, PairHandlerEntry> _entriesByIdent = new(StringComparer.Ordinal);
-    private readonly Dictionary<string, CancellationTokenSource> _pendingInvisibleEvictions = new(StringComparer.Ordinal);
     private readonly Dictionary<IPairHandlerAdapter, PairHandlerEntry> _entriesByHandler = new(ReferenceEqualityComparer.Instance);
 
     private readonly IPairHandlerAdapterFactory _handlerFactory;
@@ -89,7 +87,7 @@ public sealed class PairHandlerRegistry : IDisposable
         }
 
         if (handler.LastReceivedCharacterData is not null &&
-            (handler.LastAppliedApproximateVRAMBytes < 0 || handler.LastAppliedDataTris < 0 || handler.LastAppliedApproximateEffectiveTris < 0))
+            (handler.LastAppliedApproximateVRAMBytes < 0 || handler.LastAppliedDataTris < 0))
         {
             handler.ApplyLastReceivedData(forced: true);
         }
@@ -146,37 +144,6 @@ public sealed class PairHandlerRegistry : IDisposable
         return PairOperationResult<PairUniqueIdentifier>.Ok(registration.PairIdent);
     }
 
-    private PairOperationResult CancelAllInvisibleEvictions()
-    {
-        List<CancellationTokenSource> snapshot;
-        lock (_visibilityGate)
-        {
-            snapshot = [.. _pendingInvisibleEvictions.Values];
-            _pendingInvisibleEvictions.Clear();
-        }
-
-        List<string>? errors = null;
-
-        foreach (var cts in snapshot)
-        {
-            try { cts.Cancel(); }
-            catch (Exception ex)
-            {
-                (errors ??= new List<string>()).Add($"Cancel: {ex.Message}");
-            }
-
-            try { cts.Dispose(); }
-            catch (Exception ex)
-            {
-                (errors ??= new List<string>()).Add($"Dispose: {ex.Message}");
-            }
-        }
-
-        return errors is null
-            ? PairOperationResult.Ok()
-            : PairOperationResult.Fail($"CancelAllInvisibleEvictions had error(s): {string.Join(" | ", errors)}");
-    }
-
     public PairOperationResult ApplyCharacterData(PairRegistration registration, OnlineUserCharaDataDto dto)
     {
         if (registration.CharacterIdent is null)
@@ -333,7 +300,6 @@ public sealed class PairHandlerRegistry : IDisposable
         lock (_gate)
         {
             handlers = _entriesByHandler.Keys.ToList();
-            CancelAllInvisibleEvictions();
             _entriesByIdent.Clear();
             _entriesByHandler.Clear();
         }
@@ -366,7 +332,6 @@ public sealed class PairHandlerRegistry : IDisposable
         lock (_gate)
         {
             handlers = _entriesByHandler.Keys.ToList();
-            CancelAllInvisibleEvictions();
             _entriesByIdent.Clear();
             _entriesByHandler.Clear();
         }

LightlessSync/PlayerData/Pairs/PairLedger.cs

@@ -258,8 +258,7 @@ public sealed class PairLedger : DisposableMediatorSubscriberBase
 
             if (handler.LastAppliedApproximateVRAMBytes >= 0
                 && handler.LastAppliedDataTris >= 0
-                && handler.LastAppliedApproximateEffectiveVRAMBytes >= 0
-                && handler.LastAppliedApproximateEffectiveTris >= 0)
+                && handler.LastAppliedApproximateEffectiveVRAMBytes >= 0)
             {
                 continue;
             }

LightlessSync/PlayerData/Pairs/PairPerformanceMetricsCache.cs

@@ -5,8 +5,7 @@ namespace LightlessSync.PlayerData.Pairs;
 public readonly record struct PairPerformanceMetrics(
     long TriangleCount,
     long ApproximateVramBytes,
-    long ApproximateEffectiveVramBytes,
-    long ApproximateEffectiveTris);
+    long ApproximateEffectiveVramBytes);
 
 /// <summary>
 ///     caches performance metrics keyed by pair ident

LightlessSync/PlayerData/Pairs/VisibleUserDataDistributor.cs

@@ -50,7 +50,6 @@ public class VisibleUserDataDistributor : DisposableMediatorSubscriberBase
         });
 
         Mediator.Subscribe<ConnectedMessage>(this, (_) => PushToAllVisibleUsers());
-        Mediator.Subscribe<PairOnlineMessage>(this, (msg) => HandlePairOnline(msg.PairIdent));
         Mediator.Subscribe<DisconnectedMessage>(this, (_) =>
         {
             _fileTransferManager.CancelUpload();
@@ -112,20 +111,6 @@ public class VisibleUserDataDistributor : DisposableMediatorSubscriberBase
         _ = PushCharacterDataAsync(forced);
     }
 
-    private void HandlePairOnline(PairUniqueIdentifier pairIdent)
-    {
-        if (!_apiController.IsConnected || !_pairLedger.IsPairVisible(pairIdent))
-        {
-            return;
-        }
-
-        if (_pairLedger.GetHandler(pairIdent)?.UserData is { } user)
-        {
-            _usersToPushDataTo.Add(user);
-            PushCharacterData(forced: true);
-        }
-    }
-
     private async Task PushCharacterDataAsync(bool forced = false)
     {
         await _pushLock.WaitAsync(_runtimeCts.Token).ConfigureAwait(false);
@@ -167,6 +152,5 @@ public class VisibleUserDataDistributor : DisposableMediatorSubscriberBase
         }
     }
 
-    private List<UserData> GetVisibleUsers()
-        => [.. _pairLedger.GetVisiblePairs().Where(connection => connection.IsOnline).Select(connection => connection.User)];
+    private List<UserData> GetVisibleUsers() => [.. _pairLedger.GetVisiblePairs().Select(connection => connection.User)];
 }

LightlessSync/Plugin.cs

@@ -1,6 +1,5 @@
 using Dalamud.Game;
 using Dalamud.Game.ClientState.Objects;
-using Dalamud.Interface;
 using Dalamud.Interface.ImGuiFileDialog;
 using Dalamud.Interface.Windowing;
 using Dalamud.Plugin;
@@ -40,8 +39,6 @@ using System.Reflection;
 using OtterTex;
 using LightlessSync.Services.LightFinder;
 using LightlessSync.Services.PairProcessing;
-using LightlessSync.Services.ModelDecimation;
-using LightlessSync.UI.Models;
 
 namespace LightlessSync;
 
@@ -53,7 +50,7 @@ public sealed class Plugin : IDalamudPlugin
         IFramework framework, IObjectTable objectTable, IClientState clientState, ICondition condition, IChatGui chatGui,
         IGameGui gameGui, IDtrBar dtrBar, IPluginLog pluginLog, ITargetManager targetManager, INotificationManager notificationManager,
         ITextureProvider textureProvider, IContextMenu contextMenu, IGameInteropProvider gameInteropProvider, IGameConfig gameConfig,
-        ISigScanner sigScanner, INamePlateGui namePlateGui, IAddonLifecycle addonLifecycle, IPlayerState playerState)
+        ISigScanner sigScanner, INamePlateGui namePlateGui, IAddonLifecycle addonLifecycle)
     {
         NativeDll.Initialize(pluginInterface.AssemblyLocation.DirectoryName);
         if (!Directory.Exists(pluginInterface.ConfigDirectory.FullName))
@@ -106,12 +103,8 @@ public sealed class Plugin : IDalamudPlugin
         services.AddSingleton(new WindowSystem("LightlessSync"));
         services.AddSingleton<FileDialogManager>();
         services.AddSingleton(new Dalamud.Localization("LightlessSync.Localization.", string.Empty, useEmbedded: true));
-        services.AddSingleton(framework);
         services.AddSingleton(gameGui);
-        services.AddSingleton(gameInteropProvider);
         services.AddSingleton(addonLifecycle);
-        services.AddSingleton(objectTable);
-        services.AddSingleton<IUiBuilder>(pluginInterface.UiBuilder);
 
         // Core singletons
         services.AddSingleton<LightlessMediator>();
@@ -120,7 +113,6 @@ public sealed class Plugin : IDalamudPlugin
         services.AddSingleton<ProfileTagService>();
         services.AddSingleton<ApiController>();
         services.AddSingleton<PerformanceCollectorService>();
-        services.AddSingleton<NameplateUpdateHookService>();
         services.AddSingleton<HubFactory>();
         services.AddSingleton<FileUploadManager>();
         services.AddSingleton<FileTransferOrchestrator>();
@@ -128,7 +120,6 @@ public sealed class Plugin : IDalamudPlugin
         services.AddSingleton<LightlessProfileManager>();
         services.AddSingleton<TextureCompressionService>();
         services.AddSingleton<TextureDownscaleService>();
-        services.AddSingleton<ModelDecimationService>();
         services.AddSingleton<GameObjectHandlerFactory>();
         services.AddSingleton<FileDownloadManagerFactory>();
         services.AddSingleton<PairProcessingLimiter>();
@@ -140,11 +131,8 @@ public sealed class Plugin : IDalamudPlugin
         services.AddSingleton<TagHandler>();
         services.AddSingleton<PairRequestService>();
         services.AddSingleton<ZoneChatService>();
-        services.AddSingleton<ChatEmoteService>();
         services.AddSingleton<IdDisplayHandler>();
         services.AddSingleton<PlayerPerformanceService>();
-        services.AddSingleton<PenumbraTempCollectionJanitor>();
-        services.AddSingleton<LocationShareService>();
 
         services.AddSingleton<TextureMetadataHelper>(sp =>
             new TextureMetadataHelper(sp.GetRequiredService<ILogger<TextureMetadataHelper>>(), gameData));
@@ -181,8 +169,7 @@ public sealed class Plugin : IDalamudPlugin
 
         services.AddSingleton(sp => new BlockedCharacterHandler(
             sp.GetRequiredService<ILogger<BlockedCharacterHandler>>(),
-            gameInteropProvider,
-            objectTable));
+            gameInteropProvider));
 
         services.AddSingleton(sp => new IpcProvider(
             sp.GetRequiredService<ILogger<IpcProvider>>(),
@@ -212,7 +199,6 @@ public sealed class Plugin : IDalamudPlugin
             gameInteropProvider,
             objectTable,
             clientState,
-            condition,
             sp.GetRequiredService<LightlessMediator>()));
 
         services.AddSingleton(sp => new DalamudUtilService(
@@ -225,7 +211,6 @@ public sealed class Plugin : IDalamudPlugin
             gameData,
             targetManager,
             gameConfig,
-            playerState,
             sp.GetRequiredService<ActorObjectService>(),
             sp.GetRequiredService<BlockedCharacterHandler>(),
             sp.GetRequiredService<LightlessMediator>(),
@@ -280,7 +265,6 @@ public sealed class Plugin : IDalamudPlugin
             sp.GetRequiredService<ILogger<LightFinderPlateHandler>>(),
             addonLifecycle,
             gameGui,
-            clientState,
             sp.GetRequiredService<LightlessConfigService>(),
             sp.GetRequiredService<LightlessMediator>(),
             objectTable,
@@ -288,22 +272,12 @@ public sealed class Plugin : IDalamudPlugin
             pluginInterface,
             sp.GetRequiredService<PictomancyService>()));
 
-        services.AddSingleton(sp => new LightFinderNativePlateHandler(
-            sp.GetRequiredService<ILogger<LightFinderNativePlateHandler>>(),
-            clientState,
-            sp.GetRequiredService<LightlessConfigService>(),
-            sp.GetRequiredService<LightlessMediator>(),
-            objectTable,
-            sp.GetRequiredService<PairUiService>(),
-            sp.GetRequiredService<NameplateUpdateHookService>()));
-
         services.AddSingleton(sp => new LightFinderScannerService(
             sp.GetRequiredService<ILogger<LightFinderScannerService>>(),
             framework,
             sp.GetRequiredService<LightFinderService>(),
             sp.GetRequiredService<LightlessMediator>(),
             sp.GetRequiredService<LightFinderPlateHandler>(),
-            sp.GetRequiredService<LightFinderNativePlateHandler>(),
             sp.GetRequiredService<ActorObjectService>()));
 
         services.AddSingleton(sp => new ContextMenuService(
@@ -321,10 +295,7 @@ public sealed class Plugin : IDalamudPlugin
             sp.GetRequiredService<LightFinderScannerService>(),
             sp.GetRequiredService<LightFinderService>(),
             sp.GetRequiredService<LightlessProfileManager>(),
-            sp.GetRequiredService<LightlessMediator>(),
-            chatGui,
-            sp.GetRequiredService<NotificationService>())
-            );
+            sp.GetRequiredService<LightlessMediator>()));
 
         // IPC callers / manager
         services.AddSingleton(sp => new IpcCallerPenumbra(
@@ -378,11 +349,6 @@ public sealed class Plugin : IDalamudPlugin
             sp.GetRequiredService<DalamudUtilService>(),
             sp.GetRequiredService<LightlessMediator>()));
 
-        services.AddSingleton(sp => new IpcCallerLifestream(
-            pluginInterface,
-            sp.GetRequiredService<LightlessMediator>(),
-            sp.GetRequiredService<ILogger<IpcCallerLifestream>>()));
-
         services.AddSingleton(sp => new IpcManager(
             sp.GetRequiredService<ILogger<IpcManager>>(),
             sp.GetRequiredService<LightlessMediator>(),
@@ -393,9 +359,7 @@ public sealed class Plugin : IDalamudPlugin
             sp.GetRequiredService<IpcCallerHonorific>(),
             sp.GetRequiredService<IpcCallerMoodles>(),
             sp.GetRequiredService<IpcCallerPetNames>(),
-            sp.GetRequiredService<IpcCallerBrio>(),
-            sp.GetRequiredService<IpcCallerLifestream>()
-            ));
+            sp.GetRequiredService<IpcCallerBrio>()));
 
         // Notifications / HTTP
         services.AddSingleton(sp => new NotificationService(
@@ -429,7 +393,6 @@ public sealed class Plugin : IDalamudPlugin
             return cfg;
         });
         services.AddSingleton(sp => new ServerConfigService(configDir));
-        services.AddSingleton(sp => new PenumbraJanitorConfigService(configDir));
         services.AddSingleton(sp => new NotesConfigService(configDir));
         services.AddSingleton(sp => new PairTagConfigService(configDir));
         services.AddSingleton(sp => new SyncshellTagConfigService(configDir));
@@ -443,7 +406,6 @@ public sealed class Plugin : IDalamudPlugin
         services.AddSingleton<IConfigService<ILightlessConfiguration>>(sp => sp.GetRequiredService<UiThemeConfigService>());
         services.AddSingleton<IConfigService<ILightlessConfiguration>>(sp => sp.GetRequiredService<ChatConfigService>());
         services.AddSingleton<IConfigService<ILightlessConfiguration>>(sp => sp.GetRequiredService<ServerConfigService>());
-        services.AddSingleton<IConfigService<ILightlessConfiguration>>(sp => sp.GetRequiredService<PenumbraJanitorConfigService>());
         services.AddSingleton<IConfigService<ILightlessConfiguration>>(sp => sp.GetRequiredService<NotesConfigService>());
         services.AddSingleton<IConfigService<ILightlessConfiguration>>(sp => sp.GetRequiredService<PairTagConfigService>());
         services.AddSingleton<IConfigService<ILightlessConfiguration>>(sp => sp.GetRequiredService<SyncshellTagConfigService>());
@@ -494,12 +456,19 @@ public sealed class Plugin : IDalamudPlugin
             sp.GetRequiredService<LightlessConfigService>(),
             sp.GetRequiredService<UiSharedService>(),
             sp.GetRequiredService<ApiController>(),
+            sp.GetRequiredService<LightFinderScannerService>()));
+
+        services.AddScoped<WindowMediatorSubscriberBase, SyncshellFinderUI>(sp => new SyncshellFinderUI(
+            sp.GetRequiredService<ILogger<SyncshellFinderUI>>(),
+            sp.GetRequiredService<LightlessMediator>(),
+            sp.GetRequiredService<PerformanceCollectorService>(),
+            sp.GetRequiredService<LightFinderService>(),
+            sp.GetRequiredService<UiSharedService>(),
+            sp.GetRequiredService<ApiController>(),
             sp.GetRequiredService<LightFinderScannerService>(),
             sp.GetRequiredService<PairUiService>(),
             sp.GetRequiredService<DalamudUtilService>(),
-            sp.GetRequiredService<LightlessProfileManager>(),
-            sp.GetRequiredService<ActorObjectService>(),
-            sp.GetRequiredService<LightFinderPlateHandler>()));
+            sp.GetRequiredService<LightlessProfileManager>()));
 
         services.AddScoped<IPopupHandler, BanUserPopupHandler>();
         services.AddScoped<IPopupHandler, CensusPopupHandler>();
@@ -556,9 +525,9 @@ public sealed class Plugin : IDalamudPlugin
             clientState,
             gameGui,
             objectTable,
+            gameInteropProvider,
             sp.GetRequiredService<LightlessMediator>(),
-            sp.GetRequiredService<PairUiService>(),
-            sp.GetRequiredService<NameplateUpdateHookService>()));
+            sp.GetRequiredService<PairUiService>()));
 
         // Hosted services
         services.AddHostedService(sp => sp.GetRequiredService<ConfigurationSaveService>());
@@ -577,7 +546,6 @@ public sealed class Plugin : IDalamudPlugin
         services.AddHostedService(sp => sp.GetRequiredService<ContextMenuService>());
         services.AddHostedService(sp => sp.GetRequiredService<LightFinderService>());
         services.AddHostedService(sp => sp.GetRequiredService<LightFinderPlateHandler>());
-        services.AddHostedService(sp => sp.GetRequiredService<LightFinderNativePlateHandler>());
     }).Build();
 
         _ = _host.StartAsync();
@@ -585,6 +553,7 @@ public sealed class Plugin : IDalamudPlugin
 
     public void Dispose()
     {
-        _host.StopAsync().ContinueWith(_ => _host.Dispose()).Wait(TimeSpan.FromSeconds(5));
+        _host.StopAsync().GetAwaiter().GetResult();
+        _host.Dispose();
     }
 }

LightlessSync/Resources/LocalizationExtention.cs

@@ -1,9 +0,0 @@
-namespace LightlessSync.Resources;
-
-public static class LocalizationExtensions
-{
-    public static string F(this string mask, params object[] args)
-    {
-        return string.Format(mask, args);
-    }
-}

LightlessSync/Resources/Resources.Designer.cs

@@ -1,171 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace LightlessSync.Resources {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    public class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("LightlessSync.Resources.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to I agree.
-        /// </summary>
-        public static string ToSStrings_AgreeLabel {
-            get {
-                return ResourceManager.GetString("ToSStrings_AgreeLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Agreement of Usage of Service.
-        /// </summary>
-        public static string ToSStrings_AgreementLabel {
-            get {
-                return ResourceManager.GetString("ToSStrings_AgreementLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;I agree&apos; button will be available in.
-        /// </summary>
-        public static string ToSStrings_ButtonWillBeAvailableIn {
-            get {
-                return ResourceManager.GetString("ToSStrings_ButtonWillBeAvailableIn", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Language.
-        /// </summary>
-        public static string ToSStrings_LanguageLabel {
-            get {
-                return ResourceManager.GetString("ToSStrings_LanguageLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to All of the mod files currently active on your character as well as your current character state will be uploaded to the service you registered yourself at automatically. The plugin will exclusively upload the necessary mod files and not the whole mod..
-        /// </summary>
-        public static string ToSStrings_Paragraph1 {
-            get {
-                return ResourceManager.GetString("ToSStrings_Paragraph1", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to If you are on a data capped internet connection, higher fees due to data usage depending on the amount of downloaded and uploaded mod files might occur. Mod files will be compressed on up- and download to save on bandwidth usage. Due to varying up- and download speeds, changes in characters might not be visible immediately. Files present on the service that already represent your active mod files will not be uploaded again..
-        /// </summary>
-        public static string ToSStrings_Paragraph2 {
-            get {
-                return ResourceManager.GetString("ToSStrings_Paragraph2", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The mod files you are uploading are confidential and will not be distributed to parties other than the ones who are requesting the exact same mod files. Please think about who you are going to pair since it is unavoidable that they will receive and locally cache the necessary mod files that you have currently in use. Locally cached mod files will have arbitrary file names to discourage attempts at replicating the original mod..
-        /// </summary>
-        public static string ToSStrings_Paragraph3 {
-            get {
-                return ResourceManager.GetString("ToSStrings_Paragraph3", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The plugin creator tried their best to keep you secure. However, there is no guarantee for 100% security. Do not blindly pair your client with everyone..
-        /// </summary>
-        public static string ToSStrings_Paragraph4 {
-            get {
-                return ResourceManager.GetString("ToSStrings_Paragraph4", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Mod files that are saved on the service will remain on the service as long as there are requests for the files from clients. After a period of not being used, the mod files will be automatically deleted. You will also be able to wipe all the files you have personally uploaded on request. The service holds no information about which mod files belong to which mod..
-        /// </summary>
-        public static string ToSStrings_Paragraph5 {
-            get {
-                return ResourceManager.GetString("ToSStrings_Paragraph5", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to This service is provided as-is. In case of abuse join the Lightless Sync Discord..
-        /// </summary>
-        public static string ToSStrings_Paragraph6 {
-            get {
-                return ResourceManager.GetString("ToSStrings_Paragraph6", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to READ THIS CAREFULLY.
-        /// </summary>
-        public static string ToSStrings_ReadLabel {
-            get {
-                return ResourceManager.GetString("ToSStrings_ReadLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Users Online.
-        /// </summary>
-        public static string Users_Online {
-            get {
-                return ResourceManager.GetString("Users_Online", resourceCulture);
-            }
-        }
-    }
-}

LightlessSync/Resources/Resources.de.resx

@@ -1,47 +0,0 @@
-<root>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>1.3</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <data name="ToSStrings_LanguageLabel" xml:space="preserve">
-        <value>Language</value>
-    </data>
-    <data name="ToSStrings_AgreementLabel" xml:space="preserve">
-        <value>Nutzungsbedingungen</value>
-    </data>
-    <data name="ToSStrings_ReadLabel" xml:space="preserve">
-        <value>BITTE LIES DIES SORGFÄLTIG</value>
-    </data>
-    <data name="ToSStrings_Paragraph1" xml:space="preserve">
-        <value>Alle Moddateien, die aktuell auf deinem Charakter aktiv sind und dein Charakterzustand werden automatisch zu dem Service, an dem du dich registriert hast, hochgeladen. Das Plugin wird ausschließlich die nötigen Moddateien hochladen und nicht die gesamte Modifikation.</value>
-    </data>
-    <data name="ToSStrings_Paragraph2" xml:space="preserve">
-        <value>Falls du mit einer getakteten Internetverbindung verbunden bist, können durch den Datentransfer von Hoch- und Runtergeladenen Moddateien höhere Kosten entstehen. Moddateien werden beim Hoch- und Runterladen komprimiert um Bandbreite zu sparen. Durch unterschiedliche Hoch- und Runterladgeschwindigkeiten ist es möglich, dass Änderungen an Charakteren nicht sofort sichtbar sind. Dateien die bereits auf dem Service existieren, werden nicht nochmals hochgeladen.</value>
-    </data>
-    <data name="ToSStrings_Paragraph3" xml:space="preserve">
-        <value>Die Moddateien die du hochlädst sind vertraulich und werden nicht mit anderen Nutzern geteilt, die nicht die exakt selben Dateien anfordern. Bitte überlege dir sorgfältig mit wem du deinen Identifikationscode teilst, da es unvermeidlich ist, dass die andere Person deine Moddateien erhält und lokal zwischenspeichert. Lokal zwischengespeicherte Dateien haben willkürrliche Namen um vor Versuchen abzuschrecken die originalen Moddateien aus diesen wiederherzustellen.</value>
-    </data>
-    <data name="ToSStrings_Paragraph4" xml:space="preserve">
-        <value>Der Ersteller des Plugins hat sein Bestes getan, um deine Sicherheit zu gewährleisten. Es gibt jedoch keine Garantie für 100%ige Sicherheit. Teile deinen Identifikationscode nicht blind mit jedem.</value>
-    </data>
-    <data name="ToSStrings_Paragraph5" xml:space="preserve">
-        <value>Moddateien, die auf dem Service gespeichert sind, verbleiben auf dem Service, solange es Anforderungen für diese Dateien gibt. Nach einer Zeitspanne in der die Dateien nicht verwendet wurden, werden diese automatisch gelöscht. Du hast auch die Möglichkeit manuell alle Dateien auf dem Service zu löschen. Der Service hat keine Informationen welche Moddateien zu welcher Modifikation gehören.</value>
-    </data>
-    <data name="ToSStrings_Paragraph6" xml:space="preserve">
-        <value>Dieser Dienst wird ohne Gewähr angeboten. Im Falle eines Missbrauchs tretet dem Lightless Sync Discord bei.</value>
-    </data>
-    <data name="ToSStrings_AgreeLabel" xml:space="preserve">
-        <value>Ich Stimme zu</value>
-    </data>
-    <data name="ToSStrings_ButtonWillBeAvailableIn" xml:space="preserve">
-        <value>"Ich stimme zu" Knopf verfügbar in</value>
-    </data>
-</root>

LightlessSync/Resources/Resources.fr.resx

@@ -1,47 +0,0 @@
-<root>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>1.3</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <data name="ToSStrings_LanguageLabel" xml:space="preserve">
-        <value>Language</value>
-    </data>
-    <data name="ToSStrings_AgreementLabel" xml:space="preserve">
-        <value>Conditions d'Utilisation</value>
-    </data>
-    <data name="ToSStrings_ReadLabel" xml:space="preserve">
-        <value>LISEZ CES INFORMATIONS ATTENTIVEMENT</value>
-    </data>
-    <data name="ToSStrings_Paragraph1" xml:space="preserve">
-        <value>Tous les fichiers moddés actuellement en cours d'utilisation ainsi que le statut actuel de votre personnage vont être mix en ligne via le service sur lequel vous vous êtes automatiquement enregistré. Seuls les fichiers nécessaires seront téléversés par le plugin et non pas le mod en entier.</value>
-    </data>
-    <data name="ToSStrings_Paragraph2" xml:space="preserve">
-        <value>Si le débit de votre connexion internet est limité, le téléchargement et téléversement d'un grand nombre de fichiers peut entraîner des coûts supplémentaires. Les fichiers seront compressés au chargement et versement pour réduire l'impact sur votre bande passants. Selon la rapidité de vos téléchargements et téléversements, les changements ne seront peut-être pas visibles instantanément sur les personnages. Les fichiers déja présents sur le service qui correspondent à ceux de vos mods en cours d'utilisation ne seront pas remis en ligne.</value>
-    </data>
-    <data name="ToSStrings_Paragraph3" xml:space="preserve">
-        <value>Les fichiers que vous allez partager sont confidentiels et ne seront envoyés qu'aux utilisateurs qui feront une requête exacte de ceux-çi. Nous vous demandons de (re)considérer qui sera synchronisé avec vous, puisqu'ils recevront et stockeront inévitablement en local les fichiers nécéssaires utilisés à cet instant. Les noms des fichiers stockés localement sont changés de manière arbitraire afin de décourager toute tentative de réplication des originaux.</value>
-    </data>
-    <data name="ToSStrings_Paragraph4" xml:space="preserve">
-        <value>Le créateur de ce plugin a tenté de sécuriser l'application du mieux possible. Cependant, il ne peut pas garantir une protection 100% infaillible. Pour votre sécurité, ne vous synchronisez pas aveuglément et avec n'importe qui.</value>
-    </data>
-    <data name="ToSStrings_Paragraph5" xml:space="preserve">
-        <value>Les fichiers sauvegardés sur le service resteront en ligne tant que des utilisateurs en feront usage. Ils seront effacés automatiquement après une certaine période d'inactivité. Vous pouvez également demander l'effacement de tous les fichiers que vous avez mis en ligne vous-même. Le service en soi ne contient aucune information pouvant identifier quel fichier appartient à quel mod.</value>
-    </data>
-    <data name="ToSStrings_Paragraph6" xml:space="preserve">
-        <value>Ce service et ses composants vous sont fournis en l'état. En cas d'abus rejoindre le serveur Discord Lightless Sync.</value>
-    </data>
-    <data name="ToSStrings_AgreeLabel" xml:space="preserve">
-        <value>J'accept</value>
-    </data>
-    <data name="ToSStrings_ButtonWillBeAvailableIn" xml:space="preserve">
-        <value>Bouton "J'accept" disposible dans</value>
-    </data>
-</root>

LightlessSync/Resources/Resources.resx

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<root>
-    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-        <xsd:element name="root" msdata:IsDataSet="true">
-            
-        </xsd:element>
-    </xsd:schema>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>1.3</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <data name="ToSStrings_AgreeLabel" xml:space="preserve">
-        <value>I agree</value>
-    </data>
-    <data name="ToSStrings_AgreementLabel" xml:space="preserve">
-        <value>Agreement of Usage of Service</value>
-    </data>
-    <data name="ToSStrings_ButtonWillBeAvailableIn" xml:space="preserve">
-        <value>'I agree' button will be available in</value>
-    </data>
-    <data name="ToSStrings_Paragraph1" xml:space="preserve">
-        <value>All of the mod files currently active on your character as well as your current character state will be uploaded to the service you registered yourself at automatically. The plugin will exclusively upload the necessary mod files and not the whole mod.</value>
-    </data>
-    <data name="ToSStrings_Paragraph2" xml:space="preserve">
-        <value>If you are on a data capped internet connection, higher fees due to data usage depending on the amount of downloaded and uploaded mod files might occur. Mod files will be compressed on up- and download to save on bandwidth usage. Due to varying up- and download speeds, changes in characters might not be visible immediately. Files present on the service that already represent your active mod files will not be uploaded again.</value>
-    </data>
-    <data name="ToSStrings_Paragraph3" xml:space="preserve">
-        <value>The mod files you are uploading are confidential and will not be distributed to parties other than the ones who are requesting the exact same mod files. Please think about who you are going to pair since it is unavoidable that they will receive and locally cache the necessary mod files that you have currently in use. Locally cached mod files will have arbitrary file names to discourage attempts at replicating the original mod.</value>
-    </data>
-    <data name="ToSStrings_Paragraph4" xml:space="preserve">
-        <value>The plugin creator tried their best to keep you secure. However, there is no guarantee for 100% security. Do not blindly pair your client with everyone.</value>
-    </data>
-    <data name="ToSStrings_Paragraph5" xml:space="preserve">
-        <value>Mod files that are saved on the service will remain on the service as long as there are requests for the files from clients. After a period of not being used, the mod files will be automatically deleted. You will also be able to wipe all the files you have personally uploaded on request. The service holds no information about which mod files belong to which mod.</value>
-    </data>
-    <data name="ToSStrings_Paragraph6" xml:space="preserve">
-        <value>This service is provided as-is. In case of abuse join the Lightless Sync Discord.</value>
-    </data>
-    <data name="ToSStrings_ReadLabel" xml:space="preserve">
-        <value>READ THIS CAREFULLY</value>
-    </data>
-    <data name="ToSStrings_LanguageLabel" xml:space="preserve">
-        <value>Language</value>
-    </data>
-    <data name="Users_Online" xml:space="preserve">
-        <value>Users Online</value>
-    </data>
-</root>

LightlessSync/Resources/Resources.zh.resx

@@ -1,20 +0,0 @@
-<root>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>1.3</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <data name="ToSStrings_LanguageLabel" xml:space="preserve">
-        <value>语言</value>
-    </data>
-    <data name="Users_Online" xml:space="preserve">
-        <value>用户在线</value>
-    </data>
-</root>

LightlessSync/Services/CharaData/CharaDataFileHandler.cs

@@ -1,16 +1,13 @@
-using Dalamud.Game.ClientState.Objects.SubKinds;
+using Dalamud.Game.ClientState.Objects.SubKinds;
 using K4os.Compression.LZ4.Legacy;
 using LightlessSync.API.Data;
 using LightlessSync.API.Data.Enum;
 using LightlessSync.API.Dto.CharaData;
 using LightlessSync.FileCache;
-using LightlessSync.LightlessConfiguration.Models;
 using LightlessSync.PlayerData.Factories;
 using LightlessSync.PlayerData.Handlers;
 using LightlessSync.Services.CharaData;
 using LightlessSync.Services.CharaData.Models;
-using LightlessSync.Services.Mediator;
-using LightlessSync.UI.Models;
 using LightlessSync.Utils;
 using LightlessSync.WebAPI.Files;
 using Microsoft.Extensions.Logging;
@@ -27,11 +24,10 @@ public sealed class CharaDataFileHandler : IDisposable
     private readonly ILogger<CharaDataFileHandler> _logger;
     private readonly LightlessCharaFileDataFactory _lightlessCharaFileDataFactory;
     private readonly PlayerDataFactory _playerDataFactory;
-    private readonly NotificationService _notificationService;
     private int _globalFileCounter = 0;
 
     public CharaDataFileHandler(ILogger<CharaDataFileHandler> logger, FileDownloadManagerFactory fileDownloadManagerFactory, FileUploadManager fileUploadManager, FileCacheManager fileCacheManager,
-            DalamudUtilService dalamudUtilService, GameObjectHandlerFactory gameObjectHandlerFactory, PlayerDataFactory playerDataFactory, NotificationService notificationService)
+            DalamudUtilService dalamudUtilService, GameObjectHandlerFactory gameObjectHandlerFactory, PlayerDataFactory playerDataFactory)
     {
         _fileDownloadManager = fileDownloadManagerFactory.Create();
         _logger = logger;
@@ -40,7 +36,6 @@ public sealed class CharaDataFileHandler : IDisposable
         _dalamudUtilService = dalamudUtilService;
         _gameObjectHandlerFactory = gameObjectHandlerFactory;
         _playerDataFactory = playerDataFactory;
-        _notificationService = notificationService;
         _lightlessCharaFileDataFactory = new(fileCacheManager);
     }
 
@@ -253,161 +248,54 @@ public sealed class CharaDataFileHandler : IDisposable
     }
 
     internal async Task SaveCharaFileAsync(string description, string filePath)
-    {
-        var createPlayerDataStopwatch = System.Diagnostics.Stopwatch.StartNew();
-        var data = await CreatePlayerData().ConfigureAwait(false);
-        createPlayerDataStopwatch.Stop();
-        _logger.LogInformation("CreatePlayerData took {elapsed}ms", createPlayerDataStopwatch.ElapsedMilliseconds);
-
-        if (data == null) return;
-
-        await Task.Run(async () => await SaveCharaFileAsyncInternal(description, filePath, data).ConfigureAwait(false)).ConfigureAwait(false);
-    }
-
-    private async Task SaveCharaFileAsyncInternal(string description, string filePath, CharacterData data)
     {
         var tempFilePath = filePath + ".tmp";
-        var overallStopwatch = System.Diagnostics.Stopwatch.StartNew();
 
         try
         {
+            var data = await CreatePlayerData().ConfigureAwait(false);
+            if (data == null) return;
+
             var lightlessCharaFileData = _lightlessCharaFileDataFactory.Create(description, data);
             LightlessCharaFileHeader output = new(LightlessCharaFileHeader.CurrentVersion, lightlessCharaFileData);
 
-            using var fs = new FileStream(tempFilePath, FileMode.Create, FileAccess.ReadWrite, FileShare.None, bufferSize: 65536, useAsync: false);
+            using var fs = new FileStream(tempFilePath, FileMode.Create, FileAccess.ReadWrite, FileShare.None);
             using var lz4 = new LZ4Stream(fs, LZ4StreamMode.Compress, LZ4StreamFlags.HighCompression);
             using var writer = new BinaryWriter(lz4);
             output.WriteToStream(writer);
 
-            int fileIndex = 0;
-            long totalBytesWritten = 0;
-            long totalBytesToWrite = output.CharaFileData.Files.Sum(f => f.Length);
-            var fileWriteStopwatch = System.Diagnostics.Stopwatch.StartNew();
-            const long updateIntervalMs = 1000;
-
             foreach (var item in output.CharaFileData.Files)
             {
-                fileIndex++;
-                var fileStopwatch = System.Diagnostics.Stopwatch.StartNew();
-
                 var file = _fileCacheManager.GetFileCacheByHash(item.Hash)!;
-                _logger.LogDebug("Saving to MCDF [{fileNum}/{totalFiles}]: {hash}:{file}", fileIndex, output.CharaFileData.Files.Count, item.Hash, file.ResolvedFilepath);
+                _logger.LogDebug("Saving to MCDF: {hash}:{file}", item.Hash, file.ResolvedFilepath);
                 _logger.LogDebug("\tAssociated GamePaths:");
                 foreach (var path in item.GamePaths)
                 {
                     _logger.LogDebug("\t{path}", path);
                 }
 
-                using var fsRead = File.OpenRead(file.ResolvedFilepath);
-                using var br = new BinaryReader(fsRead);
-                byte[] buffer = new byte[item.Length];
-                int bytesRead = br.Read(buffer, 0, item.Length);
-
-                if (bytesRead != item.Length)
+                var fsRead = File.OpenRead(file.ResolvedFilepath);
+                await using (fsRead.ConfigureAwait(false))
                 {
-                    _logger.LogWarning("Expected to read {expected} bytes but got {actual} bytes from {file}", item.Length, bytesRead, file.ResolvedFilepath);
-                }
-
-                writer.Write(buffer);
-                totalBytesWritten += bytesRead;
-
-                fileStopwatch.Stop();
-                _logger.LogDebug("Wrote file [{fileNum}/{totalFiles}] in {elapsed}ms ({sizeKb}kb)", fileIndex, output.CharaFileData.Files.Count, fileStopwatch.ElapsedMilliseconds, item.Length / 1024);
-
-                if (fileWriteStopwatch.ElapsedMilliseconds >= updateIntervalMs && totalBytesToWrite > 0)
-                {
-                    float progress = (float)totalBytesWritten / totalBytesToWrite;
-                    var elapsed = overallStopwatch.Elapsed;
-                    var eta = CalculateEta(elapsed, progress);
-
-                    var notification = new LightlessNotification
-                    {
-                        Id = "chara_file_save_progress",
-                        Title = "Character Data",
-                        Message = $"Compressing and saving character file... {(progress * 100):F0}%\nETA: {FormatTimespan(eta)}",
-                        Type = NotificationType.Info,
-                        Duration = TimeSpan.FromMinutes(5),
-                        ShowProgress = true,
-                        Progress = progress
-                    };
-
-                    _notificationService.Mediator.Publish(new LightlessNotificationMessage(notification));
-
-                    fileWriteStopwatch.Restart();
+                    using var br = new BinaryReader(fsRead);
+                    byte[] buffer = new byte[item.Length];
+                    br.Read(buffer, 0, item.Length);
+                    writer.Write(buffer);
                 }
             }
-
-            var flushStopwatch = System.Diagnostics.Stopwatch.StartNew();
             writer.Flush();
-            lz4.Flush();
-            fs.Flush();
+            await lz4.FlushAsync().ConfigureAwait(false);
+            await fs.FlushAsync().ConfigureAwait(false);
             fs.Close();
-            flushStopwatch.Stop();
-            _logger.LogInformation("Flush operations took {elapsed}ms", flushStopwatch.ElapsedMilliseconds);
-
-            var moveStopwatch = System.Diagnostics.Stopwatch.StartNew();
             File.Move(tempFilePath, filePath, true);
-            moveStopwatch.Stop();
-            _logger.LogInformation("File move took {elapsed}ms", moveStopwatch.ElapsedMilliseconds);
-
-            overallStopwatch.Stop();
-            _logger.LogInformation("SaveCharaFileAsync completed successfully in {elapsed}ms. Total bytes written: {totalBytes}mb", overallStopwatch.ElapsedMilliseconds, totalBytesWritten / (1024 * 1024));
-
-            _notificationService.ShowNotification(
-                "Character Data",
-                "Character file saved successfully!",
-                NotificationType.Info,
-                duration: TimeSpan.FromSeconds(5));
-
-            _notificationService.Mediator.Publish(new LightlessNotificationDismissMessage("chara_file_save_progress"));
         }
         catch (Exception ex)
         {
-            overallStopwatch.Stop();
-            _logger.LogError(ex, "Failure Saving Lightless Chara File after {elapsed}ms, deleting output", overallStopwatch.ElapsedMilliseconds);
-            try
-            {
-                File.Delete(tempFilePath);
-            }
-            catch (Exception deleteEx)
-            {
-                _logger.LogError(deleteEx, "Failed to delete temporary file {file}", tempFilePath);
-            }
-
-            _notificationService.ShowErrorNotification(
-                "Character Data Save Failed",
-                "Failed to save character file",
-                ex);
-
-            _notificationService.Mediator.Publish(new LightlessNotificationDismissMessage("chara_file_save_progress"));
+            _logger.LogError(ex, "Failure Saving Lightless Chara File, deleting output");
+            File.Delete(tempFilePath);
         }
     }
 
-    private static TimeSpan CalculateEta(TimeSpan elapsed, float progress)
-    {
-        if (progress <= 0 || elapsed.TotalSeconds < 0.1)
-            return TimeSpan.Zero;
-
-        double totalSeconds = elapsed.TotalSeconds / progress;
-        double remainingSeconds = totalSeconds - elapsed.TotalSeconds;
-
-        return TimeSpan.FromSeconds(Math.Max(0, remainingSeconds));
-    }
-
-    private static string FormatTimespan(TimeSpan ts)
-    {
-        if (ts.TotalSeconds < 1)
-            return "< 1s";
-
-        if (ts.TotalSeconds < 60)
-            return $"{ts.TotalSeconds:F0}s";
-
-        if (ts.TotalMinutes < 60)
-            return $"{ts.TotalMinutes:F1}m";
-
-        return $"{ts.TotalHours:F1}h";
-    }
-
     internal async Task<List<string>> UploadFiles(List<string> fileList, ValueProgress<string> uploadProgress, CancellationToken token)
     {
         return await _fileUploadManager.UploadFiles(fileList, uploadProgress, token).ConfigureAwait(false);

LightlessSync/Services/CharaData/CharaDataGposeTogetherManager.cs

@@ -450,7 +450,7 @@ public class CharaDataGposeTogetherManager : DisposableMediatorSubscriberBase
                     };
                 }
 
-                var loc = _dalamudUtil.GetMapData();
+                var loc = await _dalamudUtil.GetMapDataAsync().ConfigureAwait(false);
                 worldData.LocationInfo = loc;
 
                 if (_forceResendWorldData || worldData != _lastWorldData)

LightlessSync/Services/CharaData/CharaDataManager.cs

@@ -254,7 +254,7 @@ public sealed partial class CharaDataManager : DisposableMediatorSubscriberBase
 
             Logger.LogTrace("Attaching World data {data}", worldData);
 
-            worldData.LocationInfo = _dalamudUtilService.GetMapData();
+            worldData.LocationInfo = await _dalamudUtilService.GetMapDataAsync().ConfigureAwait(false);
 
             Logger.LogTrace("World data serialized: {data}", worldData);
 

LightlessSync/Services/CharaData/CharaDataNearbyManager.cs

@@ -186,8 +186,8 @@ public sealed class CharaDataNearbyManager : DisposableMediatorSubscriberBase
         var previousPoses = _nearbyData.Keys.ToList();
         _nearbyData.Clear();
 
-        var ownLocation = _dalamudUtilService.GetMapData();
-        var player = await _dalamudUtilService.GetPlayerCharacterAsync().ConfigureAwait(false);
+        var ownLocation = await _dalamudUtilService.RunOnFrameworkThread(() => _dalamudUtilService.GetMapData()).ConfigureAwait(false);
+        var player = await _dalamudUtilService.RunOnFrameworkThread(() => _dalamudUtilService.GetPlayerCharacter()).ConfigureAwait(false);
         var currentServer = player.CurrentWorld;
         var playerPos = player.Position;
 

LightlessSync/Services/CharacterAnalyzer.cs

@@ -1,4 +1,3 @@
-using FFXIVClientStructs.FFXIV.Client.Graphics.Render;
 using LightlessSync.API.Data;
 using LightlessSync.API.Data.Enum;
 using LightlessSync.FileCache;
@@ -28,7 +27,7 @@ public sealed class CharacterAnalyzer : MediatorSubscriberBase, IDisposable
         {
             _baseAnalysisCts = _baseAnalysisCts.CancelRecreate();
             var token = _baseAnalysisCts.Token;
-            _ = Task.Run(async () => await BaseAnalysis(msg.CharacterData, token).ConfigureAwait(false), token);
+            _ = BaseAnalysis(msg.CharacterData, token);
         });
         _fileCacheManager = fileCacheManager;
         _xivDataAnalyzer = modelAnalyzer;
@@ -99,13 +98,11 @@ public sealed class CharacterAnalyzer : MediatorSubscriberBase, IDisposable
         _analysisCts = null;
         if (print) PrintAnalysis();
     }
-
     public void Dispose()
     {
         _analysisCts.CancelDispose();
         _baseAnalysisCts.Dispose();
     }
-
     public async Task UpdateFileEntriesAsync(IEnumerable<string> filePaths, CancellationToken token)
     {
         var normalized = new HashSet<string>(
@@ -128,7 +125,6 @@ public sealed class CharacterAnalyzer : MediatorSubscriberBase, IDisposable
             }
         }
     }
-
     private async Task BaseAnalysis(CharacterData charaData, CancellationToken token)
     {
         if (string.Equals(charaData.DataHash.Value, _lastDataHash, StringComparison.Ordinal)) return;
@@ -140,47 +136,29 @@ public sealed class CharacterAnalyzer : MediatorSubscriberBase, IDisposable
             {
                 token.ThrowIfCancellationRequested();
 
-                var fileCacheEntries = (await _fileCacheManager
-                    .GetAllFileCachesByHashAsync(fileEntry.Hash, ignoreCacheEntries: true, validate: false, token)
-                    .ConfigureAwait(false))
-                    .ToList();
-
-                if (fileCacheEntries.Count == 0)
-                    continue;
-
-                var resolved = fileCacheEntries[0].ResolvedFilepath;
-
-                var extWithDot = Path.GetExtension(resolved);
-                var ext = string.IsNullOrEmpty(extWithDot) ? "unk?" : extWithDot.TrimStart('.');
-
-                var tris = await _xivDataAnalyzer.GetTrianglesByHash(fileEntry.Hash).ConfigureAwait(false);
-
-                var distinctFilePaths = fileCacheEntries
-                    .Select(c => c.ResolvedFilepath)
-                    .Where(p => !string.IsNullOrWhiteSpace(p))
-                    .Distinct(StringComparer.OrdinalIgnoreCase)
-                    .ToList();
-
-                long orig = 0, comp = 0;
-                var first = fileCacheEntries[0];
-                if (first.Size > 0) orig = first.Size.Value;
-                if (first.CompressedSize > 0) comp = first.CompressedSize.Value;
-
-                if (_fileCacheManager.TryGetSizeInfo(fileEntry.Hash, out var cached))
+                var fileCacheEntries = (await _fileCacheManager.GetAllFileCachesByHashAsync(fileEntry.Hash, ignoreCacheEntries: true, validate: false, token).ConfigureAwait(false)).ToList();
+                if (fileCacheEntries.Count == 0) continue;
+                var filePath = fileCacheEntries[0].ResolvedFilepath;
+                FileInfo fi = new(filePath);
+                string ext = "unk?";
+                try
                 {
-                    if (orig <= 0 && cached.Original > 0) orig = cached.Original;
-                    if (comp <= 0 && cached.Compressed > 0) comp = cached.Compressed;
+                    ext = fi.Extension[1..];
+                }
+                catch (Exception ex)
+                {
+                    Logger.LogWarning(ex, "Could not identify extension for {path}", filePath);
+                }
+                var tris = await _xivDataAnalyzer.GetTrianglesByHash(fileEntry.Hash).ConfigureAwait(false);
+                foreach (var entry in fileCacheEntries)
+                {
+                    data[fileEntry.Hash] = new FileDataEntry(fileEntry.Hash, ext,
+                        [.. fileEntry.GamePaths],
+                        [.. fileCacheEntries.Select(c => c.ResolvedFilepath).Distinct(StringComparer.Ordinal)],
+                        entry.Size > 0 ? entry.Size.Value : 0,
+                        entry.CompressedSize > 0 ? entry.CompressedSize.Value : 0,
+                        tris);
                 }
-
-                data[fileEntry.Hash] = new FileDataEntry(
-                    fileEntry.Hash,
-                    ext,
-                    [.. fileEntry.GamePaths],
-                    distinctFilePaths,
-                    orig,
-                    comp,
-                    tris,
-                    fileCacheEntries);
             }
             LastAnalysis[obj.Key] = data;
         }
@@ -189,7 +167,6 @@ public sealed class CharacterAnalyzer : MediatorSubscriberBase, IDisposable
         Mediator.Publish(new CharacterDataAnalyzedMessage());
         _lastDataHash = charaData.DataHash.Value;
     }
-
     private void RecalculateSummary()
     {
         var builder = ImmutableDictionary.CreateBuilder<ObjectKind, CharacterAnalysisObjectSummary>();
@@ -215,7 +192,6 @@ public sealed class CharacterAnalyzer : MediatorSubscriberBase, IDisposable
 
         _latestSummary = new CharacterAnalysisSummary(builder.ToImmutable());
     }
-
     private void PrintAnalysis()
     {
         if (LastAnalysis.Count == 0) return;
@@ -259,79 +235,42 @@ public sealed class CharacterAnalyzer : MediatorSubscriberBase, IDisposable
             UiSharedService.ByteToString(LastAnalysis.Values.Sum(c => c.Values.Sum(v => v.CompressedSize))));
         Logger.LogInformation("IMPORTANT NOTES:\n\r- For Lightless up- and downloads only the compressed size is relevant.\n\r- An unusually high total files count beyond 200 and up will also increase your download time to others significantly.");
     }
-
-    internal sealed class FileDataEntry
+    internal sealed record FileDataEntry(string Hash, string FileType, List<string> GamePaths, List<string> FilePaths, long OriginalSize, long CompressedSize, long Triangles)
     {
-        public string Hash { get; }
-        public string FileType { get; }
-        public List<string> GamePaths { get; }
-        public List<string> FilePaths { get; }
-
-        public long OriginalSize { get; private set; }
-        public long CompressedSize { get; private set; }
-        public long Triangles { get; private set; }
-
-        public IReadOnlyList<FileCacheEntity> CacheEntries { get; }
-
         public bool IsComputed => OriginalSize > 0 && CompressedSize > 0;
-
-        public FileDataEntry(
-            string hash,
-            string fileType,
-            List<string> gamePaths,
-            List<string> filePaths,
-            long originalSize,
-            long compressedSize,
-            long triangles,
-            IReadOnlyList<FileCacheEntity> cacheEntries)
+        public async Task ComputeSizes(FileCacheManager fileCacheManager, CancellationToken token)
         {
-            Hash = hash;
-            FileType = fileType;
-            GamePaths = gamePaths;
-            FilePaths = filePaths;
-            OriginalSize = originalSize;
-            CompressedSize = compressedSize;
-            Triangles = triangles;
-            CacheEntries = cacheEntries;
+            var compressedsize = await fileCacheManager.GetCompressedFileData(Hash, token).ConfigureAwait(false);
+            var normalSize = new FileInfo(FilePaths[0]).Length;
+            var entries = await fileCacheManager.GetAllFileCachesByHashAsync(Hash, ignoreCacheEntries: true, validate: false, token).ConfigureAwait(false);
+            foreach (var entry in entries)
+            {
+                entry.Size = normalSize;
+                entry.CompressedSize = compressedsize.Item2.LongLength;
+            }
+            OriginalSize = normalSize;
+            CompressedSize = compressedsize.Item2.LongLength;
+            RefreshFormat();
         }
-
-        public async Task ComputeSizes(FileCacheManager fileCacheManager, CancellationToken token, bool force = false)
-        {
-            if (!force && IsComputed)
-                return;
-
-            if (FilePaths.Count == 0 || string.IsNullOrWhiteSpace(FilePaths[0]))
-                return;
-
-            var path = FilePaths[0];
-
-            if (!File.Exists(path))
-                return;
-
-            var original = new FileInfo(path).Length;
-
-            var compressedLen = await fileCacheManager.GetCompressedSizeAsync(Hash, token).ConfigureAwait(false);
-
-            fileCacheManager.SetSizeInfo(Hash, original, compressedLen);
-            FileCacheManager.ApplySizesToEntries(CacheEntries, original, compressedLen);
-
-            OriginalSize = original;
-            CompressedSize = compressedLen;
-
-            if (string.Equals(FileType, "tex", StringComparison.OrdinalIgnoreCase))
-                RefreshFormat();
-        }
-
+        public long OriginalSize { get; private set; } = OriginalSize;
+        public long CompressedSize { get; private set; } = CompressedSize;
+        public long Triangles { get; private set; } = Triangles;
         public Lazy<string> Format => _format ??= CreateFormatValue();
+
         private Lazy<string>? _format;
 
-        public void RefreshFormat() => _format = CreateFormatValue();
+        public void RefreshFormat()
+        {
+            _format = CreateFormatValue();
+        }
 
         private Lazy<string> CreateFormatValue()
             => new(() =>
             {
-                if (!string.Equals(FileType, "tex", StringComparison.OrdinalIgnoreCase))
+                if (!string.Equals(FileType, "tex", StringComparison.Ordinal))
+                {
                     return string.Empty;
+                }
 
                 try
                 {

LightlessSync/Services/Chat/ChatEmoteService.cs

@@ -1,770 +0,0 @@
-using Dalamud.Interface.Textures.TextureWraps;
-using LightlessSync.LightlessConfiguration;
-using LightlessSync.UI;
-using Microsoft.Extensions.Logging;
-using System.Collections.Concurrent;
-using System.Diagnostics;
-using System.Text.Json;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Formats.Gif;
-using SixLabors.ImageSharp.Formats.Webp;
-using SixLabors.ImageSharp.Metadata;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-
-namespace LightlessSync.Services.Chat;
-
-public sealed class ChatEmoteService : IDisposable
-{
-    private const string GlobalEmoteSetUrl = "https://7tv.io/v3/emote-sets/global";
-    private const int DefaultFrameDelayMs = 100;
-    private const int MinFrameDelayMs = 20;
-
-    private readonly ILogger<ChatEmoteService> _logger;
-    private readonly HttpClient _httpClient;
-    private readonly UiSharedService _uiSharedService;
-    private readonly ChatConfigService _chatConfigService;
-    private readonly ConcurrentDictionary<string, EmoteEntry> _emotes = new(StringComparer.Ordinal);
-    private readonly SemaphoreSlim _downloadGate = new(3, 3);
-
-    private readonly object _loadLock = new();
-    private Task? _loadTask;
-
-    public ChatEmoteService(ILogger<ChatEmoteService> logger, HttpClient httpClient, UiSharedService uiSharedService, ChatConfigService chatConfigService)
-    {
-        _logger = logger;
-        _httpClient = httpClient;
-        _uiSharedService = uiSharedService;
-        _chatConfigService = chatConfigService;
-    }
-
-    public void EnsureGlobalEmotesLoaded()
-    {
-        lock (_loadLock)
-        {
-            if (_loadTask is not null && !_loadTask.IsCompleted)
-            {
-                return;
-            }
-
-            if (_emotes.Count > 0)
-            {
-                return;
-            }
-
-            _loadTask = Task.Run(LoadGlobalEmotesAsync);
-        }
-    }
-
-    public IReadOnlyList<string> GetEmoteNames()
-    {
-        EnsureGlobalEmotesLoaded();
-        var names = _emotes.Keys.ToArray();
-        Array.Sort(names, StringComparer.OrdinalIgnoreCase);
-        return names;
-    }
-
-    public bool TryGetEmote(string code, out IDalamudTextureWrap? texture)
-    {
-        texture = null;
-        EnsureGlobalEmotesLoaded();
-
-        if (!_emotes.TryGetValue(code, out var entry))
-        {
-            return false;
-        }
-
-        var allowAnimation = _chatConfigService.Current.EnableAnimatedEmotes;
-        if (entry.TryGetTexture(allowAnimation, out texture))
-        {
-            if (allowAnimation && entry.NeedsAnimationLoad && !entry.HasAttemptedAnimation)
-            {
-                entry.EnsureLoading(allowAnimation, QueueEmoteDownload, allowWhenStaticLoaded: true);
-            }
-            return true;
-        }
-
-        entry.EnsureLoading(allowAnimation, QueueEmoteDownload);
-        return true;
-    }
-
-    public void Dispose()
-    {
-        foreach (var entry in _emotes.Values)
-        {
-            entry.Dispose();
-        }
-
-        _downloadGate.Dispose();
-    }
-
-    private async Task LoadGlobalEmotesAsync()
-    {
-        try
-        {
-            using var stream = await _httpClient.GetStreamAsync(GlobalEmoteSetUrl).ConfigureAwait(false);
-            using var document = await JsonDocument.ParseAsync(stream).ConfigureAwait(false);
-
-            if (!document.RootElement.TryGetProperty("emotes", out var emotes))
-            {
-                _logger.LogWarning("7TV emote set response missing emotes array");
-                return;
-            }
-
-            foreach (var emoteElement in emotes.EnumerateArray())
-            {
-                if (!emoteElement.TryGetProperty("name", out var nameElement))
-                {
-                    continue;
-                }
-
-                var name = nameElement.GetString();
-                if (string.IsNullOrWhiteSpace(name))
-                {
-                    continue;
-                }
-
-                var source = TryBuildEmoteSource(emoteElement);
-                if (source is null || (!source.Value.HasStatic && !source.Value.HasAnimation))
-                {
-                    continue;
-                }
-
-                _emotes.TryAdd(name, new EmoteEntry(name, source.Value));
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning(ex, "Failed to load 7TV emote set");
-        }
-    }
-
-    private static EmoteSource? TryBuildEmoteSource(JsonElement emoteElement)
-    {
-        if (!emoteElement.TryGetProperty("data", out var dataElement))
-        {
-            return null;
-        }
-
-        if (!dataElement.TryGetProperty("host", out var hostElement))
-        {
-            return null;
-        }
-
-        if (!hostElement.TryGetProperty("url", out var urlElement))
-        {
-            return null;
-        }
-
-        var baseUrl = urlElement.GetString();
-        if (string.IsNullOrWhiteSpace(baseUrl))
-        {
-            return null;
-        }
-
-        if (baseUrl.StartsWith("//", StringComparison.Ordinal))
-        {
-            baseUrl = "https:" + baseUrl;
-        }
-
-        if (!hostElement.TryGetProperty("files", out var filesElement))
-        {
-            return null;
-        }
-
-        var files = ReadEmoteFiles(filesElement);
-        if (files.Count == 0)
-        {
-            return null;
-        }
-
-        var animatedFile = PickBestAnimatedFile(files);
-        var animatedUrl = animatedFile is null ? null : BuildEmoteUrl(baseUrl, animatedFile.Value.Name);
-
-        var staticName = animatedFile?.StaticName;
-        if (string.IsNullOrWhiteSpace(staticName))
-        {
-            staticName = PickBestStaticFileName(files);
-        }
-
-        var staticUrl = string.IsNullOrWhiteSpace(staticName) ? null : BuildEmoteUrl(baseUrl, staticName);
-        if (string.IsNullOrWhiteSpace(animatedUrl) && string.IsNullOrWhiteSpace(staticUrl))
-        {
-            return null;
-        }
-
-        return new EmoteSource(staticUrl, animatedUrl);
-    }
-
-    private static string BuildEmoteUrl(string baseUrl, string fileName)
-        => baseUrl.TrimEnd('/') + "/" + fileName;
-
-    private static List<EmoteFile> ReadEmoteFiles(JsonElement filesElement)
-    {
-        var files = new List<EmoteFile>();
-        foreach (var file in filesElement.EnumerateArray())
-        {
-            if (!file.TryGetProperty("name", out var nameElement))
-            {
-                continue;
-            }
-
-            var name = nameElement.GetString();
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                continue;
-            }
-
-            string? staticName = null;
-            if (file.TryGetProperty("static_name", out var staticNameElement) && staticNameElement.ValueKind == JsonValueKind.String)
-            {
-                staticName = staticNameElement.GetString();
-            }
-
-            var frameCount = 1;
-            if (file.TryGetProperty("frame_count", out var frameCountElement) && frameCountElement.ValueKind == JsonValueKind.Number)
-            {
-                frameCountElement.TryGetInt32(out frameCount);
-                frameCount = Math.Max(frameCount, 1);
-            }
-
-            string? format = null;
-            if (file.TryGetProperty("format", out var formatElement) && formatElement.ValueKind == JsonValueKind.String)
-            {
-                format = formatElement.GetString();
-            }
-
-            files.Add(new EmoteFile(name, staticName, frameCount, format));
-        }
-
-        return files;
-    }
-
-    private static EmoteFile? PickBestAnimatedFile(IReadOnlyList<EmoteFile> files)
-    {
-        EmoteFile? webp1x = null;
-        EmoteFile? gif1x = null;
-        EmoteFile? webpFallback = null;
-        EmoteFile? gifFallback = null;
-
-        foreach (var file in files)
-        {
-            if (file.FrameCount <= 1 || !IsAnimatedFormatSupported(file))
-            {
-                continue;
-            }
-
-            if (file.Name.Equals("1x.webp", StringComparison.OrdinalIgnoreCase))
-            {
-                webp1x = file;
-            }
-            else if (file.Name.Equals("1x.gif", StringComparison.OrdinalIgnoreCase))
-            {
-                gif1x = file;
-            }
-            else if (file.Name.EndsWith(".webp", StringComparison.OrdinalIgnoreCase) && webpFallback is null)
-            {
-                webpFallback = file;
-            }
-            else if (file.Name.EndsWith(".gif", StringComparison.OrdinalIgnoreCase) && gifFallback is null)
-            {
-                gifFallback = file;
-            }
-        }
-
-        return webp1x ?? gif1x ?? webpFallback ?? gifFallback;
-    }
-
-    private static string? PickBestStaticFileName(IReadOnlyList<EmoteFile> files)
-    {
-        string? png1x = null;
-        string? webp1x = null;
-        string? gif1x = null;
-        string? pngFallback = null;
-        string? webpFallback = null;
-        string? gifFallback = null;
-
-        foreach (var file in files)
-        {
-            if (file.FrameCount > 1)
-            {
-                continue;
-            }
-
-            var name = file.StaticName ?? file.Name;
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                continue;
-            }
-
-            if (name.Equals("1x.png", StringComparison.OrdinalIgnoreCase))
-            {
-                png1x = name;
-            }
-            else if (name.Equals("1x.webp", StringComparison.OrdinalIgnoreCase))
-            {
-                webp1x = name;
-            }
-            else if (name.Equals("1x.gif", StringComparison.OrdinalIgnoreCase))
-            {
-                gif1x = name;
-            }
-            else if (name.EndsWith(".png", StringComparison.OrdinalIgnoreCase) && pngFallback is null)
-            {
-                pngFallback = name;
-            }
-            else if (name.EndsWith(".webp", StringComparison.OrdinalIgnoreCase) && webpFallback is null)
-            {
-                webpFallback = name;
-            }
-            else if (name.EndsWith(".gif", StringComparison.OrdinalIgnoreCase) && gifFallback is null)
-            {
-                gifFallback = name;
-            }
-        }
-
-        return png1x ?? webp1x ?? gif1x ?? pngFallback ?? webpFallback ?? gifFallback;
-    }
-
-    private static bool IsAnimatedFormatSupported(EmoteFile file)
-    {
-        if (!string.IsNullOrWhiteSpace(file.Format))
-        {
-            return file.Format.Equals("WEBP", StringComparison.OrdinalIgnoreCase)
-                || file.Format.Equals("GIF", StringComparison.OrdinalIgnoreCase);
-        }
-
-        return file.Name.EndsWith(".webp", StringComparison.OrdinalIgnoreCase)
-            || file.Name.EndsWith(".gif", StringComparison.OrdinalIgnoreCase);
-    }
-
-    private readonly record struct EmoteSource(string? StaticUrl, string? AnimatedUrl)
-    {
-        public bool HasStatic => !string.IsNullOrWhiteSpace(StaticUrl);
-        public bool HasAnimation => !string.IsNullOrWhiteSpace(AnimatedUrl);
-    }
-
-    private readonly record struct EmoteFile(string Name, string? StaticName, int FrameCount, string? Format);
-
-    private void QueueEmoteDownload(EmoteEntry entry, bool allowAnimation)
-    {
-        _ = Task.Run(async () =>
-        {
-            await _downloadGate.WaitAsync().ConfigureAwait(false);
-            try
-            {
-                if (allowAnimation)
-                {
-                    if (entry.HasAnimatedSource)
-                    {
-                        entry.MarkAnimationAttempted();
-                        if (await TryLoadAnimatedEmoteAsync(entry).ConfigureAwait(false))
-                        {
-                            return;
-                        }
-                    }
-
-                    if (entry.HasStaticSource && !entry.HasStaticTexture && await TryLoadStaticEmoteAsync(entry).ConfigureAwait(false))
-                    {
-                        return;
-                    }
-                }
-                else
-                {
-                    if (entry.HasStaticSource && await TryLoadStaticEmoteAsync(entry).ConfigureAwait(false))
-                    {
-                        return;
-                    }
-
-                    if (entry.HasAnimatedSource)
-                    {
-                        entry.MarkAnimationAttempted();
-                        if (await TryLoadAnimatedEmoteAsync(entry).ConfigureAwait(false))
-                        {
-                            return;
-                        }
-                    }
-                }
-
-                entry.MarkFailed();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogDebug(ex, "Failed to load 7TV emote {Emote}", entry.Code);
-                entry.MarkFailed();
-            }
-            finally
-            {
-                _downloadGate.Release();
-            }
-        });
-    }
-
-    private async Task<bool> TryLoadAnimatedEmoteAsync(EmoteEntry entry)
-    {
-        if (string.IsNullOrWhiteSpace(entry.AnimatedUrl))
-        {
-            return false;
-        }
-
-        try
-        {
-            var data = await _httpClient.GetByteArrayAsync(entry.AnimatedUrl).ConfigureAwait(false);
-            var isWebp = entry.AnimatedUrl.EndsWith(".webp", StringComparison.OrdinalIgnoreCase);
-            if (!TryDecodeAnimation(data, isWebp, out var animation))
-            {
-                return false;
-            }
-
-            entry.SetAnimation(animation);
-            return true;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogDebug(ex, "Failed to decode animated 7TV emote {Emote}", entry.Code);
-            return false;
-        }
-    }
-
-    private async Task<bool> TryLoadStaticEmoteAsync(EmoteEntry entry)
-    {
-        if (string.IsNullOrWhiteSpace(entry.StaticUrl))
-        {
-            return false;
-        }
-
-        try
-        {
-            var data = await _httpClient.GetByteArrayAsync(entry.StaticUrl).ConfigureAwait(false);
-            var texture = _uiSharedService.LoadImage(data);
-            entry.SetStaticTexture(texture);
-            return true;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogDebug(ex, "Failed to decode static 7TV emote {Emote}", entry.Code);
-            return false;
-        }
-    }
-
-    private bool TryDecodeAnimation(byte[] data, bool isWebp, out EmoteAnimation? animation)
-    {
-        animation = null;
-        List<EmoteFrame>? frames = null;
-
-        try
-        {
-            Image<Rgba32> image;
-            if (isWebp)
-            {
-                using var stream = new MemoryStream(data);
-                image = WebpDecoder.Instance.Decode<Rgba32>(
-                    new WebpDecoderOptions { BackgroundColorHandling = BackgroundColorHandling.Ignore },
-                    stream);
-            }
-            else
-            {
-                image = Image.Load<Rgba32>(data);
-            }
-
-            using (image)
-            {
-                if (image.Frames.Count <= 1)
-                {
-                    return false;
-                }
-
-                using var composite = new Image<Rgba32>(image.Width, image.Height, Color.Transparent);
-                Image<Rgba32>? restoreCanvas = null;
-                GifDisposalMethod? pendingGifDisposal = null;
-                WebpDisposalMethod? pendingWebpDisposal = null;
-
-                frames = new List<EmoteFrame>(image.Frames.Count);
-                for (var i = 0; i < image.Frames.Count; i++)
-                {
-                    var frameMetadata = image.Frames[i].Metadata;
-                    var delayMs = GetFrameDelayMs(frameMetadata);
-
-                    ApplyDisposal(composite, ref restoreCanvas, pendingGifDisposal, pendingWebpDisposal);
-
-                    GifDisposalMethod? currentGifDisposal = null;
-                    WebpDisposalMethod? currentWebpDisposal = null;
-                    var blendMethod = WebpBlendMethod.Over;
-
-                    if (isWebp)
-                    {
-                        if (frameMetadata.TryGetWebpFrameMetadata(out var webpMetadata))
-                        {
-                            currentWebpDisposal = webpMetadata.DisposalMethod;
-                            blendMethod = webpMetadata.BlendMethod;
-                        }
-                    }
-                    else if (frameMetadata.TryGetGifMetadata(out var gifMetadata))
-                    {
-                        currentGifDisposal = gifMetadata.DisposalMethod;
-                    }
-
-                    if (currentGifDisposal == GifDisposalMethod.RestoreToPrevious)
-                    {
-                        restoreCanvas?.Dispose();
-                        restoreCanvas = composite.Clone();
-                    }
-
-                    using var frameImage = image.Frames.CloneFrame(i);
-                    var alphaMode = blendMethod == WebpBlendMethod.Source
-                        ? PixelAlphaCompositionMode.Src
-                        : PixelAlphaCompositionMode.SrcOver;
-                    composite.Mutate(ctx => ctx.DrawImage(frameImage, PixelColorBlendingMode.Normal, alphaMode, 1f));
-
-                    using var renderedFrame = composite.Clone();
-                    using var ms = new MemoryStream();
-                    renderedFrame.SaveAsPng(ms);
-
-                    var texture = _uiSharedService.LoadImage(ms.ToArray());
-                    frames.Add(new EmoteFrame(texture, delayMs));
-
-                    pendingGifDisposal = currentGifDisposal;
-                    pendingWebpDisposal = currentWebpDisposal;
-                }
-
-                restoreCanvas?.Dispose();
-
-                animation = new EmoteAnimation(frames);
-                return true;
-            }
-        }
-        catch
-        {
-            if (frames is not null)
-            {
-                foreach (var frame in frames)
-                {
-                    frame.Texture.Dispose();
-                }
-            }
-
-            return false;
-        }
-    }
-
-    private static int GetFrameDelayMs(ImageFrameMetadata metadata)
-    {
-        if (metadata.TryGetGifMetadata(out var gifMetadata))
-        {
-            var delayMs = (long)gifMetadata.FrameDelay * 10L;
-            return NormalizeFrameDelayMs(delayMs);
-        }
-
-        if (metadata.TryGetWebpFrameMetadata(out var webpMetadata))
-        {
-            return NormalizeFrameDelayMs(webpMetadata.FrameDelay);
-        }
-
-        return DefaultFrameDelayMs;
-    }
-
-    private static int NormalizeFrameDelayMs(long delayMs)
-    {
-        if (delayMs <= 0)
-        {
-            return DefaultFrameDelayMs;
-        }
-
-        var clamped = delayMs > int.MaxValue ? int.MaxValue : (int)delayMs;
-        return Math.Max(clamped, MinFrameDelayMs);
-    }
-
-    private static void ApplyDisposal(
-        Image<Rgba32> composite,
-        ref Image<Rgba32>? restoreCanvas,
-        GifDisposalMethod? gifDisposal,
-        WebpDisposalMethod? webpDisposal)
-    {
-        if (gifDisposal is not null)
-        {
-            switch (gifDisposal)
-            {
-                case GifDisposalMethod.RestoreToBackground:
-                    composite.Mutate(ctx => ctx.BackgroundColor(Color.Transparent));
-                    break;
-                case GifDisposalMethod.RestoreToPrevious:
-                    if (restoreCanvas is not null)
-                    {
-                        composite.Mutate(ctx => ctx.BackgroundColor(Color.Transparent));
-                        var restoreSnapshot = restoreCanvas;
-                        composite.Mutate(ctx => ctx.DrawImage(restoreSnapshot, PixelColorBlendingMode.Normal, PixelAlphaCompositionMode.Src, 1f));
-                        restoreCanvas.Dispose();
-                        restoreCanvas = null;
-                    }
-                    break;
-            }
-        }
-        else if (webpDisposal == WebpDisposalMethod.RestoreToBackground)
-        {
-            composite.Mutate(ctx => ctx.BackgroundColor(Color.Transparent));
-        }
-    }
-
-    private sealed class EmoteAnimation : IDisposable
-    {
-        private readonly EmoteFrame[] _frames;
-        private readonly int _durationMs;
-        private readonly long _startTimestamp;
-
-        public EmoteAnimation(IReadOnlyList<EmoteFrame> frames)
-        {
-            _frames = frames.ToArray();
-            _durationMs = Math.Max(1, frames.Sum(frame => frame.DurationMs));
-            _startTimestamp = Stopwatch.GetTimestamp();
-        }
-
-        public IDalamudTextureWrap? GetCurrentFrame()
-        {
-            if (_frames.Length == 0)
-            {
-                return null;
-            }
-
-            if (_frames.Length == 1)
-            {
-                return _frames[0].Texture;
-            }
-
-            var elapsedTicks = Stopwatch.GetTimestamp() - _startTimestamp;
-            var elapsedMs = (elapsedTicks * 1000L) / Stopwatch.Frequency;
-            var targetMs = (int)(elapsedMs % _durationMs);
-            var accumulated = 0;
-
-            foreach (var frame in _frames)
-            {
-                accumulated += frame.DurationMs;
-                if (targetMs < accumulated)
-                {
-                    return frame.Texture;
-                }
-            }
-
-            return _frames[^1].Texture;
-        }
-
-        public IDalamudTextureWrap? GetStaticFrame()
-        {
-            if (_frames.Length == 0)
-            {
-                return null;
-            }
-
-            return _frames[0].Texture;
-        }
-
-        public void Dispose()
-        {
-            foreach (var frame in _frames)
-            {
-                frame.Texture.Dispose();
-            }
-        }
-    }
-
-    private readonly record struct EmoteFrame(IDalamudTextureWrap Texture, int DurationMs);
-
-    private sealed class EmoteEntry : IDisposable
-    {
-        private int _loadingState;
-        private int _animationAttempted;
-        private IDalamudTextureWrap? _staticTexture;
-        private EmoteAnimation? _animation;
-
-        public EmoteEntry(string code, EmoteSource source)
-        {
-            Code = code;
-            StaticUrl = source.StaticUrl;
-            AnimatedUrl = source.AnimatedUrl;
-        }
-
-        public string Code { get; }
-        public string? StaticUrl { get; }
-        public string? AnimatedUrl { get; }
-        public bool HasStaticSource => !string.IsNullOrWhiteSpace(StaticUrl);
-        public bool HasAnimatedSource => !string.IsNullOrWhiteSpace(AnimatedUrl);
-        public bool HasStaticTexture => _staticTexture is not null;
-        public bool HasAttemptedAnimation => Interlocked.CompareExchange(ref _animationAttempted, 0, 0) != 0;
-        public bool NeedsAnimationLoad => _animation is null && HasAnimatedSource;
-
-        public void MarkAnimationAttempted()
-        {
-            Interlocked.Exchange(ref _animationAttempted, 1);
-        }
-
-        public bool TryGetTexture(bool allowAnimation, out IDalamudTextureWrap? texture)
-        {
-            if (allowAnimation && _animation is not null)
-            {
-                texture = _animation.GetCurrentFrame();
-                return true;
-            }
-
-            if (_staticTexture is not null)
-            {
-                texture = _staticTexture;
-                return true;
-            }
-
-            if (!allowAnimation && _animation is not null)
-            {
-                texture = _animation.GetStaticFrame();
-                return true;
-            }
-
-            texture = null;
-            return false;
-        }
-
-        public void EnsureLoading(bool allowAnimation, Action<EmoteEntry, bool> queueDownload, bool allowWhenStaticLoaded = false)
-        {
-            if (_animation is not null)
-            {
-                return;
-            }
-
-            if (!allowWhenStaticLoaded && _staticTexture is not null)
-            {
-                return;
-            }
-
-            if (Interlocked.CompareExchange(ref _loadingState, 1, 0) != 0)
-            {
-                return;
-            }
-
-            queueDownload(this, allowAnimation);
-        }
-
-        public void SetAnimation(EmoteAnimation animation)
-        {
-            _staticTexture?.Dispose();
-            _staticTexture = null;
-            _animation?.Dispose();
-            _animation = animation;
-            Interlocked.Exchange(ref _loadingState, 0);
-        }
-
-        public void SetStaticTexture(IDalamudTextureWrap texture)
-        {
-            _staticTexture?.Dispose();
-            _staticTexture = texture;
-            Interlocked.Exchange(ref _loadingState, 0);
-        }
-
-        public void MarkFailed()
-        {
-            Interlocked.Exchange(ref _loadingState, 0);
-        }
-
-        public void Dispose()
-        {
-            _animation?.Dispose();
-            _staticTexture?.Dispose();
-        }
-    }
-}

LightlessSync/Services/Chat/ZoneChatService.cs

@@ -1,8 +1,6 @@
 using LightlessSync.API.Dto.Chat;
-using LightlessSync.API.Data.Extensions;
 using LightlessSync.Services.ActorTracking;
 using LightlessSync.Services.Mediator;
-using LightlessSync.Services.ServerConfiguration;
 using LightlessSync.WebAPI;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
@@ -25,8 +23,6 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
     private readonly DalamudUtilService _dalamudUtilService;
     private readonly ActorObjectService _actorObjectService;
     private readonly PairUiService _pairUiService;
-    private readonly ChatConfigService _chatConfigService;
-    private readonly ServerConfigurationManager _serverConfigurationManager;
 
     private readonly Lock _sync = new();
 
@@ -39,9 +35,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 readonly Dictionary<string, List<ChatMessageEntry>> _messageHistoryCache = new(StringComparer.Ordinal);
-    private List<ChatChannelSnapshot>? _cachedChannelSnapshots;
-    private bool _channelsSnapshotDirty = true;
 
     private bool _isLoggedIn;
     private bool _isConnected;
@@ -57,16 +50,13 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
         ApiController apiController,
         DalamudUtilService dalamudUtilService,
         ActorObjectService actorObjectService,
-        PairUiService pairUiService,
-        ServerConfigurationManager serverConfigurationManager)
+        PairUiService pairUiService)
         : base(logger, mediator)
     {
         _apiController = apiController;
         _dalamudUtilService = dalamudUtilService;
         _actorObjectService = actorObjectService;
         _pairUiService = pairUiService;
-        _chatConfigService = chatConfigService;
-        _serverConfigurationManager = serverConfigurationManager;
 
         _isLoggedIn = _dalamudUtilService.IsLoggedIn;
         _isConnected = _apiController.IsConnected;
@@ -77,11 +67,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)
             {
@@ -111,8 +96,6 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
                     state.Messages.ToList()));
             }
 
-            _cachedChannelSnapshots = snapshots;
-            _channelsSnapshotDirty = false;
             return snapshots;
         }
     }
@@ -150,44 +133,6 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
                 state.UnreadCount = 0;
                 _lastReadCounts[key] = state.Messages.Count;
             }
-
-            MarkChannelsSnapshotDirtyLocked();
-        }
-    }
-
-    public void MoveChannel(string draggedKey, string targetKey)
-    {
-        if (string.IsNullOrWhiteSpace(draggedKey) || string.IsNullOrWhiteSpace(targetKey))
-        {
-            return;
-        }
-
-        bool updated = false;
-        using (_sync.EnterScope())
-        {
-            if (!_channels.ContainsKey(draggedKey) || !_channels.ContainsKey(targetKey))
-            {
-                return;
-            }
-
-            var fromIndex = _channelOrder.IndexOf(draggedKey);
-            var toIndex = _channelOrder.IndexOf(targetKey);
-            if (fromIndex < 0 || toIndex < 0 || fromIndex == toIndex)
-            {
-                return;
-            }
-
-            _channelOrder.RemoveAt(fromIndex);
-            var insertIndex = Math.Clamp(toIndex, 0, _channelOrder.Count);
-            _channelOrder.Insert(insertIndex, draggedKey);
-            _chatConfigService.Current.ChannelOrder = new List<string>(_channelOrder);
-            _chatConfigService.Save();
-            updated = true;
-        }
-
-        if (updated)
-        {
-            PublishChannelListChanged();
         }
     }
 
@@ -203,7 +148,6 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
             if (!wasEnabled)
             {
                 _chatEnabled = true;
-                MarkChannelsSnapshotDirtyLocked();
             }
         }
 
@@ -249,8 +193,6 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
                 state.IsAvailable = false;
                 state.StatusText = "Chat services disabled";
             }
-
-            MarkChannelsSnapshotDirtyLocked();
         }
 
         UnregisterChatHandler();
@@ -570,15 +512,14 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
 
         if (!_isLoggedIn || !_apiController.IsConnected)
         {
-            await LeaveCurrentZoneAsync(force, 0, 0).ConfigureAwait(false);
+            await LeaveCurrentZoneAsync(force, 0).ConfigureAwait(false);
             return;
         }
 
         try
         {
-            var location = _dalamudUtilService.GetMapData();
+            var location = await _dalamudUtilService.GetMapDataAsync().ConfigureAwait(false);
             var territoryId = (ushort)location.TerritoryId;
-            var worldId = (ushort)location.ServerId;
 
             string? zoneKey;
             ZoneChannelDefinition? definition = null;
@@ -595,14 +536,14 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
 
             if (definition is null)
             {
-                await LeaveCurrentZoneAsync(force, territoryId, worldId).ConfigureAwait(false);
+                await LeaveCurrentZoneAsync(force, territoryId).ConfigureAwait(false);
                 return;
             }
 
             var descriptor = await BuildZoneDescriptorAsync(definition.Value).ConfigureAwait(false);
             if (descriptor is null)
             {
-                await LeaveCurrentZoneAsync(force, territoryId, worldId).ConfigureAwait(false);
+                await LeaveCurrentZoneAsync(force, territoryId).ConfigureAwait(false);
                 return;
             }
 
@@ -645,7 +586,7 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
         }
     }
 
-    private async Task LeaveCurrentZoneAsync(bool force, ushort territoryId, ushort worldId)
+    private async Task LeaveCurrentZoneAsync(bool force, ushort territoryId)
     {
         ChatChannelDescriptor? descriptor = null;
 
@@ -661,27 +602,7 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
                 state.StatusText = !_chatEnabled
                     ? "Chat services disabled"
                     : (_isConnected ? ZoneUnavailableMessage : "Disconnected from chat server");
-                if (territoryId != 0
-                    && _dalamudUtilService.TerritoryData.Value.TryGetValue(territoryId, out var territoryName)
-                    && !string.IsNullOrWhiteSpace(territoryName))
-                {
-                    state.DisplayName = territoryName;
-                }
-                else
-                {
-                    state.DisplayName = "Zone Chat";
-                }
-
-                if (worldId != 0)
-                {
-                    state.Descriptor = new ChatChannelDescriptor
-                    {
-                        Type = ChatChannelType.Zone,
-                        WorldId = worldId,
-                        ZoneId = territoryId,
-                        CustomKey = string.Empty
-                    };
-                }
+                state.DisplayName = "Zone Chat";
             }
 
             if (string.Equals(_activeChannelKey, ZoneChannelKey, StringComparison.Ordinal))
@@ -702,7 +623,7 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
     {
         try
         {
-            var worldId = (ushort)_dalamudUtilService.GetWorldId();
+            var worldId = (ushort)await _dalamudUtilService.GetWorldIdAsync().ConfigureAwait(false);
             return definition.Descriptor with { WorldId = worldId };
         }
         catch (Exception ex)
@@ -737,7 +658,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))
@@ -781,7 +702,6 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
         using (_sync.EnterScope())
         {
             var remainingGroups = new HashSet<string>(_groupDefinitions.Keys, StringComparer.OrdinalIgnoreCase);
-            var allowRemoval = _isConnected;
 
             foreach (var info in infoList)
             {
@@ -797,19 +717,18 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
                 var key = BuildChannelKey(descriptor);
                 if (!_channels.TryGetValue(key, out var state))
                 {
-                state = new ChatChannelState(key, ChatChannelType.Group, info.DisplayName ?? groupId, descriptor);
-                var restoredCount = RestoreCachedMessagesLocked(state);
-                state.IsConnected = _chatEnabled && _isConnected;
-                state.IsAvailable = _chatEnabled && _isConnected;
-                state.StatusText = !_chatEnabled
-                    ? "Chat services disabled"
-                    : (_isConnected ? null : "Disconnected from chat server");
-                _channels[key] = state;
-                _lastReadCounts[key] = restoredCount > 0 ? state.Messages.Count : 0;
-                if (_chatEnabled)
-                {
-                    descriptorsToJoin.Add(descriptor);
-                }
+                    state = new ChatChannelState(key, ChatChannelType.Group, info.DisplayName ?? groupId, descriptor);
+                    state.IsConnected = _chatEnabled && _isConnected;
+                    state.IsAvailable = _chatEnabled && _isConnected;
+                    state.StatusText = !_chatEnabled
+                        ? "Chat services disabled"
+                        : (_isConnected ? null : "Disconnected from chat server");
+                    _channels[key] = state;
+                    _lastReadCounts[key] = 0;
+                    if (_chatEnabled)
+                    {
+                        descriptorsToJoin.Add(descriptor);
+                    }
                 }
                 else
                 {
@@ -823,30 +742,26 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
                 }
             }
 
-            if (allowRemoval)
+            foreach (var removedGroupId in remainingGroups)
             {
-                foreach (var removedGroupId in remainingGroups)
+                if (_groupDefinitions.TryGetValue(removedGroupId, out var definition))
                 {
-                    if (_groupDefinitions.TryGetValue(removedGroupId, out var definition))
+                    var key = BuildChannelKey(definition.Descriptor);
+                    if (_channels.TryGetValue(key, out var state))
                     {
-                        var key = BuildChannelKey(definition.Descriptor);
-                        if (_channels.TryGetValue(key, out var state))
+                        descriptorsToLeave.Add(state.Descriptor);
+                        _channels.Remove(key);
+                        _lastReadCounts.Remove(key);
+                        _lastPresenceStates.Remove(BuildPresenceKey(state.Descriptor));
+                        _selfTokens.Remove(key);
+                        _pendingSelfMessages.RemoveAll(p => string.Equals(p.ChannelKey, key, StringComparison.Ordinal));
+                        if (string.Equals(_activeChannelKey, key, StringComparison.Ordinal))
                         {
-                            CacheMessagesLocked(state);
-                            descriptorsToLeave.Add(state.Descriptor);
-                            _channels.Remove(key);
-                            _lastReadCounts.Remove(key);
-                            _lastPresenceStates.Remove(BuildPresenceKey(state.Descriptor));
-                            _selfTokens.Remove(key);
-                            _pendingSelfMessages.RemoveAll(p => string.Equals(p.ChannelKey, key, StringComparison.Ordinal));
-                            if (string.Equals(_activeChannelKey, key, StringComparison.Ordinal))
-                            {
-                                _activeChannelKey = null;
-                            }
+                            _activeChannelKey = null;
                         }
-
-                        _groupDefinitions.Remove(removedGroupId);
                     }
+
+                    _groupDefinitions.Remove(removedGroupId);
                 }
             }
 
@@ -879,12 +794,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,
@@ -1024,14 +933,13 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
                     descriptor.Type,
                     displayName,
                     descriptor.Type == ChatChannelType.Zone ? (_lastZoneDescriptor ?? descriptor) : descriptor);
-                var restoredCount = RestoreCachedMessagesLocked(state);
 
                 state.IsConnected = _isConnected;
                 state.IsAvailable = descriptor.Type == ChatChannelType.Group && _isConnected;
                 state.StatusText = descriptor.Type == ChatChannelType.Zone ? ZoneUnavailableMessage : (_isConnected ? null : "Disconnected from chat server");
 
                 _channels[key] = state;
-                _lastReadCounts[key] = restoredCount > 0 ? state.Messages.Count : 0;
+                _lastReadCounts[key] = 0;
                 publishChannelList = true;
             }
 
@@ -1056,8 +964,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));
@@ -1161,7 +1067,7 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
         {
             try
             {
-                return _dalamudUtilService.GetPlayerName();
+                return _dalamudUtilService.GetPlayerNameAsync().ConfigureAwait(false).GetAwaiter().GetResult();
             }
             catch (Exception ex)
             {
@@ -1171,15 +1077,6 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
 
         if (dto.Sender.Kind == ChatSenderKind.IdentifiedUser && dto.Sender.User is not null)
         {
-            if (dto.Channel.Type != ChatChannelType.Group || _chatConfigService.Current.ShowNotesInSyncshellChat)
-            {
-                var note = _serverConfigurationManager.GetNoteForUid(dto.Sender.User.UID);
-                if (!string.IsNullOrWhiteSpace(note))
-                {
-                    return note;
-                }
-            }
-
             return dto.Sender.User.AliasOrUID;
         }
 
@@ -1195,50 +1092,17 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
     {
         _channelOrder.Clear();
 
-        var configuredOrder = _chatConfigService.Current.ChannelOrder;
-        if (configuredOrder.Count > 0)
+        if (_channels.ContainsKey(ZoneChannelKey))
         {
-            var seen = new HashSet<string>(StringComparer.Ordinal);
-            foreach (var key in configuredOrder)
-            {
-                if (_channels.ContainsKey(key) && seen.Add(key))
-                {
-                    _channelOrder.Add(key);
-                }
-            }
-
-            var remaining = _channels.Values
-                .Where(state => !seen.Contains(state.Key))
-                .ToList();
-
-            if (remaining.Count > 0)
-            {
-                var zoneKeys = remaining
-                    .Where(state => state.Type == ChatChannelType.Zone)
-                    .Select(state => state.Key);
-                var groupKeys = remaining
-                    .Where(state => state.Type == ChatChannelType.Group)
-                    .OrderBy(state => state.DisplayName, StringComparer.OrdinalIgnoreCase)
-                    .Select(state => state.Key);
-
-                _channelOrder.AddRange(zoneKeys);
-                _channelOrder.AddRange(groupKeys);
-            }
+            _channelOrder.Add(ZoneChannelKey);
         }
-        else
-        {
-            if (_channels.ContainsKey(ZoneChannelKey))
-            {
-                _channelOrder.Add(ZoneChannelKey);
-            }
 
-            var groups = _channels.Values
-                .Where(state => state.Type == ChatChannelType.Group)
-                .OrderBy(state => state.DisplayName, StringComparer.OrdinalIgnoreCase)
-                .Select(state => state.Key);
+        var groups = _channels.Values
+            .Where(state => state.Type == ChatChannelType.Group)
+            .OrderBy(state => state.DisplayName, StringComparer.OrdinalIgnoreCase)
+            .Select(state => state.Key);
 
-            _channelOrder.AddRange(groups);
-        }
+        _channelOrder.AddRange(groups);
 
         if (_activeChannelKey is null && _channelOrder.Count > 0)
         {
@@ -1248,25 +1112,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)
     {
@@ -1309,12 +1157,11 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
         if (!_channels.TryGetValue(ZoneChannelKey, out var state))
         {
             state = new ChatChannelState(ZoneChannelKey, ChatChannelType.Zone, "Zone Chat", new ChatChannelDescriptor { Type = ChatChannelType.Zone });
-            var restoredCount = RestoreCachedMessagesLocked(state);
             state.IsConnected = _chatEnabled && _isConnected;
             state.IsAvailable = false;
             state.StatusText = _chatEnabled ? ZoneUnavailableMessage : "Chat services disabled";
             _channels[ZoneChannelKey] = state;
-            _lastReadCounts[ZoneChannelKey] = restoredCount > 0 ? state.Messages.Count : 0;
+            _lastReadCounts[ZoneChannelKey] = 0;
             UpdateChannelOrderLocked();
         }
 
@@ -1323,11 +1170,6 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
 
     private void RemoveZoneStateLocked()
     {
-        if (_channels.TryGetValue(ZoneChannelKey, out var existing))
-        {
-            CacheMessagesLocked(existing);
-        }
-
         if (_channels.Remove(ZoneChannelKey))
         {
             _lastReadCounts.Remove(ZoneChannelKey);
@@ -1342,28 +1184,6 @@ public sealed class ZoneChatService : DisposableMediatorSubscriberBase, IHostedS
         }
     }
 
-    private void CacheMessagesLocked(ChatChannelState state)
-    {
-        if (state.Messages.Count == 0)
-        {
-            return;
-        }
-
-        _messageHistoryCache[state.Key] = new List<ChatMessageEntry>(state.Messages);
-    }
-
-    private int RestoreCachedMessagesLocked(ChatChannelState state)
-    {
-        if (_messageHistoryCache.TryGetValue(state.Key, out var cached) && cached.Count > 0)
-        {
-            state.Messages.AddRange(cached);
-            _messageHistoryCache.Remove(state.Key);
-            return cached.Count;
-        }
-
-        return 0;
-    }
-
     private sealed class ChatChannelState
     {
         public ChatChannelState(string key, ChatChannelType type, string displayName, ChatChannelDescriptor descriptor)

LightlessSync/Services/CommandManagerService.cs

@@ -48,8 +48,7 @@ public sealed class CommandManagerService : IDisposable
                 "\t /light gpose - Opens the Lightless Character Data Hub window" + Environment.NewLine +
                 "\t /light analyze - Opens the Lightless Character Data Analysis window" + Environment.NewLine +
                 "\t /light settings - Opens the Lightless Settings window" + Environment.NewLine +
-                "\t /light finder - Opens the Lightfinder window" + Environment.NewLine +
-                "\t /light chat - Opens the Lightless Chat window"
+                "\t /light finder - Opens the Lightfinder window"
         });
     }
 
@@ -134,9 +133,5 @@ public sealed class CommandManagerService : IDisposable
         {
             _mediator.Publish(new UiToggleMessage(typeof(LightFinderUI)));
         }
-        else if (string.Equals(splitArgs[0], "chat", StringComparison.OrdinalIgnoreCase))
-        {
-            _mediator.Publish(new UiToggleMessage(typeof(ZoneChatUi)));
-        }
     }
 }

LightlessSync/Services/ContextMenuService.cs

@@ -4,21 +4,21 @@ using Dalamud.Plugin;
 using Dalamud.Plugin.Services;
 using LightlessSync.LightlessConfiguration;
 using LightlessSync.LightlessConfiguration.Models;
-using LightlessSync.Services.LightFinder;
 using LightlessSync.Services.Mediator;
-using LightlessSync.UI;
-using LightlessSync.UI.Services;
 using LightlessSync.Utils;
 using LightlessSync.WebAPI;
+using Lumina.Excel.Sheets;
+using LightlessSync.UI.Services;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using LightlessSync.UI;
+using LightlessSync.Services.LightFinder;
 
 namespace LightlessSync.Services;
 
 internal class ContextMenuService : IHostedService
 {
     private readonly IContextMenu _contextMenu;
-    private readonly IChatGui _chatGui;
     private readonly IDalamudPluginInterface _pluginInterface;
     private readonly IDataManager _gameData;
     private readonly ILogger<ContextMenuService> _logger;
@@ -29,7 +29,6 @@ internal class ContextMenuService : IHostedService
     private readonly ApiController _apiController;
     private readonly IObjectTable _objectTable;
     private readonly LightlessConfigService _configService;
-    private readonly NotificationService _lightlessNotification;
     private readonly LightFinderScannerService _broadcastScannerService;
     private readonly LightFinderService _broadcastService;
     private readonly LightlessProfileManager _lightlessProfileManager;
@@ -44,7 +43,7 @@ internal class ContextMenuService : IHostedService
         ILogger<ContextMenuService> logger,
         DalamudUtilService dalamudUtil,
         ApiController apiController,
-        IObjectTable objectTable,
+        IObjectTable objectTable,   
         LightlessConfigService configService,
         PairRequestService pairRequestService,
         PairUiService pairUiService,
@@ -52,9 +51,7 @@ internal class ContextMenuService : IHostedService
         LightFinderScannerService broadcastScannerService,
         LightFinderService broadcastService,
         LightlessProfileManager lightlessProfileManager,
-        LightlessMediator mediator,
-        IChatGui chatGui,
-        NotificationService lightlessNotification)
+        LightlessMediator mediator)
     {
         _contextMenu = contextMenu;
         _pluginInterface = pluginInterface;
@@ -71,8 +68,6 @@ internal class ContextMenuService : IHostedService
         _broadcastService = broadcastService;
         _lightlessProfileManager = lightlessProfileManager;
         _mediator = mediator;
-        _chatGui = chatGui;
-        _lightlessNotification = lightlessNotification;
     }
 
     public Task StartAsync(CancellationToken cancellationToken)
@@ -104,12 +99,6 @@ internal class ContextMenuService : IHostedService
         if (!_pluginInterface.UiBuilder.ShouldModifyUi)
             return;
 
-        if (!_configService.Current.EnableRightClickMenus)
-        {
-            _logger.LogTrace("Right-click menus are disabled in configuration.");
-            return;
-        }
-
         if (args.AddonName != null)
         {
             var addonName = args.AddonName;
@@ -140,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);
 
@@ -171,8 +161,9 @@ internal class ContextMenuService : IHostedService
             _logger.LogTrace("Cannot send pair request to {TargetName}@{World} while in PvP or GPose.", target.TargetName, target.TargetHomeWorld.RowId);
             return;
         }
-        
-        if (!IsWorldValid(target.TargetHomeWorld.RowId))
+
+        var world = GetWorld(target.TargetHomeWorld.RowId);
+        if (!IsWorldValid(world))
         {
             _logger.LogTrace("Target player {TargetName}@{World} is on an invalid world.", target.TargetName, target.TargetHomeWorld.RowId);
             return;
@@ -208,24 +199,13 @@ internal class ContextMenuService : IHostedService
             .Where(p => p.IsVisible && p.PlayerCharacterId != uint.MaxValue)
             .Select(p => (ulong)p.PlayerCharacterId)];
 
-    private void NotifyInChat(string message, NotificationType type = NotificationType.Info)
-    {
-        if (!_configService.Current.UseLightlessNotifications || (_configService.Current.LightlessPairRequestNotification == NotificationLocation.Chat || _configService.Current.LightlessPairRequestNotification == NotificationLocation.ChatAndLightlessUi))
-        {
-            var chatMsg = $"[Lightless] {message}";
-            if (type == NotificationType.Error)
-                _chatGui.PrintError(chatMsg);
-            else
-                _chatGui.Print(chatMsg);
-        }
-    }
-
     private async Task HandleSelection(IMenuArgs args)
     {
         if (args.Target is not MenuTargetDefault target)
             return;
-        
-        if (!target.TargetHomeWorld.IsValid || !IsWorldValid(target.TargetHomeWorld.RowId))
+
+        var world = GetWorld(target.TargetHomeWorld.RowId);
+        if (!IsWorldValid(world))
             return;
 
         try
@@ -234,11 +214,11 @@ internal class ContextMenuService : IHostedService
 
             if (targetData == null || targetData.Address == nint.Zero)
             {
-                _logger.LogWarning("Target player {TargetName}@{World} not found in object table.", target.TargetName, target.TargetHomeWorld.Value.Name);
+                _logger.LogWarning("Target player {TargetName}@{World} not found in object table.", target.TargetName, world.Name);
                 return;
             }
 
-            var senderCid = _dalamudUtil.GetCID().ToString().GetHash256();
+            var senderCid = (await _dalamudUtil.GetCIDAsync().ConfigureAwait(false)).ToString().GetHash256();
             var receiverCid = DalamudUtilService.GetHashedCIDFromPlayerPointer(targetData.Address);
 
             _logger.LogInformation("Sending pair request: sender {SenderCid}, receiver {ReceiverCid}", senderCid, receiverCid);
@@ -247,9 +227,6 @@ internal class ContextMenuService : IHostedService
             {
                 _pairRequestService.RemoveRequest(receiverCid);
             }
-
-            // Notify in chat when NotificationService is disabled
-            NotifyInChat($"Pair request sent to {target.TargetName}@{target.TargetHomeWorld.Value.Name}.", NotificationType.Info);
         }
         catch (Exception ex)
         {
@@ -309,8 +286,37 @@ internal class ContextMenuService : IHostedService
                 p.HomeWorld.RowId == target.TargetHomeWorld.RowId);
     }
 
-    private bool IsWorldValid(uint worldId)
+    private World GetWorld(uint worldId)
     {
-        return _dalamudUtil.WorldData.Value.ContainsKey((ushort)worldId);
+        var sheet = _gameData.GetExcelSheet<World>()!;
+        var luminaWorlds = sheet.Where(x =>
+        {
+            var dc = x.DataCenter.ValueNullable;
+            var name = x.Name.ExtractText();
+            var internalName = x.InternalName.ExtractText();
+
+            if (dc == null || dc.Value.Region == 0 || string.IsNullOrWhiteSpace(dc.Value.Name.ExtractText()))
+                return false;
+
+            if (string.IsNullOrWhiteSpace(name) || string.IsNullOrWhiteSpace(internalName))
+                return false;
+
+            if (name.Contains('-', StringComparison.Ordinal) || name.Contains('_', StringComparison.Ordinal))
+                return false;
+
+            return x.DataCenter.Value.Region != 5 || x.RowId > 3001 && x.RowId != 1200 && IsChineseJapaneseKoreanString(name);
+        });
+
+        return luminaWorlds.FirstOrDefault(x => x.RowId == worldId);
+    }
+
+    private static bool IsChineseJapaneseKoreanString(string text) => text.All(IsChineseJapaneseKoreanCharacter);
+
+    private static bool IsChineseJapaneseKoreanCharacter(char c) => c >= 0x4E00 && c <= 0x9FFF;
+
+    public static bool IsWorldValid(World world)
+    {
+        var name = world.Name.ToString();
+        return !string.IsNullOrWhiteSpace(name) && char.IsUpper(name[0]);
     }
 }

LightlessSync/Services/DalamudUtilService.cs

@@ -1,13 +1,12 @@
 using Dalamud.Game.ClientState.Conditions;
+using Dalamud.Game.ClientState.Objects;
 using Dalamud.Game.ClientState.Objects.SubKinds;
 using Dalamud.Game.ClientState.Objects.Types;
-using Dalamud.Game.Text;
 using Dalamud.Plugin.Services;
 using Dalamud.Utility;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using FFXIVClientStructs.FFXIV.Client.Game.Character;
 using FFXIVClientStructs.FFXIV.Client.Game.Control;
-using FFXIVClientStructs.FFXIV.Client.Game.UI;
 using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
 using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 using LightlessSync.API.Dto.CharaData;
@@ -22,15 +21,11 @@ using LightlessSync.Utils;
 using Lumina.Excel.Sheets;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using System.Diagnostics;
 using System.Numerics;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 using System.Text;
-using BattleNpcSubKind = FFXIVClientStructs.FFXIV.Client.Game.Object.BattleNpcSubKind;
 using DalamudObjectKind = Dalamud.Game.ClientState.Objects.Enums.ObjectKind;
 using GameObject = FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject;
-using Map = Lumina.Excel.Sheets.Map;
 using VisibilityFlags = FFXIVClientStructs.FFXIV.Client.Game.Object.VisibilityFlags;
 
 namespace LightlessSync.Services;
@@ -42,7 +37,6 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     private readonly ICondition _condition;
     private readonly IDataManager _gameData;
     private readonly IGameConfig _gameConfig;
-    private readonly IPlayerState _playerState;
     private readonly BlockedCharacterHandler _blockedCharacterHandler;
     private readonly IFramework _framework;
     private readonly IGameGui _gameGui;
@@ -62,12 +56,11 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     private string _lastGlobalBlockReason = string.Empty;
     private ushort _lastZone = 0;
     private ushort _lastWorldId = 0;
-    private uint _lastMapId = 0;
     private bool _sentBetweenAreas = false;
     private Lazy<ulong> _cid;
 
     public DalamudUtilService(ILogger<DalamudUtilService> logger, IClientState clientState, IObjectTable objectTable, IFramework framework,
-        IGameGui gameGui, ICondition condition, IDataManager gameData, ITargetManager targetManager, IGameConfig gameConfig, IPlayerState playerState,
+        IGameGui gameGui, ICondition condition, IDataManager gameData, ITargetManager targetManager, IGameConfig gameConfig,
         ActorObjectService actorObjectService, BlockedCharacterHandler blockedCharacterHandler, LightlessMediator mediator, PerformanceCollectorService performanceCollector,
         LightlessConfigService configService, PlayerPerformanceConfigService playerPerformanceConfigService, Lazy<PairFactory> pairFactory)
     {
@@ -79,7 +72,6 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         _condition = condition;
         _gameData = gameData;
         _gameConfig = gameConfig;
-        _playerState = playerState;
         _actorObjectService = actorObjectService;
         _targetManager = targetManager;
         _blockedCharacterHandler = blockedCharacterHandler;
@@ -88,27 +80,53 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         _configService = configService;
         _playerPerformanceConfigService = playerPerformanceConfigService;
         _pairFactory = pairFactory;
-        var clientLanguage = _clientState.ClientLanguage;
         WorldData = new(() =>
         {
-            return gameData.GetExcelSheet<Lumina.Excel.Sheets.World>(clientLanguage)!
-                .Where(w => !w.Name.IsEmpty && w.DataCenter.RowId != 0 && (w.IsPublic || char.IsUpper(w.Name.ToString()[0])
-                    || w is { RowId: > 1000, UserType: 101 or 201 }))
+            return gameData.GetExcelSheet<Lumina.Excel.Sheets.World>(Dalamud.Game.ClientLanguage.English)!
+                .Where(w => !w.Name.IsEmpty && w.DataCenter.RowId != 0 && (w.IsPublic || char.IsUpper(w.Name.ToString()[0])))
                 .ToDictionary(w => (ushort)w.RowId, w => w.Name.ToString());
         });
         JobData = new(() =>
         {
-            return gameData.GetExcelSheet<ClassJob>(clientLanguage)!
-                .ToDictionary(k => k.RowId, k => k.Name.ToString());
+            return gameData.GetExcelSheet<ClassJob>(Dalamud.Game.ClientLanguage.English)!
+                .ToDictionary(k => k.RowId, k => k.NameEnglish.ToString());
         });
-        TerritoryData = new(() => BuildTerritoryData(clientLanguage));
-        TerritoryDataEnglish = new(() => BuildTerritoryData(Dalamud.Game.ClientLanguage.English));
-        MapData = new(() => BuildMapData(clientLanguage));
-        ContentFinderData = new Lazy<Dictionary<uint, string>>(() =>
+        TerritoryData = new(() =>
         {
-            return _gameData.GetExcelSheet<TerritoryType>()!
-                .Where(w => w.RowId != 0 && !string.IsNullOrEmpty(w.ContentFinderCondition.ValueNullable?.Name.ToString()))
-                .ToDictionary(w => w.RowId, w => w.ContentFinderCondition.Value.Name.ToString());
+            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) =>
         {
@@ -140,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;
@@ -280,51 +233,21 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     public bool IsAnythingDrawing { get; private set; } = false;
     public bool IsInCutscene { get; private set; } = false;
     public bool IsInGpose { get; private set; } = false;
-    public bool IsGameUiHidden => _gameGui.GameUiHidden;
     public bool IsLoggedIn { get; private set; }
     public bool IsOnFrameworkThread => _framework.IsInFrameworkUpdateThread;
     public bool IsZoning => _condition[ConditionFlag.BetweenAreas] || _condition[ConditionFlag.BetweenAreas51];
     public bool IsInCombat { get; private set; } = false;
     public bool IsPerforming { get; private set; } = false;
     public bool IsInInstance { get; private set; } = false;
-    public bool IsInDuty => _condition[ConditionFlag.BoundByDuty];
     public bool HasModifiedGameFiles => _gameData.HasModifiedGameDataFiles;
     public uint ClassJobId => _classJobId!.Value;
     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 Lazy<Dictionary<uint, string>> ContentFinderData { get; private set; }
     public bool IsLodEnabled { get; private set; }
     public LightlessMediator Mediator { get; }
 
-    public bool IsInFieldOperation
-    {
-        get
-        {
-            if (!IsInDuty)
-            {
-                return false;
-            }
-
-            var territoryId = _clientState.TerritoryType;
-            if (territoryId == 0)
-            {
-                return false;
-            }
-
-            if (!TerritoryDataEnglish.Value.TryGetValue(territoryId, out var name) || string.IsNullOrWhiteSpace(name))
-            {
-                return false;
-            }
-
-            return name.Contains("Eureka", StringComparison.OrdinalIgnoreCase)
-                || name.Contains("Bozja", StringComparison.OrdinalIgnoreCase)
-                || name.Contains("Zadnor", StringComparison.OrdinalIgnoreCase);
-        }
-    }
-
     public IGameObject? CreateGameObject(IntPtr reference)
     {
         EnsureIsOnFramework();
@@ -377,8 +300,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)
@@ -389,7 +312,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     public bool GetIsPlayerPresent()
     {
         EnsureIsOnFramework();
-        return _objectTable.LocalPlayer != null && _objectTable.LocalPlayer.IsValid() && _playerState.IsLoaded;
+        return _objectTable.LocalPlayer != null && _objectTable.LocalPlayer.IsValid();
     }
 
     public async Task<bool> GetIsPlayerPresentAsync()
@@ -405,8 +328,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)
         {
@@ -417,17 +339,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)
@@ -435,7 +346,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)
@@ -450,22 +361,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         var mgr = CharacterManager.Instance();
         playerPointer ??= GetPlayerPtr();
         if (playerPointer == IntPtr.Zero || (IntPtr)mgr == IntPtr.Zero) return IntPtr.Zero;
-
-        var ownerAddress = playerPointer.Value;
-        var ownerEntityId = ((Character*)ownerAddress)->EntityId;
-        if (ownerEntityId == 0) return IntPtr.Zero;
-
-        var candidate = (IntPtr)mgr->LookupPetByOwnerObject((BattleChara*)ownerAddress);
-        if (candidate != IntPtr.Zero)
-        {
-            var candidateObj = (GameObject*)candidate;
-            if (IsPetMatch(candidateObj, ownerEntityId))
-            {
-                return candidate;
-            }
-        }
-
-        return FindOwnedPet(ownerEntityId, ownerAddress);
+        return (IntPtr)mgr->LookupPetByOwnerObject((BattleChara*)playerPointer);
     }
 
     public async Task<IntPtr> GetPetAsync(IntPtr? playerPointer = null)
@@ -502,60 +398,6 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         return nint.Zero;
     }
 
-    private unsafe nint FindOwnedPet(uint ownerEntityId, nint ownerAddress)
-    {
-        if (ownerEntityId == 0)
-        {
-            return nint.Zero;
-        }
-
-        foreach (var obj in _objectTable)
-        {
-            if (obj is null || obj.Address == nint.Zero || obj.Address == ownerAddress)
-            {
-                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;
-    }
-
-    private static unsafe bool IsPetMatch(GameObject* candidate, uint ownerEntityId)
-    {
-        if (candidate == null)
-        {
-            return false;
-        }
-
-        if ((DalamudObjectKind)candidate->ObjectKind != DalamudObjectKind.BattleNpc)
-        {
-            return false;
-        }
-
-        if (candidate->BattleNpcSubKind != BattleNpcSubKind.Pet)
-        {
-            return false;
-        }
-
-        return ResolveOwnerId(candidate) == ownerEntityId;
-    }
-
     private static unsafe uint ResolveOwnerId(GameObject* gameObject)
     {
         if (gameObject == null)
@@ -603,17 +445,30 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
 
     public string GetPlayerName()
     {
-        return _playerState.CharacterName;
+        EnsureIsOnFramework();
+        return _objectTable.LocalPlayer?.Name.ToString() ?? "--";
+    }
+
+    public async Task<string> GetPlayerNameAsync()
+    {
+        return await RunOnFrameworkThread(GetPlayerName).ConfigureAwait(false);
+    }
+
+    public async Task<ulong> GetCIDAsync()
+    {
+        return await RunOnFrameworkThread(GetCID).ConfigureAwait(false);
     }
 
     public unsafe ulong GetCID()
     {
-        return _playerState.ContentId;
+        EnsureIsOnFramework();
+        var playerChar = GetPlayerCharacter();
+        return ((BattleChara*)playerChar.Address)->Character.ContentId;
     }
 
-    public string GetPlayerNameHashed()
+    public async Task<string> GetPlayerNameHashedAsync()
     {
-        return _cid.Value.ToString().GetHash256();
+        return await RunOnFrameworkThread(() => _cid.Value.ToString().GetHash256()).ConfigureAwait(false);
     }
 
     public static unsafe bool TryGetHashedCID(IPlayerCharacter? playerCharacter, out string hashedCid)
@@ -652,100 +507,54 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
 
     public uint GetHomeWorldId()
     {
-        return _playerState.HomeWorld.RowId;
+        EnsureIsOnFramework();
+        return _objectTable.LocalPlayer?.HomeWorld.RowId ?? 0;
     }
 
     public uint GetWorldId()
     {
-        return _playerState.CurrentWorld.RowId;
+        EnsureIsOnFramework();
+        return _objectTable.LocalPlayer!.CurrentWorld.RowId;
     }
 
     public unsafe LocationInfo GetMapData()
     {
+        EnsureIsOnFramework();
+        var agentMap = AgentMap.Instance();
         var houseMan = HousingManager.Instance();
-
-        var location = new LocationInfo();
-        location.ServerId = _playerState.CurrentWorld.RowId;
-        location.InstanceId = UIState.Instance()->PublicInstance.InstanceId;
-        location.TerritoryId = _clientState.TerritoryType;
-        location.MapId = _clientState.MapId;
-        if (houseMan != null)
+        uint serverId = 0;
+        if (_objectTable.LocalPlayer == null) serverId = 0;
+        else serverId = _objectTable.LocalPlayer.CurrentWorld.RowId;
+        uint mapId = agentMap == null ? 0 : agentMap->CurrentMapId;
+        uint territoryId = agentMap == null ? 0 : agentMap->CurrentTerritoryId;
+        uint divisionId = houseMan == null ? 0 : (uint)(houseMan->GetCurrentDivision());
+        uint wardId = houseMan == null ? 0 : (uint)(houseMan->GetCurrentWard() + 1);
+        uint houseId = 0;
+        var tempHouseId = houseMan == null ? 0 : (houseMan->GetCurrentPlot());
+        if (!houseMan->IsInside()) tempHouseId = 0;
+        if (tempHouseId < -1)
         {
-            if (houseMan->IsInside())
-            {
-                location.TerritoryId = HousingManager.GetOriginalHouseTerritoryTypeId();
-                var house = houseMan->GetCurrentIndoorHouseId();
-                location.WardId = house.WardIndex + 1u;
-                location.HouseId = house.IsApartment ? 100 : house.PlotIndex + 1u;
-                location.RoomId = (uint)house.RoomNumber;
-                location.DivisionId = house.IsApartment ? house.ApartmentDivision + 1u : houseMan->GetCurrentDivision();
-            }
-            else if (houseMan->IsInWorkshop())
-            {
-                var workShop = houseMan->WorkshopTerritory;
-                var house = workShop->HouseId;
-                location.WardId = house.WardIndex + 1u;
-                location.HouseId = house.PlotIndex + 1u;
-            }
-            else if (houseMan->IsOutside())
-            {
-                var outside = houseMan->OutdoorTerritory;
-                var house = outside->HouseId;
-                location.WardId = house.WardIndex + 1u;
-                //location.HouseId = (uint)houseMan->GetCurrentPlot() + 1;
-                location.DivisionId = houseMan->GetCurrentDivision();
-            }
-            //_logger.LogWarning(LocationToString(location));
+            divisionId = tempHouseId == -127 ? 2 : (uint)1;
+            tempHouseId = 100;
         }
-        return location;
-    }
-
-    public string LocationToString(LocationInfo location)
-    {
-        if (location.ServerId is 0 || location.TerritoryId is 0) return String.Empty;
-        var str = WorldData.Value[(ushort)location.ServerId];
-
-        if (ContentFinderData.Value.TryGetValue(location.TerritoryId, out var dutyName))
+        if (tempHouseId == -1) tempHouseId = 0;
+        houseId = (uint)tempHouseId;
+        if (houseId != 0)
         {
-            str += $" - [In Duty]{dutyName}";
+            territoryId = HousingManager.GetOriginalHouseTerritoryTypeId();
         }
-        else
+        uint roomId = houseMan == null ? 0 : (uint)(houseMan->GetCurrentRoom());
+
+        return new LocationInfo()
         {
-            if (location.HouseId is not 0 || location.MapId is 0) // Dont show mapName when in house/no map available
-            {
-                str += $" - {TerritoryData.Value[(ushort)location.TerritoryId]}";
-            }
-            else
-            {
-                str += $" - {MapData.Value[(ushort)location.MapId].MapName}";
-            }
-
-            if (location.InstanceId is not 0)
-            {
-                str += ((SeIconChar)(57520 + location.InstanceId)).ToIconString();
-            }
-
-            if (location.WardId is not 0)
-            {
-                str += $" Ward #{location.WardId}";
-            }
-
-            if (location.HouseId is not 0 and not 100)
-            {
-                str += $" House #{location.HouseId}";
-            }
-            else if (location.HouseId is 100)
-            {
-                str += $" {(location.DivisionId == 2 ? "[Subdivision]" : "")} Apartment";
-            }
-
-            if (location.RoomId is not 0)
-            {
-                str += $" Room #{location.RoomId}";
-            }
-        }
-
-        return str;
+            ServerId = serverId,
+            MapId = mapId,
+            TerritoryId = territoryId,
+            DivisionId = divisionId,
+            WardId = wardId,
+            HouseId = houseId,
+            RoomId = roomId
+        };
     }
 
     public unsafe void SetMarkerAndOpenMap(Vector3 position, Map map)
@@ -757,6 +566,21 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         agentMap->SetFlagMapMarker(map.TerritoryType.RowId, map.RowId, position);
     }
 
+    public async Task<LocationInfo> GetMapDataAsync()
+    {
+        return await RunOnFrameworkThread(GetMapData).ConfigureAwait(false);
+    }
+
+    public async Task<uint> GetWorldIdAsync()
+    {
+        return await RunOnFrameworkThread(GetWorldId).ConfigureAwait(false);
+    }
+
+    public async Task<uint> GetHomeWorldIdAsync()
+    {
+        return await RunOnFrameworkThread(GetHomeWorldId).ConfigureAwait(false);
+    }
+
     public unsafe bool IsGameObjectPresent(IntPtr key)
     {
         return _objectTable.Any(f => f.Address == key);
@@ -816,12 +640,9 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     {
         _logger.LogInformation("Starting DalamudUtilService");
         _framework.Update += FrameworkOnUpdate;
-        _clientState.Login += OnClientLogin;
-        _clientState.Logout += OnClientLogout;
-
-        if (_clientState.IsLoggedIn)
+        if (IsLoggedIn)
         {
-            OnClientLogin();
+            _classJobId = _objectTable.LocalPlayer!.ClassJob.RowId;
         }
 
         _logger.LogInformation("Started DalamudUtilService");
@@ -834,9 +655,6 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
 
         Mediator.UnsubscribeAll(this);
         _framework.Update -= FrameworkOnUpdate;
-        _clientState.Login -= OnClientLogin;
-        _clientState.Logout -= OnClientLogout;
-
         if (_FocusPairIdent.HasValue)
         {
             if (_framework.IsInFrameworkUpdateThread)
@@ -851,78 +669,33 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         return Task.CompletedTask;
     }
 
-    private void OnClientLogin()
-    {
-        if (IsLoggedIn)
-            return;
-        _ = RunOnFrameworkThread(() =>
-        {
-            if (IsLoggedIn)
-                return;
-            var localPlayer = _objectTable.LocalPlayer;
-            IsLoggedIn = true;
-            _lastZone = _clientState.TerritoryType;
-            if (localPlayer != null)
-            {
-                _lastWorldId = (ushort)localPlayer.CurrentWorld.RowId;
-                _classJobId = localPlayer.ClassJob.RowId;
-            }
-            _cid = RebuildCID();
-            Mediator.Publish(new DalamudLoginMessage());
-        });
-    }
-
-    private void OnClientLogout(int type, int code)
-    {
-        if (!IsLoggedIn)
-            return;
-        _ = RunOnFrameworkThread(() =>
-        {
-            if (!IsLoggedIn)
-                return;
-            IsLoggedIn = false;
-            _lastWorldId = 0;
-            Mediator.Publish(new DalamudLogoutMessage());
-        });
-    }
-
-    public async Task WaitWhileCharacterIsDrawing(
-        ILogger logger,
-        GameObjectHandler handler,
-        Guid redrawId,
-        int timeOut = 5000,
-        CancellationToken? ct = null)
+    public async Task WaitWhileCharacterIsDrawing(ILogger logger, GameObjectHandler handler, Guid redrawId, int timeOut = 5000, CancellationToken? ct = null)
     {
         if (!_clientState.IsLoggedIn) return;
 
-        var token = ct ?? CancellationToken.None;
+        if (ct == null)
+            ct = CancellationToken.None;
 
         const int tick = 250;
-        const int initialSettle = 50;
-
-        var sw = Stopwatch.StartNew();
-
+        int curWaitTime = 0;
         try
         {
             logger.LogTrace("[{redrawId}] Starting wait for {handler} to draw", redrawId, handler);
+            await Task.Delay(tick, ct.Value).ConfigureAwait(true);
+            curWaitTime += tick;
 
-            await Task.Delay(initialSettle, token).ConfigureAwait(false);
-
-            while (!token.IsCancellationRequested
-                   && sw.ElapsedMilliseconds < timeOut
-                   && await handler.IsBeingDrawnRunOnFrameworkAsync().ConfigureAwait(false))
+            while ((!ct.Value.IsCancellationRequested)
+                   && curWaitTime < timeOut
+                   && await handler.IsBeingDrawnRunOnFrameworkAsync().ConfigureAwait(false)) // 0b100000000000 is "still rendering" or something
             {
                 logger.LogTrace("[{redrawId}] Waiting for {handler} to finish drawing", redrawId, handler);
-                await Task.Delay(tick, token).ConfigureAwait(false);
+                curWaitTime += tick;
+                await Task.Delay(tick, ct.Value).ConfigureAwait(true);
             }
 
-            logger.LogTrace("[{redrawId}] Finished drawing after {ms}ms", redrawId, sw.ElapsedMilliseconds);
+            logger.LogTrace("[{redrawId}] Finished drawing after {curWaitTime}ms", redrawId, curWaitTime);
         }
-        catch (OperationCanceledException)
-        {
-            // ignore
-        }
-        catch (Exception ex)
+        catch (AccessViolationException ex)
         {
             logger.LogWarning(ex, "Error accessing {handler}, object does not exist anymore?", handler);
         }
@@ -963,118 +736,46 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     public string? GetWorldNameFromPlayerAddress(nint address)
     {
         if (address == nint.Zero) return null;
-
+        
         EnsureIsOnFramework();
         var playerCharacter = _objectTable.OfType<IPlayerCharacter>().FirstOrDefault(p => p.Address == address);
         if (playerCharacter == null) return null;
-
+        
         var worldId = (ushort)playerCharacter.HomeWorld.RowId;
         return WorldData.Value.TryGetValue(worldId, out var worldName) ? worldName : null;
     }
 
-    public void TargetPlayerByAddress(nint address)
-    {
-        if (address == nint.Zero) return;
-        if (_clientState.IsPvP) return;
-
-        _ = RunOnFrameworkThread(() =>
-        {
-            var gameObject = CreateGameObject(address);
-            if (gameObject is null) return;
-
-            var useFocusTarget = _configService.Current.UseFocusTarget;
-            if (useFocusTarget)
-            {
-                _targetManager.FocusTarget = gameObject;
-            }
-            else
-            {
-                _targetManager.Target = gameObject;
-            }
-        });
-    }
-
-    [DllImport("kernel32.dll", SetLastError = true)]
-    private static extern bool IsBadReadPtr(IntPtr ptr, UIntPtr size);
-
-    private static bool IsValidPointer(nint ptr, int size = 8)
-    {
-        if (ptr == nint.Zero)
-            return false;
-
-        try
-        {
-            if (!Util.IsWine())
-            {
-                return !IsBadReadPtr(ptr, (UIntPtr)size);
-            }
-            return ptr != nint.Zero && (ptr % IntPtr.Size) == 0;
-        }
-        catch
-        {
-            return false;
-        }
-    }
-
     private unsafe void CheckCharacterForDrawing(nint address, string characterName)
     {
-        if (address == nint.Zero)
-            return;
-
-        if (!IsValidPointer(address))
-        {
-            _logger.LogDebug("Invalid pointer for character {name} at {addr}", characterName, address.ToString("X"));
-            return;
-        }
-
         var gameObj = (GameObject*)address;
-
-        if (gameObj == null)
-            return;
-
-        if (!_objectTable.Any(o => o?.Address == address))
-        {
-            _logger.LogDebug("Character {name} at {addr} no longer in object table", characterName, address.ToString("X"));
-            return;
-        }
-
-        if (gameObj->ObjectKind == 0)
-            return;
-
         var drawObj = gameObj->DrawObject;
         bool isDrawing = false;
         bool isDrawingChanged = false;
-
-        if ((nint)drawObj != IntPtr.Zero && IsValidPointer((nint)drawObj))
+        if ((nint)drawObj != IntPtr.Zero)
         {
-            isDrawing = gameObj->RenderFlags == (VisibilityFlags)0b100000000000;
-
+            isDrawing = (gameObj->RenderFlags & VisibilityFlags.Nameplate) != VisibilityFlags.None;
             if (!isDrawing)
             {
-                var charBase = (CharacterBase*)drawObj;
-                if (charBase != null && IsValidPointer((nint)charBase))
+                isDrawing = ((CharacterBase*)drawObj)->HasModelInSlotLoaded != 0;
+                if (!isDrawing)
                 {
-                    isDrawing = charBase->HasModelInSlotLoaded != 0;
-                    if (!isDrawing)
+                    isDrawing = ((CharacterBase*)drawObj)->HasModelFilesInSlotLoaded != 0;
+                    if (isDrawing && !string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal)
+                        && !string.Equals(_lastGlobalBlockReason, "HasModelFilesInSlotLoaded", StringComparison.Ordinal))
                     {
-                        isDrawing = charBase->HasModelFilesInSlotLoaded != 0;
-                        if (isDrawing && !string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal)
-                            && !string.Equals(_lastGlobalBlockReason, "HasModelFilesInSlotLoaded", StringComparison.Ordinal))
-                        {
-                            _lastGlobalBlockPlayer = characterName;
-                            _lastGlobalBlockReason = "HasModelFilesInSlotLoaded";
-                            isDrawingChanged = true;
-                        }
+                        _lastGlobalBlockPlayer = characterName;
+                        _lastGlobalBlockReason = "HasModelFilesInSlotLoaded";
+                        isDrawingChanged = true;
                     }
-                    else
+                }
+                else
+                {
+                    if (!string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal)
+                        && !string.Equals(_lastGlobalBlockReason, "HasModelInSlotLoaded", StringComparison.Ordinal))
                     {
-                        if (!string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal)
-                            && !string.Equals(_lastGlobalBlockReason, "HasModelInSlotLoaded", StringComparison.Ordinal))
-                        {
-                            _lastGlobalBlockPlayer = characterName;
-                            _lastGlobalBlockReason = "HasModelInSlotLoaded";
-                            isDrawingChanged = true;
-                        }
+                        _lastGlobalBlockPlayer = characterName;
+                        _lastGlobalBlockReason = "HasModelInSlotLoaded";
+                        isDrawingChanged = true;
                     }
                 }
             }
@@ -1105,11 +806,6 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
 
     private unsafe void FrameworkOnUpdateInternal()
     {
-        if (!_clientState.IsLoggedIn || _objectTable.LocalPlayer == null)
-        {
-            return;
-        }
-
         if ((_objectTable.LocalPlayer?.IsDead ?? false) && _condition[ConditionFlag.BoundByDuty])
         {
             return;
@@ -1123,29 +819,21 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
             _performanceCollector.LogPerformance(this, $"TrackedActorsToState",
                 () =>
                 {
-                    if (!_actorObjectService.HooksActive || !isNormalFrameworkUpdate || _actorObjectService.HasPendingHashResolutions)
+                    _actorObjectService.RefreshTrackedActors();
+
+                    var playerDescriptors = _actorObjectService.PlayerCharacterDescriptors;
+                    for (var i = 0; i < playerDescriptors.Count; i++)
                     {
-                        _actorObjectService.RefreshTrackedActors();
-                    }
-
-                    var playerDescriptors = _actorObjectService.PlayerDescriptors;
-                    var descriptorCount = playerDescriptors.Count;
-
-                    for (var i = 0; i < descriptorCount; i++)
-                    {
-                        if (i >= playerDescriptors.Count)
-                            break;
-
                         var actor = playerDescriptors[i];
 
                         var playerAddress = actor.Address;
-                        if (playerAddress == nint.Zero || !IsValidPointer(playerAddress))
+                        if (playerAddress == nint.Zero)
                             continue;
 
                         if (actor.ObjectIndex >= 200)
                             continue;
 
-                        if (_blockedCharacterHandler.IsCharacterBlocked(playerAddress, actor.ObjectIndex, out bool firstTime) && firstTime)
+                        if (_blockedCharacterHandler.IsCharacterBlocked(playerAddress, out bool firstTime) && firstTime)
                         {
                             _logger.LogTrace("Skipping character {addr}, blocked/muted", playerAddress.ToString("X"));
                             continue;
@@ -1153,16 +841,17 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
 
                         if (!IsAnythingDrawing)
                         {
-                            if (!_objectTable.Any(o => o?.Address == playerAddress))
-                            {
-                                continue;
-                            }
-
-                            CheckCharacterForDrawing(playerAddress, actor.Name);
-
+                            var gameObj = (GameObject*)playerAddress;
+                            var currentName = gameObj != null ? gameObj->NameString ?? string.Empty : string.Empty;
+                            var charaName = string.IsNullOrEmpty(currentName) ? actor.Name : currentName;
+                            CheckCharacterForDrawing(playerAddress, charaName);
                             if (IsAnythingDrawing)
                                 break;
                         }
+                        else
+                        {
+                            break;
+                        }
                     }
                 });
 
@@ -1231,7 +920,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                 });
 
             // Cutscene
-            HandleStateTransition(() => IsInCutscene, v => IsInCutscene = v, shouldBeInCutscene, "Cutscene",
+            HandleStateTransition(() => IsInCutscene,v => IsInCutscene = v, shouldBeInCutscene, "Cutscene",
                 onEnter: () =>
                 {
                     Mediator.Publish(new CutsceneStartMessage());
@@ -1275,18 +964,6 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                 Mediator.Publish(new ResumeScanMessage(nameof(ConditionFlag.BetweenAreas)));
             }
 
-            //Map
-            if (!_sentBetweenAreas)
-            {
-                var mapid = _clientState.MapId;
-                if (mapid != _lastMapId)
-                {
-                    _lastMapId = mapid;
-                    Mediator.Publish(new MapChangedMessage(mapid));
-                }
-            }
-
-
             var localPlayer = _objectTable.LocalPlayer;
             if (localPlayer != null)
             {
@@ -1313,6 +990,23 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
             if (isNormalFrameworkUpdate)
                 return;
 
+            if (localPlayer != null && !IsLoggedIn)
+            {
+                _logger.LogDebug("Logged in");
+                IsLoggedIn = true;
+                _lastZone = _clientState.TerritoryType;
+                _lastWorldId = (ushort)localPlayer.CurrentWorld.RowId;
+                _cid = RebuildCID();
+                Mediator.Publish(new DalamudLoginMessage());
+            }
+            else if (localPlayer == null && IsLoggedIn)
+            {
+                _logger.LogDebug("Logged out");
+                IsLoggedIn = false;
+                _lastWorldId = 0;
+                Mediator.Publish(new DalamudLogoutMessage());
+            }
+
             if (_gameConfig != null
                 && _gameConfig.TryGet(Dalamud.Game.Config.SystemConfigOption.LodType_DX11, out bool lodEnabled))
             {
@@ -1354,4 +1048,4 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
             onExit();
         }
     }
-}
+}

LightlessSync/Services/LightFinder/LightFinderNativePlateHandler.cs

@@ -1,863 +0,0 @@
-using Dalamud.Game.ClientState.Objects.Enums;
-using Dalamud.Plugin.Services;
-using FFXIVClientStructs.FFXIV.Client.System.Framework;
-using FFXIVClientStructs.FFXIV.Client.Game.Character;
-using FFXIVClientStructs.FFXIV.Client.UI;
-using FFXIVClientStructs.FFXIV.Component.GUI;
-using LightlessSync.LightlessConfiguration;
-using LightlessSync.Services.Mediator;
-using LightlessSync.UI;
-using LightlessSync.UI.Services;
-using LightlessSync.Utils;
-using LightlessSync.UtilsEnum.Enum;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using System.Collections.Immutable;
-using Task = System.Threading.Tasks.Task;
-
-namespace LightlessSync.Services.LightFinder;
-
-/// <summary>
-/// Native nameplate handler that injects LightFinder labels via the signature hook path.
-/// </summary>
-public unsafe class LightFinderNativePlateHandler : DisposableMediatorSubscriberBase, IHostedService
-{
-    private const uint NameplateNodeIdBase = 0x7D99D500;
-    private const string DefaultLabelText = "LightFinder";
-
-    private readonly ILogger<LightFinderNativePlateHandler> _logger;
-    private readonly IClientState _clientState;
-    private readonly IObjectTable _objectTable;
-    private readonly LightlessConfigService _configService;
-    private readonly PairUiService _pairUiService;
-    private readonly NameplateUpdateHookService _nameplateUpdateHookService;
-
-    private readonly int[] _cachedNameplateTextWidths = new int[AddonNamePlate.NumNamePlateObjects];
-    private readonly int[] _cachedNameplateTextHeights = new int[AddonNamePlate.NumNamePlateObjects];
-    private readonly int[] _cachedNameplateContainerHeights = new int[AddonNamePlate.NumNamePlateObjects];
-    private readonly int[] _cachedNameplateTextOffsets = new int[AddonNamePlate.NumNamePlateObjects];
-    private readonly string?[] _lastLabelByIndex = new string?[AddonNamePlate.NumNamePlateObjects];
-
-    private ImmutableHashSet<string> _activeBroadcastingCids = [];
-    private LightfinderLabelRenderer _lastRenderer;
-    private uint _lastSignatureUpdateFrame;
-    private bool _isUpdating;
-    private string _lastLabelContent = DefaultLabelText;
-
-    public LightFinderNativePlateHandler(
-        ILogger<LightFinderNativePlateHandler> logger,
-        IClientState clientState,
-        LightlessConfigService configService,
-        LightlessMediator mediator,
-        IObjectTable objectTable,
-        PairUiService pairUiService,
-        NameplateUpdateHookService nameplateUpdateHookService) : base(logger, mediator)
-    {
-        _logger = logger;
-        _clientState = clientState;
-        _configService = configService;
-        _objectTable = objectTable;
-        _pairUiService = pairUiService;
-        _nameplateUpdateHookService = nameplateUpdateHookService;
-        _lastRenderer = _configService.Current.LightfinderLabelRenderer;
-
-        Array.Fill(_cachedNameplateTextOffsets, int.MinValue);
-    }
-
-    private bool IsSignatureMode => _configService.Current.LightfinderLabelRenderer == LightfinderLabelRenderer.SignatureHook;
-
-    /// <summary>
-    /// Starts listening for nameplate updates from the hook service.
-    /// </summary>
-    public Task StartAsync(CancellationToken cancellationToken)
-    {
-        _nameplateUpdateHookService.NameplateUpdated += OnNameplateUpdated;
-        return Task.CompletedTask;
-    }
-
-    /// <summary>
-    /// Stops listening for nameplate updates and tears down any constructed nodes.
-    /// </summary>
-    public Task StopAsync(CancellationToken cancellationToken)
-    {
-        _nameplateUpdateHookService.NameplateUpdated -= OnNameplateUpdated;
-        UnsubscribeAll();
-        TryDestroyNameplateNodes();
-        return Task.CompletedTask;
-    }
-
-    /// <summary>
-    /// Triggered by the sig hook to refresh native nameplate labels.
-    /// </summary>
-    private void HandleNameplateUpdate(RaptureAtkModule* raptureAtkModule)
-    {
-        if (_isUpdating)
-            return;
-
-        _isUpdating = true;
-        try
-        {
-            RefreshRendererState();
-            if (!IsSignatureMode)
-                return;
-
-            if (raptureAtkModule == null)
-                return;
-
-            var namePlateAddon = GetNamePlateAddon(raptureAtkModule);
-            if (namePlateAddon == null)
-                return;
-
-            if (_clientState.IsGPosing)
-            {
-                HideAllNameplateNodes(namePlateAddon);
-                return;
-            }
-
-            var fw = Framework.Instance();
-            if (fw == null)
-                return;
-
-            var frame = fw->FrameCounter;
-            if (_lastSignatureUpdateFrame == frame)
-                return;
-
-            _lastSignatureUpdateFrame = frame;
-            UpdateNameplateNodes(namePlateAddon);
-        }
-        finally
-        {
-            _isUpdating = false;
-        }
-    }
-
-    /// <summary>
-    /// Hook callback from the nameplate update signature.
-    /// </summary>
-    private void OnNameplateUpdated(RaptureAtkModule* raptureAtkModule, RaptureAtkModule.NamePlateInfo* namePlateInfo,
-        NumberArrayData* numArray, StringArrayData* stringArray, BattleChara* battleChara, int numArrayIndex, int stringArrayIndex)
-    {
-        HandleNameplateUpdate(raptureAtkModule);
-    }
-
-    /// <summary>
-    /// Updates the active broadcasting CID set and requests a nameplate redraw.
-    /// </summary>
-    public void UpdateBroadcastingCids(IEnumerable<string> cids)
-    {
-        var newSet = cids.ToImmutableHashSet(StringComparer.Ordinal);
-        if (ReferenceEquals(_activeBroadcastingCids, newSet) || _activeBroadcastingCids.SetEquals(newSet))
-            return;
-
-        _activeBroadcastingCids = newSet;
-        if (_logger.IsEnabled(LogLevel.Trace))
-            _logger.LogTrace("Active broadcast IDs (native): {Cids}", string.Join(',', _activeBroadcastingCids));
-        RequestNameplateRedraw();
-    }
-
-    /// <summary>
-    /// Sync renderer state with config and clear/remove native nodes if needed.
-    /// </summary>
-    private void RefreshRendererState()
-    {
-        var renderer = _configService.Current.LightfinderLabelRenderer;
-        if (renderer == _lastRenderer)
-            return;
-
-        _lastRenderer = renderer;
-
-        if (renderer == LightfinderLabelRenderer.SignatureHook)
-        {
-            ClearNameplateCaches();
-            RequestNameplateRedraw();
-        }
-        else
-        {
-            TryDestroyNameplateNodes();
-            ClearNameplateCaches();
-        }
-    }
-
-    /// <summary>
-    /// Requests a full nameplate update through the native addon.
-    /// </summary>
-    private void RequestNameplateRedraw()
-    {
-        if (!IsSignatureMode)
-            return;
-
-        var raptureAtkModule = GetRaptureAtkModule();
-        if (raptureAtkModule == null)
-            return;
-
-        var namePlateAddon = GetNamePlateAddon(raptureAtkModule);
-        if (namePlateAddon == null)
-            return;
-
-        namePlateAddon->DoFullUpdate = 1;
-    }
-
-    private HashSet<ulong> VisibleUserIds
-        => [.. _pairUiService.GetSnapshot().PairsByUid.Values
-            .Where(u => u.IsVisible && u.PlayerCharacterId != uint.MaxValue)
-            .Select(u => (ulong)u.PlayerCharacterId)];
-
-    /// <summary>
-    /// Creates/updates LightFinder label nodes for active broadcasts.
-    /// </summary>
-    private void UpdateNameplateNodes(AddonNamePlate* namePlateAddon)
-    {
-        if (namePlateAddon == null)
-        {
-            if (_logger.IsEnabled(LogLevel.Debug))
-                _logger.LogDebug("NamePlate addon unavailable during update, skipping label refresh.");
-            return;
-        }
-
-        if (!IsNameplateAddonVisible(namePlateAddon))
-            return;
-
-        if (!IsSignatureMode)
-        {
-            HideAllNameplateNodes(namePlateAddon);
-            return;
-        }
-
-        if (_activeBroadcastingCids.Count == 0)
-        {
-            HideAllNameplateNodes(namePlateAddon);
-            return;
-        }
-
-        var framework = Framework.Instance();
-        if (framework == null)
-        {
-            if (_logger.IsEnabled(LogLevel.Debug))
-                _logger.LogDebug("Framework instance unavailable during nameplate update, skipping.");
-            return;
-        }
-
-        var uiModule = framework->GetUIModule();
-        if (uiModule == null)
-        {
-            if (_logger.IsEnabled(LogLevel.Debug))
-                _logger.LogDebug("UI module unavailable during nameplate update, skipping.");
-            return;
-        }
-
-        var ui3DModule = uiModule->GetUI3DModule();
-        if (ui3DModule == null)
-        {
-            if (_logger.IsEnabled(LogLevel.Debug))
-                _logger.LogDebug("UI3D module unavailable during nameplate update, skipping.");
-            return;
-        }
-
-        var vec = ui3DModule->NamePlateObjectInfoPointers;
-        if (vec.IsEmpty)
-            return;
-
-        var config = _configService.Current;
-        var visibleUserIdsSnapshot = VisibleUserIds;
-        var labelColor = UIColors.Get("Lightfinder");
-        var edgeColor = UIColors.Get("LightfinderEdge");
-        var scaleMultiplier = Math.Clamp(config.LightfinderLabelScale, 0.5f, 2.0f);
-        var baseScale = config.LightfinderLabelUseIcon ? 1.0f : 0.5f;
-        var effectiveScale = baseScale * scaleMultiplier;
-        var labelContent = config.LightfinderLabelUseIcon
-            ? LightFinderPlateHandler.NormalizeIconGlyph(config.LightfinderLabelIconGlyph)
-            : DefaultLabelText;
-
-        if (!config.LightfinderLabelUseIcon && (string.IsNullOrWhiteSpace(labelContent) || string.Equals(labelContent, "-", StringComparison.Ordinal)))
-            labelContent = DefaultLabelText;
-
-        if (!string.Equals(_lastLabelContent, labelContent, StringComparison.Ordinal))
-        {
-            _lastLabelContent = labelContent;
-            Array.Fill(_lastLabelByIndex, null);
-        }
-
-        var desiredFontType = config.LightfinderLabelUseIcon ? FontType.Axis : FontType.MiedingerMed;
-        var baseFontSize = config.LightfinderLabelUseIcon ? 36f : 24f;
-        var desiredFontSize = (byte)Math.Clamp((int)Math.Round(baseFontSize * scaleMultiplier), 1, 255);
-        var desiredFlags = config.LightfinderLabelUseIcon
-            ? TextFlags.Edge | TextFlags.Glare | TextFlags.AutoAdjustNodeSize
-            : TextFlags.Edge | TextFlags.Glare;
-        var desiredLineSpacing = (byte)Math.Clamp((int)Math.Round(24 * scaleMultiplier), 0, byte.MaxValue);
-        var defaultNodeWidth = (int)Math.Round(AtkNodeHelpers.DefaultTextNodeWidth * effectiveScale);
-        var defaultNodeHeight = (int)Math.Round(AtkNodeHelpers.DefaultTextNodeHeight * effectiveScale);
-
-        var safeCount = Math.Min(ui3DModule->NamePlateObjectInfoCount, vec.Length);
-        var visibleIndices = new bool[AddonNamePlate.NumNamePlateObjects];
-
-        for (int i = 0; i < safeCount; ++i)
-        {
-            var objectInfoPtr = vec[i];
-            if (objectInfoPtr == null)
-                continue;
-
-            var objectInfo = objectInfoPtr.Value;
-            if (objectInfo == null || objectInfo->GameObject == null)
-                continue;
-
-            var nameplateIndex = objectInfo->NamePlateIndex;
-            if (nameplateIndex < 0 || nameplateIndex >= AddonNamePlate.NumNamePlateObjects)
-                continue;
-
-            var gameObject = objectInfo->GameObject;
-            if ((ObjectKind)gameObject->ObjectKind != ObjectKind.Player)
-                continue;
-
-            var cid = DalamudUtilService.GetHashedCIDFromPlayerPointer((nint)gameObject);
-            if (cid == null || !_activeBroadcastingCids.Contains(cid))
-                continue;
-
-            var local = _objectTable.LocalPlayer;
-            if (!config.LightfinderLabelShowOwn && local != null &&
-                objectInfo->GameObject->GetGameObjectId() == local.GameObjectId)
-                continue;
-
-            var hidePaired = !config.LightfinderLabelShowPaired;
-            var goId = (ulong)gameObject->GetGameObjectId();
-            if (hidePaired && visibleUserIdsSnapshot.Contains(goId))
-                continue;
-
-            var nameplateObject = namePlateAddon->NamePlateObjectArray[nameplateIndex];
-            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)
-            {
-                if (_logger.IsEnabled(LogLevel.Debug))
-                    _logger.LogDebug("Nameplate {Index} missing required nodes during update, skipping.", nameplateIndex);
-                continue;
-            }
-
-            var nodeId = GetNameplateNodeId(nameplateIndex);
-            var pNode = EnsureNameplateTextNode(nameContainer, root, nodeId, out var nodeCreated);
-            if (pNode == null)
-                continue;
-
-            bool isVisible =
-                ((marker != null) && marker->AtkResNode.IsVisible()) ||
-                (nameContainer->IsVisible() && nameText->AtkResNode.IsVisible()) ||
-                config.LightfinderLabelShowHidden;
-
-            if (!isVisible)
-                continue;
-
-            if (!pNode->AtkResNode.IsVisible())
-                pNode->AtkResNode.ToggleVisibility(enable: true);
-            visibleIndices[nameplateIndex] = true;
-
-            if (nodeCreated)
-                pNode->AtkResNode.SetUseDepthBasedPriority(enable: true);
-
-            var scaleMatches = NearlyEqual(pNode->AtkResNode.ScaleX, effectiveScale) &&
-                NearlyEqual(pNode->AtkResNode.ScaleY, effectiveScale);
-            if (!scaleMatches)
-                pNode->AtkResNode.SetScale(effectiveScale, effectiveScale);
-
-            var fontTypeChanged = pNode->FontType != desiredFontType;
-            if (fontTypeChanged)
-                pNode->FontType = desiredFontType;
-
-            var fontSizeChanged = pNode->FontSize != desiredFontSize;
-            if (fontSizeChanged)
-                pNode->FontSize = desiredFontSize;
-
-            var needsTextUpdate = nodeCreated ||
-                !string.Equals(_lastLabelByIndex[nameplateIndex], labelContent, StringComparison.Ordinal);
-            if (needsTextUpdate)
-            {
-                pNode->SetText(labelContent);
-                _lastLabelByIndex[nameplateIndex] = labelContent;
-            }
-
-            var flagsChanged = pNode->TextFlags != desiredFlags;
-            var nodeWidth = (int)pNode->AtkResNode.GetWidth();
-            if (nodeWidth <= 0)
-                nodeWidth = defaultNodeWidth;
-            var nodeHeight = defaultNodeHeight;
-            AlignmentType alignment;
-
-            var textScaleY = nameText->AtkResNode.ScaleY;
-            if (textScaleY <= 0f)
-                textScaleY = 1f;
-
-            var blockHeight = Math.Abs((int)nameplateObject.TextH);
-            if (blockHeight > 0)
-            {
-                _cachedNameplateTextHeights[nameplateIndex] = blockHeight;
-            }
-            else
-            {
-                blockHeight = _cachedNameplateTextHeights[nameplateIndex];
-            }
-
-            if (blockHeight <= 0)
-            {
-                blockHeight = GetScaledTextHeight(nameText);
-                if (blockHeight <= 0)
-                    blockHeight = nodeHeight;
-
-                _cachedNameplateTextHeights[nameplateIndex] = blockHeight;
-            }
-
-            var containerHeight = (int)nameContainer->Height;
-            if (containerHeight > 0)
-            {
-                _cachedNameplateContainerHeights[nameplateIndex] = containerHeight;
-            }
-            else
-            {
-                containerHeight = _cachedNameplateContainerHeights[nameplateIndex];
-            }
-
-            if (containerHeight <= 0)
-            {
-                containerHeight = blockHeight + (int)Math.Round(8 * textScaleY);
-                if (containerHeight <= blockHeight)
-                    containerHeight = blockHeight + 1;
-
-                _cachedNameplateContainerHeights[nameplateIndex] = containerHeight;
-            }
-
-            var blockTop = containerHeight - blockHeight;
-            if (blockTop < 0)
-                blockTop = 0;
-            var verticalPadding = (int)Math.Round(4 * effectiveScale);
-
-            var positionY = blockTop - verticalPadding - nodeHeight;
-
-            var textWidth = Math.Abs((int)nameplateObject.TextW);
-            if (textWidth <= 0)
-            {
-                textWidth = GetScaledTextWidth(nameText);
-                if (textWidth <= 0)
-                    textWidth = nodeWidth;
-            }
-
-            if (textWidth > 0)
-            {
-                _cachedNameplateTextWidths[nameplateIndex] = textWidth;
-            }
-
-            var textOffset = (int)Math.Round(nameText->AtkResNode.X);
-            var hasValidOffset = false;
-
-            if (Math.Abs((int)nameplateObject.TextW) > 0 || textOffset != 0)
-            {
-                _cachedNameplateTextOffsets[nameplateIndex] = textOffset;
-                hasValidOffset = true;
-            }
-            else if (_cachedNameplateTextOffsets[nameplateIndex] != int.MinValue)
-            {
-                hasValidOffset = true;
-            }
-
-            int positionX;
-
-            if (!config.LightfinderLabelUseIcon)
-            {
-                var needsWidthRefresh = nodeCreated || needsTextUpdate || !scaleMatches || fontTypeChanged || fontSizeChanged || flagsChanged;
-                if (flagsChanged)
-                    pNode->TextFlags = desiredFlags;
-
-                if (needsWidthRefresh)
-                {
-                    if (pNode->AtkResNode.Width != 0)
-                        pNode->AtkResNode.Width = 0;
-                    nodeWidth = (int)pNode->AtkResNode.GetWidth();
-                    if (nodeWidth <= 0)
-                        nodeWidth = defaultNodeWidth;
-                }
-
-                if (pNode->AtkResNode.Width != (ushort)nodeWidth)
-                    pNode->AtkResNode.Width = (ushort)nodeWidth;
-            }
-            else
-            {
-                var needsWidthRefresh = nodeCreated || needsTextUpdate || !scaleMatches || fontTypeChanged || fontSizeChanged || flagsChanged;
-                if (flagsChanged)
-                    pNode->TextFlags = desiredFlags;
-
-                if (needsWidthRefresh && pNode->AtkResNode.Width != 0)
-                    pNode->AtkResNode.Width = 0;
-                nodeWidth = pNode->AtkResNode.GetWidth();
-            }
-
-            if (config.LightfinderAutoAlign && nameContainer != null && hasValidOffset)
-            {
-                var nameplateWidth = (int)nameContainer->Width;
-
-                int leftPos = nameplateWidth / 8;
-                int rightPos = nameplateWidth - nodeWidth - (nameplateWidth / 8);
-                int centrePos = (nameplateWidth - nodeWidth) / 2;
-                int staticMargin = 24;
-                int calcMargin = (int)(nameplateWidth * 0.08f);
-
-                switch (config.LabelAlignment)
-                {
-                    case LabelAlignment.Left:
-                        positionX = config.LightfinderLabelUseIcon ? leftPos + staticMargin : leftPos;
-                        alignment = AlignmentType.BottomLeft;
-                        break;
-                    case LabelAlignment.Right:
-                        positionX = config.LightfinderLabelUseIcon ? rightPos - staticMargin : nameplateWidth - nodeWidth + calcMargin;
-                        alignment = AlignmentType.BottomRight;
-                        break;
-                    default:
-                        positionX = config.LightfinderLabelUseIcon ? centrePos : centrePos + calcMargin;
-                        alignment = AlignmentType.Bottom;
-                        break;
-                }
-            }
-            else
-            {
-                positionX = 58 + config.LightfinderLabelOffsetX;
-                alignment = AlignmentType.Bottom;
-            }
-
-            positionY += config.LightfinderLabelOffsetY;
-
-            alignment = (AlignmentType)Math.Clamp((int)alignment, 0, 8);
-            if (pNode->AtkResNode.Color.A != 255)
-                pNode->AtkResNode.Color.A = 255;
-
-            var textR = (byte)(labelColor.X * 255);
-            var textG = (byte)(labelColor.Y * 255);
-            var textB = (byte)(labelColor.Z * 255);
-            var textA = (byte)(labelColor.W * 255);
-
-            if (pNode->TextColor.R != textR || pNode->TextColor.G != textG ||
-                pNode->TextColor.B != textB || pNode->TextColor.A != textA)
-            {
-                pNode->TextColor.R = textR;
-                pNode->TextColor.G = textG;
-                pNode->TextColor.B = textB;
-                pNode->TextColor.A = textA;
-            }
-
-            var edgeR = (byte)(edgeColor.X * 255);
-            var edgeG = (byte)(edgeColor.Y * 255);
-            var edgeB = (byte)(edgeColor.Z * 255);
-            var edgeA = (byte)(edgeColor.W * 255);
-
-            if (pNode->EdgeColor.R != edgeR || pNode->EdgeColor.G != edgeG ||
-                pNode->EdgeColor.B != edgeB || pNode->EdgeColor.A != edgeA)
-            {
-                pNode->EdgeColor.R = edgeR;
-                pNode->EdgeColor.G = edgeG;
-                pNode->EdgeColor.B = edgeB;
-                pNode->EdgeColor.A = edgeA;
-            }
-
-            var desiredAlignment = config.LightfinderLabelUseIcon ? alignment : AlignmentType.Bottom;
-            if (pNode->AlignmentType != desiredAlignment)
-                pNode->AlignmentType = desiredAlignment;
-
-            var desiredX = (short)Math.Clamp(positionX, short.MinValue, short.MaxValue);
-            var desiredY = (short)Math.Clamp(positionY, short.MinValue, short.MaxValue);
-            if (!NearlyEqual(pNode->AtkResNode.X, desiredX) || !NearlyEqual(pNode->AtkResNode.Y, desiredY))
-                pNode->AtkResNode.SetPositionShort(desiredX, desiredY);
-
-            if (pNode->LineSpacing != desiredLineSpacing)
-                pNode->LineSpacing = desiredLineSpacing;
-            if (pNode->CharSpacing != 1)
-                pNode->CharSpacing = 1;
-        }
-
-        HideUnmarkedNodes(namePlateAddon, visibleIndices);
-    }
-
-    /// <summary>
-    /// Resolve the current RaptureAtkModule for native UI access.
-    /// </summary>
-    private static RaptureAtkModule* GetRaptureAtkModule()
-    {
-        var framework = Framework.Instance();
-        if (framework == null)
-            return null;
-
-        var uiModule = framework->GetUIModule();
-        if (uiModule == null)
-            return null;
-
-        return uiModule->GetRaptureAtkModule();
-    }
-
-    /// <summary>
-    /// Resolve the NamePlate addon from the given RaptureAtkModule.
-    /// </summary>
-    private static AddonNamePlate* GetNamePlateAddon(RaptureAtkModule* raptureAtkModule)
-    {
-        if (raptureAtkModule == null)
-            return null;
-
-        var addon = raptureAtkModule->RaptureAtkUnitManager.GetAddonByName("NamePlate");
-        return addon != null ? (AddonNamePlate*)addon : null;
-    }
-
-    private static uint GetNameplateNodeId(int index)
-        => NameplateNodeIdBase + (uint)index;
-
-    /// <summary>
-    /// Checks if the NamePlate addon is visible and safe to touch.
-    /// </summary>
-    private static bool IsNameplateAddonVisible(AddonNamePlate* namePlateAddon)
-    {
-        if (namePlateAddon == null)
-            return false;
-
-        var root = namePlateAddon->AtkUnitBase.RootNode;
-        return root != null && root->IsVisible();
-    }
-
-    /// <summary>
-    /// Finds a LightFinder text node by ID in the name container.
-    /// </summary>
-    private static AtkTextNode* FindNameplateTextNode(AtkResNode* nameContainer, uint nodeId)
-    {
-        if (nameContainer == null)
-            return null;
-
-        var child = nameContainer->ChildNode;
-        while (child != null)
-        {
-            if (child->NodeId == nodeId &&
-                child->Type == NodeType.Text &&
-                child->ParentNode == nameContainer)
-                return (AtkTextNode*)child;
-
-            child = child->PrevSiblingNode;
-        }
-
-        return null;
-    }
-
-    /// <summary>
-    /// Ensures a LightFinder text node exists for the given nameplate index.
-    /// </summary>
-    private static AtkTextNode* EnsureNameplateTextNode(AtkResNode* nameContainer, AtkComponentNode* root, uint nodeId, out bool created)
-    {
-        created = false;
-        if (nameContainer == null || root == null || root->Component == null)
-            return null;
-
-        var existing = FindNameplateTextNode(nameContainer, nodeId);
-        if (existing != null)
-            return existing;
-
-        if (nameContainer->ChildNode == null)
-            return null;
-
-        var newNode = AtkNodeHelpers.CreateOrphanTextNode(nodeId, TextFlags.Edge | TextFlags.Glare);
-        if (newNode == null)
-            return null;
-
-        var lastChild = nameContainer->ChildNode;
-        while (lastChild->PrevSiblingNode != null)
-            lastChild = lastChild->PrevSiblingNode;
-
-        newNode->AtkResNode.NextSiblingNode = lastChild;
-        newNode->AtkResNode.ParentNode = nameContainer;
-        lastChild->PrevSiblingNode = (AtkResNode*)newNode;
-        root->Component->UldManager.UpdateDrawNodeList();
-        newNode->AtkResNode.SetUseDepthBasedPriority(true);
-
-        created = true;
-        return newNode;
-    }
-
-    /// <summary>
-    /// Hides all native LightFinder nodes on the nameplate addon.
-    /// </summary>
-    private static void HideAllNameplateNodes(AddonNamePlate* namePlateAddon)
-    {
-        if (namePlateAddon == null)
-            return;
-
-        if (!IsNameplateAddonVisible(namePlateAddon))
-            return;
-
-        for (int i = 0; i < AddonNamePlate.NumNamePlateObjects; ++i)
-        {
-            HideNameplateTextNode(namePlateAddon->NamePlateObjectArray[i], GetNameplateNodeId(i));
-        }
-    }
-
-    /// <summary>
-    /// Hides all LightFinder nodes not marked as visible this frame.
-    /// </summary>
-    private static void HideUnmarkedNodes(AddonNamePlate* namePlateAddon, bool[] visibleIndices)
-    {
-        if (namePlateAddon == null)
-            return;
-
-        if (!IsNameplateAddonVisible(namePlateAddon))
-            return;
-
-        var visibleLength = visibleIndices.Length;
-        for (int i = 0; i < AddonNamePlate.NumNamePlateObjects; ++i)
-        {
-            if (i < visibleLength && visibleIndices[i])
-                continue;
-
-            HideNameplateTextNode(namePlateAddon->NamePlateObjectArray[i], GetNameplateNodeId(i));
-        }
-    }
-
-    /// <summary>
-    /// Hides the LightFinder text node for a single nameplate object.
-    /// </summary>
-    private static void HideNameplateTextNode(AddonNamePlate.NamePlateObject nameplateObject, uint nodeId)
-    {
-        var nameContainer = nameplateObject.NameContainer;
-        if (nameContainer == null)
-            return;
-
-        var node = FindNameplateTextNode(nameContainer, nodeId);
-        if (!IsValidNameplateTextNode(node, nameContainer))
-            return;
-
-        node->AtkResNode.ToggleVisibility(false);
-    }
-
-    /// <summary>
-    /// Attempts to destroy all constructed LightFinder nodes safely.
-    /// </summary>
-    private void TryDestroyNameplateNodes()
-    {
-        var raptureAtkModule = GetRaptureAtkModule();
-        if (raptureAtkModule == null)
-        {
-            if (_logger.IsEnabled(LogLevel.Debug))
-                _logger.LogDebug("Unable to destroy nameplate nodes because the RaptureAtkModule is not available.");
-            return;
-        }
-
-        var namePlateAddon = GetNamePlateAddon(raptureAtkModule);
-        if (namePlateAddon == null)
-        {
-            if (_logger.IsEnabled(LogLevel.Debug))
-                _logger.LogDebug("Unable to destroy nameplate nodes because the NamePlate addon is not available.");
-            return;
-        }
-
-        DestroyNameplateNodes(namePlateAddon);
-    }
-
-    /// <summary>
-    /// Removes all constructed LightFinder nodes from the given nameplate addon.
-    /// </summary>
-    private void DestroyNameplateNodes(AddonNamePlate* namePlateAddon)
-    {
-        if (namePlateAddon == null)
-            return;
-
-        for (int i = 0; i < AddonNamePlate.NumNamePlateObjects; ++i)
-        {
-            var nameplateObject = namePlateAddon->NamePlateObjectArray[i];
-            var root = nameplateObject.RootComponentNode;
-            var nameContainer = nameplateObject.NameContainer;
-            if (root == null || root->Component == null || nameContainer == null)
-                continue;
-
-            var nodeId = GetNameplateNodeId(i);
-            var textNode = FindNameplateTextNode(nameContainer, nodeId);
-            if (!IsValidNameplateTextNode(textNode, nameContainer))
-                continue;
-
-            try
-            {
-                var resNode = &textNode->AtkResNode;
-
-                if (resNode->PrevSiblingNode != null)
-                    resNode->PrevSiblingNode->NextSiblingNode = resNode->NextSiblingNode;
-                if (resNode->NextSiblingNode != null)
-                    resNode->NextSiblingNode->PrevSiblingNode = resNode->PrevSiblingNode;
-
-                root->Component->UldManager.UpdateDrawNodeList();
-                resNode->Destroy(true);
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(e, "Unknown error while removing text node 0x{Node:X} for nameplate {Index} on component node 0x{Component:X}", (IntPtr)textNode, i, (IntPtr)root);
-            }
-        }
-
-        ClearNameplateCaches();
-    }
-
-    /// <summary>
-    /// Validates that a node is a LightFinder text node owned by the container.
-    /// </summary>
-    private static bool IsValidNameplateTextNode(AtkTextNode* node, AtkResNode* nameContainer)
-    {
-        if (node == null || nameContainer == null)
-            return false;
-
-        var resNode = &node->AtkResNode;
-        return resNode->Type == NodeType.Text && resNode->ParentNode == nameContainer;
-    }
-
-    /// <summary>
-    /// Float comparison helper for UI values.
-    /// </summary>
-    private static bool NearlyEqual(float a, float b, float epsilon = 0.001f)
-        => Math.Abs(a - b) <= epsilon;
-
-    private static int GetScaledTextHeight(AtkTextNode* node)
-    {
-        if (node == null)
-            return 0;
-
-        var resNode = &node->AtkResNode;
-        var rawHeight = (int)resNode->GetHeight();
-        if (rawHeight <= 0 && node->LineSpacing > 0)
-            rawHeight = node->LineSpacing;
-        if (rawHeight <= 0)
-            rawHeight = AtkNodeHelpers.DefaultTextNodeHeight;
-
-        var scale = resNode->ScaleY;
-        if (scale <= 0f)
-            scale = 1f;
-
-        var computed = (int)Math.Round(rawHeight * scale);
-        return Math.Max(1, computed);
-    }
-
-    private static int GetScaledTextWidth(AtkTextNode* node)
-    {
-        if (node == null)
-            return 0;
-
-        var resNode = &node->AtkResNode;
-        var rawWidth = (int)resNode->GetWidth();
-        if (rawWidth <= 0)
-            rawWidth = AtkNodeHelpers.DefaultTextNodeWidth;
-
-        var scale = resNode->ScaleX;
-        if (scale <= 0f)
-            scale = 1f;
-
-        var computed = (int)Math.Round(rawWidth * scale);
-        return Math.Max(1, computed);
-    }
-
-    /// <summary>
-    /// Clears cached text sizing and label state for nameplates.
-    /// </summary>
-    public void ClearNameplateCaches()
-    {
-        Array.Clear(_cachedNameplateTextWidths, 0, _cachedNameplateTextWidths.Length);
-        Array.Clear(_cachedNameplateTextHeights, 0, _cachedNameplateTextHeights.Length);
-        Array.Clear(_cachedNameplateContainerHeights, 0, _cachedNameplateContainerHeights.Length);
-        Array.Fill(_cachedNameplateTextOffsets, int.MinValue);
-        Array.Fill(_lastLabelByIndex, null);
-    }
-
-}

LightlessSync/Services/LightFinder/LightFinderScannerService.cs

@@ -1,4 +1,4 @@
-using Dalamud.Plugin.Services;
+using Dalamud.Plugin.Services;
 using LightlessSync.API.Dto.User;
 using LightlessSync.Services.ActorTracking;
 using LightlessSync.Services.Mediator;
@@ -15,15 +15,11 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
 
     private readonly LightFinderService _broadcastService;
     private readonly LightFinderPlateHandler _lightFinderPlateHandler;
-    private readonly LightFinderNativePlateHandler _lightFinderNativePlateHandler;
 
     private readonly ConcurrentDictionary<string, BroadcastEntry> _broadcastCache = new(StringComparer.Ordinal);
     private readonly Queue<string> _lookupQueue = new();
     private readonly HashSet<string> _lookupQueuedCids = [];
     private readonly HashSet<string> _syncshellCids = [];
-    private volatile bool _pendingLocalBroadcast;
-    private TimeSpan? _pendingLocalTtl;
-    private string? _pendingLocalGid;
 
     private static readonly TimeSpan _maxAllowedTtl = TimeSpan.FromMinutes(4);
     private static readonly TimeSpan _retryDelay = TimeSpan.FromMinutes(1);
@@ -37,7 +33,6 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
     private const int _maxQueueSize = 100;
 
     private volatile bool _batchRunning = false;
-    private volatile bool _disposed = false;
 
     public IReadOnlyDictionary<string, BroadcastEntry> BroadcastCache => _broadcastCache;
     public readonly record struct BroadcastEntry(bool IsBroadcasting, DateTime ExpiryTime, string? GID);
@@ -47,14 +42,12 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
         LightFinderService broadcastService,
         LightlessMediator mediator,
         LightFinderPlateHandler lightFinderPlateHandler,
-        LightFinderNativePlateHandler lightFinderNativePlateHandler,
         ActorObjectService actorTracker) : base(logger, mediator)
     {
         _logger = logger;
         _actorTracker = actorTracker;
         _broadcastService = broadcastService;
         _lightFinderPlateHandler = lightFinderPlateHandler;
-        _lightFinderNativePlateHandler = lightFinderNativePlateHandler;
 
         _logger = logger;
         _framework = framework;
@@ -70,25 +63,20 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
 
     public void Update()
     {
-        if (_disposed)
-            return;
-
         _frameCounter++;
         var lookupsThisFrame = 0;
 
         if (!_broadcastService.IsBroadcasting)
             return;
 
-        TryPrimeLocalBroadcastCache();
-
         var now = DateTime.UtcNow;
 
-        foreach (var descriptor in _actorTracker.PlayerDescriptors)
+        foreach (var address in _actorTracker.PlayerAddresses)
         {
-            if (string.IsNullOrEmpty(descriptor.HashedContentId))
+            if (address == nint.Zero)
                 continue;
 
-            var cid = descriptor.HashedContentId;
+            var cid = DalamudUtilService.GetHashedCIDFromPlayerPointer(address);
             var isStale = !_broadcastCache.TryGetValue(cid, out var entry) || entry.ExpiryTime <= now;
 
             if (isStale && _lookupQueuedCids.Add(cid) && _lookupQueue.Count < _maxQueueSize)
@@ -116,14 +104,7 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
 
     private async Task BatchUpdateBroadcastCacheAsync(List<string> cids)
     {
-        if (_disposed)
-            return;
-
         var results = await _broadcastService.AreUsersBroadcastingAsync(cids).ConfigureAwait(false);
-        
-        if (_disposed)
-            return;
-
         var now = DateTime.UtcNow;
 
         foreach (var (cid, info) in results)
@@ -142,88 +123,35 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
                 (_, old) => new BroadcastEntry(info.IsBroadcasting, expiry, info.GID));
         }
 
-        if (_disposed)
-            return;
-
         var activeCids = _broadcastCache
             .Where(e => e.Value.IsBroadcasting && e.Value.ExpiryTime > now)
             .Select(e => e.Key)
             .ToList();
 
         _lightFinderPlateHandler.UpdateBroadcastingCids(activeCids);
-        _lightFinderNativePlateHandler.UpdateBroadcastingCids(activeCids);
         UpdateSyncshellBroadcasts();
     }
 
     private void OnBroadcastStatusChanged(BroadcastStatusChangedMessage msg)
     {
-        if (_disposed)
-            return;
-
         if (!msg.Enabled)
         {
             _broadcastCache.Clear();
             _lookupQueue.Clear();
             _lookupQueuedCids.Clear();
             _syncshellCids.Clear();
-            _pendingLocalBroadcast = false;
-            _pendingLocalTtl = null;
 
             _lightFinderPlateHandler.UpdateBroadcastingCids([]);
-            _lightFinderNativePlateHandler.UpdateBroadcastingCids([]);
-            return;
         }
-
-        _pendingLocalBroadcast = true;
-        _pendingLocalTtl = msg.Ttl;
-        _pendingLocalGid = msg.Gid;
-        TryPrimeLocalBroadcastCache();
-    }
-
-    private void TryPrimeLocalBroadcastCache()
-    {
-        if (!_pendingLocalBroadcast)
-            return;
-
-        if (!TryGetLocalHashedCid(out var localCid))
-            return;
-
-        var ttl = _pendingLocalTtl ?? _maxAllowedTtl;
-        var expiry = DateTime.UtcNow + ttl;
-
-        _broadcastCache.AddOrUpdate(localCid,
-            new BroadcastEntry(true, expiry, _pendingLocalGid),
-            (_, old) => new BroadcastEntry(true, expiry, _pendingLocalGid ?? old.GID));
-
-        _pendingLocalBroadcast = false;
-        _pendingLocalTtl = null;
-        _pendingLocalGid = null;
-
-        var now = DateTime.UtcNow;
-        var activeCids = _broadcastCache
-            .Where(e => e.Value.IsBroadcasting && e.Value.ExpiryTime > now)
-            .Select(e => e.Key)
-            .ToList();
-
-        _lightFinderPlateHandler.UpdateBroadcastingCids(activeCids);
-        _lightFinderNativePlateHandler.UpdateBroadcastingCids(activeCids);
-        UpdateSyncshellBroadcasts();
     }
 
     private void UpdateSyncshellBroadcasts()
     {
-        if (_disposed)
-            return;
-
         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))
         {
@@ -235,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,
@@ -255,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;
@@ -348,35 +230,17 @@ public class LightFinderScannerService : DisposableMediatorSubscriberBase
 
     protected override void Dispose(bool disposing)
     {
-        _disposed = true;
         base.Dispose(disposing);
         _framework.Update -= OnFrameworkUpdate;
-        
-        try
+        if (_cleanupTask != null)
         {
-            _cleanupCts.Cancel();
-        }
-        catch (ObjectDisposedException)
-        {
-            // Already disposed, can be ignored :)
+            _cleanupTask?.Wait(100, _cleanupCts.Token);
         }
 
-        try
-        {
-            _cleanupTask?.Wait(100);
-        }
-        catch (Exception)
-        {
-            // Task may have already completed or been cancelled?
-        }
+        _cleanupCts.Cancel();
+        _cleanupCts.Dispose();
 
-        try
-        {
-            _cleanupCts.Dispose();
-        }
-        catch (ObjectDisposedException)
-        {
-            // Already disposed, ignore
-        }
+        _cleanupTask?.Wait(100);
+        _cleanupCts.Dispose();
     }
 }

LightlessSync/Services/LightFinder/LightFinderService.cs

@@ -1,4 +1,4 @@
-using Dalamud.Interface;
+using Dalamud.Interface;
 using LightlessSync.API.Dto.Group;
 using LightlessSync.API.Dto.User;
 using LightlessSync.LightlessConfiguration;
@@ -67,7 +67,7 @@ public class LightFinderService : IHostedService, IMediatorSubscriber
     {
         try
         {
-            var cid = _dalamudUtil.GetCID();
+            var cid = await _dalamudUtil.GetCIDAsync().ConfigureAwait(false);
             return cid.ToString().GetHash256();
         }
         catch (Exception ex)
@@ -121,10 +121,7 @@ public class LightFinderService : IHostedService, IMediatorSubscriber
         _waitingForTtlFetch = false;
 
         if (!wasEnabled || previousRemaining != validTtl)
-        {
-            var gid = _config.Current.SyncshellFinderEnabled ? _config.Current.SelectedFinderSyncshell : null;
-            _mediator.Publish(new BroadcastStatusChangedMessage(true, validTtl, gid));
-        }
+            _mediator.Publish(new BroadcastStatusChangedMessage(true, validTtl));
 
         _logger.LogInformation("Lightfinder broadcast enabled ({Context}), TTL: {TTL}", context, validTtl);
         return true;

LightlessSync/Services/LocationShareService.cs

@@ -1,137 +0,0 @@
-using LightlessSync.API.Data;
-using LightlessSync.API.Dto.CharaData;
-using LightlessSync.API.Dto.User;
-using LightlessSync.Services.Mediator;
-using LightlessSync.WebAPI;
-using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Primitives;
-
-namespace LightlessSync.Services
-{
-    public class LocationShareService : DisposableMediatorSubscriberBase
-    {
-        private readonly DalamudUtilService _dalamudUtilService;
-        private readonly ApiController _apiController;
-        private IMemoryCache _locations = new MemoryCache(new MemoryCacheOptions());
-        private IMemoryCache _sharingStatus = new MemoryCache(new MemoryCacheOptions());
-        private CancellationTokenSource _resetToken = new CancellationTokenSource();
-        
-        public LocationShareService(ILogger<LocationShareService> logger, LightlessMediator mediator, DalamudUtilService dalamudUtilService, ApiController apiController) : base(logger, mediator)
-        {
-            _dalamudUtilService = dalamudUtilService;
-            _apiController = apiController;
-
-
-            Mediator.Subscribe<DisconnectedMessage>(this, (msg) =>
-            {
-                _resetToken.Cancel();
-                _resetToken.Dispose();
-                _resetToken = new CancellationTokenSource();
-            });
-            Mediator.Subscribe<ConnectedMessage>(this, (msg) =>
-            {
-                _ = _apiController.UpdateLocation(new LocationDto(new UserData(_apiController.UID, apiController.DisplayName), _dalamudUtilService.GetMapData()));
-                _ = RequestAllLocation();
-            } );
-            Mediator.Subscribe<LocationSharingMessage>(this, UpdateLocationList);
-            Mediator.Subscribe<MapChangedMessage>(this,
-                msg => _ = _apiController.UpdateLocation(new LocationDto(new UserData(_apiController.UID, _apiController.DisplayName), _dalamudUtilService.GetMapData())));
-        }
-
-        private void UpdateLocationList(LocationSharingMessage msg)
-        {
-            if (_locations.TryGetValue(msg.User.UID, out _) && msg.LocationInfo.ServerId is 0)
-            {
-                _locations.Remove(msg.User.UID);
-                return;
-            }
-
-            if ( msg.LocationInfo.ServerId is not 0 && msg.ExpireAt > DateTime.UtcNow)
-            {
-                AddLocationInfo(msg.User.UID, msg.LocationInfo, msg.ExpireAt);
-            }
-        }
-
-        private void AddLocationInfo(string uid, LocationInfo location, DateTimeOffset expireAt)
-        {
-            var options = new MemoryCacheEntryOptions()
-                .SetAbsoluteExpiration(expireAt)
-                .AddExpirationToken(new CancellationChangeToken(_resetToken.Token));
-            _locations.Set(uid, location, options);
-        }
-
-        private async Task RequestAllLocation()
-        {
-            try
-            {
-                var (data, status) = await _apiController.RequestAllLocationInfo().ConfigureAwait(false);
-                foreach (var dto in data)
-                {
-                    AddLocationInfo(dto.LocationDto.User.UID, dto.LocationDto.Location, dto.ExpireAt);
-                }
-
-                foreach (var dto in status)
-                {
-                    AddStatus(dto.User.UID, dto.ExpireAt);
-                }
-            }
-            catch (Exception e)
-            {
-                Logger.LogError(e,"RequestAllLocation error : ");
-                throw;
-            }
-        }
-
-        private void AddStatus(string uid, DateTimeOffset expireAt)
-        {
-            var options = new MemoryCacheEntryOptions()
-                .SetAbsoluteExpiration(expireAt)
-                .AddExpirationToken(new CancellationChangeToken(_resetToken.Token));
-            _sharingStatus.Set(uid, expireAt, options);
-        }
-
-        public string GetUserLocation(string uid)
-        {
-            try
-            {
-                if (_locations.TryGetValue<LocationInfo>(uid, out var location))
-                {
-                    return _dalamudUtilService.LocationToString(location);
-                }
-                return String.Empty;
-            }
-            catch (Exception e)
-            {
-                Logger.LogError(e,"GetUserLocation error : ");
-                throw;
-            }
-        }
-
-        public DateTimeOffset GetSharingStatus(string uid)
-        {
-            try
-            {
-                if (_sharingStatus.TryGetValue<DateTimeOffset>(uid, out var expireAt))
-                {
-                    return expireAt;
-                }
-                return DateTimeOffset.MinValue;
-            }
-            catch (Exception e)
-            {
-                Logger.LogError(e,"GetSharingStatus error : ");
-                throw;
-            }
-        }
-
-        public void UpdateSharingStatus(List<string> users, DateTimeOffset expireAt)
-        {
-            foreach (var user in users)
-            {
-                AddStatus(user, expireAt);
-            }
-        }
-        
-    }
-}

LightlessSync/Services/Mediator/LightlessMediator.cs

@@ -63,31 +63,23 @@ public sealed class LightlessMediator : IHostedService
 
         _ = Task.Run(async () =>
         {
-            try
+            while (!_loopCts.Token.IsCancellationRequested)
             {
-                while (!_loopCts.Token.IsCancellationRequested)
+                while (!_processQueue)
                 {
-                    while (!_processQueue)
-                    {
-                        await Task.Delay(100, _loopCts.Token).ConfigureAwait(false);
-                    }
-
                     await Task.Delay(100, _loopCts.Token).ConfigureAwait(false);
-
-                    HashSet<MessageBase> processedMessages = [];
-                    while (_messageQueue.TryDequeue(out var message))
-                    {
-                        if (processedMessages.Contains(message)) { continue; }
-
-                        processedMessages.Add(message);
-
-                        ExecuteMessage(message);
-                    }
                 }
-            }
-            catch (OperationCanceledException)
-            {
-                _logger.LogInformation("LightlessMediator stopped");
+
+                await Task.Delay(100, _loopCts.Token).ConfigureAwait(false);
+
+                HashSet<MessageBase> processedMessages = [];
+                while (_messageQueue.TryDequeue(out var message))
+                {
+                    if (processedMessages.Contains(message)) { continue; }
+                    processedMessages.Add(message);
+
+                    ExecuteMessage(message);
+                }
             }
         });
 

LightlessSync/Services/Mediator/Messages.cs

@@ -73,7 +73,7 @@ public record HubClosedMessage(Exception? Exception) : SameThreadMessage;
 public record ResumeScanMessage(string Source) : MessageBase;
 public record FileCacheInitializedMessage : MessageBase;
 public record DownloadReadyMessage(Guid RequestId) : MessageBase;
-public record DownloadStartedMessage(GameObjectHandler DownloadId, IReadOnlyDictionary<string, FileDownloadStatus> DownloadStatus) : MessageBase;
+public record DownloadStartedMessage(GameObjectHandler DownloadId, Dictionary<string, FileDownloadStatus> DownloadStatus) : MessageBase;
 public record DownloadFinishedMessage(GameObjectHandler DownloadId) : MessageBase;
 public record UiToggleMessage(Type UiType) : MessageBase;
 public record PlayerUploadingMessage(GameObjectHandler Handler, bool IsUploading) : MessageBase;
@@ -104,7 +104,6 @@ public record PairUiUpdatedMessage(PairUiSnapshot Snapshot) : MessageBase;
 public record CensusUpdateMessage(byte Gender, byte RaceId, byte TribeId) : MessageBase;
 public record TargetPairMessage(Pair Pair) : MessageBase;
 public record PairFocusCharacterMessage(Pair Pair) : SameThreadMessage;
-public record PairOnlineMessage(PairUniqueIdentifier PairIdent) : MessageBase;
 public record CombatStartMessage : MessageBase;
 public record CombatEndMessage : MessageBase;
 public record PerformanceStartMessage : MessageBase;
@@ -124,7 +123,7 @@ public record GPoseLobbyReceivePoseData(UserData UserData, PoseData PoseData) :
 public record GPoseLobbyReceiveWorldData(UserData UserData, WorldData WorldData) : MessageBase;
 public record OpenCharaDataHubWithFilterMessage(UserData UserData) : MessageBase;
 public record EnableBroadcastMessage(string HashedCid, bool Enabled) : MessageBase;
-public record BroadcastStatusChangedMessage(bool Enabled, TimeSpan? Ttl, string? Gid = null) : MessageBase;
+public record BroadcastStatusChangedMessage(bool Enabled, TimeSpan? Ttl) : MessageBase;
 public record UserLeftSyncshell(string gid) : MessageBase;
 public record UserJoinedSyncshell(string gid) : MessageBase;
 public record SyncshellBroadcastsUpdatedMessage : MessageBase;
@@ -136,8 +135,5 @@ public record ChatChannelsUpdated : MessageBase;
 public record ChatChannelMessageAdded(string ChannelKey, ChatMessageEntry Message) : MessageBase;
 public record GroupCollectionChangedMessage : MessageBase;
 public record OpenUserProfileMessage(UserData User) : MessageBase;
-public record LocationSharingMessage(UserData User, LocationInfo LocationInfo, DateTimeOffset ExpireAt) : MessageBase;
-public record MapChangedMessage(uint MapId) : MessageBase;
-public record PenumbraTempCollectionsCleanedMessage : MessageBase;
 #pragma warning restore S2094
-#pragma warning restore MA0048 // File name must match type name
+#pragma warning restore MA0048 // File name must match type name

LightlessSync/Services/ModelDecimation/ModelDecimationService.cs

@@ -1,381 +0,0 @@
-using LightlessSync.FileCache;
-using LightlessSync.LightlessConfiguration;
-using Microsoft.Extensions.Logging;
-using System.Collections.Concurrent;
-using System.Globalization;
-
-namespace LightlessSync.Services.ModelDecimation;
-
-public sealed class ModelDecimationService
-{
-    private const int MaxConcurrentJobs = 1;
-    private const double MinTargetRatio = 0.01;
-    private const double MaxTargetRatio = 0.99;
-
-    private readonly ILogger<ModelDecimationService> _logger;
-    private readonly LightlessConfigService _configService;
-    private readonly FileCacheManager _fileCacheManager;
-    private readonly PlayerPerformanceConfigService _performanceConfigService;
-    private readonly XivDataStorageService _xivDataStorageService;
-    private readonly SemaphoreSlim _decimationSemaphore = new(MaxConcurrentJobs);
-
-    private readonly ConcurrentDictionary<string, Task> _activeJobs = new(StringComparer.OrdinalIgnoreCase);
-    private readonly ConcurrentDictionary<string, string> _decimatedPaths = new(StringComparer.OrdinalIgnoreCase);
-    private readonly ConcurrentDictionary<string, byte> _failedHashes = new(StringComparer.OrdinalIgnoreCase);
-
-    public ModelDecimationService(
-        ILogger<ModelDecimationService> logger,
-        LightlessConfigService configService,
-        FileCacheManager fileCacheManager,
-        PlayerPerformanceConfigService performanceConfigService,
-        XivDataStorageService xivDataStorageService)
-    {
-        _logger = logger;
-        _configService = configService;
-        _fileCacheManager = fileCacheManager;
-        _performanceConfigService = performanceConfigService;
-        _xivDataStorageService = xivDataStorageService;
-    }
-
-    public void ScheduleDecimation(string hash, string filePath, string? gamePath = null)
-    {
-        if (!ShouldScheduleDecimation(hash, filePath, gamePath))
-        {
-            return;
-        }
-
-        if (_decimatedPaths.ContainsKey(hash) || _failedHashes.ContainsKey(hash) || _activeJobs.ContainsKey(hash))
-        {
-            return;
-        }
-
-        _logger.LogInformation("Queued model decimation for {Hash}", hash);
-
-        _activeJobs[hash] = Task.Run(async () =>
-        {
-            await _decimationSemaphore.WaitAsync().ConfigureAwait(false);
-            try
-            {
-                await DecimateInternalAsync(hash, filePath).ConfigureAwait(false);
-            }
-            catch (Exception ex)
-            {
-                _failedHashes[hash] = 1;
-                _logger.LogWarning(ex, "Model decimation failed for {Hash}", hash);
-            }
-            finally
-            {
-                _decimationSemaphore.Release();
-                _activeJobs.TryRemove(hash, out _);
-            }
-        }, CancellationToken.None);
-    }
-
-    public bool ShouldScheduleDecimation(string hash, string filePath, string? gamePath = null)
-        => IsDecimationEnabled()
-            && filePath.EndsWith(".mdl", StringComparison.OrdinalIgnoreCase)
-            && IsDecimationAllowed(gamePath)
-            && !ShouldSkipByTriangleCache(hash);
-
-    public string GetPreferredPath(string hash, string originalPath)
-    {
-        if (!IsDecimationEnabled())
-        {
-            return originalPath;
-        }
-
-        if (_decimatedPaths.TryGetValue(hash, out var existing) && File.Exists(existing))
-        {
-            return existing;
-        }
-
-        var resolved = GetExistingDecimatedPath(hash);
-        if (!string.IsNullOrEmpty(resolved))
-        {
-            _decimatedPaths[hash] = resolved;
-            return resolved;
-        }
-
-        return originalPath;
-    }
-
-    public Task WaitForPendingJobsAsync(IEnumerable<string>? hashes, CancellationToken token)
-    {
-        if (hashes is null)
-        {
-            return Task.CompletedTask;
-        }
-
-        var pending = new List<Task>();
-        var seen = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-
-        foreach (var hash in hashes)
-        {
-            if (string.IsNullOrEmpty(hash) || !seen.Add(hash))
-            {
-                continue;
-            }
-
-            if (_activeJobs.TryGetValue(hash, out var job))
-            {
-                pending.Add(job);
-            }
-        }
-
-        if (pending.Count == 0)
-        {
-            return Task.CompletedTask;
-        }
-
-        return Task.WhenAll(pending).WaitAsync(token);
-    }
-
-    private Task DecimateInternalAsync(string hash, string sourcePath)
-    {
-        if (!File.Exists(sourcePath))
-        {
-            _failedHashes[hash] = 1;
-            _logger.LogWarning("Cannot decimate model {Hash}; source path missing: {Path}", hash, sourcePath);
-            return Task.CompletedTask;
-        }
-
-        if (!TryGetDecimationSettings(out var triangleThreshold, out var targetRatio))
-        {
-            _logger.LogInformation("Model decimation disabled or invalid settings for {Hash}", hash);
-            return Task.CompletedTask;
-        }
-
-        _logger.LogInformation("Starting model decimation for {Hash} (threshold {Threshold}, ratio {Ratio:0.##})", hash, triangleThreshold, targetRatio);
-
-        var destination = Path.Combine(GetDecimatedDirectory(), $"{hash}.mdl");
-        if (File.Exists(destination))
-        {
-            RegisterDecimatedModel(hash, sourcePath, destination);
-            return Task.CompletedTask;
-        }
-
-        if (!MdlDecimator.TryDecimate(sourcePath, destination, triangleThreshold, targetRatio, _logger))
-        {
-            _failedHashes[hash] = 1;
-            _logger.LogInformation("Model decimation skipped for {Hash}", hash);
-            return Task.CompletedTask;
-        }
-
-        RegisterDecimatedModel(hash, sourcePath, destination);
-        _logger.LogInformation("Decimated model {Hash} -> {Path}", hash, destination);
-        return Task.CompletedTask;
-    }
-
-    private void RegisterDecimatedModel(string hash, string sourcePath, string destination)
-    {
-        _decimatedPaths[hash] = destination;
-
-        var performanceConfig = _performanceConfigService.Current;
-        if (performanceConfig.KeepOriginalModelFiles)
-        {
-            return;
-        }
-
-        if (string.Equals(sourcePath, destination, StringComparison.OrdinalIgnoreCase))
-        {
-            return;
-        }
-
-        if (!TryReplaceCacheEntryWithDecimated(hash, sourcePath, destination))
-        {
-            return;
-        }
-
-        TryDelete(sourcePath);
-    }
-
-    private bool TryReplaceCacheEntryWithDecimated(string hash, string sourcePath, string destination)
-    {
-        try
-        {
-            var cacheEntry = _fileCacheManager.GetFileCacheByHash(hash);
-            if (cacheEntry is null || !cacheEntry.IsCacheEntry)
-            {
-                return File.Exists(sourcePath) ? false : true;
-            }
-
-            var cacheFolder = _configService.Current.CacheFolder;
-            if (string.IsNullOrEmpty(cacheFolder))
-            {
-                return false;
-            }
-
-            if (!destination.StartsWith(cacheFolder, StringComparison.OrdinalIgnoreCase))
-            {
-                return false;
-            }
-
-            var info = new FileInfo(destination);
-            if (!info.Exists)
-            {
-                return false;
-            }
-
-            var relative = Path.GetRelativePath(cacheFolder, destination)
-                .Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
-            var sanitizedRelative = relative.TrimStart(Path.DirectorySeparatorChar);
-            var prefixed = Path.Combine(FileCacheManager.CachePrefix, sanitizedRelative);
-
-            var replacement = new FileCacheEntity(
-                hash,
-                prefixed,
-                info.LastWriteTimeUtc.Ticks.ToString(CultureInfo.InvariantCulture),
-                info.Length,
-                cacheEntry.CompressedSize);
-            replacement.SetResolvedFilePath(destination);
-
-            if (!string.Equals(cacheEntry.PrefixedFilePath, prefixed, StringComparison.OrdinalIgnoreCase))
-            {
-                _fileCacheManager.RemoveHashedFile(cacheEntry.Hash, cacheEntry.PrefixedFilePath, removeDerivedFiles: false);
-            }
-
-            _fileCacheManager.UpdateHashedFile(replacement, computeProperties: false);
-            _fileCacheManager.WriteOutFullCsv();
-
-            _logger.LogTrace("Replaced cache entry for model {Hash} to decimated path {Path}", hash, destination);
-            return true;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogTrace(ex, "Failed to replace cache entry for model {Hash}", hash);
-            return false;
-        }
-    }
-
-    private bool IsDecimationEnabled()
-        => _performanceConfigService.Current.EnableModelDecimation;
-
-    private bool ShouldSkipByTriangleCache(string hash)
-    {
-        if (string.IsNullOrEmpty(hash))
-        {
-            return false;
-        }
-
-        if (!_xivDataStorageService.Current.TriangleDictionary.TryGetValue(hash, out var cachedTris) || cachedTris <= 0)
-        {
-            return false;
-        }
-
-        var threshold = Math.Max(0, _performanceConfigService.Current.ModelDecimationTriangleThreshold);
-        return threshold > 0 && cachedTris < threshold;
-    }
-
-    private bool IsDecimationAllowed(string? gamePath)
-    {
-        if (string.IsNullOrWhiteSpace(gamePath))
-        {
-            return true;
-        }
-
-        var normalized = NormalizeGamePath(gamePath);
-        if (normalized.Contains("/hair/", StringComparison.Ordinal))
-        {
-            return false;
-        }
-
-        if (normalized.Contains("/chara/equipment/", StringComparison.Ordinal))
-        {
-            return _performanceConfigService.Current.ModelDecimationAllowClothing;
-        }
-
-        if (normalized.Contains("/chara/accessory/", StringComparison.Ordinal))
-        {
-            return _performanceConfigService.Current.ModelDecimationAllowAccessories;
-        }
-
-        if (normalized.Contains("/chara/human/", StringComparison.Ordinal))
-        {
-            if (normalized.Contains("/body/", StringComparison.Ordinal))
-            {
-                return _performanceConfigService.Current.ModelDecimationAllowBody;
-            }
-
-            if (normalized.Contains("/face/", StringComparison.Ordinal) || normalized.Contains("/head/", StringComparison.Ordinal))
-            {
-                return _performanceConfigService.Current.ModelDecimationAllowFaceHead;
-            }
-
-            if (normalized.Contains("/tail/", StringComparison.Ordinal))
-            {
-                return _performanceConfigService.Current.ModelDecimationAllowTail;
-            }
-        }
-
-        return true;
-    }
-
-    private static string NormalizeGamePath(string path)
-        => path.Replace('\\', '/').ToLowerInvariant();
-
-    private bool TryGetDecimationSettings(out int triangleThreshold, out double targetRatio)
-    {
-        triangleThreshold = 15_000;
-        targetRatio = 0.8;
-
-        var config = _performanceConfigService.Current;
-        if (!config.EnableModelDecimation)
-        {
-            return false;
-        }
-
-        triangleThreshold = Math.Max(0, config.ModelDecimationTriangleThreshold);
-        targetRatio = config.ModelDecimationTargetRatio;
-        if (double.IsNaN(targetRatio) || double.IsInfinity(targetRatio))
-        {
-            return false;
-        }
-
-        targetRatio = Math.Clamp(targetRatio, MinTargetRatio, MaxTargetRatio);
-        return true;
-    }
-
-    private string? GetExistingDecimatedPath(string hash)
-    {
-        var candidate = Path.Combine(GetDecimatedDirectory(), $"{hash}.mdl");
-        return File.Exists(candidate) ? candidate : null;
-    }
-
-    private string GetDecimatedDirectory()
-    {
-        var directory = Path.Combine(_configService.Current.CacheFolder, "decimated");
-        if (!Directory.Exists(directory))
-        {
-            try
-            {
-                Directory.CreateDirectory(directory);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogTrace(ex, "Failed to create decimated directory {Directory}", directory);
-            }
-        }
-
-        return directory;
-    }
-
-    private static void TryDelete(string? path)
-    {
-        if (string.IsNullOrEmpty(path))
-        {
-            return;
-        }
-
-        try
-        {
-            if (File.Exists(path))
-            {
-                File.Delete(path);
-            }
-        }
-        catch
-        {
-            // ignored
-        }
-    }
-}

LightlessSync/Services/NameplateService.cs

@@ -2,8 +2,10 @@ using Dalamud.Game.ClientState.Objects.Enums;
 using Dalamud.Game.ClientState.Objects.SubKinds;
 using Dalamud.Game.NativeWrapper;
 using Dalamud.Game.Text.SeStringHandling;
+using Dalamud.Hooking;
 using Dalamud.Plugin.Services;
 using Dalamud.Utility;
+using Dalamud.Utility.Signatures;
 using FFXIVClientStructs.FFXIV.Client.Game.Character;
 using FFXIVClientStructs.FFXIV.Client.UI;
 using FFXIVClientStructs.FFXIV.Component.GUI;
@@ -22,22 +24,27 @@ namespace LightlessSync.Services;
 /// </summary>
 public unsafe class NameplateService : DisposableMediatorSubscriberBase
 {
+    private delegate nint UpdateNameplateDelegate(RaptureAtkModule* raptureAtkModule, RaptureAtkModule.NamePlateInfo* namePlateInfo, NumberArrayData* numArray, StringArrayData* stringArray, BattleChara* battleChara, int numArrayIndex, int stringArrayIndex);
+
+    // Glyceri, Thanks :bow:
+    [Signature("40 53 55 57 41 56 48 81 EC ?? ?? ?? ?? 48 8B 84 24", DetourName = nameof(UpdateNameplateDetour))]
+    private readonly Hook<UpdateNameplateDelegate>? _nameplateHook = null;
+
     private readonly ILogger<NameplateService> _logger;
     private readonly LightlessConfigService _configService;
     private readonly IClientState _clientState;
     private readonly IGameGui _gameGui;
     private readonly IObjectTable _objectTable;
     private readonly PairUiService _pairUiService;
-    private readonly NameplateUpdateHookService _nameplateUpdateHookService;
 
     public NameplateService(ILogger<NameplateService> logger,
         LightlessConfigService configService,
         IClientState clientState,
         IGameGui gameGui,
         IObjectTable objectTable,
+        IGameInteropProvider interop,
         LightlessMediator lightlessMediator,
-        PairUiService pairUiService,
-        NameplateUpdateHookService nameplateUpdateHookService) : base(logger, lightlessMediator)
+        PairUiService pairUiService) : base(logger, lightlessMediator)
     {
         _logger = logger;
         _configService = configService;
@@ -45,18 +52,21 @@ public unsafe class NameplateService : DisposableMediatorSubscriberBase
         _gameGui = gameGui;
         _objectTable = objectTable;
         _pairUiService = pairUiService;
-        _nameplateUpdateHookService = nameplateUpdateHookService;
 
-        _nameplateUpdateHookService.NameplateUpdated += OnNameplateUpdated;
+        interop.InitializeFromAttributes(this);
+        _nameplateHook?.Enable();
         Refresh();
 
         Mediator.Subscribe<VisibilityChange>(this, (_) => Refresh());
     }
 
     /// <summary>
-    /// Nameplate update handler, triggered by the signature hook service.
+    /// Detour for the game's internal nameplate update function.
+    /// This will be called whenever the client updates any nameplate.
+    /// 
+    /// We hook into it to apply our own nameplate coloring logic via <see cref="SetNameplate"/>,
     /// </summary>
-    private void OnNameplateUpdated(RaptureAtkModule* raptureAtkModule, RaptureAtkModule.NamePlateInfo* namePlateInfo, NumberArrayData* numArray, StringArrayData* stringArray, BattleChara* battleChara, int numArrayIndex, int stringArrayIndex)
+    private nint UpdateNameplateDetour(RaptureAtkModule* raptureAtkModule, RaptureAtkModule.NamePlateInfo* namePlateInfo, NumberArrayData* numArray, StringArrayData* stringArray, BattleChara* battleChara, int numArrayIndex, int stringArrayIndex)
     {
         try
         {
@@ -64,8 +74,10 @@ public unsafe class NameplateService : DisposableMediatorSubscriberBase
         }
         catch (Exception e)
         {
-            _logger.LogError(e, "Error in NameplateService OnNameplateUpdated");
+            _logger.LogError(e, "Error in NameplateService UpdateNameplateDetour");
         }
+
+        return _nameplateHook!.Original(raptureAtkModule, namePlateInfo, numArray, stringArray, battleChara, numArrayIndex, stringArrayIndex);
     }
 
     /// <summary>
@@ -234,7 +246,7 @@ public unsafe class NameplateService : DisposableMediatorSubscriberBase
     {
         if (disposing)
         {
-            _nameplateUpdateHookService.NameplateUpdated -= OnNameplateUpdated;
+            _nameplateHook?.Dispose();
         }
 
         base.Dispose(disposing);

LightlessSync/Services/NameplateUpdateHookService.cs

@@ -1,57 +0,0 @@
-using Dalamud.Hooking;
-using Dalamud.Plugin.Services;
-using Dalamud.Utility.Signatures;
-using FFXIVClientStructs.FFXIV.Client.Game.Character;
-using FFXIVClientStructs.FFXIV.Client.UI;
-using FFXIVClientStructs.FFXIV.Component.GUI;
-using Microsoft.Extensions.Logging;
-
-namespace LightlessSync.Services;
-
-public unsafe sealed class NameplateUpdateHookService : IDisposable
-{
-    private delegate nint UpdateNameplateDelegate(RaptureAtkModule* raptureAtkModule, RaptureAtkModule.NamePlateInfo* namePlateInfo,
-        NumberArrayData* numArray, StringArrayData* stringArray, BattleChara* battleChara, int numArrayIndex, int stringArrayIndex);
-    public delegate void NameplateUpdatedHandler(RaptureAtkModule* raptureAtkModule, RaptureAtkModule.NamePlateInfo* namePlateInfo,
-        NumberArrayData* numArray, StringArrayData* stringArray, BattleChara* battleChara, int numArrayIndex, int stringArrayIndex);
-
-    // Glyceri, Thanks :bow:
-    [Signature("40 53 55 57 41 56 48 81 EC ?? ?? ?? ?? 48 8B 84 24", DetourName = nameof(UpdateNameplateDetour))]
-    private readonly Hook<UpdateNameplateDelegate>? _nameplateHook = null;
-
-    private readonly ILogger<NameplateUpdateHookService> _logger;
-
-    public NameplateUpdateHookService(ILogger<NameplateUpdateHookService> logger, IGameInteropProvider interop)
-    {
-        _logger = logger;
-
-        interop.InitializeFromAttributes(this);
-        _nameplateHook?.Enable();
-    }
-
-    public event NameplateUpdatedHandler? NameplateUpdated;
-
-    /// <summary>
-    /// Detour for the game's internal nameplate update function.
-    /// This will be called whenever the client updates any nameplate.
-    /// </summary>
-    private nint UpdateNameplateDetour(RaptureAtkModule* raptureAtkModule, RaptureAtkModule.NamePlateInfo* namePlateInfo,
-        NumberArrayData* numArray, StringArrayData* stringArray, BattleChara* battleChara, int numArrayIndex, int stringArrayIndex)
-    {
-        try
-        {
-            NameplateUpdated?.Invoke(raptureAtkModule, namePlateInfo, numArray, stringArray, battleChara, numArrayIndex, stringArrayIndex);
-        }
-        catch (Exception e)
-        {
-            _logger.LogError(e, "Error in NameplateUpdateHookService UpdateNameplateDetour");
-        }
-
-        return _nameplateHook!.Original(raptureAtkModule, namePlateInfo, numArray, stringArray, battleChara, numArrayIndex, stringArrayIndex);
-    }
-
-    public void Dispose()
-    {
-        _nameplateHook?.Dispose();
-    }
-}

LightlessSync/Services/PenumbraTempCollectionJanitor.cs

@@ -1,74 +0,0 @@
-using LightlessSync.Interop.Ipc;
-using LightlessSync.LightlessConfiguration;
-using LightlessSync.Services.Mediator;
-using Microsoft.Extensions.Logging;
-
-namespace LightlessSync.Services;
-
-public sealed class PenumbraTempCollectionJanitor : DisposableMediatorSubscriberBase
-{
-    private readonly IpcManager _ipc;
-    private readonly PenumbraJanitorConfigService _config; 
-    private int _ran;
-
-    public PenumbraTempCollectionJanitor(
-        ILogger<PenumbraTempCollectionJanitor> logger,
-        LightlessMediator mediator,
-        IpcManager ipc,
-        PenumbraJanitorConfigService config) : base(logger, mediator)
-    {
-        _ipc = ipc;
-        _config = config;
-
-        Mediator.Subscribe<PenumbraInitializedMessage>(this, _ => CleanupOrphansOnBoot());
-    }
-
-    public void Register(Guid id)
-    {
-        if (id == Guid.Empty) return;
-        if (_config.Current.OrphanableTempCollections.Add(id))
-            _config.Save();
-    }
-
-    public void Unregister(Guid id)
-    {
-        if (id == Guid.Empty) return;
-        if (_config.Current.OrphanableTempCollections.Remove(id))
-            _config.Save();
-    }
-
-    private void CleanupOrphansOnBoot()
-    {
-        if (Interlocked.Exchange(ref _ran, 1) == 1)
-            return;
-
-        if (!_ipc.Penumbra.APIAvailable)
-            return;
-
-        var ids = _config.Current.OrphanableTempCollections.ToArray();
-        if (ids.Length == 0)
-            return;
-
-        var appId = Guid.NewGuid();
-        Logger.LogInformation("Cleaning up {count} orphaned Lightless temp collections found in configuration", ids.Length);
-
-        foreach (var id in ids)
-        {
-            try
-            {
-                _ipc.Penumbra.RemoveTemporaryCollectionAsync(Logger, appId, id)
-                    .GetAwaiter().GetResult();
-            }
-            catch (Exception ex)
-            {
-                Logger.LogDebug(ex, "Failed removing orphaned temp collection {id}", id);
-            }
-        }
-
-        _config.Current.OrphanableTempCollections.Clear();
-        _config.Save();
-
-        // Notify cleanup complete
-        Mediator.Publish(new PenumbraTempCollectionsCleanedMessage());
-    }
-}

LightlessSync/Services/PlayerPerformanceService.cs

@@ -4,7 +4,6 @@ using LightlessSync.LightlessConfiguration;
 using LightlessSync.PlayerData.Pairs;
 using LightlessSync.Services.Events;
 using LightlessSync.Services.Mediator;
-using LightlessSync.Services.ModelDecimation;
 using LightlessSync.Services.TextureCompression;
 using LightlessSync.UI;
 using LightlessSync.WebAPI.Files.Models;
@@ -19,14 +18,12 @@ public class PlayerPerformanceService
     private readonly ILogger<PlayerPerformanceService> _logger;
     private readonly LightlessMediator _mediator;
     private readonly PlayerPerformanceConfigService _playerPerformanceConfigService;
-    private readonly ModelDecimationService _modelDecimationService;
     private readonly TextureDownscaleService _textureDownscaleService;
     private readonly Dictionary<string, bool> _warnedForPlayers = new(StringComparer.Ordinal);
 
     public PlayerPerformanceService(ILogger<PlayerPerformanceService> logger, LightlessMediator mediator,
         PlayerPerformanceConfigService playerPerformanceConfigService, FileCacheManager fileCacheManager,
-        XivDataAnalyzer xivDataAnalyzer, TextureDownscaleService textureDownscaleService,
-        ModelDecimationService modelDecimationService)
+        XivDataAnalyzer xivDataAnalyzer, TextureDownscaleService textureDownscaleService)
     {
         _logger = logger;
         _mediator = mediator;
@@ -34,7 +31,6 @@ public class PlayerPerformanceService
         _fileCacheManager = fileCacheManager;
         _xivDataAnalyzer = xivDataAnalyzer;
         _textureDownscaleService = textureDownscaleService;
-        _modelDecimationService = modelDecimationService;
     }
 
     public async Task<bool> CheckBothThresholds(IPairPerformanceSubject pairHandler, CharacterData charaData)
@@ -115,12 +111,10 @@ public class PlayerPerformanceService
         var config = _playerPerformanceConfigService.Current;
 
         long triUsage = 0;
-        long effectiveTriUsage = 0;
 
         if (!charaData.FileReplacements.TryGetValue(API.Data.Enum.ObjectKind.Player, out List<FileReplacementData>? playerReplacements))
         {
             pairHandler.LastAppliedDataTris = 0;
-            pairHandler.LastAppliedApproximateEffectiveTris = 0;
             return true;
         }
 
@@ -129,40 +123,14 @@ public class PlayerPerformanceService
             .Distinct(StringComparer.OrdinalIgnoreCase)
             .ToList();
 
-        var skipDecimation = config.SkipModelDecimationForPreferredPairs && pairHandler.IsDirectlyPaired && pairHandler.HasStickyPermissions;
-
         foreach (var hash in moddedModelHashes)
         {
-            var tris = await _xivDataAnalyzer.GetTrianglesByHash(hash).ConfigureAwait(false);
-            triUsage += tris;
-
-            long effectiveTris = tris;
-            var fileEntry = _fileCacheManager.GetFileCacheByHash(hash);
-            if (fileEntry != null)
-            {
-                var preferredPath = fileEntry.ResolvedFilepath;
-                if (!skipDecimation)
-                {
-                    preferredPath = _modelDecimationService.GetPreferredPath(hash, fileEntry.ResolvedFilepath);
-                }
-
-                if (!string.Equals(preferredPath, fileEntry.ResolvedFilepath, StringComparison.OrdinalIgnoreCase))
-                {
-                    var decimatedTris = await _xivDataAnalyzer.GetEffectiveTrianglesByHash(hash, preferredPath).ConfigureAwait(false);
-                    if (decimatedTris > 0)
-                    {
-                        effectiveTris = decimatedTris;
-                    }
-                }
-            }
-
-            effectiveTriUsage += effectiveTris;
+            triUsage += await _xivDataAnalyzer.GetTrianglesByHash(hash).ConfigureAwait(false);
         }
 
         pairHandler.LastAppliedDataTris = triUsage;
-        pairHandler.LastAppliedApproximateEffectiveTris = effectiveTriUsage;
 
-        _logger.LogDebug("Calculated triangle usage for {p}", pairHandler);
+        _logger.LogDebug("Calculated VRAM usage for {p}", pairHandler);
 
         // no warning of any kind on ignored pairs
         if (config.UIDsToIgnore
@@ -199,9 +167,7 @@ public class PlayerPerformanceService
     public bool ComputeAndAutoPauseOnVRAMUsageThresholds(IPairPerformanceSubject pairHandler, CharacterData charaData, List<DownloadFileTransfer> toDownloadFiles)
     {
         var config = _playerPerformanceConfigService.Current;
-        bool skipDownscale = config.SkipTextureDownscaleForPreferredPairs
-            && pairHandler.IsDirectlyPaired
-            && pairHandler.HasStickyPermissions;
+        bool skipDownscale = pairHandler.IsDirectlyPaired && pairHandler.HasStickyPermissions;
 
         long vramUsage = 0;
         long effectiveVramUsage = 0;
@@ -308,4 +274,4 @@ public class PlayerPerformanceService
 
     private static bool CheckForThreshold(bool thresholdEnabled, long threshold, long value, bool checkForPrefPerm, bool isPrefPerm) =>
         thresholdEnabled && threshold > 0 && threshold < value && ((checkForPrefPerm && isPrefPerm) || !isPrefPerm);
-}
+}

LightlessSync/Services/ServerConfiguration/ServerConfigurationManager.cs

@@ -101,9 +101,9 @@ public class ServerConfigurationManager
         }
         hasMulti = false;
 
-        var charaName = _dalamudUtil.GetPlayerName();
-        var worldId = _dalamudUtil.GetHomeWorldId();
-        var cid = _dalamudUtil.GetCID();
+        var charaName = _dalamudUtil.GetPlayerNameAsync().GetAwaiter().GetResult();
+        var worldId = _dalamudUtil.GetHomeWorldIdAsync().GetAwaiter().GetResult();
+        var cid = _dalamudUtil.GetCIDAsync().GetAwaiter().GetResult();
 
         var auth = currentServer.Authentications.FindAll(f => string.Equals(f.CharacterName, charaName) && f.WorldId == worldId);
         if (auth.Count >= 2)
@@ -148,9 +148,9 @@ public class ServerConfigurationManager
         }
         hasMulti = false;
 
-        var charaName = _dalamudUtil.GetPlayerName();
-        var worldId = _dalamudUtil.GetHomeWorldId();
-        var cid = _dalamudUtil.GetCID();
+        var charaName = _dalamudUtil.GetPlayerNameAsync().GetAwaiter().GetResult();
+        var worldId = _dalamudUtil.GetHomeWorldIdAsync().GetAwaiter().GetResult();
+        var cid = _dalamudUtil.GetCIDAsync().GetAwaiter().GetResult();
         if (!currentServer.Authentications.Any() && currentServer.SecretKeys.Any())
         {
             currentServer.Authentications.Add(new Authentication()
@@ -268,16 +268,16 @@ public class ServerConfigurationManager
     {
         if (serverSelectionIndex == -1) serverSelectionIndex = CurrentServerIndex;
         var server = GetServerByIndex(serverSelectionIndex);
-        if (server.Authentications.Exists(c => string.Equals(c.CharacterName, _dalamudUtil.GetPlayerName(), StringComparison.Ordinal)
-                && c.WorldId == _dalamudUtil.GetHomeWorldId()))
+        if (server.Authentications.Exists(c => string.Equals(c.CharacterName, _dalamudUtil.GetPlayerNameAsync().GetAwaiter().GetResult(), StringComparison.Ordinal)
+                && c.WorldId == _dalamudUtil.GetHomeWorldIdAsync().GetAwaiter().GetResult()))
             return;
 
         server.Authentications.Add(new Authentication()
         {
-            CharacterName = _dalamudUtil.GetPlayerName(),
-            WorldId = _dalamudUtil.GetHomeWorldId(),
+            CharacterName = _dalamudUtil.GetPlayerNameAsync().GetAwaiter().GetResult(),
+            WorldId = _dalamudUtil.GetHomeWorldIdAsync().GetAwaiter().GetResult(),
             SecretKeyIdx = !server.UseOAuth2 ? server.SecretKeys.Last().Key : -1,
-            LastSeenCID = _dalamudUtil.GetCID()
+            LastSeenCID = _dalamudUtil.GetCIDAsync().GetAwaiter().GetResult()
         });
         Save();
     }

LightlessSync/Services/TextureCompression/TextureDownscaleService.cs

@@ -77,39 +77,16 @@ public sealed class TextureDownscaleService
     }
 
     public void ScheduleDownscale(string hash, string filePath, TextureMapKind mapKind)
-        => ScheduleDownscale(hash, filePath, () => mapKind);
-
-    public void ScheduleDownscale(string hash, string filePath, Func<TextureMapKind> mapKindFactory)
     {
         if (!filePath.EndsWith(".tex", StringComparison.OrdinalIgnoreCase)) return;
         if (_activeJobs.ContainsKey(hash)) return;
 
         _activeJobs[hash] = Task.Run(async () =>
         {
-            TextureMapKind mapKind;
-            try
-            {
-                mapKind = mapKindFactory();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning(ex, "Failed to determine texture map kind for {Hash}; skipping downscale", hash);
-                return;
-            }
-
             await DownscaleInternalAsync(hash, filePath, mapKind).ConfigureAwait(false);
         }, CancellationToken.None);
     }
 
-    public bool ShouldScheduleDownscale(string filePath)
-    {
-        if (!filePath.EndsWith(".tex", StringComparison.OrdinalIgnoreCase))
-            return false;
-
-        var performanceConfig = _playerPerformanceConfigService.Current;
-        return performanceConfig.EnableNonIndexTextureMipTrim || performanceConfig.EnableIndexTextureDownscale;
-    }
-
     public string GetPreferredPath(string hash, string originalPath)
     {
         if (_downscaledPaths.TryGetValue(hash, out var existing) && File.Exists(existing))
@@ -678,7 +655,7 @@ public sealed class TextureDownscaleService
 
             if (!string.Equals(cacheEntry.PrefixedFilePath, prefixed, StringComparison.OrdinalIgnoreCase))
             {
-                _fileCacheManager.RemoveHashedFile(cacheEntry.Hash, cacheEntry.PrefixedFilePath, removeDerivedFiles: false);
+                _fileCacheManager.RemoveHashedFile(cacheEntry.Hash, cacheEntry.PrefixedFilePath);
             }
 
             _fileCacheManager.UpdateHashedFile(replacement, computeProperties: false);

LightlessSync/Services/TextureCompression/TextureMetadataHelper.cs

@@ -126,11 +126,11 @@ public sealed class TextureMetadataHelper
     private const string TextureSegment = "/texture/";
     private const string MaterialSegment = "/material/";
 
-    private const uint NormalSamplerId = ShpkFile.NormalSamplerId;
-    private const uint IndexSamplerId = ShpkFile.IndexSamplerId;
-    private const uint SpecularSamplerId = ShpkFile.SpecularSamplerId;
-    private const uint DiffuseSamplerId = ShpkFile.DiffuseSamplerId;
-    private const uint MaskSamplerId = ShpkFile.MaskSamplerId;
+    private const uint NormalSamplerId = 0x0C5EC1F1u;
+    private const uint IndexSamplerId = 0x565F8FD8u;
+    private const uint SpecularSamplerId = 0x2B99E025u;
+    private const uint DiffuseSamplerId = 0x115306BEu;
+    private const uint MaskSamplerId = 0x8A4E82B6u;
 
     public TextureMetadataHelper(ILogger<TextureMetadataHelper> logger, IDataManager dataManager)
     {
@@ -394,21 +394,6 @@ public sealed class TextureMetadataHelper
         if (string.IsNullOrEmpty(fileNameWithExtension) && string.IsNullOrEmpty(fileNameWithoutExtension))
             return TextureMapKind.Unknown;
 
-        if (normalized.Contains("/eye/eyelids_shadow.tex", StringComparison.Ordinal))
-            return TextureMapKind.Normal;
-
-        if (normalized.Contains("/ui/map/", StringComparison.Ordinal) && !string.IsNullOrEmpty(fileNameWithoutExtension))
-        {
-            if (fileNameWithoutExtension.EndsWith("m_m", StringComparison.Ordinal)
-                || fileNameWithoutExtension.EndsWith("m_s", StringComparison.Ordinal))
-                return TextureMapKind.Mask;
-
-            if (fileNameWithoutExtension.EndsWith("_m", StringComparison.Ordinal)
-                || fileNameWithoutExtension.EndsWith("_s", StringComparison.Ordinal)
-                || fileNameWithoutExtension.EndsWith("d", StringComparison.Ordinal))
-                return TextureMapKind.Diffuse;
-        }
-
         foreach (var (kind, token) in MapTokens)
         {
             if (!string.IsNullOrEmpty(fileNameWithExtension) &&
@@ -578,16 +563,7 @@ public sealed class TextureMetadataHelper
 
         var normalized = format.ToUpperInvariant();
         return normalized.Contains("A8", StringComparison.Ordinal)
-            || normalized.Contains("A1", StringComparison.Ordinal)
-            || normalized.Contains("A4", StringComparison.Ordinal)
-            || normalized.Contains("A16", StringComparison.Ordinal)
-            || normalized.Contains("A32", StringComparison.Ordinal)
             || normalized.Contains("ARGB", StringComparison.Ordinal)
-            || normalized.Contains("RGBA", StringComparison.Ordinal)
-            || normalized.Contains("BGRA", StringComparison.Ordinal)
-            || normalized.Contains("DXT3", StringComparison.Ordinal)
-            || normalized.Contains("DXT5", StringComparison.Ordinal)
-            || normalized.Contains("BC2", StringComparison.Ordinal)
             || normalized.Contains("BC3", StringComparison.Ordinal)
             || normalized.Contains("BC7", StringComparison.Ordinal);
     }

LightlessSync/Services/UiFactory.cs

@@ -8,7 +8,6 @@ using LightlessSync.UI.Tags;
 using LightlessSync.WebAPI;
 using LightlessSync.UI.Services;
 using Microsoft.Extensions.Logging;
-using LightlessSync.PlayerData.Factories;
 
 namespace LightlessSync.Services;
 
@@ -24,7 +23,6 @@ public class UiFactory
     private readonly PerformanceCollectorService _performanceCollectorService;
     private readonly ProfileTagService _profileTagService;
     private readonly DalamudUtilService _dalamudUtilService;
-    private readonly PairFactory _pairFactory;
 
     public UiFactory(
         ILoggerFactory loggerFactory,
@@ -36,8 +34,7 @@ public class UiFactory
         LightlessProfileManager lightlessProfileManager,
         PerformanceCollectorService performanceCollectorService,
         ProfileTagService profileTagService,
-        DalamudUtilService dalamudUtilService,
-        PairFactory pairFactory)
+        DalamudUtilService dalamudUtilService)
     {
         _loggerFactory = loggerFactory;
         _lightlessMediator = lightlessMediator;
@@ -49,7 +46,6 @@ public class UiFactory
         _performanceCollectorService = performanceCollectorService;
         _profileTagService = profileTagService;
         _dalamudUtilService = dalamudUtilService;
-        _pairFactory = pairFactory;
     }
 
     public SyncshellAdminUI CreateSyncshellAdminUi(GroupFullInfoDto dto)
@@ -62,8 +58,7 @@ public class UiFactory
             _pairUiService,
             dto,
             _performanceCollectorService,
-            _lightlessProfileManager,
-            _pairFactory);
+            _lightlessProfileManager);
     }
 
     public StandaloneProfileUi CreateStandaloneProfileUi(Pair pair)
@@ -110,7 +105,6 @@ public class UiFactory
             groupData: groupData,
             isLightfinderContext: isLightfinderContext,
             lightfinderCid: lightfinderCid,
-            performanceCollector: _performanceCollectorService,
-            _apiController);
+            performanceCollector: _performanceCollectorService);
     }
 }

LightlessSync/Services/XivDataAnalyzer.cs

@@ -1,30 +1,23 @@
 using FFXIVClientStructs.FFXIV.Client.Game.Character;
 using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
-using FFXIVClientStructs.Havok.Common.Serialize.Resource;
 using FFXIVClientStructs.Havok.Animation;
 using FFXIVClientStructs.Havok.Common.Base.Types;
-using FFXIVClientStructs.Havok.Common.Serialize.Resource;
 using FFXIVClientStructs.Havok.Common.Serialize.Util;
 using LightlessSync.FileCache;
 using LightlessSync.Interop.GameModel;
 using LightlessSync.LightlessConfiguration;
-using LightlessSync.PlayerData.Factories;
 using LightlessSync.PlayerData.Handlers;
 using Microsoft.Extensions.Logging;
-using OtterGui.Text.EndObjects;
-using System.Collections.Concurrent;
 using System.Runtime.InteropServices;
-using System.Text.RegularExpressions;
 
 namespace LightlessSync.Services;
 
-public sealed partial class XivDataAnalyzer
+public sealed class XivDataAnalyzer
 {
     private readonly ILogger<XivDataAnalyzer> _logger;
     private readonly FileCacheManager _fileCacheManager;
     private readonly XivDataStorageService _configService;
     private readonly List<string> _failedCalculatedTris = [];
-    private readonly List<string> _failedCalculatedEffectiveTris = [];
 
     public XivDataAnalyzer(ILogger<XivDataAnalyzer> logger, FileCacheManager fileCacheManager,
         XivDataStorageService configService)
@@ -36,435 +29,127 @@ public sealed partial class XivDataAnalyzer
 
     public unsafe Dictionary<string, List<ushort>>? GetSkeletonBoneIndices(GameObjectHandler handler)
     {
-        if (handler is null || handler.Address == nint.Zero)
-            return null;
-
-        Dictionary<string, HashSet<ushort>> sets = new(StringComparer.OrdinalIgnoreCase);
-
+        if (handler.Address == nint.Zero) return null;
+        var chara = (CharacterBase*)(((Character*)handler.Address)->GameObject.DrawObject);
+        if (chara->GetModelType() != CharacterBase.ModelType.Human) return null;
+        var resHandles = chara->Skeleton->SkeletonResourceHandles;
+        Dictionary<string, List<ushort>> outputIndices = [];
         try
         {
-            var drawObject = ((Character*)handler.Address)->GameObject.DrawObject;
-            if (drawObject == null)
-                return null;
-
-            var chara = (CharacterBase*)drawObject;
-            if (chara->GetModelType() != CharacterBase.ModelType.Human)
-                return null;
-
-            var skeleton = chara->Skeleton;
-            if (skeleton == null)
-                return null;
-
-            var resHandles = skeleton->SkeletonResourceHandles;
-            var partialCount = skeleton->PartialSkeletonCount;
-            if (partialCount <= 0)
-                return null;
-
-            for (int i = 0; i < partialCount; i++)
+            for (int i = 0; i < chara->Skeleton->PartialSkeletonCount; i++)
             {
                 var handle = *(resHandles + i);
-                if ((nint)handle == nint.Zero)
-                    continue;
-
-                if (handle->FileName.Length > 1024)
-                    continue;
-
-                var rawName = handle->FileName.ToString();
-                if (string.IsNullOrWhiteSpace(rawName))
-                    continue;
-
-                var skeletonKey = CanonicalizeSkeletonKey(rawName);
-                if (string.IsNullOrEmpty(skeletonKey))
-                    continue;
-
-                var boneCount = handle->BoneCount;
-                if (boneCount == 0)
-                    continue;
-
-                var havokSkel = handle->HavokSkeleton;
-                if ((nint)havokSkel == nint.Zero)
-                    continue;
-
-                if (!sets.TryGetValue(skeletonKey, out var set))
+                _logger.LogTrace("Iterating over SkeletonResourceHandle #{i}:{x}", i, ((nint)handle).ToString("X"));
+                if ((nint)handle == nint.Zero) continue;
+                var curBones = handle->BoneCount;
+                // this is unrealistic, the filename shouldn't ever be that long
+                if (handle->FileName.Length > 1024) continue;
+                var skeletonName = handle->FileName.ToString();
+                if (string.IsNullOrEmpty(skeletonName)) continue;
+                outputIndices[skeletonName] = [];
+                for (ushort boneIdx = 0; boneIdx < curBones; boneIdx++)
                 {
-                    set = [];
-                    sets[skeletonKey] = set;
+                    var boneName = handle->HavokSkeleton->Bones[boneIdx].Name.String;
+                    if (boneName == null) continue;
+                    outputIndices[skeletonName].Add((ushort)(boneIdx + 1));
                 }
-
-                uint maxExclusive = boneCount;
-                uint ushortExclusive = (uint)ushort.MaxValue + 1u;
-                if (maxExclusive > ushortExclusive)
-                    maxExclusive = ushortExclusive;
-
-                for (uint boneIdx = 0; boneIdx < maxExclusive; boneIdx++)
-                {
-                    var name = havokSkel->Bones[boneIdx].Name.String;
-                    if (name == null)
-                        continue;
-
-                    set.Add((ushort)boneIdx);
-                }
-
-                _logger.LogTrace("Local skeleton raw file='{raw}', key='{key}', boneCount={count}",
-                    rawName, skeletonKey, boneCount);
             }
         }
         catch (Exception ex)
         {
             _logger.LogWarning(ex, "Could not process skeleton data");
-            return null;
         }
 
-        if (sets.Count == 0)
-            return null;
-
-        var output = new Dictionary<string, List<ushort>>(sets.Count, StringComparer.OrdinalIgnoreCase);
-        foreach (var (key, set) in sets)
-        {
-            if (set.Count == 0)
-                continue;
-
-            var list = set.ToList();
-            list.Sort();
-            output[key] = list;
-        }
-
-        return (output.Count != 0 && output.Values.All(v => v.Count > 0)) ? output : null;
+        return (outputIndices.Count != 0 && outputIndices.Values.All(u => u.Count > 0)) ? outputIndices : null;
     }
 
-    public static byte[]? ReadHavokBytesFromPap(string papPath)
+    public unsafe Dictionary<string, List<ushort>>? GetBoneIndicesFromPap(string hash)
     {
-        using var fs = File.Open(papPath, FileMode.Open, FileAccess.Read, FileShare.Read);
-        using var reader = new BinaryReader(fs);
+        if (_configService.Current.BonesDictionary.TryGetValue(hash, out var bones)) return bones;
 
-        _ = reader.ReadInt32();
-        _ = reader.ReadInt32();
-        _ = reader.ReadInt16();
-        _ = reader.ReadInt16();
+        var cacheEntity = _fileCacheManager.GetFileCacheByHash(hash);
+        if (cacheEntity == null) return null;
 
-        var type = reader.ReadByte();
-        if (type != 0) return null;
+        using BinaryReader reader = new(File.Open(cacheEntity.ResolvedFilepath, FileMode.Open, FileAccess.Read, FileShare.Read));
 
-        _ = reader.ReadByte();
-        _ = reader.ReadInt32();
+        // most of this shit is from vfxeditor, surely nothing will change in the pap format :copium:
+        reader.ReadInt32(); // ignore
+        reader.ReadInt32(); // ignore
+        reader.ReadInt16(); // read 2 (num animations)
+        reader.ReadInt16(); // read 2 (modelid)
+        var type = reader.ReadByte();// read 1 (type)
+        if (type != 0) return null; // it's not human, just ignore it, whatever
 
+        reader.ReadByte(); // read 1 (variant)
+        reader.ReadInt32(); // ignore
         var havokPosition = reader.ReadInt32();
         var footerPosition = reader.ReadInt32();
+        var havokDataSize = footerPosition - havokPosition;
+        reader.BaseStream.Position = havokPosition;
+        var havokData = reader.ReadBytes(havokDataSize);
+        if (havokData.Length <= 8) return null; // no havok data
 
-        if (havokPosition <= 0 || footerPosition <= havokPosition || footerPosition > fs.Length)
-            return null;
-
-        var sizeLong = (long)footerPosition - havokPosition;
-        if (sizeLong <= 8 || sizeLong > int.MaxValue)
-            return null;
-
-        var size = (int)sizeLong;
-
-        fs.Position = havokPosition;
-        var bytes = reader.ReadBytes(size);
-        return bytes.Length > 8 ? bytes : null;
-    }
-
-    public unsafe Dictionary<string, List<ushort>>? ParseHavokBytesOnFrameworkThread(
-    byte[] havokData,
-    string hash,
-    bool persistToConfig)
-    {
-        var tempSets = new Dictionary<string, HashSet<ushort>>(StringComparer.OrdinalIgnoreCase);
-
-        var tempHkxPath = Path.Combine(Path.GetTempPath(), $"lightless_{Guid.NewGuid():N}.hkx");
-        IntPtr pathAnsi = IntPtr.Zero;
+        var output = new Dictionary<string, List<ushort>>(StringComparer.OrdinalIgnoreCase);
+        var tempHavokDataPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()) + ".hkx";
+        var tempHavokDataPathAnsi = Marshal.StringToHGlobalAnsi(tempHavokDataPath);
 
         try
         {
-            File.WriteAllBytes(tempHkxPath, havokData);
+            File.WriteAllBytes(tempHavokDataPath, havokData);
 
-            pathAnsi = Marshal.StringToHGlobalAnsi(tempHkxPath);
-
-            hkSerializeUtil.LoadOptions loadOptions = default;
-            loadOptions.TypeInfoRegistry = hkBuiltinTypeRegistry.Instance()->GetTypeInfoRegistry();
-            loadOptions.ClassNameRegistry = hkBuiltinTypeRegistry.Instance()->GetClassNameRegistry();
-            loadOptions.Flags = new hkFlags<hkSerializeUtil.LoadOptionBits, int>
+            var loadoptions = stackalloc hkSerializeUtil.LoadOptions[1];
+            loadoptions->TypeInfoRegistry = hkBuiltinTypeRegistry.Instance()->GetTypeInfoRegistry();
+            loadoptions->ClassNameRegistry = hkBuiltinTypeRegistry.Instance()->GetClassNameRegistry();
+            loadoptions->Flags = new hkFlags<hkSerializeUtil.LoadOptionBits, int>
             {
-                Storage = (int)hkSerializeUtil.LoadOptionBits.Default
+                Storage = (int)(hkSerializeUtil.LoadOptionBits.Default)
             };
 
-            hkSerializeUtil.LoadOptions* pOpts = &loadOptions;
-
-            var resource = hkSerializeUtil.LoadFromFile((byte*)pathAnsi, errorResult: null, pOpts);
+            var resource = hkSerializeUtil.LoadFromFile((byte*)tempHavokDataPathAnsi, null, loadoptions);
             if (resource == null)
-                return null;
+            {
+                throw new InvalidOperationException("Resource was null after loading");
+            }
 
             var rootLevelName = @"hkRootLevelContainer"u8;
             fixed (byte* n1 = rootLevelName)
             {
-                var container = (hkRootLevelContainer*)resource->GetContentsPointer(
-                    n1, hkBuiltinTypeRegistry.Instance()->GetTypeInfoRegistry());
-
-                if (container == null) return null;
-
+                var container = (hkRootLevelContainer*)resource->GetContentsPointer(n1, hkBuiltinTypeRegistry.Instance()->GetTypeInfoRegistry());
                 var animationName = @"hkaAnimationContainer"u8;
                 fixed (byte* n2 = animationName)
                 {
                     var animContainer = (hkaAnimationContainer*)container->findObjectByName(n2, null);
-                    if (animContainer == null) return null;
-
                     for (int i = 0; i < animContainer->Bindings.Length; i++)
                     {
                         var binding = animContainer->Bindings[i].ptr;
-                        if (binding == null) continue;
-
-                        var rawSkel = binding->OriginalSkeletonName.String;
-                        var skeletonKey = CanonicalizeSkeletonKey(rawSkel);
-                        if (string.IsNullOrEmpty(skeletonKey)) continue;
-
                         var boneTransform = binding->TransformTrackToBoneIndices;
-                        if (boneTransform.Length <= 0) continue;
-
-                        if (!tempSets.TryGetValue(skeletonKey, out var set))
-                            tempSets[skeletonKey] = set = [];
-
+                        string name = binding->OriginalSkeletonName.String! + "_" + i;
+                        output[name] = [];
                         for (int boneIdx = 0; boneIdx < boneTransform.Length; boneIdx++)
                         {
-                            var v = boneTransform[boneIdx];
-                            if (v < 0) continue;
-                            set.Add((ushort)v);
+                            output[name].Add((ushort)boneTransform[boneIdx]);
                         }
+                        output[name].Sort();
                     }
+
                 }
             }
         }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "Could not load havok file in {path}", tempHavokDataPath);
+        }
         finally
         {
-            if (pathAnsi != IntPtr.Zero)
-                Marshal.FreeHGlobal(pathAnsi);
-
-            try { if (File.Exists(tempHkxPath)) File.Delete(tempHkxPath); }
-            catch { /* ignore */ }
+            Marshal.FreeHGlobal(tempHavokDataPathAnsi);
+            File.Delete(tempHavokDataPath);
         }
 
-        if (tempSets.Count == 0) return null;
-
-        var output = new Dictionary<string, List<ushort>>(tempSets.Count, StringComparer.OrdinalIgnoreCase);
-        foreach (var (key, set) in tempSets)
-        {
-            if (set.Count == 0) continue;
-            var list = set.ToList();
-            list.Sort();
-            output[key] = list;
-        }
-
-        if (output.Count == 0) return null;
-
         _configService.Current.BonesDictionary[hash] = output;
-        if (persistToConfig) _configService.Save();
-
+        _configService.Save();
         return output;
     }
 
-    public static string CanonicalizeSkeletonKey(string? raw)
-    {
-        if (string.IsNullOrWhiteSpace(raw))
-            return string.Empty;
-
-        var s = raw.Replace('\\', '/').Trim();
-
-        var underscore = s.LastIndexOf('_');
-        if (underscore > 0 && underscore + 1 < s.Length && char.IsDigit(s[underscore + 1]))
-            s = s[..underscore];
-
-        if (s.StartsWith("skeleton", StringComparison.OrdinalIgnoreCase))
-            return "skeleton";
-
-        var m = _bucketPathRegex.Match(s);
-        if (m.Success)
-            return m.Groups["bucket"].Value.ToLowerInvariant();
-
-        m = _bucketSklRegex.Match(s);
-        if (m.Success)
-            return m.Groups["bucket"].Value.ToLowerInvariant();
-
-        m = _bucketLooseRegex.Match(s);
-        if (m.Success)
-            return m.Groups["bucket"].Value.ToLowerInvariant();
-
-        return string.Empty;
-    }
-
-    public static bool ContainsIndexCompat(
-        HashSet<ushort> available,
-        ushort idx,
-        bool papLikelyOneBased,
-        bool allowOneBasedShift,
-        bool allowNeighborTolerance)
-    {
-        Span<ushort> candidates = stackalloc ushort[2];
-        int count = 0;
-
-        candidates[count++] = idx;
-
-        if (allowOneBasedShift && papLikelyOneBased && idx > 0)
-            candidates[count++] = (ushort)(idx - 1);
-
-        for (int i = 0; i < count; i++)
-        {
-            var c = candidates[i];
-
-            if (available.Contains(c))
-                return true;
-
-            if (allowNeighborTolerance)
-            {
-                if (c > 0 && available.Contains((ushort)(c - 1)))
-                    return true;
-
-                if (c < ushort.MaxValue && available.Contains((ushort)(c + 1)))
-                    return true;
-            }
-        }
-
-        return false;
-    }
-
-    public static bool IsPapCompatible(
-        IReadOnlyDictionary<string, HashSet<ushort>> localBoneSets,
-        IReadOnlyDictionary<string, List<ushort>> papBoneIndices,
-        AnimationValidationMode mode,
-        bool allowOneBasedShift,
-        bool allowNeighborTolerance,
-        out string reason)
-    {
-        reason = string.Empty;
-
-        if (mode == AnimationValidationMode.Unsafe)
-            return true;
-
-        var papByBucket = new Dictionary<string, List<ushort>>(StringComparer.OrdinalIgnoreCase);
-
-        foreach (var (rawKey, list) in papBoneIndices)
-        {
-            var key = CanonicalizeSkeletonKey(rawKey);
-            if (string.IsNullOrEmpty(key))
-                continue;
-
-            if (string.Equals(key, "skeleton", StringComparison.OrdinalIgnoreCase))
-                key = "__any__";
-
-            if (!papByBucket.TryGetValue(key, out var acc))
-                papByBucket[key] = acc = [];
-
-            if (list is { Count: > 0 })
-                acc.AddRange(list);
-        }
-
-        foreach (var k in papByBucket.Keys.ToList())
-            papByBucket[k] = papByBucket[k].Distinct().ToList();
-
-        if (papByBucket.Count == 0)
-        {
-            reason = "No skeleton bucket bindings found in the PAP";
-            return false;
-        }
-
-        static bool AllIndicesOk(
-            HashSet<ushort> available,
-            List<ushort> indices,
-            bool papLikelyOneBased,
-            bool allowOneBasedShift,
-            bool allowNeighborTolerance,
-            out ushort missing)
-        {
-            foreach (var idx in indices)
-            {
-                if (!ContainsIndexCompat(available, idx, papLikelyOneBased, allowOneBasedShift, allowNeighborTolerance))
-                {
-                    missing = idx;
-                    return false;
-                }
-            }
-
-            missing = 0;
-            return true;
-        }
-
-        foreach (var (bucket, indices) in papByBucket)
-        {
-            if (indices.Count == 0)
-                continue;
-
-            bool has0 = false, has1 = false;
-            ushort min = ushort.MaxValue;
-            foreach (var v in indices)
-            {
-                if (v == 0) has0 = true;
-                if (v == 1) has1 = true;
-                if (v < min) min = v;
-            }
-            bool papLikelyOneBased = allowOneBasedShift && (min == 1) && has1 && !has0;
-
-            if (string.Equals(bucket, "__any__", StringComparison.OrdinalIgnoreCase))
-            {
-                foreach (var (lk, ls) in localBoneSets)
-                {
-                    if (AllIndicesOk(ls, indices, papLikelyOneBased, allowOneBasedShift, allowNeighborTolerance, out _))
-                        goto nextBucket; 
-                }
-
-                reason = $"No compatible local skeleton bucket for generic PAP skeleton '{bucket}'. Local buckets: {string.Join(", ", localBoneSets.Keys)}";
-                return false;
-            }
-
-            if (!localBoneSets.TryGetValue(bucket, out var available))
-            {
-                reason = $"Missing skeleton bucket '{bucket}' on local actor.";
-                return false;
-            }
-
-            if (!AllIndicesOk(available, indices, papLikelyOneBased, allowOneBasedShift, allowNeighborTolerance, out var missing))
-            {
-                reason = $"No compatible local skeleton for PAP '{bucket}': missing bone index {missing}.";
-                return false;
-            }
-
-        nextBucket:
-            ;
-        }
-
-        return true;
-    }
-
-    public void DumpLocalSkeletonIndices(GameObjectHandler handler, string? filter = null)
-    {
-        var skels = GetSkeletonBoneIndices(handler);
-        if (skels == null)
-        {
-            _logger.LogTrace("DumpLocalSkeletonIndices: local skeleton indices are null or not found");
-            return;
-        }
-        
-        var keys = skels.Keys
-            .Order(StringComparer.OrdinalIgnoreCase)
-            .ToArray();
-
-        _logger.LogTrace("Local skeleton indices found ({count}): {keys}",
-            keys.Length,
-            string.Join(", ", keys));
-
-        if (!string.IsNullOrWhiteSpace(filter))
-        {
-            var hits = keys.Where(k =>
-                k.Equals(filter, StringComparison.OrdinalIgnoreCase) ||
-                k.StartsWith(filter + "_", StringComparison.OrdinalIgnoreCase) ||
-                 filter.StartsWith(k + "_", StringComparison.OrdinalIgnoreCase) ||
-                k.Contains(filter, StringComparison.OrdinalIgnoreCase))
-                .ToArray();
-
-            _logger.LogTrace("Matches found for '{filter}': {hits}",
-                filter,
-                hits.Length == 0 ? "<none>" : string.Join(", ", hits));
-        }
-    }
-
     public async Task<long> GetTrianglesByHash(string hash)
     {
         if (_configService.Current.TriangleDictionary.TryGetValue(hash, out var cachedTris) && cachedTris > 0)
@@ -477,41 +162,16 @@ public sealed partial class XivDataAnalyzer
         if (path == null || !path.ResolvedFilepath.EndsWith(".mdl", StringComparison.OrdinalIgnoreCase))
             return 0;
 
-        return CalculateTrianglesFromPath(hash, path.ResolvedFilepath, _configService.Current.TriangleDictionary, _failedCalculatedTris);
-    }
+        var filePath = path.ResolvedFilepath;
 
-    public async Task<long> GetEffectiveTrianglesByHash(string hash, string filePath)
-    {
-        if (_configService.Current.EffectiveTriangleDictionary.TryGetValue(hash, out var cachedTris) && cachedTris > 0)
-            return cachedTris;
-
-        if (_failedCalculatedEffectiveTris.Contains(hash, StringComparer.Ordinal))
-            return 0;
-
-        if (string.IsNullOrEmpty(filePath)
-            || !filePath.EndsWith(".mdl", StringComparison.OrdinalIgnoreCase)
-            || !File.Exists(filePath))
-        {
-            return 0;
-        }
-
-        return CalculateTrianglesFromPath(hash, filePath, _configService.Current.EffectiveTriangleDictionary, _failedCalculatedEffectiveTris);
-    }
-
-    private long CalculateTrianglesFromPath(
-        string hash,
-        string filePath,
-        ConcurrentDictionary<string, long> cache,
-        List<string> failedList)
-    {
         try
         {
             _logger.LogDebug("Detected Model File {path}, calculating Tris", filePath);
             var file = new MdlFile(filePath);
             if (file.LodCount <= 0)
             {
-                failedList.Add(hash);
-                cache[hash] = 0;
+                _failedCalculatedTris.Add(hash);
+                _configService.Current.TriangleDictionary[hash] = 0;
                 _configService.Save();
                 return 0;
             }
@@ -535,7 +195,7 @@ public sealed partial class XivDataAnalyzer
                 if (tris > 0)
                 {
                     _logger.LogDebug("TriAnalysis: {filePath} => {tris} triangles", filePath, tris);
-                    cache[hash] = tris;
+                    _configService.Current.TriangleDictionary[hash] = tris;
                     _configService.Save();
                     break;
                 }
@@ -545,30 +205,11 @@ public sealed partial class XivDataAnalyzer
         }
         catch (Exception e)
         {
-            failedList.Add(hash);
-            cache[hash] = 0;
+            _failedCalculatedTris.Add(hash);
+            _configService.Current.TriangleDictionary[hash] = 0;
             _configService.Save();
             _logger.LogWarning(e, "Could not parse file {file}", filePath);
             return 0;
         }
     }
-
-    // Regexes for canonicalizing skeleton keys
-    private static readonly Regex _bucketPathRegex =
-    BucketRegex();
-
-    private static readonly Regex _bucketSklRegex =
-        SklRegex();
-
-    private static readonly Regex _bucketLooseRegex =
-        LooseBucketRegex();
-
-    [GeneratedRegex(@"(?i)(?:^|/)(?<bucket>c\d{4})(?:/|$)", RegexOptions.Compiled, "en-NL")]
-    private static partial Regex BucketRegex();
-
-    [GeneratedRegex(@"(?i)\bskl_(?<bucket>c\d{4})[a-z]\d{4}\b", RegexOptions.Compiled, "en-NL")]
-    private static partial Regex SklRegex();
-
-    [GeneratedRegex(@"(?i)(?<![a-z0-9])(?<bucket>c\d{4})(?!\d)", RegexOptions.Compiled, "en-NL")]
-    private static partial Regex LooseBucketRegex();
 }

LightlessSync/ThirdParty/MeshDecimator/Algorithms/DecimationAlgorithm.cs

@@ -1,169 +0,0 @@
-#region License
-/*
-MIT License
-
-Copyright(c) 2017-2018 Mattias Edlund
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-#endregion
-
-using System;
-using Microsoft.Extensions.Logging;
-
-namespace MeshDecimator.Algorithms
-{
-    /// <summary>
-    /// A decimation algorithm.
-    /// </summary>
-    public abstract class DecimationAlgorithm
-    {
-        #region Delegates
-        /// <summary>
-        /// A callback for decimation status reports.
-        /// </summary>
-        /// <param name="iteration">The current iteration, starting at zero.</param>
-        /// <param name="originalTris">The original count of triangles.</param>
-        /// <param name="currentTris">The current count of triangles.</param>
-        /// <param name="targetTris">The target count of triangles.</param>
-        public delegate void StatusReportCallback(int iteration, int originalTris, int currentTris, int targetTris);
-        #endregion
-
-        #region Fields
-        private bool preserveBorders = false;
-        private int maxVertexCount = 0;
-        private bool verbose = false;
-
-        private StatusReportCallback statusReportInvoker = null;
-        #endregion
-
-        #region Properties
-        /// <summary>
-        /// Gets or sets if borders should be kept.
-        /// Default value: false
-        /// </summary>
-        [Obsolete("Use the 'DecimationAlgorithm.PreserveBorders' property instead.", false)]
-        public bool KeepBorders
-        {
-            get { return preserveBorders; }
-            set { preserveBorders = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets if borders should be preserved.
-        /// Default value: false
-        /// </summary>
-        public bool PreserveBorders
-        {
-            get { return preserveBorders; }
-            set { preserveBorders = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets if linked vertices should be kept.
-        /// Default value: false
-        /// </summary>
-        [Obsolete("This feature has been removed, for more details why please read the readme.", true)]
-        public bool KeepLinkedVertices
-        {
-            get { return false; }
-            set { }
-        }
-
-        /// <summary>
-        /// Gets or sets the maximum vertex count. Set to zero for no limitation.
-        /// Default value: 0 (no limitation)
-        /// </summary>
-        public int MaxVertexCount
-        {
-            get { return maxVertexCount; }
-            set { maxVertexCount = Math.MathHelper.Max(value, 0); }
-        }
-
-        /// <summary>
-        /// Gets or sets if verbose information should be printed in the console.
-        /// Default value: false
-        /// </summary>
-        public bool Verbose
-        {
-            get { return verbose; }
-            set { verbose = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the logger used for diagnostics.
-        /// </summary>
-        public ILogger? Logger { get; set; }
-        #endregion
-
-        #region Events
-        /// <summary>
-        /// An event for status reports for this algorithm.
-        /// </summary>
-        public event StatusReportCallback StatusReport
-        {
-            add { statusReportInvoker += value; }
-            remove { statusReportInvoker -= value; }
-        }
-        #endregion
-
-        #region Protected Methods
-        /// <summary>
-        /// Reports the current status of the decimation.
-        /// </summary>
-        /// <param name="iteration">The current iteration, starting at zero.</param>
-        /// <param name="originalTris">The original count of triangles.</param>
-        /// <param name="currentTris">The current count of triangles.</param>
-        /// <param name="targetTris">The target count of triangles.</param>
-        protected void ReportStatus(int iteration, int originalTris, int currentTris, int targetTris)
-        {
-            var statusReportInvoker = this.statusReportInvoker;
-            if (statusReportInvoker != null)
-            {
-                statusReportInvoker.Invoke(iteration, originalTris, currentTris, targetTris);
-            }
-        }
-        #endregion
-
-        #region Public Methods
-        /// <summary>
-        /// Initializes the algorithm with the original mesh.
-        /// </summary>
-        /// <param name="mesh">The mesh.</param>
-        public abstract void Initialize(Mesh mesh);
-
-        /// <summary>
-        /// Decimates the mesh.
-        /// </summary>
-        /// <param name="targetTrisCount">The target triangle count.</param>
-        public abstract void DecimateMesh(int targetTrisCount);
-
-        /// <summary>
-        /// Decimates the mesh without losing any quality.
-        /// </summary>
-        public abstract void DecimateMeshLossless();
-
-        /// <summary>
-        /// Returns the resulting mesh.
-        /// </summary>
-        /// <returns>The resulting mesh.</returns>
-        public abstract Mesh ToMesh();
-        #endregion
-    }
-}

LightlessSync/ThirdParty/MeshDecimator/BoneWeight.cs

@@ -1,249 +0,0 @@
-#region License
-/*
-MIT License
-
-Copyright(c) 2017-2018 Mattias Edlund
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-#endregion
-
-using System;
-using MeshDecimator.Math;
-
-namespace MeshDecimator
-{
-    /// <summary>
-    /// A bone weight.
-    /// </summary>
-    public struct BoneWeight : IEquatable<BoneWeight>
-    {
-        #region Fields
-        /// <summary>
-        /// The first bone index.
-        /// </summary>
-        public int boneIndex0;
-        /// <summary>
-        /// The second bone index.
-        /// </summary>
-        public int boneIndex1;
-        /// <summary>
-        /// The third bone index.
-        /// </summary>
-        public int boneIndex2;
-        /// <summary>
-        /// The fourth bone index.
-        /// </summary>
-        public int boneIndex3;
-
-        /// <summary>
-        /// The first bone weight.
-        /// </summary>
-        public float boneWeight0;
-        /// <summary>
-        /// The second bone weight.
-        /// </summary>
-        public float boneWeight1;
-        /// <summary>
-        /// The third bone weight.
-        /// </summary>
-        public float boneWeight2;
-        /// <summary>
-        /// The fourth bone weight.
-        /// </summary>
-        public float boneWeight3;
-        #endregion
-
-        #region Constructor
-        /// <summary>
-        /// Creates a new bone weight.
-        /// </summary>
-        /// <param name="boneIndex0">The first bone index.</param>
-        /// <param name="boneIndex1">The second bone index.</param>
-        /// <param name="boneIndex2">The third bone index.</param>
-        /// <param name="boneIndex3">The fourth bone index.</param>
-        /// <param name="boneWeight0">The first bone weight.</param>
-        /// <param name="boneWeight1">The second bone weight.</param>
-        /// <param name="boneWeight2">The third bone weight.</param>
-        /// <param name="boneWeight3">The fourth bone weight.</param>
-        public BoneWeight(int boneIndex0, int boneIndex1, int boneIndex2, int boneIndex3, float boneWeight0, float boneWeight1, float boneWeight2, float boneWeight3)
-        {
-            this.boneIndex0 = boneIndex0;
-            this.boneIndex1 = boneIndex1;
-            this.boneIndex2 = boneIndex2;
-            this.boneIndex3 = boneIndex3;
-
-            this.boneWeight0 = boneWeight0;
-            this.boneWeight1 = boneWeight1;
-            this.boneWeight2 = boneWeight2;
-            this.boneWeight3 = boneWeight3;
-        }
-        #endregion
-
-        #region Operators
-        /// <summary>
-        /// Returns if two bone weights equals eachother.
-        /// </summary>
-        /// <param name="lhs">The left hand side bone weight.</param>
-        /// <param name="rhs">The right hand side bone weight.</param>
-        /// <returns>If equals.</returns>
-        public static bool operator ==(BoneWeight lhs, BoneWeight rhs)
-        {
-            return (lhs.boneIndex0 == rhs.boneIndex0 && lhs.boneIndex1 == rhs.boneIndex1 && lhs.boneIndex2 == rhs.boneIndex2 && lhs.boneIndex3 == rhs.boneIndex3 &&
-                new Vector4(lhs.boneWeight0, lhs.boneWeight1, lhs.boneWeight2, lhs.boneWeight3) == new Vector4(rhs.boneWeight0, rhs.boneWeight1, rhs.boneWeight2, rhs.boneWeight3));
-        }
-
-        /// <summary>
-        /// Returns if two bone weights don't equal eachother.
-        /// </summary>
-        /// <param name="lhs">The left hand side bone weight.</param>
-        /// <param name="rhs">The right hand side bone weight.</param>
-        /// <returns>If not equals.</returns>
-        public static bool operator !=(BoneWeight lhs, BoneWeight rhs)
-        {
-            return !(lhs == rhs);
-        }
-        #endregion
-
-        #region Private Methods
-        private void MergeBoneWeight(int boneIndex, float weight)
-        {
-            if (boneIndex == boneIndex0)
-            {
-                boneWeight0 = (boneWeight0 + weight) * 0.5f;
-            }
-            else if (boneIndex == boneIndex1)
-            {
-                boneWeight1 = (boneWeight1 + weight) * 0.5f;
-            }
-            else if (boneIndex == boneIndex2)
-            {
-                boneWeight2 = (boneWeight2 + weight) * 0.5f;
-            }
-            else if (boneIndex == boneIndex3)
-            {
-                boneWeight3 = (boneWeight3 + weight) * 0.5f;
-            }
-            else if(boneWeight0 == 0f)
-            {
-                boneIndex0 = boneIndex;
-                boneWeight0 = weight;
-            }
-            else if (boneWeight1 == 0f)
-            {
-                boneIndex1 = boneIndex;
-                boneWeight1 = weight;
-            }
-            else if (boneWeight2 == 0f)
-            {
-                boneIndex2 = boneIndex;
-                boneWeight2 = weight;
-            }
-            else if (boneWeight3 == 0f)
-            {
-                boneIndex3 = boneIndex;
-                boneWeight3 = weight;
-            }
-            Normalize();
-        }
-
-        private void Normalize()
-        {
-            float mag = (float)System.Math.Sqrt(boneWeight0 * boneWeight0 + boneWeight1 * boneWeight1 + boneWeight2 * boneWeight2 + boneWeight3 * boneWeight3);
-            if (mag > float.Epsilon)
-            {
-                boneWeight0 /= mag;
-                boneWeight1 /= mag;
-                boneWeight2 /= mag;
-                boneWeight3 /= mag;
-            }
-            else
-            {
-                boneWeight0 = boneWeight1 = boneWeight2 = boneWeight3 = 0f;
-            }
-        }
-        #endregion
-
-        #region Public Methods
-        #region Object
-        /// <summary>
-        /// Returns a hash code for this vector.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            return boneIndex0.GetHashCode() ^ boneIndex1.GetHashCode() << 2 ^ boneIndex2.GetHashCode() >> 2 ^ boneIndex3.GetHashCode() >>
-                1 ^ boneWeight0.GetHashCode() << 5 ^ boneWeight1.GetHashCode() << 4 ^ boneWeight2.GetHashCode() >> 4 ^ boneWeight3.GetHashCode() >> 3;
-        }
-
-        /// <summary>
-        /// Returns if this bone weight is equal to another object.
-        /// </summary>
-        /// <param name="obj">The other object to compare to.</param>
-        /// <returns>If equals.</returns>
-        public override bool Equals(object obj)
-        {
-            if (!(obj is BoneWeight))
-            {
-                return false;
-            }
-            BoneWeight other = (BoneWeight)obj;
-            return (boneIndex0 == other.boneIndex0 && boneIndex1 == other.boneIndex1 && boneIndex2 == other.boneIndex2 && boneIndex3 == other.boneIndex3 &&
-                boneWeight0 == other.boneWeight0 && boneWeight1 == other.boneWeight1 && boneWeight2 == other.boneWeight2 && boneWeight3 == other.boneWeight3);
-        }
-
-        /// <summary>
-        /// Returns if this bone weight is equal to another one.
-        /// </summary>
-        /// <param name="other">The other bone weight to compare to.</param>
-        /// <returns>If equals.</returns>
-        public bool Equals(BoneWeight other)
-        {
-            return (boneIndex0 == other.boneIndex0 && boneIndex1 == other.boneIndex1 && boneIndex2 == other.boneIndex2 && boneIndex3 == other.boneIndex3 &&
-                boneWeight0 == other.boneWeight0 && boneWeight1 == other.boneWeight1 && boneWeight2 == other.boneWeight2 && boneWeight3 == other.boneWeight3);
-        }
-
-        /// <summary>
-        /// Returns a nicely formatted string for this bone weight.
-        /// </summary>
-        /// <returns>The string.</returns>
-        public override string ToString()
-        {
-            return string.Format("({0}:{4:F1}, {1}:{5:F1}, {2}:{6:F1}, {3}:{7:F1})",
-                boneIndex0, boneIndex1, boneIndex2, boneIndex3, boneWeight0, boneWeight1, boneWeight2, boneWeight3);
-        }
-        #endregion
-
-        #region Static
-        /// <summary>
-        /// Merges two bone weights and stores the merged result in the first parameter.
-        /// </summary>
-        /// <param name="a">The first bone weight, also stores result.</param>
-        /// <param name="b">The second bone weight.</param>
-        public static void Merge(ref BoneWeight a, ref BoneWeight b)
-        {
-            if (b.boneWeight0 > 0f) a.MergeBoneWeight(b.boneIndex0, b.boneWeight0);
-            if (b.boneWeight1 > 0f) a.MergeBoneWeight(b.boneIndex1, b.boneWeight1);
-            if (b.boneWeight2 > 0f) a.MergeBoneWeight(b.boneIndex2, b.boneWeight2);
-            if (b.boneWeight3 > 0f) a.MergeBoneWeight(b.boneIndex3, b.boneWeight3);
-        }
-        #endregion
-        #endregion
-    }
-}

LightlessSync/ThirdParty/MeshDecimator/Collections/ResizableArray.cs

@@ -1,179 +0,0 @@
-#region License
-/*
-MIT License
-
-Copyright(c) 2017-2018 Mattias Edlund
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-#endregion
-
-using System;
-
-namespace MeshDecimator.Collections
-{
-    /// <summary>
-    /// A resizable array.
-    /// </summary>
-    /// <typeparam name="T">The item type.</typeparam>
-    internal sealed class ResizableArray<T>
-    {
-        #region Fields
-        private T[] items = null;
-        private int length = 0;
-
-        private static T[] emptyArr = new T[0];
-        #endregion
-
-        #region Properties
-        /// <summary>
-        /// Gets the length of this array.
-        /// </summary>
-        public int Length
-        {
-            get { return length; }
-        }
-
-        /// <summary>
-        /// Gets the internal data buffer for this array.
-        /// </summary>
-        public T[] Data
-        {
-            get { return items; }
-        }
-
-        /// <summary>
-        /// Gets or sets the element value at a specific index.
-        /// </summary>
-        /// <param name="index">The element index.</param>
-        /// <returns>The element value.</returns>
-        public T this[int index]
-        {
-            get { return items[index]; }
-            set { items[index] = value; }
-        }
-        #endregion
-
-        #region Constructor
-        /// <summary>
-        /// Creates a new resizable array.
-        /// </summary>
-        /// <param name="capacity">The initial array capacity.</param>
-        public ResizableArray(int capacity)
-            : this(capacity, 0)
-        {
-
-        }
-
-        /// <summary>
-        /// Creates a new resizable array.
-        /// </summary>
-        /// <param name="capacity">The initial array capacity.</param>
-        /// <param name="length">The initial length of the array.</param>
-        public ResizableArray(int capacity, int length)
-        {
-            if (capacity < 0)
-                throw new ArgumentOutOfRangeException("capacity");
-            else if (length < 0 || length > capacity)
-                throw new ArgumentOutOfRangeException("length");
-
-            if (capacity > 0)
-                items = new T[capacity];
-            else
-                items = emptyArr;
-
-            this.length = length;
-        }
-        #endregion
-
-        #region Private Methods
-        private void IncreaseCapacity(int capacity)
-        {
-            T[] newItems = new T[capacity];
-            Array.Copy(items, 0, newItems, 0, System.Math.Min(length, capacity));
-            items = newItems;
-        }
-        #endregion
-
-        #region Public Methods
-        /// <summary>
-        /// Clears this array.
-        /// </summary>
-        public void Clear()
-        {
-            Array.Clear(items, 0, length);
-            length = 0;
-        }
-
-        /// <summary>
-        /// Resizes this array.
-        /// </summary>
-        /// <param name="length">The new length.</param>
-        /// <param name="trimExess">If exess memory should be trimmed.</param>
-        public void Resize(int length, bool trimExess = false)
-        {
-            if (length < 0)
-                throw new ArgumentOutOfRangeException("capacity");
-
-            if (length > items.Length)
-            {
-                IncreaseCapacity(length);
-            }
-            else if (length < this.length)
-            {
-                //Array.Clear(items, capacity, length - capacity);
-            }
-
-            this.length = length;
-
-            if (trimExess)
-            {
-                TrimExcess();
-            }
-        }
-
-        /// <summary>
-        /// Trims any excess memory for this array.
-        /// </summary>
-        public void TrimExcess()
-        {
-            if (items.Length == length) // Nothing to do
-                return;
-
-            T[] newItems = new T[length];
-            Array.Copy(items, 0, newItems, 0, length);
-            items = newItems;
-        }
-
-        /// <summary>
-        /// Adds a new item to the end of this array.
-        /// </summary>
-        /// <param name="item">The new item.</param>
-        public void Add(T item)
-        {
-            if (length >= items.Length)
-            {
-                IncreaseCapacity(items.Length << 1);
-            }
-
-            items[length++] = item;
-        }
-        #endregion
-    }
-}

LightlessSync/ThirdParty/MeshDecimator/Collections/UVChannels.cs

@@ -1,79 +0,0 @@
-using System;
-
-namespace MeshDecimator.Collections
-{
-    /// <summary>
-    /// A collection of UV channels.
-    /// </summary>
-    /// <typeparam name="TVec">The UV vector type.</typeparam>
-    internal sealed class UVChannels<TVec>
-    {
-        #region Fields
-        private ResizableArray<TVec>[] channels = null;
-        private TVec[][] channelsData = null;
-        #endregion
-
-        #region Properties
-        /// <summary>
-        /// Gets the channel collection data.
-        /// </summary>
-        public TVec[][] Data
-        {
-            get
-            {
-                for (int i = 0; i < Mesh.UVChannelCount; i++)
-                {
-                    if (channels[i] != null)
-                    {
-                        channelsData[i] = channels[i].Data;
-                    }
-                    else
-                    {
-                        channelsData[i] = null;
-                    }
-                }
-                return channelsData;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a specific channel by index.
-        /// </summary>
-        /// <param name="index">The channel index.</param>
-        public ResizableArray<TVec> this[int index]
-        {
-            get { return channels[index]; }
-            set { channels[index] = value; }
-        }
-        #endregion
-
-        #region Constructor
-        /// <summary>
-        /// Creates a new collection of UV channels.
-        /// </summary>
-        public UVChannels()
-        {
-            channels = new ResizableArray<TVec>[Mesh.UVChannelCount];
-            channelsData = new TVec[Mesh.UVChannelCount][];
-        }
-        #endregion
-
-        #region Public Methods
-        /// <summary>
-        /// Resizes all channels at once.
-        /// </summary>
-        /// <param name="capacity">The new capacity.</param>
-        /// <param name="trimExess">If exess memory should be trimmed.</param>
-        public void Resize(int capacity, bool trimExess = false)
-        {
-            for (int i = 0; i < Mesh.UVChannelCount; i++)
-            {
-                if (channels[i] != null)
-                {
-                    channels[i].Resize(capacity, trimExess);
-                }
-            }
-        }
-        #endregion
-    }
-}

LightlessSync/ThirdParty/MeshDecimator/LICENSE.md

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2017-2018 Mattias Edlund
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

LightlessSync/ThirdParty/MeshDecimator/Math/MathHelper.cs

@@ -1,286 +0,0 @@
-#region License
-/*
-MIT License
-
-Copyright(c) 2017-2018 Mattias Edlund
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-#endregion
-
-using System;
-
-namespace MeshDecimator.Math
-{
-    /// <summary>
-    /// Math helpers.
-    /// </summary>
-    public static class MathHelper
-    {
-        #region Consts
-        /// <summary>
-        /// The Pi constant.
-        /// </summary>
-        public const float PI = 3.14159274f;
-
-        /// <summary>
-        /// The Pi constant.
-        /// </summary>
-        public const double PId = 3.1415926535897932384626433832795;
-
-        /// <summary>
-        /// Degrees to radian constant.
-        /// </summary>
-        public const float Deg2Rad = PI / 180f;
-
-        /// <summary>
-        /// Degrees to radian constant.
-        /// </summary>
-        public const double Deg2Radd = PId / 180.0;
-
-        /// <summary>
-        /// Radians to degrees constant.
-        /// </summary>
-        public const float Rad2Deg = 180f / PI;
-
-        /// <summary>
-        /// Radians to degrees constant.
-        /// </summary>
-        public const double Rad2Degd = 180.0 / PId;
-        #endregion
-
-        #region Min
-        /// <summary>
-        /// Returns the minimum of two values.
-        /// </summary>
-        /// <param name="val1">The first value.</param>
-        /// <param name="val2">The second value.</param>
-        /// <returns>The minimum value.</returns>
-        public static int Min(int val1, int val2)
-        {
-            return (val1 < val2 ? val1 : val2);
-        }
-
-        /// <summary>
-        /// Returns the minimum of three values.
-        /// </summary>
-        /// <param name="val1">The first value.</param>
-        /// <param name="val2">The second value.</param>
-        /// <param name="val3">The third value.</param>
-        /// <returns>The minimum value.</returns>
-        public static int Min(int val1, int val2, int val3)
-        {
-            return (val1 < val2 ? (val1 < val3 ? val1 : val3) : (val2 < val3 ? val2 : val3));
-        }
-
-        /// <summary>
-        /// Returns the minimum of two values.
-        /// </summary>
-        /// <param name="val1">The first value.</param>
-        /// <param name="val2">The second value.</param>
-        /// <returns>The minimum value.</returns>
-        public static float Min(float val1, float val2)
-        {
-            return (val1 < val2 ? val1 : val2);
-        }
-
-        /// <summary>
-        /// Returns the minimum of three values.
-        /// </summary>
-        /// <param name="val1">The first value.</param>
-        /// <param name="val2">The second value.</param>
-        /// <param name="val3">The third value.</param>
-        /// <returns>The minimum value.</returns>
-        public static float Min(float val1, float val2, float val3)
-        {
-            return (val1 < val2 ? (val1 < val3 ? val1 : val3) : (val2 < val3 ? val2 : val3));
-        }
-
-        /// <summary>
-        /// Returns the minimum of two values.
-        /// </summary>
-        /// <param name="val1">The first value.</param>
-        /// <param name="val2">The second value.</param>
-        /// <returns>The minimum value.</returns>
-        public static double Min(double val1, double val2)
-        {
-            return (val1 < val2 ? val1 : val2);
-        }
-
-        /// <summary>
-        /// Returns the minimum of three values.
-        /// </summary>
-        /// <param name="val1">The first value.</param>
-        /// <param name="val2">The second value.</param>
-        /// <param name="val3">The third value.</param>
-        /// <returns>The minimum value.</returns>
-        public static double Min(double val1, double val2, double val3)
-        {
-            return (val1 < val2 ? (val1 < val3 ? val1 : val3) : (val2 < val3 ? val2 : val3));
-        }
-        #endregion
-
-        #region Max
-        /// <summary>
-        /// Returns the maximum of two values.
-        /// </summary>
-        /// <param name="val1">The first value.</param>
-        /// <param name="val2">The second value.</param>
-        /// <returns>The maximum value.</returns>
-        public static int Max(int val1, int val2)
-        {
-            return (val1 > val2 ? val1 : val2);
-        }
-
-        /// <summary>
-        /// Returns the maximum of three values.
-        /// </summary>
-        /// <param name="val1">The first value.</param>
-        /// <param name="val2">The second value.</param>
-        /// <param name="val3">The third value.</param>
-        /// <returns>The maximum value.</returns>
-        public static int Max(int val1, int val2, int val3)
-        {
-            return (val1 > val2 ? (val1 > val3 ? val1 : val3) : (val2 > val3 ? val2 : val3));
-        }
-
-        /// <summary>
-        /// Returns the maximum of two values.
-        /// </summary>
-        /// <param name="val1">The first value.</param>
-        /// <param name="val2">The second value.</param>
-        /// <returns>The maximum value.</returns>
-        public static float Max(float val1, float val2)
-        {
-            return (val1 > val2 ? val1 : val2);
-        }
-
-        /// <summary>
-        /// Returns the maximum of three values.
-        /// </summary>
-        /// <param name="val1">The first value.</param>
-        /// <param name="val2">The second value.</param>
-        /// <param name="val3">The third value.</param>
-        /// <returns>The maximum value.</returns>
-        public static float Max(float val1, float val2, float val3)
-        {
-            return (val1 > val2 ? (val1 > val3 ? val1 : val3) : (val2 > val3 ? val2 : val3));
-        }
-
-        /// <summary>
-        /// Returns the maximum of two values.
-        /// </summary>
-        /// <param name="val1">The first value.</param>
-        /// <param name="val2">The second value.</param>
-        /// <returns>The maximum value.</returns>
-        public static double Max(double val1, double val2)
-        {
-            return (val1 > val2 ? val1 : val2);
-        }
-
-        /// <summary>
-        /// Returns the maximum of three values.
-        /// </summary>
-        /// <param name="val1">The first value.</param>
-        /// <param name="val2">The second value.</param>
-        /// <param name="val3">The third value.</param>
-        /// <returns>The maximum value.</returns>
-        public static double Max(double val1, double val2, double val3)
-        {
-            return (val1 > val2 ? (val1 > val3 ? val1 : val3) : (val2 > val3 ? val2 : val3));
-        }
-        #endregion
-
-        #region Clamping
-        /// <summary>
-        /// Clamps a value between a minimum and a maximum value.
-        /// </summary>
-        /// <param name="value">The value to clamp.</param>
-        /// <param name="min">The minimum value.</param>
-        /// <param name="max">The maximum value.</param>
-        /// <returns>The clamped value.</returns>
-        public static float Clamp(float value, float min, float max)
-        {
-            return (value >= min ? (value <= max ? value : max) : min);
-        }
-
-        /// <summary>
-        /// Clamps a value between a minimum and a maximum value.
-        /// </summary>
-        /// <param name="value">The value to clamp.</param>
-        /// <param name="min">The minimum value.</param>
-        /// <param name="max">The maximum value.</param>
-        /// <returns>The clamped value.</returns>
-        public static double Clamp(double value, double min, double max)
-        {
-            return (value >= min ? (value <= max ? value : max) : min);
-        }
-
-        /// <summary>
-        /// Clamps the value between 0 and 1.
-        /// </summary>
-        /// <param name="value">The value to clamp.</param>
-        /// <returns>The clamped value.</returns>
-        public static float Clamp01(float value)
-        {
-            return (value > 0f ? (value < 1f ? value : 1f) : 0f);
-        }
-
-        /// <summary>
-        /// Clamps the value between 0 and 1.
-        /// </summary>
-        /// <param name="value">The value to clamp.</param>
-        /// <returns>The clamped value.</returns>
-        public static double Clamp01(double value)
-        {
-            return (value > 0.0 ? (value < 1.0 ? value : 1.0) : 0.0);
-        }
-        #endregion
-
-        #region Triangle Area
-        /// <summary>
-        /// Calculates the area of a triangle.
-        /// </summary>
-        /// <param name="p0">The first point.</param>
-        /// <param name="p1">The second point.</param>
-        /// <param name="p2">The third point.</param>
-        /// <returns>The triangle area.</returns>
-        public static float TriangleArea(ref Vector3 p0, ref Vector3 p1, ref Vector3 p2)
-        {
-            var dx = p1 - p0;
-            var dy = p2 - p0;
-            return dx.Magnitude * ((float)System.Math.Sin(Vector3.Angle(ref dx, ref dy) * Deg2Rad) * dy.Magnitude) * 0.5f;
-        }
-
-        /// <summary>
-        /// Calculates the area of a triangle.
-        /// </summary>
-        /// <param name="p0">The first point.</param>
-        /// <param name="p1">The second point.</param>
-        /// <param name="p2">The third point.</param>
-        /// <returns>The triangle area.</returns>
-        public static double TriangleArea(ref Vector3d p0, ref Vector3d p1, ref Vector3d p2)
-        {
-            var dx = p1 - p0;
-            var dy = p2 - p0;
-            return dx.Magnitude * (System.Math.Sin(Vector3d.Angle(ref dx, ref dy) * Deg2Radd) * dy.Magnitude) * 0.5f;
-        }
-        #endregion
-    }
-}

LightlessSync/ThirdParty/MeshDecimator/Math/SymmetricMatrix.cs

@@ -1,303 +0,0 @@
-#region License
-/*
-MIT License
-
-Copyright(c) 2017-2018 Mattias Edlund
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-#endregion
-
-using System;
-
-namespace MeshDecimator.Math
-{
-    /// <summary>
-    /// A symmetric matrix.
-    /// </summary>
-    public struct SymmetricMatrix
-    {
-        #region Fields
-        /// <summary>
-        /// The m11 component.
-        /// </summary>
-        public double m0;
-        /// <summary>
-        /// The m12 component.
-        /// </summary>
-        public double m1;
-        /// <summary>
-        /// The m13 component.
-        /// </summary>
-        public double m2;
-        /// <summary>
-        /// The m14 component.
-        /// </summary>
-        public double m3;
-        /// <summary>
-        /// The m22 component.
-        /// </summary>
-        public double m4;
-        /// <summary>
-        /// The m23 component.
-        /// </summary>
-        public double m5;
-        /// <summary>
-        /// The m24 component.
-        /// </summary>
-        public double m6;
-        /// <summary>
-        /// The m33 component.
-        /// </summary>
-        public double m7;
-        /// <summary>
-        /// The m34 component.
-        /// </summary>
-        public double m8;
-        /// <summary>
-        /// The m44 component.
-        /// </summary>
-        public double m9;
-        #endregion
-
-        #region Properties
-        /// <summary>
-        /// Gets the component value with a specific index.
-        /// </summary>
-        /// <param name="index">The component index.</param>
-        /// <returns>The value.</returns>
-        public double this[int index]
-        {
-            get
-            {
-                switch (index)
-                {
-                    case 0:
-                        return m0;
-                    case 1:
-                        return m1;
-                    case 2:
-                        return m2;
-                    case 3:
-                        return m3;
-                    case 4:
-                        return m4;
-                    case 5:
-                        return m5;
-                    case 6:
-                        return m6;
-                    case 7:
-                        return m7;
-                    case 8:
-                        return m8;
-                    case 9:
-                        return m9;
-                    default:
-                        throw new IndexOutOfRangeException();
-                }
-            }
-        }
-        #endregion
-
-        #region Constructor
-        /// <summary>
-        /// Creates a symmetric matrix with a value in each component.
-        /// </summary>
-        /// <param name="c">The component value.</param>
-        public SymmetricMatrix(double c)
-        {
-            this.m0 = c;
-            this.m1 = c;
-            this.m2 = c;
-            this.m3 = c;
-            this.m4 = c;
-            this.m5 = c;
-            this.m6 = c;
-            this.m7 = c;
-            this.m8 = c;
-            this.m9 = c;
-        }
-
-        /// <summary>
-        /// Creates a symmetric matrix.
-        /// </summary>
-        /// <param name="m0">The m11 component.</param>
-        /// <param name="m1">The m12 component.</param>
-        /// <param name="m2">The m13 component.</param>
-        /// <param name="m3">The m14 component.</param>
-        /// <param name="m4">The m22 component.</param>
-        /// <param name="m5">The m23 component.</param>
-        /// <param name="m6">The m24 component.</param>
-        /// <param name="m7">The m33 component.</param>
-        /// <param name="m8">The m34 component.</param>
-        /// <param name="m9">The m44 component.</param>
-        public SymmetricMatrix(double m0, double m1, double m2, double m3,
-            double m4, double m5, double m6, double m7, double m8, double m9)
-        {
-            this.m0 = m0;
-            this.m1 = m1;
-            this.m2 = m2;
-            this.m3 = m3;
-            this.m4 = m4;
-            this.m5 = m5;
-            this.m6 = m6;
-            this.m7 = m7;
-            this.m8 = m8;
-            this.m9 = m9;
-        }
-
-        /// <summary>
-        /// Creates a symmetric matrix from a plane.
-        /// </summary>
-        /// <param name="a">The plane x-component.</param>
-        /// <param name="b">The plane y-component</param>
-        /// <param name="c">The plane z-component</param>
-        /// <param name="d">The plane w-component</param>
-        public SymmetricMatrix(double a, double b, double c, double d)
-        {
-            this.m0 = a * a;
-            this.m1 = a * b;
-            this.m2 = a * c;
-            this.m3 = a * d;
-
-            this.m4 = b * b;
-            this.m5 = b * c;
-            this.m6 = b * d;
-
-            this.m7 = c * c;
-            this.m8 = c * d;
-
-            this.m9 = d * d;
-        }
-        #endregion
-
-        #region Operators
-        /// <summary>
-        /// Adds two matrixes together.
-        /// </summary>
-        /// <param name="a">The left hand side.</param>
-        /// <param name="b">The right hand side.</param>
-        /// <returns>The resulting matrix.</returns>
-        public static SymmetricMatrix operator +(SymmetricMatrix a, SymmetricMatrix b)
-        {
-            return new SymmetricMatrix(
-                a.m0 + b.m0, a.m1 + b.m1, a.m2 + b.m2, a.m3 + b.m3,
-                a.m4 + b.m4, a.m5 + b.m5, a.m6 + b.m6,
-                a.m7 + b.m7, a.m8 + b.m8,
-                a.m9 + b.m9
-            );
-        }
-        #endregion
-
-        #region Internal Methods
-        /// <summary>
-        /// Determinant(0, 1, 2, 1, 4, 5, 2, 5, 7)
-        /// </summary>
-        /// <returns></returns>
-        internal double Determinant1()
-        {
-            double det =
-                m0 * m4 * m7 +
-                m2 * m1 * m5 +
-                m1 * m5 * m2 -
-                m2 * m4 * m2 -
-                m0 * m5 * m5 -
-                m1 * m1 * m7;
-            return det;
-        }
-
-        /// <summary>
-        /// Determinant(1, 2, 3, 4, 5, 6, 5, 7, 8)
-        /// </summary>
-        /// <returns></returns>
-        internal double Determinant2()
-        {
-            double det =
-                m1 * m5 * m8 +
-                m3 * m4 * m7 +
-                m2 * m6 * m5 -
-                m3 * m5 * m5 -
-                m1 * m6 * m7 -
-                m2 * m4 * m8;
-            return det;
-        }
-
-        /// <summary>
-        /// Determinant(0, 2, 3, 1, 5, 6, 2, 7, 8)
-        /// </summary>
-        /// <returns></returns>
-        internal double Determinant3()
-        {
-            double det =
-                m0 * m5 * m8 +
-                m3 * m1 * m7 +
-                m2 * m6 * m2 -
-                m3 * m5 * m2 -
-                m0 * m6 * m7 -
-                m2 * m1 * m8;
-            return det;
-        }
-
-        /// <summary>
-        /// Determinant(0, 1, 3, 1, 4, 6, 2, 5, 8)
-        /// </summary>
-        /// <returns></returns>
-        internal double Determinant4()
-        {
-            double det =
-                m0 * m4 * m8 +
-                m3 * m1 * m5 +
-                m1 * m6 * m2 -
-                m3 * m4 * m2 -
-                m0 * m6 * m5 -
-                m1 * m1 * m8;
-            return det;
-        }
-        #endregion
-
-        #region Public Methods
-        /// <summary>
-        /// Computes the determinant of this matrix.
-        /// </summary>
-        /// <param name="a11">The a11 index.</param>
-        /// <param name="a12">The a12 index.</param>
-        /// <param name="a13">The a13 index.</param>
-        /// <param name="a21">The a21 index.</param>
-        /// <param name="a22">The a22 index.</param>
-        /// <param name="a23">The a23 index.</param>
-        /// <param name="a31">The a31 index.</param>
-        /// <param name="a32">The a32 index.</param>
-        /// <param name="a33">The a33 index.</param>
-        /// <returns>The determinant value.</returns>
-        public double Determinant(int a11, int a12, int a13,
-            int a21, int a22, int a23,
-            int a31, int a32, int a33)
-        {
-            double det =
-                this[a11] * this[a22] * this[a33] +
-                this[a13] * this[a21] * this[a32] +
-                this[a12] * this[a23] * this[a31] -
-                this[a13] * this[a22] * this[a31] -
-                this[a11] * this[a23] * this[a32] -
-                this[a12] * this[a21] * this[a33];
-            return det;
-        }
-        #endregion
-    }
-}

LightlessSync/ThirdParty/MeshDecimator/Math/Vector2.cs

@@ -1,425 +0,0 @@
-#region License
-/*
-MIT License
-
-Copyright(c) 2017-2018 Mattias Edlund
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-#endregion
-
-using System;
-using System.Globalization;
-
-namespace MeshDecimator.Math
-{
-    /// <summary>
-    /// A single precision 2D vector.
-    /// </summary>
-    public struct Vector2 : IEquatable<Vector2>
-    {
-        #region Static Read-Only
-        /// <summary>
-        /// The zero vector.
-        /// </summary>
-        public static readonly Vector2 zero = new Vector2(0, 0);
-        #endregion
-
-        #region Consts
-        /// <summary>
-        /// The vector epsilon.
-        /// </summary>
-        public const float Epsilon = 9.99999944E-11f;
-        #endregion
-
-        #region Fields
-        /// <summary>
-        /// The x component.
-        /// </summary>
-        public float x;
-        /// <summary>
-        /// The y component.
-        /// </summary>
-        public float y;
-        #endregion
-
-        #region Properties
-        /// <summary>
-        /// Gets the magnitude of this vector.
-        /// </summary>
-        public float Magnitude
-        {
-            get { return (float)System.Math.Sqrt(x * x + y * y); }
-        }
-
-        /// <summary>
-        /// Gets the squared magnitude of this vector.
-        /// </summary>
-        public float MagnitudeSqr
-        {
-            get { return (x * x + y * y); }
-        }
-
-        /// <summary>
-        /// Gets a normalized vector from this vector.
-        /// </summary>
-        public Vector2 Normalized
-        {
-            get
-            {
-                Vector2 result;
-                Normalize(ref this, out result);
-                return result;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a specific component by index in this vector.
-        /// </summary>
-        /// <param name="index">The component index.</param>
-        public float this[int index]
-        {
-            get
-            {
-                switch (index)
-                {
-                    case 0:
-                        return x;
-                    case 1:
-                        return y;
-                    default:
-                        throw new IndexOutOfRangeException("Invalid Vector2 index!");
-                }
-            }
-            set
-            {
-                switch (index)
-                {
-                    case 0:
-                        x = value;
-                        break;
-                    case 1:
-                        y = value;
-                        break;
-                    default:
-                        throw new IndexOutOfRangeException("Invalid Vector2 index!");
-                }
-            }
-        }
-        #endregion
-
-        #region Constructor
-        /// <summary>
-        /// Creates a new vector with one value for all components.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        public Vector2(float value)
-        {
-            this.x = value;
-            this.y = value;
-        }
-
-        /// <summary>
-        /// Creates a new vector.
-        /// </summary>
-        /// <param name="x">The x value.</param>
-        /// <param name="y">The y value.</param>
-        public Vector2(float x, float y)
-        {
-            this.x = x;
-            this.y = y;
-        }
-        #endregion
-
-        #region Operators
-        /// <summary>
-        /// Adds two vectors.
-        /// </summary>
-        /// <param name="a">The first vector.</param>
-        /// <param name="b">The second vector.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector2 operator +(Vector2 a, Vector2 b)
-        {
-            return new Vector2(a.x + b.x, a.y + b.y);
-        }
-
-        /// <summary>
-        /// Subtracts two vectors.
-        /// </summary>
-        /// <param name="a">The first vector.</param>
-        /// <param name="b">The second vector.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector2 operator -(Vector2 a, Vector2 b)
-        {
-            return new Vector2(a.x - b.x, a.y - b.y);
-        }
-
-        /// <summary>
-        /// Scales the vector uniformly.
-        /// </summary>
-        /// <param name="a">The vector.</param>
-        /// <param name="d">The scaling value.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector2 operator *(Vector2 a, float d)
-        {
-            return new Vector2(a.x * d, a.y * d);
-        }
-
-        /// <summary>
-        /// Scales the vector uniformly.
-        /// </summary>
-        /// <param name="d">The scaling value.</param>
-        /// <param name="a">The vector.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector2 operator *(float d, Vector2 a)
-        {
-            return new Vector2(a.x * d, a.y * d);
-        }
-
-        /// <summary>
-        /// Divides the vector with a float.
-        /// </summary>
-        /// <param name="a">The vector.</param>
-        /// <param name="d">The dividing float value.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector2 operator /(Vector2 a, float d)
-        {
-            return new Vector2(a.x / d, a.y / d);
-        }
-
-        /// <summary>
-        /// Subtracts the vector from a zero vector.
-        /// </summary>
-        /// <param name="a">The vector.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector2 operator -(Vector2 a)
-        {
-            return new Vector2(-a.x, -a.y);
-        }
-
-        /// <summary>
-        /// Returns if two vectors equals eachother.
-        /// </summary>
-        /// <param name="lhs">The left hand side vector.</param>
-        /// <param name="rhs">The right hand side vector.</param>
-        /// <returns>If equals.</returns>
-        public static bool operator ==(Vector2 lhs, Vector2 rhs)
-        {
-            return (lhs - rhs).MagnitudeSqr < Epsilon;
-        }
-
-        /// <summary>
-        /// Returns if two vectors don't equal eachother.
-        /// </summary>
-        /// <param name="lhs">The left hand side vector.</param>
-        /// <param name="rhs">The right hand side vector.</param>
-        /// <returns>If not equals.</returns>
-        public static bool operator !=(Vector2 lhs, Vector2 rhs)
-        {
-            return (lhs - rhs).MagnitudeSqr >= Epsilon;
-        }
-
-        /// <summary>
-        /// Explicitly converts from a double-precision vector into a single-precision vector.
-        /// </summary>
-        /// <param name="v">The double-precision vector.</param>
-        public static explicit operator Vector2(Vector2d v)
-        {
-            return new Vector2((float)v.x, (float)v.y);
-        }
-
-        /// <summary>
-        /// Implicitly converts from an integer vector into a single-precision vector.
-        /// </summary>
-        /// <param name="v">The integer vector.</param>
-        public static implicit operator Vector2(Vector2i v)
-        {
-            return new Vector2(v.x, v.y);
-        }
-        #endregion
-
-        #region Public Methods
-        #region Instance
-        /// <summary>
-        /// Set x and y components of an existing vector.
-        /// </summary>
-        /// <param name="x">The x value.</param>
-        /// <param name="y">The y value.</param>
-        public void Set(float x, float y)
-        {
-            this.x = x;
-            this.y = y;
-        }
-
-        /// <summary>
-        /// Multiplies with another vector component-wise.
-        /// </summary>
-        /// <param name="scale">The vector to multiply with.</param>
-        public void Scale(ref Vector2 scale)
-        {
-            x *= scale.x;
-            y *= scale.y;
-        }
-
-        /// <summary>
-        /// Normalizes this vector.
-        /// </summary>
-        public void Normalize()
-        {
-            float mag = this.Magnitude;
-            if (mag > Epsilon)
-            {
-                x /= mag;
-                y /= mag;
-            }
-            else
-            {
-                x = y = 0;
-            }
-        }
-
-        /// <summary>
-        /// Clamps this vector between a specific range.
-        /// </summary>
-        /// <param name="min">The minimum component value.</param>
-        /// <param name="max">The maximum component value.</param>
-        public void Clamp(float min, float max)
-        {
-            if (x < min) x = min;
-            else if (x > max) x = max;
-
-            if (y < min) y = min;
-            else if (y > max) y = max;
-        }
-        #endregion
-
-        #region Object
-        /// <summary>
-        /// Returns a hash code for this vector.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            return x.GetHashCode() ^ y.GetHashCode() << 2;
-        }
-
-        /// <summary>
-        /// Returns if this vector is equal to another one.
-        /// </summary>
-        /// <param name="other">The other vector to compare to.</param>
-        /// <returns>If equals.</returns>
-        public override bool Equals(object other)
-        {
-            if (!(other is Vector2))
-            {
-                return false;
-            }
-            Vector2 vector = (Vector2)other;
-            return (x == vector.x && y == vector.y);
-        }
-
-        /// <summary>
-        /// Returns if this vector is equal to another one.
-        /// </summary>
-        /// <param name="other">The other vector to compare to.</param>
-        /// <returns>If equals.</returns>
-        public bool Equals(Vector2 other)
-        {
-            return (x == other.x && y == other.y);
-        }
-
-        /// <summary>
-        /// Returns a nicely formatted string for this vector.
-        /// </summary>
-        /// <returns>The string.</returns>
-        public override string ToString()
-        {
-            return string.Format("({0}, {1})",
-                x.ToString("F1", CultureInfo.InvariantCulture),
-                y.ToString("F1", CultureInfo.InvariantCulture));
-        }
-
-        /// <summary>
-        /// Returns a nicely formatted string for this vector.
-        /// </summary>
-        /// <param name="format">The float format.</param>
-        /// <returns>The string.</returns>
-        public string ToString(string format)
-        {
-            return string.Format("({0}, {1})",
-                x.ToString(format, CultureInfo.InvariantCulture),
-                y.ToString(format, CultureInfo.InvariantCulture));
-        }
-        #endregion
-
-        #region Static
-        /// <summary>
-        /// Dot Product of two vectors.
-        /// </summary>
-        /// <param name="lhs">The left hand side vector.</param>
-        /// <param name="rhs">The right hand side vector.</param>
-        public static float Dot(ref Vector2 lhs, ref Vector2 rhs)
-        {
-            return lhs.x * rhs.x + lhs.y * rhs.y;
-        }
-        
-        /// <summary>
-        /// Performs a linear interpolation between two vectors.
-        /// </summary>
-        /// <param name="a">The vector to interpolate from.</param>
-        /// <param name="b">The vector to interpolate to.</param>
-        /// <param name="t">The time fraction.</param>
-        /// <param name="result">The resulting vector.</param>
-        public static void Lerp(ref Vector2 a, ref Vector2 b, float t, out Vector2 result)
-        {
-            result = new Vector2(a.x + (b.x - a.x) * t, a.y + (b.y - a.y) * t);
-        }
-
-        /// <summary>
-        /// Multiplies two vectors component-wise.
-        /// </summary>
-        /// <param name="a">The first vector.</param>
-        /// <param name="b">The second vector.</param>
-        /// <param name="result">The resulting vector.</param>
-        public static void Scale(ref Vector2 a, ref Vector2 b, out Vector2 result)
-        {
-            result = new Vector2(a.x * b.x, a.y * b.y);
-        }
-
-        /// <summary>
-        /// Normalizes a vector.
-        /// </summary>
-        /// <param name="value">The vector to normalize.</param>
-        /// <param name="result">The resulting normalized vector.</param>
-        public static void Normalize(ref Vector2 value, out Vector2 result)
-        {
-            float mag = value.Magnitude;
-            if (mag > Epsilon)
-            {
-                result = new Vector2(value.x / mag, value.y / mag);
-            }
-            else
-            {
-                result = Vector2.zero;
-            }
-        }
-        #endregion
-        #endregion
-    }
-}

LightlessSync/ThirdParty/MeshDecimator/Math/Vector2d.cs

@@ -1,425 +0,0 @@
-#region License
-/*
-MIT License
-
-Copyright(c) 2017-2018 Mattias Edlund
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-#endregion
-
-using System;
-using System.Globalization;
-
-namespace MeshDecimator.Math
-{
-    /// <summary>
-    /// A double precision 2D vector.
-    /// </summary>
-    public struct Vector2d : IEquatable<Vector2d>
-    {
-        #region Static Read-Only
-        /// <summary>
-        /// The zero vector.
-        /// </summary>
-        public static readonly Vector2d zero = new Vector2d(0, 0);
-        #endregion
-
-        #region Consts
-        /// <summary>
-        /// The vector epsilon.
-        /// </summary>
-        public const double Epsilon = double.Epsilon;
-        #endregion
-
-        #region Fields
-        /// <summary>
-        /// The x component.
-        /// </summary>
-        public double x;
-        /// <summary>
-        /// The y component.
-        /// </summary>
-        public double y;
-        #endregion
-
-        #region Properties
-        /// <summary>
-        /// Gets the magnitude of this vector.
-        /// </summary>
-        public double Magnitude
-        {
-            get { return System.Math.Sqrt(x * x + y * y); }
-        }
-
-        /// <summary>
-        /// Gets the squared magnitude of this vector.
-        /// </summary>
-        public double MagnitudeSqr
-        {
-            get { return (x * x + y * y); }
-        }
-
-        /// <summary>
-        /// Gets a normalized vector from this vector.
-        /// </summary>
-        public Vector2d Normalized
-        {
-            get
-            {
-                Vector2d result;
-                Normalize(ref this, out result);
-                return result;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a specific component by index in this vector.
-        /// </summary>
-        /// <param name="index">The component index.</param>
-        public double this[int index]
-        {
-            get
-            {
-                switch (index)
-                {
-                    case 0:
-                        return x;
-                    case 1:
-                        return y;
-                    default:
-                        throw new IndexOutOfRangeException("Invalid Vector2d index!");
-                }
-            }
-            set
-            {
-                switch (index)
-                {
-                    case 0:
-                        x = value;
-                        break;
-                    case 1:
-                        y = value;
-                        break;
-                    default:
-                        throw new IndexOutOfRangeException("Invalid Vector2d index!");
-                }
-            }
-        }
-        #endregion
-
-        #region Constructor
-        /// <summary>
-        /// Creates a new vector with one value for all components.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        public Vector2d(double value)
-        {
-            this.x = value;
-            this.y = value;
-        }
-
-        /// <summary>
-        /// Creates a new vector.
-        /// </summary>
-        /// <param name="x">The x value.</param>
-        /// <param name="y">The y value.</param>
-        public Vector2d(double x, double y)
-        {
-            this.x = x;
-            this.y = y;
-        }
-        #endregion
-
-        #region Operators
-        /// <summary>
-        /// Adds two vectors.
-        /// </summary>
-        /// <param name="a">The first vector.</param>
-        /// <param name="b">The second vector.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector2d operator +(Vector2d a, Vector2d b)
-        {
-            return new Vector2d(a.x + b.x, a.y + b.y);
-        }
-
-        /// <summary>
-        /// Subtracts two vectors.
-        /// </summary>
-        /// <param name="a">The first vector.</param>
-        /// <param name="b">The second vector.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector2d operator -(Vector2d a, Vector2d b)
-        {
-            return new Vector2d(a.x - b.x, a.y - b.y);
-        }
-
-        /// <summary>
-        /// Scales the vector uniformly.
-        /// </summary>
-        /// <param name="a">The vector.</param>
-        /// <param name="d">The scaling value.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector2d operator *(Vector2d a, double d)
-        {
-            return new Vector2d(a.x * d, a.y * d);
-        }
-
-        /// <summary>
-        /// Scales the vector uniformly.
-        /// </summary>
-        /// <param name="d">The scaling value.</param>
-        /// <param name="a">The vector.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector2d operator *(double d, Vector2d a)
-        {
-            return new Vector2d(a.x * d, a.y * d);
-        }
-
-        /// <summary>
-        /// Divides the vector with a float.
-        /// </summary>
-        /// <param name="a">The vector.</param>
-        /// <param name="d">The dividing float value.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector2d operator /(Vector2d a, double d)
-        {
-            return new Vector2d(a.x / d, a.y / d);
-        }
-
-        /// <summary>
-        /// Subtracts the vector from a zero vector.
-        /// </summary>
-        /// <param name="a">The vector.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector2d operator -(Vector2d a)
-        {
-            return new Vector2d(-a.x, -a.y);
-        }
-
-        /// <summary>
-        /// Returns if two vectors equals eachother.
-        /// </summary>
-        /// <param name="lhs">The left hand side vector.</param>
-        /// <param name="rhs">The right hand side vector.</param>
-        /// <returns>If equals.</returns>
-        public static bool operator ==(Vector2d lhs, Vector2d rhs)
-        {
-            return (lhs - rhs).MagnitudeSqr < Epsilon;
-        }
-
-        /// <summary>
-        /// Returns if two vectors don't equal eachother.
-        /// </summary>
-        /// <param name="lhs">The left hand side vector.</param>
-        /// <param name="rhs">The right hand side vector.</param>
-        /// <returns>If not equals.</returns>
-        public static bool operator !=(Vector2d lhs, Vector2d rhs)
-        {
-            return (lhs - rhs).MagnitudeSqr >= Epsilon;
-        }
-
-        /// <summary>
-        /// Implicitly converts from a single-precision vector into a double-precision vector.
-        /// </summary>
-        /// <param name="v">The single-precision vector.</param>
-        public static implicit operator Vector2d(Vector2 v)
-        {
-            return new Vector2d(v.x, v.y);
-        }
-
-        /// <summary>
-        /// Implicitly converts from an integer vector into a double-precision vector.
-        /// </summary>
-        /// <param name="v">The integer vector.</param>
-        public static implicit operator Vector2d(Vector2i v)
-        {
-            return new Vector2d(v.x, v.y);
-        }
-        #endregion
-
-        #region Public Methods
-        #region Instance
-        /// <summary>
-        /// Set x and y components of an existing vector.
-        /// </summary>
-        /// <param name="x">The x value.</param>
-        /// <param name="y">The y value.</param>
-        public void Set(double x, double y)
-        {
-            this.x = x;
-            this.y = y;
-        }
-
-        /// <summary>
-        /// Multiplies with another vector component-wise.
-        /// </summary>
-        /// <param name="scale">The vector to multiply with.</param>
-        public void Scale(ref Vector2d scale)
-        {
-            x *= scale.x;
-            y *= scale.y;
-        }
-
-        /// <summary>
-        /// Normalizes this vector.
-        /// </summary>
-        public void Normalize()
-        {
-            double mag = this.Magnitude;
-            if (mag > Epsilon)
-            {
-                x /= mag;
-                y /= mag;
-            }
-            else
-            {
-                x = y = 0;
-            }
-        }
-
-        /// <summary>
-        /// Clamps this vector between a specific range.
-        /// </summary>
-        /// <param name="min">The minimum component value.</param>
-        /// <param name="max">The maximum component value.</param>
-        public void Clamp(double min, double max)
-        {
-            if (x < min) x = min;
-            else if (x > max) x = max;
-
-            if (y < min) y = min;
-            else if (y > max) y = max;
-        }
-        #endregion
-
-        #region Object
-        /// <summary>
-        /// Returns a hash code for this vector.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            return x.GetHashCode() ^ y.GetHashCode() << 2;
-        }
-
-        /// <summary>
-        /// Returns if this vector is equal to another one.
-        /// </summary>
-        /// <param name="other">The other vector to compare to.</param>
-        /// <returns>If equals.</returns>
-        public override bool Equals(object other)
-        {
-            if (!(other is Vector2d))
-            {
-                return false;
-            }
-            Vector2d vector = (Vector2d)other;
-            return (x == vector.x && y == vector.y);
-        }
-
-        /// <summary>
-        /// Returns if this vector is equal to another one.
-        /// </summary>
-        /// <param name="other">The other vector to compare to.</param>
-        /// <returns>If equals.</returns>
-        public bool Equals(Vector2d other)
-        {
-            return (x == other.x && y == other.y);
-        }
-
-        /// <summary>
-        /// Returns a nicely formatted string for this vector.
-        /// </summary>
-        /// <returns>The string.</returns>
-        public override string ToString()
-        {
-            return string.Format("({0}, {1})",
-                x.ToString("F1", CultureInfo.InvariantCulture),
-                y.ToString("F1", CultureInfo.InvariantCulture));
-        }
-
-        /// <summary>
-        /// Returns a nicely formatted string for this vector.
-        /// </summary>
-        /// <param name="format">The float format.</param>
-        /// <returns>The string.</returns>
-        public string ToString(string format)
-        {
-            return string.Format("({0}, {1})",
-                x.ToString(format, CultureInfo.InvariantCulture),
-                y.ToString(format, CultureInfo.InvariantCulture));
-        }
-        #endregion
-
-        #region Static
-        /// <summary>
-        /// Dot Product of two vectors.
-        /// </summary>
-        /// <param name="lhs">The left hand side vector.</param>
-        /// <param name="rhs">The right hand side vector.</param>
-        public static double Dot(ref Vector2d lhs, ref Vector2d rhs)
-        {
-            return lhs.x * rhs.x + lhs.y * rhs.y;
-        }
-
-        /// <summary>
-        /// Performs a linear interpolation between two vectors.
-        /// </summary>
-        /// <param name="a">The vector to interpolate from.</param>
-        /// <param name="b">The vector to interpolate to.</param>
-        /// <param name="t">The time fraction.</param>
-        /// <param name="result">The resulting vector.</param>
-        public static void Lerp(ref Vector2d a, ref Vector2d b, double t, out Vector2d result)
-        {
-            result = new Vector2d(a.x + (b.x - a.x) * t, a.y + (b.y - a.y) * t);
-        }
-
-        /// <summary>
-        /// Multiplies two vectors component-wise.
-        /// </summary>
-        /// <param name="a">The first vector.</param>
-        /// <param name="b">The second vector.</param>
-        /// <param name="result">The resulting vector.</param>
-        public static void Scale(ref Vector2d a, ref Vector2d b, out Vector2d result)
-        {
-            result = new Vector2d(a.x * b.x, a.y * b.y);
-        }
-
-        /// <summary>
-        /// Normalizes a vector.
-        /// </summary>
-        /// <param name="value">The vector to normalize.</param>
-        /// <param name="result">The resulting normalized vector.</param>
-        public static void Normalize(ref Vector2d value, out Vector2d result)
-        {
-            double mag = value.Magnitude;
-            if (mag > Epsilon)
-            {
-                result = new Vector2d(value.x / mag, value.y / mag);
-            }
-            else
-            {
-                result = Vector2d.zero;
-            }
-        }
-        #endregion
-        #endregion
-    }
-}

LightlessSync/ThirdParty/MeshDecimator/Math/Vector2i.cs

@@ -1,348 +0,0 @@
-#region License
-/*
-MIT License
-
-Copyright(c) 2017-2018 Mattias Edlund
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-#endregion
-
-using System;
-using System.Globalization;
-
-namespace MeshDecimator.Math
-{
-    /// <summary>
-    /// A 2D integer vector.
-    /// </summary>
-    public struct Vector2i : IEquatable<Vector2i>
-    {
-        #region Static Read-Only
-        /// <summary>
-        /// The zero vector.
-        /// </summary>
-        public static readonly Vector2i zero = new Vector2i(0, 0);
-        #endregion
-
-        #region Fields
-        /// <summary>
-        /// The x component.
-        /// </summary>
-        public int x;
-        /// <summary>
-        /// The y component.
-        /// </summary>
-        public int y;
-        #endregion
-
-        #region Properties
-        /// <summary>
-        /// Gets the magnitude of this vector.
-        /// </summary>
-        public int Magnitude
-        {
-            get { return (int)System.Math.Sqrt(x * x + y * y); }
-        }
-
-        /// <summary>
-        /// Gets the squared magnitude of this vector.
-        /// </summary>
-        public int MagnitudeSqr
-        {
-            get { return (x * x + y * y); }
-        }
-
-        /// <summary>
-        /// Gets or sets a specific component by index in this vector.
-        /// </summary>
-        /// <param name="index">The component index.</param>
-        public int this[int index]
-        {
-            get
-            {
-                switch (index)
-                {
-                    case 0:
-                        return x;
-                    case 1:
-                        return y;
-                    default:
-                        throw new IndexOutOfRangeException("Invalid Vector2i index!");
-                }
-            }
-            set
-            {
-                switch (index)
-                {
-                    case 0:
-                        x = value;
-                        break;
-                    case 1:
-                        y = value;
-                        break;
-                    default:
-                        throw new IndexOutOfRangeException("Invalid Vector2i index!");
-                }
-            }
-        }
-        #endregion
-
-        #region Constructor
-        /// <summary>
-        /// Creates a new vector with one value for all components.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        public Vector2i(int value)
-        {
-            this.x = value;
-            this.y = value;
-        }
-
-        /// <summary>
-        /// Creates a new vector.
-        /// </summary>
-        /// <param name="x">The x value.</param>
-        /// <param name="y">The y value.</param>
-        public Vector2i(int x, int y)
-        {
-            this.x = x;
-            this.y = y;
-        }
-        #endregion
-
-        #region Operators
-        /// <summary>
-        /// Adds two vectors.
-        /// </summary>
-        /// <param name="a">The first vector.</param>
-        /// <param name="b">The second vector.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector2i operator +(Vector2i a, Vector2i b)
-        {
-            return new Vector2i(a.x + b.x, a.y + b.y);
-        }
-
-        /// <summary>
-        /// Subtracts two vectors.
-        /// </summary>
-        /// <param name="a">The first vector.</param>
-        /// <param name="b">The second vector.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector2i operator -(Vector2i a, Vector2i b)
-        {
-            return new Vector2i(a.x - b.x, a.y - b.y);
-        }
-
-        /// <summary>
-        /// Scales the vector uniformly.
-        /// </summary>
-        /// <param name="a">The vector.</param>
-        /// <param name="d">The scaling value.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector2i operator *(Vector2i a, int d)
-        {
-            return new Vector2i(a.x * d, a.y * d);
-        }
-
-        /// <summary>
-        /// Scales the vector uniformly.
-        /// </summary>
-        /// <param name="d">The scaling value.</param>
-        /// <param name="a">The vector.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector2i operator *(int d, Vector2i a)
-        {
-            return new Vector2i(a.x * d, a.y * d);
-        }
-
-        /// <summary>
-        /// Divides the vector with a float.
-        /// </summary>
-        /// <param name="a">The vector.</param>
-        /// <param name="d">The dividing float value.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector2i operator /(Vector2i a, int d)
-        {
-            return new Vector2i(a.x / d, a.y / d);
-        }
-
-        /// <summary>
-        /// Subtracts the vector from a zero vector.
-        /// </summary>
-        /// <param name="a">The vector.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector2i operator -(Vector2i a)
-        {
-            return new Vector2i(-a.x, -a.y);
-        }
-
-        /// <summary>
-        /// Returns if two vectors equals eachother.
-        /// </summary>
-        /// <param name="lhs">The left hand side vector.</param>
-        /// <param name="rhs">The right hand side vector.</param>
-        /// <returns>If equals.</returns>
-        public static bool operator ==(Vector2i lhs, Vector2i rhs)
-        {
-            return (lhs.x == rhs.x && lhs.y == rhs.y);
-        }
-
-        /// <summary>
-        /// Returns if two vectors don't equal eachother.
-        /// </summary>
-        /// <param name="lhs">The left hand side vector.</param>
-        /// <param name="rhs">The right hand side vector.</param>
-        /// <returns>If not equals.</returns>
-        public static bool operator !=(Vector2i lhs, Vector2i rhs)
-        {
-            return (lhs.x != rhs.x || lhs.y != rhs.y);
-        }
-
-        /// <summary>
-        /// Explicitly converts from a single-precision vector into an integer vector.
-        /// </summary>
-        /// <param name="v">The single-precision vector.</param>
-        public static explicit operator Vector2i(Vector2 v)
-        {
-            return new Vector2i((int)v.x, (int)v.y);
-        }
-
-        /// <summary>
-        /// Explicitly converts from a double-precision vector into an integer vector.
-        /// </summary>
-        /// <param name="v">The double-precision vector.</param>
-        public static explicit operator Vector2i(Vector2d v)
-        {
-            return new Vector2i((int)v.x, (int)v.y);
-        }
-        #endregion
-
-        #region Public Methods
-        #region Instance
-        /// <summary>
-        /// Set x and y components of an existing vector.
-        /// </summary>
-        /// <param name="x">The x value.</param>
-        /// <param name="y">The y value.</param>
-        public void Set(int x, int y)
-        {
-            this.x = x;
-            this.y = y;
-        }
-
-        /// <summary>
-        /// Multiplies with another vector component-wise.
-        /// </summary>
-        /// <param name="scale">The vector to multiply with.</param>
-        public void Scale(ref Vector2i scale)
-        {
-            x *= scale.x;
-            y *= scale.y;
-        }
-
-        /// <summary>
-        /// Clamps this vector between a specific range.
-        /// </summary>
-        /// <param name="min">The minimum component value.</param>
-        /// <param name="max">The maximum component value.</param>
-        public void Clamp(int min, int max)
-        {
-            if (x < min) x = min;
-            else if (x > max) x = max;
-
-            if (y < min) y = min;
-            else if (y > max) y = max;
-        }
-        #endregion
-
-        #region Object
-        /// <summary>
-        /// Returns a hash code for this vector.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            return x.GetHashCode() ^ y.GetHashCode() << 2;
-        }
-
-        /// <summary>
-        /// Returns if this vector is equal to another one.
-        /// </summary>
-        /// <param name="other">The other vector to compare to.</param>
-        /// <returns>If equals.</returns>
-        public override bool Equals(object other)
-        {
-            if (!(other is Vector2i))
-            {
-                return false;
-            }
-            Vector2i vector = (Vector2i)other;
-            return (x == vector.x && y == vector.y);
-        }
-
-        /// <summary>
-        /// Returns if this vector is equal to another one.
-        /// </summary>
-        /// <param name="other">The other vector to compare to.</param>
-        /// <returns>If equals.</returns>
-        public bool Equals(Vector2i other)
-        {
-            return (x == other.x && y == other.y);
-        }
-
-        /// <summary>
-        /// Returns a nicely formatted string for this vector.
-        /// </summary>
-        /// <returns>The string.</returns>
-        public override string ToString()
-        {
-            return string.Format("({0}, {1})",
-                x.ToString(CultureInfo.InvariantCulture),
-                y.ToString(CultureInfo.InvariantCulture));
-        }
-
-        /// <summary>
-        /// Returns a nicely formatted string for this vector.
-        /// </summary>
-        /// <param name="format">The integer format.</param>
-        /// <returns>The string.</returns>
-        public string ToString(string format)
-        {
-            return string.Format("({0}, {1})",
-                x.ToString(format, CultureInfo.InvariantCulture),
-                y.ToString(format, CultureInfo.InvariantCulture));
-        }
-        #endregion
-
-        #region Static
-        /// <summary>
-        /// Multiplies two vectors component-wise.
-        /// </summary>
-        /// <param name="a">The first vector.</param>
-        /// <param name="b">The second vector.</param>
-        /// <param name="result">The resulting vector.</param>
-        public static void Scale(ref Vector2i a, ref Vector2i b, out Vector2i result)
-        {
-            result = new Vector2i(a.x * b.x, a.y * b.y);
-        }
-        #endregion
-        #endregion
-    }
-}

LightlessSync/ThirdParty/MeshDecimator/Math/Vector3.cs

@@ -1,494 +0,0 @@
-#region License
-/*
-MIT License
-
-Copyright(c) 2017-2018 Mattias Edlund
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-#endregion
-
-using System;
-using System.Globalization;
-
-namespace MeshDecimator.Math
-{
-    /// <summary>
-    /// A single precision 3D vector.
-    /// </summary>
-    public struct Vector3 : IEquatable<Vector3>
-    {
-        #region Static Read-Only
-        /// <summary>
-        /// The zero vector.
-        /// </summary>
-        public static readonly Vector3 zero = new Vector3(0, 0, 0);
-        #endregion
-
-        #region Consts
-        /// <summary>
-        /// The vector epsilon.
-        /// </summary>
-        public const float Epsilon = 9.99999944E-11f;
-        #endregion
-
-        #region Fields
-        /// <summary>
-        /// The x component.
-        /// </summary>
-        public float x;
-        /// <summary>
-        /// The y component.
-        /// </summary>
-        public float y;
-        /// <summary>
-        /// The z component.
-        /// </summary>
-        public float z;
-        #endregion
-
-        #region Properties
-        /// <summary>
-        /// Gets the magnitude of this vector.
-        /// </summary>
-        public float Magnitude
-        {
-            get { return (float)System.Math.Sqrt(x * x + y * y + z * z); }
-        }
-
-        /// <summary>
-        /// Gets the squared magnitude of this vector.
-        /// </summary>
-        public float MagnitudeSqr
-        {
-            get { return (x * x + y * y + z * z); }
-        }
-
-        /// <summary>
-        /// Gets a normalized vector from this vector.
-        /// </summary>
-        public Vector3 Normalized
-        {
-            get
-            {
-                Vector3 result;
-                Normalize(ref this, out result);
-                return result;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a specific component by index in this vector.
-        /// </summary>
-        /// <param name="index">The component index.</param>
-        public float this[int index]
-        {
-            get
-            {
-                switch (index)
-                {
-                    case 0:
-                        return x;
-                    case 1:
-                        return y;
-                    case 2:
-                        return z;
-                    default:
-                        throw new IndexOutOfRangeException("Invalid Vector3 index!");
-                }
-            }
-            set
-            {
-                switch (index)
-                {
-                    case 0:
-                        x = value;
-                        break;
-                    case 1:
-                        y = value;
-                        break;
-                    case 2:
-                        z = value;
-                        break;
-                    default:
-                        throw new IndexOutOfRangeException("Invalid Vector3 index!");
-                }
-            }
-        }
-        #endregion
-
-        #region Constructor
-        /// <summary>
-        /// Creates a new vector with one value for all components.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        public Vector3(float value)
-        {
-            this.x = value;
-            this.y = value;
-            this.z = value;
-        }
-
-        /// <summary>
-        /// Creates a new vector.
-        /// </summary>
-        /// <param name="x">The x value.</param>
-        /// <param name="y">The y value.</param>
-        /// <param name="z">The z value.</param>
-        public Vector3(float x, float y, float z)
-        {
-            this.x = x;
-            this.y = y;
-            this.z = z;
-        }
-
-        /// <summary>
-        /// Creates a new vector from a double precision vector.
-        /// </summary>
-        /// <param name="vector">The double precision vector.</param>
-        public Vector3(Vector3d vector)
-        {
-            this.x = (float)vector.x;
-            this.y = (float)vector.y;
-            this.z = (float)vector.z;
-        }
-        #endregion
-
-        #region Operators
-        /// <summary>
-        /// Adds two vectors.
-        /// </summary>
-        /// <param name="a">The first vector.</param>
-        /// <param name="b">The second vector.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector3 operator +(Vector3 a, Vector3 b)
-        {
-            return new Vector3(a.x + b.x, a.y + b.y, a.z + b.z);
-        }
-
-        /// <summary>
-        /// Subtracts two vectors.
-        /// </summary>
-        /// <param name="a">The first vector.</param>
-        /// <param name="b">The second vector.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector3 operator -(Vector3 a, Vector3 b)
-        {
-            return new Vector3(a.x - b.x, a.y - b.y, a.z - b.z);
-        }
-
-        /// <summary>
-        /// Scales the vector uniformly.
-        /// </summary>
-        /// <param name="a">The vector.</param>
-        /// <param name="d">The scaling value.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector3 operator *(Vector3 a, float d)
-        {
-            return new Vector3(a.x * d, a.y * d, a.z * d);
-        }
-
-        /// <summary>
-        /// Scales the vector uniformly.
-        /// </summary>
-        /// <param name="d">The scaling value.</param>
-        /// <param name="a">The vector.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector3 operator *(float d, Vector3 a)
-        {
-            return new Vector3(a.x * d, a.y * d, a.z * d);
-        }
-
-        /// <summary>
-        /// Divides the vector with a float.
-        /// </summary>
-        /// <param name="a">The vector.</param>
-        /// <param name="d">The dividing float value.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector3 operator /(Vector3 a, float d)
-        {
-            return new Vector3(a.x / d, a.y / d, a.z / d);
-        }
-
-        /// <summary>
-        /// Subtracts the vector from a zero vector.
-        /// </summary>
-        /// <param name="a">The vector.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector3 operator -(Vector3 a)
-        {
-            return new Vector3(-a.x, -a.y, -a.z);
-        }
-
-        /// <summary>
-        /// Returns if two vectors equals eachother.
-        /// </summary>
-        /// <param name="lhs">The left hand side vector.</param>
-        /// <param name="rhs">The right hand side vector.</param>
-        /// <returns>If equals.</returns>
-        public static bool operator ==(Vector3 lhs, Vector3 rhs)
-        {
-            return (lhs - rhs).MagnitudeSqr < Epsilon;
-        }
-
-        /// <summary>
-        /// Returns if two vectors don't equal eachother.
-        /// </summary>
-        /// <param name="lhs">The left hand side vector.</param>
-        /// <param name="rhs">The right hand side vector.</param>
-        /// <returns>If not equals.</returns>
-        public static bool operator !=(Vector3 lhs, Vector3 rhs)
-        {
-            return (lhs - rhs).MagnitudeSqr >= Epsilon;
-        }
-
-        /// <summary>
-        /// Explicitly converts from a double-precision vector into a single-precision vector.
-        /// </summary>
-        /// <param name="v">The double-precision vector.</param>
-        public static explicit operator Vector3(Vector3d v)
-        {
-            return new Vector3((float)v.x, (float)v.y, (float)v.z);
-        }
-
-        /// <summary>
-        /// Implicitly converts from an integer vector into a single-precision vector.
-        /// </summary>
-        /// <param name="v">The integer vector.</param>
-        public static implicit operator Vector3(Vector3i v)
-        {
-            return new Vector3(v.x, v.y, v.z);
-        }
-        #endregion
-
-        #region Public Methods
-        #region Instance
-        /// <summary>
-        /// Set x, y and z components of an existing vector.
-        /// </summary>
-        /// <param name="x">The x value.</param>
-        /// <param name="y">The y value.</param>
-        /// <param name="z">The z value.</param>
-        public void Set(float x, float y, float z)
-        {
-            this.x = x;
-            this.y = y;
-            this.z = z;
-        }
-
-        /// <summary>
-        /// Multiplies with another vector component-wise.
-        /// </summary>
-        /// <param name="scale">The vector to multiply with.</param>
-        public void Scale(ref Vector3 scale)
-        {
-            x *= scale.x;
-            y *= scale.y;
-            z *= scale.z;
-        }
-
-        /// <summary>
-        /// Normalizes this vector.
-        /// </summary>
-        public void Normalize()
-        {
-            float mag = this.Magnitude;
-            if (mag > Epsilon)
-            {
-                x /= mag;
-                y /= mag;
-                z /= mag;
-            }
-            else
-            {
-                x = y = z = 0;
-            }
-        }
-
-        /// <summary>
-        /// Clamps this vector between a specific range.
-        /// </summary>
-        /// <param name="min">The minimum component value.</param>
-        /// <param name="max">The maximum component value.</param>
-        public void Clamp(float min, float max)
-        {
-            if (x < min) x = min;
-            else if (x > max) x = max;
-
-            if (y < min) y = min;
-            else if (y > max) y = max;
-
-            if (z < min) z = min;
-            else if (z > max) z = max;
-        }
-        #endregion
-
-        #region Object
-        /// <summary>
-        /// Returns a hash code for this vector.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            return x.GetHashCode() ^ y.GetHashCode() << 2 ^ z.GetHashCode() >> 2;
-        }
-
-        /// <summary>
-        /// Returns if this vector is equal to another one.
-        /// </summary>
-        /// <param name="other">The other vector to compare to.</param>
-        /// <returns>If equals.</returns>
-        public override bool Equals(object other)
-        {
-            if (!(other is Vector3))
-            {
-                return false;
-            }
-            Vector3 vector = (Vector3)other;
-            return (x == vector.x && y == vector.y && z == vector.z);
-        }
-
-        /// <summary>
-        /// Returns if this vector is equal to another one.
-        /// </summary>
-        /// <param name="other">The other vector to compare to.</param>
-        /// <returns>If equals.</returns>
-        public bool Equals(Vector3 other)
-        {
-            return (x == other.x && y == other.y && z == other.z);
-        }
-
-        /// <summary>
-        /// Returns a nicely formatted string for this vector.
-        /// </summary>
-        /// <returns>The string.</returns>
-        public override string ToString()
-        {
-            return string.Format("({0}, {1}, {2})",
-                x.ToString("F1", CultureInfo.InvariantCulture),
-                y.ToString("F1", CultureInfo.InvariantCulture),
-                z.ToString("F1", CultureInfo.InvariantCulture));
-        }
-
-        /// <summary>
-        /// Returns a nicely formatted string for this vector.
-        /// </summary>
-        /// <param name="format">The float format.</param>
-        /// <returns>The string.</returns>
-        public string ToString(string format)
-        {
-            return string.Format("({0}, {1}, {2})",
-                x.ToString(format, CultureInfo.InvariantCulture),
-                y.ToString(format, CultureInfo.InvariantCulture),
-                z.ToString(format, CultureInfo.InvariantCulture));
-        }
-        #endregion
-
-        #region Static
-        /// <summary>
-        /// Dot Product of two vectors.
-        /// </summary>
-        /// <param name="lhs">The left hand side vector.</param>
-        /// <param name="rhs">The right hand side vector.</param>
-        public static float Dot(ref Vector3 lhs, ref Vector3 rhs)
-        {
-            return lhs.x * rhs.x + lhs.y * rhs.y + lhs.z * rhs.z;
-        }
-
-        /// <summary>
-        /// Cross Product of two vectors.
-        /// </summary>
-        /// <param name="lhs">The left hand side vector.</param>
-        /// <param name="rhs">The right hand side vector.</param>
-        /// <param name="result">The resulting vector.</param>
-        public static void Cross(ref Vector3 lhs, ref Vector3 rhs, out Vector3 result)
-        {
-            result = new Vector3(lhs.y * rhs.z - lhs.z * rhs.y, lhs.z * rhs.x - lhs.x * rhs.z, lhs.x * rhs.y - lhs.y * rhs.x);
-        }
-
-        /// <summary>
-        /// Calculates the angle between two vectors.
-        /// </summary>
-        /// <param name="from">The from vector.</param>
-        /// <param name="to">The to vector.</param>
-        /// <returns>The angle.</returns>
-        public static float Angle(ref Vector3 from, ref Vector3 to)
-        {
-            Vector3 fromNormalized = from.Normalized;
-            Vector3 toNormalized = to.Normalized;
-            return (float)System.Math.Acos(MathHelper.Clamp(Vector3.Dot(ref fromNormalized, ref toNormalized), -1f, 1f)) * MathHelper.Rad2Deg;
-        }
-
-        /// <summary>
-        /// Performs a linear interpolation between two vectors.
-        /// </summary>
-        /// <param name="a">The vector to interpolate from.</param>
-        /// <param name="b">The vector to interpolate to.</param>
-        /// <param name="t">The time fraction.</param>
-        /// <param name="result">The resulting vector.</param>
-        public static void Lerp(ref Vector3 a, ref Vector3 b, float t, out Vector3 result)
-        {
-            result = new Vector3(a.x + (b.x - a.x) * t, a.y + (b.y - a.y) * t, a.z + (b.z - a.z) * t);
-        }
-
-        /// <summary>
-        /// Multiplies two vectors component-wise.
-        /// </summary>
-        /// <param name="a">The first vector.</param>
-        /// <param name="b">The second vector.</param>
-        /// <param name="result">The resulting vector.</param>
-        public static void Scale(ref Vector3 a, ref Vector3 b, out Vector3 result)
-        {
-            result = new Vector3(a.x * b.x, a.y * b.y, a.z * b.z);
-        }
-
-        /// <summary>
-        /// Normalizes a vector.
-        /// </summary>
-        /// <param name="value">The vector to normalize.</param>
-        /// <param name="result">The resulting normalized vector.</param>
-        public static void Normalize(ref Vector3 value, out Vector3 result)
-        {
-            float mag = value.Magnitude;
-            if (mag > Epsilon)
-            {
-                result = new Vector3(value.x / mag, value.y / mag, value.z / mag);
-            }
-            else
-            {
-                result = Vector3.zero;
-            }
-        }
-
-        /// <summary>
-        /// Normalizes both vectors and makes them orthogonal to each other.
-        /// </summary>
-        /// <param name="normal">The normal vector.</param>
-        /// <param name="tangent">The tangent.</param>
-        public static void OrthoNormalize(ref Vector3 normal, ref Vector3 tangent)
-        {
-            normal.Normalize();
-            Vector3 proj = normal * Vector3.Dot(ref tangent, ref normal);
-            tangent -= proj;
-            tangent.Normalize();
-        }
-        #endregion
-        #endregion
-    }
-}

LightlessSync/ThirdParty/MeshDecimator/Math/Vector3d.cs

@@ -1,481 +0,0 @@
-#region License
-/*
-MIT License
-
-Copyright(c) 2017-2018 Mattias Edlund
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-#endregion
-
-using System;
-using System.Globalization;
-
-namespace MeshDecimator.Math
-{
-    /// <summary>
-    /// A double precision 3D vector.
-    /// </summary>
-    public struct Vector3d : IEquatable<Vector3d>
-    {
-        #region Static Read-Only
-        /// <summary>
-        /// The zero vector.
-        /// </summary>
-        public static readonly Vector3d zero = new Vector3d(0, 0, 0);
-        #endregion
-
-        #region Consts
-        /// <summary>
-        /// The vector epsilon.
-        /// </summary>
-        public const double Epsilon = double.Epsilon;
-        #endregion
-
-        #region Fields
-        /// <summary>
-        /// The x component.
-        /// </summary>
-        public double x;
-        /// <summary>
-        /// The y component.
-        /// </summary>
-        public double y;
-        /// <summary>
-        /// The z component.
-        /// </summary>
-        public double z;
-        #endregion
-
-        #region Properties
-        /// <summary>
-        /// Gets the magnitude of this vector.
-        /// </summary>
-        public double Magnitude
-        {
-            get { return System.Math.Sqrt(x * x + y * y + z * z); }
-        }
-
-        /// <summary>
-        /// Gets the squared magnitude of this vector.
-        /// </summary>
-        public double MagnitudeSqr
-        {
-            get { return (x * x + y * y + z * z); }
-        }
-
-        /// <summary>
-        /// Gets a normalized vector from this vector.
-        /// </summary>
-        public Vector3d Normalized
-        {
-            get
-            {
-                Vector3d result;
-                Normalize(ref this, out result);
-                return result;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a specific component by index in this vector.
-        /// </summary>
-        /// <param name="index">The component index.</param>
-        public double this[int index]
-        {
-            get
-            {
-                switch (index)
-                {
-                    case 0:
-                        return x;
-                    case 1:
-                        return y;
-                    case 2:
-                        return z;
-                    default:
-                        throw new IndexOutOfRangeException("Invalid Vector3d index!");
-                }
-            }
-            set
-            {
-                switch (index)
-                {
-                    case 0:
-                        x = value;
-                        break;
-                    case 1:
-                        y = value;
-                        break;
-                    case 2:
-                        z = value;
-                        break;
-                    default:
-                        throw new IndexOutOfRangeException("Invalid Vector3d index!");
-                }
-            }
-        }
-        #endregion
-
-        #region Constructor
-        /// <summary>
-        /// Creates a new vector with one value for all components.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        public Vector3d(double value)
-        {
-            this.x = value;
-            this.y = value;
-            this.z = value;
-        }
-
-        /// <summary>
-        /// Creates a new vector.
-        /// </summary>
-        /// <param name="x">The x value.</param>
-        /// <param name="y">The y value.</param>
-        /// <param name="z">The z value.</param>
-        public Vector3d(double x, double y, double z)
-        {
-            this.x = x;
-            this.y = y;
-            this.z = z;
-        }
-
-        /// <summary>
-        /// Creates a new vector from a single precision vector.
-        /// </summary>
-        /// <param name="vector">The single precision vector.</param>
-        public Vector3d(Vector3 vector)
-        {
-            this.x = vector.x;
-            this.y = vector.y;
-            this.z = vector.z;
-        }
-        #endregion
-
-        #region Operators
-        /// <summary>
-        /// Adds two vectors.
-        /// </summary>
-        /// <param name="a">The first vector.</param>
-        /// <param name="b">The second vector.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector3d operator +(Vector3d a, Vector3d b)
-        {
-            return new Vector3d(a.x + b.x, a.y + b.y, a.z + b.z);
-        }
-
-        /// <summary>
-        /// Subtracts two vectors.
-        /// </summary>
-        /// <param name="a">The first vector.</param>
-        /// <param name="b">The second vector.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector3d operator -(Vector3d a, Vector3d b)
-        {
-            return new Vector3d(a.x - b.x, a.y - b.y, a.z - b.z);
-        }
-
-        /// <summary>
-        /// Scales the vector uniformly.
-        /// </summary>
-        /// <param name="a">The vector.</param>
-        /// <param name="d">The scaling value.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector3d operator *(Vector3d a, double d)
-        {
-            return new Vector3d(a.x * d, a.y * d, a.z * d);
-        }
-
-        /// <summary>
-        /// Scales the vector uniformly.
-        /// </summary>
-        /// <param name="d">The scaling value.</param>
-        /// <param name="a">The vector.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector3d operator *(double d, Vector3d a)
-        {
-            return new Vector3d(a.x * d, a.y * d, a.z * d);
-        }
-
-        /// <summary>
-        /// Divides the vector with a float.
-        /// </summary>
-        /// <param name="a">The vector.</param>
-        /// <param name="d">The dividing float value.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector3d operator /(Vector3d a, double d)
-        {
-            return new Vector3d(a.x / d, a.y / d, a.z / d);
-        }
-
-        /// <summary>
-        /// Subtracts the vector from a zero vector.
-        /// </summary>
-        /// <param name="a">The vector.</param>
-        /// <returns>The resulting vector.</returns>
-        public static Vector3d operator -(Vector3d a)
-        {
-            return new Vector3d(-a.x, -a.y, -a.z);
-        }
-
-        /// <summary>
-        /// Returns if two vectors equals eachother.
-        /// </summary>
-        /// <param name="lhs">The left hand side vector.</param>
-        /// <param name="rhs">The right hand side vector.</param>
-        /// <returns>If equals.</returns>
-        public static bool operator ==(Vector3d lhs, Vector3d rhs)
-        {
-            return (lhs - rhs).MagnitudeSqr < Epsilon;
-        }
-
-        /// <summary>
-        /// Returns if two vectors don't equal eachother.
-        /// </summary>
-        /// <param name="lhs">The left hand side vector.</param>
-        /// <param name="rhs">The right hand side vector.</param>
-        /// <returns>If not equals.</returns>
-        public static bool operator !=(Vector3d lhs, Vector3d rhs)
-        {
-            return (lhs - rhs).MagnitudeSqr >= Epsilon;
-        }
-
-        /// <summary>
-        /// Implicitly converts from a single-precision vector into a double-precision vector.
-        /// </summary>
-        /// <param name="v">The single-precision vector.</param>
-        public static implicit operator Vector3d(Vector3 v)
-        {
-            return new Vector3d(v.x, v.y, v.z);
-        }
-
-        /// <summary>
-        /// Implicitly converts from an integer vector into a double-precision vector.
-        /// </summary>
-        /// <param name="v">The integer vector.</param>
-        public static implicit operator Vector3d(Vector3i v)
-        {
-            return new Vector3d(v.x, v.y, v.z);
-        }
-        #endregion
-
-        #region Public Methods
-        #region Instance
-        /// <summary>
-        /// Set x, y and z components of an existing vector.
-        /// </summary>
-        /// <param name="x">The x value.</param>
-        /// <param name="y">The y value.</param>
-        /// <param name="z">The z value.</param>
-        public void Set(double x, double y, double z)
-        {
-            this.x = x;
-            this.y = y;
-            this.z = z;
-        }
-
-        /// <summary>
-        /// Multiplies with another vector component-wise.
-        /// </summary>
-        /// <param name="scale">The vector to multiply with.</param>
-        public void Scale(ref Vector3d scale)
-        {
-            x *= scale.x;
-            y *= scale.y;
-            z *= scale.z;
-        }
-
-        /// <summary>
-        /// Normalizes this vector.
-        /// </summary>
-        public void Normalize()
-        {
-            double mag = this.Magnitude;
-            if (mag > Epsilon)
-            {
-                x /= mag;
-                y /= mag;
-                z /= mag;
-            }
-            else
-            {
-                x = y = z = 0;
-            }
-        }
-
-        /// <summary>
-        /// Clamps this vector between a specific range.
-        /// </summary>
-        /// <param name="min">The minimum component value.</param>
-        /// <param name="max">The maximum component value.</param>
-        public void Clamp(double min, double max)
-        {
-            if (x < min) x = min;
-            else if (x > max) x = max;
-
-            if (y < min) y = min;
-            else if (y > max) y = max;
-
-            if (z < min) z = min;
-            else if (z > max) z = max;
-        }
-        #endregion
-
-        #region Object
-        /// <summary>
-        /// Returns a hash code for this vector.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            return x.GetHashCode() ^ y.GetHashCode() << 2 ^ z.GetHashCode() >> 2;
-        }
-
-        /// <summary>
-        /// Returns if this vector is equal to another one.
-        /// </summary>
-        /// <param name="other">The other vector to compare to.</param>
-        /// <returns>If equals.</returns>
-        public override bool Equals(object other)
-        {
-            if (!(other is Vector3d))
-            {
-                return false;
-            }
-            Vector3d vector = (Vector3d)other;
-            return (x == vector.x && y == vector.y && z == vector.z);
-        }
-
-        /// <summary>
-        /// Returns if this vector is equal to another one.
-        /// </summary>
-        /// <param name="other">The other vector to compare to.</param>
-        /// <returns>If equals.</returns>
-        public bool Equals(Vector3d other)
-        {
-            return (x == other.x && y == other.y && z == other.z);
-        }
-
-        /// <summary>
-        /// Returns a nicely formatted string for this vector.
-        /// </summary>
-        /// <returns>The string.</returns>
-        public override string ToString()
-        {
-            return string.Format("({0}, {1}, {2})",
-                x.ToString("F1", CultureInfo.InvariantCulture),
-                y.ToString("F1", CultureInfo.InvariantCulture),
-                z.ToString("F1", CultureInfo.InvariantCulture));
-        }
-
-        /// <summary>
-        /// Returns a nicely formatted string for this vector.
-        /// </summary>
-        /// <param name="format">The float format.</param>
-        /// <returns>The string.</returns>
-        public string ToString(string format)
-        {
-            return string.Format("({0}, {1}, {2})",
-                x.ToString(format, CultureInfo.InvariantCulture),
-                y.ToString(format, CultureInfo.InvariantCulture),
-                z.ToString(format, CultureInfo.InvariantCulture));
-        }
-        #endregion
-
-        #region Static
-        /// <summary>
-        /// Dot Product of two vectors.
-        /// </summary>
-        /// <param name="lhs">The left hand side vector.</param>
-        /// <param name="rhs">The right hand side vector.</param>
-        public static double Dot(ref Vector3d lhs, ref Vector3d rhs)
-        {
-            return lhs.x * rhs.x + lhs.y * rhs.y + lhs.z * rhs.z;
-        }
-
-        /// <summary>
-        /// Cross Product of two vectors.
-        /// </summary>
-        /// <param name="lhs">The left hand side vector.</param>
-        /// <param name="rhs">The right hand side vector.</param>
-        /// <param name="result">The resulting vector.</param>
-        public static void Cross(ref Vector3d lhs, ref Vector3d rhs, out Vector3d result)
-        {
-            result = new Vector3d(lhs.y * rhs.z - lhs.z * rhs.y, lhs.z * rhs.x - lhs.x * rhs.z, lhs.x * rhs.y - lhs.y * rhs.x);
-        }
-
-        /// <summary>
-        /// Calculates the angle between two vectors.
-        /// </summary>
-        /// <param name="from">The from vector.</param>
-        /// <param name="to">The to vector.</param>
-        /// <returns>The angle.</returns>
-        public static double Angle(ref Vector3d from, ref Vector3d to)
-        {
-            Vector3d fromNormalized = from.Normalized;
-            Vector3d toNormalized = to.Normalized;
-            return System.Math.Acos(MathHelper.Clamp(Vector3d.Dot(ref fromNormalized, ref toNormalized), -1.0, 1.0)) * MathHelper.Rad2Degd;
-        }
-
-        /// <summary>
-        /// Performs a linear interpolation between two vectors.
-        /// </summary>
-        /// <param name="a">The vector to interpolate from.</param>
-        /// <param name="b">The vector to interpolate to.</param>
-        /// <param name="t">The time fraction.</param>
-        /// <param name="result">The resulting vector.</param>
-        public static void Lerp(ref Vector3d a, ref Vector3d b, double t, out Vector3d result)
-        {
-            result = new Vector3d(a.x + (b.x - a.x) * t, a.y + (b.y - a.y) * t, a.z + (b.z - a.z) * t);
-        }
-
-        /// <summary>
-        /// Multiplies two vectors component-wise.
-        /// </summary>
-        /// <param name="a">The first vector.</param>
-        /// <param name="b">The second vector.</param>
-        /// <param name="result">The resulting vector.</param>
-        public static void Scale(ref Vector3d a, ref Vector3d b, out Vector3d result)
-        {
-            result = new Vector3d(a.x * b.x, a.y * b.y, a.z * b.z);
-        }
-
-        /// <summary>
-        /// Normalizes a vector.
-        /// </summary>
-        /// <param name="value">The vector to normalize.</param>
-        /// <param name="result">The resulting normalized vector.</param>
-        public static void Normalize(ref Vector3d value, out Vector3d result)
-        {
-            double mag = value.Magnitude;
-            if (mag > Epsilon)
-            {
-                result = new Vector3d(value.x / mag, value.y / mag, value.z / mag);
-            }
-            else
-            {
-                result = Vector3d.zero;
-            }
-        }
-        #endregion
-        #endregion
-    }
-}