bumpity bump

Reviewed-on: #140

LightlessSync/Changelog/changelog.yaml

@@ -1,86 +1,11 @@
-tagline: "Lightless Sync v2.1.0"
-subline: "Location Sharing, Animation Scanning, Sync Improvements, Lifestream IPC, and More!"
+tagline: "Lightless Sync v2.0.1"
+subline: "LIGHTLESS IS EVOLVING!!"
 changelog:
-  - name: "v2.1.0"
-    tagline: "Happy New Year!"
-    date: "January 20 2026"
-   # be sure to set this every new version
-    isCurrent: true
-    versions:
-      - number: "Location Sharing (S/O to Tsubasa from the MareCN team for this feature!)"
-        icon: ""
-        items:
-          - "Are you TIRED of scrambling to find the address of the venue you're in to share with your friends? We are introducing Location Sharing! An optional feature where you can share your location with direct pairs temporarily [30 minutes, 1 hour, 3 hours] or until you turn it off for them. That's up to you!"
-          - "To share your location with a pair, click the three dots beside the pair and choose a duration to share with them."
-          - "To view the location of someone who's shared with you, simply hover over the globe icon!"
-      - number: "Model Optimization (Mesh Decimating)"
-        icon: ""
-        items:
-          - "This new option can automatically “simplify” incoming character meshes to help performance by reducing triangle counts. You choose how strong the reduction is (default/recommended is 80%). "
-          - "Decimation only kicks in when a mesh is above a certain triangle threshold, and only for the items that qualify for it and you selected for."
-          - "Hair meshes is always excluded, since simplifying hair meshes is very prone to breaking."
-          - "You can find everything under Settings → Performance → Model Optimization."
-          - "IF YOU HAVE USED DECIMATION IN TESTING, PLEASE CLEAR YOUR CACHE!" 
-      - number: "Animation (PAP) Validation (Safer animations)"
-        icon: ""
-        items:
-          - "Lightless now checks your currently animations to see if they work with your local skeleton/bone mod. If an animation matches, it’s included in what gets sent to other players. If it doesn’t, Lightless will skip it and write a warning to your log showing how many were skipped due to skeleton changes. Its defaulted to Unsafe (off). turn it on if you experience crashes from others users."
-          - "Lightless also does the same kind of check for incoming animation files, to make sure they match the body/skeleton they were sent with."
-          - "Because these checks can sometimes be a little picky, you can adjust how strict they are in Settings -> General -> Animation & Bones to reduce false positives."
-      - number: "UI Changes (Thanks to Choco for UI Changes)"
-        icon: ""
-        items:
-          - "The top part of the main screen has gotten a makeover. You can adjust the colors of the gradiant in the Color settings of Lightless."
-          - "Settings have gotten some changes as well to make this change more universal, and will use the same color settings."
-          - "The particle effects of the gradient are toggleable in 'Settings -> UI -> Behavior"
-          - "Instead of showing download/upload on bottom of Main UI, it will show VRAM usage and triangles with their optimization options next to it"  
-      - number: "LightFinder / ShellFinder"
-        icon: ""
-        items:
-          - "UI Changes that follow our new design follow the color codes for the Gradient top as the main screen does."
-          - "A list of players using LightFinder near you is now available."
-          - "Improved the look of ShellFinder; a new pop-up for the join screen is included. This will be merged into more spots later."
-      - number: "Syncing Changes"
-        icon: ""
-        items:
-          - "Fixed a bottleneck that caused hitching for some users."
-          - "Fixed a bug where files in the downscale directory were not being deleted correctly."
-          - "Improved performance tracking by tracking both original and effective triangle counts."
-          - "Improved owned object detection."
-          - "Reverted collection work to old way to mitigate the syncing and VFX issues." 
-          - "Fixed minion/mount/pet tracking to validate against player-related."
-          - "Added timeout support to Wait For Fully Loaded."
-          - "Enhanced pair handling to support model decimation. (Effective Triangles)."
-          - "Improved downloads through atomization."
-          - "Improved data management by only pushing to online pairs." 
-      - number: "Syncshell Admin Panel changes"
-        icon: ""
-        items:
-          - "Changes to banned userlist to allow for preemptive banning of users."
-          - "Fixed when you are the owner, the buttons aren't overflowing into the side."
-          - "Pruning has been fixed not to include online users. It will only focus on offline users now."
-          - "Fixed that moderators can finally broadcast the syncshell."
-      - number: "Bug Fixes"
-        icon: ""
-        items:
-          - "Fixed a bug in the client CI/CD workflow where the plugin was contained twice in the zip. This will cut down on overall plugin size."
-          - "Added new flags for certain ImGUI windows to fix focusing issues with Chat2."
-          - "Validating PTRs for the game objects to prevent crashing while switching characters."
-      - number: "Lifestream Plugin integration"
-        icon: ""
-        items:
-          - "We have added Lifestream as an optional plugin you can install to support multiple future implementations >:3. In the near future, you'll be able to go straight to your pair using the Lifestream plugin in as easy as one click. We are also cooking something up for now; it will simply show as an optional plugin."
-          - "Integrated Lifestream to Location Sharing to easily teleport to all plots/apartments, and most maps."
-      - number: "Q1 Roadmap"
-        icon: ""
-        items:
-          - "Diagnostics Window - Est. Feb"
-          - "Ability to set a location as a 'Home' in syncshells - Est. Mid-Late Feb"
-          - "Lifestream support for Syncshell Homes - Est. Mid-Late Feb"
-          - "Community-oriented feature - In Refinement (est. Mar/Apr)"
   - 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: ""

LightlessSync/Changelog/credits.yaml

@@ -11,8 +11,6 @@ credits:
         role: "Developer"
       - name: "Kenny"
         role: "Developer"
-      - name: "Tsubasa"
-        role: "Developer"
       - name: "Zura"
         role: "Developer"
       - name: "Additional Contributors"

LightlessSync/Interop/Ipc/Penumbra/PenumbraTexture.cs

@@ -92,7 +92,7 @@ public sealed class PenumbraTexture : PenumbraBase
     {
         token.ThrowIfCancellationRequested();
 
-        logger.LogDebug("Converting texture {Input} -> {Output} ({Target})", job.InputFile, job.OutputFile, job.TargetType);
+        logger.LogInformation("Converting texture {Input} -> {Output} ({Target})", job.InputFile, job.OutputFile, job.TargetType);
         var convertTask = _convertTextureFile.Invoke(job.InputFile, job.OutputFile, job.TargetType, job.IncludeMipMaps);
         await convertTask.ConfigureAwait(false);
 

LightlessSync/LightlessSync.csproj

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

LightlessSync/PlayerData/Factories/PlayerDataFactory.cs

@@ -1,5 +1,6 @@
 using Dalamud.Utility;
-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;
@@ -13,7 +14,6 @@ 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;
 
@@ -119,30 +119,46 @@ public class PlayerDataFactory
         return null;
     }
 
-    private static readonly int _drawObjectOffset =
-        (int)Marshal.OffsetOf<GameObject>(nameof(GameObject.DrawObject));
-
     private async Task<bool> CheckForNullDrawObject(IntPtr playerPointer)
-        => await _dalamudUtil.RunOnFrameworkThread(() =>
+        => await _dalamudUtil.RunOnFrameworkThread(() => CheckForNullDrawObjectUnsafe(playerPointer)).ConfigureAwait(false);
+
+    private unsafe static bool CheckForNullDrawObjectUnsafe(IntPtr playerPointer)
+    {
+        if (playerPointer == IntPtr.Zero)
+            return true;
+
+        if (!IsPointerValid(playerPointer))
+            return true;
+
+        var character = (Character*)playerPointer;
+        if (character == null)
+            return true;
+
+        var gameObject = &character->GameObject;
+        if (gameObject == null)
+            return true;
+
+        if (!IsPointerValid((IntPtr)gameObject))
+            return true;
+
+        return gameObject->DrawObject == null;
+    }
+
+    private static bool IsPointerValid(IntPtr ptr)
+    {
+        if (ptr == IntPtr.Zero)
+            return false;
+
+        try
         {
-            nint basePtr = playerPointer;
-
-            if (!PtrGuard.LooksLikePtr(basePtr))
-                return true;
-
-            nint drawObjAddr = basePtr + _drawObjectOffset;
-
-            if (!PtrGuard.IsReadable(drawObjAddr, (nuint)IntPtr.Size))
-                return true;
-
-            if (!PtrGuard.TryReadIntPtr(drawObjAddr, out var drawObj))
-                return true;
-
-            if (drawObj != 0 && !PtrGuard.LooksLikePtr(drawObj))
-                return true;
-
-            return drawObj == 0;
-        }).ConfigureAwait(false);
+            _ = Marshal.ReadByte(ptr);
+            return true;
+        }
+        catch
+        {
+            return false;
+        }
+    }
 
     private static bool IsCacheFresh(CacheEntry entry)
         => (DateTime.UtcNow - entry.CreatedUtc) <= _characterCacheTtl;

LightlessSync/PlayerData/Handlers/GameObjectHandler.cs

@@ -2,12 +2,11 @@
 using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
 using LightlessSync.Services;
 using LightlessSync.Services.Mediator;
-using LightlessSync.Utils;
 using Microsoft.Extensions.Logging;
 using System.Runtime.CompilerServices;
 using static FFXIVClientStructs.FFXIV.Client.Game.Character.DrawDataContainer;
-using ObjectKind = LightlessSync.API.Data.Enum.ObjectKind;
 using VisibilityFlags = FFXIVClientStructs.FFXIV.Client.Game.Object.VisibilityFlags;
+using ObjectKind = LightlessSync.API.Data.Enum.ObjectKind;
 
 namespace LightlessSync.PlayerData.Handlers;
 
@@ -178,41 +177,18 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
         var prevDrawObj = DrawObjectAddress;
         string? nameString = null;
 
-        var nextAddr = _getAddress();
-
-        if (nextAddr != IntPtr.Zero && !PtrGuard.LooksLikePtr(nextAddr))
-        {
-            nextAddr = IntPtr.Zero;
-        }
-
-        if (nextAddr != IntPtr.Zero &&
-            !PtrGuard.IsReadable(nextAddr, (nuint)sizeof(FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject)))
-        {
-            nextAddr = IntPtr.Zero;
-        }
-
-        Address = nextAddr;
+        Address = _getAddress();
 
         if (Address != IntPtr.Zero)
         {
             var gameObject = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)Address;
-
-            var draw = (nint)gameObject->DrawObject;
-
-            if (!PtrGuard.LooksLikePtr(draw) || !PtrGuard.IsReadable(draw, (nuint)sizeof(DrawObject)))
-                draw = 0;
-
-            DrawObjectAddress = draw;
+            DrawObjectAddress = (IntPtr)gameObject->DrawObject;
             EntityId = gameObject->EntityId;
 
-            if (PtrGuard.IsReadable(Address, (nuint)sizeof(Character)))
-            {
-                var chara = (Character*)Address;
-                nameString = chara->GameObject.NameString;
-
-                if (!string.IsNullOrEmpty(nameString) && !string.Equals(nameString, Name, StringComparison.Ordinal))
-                    Name = nameString;
-            }
+            var chara = (Character*)Address;
+            nameString = chara->GameObject.NameString;
+            if (!string.IsNullOrEmpty(nameString) && !string.Equals(nameString, Name, StringComparison.Ordinal))
+                Name = nameString;
         }
         else
         {
@@ -220,27 +196,22 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
             EntityId = uint.MaxValue;
         }
 
-        CurrentDrawCondition = (Address != IntPtr.Zero && DrawObjectAddress != IntPtr.Zero)
-            ? IsBeingDrawnUnsafe()
-            : DrawCondition.DrawObjectZero;
+        CurrentDrawCondition = IsBeingDrawnUnsafe();
 
         if (_haltProcessing || !allowPublish) return;
 
         bool drawObjDiff = DrawObjectAddress != prevDrawObj;
         bool addrDiff = Address != prevAddr;
 
-        if (Address != IntPtr.Zero && DrawObjectAddress != IntPtr.Zero
-            && PtrGuard.IsReadable(Address, (nuint)sizeof(Character))
-            && PtrGuard.IsReadable(DrawObjectAddress, (nuint)sizeof(DrawObject)))
+        if (Address != IntPtr.Zero && DrawObjectAddress != IntPtr.Zero)
         {
             var chara = (Character*)Address;
             var drawObj = (DrawObject*)DrawObjectAddress;
-
             var objType = drawObj->Object.GetObjectType();
             var isHuman = objType == ObjectType.CharacterBase
                           && ((CharacterBase*)drawObj)->GetModelType() == CharacterBase.ModelType.Human;
 
-            nameString ??= chara->GameObject.NameString;
+            nameString ??= ((Character*)Address)->GameObject.NameString;
             var nameChange = !string.Equals(nameString, Name, StringComparison.Ordinal);
             if (nameChange) Name = nameString;
 
@@ -248,36 +219,32 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
 
             if (isHuman)
             {
-                if (PtrGuard.IsReadable(DrawObjectAddress, (nuint)sizeof(Human)))
+                var classJob = chara->CharacterData.ClassJob;
+                if (classJob != _classJob)
                 {
-                    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*)drawObj)->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);
-                }
-                else
-                {
-                    isHuman = false;
+                    Logger.LogTrace("[{this}] classjob changed from {old} to {new}", this, _classJob, classJob);
+                    _classJob = classJob;
+                    Mediator.Publish(new ClassJobChangedMessage(this));
                 }
+
+                equipDiff = CompareAndUpdateEquipByteData((byte*)&((Human*)drawObj)->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);
             }
-
-            if (!isHuman)
+            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);
             }
 
-            if (equipDiff && !_isOwnedObject)
+            if (equipDiff && !_isOwnedObject) // send the message out immediately and cancel out, no reason to continue if not self
             {
                 Logger.LogTrace("[{this}] Changed", this);
                 return;
@@ -285,13 +252,11 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
 
             bool customizeDiff = false;
 
-            if (isHuman && PtrGuard.IsReadable(DrawObjectAddress, (nuint)sizeof(Human)))
+            if (isHuman)
             {
-                var human = (Human*)drawObj;
-
-                var gender = human->Customize.Sex;
-                var raceId = human->Customize.Race;
-                var tribeId = human->Customize.Tribe;
+                var gender = ((Human*)drawObj)->Customize.Sex;
+                var raceId = ((Human*)drawObj)->Customize.Race;
+                var tribeId = ((Human*)drawObj)->Customize.Tribe;
 
                 if (_isOwnedObject && ObjectKind == ObjectKind.Player
                     && (gender != Gender || raceId != RaceId || tribeId != TribeId))
@@ -302,11 +267,15 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
                     TribeId = tribeId;
                 }
 
-                customizeDiff = CompareAndUpdateCustomizeData(human->Customize.Data);
+                customizeDiff = CompareAndUpdateCustomizeData(((Human*)drawObj)->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 || equipDiff || customizeDiff || nameChange) && _isOwnedObject)
@@ -320,11 +289,12 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
             CurrentDrawCondition = DrawCondition.DrawObjectZero;
             Logger.LogTrace("[{this}] Changed", this);
             if (_isOwnedObject && ObjectKind != ObjectKind.Player)
+            {
                 Mediator.Publish(new ClearCacheForObjectMessage(this));
+            }
         }
     }
 
-
     private unsafe bool CompareAndUpdateCustomizeData(Span<byte> customizeData)
     {
         bool hasChanges = false;
@@ -360,10 +330,7 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
 
     private unsafe bool CompareAndUpdateMainHand(Weapon* weapon)
     {
-        var p = (nint)weapon;
-        if (!PtrGuard.LooksLikePtr(p) || !PtrGuard.IsReadable(p, (nuint)sizeof(Weapon)))
-            return false;
-
+        if ((nint)weapon == nint.Zero) return false;
         bool hasChanges = false;
         hasChanges |= weapon->ModelSetId != MainHandData[0];
         MainHandData[0] = weapon->ModelSetId;
@@ -376,10 +343,7 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
 
     private unsafe bool CompareAndUpdateOffHand(Weapon* weapon)
     {
-        var p = (nint)weapon;
-        if (!PtrGuard.LooksLikePtr(p) || !PtrGuard.IsReadable(p, (nuint)sizeof(Weapon)))
-            return false;
-
+        if ((nint)weapon == nint.Zero) return false;
         bool hasChanges = false;
         hasChanges |= weapon->ModelSetId != OffHandData[0];
         OffHandData[0] = weapon->ModelSetId;

LightlessSync/Plugin.cs

@@ -125,8 +125,6 @@ public sealed class Plugin : IDalamudPlugin
         services.AddSingleton<FileTransferOrchestrator>();
         services.AddSingleton<LightlessPlugin>();
         services.AddSingleton<LightlessProfileManager>();
-        services.AddSingleton<TextureProcessingQueue>();
-        services.AddSingleton<ModelProcessingQueue>();
         services.AddSingleton<TextureCompressionService>();
         services.AddSingleton<TextureDownscaleService>();
         services.AddSingleton<ModelDecimationService>();

LightlessSync/Services/AssetProcessingQueue.cs

@@ -1,93 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System.Collections.Concurrent;
-
-namespace LightlessSync.Services;
-
-public sealed class AssetProcessingQueue : IDisposable
-{
-    private readonly BlockingCollection<WorkItem> _queue = new();
-    private readonly Thread _worker;
-    private readonly ILogger _logger;
-    private bool _disposed;
-
-    public AssetProcessingQueue(ILogger logger, string name)
-    {
-        _logger = logger;
-        _worker = new Thread(Run)
-        {
-            IsBackground = true,
-            Name = string.IsNullOrWhiteSpace(name) ? "LightlessSync.AssetProcessing" : name
-        };
-        _worker.Start();
-    }
-
-    public Task Enqueue(Func<CancellationToken, Task> work, CancellationToken token = default)
-    {
-        if (work is null)
-        {
-            throw new ArgumentNullException(nameof(work));
-        }
-
-        var completion = new TaskCompletionSource<object?>(TaskCreationOptions.RunContinuationsAsynchronously);
-        if (token.IsCancellationRequested)
-        {
-            completion.TrySetCanceled(token);
-            return completion.Task;
-        }
-
-        if (_queue.IsAddingCompleted || _disposed)
-        {
-            completion.TrySetException(new ObjectDisposedException(nameof(AssetProcessingQueue)));
-            return completion.Task;
-        }
-
-        _queue.Add(new WorkItem(work, token, completion));
-        return completion.Task;
-    }
-
-    private void Run()
-    {
-        foreach (var item in _queue.GetConsumingEnumerable())
-        {
-            if (item.Token.IsCancellationRequested)
-            {
-                item.Completion.TrySetCanceled(item.Token);
-                continue;
-            }
-
-            try
-            {
-                item.Work(item.Token).GetAwaiter().GetResult();
-                item.Completion.TrySetResult(null);
-            }
-            catch (OperationCanceledException ex)
-            {
-                var token = ex.CancellationToken.IsCancellationRequested ? ex.CancellationToken : item.Token;
-                item.Completion.TrySetCanceled(token);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning(ex, "Asset processing job failed.");
-                item.Completion.TrySetException(ex);
-            }
-        }
-    }
-
-    public void Dispose()
-    {
-        if (_disposed)
-        {
-            return;
-        }
-
-        _disposed = true;
-        _queue.CompleteAdding();
-        _worker.Join(TimeSpan.FromSeconds(2));
-        _queue.Dispose();
-    }
-
-    private readonly record struct WorkItem(
-        Func<CancellationToken, Task> Work,
-        CancellationToken Token,
-        TaskCompletionSource<object?> Completion);
-}

LightlessSync/Services/ModelDecimation/MdlDecimator.cs

@@ -2104,16 +2104,6 @@ internal static class MdlDecimator
             }
         }
 
-        if (boneWeights != null
-            && blendWeightEncoding == BlendWeightEncoding.Default
-            && format.BlendWeightsElement is { } blendWeightsElement
-            && (MdlFile.VertexType)blendWeightsElement.Type == MdlFile.VertexType.UShort4
-            && ShouldTreatWeightsAsByteNormalized(boneWeights))
-        {
-            RescaleUShortAsByteWeights(boneWeights);
-            blendWeightEncoding = BlendWeightEncoding.UShortAsByte;
-        }
-
         decoded = new DecodedMeshData(positions, normals, tangents, tangents2, colors, boneWeights, uvChannels, positionWs, normalWs, blendWeightEncoding);
         return true;
     }
@@ -3423,44 +3413,6 @@ internal static class MdlDecimator
         return ToUShortNormalized(normalized);
     }
 
-    private static bool ShouldTreatWeightsAsByteNormalized(BoneWeight[] weights)
-    {
-        const float maxByteUnorm = byte.MaxValue / (float)ushort.MaxValue;
-        var maxWeight = 0f;
-        for (var i = 0; i < weights.Length; i++)
-        {
-            var weight = weights[i];
-            maxWeight = Math.Max(maxWeight, weight.weight0);
-            maxWeight = Math.Max(maxWeight, weight.weight1);
-            maxWeight = Math.Max(maxWeight, weight.weight2);
-            maxWeight = Math.Max(maxWeight, weight.weight3);
-            if (maxWeight > maxByteUnorm)
-            {
-                return false;
-            }
-        }
-
-        return maxWeight > 0f;
-    }
-
-    private static void RescaleUShortAsByteWeights(BoneWeight[] weights)
-    {
-        var scale = ushort.MaxValue / (float)byte.MaxValue;
-        for (var i = 0; i < weights.Length; i++)
-        {
-            var weight = weights[i];
-            weights[i] = new BoneWeight(
-                weight.index0,
-                weight.index1,
-                weight.index2,
-                weight.index3,
-                weight.weight0 * scale,
-                weight.weight1 * scale,
-                weight.weight2 * scale,
-                weight.weight3 * scale);
-        }
-    }
-
     private static void NormalizeWeights(float[] weights)
     {
         var sum = weights.Sum();

LightlessSync/Services/ModelDecimation/ModelDecimationService.cs

@@ -1,7 +1,6 @@
 using LightlessSync.FileCache;
 using LightlessSync.LightlessConfiguration;
 using LightlessSync.LightlessConfiguration.Configurations;
-using LightlessSync.Services;
 using LightlessSync.Utils;
 using Microsoft.Extensions.Logging;
 using System.Collections.Concurrent;
@@ -20,7 +19,6 @@ public sealed class ModelDecimationService
     private readonly FileCacheManager _fileCacheManager;
     private readonly PlayerPerformanceConfigService _performanceConfigService;
     private readonly XivDataStorageService _xivDataStorageService;
-    private readonly ModelProcessingQueue _processingQueue;
     private readonly SemaphoreSlim _decimationSemaphore = new(MaxConcurrentJobs);
 
     private readonly TaskRegistry<string> _decimationDeduplicator = new();
@@ -32,15 +30,13 @@ public sealed class ModelDecimationService
         LightlessConfigService configService,
         FileCacheManager fileCacheManager,
         PlayerPerformanceConfigService performanceConfigService,
-        XivDataStorageService xivDataStorageService,
-        ModelProcessingQueue processingQueue)
+        XivDataStorageService xivDataStorageService)
     {
         _logger = logger;
         _configService = configService;
         _fileCacheManager = fileCacheManager;
         _performanceConfigService = performanceConfigService;
         _xivDataStorageService = xivDataStorageService;
-        _processingQueue = processingQueue;
     }
 
     public void ScheduleDecimation(string hash, string filePath, string? gamePath = null)
@@ -57,9 +53,9 @@ public sealed class ModelDecimationService
 
         _logger.LogDebug("Queued model decimation for {Hash}", hash);
 
-        _decimationDeduplicator.GetOrStart(hash, () => _processingQueue.Enqueue(async token =>
+        _decimationDeduplicator.GetOrStart(hash, async () =>
         {
-            await _decimationSemaphore.WaitAsync(token).ConfigureAwait(false);
+            await _decimationSemaphore.WaitAsync().ConfigureAwait(false);
             try
             {
                 await DecimateInternalAsync(hash, filePath).ConfigureAwait(false);
@@ -73,7 +69,7 @@ public sealed class ModelDecimationService
             {
                 _decimationSemaphore.Release();
             }
-        }, CancellationToken.None));
+        });
     }
 
     public void ScheduleBatchDecimation(string hash, string filePath, ModelDecimationSettings settings)
@@ -93,9 +89,9 @@ public sealed class ModelDecimationService
 
         _logger.LogInformation("Queued batch model decimation for {Hash}", hash);
 
-        _decimationDeduplicator.GetOrStart(hash, () => _processingQueue.Enqueue(async token =>
+        _decimationDeduplicator.GetOrStart(hash, async () =>
         {
-            await _decimationSemaphore.WaitAsync(token).ConfigureAwait(false);
+            await _decimationSemaphore.WaitAsync().ConfigureAwait(false);
             try
             {
                 await DecimateInternalAsync(hash, filePath, settings, allowExisting: false, destinationOverride: filePath, registerDecimatedPath: false).ConfigureAwait(false);
@@ -109,7 +105,7 @@ public sealed class ModelDecimationService
             {
                 _decimationSemaphore.Release();
             }
-        }, CancellationToken.None));
+        });
     }
 
     public bool ShouldScheduleDecimation(string hash, string filePath, string? gamePath = null)

LightlessSync/Services/ModelProcessingQueue.cs

@@ -1,19 +0,0 @@
-using Microsoft.Extensions.Logging;
-
-namespace LightlessSync.Services;
-
-public sealed class ModelProcessingQueue : IDisposable
-{
-    private readonly AssetProcessingQueue _queue;
-
-    public ModelProcessingQueue(ILogger<ModelProcessingQueue> logger)
-    {
-        _queue = new AssetProcessingQueue(logger, "LightlessSync.ModelProcessing");
-    }
-
-    public Task Enqueue(Func<CancellationToken, Task> work, CancellationToken token = default)
-        => _queue.Enqueue(work, token);
-
-    public void Dispose()
-        => _queue.Dispose();
-}

LightlessSync/Services/TextureCompression/TextureDownscaleService.cs

@@ -8,7 +8,6 @@ using System.Threading;
 using OtterTex;
 using OtterImage = OtterTex.Image;
 using LightlessSync.LightlessConfiguration;
-using LightlessSync.Services;
 using LightlessSync.Utils;
 using LightlessSync.FileCache;
 using Microsoft.Extensions.Logging;
@@ -34,7 +33,6 @@ public sealed class TextureDownscaleService
     private readonly PlayerPerformanceConfigService _playerPerformanceConfigService;
     private readonly FileCacheManager _fileCacheManager;
     private readonly TextureCompressionService _textureCompressionService;
-    private readonly TextureProcessingQueue _processingQueue;
 
     private readonly TaskRegistry<string> _downscaleDeduplicator = new();
     private readonly ConcurrentDictionary<string, string> _downscaledPaths = new(StringComparer.OrdinalIgnoreCase);
@@ -75,15 +73,13 @@ public sealed class TextureDownscaleService
         LightlessConfigService configService,
         PlayerPerformanceConfigService playerPerformanceConfigService,
         FileCacheManager fileCacheManager,
-        TextureCompressionService textureCompressionService,
-        TextureProcessingQueue processingQueue)
+        TextureCompressionService textureCompressionService)
     {
         _logger = logger;
         _configService = configService;
         _playerPerformanceConfigService = playerPerformanceConfigService;
         _fileCacheManager = fileCacheManager;
         _textureCompressionService = textureCompressionService;
-        _processingQueue = processingQueue;
     }
 
     public void ScheduleDownscale(string hash, string filePath, TextureMapKind mapKind)
@@ -94,7 +90,7 @@ public sealed class TextureDownscaleService
         if (!filePath.EndsWith(".tex", StringComparison.OrdinalIgnoreCase)) return;
         if (_downscaleDeduplicator.TryGetExisting(hash, out _)) return;
 
-        _downscaleDeduplicator.GetOrStart(hash, () => _processingQueue.Enqueue(async token =>
+        _downscaleDeduplicator.GetOrStart(hash, async () =>
         {
             TextureMapKind mapKind;
             try
@@ -108,7 +104,7 @@ public sealed class TextureDownscaleService
             }
 
             await DownscaleInternalAsync(hash, filePath, mapKind).ConfigureAwait(false);
-        }, CancellationToken.None));
+        });
     }
 
     public bool ShouldScheduleDownscale(string filePath)
@@ -386,12 +382,6 @@ public sealed class TextureDownscaleService
     {
         var isCompressed = sourceFormat.IsCompressed();
         var targetFormat = isCompressed ? sourceFormat : DXGIFormat.B8G8R8A8UNorm;
-        _logger.LogDebug(
-            "Downscale convert target {TargetFormat} (source {SourceFormat}, compressed {IsCompressed}, penumbraFallback {PenumbraFallback})",
-            targetFormat,
-            sourceFormat,
-            isCompressed,
-            attemptPenumbraFallback);
         try
         {
             result = source.Convert(targetFormat);
@@ -443,7 +433,6 @@ public sealed class TextureDownscaleService
     {
         try
         {
-            _logger.LogDebug("Downscale Penumbra re-encode target {Target} for {Hash}.", target, hash);
             using var uncompressed = resizedScratch.Convert(DXGIFormat.B8G8R8A8UNorm);
             TexFileHelper.Save(destination, uncompressed);
         }

LightlessSync/Services/TextureProcessingQueue.cs

@@ -1,19 +0,0 @@
-using Microsoft.Extensions.Logging;
-
-namespace LightlessSync.Services;
-
-public sealed class TextureProcessingQueue : IDisposable
-{
-    private readonly AssetProcessingQueue _queue;
-
-    public TextureProcessingQueue(ILogger<TextureProcessingQueue> logger)
-    {
-        _queue = new AssetProcessingQueue(logger, "LightlessSync.TextureProcessing");
-    }
-
-    public Task Enqueue(Func<CancellationToken, Task> work, CancellationToken token = default)
-        => _queue.Enqueue(work, token);
-
-    public void Dispose()
-        => _queue.Dispose();
-}

LightlessSync/UI/DataAnalysisUi.cs

@@ -56,7 +56,6 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
     private readonly ModelDecimationService _modelDecimationService;
     private readonly TextureCompressionService _textureCompressionService;
     private readonly TextureMetadataHelper _textureMetadataHelper;
-    private readonly TextureProcessingQueue _processingQueue;
 
     private readonly List<TextureRow> _textureRows = new();
     private readonly Dictionary<string, TextureCompressionTarget> _textureSelections = new(StringComparer.OrdinalIgnoreCase);
@@ -138,8 +137,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
         LightlessConfigService configService,
         PlayerPerformanceConfigService playerPerformanceConfig, TransientResourceManager transientResourceManager,
         TransientConfigService transientConfigService, ModelDecimationService modelDecimationService,
-        TextureCompressionService textureCompressionService, TextureMetadataHelper textureMetadataHelper,
-        TextureProcessingQueue processingQueue)
+        TextureCompressionService textureCompressionService, TextureMetadataHelper textureMetadataHelper)
         : base(logger, mediator, "Lightless Character Data Analysis", performanceCollectorService)
     {
         _characterAnalyzer = characterAnalyzer;
@@ -152,7 +150,6 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
         _modelDecimationService = modelDecimationService;
         _textureCompressionService = textureCompressionService;
         _textureMetadataHelper = textureMetadataHelper;
-        _processingQueue = processingQueue;
         Mediator.Subscribe<CharacterDataAnalyzedMessage>(this, (_) =>
         {
             _hasUpdate = true;
@@ -3719,10 +3716,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
         _conversionCurrentFileProgress = 0;
         _conversionFailed = false;
 
-        var conversionToken = _conversionCancellationTokenSource.Token;
-        _conversionTask = _processingQueue.Enqueue(
-            queueToken => RunTextureConversionAsync(requests, queueToken),
-            conversionToken);
+        _conversionTask = RunTextureConversionAsync(requests, _conversionCancellationTokenSource.Token);
         _showModal = true;
     }
 

LightlessSync/Utils/PtrGuard.cs

@@ -1,71 +0,0 @@
-using System.Runtime.InteropServices;
-using static LightlessSync.Utils.PtrGuardMemory;
-
-namespace LightlessSync.Utils
-{
-    public static partial class PtrGuard
-    {
-        private const ulong _aligmentPtr = 0x7UL;
-        private static readonly nuint _minAppAddr = (nuint)GetMinAppAddr();
-        private static readonly nuint _maxAppAddr = (nuint)GetMaxAppAddr();
-
-        private static nint GetMinAppAddr()
-        {
-            GetSystemInfo(out var si);
-            return si.lpMinimumApplicationAddress;
-        }
-
-        private static nint GetMaxAppAddr()
-        {
-            GetSystemInfo(out var si);
-            return si.lpMaximumApplicationAddress;
-        }
-
-            public static bool LooksLikePtr(nint p)
-            {
-                if (p == 0) return false;
-                nuint u = (nuint)p;
-
-                if (u < _minAppAddr) return false;
-                if (u > _maxAppAddr) return false;
-                if ((u & _aligmentPtr) != 0) return false;
-                if ((uint)u == 0x12345679u) return false;
-
-                return true;
-            }
-
-        public static bool TryReadIntPtr(nint addr, out nint value)
-        {
-            value = 0;
-            
-            if (!LooksLikePtr(addr))
-                return false;
-
-            return ReadProcessMemory(GetCurrentProcess(), addr, out value, (nuint)IntPtr.Size, out nuint bytesRead)
-                   && bytesRead == (nuint)IntPtr.Size;
-        }
-
-        public static bool IsReadable(nint addr, nuint size)
-        {
-            if (addr == 0 || size == 0) return false;
-
-            if (VirtualQuery(addr, out var mbi, (nuint)Marshal.SizeOf<MEMORY_BASIC_INFORMATION>()) == 0)
-                return false;
-
-            const uint Commit = 0x1000;
-            const uint NoAccess = 0x01;
-            const uint PageGuard = 0x100;
-
-            if (mbi.State != Commit) return false;
-            if ((mbi.Protect & PageGuard) != 0) return false;
-            if (mbi.Protect == NoAccess) return false;
-
-            ulong start = (ulong)addr;
-            ulong end = start + size - 1;
-            ulong r0 = (ulong)mbi.BaseAddress;
-            ulong r1 = r0 + mbi.RegionSize - 1;
-
-            return start >= r0 && end <= r1;
-        }
-    }
-}

LightlessSync/Utils/PtrGuardMemory.cs

@@ -1,55 +0,0 @@
-using System.Runtime.InteropServices;
-
-namespace LightlessSync.Utils
-{
-    internal static class PtrGuardMemory
-    {
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct MEMORY_BASIC_INFORMATION
-        {
-            public nint BaseAddress;
-            public nint AllocationBase;
-            public uint AllocationProtect;
-            public nuint RegionSize;
-            public uint State;
-            public uint Protect;
-            public uint Type;
-        }
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        internal static extern nuint VirtualQuery(
-            nint lpAddress,
-            out MEMORY_BASIC_INFORMATION lpBuffer,
-            nuint dwLength);
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        internal static extern bool ReadProcessMemory(
-            nint hProcess,
-            nint lpBaseAddress,
-            out nint lpBuffer,
-            nuint nSize,
-            out nuint lpNumberOfBytesRead);
-
-        [DllImport("kernel32.dll")]
-        internal static extern nint GetCurrentProcess();
-
-        [DllImport("kernel32.dll")]
-        internal static extern void GetSystemInfo(out SYSTEM_INFO lpSystemInfo);
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct SYSTEM_INFO
-        {
-            public ushort wProcessorArchitecture;
-            public ushort wReserved;
-            public uint dwPageSize;
-            public nint lpMinimumApplicationAddress;
-            public nint lpMaximumApplicationAddress;
-            public nint dwActiveProcessorMask;
-            public uint dwNumberOfProcessors;
-            public uint dwProcessorType;
-            public uint dwAllocationGranularity;
-            public ushort wProcessorLevel;
-            public ushort wProcessorRevision;
-        }
-    }
-}