[CI] Updating repo.json for 1.5.1.13

And General Fixes

.editorconfig

@@ -3576,6 +3576,18 @@ resharper_xaml_xaml_xamarin_forms_data_type_and_binding_context_type_mismatched_
 resharper_xaml_x_key_attribute_disallowed_highlighting=error
 resharper_xml_doc_comment_syntax_problem_highlighting=warning
 resharper_xunit_xunit_test_with_console_output_highlighting=warning
+csharp_style_prefer_implicitly_typed_lambda_expression = true:suggestion
+csharp_style_expression_bodied_methods = true:silent
+csharp_style_prefer_tuple_swap = true:suggestion
+csharp_style_prefer_unbound_generic_type_in_nameof = true:suggestion
+csharp_style_prefer_utf8_string_literals = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+csharp_style_expression_bodied_constructors = true:silent
+csharp_style_expression_bodied_operators = true:silent
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_style_unused_value_assignment_preference = discard_variable:suggestion
+csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+csharp_style_expression_bodied_properties = true:silent
 
 [*.{cshtml,htm,html,proto,razor}]
 indent_style=tab

.github/workflows/build.yml

@@ -10,13 +10,15 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Setup .NET
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '8.x.x'
+          dotnet-version: |
+              10.x.x
+              9.x.x
       - name: Restore dependencies
         run: dotnet restore
       - name: Download Dalamud
@@ -29,7 +31,7 @@ jobs:
       - name: Archive
         run: Compress-Archive -Path Penumbra/bin/Release/* -DestinationPath Penumbra.zip
       - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v2.2.1
+        uses: actions/upload-artifact@v4
         with:
           path: |
             ./Penumbra/bin/Release/*

.github/workflows/release.yml

@@ -9,18 +9,20 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Setup .NET
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '8.x.x'
+          dotnet-version: |
+              10.x.x
+              9.x.x
       - name: Restore dependencies
         run: dotnet restore
       - name: Download Dalamud
         run: |
-          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/latest.zip -OutFile latest.zip
+          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile latest.zip
           Expand-Archive -Force latest.zip "$env:AppData\XIVLauncher\addon\Hooks\dev"
       - name: Build
         run: |
@@ -37,7 +39,7 @@ jobs:
       - name: Archive
         run: Compress-Archive -Path Penumbra/bin/Release/* -DestinationPath Penumbra.zip
       - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v2.2.1
+        uses: actions/upload-artifact@v4
         with:
           path: |
             ./Penumbra/bin/Release/*

.github/workflows/test_release.yml

@@ -9,18 +9,20 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Setup .NET
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '8.x.x'
+          dotnet-version: |
+              10.x.x
+              9.x.x
       - name: Restore dependencies
         run: dotnet restore
       - name: Download Dalamud
         run: |
-          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/latest.zip -OutFile latest.zip
+          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile latest.zip
           Expand-Archive -Force latest.zip "$env:AppData\XIVLauncher\addon\Hooks\dev"
       - name: Build
         run: |
@@ -37,7 +39,7 @@ jobs:
       - name: Archive
         run: Compress-Archive -Path Penumbra/bin/Debug/* -DestinationPath Penumbra.zip
       - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v2.2.1
+        uses: actions/upload-artifact@v4
         with:
           path: |
             ./Penumbra/bin/Debug/*

OtterGui

@@ -1 +1 @@
-Subproject commit 4e06921da239788331a4527aa6a2943cf0e809fe
+Subproject commit ff1e6543845e3b8c53a5f8b240bc38faffb1b3bf

Penumbra.Api

@@ -1 +1 @@
-Subproject commit 8787efc8fc897dfbb4515ebbabbcd5e6f54d1b42
+Subproject commit 52a3216a525592205198303df2844435e382cf87

Penumbra.CrashHandler/Buffers/AnimationInvocationBuffer.cs

@@ -1,4 +1,6 @@
-using System.Text.Json.Nodes;
+using System;
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
 
 namespace Penumbra.CrashHandler.Buffers;
 
@@ -24,7 +26,7 @@ public record struct VfxFuncInvokedEntry(
     string InvocationType,
     string CharacterName,
     string CharacterAddress,
-    string CollectionName) : ICrashDataEntry;
+    Guid CollectionId) : ICrashDataEntry;
 
 /// <summary> Only expose the write interface for the buffer. </summary>
 public interface IAnimationInvocationBufferWriter
@@ -32,19 +34,19 @@ public interface IAnimationInvocationBufferWriter
     /// <summary> Write a line into the buffer with the given data. </summary>
     /// <param name="characterAddress"> The address of the related character, if known. </param>
     /// <param name="characterName"> The name of the related character, anonymized or relying on index if unavailable, if known. </param>
-    /// <param name="collectionName"> The name of the associated collection. Not anonymized. </param>
+    /// <param name="collectionId"> The GUID of the associated collection. </param>
     /// <param name="type"> The type of VFX func called. </param>
-    public void WriteLine(nint characterAddress, ReadOnlySpan<byte> characterName, string collectionName, AnimationInvocationType type);
+    public void WriteLine(nint characterAddress, ReadOnlySpan<byte> characterName, Guid collectionId, AnimationInvocationType type);
 }
 
 internal sealed class AnimationInvocationBuffer : MemoryMappedBuffer, IAnimationInvocationBufferWriter, IBufferReader
 {
     private const int    _version      = 1;
     private const int    _lineCount    = 64;
-    private const int    _lineCapacity = 256;
+    private const int    _lineCapacity = 128;
     private const string _name         = "Penumbra.AnimationInvocation";
 
-    public void WriteLine(nint characterAddress, ReadOnlySpan<byte> characterName, string collectionName, AnimationInvocationType type)
+    public void WriteLine(nint characterAddress, ReadOnlySpan<byte> characterName, Guid collectionId, AnimationInvocationType type)
     {
         var accessor = GetCurrentLineLocking();
         lock (accessor)
@@ -53,10 +55,12 @@ internal sealed class AnimationInvocationBuffer : MemoryMappedBuffer, IAnimation
             accessor.Write(8,  Environment.CurrentManagedThreadId);
             accessor.Write(12, (int)type);
             accessor.Write(16, characterAddress);
-            var span = GetSpan(accessor, 24, 104);
+            var span = GetSpan(accessor, 24, 16);
+            collectionId.TryWriteBytes(span);
+            accessor.SafeMemoryMappedViewHandle.ReleasePointer();
+            span = GetSpan(accessor, 40);
             WriteSpan(characterName, span);
-            span = GetSpan(accessor, 128);
-            WriteString(collectionName, span);
+            accessor.SafeMemoryMappedViewHandle.ReleasePointer();
         }
     }
 
@@ -68,13 +72,13 @@ internal sealed class AnimationInvocationBuffer : MemoryMappedBuffer, IAnimation
         var lineCount = (int)CurrentLineCount;
         for (var i = lineCount - 1; i >= 0; --i)
         {
-            var line           = GetLine(i);
-            var timestamp      = DateTimeOffset.FromUnixTimeMilliseconds(BitConverter.ToInt64(line));
-            var thread         = BitConverter.ToInt32(line[8..]);
-            var type           = (AnimationInvocationType)BitConverter.ToInt32(line[12..]);
-            var address        = BitConverter.ToUInt64(line[16..]);
-            var characterName  = ReadString(line[24..]);
-            var collectionName = ReadString(line[128..]);
+            var line          = GetLine(i);
+            var timestamp     = DateTimeOffset.FromUnixTimeMilliseconds(BitConverter.ToInt64(line));
+            var thread        = BitConverter.ToInt32(line[8..]);
+            var type          = (AnimationInvocationType)BitConverter.ToInt32(line[12..]);
+            var address       = BitConverter.ToUInt64(line[16..]);
+            var collectionId  = new Guid(line[24..40]);
+            var characterName = ReadString(line[40..]);
             yield return new JsonObject()
             {
                 [nameof(VfxFuncInvokedEntry.Age)]              = (crashTime - timestamp).TotalSeconds,
@@ -83,7 +87,7 @@ internal sealed class AnimationInvocationBuffer : MemoryMappedBuffer, IAnimation
                 [nameof(VfxFuncInvokedEntry.InvocationType)]   = ToName(type),
                 [nameof(VfxFuncInvokedEntry.CharacterName)]    = characterName,
                 [nameof(VfxFuncInvokedEntry.CharacterAddress)] = address.ToString("X"),
-                [nameof(VfxFuncInvokedEntry.CollectionName)]   = collectionName,
+                [nameof(VfxFuncInvokedEntry.CollectionId)]     = collectionId,
             };
         }
     }

Penumbra.CrashHandler/Buffers/CharacterBaseBuffer.cs

@@ -1,4 +1,6 @@
-using System.Text.Json.Nodes;
+using System;
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
 
 namespace Penumbra.CrashHandler.Buffers;
 
@@ -8,8 +10,8 @@ public interface ICharacterBaseBufferWriter
     /// <summary> Write a line into the buffer with the given data. </summary>
     /// <param name="characterAddress"> The address of the related character, if known. </param>
     /// <param name="characterName"> The name of the related character, anonymized or relying on index if unavailable, if known. </param>
-    /// <param name="collectionName"> The name of the associated collection. Not anonymized. </param>
-    public void WriteLine(nint characterAddress, ReadOnlySpan<byte> characterName, string collectionName);
+    /// <param name="collectionId"> The GUID of the associated collection. </param>
+    public void WriteLine(nint characterAddress, ReadOnlySpan<byte> characterName, Guid collectionId);
 }
 
 /// <summary> The full crash entry for a loaded character base. </summary>
@@ -19,27 +21,29 @@ public record struct CharacterLoadedEntry(
     int ThreadId,
     string CharacterName,
     string CharacterAddress,
-    string CollectionName) : ICrashDataEntry;
+    Guid CollectionId) : ICrashDataEntry;
 
 internal sealed class CharacterBaseBuffer : MemoryMappedBuffer, ICharacterBaseBufferWriter, IBufferReader
 {
-    private const int _version = 1;
-    private const int _lineCount = 10;
-    private const int _lineCapacity = 256;
-    private const string _name = "Penumbra.CharacterBase";
+    private const int    _version      = 1;
+    private const int    _lineCount    = 10;
+    private const int    _lineCapacity = 128;
+    private const string _name         = "Penumbra.CharacterBase";
 
-    public void WriteLine(nint characterAddress, ReadOnlySpan<byte> characterName, string collectionName)
+    public void WriteLine(nint characterAddress, ReadOnlySpan<byte> characterName, Guid collectionId)
     {
         var accessor = GetCurrentLineLocking();
         lock (accessor)
         {
-            accessor.Write(0, DateTimeOffset.UtcNow.ToUnixTimeMilliseconds());
-            accessor.Write(8, Environment.CurrentManagedThreadId);
+            accessor.Write(0,  DateTimeOffset.UtcNow.ToUnixTimeMilliseconds());
+            accessor.Write(8,  Environment.CurrentManagedThreadId);
             accessor.Write(12, characterAddress);
-            var span = GetSpan(accessor, 20, 108);
+            var span = GetSpan(accessor, 20, 16);
+            collectionId.TryWriteBytes(span);
+            accessor.SafeMemoryMappedViewHandle.ReleasePointer();
+            span = GetSpan(accessor, 36);
             WriteSpan(characterName, span);
-            span = GetSpan(accessor, 128);
-            WriteString(collectionName, span);
+            accessor.SafeMemoryMappedViewHandle.ReleasePointer();
         }
     }
 
@@ -48,20 +52,20 @@ internal sealed class CharacterBaseBuffer : MemoryMappedBuffer, ICharacterBaseBu
         var lineCount = (int)CurrentLineCount;
         for (var i = lineCount - 1; i >= 0; --i)
         {
-            var line = GetLine(i);
-            var timestamp = DateTimeOffset.FromUnixTimeMilliseconds(BitConverter.ToInt64(line));
-            var thread = BitConverter.ToInt32(line[8..]);
-            var address = BitConverter.ToUInt64(line[12..]);
-            var characterName = ReadString(line[20..]);
-            var collectionName = ReadString(line[128..]);
+            var line          = GetLine(i);
+            var timestamp     = DateTimeOffset.FromUnixTimeMilliseconds(BitConverter.ToInt64(line));
+            var thread        = BitConverter.ToInt32(line[8..]);
+            var address       = BitConverter.ToUInt64(line[12..]);
+            var collectionId  = new Guid(line[20..36]);
+            var characterName = ReadString(line[36..]);
             yield return new JsonObject
             {
-                [nameof(CharacterLoadedEntry.Age)] = (crashTime - timestamp).TotalSeconds,
-                [nameof(CharacterLoadedEntry.Timestamp)] = timestamp,
-                [nameof(CharacterLoadedEntry.ThreadId)] = thread,
-                [nameof(CharacterLoadedEntry.CharacterName)] = characterName,
+                [nameof(CharacterLoadedEntry.Age)]              = (crashTime - timestamp).TotalSeconds,
+                [nameof(CharacterLoadedEntry.Timestamp)]        = timestamp,
+                [nameof(CharacterLoadedEntry.ThreadId)]         = thread,
+                [nameof(CharacterLoadedEntry.CharacterName)]    = characterName,
                 [nameof(CharacterLoadedEntry.CharacterAddress)] = address.ToString("X"),
-                [nameof(CharacterLoadedEntry.CollectionName)] = collectionName,
+                [nameof(CharacterLoadedEntry.CollectionId)]     = collectionId,
             };
         }
     }

Penumbra.CrashHandler/Buffers/MemoryMappedBuffer.cs

@@ -1,5 +1,8 @@
+using System;
 using System.Diagnostics.CodeAnalysis;
+using System.IO;
 using System.IO.MemoryMappedFiles;
+using System.Linq;
 using System.Numerics;
 using System.Text;
 

Penumbra.CrashHandler/Buffers/ModdedFileBuffer.cs

@@ -1,4 +1,6 @@
-using System.Text.Json.Nodes;
+using System;
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
 
 namespace Penumbra.CrashHandler.Buffers;
 
@@ -8,10 +10,10 @@ public interface IModdedFileBufferWriter
     /// <summary> Write a line into the buffer with the given data. </summary>
     /// <param name="characterAddress"> The address of the related character, if known. </param>
     /// <param name="characterName"> The name of the related character, anonymized or relying on index if unavailable, if known. </param>
-    /// <param name="collectionName"> The name of the associated collection. Not anonymized. </param>
+    /// <param name="collectionId"> The GUID of the associated collection. </param>
     /// <param name="requestedFileName"> The file name as requested by the game. </param>
     /// <param name="actualFileName"> The actual modded file name loaded. </param>
-    public void WriteLine(nint characterAddress, ReadOnlySpan<byte> characterName, string collectionName, ReadOnlySpan<byte> requestedFileName,
+    public void WriteLine(nint characterAddress, ReadOnlySpan<byte> characterName, Guid collectionId, ReadOnlySpan<byte> requestedFileName,
         ReadOnlySpan<byte> actualFileName);
 }
 
@@ -22,34 +24,38 @@ public record struct ModdedFileLoadedEntry(
     int ThreadId,
     string CharacterName,
     string CharacterAddress,
-    string CollectionName,
+    Guid CollectionId,
     string RequestedFileName,
     string ActualFileName) : ICrashDataEntry;
 
 internal sealed class ModdedFileBuffer : MemoryMappedBuffer, IModdedFileBufferWriter, IBufferReader
 {
-    private const int _version = 1;
-    private const int _lineCount = 128;
-    private const int _lineCapacity = 1024;
-    private const string _name = "Penumbra.ModdedFile";
+    private const int    _version      = 1;
+    private const int    _lineCount    = 128;
+    private const int    _lineCapacity = 1024;
+    private const string _name         = "Penumbra.ModdedFile";
 
-    public void WriteLine(nint characterAddress, ReadOnlySpan<byte> characterName, string collectionName, ReadOnlySpan<byte> requestedFileName,
+    public void WriteLine(nint characterAddress, ReadOnlySpan<byte> characterName, Guid collectionId, ReadOnlySpan<byte> requestedFileName,
         ReadOnlySpan<byte> actualFileName)
     {
         var accessor = GetCurrentLineLocking();
         lock (accessor)
         {
-            accessor.Write(0, DateTimeOffset.UtcNow.ToUnixTimeMilliseconds());
-            accessor.Write(8, Environment.CurrentManagedThreadId);
+            accessor.Write(0,  DateTimeOffset.UtcNow.ToUnixTimeMilliseconds());
+            accessor.Write(8,  Environment.CurrentManagedThreadId);
             accessor.Write(12, characterAddress);
-            var span = GetSpan(accessor, 20, 80);
+            var span = GetSpan(accessor, 20, 16);
+            collectionId.TryWriteBytes(span);
+            accessor.SafeMemoryMappedViewHandle.ReleasePointer();
+            span = GetSpan(accessor, 36, 80);
             WriteSpan(characterName, span);
-            span = GetSpan(accessor, 92, 80);
-            WriteString(collectionName, span);
-            span = GetSpan(accessor, 172, 260);
+            accessor.SafeMemoryMappedViewHandle.ReleasePointer();
+            span = GetSpan(accessor, 116, 260);
             WriteSpan(requestedFileName, span);
-            span = GetSpan(accessor, 432);
+            accessor.SafeMemoryMappedViewHandle.ReleasePointer();
+            span = GetSpan(accessor, 376);
             WriteSpan(actualFileName, span);
+            accessor.SafeMemoryMappedViewHandle.ReleasePointer();
         }
     }
 
@@ -61,24 +67,24 @@ internal sealed class ModdedFileBuffer : MemoryMappedBuffer, IModdedFileBufferWr
         var lineCount = (int)CurrentLineCount;
         for (var i = lineCount - 1; i >= 0; --i)
         {
-            var line = GetLine(i);
-            var timestamp = DateTimeOffset.FromUnixTimeMilliseconds(BitConverter.ToInt64(line));
-            var thread = BitConverter.ToInt32(line[8..]);
-            var address = BitConverter.ToUInt64(line[12..]);
-            var characterName = ReadString(line[20..]);
-            var collectionName = ReadString(line[92..]);
-            var requestedFileName = ReadString(line[172..]);
-            var actualFileName = ReadString(line[432..]);
+            var line              = GetLine(i);
+            var timestamp         = DateTimeOffset.FromUnixTimeMilliseconds(BitConverter.ToInt64(line));
+            var thread            = BitConverter.ToInt32(line[8..]);
+            var address           = BitConverter.ToUInt64(line[12..]);
+            var collectionId      = new Guid(line[20..36]);
+            var characterName     = ReadString(line[36..]);
+            var requestedFileName = ReadString(line[116..]);
+            var actualFileName    = ReadString(line[376..]);
             yield return new JsonObject()
             {
-                [nameof(ModdedFileLoadedEntry.Age)] = (crashTime - timestamp).TotalSeconds,
-                [nameof(ModdedFileLoadedEntry.Timestamp)] = timestamp,
-                [nameof(ModdedFileLoadedEntry.ThreadId)] = thread,
-                [nameof(ModdedFileLoadedEntry.CharacterName)] = characterName,
-                [nameof(ModdedFileLoadedEntry.CharacterAddress)] = address.ToString("X"),
-                [nameof(ModdedFileLoadedEntry.CollectionName)] = collectionName,
+                [nameof(ModdedFileLoadedEntry.Age)]               = (crashTime - timestamp).TotalSeconds,
+                [nameof(ModdedFileLoadedEntry.Timestamp)]         = timestamp,
+                [nameof(ModdedFileLoadedEntry.ThreadId)]          = thread,
+                [nameof(ModdedFileLoadedEntry.CharacterName)]     = characterName,
+                [nameof(ModdedFileLoadedEntry.CharacterAddress)]  = address.ToString("X"),
+                [nameof(ModdedFileLoadedEntry.CollectionId)]      = collectionId,
                 [nameof(ModdedFileLoadedEntry.RequestedFileName)] = requestedFileName,
-                [nameof(ModdedFileLoadedEntry.ActualFileName)] = actualFileName,
+                [nameof(ModdedFileLoadedEntry.ActualFileName)]    = actualFileName,
             };
         }
     }

Penumbra.CrashHandler/CrashData.cs

@@ -1,3 +1,5 @@
+using System;
+using System.Collections.Generic;
 using Penumbra.CrashHandler.Buffers;
 
 namespace Penumbra.CrashHandler;
@@ -55,7 +57,7 @@ public class CrashData
 
     /// <summary> The last vfx function invoked before this crash data was generated. </summary>
     public VfxFuncInvokedEntry? LastVfxFuncInvoked
-        => LastVfxFuncsInvoked.Count == 0 ? default : LastVfxFuncsInvoked[0];
+        => LastVFXFuncsInvoked.Count == 0 ? default : LastVFXFuncsInvoked[0];
 
     /// <summary> A collection of the last few characters loaded before this crash data was generated. </summary>
     public List<CharacterLoadedEntry> LastCharactersLoaded { get; set; } = [];
@@ -64,5 +66,5 @@ public class CrashData
     public List<ModdedFileLoadedEntry> LastModdedFilesLoaded { get; set; } = [];
 
     /// <summary> A collection of the last few vfx functions invoked before this crash data was generated. </summary>
-    public List<VfxFuncInvokedEntry> LastVfxFuncsInvoked { get; set; } = [];
+    public List<VfxFuncInvokedEntry> LastVFXFuncsInvoked { get; set; } = [];
 }

Penumbra.CrashHandler/GameEventLogReader.cs

@@ -1,4 +1,7 @@
-using System.Text.Json.Nodes;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Nodes;
 using Penumbra.CrashHandler.Buffers;
 
 namespace Penumbra.CrashHandler;

Penumbra.CrashHandler/GameEventLogWriter.cs

@@ -1,4 +1,5 @@
-using Penumbra.CrashHandler.Buffers;
+using System;
+using Penumbra.CrashHandler.Buffers;
 
 namespace Penumbra.CrashHandler;
 

Penumbra.CrashHandler/Penumbra.CrashHandler.csproj

@@ -1,20 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Dalamud.NET.Sdk/14.0.1">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0-windows</TargetFramework>
-        <LangVersion>preview</LangVersion>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <PlatformTarget>x64</PlatformTarget>
-        <Nullable>enable</Nullable>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <DalamudLibPath Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(appdata)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath>
-        <DalamudLibPath Condition="$([MSBuild]::IsOSPlatform('Linux'))">$(HOME)/.xlcore/dalamud/Hooks/dev/</DalamudLibPath>
-        <DalamudLibPath Condition="$(DALAMUD_HOME) != ''">$(DALAMUD_HOME)/</DalamudLibPath>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -25,4 +11,8 @@
       <DebugType>embedded</DebugType>
     </PropertyGroup>
 
+    <PropertyGroup>
+        <Use_DalamudPackager>false</Use_DalamudPackager>
+    </PropertyGroup>
+
 </Project>

Penumbra.CrashHandler/Program.cs

@@ -1,4 +1,6 @@
-using System.Diagnostics;
+using System;
+using System.Diagnostics;
+using System.IO;
 using System.Text.Json;
 
 namespace Penumbra.CrashHandler;

Penumbra.CrashHandler/packages.lock.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "dependencies": {
+    "net10.0-windows7.0": {
+      "DotNet.ReproducibleBuilds": {
+        "type": "Direct",
+        "requested": "[1.2.39, )",
+        "resolved": "1.2.39",
+        "contentHash": "fcFN01tDTIQqDuTwr1jUQK/geofiwjG5DycJQOnC72i1SsLAk1ELe+apBOuZ11UMQG8YKFZG1FgvjZPbqHyatg=="
+      }
+    }
+  }
+}

Penumbra.GameData

@@ -1 +1 @@
-Subproject commit 66687643da2163c938575ad6949c8d0fbd03afe7
+Subproject commit 0e973ed6eace6afd31cd298f8c58f76fa8d5ef60

Penumbra.String

@@ -1 +1 @@
-Subproject commit 14e00f77d42bc677e02325660db765ef11932560
+Subproject commit 9bd016fbef5fb2de467dd42165267fdd93cd9592

Penumbra.sln

@@ -8,6 +8,11 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F89C9EAE-25C8-43BE-8108-5921E5A93502}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		.github\workflows\build.yml = .github\workflows\build.yml
+		Penumbra\Penumbra.json = Penumbra\Penumbra.json
+		.github\workflows\release.yml = .github\workflows\release.yml
+		repo.json = repo.json
+		.github\workflows\test_release.yml = .github\workflows\test_release.yml
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Penumbra.GameData", "Penumbra.GameData\Penumbra.GameData.csproj", "{EE551E87-FDB3-4612-B500-DC870C07C605}"
@@ -18,42 +23,76 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Penumbra.Api", "Penumbra.Ap
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Penumbra.String", "Penumbra.String\Penumbra.String.csproj", "{5549BAFD-6357-4B1A-800C-75AC36E5B76D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Penumbra.CrashHandler", "Penumbra.CrashHandler\Penumbra.CrashHandler.csproj", "{EE834491-A98F-4395-BE0D-6861AE5AD953}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Penumbra.CrashHandler", "Penumbra.CrashHandler\Penumbra.CrashHandler.csproj", "{EE834491-A98F-4395-BE0D-6861AE5AD953}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Schemas", "Schemas", "{BFEA7504-1210-4F79-A7FE-BF03B6567E33}"
+	ProjectSection(SolutionItems) = preProject
+		schemas\default_mod.json = schemas\default_mod.json
+		schemas\group.json = schemas\group.json
+		schemas\local_mod_data-v3.json = schemas\local_mod_data-v3.json
+		schemas\mod_meta-v3.json = schemas\mod_meta-v3.json
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "structs", "structs", "{B03F276A-0572-4F62-AF86-EF62F6B80463}"
+	ProjectSection(SolutionItems) = preProject
+		schemas\structs\container.json = schemas\structs\container.json
+		schemas\structs\group_combining.json = schemas\structs\group_combining.json
+		schemas\structs\group_imc.json = schemas\structs\group_imc.json
+		schemas\structs\group_multi.json = schemas\structs\group_multi.json
+		schemas\structs\group_single.json = schemas\structs\group_single.json
+		schemas\structs\manipulation.json = schemas\structs\manipulation.json
+		schemas\structs\meta_atch.json = schemas\structs\meta_atch.json
+		schemas\structs\meta_atr.json = schemas\structs\meta_atr.json
+		schemas\structs\meta_enums.json = schemas\structs\meta_enums.json
+		schemas\structs\meta_eqdp.json = schemas\structs\meta_eqdp.json
+		schemas\structs\meta_eqp.json = schemas\structs\meta_eqp.json
+		schemas\structs\meta_est.json = schemas\structs\meta_est.json
+		schemas\structs\meta_geqp.json = schemas\structs\meta_geqp.json
+		schemas\structs\meta_gmp.json = schemas\structs\meta_gmp.json
+		schemas\structs\meta_imc.json = schemas\structs\meta_imc.json
+		schemas\structs\meta_rsp.json = schemas\structs\meta_rsp.json
+		schemas\structs\meta_shp.json = schemas\structs\meta_shp.json
+		schemas\structs\option.json = schemas\structs\option.json
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{13C812E9-0D42-4B95-8646-40EEBF30636F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{13C812E9-0D42-4B95-8646-40EEBF30636F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{13C812E9-0D42-4B95-8646-40EEBF30636F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{13C812E9-0D42-4B95-8646-40EEBF30636F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EE551E87-FDB3-4612-B500-DC870C07C605}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EE551E87-FDB3-4612-B500-DC870C07C605}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EE551E87-FDB3-4612-B500-DC870C07C605}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EE551E87-FDB3-4612-B500-DC870C07C605}.Release|Any CPU.Build.0 = Release|Any CPU
-		{87750518-1A20-40B4-9FC1-22F906EFB290}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87750518-1A20-40B4-9FC1-22F906EFB290}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87750518-1A20-40B4-9FC1-22F906EFB290}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{87750518-1A20-40B4-9FC1-22F906EFB290}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1FE4D8DF-B56A-464F-B39E-CDC0ED4167D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1FE4D8DF-B56A-464F-B39E-CDC0ED4167D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1FE4D8DF-B56A-464F-B39E-CDC0ED4167D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1FE4D8DF-B56A-464F-B39E-CDC0ED4167D4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5549BAFD-6357-4B1A-800C-75AC36E5B76D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5549BAFD-6357-4B1A-800C-75AC36E5B76D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5549BAFD-6357-4B1A-800C-75AC36E5B76D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5549BAFD-6357-4B1A-800C-75AC36E5B76D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EE834491-A98F-4395-BE0D-6861AE5AD953}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EE834491-A98F-4395-BE0D-6861AE5AD953}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EE834491-A98F-4395-BE0D-6861AE5AD953}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EE834491-A98F-4395-BE0D-6861AE5AD953}.Release|Any CPU.Build.0 = Release|Any CPU
+		{13C812E9-0D42-4B95-8646-40EEBF30636F}.Debug|x64.ActiveCfg = Debug|x64
+		{13C812E9-0D42-4B95-8646-40EEBF30636F}.Debug|x64.Build.0 = Debug|x64
+		{13C812E9-0D42-4B95-8646-40EEBF30636F}.Release|x64.ActiveCfg = Release|x64
+		{13C812E9-0D42-4B95-8646-40EEBF30636F}.Release|x64.Build.0 = Release|x64
+		{EE551E87-FDB3-4612-B500-DC870C07C605}.Debug|x64.ActiveCfg = Debug|x64
+		{EE551E87-FDB3-4612-B500-DC870C07C605}.Debug|x64.Build.0 = Debug|x64
+		{EE551E87-FDB3-4612-B500-DC870C07C605}.Release|x64.ActiveCfg = Release|x64
+		{EE551E87-FDB3-4612-B500-DC870C07C605}.Release|x64.Build.0 = Release|x64
+		{87750518-1A20-40B4-9FC1-22F906EFB290}.Debug|x64.ActiveCfg = Debug|x64
+		{87750518-1A20-40B4-9FC1-22F906EFB290}.Debug|x64.Build.0 = Debug|x64
+		{87750518-1A20-40B4-9FC1-22F906EFB290}.Release|x64.ActiveCfg = Release|x64
+		{87750518-1A20-40B4-9FC1-22F906EFB290}.Release|x64.Build.0 = Release|x64
+		{1FE4D8DF-B56A-464F-B39E-CDC0ED4167D4}.Debug|x64.ActiveCfg = Debug|x64
+		{1FE4D8DF-B56A-464F-B39E-CDC0ED4167D4}.Debug|x64.Build.0 = Debug|x64
+		{1FE4D8DF-B56A-464F-B39E-CDC0ED4167D4}.Release|x64.ActiveCfg = Release|x64
+		{1FE4D8DF-B56A-464F-B39E-CDC0ED4167D4}.Release|x64.Build.0 = Release|x64
+		{5549BAFD-6357-4B1A-800C-75AC36E5B76D}.Debug|x64.ActiveCfg = Debug|x64
+		{5549BAFD-6357-4B1A-800C-75AC36E5B76D}.Debug|x64.Build.0 = Debug|x64
+		{5549BAFD-6357-4B1A-800C-75AC36E5B76D}.Release|x64.ActiveCfg = Release|x64
+		{5549BAFD-6357-4B1A-800C-75AC36E5B76D}.Release|x64.Build.0 = Release|x64
+		{EE834491-A98F-4395-BE0D-6861AE5AD953}.Debug|x64.ActiveCfg = Debug|x64
+		{EE834491-A98F-4395-BE0D-6861AE5AD953}.Debug|x64.Build.0 = Debug|x64
+		{EE834491-A98F-4395-BE0D-6861AE5AD953}.Release|x64.ActiveCfg = Release|x64
+		{EE834491-A98F-4395-BE0D-6861AE5AD953}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{BFEA7504-1210-4F79-A7FE-BF03B6567E33} = {F89C9EAE-25C8-43BE-8108-5921E5A93502}
+		{B03F276A-0572-4F62-AF86-EF62F6B80463} = {BFEA7504-1210-4F79-A7FE-BF03B6567E33}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B17E85B1-5F60-4440-9F9A-3DDE877E8CDF}
 	EndGlobalSection

Penumbra/Api/Api/ApiHelpers.cs

@@ -0,0 +1,78 @@
+using OtterGui.Log;
+using OtterGui.Services;
+using Penumbra.Api.Enums;
+using Penumbra.Collections;
+using Penumbra.Collections.Manager;
+using Penumbra.GameData.Actors;
+using Penumbra.GameData.Interop;
+using Penumbra.Interop.PathResolving;
+
+namespace Penumbra.Api.Api;
+
+public class ApiHelpers(
+    CollectionManager collectionManager,
+    ObjectManager objects,
+    CollectionResolver collectionResolver,
+    ActorManager actors) : IApiService
+{
+    /// <summary> Return the associated identifier for an object given by its index. </summary>
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    internal ActorIdentifier AssociatedIdentifier(int gameObjectIdx)
+    {
+        if (gameObjectIdx < 0 || gameObjectIdx >= objects.TotalCount)
+            return ActorIdentifier.Invalid;
+
+        var ptr = objects[gameObjectIdx];
+        return actors.FromObject(ptr, out _, false, true, true);
+    }
+
+    /// <summary>
+    /// Return the collection associated to a current game object. If it does not exist, return the default collection.
+    /// If the index is invalid, returns false and the default collection.
+    /// </summary>
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    internal unsafe bool AssociatedCollection(int gameObjectIdx, out ModCollection collection)
+    {
+        collection = collectionManager.Active.Default;
+        if (gameObjectIdx < 0 || gameObjectIdx >= objects.TotalCount)
+            return false;
+
+        var ptr  = objects[gameObjectIdx];
+        var data = collectionResolver.IdentifyCollection(ptr.AsObject, false);
+        if (data.Valid)
+            collection = data.ModCollection;
+
+        return true;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    internal static PenumbraApiEc Return(PenumbraApiEc ec, LazyString args, [CallerMemberName] string name = "Unknown")
+    {
+        if (ec is PenumbraApiEc.Success or PenumbraApiEc.NothingChanged)
+            Penumbra.Log.Verbose($"[{name}] Called with {args}, returned {ec}.");
+        else
+            Penumbra.Log.Debug($"[{name}] Called with {args}, returned {ec}.");
+        return ec;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    internal static LazyString Args(params object[] arguments)
+    {
+        if (arguments.Length == 0)
+            return new LazyString(() => "no arguments");
+
+        return new LazyString(() =>
+        {
+            var sb = new StringBuilder();
+            for (var i = 0; i < arguments.Length / 2; ++i)
+            {
+                sb.Append(arguments[2 * i]);
+                sb.Append(" = ");
+                sb.Append(arguments[2 * i + 1]);
+                sb.Append(", ");
+            }
+
+            return sb.ToString(0, sb.Length - 2);
+        });
+    }
+}

Penumbra/Api/Api/CollectionApi.cs

@@ -0,0 +1,177 @@
+using OtterGui.Services;
+using Penumbra.Api.Enums;
+using Penumbra.Collections;
+using Penumbra.Collections.Manager;
+using Penumbra.Mods;
+
+namespace Penumbra.Api.Api;
+
+public class CollectionApi(CollectionManager collections, ApiHelpers helpers) : IPenumbraApiCollection, IApiService
+{
+    public Dictionary<Guid, string> GetCollections()
+        => collections.Storage.ToDictionary(c => c.Identity.Id, c => c.Identity.Name);
+
+    public List<(Guid Id, string Name)> GetCollectionsByIdentifier(string identifier)
+    {
+        if (identifier.Length == 0)
+            return [];
+
+        var list = new List<(Guid Id, string Name)>(4);
+        if (Guid.TryParse(identifier, out var guid) && collections.Storage.ById(guid, out var collection) && collection != ModCollection.Empty)
+            list.Add((collection.Identity.Id, collection.Identity.Name));
+        else if (identifier.Length >= 8)
+            list.AddRange(collections.Storage.Where(c => c.Identity.Identifier.StartsWith(identifier, StringComparison.OrdinalIgnoreCase))
+                .Select(c => (c.Identity.Id, c.Identity.Name)));
+
+        list.AddRange(collections.Storage
+            .Where(c => string.Equals(c.Identity.Name, identifier, StringComparison.OrdinalIgnoreCase)
+             && !list.Contains((c.Identity.Id, c.Identity.Name)))
+            .Select(c => (c.Identity.Id, c.Identity.Name)));
+        return list;
+    }
+
+    public Func<string, (string ModDirectory, string ModName)[]> CheckCurrentChangedItemFunc()
+    {
+        var weakRef = new WeakReference<CollectionManager>(collections);
+        return s =>
+        {
+            if (!weakRef.TryGetTarget(out var c))
+                throw new ObjectDisposedException("The underlying collection storage of this IPC container was disposed.");
+
+            if (!c.Active.Current.ChangedItems.TryGetValue(s, out var d))
+                return [];
+
+            return d.Item1.Select(m => (m is Mod mod ? mod.Identifier : string.Empty, m.Name.Text)).ToArray();
+        };
+    }
+
+    public Dictionary<string, object?> GetChangedItemsForCollection(Guid collectionId)
+    {
+        try
+        {
+            if (!collections.Storage.ById(collectionId, out var collection))
+                collection = ModCollection.Empty;
+
+            if (collection.HasCache)
+                return collection.ChangedItems.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.Item2?.ToInternalObject());
+
+            Penumbra.Log.Warning($"Collection {collectionId} does not exist or is not loaded.");
+            return [];
+        }
+        catch (Exception e)
+        {
+            Penumbra.Log.Error($"Could not obtain Changed Items for {collectionId}:\n{e}");
+            throw;
+        }
+    }
+
+    public (Guid Id, string Name)? GetCollection(ApiCollectionType type)
+    {
+        if (!Enum.IsDefined(type))
+            return null;
+
+        var collection = collections.Active.ByType((CollectionType)type);
+        return collection == null ? null : (collection.Identity.Id, collection.Identity.Name);
+    }
+
+    internal (Guid Id, string Name)? GetCollection(byte type)
+        => GetCollection((ApiCollectionType)type);
+
+    public (bool ObjectValid, bool IndividualSet, (Guid Id, string Name) EffectiveCollection) GetCollectionForObject(int gameObjectIdx)
+    {
+        var id = helpers.AssociatedIdentifier(gameObjectIdx);
+        if (!id.IsValid)
+            return (false, false, (collections.Active.Default.Identity.Id, collections.Active.Default.Identity.Name));
+
+        if (collections.Active.Individuals.TryGetValue(id, out var collection))
+            return (true, true, (collection.Identity.Id, collection.Identity.Name));
+
+        helpers.AssociatedCollection(gameObjectIdx, out collection);
+        return (true, false, (collection.Identity.Id, collection.Identity.Name));
+    }
+
+    public Guid[] GetCollectionByName(string name)
+        => collections.Storage.Where(c => string.Equals(name, c.Identity.Name, StringComparison.OrdinalIgnoreCase)).Select(c => c.Identity.Id)
+            .ToArray();
+
+    public (PenumbraApiEc, (Guid Id, string Name)? OldCollection) SetCollection(ApiCollectionType type, Guid? collectionId,
+        bool allowCreateNew, bool allowDelete)
+    {
+        if (!Enum.IsDefined(type))
+            return (PenumbraApiEc.InvalidArgument, null);
+
+        var oldCollection = collections.Active.ByType((CollectionType)type);
+        var old           = oldCollection != null ? (oldCollection.Identity.Id, oldCollection.Identity.Name) : new ValueTuple<Guid, string>?();
+        if (collectionId == null)
+        {
+            if (old == null)
+                return (PenumbraApiEc.NothingChanged, old);
+
+            if (!allowDelete || type is ApiCollectionType.Current or ApiCollectionType.Default or ApiCollectionType.Interface)
+                return (PenumbraApiEc.AssignmentDeletionDisallowed, old);
+
+            collections.Active.RemoveSpecialCollection((CollectionType)type);
+            return (PenumbraApiEc.Success, old);
+        }
+
+        if (!collections.Storage.ById(collectionId.Value, out var collection))
+            return (PenumbraApiEc.CollectionMissing, old);
+
+        if (old == null)
+        {
+            if (!allowCreateNew)
+                return (PenumbraApiEc.AssignmentCreationDisallowed, old);
+
+            collections.Active.CreateSpecialCollection((CollectionType)type);
+        }
+        else if (old.Value.Item1 == collection.Identity.Id)
+        {
+            return (PenumbraApiEc.NothingChanged, old);
+        }
+
+        collections.Active.SetCollection(collection, (CollectionType)type);
+        return (PenumbraApiEc.Success, old);
+    }
+
+    public (PenumbraApiEc, (Guid Id, string Name)? OldCollection) SetCollectionForObject(int gameObjectIdx, Guid? collectionId,
+        bool allowCreateNew, bool allowDelete)
+    {
+        var id = helpers.AssociatedIdentifier(gameObjectIdx);
+        if (!id.IsValid)
+            return (PenumbraApiEc.InvalidIdentifier, (collections.Active.Default.Identity.Id, collections.Active.Default.Identity.Name));
+
+        var oldCollection = collections.Active.Individuals.TryGetValue(id, out var c) ? c : null;
+        var old           = oldCollection != null ? (oldCollection.Identity.Id, oldCollection.Identity.Name) : new ValueTuple<Guid, string>?();
+        if (collectionId == null)
+        {
+            if (old == null)
+                return (PenumbraApiEc.NothingChanged, old);
+
+            if (!allowDelete)
+                return (PenumbraApiEc.AssignmentDeletionDisallowed, old);
+
+            var idx = collections.Active.Individuals.Index(id);
+            collections.Active.RemoveIndividualCollection(idx);
+            return (PenumbraApiEc.Success, old);
+        }
+
+        if (!collections.Storage.ById(collectionId.Value, out var collection))
+            return (PenumbraApiEc.CollectionMissing, old);
+
+        if (old == null)
+        {
+            if (!allowCreateNew)
+                return (PenumbraApiEc.AssignmentCreationDisallowed, old);
+
+            var ids = collections.Active.Individuals.GetGroup(id);
+            collections.Active.CreateIndividualCollection(ids);
+        }
+        else if (old.Value.Item1 == collection.Identity.Id)
+        {
+            return (PenumbraApiEc.NothingChanged, old);
+        }
+
+        collections.Active.SetCollection(collection, CollectionType.Individual, collections.Active.Individuals.Index(id));
+        return (PenumbraApiEc.Success, old);
+    }
+}

Penumbra/Api/Api/EditingApi.cs

@@ -0,0 +1,54 @@
+using OtterGui.Services;
+using Penumbra.Import.Textures;
+using TextureType = Penumbra.Api.Enums.TextureType;
+
+namespace Penumbra.Api.Api;
+
+public class EditingApi(TextureManager textureManager) : IPenumbraApiEditing, IApiService
+{
+    public Task ConvertTextureFile(string inputFile, string outputFile, TextureType textureType, bool mipMaps)
+        => textureType switch
+        {
+            TextureType.Png     => textureManager.SavePng(inputFile, outputFile),
+            TextureType.Targa   => textureManager.SaveTga(inputFile, outputFile),
+            TextureType.AsIsTex => textureManager.SaveAs(CombinedTexture.TextureSaveType.AsIs,   mipMaps, true,  inputFile, outputFile),
+            TextureType.AsIsDds => textureManager.SaveAs(CombinedTexture.TextureSaveType.AsIs,   mipMaps, false, inputFile, outputFile),
+            TextureType.RgbaTex => textureManager.SaveAs(CombinedTexture.TextureSaveType.Bitmap, mipMaps, true,  inputFile, outputFile),
+            TextureType.RgbaDds => textureManager.SaveAs(CombinedTexture.TextureSaveType.Bitmap, mipMaps, false, inputFile, outputFile),
+            TextureType.Bc3Tex  => textureManager.SaveAs(CombinedTexture.TextureSaveType.BC3,    mipMaps, true,  inputFile, outputFile),
+            TextureType.Bc3Dds  => textureManager.SaveAs(CombinedTexture.TextureSaveType.BC3,    mipMaps, false, inputFile, outputFile),
+            TextureType.Bc7Tex  => textureManager.SaveAs(CombinedTexture.TextureSaveType.BC7,    mipMaps, true,  inputFile, outputFile),
+            TextureType.Bc7Dds  => textureManager.SaveAs(CombinedTexture.TextureSaveType.BC7,    mipMaps, false, inputFile, outputFile),
+            TextureType.Bc1Tex  => textureManager.SaveAs(CombinedTexture.TextureSaveType.BC1,    mipMaps, true,  inputFile, outputFile),
+            TextureType.Bc1Dds  => textureManager.SaveAs(CombinedTexture.TextureSaveType.BC1,    mipMaps, false, inputFile, outputFile),
+            TextureType.Bc4Tex  => textureManager.SaveAs(CombinedTexture.TextureSaveType.BC4,    mipMaps, true,  inputFile, outputFile),
+            TextureType.Bc4Dds  => textureManager.SaveAs(CombinedTexture.TextureSaveType.BC4,    mipMaps, false, inputFile, outputFile),
+            TextureType.Bc5Tex  => textureManager.SaveAs(CombinedTexture.TextureSaveType.BC5,    mipMaps, true,  inputFile, outputFile),
+            TextureType.Bc5Dds  => textureManager.SaveAs(CombinedTexture.TextureSaveType.BC5,    mipMaps, false, inputFile, outputFile),
+            _                   => Task.FromException(new Exception($"Invalid input value {textureType}.")),
+        };
+
+    // @formatter:off
+    public Task ConvertTextureData(byte[] rgbaData, int width, string outputFile, TextureType textureType, bool mipMaps)
+        => textureType switch
+        {
+            TextureType.Png     => textureManager.SavePng(new BaseImage(), outputFile, rgbaData, width, rgbaData.Length / 4 / width),
+            TextureType.Targa   => textureManager.SaveTga(new BaseImage(), outputFile, rgbaData, width, rgbaData.Length / 4 / width),
+            TextureType.AsIsTex => textureManager.SaveAs(CombinedTexture.TextureSaveType.AsIs,   mipMaps, true,  new BaseImage(), outputFile, rgbaData, width, rgbaData.Length / 4 / width),
+            TextureType.AsIsDds => textureManager.SaveAs(CombinedTexture.TextureSaveType.AsIs,   mipMaps, false, new BaseImage(), outputFile, rgbaData, width, rgbaData.Length / 4 / width),
+            TextureType.RgbaTex => textureManager.SaveAs(CombinedTexture.TextureSaveType.Bitmap, mipMaps, true,  new BaseImage(), outputFile, rgbaData, width, rgbaData.Length / 4 / width),
+            TextureType.RgbaDds => textureManager.SaveAs(CombinedTexture.TextureSaveType.Bitmap, mipMaps, false, new BaseImage(), outputFile, rgbaData, width, rgbaData.Length / 4 / width),
+            TextureType.Bc3Tex  => textureManager.SaveAs(CombinedTexture.TextureSaveType.BC3,    mipMaps, true,  new BaseImage(), outputFile, rgbaData, width, rgbaData.Length / 4 / width),
+            TextureType.Bc3Dds  => textureManager.SaveAs(CombinedTexture.TextureSaveType.BC3,    mipMaps, false, new BaseImage(), outputFile, rgbaData, width, rgbaData.Length / 4 / width),
+            TextureType.Bc7Tex  => textureManager.SaveAs(CombinedTexture.TextureSaveType.BC7,    mipMaps, true,  new BaseImage(), outputFile, rgbaData, width, rgbaData.Length / 4 / width),
+            TextureType.Bc7Dds  => textureManager.SaveAs(CombinedTexture.TextureSaveType.BC7,    mipMaps, false, new BaseImage(), outputFile, rgbaData, width, rgbaData.Length / 4 / width),
+            TextureType.Bc1Tex  => textureManager.SaveAs(CombinedTexture.TextureSaveType.BC1,    mipMaps, true,  new BaseImage(), outputFile, rgbaData, width, rgbaData.Length / 4 / width),
+            TextureType.Bc1Dds  => textureManager.SaveAs(CombinedTexture.TextureSaveType.BC1,    mipMaps, false, new BaseImage(), outputFile, rgbaData, width, rgbaData.Length / 4 / width),
+            TextureType.Bc4Tex  => textureManager.SaveAs(CombinedTexture.TextureSaveType.BC4,    mipMaps, true,  new BaseImage(), outputFile, rgbaData, width, rgbaData.Length / 4 / width),
+            TextureType.Bc4Dds  => textureManager.SaveAs(CombinedTexture.TextureSaveType.BC4,    mipMaps, false, new BaseImage(), outputFile, rgbaData, width, rgbaData.Length / 4 / width),
+            TextureType.Bc5Tex  => textureManager.SaveAs(CombinedTexture.TextureSaveType.BC5,    mipMaps, true,  new BaseImage(), outputFile, rgbaData, width, rgbaData.Length / 4 / width),
+            TextureType.Bc5Dds  => textureManager.SaveAs(CombinedTexture.TextureSaveType.BC5,    mipMaps, false, new BaseImage(), outputFile, rgbaData, width, rgbaData.Length / 4 / width),
+            _                   => Task.FromException(new Exception($"Invalid input value {textureType}.")),
+        };
+    // @formatter:on
+}

Penumbra/Api/Api/GameStateApi.cs

@@ -0,0 +1,123 @@
+using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
+using OtterGui.Services;
+using Penumbra.Api.Enums;
+using Penumbra.Collections;
+using Penumbra.Interop.Hooks.ResourceLoading;
+using Penumbra.Interop.PathResolving;
+using Penumbra.Interop.Structs;
+using Penumbra.Services;
+using Penumbra.String.Classes;
+
+namespace Penumbra.Api.Api;
+
+public class GameStateApi : IPenumbraApiGameState, IApiService, IDisposable
+{
+    private readonly CommunicatorService _communicator;
+    private readonly CollectionResolver  _collectionResolver;
+    private readonly DrawObjectState     _drawObjectState;
+    private readonly CutsceneService     _cutsceneService;
+    private readonly ResourceLoader      _resourceLoader;
+
+    public unsafe GameStateApi(CommunicatorService communicator, CollectionResolver collectionResolver, CutsceneService cutsceneService,
+        ResourceLoader resourceLoader, DrawObjectState drawObjectState)
+    {
+        _communicator                  =  communicator;
+        _collectionResolver            =  collectionResolver;
+        _cutsceneService               =  cutsceneService;
+        _resourceLoader                =  resourceLoader;
+        _drawObjectState               =  drawObjectState;
+        _resourceLoader.ResourceLoaded += OnResourceLoaded;
+        _resourceLoader.PapRequested   += OnPapRequested;
+        _communicator.CreatedCharacterBase.Subscribe(OnCreatedCharacterBase, Communication.CreatedCharacterBase.Priority.Api);
+    }
+
+    public unsafe void Dispose()
+    {
+        _resourceLoader.ResourceLoaded -= OnResourceLoaded;
+        _resourceLoader.PapRequested   -= OnPapRequested;
+        _communicator.CreatedCharacterBase.Unsubscribe(OnCreatedCharacterBase);
+    }
+
+    public event CreatedCharacterBaseDelegate?       CreatedCharacterBase;
+    public event GameObjectResourceResolvedDelegate? GameObjectResourceResolved;
+
+    public event CreatingCharacterBaseDelegate? CreatingCharacterBase
+    {
+        add
+        {
+            if (value == null)
+                return;
+
+            _communicator.CreatingCharacterBase.Subscribe(new Action<nint, Guid, nint, nint, nint>(value),
+                Communication.CreatingCharacterBase.Priority.Api);
+        }
+        remove
+        {
+            if (value == null)
+                return;
+
+            _communicator.CreatingCharacterBase.Unsubscribe(new Action<nint, Guid, nint, nint, nint>(value));
+        }
+    }
+
+    public unsafe (nint GameObject, (Guid Id, string Name) Collection) GetDrawObjectInfo(nint drawObject)
+    {
+        var data = _collectionResolver.IdentifyCollection((DrawObject*)drawObject, true);
+        return (data.AssociatedGameObject, (Id: data.ModCollection.Identity.Id, Name: data.ModCollection.Identity.Name));
+    }
+
+    public int GetCutsceneParentIndex(int actorIdx)
+        => _cutsceneService.GetParentIndex(actorIdx);
+
+    public Func<int, int> GetCutsceneParentIndexFunc()
+    {
+        var weakRef = new WeakReference<CutsceneService>(_cutsceneService);
+        return idx =>
+        {
+            if (!weakRef.TryGetTarget(out var c))
+                throw new ObjectDisposedException("The underlying cutscene state storage of this IPC container was disposed.");
+
+            return c.GetParentIndex(idx);
+        };
+    }
+
+    public Func<nint, nint> GetGameObjectFromDrawObjectFunc()
+    {
+        var weakRef = new WeakReference<DrawObjectState>(_drawObjectState);
+        return model =>
+        {
+            if (!weakRef.TryGetTarget(out var c))
+                throw new ObjectDisposedException("The underlying draw object state storage of this IPC container was disposed.");
+
+            return c.TryGetValue(model, out var data) ? data.Item1.Address : nint.Zero;
+        };
+    }
+
+    public PenumbraApiEc SetCutsceneParentIndex(int copyIdx, int newParentIdx)
+        => _cutsceneService.SetParentIndex(copyIdx, newParentIdx)
+            ? PenumbraApiEc.Success
+            : PenumbraApiEc.InvalidArgument;
+
+    private unsafe void OnResourceLoaded(ResourceHandle* handle, Utf8GamePath originalPath, FullPath? manipulatedPath, ResolveData resolveData)
+    {
+        if (resolveData.AssociatedGameObject != nint.Zero && GameObjectResourceResolved != null)
+        {
+            var original = originalPath.ToString();
+            GameObjectResourceResolved.Invoke(resolveData.AssociatedGameObject, original,
+                manipulatedPath?.ToString() ?? original);
+        }
+    }
+
+    private void OnPapRequested(Utf8GamePath originalPath, FullPath? manipulatedPath, ResolveData resolveData)
+    {
+        if (resolveData.AssociatedGameObject != nint.Zero && GameObjectResourceResolved != null)
+        {
+            var original = originalPath.ToString();
+            GameObjectResourceResolved.Invoke(resolveData.AssociatedGameObject, original,
+                manipulatedPath?.ToString() ?? original);
+        }
+    }
+
+    private void OnCreatedCharacterBase(nint gameObject, ModCollection collection, nint drawObject)
+        => CreatedCharacterBase?.Invoke(gameObject, collection.Identity.Id, drawObject);
+}

Penumbra/Api/Api/IdentityChecker.cs

@@ -0,0 +1,7 @@
+namespace Penumbra.Api.Api;
+
+public static class IdentityChecker
+{
+    public static bool Check(string identity)
+        => true;
+}

Penumbra/Api/Api/MetaApi.cs

@@ -0,0 +1,544 @@
+using Dalamud.Plugin.Services;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using OtterGui;
+using OtterGui.Services;
+using Penumbra.Collections;
+using Penumbra.Collections.Cache;
+using Penumbra.GameData.Files.AtchStructs;
+using Penumbra.GameData.Files.Utility;
+using Penumbra.GameData.Structs;
+using Penumbra.Interop.PathResolving;
+using Penumbra.Meta.Manipulations;
+
+namespace Penumbra.Api.Api;
+
+public class MetaApi(IFramework framework, CollectionResolver collectionResolver, ApiHelpers helpers)
+    : IPenumbraApiMeta, IApiService
+{
+    public string GetPlayerMetaManipulations()
+    {
+        var collection = collectionResolver.PlayerCollection();
+        return CompressMetaManipulations(collection);
+    }
+
+    public string GetMetaManipulations(int gameObjectIdx)
+    {
+        helpers.AssociatedCollection(gameObjectIdx, out var collection);
+        return CompressMetaManipulations(collection);
+    }
+
+    public Task<string> GetPlayerMetaManipulationsAsync()
+    {
+        return Task.Run(async () =>
+        {
+            var playerCollection = await framework.RunOnFrameworkThread(collectionResolver.PlayerCollection).ConfigureAwait(false);
+            return CompressMetaManipulations(playerCollection);
+        });
+    }
+
+    public Task<string> GetMetaManipulationsAsync(int gameObjectIdx)
+    {
+        return Task.Run(async () =>
+        {
+            var playerCollection = await framework.RunOnFrameworkThread(() =>
+            {
+                helpers.AssociatedCollection(gameObjectIdx, out var collection);
+                return collection;
+            }).ConfigureAwait(false);
+            return CompressMetaManipulations(playerCollection);
+        });
+    }
+
+    internal static string CompressMetaManipulations(ModCollection collection)
+        => CompressMetaManipulationsV1(collection);
+
+    private static string CompressMetaManipulationsV0(ModCollection collection)
+    {
+        var array = new JArray();
+        if (collection.MetaCache is { } cache)
+        {
+            MetaDictionary.SerializeTo(array, cache.GlobalEqp.Select(kvp => kvp.Key));
+            MetaDictionary.SerializeTo(array, cache.Imc.Select(kvp => new KeyValuePair<ImcIdentifier, ImcEntry>(kvp.Key, kvp.Value.Entry)));
+            MetaDictionary.SerializeTo(array, cache.Eqp.Select(kvp => new KeyValuePair<EqpIdentifier, EqpEntry>(kvp.Key, kvp.Value.Entry)));
+            MetaDictionary.SerializeTo(array, cache.Eqdp.Select(kvp => new KeyValuePair<EqdpIdentifier, EqdpEntry>(kvp.Key, kvp.Value.Entry)));
+            MetaDictionary.SerializeTo(array, cache.Est.Select(kvp => new KeyValuePair<EstIdentifier, EstEntry>(kvp.Key, kvp.Value.Entry)));
+            MetaDictionary.SerializeTo(array, cache.Rsp.Select(kvp => new KeyValuePair<RspIdentifier, RspEntry>(kvp.Key, kvp.Value.Entry)));
+            MetaDictionary.SerializeTo(array, cache.Gmp.Select(kvp => new KeyValuePair<GmpIdentifier, GmpEntry>(kvp.Key, kvp.Value.Entry)));
+            MetaDictionary.SerializeTo(array, cache.Atch.Select(kvp => new KeyValuePair<AtchIdentifier, AtchEntry>(kvp.Key, kvp.Value.Entry)));
+            MetaDictionary.SerializeTo(array, cache.Shp.Select(kvp => new KeyValuePair<ShpIdentifier, ShpEntry>(kvp.Key, kvp.Value.Entry)));
+            MetaDictionary.SerializeTo(array, cache.Atr.Select(kvp => new KeyValuePair<AtrIdentifier, AtrEntry>(kvp.Key, kvp.Value.Entry)));
+        }
+
+        return Functions.ToCompressedBase64(array, 0);
+    }
+
+    private static unsafe string CompressMetaManipulationsV1(ModCollection? collection)
+    {
+        using var ms = new MemoryStream();
+        ms.Capacity = 1024;
+        using (var zipStream = new GZipStream(ms, CompressionMode.Compress, true))
+        {
+            zipStream.Write((byte)1);
+            zipStream.Write("META0001"u8);
+            if (collection?.MetaCache is not { } cache)
+            {
+                zipStream.Write(0);
+                zipStream.Write(0);
+                zipStream.Write(0);
+                zipStream.Write(0);
+                zipStream.Write(0);
+                zipStream.Write(0);
+                zipStream.Write(0);
+            }
+            else
+            {
+                WriteCache(zipStream, cache.Imc);
+                WriteCache(zipStream, cache.Eqp);
+                WriteCache(zipStream, cache.Eqdp);
+                WriteCache(zipStream, cache.Est);
+                WriteCache(zipStream, cache.Rsp);
+                WriteCache(zipStream, cache.Gmp);
+                cache.GlobalEqp.EnterReadLock();
+
+                try
+                {
+                    zipStream.Write(cache.GlobalEqp.Count);
+                    foreach (var (globalEqp, _) in cache.GlobalEqp)
+                        zipStream.Write(new ReadOnlySpan<byte>(&globalEqp, sizeof(GlobalEqpManipulation)));
+                }
+                finally
+                {
+                    cache.GlobalEqp.ExitReadLock();
+                }
+
+                WriteCache(zipStream, cache.Atch);
+                WriteCache(zipStream, cache.Shp);
+                WriteCache(zipStream, cache.Atr);
+            }
+        }
+
+        ms.Flush();
+        ms.Position = 0;
+        var data = ms.GetBuffer().AsSpan(0, (int)ms.Length);
+        return Convert.ToBase64String(data);
+
+        void WriteCache<TKey, TValue>(Stream stream, MetaCacheBase<TKey, TValue> metaCache)
+            where TKey : unmanaged, IMetaIdentifier
+            where TValue : unmanaged
+        {
+            metaCache.EnterReadLock();
+            try
+            {
+                stream.Write(metaCache.Count);
+                foreach (var (identifier, (_, value)) in metaCache)
+                {
+                    stream.Write(identifier);
+                    stream.Write(value);
+                }
+            }
+            finally
+            {
+                metaCache.ExitReadLock();
+            }
+        }
+    }
+
+    public const uint ImcKey  = ((uint)'I' << 24) | ((uint)'M' << 16) | ((uint)'C' << 8);
+    public const uint EqpKey  = ((uint)'E' << 24) | ((uint)'Q' << 16) | ((uint)'P' << 8);
+    public const uint EqdpKey = ((uint)'E' << 24) | ((uint)'Q' << 16) | ((uint)'D' << 8) | 'P';
+    public const uint EstKey  = ((uint)'E' << 24) | ((uint)'S' << 16) | ((uint)'T' << 8);
+    public const uint RspKey  = ((uint)'R' << 24) | ((uint)'S' << 16) | ((uint)'P' << 8);
+    public const uint GmpKey  = ((uint)'G' << 24) | ((uint)'M' << 16) | ((uint)'P' << 8);
+    public const uint GeqpKey = ((uint)'G' << 24) | ((uint)'E' << 16) | ((uint)'Q' << 8) | 'P';
+    public const uint AtchKey = ((uint)'A' << 24) | ((uint)'T' << 16) | ((uint)'C' << 8) | 'H';
+    public const uint ShpKey  = ((uint)'S' << 24) | ((uint)'H' << 16) | ((uint)'P' << 8);
+    public const uint AtrKey  = ((uint)'A' << 24) | ((uint)'T' << 16) | ((uint)'R' << 8);
+
+    private static unsafe string CompressMetaManipulationsV2(ModCollection? collection)
+    {
+        using var ms = new MemoryStream();
+        ms.Capacity = 1024;
+        using (var zipStream = new GZipStream(ms, CompressionMode.Compress, true))
+        {
+            zipStream.Write((byte)2);
+            zipStream.Write("META0002"u8);
+            if (collection?.MetaCache is { } cache)
+            {
+                WriteCache(zipStream, cache.Imc,  ImcKey);
+                WriteCache(zipStream, cache.Eqp,  EqpKey);
+                WriteCache(zipStream, cache.Eqdp, EqdpKey);
+                WriteCache(zipStream, cache.Est,  EstKey);
+                WriteCache(zipStream, cache.Rsp,  RspKey);
+                WriteCache(zipStream, cache.Gmp,  GmpKey);
+                cache.GlobalEqp.EnterReadLock();
+
+                try
+                {
+                    if (cache.GlobalEqp.Count > 0)
+                    {
+                        zipStream.Write(GeqpKey);
+                        zipStream.Write(cache.GlobalEqp.Count);
+                        foreach (var (globalEqp, _) in cache.GlobalEqp)
+                            zipStream.Write(new ReadOnlySpan<byte>(&globalEqp, sizeof(GlobalEqpManipulation)));
+                    }
+                }
+                finally
+                {
+                    cache.GlobalEqp.ExitReadLock();
+                }
+
+                WriteCache(zipStream, cache.Atch, AtchKey);
+                WriteCache(zipStream, cache.Shp,  ShpKey);
+                WriteCache(zipStream, cache.Atr,  AtrKey);
+            }
+        }
+
+        ms.Flush();
+        ms.Position = 0;
+        var data = ms.GetBuffer().AsSpan(0, (int)ms.Length);
+        return Convert.ToBase64String(data);
+
+        void WriteCache<TKey, TValue>(Stream stream, MetaCacheBase<TKey, TValue> metaCache, uint label)
+            where TKey : unmanaged, IMetaIdentifier
+            where TValue : unmanaged
+        {
+            metaCache.EnterReadLock();
+            try
+            {
+                if (metaCache.Count <= 0)
+                    return;
+
+                stream.Write(label);
+                stream.Write(metaCache.Count);
+                foreach (var (identifier, (_, value)) in metaCache)
+                {
+                    stream.Write(identifier);
+                    stream.Write(value);
+                }
+            }
+            finally
+            {
+                metaCache.ExitReadLock();
+            }
+        }
+    }
+
+    /// <summary>
+    /// Convert manipulations from a transmitted base64 string to actual manipulations.
+    /// The empty string is treated as an empty set.
+    /// Only returns true if all conversions are successful and distinct. 
+    /// </summary>
+    internal static bool ConvertManips(string manipString, [NotNullWhen(true)] out MetaDictionary? manips, out byte version)
+    {
+        if (manipString.Length == 0)
+        {
+            manips  = new MetaDictionary();
+            version = byte.MaxValue;
+            return true;
+        }
+
+        try
+        {
+            var       bytes            = Convert.FromBase64String(manipString);
+            using var compressedStream = new MemoryStream(bytes);
+            using var zipStream        = new GZipStream(compressedStream, CompressionMode.Decompress);
+            using var resultStream     = new MemoryStream();
+            zipStream.CopyTo(resultStream);
+            resultStream.Flush();
+            resultStream.Position = 0;
+            var data = resultStream.GetBuffer().AsSpan(0, (int)resultStream.Length);
+            version = data[0];
+            data    = data[1..];
+            switch (version)
+            {
+                case 0: return ConvertManipsV0(data, out manips);
+                case 1: return ConvertManipsV1(data, out manips);
+                case 2: return ConvertManipsV2(data, out manips);
+                default:
+                    Penumbra.Log.Debug($"Invalid version for manipulations: {version}.");
+                    manips = null;
+                    return false;
+            }
+        }
+        catch (Exception ex)
+        {
+            Penumbra.Log.Debug($"Error decompressing manipulations:\n{ex}");
+            manips  = null;
+            version = byte.MaxValue;
+            return false;
+        }
+    }
+
+    private static bool ConvertManipsV2(ReadOnlySpan<byte> data, [NotNullWhen(true)] out MetaDictionary? manips)
+    {
+        if (!data.StartsWith("META0002"u8))
+        {
+            Penumbra.Log.Debug("Invalid manipulations of version 2, does not start with valid prefix.");
+            manips = null;
+            return false;
+        }
+
+        manips = new MetaDictionary();
+        var r = new SpanBinaryReader(data[8..]);
+        while (r.Remaining > 4)
+        {
+            var prefix = r.ReadUInt32();
+            var count  = r.Remaining > 4 ? r.ReadInt32() : 0;
+            if (count is 0)
+                continue;
+
+            switch (prefix)
+            {
+                case ImcKey:
+                    for (var i = 0; i < count; ++i)
+                    {
+                        var identifier = r.Read<ImcIdentifier>();
+                        var value      = r.Read<ImcEntry>();
+                        if (!identifier.Validate() || !manips.TryAdd(identifier, value))
+                            return false;
+                    }
+
+                    break;
+                case EqpKey:
+                    for (var i = 0; i < count; ++i)
+                    {
+                        var identifier = r.Read<EqpIdentifier>();
+                        var value      = r.Read<EqpEntry>();
+                        if (!identifier.Validate() || !manips.TryAdd(identifier, value))
+                            return false;
+                    }
+
+                    break;
+                case EqdpKey:
+                    for (var i = 0; i < count; ++i)
+                    {
+                        var identifier = r.Read<EqdpIdentifier>();
+                        var value      = r.Read<EqdpEntry>();
+                        if (!identifier.Validate() || !manips.TryAdd(identifier, value))
+                            return false;
+                    }
+
+                    break;
+                case EstKey:
+                    for (var i = 0; i < count; ++i)
+                    {
+                        var identifier = r.Read<EstIdentifier>();
+                        var value      = r.Read<EstEntry>();
+                        if (!identifier.Validate() || !manips.TryAdd(identifier, value))
+                            return false;
+                    }
+
+                    break;
+                case RspKey:
+                    for (var i = 0; i < count; ++i)
+                    {
+                        var identifier = r.Read<RspIdentifier>();
+                        var value      = r.Read<RspEntry>();
+                        if (!identifier.Validate() || !manips.TryAdd(identifier, value))
+                            return false;
+                    }
+
+                    break;
+                case GmpKey:
+                    for (var i = 0; i < count; ++i)
+                    {
+                        var identifier = r.Read<GmpIdentifier>();
+                        var value      = r.Read<GmpEntry>();
+                        if (!identifier.Validate() || !manips.TryAdd(identifier, value))
+                            return false;
+                    }
+
+                    break;
+                case GeqpKey:
+                    for (var i = 0; i < count; ++i)
+                    {
+                        var identifier = r.Read<GlobalEqpManipulation>();
+                        if (!identifier.Validate() || !manips.TryAdd(identifier))
+                            return false;
+                    }
+
+                    break;
+                case AtchKey:
+                    for (var i = 0; i < count; ++i)
+                    {
+                        var identifier = r.Read<AtchIdentifier>();
+                        var value      = r.Read<AtchEntry>();
+                        if (!identifier.Validate() || !manips.TryAdd(identifier, value))
+                            return false;
+                    }
+
+                    break;
+                case ShpKey:
+                    for (var i = 0; i < count; ++i)
+                    {
+                        var identifier = r.Read<ShpIdentifier>();
+                        var value      = r.Read<ShpEntry>();
+                        if (!identifier.Validate() || !manips.TryAdd(identifier, value))
+                            return false;
+                    }
+
+                    break;
+                case AtrKey:
+                    for (var i = 0; i < count; ++i)
+                    {
+                        var identifier = r.Read<AtrIdentifier>();
+                        var value      = r.Read<AtrEntry>();
+                        if (!identifier.Validate() || !manips.TryAdd(identifier, value))
+                            return false;
+                    }
+
+                    break;
+            }
+        }
+
+        return true;
+    }
+
+    private static bool ConvertManipsV1(ReadOnlySpan<byte> data, [NotNullWhen(true)] out MetaDictionary? manips)
+    {
+        if (!data.StartsWith("META0001"u8))
+        {
+            Penumbra.Log.Debug($"Invalid manipulations of version 1, does not start with valid prefix.");
+            manips = null;
+            return false;
+        }
+
+        manips = new MetaDictionary();
+        var r        = new SpanBinaryReader(data[8..]);
+        var imcCount = r.ReadInt32();
+        for (var i = 0; i < imcCount; ++i)
+        {
+            var identifier = r.Read<ImcIdentifier>();
+            var value      = r.Read<ImcEntry>();
+            if (!identifier.Validate() || !manips.TryAdd(identifier, value))
+                return false;
+        }
+
+        var eqpCount = r.ReadInt32();
+        for (var i = 0; i < eqpCount; ++i)
+        {
+            var identifier = r.Read<EqpIdentifier>();
+            var value      = r.Read<EqpEntry>();
+            if (!identifier.Validate() || !manips.TryAdd(identifier, value))
+                return false;
+        }
+
+        var eqdpCount = r.ReadInt32();
+        for (var i = 0; i < eqdpCount; ++i)
+        {
+            var identifier = r.Read<EqdpIdentifier>();
+            var value      = r.Read<EqdpEntry>();
+            if (!identifier.Validate() || !manips.TryAdd(identifier, value))
+                return false;
+        }
+
+        var estCount = r.ReadInt32();
+        for (var i = 0; i < estCount; ++i)
+        {
+            var identifier = r.Read<EstIdentifier>();
+            var value      = r.Read<EstEntry>();
+            if (!identifier.Validate() || !manips.TryAdd(identifier, value))
+                return false;
+        }
+
+        var rspCount = r.ReadInt32();
+        for (var i = 0; i < rspCount; ++i)
+        {
+            var identifier = r.Read<RspIdentifier>();
+            var value      = r.Read<RspEntry>();
+            if (!identifier.Validate() || !manips.TryAdd(identifier, value))
+                return false;
+        }
+
+        var gmpCount = r.ReadInt32();
+        for (var i = 0; i < gmpCount; ++i)
+        {
+            var identifier = r.Read<GmpIdentifier>();
+            var value      = r.Read<GmpEntry>();
+            if (!identifier.Validate() || !manips.TryAdd(identifier, value))
+                return false;
+        }
+
+        var globalEqpCount = r.ReadInt32();
+        for (var i = 0; i < globalEqpCount; ++i)
+        {
+            var manip = r.Read<GlobalEqpManipulation>();
+            if (!manip.Validate() || !manips.TryAdd(manip))
+                return false;
+        }
+
+        // Atch was added after there were already some V1 around, so check for size here.
+        if (r.Position < r.Count)
+        {
+            var atchCount = r.ReadInt32();
+            for (var i = 0; i < atchCount; ++i)
+            {
+                var identifier = r.Read<AtchIdentifier>();
+                var value      = r.Read<AtchEntry>();
+                if (!identifier.Validate() || !manips.TryAdd(identifier, value))
+                    return false;
+            }
+
+            // Shp and Atr was added later
+            if (r.Position < r.Count)
+            {
+                var shpCount = r.ReadInt32();
+                for (var i = 0; i < shpCount; ++i)
+                {
+                    var identifier = r.Read<ShpIdentifier>();
+                    var value      = r.Read<ShpEntry>();
+                    if (!identifier.Validate() || !manips.TryAdd(identifier, value))
+                        return false;
+                }
+
+                var atrCount = r.ReadInt32();
+                for (var i = 0; i < atrCount; ++i)
+                {
+                    var identifier = r.Read<AtrIdentifier>();
+                    var value      = r.Read<AtrEntry>();
+                    if (!identifier.Validate() || !manips.TryAdd(identifier, value))
+                        return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    private static bool ConvertManipsV0(ReadOnlySpan<byte> data, [NotNullWhen(true)] out MetaDictionary? manips)
+    {
+        var json = Encoding.UTF8.GetString(data);
+        manips = JsonConvert.DeserializeObject<MetaDictionary>(json);
+        return manips != null;
+    }
+
+    internal void TestMetaManipulations()
+    {
+        var collection = collectionResolver.PlayerCollection();
+        var dict       = new MetaDictionary(collection.MetaCache);
+        var count      = dict.Count;
+
+        var watch  = Stopwatch.StartNew();
+        var v0     = CompressMetaManipulationsV0(collection);
+        var v0Time = watch.ElapsedMilliseconds;
+
+        watch.Restart();
+        var v1     = CompressMetaManipulationsV1(collection);
+        var v1Time = watch.ElapsedMilliseconds;
+
+        watch.Restart();
+        var v1Success       = ConvertManips(v1, out var v1Roundtrip, out _);
+        var v1RoundtripTime = watch.ElapsedMilliseconds;
+
+        watch.Restart();
+        var v0Success       = ConvertManips(v0, out var v0Roundtrip, out _);
+        var v0RoundtripTime = watch.ElapsedMilliseconds;
+
+        Penumbra.Log.Information($"Version | Count | Time | Length | Success | ReCount | ReTime | Equal");
+        Penumbra.Log.Information(
+            $"0       | {count} | {v0Time} | {v0.Length} | {v0Success} | {v0Roundtrip?.Count} | {v0RoundtripTime} | {v0Roundtrip?.Equals(dict)}");
+        Penumbra.Log.Information(
+            $"1       | {count} | {v1Time} | {v1.Length} | {v1Success} | {v1Roundtrip?.Count} | {v1RoundtripTime} | {v0Roundtrip?.Equals(dict)}");
+    }
+}

Penumbra/Api/Api/ModSettingsApi.cs

@@ -0,0 +1,362 @@
+using OtterGui.Extensions;
+using OtterGui.Services;
+using Penumbra.Api.Enums;
+using Penumbra.Api.Helpers;
+using Penumbra.Collections;
+using Penumbra.Collections.Manager;
+using Penumbra.Communication;
+using Penumbra.Interop.PathResolving;
+using Penumbra.Mods;
+using Penumbra.Mods.Editor;
+using Penumbra.Mods.Groups;
+using Penumbra.Mods.Manager;
+using Penumbra.Mods.Manager.OptionEditor;
+using Penumbra.Mods.Settings;
+using Penumbra.Mods.SubMods;
+using Penumbra.Services;
+
+namespace Penumbra.Api.Api;
+
+public class ModSettingsApi : IPenumbraApiModSettings, IApiService, IDisposable
+{
+    private readonly CollectionResolver  _collectionResolver;
+    private readonly ModManager          _modManager;
+    private readonly CollectionManager   _collectionManager;
+    private readonly CollectionEditor    _collectionEditor;
+    private readonly CommunicatorService _communicator;
+
+    public ModSettingsApi(CollectionResolver collectionResolver,
+        ModManager modManager,
+        CollectionManager collectionManager,
+        CollectionEditor collectionEditor,
+        CommunicatorService communicator)
+    {
+        _collectionResolver = collectionResolver;
+        _modManager         = modManager;
+        _collectionManager  = collectionManager;
+        _collectionEditor   = collectionEditor;
+        _communicator       = communicator;
+        _communicator.ModPathChanged.Subscribe(OnModPathChange, ModPathChanged.Priority.ApiModSettings);
+        _communicator.ModSettingChanged.Subscribe(OnModSettingChange, Communication.ModSettingChanged.Priority.Api);
+        _communicator.ModOptionChanged.Subscribe(OnModOptionEdited, ModOptionChanged.Priority.Api);
+        _communicator.ModFileChanged.Subscribe(OnModFileChanged, ModFileChanged.Priority.Api);
+    }
+
+    public void Dispose()
+    {
+        _communicator.ModPathChanged.Unsubscribe(OnModPathChange);
+        _communicator.ModSettingChanged.Unsubscribe(OnModSettingChange);
+        _communicator.ModOptionChanged.Unsubscribe(OnModOptionEdited);
+        _communicator.ModFileChanged.Unsubscribe(OnModFileChanged);
+    }
+
+    public event ModSettingChangedDelegate? ModSettingChanged;
+
+    public AvailableModSettings? GetAvailableModSettings(string modDirectory, string modName)
+    {
+        if (!_modManager.TryGetMod(modDirectory, modName, out var mod))
+            return null;
+
+        var dict = new Dictionary<string, (string[], int)>(mod.Groups.Count);
+        foreach (var g in mod.Groups)
+            dict.Add(g.Name, (g.Options.Select(o => o.Name).ToArray(), (int)g.Type));
+        return new AvailableModSettings(dict);
+    }
+
+    public (PenumbraApiEc, (bool, int, Dictionary<string, List<string>>, bool)?) GetCurrentModSettings(Guid collectionId, string modDirectory,
+        string modName, bool ignoreInheritance)
+    {
+        var ret = GetCurrentModSettingsWithTemp(collectionId, modDirectory, modName, ignoreInheritance, true, 0);
+        if (ret.Item2 is null)
+            return (ret.Item1, null);
+
+        return (ret.Item1, (ret.Item2.Value.Item1, ret.Item2.Value.Item2, ret.Item2.Value.Item3, ret.Item2.Value.Item4));
+    }
+
+    public PenumbraApiEc GetSettingsInAllCollections(string modDirectory, string modName,
+        out Dictionary<Guid, (bool, int, Dictionary<string, List<string>>, bool, bool)> settings,
+        bool ignoreTemporaryCollections = false)
+    {
+        settings = [];
+        if (!_modManager.TryGetMod(modDirectory, modName, out var mod))
+            return PenumbraApiEc.ModMissing;
+
+        var collections = ignoreTemporaryCollections
+            ? _collectionManager.Storage.Where(c => c != ModCollection.Empty)
+            : _collectionManager.Storage.Where(c => c != ModCollection.Empty).Concat(_collectionManager.Temp.Values);
+        settings = [];
+        foreach (var collection in collections)
+        {
+            if (GetCurrentSettings(collection, mod, false, false, 0) is { } s)
+                settings.Add(collection.Identity.Id, s);
+        }
+
+        return PenumbraApiEc.Success;
+    }
+
+    public (PenumbraApiEc, (bool, int, Dictionary<string, List<string>>, bool, bool)?) GetCurrentModSettingsWithTemp(Guid collectionId,
+        string modDirectory, string modName, bool ignoreInheritance, bool ignoreTemporary, int key)
+    {
+        if (!_modManager.TryGetMod(modDirectory, modName, out var mod))
+            return (PenumbraApiEc.ModMissing, null);
+
+        if (!_collectionManager.Storage.ById(collectionId, out var collection))
+            return (PenumbraApiEc.CollectionMissing, null);
+
+        if (collection.Identity.Id == Guid.Empty)
+            return (PenumbraApiEc.Success, null);
+
+        if (GetCurrentSettings(collection, mod, ignoreInheritance, ignoreTemporary, key) is { } settings)
+            return (PenumbraApiEc.Success, settings);
+
+        return (PenumbraApiEc.Success, null);
+    }
+
+    public (PenumbraApiEc, Dictionary<string, (bool, int, Dictionary<string, List<string>>, bool, bool)>?) GetAllModSettings(Guid collectionId,
+        bool ignoreInheritance, bool ignoreTemporary, int key)
+    {
+        if (!_collectionManager.Storage.ById(collectionId, out var collection))
+            return (PenumbraApiEc.CollectionMissing, null);
+
+        if (collection.Identity.Id == Guid.Empty)
+            return (PenumbraApiEc.Success, []);
+
+        var ret = new Dictionary<string, (bool, int, Dictionary<string, List<string>>, bool, bool)>(_modManager.Count);
+        foreach (var mod in _modManager)
+        {
+            if (GetCurrentSettings(collection, mod, ignoreInheritance, ignoreTemporary, key) is { } settings)
+                ret[mod.Identifier] = settings;
+        }
+
+        return (PenumbraApiEc.Success, ret);
+    }
+
+    public PenumbraApiEc TryInheritMod(Guid collectionId, string modDirectory, string modName, bool inherit)
+    {
+        var args = ApiHelpers.Args("CollectionId", collectionId, "ModDirectory", modDirectory, "ModName", modName, "Inherit",
+            inherit.ToString());
+
+        if (collectionId == Guid.Empty)
+            return ApiHelpers.Return(PenumbraApiEc.InvalidArgument, args);
+
+        if (!_collectionManager.Storage.ById(collectionId, out var collection))
+            return ApiHelpers.Return(PenumbraApiEc.CollectionMissing, args);
+
+        if (!_modManager.TryGetMod(modDirectory, modName, out var mod))
+            return ApiHelpers.Return(PenumbraApiEc.ModMissing, args);
+
+        var ret = _collectionEditor.SetModInheritance(collection, mod, inherit)
+            ? PenumbraApiEc.Success
+            : PenumbraApiEc.NothingChanged;
+        return ApiHelpers.Return(ret, args);
+    }
+
+    public PenumbraApiEc TrySetMod(Guid collectionId, string modDirectory, string modName, bool enabled)
+    {
+        var args = ApiHelpers.Args("CollectionId", collectionId, "ModDirectory", modDirectory, "ModName", modName, "Enabled", enabled);
+        if (!_collectionManager.Storage.ById(collectionId, out var collection))
+            return ApiHelpers.Return(PenumbraApiEc.CollectionMissing, args);
+
+        if (!_modManager.TryGetMod(modDirectory, modName, out var mod))
+            return ApiHelpers.Return(PenumbraApiEc.ModMissing, args);
+
+        var ret = _collectionEditor.SetModState(collection, mod, enabled)
+            ? PenumbraApiEc.Success
+            : PenumbraApiEc.NothingChanged;
+        return ApiHelpers.Return(ret, args);
+    }
+
+    public PenumbraApiEc TrySetModPriority(Guid collectionId, string modDirectory, string modName, int priority)
+    {
+        var args = ApiHelpers.Args("CollectionId", collectionId, "ModDirectory", modDirectory, "ModName", modName, "Priority", priority);
+
+        if (!_collectionManager.Storage.ById(collectionId, out var collection))
+            return ApiHelpers.Return(PenumbraApiEc.CollectionMissing, args);
+
+        if (!_modManager.TryGetMod(modDirectory, modName, out var mod))
+            return ApiHelpers.Return(PenumbraApiEc.ModMissing, args);
+
+        var ret = _collectionEditor.SetModPriority(collection, mod, new ModPriority(priority))
+            ? PenumbraApiEc.Success
+            : PenumbraApiEc.NothingChanged;
+        return ApiHelpers.Return(ret, args);
+    }
+
+    public PenumbraApiEc TrySetModSetting(Guid collectionId, string modDirectory, string modName, string optionGroupName, string optionName)
+    {
+        var args = ApiHelpers.Args("CollectionId", collectionId, "ModDirectory", modDirectory, "ModName", modName, "OptionGroupName",
+            optionGroupName, "OptionName", optionName);
+
+        if (!_collectionManager.Storage.ById(collectionId, out var collection))
+            return ApiHelpers.Return(PenumbraApiEc.CollectionMissing, args);
+
+        if (!_modManager.TryGetMod(modDirectory, modName, out var mod))
+            return ApiHelpers.Return(PenumbraApiEc.ModMissing, args);
+
+        var groupIdx = mod.Groups.IndexOf(g => g.Name == optionGroupName);
+        if (groupIdx < 0)
+            return ApiHelpers.Return(PenumbraApiEc.OptionGroupMissing, args);
+
+        var optionIdx = mod.Groups[groupIdx].Options.IndexOf(o => o.Name == optionName);
+        if (optionIdx < 0)
+            return ApiHelpers.Return(PenumbraApiEc.OptionMissing, args);
+
+        var setting = mod.Groups[groupIdx].Behaviour switch
+        {
+            GroupDrawBehaviour.MultiSelection  => Setting.Multi(optionIdx),
+            GroupDrawBehaviour.SingleSelection => Setting.Single(optionIdx),
+            _                                  => Setting.Zero,
+        };
+        var ret = _collectionEditor.SetModSetting(collection, mod, groupIdx, setting)
+            ? PenumbraApiEc.Success
+            : PenumbraApiEc.NothingChanged;
+        return ApiHelpers.Return(ret, args);
+    }
+
+    public PenumbraApiEc TrySetModSettings(Guid collectionId, string modDirectory, string modName, string optionGroupName,
+        IReadOnlyList<string> optionNames)
+    {
+        var args = ApiHelpers.Args("CollectionId", collectionId, "ModDirectory", modDirectory, "ModName", modName, "OptionGroupName",
+            optionGroupName, "#optionNames", optionNames.Count);
+
+        if (!_collectionManager.Storage.ById(collectionId, out var collection))
+            return ApiHelpers.Return(PenumbraApiEc.CollectionMissing, args);
+
+        if (!_modManager.TryGetMod(modDirectory, modName, out var mod))
+            return ApiHelpers.Return(PenumbraApiEc.ModMissing, args);
+
+        var settingSuccess = ConvertModSetting(mod, optionGroupName, optionNames, out var groupIdx, out var setting);
+        if (settingSuccess is not PenumbraApiEc.Success)
+            return ApiHelpers.Return(settingSuccess, args);
+
+        var ret = _collectionEditor.SetModSetting(collection, mod, groupIdx, setting)
+            ? PenumbraApiEc.Success
+            : PenumbraApiEc.NothingChanged;
+        return ApiHelpers.Return(ret, args);
+    }
+
+    public PenumbraApiEc CopyModSettings(Guid? collectionId, string modDirectoryFrom, string modDirectoryTo)
+    {
+        var args = ApiHelpers.Args("CollectionId", collectionId.HasValue ? collectionId.Value.ToString() : "NULL",
+            "From", modDirectoryFrom, "To", modDirectoryTo);
+        var sourceMod = _modManager.FirstOrDefault(m => string.Equals(m.ModPath.Name, modDirectoryFrom, StringComparison.OrdinalIgnoreCase));
+        var targetMod = _modManager.FirstOrDefault(m => string.Equals(m.ModPath.Name, modDirectoryTo,   StringComparison.OrdinalIgnoreCase));
+        if (collectionId == null)
+            foreach (var collection in _collectionManager.Storage)
+                _collectionEditor.CopyModSettings(collection, sourceMod, modDirectoryFrom, targetMod, modDirectoryTo);
+        else if (_collectionManager.Storage.ById(collectionId.Value, out var collection))
+            _collectionEditor.CopyModSettings(collection, sourceMod, modDirectoryFrom, targetMod, modDirectoryTo);
+        else
+            return ApiHelpers.Return(PenumbraApiEc.CollectionMissing, args);
+
+        return ApiHelpers.Return(PenumbraApiEc.Success, args);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    private (bool, int, Dictionary<string, List<string>>, bool, bool)? GetCurrentSettings(ModCollection collection, Mod mod,
+        bool ignoreInheritance, bool ignoreTemporary, int key)
+    {
+        var settings = collection.Settings.Settings[mod.Index];
+        if (!ignoreTemporary && settings.TempSettings is { } tempSettings && (tempSettings.Lock <= 0 || tempSettings.Lock == key))
+        {
+            if (!tempSettings.ForceInherit)
+                return (tempSettings.Enabled, tempSettings.Priority.Value, tempSettings.ConvertToShareable(mod).Settings,
+                    false, true);
+            if (!ignoreInheritance && collection.GetActualSettings(mod.Index).Settings is { } actualSettingsTemp)
+                return (actualSettingsTemp.Enabled, actualSettingsTemp.Priority.Value,
+                    actualSettingsTemp.ConvertToShareable(mod).Settings, true, true);
+        }
+
+        if (settings.Settings is { } ownSettings)
+            return (ownSettings.Enabled, ownSettings.Priority.Value, ownSettings.ConvertToShareable(mod).Settings, false,
+                false);
+        if (!ignoreInheritance && collection.GetInheritedSettings(mod.Index).Settings is { } actualSettings)
+            return (actualSettings.Enabled, actualSettings.Priority.Value,
+                actualSettings.ConvertToShareable(mod).Settings, true, false);
+
+        return null;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    private void TriggerSettingEdited(Mod mod)
+    {
+        var collection = _collectionResolver.PlayerCollection();
+        var (settings, parent) = collection.GetActualSettings(mod.Index);
+        if (settings is { Enabled: true })
+            ModSettingChanged?.Invoke(ModSettingChange.Edited, collection.Identity.Id, mod.Identifier, parent != collection);
+    }
+
+    private void OnModPathChange(ModPathChangeType type, Mod mod, DirectoryInfo? _1, DirectoryInfo? _2)
+    {
+        if (type == ModPathChangeType.Reloaded)
+            TriggerSettingEdited(mod);
+    }
+
+    private void OnModSettingChange(ModCollection collection, ModSettingChange type, Mod? mod, Setting _1, int _2, bool inherited)
+        => ModSettingChanged?.Invoke(type, collection.Identity.Id, mod?.ModPath.Name ?? string.Empty, inherited);
+
+    private void OnModOptionEdited(ModOptionChangeType type, Mod mod, IModGroup? group, IModOption? option, IModDataContainer? container,
+        int moveIndex)
+    {
+        switch (type)
+        {
+            case ModOptionChangeType.GroupDeleted:
+            case ModOptionChangeType.GroupMoved:
+            case ModOptionChangeType.GroupTypeChanged:
+            case ModOptionChangeType.PriorityChanged:
+            case ModOptionChangeType.OptionDeleted:
+            case ModOptionChangeType.OptionMoved:
+            case ModOptionChangeType.OptionFilesChanged:
+            case ModOptionChangeType.OptionFilesAdded:
+            case ModOptionChangeType.OptionSwapsChanged:
+            case ModOptionChangeType.OptionMetaChanged:
+                TriggerSettingEdited(mod);
+                break;
+        }
+    }
+
+    private void OnModFileChanged(Mod mod, FileRegistry file)
+    {
+        if (file.CurrentUsage == 0)
+            return;
+
+        TriggerSettingEdited(mod);
+    }
+
+    public static PenumbraApiEc ConvertModSetting(Mod mod, string groupName, IReadOnlyList<string> optionNames, out int groupIndex,
+        out Setting setting)
+    {
+        groupIndex = mod.Groups.IndexOf(g => g.Name.Equals(groupName, StringComparison.OrdinalIgnoreCase));
+        setting    = Setting.Zero;
+        if (groupIndex < 0)
+            return PenumbraApiEc.OptionGroupMissing;
+
+        switch (mod.Groups[groupIndex])
+        {
+            case { Behaviour: GroupDrawBehaviour.SingleSelection } single:
+            {
+                var optionIdx = optionNames.Count == 0 ? -1 : single.Options.IndexOf(o => o.Name == optionNames[^1]);
+                if (optionIdx < 0)
+                    return PenumbraApiEc.OptionMissing;
+
+                setting = Setting.Single(optionIdx);
+                break;
+            }
+            case { Behaviour: GroupDrawBehaviour.MultiSelection } multi:
+            {
+                foreach (var name in optionNames)
+                {
+                    var optionIdx = multi.Options.IndexOf(o => o.Name == name);
+                    if (optionIdx < 0)
+                        return PenumbraApiEc.OptionMissing;
+
+                    setting |= Setting.Multi(optionIdx);
+                }
+
+                break;
+            }
+        }
+
+        return PenumbraApiEc.Success;
+    }
+}

Penumbra/Api/Api/ModsApi.cs

@@ -0,0 +1,165 @@
+using Newtonsoft.Json.Linq;
+using OtterGui.Compression;
+using OtterGui.Services;
+using Penumbra.Api.Enums;
+using Penumbra.Communication;
+using Penumbra.Mods;
+using Penumbra.Mods.Manager;
+using Penumbra.Services;
+
+namespace Penumbra.Api.Api;
+
+public class ModsApi : IPenumbraApiMods, IApiService, IDisposable
+{
+    private readonly CommunicatorService _communicator;
+    private readonly ModManager          _modManager;
+    private readonly ModImportManager    _modImportManager;
+    private readonly Configuration       _config;
+    private readonly ModFileSystem       _modFileSystem;
+    private readonly MigrationManager    _migrationManager;
+
+    public ModsApi(ModManager modManager, ModImportManager modImportManager, Configuration config, ModFileSystem modFileSystem,
+        CommunicatorService communicator, MigrationManager migrationManager)
+    {
+        _modManager       = modManager;
+        _modImportManager = modImportManager;
+        _config           = config;
+        _modFileSystem    = modFileSystem;
+        _communicator     = communicator;
+        _migrationManager = migrationManager;
+        _communicator.ModPathChanged.Subscribe(OnModPathChanged, ModPathChanged.Priority.ApiMods);
+    }
+
+    private void OnModPathChanged(ModPathChangeType type, Mod mod, DirectoryInfo? oldDirectory, DirectoryInfo? newDirectory)
+    {
+        switch (type)
+        {
+            case ModPathChangeType.Deleted when oldDirectory != null: ModDeleted?.Invoke(oldDirectory.Name); break;
+            case ModPathChangeType.Added when newDirectory != null:   ModAdded?.Invoke(newDirectory.Name); break;
+            case ModPathChangeType.Moved when newDirectory != null && oldDirectory != null:
+                ModMoved?.Invoke(oldDirectory.Name, newDirectory.Name);
+                break;
+        }
+    }
+
+    public void Dispose()
+    {
+        _communicator.ModPathChanged.Unsubscribe(OnModPathChanged);
+    }
+
+    public Dictionary<string, string> GetModList()
+        => _modManager.ToDictionary(m => m.ModPath.Name, m => m.Name.Text);
+
+    public PenumbraApiEc InstallMod(string modFilePackagePath)
+    {
+        if (!File.Exists(modFilePackagePath))
+            return ApiHelpers.Return(PenumbraApiEc.FileMissing, ApiHelpers.Args("ModFilePackagePath", modFilePackagePath));
+
+        _modImportManager.AddUnpack(modFilePackagePath);
+        return ApiHelpers.Return(PenumbraApiEc.Success, ApiHelpers.Args("ModFilePackagePath", modFilePackagePath));
+    }
+
+    public PenumbraApiEc ReloadMod(string modDirectory, string modName)
+    {
+        if (!_modManager.TryGetMod(modDirectory, modName, out var mod))
+            return ApiHelpers.Return(PenumbraApiEc.ModMissing, ApiHelpers.Args("ModDirectory", modDirectory, "ModName", modName));
+
+        _modManager.ReloadMod(mod);
+        return ApiHelpers.Return(PenumbraApiEc.Success, ApiHelpers.Args("ModDirectory", modDirectory, "ModName", modName));
+    }
+
+    public PenumbraApiEc AddMod(string modDirectory)
+    {
+        var args = ApiHelpers.Args("ModDirectory", modDirectory);
+
+        var dir = new DirectoryInfo(Path.Join(_modManager.BasePath.FullName, Path.GetFileName(modDirectory)));
+        if (!dir.Exists)
+            return ApiHelpers.Return(PenumbraApiEc.FileMissing, args);
+
+        if (dir.Parent == null
+         || Path.TrimEndingDirectorySeparator(Path.GetFullPath(_modManager.BasePath.FullName))
+         != Path.TrimEndingDirectorySeparator(Path.GetFullPath(dir.Parent.FullName)))
+            return ApiHelpers.Return(PenumbraApiEc.InvalidArgument, args);
+
+        _modManager.AddMod(dir, true);
+        if (_config.MigrateImportedModelsToV6)
+        {
+            _migrationManager.MigrateMdlDirectory(dir.FullName, false);
+            _migrationManager.Await();
+        }
+
+        if (_config.UseFileSystemCompression)
+            new FileCompactor(Penumbra.Log).StartMassCompact(dir.EnumerateFiles("*.*", SearchOption.AllDirectories),
+                CompressionAlgorithm.Xpress8K, false);
+
+        return ApiHelpers.Return(PenumbraApiEc.Success, args);
+    }
+
+    public PenumbraApiEc DeleteMod(string modDirectory, string modName)
+    {
+        if (!_modManager.TryGetMod(modDirectory, modName, out var mod))
+            return ApiHelpers.Return(PenumbraApiEc.NothingChanged, ApiHelpers.Args("ModDirectory", modDirectory, "ModName", modName));
+
+        _modManager.DeleteMod(mod);
+        return ApiHelpers.Return(PenumbraApiEc.Success, ApiHelpers.Args("ModDirectory", modDirectory, "ModName", modName));
+    }
+
+    public event Action<string>?         ModDeleted;
+    public event Action<string>?         ModAdded;
+    public event Action<string, string>? ModMoved;
+
+    public event Action<JObject, ushort, string>? CreatingPcp
+    {
+        add => _communicator.PcpCreation.Subscribe(value!, PcpCreation.Priority.ModsApi);
+        remove => _communicator.PcpCreation.Unsubscribe(value!);
+    }
+
+    public event Action<JObject, string, Guid>? ParsingPcp
+    {
+        add => _communicator.PcpParsing.Subscribe(value!, PcpParsing.Priority.ModsApi);
+        remove => _communicator.PcpParsing.Unsubscribe(value!);
+    }
+
+    public (PenumbraApiEc, string, bool, bool) GetModPath(string modDirectory, string modName)
+    {
+        if (!_modManager.TryGetMod(modDirectory, modName, out var mod)
+         || !_modFileSystem.TryGetValue(mod, out var leaf))
+            return (PenumbraApiEc.ModMissing, string.Empty, false, false);
+
+        var fullPath      = leaf.FullName();
+        var isDefault     = ModFileSystem.ModHasDefaultPath(mod, fullPath);
+        var isNameDefault = isDefault || ModFileSystem.ModHasDefaultPath(mod, leaf.Name);
+        return (PenumbraApiEc.Success, fullPath, !isDefault, !isNameDefault);
+    }
+
+    public PenumbraApiEc SetModPath(string modDirectory, string modName, string newPath)
+    {
+        if (newPath.Length == 0)
+            return PenumbraApiEc.InvalidArgument;
+
+        if (!_modManager.TryGetMod(modDirectory, modName, out var mod)
+         || !_modFileSystem.TryGetValue(mod, out var leaf))
+            return PenumbraApiEc.ModMissing;
+
+        try
+        {
+            _modFileSystem.RenameAndMove(leaf, newPath);
+            return PenumbraApiEc.Success;
+        }
+        catch
+        {
+            return PenumbraApiEc.PathRenameFailed;
+        }
+    }
+
+    public Dictionary<string, object?> GetChangedItems(string modDirectory, string modName)
+        => _modManager.TryGetMod(modDirectory, modName, out var mod)
+            ? mod.ChangedItems.ToDictionary(kvp => kvp.Key, kvp => kvp.Value?.ToInternalObject())
+            : [];
+
+    public IReadOnlyDictionary<string, IReadOnlyDictionary<string, object?>> GetChangedItemAdapterDictionary()
+        => new ModChangedItemAdapter(new WeakReference<ModStorage>(_modManager));
+
+    public IReadOnlyList<(string ModDirectory, IReadOnlyDictionary<string, object?> ChangedItems)> GetChangedItemAdapterList()
+        => new ModChangedItemAdapter(new WeakReference<ModStorage>(_modManager));
+}

Penumbra/Api/Api/PenumbraApi.cs

@@ -0,0 +1,43 @@
+using OtterGui.Services;
+
+namespace Penumbra.Api.Api;
+
+public class PenumbraApi(
+    CollectionApi collection,
+    EditingApi editing,
+    GameStateApi gameState,
+    MetaApi meta,
+    ModsApi mods,
+    ModSettingsApi modSettings,
+    PluginStateApi pluginState,
+    RedrawApi redraw,
+    ResolveApi resolve,
+    ResourceTreeApi resourceTree,
+    TemporaryApi temporary,
+    UiApi ui) : IDisposable, IApiService, IPenumbraApi
+{
+    public const int BreakingVersion = 5;
+    public const int FeatureVersion  = 13;
+
+    public void Dispose()
+    {
+        Valid = false;
+    }
+
+    public (int Breaking, int Feature) ApiVersion
+        => (BreakingVersion, FeatureVersion);
+
+    public bool                     Valid        { get; private set; } = true;
+    public IPenumbraApiCollection   Collection   { get; }              = collection;
+    public IPenumbraApiEditing      Editing      { get; }              = editing;
+    public IPenumbraApiGameState    GameState    { get; }              = gameState;
+    public IPenumbraApiMeta         Meta         { get; }              = meta;
+    public IPenumbraApiMods         Mods         { get; }              = mods;
+    public IPenumbraApiModSettings  ModSettings  { get; }              = modSettings;
+    public IPenumbraApiPluginState  PluginState  { get; }              = pluginState;
+    public IPenumbraApiRedraw       Redraw       { get; }              = redraw;
+    public IPenumbraApiResolve      Resolve      { get; }              = resolve;
+    public IPenumbraApiResourceTree ResourceTree { get; }              = resourceTree;
+    public IPenumbraApiTemporary    Temporary    { get; }              = temporary;
+    public IPenumbraApiUi           Ui           { get; }              = ui;
+}

Penumbra/Api/Api/PluginStateApi.cs

@@ -0,0 +1,38 @@
+using System.Collections.Frozen;
+using Newtonsoft.Json;
+using OtterGui.Services;
+using Penumbra.Communication;
+using Penumbra.Mods;
+using Penumbra.Services;
+
+namespace Penumbra.Api.Api;
+
+public class PluginStateApi(Configuration config, CommunicatorService communicator) : IPenumbraApiPluginState, IApiService
+{
+    public string GetModDirectory()
+        => config.ModDirectory;
+
+    public string GetConfiguration()
+        => JsonConvert.SerializeObject(config, Formatting.Indented);
+
+    public event Action<string, bool>? ModDirectoryChanged
+    {
+        add => communicator.ModDirectoryChanged.Subscribe(value!, Communication.ModDirectoryChanged.Priority.Api);
+        remove => communicator.ModDirectoryChanged.Unsubscribe(value!);
+    }
+
+    public bool GetEnabledState()
+        => config.EnableMods;
+
+    public event Action<bool>? EnabledChange
+    {
+        add => communicator.EnabledChanged.Subscribe(value!, EnabledChanged.Priority.Api);
+        remove => communicator.EnabledChanged.Unsubscribe(value!);
+    }
+
+    public FrozenSet<string> SupportedFeatures
+        => FeatureChecker.SupportedFeatures.ToFrozenSet();
+
+    public string[] CheckSupportedFeatures(IEnumerable<string> requiredFeatures)
+        => requiredFeatures.Where(f => !FeatureChecker.Supported(f)).ToArray();
+}

Penumbra/Api/Api/RedrawApi.cs

@@ -0,0 +1,57 @@
+using Dalamud.Game.ClientState.Objects.Types;
+using Dalamud.Plugin.Services;
+using OtterGui.Services;
+using Penumbra.Api.Enums;
+using Penumbra.Collections;
+using Penumbra.Collections.Manager;
+using Penumbra.GameData.Interop;
+using Penumbra.Interop.Services;
+
+namespace Penumbra.Api.Api;
+
+public class RedrawApi(RedrawService redrawService, IFramework framework, CollectionManager collections, ObjectManager objects, ApiHelpers helpers) : IPenumbraApiRedraw, IApiService
+{
+    public void RedrawObject(int gameObjectIndex, RedrawType setting)
+    {
+        framework.RunOnFrameworkThread(() => redrawService.RedrawObject(gameObjectIndex, setting));
+    }
+
+    public void RedrawObject(string name, RedrawType setting)
+    {
+        framework.RunOnFrameworkThread(() => redrawService.RedrawObject(name, setting));
+    }
+
+    public void RedrawObject(IGameObject? gameObject, RedrawType setting)
+    {
+        framework.RunOnFrameworkThread(() => redrawService.RedrawObject(gameObject, setting));
+    }
+
+    public void RedrawAll(RedrawType setting)
+    {
+        framework.RunOnFrameworkThread(() => redrawService.RedrawAll(setting));
+    }
+
+    public void RedrawCollectionMembers(Guid collectionId, RedrawType setting)
+    {
+
+        if (!collections.Storage.ById(collectionId, out var collection))
+            collection = ModCollection.Empty;
+        framework.RunOnFrameworkThread(() =>
+        {
+            foreach (var actor in objects.Objects)
+            {
+                helpers.AssociatedCollection(actor.ObjectIndex, out var modCollection);
+                if (collection == modCollection)
+                {
+                     redrawService.RedrawObject(actor.ObjectIndex, setting);
+                }
+            }
+        });
+    }
+
+    public event GameObjectRedrawnDelegate? GameObjectRedrawn
+    {
+        add => redrawService.GameObjectRedrawn += value;
+        remove => redrawService.GameObjectRedrawn -= value;
+    }
+}

Penumbra/Api/Api/ResolveApi.cs

@@ -0,0 +1,135 @@
+using Dalamud.Plugin.Services;
+using OtterGui.Services;
+using Penumbra.Api.Enums;
+using Penumbra.Collections;
+using Penumbra.Collections.Manager;
+using Penumbra.Interop.PathResolving;
+using Penumbra.Mods.Manager;
+using Penumbra.String.Classes;
+
+namespace Penumbra.Api.Api;
+
+public class ResolveApi(
+    ModManager modManager,
+    CollectionManager collectionManager,
+    Configuration config,
+    CollectionResolver collectionResolver,
+    ApiHelpers helpers,
+    IFramework framework) : IPenumbraApiResolve, IApiService
+{
+    public string ResolveDefaultPath(string gamePath)
+        => ResolvePath(gamePath, modManager, collectionManager.Active.Default);
+
+    public string ResolveInterfacePath(string gamePath)
+        => ResolvePath(gamePath, modManager, collectionManager.Active.Interface);
+
+    public string ResolveGameObjectPath(string gamePath, int gameObjectIdx)
+    {
+        helpers.AssociatedCollection(gameObjectIdx, out var collection);
+        return ResolvePath(gamePath, modManager, collection);
+    }
+
+    public string ResolvePlayerPath(string gamePath)
+        => ResolvePath(gamePath, modManager, collectionResolver.PlayerCollection());
+
+    public string[] ReverseResolveGameObjectPath(string moddedPath, int gameObjectIdx)
+    {
+        if (!config.EnableMods)
+            return [moddedPath];
+
+        helpers.AssociatedCollection(gameObjectIdx, out var collection);
+        var ret = collection.ReverseResolvePath(new FullPath(moddedPath));
+        return ret.Select(r => r.ToString()).ToArray();
+    }
+
+    public PenumbraApiEc ResolvePath(Guid collectionId, string gamePath, out string resolvedPath)
+    {
+        resolvedPath = gamePath;
+        if (!collectionManager.Storage.ById(collectionId, out var collection))
+            return PenumbraApiEc.CollectionMissing;
+
+        if (!collection.HasCache)
+            return PenumbraApiEc.CollectionInactive;
+
+        resolvedPath = ResolvePath(gamePath, modManager, collection);
+        return PenumbraApiEc.Success;
+    }
+
+    public string[] ReverseResolvePlayerPath(string moddedPath)
+    {
+        if (!config.EnableMods)
+            return [moddedPath];
+
+        var ret = collectionResolver.PlayerCollection().ReverseResolvePath(new FullPath(moddedPath));
+        return ret.Select(r => r.ToString()).ToArray();
+    }
+
+    public (string[], string[][]) ResolvePlayerPaths(string[] forward, string[] reverse)
+    {
+        if (!config.EnableMods)
+            return (forward, reverse.Select(p => new[]
+            {
+                p,
+            }).ToArray());
+
+        var playerCollection = collectionResolver.PlayerCollection();
+        var resolved         = forward.Select(p => ResolvePath(p, modManager, playerCollection)).ToArray();
+        var reverseResolved  = playerCollection.ReverseResolvePaths(reverse);
+        return (resolved, reverseResolved.Select(a => a.Select(p => p.ToString()).ToArray()).ToArray());
+    }
+
+    public PenumbraApiEc ResolvePaths(Guid collectionId, string[] forward, string[] reverse, out string[] resolvedForward,
+        out string[][] resolvedReverse)
+    {
+        resolvedForward = forward;
+        resolvedReverse = [];
+        if (!config.EnableMods)
+            return PenumbraApiEc.Success;
+
+        if (!collectionManager.Storage.ById(collectionId, out var collection))
+            return PenumbraApiEc.CollectionMissing;
+
+        if (!collection.HasCache)
+            return PenumbraApiEc.CollectionInactive;
+
+        resolvedForward        = forward.Select(p => ResolvePath(p, modManager, collection)).ToArray();
+        var reverseResolved = collection.ReverseResolvePaths(reverse);
+        resolvedReverse = reverseResolved.Select(a => a.Select(p => p.ToString()).ToArray()).ToArray();
+        return PenumbraApiEc.Success;
+    }
+
+    public async Task<(string[], string[][])> ResolvePlayerPathsAsync(string[] forward, string[] reverse)
+    {
+        if (!config.EnableMods)
+            return (forward, reverse.Select(p => new[]
+            {
+                p,
+            }).ToArray());
+
+        return await Task.Run(async () =>
+        {
+            var playerCollection = await framework.RunOnFrameworkThread(collectionResolver.PlayerCollection).ConfigureAwait(false);
+            var forwardTask = Task.Run(() =>
+            {
+                var forwardRet = new string[forward.Length];
+                Parallel.For(0, forward.Length, idx => forwardRet[idx] = ResolvePath(forward[idx], modManager, playerCollection));
+                return forwardRet;
+            }).ConfigureAwait(false);
+            var reverseTask     = Task.Run(() => playerCollection.ReverseResolvePaths(reverse)).ConfigureAwait(false);
+            var reverseResolved = (await reverseTask).Select(a => a.Select(p => p.ToString()).ToArray()).ToArray();
+            return (await forwardTask, reverseResolved);
+        }).ConfigureAwait(false);
+    }
+
+    /// <summary> Resolve a path given by string for a specific collection. </summary>
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    private string ResolvePath(string path, ModManager _, ModCollection collection)
+    {
+        if (!config.EnableMods)
+            return path;
+
+        var gamePath = Utf8GamePath.FromString(path, out var p) ? p : Utf8GamePath.Empty;
+        var ret      = collection.ResolvePath(gamePath);
+        return ret?.ToString() ?? path;
+    }
+}

Penumbra/Api/Api/ResourceTreeApi.cs

@@ -0,0 +1,63 @@
+using Dalamud.Game.ClientState.Objects.Types;
+using Newtonsoft.Json.Linq;
+using OtterGui.Services;
+using Penumbra.Api.Enums;
+using Penumbra.Api.Helpers;
+using Penumbra.GameData.Interop;
+using Penumbra.Interop.ResourceTree;
+
+namespace Penumbra.Api.Api;
+
+public class ResourceTreeApi(ResourceTreeFactory resourceTreeFactory, ObjectManager objects) : IPenumbraApiResourceTree, IApiService
+{
+    public Dictionary<string, HashSet<string>>?[] GetGameObjectResourcePaths(params ushort[] gameObjects)
+    {
+        var characters       = gameObjects.Select(index => objects.GetDalamudObject((int)index)).OfType<ICharacter>();
+        var resourceTrees    = resourceTreeFactory.FromCharacters(characters, 0);
+        var pathDictionaries = ResourceTreeApiHelper.GetResourcePathDictionaries(resourceTrees);
+
+        return Array.ConvertAll(gameObjects, obj => pathDictionaries.GetValueOrDefault(obj));
+    }
+
+    public Dictionary<ushort, Dictionary<string, HashSet<string>>> GetPlayerResourcePaths()
+    {
+        var resourceTrees = resourceTreeFactory.FromObjectTable(ResourceTreeFactory.Flags.LocalPlayerRelatedOnly);
+        return ResourceTreeApiHelper.GetResourcePathDictionaries(resourceTrees);
+    }
+
+    public GameResourceDict?[] GetGameObjectResourcesOfType(ResourceType type, bool withUiData,
+        params ushort[] gameObjects)
+    {
+        var characters      = gameObjects.Select(index => objects.GetDalamudObject((int)index)).OfType<ICharacter>();
+        var resourceTrees   = resourceTreeFactory.FromCharacters(characters, withUiData ? ResourceTreeFactory.Flags.WithUiData : 0);
+        var resDictionaries = ResourceTreeApiHelper.GetResourcesOfType(resourceTrees, type);
+
+        return Array.ConvertAll(gameObjects, obj => resDictionaries.GetValueOrDefault(obj));
+    }
+
+    public Dictionary<ushort, GameResourceDict> GetPlayerResourcesOfType(ResourceType type,
+        bool withUiData)
+    {
+        var resourceTrees = resourceTreeFactory.FromObjectTable(ResourceTreeFactory.Flags.LocalPlayerRelatedOnly
+          | (withUiData ? ResourceTreeFactory.Flags.WithUiData : 0));
+        return ResourceTreeApiHelper.GetResourcesOfType(resourceTrees, type);
+    }
+
+    public JObject?[] GetGameObjectResourceTrees(bool withUiData, params ushort[] gameObjects)
+    {
+        var characters    = gameObjects.Select(index => objects.GetDalamudObject((int)index)).OfType<ICharacter>();
+        var resourceTrees = resourceTreeFactory.FromCharacters(characters, withUiData ? ResourceTreeFactory.Flags.WithUiData : 0);
+        var resDictionary = ResourceTreeApiHelper.EncapsulateResourceTrees(resourceTrees);
+
+        return Array.ConvertAll(gameObjects, obj => resDictionary.GetValueOrDefault(obj));
+    }
+
+    public Dictionary<ushort, JObject> GetPlayerResourceTrees(bool withUiData)
+    {
+        var resourceTrees = resourceTreeFactory.FromObjectTable(ResourceTreeFactory.Flags.LocalPlayerRelatedOnly
+          | (withUiData ? ResourceTreeFactory.Flags.WithUiData : 0));
+        var resDictionary = ResourceTreeApiHelper.EncapsulateResourceTrees(resourceTrees);
+
+        return resDictionary;
+    }
+}

Penumbra/Api/Api/TemporaryApi.cs

@@ -0,0 +1,338 @@
+using OtterGui.Log;
+using OtterGui.Services;
+using Penumbra.Api.Enums;
+using Penumbra.Collections;
+using Penumbra.Collections.Manager;
+using Penumbra.GameData.Actors;
+using Penumbra.GameData.Interop;
+using Penumbra.Mods.Manager;
+using Penumbra.Mods.Settings;
+using Penumbra.String.Classes;
+
+namespace Penumbra.Api.Api;
+
+public class TemporaryApi(
+    TempCollectionManager tempCollections,
+    ObjectManager objects,
+    ActorManager actors,
+    CollectionManager collectionManager,
+    TempModManager tempMods,
+    ApiHelpers apiHelpers,
+    ModManager modManager) : IPenumbraApiTemporary, IApiService
+{
+    public (PenumbraApiEc, Guid) CreateTemporaryCollection(string identity, string name)
+    {
+        if (!IdentityChecker.Check(identity))
+            return (PenumbraApiEc.InvalidCredentials, Guid.Empty);
+
+        var collection = tempCollections.CreateTemporaryCollection(name);
+        if (collection == Guid.Empty)
+            return (PenumbraApiEc.UnknownError, collection);
+        return (PenumbraApiEc.Success, collection);
+    }
+
+    public PenumbraApiEc DeleteTemporaryCollection(Guid collectionId)
+        => tempCollections.RemoveTemporaryCollection(collectionId)
+            ? PenumbraApiEc.Success
+            : PenumbraApiEc.CollectionMissing;
+
+    public PenumbraApiEc AssignTemporaryCollection(Guid collectionId, int actorIndex, bool forceAssignment)
+    {
+        var args = ApiHelpers.Args("CollectionId", collectionId, "ActorIndex", actorIndex, "Forced", forceAssignment);
+        if (actorIndex < 0 || actorIndex >= objects.TotalCount)
+            return ApiHelpers.Return(PenumbraApiEc.InvalidArgument, args);
+
+        var identifier = actors.FromObject(objects[actorIndex], out _, false, false, true);
+        if (!identifier.IsValid)
+            return ApiHelpers.Return(PenumbraApiEc.InvalidArgument, args);
+
+        if (!tempCollections.CollectionById(collectionId, out var collection))
+            return ApiHelpers.Return(PenumbraApiEc.CollectionMissing, args);
+
+        if (forceAssignment)
+        {
+            if (tempCollections.Collections.ContainsKey(identifier) && !tempCollections.Collections.Delete(identifier))
+                return ApiHelpers.Return(PenumbraApiEc.AssignmentDeletionFailed, args);
+        }
+        else if (tempCollections.Collections.ContainsKey(identifier)
+              || collectionManager.Active.Individuals.ContainsKey(identifier))
+        {
+            return ApiHelpers.Return(PenumbraApiEc.CharacterCollectionExists, args);
+        }
+
+        var group = tempCollections.Collections.GetGroup(identifier);
+        var ret = tempCollections.AddIdentifier(collection, group)
+            ? PenumbraApiEc.Success
+            : PenumbraApiEc.UnknownError;
+        return ApiHelpers.Return(ret, args);
+    }
+
+    public PenumbraApiEc AddTemporaryModAll(string tag, Dictionary<string, string> paths, string manipString, int priority)
+    {
+        var args = ApiHelpers.Args("Tag", tag, "#Paths", paths.Count, "ManipString", manipString, "Priority", priority);
+        if (!ConvertPaths(paths, out var p))
+            return ApiHelpers.Return(PenumbraApiEc.InvalidGamePath, args);
+
+        if (!MetaApi.ConvertManips(manipString, out var m, out _))
+            return ApiHelpers.Return(PenumbraApiEc.InvalidManipulation, args);
+
+        var ret = tempMods.Register(tag, null, p, m, new ModPriority(priority)) switch
+        {
+            RedirectResult.Success => PenumbraApiEc.Success,
+            _                      => PenumbraApiEc.UnknownError,
+        };
+        return ApiHelpers.Return(ret, args);
+    }
+
+    public PenumbraApiEc AddTemporaryMod(string tag, Guid collectionId, Dictionary<string, string> paths, string manipString, int priority)
+    {
+        var args = ApiHelpers.Args("Tag", tag, "CollectionId", collectionId, "#Paths", paths.Count, "ManipString",
+            manipString, "Priority", priority);
+
+        if (collectionId == Guid.Empty)
+            return ApiHelpers.Return(PenumbraApiEc.InvalidArgument, args);
+
+        if (!tempCollections.CollectionById(collectionId, out var collection)
+         && !collectionManager.Storage.ById(collectionId, out collection))
+            return ApiHelpers.Return(PenumbraApiEc.CollectionMissing, args);
+
+        if (!ConvertPaths(paths, out var p))
+            return ApiHelpers.Return(PenumbraApiEc.InvalidGamePath, args);
+
+        if (!MetaApi.ConvertManips(manipString, out var m, out _))
+            return ApiHelpers.Return(PenumbraApiEc.InvalidManipulation, args);
+
+        var ret = tempMods.Register(tag, collection, p, m, new ModPriority(priority)) switch
+        {
+            RedirectResult.Success => PenumbraApiEc.Success,
+            _                      => PenumbraApiEc.UnknownError,
+        };
+        return ApiHelpers.Return(ret, args);
+    }
+
+    public PenumbraApiEc RemoveTemporaryModAll(string tag, int priority)
+    {
+        var ret = tempMods.Unregister(tag, null, new ModPriority(priority)) switch
+        {
+            RedirectResult.Success       => PenumbraApiEc.Success,
+            RedirectResult.NotRegistered => PenumbraApiEc.NothingChanged,
+            _                            => PenumbraApiEc.UnknownError,
+        };
+        return ApiHelpers.Return(ret, ApiHelpers.Args("Tag", tag, "Priority", priority));
+    }
+
+    public PenumbraApiEc RemoveTemporaryMod(string tag, Guid collectionId, int priority)
+    {
+        var args = ApiHelpers.Args("Tag", tag, "CollectionId", collectionId, "Priority", priority);
+
+        if (!tempCollections.CollectionById(collectionId, out var collection)
+         && !collectionManager.Storage.ById(collectionId, out collection))
+            return ApiHelpers.Return(PenumbraApiEc.CollectionMissing, args);
+
+        var ret = tempMods.Unregister(tag, collection, new ModPriority(priority)) switch
+        {
+            RedirectResult.Success       => PenumbraApiEc.Success,
+            RedirectResult.NotRegistered => PenumbraApiEc.NothingChanged,
+            _                            => PenumbraApiEc.UnknownError,
+        };
+        return ApiHelpers.Return(ret, args);
+    }
+
+    public (PenumbraApiEc, (bool, bool, int, Dictionary<string, List<string>>)?, string) QueryTemporaryModSettings(Guid collectionId,
+        string modDirectory, string modName, int key)
+    {
+        var args = ApiHelpers.Args("CollectionId", collectionId, "ModDirectory", modDirectory, "ModName", modName);
+        if (!collectionManager.Storage.ById(collectionId, out var collection))
+            return (ApiHelpers.Return(PenumbraApiEc.CollectionMissing, args), null, string.Empty);
+
+        return QueryTemporaryModSettings(args, collection, modDirectory, modName, key);
+    }
+
+    public (PenumbraApiEc ErrorCode, (bool, bool, int, Dictionary<string, List<string>>)? Settings, string Source)
+        QueryTemporaryModSettingsPlayer(int objectIndex,
+            string modDirectory, string modName, int key)
+    {
+        var args = ApiHelpers.Args("ObjectIndex", objectIndex, "ModDirectory", modDirectory, "ModName", modName);
+        if (!apiHelpers.AssociatedCollection(objectIndex, out var collection))
+            return (ApiHelpers.Return(PenumbraApiEc.InvalidArgument, args), null, string.Empty);
+
+        return QueryTemporaryModSettings(args, collection, modDirectory, modName, key);
+    }
+
+    private (PenumbraApiEc ErrorCode, (bool, bool, int, Dictionary<string, List<string>>)? Settings, string Source) QueryTemporaryModSettings(
+        in LazyString args, ModCollection collection, string modDirectory, string modName, int key)
+    {
+        if (!modManager.TryGetMod(modDirectory, modName, out var mod))
+            return (ApiHelpers.Return(PenumbraApiEc.ModMissing, args), null, string.Empty);
+
+        if (collection.Identity.Index <= 0)
+            return (ApiHelpers.Return(PenumbraApiEc.Success, args), null, string.Empty);
+
+        var settings = collection.GetTempSettings(mod.Index);
+        if (settings == null)
+            return (ApiHelpers.Return(PenumbraApiEc.Success, args), null, string.Empty);
+
+        if (settings.Lock > 0 && settings.Lock != key)
+            return (ApiHelpers.Return(PenumbraApiEc.TemporarySettingDisallowed, args), null, settings.Source);
+
+        return (ApiHelpers.Return(PenumbraApiEc.Success, args),
+            (settings.ForceInherit, settings.Enabled, settings.Priority.Value, settings.ConvertToShareable(mod).Settings), settings.Source);
+    }
+
+
+    public PenumbraApiEc SetTemporaryModSettings(Guid collectionId, string modDirectory, string modName, bool inherit, bool enabled,
+        int priority,
+        IReadOnlyDictionary<string, IReadOnlyList<string>> options, string source, int key)
+    {
+        var args = ApiHelpers.Args("CollectionId", collectionId, "ModDirectory", modDirectory, "ModName", modName, "Inherit", inherit,
+            "Enabled", enabled,
+            "Priority", priority, "Options", options, "Source", source, "Key", key);
+        if (!collectionManager.Storage.ById(collectionId, out var collection))
+            return ApiHelpers.Return(PenumbraApiEc.CollectionMissing, args);
+
+        return SetTemporaryModSettings(args, collection, modDirectory, modName, inherit, enabled, priority, options, source, key);
+    }
+
+    public PenumbraApiEc SetTemporaryModSettingsPlayer(int objectIndex, string modDirectory, string modName, bool inherit, bool enabled,
+        int priority,
+        IReadOnlyDictionary<string, IReadOnlyList<string>> options, string source, int key)
+    {
+        var args = ApiHelpers.Args("ObjectIndex", objectIndex, "ModDirectory", modDirectory, "ModName", modName, "Inherit", inherit, "Enabled",
+            enabled,
+            "Priority", priority, "Options", options, "Source", source, "Key", key);
+        if (!apiHelpers.AssociatedCollection(objectIndex, out var collection))
+            return ApiHelpers.Return(PenumbraApiEc.InvalidArgument, args);
+
+        return SetTemporaryModSettings(args, collection, modDirectory, modName, inherit, enabled, priority, options, source, key);
+    }
+
+    private PenumbraApiEc SetTemporaryModSettings(in LazyString args, ModCollection collection, string modDirectory, string modName,
+        bool inherit, bool enabled, int priority, IReadOnlyDictionary<string, IReadOnlyList<string>> options, string source, int key)
+    {
+        if (collection.Identity.Index <= 0)
+            return ApiHelpers.Return(PenumbraApiEc.TemporarySettingImpossible, args);
+
+        if (!modManager.TryGetMod(modDirectory, modName, out var mod))
+            return ApiHelpers.Return(PenumbraApiEc.ModMissing, args);
+
+        if (!collectionManager.Editor.CanSetTemporarySettings(collection, mod, key))
+            if (collection.GetTempSettings(mod.Index) is { Lock: > 0 } oldSettings && oldSettings.Lock != key)
+                return ApiHelpers.Return(PenumbraApiEc.TemporarySettingDisallowed, args);
+
+        var newSettings = new TemporaryModSettings()
+        {
+            ForceInherit = inherit,
+            Enabled      = enabled,
+            Priority     = new ModPriority(priority),
+            Lock         = key,
+            Source       = source,
+            Settings     = SettingList.Default(mod),
+        };
+
+
+        foreach (var (groupName, optionNames) in options)
+        {
+            var ec = ModSettingsApi.ConvertModSetting(mod, groupName, optionNames, out var groupIdx, out var setting);
+            if (ec != PenumbraApiEc.Success)
+                return ApiHelpers.Return(ec, args);
+
+            newSettings.Settings[groupIdx] = setting;
+        }
+
+        if (collectionManager.Editor.SetTemporarySettings(collection, mod, newSettings, key))
+            return ApiHelpers.Return(PenumbraApiEc.Success, args);
+
+        // This should not happen since all error cases had been checked before.
+        return ApiHelpers.Return(PenumbraApiEc.UnknownError, args);
+    }
+
+    public PenumbraApiEc RemoveTemporaryModSettings(Guid collectionId, string modDirectory, string modName, int key)
+    {
+        var args = ApiHelpers.Args("CollectionId", collectionId, "ModDirectory", modDirectory, "ModName", modName, "Key", key);
+        if (!collectionManager.Storage.ById(collectionId, out var collection))
+            return ApiHelpers.Return(PenumbraApiEc.CollectionMissing, args);
+
+        return RemoveTemporaryModSettings(args, collection, modDirectory, modName, key);
+    }
+
+    public PenumbraApiEc RemoveTemporaryModSettingsPlayer(int objectIndex, string modDirectory, string modName, int key)
+    {
+        var args = ApiHelpers.Args("ObjectIndex", objectIndex, "ModDirectory", modDirectory, "ModName", modName, "Key", key);
+        if (!apiHelpers.AssociatedCollection(objectIndex, out var collection))
+            return ApiHelpers.Return(PenumbraApiEc.InvalidArgument, args);
+
+        return RemoveTemporaryModSettings(args, collection, modDirectory, modName, key);
+    }
+
+    private PenumbraApiEc RemoveTemporaryModSettings(in LazyString args, ModCollection collection, string modDirectory, string modName, int key)
+    {
+        if (collection.Identity.Index <= 0)
+            return ApiHelpers.Return(PenumbraApiEc.NothingChanged, args);
+
+        if (!modManager.TryGetMod(modDirectory, modName, out var mod))
+            return ApiHelpers.Return(PenumbraApiEc.ModMissing, args);
+
+        if (collection.GetTempSettings(mod.Index) is null)
+            return ApiHelpers.Return(PenumbraApiEc.NothingChanged, args);
+
+        if (!collectionManager.Editor.SetTemporarySettings(collection, mod, null, key))
+            return ApiHelpers.Return(PenumbraApiEc.TemporarySettingDisallowed, args);
+
+        return ApiHelpers.Return(PenumbraApiEc.Success, args);
+    }
+
+    public PenumbraApiEc RemoveAllTemporaryModSettings(Guid collectionId, int key)
+    {
+        var args = ApiHelpers.Args("CollectionId", collectionId, "Key", key);
+        if (!collectionManager.Storage.ById(collectionId, out var collection))
+            return ApiHelpers.Return(PenumbraApiEc.CollectionMissing, args);
+
+        return RemoveAllTemporaryModSettings(args, collection, key);
+    }
+
+    public PenumbraApiEc RemoveAllTemporaryModSettingsPlayer(int objectIndex, int key)
+    {
+        var args = ApiHelpers.Args("ObjectIndex", objectIndex, "Key", key);
+        if (!apiHelpers.AssociatedCollection(objectIndex, out var collection))
+            return ApiHelpers.Return(PenumbraApiEc.InvalidArgument, args);
+
+        return RemoveAllTemporaryModSettings(args, collection, key);
+    }
+
+    private PenumbraApiEc RemoveAllTemporaryModSettings(in LazyString args, ModCollection collection, int key)
+    {
+        if (collection.Identity.Index <= 0)
+            return ApiHelpers.Return(PenumbraApiEc.NothingChanged, args);
+
+        var numRemoved = collectionManager.Editor.ClearTemporarySettings(collection, key);
+        return ApiHelpers.Return(numRemoved > 0 ? PenumbraApiEc.Success : PenumbraApiEc.NothingChanged, args);
+    }
+
+
+    /// <summary>
+    /// Convert a dictionary of strings to a dictionary of game paths to full paths.
+    /// Only returns true if all paths can successfully be converted and added.
+    /// </summary>
+    private static bool ConvertPaths(IReadOnlyDictionary<string, string> redirections,
+        [NotNullWhen(true)] out Dictionary<Utf8GamePath, FullPath>? paths)
+    {
+        paths = new Dictionary<Utf8GamePath, FullPath>(redirections.Count);
+        foreach (var (gString, fString) in redirections)
+        {
+            if (!Utf8GamePath.FromString(gString, out var path))
+            {
+                paths = null;
+                return false;
+            }
+
+            var fullPath = new FullPath(fString);
+            if (!paths.TryAdd(path, fullPath))
+            {
+                paths = null;
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

Penumbra/Api/Api/UiApi.cs

@@ -0,0 +1,113 @@
+using OtterGui.Services;
+using Penumbra.Api.Enums;
+using Penumbra.Communication;
+using Penumbra.GameData.Data;
+using Penumbra.Mods.Manager;
+using Penumbra.Services;
+using Penumbra.UI;
+using Penumbra.UI.Integration;
+using Penumbra.UI.Tabs;
+
+namespace Penumbra.Api.Api;
+
+public class UiApi : IPenumbraApiUi, IApiService, IDisposable
+{
+    private readonly CommunicatorService         _communicator;
+    private readonly ConfigWindow                _configWindow;
+    private readonly ModManager                  _modManager;
+    private readonly IntegrationSettingsRegistry _integrationSettings;
+
+    public UiApi(CommunicatorService communicator, ConfigWindow configWindow, ModManager modManager, IntegrationSettingsRegistry integrationSettings)
+    {
+        _communicator        = communicator;
+        _configWindow        = configWindow;
+        _modManager          = modManager;
+        _integrationSettings = integrationSettings;
+        _communicator.ChangedItemHover.Subscribe(OnChangedItemHover, ChangedItemHover.Priority.Default);
+        _communicator.ChangedItemClick.Subscribe(OnChangedItemClick, ChangedItemClick.Priority.Default);
+    }
+
+    public void Dispose()
+    {
+        _communicator.ChangedItemHover.Unsubscribe(OnChangedItemHover);
+        _communicator.ChangedItemClick.Unsubscribe(OnChangedItemClick);
+    }
+
+    public event Action<ChangedItemType, uint>? ChangedItemTooltip;
+
+    public event Action<MouseButton, ChangedItemType, uint>? ChangedItemClicked;
+
+    public event Action<string, float, float>? PreSettingsTabBarDraw
+    {
+        add => _communicator.PreSettingsTabBarDraw.Subscribe(value!, Communication.PreSettingsTabBarDraw.Priority.Default);
+        remove => _communicator.PreSettingsTabBarDraw.Unsubscribe(value!);
+    }
+
+    public event Action<string>? PreSettingsPanelDraw
+    {
+        add => _communicator.PreSettingsPanelDraw.Subscribe(value!, Communication.PreSettingsPanelDraw.Priority.Default);
+        remove => _communicator.PreSettingsPanelDraw.Unsubscribe(value!);
+    }
+
+    public event Action<string>? PostEnabledDraw
+    {
+        add => _communicator.PostEnabledDraw.Subscribe(value!, Communication.PostEnabledDraw.Priority.Default);
+        remove => _communicator.PostEnabledDraw.Unsubscribe(value!);
+    }
+
+    public event Action<string>? PostSettingsPanelDraw
+    {
+        add => _communicator.PostSettingsPanelDraw.Subscribe(value!, Communication.PostSettingsPanelDraw.Priority.Default);
+        remove => _communicator.PostSettingsPanelDraw.Unsubscribe(value!);
+    }
+
+    public PenumbraApiEc OpenMainWindow(TabType tab, string modDirectory, string modName)
+    {
+        _configWindow.IsOpen = true;
+        if (!Enum.IsDefined(tab))
+            return PenumbraApiEc.InvalidArgument;
+
+        if (tab == TabType.Mods && (modDirectory.Length > 0 || modName.Length > 0))
+        {
+            if (_modManager.TryGetMod(modDirectory, modName, out var mod))
+                _communicator.SelectTab.Invoke(tab, mod);
+            else
+                return PenumbraApiEc.ModMissing;
+        }
+        else if (tab != TabType.None)
+        {
+            _communicator.SelectTab.Invoke(tab, null);
+        }
+
+        return PenumbraApiEc.Success;
+    }
+
+    public void CloseMainWindow()
+        => _configWindow.IsOpen = false;
+
+    private void OnChangedItemClick(MouseButton button, IIdentifiedObjectData data)
+    {
+        if (ChangedItemClicked == null)
+            return;
+
+        var (type, id) = data.ToApiObject();
+        ChangedItemClicked.Invoke(button, type, id);
+    }
+
+    private void OnChangedItemHover(IIdentifiedObjectData data)
+    {
+        if (ChangedItemTooltip == null)
+            return;
+
+        var (type, id) = data.ToApiObject();
+        ChangedItemTooltip.Invoke(type, id);
+    }
+
+    public PenumbraApiEc RegisterSettingsSection(Action draw)
+        => _integrationSettings.RegisterSection(draw);
+
+    public PenumbraApiEc UnregisterSettingsSection(Action draw)
+        => _integrationSettings.UnregisterSection(draw)
+            ? PenumbraApiEc.Success
+            : PenumbraApiEc.NothingChanged;
+}

Penumbra/Api/DalamudSubstitutionProvider.cs

@@ -1,17 +1,19 @@
+using Dalamud.Interface;
 using Dalamud.Plugin.Services;
+using OtterGui.Services;
 using Penumbra.Collections;
 using Penumbra.Collections.Manager;
 using Penumbra.Communication;
-using Penumbra.Mods;
 using Penumbra.Mods.Editor;
 using Penumbra.Services;
 using Penumbra.String.Classes;
 
 namespace Penumbra.Api;
 
-public class DalamudSubstitutionProvider : IDisposable
+public class DalamudSubstitutionProvider : IDisposable, IApiService
 {
     private readonly ITextureSubstitutionProvider _substitution;
+    private readonly IUiBuilder                   _uiBuilder;
     private readonly ActiveCollectionData         _activeCollectionData;
     private readonly Configuration                _config;
     private readonly CommunicatorService          _communicator;
@@ -20,9 +22,10 @@ public class DalamudSubstitutionProvider : IDisposable
         => _config.UseDalamudUiTextureRedirection;
 
     public DalamudSubstitutionProvider(ITextureSubstitutionProvider substitution, ActiveCollectionData activeCollectionData,
-        Configuration config, CommunicatorService communicator)
+        Configuration config, CommunicatorService communicator, IUiBuilder ui)
     {
         _substitution         = substitution;
+        _uiBuilder            = ui;
         _activeCollectionData = activeCollectionData;
         _config               = config;
         _communicator         = communicator;
@@ -40,6 +43,9 @@ public class DalamudSubstitutionProvider : IDisposable
 
     public void ResetSubstitutions(IEnumerable<Utf8GamePath> paths)
     {
+        if (!_uiBuilder.UiPrepared)
+            return;
+
         var transformed = paths
             .Where(p => (p.Path.StartsWith("ui/"u8) || p.Path.StartsWith("common/font/"u8)) && p.Path.EndsWith(".tex"u8))
             .Select(p => p.ToString());
@@ -90,10 +96,7 @@ public class DalamudSubstitutionProvider : IDisposable
             case ResolvedFileChanged.Type.Added:
             case ResolvedFileChanged.Type.Removed:
             case ResolvedFileChanged.Type.Replaced:
-                ResetSubstitutions(new[]
-                {
-                    key,
-                });
+                ResetSubstitutions([key]);
                 break;
             case ResolvedFileChanged.Type.FullRecomputeStart:
             case ResolvedFileChanged.Type.FullRecomputeFinished:
@@ -126,7 +129,7 @@ public class DalamudSubstitutionProvider : IDisposable
 
         try
         {
-            if (!Utf8GamePath.FromString(path, out var utf8Path, true))
+            if (!Utf8GamePath.FromString(path, out var utf8Path))
                 return;
 
             var resolved = _activeCollectionData.Interface.ResolvePath(utf8Path);

Penumbra/Api/HttpApi.cs

@@ -1,32 +1,41 @@
+using Dalamud.Plugin.Services;
 using EmbedIO;
 using EmbedIO.Routing;
 using EmbedIO.WebApi;
+using OtterGui.Services;
+using Penumbra.Api.Api;
 using Penumbra.Api.Enums;
+using Penumbra.Mods.Settings;
 
 namespace Penumbra.Api;
 
-public class HttpApi : IDisposable
+public class HttpApi : IDisposable, IApiService
 {
     private partial class Controller : WebApiController
     {
         // @formatter:off
-        [Route( HttpVerbs.Get,  "/mods"       )] public partial object? GetMods();
-        [Route( HttpVerbs.Post, "/redraw"     )] public partial Task    Redraw();
-        [Route( HttpVerbs.Post, "/redrawAll"  )] public partial void    RedrawAll();
-        [Route( HttpVerbs.Post, "/reloadmod"  )] public partial Task    ReloadMod();
-        [Route( HttpVerbs.Post, "/installmod" )] public partial Task    InstallMod();
-        [Route( HttpVerbs.Post, "/openwindow" )] public partial void    OpenWindow();
+        [Route( HttpVerbs.Get,  "/moddirectory"  )] public partial string GetModDirectory();
+        [Route( HttpVerbs.Get,  "/mods"          )] public partial object? GetMods();
+        [Route( HttpVerbs.Post, "/redraw"        )] public partial Task    Redraw();
+        [Route( HttpVerbs.Post, "/redrawAll"     )] public partial Task    RedrawAll();
+        [Route( HttpVerbs.Post, "/reloadmod"     )] public partial Task    ReloadMod();
+        [Route( HttpVerbs.Post, "/installmod"    )] public partial Task    InstallMod();
+        [Route( HttpVerbs.Post, "/openwindow"    )] public partial void    OpenWindow();
+        [Route( HttpVerbs.Post, "/focusmod"      )] public partial Task    FocusMod();
+        [Route( HttpVerbs.Post, "/setmodsettings")] public partial Task    SetModSettings();
         // @formatter:on
     }
 
     public const string Prefix = "http://localhost:42069/";
 
     private readonly IPenumbraApi _api;
+    private readonly IFramework   _framework;
     private          WebServer?   _server;
 
-    public HttpApi(Configuration config, IPenumbraApi api)
+    public HttpApi(Configuration config, IPenumbraApi api, IFramework framework)
     {
-        _api = api;
+        _api       = api;
+        _framework = framework;
         if (config.EnableHttpApi)
             CreateWebServer();
     }
@@ -42,7 +51,7 @@ public class HttpApi : IDisposable
                 .WithUrlPrefix(Prefix)
                 .WithMode(HttpListenerMode.EmbedIO))
             .WithCors(Prefix)
-            .WithWebApi("/api", m => m.WithController(() => new Controller(_api)));
+            .WithWebApi("/api", m => m.WithController(() => new Controller(_api, _framework)));
 
         _server.StateChanged += (_, e) => Penumbra.Log.Information($"WebServer New State - {e.NewState}");
         _server.RunAsync();
@@ -57,62 +66,96 @@ public class HttpApi : IDisposable
     public void Dispose()
         => ShutdownWebServer();
 
-    private partial class Controller
+    private partial class Controller(IPenumbraApi api, IFramework framework)
     {
-        private readonly IPenumbraApi _api;
-
-        public Controller(IPenumbraApi api)
-            => _api = api;
+        public partial string GetModDirectory()
+        {
+            Penumbra.Log.Debug($"[HTTP] {nameof(GetModDirectory)} triggered.");
+            return api.PluginState.GetModDirectory();
+        }
 
         public partial object? GetMods()
         {
             Penumbra.Log.Debug($"[HTTP] {nameof(GetMods)} triggered.");
-            return _api.GetModList();
+            return api.Mods.GetModList();
         }
 
         public async partial Task Redraw()
         {
-            var data = await HttpContext.GetRequestDataAsync<RedrawData>();
-            Penumbra.Log.Debug($"[HTTP] {nameof(Redraw)} triggered with {data}.");
-            if (data.ObjectTableIndex >= 0)
-                _api.RedrawObject(data.ObjectTableIndex, data.Type);
-            else if (data.Name.Length > 0)
-                _api.RedrawObject(data.Name, data.Type);
-            else
-                _api.RedrawAll(data.Type);
+            var data = await HttpContext.GetRequestDataAsync<RedrawData>().ConfigureAwait(false);
+            Penumbra.Log.Debug($"[HTTP] [{Environment.CurrentManagedThreadId}] {nameof(Redraw)} triggered with {data}.");
+            await framework.RunOnFrameworkThread(() =>
+            {
+                if (data.ObjectTableIndex >= 0)
+                    api.Redraw.RedrawObject(data.ObjectTableIndex, data.Type);
+                else
+                    api.Redraw.RedrawAll(data.Type);
+            }).ConfigureAwait(false);
         }
 
-        public partial void RedrawAll()
+        public async partial Task RedrawAll()
         {
             Penumbra.Log.Debug($"[HTTP] {nameof(RedrawAll)} triggered.");
-            _api.RedrawAll(RedrawType.Redraw);
+            await framework.RunOnFrameworkThread(() => { api.Redraw.RedrawAll(RedrawType.Redraw); }).ConfigureAwait(false);
         }
 
         public async partial Task ReloadMod()
         {
-            var data = await HttpContext.GetRequestDataAsync<ModReloadData>();
+            var data = await HttpContext.GetRequestDataAsync<ModReloadData>().ConfigureAwait(false);
             Penumbra.Log.Debug($"[HTTP] {nameof(ReloadMod)} triggered with {data}.");
             // Add the mod if it is not already loaded and if the directory name is given.
             // AddMod returns Success if the mod is already loaded.
             if (data.Path.Length != 0)
-                _api.AddMod(data.Path);
+                api.Mods.AddMod(data.Path);
 
             // Reload the mod by path or name, which will also remove no-longer existing mods.
-            _api.ReloadMod(data.Path, data.Name);
+            api.Mods.ReloadMod(data.Path, data.Name);
         }
 
         public async partial Task InstallMod()
         {
-            var data = await HttpContext.GetRequestDataAsync<ModInstallData>();
+            var data = await HttpContext.GetRequestDataAsync<ModInstallData>().ConfigureAwait(false);
             Penumbra.Log.Debug($"[HTTP] {nameof(InstallMod)} triggered with {data}.");
             if (data.Path.Length != 0)
-                _api.InstallMod(data.Path);
+                api.Mods.InstallMod(data.Path);
         }
 
         public partial void OpenWindow()
         {
             Penumbra.Log.Debug($"[HTTP] {nameof(OpenWindow)} triggered.");
-            _api.OpenMainWindow(TabType.Mods, string.Empty, string.Empty);
+            api.Ui.OpenMainWindow(TabType.Mods, string.Empty, string.Empty);
+        }
+
+        public async partial Task FocusMod()
+        {
+            var data = await HttpContext.GetRequestDataAsync<ModFocusData>().ConfigureAwait(false);
+            Penumbra.Log.Debug($"[HTTP] {nameof(FocusMod)} triggered.");
+            if (data.Path.Length != 0)
+                api.Ui.OpenMainWindow(TabType.Mods, data.Path, data.Name);
+        }
+
+        public async partial Task SetModSettings()
+        {
+            var data = await HttpContext.GetRequestDataAsync<SetModSettingsData>().ConfigureAwait(false);
+            Penumbra.Log.Debug($"[HTTP] {nameof(SetModSettings)} triggered.");
+            await framework.RunOnFrameworkThread(() =>
+                {
+                    var collection = data.CollectionId ?? api.Collection.GetCollection(ApiCollectionType.Current)!.Value.Id;
+                    if (data.Inherit.HasValue)
+                    {
+                        api.ModSettings.TryInheritMod(collection, data.ModPath, data.ModName, data.Inherit.Value);
+                        if (data.Inherit.Value)
+                            return;
+                    }
+
+                    if (data.State.HasValue)
+                        api.ModSettings.TrySetMod(collection, data.ModPath, data.ModName, data.State.Value);
+                    if (data.Priority.HasValue)
+                        api.ModSettings.TrySetModPriority(collection, data.ModPath, data.ModName, data.Priority.Value);
+                    foreach (var (group, settings) in data.Settings ?? [])
+                        api.ModSettings.TrySetModSettings(collection, data.ModPath, data.ModName, group, settings);
+                }
+            ).ConfigureAwait(false);
         }
 
         private record ModReloadData(string Path, string Name)
@@ -122,6 +165,13 @@ public class HttpApi : IDisposable
             { }
         }
 
+        private record ModFocusData(string Path, string Name)
+        {
+            public ModFocusData()
+                : this(string.Empty, string.Empty)
+            { }
+        }
+
         private record ModInstallData(string Path)
         {
             public ModInstallData()
@@ -135,5 +185,19 @@ public class HttpApi : IDisposable
                 : this(string.Empty, RedrawType.Redraw, -1)
             { }
         }
+
+        private record SetModSettingsData(
+            Guid? CollectionId,
+            string ModPath,
+            string ModName,
+            bool? Inherit,
+            bool? State,
+            int? Priority,
+            Dictionary<string, List<string>>? Settings)
+        {
+            public SetModSettingsData()
+                : this(null, string.Empty, string.Empty, null, null, null, null)
+            {}
+        }
     }
 }

Penumbra/Api/IpcLaunchingProvider.cs

@@ -0,0 +1,28 @@
+using Dalamud.Plugin;
+using OtterGui.Log;
+using OtterGui.Services;
+using Penumbra.Api.Api;
+using Serilog.Events;
+
+namespace Penumbra.Api;
+
+public sealed class IpcLaunchingProvider : IApiService
+{
+    public IpcLaunchingProvider(IDalamudPluginInterface pi, Logger log)
+    {
+        try
+        {
+            using var subscriber = log.MainLogger.IsEnabled(LogEventLevel.Debug)
+                ? IpcSubscribers.Launching.Subscriber(pi,
+                    (major, minor) => log.Debug($"[IPC] Invoked Penumbra.Launching IPC with API Version {major}.{minor}."))
+                : null;
+
+            using var provider = IpcSubscribers.Launching.Provider(pi);
+            provider.Invoke(PenumbraApi.BreakingVersion, PenumbraApi.FeatureVersion);
+        }
+        catch (Exception ex)
+        {
+            log.Error($"[IPC] Could not invoke Penumbra.Launching IPC:\n{ex}");
+        }
+    }
+}

Penumbra/Api/IpcProviders.cs

@@ -0,0 +1,161 @@
+using Dalamud.Plugin;
+using OtterGui.Services;
+using Penumbra.Api.Api;
+using Penumbra.Api.Helpers;
+using Penumbra.Communication;
+using CharacterUtility = Penumbra.Interop.Services.CharacterUtility;
+
+namespace Penumbra.Api;
+
+public sealed class IpcProviders : IDisposable, IApiService
+{
+    private readonly List<IDisposable> _providers;
+
+    private readonly EventProvider    _disposedProvider;
+    private readonly EventProvider    _initializedProvider;
+    private readonly CharacterUtility _characterUtility;
+
+    public IpcProviders(IDalamudPluginInterface pi, IPenumbraApi api, CharacterUtility characterUtility)
+    {
+        _characterUtility    = characterUtility;
+        _disposedProvider    = IpcSubscribers.Disposed.Provider(pi);
+        _initializedProvider = IpcSubscribers.Initialized.Provider(pi);
+        _providers =
+        [
+            IpcSubscribers.GetCollections.Provider(pi, api.Collection),
+            IpcSubscribers.GetCollectionsByIdentifier.Provider(pi, api.Collection),
+            IpcSubscribers.GetChangedItemsForCollection.Provider(pi, api.Collection),
+            IpcSubscribers.GetCollection.Provider(pi, api.Collection),
+            IpcSubscribers.GetCollectionForObject.Provider(pi, api.Collection),
+            IpcSubscribers.SetCollection.Provider(pi, api.Collection),
+            IpcSubscribers.SetCollectionForObject.Provider(pi, api.Collection),
+            IpcSubscribers.CheckCurrentChangedItemFunc.Provider(pi, api.Collection),
+
+            IpcSubscribers.ConvertTextureFile.Provider(pi, api.Editing),
+            IpcSubscribers.ConvertTextureData.Provider(pi, api.Editing),
+
+            IpcSubscribers.GetDrawObjectInfo.Provider(pi, api.GameState),
+            IpcSubscribers.GetCutsceneParentIndex.Provider(pi, api.GameState),
+            IpcSubscribers.SetCutsceneParentIndex.Provider(pi, api.GameState),
+            IpcSubscribers.CreatingCharacterBase.Provider(pi, api.GameState),
+            IpcSubscribers.CreatedCharacterBase.Provider(pi, api.GameState),
+            IpcSubscribers.GameObjectResourcePathResolved.Provider(pi, api.GameState),
+            IpcSubscribers.GetCutsceneParentIndexFunc.Provider(pi, api.GameState),
+            IpcSubscribers.GetGameObjectFromDrawObjectFunc.Provider(pi, api.GameState),
+
+            IpcSubscribers.GetPlayerMetaManipulations.Provider(pi, api.Meta),
+            IpcSubscribers.GetMetaManipulations.Provider(pi, api.Meta),
+
+            IpcSubscribers.GetModList.Provider(pi, api.Mods),
+            IpcSubscribers.InstallMod.Provider(pi, api.Mods),
+            IpcSubscribers.ReloadMod.Provider(pi, api.Mods),
+            IpcSubscribers.AddMod.Provider(pi, api.Mods),
+            IpcSubscribers.DeleteMod.Provider(pi, api.Mods),
+            IpcSubscribers.ModDeleted.Provider(pi, api.Mods),
+            IpcSubscribers.ModAdded.Provider(pi, api.Mods),
+            IpcSubscribers.ModMoved.Provider(pi, api.Mods),
+            IpcSubscribers.CreatingPcp.Provider(pi, api.Mods),
+            IpcSubscribers.ParsingPcp.Provider(pi, api.Mods),
+            IpcSubscribers.GetModPath.Provider(pi, api.Mods),
+            IpcSubscribers.SetModPath.Provider(pi, api.Mods),
+            IpcSubscribers.GetChangedItems.Provider(pi, api.Mods),
+            IpcSubscribers.GetChangedItemAdapterDictionary.Provider(pi, api.Mods),
+            IpcSubscribers.GetChangedItemAdapterList.Provider(pi, api.Mods),
+
+            IpcSubscribers.GetAvailableModSettings.Provider(pi, api.ModSettings),
+            IpcSubscribers.GetCurrentModSettings.Provider(pi, api.ModSettings),
+            IpcSubscribers.GetCurrentModSettingsWithTemp.Provider(pi, api.ModSettings),
+            IpcSubscribers.GetAllModSettings.Provider(pi, api.ModSettings),
+            IpcSubscribers.GetSettingsInAllCollections.Provider(pi, api.ModSettings),
+            IpcSubscribers.TryInheritMod.Provider(pi, api.ModSettings),
+            IpcSubscribers.TrySetMod.Provider(pi, api.ModSettings),
+            IpcSubscribers.TrySetModPriority.Provider(pi, api.ModSettings),
+            IpcSubscribers.TrySetModSetting.Provider(pi, api.ModSettings),
+            IpcSubscribers.TrySetModSettings.Provider(pi, api.ModSettings),
+            IpcSubscribers.ModSettingChanged.Provider(pi, api.ModSettings),
+            IpcSubscribers.CopyModSettings.Provider(pi, api.ModSettings),
+
+            IpcSubscribers.ApiVersion.Provider(pi, api),
+            new FuncProvider<(int Major, int Minor)>(pi, "Penumbra.ApiVersions", () => api.ApiVersion), // backward compatibility
+            new FuncProvider<int>(pi, "Penumbra.ApiVersion", () => api.ApiVersion.Breaking),            // backward compatibility
+            IpcSubscribers.GetModDirectory.Provider(pi, api.PluginState),
+            IpcSubscribers.GetConfiguration.Provider(pi, api.PluginState),
+            IpcSubscribers.ModDirectoryChanged.Provider(pi, api.PluginState),
+            IpcSubscribers.GetEnabledState.Provider(pi, api.PluginState),
+            IpcSubscribers.EnabledChange.Provider(pi, api.PluginState),
+            IpcSubscribers.SupportedFeatures.Provider(pi, api.PluginState),
+            IpcSubscribers.CheckSupportedFeatures.Provider(pi, api.PluginState),
+
+            IpcSubscribers.RedrawObject.Provider(pi, api.Redraw),
+            IpcSubscribers.RedrawAll.Provider(pi, api.Redraw),
+            IpcSubscribers.GameObjectRedrawn.Provider(pi, api.Redraw),
+            IpcSubscribers.RedrawCollectionMembers.Provider(pi, api.Redraw),
+
+            IpcSubscribers.ResolveDefaultPath.Provider(pi, api.Resolve),
+            IpcSubscribers.ResolveInterfacePath.Provider(pi, api.Resolve),
+            IpcSubscribers.ResolveGameObjectPath.Provider(pi, api.Resolve),
+            IpcSubscribers.ResolvePlayerPath.Provider(pi, api.Resolve),
+            IpcSubscribers.ReverseResolveGameObjectPath.Provider(pi, api.Resolve),
+            IpcSubscribers.ReverseResolvePlayerPath.Provider(pi, api.Resolve),
+            IpcSubscribers.ResolvePlayerPaths.Provider(pi, api.Resolve),
+            IpcSubscribers.ResolvePlayerPathsAsync.Provider(pi, api.Resolve),
+            IpcSubscribers.ResolvePath.Provider(pi, api.Resolve),
+            IpcSubscribers.ResolvePaths.Provider(pi, api.Resolve),
+
+            IpcSubscribers.GetGameObjectResourcePaths.Provider(pi, api.ResourceTree),
+            IpcSubscribers.GetPlayerResourcePaths.Provider(pi, api.ResourceTree),
+            IpcSubscribers.GetGameObjectResourcesOfType.Provider(pi, api.ResourceTree),
+            IpcSubscribers.GetPlayerResourcesOfType.Provider(pi, api.ResourceTree),
+            IpcSubscribers.GetGameObjectResourceTrees.Provider(pi, api.ResourceTree),
+            IpcSubscribers.GetPlayerResourceTrees.Provider(pi, api.ResourceTree),
+
+            IpcSubscribers.CreateTemporaryCollection.Provider(pi, api.Temporary),
+            IpcSubscribers.DeleteTemporaryCollection.Provider(pi, api.Temporary),
+            IpcSubscribers.AssignTemporaryCollection.Provider(pi, api.Temporary),
+            IpcSubscribers.AddTemporaryModAll.Provider(pi, api.Temporary),
+            IpcSubscribers.AddTemporaryMod.Provider(pi, api.Temporary),
+            IpcSubscribers.RemoveTemporaryModAll.Provider(pi, api.Temporary),
+            IpcSubscribers.RemoveTemporaryMod.Provider(pi, api.Temporary),
+            IpcSubscribers.SetTemporaryModSettings.Provider(pi, api.Temporary),
+            IpcSubscribers.SetTemporaryModSettingsPlayer.Provider(pi, api.Temporary),
+            IpcSubscribers.RemoveTemporaryModSettings.Provider(pi, api.Temporary),
+            IpcSubscribers.RemoveTemporaryModSettingsPlayer.Provider(pi, api.Temporary),
+            IpcSubscribers.RemoveAllTemporaryModSettings.Provider(pi, api.Temporary),
+            IpcSubscribers.RemoveAllTemporaryModSettingsPlayer.Provider(pi, api.Temporary),
+            IpcSubscribers.QueryTemporaryModSettings.Provider(pi, api.Temporary),
+            IpcSubscribers.QueryTemporaryModSettingsPlayer.Provider(pi, api.Temporary),
+
+            IpcSubscribers.ChangedItemTooltip.Provider(pi, api.Ui),
+            IpcSubscribers.ChangedItemClicked.Provider(pi, api.Ui),
+            IpcSubscribers.PreSettingsTabBarDraw.Provider(pi, api.Ui),
+            IpcSubscribers.PreSettingsDraw.Provider(pi, api.Ui),
+            IpcSubscribers.PostEnabledDraw.Provider(pi, api.Ui),
+            IpcSubscribers.PostSettingsDraw.Provider(pi, api.Ui),
+            IpcSubscribers.OpenMainWindow.Provider(pi, api.Ui),
+            IpcSubscribers.CloseMainWindow.Provider(pi, api.Ui),
+            IpcSubscribers.RegisterSettingsSection.Provider(pi, api.Ui),
+            IpcSubscribers.UnregisterSettingsSection.Provider(pi, api.Ui),
+        ];
+        if (_characterUtility.Ready)
+            _initializedProvider.Invoke();
+        else
+            _characterUtility.LoadingFinished.Subscribe(OnCharacterUtilityReady, CharacterUtilityFinished.Priority.IpcProvider);
+    }
+
+    private void OnCharacterUtilityReady()
+    {
+        _initializedProvider.Invoke();
+        _characterUtility.LoadingFinished.Unsubscribe(OnCharacterUtilityReady);
+    }
+
+    public void Dispose()
+    {
+        _characterUtility.LoadingFinished.Unsubscribe(OnCharacterUtilityReady);
+        foreach (var provider in _providers)
+            provider.Dispose();
+        _providers.Clear();
+        _initializedProvider.Dispose();
+        _disposedProvider.Invoke();
+        _disposedProvider.Dispose();
+    }
+}

Penumbra/Api/IpcTester/CollectionsIpcTester.cs

@@ -0,0 +1,189 @@
+using Dalamud.Bindings.ImGui;
+using Dalamud.Interface;
+using Dalamud.Interface.Utility;
+using Dalamud.Plugin;
+using OtterGui;
+using OtterGui.Raii;
+using OtterGui.Services;
+using Penumbra.Api.Enums;
+using Penumbra.Api.IpcSubscribers;
+using Penumbra.Collections.Manager;
+using Penumbra.GameData.Data;
+using ImGuiClip = OtterGui.ImGuiClip;
+
+namespace Penumbra.Api.IpcTester;
+
+public class CollectionsIpcTester(IDalamudPluginInterface pi) : IUiService
+{
+    private int               _objectIdx;
+    private string            _collectionIdString = string.Empty;
+    private Guid?             _collectionId;
+    private bool              _allowCreation = true;
+    private bool              _allowDeletion = true;
+    private ApiCollectionType _type          = ApiCollectionType.Yourself;
+
+    private Dictionary<Guid, string>          _collections  = [];
+    private (string, ChangedItemType, uint)[] _changedItems = [];
+    private PenumbraApiEc                     _returnCode   = PenumbraApiEc.Success;
+    private (Guid Id, string Name)?           _oldCollection;
+
+    public void Draw()
+    {
+        using var _ = ImRaii.TreeNode("Collections");
+        if (!_)
+            return;
+
+        ImGuiUtil.GenericEnumCombo("Collection Type", 200, _type, out _type, t => ((CollectionType)t).ToName());
+        ImGui.InputInt("Object Index##Collections", ref _objectIdx, 0, 0);
+        ImGuiUtil.GuidInput("Collection Id##Collections", "Collection Identifier...", string.Empty, ref _collectionId, ref _collectionIdString);
+        ImGui.Checkbox("Allow Assignment Creation", ref _allowCreation);
+        ImGui.SameLine();
+        ImGui.Checkbox("Allow Assignment Deletion", ref _allowDeletion);
+
+        using var table = ImRaii.Table(string.Empty, 4, ImGuiTableFlags.SizingFixedFit);
+        if (!table)
+            return;
+
+        IpcTester.DrawIntro("Last Return Code", _returnCode.ToString());
+        if (_oldCollection != null)
+            ImGui.TextUnformatted(!_oldCollection.HasValue ? "Created" : _oldCollection.ToString());
+
+        IpcTester.DrawIntro(GetCollectionsByIdentifier.Label, "Collection Identifier");
+        var collectionList = new GetCollectionsByIdentifier(pi).Invoke(_collectionIdString);
+        if (collectionList.Count == 0)
+        {
+            DrawCollection(null);
+        }
+        else
+        {
+            DrawCollection(collectionList[0]);
+            foreach (var pair in collectionList.Skip(1))
+            {
+                ImGui.TableNextRow();
+                ImGui.TableNextColumn();
+                ImGui.TableNextColumn();
+                ImGui.TableNextColumn();
+                DrawCollection(pair);
+            }
+        }
+
+        IpcTester.DrawIntro(GetCollection.Label, "Current Collection");
+        DrawCollection(new GetCollection(pi).Invoke(ApiCollectionType.Current));
+
+        IpcTester.DrawIntro(GetCollection.Label, "Default Collection");
+        DrawCollection(new GetCollection(pi).Invoke(ApiCollectionType.Default));
+
+        IpcTester.DrawIntro(GetCollection.Label, "Interface Collection");
+        DrawCollection(new GetCollection(pi).Invoke(ApiCollectionType.Interface));
+
+        IpcTester.DrawIntro(GetCollection.Label, "Special Collection");
+        DrawCollection(new GetCollection(pi).Invoke(_type));
+
+        IpcTester.DrawIntro(GetCollections.Label, "Collections");
+        DrawCollectionPopup();
+        if (ImGui.Button("Get##Collections"))
+        {
+            _collections = new GetCollections(pi).Invoke();
+            ImGui.OpenPopup("Collections");
+        }
+
+        IpcTester.DrawIntro(GetCollectionForObject.Label, "Get Object Collection");
+        var (valid, individual, effectiveCollection) = new GetCollectionForObject(pi).Invoke(_objectIdx);
+        DrawCollection(effectiveCollection);
+        ImGui.SameLine();
+        ImGui.TextUnformatted($"({(valid ? "Valid" : "Invalid")} Object{(individual ? ", Individual Assignment)" : ")")}");
+
+        IpcTester.DrawIntro(SetCollection.Label, "Set Special Collection");
+        if (ImGui.Button("Set##SpecialCollection"))
+            (_returnCode, _oldCollection) =
+                new SetCollection(pi).Invoke(_type, _collectionId.GetValueOrDefault(Guid.Empty), _allowCreation, _allowDeletion);
+        ImGui.TableNextColumn();
+        if (ImGui.Button("Remove##SpecialCollection"))
+            (_returnCode, _oldCollection) = new SetCollection(pi).Invoke(_type, null, _allowCreation, _allowDeletion);
+
+        IpcTester.DrawIntro(SetCollectionForObject.Label, "Set Object Collection");
+        if (ImGui.Button("Set##ObjectCollection"))
+            (_returnCode, _oldCollection) = new SetCollectionForObject(pi).Invoke(_objectIdx, _collectionId.GetValueOrDefault(Guid.Empty),
+                _allowCreation, _allowDeletion);
+        ImGui.TableNextColumn();
+        if (ImGui.Button("Remove##ObjectCollection"))
+            (_returnCode, _oldCollection) = new SetCollectionForObject(pi).Invoke(_objectIdx, null, _allowCreation, _allowDeletion);
+
+        IpcTester.DrawIntro(GetChangedItemsForCollection.Label, "Changed Item List");
+        DrawChangedItemPopup();
+        if (ImGui.Button("Get##ChangedItems"))
+        {
+            var items = new GetChangedItemsForCollection(pi).Invoke(_collectionId.GetValueOrDefault(Guid.Empty));
+            _changedItems = items.Select(kvp =>
+            {
+                var (type, id) = kvp.Value.ToApiObject();
+                return (kvp.Key, type, id);
+            }).ToArray();
+            ImGui.OpenPopup("Changed Item List");
+        }
+        IpcTester.DrawIntro(RedrawCollectionMembers.Label, "Redraw Collection Members");
+        if (ImGui.Button("Redraw##ObjectCollection"))
+             new RedrawCollectionMembers(pi).Invoke(collectionList[0].Id, RedrawType.Redraw);
+            
+    }
+
+    private void DrawChangedItemPopup()
+    {
+        ImGui.SetNextWindowSize(ImGuiHelpers.ScaledVector2(500, 500));
+        using var p = ImRaii.Popup("Changed Item List");
+        if (!p)
+            return;
+
+        using (var table = ImRaii.Table("##ChangedItems", 3, ImGuiTableFlags.SizingFixedFit))
+        {
+            if (table)
+                ImGuiClip.ClippedDraw(_changedItems, t =>
+                {
+                    ImGuiUtil.DrawTableColumn(t.Item1);
+                    ImGuiUtil.DrawTableColumn(t.Item2.ToString());
+                    ImGuiUtil.DrawTableColumn(t.Item3.ToString());
+                }, ImGui.GetTextLineHeightWithSpacing());
+        }
+
+        if (ImGui.Button("Close", -Vector2.UnitX) || !ImGui.IsWindowFocused())
+            ImGui.CloseCurrentPopup();
+    }
+
+    private void DrawCollectionPopup()
+    {
+        ImGui.SetNextWindowSize(ImGuiHelpers.ScaledVector2(500, 500));
+        using var p = ImRaii.Popup("Collections");
+        if (!p)
+            return;
+
+        using (var t = ImRaii.Table("collections", 2, ImGuiTableFlags.SizingFixedFit))
+        {
+            if (t)
+                foreach (var collection in _collections)
+                {
+                    ImGui.TableNextColumn();
+                    DrawCollection((collection.Key, collection.Value));
+                }
+        }
+
+        if (ImGui.Button("Close", -Vector2.UnitX) || !ImGui.IsWindowFocused())
+            ImGui.CloseCurrentPopup();
+    }
+
+    private static void DrawCollection((Guid Id, string Name)? collection)
+    {
+        if (collection == null)
+        {
+            ImGui.TextUnformatted("<Unassigned>");
+            ImGui.TableNextColumn();
+            return;
+        }
+
+        ImGui.TextUnformatted(collection.Value.Name);
+        ImGui.TableNextColumn();
+        using (ImRaii.PushFont(UiBuilder.MonoFont))
+        {
+            ImGuiUtil.CopyOnClickSelectable(collection.Value.Id.ToString());
+        }
+    }
+}

Penumbra/Api/IpcTester/EditingIpcTester.cs

@@ -0,0 +1,70 @@
+using Dalamud.Bindings.ImGui;
+using Dalamud.Plugin;
+using OtterGui;
+using OtterGui.Raii;
+using OtterGui.Services;
+using Penumbra.Api.Enums;
+using Penumbra.Api.IpcSubscribers;
+
+namespace Penumbra.Api.IpcTester;
+
+public class EditingIpcTester(IDalamudPluginInterface pi) : IUiService
+{
+    private string _inputPath   = string.Empty;
+    private string _inputPath2  = string.Empty;
+    private string _outputPath  = string.Empty;
+    private string _outputPath2 = string.Empty;
+
+    private TextureType _typeSelector;
+    private bool        _mipMaps = true;
+
+    private Task? _task1;
+    private Task? _task2;
+
+    public void Draw()
+    {
+        using var _ = ImRaii.TreeNode("Editing");
+        if (!_)
+            return;
+
+        ImGui.InputTextWithHint("##inputPath",   "Input Texture Path...",    ref _inputPath,   256);
+        ImGui.InputTextWithHint("##outputPath",  "Output Texture Path...",   ref _outputPath,  256);
+        ImGui.InputTextWithHint("##inputPath2",  "Input Texture Path 2...",  ref _inputPath2,  256);
+        ImGui.InputTextWithHint("##outputPath2", "Output Texture Path 2...", ref _outputPath2, 256);
+        TypeCombo();
+        ImGui.Checkbox("Add MipMaps", ref _mipMaps);
+
+        using var table = ImRaii.Table("...", 3, ImGuiTableFlags.SizingFixedFit);
+        if (!table)
+            return;
+
+        IpcTester.DrawIntro(ConvertTextureFile.Label, (string)"Convert Texture 1");
+        if (ImGuiUtil.DrawDisabledButton("Save 1", Vector2.Zero, string.Empty, _task1 is { IsCompleted: false }))
+            _task1 = new ConvertTextureFile(pi).Invoke(_inputPath, _outputPath, _typeSelector, _mipMaps);
+        ImGui.SameLine();
+        ImGui.TextUnformatted(_task1 == null ? "Not Initiated" : _task1.Status.ToString());
+        if (ImGui.IsItemHovered() && _task1?.Status == TaskStatus.Faulted)
+            ImGui.SetTooltip(_task1.Exception?.ToString());
+
+        IpcTester.DrawIntro(ConvertTextureFile.Label, (string)"Convert Texture 2");
+        if (ImGuiUtil.DrawDisabledButton("Save 2", Vector2.Zero, string.Empty, _task2 is { IsCompleted: false }))
+            _task2 = new ConvertTextureFile(pi).Invoke(_inputPath2, _outputPath2, _typeSelector, _mipMaps);
+        ImGui.SameLine();
+        ImGui.TextUnformatted(_task2 == null ? "Not Initiated" : _task2.Status.ToString());
+        if (ImGui.IsItemHovered() && _task2?.Status == TaskStatus.Faulted)
+            ImGui.SetTooltip(_task2.Exception?.ToString());
+    }
+
+    private void TypeCombo()
+    {
+        using var combo = ImRaii.Combo("Convert To", _typeSelector.ToString());
+        if (!combo)
+            return;
+
+        foreach (var value in Enum.GetValues<TextureType>())
+        {
+            if (ImGui.Selectable(value.ToString(), _typeSelector == value))
+                _typeSelector = value;
+        }
+    }
+}

Penumbra/Api/IpcTester/GameStateIpcTester.cs

@@ -0,0 +1,139 @@
+using Dalamud.Bindings.ImGui;
+using Dalamud.Interface;
+using Dalamud.Plugin;
+using OtterGui.Raii;
+using OtterGui.Services;
+using Penumbra.Api.Enums;
+using Penumbra.Api.Helpers;
+using Penumbra.Api.IpcSubscribers;
+using Penumbra.String;
+
+namespace Penumbra.Api.IpcTester;
+
+public class GameStateIpcTester : IUiService, IDisposable
+{
+    private readonly IDalamudPluginInterface                        _pi;
+    public readonly  EventSubscriber<nint, Guid, nint, nint, nint> CharacterBaseCreating;
+    public readonly  EventSubscriber<nint, Guid, nint>             CharacterBaseCreated;
+    public readonly  EventSubscriber<nint, string, string>         GameObjectResourcePathResolved;
+
+    private string         _lastCreatedGameObjectName = string.Empty;
+    private nint           _lastCreatedDrawObject     = nint.Zero;
+    private DateTimeOffset _lastCreatedGameObjectTime = DateTimeOffset.MaxValue;
+    private string         _lastResolvedGamePath      = string.Empty;
+    private string         _lastResolvedFullPath      = string.Empty;
+    private string         _lastResolvedObject        = string.Empty;
+    private DateTimeOffset _lastResolvedGamePathTime  = DateTimeOffset.MaxValue;
+    private string         _currentDrawObjectString   = string.Empty;
+    private nint           _currentDrawObject         = nint.Zero;
+    private int            _currentCutsceneActor;
+    private int            _currentCutsceneParent;
+    private PenumbraApiEc  _cutsceneError = PenumbraApiEc.Success;
+
+    public GameStateIpcTester(IDalamudPluginInterface pi)
+    {
+        _pi                            = pi;
+        CharacterBaseCreating          = IpcSubscribers.CreatingCharacterBase.Subscriber(pi, UpdateLastCreated);
+        CharacterBaseCreated           = IpcSubscribers.CreatedCharacterBase.Subscriber(pi, UpdateLastCreated2);
+        GameObjectResourcePathResolved = IpcSubscribers.GameObjectResourcePathResolved.Subscriber(pi, UpdateGameObjectResourcePath);
+        CharacterBaseCreating.Disable();
+        CharacterBaseCreated.Disable();
+        GameObjectResourcePathResolved.Disable();
+    }
+
+    public void Dispose()
+    {
+        CharacterBaseCreating.Dispose();
+        CharacterBaseCreated.Dispose();
+        GameObjectResourcePathResolved.Dispose();
+    }
+
+    public void Draw()
+    {
+        using var _ = ImRaii.TreeNode("Game State");
+        if (!_)
+            return;
+
+        if (ImGui.InputTextWithHint("##drawObject", "Draw Object Address..", ref _currentDrawObjectString, 16,
+                ImGuiInputTextFlags.CharsHexadecimal))
+            _currentDrawObject = nint.TryParse(_currentDrawObjectString, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
+                out var tmp)
+                ? tmp
+                : nint.Zero;
+
+        ImGui.InputInt("Cutscene Actor",  ref _currentCutsceneActor,  0);
+        ImGui.InputInt("Cutscene Parent", ref _currentCutsceneParent, 0);
+        if (_cutsceneError is not PenumbraApiEc.Success)
+        {
+            ImGui.SameLine();
+            ImGui.TextUnformatted("Invalid Argument on last Call");
+        }
+
+        using var table = ImRaii.Table(string.Empty, 3, ImGuiTableFlags.SizingFixedFit);
+        if (!table)
+            return;
+
+        IpcTester.DrawIntro(GetDrawObjectInfo.Label, "Draw Object Info");
+        if (_currentDrawObject == nint.Zero)
+        {
+            ImGui.TextUnformatted("Invalid");
+        }
+        else
+        {
+            var (ptr, (collectionId, collectionName)) = new GetDrawObjectInfo(_pi).Invoke(_currentDrawObject);
+            ImGui.TextUnformatted(ptr == nint.Zero ? $"No Actor Associated, {collectionName}" : $"{ptr:X}, {collectionName}");
+            ImGui.SameLine();
+            using (ImRaii.PushFont(UiBuilder.MonoFont))
+            {
+                ImGui.TextUnformatted(collectionId.ToString());
+            }
+        }
+
+        IpcTester.DrawIntro(GetCutsceneParentIndex.Label, "Cutscene Parent");
+        ImGui.TextUnformatted(new GetCutsceneParentIndex(_pi).Invoke(_currentCutsceneActor).ToString());
+
+        IpcTester.DrawIntro(SetCutsceneParentIndex.Label, "Cutscene Parent");
+        if (ImGui.Button("Set Parent"))
+            _cutsceneError = new SetCutsceneParentIndex(_pi)
+                .Invoke(_currentCutsceneActor, _currentCutsceneParent);
+
+        IpcTester.DrawIntro(CreatingCharacterBase.Label, "Last Drawobject created");
+        if (_lastCreatedGameObjectTime < DateTimeOffset.Now)
+            ImGui.TextUnformatted(_lastCreatedDrawObject != nint.Zero
+                ? $"0x{_lastCreatedDrawObject:X} for <{_lastCreatedGameObjectName}> at {_lastCreatedGameObjectTime}"
+                : $"NULL for <{_lastCreatedGameObjectName}> at {_lastCreatedGameObjectTime}");
+
+        IpcTester.DrawIntro(IpcSubscribers.GameObjectResourcePathResolved.Label, "Last GamePath resolved");
+        if (_lastResolvedGamePathTime < DateTimeOffset.Now)
+            ImGui.TextUnformatted(
+                $"{_lastResolvedGamePath} -> {_lastResolvedFullPath} for <{_lastResolvedObject}> at {_lastResolvedGamePathTime}");
+    }
+
+    private void UpdateLastCreated(nint gameObject, Guid _, nint _2, nint _3, nint _4)
+    {
+        _lastCreatedGameObjectName = GetObjectName(gameObject);
+        _lastCreatedGameObjectTime = DateTimeOffset.Now;
+        _lastCreatedDrawObject     = nint.Zero;
+    }
+
+    private void UpdateLastCreated2(nint gameObject, Guid _, nint drawObject)
+    {
+        _lastCreatedGameObjectName = GetObjectName(gameObject);
+        _lastCreatedGameObjectTime = DateTimeOffset.Now;
+        _lastCreatedDrawObject     = drawObject;
+    }
+
+    private void UpdateGameObjectResourcePath(nint gameObject, string gamePath, string fullPath)
+    {
+        _lastResolvedObject       = GetObjectName(gameObject);
+        _lastResolvedGamePath     = gamePath;
+        _lastResolvedFullPath     = fullPath;
+        _lastResolvedGamePathTime = DateTimeOffset.Now;
+    }
+
+    private static unsafe string GetObjectName(nint gameObject)
+    {
+        var obj  = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)gameObject;
+        return obj != null && obj->Name[0] != 0 ? new ByteString(obj->Name).ToString() : "Unknown";
+    }
+}

Penumbra/Api/IpcTester/IpcTester.cs

@@ -0,0 +1,133 @@
+using Dalamud.Plugin.Services;
+using FFXIVClientStructs.FFXIV.Client.System.Framework;
+using Dalamud.Bindings.ImGui;
+using OtterGui.Services;
+using Penumbra.Api.Api;
+
+namespace Penumbra.Api.IpcTester;
+
+public class IpcTester(
+    IpcProviders ipcProviders,
+    IPenumbraApi api,
+    PluginStateIpcTester pluginStateIpcTester,
+    UiIpcTester uiIpcTester,
+    RedrawingIpcTester redrawingIpcTester,
+    GameStateIpcTester gameStateIpcTester,
+    ResolveIpcTester resolveIpcTester,
+    CollectionsIpcTester collectionsIpcTester,
+    MetaIpcTester metaIpcTester,
+    ModsIpcTester modsIpcTester,
+    ModSettingsIpcTester modSettingsIpcTester,
+    EditingIpcTester editingIpcTester,
+    TemporaryIpcTester temporaryIpcTester,
+    ResourceTreeIpcTester resourceTreeIpcTester,
+    IFramework framework) : IUiService
+{
+    private readonly IpcProviders _ipcProviders = ipcProviders;
+    private          DateTime     _lastUpdate;
+    private          bool         _subscribed = false;
+
+    public void Draw()
+    {
+        try
+        {
+            _lastUpdate = framework.LastUpdateUTC.AddSeconds(1);
+            Subscribe();
+
+            ImGui.TextUnformatted($"API Version: {api.ApiVersion.Breaking}.{api.ApiVersion.Feature:D4}");
+            collectionsIpcTester.Draw();
+            editingIpcTester.Draw();
+            gameStateIpcTester.Draw();
+            metaIpcTester.Draw();
+            modSettingsIpcTester.Draw();
+            modsIpcTester.Draw();
+            pluginStateIpcTester.Draw();
+            redrawingIpcTester.Draw();
+            resolveIpcTester.Draw();
+            resourceTreeIpcTester.Draw();
+            uiIpcTester.Draw();
+            temporaryIpcTester.Draw();
+            temporaryIpcTester.DrawCollections();
+            temporaryIpcTester.DrawMods();
+        }
+        catch (Exception e)
+        {
+            Penumbra.Log.Error($"Error during IPC Tests:\n{e}");
+        }
+    }
+
+    internal static void DrawIntro(string label, string info)
+    {
+        ImGui.TableNextRow();
+        ImGui.TableNextColumn();
+        ImGui.TextUnformatted(label);
+        ImGui.TableNextColumn();
+        ImGui.TextUnformatted(info);
+        ImGui.TableNextColumn();
+    }
+
+    private void Subscribe()
+    {
+        if (_subscribed)
+            return;
+
+        Penumbra.Log.Debug("[IPCTester] Subscribed to IPC events for IPC tester.");
+        gameStateIpcTester.GameObjectResourcePathResolved.Enable();
+        gameStateIpcTester.CharacterBaseCreated.Enable();
+        gameStateIpcTester.CharacterBaseCreating.Enable();
+        modSettingsIpcTester.SettingChanged.Enable();
+        modsIpcTester.DeleteSubscriber.Enable();
+        modsIpcTester.AddSubscriber.Enable();
+        modsIpcTester.MoveSubscriber.Enable();
+        pluginStateIpcTester.ModDirectoryChanged.Enable();
+        pluginStateIpcTester.Initialized.Enable();
+        pluginStateIpcTester.Disposed.Enable();
+        pluginStateIpcTester.EnabledChange.Enable();
+        redrawingIpcTester.Redrawn.Enable();
+        uiIpcTester.PreSettingsTabBar.Enable();
+        uiIpcTester.PreSettingsPanel.Enable();
+        uiIpcTester.PostEnabled.Enable();
+        uiIpcTester.PostSettingsPanelDraw.Enable();
+        uiIpcTester.ChangedItemTooltip.Enable();
+        uiIpcTester.ChangedItemClicked.Enable();
+
+        framework.Update += CheckUnsubscribe;
+        _subscribed      =  true;
+    }
+
+    private void CheckUnsubscribe(IFramework framework1)
+    {
+        if (_lastUpdate > framework.LastUpdateUTC)
+            return;
+
+        Unsubscribe();
+        framework.Update -= CheckUnsubscribe;
+    }
+
+    private void Unsubscribe()
+    {
+        if (!_subscribed)
+            return;
+
+        Penumbra.Log.Debug("[IPCTester] Unsubscribed from IPC events for IPC tester.");
+        _subscribed = false;
+        gameStateIpcTester.GameObjectResourcePathResolved.Disable();
+        gameStateIpcTester.CharacterBaseCreated.Disable();
+        gameStateIpcTester.CharacterBaseCreating.Disable();
+        modSettingsIpcTester.SettingChanged.Disable();
+        modsIpcTester.DeleteSubscriber.Disable();
+        modsIpcTester.AddSubscriber.Disable();
+        modsIpcTester.MoveSubscriber.Disable();
+        pluginStateIpcTester.ModDirectoryChanged.Disable();
+        pluginStateIpcTester.Initialized.Disable();
+        pluginStateIpcTester.Disposed.Disable();
+        pluginStateIpcTester.EnabledChange.Disable();
+        redrawingIpcTester.Redrawn.Disable();
+        uiIpcTester.PreSettingsTabBar.Disable();
+        uiIpcTester.PreSettingsPanel.Disable();
+        uiIpcTester.PostEnabled.Disable();
+        uiIpcTester.PostSettingsPanelDraw.Disable();
+        uiIpcTester.ChangedItemTooltip.Disable();
+        uiIpcTester.ChangedItemClicked.Disable();
+    }
+}

Penumbra/Api/IpcTester/MetaIpcTester.cs

@@ -0,0 +1,52 @@
+using Dalamud.Bindings.ImGui;
+using Dalamud.Plugin;
+using OtterGui.Raii;
+using OtterGui.Services;
+using OtterGui.Text;
+using Penumbra.Api.Api;
+using Penumbra.Api.IpcSubscribers;
+using Penumbra.Meta.Manipulations;
+
+namespace Penumbra.Api.IpcTester;
+
+public class MetaIpcTester(IDalamudPluginInterface pi) : IUiService
+{
+    private int            _gameObjectIndex;
+    private string         _metaBase64    = string.Empty;
+    private MetaDictionary _metaDict      = new();
+    private byte           _parsedVersion = byte.MaxValue;
+
+    public void Draw()
+    {
+        using var _ = ImRaii.TreeNode("Meta");
+        if (!_)
+            return;
+
+        ImGui.InputInt("##metaIdx", ref _gameObjectIndex, 0, 0);
+        if (ImUtf8.InputText("##metaText"u8, ref _metaBase64, "Base64 Metadata..."u8))
+            if (!MetaApi.ConvertManips(_metaBase64, out _metaDict!, out _parsedVersion))
+                _metaDict ??= new MetaDictionary();
+
+
+        using var table = ImRaii.Table(string.Empty, 3, ImGuiTableFlags.SizingFixedFit);
+        if (!table)
+            return;
+
+        IpcTester.DrawIntro(GetPlayerMetaManipulations.Label, "Player Meta Manipulations");
+        if (ImGui.Button("Copy to Clipboard##Player"))
+        {
+            var base64 = new GetPlayerMetaManipulations(pi).Invoke();
+            ImGui.SetClipboardText(base64);
+        }
+
+        IpcTester.DrawIntro(GetMetaManipulations.Label, "Game Object Manipulations");
+        if (ImGui.Button("Copy to Clipboard##GameObject"))
+        {
+            var base64 = new GetMetaManipulations(pi).Invoke(_gameObjectIndex);
+            ImGui.SetClipboardText(base64);
+        }
+
+        IpcTester.DrawIntro(string.Empty, "Parsed Data");
+        ImUtf8.Text($"Version: {_parsedVersion}, Count: {_metaDict.Count}");
+    }
+}

Penumbra/Api/IpcTester/ModSettingsIpcTester.cs

@@ -0,0 +1,224 @@
+using Dalamud.Bindings.ImGui;
+using Dalamud.Plugin;
+using OtterGui;
+using OtterGui.Raii;
+using OtterGui.Services;
+using OtterGui.Text;
+using Penumbra.Api.Enums;
+using Penumbra.Api.Helpers;
+using Penumbra.Api.IpcSubscribers;
+using Penumbra.UI;
+
+namespace Penumbra.Api.IpcTester;
+
+public class ModSettingsIpcTester : IUiService, IDisposable
+{
+    private readonly IDalamudPluginInterface                                _pi;
+    public readonly  EventSubscriber<ModSettingChange, Guid, string, bool> SettingChanged;
+
+    private PenumbraApiEc    _lastSettingsError = PenumbraApiEc.Success;
+    private ModSettingChange _lastSettingChangeType;
+    private Guid             _lastSettingChangeCollection = Guid.Empty;
+    private string           _lastSettingChangeMod        = string.Empty;
+    private bool             _lastSettingChangeInherited;
+    private DateTimeOffset   _lastSettingChange;
+
+    private string                                                                         _settingsModDirectory = string.Empty;
+    private string                                                                         _settingsModName      = string.Empty;
+    private Guid?                                                                          _settingsCollection;
+    private string                                                                         _settingsCollectionName = string.Empty;
+    private bool                                                                           _settingsIgnoreInheritance;
+    private bool                                                                           _settingsIgnoreTemporary;
+    private int                                                                            _settingsKey;
+    private bool                                                                           _settingsInherit;
+    private bool                                                                           _settingsTemporary;
+    private bool                                                                           _settingsEnabled;
+    private int                                                                            _settingsPriority;
+    private IReadOnlyDictionary<string, (string[], GroupType)>?                            _availableSettings;
+    private Dictionary<string, List<string>>?                                              _currentSettings;
+    private Dictionary<string, (bool, int, Dictionary<string, List<string>>, bool, bool)>? _allSettings;
+
+    public ModSettingsIpcTester(IDalamudPluginInterface pi)
+    {
+        _pi            = pi;
+        SettingChanged = ModSettingChanged.Subscriber(pi, UpdateLastModSetting);
+        SettingChanged.Disable();
+    }
+
+    public void Dispose()
+    {
+        SettingChanged.Dispose();
+    }
+
+    public void Draw()
+    {
+        using var _ = ImRaii.TreeNode("Mod Settings");
+        if (!_)
+            return;
+
+        ImGui.InputTextWithHint("##settingsDir",  "Mod Directory Name...", ref _settingsModDirectory, 100);
+        ImGui.InputTextWithHint("##settingsName", "Mod Name...",           ref _settingsModName,      100);
+        ImGuiUtil.GuidInput("##settingsCollection", "Collection...", string.Empty, ref _settingsCollection, ref _settingsCollectionName);
+        ImUtf8.Checkbox("Ignore Inheritance"u8, ref _settingsIgnoreInheritance);
+        ImUtf8.Checkbox("Ignore Temporary"u8, ref _settingsIgnoreTemporary);
+        ImUtf8.InputScalar("Key"u8, ref _settingsKey);
+        var collection = _settingsCollection.GetValueOrDefault(Guid.Empty);
+
+        using var table = ImRaii.Table(string.Empty, 3, ImGuiTableFlags.SizingFixedFit);
+        if (!table)
+            return;
+
+        IpcTester.DrawIntro("Last Error", _lastSettingsError.ToString());
+
+        IpcTester.DrawIntro(ModSettingChanged.Label, "Last Mod Setting Changed");
+        ImGui.TextUnformatted(_lastSettingChangeMod.Length > 0
+            ? $"{_lastSettingChangeType} of {_lastSettingChangeMod} in {_lastSettingChangeCollection}{(_lastSettingChangeInherited ? " (Inherited)" : string.Empty)} at {_lastSettingChange}"
+            : "None");
+
+        IpcTester.DrawIntro(GetAvailableModSettings.Label, "Get Available Settings");
+        if (ImGui.Button("Get##Available"))
+        {
+            _availableSettings = new GetAvailableModSettings(_pi).Invoke(_settingsModDirectory, _settingsModName);
+            _lastSettingsError = _availableSettings == null ? PenumbraApiEc.ModMissing : PenumbraApiEc.Success;
+        }
+
+        IpcTester.DrawIntro(GetCurrentModSettings.Label, "Get Current Settings");
+        if (ImGui.Button("Get##Current"))
+        {
+            var ret = new GetCurrentModSettings(_pi)
+                .Invoke(collection, _settingsModDirectory, _settingsModName, _settingsIgnoreInheritance);
+            _lastSettingsError = ret.Item1;
+            if (ret.Item1 == PenumbraApiEc.Success)
+            {
+                _settingsEnabled   = ret.Item2?.Item1 ?? false;
+                _settingsInherit   = ret.Item2?.Item4 ?? true;
+                _settingsTemporary = false;
+                _settingsPriority  = ret.Item2?.Item2 ?? 0;
+                _currentSettings   = ret.Item2?.Item3;
+            }
+            else
+            {
+                _currentSettings = null;
+            }
+        }
+
+        IpcTester.DrawIntro(GetCurrentModSettingsWithTemp.Label, "Get Current Settings With Temp");
+        if (ImGui.Button("Get##CurrentTemp"))
+        {
+            var ret = new GetCurrentModSettingsWithTemp(_pi)
+                .Invoke(collection, _settingsModDirectory, _settingsModName, _settingsIgnoreInheritance, _settingsIgnoreTemporary, _settingsKey);
+            _lastSettingsError = ret.Item1;
+            if (ret.Item1 == PenumbraApiEc.Success)
+            {
+                _settingsEnabled   = ret.Item2?.Item1 ?? false;
+                _settingsInherit   = ret.Item2?.Item4 ?? true;
+                _settingsTemporary = ret.Item2?.Item5 ?? false;
+                _settingsPriority  = ret.Item2?.Item2 ?? 0;
+                _currentSettings   = ret.Item2?.Item3;
+            }
+            else
+            {
+                _currentSettings = null;
+            }
+        }
+        
+        IpcTester.DrawIntro(GetAllModSettings.Label, "Get All Mod Settings");
+        if (ImGui.Button("Get##All"))
+        {
+            var ret = new GetAllModSettings(_pi).Invoke(collection, _settingsIgnoreInheritance, _settingsIgnoreTemporary, _settingsKey);
+            _lastSettingsError = ret.Item1;
+            _allSettings       = ret.Item2;
+        }
+
+        if (_allSettings != null)
+        {
+            ImGui.SameLine();
+            ImUtf8.Text($"{_allSettings.Count} Mods");
+        }
+
+        IpcTester.DrawIntro(TryInheritMod.Label, "Inherit Mod");
+        ImGui.Checkbox("##inherit", ref _settingsInherit);
+        ImGui.SameLine();
+        if (ImGui.Button("Set##Inherit"))
+            _lastSettingsError = new TryInheritMod(_pi)
+                .Invoke(collection, _settingsModDirectory, _settingsInherit, _settingsModName);
+
+        IpcTester.DrawIntro(TrySetMod.Label, "Set Enabled");
+        ImGui.Checkbox("##enabled", ref _settingsEnabled);
+        ImGui.SameLine();
+        if (ImGui.Button("Set##Enabled"))
+            _lastSettingsError = new TrySetMod(_pi)
+                .Invoke(collection, _settingsModDirectory, _settingsEnabled, _settingsModName);
+
+        IpcTester.DrawIntro(TrySetModPriority.Label, "Set Priority");
+        ImGui.SetNextItemWidth(200 * UiHelpers.Scale);
+        ImGui.DragInt("##Priority", ref _settingsPriority);
+        ImGui.SameLine();
+        if (ImGui.Button("Set##Priority"))
+            _lastSettingsError = new TrySetModPriority(_pi)
+                .Invoke(collection, _settingsModDirectory, _settingsPriority, _settingsModName);
+
+        IpcTester.DrawIntro(CopyModSettings.Label, "Copy Mod Settings");
+        if (ImGui.Button("Copy Settings"))
+            _lastSettingsError = new CopyModSettings(_pi)
+                .Invoke(_settingsCollection, _settingsModDirectory, _settingsModName);
+
+        ImGuiUtil.HoverTooltip("Copy settings from Mod Directory Name to Mod Name (as directory) in collection.");
+
+        IpcTester.DrawIntro(TrySetModSetting.Label, "Set Setting(s)");
+        if (_availableSettings == null)
+            return;
+
+        foreach (var (group, (list, type)) in _availableSettings)
+        {
+            using var id      = ImRaii.PushId(group);
+            var       preview = list.Length > 0 ? list[0] : string.Empty;
+            if (_currentSettings != null && _currentSettings.TryGetValue(group, out var current) && current.Count > 0)
+            {
+                preview = current[0];
+            }
+            else
+            {
+                current = [];
+                if (_currentSettings != null)
+                    _currentSettings[group] = current;
+            }
+
+            ImGui.SetNextItemWidth(200 * UiHelpers.Scale);
+            using (var c = ImRaii.Combo("##group", preview))
+            {
+                if (c)
+                    foreach (var s in list)
+                    {
+                        var contained = current.Contains(s);
+                        if (ImGui.Checkbox(s, ref contained))
+                        {
+                            if (contained)
+                                current.Add(s);
+                            else
+                                current.Remove(s);
+                        }
+                    }
+            }
+
+            ImGui.SameLine();
+            if (ImGui.Button("Set##setting"))
+                _lastSettingsError = type == GroupType.Single
+                    ? new TrySetModSetting(_pi).Invoke(collection, _settingsModDirectory, group, current.Count > 0 ? current[0] : string.Empty,
+                        _settingsModName)
+                    : new TrySetModSettings(_pi).Invoke(collection, _settingsModDirectory, group, current.ToArray(), _settingsModName);
+
+            ImGui.SameLine();
+            ImGui.TextUnformatted(group);
+        }
+    }
+
+    private void UpdateLastModSetting(ModSettingChange type, Guid collection, string mod, bool inherited)
+    {
+        _lastSettingChangeType       = type;
+        _lastSettingChangeCollection = collection;
+        _lastSettingChangeMod        = mod;
+        _lastSettingChangeInherited  = inherited;
+        _lastSettingChange           = DateTimeOffset.Now;
+    }
+}

Penumbra/Api/IpcTester/ModsIpcTester.cs

@@ -0,0 +1,184 @@
+using Dalamud.Bindings.ImGui;
+using Dalamud.Interface.Utility;
+using Dalamud.Plugin;
+using OtterGui.Raii;
+using OtterGui.Services;
+using OtterGui.Text;
+using Penumbra.Api.Enums;
+using Penumbra.Api.Helpers;
+using Penumbra.Api.IpcSubscribers;
+
+namespace Penumbra.Api.IpcTester;
+
+public class ModsIpcTester : IUiService, IDisposable
+{
+    private readonly IDalamudPluginInterface _pi;
+
+    private string                      _modDirectory   = string.Empty;
+    private string                      _modName        = string.Empty;
+    private string                      _pathInput      = string.Empty;
+    private string                      _newInstallPath = string.Empty;
+    private PenumbraApiEc               _lastReloadEc;
+    private PenumbraApiEc               _lastAddEc;
+    private PenumbraApiEc               _lastDeleteEc;
+    private PenumbraApiEc               _lastSetPathEc;
+    private PenumbraApiEc               _lastInstallEc;
+    private Dictionary<string, string>  _mods         = [];
+    private Dictionary<string, object?> _changedItems = [];
+
+    public readonly EventSubscriber<string>         DeleteSubscriber;
+    public readonly EventSubscriber<string>         AddSubscriber;
+    public readonly EventSubscriber<string, string> MoveSubscriber;
+
+    private DateTimeOffset _lastDeletedModTime = DateTimeOffset.UnixEpoch;
+    private string         _lastDeletedMod     = string.Empty;
+    private DateTimeOffset _lastAddedModTime   = DateTimeOffset.UnixEpoch;
+    private string         _lastAddedMod       = string.Empty;
+    private DateTimeOffset _lastMovedModTime   = DateTimeOffset.UnixEpoch;
+    private string         _lastMovedModFrom   = string.Empty;
+    private string         _lastMovedModTo     = string.Empty;
+
+    public ModsIpcTester(IDalamudPluginInterface pi)
+    {
+        _pi = pi;
+        DeleteSubscriber = ModDeleted.Subscriber(pi, s =>
+        {
+            _lastDeletedModTime = DateTimeOffset.UtcNow;
+            _lastDeletedMod     = s;
+        });
+        AddSubscriber = ModAdded.Subscriber(pi, s =>
+        {
+            _lastAddedModTime = DateTimeOffset.UtcNow;
+            _lastAddedMod     = s;
+        });
+        MoveSubscriber = ModMoved.Subscriber(pi, (s1, s2) =>
+        {
+            _lastMovedModTime = DateTimeOffset.UtcNow;
+            _lastMovedModFrom = s1;
+            _lastMovedModTo   = s2;
+        });
+        DeleteSubscriber.Disable();
+        AddSubscriber.Disable();
+        MoveSubscriber.Disable();
+    }
+
+    public void Dispose()
+    {
+        DeleteSubscriber.Dispose();
+        DeleteSubscriber.Disable();
+        AddSubscriber.Dispose();
+        AddSubscriber.Disable();
+        MoveSubscriber.Dispose();
+        MoveSubscriber.Disable();
+    }
+
+    public void Draw()
+    {
+        using var _ = ImRaii.TreeNode("Mods");
+        if (!_)
+            return;
+
+        ImGui.InputTextWithHint("##install", "Install File Path...",  ref _newInstallPath, 100);
+        ImGui.InputTextWithHint("##modDir",  "Mod Directory Name...", ref _modDirectory,   100);
+        ImGui.InputTextWithHint("##modName", "Mod Name...",           ref _modName,        100);
+        ImGui.InputTextWithHint("##path",    "New Path...",           ref _pathInput,      100);
+        using var table = ImRaii.Table(string.Empty, 3, ImGuiTableFlags.SizingFixedFit);
+        if (!table)
+            return;
+
+        IpcTester.DrawIntro(GetModList.Label, "Mods");
+        DrawModsPopup();
+        if (ImGui.Button("Get##Mods"))
+        {
+            _mods = new GetModList(_pi).Invoke();
+            ImGui.OpenPopup("Mods");
+        }
+
+        IpcTester.DrawIntro(ReloadMod.Label, "Reload Mod");
+        if (ImGui.Button("Reload"))
+            _lastReloadEc = new ReloadMod(_pi).Invoke(_modDirectory, _modName);
+
+        ImGui.SameLine();
+        ImGui.TextUnformatted(_lastReloadEc.ToString());
+
+        IpcTester.DrawIntro(InstallMod.Label, "Install Mod");
+        if (ImGui.Button("Install"))
+            _lastInstallEc = new InstallMod(_pi).Invoke(_newInstallPath);
+
+        ImGui.SameLine();
+        ImGui.TextUnformatted(_lastInstallEc.ToString());
+
+        IpcTester.DrawIntro(AddMod.Label, "Add Mod");
+        if (ImGui.Button("Add"))
+            _lastAddEc = new AddMod(_pi).Invoke(_modDirectory);
+
+        ImGui.SameLine();
+        ImGui.TextUnformatted(_lastAddEc.ToString());
+
+        IpcTester.DrawIntro(DeleteMod.Label, "Delete Mod");
+        if (ImGui.Button("Delete"))
+            _lastDeleteEc = new DeleteMod(_pi).Invoke(_modDirectory, _modName);
+
+        ImGui.SameLine();
+        ImGui.TextUnformatted(_lastDeleteEc.ToString());
+
+        IpcTester.DrawIntro(GetChangedItems.Label, "Get Changed Items");
+        DrawChangedItemsPopup();
+        if (ImUtf8.Button("Get##ChangedItems"u8))
+        {
+            _changedItems = new GetChangedItems(_pi).Invoke(_modDirectory, _modName);
+            ImUtf8.OpenPopup("ChangedItems"u8);
+        }
+
+        IpcTester.DrawIntro(GetModPath.Label, "Current Path");
+        var (ec, path, def, nameDef) = new GetModPath(_pi).Invoke(_modDirectory, _modName);
+        ImGui.TextUnformatted($"{path} ({(def ? "Custom" : "Default")} Path, {(nameDef ? "Custom" : "Default")} Name) [{ec}]");
+
+        IpcTester.DrawIntro(SetModPath.Label, "Set Path");
+        if (ImGui.Button("Set"))
+            _lastSetPathEc = new SetModPath(_pi).Invoke(_modDirectory, _pathInput, _modName);
+
+        ImGui.SameLine();
+        ImGui.TextUnformatted(_lastSetPathEc.ToString());
+
+        IpcTester.DrawIntro(ModDeleted.Label, "Last Mod Deleted");
+        if (_lastDeletedModTime > DateTimeOffset.UnixEpoch)
+            ImGui.TextUnformatted($"{_lastDeletedMod} at {_lastDeletedModTime}");
+
+        IpcTester.DrawIntro(ModAdded.Label, "Last Mod Added");
+        if (_lastAddedModTime > DateTimeOffset.UnixEpoch)
+            ImGui.TextUnformatted($"{_lastAddedMod} at {_lastAddedModTime}");
+
+        IpcTester.DrawIntro(ModMoved.Label, "Last Mod Moved");
+        if (_lastMovedModTime > DateTimeOffset.UnixEpoch)
+            ImGui.TextUnformatted($"{_lastMovedModFrom} -> {_lastMovedModTo} at {_lastMovedModTime}");
+    }
+
+    private void DrawModsPopup()
+    {
+        ImGui.SetNextWindowSize(ImGuiHelpers.ScaledVector2(500, 500));
+        using var p = ImRaii.Popup("Mods");
+        if (!p)
+            return;
+
+        foreach (var (modDir, modName) in _mods)
+            ImGui.TextUnformatted($"{modDir}: {modName}");
+
+        if (ImGui.Button("Close", -Vector2.UnitX) || !ImGui.IsWindowFocused())
+            ImGui.CloseCurrentPopup();
+    }
+
+    private void DrawChangedItemsPopup()
+    {
+        ImGui.SetNextWindowSize(ImGuiHelpers.ScaledVector2(500, 500));
+        using var p = ImUtf8.Popup("ChangedItems"u8);
+        if (!p)
+            return;
+
+        foreach (var (name, data) in _changedItems)
+            ImUtf8.Text($"{name}: {data}");
+
+        if (ImUtf8.Button("Close"u8, -Vector2.UnitX) || !ImGui.IsWindowFocused())
+            ImGui.CloseCurrentPopup();
+    }
+}

Penumbra/Api/IpcTester/PluginStateIpcTester.cs

@@ -0,0 +1,147 @@
+using Dalamud.Interface;
+using Dalamud.Interface.Utility;
+using Dalamud.Plugin;
+using Dalamud.Bindings.ImGui;
+using OtterGui;
+using OtterGui.Raii;
+using OtterGui.Services;
+using OtterGui.Text;
+using Penumbra.Api.Helpers;
+using Penumbra.Api.IpcSubscribers;
+
+namespace Penumbra.Api.IpcTester;
+
+public class PluginStateIpcTester : IUiService, IDisposable
+{
+    private readonly IDalamudPluginInterface       _pi;
+    public readonly  EventSubscriber<string, bool> ModDirectoryChanged;
+    public readonly  EventSubscriber               Initialized;
+    public readonly  EventSubscriber               Disposed;
+    public readonly  EventSubscriber<bool>         EnabledChange;
+
+    private string         _currentConfiguration = string.Empty;
+    private string         _lastModDirectory     = string.Empty;
+    private bool           _lastModDirectoryValid;
+    private DateTimeOffset _lastModDirectoryTime = DateTimeOffset.MinValue;
+
+    private readonly List<DateTimeOffset> _initializedList = [];
+    private readonly List<DateTimeOffset> _disposedList    = [];
+
+    private string   _requiredFeatureString = string.Empty;
+    private string[] _requiredFeatures      = [];
+
+    private DateTimeOffset _lastEnabledChange = DateTimeOffset.UnixEpoch;
+    private bool?          _lastEnabledValue;
+
+    public PluginStateIpcTester(IDalamudPluginInterface pi)
+    {
+        _pi                 = pi;
+        ModDirectoryChanged = IpcSubscribers.ModDirectoryChanged.Subscriber(pi, UpdateModDirectoryChanged);
+        Initialized         = IpcSubscribers.Initialized.Subscriber(pi, AddInitialized);
+        Disposed            = IpcSubscribers.Disposed.Subscriber(pi, AddDisposed);
+        EnabledChange       = IpcSubscribers.EnabledChange.Subscriber(pi, SetLastEnabled);
+        ModDirectoryChanged.Disable();
+        EnabledChange.Disable();
+    }
+
+    public void Dispose()
+    {
+        ModDirectoryChanged.Dispose();
+        Initialized.Dispose();
+        Disposed.Dispose();
+        EnabledChange.Dispose();
+    }
+
+
+    public void Draw()
+    {
+        using var _ = ImRaii.TreeNode("Plugin State");
+        if (!_)
+            return;
+
+        if (ImUtf8.InputText("Required Features"u8, ref _requiredFeatureString))
+            _requiredFeatures = _requiredFeatureString.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
+        using var table = ImRaii.Table(string.Empty, 3, ImGuiTableFlags.SizingFixedFit);
+        if (!table)
+            return;
+
+        DrawList(IpcSubscribers.Initialized.Label, "Last Initialized", _initializedList);
+        DrawList(IpcSubscribers.Disposed.Label,    "Last Disposed",    _disposedList);
+
+        IpcTester.DrawIntro(ApiVersion.Label, "Current Version");
+        var (breaking, features) = new ApiVersion(_pi).Invoke();
+        ImGui.TextUnformatted($"{breaking}.{features:D4}");
+
+        IpcTester.DrawIntro(GetEnabledState.Label, "Current State");
+        ImGui.TextUnformatted($"{new GetEnabledState(_pi).Invoke()}");
+
+        IpcTester.DrawIntro(IpcSubscribers.EnabledChange.Label, "Last Change");
+        ImGui.TextUnformatted(_lastEnabledValue is { } v ? $"{_lastEnabledChange} (to {v})" : "Never");
+
+        IpcTester.DrawIntro(SupportedFeatures.Label, "Supported Features");
+        ImUtf8.Text(string.Join(", ", new SupportedFeatures(_pi).Invoke()));
+
+        IpcTester.DrawIntro(CheckSupportedFeatures.Label, "Missing Features");
+        ImUtf8.Text(string.Join(", ", new CheckSupportedFeatures(_pi).Invoke(_requiredFeatures)));
+
+        DrawConfigPopup();
+        IpcTester.DrawIntro(GetConfiguration.Label, "Configuration");
+        if (ImGui.Button("Get"))
+        {
+            _currentConfiguration = new GetConfiguration(_pi).Invoke();
+            ImGui.OpenPopup("Config Popup");
+        }
+
+        IpcTester.DrawIntro(GetModDirectory.Label, "Current Mod Directory");
+        ImGui.TextUnformatted(new GetModDirectory(_pi).Invoke());
+
+        IpcTester.DrawIntro(IpcSubscribers.ModDirectoryChanged.Label, "Last Mod Directory Change");
+        ImGui.TextUnformatted(_lastModDirectoryTime > DateTimeOffset.MinValue
+            ? $"{_lastModDirectory} ({(_lastModDirectoryValid ? "Valid" : "Invalid")}) at {_lastModDirectoryTime}"
+            : "None");
+
+        void DrawList(string label, string text, List<DateTimeOffset> list)
+        {
+            IpcTester.DrawIntro(label, text);
+            if (list.Count == 0)
+            {
+                ImGui.TextUnformatted("Never");
+            }
+            else
+            {
+                ImGui.TextUnformatted(list[^1].LocalDateTime.ToString(CultureInfo.CurrentCulture));
+                if (list.Count > 1 && ImGui.IsItemHovered())
+                    ImGui.SetTooltip(string.Join("\n",
+                        list.SkipLast(1).Select(t => t.LocalDateTime.ToString(CultureInfo.CurrentCulture))));
+            }
+        }
+    }
+
+    private void DrawConfigPopup()
+    {
+        ImGui.SetNextWindowSize(ImGuiHelpers.ScaledVector2(500, 500));
+        using var popup = ImRaii.Popup("Config Popup");
+        if (!popup)
+            return;
+
+        using (ImRaii.PushFont(UiBuilder.MonoFont))
+        {
+            ImGuiUtil.TextWrapped(_currentConfiguration);
+        }
+
+        if (ImGui.Button("Close", -Vector2.UnitX) || !ImGui.IsWindowFocused())
+            ImGui.CloseCurrentPopup();
+    }
+
+    private void UpdateModDirectoryChanged(string path, bool valid)
+        => (_lastModDirectory, _lastModDirectoryValid, _lastModDirectoryTime) = (path, valid, DateTimeOffset.Now);
+
+    private void AddInitialized()
+        => _initializedList.Add(DateTimeOffset.UtcNow);
+
+    private void AddDisposed()
+        => _disposedList.Add(DateTimeOffset.UtcNow);
+
+    private void SetLastEnabled(bool val)
+        => (_lastEnabledChange, _lastEnabledValue) = (DateTimeOffset.Now, val);
+}

Penumbra/Api/IpcTester/RedrawingIpcTester.cs

@@ -0,0 +1,73 @@
+using Dalamud.Plugin;
+using Dalamud.Plugin.Services;
+using Dalamud.Bindings.ImGui;
+using OtterGui.Raii;
+using OtterGui.Services;
+using Penumbra.Api.Enums;
+using Penumbra.Api.Helpers;
+using Penumbra.Api.IpcSubscribers;
+using Penumbra.GameData.Interop;
+using Penumbra.UI;
+
+namespace Penumbra.Api.IpcTester;
+
+public class RedrawingIpcTester : IUiService, IDisposable
+{
+    private readonly IDalamudPluginInterface     _pi;
+    private readonly ObjectManager              _objects;
+    public readonly  EventSubscriber<nint, int> Redrawn;
+
+    private int    _redrawIndex;
+    private string _lastRedrawnString = "None";
+
+    public RedrawingIpcTester(IDalamudPluginInterface pi, ObjectManager objects)
+    {
+        _pi      = pi;
+        _objects = objects;
+        Redrawn  = GameObjectRedrawn.Subscriber(_pi, SetLastRedrawn);
+        Redrawn.Disable();
+    }
+
+    public void Dispose()
+    {
+        Redrawn.Dispose();
+    }
+
+    public void Draw()
+    {
+        using var _ = ImRaii.TreeNode("Redrawing");
+        if (!_)
+            return;
+
+        using var table = ImRaii.Table(string.Empty, 3, ImGuiTableFlags.SizingFixedFit);
+        if (!table)
+            return;
+
+        IpcTester.DrawIntro(RedrawObject.Label, "Redraw by Index");
+        var tmp = _redrawIndex;
+        ImGui.SetNextItemWidth(100 * UiHelpers.Scale);
+        if (ImGui.DragInt("##redrawIndex", ref tmp, 0.1f, 0, _objects.TotalCount))
+            _redrawIndex = Math.Clamp(tmp, 0, _objects.TotalCount);
+        ImGui.SameLine();
+        if (ImGui.Button("Redraw##Index"))
+            new RedrawObject(_pi).Invoke(_redrawIndex);
+
+        IpcTester.DrawIntro(RedrawAll.Label, "Redraw All");
+        if (ImGui.Button("Redraw##All"))
+            new RedrawAll(_pi).Invoke();
+
+        IpcTester.DrawIntro(GameObjectRedrawn.Label, "Last Redrawn Object:");
+        ImGui.TextUnformatted(_lastRedrawnString);
+    }
+
+    private void SetLastRedrawn(nint address, int index)
+    {
+        if (index < 0
+         || index > _objects.TotalCount
+         || address == nint.Zero
+         || _objects[index].Address != address)
+            _lastRedrawnString = "Invalid";
+
+        _lastRedrawnString = $"{_objects[index].Utf8Name} (0x{address:X}, {index})";
+    }
+}

Penumbra/Api/IpcTester/ResolveIpcTester.cs

@@ -0,0 +1,114 @@
+using Dalamud.Plugin;
+using Dalamud.Bindings.ImGui;
+using OtterGui.Raii;
+using OtterGui.Services;
+using Penumbra.Api.IpcSubscribers;
+using Penumbra.String.Classes;
+
+namespace Penumbra.Api.IpcTester;
+
+public class ResolveIpcTester(IDalamudPluginInterface pi) : IUiService
+{
+    private string                       _currentResolvePath = string.Empty;
+    private string                       _currentReversePath = string.Empty;
+    private int                          _currentReverseIdx;
+    private Task<(string[], string[][])> _task = Task.FromResult<(string[], string[][])>(([], []));
+
+    public void Draw()
+    {
+        using var tree = ImRaii.TreeNode("Resolving");
+        if (!tree)
+            return;
+
+        ImGui.InputTextWithHint("##resolvePath", "Resolve this game path...", ref _currentResolvePath, Utf8GamePath.MaxGamePathLength);
+        ImGui.InputTextWithHint("##resolveInversePath", "Reverse-resolve this path...", ref _currentReversePath,
+            Utf8GamePath.MaxGamePathLength);
+        ImGui.InputInt("##resolveIdx", ref _currentReverseIdx, 0, 0);
+        using var table = ImRaii.Table(string.Empty, 3, ImGuiTableFlags.SizingFixedFit);
+        if (!table)
+            return;
+
+        IpcTester.DrawIntro(ResolveDefaultPath.Label, "Default Collection Resolve");
+        if (_currentResolvePath.Length != 0)
+            ImGui.TextUnformatted(new ResolveDefaultPath(pi).Invoke(_currentResolvePath));
+
+        IpcTester.DrawIntro(ResolveInterfacePath.Label, "Interface Collection Resolve");
+        if (_currentResolvePath.Length != 0)
+            ImGui.TextUnformatted(new ResolveInterfacePath(pi).Invoke(_currentResolvePath));
+
+        IpcTester.DrawIntro(ResolvePlayerPath.Label, "Player Collection Resolve");
+        if (_currentResolvePath.Length != 0)
+            ImGui.TextUnformatted(new ResolvePlayerPath(pi).Invoke(_currentResolvePath));
+
+        IpcTester.DrawIntro(ResolveGameObjectPath.Label, "Game Object Collection Resolve");
+        if (_currentResolvePath.Length != 0)
+            ImGui.TextUnformatted(new ResolveGameObjectPath(pi).Invoke(_currentResolvePath, _currentReverseIdx));
+
+        IpcTester.DrawIntro(ReverseResolvePlayerPath.Label, "Reversed Game Paths (Player)");
+        if (_currentReversePath.Length > 0)
+        {
+            var list = new ReverseResolvePlayerPath(pi).Invoke(_currentReversePath);
+            if (list.Length > 0)
+            {
+                ImGui.TextUnformatted(list[0]);
+                if (list.Length > 1 && ImGui.IsItemHovered())
+                    ImGui.SetTooltip(string.Join("\n", list.Skip(1)));
+            }
+        }
+
+        IpcTester.DrawIntro(ReverseResolveGameObjectPath.Label, "Reversed Game Paths (Game Object)");
+        if (_currentReversePath.Length > 0)
+        {
+            var list = new ReverseResolveGameObjectPath(pi).Invoke(_currentReversePath, _currentReverseIdx);
+            if (list.Length > 0)
+            {
+                ImGui.TextUnformatted(list[0]);
+                if (list.Length > 1 && ImGui.IsItemHovered())
+                    ImGui.SetTooltip(string.Join("\n", list.Skip(1)));
+            }
+        }
+
+        var forwardArray = _currentResolvePath.Length > 0
+            ? [_currentResolvePath]
+            : Array.Empty<string>();
+        var reverseArray = _currentReversePath.Length > 0
+            ? [_currentReversePath]
+            : Array.Empty<string>();
+
+        IpcTester.DrawIntro(ResolvePlayerPaths.Label, "Resolved Paths (Player)");
+        if (forwardArray.Length > 0 || reverseArray.Length > 0)
+        {
+            var ret = new ResolvePlayerPaths(pi).Invoke(forwardArray, reverseArray);
+            ImGui.TextUnformatted(ConvertText(ret));
+        }
+
+        IpcTester.DrawIntro(ResolvePlayerPathsAsync.Label, "Resolved Paths Async (Player)");
+        if (ImGui.Button("Start"))
+            _task = new ResolvePlayerPathsAsync(pi).Invoke(forwardArray, reverseArray);
+        var hovered = ImGui.IsItemHovered();
+        ImGui.SameLine();
+        ImGui.AlignTextToFramePadding();
+        ImGui.TextUnformatted(_task.Status.ToString());
+        if ((hovered || ImGui.IsItemHovered()) && _task.IsCompletedSuccessfully)
+            ImGui.SetTooltip(ConvertText(_task.Result));
+        return;
+
+        static string ConvertText((string[], string[][]) data)
+        {
+            var text = string.Empty;
+            if (data.Item1.Length > 0)
+            {
+                if (data.Item2.Length > 0)
+                    text = $"Forward: {data.Item1[0]} | Reverse: {string.Join("; ", data.Item2[0])}.";
+                else
+                    text = $"Forward: {data.Item1[0]}.";
+            }
+            else if (data.Item2.Length > 0)
+            {
+                text = $"Reverse: {string.Join("; ", data.Item2[0])}.";
+            }
+
+            return text;
+        }
+    }
+}

Penumbra/Api/IpcTester/ResourceTreeIpcTester.cs

@@ -0,0 +1,350 @@
+using Dalamud.Bindings.ImGui;
+using Dalamud.Game.ClientState.Objects.Enums;
+using Dalamud.Interface;
+using Dalamud.Interface.Utility;
+using Dalamud.Plugin;
+using OtterGui;
+using OtterGui.Extensions;
+using OtterGui.Raii;
+using OtterGui.Services;
+using Penumbra.Api.Enums;
+using Penumbra.Api.Helpers;
+using Penumbra.Api.IpcSubscribers;
+using Penumbra.GameData.Enums;
+using Penumbra.GameData.Interop;
+using Penumbra.GameData.Structs;
+
+namespace Penumbra.Api.IpcTester;
+
+public class ResourceTreeIpcTester(IDalamudPluginInterface pi, ObjectManager objects) : IUiService
+{
+    private readonly Stopwatch _stopwatch = new();
+
+    private string       _gameObjectIndices = "0";
+    private ResourceType _type              = ResourceType.Mtrl;
+    private bool         _withUiData;
+
+    private (string, Dictionary<string, HashSet<string>>?)[]?                          _lastGameObjectResourcePaths;
+    private (string, Dictionary<string, HashSet<string>>?)[]?                          _lastPlayerResourcePaths;
+    private (string, IReadOnlyDictionary<nint, (string, string, ChangedItemIcon)>?)[]? _lastGameObjectResourcesOfType;
+    private (string, IReadOnlyDictionary<nint, (string, string, ChangedItemIcon)>?)[]? _lastPlayerResourcesOfType;
+    private (string, ResourceTreeDto?)[]?                                              _lastGameObjectResourceTrees;
+    private (string, ResourceTreeDto)[]?                                               _lastPlayerResourceTrees;
+    private TimeSpan                                                                   _lastCallDuration;
+
+    public void Draw()
+    {
+        using var _ = ImRaii.TreeNode("Resource Tree");
+        if (!_)
+            return;
+
+        ImGui.InputText("GameObject indices", ref _gameObjectIndices, 511);
+        ImGuiUtil.GenericEnumCombo("Resource type", ImGui.CalcItemWidth(), _type, out _type, Enum.GetValues<ResourceType>());
+        ImGui.Checkbox("Also get names and icons", ref _withUiData);
+
+        using var table = ImRaii.Table(string.Empty, 3, ImGuiTableFlags.SizingFixedFit);
+        if (!table)
+            return;
+
+        IpcTester.DrawIntro(GetGameObjectResourcePaths.Label, "Get GameObject resource paths");
+        if (ImGui.Button("Get##GameObjectResourcePaths"))
+        {
+            var gameObjects = GetSelectedGameObjects();
+            var subscriber  = new GetGameObjectResourcePaths(pi);
+            _stopwatch.Restart();
+            var resourcePaths = subscriber.Invoke(gameObjects);
+
+            _lastCallDuration = _stopwatch.Elapsed;
+            _lastGameObjectResourcePaths = gameObjects
+                .Select(i => GameObjectToString(i))
+                .Zip(resourcePaths)
+                .ToArray();
+
+            ImGui.OpenPopup(nameof(GetGameObjectResourcePaths));
+        }
+
+        IpcTester.DrawIntro(GetPlayerResourcePaths.Label, "Get local player resource paths");
+        if (ImGui.Button("Get##PlayerResourcePaths"))
+        {
+            var subscriber = new GetPlayerResourcePaths(pi);
+            _stopwatch.Restart();
+            var resourcePaths = subscriber.Invoke();
+
+            _lastCallDuration = _stopwatch.Elapsed;
+            _lastPlayerResourcePaths = resourcePaths
+                .Select(pair => (GameObjectToString(pair.Key), pair.Value))
+                .ToArray()!;
+
+            ImGui.OpenPopup(nameof(GetPlayerResourcePaths));
+        }
+
+        IpcTester.DrawIntro(GetGameObjectResourcesOfType.Label, "Get GameObject resources of type");
+        if (ImGui.Button("Get##GameObjectResourcesOfType"))
+        {
+            var gameObjects = GetSelectedGameObjects();
+            var subscriber  = new GetGameObjectResourcesOfType(pi);
+            _stopwatch.Restart();
+            var resourcesOfType = subscriber.Invoke(_type, _withUiData, gameObjects);
+
+            _lastCallDuration = _stopwatch.Elapsed;
+            _lastGameObjectResourcesOfType = gameObjects
+                .Select(i => GameObjectToString(i))
+                .Zip(resourcesOfType)
+                .ToArray();
+
+            ImGui.OpenPopup(nameof(GetGameObjectResourcesOfType));
+        }
+
+        IpcTester.DrawIntro(GetPlayerResourcesOfType.Label, "Get local player resources of type");
+        if (ImGui.Button("Get##PlayerResourcesOfType"))
+        {
+            var subscriber = new GetPlayerResourcesOfType(pi);
+            _stopwatch.Restart();
+            var resourcesOfType = subscriber.Invoke(_type, _withUiData);
+
+            _lastCallDuration = _stopwatch.Elapsed;
+            _lastPlayerResourcesOfType = resourcesOfType
+                .Select(pair => (GameObjectToString(pair.Key), (IReadOnlyDictionary<nint, (string, string, ChangedItemIcon)>?)pair.Value))
+                .ToArray();
+
+            ImGui.OpenPopup(nameof(GetPlayerResourcesOfType));
+        }
+
+        IpcTester.DrawIntro(GetGameObjectResourceTrees.Label, "Get GameObject resource trees");
+        if (ImGui.Button("Get##GameObjectResourceTrees"))
+        {
+            var gameObjects = GetSelectedGameObjects();
+            var subscriber  = new GetGameObjectResourceTrees(pi);
+            _stopwatch.Restart();
+            var trees = subscriber.Invoke(_withUiData, gameObjects);
+
+            _lastCallDuration = _stopwatch.Elapsed;
+            _lastGameObjectResourceTrees = gameObjects
+                .Select(i => GameObjectToString(i))
+                .Zip(trees)
+                .ToArray();
+
+            ImGui.OpenPopup(nameof(GetGameObjectResourceTrees));
+        }
+
+        IpcTester.DrawIntro(GetPlayerResourceTrees.Label, "Get local player resource trees");
+        if (ImGui.Button("Get##PlayerResourceTrees"))
+        {
+            var subscriber = new GetPlayerResourceTrees(pi);
+            _stopwatch.Restart();
+            var trees = subscriber.Invoke(_withUiData);
+
+            _lastCallDuration = _stopwatch.Elapsed;
+            _lastPlayerResourceTrees = trees
+                .Select(pair => (GameObjectToString(pair.Key), pair.Value))
+                .ToArray();
+
+            ImGui.OpenPopup(nameof(GetPlayerResourceTrees));
+        }
+
+        DrawPopup(nameof(GetGameObjectResourcePaths), ref _lastGameObjectResourcePaths, DrawResourcePaths,
+            _lastCallDuration);
+        DrawPopup(nameof(GetPlayerResourcePaths), ref _lastPlayerResourcePaths!, DrawResourcePaths, _lastCallDuration);
+
+        DrawPopup(nameof(GetGameObjectResourcesOfType), ref _lastGameObjectResourcesOfType, DrawResourcesOfType,
+            _lastCallDuration);
+        DrawPopup(nameof(GetPlayerResourcesOfType), ref _lastPlayerResourcesOfType, DrawResourcesOfType,
+            _lastCallDuration);
+
+        DrawPopup(nameof(GetGameObjectResourceTrees), ref _lastGameObjectResourceTrees, DrawResourceTrees,
+            _lastCallDuration);
+        DrawPopup(nameof(GetPlayerResourceTrees), ref _lastPlayerResourceTrees, DrawResourceTrees!, _lastCallDuration);
+    }
+
+    private static void DrawPopup<T>(string popupId, ref T? result, Action<T> drawResult, TimeSpan duration) where T : class
+    {
+        ImGui.SetNextWindowSize(ImGuiHelpers.ScaledVector2(1000, 500));
+        using var popup = ImRaii.Popup(popupId);
+        if (!popup)
+        {
+            result = null;
+            return;
+        }
+
+        if (result == null)
+        {
+            ImGui.CloseCurrentPopup();
+            return;
+        }
+
+        drawResult(result);
+
+        ImGui.TextUnformatted($"Invoked in {duration.TotalMilliseconds} ms");
+
+        if (ImGui.Button("Close", -Vector2.UnitX) || !ImGui.IsWindowFocused())
+        {
+            result = null;
+            ImGui.CloseCurrentPopup();
+        }
+    }
+
+    private static void DrawWithHeaders<T>((string, T?)[] result, Action<T> drawItem) where T : class
+    {
+        var firstSeen = new Dictionary<T, string>();
+        foreach (var (label, item) in result)
+        {
+            if (item == null)
+            {
+                ImRaii.TreeNode($"{label}: null", ImGuiTreeNodeFlags.Leaf).Dispose();
+                continue;
+            }
+
+            if (firstSeen.TryGetValue(item, out var firstLabel))
+            {
+                ImRaii.TreeNode($"{label}: same as {firstLabel}", ImGuiTreeNodeFlags.Leaf).Dispose();
+                continue;
+            }
+
+            firstSeen.Add(item, label);
+
+            using var header = ImRaii.TreeNode(label);
+            if (!header)
+                continue;
+
+            drawItem(item);
+        }
+    }
+
+    private static void DrawResourcePaths((string, Dictionary<string, HashSet<string>>?)[] result)
+    {
+        DrawWithHeaders(result, paths =>
+        {
+            using var table = ImRaii.Table(string.Empty, 2, ImGuiTableFlags.SizingFixedFit);
+            if (!table)
+                return;
+
+            ImGui.TableSetupColumn("Actual Path", ImGuiTableColumnFlags.WidthStretch, 0.6f);
+            ImGui.TableSetupColumn("Game Paths",  ImGuiTableColumnFlags.WidthStretch, 0.4f);
+            ImGui.TableHeadersRow();
+
+            foreach (var (actualPath, gamePaths) in paths)
+            {
+                ImGui.TableNextColumn();
+                ImGui.TextUnformatted(actualPath);
+                ImGui.TableNextColumn();
+                foreach (var gamePath in gamePaths)
+                    ImGui.TextUnformatted(gamePath);
+            }
+        });
+    }
+
+    private void DrawResourcesOfType((string, IReadOnlyDictionary<nint, (string, string, ChangedItemIcon)>?)[] result)
+    {
+        DrawWithHeaders(result, resources =>
+        {
+            using var table = ImRaii.Table(string.Empty, _withUiData ? 3 : 2, ImGuiTableFlags.SizingFixedFit);
+            if (!table)
+                return;
+
+            ImGui.TableSetupColumn("Resource Handle", ImGuiTableColumnFlags.WidthStretch, 0.15f);
+            ImGui.TableSetupColumn("Actual Path",     ImGuiTableColumnFlags.WidthStretch, _withUiData ? 0.55f : 0.85f);
+            if (_withUiData)
+                ImGui.TableSetupColumn("Icon & Name", ImGuiTableColumnFlags.WidthStretch, 0.3f);
+            ImGui.TableHeadersRow();
+
+            foreach (var (resourceHandle, (actualPath, name, icon)) in resources)
+            {
+                ImGui.TableNextColumn();
+                TextUnformattedMono($"0x{resourceHandle:X}");
+                ImGui.TableNextColumn();
+                ImGui.TextUnformatted(actualPath);
+                if (_withUiData)
+                {
+                    ImGui.TableNextColumn();
+                    TextUnformattedMono(icon.ToString());
+                    ImGui.SameLine();
+                    ImGui.TextUnformatted(name);
+                }
+            }
+        });
+    }
+
+    private void DrawResourceTrees((string, ResourceTreeDto?)[] result)
+    {
+        DrawWithHeaders(result, tree =>
+        {
+            ImGui.TextUnformatted($"Name: {tree.Name}\nRaceCode: {(GenderRace)tree.RaceCode}");
+
+            using var table = ImRaii.Table(string.Empty, _withUiData ? 7 : 5, ImGuiTableFlags.SizingFixedFit | ImGuiTableFlags.Resizable);
+            if (!table)
+                return;
+
+            if (_withUiData)
+            {
+                ImGui.TableSetupColumn("Name", ImGuiTableColumnFlags.WidthStretch, 0.5f);
+                ImGui.TableSetupColumn("Type", ImGuiTableColumnFlags.WidthStretch, 0.1f);
+                ImGui.TableSetupColumn("Icon", ImGuiTableColumnFlags.WidthStretch, 0.15f);
+            }
+            else
+            {
+                ImGui.TableSetupColumn("Type", ImGuiTableColumnFlags.WidthStretch, 0.5f);
+            }
+
+            ImGui.TableSetupColumn("Game Path",       ImGuiTableColumnFlags.WidthStretch, 0.5f);
+            ImGui.TableSetupColumn("Actual Path",     ImGuiTableColumnFlags.WidthStretch, 0.5f);
+            ImGui.TableSetupColumn("Object Address",  ImGuiTableColumnFlags.WidthStretch, 0.2f);
+            ImGui.TableSetupColumn("Resource Handle", ImGuiTableColumnFlags.WidthStretch, 0.2f);
+            ImGui.TableHeadersRow();
+
+            void DrawNode(ResourceNodeDto node)
+            {
+                ImGui.TableNextRow();
+                ImGui.TableNextColumn();
+                var hasChildren = node.Children.Any();
+                using var treeNode = ImRaii.TreeNode(
+                    $"{(_withUiData ? node.Name ?? "Unknown" : node.Type)}##{node.ObjectAddress:X8}",
+                    hasChildren
+                        ? ImGuiTreeNodeFlags.SpanFullWidth
+                        : ImGuiTreeNodeFlags.SpanFullWidth | ImGuiTreeNodeFlags.Leaf | ImGuiTreeNodeFlags.NoTreePushOnOpen);
+                if (_withUiData)
+                {
+                    ImGui.TableNextColumn();
+                    TextUnformattedMono(node.Type.ToString());
+                    ImGui.TableNextColumn();
+                    TextUnformattedMono(node.Icon.ToString());
+                }
+
+                ImGui.TableNextColumn();
+                ImGui.TextUnformatted(node.GamePath ?? "Unknown");
+                ImGui.TableNextColumn();
+                ImGui.TextUnformatted(node.ActualPath);
+                ImGui.TableNextColumn();
+                TextUnformattedMono($"0x{node.ObjectAddress:X8}");
+                ImGui.TableNextColumn();
+                TextUnformattedMono($"0x{node.ResourceHandle:X8}");
+
+                if (treeNode)
+                    foreach (var child in node.Children)
+                        DrawNode(child);
+            }
+
+            foreach (var node in tree.Nodes)
+                DrawNode(node);
+        });
+    }
+
+    private static void TextUnformattedMono(string text)
+    {
+        using var _ = ImRaii.PushFont(UiBuilder.MonoFont);
+        ImGui.TextUnformatted(text);
+    }
+
+    private ushort[] GetSelectedGameObjects()
+        => _gameObjectIndices.Split(',')
+            .SelectWhere(index => (ushort.TryParse(index.Trim(), out var i), i))
+            .ToArray();
+
+    private unsafe string GameObjectToString(ObjectIndex gameObjectIndex)
+    {
+        var gameObject = objects[gameObjectIndex];
+
+        return gameObject.Valid
+            ? $"[{gameObjectIndex}] {gameObject.Utf8Name} ({(ObjectKind)gameObject.AsObject->ObjectKind})"
+            : $"[{gameObjectIndex}] null";
+    }
+}

Penumbra/Api/IpcTester/TemporaryIpcTester.cs

@@ -0,0 +1,319 @@
+using Dalamud.Interface;
+using Dalamud.Plugin;
+using Dalamud.Bindings.ImGui;
+using OtterGui;
+using OtterGui.Extensions;
+using OtterGui.Raii;
+using OtterGui.Services;
+using OtterGui.Text;
+using Penumbra.Api.Api;
+using Penumbra.Api.Enums;
+using Penumbra.Api.IpcSubscribers;
+using Penumbra.Collections.Manager;
+using Penumbra.Mods;
+using Penumbra.Mods.Manager;
+using Penumbra.Services;
+
+namespace Penumbra.Api.IpcTester;
+
+public class TemporaryIpcTester(
+    IDalamudPluginInterface pi,
+    ModManager modManager,
+    CollectionManager collections,
+    TempModManager tempMods,
+    TempCollectionManager tempCollections,
+    SaveService saveService,
+    Configuration config)
+    : IUiService
+{
+    public Guid LastCreatedCollectionId = Guid.Empty;
+
+    private readonly bool _debug = Assembly.GetAssembly(typeof(TemporaryIpcTester))?.GetName().Version?.Major >= 9;
+
+    private Guid?         _tempGuid;
+    private string        _tempCollectionName     = string.Empty;
+    private string        _tempCollectionGuidName = string.Empty;
+    private string        _tempModName            = string.Empty;
+    private string        _modDirectory           = string.Empty;
+    private string        _tempGamePath           = "test/game/path.mtrl";
+    private string        _tempFilePath           = "test/success.mtrl";
+    private string        _tempManipulation       = string.Empty;
+    private string        _identity               = string.Empty;
+    private PenumbraApiEc _lastTempError;
+    private int           _tempActorIndex;
+    private bool          _forceOverwrite;
+
+    public void Draw()
+    {
+        using var _ = ImRaii.TreeNode("Temporary");
+        if (!_)
+            return;
+
+        ImGui.InputTextWithHint("##identity", "Identity...", ref _identity, 128);
+        ImGui.InputTextWithHint("##tempCollection", "Collection Name...", ref _tempCollectionName, 128);
+        ImGuiUtil.GuidInput("##guid", "Collection GUID...", string.Empty, ref _tempGuid, ref _tempCollectionGuidName);
+        ImGui.InputInt("##tempActorIndex", ref _tempActorIndex, 0, 0);
+        ImGui.InputTextWithHint("##tempMod",  "Temporary Mod Name...", ref _tempModName,  32);
+        ImGui.InputTextWithHint("##mod",      "Existing Mod Name...",  ref _modDirectory, 256);
+        ImGui.InputTextWithHint("##tempGame", "Game Path...",          ref _tempGamePath, 256);
+        ImGui.InputTextWithHint("##tempFile", "File Path...",          ref _tempFilePath, 256);
+        ImUtf8.InputText("##tempManip"u8, ref _tempManipulation, "Manipulation Base64 String..."u8);
+        ImGui.Checkbox("Force Character Collection Overwrite", ref _forceOverwrite);
+
+        using var table = ImRaii.Table(string.Empty, 3, ImGuiTableFlags.SizingFixedFit);
+        if (!table)
+            return;
+
+        IpcTester.DrawIntro("Last Error", _lastTempError.ToString());
+        ImGuiUtil.DrawTableColumn("Last Created Collection");
+        ImGui.TableNextColumn();
+        using (ImRaii.PushFont(UiBuilder.MonoFont))
+        {
+            ImGuiUtil.CopyOnClickSelectable(LastCreatedCollectionId.ToString());
+        }
+
+        IpcTester.DrawIntro(CreateTemporaryCollection.Label, "Create Temporary Collection");
+        if (ImGui.Button("Create##Collection"))
+        {
+            _lastTempError = new CreateTemporaryCollection(pi).Invoke(_identity, _tempCollectionName, out LastCreatedCollectionId);
+            if (_tempGuid == null)
+            {
+                _tempGuid               = LastCreatedCollectionId;
+                _tempCollectionGuidName = LastCreatedCollectionId.ToString();
+            }
+        }
+
+        var guid = _tempGuid.GetValueOrDefault(Guid.Empty);
+
+        IpcTester.DrawIntro(DeleteTemporaryCollection.Label, "Delete Temporary Collection");
+        if (ImGui.Button("Delete##Collection"))
+            _lastTempError = new DeleteTemporaryCollection(pi).Invoke(guid);
+        ImGui.SameLine();
+        if (ImGui.Button("Delete Last##Collection"))
+            _lastTempError = new DeleteTemporaryCollection(pi).Invoke(LastCreatedCollectionId);
+
+        IpcTester.DrawIntro(AssignTemporaryCollection.Label, "Assign Temporary Collection");
+        if (ImGui.Button("Assign##NamedCollection"))
+            _lastTempError = new AssignTemporaryCollection(pi).Invoke(guid, _tempActorIndex, _forceOverwrite);
+
+        IpcTester.DrawIntro(AddTemporaryMod.Label, "Add Temporary Mod to specific Collection");
+        if (ImGui.Button("Add##Mod"))
+            _lastTempError = new AddTemporaryMod(pi).Invoke(_tempModName, guid,
+                new Dictionary<string, string> { { _tempGamePath, _tempFilePath } },
+                _tempManipulation.Length > 0 ? _tempManipulation : string.Empty, int.MaxValue);
+
+        IpcTester.DrawIntro(CreateTemporaryCollection.Label, "Copy Existing Collection");
+        if (ImGuiUtil.DrawDisabledButton("Copy##Collection", Vector2.Zero,
+                "Copies the effective list from the collection named in Temporary Mod Name...",
+                !collections.Storage.ByName(_tempModName, out var copyCollection))
+         && copyCollection is { HasCache: true })
+        {
+            var files  = copyCollection.ResolvedFiles.ToDictionary(kvp => kvp.Key.ToString(), kvp => kvp.Value.Path.ToString());
+            var manips = MetaApi.CompressMetaManipulations(copyCollection);
+            _lastTempError = new AddTemporaryMod(pi).Invoke(_tempModName, guid, files, manips, 999);
+        }
+
+        IpcTester.DrawIntro(AddTemporaryModAll.Label, "Add Temporary Mod to all Collections");
+        if (ImGui.Button("Add##All"))
+            _lastTempError = new AddTemporaryModAll(pi).Invoke(_tempModName,
+                new Dictionary<string, string> { { _tempGamePath, _tempFilePath } },
+                _tempManipulation.Length > 0 ? _tempManipulation : string.Empty, int.MaxValue);
+
+        IpcTester.DrawIntro(RemoveTemporaryMod.Label, "Remove Temporary Mod from specific Collection");
+        if (ImGui.Button("Remove##Mod"))
+            _lastTempError = new RemoveTemporaryMod(pi).Invoke(_tempModName, guid, int.MaxValue);
+
+        IpcTester.DrawIntro(RemoveTemporaryModAll.Label, "Remove Temporary Mod from all Collections");
+        if (ImGui.Button("Remove##ModAll"))
+            _lastTempError = new RemoveTemporaryModAll(pi).Invoke(_tempModName, int.MaxValue);
+
+        IpcTester.DrawIntro(SetTemporaryModSettings.Label, "Set Temporary Mod Settings (to default) in specific Collection");
+        if (ImUtf8.Button("Set##SetTemporary"u8))
+            _lastTempError = new SetTemporaryModSettings(pi).Invoke(guid, _modDirectory, false, true, 1337,
+                new Dictionary<string, IReadOnlyList<string>>(),
+                "IPC Tester", 1337);
+
+        IpcTester.DrawIntro(SetTemporaryModSettingsPlayer.Label, "Set Temporary Mod Settings (to default) in game object collection");
+        if (ImUtf8.Button("Set##SetTemporaryPlayer"u8))
+            _lastTempError = new SetTemporaryModSettingsPlayer(pi).Invoke(_tempActorIndex, _modDirectory, false, true, 1337,
+                new Dictionary<string, IReadOnlyList<string>>(),
+                "IPC Tester", 1337);
+
+        IpcTester.DrawIntro(RemoveTemporaryModSettings.Label, "Remove Temporary Mod Settings from specific Collection");
+        if (ImUtf8.Button("Remove##RemoveTemporary"u8))
+            _lastTempError = new RemoveTemporaryModSettings(pi).Invoke(guid, _modDirectory, 1337);
+        ImGui.SameLine();
+        if (ImUtf8.Button("Remove (Wrong Key)##RemoveTemporary"u8))
+            _lastTempError = new RemoveTemporaryModSettings(pi).Invoke(guid, _modDirectory, 1338);
+
+        IpcTester.DrawIntro(RemoveTemporaryModSettingsPlayer.Label, "Remove Temporary Mod Settings from game object Collection");
+        if (ImUtf8.Button("Remove##RemoveTemporaryPlayer"u8))
+            _lastTempError = new RemoveTemporaryModSettingsPlayer(pi).Invoke(_tempActorIndex, _modDirectory, 1337);
+        ImGui.SameLine();
+        if (ImUtf8.Button("Remove (Wrong Key)##RemoveTemporaryPlayer"u8))
+            _lastTempError = new RemoveTemporaryModSettingsPlayer(pi).Invoke(_tempActorIndex, _modDirectory, 1338);
+
+        IpcTester.DrawIntro(RemoveAllTemporaryModSettings.Label, "Remove All Temporary Mod Settings from specific Collection");
+        if (ImUtf8.Button("Remove##RemoveAllTemporary"u8))
+            _lastTempError = new RemoveAllTemporaryModSettings(pi).Invoke(guid, 1337);
+        ImGui.SameLine();
+        if (ImUtf8.Button("Remove (Wrong Key)##RemoveAllTemporary"u8))
+            _lastTempError = new RemoveAllTemporaryModSettings(pi).Invoke(guid, 1338);
+
+        IpcTester.DrawIntro(RemoveAllTemporaryModSettingsPlayer.Label, "Remove All Temporary Mod Settings from game object Collection");
+        if (ImUtf8.Button("Remove##RemoveAllTemporaryPlayer"u8))
+            _lastTempError = new RemoveAllTemporaryModSettingsPlayer(pi).Invoke(_tempActorIndex, 1337);
+        ImGui.SameLine();
+        if (ImUtf8.Button("Remove (Wrong Key)##RemoveAllTemporaryPlayer"u8))
+            _lastTempError = new RemoveAllTemporaryModSettingsPlayer(pi).Invoke(_tempActorIndex, 1338);
+
+        IpcTester.DrawIntro(QueryTemporaryModSettings.Label, "Query Temporary Mod Settings from specific Collection");
+        ImUtf8.Button("Query##QueryTemporaryModSettings"u8);
+        if (ImGui.IsItemHovered())
+        {
+            _lastTempError = new QueryTemporaryModSettings(pi).Invoke(guid, _modDirectory, out var settings, out var source, 1337);
+            DrawTooltip(settings, source);
+        }
+
+        ImGui.SameLine();
+        ImUtf8.Button("Query (Wrong Key)##RemoveAllTemporary"u8);
+        if (ImGui.IsItemHovered())
+        {
+            _lastTempError = new QueryTemporaryModSettings(pi).Invoke(guid, _modDirectory, out var settings, out var source, 1338);
+            DrawTooltip(settings, source);
+        }
+
+        IpcTester.DrawIntro(QueryTemporaryModSettingsPlayer.Label, "Query Temporary Mod Settings from game object Collection");
+        ImUtf8.Button("Query##QueryTemporaryModSettingsPlayer"u8);
+        if (ImGui.IsItemHovered())
+        {
+            _lastTempError =
+                new QueryTemporaryModSettingsPlayer(pi).Invoke(_tempActorIndex, _modDirectory, out var settings, out var source, 1337);
+            DrawTooltip(settings, source);
+        }
+
+        ImGui.SameLine();
+        ImUtf8.Button("Query (Wrong Key)##RemoveAllTemporaryPlayer"u8);
+        if (ImGui.IsItemHovered())
+        {
+            _lastTempError =
+                new QueryTemporaryModSettingsPlayer(pi).Invoke(_tempActorIndex, _modDirectory, out var settings, out var source, 1338);
+            DrawTooltip(settings, source);
+        }
+
+        void DrawTooltip((bool ForceInherit, bool Enabled, int Priority, Dictionary<string, List<string>> Settings)? settings, string source)
+        {
+            using var tt = ImUtf8.Tooltip();
+            ImUtf8.Text($"Query returned {_lastTempError}");
+            if (settings != null)
+                ImUtf8.Text($"Settings created by {(source.Length == 0 ? "Unknown Source" : source)}:");
+            else
+                ImUtf8.Text(source.Length > 0 ? $"Locked by {source}." : "No settings exist.");
+            ImGui.Separator();
+            if (settings == null)
+            {
+                
+                return;
+            }
+
+            using (ImUtf8.Group())
+            {
+                ImUtf8.Text("Force Inherit"u8);
+                ImUtf8.Text("Enabled"u8);
+                ImUtf8.Text("Priority"u8);
+                foreach (var group in settings.Value.Settings.Keys)
+                    ImUtf8.Text(group);
+            }
+
+            ImGui.SameLine();
+            using (ImUtf8.Group())
+            {
+                ImUtf8.Text($"{settings.Value.ForceInherit}");
+                ImUtf8.Text($"{settings.Value.Enabled}");
+                ImUtf8.Text($"{settings.Value.Priority}");
+                foreach (var group in settings.Value.Settings.Values)
+                    ImUtf8.Text(string.Join("; ", group));
+            }
+        }
+    }
+
+    public void DrawCollections()
+    {
+        using var collTree = ImUtf8.TreeNode("Temporary Collections##TempCollections"u8);
+        if (!collTree)
+            return;
+
+        using var table = ImUtf8.Table("##collTree"u8, 6, ImGuiTableFlags.SizingFixedFit);
+        if (!table)
+            return;
+
+        foreach (var (collection, idx) in tempCollections.Values.WithIndex())
+        {
+            using var id = ImRaii.PushId(idx);
+            ImGui.TableNextColumn();
+            var character = tempCollections.Collections.Where(p => p.Collection == collection).Select(p => p.DisplayName)
+                    .FirstOrDefault()
+             ?? "Unknown";
+            if (_debug && ImUtf8.Button("Save##Collection"u8))
+                TemporaryMod.SaveTempCollection(config, saveService, modManager, collection, character);
+
+            using (ImRaii.PushFont(UiBuilder.MonoFont))
+            {
+                ImGui.TableNextColumn();
+                ImGuiUtil.CopyOnClickSelectable(collection.Identity.Identifier);
+            }
+
+            ImGuiUtil.DrawTableColumn(collection.Identity.Name);
+            ImGuiUtil.DrawTableColumn(collection.ResolvedFiles.Count.ToString());
+            ImGuiUtil.DrawTableColumn(collection.MetaCache?.Count.ToString() ?? "0");
+            ImGuiUtil.DrawTableColumn(string.Join(", ",
+                tempCollections.Collections.Where(p => p.Collection == collection).Select(c => c.DisplayName)));
+        }
+    }
+
+    public void DrawMods()
+    {
+        using var modTree = ImRaii.TreeNode("Temporary Mods##TempMods");
+        if (!modTree)
+            return;
+
+        using var table = ImRaii.Table("##modTree", 5, ImGuiTableFlags.SizingFixedFit);
+
+        void PrintList(string collectionName, IReadOnlyList<TemporaryMod> list)
+        {
+            foreach (var mod in list)
+            {
+                ImGui.TableNextColumn();
+                ImGui.TextUnformatted(mod.Name.Text);
+                ImGui.TableNextColumn();
+                ImGui.TextUnformatted(mod.Priority.ToString());
+                ImGui.TableNextColumn();
+                ImGui.TextUnformatted(collectionName);
+                ImGui.TableNextColumn();
+                ImGui.TextUnformatted(mod.Default.Files.Count.ToString());
+                if (ImGui.IsItemHovered())
+                {
+                    using var tt = ImRaii.Tooltip();
+                    foreach (var (path, file) in mod.Default.Files)
+                        ImGui.TextUnformatted($"{path} -> {file}");
+                }
+
+                ImGui.TableNextColumn();
+                ImGui.TextUnformatted(mod.TotalManipulations.ToString());
+                if (ImGui.IsItemHovered())
+                {
+                    using var tt = ImRaii.Tooltip();
+                    foreach (var identifier in mod.Default.Manipulations.Identifiers)
+                        ImGui.TextUnformatted(identifier.ToString());
+                }
+            }
+        }
+
+        if (table)
+        {
+            PrintList("All", tempMods.ModsForAllCollections);
+            foreach (var (collection, list) in tempMods.Mods)
+                PrintList(collection.Identity.Name, list);
+        }
+    }
+}

Penumbra/Api/IpcTester/UiIpcTester.cs

@@ -0,0 +1,133 @@
+using Dalamud.Plugin;
+using Dalamud.Bindings.ImGui;
+using OtterGui.Raii;
+using OtterGui.Services;
+using Penumbra.Api.Enums;
+using Penumbra.Api.Helpers;
+using Penumbra.Api.IpcSubscribers;
+
+namespace Penumbra.Api.IpcTester;
+
+public class UiIpcTester : IUiService, IDisposable
+{
+    private readonly IDalamudPluginInterface                              _pi;
+    public readonly  EventSubscriber<string, float, float>               PreSettingsTabBar;
+    public readonly  EventSubscriber<string>                             PreSettingsPanel;
+    public readonly  EventSubscriber<string>                             PostEnabled;
+    public readonly  EventSubscriber<string>                             PostSettingsPanelDraw;
+    public readonly  EventSubscriber<ChangedItemType, uint>              ChangedItemTooltip;
+    public readonly  EventSubscriber<MouseButton, ChangedItemType, uint> ChangedItemClicked;
+
+    private string         _lastDrawnMod     = string.Empty;
+    private DateTimeOffset _lastDrawnModTime = DateTimeOffset.MinValue;
+    private bool           _subscribedToTooltip;
+    private bool           _subscribedToClick;
+    private string         _lastClicked = string.Empty;
+    private string         _lastHovered = string.Empty;
+    private TabType        _selectTab   = TabType.None;
+    private string         _modName     = string.Empty;
+    private PenumbraApiEc  _ec          = PenumbraApiEc.Success;
+
+    public UiIpcTester(IDalamudPluginInterface pi)
+    {
+        _pi                   = pi;
+        PreSettingsTabBar     = IpcSubscribers.PreSettingsTabBarDraw.Subscriber(pi, UpdateLastDrawnMod);
+        PreSettingsPanel      = IpcSubscribers.PreSettingsDraw.Subscriber(pi, UpdateLastDrawnMod);
+        PostEnabled           = IpcSubscribers.PostEnabledDraw.Subscriber(pi, UpdateLastDrawnMod);
+        PostSettingsPanelDraw = IpcSubscribers.PostSettingsDraw.Subscriber(pi, UpdateLastDrawnMod);
+        ChangedItemTooltip    = IpcSubscribers.ChangedItemTooltip.Subscriber(pi, AddedTooltip);
+        ChangedItemClicked    = IpcSubscribers.ChangedItemClicked.Subscriber(pi, AddedClick);
+        PreSettingsTabBar.Disable();
+        PreSettingsPanel.Disable();
+        PostEnabled.Disable();
+        PostSettingsPanelDraw.Disable();
+        ChangedItemTooltip.Disable();
+        ChangedItemClicked.Disable();
+    }
+
+    public void Dispose()
+    {
+        PreSettingsTabBar.Dispose();
+        PreSettingsPanel.Dispose();
+        PostEnabled.Dispose();
+        PostSettingsPanelDraw.Dispose();
+        ChangedItemTooltip.Dispose();
+        ChangedItemClicked.Dispose();
+    }
+
+    public void Draw()
+    {
+        using var _ = ImRaii.TreeNode("UI");
+        if (!_)
+            return;
+
+        using (var combo = ImRaii.Combo("Tab to Open at", _selectTab.ToString()))
+        {
+            if (combo)
+                foreach (var val in Enum.GetValues<TabType>())
+                {
+                    if (ImGui.Selectable(val.ToString(), _selectTab == val))
+                        _selectTab = val;
+                }
+        }
+
+        ImGui.InputTextWithHint("##openMod", "Mod to Open at...", ref _modName, 256);
+        using var table = ImRaii.Table(string.Empty, 3, ImGuiTableFlags.SizingFixedFit);
+        if (!table)
+            return;
+
+        IpcTester.DrawIntro(IpcSubscribers.PostSettingsDraw.Label, "Last Drawn Mod");
+        ImGui.TextUnformatted(_lastDrawnMod.Length > 0 ? $"{_lastDrawnMod} at {_lastDrawnModTime}" : "None");
+
+        IpcTester.DrawIntro(IpcSubscribers.ChangedItemTooltip.Label, "Add Tooltip");
+        if (ImGui.Checkbox("##tooltip", ref _subscribedToTooltip))
+        {
+            if (_subscribedToTooltip)
+                ChangedItemTooltip.Enable();
+            else
+                ChangedItemTooltip.Disable();
+        }
+
+        ImGui.SameLine();
+        ImGui.TextUnformatted(_lastHovered);
+
+        IpcTester.DrawIntro(IpcSubscribers.ChangedItemClicked.Label, "Subscribe Click");
+        if (ImGui.Checkbox("##click", ref _subscribedToClick))
+        {
+            if (_subscribedToClick)
+                ChangedItemClicked.Enable();
+            else
+                ChangedItemClicked.Disable();
+        }
+
+        ImGui.SameLine();
+        ImGui.TextUnformatted(_lastClicked);
+        IpcTester.DrawIntro(OpenMainWindow.Label, "Open Mod Window");
+        if (ImGui.Button("Open##window"))
+            _ec = new OpenMainWindow(_pi).Invoke(_selectTab, _modName, _modName);
+
+        ImGui.SameLine();
+        ImGui.TextUnformatted(_ec.ToString());
+
+        IpcTester.DrawIntro(CloseMainWindow.Label, "Close Mod Window");
+        if (ImGui.Button("Close##window"))
+            new CloseMainWindow(_pi).Invoke();
+    }
+
+    private void UpdateLastDrawnMod(string name)
+        => (_lastDrawnMod, _lastDrawnModTime) = (name, DateTimeOffset.Now);
+
+    private void UpdateLastDrawnMod(string name, float _1, float _2)
+        => (_lastDrawnMod, _lastDrawnModTime) = (name, DateTimeOffset.Now);
+
+    private void AddedTooltip(ChangedItemType type, uint id)
+    {
+        _lastHovered = $"{type} {id} at {DateTime.UtcNow.ToLocalTime().ToString(CultureInfo.CurrentCulture)}";
+        ImGui.TextUnformatted("IPC Test Successful");
+    }
+
+    private void AddedClick(MouseButton button, ChangedItemType type, uint id)
+    {
+        _lastClicked = $"{button}-click on {type} {id} at {DateTime.UtcNow.ToLocalTime().ToString(CultureInfo.CurrentCulture)}";
+    }
+}

Penumbra/Api/ModChangedItemAdapter.cs

@@ -0,0 +1,103 @@
+using Penumbra.GameData.Data;
+using Penumbra.Mods.Manager;
+
+namespace Penumbra.Api;
+
+public sealed class ModChangedItemAdapter(WeakReference<ModStorage> storage)
+    : IReadOnlyDictionary<string, IReadOnlyDictionary<string, object?>>,
+        IReadOnlyList<(string ModDirectory, IReadOnlyDictionary<string, object?> ChangedItems)>
+{
+    IEnumerator<(string ModDirectory, IReadOnlyDictionary<string, object?> ChangedItems)>
+        IEnumerable<(string ModDirectory, IReadOnlyDictionary<string, object?> ChangedItems)>.GetEnumerator()
+        => Storage.Select(m => (m.Identifier, (IReadOnlyDictionary<string, object?>)new ChangedItemDictionaryAdapter(m.ChangedItems)))
+            .GetEnumerator();
+
+    public IEnumerator<KeyValuePair<string, IReadOnlyDictionary<string, object?>>> GetEnumerator()
+        => Storage.Select(m => new KeyValuePair<string, IReadOnlyDictionary<string, object?>>(m.Identifier,
+                new ChangedItemDictionaryAdapter(m.ChangedItems)))
+            .GetEnumerator();
+
+    IEnumerator IEnumerable.GetEnumerator()
+        => GetEnumerator();
+
+    public int Count
+        => Storage.Count;
+
+    public bool ContainsKey(string key)
+        => Storage.TryGetMod(key, string.Empty, out _);
+
+    public bool TryGetValue(string key, [NotNullWhen(true)] out IReadOnlyDictionary<string, object?>? value)
+    {
+        if (Storage.TryGetMod(key, string.Empty, out var mod))
+        {
+            value = new ChangedItemDictionaryAdapter(mod.ChangedItems);
+            return true;
+        }
+
+        value = null;
+        return false;
+    }
+
+    public IReadOnlyDictionary<string, object?> this[string key]
+        => TryGetValue(key, out var v) ? v : throw new KeyNotFoundException();
+
+    (string ModDirectory, IReadOnlyDictionary<string, object?> ChangedItems)
+        IReadOnlyList<(string ModDirectory, IReadOnlyDictionary<string, object?> ChangedItems)>.this[int index]
+    {
+        get
+        {
+            var m = Storage[index];
+            return (m.Identifier, new ChangedItemDictionaryAdapter(m.ChangedItems));
+        }
+    }
+
+    public IEnumerable<string> Keys
+        => Storage.Select(m => m.Identifier);
+
+    public IEnumerable<IReadOnlyDictionary<string, object?>> Values
+        => Storage.Select(m => new ChangedItemDictionaryAdapter(m.ChangedItems));
+
+    private ModStorage Storage
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+        get => storage.TryGetTarget(out var t)
+            ? t
+            : throw new ObjectDisposedException("The underlying mod storage of this IPC container was disposed.");
+    }
+
+    private sealed class ChangedItemDictionaryAdapter(SortedList<string, IIdentifiedObjectData> data) : IReadOnlyDictionary<string, object?>
+    {
+        public IEnumerator<KeyValuePair<string, object?>> GetEnumerator()
+            => data.Select(d => new KeyValuePair<string, object?>(d.Key, d.Value?.ToInternalObject())).GetEnumerator();
+
+        IEnumerator IEnumerable.GetEnumerator()
+            => GetEnumerator();
+
+        public int Count
+            => data.Count;
+
+        public bool ContainsKey(string key)
+            => data.ContainsKey(key);
+
+        public bool TryGetValue(string key, out object? value)
+        {
+            if (data.TryGetValue(key, out var v))
+            {
+                value = v?.ToInternalObject();
+                return true;
+            }
+
+            value = null;
+            return false;
+        }
+
+        public object? this[string key]
+            => data[key]?.ToInternalObject();
+
+        public IEnumerable<string> Keys
+            => data.Keys;
+
+        public IEnumerable<object?> Values
+            => data.Values.Select(v => v?.ToInternalObject());
+    }
+}

Penumbra/Api/PenumbraIpcProviders.cs

@@ -1,427 +0,0 @@
-using Dalamud.Game.ClientState.Objects.Types;
-using Dalamud.Plugin;
-using Penumbra.GameData.Enums;
-using Penumbra.Api.Enums;
-using Penumbra.Api.Helpers;
-using Penumbra.Collections.Manager;
-using Penumbra.Mods.Manager;
-using Penumbra.Services;
-using Penumbra.Util;
-
-namespace Penumbra.Api;
-
-using CurrentSettings = ValueTuple<PenumbraApiEc, (bool, int, IDictionary<string, IList<string>>, bool)?>;
-
-public class PenumbraIpcProviders : IDisposable
-{
-    internal readonly IPenumbraApi Api;
-
-    // Plugin State
-    internal readonly EventProvider                              Initialized;
-    internal readonly EventProvider                              Disposed;
-    internal readonly FuncProvider<int>                          ApiVersion;
-    internal readonly FuncProvider<(int Breaking, int Features)> ApiVersions;
-    internal readonly FuncProvider<bool>                         GetEnabledState;
-    internal readonly EventProvider<bool>                        EnabledChange;
-
-    // Configuration
-    internal readonly FuncProvider<string>        GetModDirectory;
-    internal readonly FuncProvider<string>        GetConfiguration;
-    internal readonly EventProvider<string, bool> ModDirectoryChanged;
-
-    // UI
-    internal readonly EventProvider<string>                                PreSettingsDraw;
-    internal readonly EventProvider<string>                                PostSettingsDraw;
-    internal readonly EventProvider<ChangedItemType, uint>                 ChangedItemTooltip;
-    internal readonly EventProvider<MouseButton, ChangedItemType, uint>    ChangedItemClick;
-    internal readonly FuncProvider<TabType, string, string, PenumbraApiEc> OpenMainWindow;
-    internal readonly ActionProvider                                       CloseMainWindow;
-
-    // Redrawing
-    internal readonly ActionProvider<RedrawType>             RedrawAll;
-    internal readonly ActionProvider<GameObject, RedrawType> RedrawObject;
-    internal readonly ActionProvider<int, RedrawType>        RedrawObjectByIndex;
-    internal readonly ActionProvider<string, RedrawType>     RedrawObjectByName;
-    internal readonly EventProvider<nint, int>               GameObjectRedrawn;
-
-    // Game State
-    internal readonly FuncProvider<nint, (nint, string)>            GetDrawObjectInfo;
-    internal readonly FuncProvider<int, int>                        GetCutsceneParentIndex;
-    internal readonly FuncProvider<int, int, PenumbraApiEc>         SetCutsceneParentIndex;
-    internal readonly EventProvider<nint, string, nint, nint, nint> CreatingCharacterBase;
-    internal readonly EventProvider<nint, string, nint>             CreatedCharacterBase;
-    internal readonly EventProvider<nint, string, string>           GameObjectResourcePathResolved;
-
-    // Resolve
-    internal readonly FuncProvider<string, string>                                   ResolveDefaultPath;
-    internal readonly FuncProvider<string, string>                                   ResolveInterfacePath;
-    internal readonly FuncProvider<string, string>                                   ResolvePlayerPath;
-    internal readonly FuncProvider<string, int, string>                              ResolveGameObjectPath;
-    internal readonly FuncProvider<string, string, string>                           ResolveCharacterPath;
-    internal readonly FuncProvider<string, string, string[]>                         ReverseResolvePath;
-    internal readonly FuncProvider<string, int, string[]>                            ReverseResolveGameObjectPath;
-    internal readonly FuncProvider<string, string[]>                                 ReverseResolvePlayerPath;
-    internal readonly FuncProvider<string[], string[], (string[], string[][])>       ResolvePlayerPaths;
-    internal readonly FuncProvider<string[], string[], Task<(string[], string[][])>> ResolvePlayerPathsAsync;
-
-    // Collections
-    internal readonly FuncProvider<IList<string>>                                                  GetCollections;
-    internal readonly FuncProvider<string>                                                         GetCurrentCollectionName;
-    internal readonly FuncProvider<string>                                                         GetDefaultCollectionName;
-    internal readonly FuncProvider<string>                                                         GetInterfaceCollectionName;
-    internal readonly FuncProvider<string, (string, bool)>                                         GetCharacterCollectionName;
-    internal readonly FuncProvider<ApiCollectionType, string>                                      GetCollectionForType;
-    internal readonly FuncProvider<ApiCollectionType, string, bool, bool, (PenumbraApiEc, string)> SetCollectionForType;
-    internal readonly FuncProvider<int, (bool, bool, string)>                                      GetCollectionForObject;
-    internal readonly FuncProvider<int, string, bool, bool, (PenumbraApiEc, string)>               SetCollectionForObject;
-    internal readonly FuncProvider<string, IReadOnlyDictionary<string, object?>>                   GetChangedItems;
-
-    // Meta
-    internal readonly FuncProvider<string>         GetPlayerMetaManipulations;
-    internal readonly FuncProvider<string, string> GetMetaManipulations;
-    internal readonly FuncProvider<int, string>    GetGameObjectMetaManipulations;
-
-    // Mods
-    internal readonly FuncProvider<IList<(string, string)>>                       GetMods;
-    internal readonly FuncProvider<string, string, PenumbraApiEc>                 ReloadMod;
-    internal readonly FuncProvider<string, PenumbraApiEc>                         InstallMod;
-    internal readonly FuncProvider<string, PenumbraApiEc>                         AddMod;
-    internal readonly FuncProvider<string, string, PenumbraApiEc>                 DeleteMod;
-    internal readonly FuncProvider<string, string, (PenumbraApiEc, string, bool)> GetModPath;
-    internal readonly FuncProvider<string, string, string, PenumbraApiEc>         SetModPath;
-    internal readonly EventProvider<string>                                       ModDeleted;
-    internal readonly EventProvider<string>                                       ModAdded;
-    internal readonly EventProvider<string, string>                               ModMoved;
-
-    // ModSettings
-    internal readonly FuncProvider<string, string, IDictionary<string, (IList<string>, GroupType)>?>     GetAvailableModSettings;
-    internal readonly FuncProvider<string, string, string, bool, CurrentSettings>                        GetCurrentModSettings;
-    internal readonly FuncProvider<string, string, string, bool, PenumbraApiEc>                          TryInheritMod;
-    internal readonly FuncProvider<string, string, string, bool, PenumbraApiEc>                          TrySetMod;
-    internal readonly FuncProvider<string, string, string, int, PenumbraApiEc>                           TrySetModPriority;
-    internal readonly FuncProvider<string, string, string, string, string, PenumbraApiEc>                TrySetModSetting;
-    internal readonly FuncProvider<string, string, string, string, IReadOnlyList<string>, PenumbraApiEc> TrySetModSettings;
-    internal readonly EventProvider<ModSettingChange, string, string, bool>                              ModSettingChanged;
-    internal readonly FuncProvider<string, string, string, PenumbraApiEc>                                CopyModSettings;
-
-    // Editing
-    internal readonly FuncProvider<string, string, TextureType, bool, Task>      ConvertTextureFile;
-    internal readonly FuncProvider<byte[], int, string, TextureType, bool, Task> ConvertTextureData;
-
-    // Temporary
-    internal readonly FuncProvider<string, string, bool, (PenumbraApiEc, string)>                          CreateTemporaryCollection;
-    internal readonly FuncProvider<string, PenumbraApiEc>                                                  RemoveTemporaryCollection;
-    internal readonly FuncProvider<string, PenumbraApiEc>                                                  CreateNamedTemporaryCollection;
-    internal readonly FuncProvider<string, PenumbraApiEc>                                                  RemoveTemporaryCollectionByName;
-    internal readonly FuncProvider<string, int, bool, PenumbraApiEc>                                       AssignTemporaryCollection;
-    internal readonly FuncProvider<string, Dictionary<string, string>, string, int, PenumbraApiEc>         AddTemporaryModAll;
-    internal readonly FuncProvider<string, string, Dictionary<string, string>, string, int, PenumbraApiEc> AddTemporaryMod;
-    internal readonly FuncProvider<string, int, PenumbraApiEc>                                             RemoveTemporaryModAll;
-    internal readonly FuncProvider<string, string, int, PenumbraApiEc>                                     RemoveTemporaryMod;
-
-    // Resource Tree
-    internal readonly FuncProvider<ushort[], IReadOnlyDictionary<string, string[]>?[]>                 GetGameObjectResourcePaths;
-    internal readonly FuncProvider<IReadOnlyDictionary<ushort, IReadOnlyDictionary<string, string[]>>> GetPlayerResourcePaths;
-
-    internal readonly FuncProvider<ResourceType, bool, ushort[], IReadOnlyDictionary<nint, (string, string, ChangedItemIcon)>?[]>
-        GetGameObjectResourcesOfType;
-
-    internal readonly
-        FuncProvider<ResourceType, bool, IReadOnlyDictionary<ushort, IReadOnlyDictionary<nint, (string, string, ChangedItemIcon)>>>
-        GetPlayerResourcesOfType;
-
-    internal readonly FuncProvider<bool, ushort[], Ipc.ResourceTree?[]>                         GetGameObjectResourceTrees;
-    internal readonly FuncProvider<bool, IReadOnlyDictionary<ushort, Ipc.ResourceTree>>         GetPlayerResourceTrees;
-
-    public PenumbraIpcProviders(DalamudPluginInterface pi, IPenumbraApi api, ModManager modManager, CollectionManager collections,
-        TempModManager tempMods, TempCollectionManager tempCollections, SaveService saveService, Configuration config)
-    {
-        Api = api;
-
-        // Plugin State
-        Initialized     = Ipc.Initialized.Provider(pi);
-        Disposed        = Ipc.Disposed.Provider(pi);
-        ApiVersion      = Ipc.ApiVersion.Provider(pi, DeprecatedVersion);
-        ApiVersions     = Ipc.ApiVersions.Provider(pi, () => Api.ApiVersion);
-        GetEnabledState = Ipc.GetEnabledState.Provider(pi, Api.GetEnabledState);
-        EnabledChange =
-            Ipc.EnabledChange.Provider(pi, () => Api.EnabledChange += EnabledChangeEvent, () => Api.EnabledChange -= EnabledChangeEvent);
-
-        // Configuration
-        GetModDirectory     = Ipc.GetModDirectory.Provider(pi, Api.GetModDirectory);
-        GetConfiguration    = Ipc.GetConfiguration.Provider(pi, Api.GetConfiguration);
-        ModDirectoryChanged = Ipc.ModDirectoryChanged.Provider(pi, a => Api.ModDirectoryChanged += a, a => Api.ModDirectoryChanged -= a);
-
-        // UI
-        PreSettingsDraw  = Ipc.PreSettingsDraw.Provider(pi, a => Api.PreSettingsPanelDraw   += a, a => Api.PreSettingsPanelDraw  -= a);
-        PostSettingsDraw = Ipc.PostSettingsDraw.Provider(pi, a => Api.PostSettingsPanelDraw += a, a => Api.PostSettingsPanelDraw -= a);
-        ChangedItemTooltip =
-            Ipc.ChangedItemTooltip.Provider(pi, () => Api.ChangedItemTooltip += OnTooltip, () => Api.ChangedItemTooltip -= OnTooltip);
-        ChangedItemClick = Ipc.ChangedItemClick.Provider(pi, () => Api.ChangedItemClicked += OnClick, () => Api.ChangedItemClicked -= OnClick);
-        OpenMainWindow   = Ipc.OpenMainWindow.Provider(pi, Api.OpenMainWindow);
-        CloseMainWindow  = Ipc.CloseMainWindow.Provider(pi, Api.CloseMainWindow);
-
-        // Redrawing
-        RedrawAll           = Ipc.RedrawAll.Provider(pi, Api.RedrawAll);
-        RedrawObject        = Ipc.RedrawObject.Provider(pi, Api.RedrawObject);
-        RedrawObjectByIndex = Ipc.RedrawObjectByIndex.Provider(pi, Api.RedrawObject);
-        RedrawObjectByName  = Ipc.RedrawObjectByName.Provider(pi, Api.RedrawObject);
-        GameObjectRedrawn = Ipc.GameObjectRedrawn.Provider(pi, () => Api.GameObjectRedrawn += OnGameObjectRedrawn,
-            () => Api.GameObjectRedrawn                                                    -= OnGameObjectRedrawn);
-
-        // Game State
-        GetDrawObjectInfo      = Ipc.GetDrawObjectInfo.Provider(pi, Api.GetDrawObjectInfo);
-        GetCutsceneParentIndex = Ipc.GetCutsceneParentIndex.Provider(pi, Api.GetCutsceneParentIndex);
-        SetCutsceneParentIndex = Ipc.SetCutsceneParentIndex.Provider(pi, Api.SetCutsceneParentIndex);
-        CreatingCharacterBase = Ipc.CreatingCharacterBase.Provider(pi,
-            () => Api.CreatingCharacterBase += CreatingCharacterBaseEvent,
-            () => Api.CreatingCharacterBase -= CreatingCharacterBaseEvent);
-        CreatedCharacterBase = Ipc.CreatedCharacterBase.Provider(pi,
-            () => Api.CreatedCharacterBase += CreatedCharacterBaseEvent,
-            () => Api.CreatedCharacterBase -= CreatedCharacterBaseEvent);
-        GameObjectResourcePathResolved = Ipc.GameObjectResourcePathResolved.Provider(pi,
-            () => Api.GameObjectResourceResolved += GameObjectResourceResolvedEvent,
-            () => Api.GameObjectResourceResolved -= GameObjectResourceResolvedEvent);
-
-        // Resolve
-        ResolveDefaultPath           = Ipc.ResolveDefaultPath.Provider(pi, Api.ResolveDefaultPath);
-        ResolveInterfacePath         = Ipc.ResolveInterfacePath.Provider(pi, Api.ResolveInterfacePath);
-        ResolvePlayerPath            = Ipc.ResolvePlayerPath.Provider(pi, Api.ResolvePlayerPath);
-        ResolveGameObjectPath        = Ipc.ResolveGameObjectPath.Provider(pi, Api.ResolveGameObjectPath);
-        ResolveCharacterPath         = Ipc.ResolveCharacterPath.Provider(pi, Api.ResolvePath);
-        ReverseResolvePath           = Ipc.ReverseResolvePath.Provider(pi, Api.ReverseResolvePath);
-        ReverseResolveGameObjectPath = Ipc.ReverseResolveGameObjectPath.Provider(pi, Api.ReverseResolveGameObjectPath);
-        ReverseResolvePlayerPath     = Ipc.ReverseResolvePlayerPath.Provider(pi, Api.ReverseResolvePlayerPath);
-        ResolvePlayerPaths           = Ipc.ResolvePlayerPaths.Provider(pi, Api.ResolvePlayerPaths);
-        ResolvePlayerPathsAsync      = Ipc.ResolvePlayerPathsAsync.Provider(pi, Api.ResolvePlayerPathsAsync);
-
-        // Collections
-        GetCollections             = Ipc.GetCollections.Provider(pi, Api.GetCollections);
-        GetCurrentCollectionName   = Ipc.GetCurrentCollectionName.Provider(pi, Api.GetCurrentCollection);
-        GetDefaultCollectionName   = Ipc.GetDefaultCollectionName.Provider(pi, Api.GetDefaultCollection);
-        GetInterfaceCollectionName = Ipc.GetInterfaceCollectionName.Provider(pi, Api.GetInterfaceCollection);
-        GetCharacterCollectionName = Ipc.GetCharacterCollectionName.Provider(pi, Api.GetCharacterCollection);
-        GetCollectionForType       = Ipc.GetCollectionForType.Provider(pi, Api.GetCollectionForType);
-        SetCollectionForType       = Ipc.SetCollectionForType.Provider(pi, Api.SetCollectionForType);
-        GetCollectionForObject     = Ipc.GetCollectionForObject.Provider(pi, Api.GetCollectionForObject);
-        SetCollectionForObject     = Ipc.SetCollectionForObject.Provider(pi, Api.SetCollectionForObject);
-        GetChangedItems            = Ipc.GetChangedItems.Provider(pi, Api.GetChangedItemsForCollection);
-
-        // Meta
-        GetPlayerMetaManipulations     = Ipc.GetPlayerMetaManipulations.Provider(pi, Api.GetPlayerMetaManipulations);
-        GetMetaManipulations           = Ipc.GetMetaManipulations.Provider(pi, Api.GetMetaManipulations);
-        GetGameObjectMetaManipulations = Ipc.GetGameObjectMetaManipulations.Provider(pi, Api.GetGameObjectMetaManipulations);
-
-        // Mods
-        GetMods    = Ipc.GetMods.Provider(pi, Api.GetModList);
-        ReloadMod  = Ipc.ReloadMod.Provider(pi, Api.ReloadMod);
-        InstallMod = Ipc.InstallMod.Provider(pi, Api.InstallMod);
-        AddMod     = Ipc.AddMod.Provider(pi, Api.AddMod);
-        DeleteMod  = Ipc.DeleteMod.Provider(pi, Api.DeleteMod);
-        GetModPath = Ipc.GetModPath.Provider(pi, Api.GetModPath);
-        SetModPath = Ipc.SetModPath.Provider(pi, Api.SetModPath);
-        ModDeleted = Ipc.ModDeleted.Provider(pi, () => Api.ModDeleted += ModDeletedEvent, () => Api.ModDeleted -= ModDeletedEvent);
-        ModAdded   = Ipc.ModAdded.Provider(pi, () => Api.ModAdded     += ModAddedEvent, () => Api.ModAdded     -= ModAddedEvent);
-        ModMoved   = Ipc.ModMoved.Provider(pi, () => Api.ModMoved     += ModMovedEvent, () => Api.ModMoved     -= ModMovedEvent);
-
-        // ModSettings
-        GetAvailableModSettings = Ipc.GetAvailableModSettings.Provider(pi, Api.GetAvailableModSettings);
-        GetCurrentModSettings   = Ipc.GetCurrentModSettings.Provider(pi, Api.GetCurrentModSettings);
-        TryInheritMod           = Ipc.TryInheritMod.Provider(pi, Api.TryInheritMod);
-        TrySetMod               = Ipc.TrySetMod.Provider(pi, Api.TrySetMod);
-        TrySetModPriority       = Ipc.TrySetModPriority.Provider(pi, Api.TrySetModPriority);
-        TrySetModSetting        = Ipc.TrySetModSetting.Provider(pi, Api.TrySetModSetting);
-        TrySetModSettings       = Ipc.TrySetModSettings.Provider(pi, Api.TrySetModSettings);
-        ModSettingChanged = Ipc.ModSettingChanged.Provider(pi,
-            () => Api.ModSettingChanged += ModSettingChangedEvent,
-            () => Api.ModSettingChanged -= ModSettingChangedEvent);
-        CopyModSettings = Ipc.CopyModSettings.Provider(pi, Api.CopyModSettings);
-
-        // Editing
-        ConvertTextureFile = Ipc.ConvertTextureFile.Provider(pi, Api.ConvertTextureFile);
-        ConvertTextureData = Ipc.ConvertTextureData.Provider(pi, Api.ConvertTextureData);
-
-        // Temporary
-        CreateTemporaryCollection       = Ipc.CreateTemporaryCollection.Provider(pi, Api.CreateTemporaryCollection);
-        RemoveTemporaryCollection       = Ipc.RemoveTemporaryCollection.Provider(pi, Api.RemoveTemporaryCollection);
-        CreateNamedTemporaryCollection  = Ipc.CreateNamedTemporaryCollection.Provider(pi, Api.CreateNamedTemporaryCollection);
-        RemoveTemporaryCollectionByName = Ipc.RemoveTemporaryCollectionByName.Provider(pi, Api.RemoveTemporaryCollectionByName);
-        AssignTemporaryCollection       = Ipc.AssignTemporaryCollection.Provider(pi, Api.AssignTemporaryCollection);
-        AddTemporaryModAll              = Ipc.AddTemporaryModAll.Provider(pi, Api.AddTemporaryModAll);
-        AddTemporaryMod                 = Ipc.AddTemporaryMod.Provider(pi, Api.AddTemporaryMod);
-        RemoveTemporaryModAll           = Ipc.RemoveTemporaryModAll.Provider(pi, Api.RemoveTemporaryModAll);
-        RemoveTemporaryMod              = Ipc.RemoveTemporaryMod.Provider(pi, Api.RemoveTemporaryMod);
-
-        // ResourceTree
-        GetGameObjectResourcePaths   = Ipc.GetGameObjectResourcePaths.Provider(pi, Api.GetGameObjectResourcePaths);
-        GetPlayerResourcePaths       = Ipc.GetPlayerResourcePaths.Provider(pi, Api.GetPlayerResourcePaths);
-        GetGameObjectResourcesOfType = Ipc.GetGameObjectResourcesOfType.Provider(pi, Api.GetGameObjectResourcesOfType);
-        GetPlayerResourcesOfType     = Ipc.GetPlayerResourcesOfType.Provider(pi, Api.GetPlayerResourcesOfType);
-        GetGameObjectResourceTrees   = Ipc.GetGameObjectResourceTrees.Provider(pi, Api.GetGameObjectResourceTrees);
-        GetPlayerResourceTrees       = Ipc.GetPlayerResourceTrees.Provider(pi, Api.GetPlayerResourceTrees);
-
-        Initialized.Invoke();
-    }
-
-    public void Dispose()
-    {
-        // Plugin State
-        Initialized.Dispose();
-        ApiVersion.Dispose();
-        ApiVersions.Dispose();
-        GetEnabledState.Dispose();
-        EnabledChange.Dispose();
-
-        // Configuration
-        GetModDirectory.Dispose();
-        GetConfiguration.Dispose();
-        ModDirectoryChanged.Dispose();
-
-        // UI
-        PreSettingsDraw.Dispose();
-        PostSettingsDraw.Dispose();
-        ChangedItemTooltip.Dispose();
-        ChangedItemClick.Dispose();
-        OpenMainWindow.Dispose();
-        CloseMainWindow.Dispose();
-
-        // Redrawing
-        RedrawAll.Dispose();
-        RedrawObject.Dispose();
-        RedrawObjectByIndex.Dispose();
-        RedrawObjectByName.Dispose();
-        GameObjectRedrawn.Dispose();
-
-        // Game State
-        GetDrawObjectInfo.Dispose();
-        GetCutsceneParentIndex.Dispose();
-        SetCutsceneParentIndex.Dispose();
-        CreatingCharacterBase.Dispose();
-        CreatedCharacterBase.Dispose();
-        GameObjectResourcePathResolved.Dispose();
-
-        // Resolve
-        ResolveDefaultPath.Dispose();
-        ResolveInterfacePath.Dispose();
-        ResolvePlayerPath.Dispose();
-        ResolveGameObjectPath.Dispose();
-        ResolveCharacterPath.Dispose();
-        ReverseResolvePath.Dispose();
-        ReverseResolveGameObjectPath.Dispose();
-        ReverseResolvePlayerPath.Dispose();
-        ResolvePlayerPaths.Dispose();
-        ResolvePlayerPathsAsync.Dispose();
-
-        // Collections
-        GetCollections.Dispose();
-        GetCurrentCollectionName.Dispose();
-        GetDefaultCollectionName.Dispose();
-        GetInterfaceCollectionName.Dispose();
-        GetCharacterCollectionName.Dispose();
-        GetCollectionForType.Dispose();
-        SetCollectionForType.Dispose();
-        GetCollectionForObject.Dispose();
-        SetCollectionForObject.Dispose();
-        GetChangedItems.Dispose();
-
-        // Meta
-        GetPlayerMetaManipulations.Dispose();
-        GetMetaManipulations.Dispose();
-        GetGameObjectMetaManipulations.Dispose();
-
-        // Mods
-        GetMods.Dispose();
-        ReloadMod.Dispose();
-        InstallMod.Dispose();
-        AddMod.Dispose();
-        DeleteMod.Dispose();
-        GetModPath.Dispose();
-        SetModPath.Dispose();
-        ModDeleted.Dispose();
-        ModAdded.Dispose();
-        ModMoved.Dispose();
-
-        // ModSettings
-        GetAvailableModSettings.Dispose();
-        GetCurrentModSettings.Dispose();
-        TryInheritMod.Dispose();
-        TrySetMod.Dispose();
-        TrySetModPriority.Dispose();
-        TrySetModSetting.Dispose();
-        TrySetModSettings.Dispose();
-        ModSettingChanged.Dispose();
-        CopyModSettings.Dispose();
-
-        // Temporary
-        CreateTemporaryCollection.Dispose();
-        RemoveTemporaryCollection.Dispose();
-        CreateNamedTemporaryCollection.Dispose();
-        RemoveTemporaryCollectionByName.Dispose();
-        AssignTemporaryCollection.Dispose();
-        AddTemporaryModAll.Dispose();
-        AddTemporaryMod.Dispose();
-        RemoveTemporaryModAll.Dispose();
-        RemoveTemporaryMod.Dispose();
-
-        // Editing
-        ConvertTextureFile.Dispose();
-        ConvertTextureData.Dispose();
-
-        // Resource Tree
-        GetGameObjectResourcePaths.Dispose();
-        GetPlayerResourcePaths.Dispose();
-        GetGameObjectResourcesOfType.Dispose();
-        GetPlayerResourcesOfType.Dispose();
-        GetGameObjectResourceTrees.Dispose();
-        GetPlayerResourceTrees.Dispose();
-
-        Disposed.Invoke();
-        Disposed.Dispose();
-    }
-
-    // Wrappers
-    private int DeprecatedVersion()
-    {
-        Penumbra.Log.Warning($"{Ipc.ApiVersion.Label} is outdated. Please use {Ipc.ApiVersions.Label} instead.");
-        return Api.ApiVersion.Breaking;
-    }
-
-    private void OnClick(MouseButton click, object? item)
-    {
-        var (type, id) = ChangedItemExtensions.ChangedItemToTypeAndId(item);
-        ChangedItemClick.Invoke(click, type, id);
-    }
-
-    private void OnTooltip(object? item)
-    {
-        var (type, id) = ChangedItemExtensions.ChangedItemToTypeAndId(item);
-        ChangedItemTooltip.Invoke(type, id);
-    }
-
-    private void EnabledChangeEvent(bool value)
-        => EnabledChange.Invoke(value);
-
-    private void OnGameObjectRedrawn(IntPtr objectAddress, int objectTableIndex)
-        => GameObjectRedrawn.Invoke(objectAddress, objectTableIndex);
-
-    private void CreatingCharacterBaseEvent(IntPtr gameObject, string collectionName, IntPtr modelId, IntPtr customize, IntPtr equipData)
-        => CreatingCharacterBase.Invoke(gameObject, collectionName, modelId, customize, equipData);
-
-    private void CreatedCharacterBaseEvent(IntPtr gameObject, string collectionName, IntPtr drawObject)
-        => CreatedCharacterBase.Invoke(gameObject, collectionName, drawObject);
-
-    private void GameObjectResourceResolvedEvent(IntPtr gameObject, string gamePath, string localPath)
-        => GameObjectResourcePathResolved.Invoke(gameObject, gamePath, localPath);
-
-    private void ModSettingChangedEvent(ModSettingChange type, string collection, string mod, bool inherited)
-        => ModSettingChanged.Invoke(type, collection, mod, inherited);
-
-    private void ModDeletedEvent(string name)
-        => ModDeleted.Invoke(name);
-
-    private void ModAddedEvent(string name)
-        => ModAdded.Invoke(name);
-
-    private void ModMovedEvent(string from, string to)
-        => ModMoved.Invoke(from, to);
-}

Penumbra/Api/TempModManager.cs

@@ -1,3 +1,4 @@
+using OtterGui.Services;
 using Penumbra.Api.Enums;
 using Penumbra.Collections;
 using Penumbra.Meta.Manipulations;
@@ -6,6 +7,7 @@ using Penumbra.Services;
 using Penumbra.String.Classes;
 using Penumbra.Collections.Manager;
 using Penumbra.Communication;
+using Penumbra.Mods.Settings;
 
 namespace Penumbra.Api;
 
@@ -17,12 +19,12 @@ public enum RedirectResult
     FilteredGamePath        = 3,
 }
 
-public class TempModManager : IDisposable
+public class TempModManager : IDisposable, IService
 {
     private readonly CommunicatorService _communicator;
 
-    private readonly Dictionary<ModCollection, List<TemporaryMod>> _mods                  = new();
-    private readonly List<TemporaryMod>                            _modsForAllCollections = new();
+    private readonly Dictionary<ModCollection, List<TemporaryMod>> _mods                  = [];
+    private readonly List<TemporaryMod>                            _modsForAllCollections = [];
 
     public TempModManager(CommunicatorService communicator)
     {
@@ -42,7 +44,7 @@ public class TempModManager : IDisposable
         => _modsForAllCollections;
 
     public RedirectResult Register(string tag, ModCollection? collection, Dictionary<Utf8GamePath, FullPath> dict,
-        HashSet<MetaManipulation> manips, int priority)
+        MetaDictionary manips, ModPriority priority)
     {
         var mod = GetOrCreateMod(tag, collection, priority, out var created);
         Penumbra.Log.Verbose($"{(created ? "Created" : "Changed")} temporary Mod {mod.Name}.");
@@ -51,10 +53,10 @@ public class TempModManager : IDisposable
         return RedirectResult.Success;
     }
 
-    public RedirectResult Unregister(string tag, ModCollection? collection, int? priority)
+    public RedirectResult Unregister(string tag, ModCollection? collection, ModPriority? priority)
     {
         Penumbra.Log.Verbose($"Removing temporary mod with tag {tag}...");
-        var list = collection == null ? _modsForAllCollections : _mods.TryGetValue(collection, out var l) ? l : null;
+        var list = collection == null ? _modsForAllCollections : _mods.GetValueOrDefault(collection);
         if (list == null)
             return RedirectResult.NotRegistered;
 
@@ -83,15 +85,15 @@ public class TempModManager : IDisposable
         {
             if (removed)
             {
-                Penumbra.Log.Verbose($"Removing temporary Mod {mod.Name} from {collection.AnonymizedName}.");
+                Penumbra.Log.Verbose($"Removing temporary Mod {mod.Name} from {collection.Identity.AnonymizedName}.");
                 collection.Remove(mod);
-                _communicator.ModSettingChanged.Invoke(collection, ModSettingChange.TemporaryMod, null, 0, 0, false);
+                _communicator.ModSettingChanged.Invoke(collection, ModSettingChange.TemporaryMod, null, Setting.False, 0, false);
             }
             else
             {
-                Penumbra.Log.Verbose($"Adding {(created ? "new " : string.Empty)}temporary Mod {mod.Name} to {collection.AnonymizedName}.");
+                Penumbra.Log.Verbose($"Adding {(created ? "new " : string.Empty)}temporary Mod {mod.Name} to {collection.Identity.AnonymizedName}.");
                 collection.Apply(mod, created);
-                _communicator.ModSettingChanged.Invoke(collection, ModSettingChange.TemporaryMod, null, 1, 0, false);
+                _communicator.ModSettingChanged.Invoke(collection, ModSettingChange.TemporaryMod, null, Setting.True, 0, false);
             }
         }
         else
@@ -116,7 +118,7 @@ public class TempModManager : IDisposable
 
     // Find or create a mod with the given tag as name and the given priority, for the given collection (or all collections).
     // Returns the found or created mod and whether it was newly created.
-    private TemporaryMod GetOrCreateMod(string tag, ModCollection? collection, int priority, out bool created)
+    private TemporaryMod GetOrCreateMod(string tag, ModCollection? collection, ModPriority priority, out bool created)
     {
         List<TemporaryMod> list;
         if (collection == null)
@@ -129,14 +131,14 @@ public class TempModManager : IDisposable
         }
         else
         {
-            list = new List<TemporaryMod>();
+            list = [];
             _mods.Add(collection, list);
         }
 
         var mod = list.Find(m => m.Priority == priority && m.Name == tag);
         if (mod == null)
         {
-            mod = new TemporaryMod()
+            mod = new TemporaryMod
             {
                 Name     = tag,
                 Priority = priority,

Penumbra/ChangedItemMode.cs

@@ -0,0 +1,57 @@
+using Dalamud.Bindings.ImGui;
+using OtterGui.Text;
+
+namespace Penumbra;
+
+public enum ChangedItemMode
+{
+    GroupedCollapsed,
+    GroupedExpanded,
+    Alphabetical,
+}
+
+public static class ChangedItemModeExtensions
+{
+    public static ReadOnlySpan<byte> ToName(this ChangedItemMode mode)
+        => mode switch
+        {
+            ChangedItemMode.GroupedCollapsed => "Grouped (Collapsed)"u8,
+            ChangedItemMode.GroupedExpanded  => "Grouped (Expanded)"u8,
+            ChangedItemMode.Alphabetical     => "Alphabetical"u8,
+            _                                => "Error"u8,
+        };
+
+    public static ReadOnlySpan<byte> ToTooltip(this ChangedItemMode mode)
+        => mode switch
+        {
+            ChangedItemMode.GroupedCollapsed =>
+                "Display items as groups by their model and slot. Collapse those groups to a single item by default. Prefers items with more changes affecting them or configured items as the main item."u8,
+            ChangedItemMode.GroupedExpanded =>
+                "Display items as groups by their model and slot. Expand those groups showing all items by default. Prefers items with more changes affecting them or configured items as the main item."u8,
+            ChangedItemMode.Alphabetical => "Display all changed items in a single list sorted alphabetically."u8,
+            _                            => ""u8,
+        };
+
+    public static bool DrawCombo(ReadOnlySpan<byte> label, ChangedItemMode value, float width, Action<ChangedItemMode> setter)
+    {
+        ImGui.SetNextItemWidth(width);
+        using var combo = ImUtf8.Combo(label, value.ToName());
+        if (!combo)
+            return false;
+
+        var ret = false;
+        foreach (var newValue in Enum.GetValues<ChangedItemMode>())
+        {
+            var selected = ImUtf8.Selectable(newValue.ToName(), newValue == value);
+            if (selected)
+            {
+                ret = true;
+                setter(newValue);
+            }
+
+            ImUtf8.HoverTooltip(newValue.ToTooltip());
+        }
+
+        return ret;
+    }
+}

Penumbra/Collections/Cache/AtchCache.cs

@@ -0,0 +1,121 @@
+using Penumbra.GameData.Enums;
+using Penumbra.GameData.Files;
+using Penumbra.GameData.Files.AtchStructs;
+using Penumbra.Meta;
+using Penumbra.Meta.Manipulations;
+
+namespace Penumbra.Collections.Cache;
+
+public sealed class AtchCache(MetaFileManager manager, ModCollection collection) : MetaCacheBase<AtchIdentifier, AtchEntry>(manager, collection)
+{
+    private readonly Dictionary<GenderRace, (AtchFile, HashSet<AtchIdentifier>)> _atchFiles = [];
+
+    public bool HasFile(GenderRace gr)
+        => _atchFiles.ContainsKey(gr);
+
+    public bool GetFile(GenderRace gr, [NotNullWhen(true)] out AtchFile? file)
+    {
+        if (!_atchFiles.TryGetValue(gr, out var p))
+        {
+            file = null;
+            return false;
+        }
+
+        file = p.Item1;
+        return true;
+    }
+
+    public void Reset()
+    {
+        foreach (var (_, (_, set)) in _atchFiles)
+            set.Clear();
+
+        _atchFiles.Clear();
+        Clear();
+    }
+
+    protected override void ApplyModInternal(AtchIdentifier identifier, AtchEntry entry)
+    {
+        Collection.Counters.IncrementAtch();
+        ApplyFile(identifier, entry);
+    }
+
+    private void ApplyFile(AtchIdentifier identifier, AtchEntry entry)
+    {
+        try
+        {
+            if (!_atchFiles.TryGetValue(identifier.GenderRace, out var pair))
+            {
+                if (!Manager.AtchManager.AtchFileBase.TryGetValue(identifier.GenderRace, out var baseFile))
+                    throw new Exception($"Invalid Atch File for {identifier.GenderRace.ToName()} requested.");
+
+                pair = (baseFile.Clone(), []);
+            }
+
+
+            if (!Apply(pair.Item1, identifier, entry))
+                return;
+
+            pair.Item2.Add(identifier);
+            _atchFiles[identifier.GenderRace] = pair;
+        }
+        catch (Exception e)
+        {
+            Penumbra.Log.Error($"Could not apply ATCH Manipulation {identifier}:\n{e}");
+        }
+    }
+
+    protected override void RevertModInternal(AtchIdentifier identifier)
+    {
+        Collection.Counters.IncrementAtch();
+        if (!_atchFiles.TryGetValue(identifier.GenderRace, out var pair))
+            return;
+
+        if (!pair.Item2.Remove(identifier))
+            return;
+
+        if (pair.Item2.Count == 0)
+        {
+            _atchFiles.Remove(identifier.GenderRace);
+            return;
+        }
+
+        var def = GetDefault(Manager, identifier);
+        if (def == null)
+            throw new Exception($"Reverting an .atch mod had no default value for the identifier to revert to.");
+
+        Apply(pair.Item1, identifier, def.Value);
+    }
+
+    public static AtchEntry? GetDefault(MetaFileManager manager, AtchIdentifier identifier)
+    {
+        if (!manager.AtchManager.AtchFileBase.TryGetValue(identifier.GenderRace, out var baseFile))
+            return null;
+
+        if (baseFile.Points.FirstOrDefault(p => p.Type == identifier.Type) is not { } point)
+            return null;
+
+        if (point.Entries.Length <= identifier.EntryIndex)
+            return null;
+
+        return point.Entries[identifier.EntryIndex];
+    }
+
+    public static bool Apply(AtchFile file, AtchIdentifier identifier, in AtchEntry entry)
+    {
+        if (file.Points.FirstOrDefault(p => p.Type == identifier.Type) is not { } point)
+            return false;
+
+        if (point.Entries.Length <= identifier.EntryIndex)
+            return false;
+
+        point.Entries[identifier.EntryIndex] = entry;
+        return true;
+    }
+
+    protected override void Dispose(bool _)
+    {
+        Clear();
+        _atchFiles.Clear();
+    }
+}

Penumbra/Collections/Cache/AtrCache.cs

@@ -0,0 +1,65 @@
+using Penumbra.GameData.Enums;
+using Penumbra.GameData.Structs;
+using Penumbra.Meta;
+using Penumbra.Meta.Manipulations;
+
+namespace Penumbra.Collections.Cache;
+
+public sealed class AtrCache(MetaFileManager manager, ModCollection collection) : MetaCacheBase<AtrIdentifier, AtrEntry>(manager, collection)
+{
+    public bool ShouldBeDisabled(in ShapeAttributeString attribute, HumanSlot slot, PrimaryId id, GenderRace genderRace)
+        => DisabledCount > 0 && _atrData.TryGetValue(attribute, out var value) && value.CheckEntry(slot, id, genderRace) is false;
+
+    public int EnabledCount  { get; private set; }
+    public int DisabledCount { get; private set; }
+
+
+    internal IReadOnlyDictionary<ShapeAttributeString, ShapeAttributeHashSet> Data
+        => _atrData;
+
+    private readonly Dictionary<ShapeAttributeString, ShapeAttributeHashSet> _atrData = [];
+
+    public void Reset()
+    {
+        Clear();
+        _atrData.Clear();
+        DisabledCount = 0;
+        EnabledCount  = 0;
+    }
+
+    protected override void Dispose(bool _)
+        => Reset();
+
+    protected override void ApplyModInternal(AtrIdentifier identifier, AtrEntry entry)
+    {
+        if (!_atrData.TryGetValue(identifier.Attribute, out var value))
+        {
+            value = [];
+            _atrData.Add(identifier.Attribute, value);
+        }
+
+        if (value.TrySet(identifier.Slot, identifier.Id, identifier.GenderRaceCondition, entry.Value, out _))
+        {
+            if (entry.Value)
+                ++EnabledCount;
+            else
+                ++DisabledCount;
+        }
+    }
+
+    protected override void RevertModInternal(AtrIdentifier identifier)
+    {
+        if (!_atrData.TryGetValue(identifier.Attribute, out var value))
+            return;
+
+        if (value.TrySet(identifier.Slot, identifier.Id, identifier.GenderRaceCondition, null, out var which))
+        {
+            if (which)
+                --EnabledCount;
+            else
+                --DisabledCount;
+            if (value.IsEmpty)
+                _atrData.Remove(identifier.Attribute);
+        }
+    }
+}

Penumbra/Collections/Cache/CmpCache.cs

@@ -1,56 +0,0 @@
-using OtterGui.Filesystem;
-using Penumbra.Interop.Services;
-using Penumbra.Interop.Structs;
-using Penumbra.Meta;
-using Penumbra.Meta.Files;
-using Penumbra.Meta.Manipulations;
-
-namespace Penumbra.Collections.Cache;
-
-public struct CmpCache : IDisposable
-{
-    private          CmpFile?              _cmpFile          = null;
-    private readonly List<RspManipulation> _cmpManipulations = new();
-
-    public CmpCache()
-    { }
-
-    public void SetFiles(MetaFileManager manager)
-        => manager.SetFile(_cmpFile, MetaIndex.HumanCmp);
-
-    public MetaList.MetaReverter TemporarilySetFiles(MetaFileManager manager)
-        => manager.TemporarilySetFile(_cmpFile, MetaIndex.HumanCmp);
-
-    public void Reset()
-    {
-        if (_cmpFile == null)
-            return;
-
-        _cmpFile.Reset(_cmpManipulations.Select(m => (m.SubRace, m.Attribute)));
-        _cmpManipulations.Clear();
-    }
-
-    public bool ApplyMod(MetaFileManager manager, RspManipulation manip)
-    {
-        _cmpManipulations.AddOrReplace(manip);
-        _cmpFile ??= new CmpFile(manager);
-        return manip.Apply(_cmpFile);
-    }
-
-    public bool RevertMod(MetaFileManager manager, RspManipulation manip)
-    {
-        if (!_cmpManipulations.Remove(manip))
-            return false;
-
-        var def = CmpFile.GetDefault(manager, manip.SubRace, manip.Attribute);
-        manip = new RspManipulation(manip.SubRace, manip.Attribute, def);
-        return manip.Apply(_cmpFile!);
-    }
-
-    public void Dispose()
-    {
-        _cmpFile?.Dispose();
-        _cmpFile = null;
-        _cmpManipulations.Clear();
-    }
-}

Penumbra/Collections/Cache/CollectionCache.cs

@@ -1,13 +1,13 @@
-using OtterGui;
+using Dalamud.Interface.ImGuiNotification;
 using OtterGui.Classes;
 using Penumbra.Meta.Manipulations;
 using Penumbra.Mods;
-using Penumbra.Api.Enums;
 using Penumbra.Communication;
 using Penumbra.Mods.Editor;
 using Penumbra.String.Classes;
-using Penumbra.Mods.Manager;
-using Penumbra.Mods.Subclasses;
+using Penumbra.Util;
+using Penumbra.GameData.Data;
+using OtterGui.Extensions;
 
 namespace Penumbra.Collections.Cache;
 
@@ -18,31 +18,32 @@ public record ModConflicts(IMod Mod2, List<object> Conflicts, bool HasPriority,
 /// The Cache contains all required temporary data to use a collection.
 /// It will only be setup if a collection gets activated in any way.
 /// </summary>
-public class CollectionCache : IDisposable
+public sealed class CollectionCache : IDisposable
 {
-    private readonly CollectionCacheManager                           _manager;
-    private readonly ModCollection                                    _collection;
-    public readonly  CollectionModData                                ModData       = new();
-    private readonly SortedList<string, (SingleArray<IMod>, object?)> _changedItems = [];
-    public readonly  ConcurrentDictionary<Utf8GamePath, ModPath>      ResolvedFiles = new();
-    public readonly  MetaCache                                        Meta;
-    public readonly  Dictionary<IMod, SingleArray<ModConflicts>>      ConflictDict = [];
+    private readonly CollectionCacheManager                                          _manager;
+    private readonly ModCollection                                                   _collection;
+    public readonly  CollectionModData                                               ModData       = new();
+    private readonly SortedList<string, (SingleArray<IMod>, IIdentifiedObjectData)> _changedItems = [];
+    public readonly  ConcurrentDictionary<Utf8GamePath, ModPath>                     ResolvedFiles = new();
+    public readonly  CustomResourceCache                                             CustomResources;
+    public readonly  MetaCache                                                       Meta;
+    public readonly  Dictionary<IMod, SingleArray<ModConflicts>>                     ConflictDict = [];
 
     public int Calculating = -1;
 
     public string AnonymizedName
-        => _collection.AnonymizedName;
+        => _collection.Identity.AnonymizedName;
 
     public IEnumerable<SingleArray<ModConflicts>> AllConflicts
         => ConflictDict.Values;
 
     public SingleArray<ModConflicts> Conflicts(IMod mod)
-        => ConflictDict.TryGetValue(mod, out SingleArray<ModConflicts> c) ? c : new SingleArray<ModConflicts>();
+        => ConflictDict.TryGetValue(mod, out var c) ? c : new SingleArray<ModConflicts>();
 
     private int _changedItemsSaveCounter = -1;
 
     // Obtain currently changed items. Computes them if they haven't been computed before.
-    public IReadOnlyDictionary<string, (SingleArray<IMod>, object?)> ChangedItems
+    public IReadOnlyDictionary<string, (SingleArray<IMod>, IIdentifiedObjectData)> ChangedItems
     {
         get
         {
@@ -54,16 +55,21 @@ public class CollectionCache : IDisposable
     // The cache reacts through events on its collection changing.
     public CollectionCache(CollectionCacheManager manager, ModCollection collection)
     {
-        _manager    = manager;
-        _collection = collection;
-        Meta        = new MetaCache(manager.MetaFileManager, _collection);
+        _manager        = manager;
+        _collection     = collection;
+        Meta            = new MetaCache(manager.MetaFileManager, _collection);
+        CustomResources = new CustomResourceCache(manager.ResourceLoader);
     }
 
     public void Dispose()
-        => Meta.Dispose();
+    {
+        Meta.Dispose();
+        CustomResources.Dispose();
+        GC.SuppressFinalize(this);
+    }
 
     ~CollectionCache()
-        => Meta.Dispose();
+        => Dispose();
 
     // Resolve a given game path according to this collection.
     public FullPath? ResolvePath(Utf8GamePath gameResourcePath)
@@ -72,7 +78,7 @@ public class CollectionCache : IDisposable
             return null;
 
         if (candidate.Path.InternalName.Length > Utf8GamePath.MaxGamePathLength
-         || candidate.Path.IsRooted && !candidate.Path.Exists)
+         || candidate.Path is { IsRooted: true, Exists: false })
             return null;
 
         return candidate.Path;
@@ -100,7 +106,7 @@ public class CollectionCache : IDisposable
     public HashSet<Utf8GamePath>[] ReverseResolvePaths(IReadOnlyCollection<string> fullPaths)
     {
         if (fullPaths.Count == 0)
-            return Array.Empty<HashSet<Utf8GamePath>>();
+            return [];
 
         var ret  = new HashSet<Utf8GamePath>[fullPaths.Count];
         var dict = new Dictionary<FullPath, int>(fullPaths.Count);
@@ -108,8 +114,8 @@ public class CollectionCache : IDisposable
         {
             dict[new FullPath(path)] = idx;
             ret[idx] = !Path.IsPathRooted(path) && Utf8GamePath.FromString(path, out var utf8)
-                ? new HashSet<Utf8GamePath> { utf8 }
-                : new HashSet<Utf8GamePath>();
+                ? [utf8]
+                : [];
         }
 
         foreach (var (game, full) in ResolvedFiles)
@@ -121,12 +127,6 @@ public class CollectionCache : IDisposable
         return ret;
     }
 
-    public void ForceFile(Utf8GamePath path, FullPath fullPath)
-        => _manager.AddChange(ChangeData.ForcedFile(this, path, fullPath));
-
-    public void RemovePath(Utf8GamePath path)
-        => _manager.AddChange(ChangeData.ForcedFile(this, path, FullPath.Empty));
-
     public void ReloadMod(IMod mod, bool addMetaChanges)
         => _manager.AddChange(ChangeData.ModReload(this, mod, addMetaChanges));
 
@@ -148,17 +148,20 @@ public class CollectionCache : IDisposable
             if (fullPath.FullName.Length > 0)
             {
                 ResolvedFiles.TryAdd(path, new ModPath(Mod.ForcedFiles, fullPath));
+                CustomResources.Invalidate(path);
                 InvokeResolvedFileChange(_collection, ResolvedFileChanged.Type.Replaced, path, fullPath, modPath.Path,
                     Mod.ForcedFiles);
             }
             else
             {
+                CustomResources.Invalidate(path);
                 InvokeResolvedFileChange(_collection, ResolvedFileChanged.Type.Removed, path, FullPath.Empty, modPath.Path, null);
             }
         }
         else if (fullPath.FullName.Length > 0)
         {
             ResolvedFiles.TryAdd(path, new ModPath(Mod.ForcedFiles, fullPath));
+            CustomResources.Invalidate(path);
             InvokeResolvedFileChange(_collection, ResolvedFileChanged.Type.Added, path, fullPath, FullPath.Empty, Mod.ForcedFiles);
         }
     }
@@ -175,12 +178,13 @@ public class CollectionCache : IDisposable
         var (paths, manipulations) = ModData.RemoveMod(mod);
 
         if (addMetaChanges)
-            _collection.IncrementCounter();
+            _collection.Counters.IncrementChange();
 
         foreach (var path in paths)
         {
             if (ResolvedFiles.Remove(path, out var mp))
             {
+                CustomResources.Invalidate(path);
                 if (mp.Mod != mod)
                     Penumbra.Log.Warning(
                         $"Invalid mod state, removing {mod.Name} and associated file {path} returned current mod {mp.Mod.Name}.");
@@ -221,56 +225,50 @@ public class CollectionCache : IDisposable
     /// <summary> Add all files and possibly manipulations of a given mod according to its settings in this collection. </summary>
     internal void AddModSync(IMod mod, bool addMetaChanges)
     {
-        if (mod.Index >= 0)
+        var files = GetFiles(mod);
+        foreach (var (path, file) in files.FileRedirections)
+            AddFile(path, file, mod);
+
+        if (files.Manipulations.Count > 0)
         {
-            var settings = _collection[mod.Index].Settings;
-            if (settings is not { Enabled: true })
-                return;
-
-            foreach (var (group, groupIndex) in mod.Groups.WithIndex().OrderByDescending(g => g.Item1.Priority))
-            {
-                if (group.Count == 0)
-                    continue;
-
-                var config = settings.Settings[groupIndex];
-                switch (group.Type)
-                {
-                    case GroupType.Single:
-                        AddSubMod(group[(int)config], mod);
-                        break;
-                    case GroupType.Multi:
-                    {
-                        foreach (var (option, _) in group.WithIndex()
-                                     .Where(p => ((1 << p.Item2) & config) != 0)
-                                     .OrderByDescending(p => group.OptionPriority(p.Item2)))
-                            AddSubMod(option, mod);
-
-                        break;
-                    }
-                }
-            }
+            foreach (var (identifier, entry) in files.Manipulations.Eqp)
+                AddManipulation(mod, identifier, entry);
+            foreach (var (identifier, entry) in files.Manipulations.Eqdp)
+                AddManipulation(mod, identifier, entry);
+            foreach (var (identifier, entry) in files.Manipulations.Est)
+                AddManipulation(mod, identifier, entry);
+            foreach (var (identifier, entry) in files.Manipulations.Gmp)
+                AddManipulation(mod, identifier, entry);
+            foreach (var (identifier, entry) in files.Manipulations.Rsp)
+                AddManipulation(mod, identifier, entry);
+            foreach (var (identifier, entry) in files.Manipulations.Imc)
+                AddManipulation(mod, identifier, entry);
+            foreach (var (identifier, entry) in files.Manipulations.Atch)
+                AddManipulation(mod, identifier, entry);
+            foreach (var (identifier, entry) in files.Manipulations.Shp)
+                AddManipulation(mod, identifier, entry);
+            foreach (var (identifier, entry) in files.Manipulations.Atr)
+                AddManipulation(mod, identifier, entry);
+            foreach (var identifier in files.Manipulations.GlobalEqp)
+                AddManipulation(mod, identifier, null!);
         }
 
-        AddSubMod(mod.Default, mod);
-
         if (addMetaChanges)
         {
-            _collection.IncrementCounter();
-            if (mod.TotalManipulations > 0)
-                AddMetaFiles(false);
-
+            _collection.Counters.IncrementChange();
             _manager.MetaFileManager.ApplyDefaultFiles(_collection);
         }
     }
 
-    // Add all files and possibly manipulations of a specific submod
-    private void AddSubMod(ISubMod subMod, IMod parentMod)
+    private AppliedModData GetFiles(IMod mod)
     {
-        foreach (var (path, file) in subMod.Files.Concat(subMod.FileSwaps))
-            AddFile(path, file, parentMod);
+        if (mod.Index < 0)
+            return mod.GetData();
 
-        foreach (var manip in subMod.Manipulations)
-            AddManipulation(manip, parentMod);
+        var settings = _collection.GetActualSettings(mod.Index).Settings;
+        return settings is not { Enabled: true }
+            ? AppliedModData.Empty
+            : mod.GetData(settings);
     }
 
     /// <summary> Invoke only if not in a full recalculation. </summary>
@@ -281,6 +279,24 @@ public class CollectionCache : IDisposable
             _manager.ResolvedFileChanged.Invoke(collection, type, key, value, old, mod);
     }
 
+    private static bool IsRedirectionSupported(Utf8GamePath path, IMod mod)
+    {
+        var ext = path.Extension().AsciiToLower().ToString();
+        switch (ext)
+        {
+            case ".atch" or ".eqp" or ".eqdp" or ".est" or ".gmp" or ".cmp" or ".imc":
+                Penumbra.Messager.NotificationMessage(
+                    $"Redirection of {ext} files for {mod.Name} is unsupported. This probably means that the mod is outdated and may not work correctly.\n\nPlease tell the mod creator to use the corresponding meta manipulations instead.",
+                    NotificationType.Warning);
+                return false;
+            case ".lvb" or ".lgb" or ".sgb":
+                Penumbra.Messager.NotificationMessage($"Redirection of {ext} files for {mod.Name} is unsupported as this breaks the game.\n\nThis mod will probably not work correctly.",
+                    NotificationType.Warning);
+                return false;
+            default: return true;
+        }
+    }
+
     // Add a specific file redirection, handling potential conflicts.
     // For different mods, higher mod priority takes precedence before option group priority,
     // which takes precedence before option priority, which takes precedence before ordering.
@@ -290,11 +306,15 @@ public class CollectionCache : IDisposable
         if (!CheckFullPath(path, file))
             return;
 
+        if (!IsRedirectionSupported(path, mod))
+            return;
+
         try
         {
             if (ResolvedFiles.TryAdd(path, new ModPath(mod, file)))
             {
                 ModData.AddPath(mod, path);
+                CustomResources.Invalidate(path);
                 InvokeResolvedFileChange(_collection, ResolvedFileChanged.Type.Added, path, file, FullPath.Empty, mod);
                 return;
             }
@@ -309,13 +329,14 @@ public class CollectionCache : IDisposable
                 ModData.RemovePath(modPath.Mod, path);
                 ResolvedFiles[path] = new ModPath(mod, file);
                 ModData.AddPath(mod, path);
+                CustomResources.Invalidate(path);
                 InvokeResolvedFileChange(_collection, ResolvedFileChanged.Type.Replaced, path, file, modPath.Path, mod);
             }
         }
         catch (Exception ex)
         {
             Penumbra.Log.Error(
-                $"[{Thread.CurrentThread.ManagedThreadId}] Error adding redirection {file} -> {path} for mod {mod.Name} to collection cache {AnonymizedName}:\n{ex}");
+                $"[{Environment.CurrentManagedThreadId}] Error adding redirection {file} -> {path} for mod {mod.Name} to collection cache {AnonymizedName}:\n{ex}");
         }
     }
 
@@ -347,8 +368,9 @@ public class CollectionCache : IDisposable
     // Returns if the added mod takes priority before the existing mod.
     private bool AddConflict(object data, IMod addedMod, IMod existingMod)
     {
-        var addedPriority    = addedMod.Index >= 0 ? _collection[addedMod.Index].Settings!.Priority : addedMod.Priority;
-        var existingPriority = existingMod.Index >= 0 ? _collection[existingMod.Index].Settings!.Priority : existingMod.Priority;
+        var addedPriority = addedMod.Index >= 0 ? _collection.GetActualSettings(addedMod.Index).Settings!.Priority : addedMod.Priority;
+        var existingPriority =
+            existingMod.Index >= 0 ? _collection.GetActualSettings(existingMod.Index).Settings!.Priority : existingMod.Priority;
 
         if (existingPriority < addedPriority)
         {
@@ -356,7 +378,7 @@ public class CollectionCache : IDisposable
             foreach (var conflict in tmpConflicts)
             {
                 if (data is Utf8GamePath path && conflict.Conflicts.RemoveAll(p => p is Utf8GamePath x && x.Equals(path)) > 0
-                 || data is MetaManipulation meta && conflict.Conflicts.RemoveAll(m => m is MetaManipulation x && x.Equals(meta)) > 0)
+                 || data is IMetaIdentifier meta && conflict.Conflicts.RemoveAll(m => m.Equals(meta)) > 0)
                     AddConflict(data, addedMod, conflict.Mod2);
             }
 
@@ -388,12 +410,12 @@ public class CollectionCache : IDisposable
     // For different mods, higher mod priority takes precedence before option group priority,
     // which takes precedence before option priority, which takes precedence before ordering.
     // Inside the same mod, conflicts are not recorded.
-    private void AddManipulation(MetaManipulation manip, IMod mod)
+    private void AddManipulation(IMod mod, IMetaIdentifier identifier, object entry)
     {
-        if (!Meta.TryGetValue(manip, out var existingMod))
+        if (!Meta.TryGetMod(identifier, out var existingMod))
         {
-            Meta.ApplyMod(manip, mod);
-            ModData.AddManip(mod, manip);
+            Meta.ApplyMod(mod, identifier, entry);
+            ModData.AddManip(mod, identifier);
             return;
         }
 
@@ -401,34 +423,29 @@ public class CollectionCache : IDisposable
         if (mod == existingMod)
             return;
 
-        if (AddConflict(manip, mod, existingMod))
+        if (AddConflict(identifier, mod, existingMod))
         {
-            ModData.RemoveManip(existingMod, manip);
-            Meta.ApplyMod(manip, mod);
-            ModData.AddManip(mod, manip);
+            ModData.RemoveManip(existingMod, identifier);
+            Meta.ApplyMod(mod, identifier, entry);
+            ModData.AddManip(mod, identifier);
         }
     }
 
 
-    // Add all necessary meta file redirects.
-    public void AddMetaFiles(bool fromFullCompute)
-        => Meta.SetImcFiles(fromFullCompute);
-
-
     // Identify and record all manipulated objects for this entire collection.
     private void SetChangedItems()
     {
-        if (_changedItemsSaveCounter == _collection.ChangeCounter)
+        if (_changedItemsSaveCounter == _collection.Counters.Change)
             return;
 
         try
         {
-            _changedItemsSaveCounter = _collection.ChangeCounter;
+            _changedItemsSaveCounter = _collection.Counters.Change;
             _changedItems.Clear();
             // Skip IMCs because they would result in far too many false-positive items,
             // since they are per set instead of per item-slot/item/variant.
             var identifier = _manager.MetaFileManager.Identifier;
-            var items      = new SortedList<string, object?>(512);
+            var items      = new SortedList<string, IIdentifiedObjectData>(512);
 
             void AddItems(IMod mod)
             {
@@ -437,8 +454,9 @@ public class CollectionCache : IDisposable
                     if (!_changedItems.TryGetValue(name, out var data))
                         _changedItems.Add(name, (new SingleArray<IMod>(mod), obj));
                     else if (!data.Item1.Contains(mod))
-                        _changedItems[name] = (data.Item1.Append(mod), obj is int x && data.Item2 is int y ? x + y : obj);
-                    else if (obj is int x && data.Item2 is int y)
+                        _changedItems[name] = (data.Item1.Append(mod),
+                            obj is IdentifiedCounter x && data.Item2 is IdentifiedCounter y ? x + y : obj);
+                    else if (obj is IdentifiedCounter x && data.Item2 is IdentifiedCounter y)
                         _changedItems[name] = (data.Item1, x + y);
                 }
 
@@ -451,11 +469,14 @@ public class CollectionCache : IDisposable
                 AddItems(modPath.Mod);
             }
 
-            foreach (var (manip, mod) in Meta)
+            foreach (var (manip, mod) in Meta.IdentifierSources)
             {
-                ModCacheManager.ComputeChangedItems(identifier, items, manip);
+                manip.AddChangedItems(identifier, items);
                 AddItems(mod);
             }
+
+            if (_manager.Config.HideMachinistOffhandFromChangedItems)
+                _changedItems.RemoveMachinistOffhands();
         }
         catch (Exception e)
         {

Penumbra/Collections/Cache/CollectionCacheManager.cs

@@ -1,18 +1,24 @@
 using Dalamud.Plugin.Services;
 using OtterGui.Classes;
+using OtterGui.Services;
 using Penumbra.Api;
 using Penumbra.Api.Enums;
 using Penumbra.Collections.Manager;
 using Penumbra.Communication;
+using Penumbra.Interop.Hooks.ResourceLoading;
 using Penumbra.Meta;
 using Penumbra.Mods;
+using Penumbra.Mods.Groups;
 using Penumbra.Mods.Manager;
+using Penumbra.Mods.Manager.OptionEditor;
+using Penumbra.Mods.Settings;
+using Penumbra.Mods.SubMods;
 using Penumbra.Services;
 using Penumbra.String.Classes;
 
 namespace Penumbra.Collections.Cache;
 
-public class CollectionCacheManager : IDisposable
+public class CollectionCacheManager : IDisposable, IService
 {
     private readonly  FrameworkManager    _framework;
     private readonly  CommunicatorService _communicator;
@@ -20,9 +26,10 @@ public class CollectionCacheManager : IDisposable
     private readonly  ModStorage          _modStorage;
     private readonly  CollectionStorage   _storage;
     private readonly  ActiveCollections   _active;
+    internal readonly Configuration       Config;
     internal readonly ResolvedFileChanged ResolvedFileChanged;
-
-    internal readonly MetaFileManager MetaFileManager;
+    internal readonly MetaFileManager     MetaFileManager;
+    internal readonly ResourceLoader      ResourceLoader;
 
     private readonly ConcurrentQueue<CollectionCache.ChangeData> _changeQueue = new();
 
@@ -35,7 +42,8 @@ public class CollectionCacheManager : IDisposable
         => _storage.Where(c => c.HasCache);
 
     public CollectionCacheManager(FrameworkManager framework, CommunicatorService communicator, TempModManager tempMods, ModStorage modStorage,
-        MetaFileManager metaFileManager, ActiveCollections active, CollectionStorage storage)
+        MetaFileManager metaFileManager, ActiveCollections active, CollectionStorage storage, ResourceLoader resourceLoader,
+        Configuration config)
     {
         _framework          = framework;
         _communicator       = communicator;
@@ -44,6 +52,8 @@ public class CollectionCacheManager : IDisposable
         MetaFileManager     = metaFileManager;
         _active             = active;
         _storage            = storage;
+        ResourceLoader      = resourceLoader;
+        Config              = config;
         ResolvedFileChanged = _communicator.ResolvedFileChanged;
 
         if (!_active.Individuals.IsLoaded)
@@ -61,7 +71,7 @@ public class CollectionCacheManager : IDisposable
         _communicator.ModDiscoveryFinished.Subscribe(OnModDiscoveryFinished, ModDiscoveryFinished.Priority.CollectionCacheManager);
 
         if (!MetaFileManager.CharacterUtility.Ready)
-            MetaFileManager.CharacterUtility.LoadingFinished += IncrementCounters;
+            MetaFileManager.CharacterUtility.LoadingFinished.Subscribe(IncrementCounters, CharacterUtilityFinished.Priority.CollectionCacheManager);
     }
 
     public void Dispose()
@@ -73,7 +83,13 @@ public class CollectionCacheManager : IDisposable
         _communicator.ModOptionChanged.Unsubscribe(OnModOptionChange);
         _communicator.ModSettingChanged.Unsubscribe(OnModSettingChange);
         _communicator.CollectionInheritanceChanged.Unsubscribe(OnCollectionInheritanceChange);
-        MetaFileManager.CharacterUtility.LoadingFinished -= IncrementCounters;
+        MetaFileManager.CharacterUtility.LoadingFinished.Unsubscribe(IncrementCounters);
+
+        foreach (var collection in _storage)
+        {
+            collection._cache?.Dispose();
+            collection._cache = null;
+        }
     }
 
     public void AddChange(CollectionCache.ChangeData data)
@@ -98,16 +114,16 @@ public class CollectionCacheManager : IDisposable
     /// <summary> Only creates a new cache, does not update an existing one. </summary>
     public bool CreateCache(ModCollection collection)
     {
-        if (collection.Index == ModCollection.Empty.Index)
+        if (collection.Identity.Index == ModCollection.Empty.Identity.Index)
             return false;
 
         if (collection._cache != null)
             return false;
 
         collection._cache = new CollectionCache(this, collection);
-        if (collection.Index > 0)
+        if (collection.Identity.Index > 0)
             Interlocked.Increment(ref _count);
-        Penumbra.Log.Verbose($"Created new cache for collection {collection.AnonymizedName}.");
+        Penumbra.Log.Verbose($"Created new cache for collection {collection.Identity.AnonymizedName}.");
         return true;
     }
 
@@ -116,32 +132,32 @@ public class CollectionCacheManager : IDisposable
     /// Does not create caches.
     /// </summary>
     public void CalculateEffectiveFileList(ModCollection collection)
-        => _framework.RegisterImportant(nameof(CalculateEffectiveFileList) + collection.Name,
+        => _framework.RegisterImportant(nameof(CalculateEffectiveFileList) + collection.Identity.Identifier,
             () => CalculateEffectiveFileListInternal(collection));
 
     private void CalculateEffectiveFileListInternal(ModCollection collection)
     {
         // Skip the empty collection.
-        if (collection.Index == 0)
+        if (collection.Identity.Index == 0)
             return;
 
-        Penumbra.Log.Debug($"[{Environment.CurrentManagedThreadId}] Recalculating effective file list for {collection.AnonymizedName}");
+        Penumbra.Log.Debug($"[{Environment.CurrentManagedThreadId}] Recalculating effective file list for {collection.Identity.AnonymizedName}");
         if (!collection.HasCache)
         {
             Penumbra.Log.Error(
-                $"[{Environment.CurrentManagedThreadId}] Recalculating effective file list for {collection.AnonymizedName} failed, no cache exists.");
+                $"[{Environment.CurrentManagedThreadId}] Recalculating effective file list for {collection.Identity.AnonymizedName} failed, no cache exists.");
         }
         else if (collection._cache!.Calculating != -1)
         {
             Penumbra.Log.Error(
-                $"[{Environment.CurrentManagedThreadId}] Recalculating effective file list for {collection.AnonymizedName} failed, already in calculation on [{collection._cache!.Calculating}].");
+                $"[{Environment.CurrentManagedThreadId}] Recalculating effective file list for {collection.Identity.AnonymizedName} failed, already in calculation on [{collection._cache!.Calculating}].");
         }
         else
         {
             FullRecalculation(collection);
 
             Penumbra.Log.Debug(
-                $"[{Environment.CurrentManagedThreadId}] Recalculation of effective file list for {collection.AnonymizedName} finished.");
+                $"[{Environment.CurrentManagedThreadId}] Recalculation of effective file list for {collection.Identity.AnonymizedName} finished.");
         }
     }
 
@@ -155,8 +171,7 @@ public class CollectionCacheManager : IDisposable
         try
         {
             ResolvedFileChanged.Invoke(collection, ResolvedFileChanged.Type.FullRecomputeStart, Utf8GamePath.Empty, FullPath.Empty,
-                FullPath.Empty,
-                null);
+                FullPath.Empty, null);
             cache.ResolvedFiles.Clear();
             cache.Meta.Reset();
             cache.ConflictDict.Clear();
@@ -171,9 +186,7 @@ public class CollectionCacheManager : IDisposable
             foreach (var mod in _modStorage)
                 cache.AddModSync(mod, false);
 
-            cache.AddMetaFiles(true);
-
-            collection.IncrementCounter();
+            collection.Counters.IncrementChange();
 
             MetaFileManager.ApplyDefaultFiles(collection);
             ResolvedFileChanged.Invoke(collection, ResolvedFileChanged.Type.FullRecomputeFinished, Utf8GamePath.Empty, FullPath.Empty,
@@ -199,7 +212,7 @@ public class CollectionCacheManager : IDisposable
         else
         {
             RemoveCache(old);
-            if (type is not CollectionType.Inactive && newCollection != null && newCollection.Index != 0 && CreateCache(newCollection))
+            if (type is not CollectionType.Inactive && newCollection != null && newCollection.Identity.Index != 0 && CreateCache(newCollection))
                 CalculateEffectiveFileList(newCollection);
 
             if (type is CollectionType.Default)
@@ -217,11 +230,11 @@ public class CollectionCacheManager : IDisposable
         {
             case ModPathChangeType.Deleted:
             case ModPathChangeType.StartingReload:
-                foreach (var collection in _storage.Where(c => c.HasCache && c[mod.Index].Settings?.Enabled == true))
+                foreach (var collection in _storage.Where(c => c.HasCache && c.GetActualSettings(mod.Index).Settings?.Enabled == true))
                     collection._cache!.RemoveMod(mod, true);
                 break;
             case ModPathChangeType.Moved:
-                foreach (var collection in _storage.Where(c => c.HasCache && c[mod.Index].Settings?.Enabled == true))
+                foreach (var collection in _storage.Where(c => c.HasCache && c.GetActualSettings(mod.Index).Settings?.Enabled == true))
                     collection._cache!.ReloadMod(mod, true);
                 break;
         }
@@ -232,7 +245,7 @@ public class CollectionCacheManager : IDisposable
         if (type is not (ModPathChangeType.Added or ModPathChangeType.Reloaded))
             return;
 
-        foreach (var collection in _storage.Where(c => c.HasCache && c[mod.Index].Settings?.Enabled == true))
+        foreach (var collection in _storage.Where(c => c.HasCache && c.GetActualSettings(mod.Index).Settings?.Enabled == true))
             collection._cache!.AddMod(mod, true);
     }
 
@@ -244,37 +257,38 @@ public class CollectionCacheManager : IDisposable
     private void RemoveCache(ModCollection? collection)
     {
         if (collection != null
-         && collection.Index > ModCollection.Empty.Index
-         && collection.Index != _active.Default.Index
-         && collection.Index != _active.Interface.Index
-         && collection.Index != _active.Current.Index
-         && _active.SpecialAssignments.All(c => c.Value.Index != collection.Index)
-         && _active.Individuals.All(c => c.Collection.Index != collection.Index))
+         && collection.Identity.Index > ModCollection.Empty.Identity.Index
+         && collection.Identity.Index != _active.Default.Identity.Index
+         && collection.Identity.Index != _active.Interface.Identity.Index
+         && collection.Identity.Index != _active.Current.Identity.Index
+         && _active.SpecialAssignments.All(c => c.Value.Identity.Index != collection.Identity.Index)
+         && _active.Individuals.All(c => c.Collection.Identity.Index != collection.Identity.Index))
             ClearCache(collection);
     }
 
     /// <summary> Prepare Changes by removing mods from caches with collections or add or reload mods. </summary>
-    private void OnModOptionChange(ModOptionChangeType type, Mod mod, int groupIdx, int optionIdx, int movedToIdx)
+    private void OnModOptionChange(ModOptionChangeType type, Mod mod, IModGroup? group, IModOption? option, IModDataContainer? container,
+        int movedToIdx)
     {
         if (type is ModOptionChangeType.PrepareChange)
         {
-            foreach (var collection in _storage.Where(collection => collection.HasCache && collection[mod.Index].Settings is { Enabled: true }))
+            foreach (var collection in _storage.Where(collection => collection.HasCache && collection.GetActualSettings(mod.Index).Settings is { Enabled: true }))
                 collection._cache!.RemoveMod(mod, false);
 
             return;
         }
 
-        type.HandlingInfo(out _, out var recomputeList, out var reload);
+        type.HandlingInfo(out _, out var recomputeList, out var justAdd);
 
         if (!recomputeList)
             return;
 
-        foreach (var collection in _storage.Where(collection => collection.HasCache && collection[mod.Index].Settings is { Enabled: true }))
+        foreach (var collection in _storage.Where(collection => collection.HasCache && collection.GetActualSettings(mod.Index).Settings is { Enabled: true }))
         {
-            if (reload)
-                collection._cache!.ReloadMod(mod, true);
-            else
+            if (justAdd)
                 collection._cache!.AddMod(mod, true);
+            else
+                collection._cache!.ReloadMod(mod, true);
         }
     }
 
@@ -282,11 +296,11 @@ public class CollectionCacheManager : IDisposable
     private void IncrementCounters()
     {
         foreach (var collection in _storage.Where(c => c.HasCache))
-            collection.IncrementCounter();
-        MetaFileManager.CharacterUtility.LoadingFinished -= IncrementCounters;
+            collection.Counters.IncrementChange();
+        MetaFileManager.CharacterUtility.LoadingFinished.Unsubscribe(IncrementCounters);
     }
 
-    private void OnModSettingChange(ModCollection collection, ModSettingChange type, Mod? mod, int oldValue, int groupIdx, bool _)
+    private void OnModSettingChange(ModCollection collection, ModSettingChange type, Mod? mod, Setting oldValue, int groupIdx, bool _)
     {
         if (!collection.HasCache)
             return;
@@ -298,11 +312,11 @@ public class CollectionCacheManager : IDisposable
                 cache.ReloadMod(mod!, true);
                 break;
             case ModSettingChange.EnableState:
-                if (oldValue == 0)
+                if (oldValue == Setting.False)
                     cache.AddMod(mod!, true);
-                else if (oldValue == 1)
+                else if (oldValue == Setting.True)
                     cache.RemoveMod(mod!, true);
-                else if (collection[mod!.Index].Settings?.Enabled == true)
+                else if (collection.GetActualSettings(mod!.Index).Settings?.Enabled == true)
                     cache.ReloadMod(mod!, true);
                 else
                     cache.RemoveMod(mod!, true);
@@ -314,10 +328,13 @@ public class CollectionCacheManager : IDisposable
 
                 break;
             case ModSettingChange.Setting:
-                if (collection[mod!.Index].Settings?.Enabled == true)
-                    cache.ReloadMod(mod!, true);
+                if (collection.GetActualSettings(mod!.Index).Settings?.Enabled == true)
+                    cache.ReloadMod(mod, true);
 
                 break;
+            case ModSettingChange.TemporarySetting:
+                cache.ReloadMod(mod!, true);
+                break;
             case ModSettingChange.MultiInheritance:
             case ModSettingChange.MultiEnableState:
                 FullRecalculation(collection);
@@ -344,9 +361,9 @@ public class CollectionCacheManager : IDisposable
 
         collection._cache!.Dispose();
         collection._cache = null;
-        if (collection.Index > 0)
+        if (collection.Identity.Index > 0)
             Interlocked.Decrement(ref _count);
-        Penumbra.Log.Verbose($"Cleared cache of collection {collection.AnonymizedName}.");
+        Penumbra.Log.Verbose($"Cleared cache of collection {collection.Identity.AnonymizedName}.");
     }
 
     /// <summary>

Penumbra/Collections/Cache/CollectionModData.cs

@@ -1,23 +1,25 @@
 using Penumbra.Meta.Manipulations;
-using Penumbra.Mods;
 using Penumbra.Mods.Editor;
 using Penumbra.String.Classes;
 
 namespace Penumbra.Collections.Cache;
 
+/// <summary>
+///     Contains associations between a mod and the paths and meta manipulations affected by that mod.
+/// </summary>
 public class CollectionModData
 {
-    private readonly Dictionary<IMod, (HashSet<Utf8GamePath>, HashSet<MetaManipulation>)> _data = new();
+    private readonly Dictionary<IMod, (HashSet<Utf8GamePath>, HashSet<IMetaIdentifier>)> _data = new();
 
-    public IEnumerable<(IMod, IReadOnlySet<Utf8GamePath>, IReadOnlySet<MetaManipulation>)> Data
-        => _data.Select(kvp => (kvp.Key, (IReadOnlySet<Utf8GamePath>)kvp.Value.Item1, (IReadOnlySet<MetaManipulation>)kvp.Value.Item2));
+    public IEnumerable<(IMod, IReadOnlySet<Utf8GamePath>, IReadOnlySet<IMetaIdentifier>)> Data
+        => _data.Select(kvp => (kvp.Key, (IReadOnlySet<Utf8GamePath>)kvp.Value.Item1, (IReadOnlySet<IMetaIdentifier>)kvp.Value.Item2));
 
-    public (IReadOnlyCollection<Utf8GamePath> Paths, IReadOnlyCollection<MetaManipulation> Manipulations) RemoveMod(IMod mod)
+    public (IReadOnlyCollection<Utf8GamePath> Paths, IReadOnlyCollection<IMetaIdentifier> Manipulations) RemoveMod(IMod mod)
     {
         if (_data.Remove(mod, out var data))
             return data;
 
-        return (Array.Empty<Utf8GamePath>(), Array.Empty<MetaManipulation>());
+        return ([], []);
     }
 
     public void AddPath(IMod mod, Utf8GamePath path)
@@ -28,12 +30,12 @@ public class CollectionModData
         }
         else
         {
-            data = (new HashSet<Utf8GamePath> { path }, new HashSet<MetaManipulation>());
+            data = ([path], []);
             _data.Add(mod, data);
         }
     }
 
-    public void AddManip(IMod mod, MetaManipulation manipulation)
+    public void AddManip(IMod mod, IMetaIdentifier manipulation)
     {
         if (_data.TryGetValue(mod, out var data))
         {
@@ -41,7 +43,7 @@ public class CollectionModData
         }
         else
         {
-            data = (new HashSet<Utf8GamePath>(), new HashSet<MetaManipulation> { manipulation });
+            data = ([], [manipulation]);
             _data.Add(mod, data);
         }
     }
@@ -52,7 +54,7 @@ public class CollectionModData
             _data.Remove(mod);
     }
 
-    public void RemoveManip(IMod mod, MetaManipulation manip)
+    public void RemoveManip(IMod mod, IMetaIdentifier manip)
     {
         if (_data.TryGetValue(mod, out var data) && data.Item2.Remove(manip) && data.Item1.Count == 0 && data.Item2.Count == 0)
             _data.Remove(mod);

Penumbra/Collections/Cache/CustomResourceCache.cs

@@ -0,0 +1,49 @@
+using FFXIVClientStructs.FFXIV.Client.System.Resource;
+using Penumbra.Api.Enums;
+using Penumbra.Interop.Hooks.ResourceLoading;
+using Penumbra.Interop.SafeHandles;
+using Penumbra.String.Classes;
+
+namespace Penumbra.Collections.Cache;
+
+/// <summary> A cache for resources owned by a collection. </summary>
+public sealed class CustomResourceCache(ResourceLoader loader)
+    : ConcurrentDictionary<Utf8GamePath, SafeResourceHandle>, IDisposable
+{
+    /// <summary> Invalidate an existing resource by clearing it from the cache and disposing it. </summary>
+    public void Invalidate(Utf8GamePath path)
+    {
+        if (TryRemove(path, out var handle))
+            handle.Dispose();
+    }
+
+    public void Dispose()
+    {
+        foreach (var handle in Values)
+            handle.Dispose();
+        Clear();
+    }
+
+    /// <summary> Get the requested resource either from the cached resource, or load a new one if it does not exist. </summary>
+    public SafeResourceHandle Get(ResourceCategory category, ResourceType type, Utf8GamePath path, ResolveData data)
+    {
+        if (TryGetClonedValue(path, out var handle))
+            return handle;
+
+        handle = loader.LoadResolvedSafeResource(category, type, path.Path, data);
+        var clone = handle.Clone();
+        if (!TryAdd(path, clone))
+            clone.Dispose();
+        return handle;
+    }
+
+    /// <summary> Get a cloned cached resource if it exists. </summary>
+    private bool TryGetClonedValue(Utf8GamePath path, [NotNullWhen(true)] out SafeResourceHandle? handle)
+    {
+        if (!TryGetValue(path, out handle))
+            return false;
+
+        handle = handle.Clone();
+        return true;
+    }
+}

Penumbra/Collections/Cache/EqdpCache.cs

@@ -1,97 +1,54 @@
-using OtterGui;
-using OtterGui.Filesystem;
 using Penumbra.GameData.Enums;
 using Penumbra.GameData.Structs;
-using Penumbra.Interop.Services;
-using Penumbra.Interop.Structs;
 using Penumbra.Meta;
-using Penumbra.Meta.Files;
 using Penumbra.Meta.Manipulations;
 
 namespace Penumbra.Collections.Cache;
 
-public readonly struct EqdpCache : IDisposable
+public sealed class EqdpCache(MetaFileManager manager, ModCollection collection) : MetaCacheBase<EqdpIdentifier, EqdpEntry>(manager, collection)
 {
-    private readonly ExpandedEqdpFile?[]    _eqdpFiles = new ExpandedEqdpFile[CharacterUtilityData.EqdpIndices.Length]; // TODO: female Hrothgar
-    private readonly List<EqdpManipulation> _eqdpManipulations = new();
+    private readonly Dictionary<(PrimaryId Id, GenderRace GenderRace, bool Accessory), (EqdpEntry Entry, EqdpEntry InverseMask)> _fullEntries =
+        [];
 
-    public EqdpCache()
-    { }
-
-    public void SetFiles(MetaFileManager manager)
-    {
-        for (var i = 0; i < CharacterUtilityData.EqdpIndices.Length; ++i)
-            manager.SetFile(_eqdpFiles[i], CharacterUtilityData.EqdpIndices[i]);
-    }
-
-    public void SetFile(MetaFileManager manager, MetaIndex index)
-    {
-        var i = CharacterUtilityData.EqdpIndices.IndexOf(index);
-        if (i != -1)
-            manager.SetFile(_eqdpFiles[i], index);
-    }
-
-    public MetaList.MetaReverter? TemporarilySetFiles(MetaFileManager manager, GenderRace genderRace, bool accessory)
-    {
-        var idx = CharacterUtilityData.EqdpIdx(genderRace, accessory);
-        if (idx < 0)
-        {
-            Penumbra.Log.Warning($"Invalid Gender, Race or Accessory for EQDP file {genderRace}, {accessory}.");
-            return null;
-        }
-
-        var i = CharacterUtilityData.EqdpIndices.IndexOf(idx);
-        if (i < 0)
-        {
-            Penumbra.Log.Warning($"Invalid Gender, Race or Accessory for EQDP file {genderRace}, {accessory}.");
-            return null;
-        }
-
-        return manager.TemporarilySetFile(_eqdpFiles[i], idx);
-    }
+    public EqdpEntry ApplyFullEntry(PrimaryId id, GenderRace genderRace, bool accessory, EqdpEntry originalEntry)
+        => _fullEntries.TryGetValue((id, genderRace, accessory), out var pair)
+            ? (originalEntry & pair.InverseMask) | pair.Entry
+            : originalEntry;
 
     public void Reset()
     {
-        foreach (var file in _eqdpFiles.OfType<ExpandedEqdpFile>())
-        {
-            var relevant = CharacterUtility.RelevantIndices[file.Index.Value];
-            file.Reset(_eqdpManipulations.Where(m => m.FileIndex() == relevant).Select(m => (PrimaryId)m.SetId));
-        }
-
-        _eqdpManipulations.Clear();
+        Clear();
+        _fullEntries.Clear();
     }
 
-    public bool ApplyMod(MetaFileManager manager, EqdpManipulation manip)
+    protected override void ApplyModInternal(EqdpIdentifier identifier, EqdpEntry entry)
     {
-        _eqdpManipulations.AddOrReplace(manip);
-        var file = _eqdpFiles[Array.IndexOf(CharacterUtilityData.EqdpIndices, manip.FileIndex())] ??=
-            new ExpandedEqdpFile(manager, Names.CombinedRace(manip.Gender, manip.Race), manip.Slot.IsAccessory()); // TODO: female Hrothgar
-        return manip.Apply(file);
+        var tuple       = (identifier.SetId, identifier.GenderRace, identifier.Slot.IsAccessory());
+        var mask        = Eqdp.Mask(identifier.Slot);
+        var inverseMask = ~mask;
+        if (_fullEntries.TryGetValue(tuple, out var pair))
+            pair = ((pair.Entry & inverseMask) | (entry & mask), pair.InverseMask & inverseMask);
+        else
+            pair = (entry & mask, inverseMask);
+        _fullEntries[tuple] = pair;
     }
 
-    public bool RevertMod(MetaFileManager manager, EqdpManipulation manip)
+    protected override void RevertModInternal(EqdpIdentifier identifier)
     {
-        if (!_eqdpManipulations.Remove(manip))
-            return false;
+        var tuple = (identifier.SetId, identifier.GenderRace, identifier.Slot.IsAccessory());
 
-        var def  = ExpandedEqdpFile.GetDefault(manager, Names.CombinedRace(manip.Gender, manip.Race), manip.Slot.IsAccessory(), manip.SetId);
-        var file = _eqdpFiles[Array.IndexOf(CharacterUtilityData.EqdpIndices, manip.FileIndex())]!;
-        manip = new EqdpManipulation(def, manip.Slot, manip.Gender, manip.Race, manip.SetId);
-        return manip.Apply(file);
+        if (!_fullEntries.Remove(tuple, out var pair))
+            return;
+
+        var mask    = Eqdp.Mask(identifier.Slot);
+        var newMask = pair.InverseMask | mask;
+        if (newMask is not EqdpEntry.FullMask)
+            _fullEntries[tuple] = (pair.Entry & ~mask, newMask);
     }
 
-    public ExpandedEqdpFile? EqdpFile(GenderRace race, bool accessory)
-        => _eqdpFiles
-            [Array.IndexOf(CharacterUtilityData.EqdpIndices, CharacterUtilityData.EqdpIdx(race, accessory))]; // TODO: female Hrothgar
-
-    public void Dispose()
+    protected override void Dispose(bool _)
     {
-        for (var i = 0; i < _eqdpFiles.Length; ++i)
-        {
-            _eqdpFiles[i]?.Dispose();
-            _eqdpFiles[i] = null;
-        }
-
-        _eqdpManipulations.Clear();
+        Clear();
+        _fullEntries.Clear();
     }
 }

Penumbra/Collections/Cache/EqpCache.cs

@@ -1,60 +1,66 @@
-using OtterGui.Filesystem;
-using Penumbra.Interop.Services;
-using Penumbra.Interop.Structs;
+using Penumbra.GameData.Enums;
+using Penumbra.GameData.Structs;
 using Penumbra.Meta;
 using Penumbra.Meta.Files;
 using Penumbra.Meta.Manipulations;
 
 namespace Penumbra.Collections.Cache;
 
-public struct EqpCache : IDisposable
+public sealed class EqpCache(MetaFileManager manager, ModCollection collection) : MetaCacheBase<EqpIdentifier, EqpEntry>(manager, collection)
 {
-    private          ExpandedEqpFile?      _eqpFile          = null;
-    private readonly List<EqpManipulation> _eqpManipulations = new();
+    public unsafe EqpEntry GetValues(CharacterArmor* armor)
+    {
+        var bodyEntry = GetSingleValue(armor[1].Set, EquipSlot.Body);
+        var headEntry = bodyEntry.HasFlag(EqpEntry.BodyShowHead)
+            ? GetSingleValue(armor[0].Set, EquipSlot.Head)
+            : GetSingleValue(armor[1].Set, EquipSlot.Head);
+        var handEntry = bodyEntry.HasFlag(EqpEntry.BodyShowHand)
+            ? GetSingleValue(armor[2].Set, EquipSlot.Hands)
+            : GetSingleValue(armor[1].Set, EquipSlot.Hands);
+        var (legsEntry, legsId) = bodyEntry.HasFlag(EqpEntry.BodyShowLeg)
+            ? (GetSingleValue(armor[3].Set, EquipSlot.Legs), 3)
+            : (GetSingleValue(armor[1].Set, EquipSlot.Legs), 1);
+        var footEntry = legsEntry.HasFlag(EqpEntry.LegsShowFoot)
+            ? GetSingleValue(armor[4].Set,      EquipSlot.Feet)
+            : GetSingleValue(armor[legsId].Set, EquipSlot.Feet);
 
-    public EqpCache()
-    { }
+        var combined = bodyEntry | headEntry | handEntry | legsEntry | footEntry;
+        return PostProcessFeet(PostProcessHands(combined));
+    }
 
-    public void SetFiles(MetaFileManager manager)
-        => manager.SetFile(_eqpFile, MetaIndex.Eqp);
-
-    public static void ResetFiles(MetaFileManager manager)
-        => manager.SetFile(null, MetaIndex.Eqp);
-
-    public MetaList.MetaReverter TemporarilySetFiles(MetaFileManager manager)
-        => manager.TemporarilySetFile(_eqpFile, MetaIndex.Eqp);
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    private EqpEntry GetSingleValue(PrimaryId id, EquipSlot slot)
+        => TryGetValue(new EqpIdentifier(id, slot), out var pair) ? pair.Entry : ExpandedEqpFile.GetDefault(Manager, id) & Eqp.Mask(slot);
 
     public void Reset()
-    {
-        if (_eqpFile == null)
-            return;
+        => Clear();
 
-        _eqpFile.Reset(_eqpManipulations.Select(m => m.SetId));
-        _eqpManipulations.Clear();
+    protected override void Dispose(bool _)
+        => Clear();
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    private static EqpEntry PostProcessHands(EqpEntry entry)
+    {
+        if (!entry.HasFlag(EqpEntry.HandsHideForearm))
+            return entry;
+
+        var testFlag = entry.HasFlag(EqpEntry.HandsHideElbow)
+            ? entry.HasFlag(EqpEntry.BodyHideGlovesL)
+            : entry.HasFlag(EqpEntry.BodyHideGlovesM);
+        return testFlag
+            ? (entry | EqpEntry.BodyHideGloveCuffs) & ~EqpEntry.BodyHideGlovesS
+            : entry & ~(EqpEntry.BodyHideGloveCuffs | EqpEntry.BodyHideGlovesS);
     }
 
-    public bool ApplyMod(MetaFileManager manager, EqpManipulation manip)
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    private static EqpEntry PostProcessFeet(EqpEntry entry)
     {
-        _eqpManipulations.AddOrReplace(manip);
-        _eqpFile ??= new ExpandedEqpFile(manager);
-        return manip.Apply(_eqpFile);
-    }
+        if (!entry.HasFlag(EqpEntry.FeetHideCalf))
+            return entry;
 
-    public bool RevertMod(MetaFileManager manager, EqpManipulation manip)
-    {
-        var idx = _eqpManipulations.FindIndex(manip.Equals);
-        if (idx < 0)
-            return false;
+        if (entry.HasFlag(EqpEntry.FeetHideKnee) || !entry.HasFlag(EqpEntry._20))
+            return entry & ~(EqpEntry.LegsHideBootsS | EqpEntry.LegsHideBootsM);
 
-        var def = ExpandedEqpFile.GetDefault(manager, manip.SetId);
-        manip = new EqpManipulation(def, manip.Slot, manip.SetId);
-        return manip.Apply(_eqpFile!);
-    }
-
-    public void Dispose()
-    {
-        _eqpFile?.Dispose();
-        _eqpFile = null;
-        _eqpManipulations.Clear();
+        return (entry | EqpEntry.LegsHideBootsM) & ~EqpEntry.LegsHideBootsS;
     }
 }

Penumbra/Collections/Cache/EstCache.cs

@@ -1,138 +1,19 @@
-using OtterGui.Filesystem;
-using Penumbra.GameData.Enums;
-using Penumbra.GameData.Structs;
-using Penumbra.Interop.Services;
-using Penumbra.Interop.Structs;
 using Penumbra.Meta;
 using Penumbra.Meta.Files;
 using Penumbra.Meta.Manipulations;
 
 namespace Penumbra.Collections.Cache;
 
-public struct EstCache : IDisposable
+public sealed class EstCache(MetaFileManager manager, ModCollection collection) : MetaCacheBase<EstIdentifier, EstEntry>(manager, collection)
 {
-    private EstFile? _estFaceFile = null;
-    private EstFile? _estHairFile = null;
-    private EstFile? _estBodyFile = null;
-    private EstFile? _estHeadFile = null;
-
-    private readonly List<EstManipulation> _estManipulations = new();
-
-    public EstCache()
-    { }
-
-    public void SetFiles(MetaFileManager manager)
-    {
-        manager.SetFile(_estFaceFile, MetaIndex.FaceEst);
-        manager.SetFile(_estHairFile, MetaIndex.HairEst);
-        manager.SetFile(_estBodyFile, MetaIndex.BodyEst);
-        manager.SetFile(_estHeadFile, MetaIndex.HeadEst);
-    }
-
-    public void SetFile(MetaFileManager manager, MetaIndex index)
-    {
-        switch (index)
-        {
-            case MetaIndex.FaceEst:
-                manager.SetFile(_estFaceFile, MetaIndex.FaceEst);
-                break;
-            case MetaIndex.HairEst:
-                manager.SetFile(_estHairFile, MetaIndex.HairEst);
-                break;
-            case MetaIndex.BodyEst:
-                manager.SetFile(_estBodyFile, MetaIndex.BodyEst);
-                break;
-            case MetaIndex.HeadEst:
-                manager.SetFile(_estHeadFile, MetaIndex.HeadEst);
-                break;
-        }
-    }
-
-    public MetaList.MetaReverter TemporarilySetFiles(MetaFileManager manager, EstManipulation.EstType type)
-    {
-        var (file, idx) = type switch
-        {
-            EstManipulation.EstType.Face => (_estFaceFile, MetaIndex.FaceEst),
-            EstManipulation.EstType.Hair => (_estHairFile, MetaIndex.HairEst),
-            EstManipulation.EstType.Body => (_estBodyFile, MetaIndex.BodyEst),
-            EstManipulation.EstType.Head => (_estHeadFile, MetaIndex.HeadEst),
-            _                            => (null, 0),
-        };
-
-        return manager.TemporarilySetFile(file, idx);
-    }
-
-    private readonly EstFile? GetEstFile(EstManipulation.EstType type)
-    {
-        return type switch
-        {
-            EstManipulation.EstType.Face => _estFaceFile,
-            EstManipulation.EstType.Hair => _estHairFile,
-            EstManipulation.EstType.Body => _estBodyFile,
-            EstManipulation.EstType.Head => _estHeadFile,
-            _                            => null,
-        };
-    }
-
-    internal ushort GetEstEntry(MetaFileManager manager, EstManipulation.EstType type, GenderRace genderRace, PrimaryId primaryId)
-    {
-        var file = GetEstFile(type);
-        return file != null
-            ? file[genderRace, primaryId.Id]
-            : EstFile.GetDefault(manager, type, genderRace, primaryId);
-    }
+    public EstEntry GetEstEntry(EstIdentifier identifier)
+        => TryGetValue(identifier, out var entry)
+            ? entry.Entry
+            : EstFile.GetDefault(Manager, identifier);
 
     public void Reset()
-    {
-        _estFaceFile?.Reset();
-        _estHairFile?.Reset();
-        _estBodyFile?.Reset();
-        _estHeadFile?.Reset();
-        _estManipulations.Clear();
-    }
+        => Clear();
 
-    public bool ApplyMod(MetaFileManager manager, EstManipulation m)
-    {
-        _estManipulations.AddOrReplace(m);
-        var file = m.Slot switch
-        {
-            EstManipulation.EstType.Hair => _estHairFile ??= new EstFile(manager, EstManipulation.EstType.Hair),
-            EstManipulation.EstType.Face => _estFaceFile ??= new EstFile(manager, EstManipulation.EstType.Face),
-            EstManipulation.EstType.Body => _estBodyFile ??= new EstFile(manager, EstManipulation.EstType.Body),
-            EstManipulation.EstType.Head => _estHeadFile ??= new EstFile(manager, EstManipulation.EstType.Head),
-            _                            => throw new ArgumentOutOfRangeException(),
-        };
-        return m.Apply(file);
-    }
-
-    public bool RevertMod(MetaFileManager manager, EstManipulation m)
-    {
-        if (!_estManipulations.Remove(m))
-            return false;
-
-        var def   = EstFile.GetDefault(manager, m.Slot, Names.CombinedRace(m.Gender, m.Race), m.SetId);
-        var manip = new EstManipulation(m.Gender, m.Race, m.Slot, m.SetId, def);
-        var file = m.Slot switch
-        {
-            EstManipulation.EstType.Hair => _estHairFile!,
-            EstManipulation.EstType.Face => _estFaceFile!,
-            EstManipulation.EstType.Body => _estBodyFile!,
-            EstManipulation.EstType.Head => _estHeadFile!,
-            _                            => throw new ArgumentOutOfRangeException(),
-        };
-        return manip.Apply(file);
-    }
-
-    public void Dispose()
-    {
-        _estFaceFile?.Dispose();
-        _estHairFile?.Dispose();
-        _estBodyFile?.Dispose();
-        _estHeadFile?.Dispose();
-        _estFaceFile = null;
-        _estHairFile = null;
-        _estBodyFile = null;
-        _estHeadFile = null;
-        _estManipulations.Clear();
-    }
+    protected override void Dispose(bool _)
+        => Clear();
 }

Penumbra/Collections/Cache/GlobalEqpCache.cs

@@ -0,0 +1,122 @@
+using OtterGui.Classes;
+using OtterGui.Services;
+using Penumbra.GameData.Structs;
+using Penumbra.Meta.Manipulations;
+using Penumbra.Mods.Editor;
+
+namespace Penumbra.Collections.Cache;
+
+public class GlobalEqpCache : ReadWriteDictionary<GlobalEqpManipulation, IMod>, IService
+{
+    private readonly HashSet<PrimaryId> _doNotHideEarrings  = [];
+    private readonly HashSet<PrimaryId> _doNotHideNecklace  = [];
+    private readonly HashSet<PrimaryId> _doNotHideBracelets = [];
+    private readonly HashSet<PrimaryId> _doNotHideRingL     = [];
+    private readonly HashSet<PrimaryId> _doNotHideRingR     = [];
+    private          bool               _doNotHideVieraHats;
+    private          bool               _doNotHideHrothgarHats;
+    private          bool               _hideAuRaHorns;
+    private          bool               _hideVieraEars;
+    private          bool               _hideMiqoteEars;
+
+    public new void Clear()
+    {
+        base.Clear();
+        _doNotHideEarrings.Clear();
+        _doNotHideNecklace.Clear();
+        _doNotHideBracelets.Clear();
+        _doNotHideRingL.Clear();
+        _doNotHideRingR.Clear();
+        _doNotHideHrothgarHats = false;
+        _doNotHideVieraHats    = false;
+        _hideAuRaHorns         = false;
+        _hideVieraEars         = false;
+        _hideMiqoteEars        = false;
+    }
+
+    public unsafe EqpEntry Apply(EqpEntry original, CharacterArmor* armor)
+    {
+        if (Count == 0)
+            return original;
+
+        if (_doNotHideVieraHats)
+            original |= EqpEntry.HeadShowVieraHat;
+
+        if (_doNotHideHrothgarHats)
+            original |= EqpEntry.HeadShowHrothgarHat;
+
+        if (_hideAuRaHorns)
+            original &= ~EqpEntry.HeadShowEarAuRa;
+
+        if (_hideVieraEars)
+            original &= ~EqpEntry.HeadShowEarViera;
+
+        if (_hideMiqoteEars)
+            original &= ~EqpEntry.HeadShowEarMiqote;
+
+        if (_doNotHideEarrings.Contains(armor[5].Set))
+            original |= EqpEntry.HeadShowEarringsHyurRoe
+              | EqpEntry.HeadShowEarringsLalaElezen
+              | EqpEntry.HeadShowEarringsMiqoHrothViera
+              | EqpEntry.HeadShowEarringsAura;
+
+        if (_doNotHideNecklace.Contains(armor[6].Set))
+            original |= EqpEntry.BodyShowNecklace | EqpEntry.HeadShowNecklace;
+
+        if (_doNotHideBracelets.Contains(armor[7].Set))
+            original |= EqpEntry.BodyShowBracelet | EqpEntry.HandShowBracelet;
+
+        if (_doNotHideRingR.Contains(armor[8].Set))
+            original |= EqpEntry.HandShowRingR;
+
+        if (_doNotHideRingL.Contains(armor[9].Set))
+            original |= EqpEntry.HandShowRingL;
+
+        return original;
+    }
+
+    public bool ApplyMod(IMod mod, GlobalEqpManipulation manipulation)
+    {
+        if (Remove(manipulation, out var oldMod) && oldMod == mod)
+            return false;
+
+        this[manipulation] = mod;
+        _ = manipulation.Type switch
+        {
+            GlobalEqpType.DoNotHideEarrings     => _doNotHideEarrings.Add(manipulation.Condition),
+            GlobalEqpType.DoNotHideNecklace     => _doNotHideNecklace.Add(manipulation.Condition),
+            GlobalEqpType.DoNotHideBracelets    => _doNotHideBracelets.Add(manipulation.Condition),
+            GlobalEqpType.DoNotHideRingR        => _doNotHideRingR.Add(manipulation.Condition),
+            GlobalEqpType.DoNotHideRingL        => _doNotHideRingL.Add(manipulation.Condition),
+            GlobalEqpType.DoNotHideHrothgarHats => !_doNotHideHrothgarHats && (_doNotHideHrothgarHats = true),
+            GlobalEqpType.DoNotHideVieraHats    => !_doNotHideVieraHats && (_doNotHideVieraHats       = true),
+            GlobalEqpType.HideHorns             => !_hideAuRaHorns && (_hideAuRaHorns                 = true),
+            GlobalEqpType.HideMiqoteEars        => !_hideMiqoteEars && (_hideMiqoteEars               = true),
+            GlobalEqpType.HideVieraEars         => !_hideVieraEars && (_hideVieraEars                 = true),
+            _                                   => false,
+        };
+        return true;
+    }
+
+    public bool RevertMod(GlobalEqpManipulation manipulation, [NotNullWhen(true)] out IMod? mod)
+    {
+        if (!Remove(manipulation, out mod))
+            return false;
+
+        _ = manipulation.Type switch
+        {
+            GlobalEqpType.DoNotHideEarrings     => _doNotHideEarrings.Remove(manipulation.Condition),
+            GlobalEqpType.DoNotHideNecklace     => _doNotHideNecklace.Remove(manipulation.Condition),
+            GlobalEqpType.DoNotHideBracelets    => _doNotHideBracelets.Remove(manipulation.Condition),
+            GlobalEqpType.DoNotHideRingR        => _doNotHideRingR.Remove(manipulation.Condition),
+            GlobalEqpType.DoNotHideRingL        => _doNotHideRingL.Remove(manipulation.Condition),
+            GlobalEqpType.DoNotHideHrothgarHats => _doNotHideHrothgarHats && !(_doNotHideHrothgarHats = false),
+            GlobalEqpType.DoNotHideVieraHats    => _doNotHideVieraHats && !(_doNotHideVieraHats       = false),
+            GlobalEqpType.HideHorns             => _hideAuRaHorns && (_hideAuRaHorns   = false),
+            GlobalEqpType.HideMiqoteEars        => _hideMiqoteEars && (_hideMiqoteEars = false),
+            GlobalEqpType.HideVieraEars         => _hideVieraEars && (_hideVieraEars   = false),
+            _                                   => false,
+        };
+        return true;
+    }
+}

Penumbra/Collections/Cache/GmpCache.cs

@@ -1,56 +1,14 @@
-using OtterGui.Filesystem;
-using Penumbra.Interop.Services;
-using Penumbra.Interop.Structs;
+using Penumbra.GameData.Structs;
 using Penumbra.Meta;
-using Penumbra.Meta.Files;
 using Penumbra.Meta.Manipulations;
 
 namespace Penumbra.Collections.Cache;
 
-public struct GmpCache : IDisposable
+public sealed class GmpCache(MetaFileManager manager, ModCollection collection) : MetaCacheBase<GmpIdentifier, GmpEntry>(manager, collection)
 {
-    private          ExpandedGmpFile?      _gmpFile          = null;
-    private readonly List<GmpManipulation> _gmpManipulations = new();
-
-    public GmpCache()
-    { }
-
-    public void SetFiles(MetaFileManager manager)
-        => manager.SetFile(_gmpFile, MetaIndex.Gmp);
-
-    public MetaList.MetaReverter TemporarilySetFiles(MetaFileManager manager)
-        => manager.TemporarilySetFile(_gmpFile, MetaIndex.Gmp);
-
     public void Reset()
-    {
-        if (_gmpFile == null)
-            return;
+        => Clear();
 
-        _gmpFile.Reset(_gmpManipulations.Select(m => m.SetId));
-        _gmpManipulations.Clear();
-    }
-
-    public bool ApplyMod(MetaFileManager manager, GmpManipulation manip)
-    {
-        _gmpManipulations.AddOrReplace(manip);
-        _gmpFile ??= new ExpandedGmpFile(manager);
-        return manip.Apply(_gmpFile);
-    }
-
-    public bool RevertMod(MetaFileManager manager, GmpManipulation manip)
-    {
-        if (!_gmpManipulations.Remove(manip))
-            return false;
-
-        var def = ExpandedGmpFile.GetDefault(manager, manip.SetId);
-        manip = new GmpManipulation(def, manip.SetId);
-        return manip.Apply(_gmpFile!);
-    }
-
-    public void Dispose()
-    {
-        _gmpFile?.Dispose();
-        _gmpFile = null;
-        _gmpManipulations.Clear();
-    }
+    protected override void Dispose(bool _)
+        => Clear();
 }

Penumbra/Collections/Cache/ImcCache.cs

@@ -1,123 +1,102 @@
+using Penumbra.GameData.Structs;
 using Penumbra.Meta;
 using Penumbra.Meta.Files;
 using Penumbra.Meta.Manipulations;
-using Penumbra.String.Classes;
+using Penumbra.String;
 
 namespace Penumbra.Collections.Cache;
 
-public readonly struct ImcCache : IDisposable
+public sealed class ImcCache(MetaFileManager manager, ModCollection collection) : MetaCacheBase<ImcIdentifier, ImcEntry>(manager, collection)
 {
-    private readonly Dictionary<Utf8GamePath, ImcFile> _imcFiles         = new();
-    private readonly List<(ImcManipulation, ImcFile)>  _imcManipulations = new();
+    private readonly Dictionary<CiByteString, (ImcFile, HashSet<ImcIdentifier>)> _imcFiles = [];
 
-    public ImcCache()
-    { }
+    public bool HasFile(CiByteString path)
+        => _imcFiles.ContainsKey(path);
 
-    public void SetFiles(ModCollection collection, bool fromFullCompute)
+    public bool GetFile(CiByteString path, [NotNullWhen(true)] out ImcFile? file)
     {
-        if (fromFullCompute)
-            foreach (var path in _imcFiles.Keys)
-                collection._cache!.ForceFileSync(path, CreateImcPath(collection, path));
-        else
-            foreach (var path in _imcFiles.Keys)
-                collection._cache!.ForceFile(path, CreateImcPath(collection, path));
-    }
-
-    public void Reset(ModCollection collection)
-    {
-        foreach (var (path, file) in _imcFiles)
+        if (!_imcFiles.TryGetValue(path, out var p))
         {
-            collection._cache!.RemovePath(path);
-            file.Reset();
-        }
-
-        _imcManipulations.Clear();
-    }
-
-    public bool ApplyMod(MetaFileManager manager, ModCollection collection, ImcManipulation manip)
-    {
-        if (!manip.Validate())
+            file = null;
             return false;
-
-        var idx = _imcManipulations.FindIndex(p => p.Item1.Equals(manip));
-        if (idx < 0)
-        {
-            idx = _imcManipulations.Count;
-            _imcManipulations.Add((manip, null!));
         }
 
-        var path = manip.GamePath();
+        file = p.Item1;
+        return true;
+    }
+
+    public void Reset()
+    {
+        foreach (var (_, (file, set)) in _imcFiles)
+        {
+            file.Reset();
+            set.Clear();
+        }
+
+        _imcFiles.Clear();
+        Clear();
+    }
+
+    protected override void ApplyModInternal(ImcIdentifier identifier, ImcEntry entry)
+    {
+        Collection.Counters.IncrementImc();
+        ApplyFile(identifier, entry);
+    }
+
+    private void ApplyFile(ImcIdentifier identifier, ImcEntry entry)
+    {
+        var path = identifier.GamePath().Path;
         try
         {
-            if (!_imcFiles.TryGetValue(path, out var file))
-                file = new ImcFile(manager, manip);
+            if (!_imcFiles.TryGetValue(path, out var pair))
+                pair = (new ImcFile(Manager, identifier), []);
 
-            _imcManipulations[idx] = (manip, file);
-            if (!manip.Apply(file))
-                return false;
+            if (!Apply(pair.Item1, identifier, entry))
+                return;
 
-            _imcFiles[path] = file;
-            var fullPath = CreateImcPath(collection, path);
-            collection._cache!.ForceFile(path, fullPath);
-
-            return true;
+            pair.Item2.Add(identifier);
+            _imcFiles[path] = pair;
         }
         catch (ImcException e)
         {
-            manager.ValidityChecker.ImcExceptions.Add(e);
+            Manager.ValidityChecker.ImcExceptions.Add(e);
             Penumbra.Log.Error(e.ToString());
         }
         catch (Exception e)
         {
-            Penumbra.Log.Error($"Could not apply IMC Manipulation {manip}:\n{e}");
+            Penumbra.Log.Error($"Could not apply IMC Manipulation {identifier}:\n{e}");
         }
-
-        return false;
     }
 
-    public bool RevertMod(MetaFileManager manager, ModCollection collection, ImcManipulation m)
+    protected override void RevertModInternal(ImcIdentifier identifier)
     {
-        if (!m.Validate())
-            return false;
+        Collection.Counters.IncrementImc();
+        var path = identifier.GamePath().Path;
+        if (!_imcFiles.TryGetValue(path, out var pair))
+            return;
 
-        var idx = _imcManipulations.FindIndex(p => p.Item1.Equals(m));
-        if (idx < 0)
-            return false;
+        if (!pair.Item2.Remove(identifier))
+            return;
 
-        var (_, file) = _imcManipulations[idx];
-        _imcManipulations.RemoveAt(idx);
-
-        if (_imcManipulations.All(p => !ReferenceEquals(p.Item2, file)))
+        if (pair.Item2.Count == 0)
         {
-            _imcFiles.Remove(file.Path);
-            collection._cache!.ForceFile(file.Path, FullPath.Empty);
-            file.Dispose();
-            return true;
+            _imcFiles.Remove(path);
+            pair.Item1.Dispose();
+            return;
         }
 
-        var def   = ImcFile.GetDefault(manager, file.Path, m.EquipSlot, m.Variant.Id, out _);
-        var manip = m.Copy(def);
-        if (!manip.Apply(file))
-            return false;
-
-        var fullPath = CreateImcPath(collection, file.Path);
-        collection._cache!.ForceFile(file.Path, fullPath);
-
-        return true;
+        var def = ImcFile.GetDefault(Manager, pair.Item1.Path, identifier.EquipSlot, identifier.Variant, out _);
+        Apply(pair.Item1, identifier, def);
     }
 
-    public void Dispose()
+    public static bool Apply(ImcFile file, ImcIdentifier identifier, ImcEntry entry)
+        => file.SetEntry(ImcFile.PartIndex(identifier.EquipSlot), identifier.Variant.Id, entry);
+
+    protected override void Dispose(bool _)
     {
-        foreach (var file in _imcFiles.Values)
+        foreach (var (_, (file, _)) in _imcFiles)
             file.Dispose();
-
+        Clear();
         _imcFiles.Clear();
-        _imcManipulations.Clear();
     }
-
-    private static FullPath CreateImcPath(ModCollection collection, Utf8GamePath path)
-        => new($"|{collection.Name}_{collection.ChangeCounter}|{path}");
-
-    public bool GetImcFile(Utf8GamePath path, [NotNullWhen(true)] out ImcFile? file)
-        => _imcFiles.TryGetValue(path, out file);
 }

Penumbra/Collections/Cache/MetaCache.cs

@@ -1,234 +1,137 @@
 using Penumbra.GameData.Enums;
+using Penumbra.GameData.Files.AtchStructs;
 using Penumbra.GameData.Structs;
-using Penumbra.Interop.Services;
-using Penumbra.Interop.Structs;
 using Penumbra.Meta;
 using Penumbra.Meta.Manipulations;
-using Penumbra.Mods;
 using Penumbra.Mods.Editor;
-using Penumbra.String.Classes;
 
 namespace Penumbra.Collections.Cache;
 
-public class MetaCache : IDisposable, IEnumerable<KeyValuePair<MetaManipulation, IMod>>
+public class MetaCache(MetaFileManager manager, ModCollection collection)
 {
-    private readonly MetaFileManager                    _manager;
-    private readonly ModCollection                      _collection;
-    private readonly Dictionary<MetaManipulation, IMod> _manipulations = new();
-    private          EqpCache                           _eqpCache      = new();
-    private readonly EqdpCache                          _eqdpCache     = new();
-    private          EstCache                           _estCache      = new();
-    private          GmpCache                           _gmpCache      = new();
-    private          CmpCache                           _cmpCache      = new();
-    private readonly ImcCache                           _imcCache      = new();
-
-    public bool TryGetValue(MetaManipulation manip, [NotNullWhen(true)] out IMod? mod)
-    {
-        lock (_manipulations)
-        {
-            return _manipulations.TryGetValue(manip, out mod);
-        }
-    }
+    public readonly EqpCache       Eqp       = new(manager, collection);
+    public readonly EqdpCache      Eqdp      = new(manager, collection);
+    public readonly EstCache       Est       = new(manager, collection);
+    public readonly GmpCache       Gmp       = new(manager, collection);
+    public readonly RspCache       Rsp       = new(manager, collection);
+    public readonly ImcCache       Imc       = new(manager, collection);
+    public readonly AtchCache      Atch      = new(manager, collection);
+    public readonly ShpCache       Shp       = new(manager, collection);
+    public readonly AtrCache       Atr       = new(manager, collection);
+    public readonly GlobalEqpCache GlobalEqp = new();
+    public          bool           IsDisposed { get; private set; }
 
     public int Count
-        => _manipulations.Count;
+        => Eqp.Count + Eqdp.Count + Est.Count + Gmp.Count + Rsp.Count + Imc.Count + Atch.Count + Shp.Count + Atr.Count + GlobalEqp.Count;
 
-    public IReadOnlyCollection<MetaManipulation> Manipulations
-        => _manipulations.Keys;
-
-    public IEnumerator<KeyValuePair<MetaManipulation, IMod>> GetEnumerator()
-        => _manipulations.GetEnumerator();
-
-    IEnumerator IEnumerable.GetEnumerator()
-        => GetEnumerator();
-
-    public MetaCache(MetaFileManager manager, ModCollection collection)
-    {
-        _manager    = manager;
-        _collection = collection;
-        if (!_manager.CharacterUtility.Ready)
-            _manager.CharacterUtility.LoadingFinished += ApplyStoredManipulations;
-    }
-
-    public void SetFiles()
-    {
-        _eqpCache.SetFiles(_manager);
-        _eqdpCache.SetFiles(_manager);
-        _estCache.SetFiles(_manager);
-        _gmpCache.SetFiles(_manager);
-        _cmpCache.SetFiles(_manager);
-        _imcCache.SetFiles(_collection, false);
-    }
+    public IEnumerable<(IMetaIdentifier, IMod)> IdentifierSources
+        => Eqp.Select(kvp => ((IMetaIdentifier)kvp.Key, kvp.Value.Source))
+            .Concat(Eqdp.Select(kvp => ((IMetaIdentifier)kvp.Key, kvp.Value.Source)))
+            .Concat(Est.Select(kvp => ((IMetaIdentifier)kvp.Key, kvp.Value.Source)))
+            .Concat(Gmp.Select(kvp => ((IMetaIdentifier)kvp.Key, kvp.Value.Source)))
+            .Concat(Rsp.Select(kvp => ((IMetaIdentifier)kvp.Key, kvp.Value.Source)))
+            .Concat(Imc.Select(kvp => ((IMetaIdentifier)kvp.Key, kvp.Value.Source)))
+            .Concat(Atch.Select(kvp => ((IMetaIdentifier)kvp.Key, kvp.Value.Source)))
+            .Concat(Shp.Select(kvp => ((IMetaIdentifier)kvp.Key, kvp.Value.Source)))
+            .Concat(Atr.Select(kvp => ((IMetaIdentifier)kvp.Key, kvp.Value.Source)))
+            .Concat(GlobalEqp.Select(kvp => ((IMetaIdentifier)kvp.Key, kvp.Value)));
 
     public void Reset()
     {
-        _eqpCache.Reset();
-        _eqdpCache.Reset();
-        _estCache.Reset();
-        _gmpCache.Reset();
-        _cmpCache.Reset();
-        _imcCache.Reset(_collection);
-        _manipulations.Clear();
+        Eqp.Reset();
+        Eqdp.Reset();
+        Est.Reset();
+        Gmp.Reset();
+        Rsp.Reset();
+        Imc.Reset();
+        Atch.Reset();
+        Shp.Reset();
+        Atr.Reset();
+        GlobalEqp.Clear();
     }
 
     public void Dispose()
     {
-        _manager.CharacterUtility.LoadingFinished -= ApplyStoredManipulations;
-        _eqpCache.Dispose();
-        _eqdpCache.Dispose();
-        _estCache.Dispose();
-        _gmpCache.Dispose();
-        _cmpCache.Dispose();
-        _imcCache.Dispose();
-        _manipulations.Clear();
+        if (IsDisposed)
+            return;
+
+        IsDisposed = true;
+        Eqp.Dispose();
+        Eqdp.Dispose();
+        Est.Dispose();
+        Gmp.Dispose();
+        Rsp.Dispose();
+        Imc.Dispose();
+        Atch.Dispose();
+        Shp.Dispose();
+        Atr.Dispose();
     }
 
+    public bool TryGetMod(IMetaIdentifier identifier, [NotNullWhen(true)] out IMod? mod)
+    {
+        mod = null;
+        return identifier switch
+        {
+            EqdpIdentifier i        => Eqdp.TryGetValue(i, out var p) && Convert(p, out mod),
+            EqpIdentifier i         => Eqp.TryGetValue(i, out var p) && Convert(p,  out mod),
+            EstIdentifier i         => Est.TryGetValue(i, out var p) && Convert(p,  out mod),
+            GmpIdentifier i         => Gmp.TryGetValue(i, out var p) && Convert(p,  out mod),
+            ImcIdentifier i         => Imc.TryGetValue(i, out var p) && Convert(p,  out mod),
+            RspIdentifier i         => Rsp.TryGetValue(i, out var p) && Convert(p,  out mod),
+            AtchIdentifier i        => Atch.TryGetValue(i, out var p) && Convert(p, out mod),
+            ShpIdentifier i         => Shp.TryGetValue(i, out var p) && Convert(p,  out mod),
+            AtrIdentifier i         => Atr.TryGetValue(i, out var p) && Convert(p,  out mod),
+            GlobalEqpManipulation i => GlobalEqp.TryGetValue(i, out mod),
+            _                       => false,
+        };
+
+        static bool Convert<T>((IMod, T) pair, out IMod mod)
+        {
+            mod = pair.Item1;
+            return true;
+        }
+    }
+
+    public bool RevertMod(IMetaIdentifier identifier, [NotNullWhen(true)] out IMod? mod)
+        => identifier switch
+        {
+            EqdpIdentifier i        => Eqdp.RevertMod(i, out mod),
+            EqpIdentifier i         => Eqp.RevertMod(i, out mod),
+            EstIdentifier i         => Est.RevertMod(i, out mod),
+            GmpIdentifier i         => Gmp.RevertMod(i, out mod),
+            ImcIdentifier i         => Imc.RevertMod(i, out mod),
+            RspIdentifier i         => Rsp.RevertMod(i, out mod),
+            AtchIdentifier i        => Atch.RevertMod(i, out mod),
+            ShpIdentifier i         => Shp.RevertMod(i, out mod),
+            AtrIdentifier i         => Atr.RevertMod(i, out mod),
+            GlobalEqpManipulation i => GlobalEqp.RevertMod(i, out mod),
+            _                       => (mod = null) != null,
+        };
+
+    public bool ApplyMod(IMod mod, IMetaIdentifier identifier, object entry)
+        => identifier switch
+        {
+            EqdpIdentifier i when entry is EqdpEntry e         => Eqdp.ApplyMod(mod, i, e),
+            EqdpIdentifier i when entry is EqdpEntryInternal e => Eqdp.ApplyMod(mod, i, e.ToEntry(i.Slot)),
+            EqpIdentifier i when entry is EqpEntry e           => Eqp.ApplyMod(mod, i, e),
+            EqpIdentifier i when entry is EqpEntryInternal e   => Eqp.ApplyMod(mod, i, e.ToEntry(i.Slot)),
+            EstIdentifier i when entry is EstEntry e           => Est.ApplyMod(mod, i, e),
+            GmpIdentifier i when entry is GmpEntry e           => Gmp.ApplyMod(mod, i, e),
+            ImcIdentifier i when entry is ImcEntry e           => Imc.ApplyMod(mod, i, e),
+            RspIdentifier i when entry is RspEntry e           => Rsp.ApplyMod(mod, i, e),
+            AtchIdentifier i when entry is AtchEntry e         => Atch.ApplyMod(mod, i, e),
+            ShpIdentifier i when entry is ShpEntry e           => Shp.ApplyMod(mod, i, e),
+            AtrIdentifier i when entry is AtrEntry e           => Atr.ApplyMod(mod, i, e),
+            GlobalEqpManipulation i                            => GlobalEqp.ApplyMod(mod, i),
+            _                                                  => false,
+        };
+
     ~MetaCache()
         => Dispose();
 
-    public bool ApplyMod(MetaManipulation manip, IMod mod)
-    {
-        lock (_manipulations)
-        {
-            if (_manipulations.ContainsKey(manip))
-                _manipulations.Remove(manip);
-
-            _manipulations[manip] = mod;
-        }
-
-        if (!_manager.CharacterUtility.Ready)
-            return true;
-
-        // Imc manipulations do not require character utility,
-        // but they do require the file space to be ready.
-        return manip.ManipulationType switch
-        {
-            MetaManipulation.Type.Eqp     => _eqpCache.ApplyMod(_manager, manip.Eqp),
-            MetaManipulation.Type.Eqdp    => _eqdpCache.ApplyMod(_manager, manip.Eqdp),
-            MetaManipulation.Type.Est     => _estCache.ApplyMod(_manager, manip.Est),
-            MetaManipulation.Type.Gmp     => _gmpCache.ApplyMod(_manager, manip.Gmp),
-            MetaManipulation.Type.Rsp     => _cmpCache.ApplyMod(_manager, manip.Rsp),
-            MetaManipulation.Type.Imc     => _imcCache.ApplyMod(_manager, _collection, manip.Imc),
-            MetaManipulation.Type.Unknown => false,
-            _                             => false,
-        };
-    }
-
-    public bool RevertMod(MetaManipulation manip, [NotNullWhen(true)] out IMod? mod)
-    {
-        lock (_manipulations)
-        {
-            var ret = _manipulations.Remove(manip, out mod);
-            if (!_manager.CharacterUtility.Ready)
-                return ret;
-        }
-
-        // Imc manipulations do not require character utility,
-        // but they do require the file space to be ready.
-        return manip.ManipulationType switch
-        {
-            MetaManipulation.Type.Eqp     => _eqpCache.RevertMod(_manager, manip.Eqp),
-            MetaManipulation.Type.Eqdp    => _eqdpCache.RevertMod(_manager, manip.Eqdp),
-            MetaManipulation.Type.Est     => _estCache.RevertMod(_manager, manip.Est),
-            MetaManipulation.Type.Gmp     => _gmpCache.RevertMod(_manager, manip.Gmp),
-            MetaManipulation.Type.Rsp     => _cmpCache.RevertMod(_manager, manip.Rsp),
-            MetaManipulation.Type.Imc     => _imcCache.RevertMod(_manager, _collection, manip.Imc),
-            MetaManipulation.Type.Unknown => false,
-            _                             => false,
-        };
-    }
-
-    /// <summary> Set a single file. </summary>
-    public void SetFile(MetaIndex metaIndex)
-    {
-        switch (metaIndex)
-        {
-            case MetaIndex.Eqp:
-                _eqpCache.SetFiles(_manager);
-                break;
-            case MetaIndex.Gmp:
-                _gmpCache.SetFiles(_manager);
-                break;
-            case MetaIndex.HumanCmp:
-                _cmpCache.SetFiles(_manager);
-                break;
-            case MetaIndex.FaceEst:
-            case MetaIndex.HairEst:
-            case MetaIndex.HeadEst:
-            case MetaIndex.BodyEst:
-                _estCache.SetFile(_manager, metaIndex);
-                break;
-            default:
-                _eqdpCache.SetFile(_manager, metaIndex);
-                break;
-        }
-    }
-
-    /// <summary> Set the currently relevant IMC files for the collection cache. </summary>
-    public void SetImcFiles(bool fromFullCompute)
-        => _imcCache.SetFiles(_collection, fromFullCompute);
-
-    public MetaList.MetaReverter TemporarilySetEqpFile()
-        => _eqpCache.TemporarilySetFiles(_manager);
-
-    public MetaList.MetaReverter? TemporarilySetEqdpFile(GenderRace genderRace, bool accessory)
-        => _eqdpCache.TemporarilySetFiles(_manager, genderRace, accessory);
-
-    public MetaList.MetaReverter TemporarilySetGmpFile()
-        => _gmpCache.TemporarilySetFiles(_manager);
-
-    public MetaList.MetaReverter TemporarilySetCmpFile()
-        => _cmpCache.TemporarilySetFiles(_manager);
-
-    public MetaList.MetaReverter TemporarilySetEstFile(EstManipulation.EstType type)
-        => _estCache.TemporarilySetFiles(_manager, type);
-
-
-    /// <summary> Try to obtain a manipulated IMC file. </summary>
-    public bool GetImcFile(Utf8GamePath path, [NotNullWhen(true)] out Meta.Files.ImcFile? file)
-        => _imcCache.GetImcFile(path, out file);
-
     internal EqdpEntry GetEqdpEntry(GenderRace race, bool accessory, PrimaryId primaryId)
-    {
-        var eqdpFile = _eqdpCache.EqdpFile(race, accessory);
-        if (eqdpFile != null)
-            return primaryId.Id < eqdpFile.Count ? eqdpFile[primaryId] : default;
-        else
-            return Meta.Files.ExpandedEqdpFile.GetDefault(_manager, race, accessory, primaryId);
-    }
+        => Eqdp.ApplyFullEntry(primaryId, race, accessory, Meta.Files.ExpandedEqdpFile.GetDefault(manager, race, accessory, primaryId));
 
-    internal ushort GetEstEntry(EstManipulation.EstType type, GenderRace genderRace, PrimaryId primaryId)
-        => _estCache.GetEstEntry(_manager, type, genderRace, primaryId);
-
-    /// <summary> Use this when CharacterUtility becomes ready. </summary>
-    private void ApplyStoredManipulations()
-    {
-        if (!_manager.CharacterUtility.Ready)
-            return;
-
-        var loaded = 0;
-        lock (_manipulations)
-        {
-            foreach (var manip in Manipulations)
-            {
-                loaded += manip.ManipulationType switch
-                {
-                    MetaManipulation.Type.Eqp     => _eqpCache.ApplyMod(_manager, manip.Eqp),
-                    MetaManipulation.Type.Eqdp    => _eqdpCache.ApplyMod(_manager, manip.Eqdp),
-                    MetaManipulation.Type.Est     => _estCache.ApplyMod(_manager, manip.Est),
-                    MetaManipulation.Type.Gmp     => _gmpCache.ApplyMod(_manager, manip.Gmp),
-                    MetaManipulation.Type.Rsp     => _cmpCache.ApplyMod(_manager, manip.Rsp),
-                    MetaManipulation.Type.Imc     => _imcCache.ApplyMod(_manager, _collection, manip.Imc),
-                    MetaManipulation.Type.Unknown => false,
-                    _                             => false,
-                }
-                    ? 1
-                    : 0;
-            }
-        }
-
-        _manager.ApplyDefaultFiles(_collection);
-        _manager.CharacterUtility.LoadingFinished -= ApplyStoredManipulations;
-        Penumbra.Log.Debug($"{_collection.AnonymizedName}: Loaded {loaded} delayed meta manipulations.");
-    }
+    internal EstEntry GetEstEntry(EstType type, GenderRace genderRace, PrimaryId primaryId)
+        => Est.GetEstEntry(new EstIdentifier(primaryId, type, genderRace));
 }

Penumbra/Collections/Cache/MetaCacheBase.cs

@@ -0,0 +1,47 @@
+using OtterGui.Classes;
+using Penumbra.Meta;
+using Penumbra.Meta.Manipulations;
+using Penumbra.Mods.Editor;
+
+namespace Penumbra.Collections.Cache;
+
+public abstract class MetaCacheBase<TIdentifier, TEntry>(MetaFileManager manager, ModCollection collection)
+    : ReadWriteDictionary<TIdentifier, (IMod Source, TEntry Entry)>
+    where TIdentifier : unmanaged, IMetaIdentifier
+    where TEntry : unmanaged
+{
+    protected readonly MetaFileManager      Manager    = manager;
+    protected readonly ModCollection        Collection = collection;
+
+    public bool ApplyMod(IMod source, TIdentifier identifier, TEntry entry)
+    {
+        if (TryGetValue(identifier, out var pair) && pair.Source == source && EqualityComparer<TEntry>.Default.Equals(pair.Entry, entry))
+            return false;
+
+        this[identifier] = (source, entry);
+
+        ApplyModInternal(identifier, entry);
+        return true;
+    }
+
+    public bool RevertMod(TIdentifier identifier, [NotNullWhen(true)] out IMod? mod)
+    {
+        if (!Remove(identifier, out var pair))
+        {
+            mod = null;
+            return false;
+        }
+
+        mod = pair.Source;
+
+        RevertModInternal(identifier);
+        return true;
+    }
+
+
+    protected virtual void ApplyModInternal(TIdentifier identifier, TEntry entry)
+    { }
+
+    protected virtual void RevertModInternal(TIdentifier identifier)
+    { }
+}

Penumbra/Collections/Cache/RspCache.cs

@@ -0,0 +1,13 @@
+using Penumbra.Meta;
+using Penumbra.Meta.Manipulations;
+
+namespace Penumbra.Collections.Cache;
+
+public sealed class RspCache(MetaFileManager manager, ModCollection collection) : MetaCacheBase<RspIdentifier, RspEntry>(manager, collection)
+{
+    public void Reset()
+        => Clear();
+
+    protected override void Dispose(bool _)
+        => Clear();
+}

Penumbra/Collections/Cache/ShapeAttributeHashSet.cs

@@ -0,0 +1,181 @@
+using System.Collections.Frozen;
+using OtterGui.Extensions;
+using Penumbra.GameData.Enums;
+using Penumbra.GameData.Structs;
+using Penumbra.Meta;
+
+namespace Penumbra.Collections.Cache;
+
+public sealed class ShapeAttributeHashSet : Dictionary<(HumanSlot Slot, PrimaryId Id), ulong>
+{
+    public static readonly IReadOnlyList<GenderRace> GenderRaceValues =
+    [
+        GenderRace.Unknown, GenderRace.MidlanderMale, GenderRace.MidlanderFemale, GenderRace.HighlanderMale, GenderRace.HighlanderFemale,
+        GenderRace.ElezenMale, GenderRace.ElezenFemale, GenderRace.MiqoteMale, GenderRace.MiqoteFemale, GenderRace.RoegadynMale,
+        GenderRace.RoegadynFemale, GenderRace.LalafellMale, GenderRace.LalafellFemale, GenderRace.AuRaMale, GenderRace.AuRaFemale,
+        GenderRace.HrothgarMale, GenderRace.HrothgarFemale, GenderRace.VieraMale, GenderRace.VieraFemale,
+    ];
+
+    public static readonly FrozenDictionary<GenderRace, int> GenderRaceIndices =
+        GenderRaceValues.WithIndex().ToFrozenDictionary(p => p.Value, p => p.Index);
+
+    private readonly BitArray _allIds = new(2 * (ShapeAttributeManager.ModelSlotSize + 1) * GenderRaceValues.Count);
+
+    public bool? this[HumanSlot slot]
+        => AllCheck(ToIndex(slot, 0));
+
+    public bool? this[GenderRace genderRace]
+        => ToIndex(HumanSlot.Unknown, genderRace, out var index) ? AllCheck(index) : null;
+
+    public bool? this[HumanSlot slot, GenderRace genderRace]
+        => ToIndex(slot, genderRace, out var index) ? AllCheck(index) : null;
+
+    public bool? All
+        => Convert(_allIds[2 * AllIndex], _allIds[2 * AllIndex + 1]);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    private bool? AllCheck(int idx)
+        => Convert(_allIds[idx], _allIds[idx + 1]);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    private static int ToIndex(HumanSlot slot, int genderRaceIndex)
+        => 2 * (slot is HumanSlot.Unknown ? genderRaceIndex + AllIndex : genderRaceIndex + (int)slot * GenderRaceValues.Count);
+
+    [MethodImpl(MethodImplOptions.AggressiveOptimization)]
+    public bool? CheckEntry(HumanSlot slot, PrimaryId id, GenderRace genderRace)
+    {
+        if (!GenderRaceIndices.TryGetValue(genderRace, out var index))
+            return null;
+
+        // Check for specific ID.
+        if (TryGetValue((slot, id), out var flags))
+        {
+            // Check completely specified entry.
+            if (Convert(flags, 2 * index) is { } specified)
+                return specified;
+
+            // Check any gender / race.
+            if (Convert(flags, 0) is { } anyGr)
+                return anyGr;
+        }
+
+        // Check for specified gender / race and slot, but no ID.
+        if (AllCheck(ToIndex(slot, index)) is { } noIdButGr)
+            return noIdButGr;
+
+        // Check for specified gender / race but no slot or ID.
+        if (AllCheck(ToIndex(HumanSlot.Unknown, index)) is { } noSlotButGr)
+            return noSlotButGr;
+
+        // Check for specified slot but no gender / race or ID.
+        if (AllCheck(ToIndex(slot, 0)) is { } noGrButSlot)
+            return noGrButSlot;
+
+        return All;
+    }
+
+    public bool TrySet(HumanSlot slot, PrimaryId? id, GenderRace genderRace, bool? value, out bool which)
+    {
+        which = false;
+        if (!GenderRaceIndices.TryGetValue(genderRace, out var index))
+            return false;
+
+        if (!id.HasValue)
+        {
+            var slotIndex = ToIndex(slot, index);
+            var ret       = false;
+            if (value is true)
+            {
+                if (!_allIds[slotIndex])
+                    ret = true;
+                _allIds[slotIndex]     = true;
+                _allIds[slotIndex + 1] = false;
+            }
+            else if (value is false)
+            {
+                if (!_allIds[slotIndex + 1])
+                    ret = true;
+                _allIds[slotIndex]     = false;
+                _allIds[slotIndex + 1] = true;
+            }
+            else
+            {
+                if (_allIds[slotIndex])
+                {
+                    which = true;
+                    ret   = true;
+                }
+                else if (_allIds[slotIndex + 1])
+                {
+                    which = false;
+                    ret   = true;
+                }
+
+                _allIds[slotIndex]     = false;
+                _allIds[slotIndex + 1] = false;
+            }
+
+            return ret;
+        }
+
+        if (TryGetValue((slot, id.Value), out var flags))
+        {
+            index *= 2;
+            var newFlags = value switch
+            {
+                true  => (flags | (1ul << index)) & ~(1ul << (index + 1)),
+                false => (flags & ~(1ul << index)) | (1ul << (index + 1)),
+                _     => flags & ~(1ul << index) & ~(1ul << (index + 1)),
+            };
+            if (newFlags == flags)
+                return false;
+
+            this[(slot, id.Value)] = newFlags;
+            which                  = (flags & (1ul << index)) is not 0;
+            return true;
+        }
+
+        if (value is null)
+            return false;
+
+        this[(slot, id.Value)] = 1ul << (2 * index + (value.Value ? 0 : 1));
+        return true;
+    }
+
+    public new void Clear()
+    {
+        base.Clear();
+        _allIds.SetAll(false);
+    }
+
+    public bool IsEmpty
+        => !_allIds.HasAnySet() && Count is 0;
+
+    private static readonly int AllIndex = ShapeAttributeManager.ModelSlotSize * GenderRaceValues.Count;
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    private static bool ToIndex(HumanSlot slot, GenderRace genderRace, out int index)
+    {
+        if (!GenderRaceIndices.TryGetValue(genderRace, out index))
+            return false;
+
+        index = ToIndex(slot, index);
+        return true;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    private static bool? Convert(bool trueValue, bool falseValue)
+        => trueValue ? true : falseValue ? false : null;
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    private static bool? Convert(ulong mask, int idx)
+    {
+        mask >>= idx;
+        return (mask & 3) switch
+        {
+            1 => true,
+            2 => false,
+            _ => null,
+        };
+    }
+}

Penumbra/Collections/Cache/ShpCache.cs

@@ -0,0 +1,106 @@
+using Penumbra.GameData.Enums;
+using Penumbra.GameData.Structs;
+using Penumbra.Meta;
+using Penumbra.Meta.Manipulations;
+
+namespace Penumbra.Collections.Cache;
+
+public sealed class ShpCache(MetaFileManager manager, ModCollection collection) : MetaCacheBase<ShpIdentifier, ShpEntry>(manager, collection)
+{
+    public bool ShouldBeEnabled(in ShapeAttributeString shape, HumanSlot slot, PrimaryId id, GenderRace genderRace)
+        => EnabledCount > 0 && _shpData.TryGetValue(shape, out var value) && value.CheckEntry(slot, id, genderRace) is true;
+
+    public bool ShouldBeDisabled(in ShapeAttributeString shape, HumanSlot slot, PrimaryId id, GenderRace genderRace)
+        => DisabledCount > 0 && _shpData.TryGetValue(shape, out var value) && value.CheckEntry(slot, id, genderRace) is false;
+
+    internal IReadOnlyDictionary<ShapeAttributeString, ShapeAttributeHashSet> State(ShapeConnectorCondition connector)
+        => connector switch
+        {
+            ShapeConnectorCondition.None   => _shpData,
+            ShapeConnectorCondition.Wrists => _wristConnectors,
+            ShapeConnectorCondition.Waist  => _waistConnectors,
+            ShapeConnectorCondition.Ankles => _ankleConnectors,
+            _                              => [],
+        };
+
+    public int EnabledCount  { get; private set; }
+    public int DisabledCount { get; private set; }
+
+    private readonly Dictionary<ShapeAttributeString, ShapeAttributeHashSet> _shpData         = [];
+    private readonly Dictionary<ShapeAttributeString, ShapeAttributeHashSet> _wristConnectors = [];
+    private readonly Dictionary<ShapeAttributeString, ShapeAttributeHashSet> _waistConnectors = [];
+    private readonly Dictionary<ShapeAttributeString, ShapeAttributeHashSet> _ankleConnectors = [];
+
+    public void Reset()
+    {
+        Clear();
+        _shpData.Clear();
+        _wristConnectors.Clear();
+        _waistConnectors.Clear();
+        _ankleConnectors.Clear();
+        EnabledCount  = 0;
+        DisabledCount = 0;
+    }
+
+    protected override void Dispose(bool _)
+        => Reset();
+
+    protected override void ApplyModInternal(ShpIdentifier identifier, ShpEntry entry)
+    {
+        switch (identifier.ConnectorCondition)
+        {
+            case ShapeConnectorCondition.None:   Func(_shpData); break;
+            case ShapeConnectorCondition.Wrists: Func(_wristConnectors); break;
+            case ShapeConnectorCondition.Waist:  Func(_waistConnectors); break;
+            case ShapeConnectorCondition.Ankles: Func(_ankleConnectors); break;
+        }
+
+        return;
+
+        void Func(Dictionary<ShapeAttributeString, ShapeAttributeHashSet> dict)
+        {
+            if (!dict.TryGetValue(identifier.Shape, out var value))
+            {
+                value = [];
+                dict.Add(identifier.Shape, value);
+            }
+
+            if (value.TrySet(identifier.Slot, identifier.Id, identifier.GenderRaceCondition, entry.Value, out _))
+            {
+                if (entry.Value)
+                    ++EnabledCount;
+                else
+                    ++DisabledCount;
+            }
+        }
+    }
+
+    protected override void RevertModInternal(ShpIdentifier identifier)
+    {
+        switch (identifier.ConnectorCondition)
+        {
+            case ShapeConnectorCondition.None:   Func(_shpData); break;
+            case ShapeConnectorCondition.Wrists: Func(_wristConnectors); break;
+            case ShapeConnectorCondition.Waist:  Func(_waistConnectors); break;
+            case ShapeConnectorCondition.Ankles: Func(_ankleConnectors); break;
+        }
+
+        return;
+
+        void Func(Dictionary<ShapeAttributeString, ShapeAttributeHashSet> dict)
+        {
+            if (!dict.TryGetValue(identifier.Shape, out var value))
+                return;
+
+            if (value.TrySet(identifier.Slot, identifier.Id, identifier.GenderRaceCondition, null, out var which))
+            {
+                if (which)
+                    --EnabledCount;
+                else
+                    --DisabledCount;
+                if (value.IsEmpty)
+                    dict.Remove(identifier.Shape);
+            }
+        }
+    }
+}

Penumbra/Collections/CollectionAutoSelector.cs

@@ -0,0 +1,82 @@
+using Dalamud.Plugin.Services;
+using OtterGui.Services;
+using Penumbra.Collections.Manager;
+using Penumbra.GameData.Interop;
+using Penumbra.Interop.PathResolving;
+
+namespace Penumbra.Collections;
+
+public sealed class CollectionAutoSelector : IService, IDisposable
+{
+    private readonly Configuration      _config;
+    private readonly ActiveCollections  _collections;
+    private readonly IClientState       _clientState;
+    private readonly CollectionResolver _resolver;
+    private readonly ObjectManager      _objects;
+
+    public CollectionAutoSelector(Configuration config, ActiveCollections collections, IClientState clientState, CollectionResolver resolver,
+        ObjectManager objects)
+    {
+        _config      = config;
+        _collections = collections;
+        _clientState = clientState;
+        _resolver    = resolver;
+        _objects     = objects;
+
+        if (_config.AutoSelectCollection)
+            Attach();
+    }
+
+    public bool Disposed { get; private set; }
+
+    public void SetAutomaticSelection(bool value)
+    {
+        _config.AutoSelectCollection = value;
+        if (value)
+            Attach();
+        else
+            Detach();
+    }
+
+    private void Attach()
+    {
+        if (Disposed)
+            return;
+
+        _clientState.Login += OnLogin;
+        Select();
+    }
+
+    private void OnLogin()
+        => Select();
+
+    private void Detach()
+        => _clientState.Login -= OnLogin;
+
+    private void Select()
+    {
+        if (!_objects[0].IsCharacter)
+            return;
+
+        var collection = _resolver.PlayerCollection();
+        if (collection.Identity.Id == Guid.Empty)
+        {
+            Penumbra.Log.Debug($"Not setting current collection because character has no mods assigned.");
+        }
+        else
+        {
+            Penumbra.Log.Debug($"Setting current collection to {collection.Identity.Identifier} through automatic collection selection.");
+            _collections.SetCollection(collection, CollectionType.Current);
+        }
+    }
+
+
+    public void Dispose()
+    {
+        if (Disposed)
+            return;
+
+        Disposed = true;
+        Detach();
+    }
+}

Penumbra/Collections/CollectionCounters.cs

@@ -0,0 +1,28 @@
+namespace Penumbra.Collections;
+
+public struct CollectionCounters(int changeCounter)
+{
+    /// <summary> Count the number of changes of the effective file list. </summary>
+    public int Change { get; private set; } = changeCounter;
+
+    /// <summary> Count the number of IMC-relevant changes of the effective file list. </summary>
+    public int Imc    { get; private set; }
+
+    /// <summary> Count the number of ATCH-relevant changes of the effective file list. </summary>
+    public int Atch   { get; private set; }
+
+    /// <summary> Increment the number of changes in the effective file list. </summary>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public int IncrementChange()
+        => ++Change;
+
+    /// <summary> Increment the number of IMC-relevant changes in the effective file list. </summary>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public int IncrementImc()
+        => ++Imc;
+
+    /// <summary> Increment the number of ATCH-relevant changes in the effective file list. </summary>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public int IncrementAtch()
+        => ++Atch;
+}

Penumbra/Collections/Manager/ActiveCollectionMigration.cs

@@ -1,4 +1,4 @@
-using Dalamud.Interface.Internal.Notifications;
+using Dalamud.Interface.ImGuiNotification;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using OtterGui.Classes;
@@ -48,7 +48,7 @@ public static class ActiveCollectionMigration
             if (!storage.ByName(collectionName, out var collection))
             {
                 Penumbra.Messager.NotificationMessage(
-                    $"Last choice of <{player}>'s Collection {collectionName} is not available, reset to {ModCollection.Empty.Name}.", NotificationType.Warning);
+                    $"Last choice of <{player}>'s Collection {collectionName} is not available, reset to {ModCollection.Empty.Identity.Name}.", NotificationType.Warning);
                 dict.Add(player, ModCollection.Empty);
             }
             else

Penumbra/Collections/Manager/ActiveCollections.cs

@@ -1,8 +1,9 @@
-using Dalamud.Interface.Internal.Notifications;
+using Dalamud.Interface.ImGuiNotification;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
+using OtterGui.Services;
 using Penumbra.Communication;
 using Penumbra.GameData.Actors;
 using Penumbra.GameData.Enums;
@@ -11,7 +12,7 @@ using Penumbra.UI;
 
 namespace Penumbra.Collections.Manager;
 
-public class ActiveCollectionData
+public class ActiveCollectionData : IService
 {
     public ModCollection Current   { get; internal set; } = ModCollection.Empty;
     public ModCollection Default   { get; internal set; } = ModCollection.Empty;
@@ -20,9 +21,9 @@ public class ActiveCollectionData
     public readonly ModCollection?[] SpecialCollections = new ModCollection?[Enum.GetValues<Api.Enums.ApiCollectionType>().Length - 3];
 }
 
-public class ActiveCollections : ISavable, IDisposable
+public class ActiveCollections : ISavable, IDisposable, IService
 {
-    public const int Version = 1;
+    public const int Version = 2;
 
     private readonly CollectionStorage    _storage;
     private readonly CommunicatorService  _communicator;
@@ -218,7 +219,7 @@ public class ActiveCollections : ISavable, IDisposable
             _                                 => null,
         };
 
-        if (oldCollection == null || collection == oldCollection || collection.Index >= _storage.Count)
+        if (oldCollection == null || collection == oldCollection || collection.Identity.Index >= _storage.Count)
             return;
 
         switch (collectionType)
@@ -261,16 +262,17 @@ public class ActiveCollections : ISavable, IDisposable
         var jObj = new JObject
         {
             { nameof(Version), Version },
-            { nameof(Default), Default.Name },
-            { nameof(Interface), Interface.Name },
-            { nameof(Current), Current.Name },
+            { nameof(Default), Default.Identity.Id },
+            { nameof(Interface), Interface.Identity.Id },
+            { nameof(Current), Current.Identity.Id },
         };
         foreach (var (type, collection) in SpecialCollections.WithIndex().Where(p => p.Value != null)
                      .Select(p => ((CollectionType)p.Index, p.Value!)))
-            jObj.Add(type.ToString(), collection.Name);
+            jObj.Add(type.ToString(), collection.Identity.Id);
 
         jObj.Add(nameof(Individuals), Individuals.ToJObject());
-        using var j = new JsonTextWriter(writer) { Formatting = Formatting.Indented };
+        using var j = new JsonTextWriter(writer);
+        j.Formatting = Formatting.Indented;
         jObj.WriteTo(j);
     }
 
@@ -280,7 +282,7 @@ public class ActiveCollections : ISavable, IDisposable
             .Prepend(Interface)
             .Prepend(Default)
             .Concat(Individuals.Assignments.Select(kvp => kvp.Collection))
-            .SelectMany(c => c.GetFlattenedInheritance()).Contains(Current);
+            .SelectMany(c => c.Inheritance.FlatHierarchy).Contains(Current);
 
     /// <summary> Save if any of the active collections is changed and set new collections to Current. </summary>
     private void OnCollectionChange(CollectionType collectionType, ModCollection? oldCollection, ModCollection? newCollection, string _3)
@@ -298,7 +300,7 @@ public class ActiveCollections : ISavable, IDisposable
                 if (oldCollection == Interface)
                     SetCollection(ModCollection.Empty, CollectionType.Interface);
                 if (oldCollection == Current)
-                    SetCollection(Default.Index > ModCollection.Empty.Index ? Default : _storage.DefaultNamed, CollectionType.Current);
+                    SetCollection(Default.Identity.Index > ModCollection.Empty.Identity.Index ? Default : _storage.DefaultNamed, CollectionType.Current);
 
                 for (var i = 0; i < SpecialCollections.Length; ++i)
                 {
@@ -319,22 +321,16 @@ public class ActiveCollections : ISavable, IDisposable
         }
     }
 
-    /// <summary>
-    /// Load default, current, special, and character collections from config.
-    /// If a collection does not exist anymore, reset it to an appropriate default.
-    /// </summary>
-    private void LoadCollections()
+    private bool LoadCollectionsV1(JObject jObject)
     {
-        Penumbra.Log.Debug("[Collections] Reading collection assignments...");
-        var configChanged = !Load(_saveService.FileNames, out var jObject);
-
-        // Load the default collection. If the string does not exist take the Default name if no file existed or the Empty name if one existed.
-        var defaultName = jObject[nameof(Default)]?.ToObject<string>()
-         ?? (configChanged ? ModCollection.DefaultCollectionName : ModCollection.Empty.Name);
+        var configChanged = false;
+        // Load the default collection. If the name does not exist take the empty collection.
+        var defaultName = jObject[nameof(Default)]?.ToObject<string>() ?? ModCollection.Empty.Identity.Name;
         if (!_storage.ByName(defaultName, out var defaultCollection))
         {
             Penumbra.Messager.NotificationMessage(
-                $"Last choice of {TutorialService.DefaultCollection} {defaultName} is not available, reset to {ModCollection.Empty.Name}.", NotificationType.Warning);
+                $"Last choice of {TutorialService.DefaultCollection} {defaultName} is not available, reset to {ModCollection.Empty.Identity.Name}.",
+                NotificationType.Warning);
             Default       = ModCollection.Empty;
             configChanged = true;
         }
@@ -344,11 +340,12 @@ public class ActiveCollections : ISavable, IDisposable
         }
 
         // Load the interface collection. If no string is set, use the name of whatever was set as Default.
-        var interfaceName = jObject[nameof(Interface)]?.ToObject<string>() ?? Default.Name;
+        var interfaceName = jObject[nameof(Interface)]?.ToObject<string>() ?? Default.Identity.Name;
         if (!_storage.ByName(interfaceName, out var interfaceCollection))
         {
             Penumbra.Messager.NotificationMessage(
-                $"Last choice of {TutorialService.InterfaceCollection} {interfaceName} is not available, reset to {ModCollection.Empty.Name}.", NotificationType.Warning);
+                $"Last choice of {TutorialService.InterfaceCollection} {interfaceName} is not available, reset to {ModCollection.Empty.Identity.Name}.",
+                NotificationType.Warning);
             Interface     = ModCollection.Empty;
             configChanged = true;
         }
@@ -358,11 +355,12 @@ public class ActiveCollections : ISavable, IDisposable
         }
 
         // Load the current collection.
-        var currentName = jObject[nameof(Current)]?.ToObject<string>() ?? Default.Name;
+        var currentName = jObject[nameof(Current)]?.ToObject<string>() ?? Default.Identity.Name;
         if (!_storage.ByName(currentName, out var currentCollection))
         {
             Penumbra.Messager.NotificationMessage(
-                $"Last choice of {TutorialService.SelectedCollection} {currentName} is not available, reset to {ModCollection.DefaultCollectionName}.", NotificationType.Warning);
+                $"Last choice of {TutorialService.SelectedCollection} {currentName} is not available, reset to {ModCollectionIdentity.DefaultCollectionName}.",
+                NotificationType.Warning);
             Current       = _storage.DefaultNamed;
             configChanged = true;
         }
@@ -393,11 +391,124 @@ public class ActiveCollections : ISavable, IDisposable
         Penumbra.Log.Debug("[Collections] Loaded non-individual collection assignments.");
 
         configChanged |= ActiveCollectionMigration.MigrateIndividualCollections(_storage, Individuals, jObject);
-        configChanged |= Individuals.ReadJObject(_saveService, this, jObject[nameof(Individuals)] as JArray, _storage);
+        configChanged |= Individuals.ReadJObject(_saveService, this, jObject[nameof(Individuals)] as JArray, _storage, 1);
 
-        // Save any changes.
-        if (configChanged)
-            _saveService.ImmediateSave(this);
+        return configChanged;
+    }
+
+    private bool LoadCollectionsV2(JObject jObject)
+    {
+        var configChanged = false;
+        // Load the default collection. If the guid does not exist take the empty collection.
+        var defaultId = jObject[nameof(Default)]?.ToObject<Guid>() ?? Guid.Empty;
+        if (!_storage.ById(defaultId, out var defaultCollection))
+        {
+            Penumbra.Messager.NotificationMessage(
+                $"Last choice of {TutorialService.DefaultCollection} {defaultId} is not available, reset to {ModCollection.Empty.Identity.Name}.",
+                NotificationType.Warning);
+            Default       = ModCollection.Empty;
+            configChanged = true;
+        }
+        else
+        {
+            Default = defaultCollection;
+        }
+
+        // Load the interface collection. If no string is set, use the name of whatever was set as Default.
+        var interfaceId = jObject[nameof(Interface)]?.ToObject<Guid>() ?? Default.Identity.Id;
+        if (!_storage.ById(interfaceId, out var interfaceCollection))
+        {
+            Penumbra.Messager.NotificationMessage(
+                $"Last choice of {TutorialService.InterfaceCollection} {interfaceId} is not available, reset to {ModCollection.Empty.Identity.Name}.",
+                NotificationType.Warning);
+            Interface     = ModCollection.Empty;
+            configChanged = true;
+        }
+        else
+        {
+            Interface = interfaceCollection;
+        }
+
+        // Load the current collection.
+        var currentId = jObject[nameof(Current)]?.ToObject<Guid>() ?? _storage.DefaultNamed.Identity.Id;
+        if (!_storage.ById(currentId, out var currentCollection))
+        {
+            Penumbra.Messager.NotificationMessage(
+                $"Last choice of {TutorialService.SelectedCollection} {currentId} is not available, reset to {ModCollectionIdentity.DefaultCollectionName}.",
+                NotificationType.Warning);
+            Current       = _storage.DefaultNamed;
+            configChanged = true;
+        }
+        else
+        {
+            Current = currentCollection;
+        }
+
+        // Load special collections.
+        foreach (var (type, name, _) in CollectionTypeExtensions.Special)
+        {
+            var typeId = jObject[type.ToString()]?.ToObject<Guid>();
+            if (typeId == null)
+                continue;
+
+            if (!_storage.ById(typeId.Value, out var typeCollection))
+            {
+                Penumbra.Messager.NotificationMessage($"Last choice of {name} Collection {typeId.Value} is not available, removed.",
+                    NotificationType.Warning);
+                configChanged = true;
+            }
+            else
+            {
+                SpecialCollections[(int)type] = typeCollection;
+            }
+        }
+
+        Penumbra.Log.Debug("[Collections] Loaded non-individual collection assignments.");
+
+        configChanged |= ActiveCollectionMigration.MigrateIndividualCollections(_storage, Individuals, jObject);
+        configChanged |= Individuals.ReadJObject(_saveService, this, jObject[nameof(Individuals)] as JArray, _storage, 2);
+
+        return configChanged;
+    }
+
+    private bool LoadCollectionsNew()
+    {
+        Current   = _storage.DefaultNamed;
+        Default   = _storage.DefaultNamed;
+        Interface = _storage.DefaultNamed;
+        return true;
+    }
+
+    /// <summary>
+    /// Load default, current, special, and character collections from config.
+    /// If a collection does not exist anymore, reset it to an appropriate default.
+    /// </summary>
+    private void LoadCollections()
+    {
+        Penumbra.Log.Debug("[Collections] Reading collection assignments...");
+        var configChanged = !Load(_saveService.FileNames, out var jObject);
+        var version       = jObject["Version"]?.ToObject<int>() ?? 0;
+        var changed       = false;
+        switch (version)
+        {
+            case 1:
+                changed = LoadCollectionsV1(jObject);
+                break;
+            case 2:
+                changed = LoadCollectionsV2(jObject);
+                break;
+            case 0 when configChanged:
+                changed = LoadCollectionsNew();
+                break;
+            case 0:
+                Penumbra.Messager.NotificationMessage("Active Collections File has unknown version and will be reset.",
+                    NotificationType.Warning);
+                changed = LoadCollectionsNew();
+                break;
+        }
+
+        if (changed)
+            _saveService.ImmediateSaveSync(this);
     }
 
     /// <summary>
@@ -410,7 +521,7 @@ public class ActiveCollections : ISavable, IDisposable
         var jObj = BackupService.GetJObjectForFile(fileNames, file);
         if (jObj == null)
         {
-            ret = new JObject();
+            ret = [];
             return false;
         }
 
@@ -476,7 +587,7 @@ public class ActiveCollections : ISavable, IDisposable
                     case IdentifierType.Player when id.HomeWorld != ushort.MaxValue:
                     {
                         var global = ByType(CollectionType.Individual, _actors.CreatePlayer(id.PlayerName, ushort.MaxValue));
-                        return global?.Index == checkAssignment.Index
+                        return (global != null ? global.Identity.Index : null) == checkAssignment.Identity.Index
                             ? "Assignment is redundant due to an identical Any-World assignment existing.\nYou can remove it."
                             : string.Empty;
                     }
@@ -485,12 +596,12 @@ public class ActiveCollections : ISavable, IDisposable
                         {
                             var global = ByType(CollectionType.Individual,
                                 _actors.CreateOwned(id.PlayerName, ushort.MaxValue, id.Kind, id.DataId));
-                            if (global?.Index == checkAssignment.Index)
+                            if ((global != null ? global.Identity.Index : null) == checkAssignment.Identity.Index)
                                 return "Assignment is redundant due to an identical Any-World assignment existing.\nYou can remove it.";
                         }
 
                         var unowned = ByType(CollectionType.Individual, _actors.CreateNpc(id.Kind, id.DataId));
-                        return unowned?.Index == checkAssignment.Index
+                        return (unowned != null ? unowned.Identity.Index : null) == checkAssignment.Identity.Index
                             ? "Assignment is redundant due to an identical unowned NPC assignment existing.\nYou can remove it."
                             : string.Empty;
                 }
@@ -506,7 +617,7 @@ public class ActiveCollections : ISavable, IDisposable
                 if (maleNpc == null)
                 {
                     maleNpc = Default;
-                    if (maleNpc.Index != checkAssignment.Index)
+                    if (maleNpc.Identity.Index != checkAssignment.Identity.Index)
                         return string.Empty;
 
                     collection1 = CollectionType.Default;
@@ -515,7 +626,7 @@ public class ActiveCollections : ISavable, IDisposable
                 if (femaleNpc == null)
                 {
                     femaleNpc = Default;
-                    if (femaleNpc.Index != checkAssignment.Index)
+                    if (femaleNpc.Identity.Index != checkAssignment.Identity.Index)
                         return string.Empty;
 
                     collection2 = CollectionType.Default;
@@ -535,7 +646,7 @@ public class ActiveCollections : ISavable, IDisposable
                     if (assignment == null)
                         continue;
 
-                    if (assignment.Index == checkAssignment.Index)
+                    if (assignment.Identity.Index == checkAssignment.Identity.Index)
                         return
                             $"Assignment is currently redundant due to overwriting {parentType.ToName()} with an identical collection.\nYou can remove it.";
                 }

Penumbra/Collections/Manager/CollectionEditor.cs

@@ -1,32 +1,22 @@
-using OtterGui;
+using OtterGui.Extensions;
+using OtterGui.Services;
 using Penumbra.Api.Enums;
 using Penumbra.Mods;
 using Penumbra.Mods.Manager;
-using Penumbra.Mods.Subclasses;
+using Penumbra.Mods.Settings;
 using Penumbra.Services;
 
 namespace Penumbra.Collections.Manager;
 
-public class CollectionEditor
+public class CollectionEditor(SaveService saveService, CommunicatorService communicator, ModStorage modStorage) : IService
 {
-    private readonly CommunicatorService _communicator;
-    private readonly SaveService         _saveService;
-    private readonly ModStorage          _modStorage;
-
-    public CollectionEditor(SaveService saveService, CommunicatorService communicator, ModStorage modStorage)
-    {
-        _saveService  = saveService;
-        _communicator = communicator;
-        _modStorage   = modStorage;
-    }
-
     /// <summary> Enable or disable the mod inheritance of mod idx. </summary>
     public bool SetModInheritance(ModCollection collection, Mod mod, bool inherit)
     {
         if (!FixInheritance(collection, mod, inherit))
             return false;
 
-        InvokeChange(collection, ModSettingChange.Inheritance, mod, inherit ? 0 : 1, 0);
+        InvokeChange(collection, ModSettingChange.Inheritance, mod, inherit ? Setting.False : Setting.True, 0);
         return true;
     }
 
@@ -36,13 +26,14 @@ public class CollectionEditor
     /// </summary>
     public bool SetModState(ModCollection collection, Mod mod, bool newValue)
     {
-        var oldValue = collection.Settings[mod.Index]?.Enabled ?? collection[mod.Index].Settings?.Enabled ?? false;
+        var oldValue = collection.GetInheritedSettings(mod.Index).Settings?.Enabled ?? false;
         if (newValue == oldValue)
             return false;
 
         var inheritance = FixInheritance(collection, mod, false);
-        ((List<ModSettings?>)collection.Settings)[mod.Index]!.Enabled = newValue;
-        InvokeChange(collection, ModSettingChange.EnableState, mod, inheritance ? -1 : newValue ? 0 : 1, 0);
+        collection.GetOwnSettings(mod.Index)!.Enabled = newValue;
+        InvokeChange(collection, ModSettingChange.EnableState, mod, inheritance ? Setting.Indefinite : newValue ? Setting.False : Setting.True,
+            0);
         return true;
     }
 
@@ -52,7 +43,7 @@ public class CollectionEditor
         if (!mods.Aggregate(false, (current, mod) => current | FixInheritance(collection, mod, inherit)))
             return;
 
-        InvokeChange(collection, ModSettingChange.MultiInheritance, null, -1, 0);
+        InvokeChange(collection, ModSettingChange.MultiInheritance, null, Setting.Indefinite, 0);
     }
 
     /// <summary>
@@ -64,56 +55,85 @@ public class CollectionEditor
         var changes = false;
         foreach (var mod in mods)
         {
-            var oldValue = collection.Settings[mod.Index]?.Enabled;
+            var oldValue = collection.GetOwnSettings(mod.Index)?.Enabled;
             if (newValue == oldValue)
                 continue;
 
             FixInheritance(collection, mod, false);
-            ((List<ModSettings?>)collection.Settings)[mod.Index]!.Enabled = newValue;
-            changes                                                       = true;
+            collection.GetOwnSettings(mod.Index)!.Enabled = newValue;
+            changes                                       = true;
         }
 
         if (!changes)
             return;
 
-        InvokeChange(collection, ModSettingChange.MultiEnableState, null, -1, 0);
+        InvokeChange(collection, ModSettingChange.MultiEnableState, null, Setting.Indefinite, 0);
     }
 
     /// <summary>
     /// Set the priority of mod idx to newValue if it differs from the current priority.
     /// If the mod is currently inherited, stop the inheritance.
     /// </summary>
-    public bool SetModPriority(ModCollection collection, Mod mod, int newValue)
+    public bool SetModPriority(ModCollection collection, Mod mod, ModPriority newValue)
     {
-        var oldValue = collection.Settings[mod.Index]?.Priority ?? collection[mod.Index].Settings?.Priority ?? 0;
+        var oldValue = collection.GetInheritedSettings(mod.Index).Settings?.Priority ?? ModPriority.Default;
         if (newValue == oldValue)
             return false;
 
         var inheritance = FixInheritance(collection, mod, false);
-        ((List<ModSettings?>)collection.Settings)[mod.Index]!.Priority = newValue;
-        InvokeChange(collection, ModSettingChange.Priority, mod, inheritance ? -1 : oldValue, 0);
+        collection.GetOwnSettings(mod.Index)!.Priority = newValue;
+        InvokeChange(collection, ModSettingChange.Priority, mod, inheritance ? Setting.Indefinite : oldValue.AsSetting, 0);
         return true;
     }
 
     /// <summary>
     /// Set a given setting group settingName of mod idx to newValue if it differs from the current value and fix it if necessary.
-    /// /// If the mod is currently inherited, stop the inheritance.
+    /// If the mod is currently inherited, stop the inheritance.
     /// </summary>
-    public bool SetModSetting(ModCollection collection, Mod mod, int groupIdx, uint newValue)
+    public bool SetModSetting(ModCollection collection, Mod mod, int groupIdx, Setting newValue)
     {
-        var settings = collection.Settings[mod.Index] != null
-            ? collection.Settings[mod.Index]!.Settings
-            : collection[mod.Index].Settings?.Settings;
+        var settings = collection.GetInheritedSettings(mod.Index).Settings?.Settings;
         var oldValue = settings?[groupIdx] ?? mod.Groups[groupIdx].DefaultSettings;
         if (oldValue == newValue)
             return false;
 
         var inheritance = FixInheritance(collection, mod, false);
-        ((List<ModSettings?>)collection.Settings)[mod.Index]!.SetValue(mod, groupIdx, newValue);
-        InvokeChange(collection, ModSettingChange.Setting, mod, inheritance ? -1 : (int)oldValue, groupIdx);
+        collection.GetOwnSettings(mod.Index)!.SetValue(mod, groupIdx, newValue);
+        InvokeChange(collection, ModSettingChange.Setting, mod, inheritance ? Setting.Indefinite : oldValue, groupIdx);
         return true;
     }
 
+    public bool SetTemporarySettings(ModCollection collection, Mod mod, TemporaryModSettings? settings, int key = 0)
+    {
+        key = settings?.Lock ?? key;
+        if (!CanSetTemporarySettings(collection, mod, key))
+            return false;
+
+        collection.Settings.SetTemporary(mod.Index, settings);
+        InvokeChange(collection, ModSettingChange.TemporarySetting, mod, Setting.Indefinite, 0);
+        return true;
+    }
+
+    public int ClearTemporarySettings(ModCollection collection, int key = 0)
+    {
+        var numRemoved = 0;
+        for (var i = 0; i < collection.Settings.Count; ++i)
+        {
+            if (collection.GetTempSettings(i) is { } tempSettings
+             && tempSettings.Lock == key
+             && SetTemporarySettings(collection, modStorage[i], null, key))
+                ++numRemoved;
+        }
+
+        return numRemoved;
+    }
+
+    public bool CanSetTemporarySettings(ModCollection collection, Mod mod, int key)
+    {
+        var old = collection.GetTempSettings(mod.Index);
+        return old is not { Lock: > 0 } || old.Lock == key;
+    }
+
     /// <summary> Copy the settings of an existing (sourceMod != null) or stored (sourceName) mod to another mod, if they exist. </summary>
     public bool CopyModSettings(ModCollection collection, Mod? sourceMod, string sourceName, Mod? targetMod, string targetName)
     {
@@ -124,10 +144,10 @@ public class CollectionEditor
         // If it does not exist, check unused settings.
         // If it does not exist and has no unused settings, also use null.
         ModSettings.SavedSettings? savedSettings = sourceMod != null
-            ? collection.Settings[sourceMod.Index] != null
-                ? new ModSettings.SavedSettings(collection.Settings[sourceMod.Index]!, sourceMod)
+            ? collection.GetOwnSettings(sourceMod.Index) is { } ownSettings
+                ? new ModSettings.SavedSettings(ownSettings, sourceMod)
                 : null
-            : collection.UnusedSettings.TryGetValue(sourceName, out var s)
+            : collection.Settings.Unused.TryGetValue(sourceName, out var s)
                 ? s
                 : null;
 
@@ -157,75 +177,59 @@ public class CollectionEditor
             // or remove any unused settings for the target if they are inheriting.
             if (savedSettings != null)
             {
-                ((Dictionary<string, ModSettings.SavedSettings>)collection.UnusedSettings)[targetName] = savedSettings.Value;
-                _saveService.QueueSave(new ModCollectionSave(_modStorage, collection));
+                ((Dictionary<string, ModSettings.SavedSettings>)collection.Settings.Unused)[targetName] = savedSettings.Value;
+                saveService.QueueSave(new ModCollectionSave(modStorage, collection));
             }
-            else if (((Dictionary<string, ModSettings.SavedSettings>)collection.UnusedSettings).Remove(targetName))
+            else if (((Dictionary<string, ModSettings.SavedSettings>)collection.Settings.Unused).Remove(targetName))
             {
-                _saveService.QueueSave(new ModCollectionSave(_modStorage, collection));
+                saveService.QueueSave(new ModCollectionSave(modStorage, collection));
             }
         }
 
         return true;
     }
 
-    /// <summary>
-    /// Change one of the available mod settings for mod idx discerned by type.
-    /// If type == Setting, settingName should be a valid setting for that mod, otherwise it will be ignored.
-    /// The setting will also be automatically fixed if it is invalid for that setting group.
-    /// For boolean parameters, newValue == 0 will be treated as false and != 0 as true.
-    /// </summary>
-    public bool ChangeModSetting(ModCollection collection, ModSettingChange type, Mod mod, int newValue, int groupIdx)
-    {
-        return type switch
-        {
-            ModSettingChange.Inheritance => SetModInheritance(collection, mod, newValue != 0),
-            ModSettingChange.EnableState => SetModState(collection, mod, newValue != 0),
-            ModSettingChange.Priority    => SetModPriority(collection, mod, newValue),
-            ModSettingChange.Setting     => SetModSetting(collection, mod, groupIdx, (uint)newValue),
-            _                            => throw new ArgumentOutOfRangeException(nameof(type), type, null),
-        };
-    }
-
     /// <summary>
     /// Set inheritance of a mod without saving,
     /// to be used as an intermediary.
     /// </summary>
     private static bool FixInheritance(ModCollection collection, Mod mod, bool inherit)
     {
-        var settings = collection.Settings[mod.Index];
+        var settings = collection.GetOwnSettings(mod.Index);
         if (inherit == (settings == null))
             return false;
 
-        ((List<ModSettings?>)collection.Settings)[mod.Index] =
-            inherit ? null : collection[mod.Index].Settings?.DeepCopy() ?? ModSettings.DefaultSettings(mod);
+        var settings1 = inherit ? null : collection.GetInheritedSettings(mod.Index).Settings?.DeepCopy() ?? ModSettings.DefaultSettings(mod);
+        collection.Settings.Set(mod.Index, settings1);
         return true;
     }
 
     /// <summary> Queue saves and trigger changes for any non-inherited change in a collection, then trigger changes for all inheritors. </summary>
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    private void InvokeChange(ModCollection changedCollection, ModSettingChange type, Mod? mod, int oldValue, int groupIdx)
+    private void InvokeChange(ModCollection changedCollection, ModSettingChange type, Mod? mod, Setting oldValue, int groupIdx)
     {
-        _saveService.QueueSave(new ModCollectionSave(_modStorage, changedCollection));
-        _communicator.ModSettingChanged.Invoke(changedCollection, type, mod, oldValue, groupIdx, false);
-        RecurseInheritors(changedCollection, type, mod, oldValue, groupIdx);
+        if (type is not ModSettingChange.TemporarySetting)
+            saveService.QueueSave(new ModCollectionSave(modStorage, changedCollection));
+        communicator.ModSettingChanged.Invoke(changedCollection, type, mod, oldValue, groupIdx, false);
+        if (type is not ModSettingChange.TemporarySetting)
+            RecurseInheritors(changedCollection, type, mod, oldValue, groupIdx);
     }
 
     /// <summary> Trigger changes in all inherited collections. </summary>
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    private void RecurseInheritors(ModCollection directParent, ModSettingChange type, Mod? mod, int oldValue, int groupIdx)
+    private void RecurseInheritors(ModCollection directParent, ModSettingChange type, Mod? mod, Setting oldValue, int groupIdx)
     {
-        foreach (var directInheritor in directParent.DirectParentOf)
+        foreach (var directInheritor in directParent.Inheritance.DirectlyInheritedBy)
         {
             switch (type)
             {
                 case ModSettingChange.MultiInheritance:
                 case ModSettingChange.MultiEnableState:
-                    _communicator.ModSettingChanged.Invoke(directInheritor, type, null, oldValue, groupIdx, true);
+                    communicator.ModSettingChanged.Invoke(directInheritor, type, null, oldValue, groupIdx, true);
                     break;
                 default:
-                    if (directInheritor.Settings[mod!.Index] == null)
-                        _communicator.ModSettingChanged.Invoke(directInheritor, type, mod, oldValue, groupIdx, true);
+                    if (directInheritor.GetOwnSettings(mod!.Index) == null)
+                        communicator.ModSettingChanged.Invoke(directInheritor, type, mod, oldValue, groupIdx, true);
                     break;
             }
 

Penumbra/Collections/Manager/CollectionManager.cs

@@ -1,3 +1,4 @@
+using OtterGui.Services;
 using Penumbra.Collections.Cache;
 
 namespace Penumbra.Collections.Manager;
@@ -8,7 +9,7 @@ public class CollectionManager(
     InheritanceManager inheritances,
     CollectionCacheManager caches,
     TempCollectionManager temp,
-    CollectionEditor editor)
+    CollectionEditor editor) : IService
 {
     public readonly CollectionStorage      Storage      = storage;
     public readonly ActiveCollections      Active       = active;

Penumbra/Collections/Manager/CollectionStorage.cs

@@ -1,30 +1,80 @@
-using Dalamud.Interface.Internal.Notifications;
-using OtterGui;
+using Dalamud.Interface.ImGuiNotification;
 using OtterGui.Classes;
-using OtterGui.Filesystem;
+using OtterGui.Extensions;
+using OtterGui.Services;
 using Penumbra.Communication;
 using Penumbra.Mods;
 using Penumbra.Mods.Editor;
+using Penumbra.Mods.Groups;
 using Penumbra.Mods.Manager;
-using Penumbra.Mods.Subclasses;
+using Penumbra.Mods.Manager.OptionEditor;
+using Penumbra.Mods.Settings;
+using Penumbra.Mods.SubMods;
 using Penumbra.Services;
 
 namespace Penumbra.Collections.Manager;
 
-public class CollectionStorage : IReadOnlyList<ModCollection>, IDisposable
+/// <summary> A contiguously incrementing ID managed by the CollectionCreator. </summary>
+public readonly record struct LocalCollectionId(int Id) : IAdditionOperators<LocalCollectionId, int, LocalCollectionId>
+{
+    public static readonly LocalCollectionId Zero = new(0);
+
+    public static LocalCollectionId operator +(LocalCollectionId left, int right)
+        => new(left.Id + right);
+}
+
+public class CollectionStorage : IReadOnlyList<ModCollection>, IDisposable, IService
 {
     private readonly CommunicatorService _communicator;
     private readonly SaveService         _saveService;
     private readonly ModStorage          _modStorage;
 
+    public ModCollection Create(string name, int index, ModCollection? duplicate)
+    {
+        var newCollection = duplicate?.Duplicate(name, CurrentCollectionId, index)
+         ?? ModCollection.CreateEmpty(name, CurrentCollectionId, index, _modStorage.Count);
+        _collectionsByLocal[CurrentCollectionId] =  newCollection;
+        CurrentCollectionId                      += 1;
+        return newCollection;
+    }
+
+    public ModCollection CreateFromData(Guid id, string name, int version, Dictionary<string, ModSettings.SavedSettings> allSettings,
+        IReadOnlyList<string> inheritances)
+    {
+        var newCollection = ModCollection.CreateFromData(_saveService, _modStorage,
+            new ModCollectionIdentity(id, CurrentCollectionId, name, Count), version, allSettings, inheritances);
+        _collectionsByLocal[CurrentCollectionId] =  newCollection;
+        CurrentCollectionId                      += 1;
+        return newCollection;
+    }
+
+    public ModCollection CreateTemporary(string name, int index, int globalChangeCounter)
+    {
+        var newCollection = ModCollection.CreateTemporary(name, CurrentCollectionId, index, globalChangeCounter);
+        _collectionsByLocal[CurrentCollectionId] =  newCollection;
+        CurrentCollectionId                      += 1;
+        return newCollection;
+    }
+
+    public void Delete(ModCollection collection)
+        => _collectionsByLocal.Remove(collection.Identity.LocalId);
+
     /// <remarks> The empty collection is always available at Index 0. </remarks>
     private readonly List<ModCollection> _collections =
     [
         ModCollection.Empty,
     ];
 
+    /// <remarks> A list of all collections ever created still existing by their local id. </remarks>
+    private readonly Dictionary<LocalCollectionId, ModCollection>
+        _collectionsByLocal = new() { [LocalCollectionId.Zero] = ModCollection.Empty };
+
+
     public readonly ModCollection DefaultNamed;
 
+    /// <remarks> Incremented by 1 because the empty collection gets Zero. </remarks>
+    public LocalCollectionId CurrentCollectionId { get; private set; } = LocalCollectionId.Zero + 1;
+
     /// <summary> Default enumeration skips the empty collection. </summary>
     public IEnumerator<ModCollection> GetEnumerator()
         => _collections.Skip(1).GetEnumerator();
@@ -42,12 +92,35 @@ public class CollectionStorage : IReadOnlyList<ModCollection>, IDisposable
     public bool ByName(string name, [NotNullWhen(true)] out ModCollection? collection)
     {
         if (name.Length != 0)
-            return _collections.FindFirst(c => string.Equals(c.Name, name, StringComparison.OrdinalIgnoreCase), out collection);
+            return _collections.FindFirst(c => string.Equals(c.Identity.Name, name, StringComparison.OrdinalIgnoreCase), out collection);
 
         collection = ModCollection.Empty;
         return true;
     }
 
+    /// <summary> Find a collection by its id. If the GUID is empty, the empty collection is returned. </summary>
+    public bool ById(Guid id, [NotNullWhen(true)] out ModCollection? collection)
+    {
+        if (id != Guid.Empty)
+            return _collections.FindFirst(c => c.Identity.Id == id, out collection);
+
+        collection = ModCollection.Empty;
+        return true;
+    }
+
+    /// <summary> Find a collection by an identifier, which is interpreted as a GUID first and if it does not correspond to one, as a name. </summary>
+    public bool ByIdentifier(string identifier, [NotNullWhen(true)] out ModCollection? collection)
+    {
+        if (Guid.TryParse(identifier, out var guid))
+            return ById(guid, out collection);
+
+        return ByName(identifier, out collection);
+    }
+
+    /// <summary> Find a collection by its local ID if it still exists, otherwise returns the empty collection. </summary>
+    public ModCollection ByLocalId(LocalCollectionId localId)
+        => _collectionsByLocal.TryGetValue(localId, out var coll) ? coll : ModCollection.Empty;
+
     public CollectionStorage(CommunicatorService communicator, SaveService saveService, ModStorage modStorage)
     {
         _communicator = communicator;
@@ -70,31 +143,6 @@ public class CollectionStorage : IReadOnlyList<ModCollection>, IDisposable
         _communicator.ModFileChanged.Unsubscribe(OnModFileChanged);
     }
 
-    /// <summary>
-    /// Returns true if the name is not empty, it is not the name of the empty collection
-    /// and no existing collection results in the same filename as name. Also returns the fixed name.
-    /// </summary>
-    public bool CanAddCollection(string name, out string fixedName)
-    {
-        if (!IsValidName(name))
-        {
-            fixedName = string.Empty;
-            return false;
-        }
-
-        name = name.ToLowerInvariant();
-        if (name.Length == 0
-         || name == ModCollection.Empty.Name.ToLowerInvariant()
-         || _collections.Any(c => c.Name.ToLowerInvariant() == name))
-        {
-            fixedName = string.Empty;
-            return false;
-        }
-
-        fixedName = name;
-        return true;
-    }
-
     /// <summary>
     /// Add a new collection of the given name.
     /// If duplicate is not-null, the new collection will be a duplicate of it.
@@ -104,20 +152,13 @@ public class CollectionStorage : IReadOnlyList<ModCollection>, IDisposable
     /// </summary>
     public bool AddCollection(string name, ModCollection? duplicate)
     {
-        if (!CanAddCollection(name, out var fixedName))
-        {
-            Penumbra.Messager.NotificationMessage(
-                $"The new collection {name} would lead to the same path {fixedName} as one that already exists.", NotificationType.Warning,
-                false);
+        if (name.Length == 0)
             return false;
-        }
 
-        var newCollection = duplicate?.Duplicate(name, _collections.Count)
-         ?? ModCollection.CreateEmpty(name, _collections.Count, _modStorage.Count);
+        var newCollection = Create(name, _collections.Count, duplicate);
         _collections.Add(newCollection);
-
         _saveService.ImmediateSave(new ModCollectionSave(_modStorage, newCollection));
-        Penumbra.Messager.NotificationMessage($"Created new collection {newCollection.AnonymizedName}.", NotificationType.Success, false);
+        Penumbra.Messager.NotificationMessage($"Created new collection {newCollection.Identity.AnonymizedName}.", NotificationType.Success, false);
         _communicator.CollectionChange.Invoke(CollectionType.Inactive, null, newCollection, string.Empty);
         return true;
     }
@@ -127,55 +168,54 @@ public class CollectionStorage : IReadOnlyList<ModCollection>, IDisposable
     /// </summary>
     public bool RemoveCollection(ModCollection collection)
     {
-        if (collection.Index <= ModCollection.Empty.Index || collection.Index >= _collections.Count)
+        if (collection.Identity.Index <= ModCollection.Empty.Identity.Index || collection.Identity.Index >= _collections.Count)
         {
             Penumbra.Messager.NotificationMessage("Can not remove the empty collection.", NotificationType.Error, false);
             return false;
         }
 
-        if (collection.Index == DefaultNamed.Index)
+        if (collection.Identity.Index == DefaultNamed.Identity.Index)
         {
             Penumbra.Messager.NotificationMessage("Can not remove the default collection.", NotificationType.Error, false);
             return false;
         }
 
+        Delete(collection);
         _saveService.ImmediateDelete(new ModCollectionSave(_modStorage, collection));
-        _collections.RemoveAt(collection.Index);
+        _collections.RemoveAt(collection.Identity.Index);
         // Update indices.
-        for (var i = collection.Index; i < Count; ++i)
-            _collections[i].Index = i;
+        for (var i = collection.Identity.Index; i < Count; ++i)
+            _collections[i].Identity.Index = i;
+        _collectionsByLocal.Remove(collection.Identity.LocalId);
 
-        Penumbra.Messager.NotificationMessage($"Deleted collection {collection.AnonymizedName}.", NotificationType.Success, false);
+        Penumbra.Messager.NotificationMessage($"Deleted collection {collection.Identity.AnonymizedName}.", NotificationType.Success, false);
         _communicator.CollectionChange.Invoke(CollectionType.Inactive, collection, null, string.Empty);
         return true;
     }
 
     /// <summary> Remove all settings for not currently-installed mods from the given collection. </summary>
-    public void CleanUnavailableSettings(ModCollection collection)
+    public int CleanUnavailableSettings(ModCollection collection)
     {
-        var any = collection.UnusedSettings.Count > 0;
-        ((Dictionary<string, ModSettings.SavedSettings>)collection.UnusedSettings).Clear();
-        if (any)
+        var count = collection.Settings.Unused.Count;
+        if (count > 0)
+        {
+            ((Dictionary<string, ModSettings.SavedSettings>)collection.Settings.Unused).Clear();
             _saveService.QueueSave(new ModCollectionSave(_modStorage, collection));
+        }
+
+        return count;
     }
 
     /// <summary> Remove a specific setting for not currently-installed mods from the given collection. </summary>
     public void CleanUnavailableSetting(ModCollection collection, string? setting)
     {
-        if (setting != null && ((Dictionary<string, ModSettings.SavedSettings>)collection.UnusedSettings).Remove(setting))
+        if (setting != null && ((Dictionary<string, ModSettings.SavedSettings>)collection.Settings.Unused).Remove(setting))
             _saveService.QueueSave(new ModCollectionSave(_modStorage, collection));
     }
 
-    /// <summary>
-    /// Check if a name is valid to use for a collection.
-    /// Does not check for uniqueness.
-    /// </summary>
-    private static bool IsValidName(string name)
-        => name.Length is > 0 and < 64 && name.All(c => !c.IsInvalidAscii() && c is not '|' && !c.IsInvalidInPath());
-
     /// <summary>
     /// Read all collection files in the Collection Directory.
-    /// Ensure that the default named collection exists, and apply inheritances afterwards.
+    /// Ensure that the default named collection exists, and apply inheritances afterward.
     /// Duplicate collection files are not deleted, just not added here.
     /// </summary>
     private void ReadCollections(out ModCollection defaultNamedCollection)
@@ -183,29 +223,64 @@ public class CollectionStorage : IReadOnlyList<ModCollection>, IDisposable
         Penumbra.Log.Debug("[Collections] Reading saved collections...");
         foreach (var file in _saveService.FileNames.CollectionFiles)
         {
-            if (!ModCollectionSave.LoadFromFile(file, out var name, out var version, out var settings, out var inheritance))
+            if (!ModCollectionSave.LoadFromFile(file, out var id, out var name, out var version, out var settings, out var inheritance))
                 continue;
 
-            if (!IsValidName(name))
+            if (id == Guid.Empty)
             {
-                // TODO: handle better.
-                Penumbra.Messager.NotificationMessage($"Collection of unsupported name found: {name} is not a valid collection name.",
+                Penumbra.Messager.NotificationMessage("Collection without ID found.", NotificationType.Warning);
+                continue;
+            }
+
+            if (ById(id, out _))
+            {
+                Penumbra.Messager.NotificationMessage($"Duplicate collection found: {id} already exists. Import skipped.",
                     NotificationType.Warning);
                 continue;
             }
 
-            if (ByName(name, out _))
-            {
-                Penumbra.Messager.NotificationMessage($"Duplicate collection found: {name} already exists. Import skipped.",
-                    NotificationType.Warning);
-                continue;
-            }
-
-            var collection  = ModCollection.CreateFromData(_saveService, _modStorage, name, version, Count, settings, inheritance);
+            var collection  = CreateFromData(id, name, version, settings, inheritance);
             var correctName = _saveService.FileNames.CollectionFile(collection);
             if (file.FullName != correctName)
-                Penumbra.Messager.NotificationMessage($"Collection {file.Name} does not correspond to {collection.Name}.",
-                    NotificationType.Warning);
+                try
+                {
+                    if (version >= 2)
+                    {
+                        try
+                        {
+                            File.Move(file.FullName, correctName, false);
+                            Penumbra.Messager.NotificationMessage(
+                                $"Collection {file.Name} does not correspond to {collection.Identity.Identifier}, renamed.",
+                                NotificationType.Warning);
+                        }
+                        catch (Exception ex)
+                        {
+                            Penumbra.Messager.NotificationMessage(
+                                $"Collection {file.Name} does not correspond to {collection.Identity.Identifier}, rename failed:\n{ex}",
+                                NotificationType.Warning);
+                        }
+                    }
+                    else
+                    {
+                        _saveService.ImmediateSaveSync(new ModCollectionSave(_modStorage, collection));
+                        try
+                        {
+                            File.Move(file.FullName, file.FullName + ".bak", true);
+                            Penumbra.Log.Information($"Migrated collection {name} to Guid {id} with backup of old file.");
+                        }
+                        catch (Exception ex)
+                        {
+                            Penumbra.Log.Information($"Migrated collection {name} to Guid {id}, rename of old file failed:\n{ex}");
+                        }
+                    }
+                }
+                catch (Exception e)
+                {
+                    Penumbra.Messager.NotificationMessage(e,
+                        $"Collection {file.Name} does not correspond to {collection.Identity.Identifier}, but could not rename.",
+                        NotificationType.Error);
+                }
+
             _collections.Add(collection);
         }
 
@@ -220,14 +295,14 @@ public class CollectionStorage : IReadOnlyList<ModCollection>, IDisposable
     /// </summary>
     private ModCollection SetDefaultNamedCollection()
     {
-        if (ByName(ModCollection.DefaultCollectionName, out var collection))
+        if (ByName(ModCollectionIdentity.DefaultCollectionName, out var collection))
             return collection;
 
-        if (AddCollection(ModCollection.DefaultCollectionName, null))
+        if (AddCollection(ModCollectionIdentity.DefaultCollectionName, null))
             return _collections[^1];
 
         Penumbra.Messager.NotificationMessage(
-            $"Unknown problem creating a collection with the name {ModCollection.DefaultCollectionName}, which is required to exist.",
+            $"Unknown problem creating a collection with the name {ModCollectionIdentity.DefaultCollectionName}, which is required to exist.",
             NotificationType.Error);
         return Count > 1 ? _collections[1] : _collections[0];
     }
@@ -236,7 +311,7 @@ public class CollectionStorage : IReadOnlyList<ModCollection>, IDisposable
     private void OnModDiscoveryStarted()
     {
         foreach (var collection in this)
-            collection.PrepareModDiscovery(_modStorage);
+            collection.Settings.PrepareModDiscovery(_modStorage);
     }
 
     /// <summary> Restore all settings in all collections to mods. </summary>
@@ -244,7 +319,7 @@ public class CollectionStorage : IReadOnlyList<ModCollection>, IDisposable
     {
         // Re-apply all mod settings.
         foreach (var collection in this)
-            collection.ApplyModSettings(_saveService, _modStorage);
+            collection.Settings.ApplyModSettings(collection, _saveService, _modStorage);
     }
 
     /// <summary> Add or remove a mod from all collections, or re-save all collections where the mod has settings. </summary>
@@ -255,21 +330,22 @@ public class CollectionStorage : IReadOnlyList<ModCollection>, IDisposable
         {
             case ModPathChangeType.Added:
                 foreach (var collection in this)
-                    collection.AddMod(mod);
+                    collection.Settings.AddMod(mod);
                 break;
             case ModPathChangeType.Deleted:
                 foreach (var collection in this)
-                    collection.RemoveMod(mod);
+                    collection.Settings.RemoveMod(mod);
                 break;
             case ModPathChangeType.Moved:
-                foreach (var collection in this.Where(collection => collection.Settings[mod.Index] != null))
+                foreach (var collection in this.Where(collection => collection.GetOwnSettings(mod.Index) != null))
                     _saveService.QueueSave(new ModCollectionSave(_modStorage, collection));
                 break;
             case ModPathChangeType.Reloaded:
                 foreach (var collection in this)
                 {
-                    if (collection.Settings[mod.Index]?.FixAllSettings(mod) ?? false)
+                    if (collection.GetOwnSettings(mod.Index)?.Settings.FixAll(mod) ?? false)
                         _saveService.QueueSave(new ModCollectionSave(_modStorage, collection));
+                    collection.Settings.SetTemporary(mod.Index, null);
                 }
 
                 break;
@@ -277,7 +353,8 @@ public class CollectionStorage : IReadOnlyList<ModCollection>, IDisposable
     }
 
     /// <summary> Save all collections where the mod has settings and the change requires saving. </summary>
-    private void OnModOptionChange(ModOptionChangeType type, Mod mod, int groupIdx, int optionIdx, int movedToIdx)
+    private void OnModOptionChange(ModOptionChangeType type, Mod mod, IModGroup? group, IModOption? option, IModDataContainer? container,
+        int movedToIdx)
     {
         type.HandlingInfo(out var requiresSaving, out _, out _);
         if (!requiresSaving)
@@ -285,8 +362,9 @@ public class CollectionStorage : IReadOnlyList<ModCollection>, IDisposable
 
         foreach (var collection in this)
         {
-            if (collection.Settings[mod.Index]?.HandleChanges(type, mod, groupIdx, optionIdx, movedToIdx) ?? false)
+            if (collection.GetOwnSettings(mod.Index)?.HandleChanges(type, mod, group, option, movedToIdx) ?? false)
                 _saveService.QueueSave(new ModCollectionSave(_modStorage, collection));
+            collection.Settings.SetTemporary(mod.Index, null);
         }
     }
 
@@ -298,9 +376,9 @@ public class CollectionStorage : IReadOnlyList<ModCollection>, IDisposable
 
         foreach (var collection in this)
         {
-            var (settings, _) = collection[mod.Index];
+            var (settings, _) = collection.GetActualSettings(mod.Index);
             if (settings is { Enabled: true })
-                collection.IncrementCounter();
+                collection.Counters.IncrementChange();
         }
     }
 }

Penumbra/Collections/Manager/CollectionType.cs

@@ -107,6 +107,9 @@ public static class CollectionTypeExtensions
     public static bool IsSpecial(this CollectionType collectionType)
         => collectionType < CollectionType.Default;
 
+    public static bool CanBeRemoved(this CollectionType collectionType)
+        => collectionType.IsSpecial() || collectionType is CollectionType.Individual;
+
     public static readonly (CollectionType, string, string)[] Special = Enum.GetValues<CollectionType>()
         .Where(IsSpecial)
         .Select(s => (s, s.ToName(), s.ToDescription()))

Penumbra/Collections/Manager/IndividualCollections.Access.cs

@@ -48,8 +48,7 @@ public sealed partial class IndividualCollections : IReadOnlyList<(string Displa
 
                 // Handle generic NPC
                 var npcIdentifier = _actors.CreateIndividualUnchecked(IdentifierType.Npc, ByteString.Empty,
-                    ushort.MaxValue,
-                    identifier.Kind, identifier.DataId);
+                    ushort.MaxValue, identifier.Kind, identifier.DataId);
                 if (npcIdentifier.IsValid && _individuals.TryGetValue(npcIdentifier, out collection))
                     return true;
 
@@ -58,8 +57,7 @@ public sealed partial class IndividualCollections : IReadOnlyList<(string Displa
                     return false;
 
                 identifier = _actors.CreateIndividualUnchecked(IdentifierType.Player, identifier.PlayerName,
-                    identifier.HomeWorld.Id,
-                    ObjectKind.None, uint.MaxValue);
+                    identifier.HomeWorld.Id, ObjectKind.None, uint.MaxValue);
                 return CheckWorlds(identifier, out collection);
             }
             case IdentifierType.Npc:     return _individuals.TryGetValue(identifier, out collection);
@@ -127,7 +125,7 @@ public sealed partial class IndividualCollections : IReadOnlyList<(string Displa
         }
     }
 
-    public bool TryGetCollection(GameObject? gameObject, out ModCollection? collection)
+    public bool TryGetCollection(IGameObject? gameObject, out ModCollection? collection)
         => TryGetCollection(_actors.FromObject(gameObject, true, false, false), out collection);
 
     public unsafe bool TryGetCollection(FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject* gameObject, out ModCollection? collection)

Penumbra/Collections/Manager/IndividualCollections.Files.cs

@@ -1,5 +1,5 @@
 using Dalamud.Game.ClientState.Objects.Enums;
-using Dalamud.Interface.Internal.Notifications;
+using Dalamud.Interface.ImGuiNotification;
 using Newtonsoft.Json.Linq;
 using OtterGui.Classes;
 using Penumbra.GameData.Actors;
@@ -18,7 +18,7 @@ public partial class IndividualCollections
         foreach (var (name, identifiers, collection) in Assignments)
         {
             var tmp = identifiers[0].ToJson();
-            tmp.Add("Collection", collection.Name);
+            tmp.Add("Collection", collection.Identity.Id);
             tmp.Add("Display",    name);
             ret.Add(tmp);
         }
@@ -26,18 +26,28 @@ public partial class IndividualCollections
         return ret;
     }
 
-    public bool ReadJObject(SaveService saver, ActiveCollections parent, JArray? obj, CollectionStorage storage)
+    public bool ReadJObject(SaveService saver, ActiveCollections parent, JArray? obj, CollectionStorage storage, int version)
     {
         if (_actors.Awaiter.IsCompletedSuccessfully)
         {
-            var ret = ReadJObjectInternal(obj, storage);
+            var ret = version switch
+            {
+                1 => ReadJObjectInternalV1(obj, storage),
+                2 => ReadJObjectInternalV2(obj, storage),
+                _ => true,
+            };
             return ret;
         }
 
         Penumbra.Log.Debug("[Collections] Delayed reading individual assignments until actor service is ready...");
         _actors.Awaiter.ContinueWith(_ =>
         {
-            if (ReadJObjectInternal(obj, storage))
+            if (version switch
+                {
+                    1 => ReadJObjectInternalV1(obj, storage),
+                    2 => ReadJObjectInternalV2(obj, storage),
+                    _ => true,
+                })
                 saver.ImmediateSave(parent);
             IsLoaded = true;
             Loaded.Invoke();
@@ -45,7 +55,55 @@ public partial class IndividualCollections
         return false;
     }
 
-    private bool ReadJObjectInternal(JArray? obj, CollectionStorage storage)
+    private bool ReadJObjectInternalV1(JArray? obj, CollectionStorage storage)
+    {
+        Penumbra.Log.Debug("[Collections] Reading individual assignments...");
+        if (obj == null)
+        {
+            Penumbra.Log.Debug($"[Collections] Finished reading {Count} individual assignments...");
+            return true;
+        }
+
+        foreach (var data in obj)
+        {
+            try
+            {
+                var identifier = _actors.FromJson(data as JObject);
+                var group      = GetGroup(identifier);
+                if (group.Length == 0 || group.Any(i => !i.IsValid))
+                {
+                    Penumbra.Messager.NotificationMessage("Could not load an unknown individual collection, removed.",
+                        NotificationType.Error);
+                    continue;
+                }
+
+                var collectionName = data["Collection"]?.ToObject<string>() ?? string.Empty;
+                if (collectionName.Length == 0 || !storage.ByName(collectionName, out var collection))
+                {
+                    Penumbra.Messager.NotificationMessage(
+                        $"Could not load the collection \"{collectionName}\" as individual collection for {identifier}, set to None.",
+                        NotificationType.Warning);
+                    continue;
+                }
+
+                if (!Add(group, collection))
+                {
+                    Penumbra.Messager.NotificationMessage($"Could not add an individual collection for {identifier}, removed.",
+                        NotificationType.Warning);
+                }
+            }
+            catch (Exception e)
+            {
+                Penumbra.Messager.NotificationMessage(e, $"Could not load an unknown individual collection, removed.", NotificationType.Error);
+            }
+        }
+
+        Penumbra.Log.Debug($"Finished reading {Count} individual assignments...");
+
+        return true;
+    }
+
+    private bool ReadJObjectInternalV2(JArray? obj, CollectionStorage storage)
     {
         Penumbra.Log.Debug("[Collections] Reading individual assignments...");
         if (obj == null)
@@ -64,17 +122,17 @@ public partial class IndividualCollections
                 if (group.Length == 0 || group.Any(i => !i.IsValid))
                 {
                     changes = true;
-                    Penumbra.Messager.NotificationMessage("Could not load an unknown individual collection, removed.",
+                    Penumbra.Messager.NotificationMessage("Could not load an unknown individual collection, removed assignment.",
                         NotificationType.Error);
                     continue;
                 }
 
-                var collectionName = data["Collection"]?.ToObject<string>() ?? string.Empty;
-                if (collectionName.Length == 0 || !storage.ByName(collectionName, out var collection))
+                var collectionId = data["Collection"]?.ToObject<Guid>();
+                if (!collectionId.HasValue || !storage.ById(collectionId.Value, out var collection))
                 {
                     changes = true;
                     Penumbra.Messager.NotificationMessage(
-                        $"Could not load the collection \"{collectionName}\" as individual collection for {identifier}, set to None.",
+                        $"Could not load the collection {collectionId} as individual collection for {identifier}, removed assignment.",
                         NotificationType.Warning);
                     continue;
                 }
@@ -82,14 +140,14 @@ public partial class IndividualCollections
                 if (!Add(group, collection))
                 {
                     changes = true;
-                    Penumbra.Messager.NotificationMessage($"Could not add an individual collection for {identifier}, removed.",
+                    Penumbra.Messager.NotificationMessage($"Could not add an individual collection for {identifier}, removed assignment.",
                         NotificationType.Warning);
                 }
             }
             catch (Exception e)
             {
                 changes = true;
-                Penumbra.Messager.NotificationMessage(e, $"Could not load an unknown individual collection, removed.", NotificationType.Error);
+                Penumbra.Messager.NotificationMessage(e, $"Could not load an unknown individual collection, removed assignment.", NotificationType.Error);
             }
         }
 
@@ -100,14 +158,6 @@ public partial class IndividualCollections
 
     internal void Migrate0To1(Dictionary<string, ModCollection> old)
     {
-        static bool FindDataId(string name, NameDictionary data, out NpcId dataId)
-        {
-            var kvp = data.FirstOrDefault(kvp => kvp.Value.Equals(name, StringComparison.OrdinalIgnoreCase),
-                new KeyValuePair<NpcId, string>(uint.MaxValue, string.Empty));
-            dataId = kvp.Key;
-            return kvp.Value.Length > 0;
-        }
-
         foreach (var (name, collection) in old)
         {
             var kind      = ObjectKind.None;
@@ -132,7 +182,7 @@ public partial class IndividualCollections
                     Penumbra.Log.Information($"Migrated {name} ({kind.ToName()}) to NPC Identifiers [{ids}].");
                 else
                     Penumbra.Messager.NotificationMessage(
-                        $"Could not migrate {name} ({collection.AnonymizedName}) which was assumed to be a {kind.ToName()} with IDs [{ids}], please look through your individual collections.",
+                        $"Could not migrate {name} ({collection.Identity.AnonymizedName}) which was assumed to be a {kind.ToName()} with IDs [{ids}], please look through your individual collections.",
                         NotificationType.Error);
             }
             // If it is not a valid NPC name, check if it can be a player name.
@@ -142,18 +192,28 @@ public partial class IndividualCollections
                 var shortName = string.Join(" ", name.Split().Select(n => $"{n[0]}."));
                 // Try to migrate the player name without logging full names.
                 if (Add($"{name} ({_actors.Data.ToWorldName(identifier.HomeWorld)})", [identifier], collection))
-                    Penumbra.Log.Information($"Migrated {shortName} ({collection.AnonymizedName}) to Player Identifier.");
+                    Penumbra.Log.Information($"Migrated {shortName} ({collection.Identity.AnonymizedName}) to Player Identifier.");
                 else
                     Penumbra.Messager.NotificationMessage(
-                        $"Could not migrate {shortName} ({collection.AnonymizedName}), please look through your individual collections.",
+                        $"Could not migrate {shortName} ({collection.Identity.AnonymizedName}), please look through your individual collections.",
                         NotificationType.Error);
             }
             else
             {
                 Penumbra.Messager.NotificationMessage(
-                    $"Could not migrate {name} ({collection.AnonymizedName}), which can not be a player name nor is it a known NPC name, please look through your individual collections.",
+                    $"Could not migrate {name} ({collection.Identity.AnonymizedName}), which can not be a player name nor is it a known NPC name, please look through your individual collections.",
                     NotificationType.Error);
             }
         }
+
+        return;
+
+        static bool FindDataId(string name, NameDictionary data, out NpcId dataId)
+        {
+            var kvp = data.FirstOrDefault(kvp => kvp.Value.Equals(name, StringComparison.OrdinalIgnoreCase),
+                new KeyValuePair<NpcId, string>(uint.MaxValue, string.Empty));
+            dataId = kvp.Key;
+            return kvp.Value.Length > 0;
+        }
     }
 }

Penumbra/Collections/Manager/InheritanceManager.cs

@@ -1,12 +1,10 @@
-using Dalamud.Interface.Internal.Notifications;
-using OtterGui;
+using Dalamud.Interface.ImGuiNotification;
 using OtterGui.Classes;
-using OtterGui.Filesystem;
+using OtterGui.Extensions;
+using OtterGui.Services;
 using Penumbra.Communication;
 using Penumbra.Mods.Manager;
 using Penumbra.Services;
-using Penumbra.UI.CollectionTab;
-using Penumbra.Util;
 
 namespace Penumbra.Collections.Manager;
 
@@ -15,7 +13,7 @@ namespace Penumbra.Collections.Manager;
 /// This is transitive, so a collection A inheriting from B also inherits from everything B inherits.
 /// Circular dependencies are resolved by distinctness.
 /// </summary>
-public class InheritanceManager : IDisposable
+public class InheritanceManager : IDisposable, IService
 {
     public enum ValidInheritance
     {
@@ -64,10 +62,10 @@ public class InheritanceManager : IDisposable
         if (ReferenceEquals(potentialParent, potentialInheritor))
             return ValidInheritance.Self;
 
-        if (potentialInheritor.DirectlyInheritsFrom.Contains(potentialParent))
+        if (potentialInheritor.Inheritance.DirectlyInheritsFrom.Contains(potentialParent))
             return ValidInheritance.Contained;
 
-        if (ModCollection.InheritedCollections(potentialParent).Any(c => ReferenceEquals(c, potentialInheritor)))
+        if (potentialParent.Inheritance.FlatHierarchy.Any(c => ReferenceEquals(c, potentialInheritor)))
             return ValidInheritance.Circle;
 
         return ValidInheritance.Valid;
@@ -84,25 +82,23 @@ public class InheritanceManager : IDisposable
     /// <summary> Remove an existing inheritance from a collection. </summary>
     public void RemoveInheritance(ModCollection inheritor, int idx)
     {
-        var parent = inheritor.DirectlyInheritsFrom[idx];
-        ((List<ModCollection>)inheritor.DirectlyInheritsFrom).RemoveAt(idx);
-        ((List<ModCollection>)parent.DirectParentOf).Remove(inheritor);
+        var parent = inheritor.Inheritance.RemoveInheritanceAt(inheritor, idx);
         _saveService.QueueSave(new ModCollectionSave(_modStorage, inheritor));
         _communicator.CollectionInheritanceChanged.Invoke(inheritor, false);
-        RecurseInheritanceChanges(inheritor);
-        Penumbra.Log.Debug($"Removed {parent.AnonymizedName} from {inheritor.AnonymizedName} inheritances.");
+        RecurseInheritanceChanges(inheritor, true);
+        Penumbra.Log.Debug($"Removed {parent.Identity.AnonymizedName} from {inheritor.Identity.AnonymizedName} inheritances.");
     }
 
     /// <summary> Order in the inheritance list is relevant. </summary>
     public void MoveInheritance(ModCollection inheritor, int from, int to)
     {
-        if (!((List<ModCollection>)inheritor.DirectlyInheritsFrom).Move(from, to))
+        if (!inheritor.Inheritance.MoveInheritance(inheritor, from, to))
             return;
 
         _saveService.QueueSave(new ModCollectionSave(_modStorage, inheritor));
         _communicator.CollectionInheritanceChanged.Invoke(inheritor, false);
-        RecurseInheritanceChanges(inheritor);
-        Penumbra.Log.Debug($"Moved {inheritor.AnonymizedName}s inheritance {from} to {to}.");
+        RecurseInheritanceChanges(inheritor, true);
+        Penumbra.Log.Debug($"Moved {inheritor.Identity.AnonymizedName}s inheritance {from} to {to}.");
     }
 
     /// <inheritdoc cref="AddInheritance(ModCollection, ModCollection)"/>
@@ -111,16 +107,16 @@ public class InheritanceManager : IDisposable
         if (CheckValidInheritance(inheritor, parent) != ValidInheritance.Valid)
             return false;
 
-        ((List<ModCollection>)inheritor.DirectlyInheritsFrom).Add(parent);
-        ((List<ModCollection>)parent.DirectParentOf).Add(inheritor);
+        inheritor.Inheritance.AddInheritance(inheritor, parent);
         if (invokeEvent)
         {
             _saveService.QueueSave(new ModCollectionSave(_modStorage, inheritor));
             _communicator.CollectionInheritanceChanged.Invoke(inheritor, false);
-            RecurseInheritanceChanges(inheritor);
         }
 
-        Penumbra.Log.Debug($"Added {parent.AnonymizedName} to {inheritor.AnonymizedName} inheritances.");
+        RecurseInheritanceChanges(inheritor, invokeEvent);
+
+        Penumbra.Log.Debug($"Added {parent.Identity.AnonymizedName} to {inheritor.Identity.AnonymizedName} inheritances.");
         return true;
     }
 
@@ -132,29 +128,42 @@ public class InheritanceManager : IDisposable
     {
         foreach (var collection in _storage)
         {
-            if (collection.InheritanceByName == null)
+            if (collection.Inheritance.ConsumeNames() is not { } byName)
                 continue;
 
             var changes = false;
-            foreach (var subCollectionName in collection.InheritanceByName)
+            foreach (var subCollectionName in byName)
             {
-                if (_storage.ByName(subCollectionName, out var subCollection))
+                if (Guid.TryParse(subCollectionName, out var guid) && _storage.ById(guid, out var subCollection))
                 {
                     if (AddInheritance(collection, subCollection, false))
                         continue;
 
                     changes = true;
-                    Penumbra.Messager.NotificationMessage($"{collection.Name} can not inherit from {subCollection.Name}, removed.", NotificationType.Warning);
+                    Penumbra.Messager.NotificationMessage(
+                        $"{collection.Identity.Name} can not inherit from {subCollection.Identity.Name}, removed.",
+                        NotificationType.Warning);
+                }
+                else if (_storage.ByName(subCollectionName, out subCollection))
+                {
+                    changes = true;
+                    Penumbra.Log.Information($"Migrating inheritance for {collection.Identity.AnonymizedName} from name to GUID.");
+                    if (AddInheritance(collection, subCollection, false))
+                        continue;
+
+                    Penumbra.Messager.NotificationMessage(
+                        $"{collection.Identity.Name} can not inherit from {subCollection.Identity.Name}, removed.",
+                        NotificationType.Warning);
                 }
                 else
                 {
                     Penumbra.Messager.NotificationMessage(
-                        $"Inherited collection {subCollectionName} for {collection.AnonymizedName} does not exist, it was removed.", NotificationType.Warning);
+                        $"Inherited collection {subCollectionName} for {collection.Identity.AnonymizedName} does not exist, it was removed.",
+                        NotificationType.Warning);
                     changes = true;
                 }
             }
 
-            collection.InheritanceByName = null;
             if (changes)
                 _saveService.ImmediateSave(new ModCollectionSave(_modStorage, collection));
         }
@@ -167,20 +176,22 @@ public class InheritanceManager : IDisposable
 
         foreach (var c in _storage)
         {
-            var inheritedIdx = c.DirectlyInheritsFrom.IndexOf(old);
+            var inheritedIdx = c.Inheritance.DirectlyInheritsFrom.IndexOf(old);
             if (inheritedIdx >= 0)
                 RemoveInheritance(c, inheritedIdx);
 
-            ((List<ModCollection>)c.DirectParentOf).Remove(old);
+            c.Inheritance.RemoveChild(old);
         }
     }
 
-    private void RecurseInheritanceChanges(ModCollection newInheritor)
+    private void RecurseInheritanceChanges(ModCollection newInheritor, bool invokeEvent)
     {
-        foreach (var inheritor in newInheritor.DirectParentOf)
+        foreach (var inheritor in newInheritor.Inheritance.DirectlyInheritedBy)
         {
-            _communicator.CollectionInheritanceChanged.Invoke(inheritor, true);
-            RecurseInheritanceChanges(inheritor);
+            ModCollectionInheritance.UpdateFlattenedInheritance(inheritor);
+            RecurseInheritanceChanges(inheritor, invokeEvent);
+            if (invokeEvent)
+                _communicator.CollectionInheritanceChanged.Invoke(inheritor, true);
         }
     }
 }

Penumbra/Collections/Manager/ModCollectionMigration.cs

@@ -1,8 +1,6 @@
-using Penumbra.Mods;
 using Penumbra.Mods.Manager;
-using Penumbra.Mods.Subclasses;
+using Penumbra.Mods.Settings;
 using Penumbra.Services;
-using Penumbra.Util;
 
 namespace Penumbra.Collections.Manager;
 
@@ -28,21 +26,21 @@ internal static class ModCollectionMigration
         // Remove all completely defaulted settings from active and inactive mods.
         for (var i = 0; i < collection.Settings.Count; ++i)
         {
-            if (SettingIsDefaultV0(collection.Settings[i]))
-                ((List<ModSettings?>)collection.Settings)[i] = null;
+            if (SettingIsDefaultV0(collection.GetOwnSettings(i)))
+                collection.Settings.SetAll(i, FullModSettings.Empty);
         }
 
-        foreach (var (key, _) in collection.UnusedSettings.Where(kvp => SettingIsDefaultV0(kvp.Value)).ToList())
-            ((Dictionary<string, ModSettings.SavedSettings>)collection.UnusedSettings).Remove(key);
+        foreach (var (key, _) in collection.Settings.Unused.Where(kvp => SettingIsDefaultV0(kvp.Value)).ToList())
+            collection.Settings.RemoveUnused(key);
 
         return true;
     }
 
     /// <summary> We treat every completely defaulted setting as inheritance-ready. </summary>
     private static bool SettingIsDefaultV0(ModSettings.SavedSettings setting)
-        => setting is { Enabled: false, Priority: 0 } && setting.Settings.Values.All(s => s == 0);
+        => setting is { Enabled: true, Priority.IsDefault: true } && setting.Settings.Values.All(s => s == Setting.Zero);
 
     /// <inheritdoc cref="SettingIsDefaultV0(ModSettings.SavedSettings)"/>
     private static bool SettingIsDefaultV0(ModSettings? setting)
-        => setting is { Enabled: false, Priority: 0 } && setting.Settings.All(s => s == 0);
+        => setting is { Enabled: true, Priority.IsDefault: true } && setting.Settings.All(s => s == Setting.Zero);
 }

Penumbra/Collections/Manager/TempCollectionManager.cs

@@ -1,3 +1,5 @@
+using OtterGui.Extensions;
+using OtterGui.Services;
 using Penumbra.Api;
 using Penumbra.Communication;
 using Penumbra.GameData.Actors;
@@ -7,15 +9,15 @@ using Penumbra.String;
 
 namespace Penumbra.Collections.Manager;
 
-public class TempCollectionManager : IDisposable
+public class TempCollectionManager : IDisposable, IService
 {
-    public          int                   GlobalChangeCounter { get; private set; } = 0;
+    public          int                   GlobalChangeCounter { get; private set; }
     public readonly IndividualCollections Collections;
 
-    private readonly CommunicatorService               _communicator;
-    private readonly CollectionStorage                 _storage;
-    private readonly ActorManager                      _actors;
-    private readonly Dictionary<string, ModCollection> _customCollections = new();
+    private readonly CommunicatorService             _communicator;
+    private readonly CollectionStorage               _storage;
+    private readonly ActorManager                    _actors;
+    private readonly Dictionary<Guid, ModCollection> _customCollections = [];
 
     public TempCollectionManager(Configuration config, CommunicatorService communicator, ActorManager actors, CollectionStorage storage)
     {
@@ -42,37 +44,38 @@ public class TempCollectionManager : IDisposable
         => _customCollections.Values;
 
     public bool CollectionByName(string name, [NotNullWhen(true)] out ModCollection? collection)
-        => _customCollections.TryGetValue(name.ToLowerInvariant(), out collection);
+        => _customCollections.Values.FindFirst(c => string.Equals(name, c.Identity.Name, StringComparison.OrdinalIgnoreCase), out collection);
 
-    public string CreateTemporaryCollection(string name)
+    public bool CollectionById(Guid id, [NotNullWhen(true)] out ModCollection? collection)
+        => _customCollections.TryGetValue(id, out collection);
+
+    public Guid CreateTemporaryCollection(string name)
     {
-        if (_storage.ByName(name, out _))
-            return string.Empty;
-
         if (GlobalChangeCounter == int.MaxValue)
             GlobalChangeCounter = 0;
-        var collection = ModCollection.CreateTemporary(name, ~Count, GlobalChangeCounter++);
-        Penumbra.Log.Debug($"Creating temporary collection {collection.AnonymizedName}.");
-        if (_customCollections.TryAdd(collection.Name.ToLowerInvariant(), collection))
+        var collection = _storage.CreateTemporary(name, ~Count, GlobalChangeCounter++);
+        Penumbra.Log.Debug($"Creating temporary collection {collection.Identity.Name} with {collection.Identity.Id}.");
+        if (_customCollections.TryAdd(collection.Identity.Id, collection))
         {
             // Temporary collection created.
             _communicator.CollectionChange.Invoke(CollectionType.Temporary, null, collection, string.Empty);
-            return collection.Name;
+            return collection.Identity.Id;
         }
 
-        return string.Empty;
+        return Guid.Empty;
     }
 
-    public bool RemoveTemporaryCollection(string collectionName)
+    public bool RemoveTemporaryCollection(Guid collectionId)
     {
-        if (!_customCollections.Remove(collectionName.ToLowerInvariant(), out var collection))
+        if (!_customCollections.Remove(collectionId, out var collection))
         {
-            Penumbra.Log.Debug($"Tried to delete temporary collection {collectionName.ToLowerInvariant()}, but did not exist.");
+            Penumbra.Log.Debug($"Tried to delete temporary collection {collectionId}, but did not exist.");
             return false;
         }
 
-        Penumbra.Log.Debug($"Deleted temporary collection {collection.AnonymizedName}.");
-        GlobalChangeCounter += Math.Max(collection.ChangeCounter + 1 - GlobalChangeCounter, 0);
+        _storage.Delete(collection);
+        Penumbra.Log.Debug($"Deleted temporary collection {collection.Identity.Id}.");
+        GlobalChangeCounter += Math.Max(collection.Counters.Change + 1 - GlobalChangeCounter, 0);
         for (var i = 0; i < Collections.Count; ++i)
         {
             if (Collections[i].Collection != collection)
@@ -80,7 +83,7 @@ public class TempCollectionManager : IDisposable
 
             // Temporary collection assignment removed.
             _communicator.CollectionChange.Invoke(CollectionType.Temporary, collection, null, Collections[i].DisplayName);
-            Penumbra.Log.Verbose($"Unassigned temporary collection {collection.AnonymizedName} from {Collections[i].DisplayName}.");
+            Penumbra.Log.Verbose($"Unassigned temporary collection {collection.Identity.Id} from {Collections[i].DisplayName}.");
             Collections.Delete(i--);
         }
 
@@ -93,37 +96,37 @@ public class TempCollectionManager : IDisposable
             return false;
 
         // Temporary collection assignment added.
-        Penumbra.Log.Verbose($"Assigned temporary collection {collection.AnonymizedName} to {Collections.Last().DisplayName}.");
+        Penumbra.Log.Verbose($"Assigned temporary collection {collection.Identity.AnonymizedName} to {Collections.Last().DisplayName}.");
         _communicator.CollectionChange.Invoke(CollectionType.Temporary, null, collection, Collections.Last().DisplayName);
         return true;
     }
 
-    public bool AddIdentifier(string collectionName, params ActorIdentifier[] identifiers)
+    public bool AddIdentifier(Guid collectionId, params ActorIdentifier[] identifiers)
     {
-        if (!_customCollections.TryGetValue(collectionName.ToLowerInvariant(), out var collection))
+        if (!_customCollections.TryGetValue(collectionId, out var collection))
             return false;
 
         return AddIdentifier(collection, identifiers);
     }
 
-    public bool AddIdentifier(string collectionName, string characterName, ushort worldId = ushort.MaxValue)
+    public bool AddIdentifier(Guid collectionId, string characterName, ushort worldId = ushort.MaxValue)
     {
-        if (!ByteString.FromString(characterName, out var byteString, false))
+        if (!ByteString.FromString(characterName, out var byteString))
             return false;
 
         var identifier = _actors.CreatePlayer(byteString, worldId);
         if (!identifier.IsValid)
             return false;
 
-        return AddIdentifier(collectionName, identifier);
+        return AddIdentifier(collectionId, identifier);
     }
 
     internal bool RemoveByCharacterName(string characterName, ushort worldId = ushort.MaxValue)
     {
-        if (!ByteString.FromString(characterName, out var byteString, false))
+        if (!ByteString.FromString(characterName, out var byteString))
             return false;
 
         var identifier = _actors.CreatePlayer(byteString, worldId);
-        return Collections.TryGetValue(identifier, out var collection) && RemoveTemporaryCollection(collection.Name);
+        return Collections.TryGetValue(identifier, out var collection) && RemoveTemporaryCollection(collection.Identity.Id);
     }
 }

Penumbra/Collections/ModCollection.Cache.Access.cs

@@ -1,12 +1,8 @@
 using OtterGui.Classes;
-using Penumbra.GameData.Enums;
 using Penumbra.Mods;
-using Penumbra.Interop.Structs;
-using Penumbra.Meta.Files;
-using Penumbra.Meta.Manipulations;
 using Penumbra.String.Classes;
 using Penumbra.Collections.Cache;
-using Penumbra.Interop.Services;
+using Penumbra.GameData.Data;
 using Penumbra.Mods.Editor;
 
 namespace Penumbra.Collections;
@@ -47,71 +43,15 @@ public partial class ModCollection
     internal MetaCache? MetaCache
         => _cache?.Meta;
 
-    public bool GetImcFile(Utf8GamePath path, [NotNullWhen(true)] out ImcFile? file)
-    {
-        if (_cache != null)
-            return _cache.Meta.GetImcFile(path, out file);
-
-        file = null;
-        return false;
-    }
-
     internal IReadOnlyDictionary<Utf8GamePath, ModPath> ResolvedFiles
         => _cache?.ResolvedFiles ?? new ConcurrentDictionary<Utf8GamePath, ModPath>();
 
-    internal IReadOnlyDictionary<string, (SingleArray<IMod>, object?)> ChangedItems
-        => _cache?.ChangedItems ?? new Dictionary<string, (SingleArray<IMod>, object?)>();
+    internal IReadOnlyDictionary<string, (SingleArray<IMod>, IIdentifiedObjectData)> ChangedItems
+        => _cache?.ChangedItems ?? new Dictionary<string, (SingleArray<IMod>, IIdentifiedObjectData)>();
 
     internal IEnumerable<SingleArray<ModConflicts>> AllConflicts
         => _cache?.AllConflicts ?? Array.Empty<SingleArray<ModConflicts>>();
 
     internal SingleArray<ModConflicts> Conflicts(Mod mod)
         => _cache?.Conflicts(mod) ?? new SingleArray<ModConflicts>();
-
-    public void SetFiles(CharacterUtility utility)
-    {
-        if (_cache == null)
-        {
-            utility.ResetAll();
-        }
-        else
-        {
-            _cache.Meta.SetFiles();
-            Penumbra.Log.Debug($"Set CharacterUtility resources for collection {Name}.");
-        }
-    }
-
-    public void SetMetaFile(CharacterUtility utility, MetaIndex idx)
-    {
-        if (_cache == null)
-            utility.ResetResource(idx);
-        else
-            _cache.Meta.SetFile(idx);
-    }
-
-    // Used for short periods of changed files.
-    public MetaList.MetaReverter? TemporarilySetEqdpFile(CharacterUtility utility, GenderRace genderRace, bool accessory)
-    {
-        if (_cache != null)
-            return _cache?.Meta.TemporarilySetEqdpFile(genderRace, accessory);
-
-        var idx = CharacterUtilityData.EqdpIdx(genderRace, accessory);
-        return idx >= 0 ? utility.TemporarilyResetResource(idx) : null;
-    }
-
-    public MetaList.MetaReverter TemporarilySetEqpFile(CharacterUtility utility)
-        => _cache?.Meta.TemporarilySetEqpFile()
-         ?? utility.TemporarilyResetResource(MetaIndex.Eqp);
-
-    public MetaList.MetaReverter TemporarilySetGmpFile(CharacterUtility utility)
-        => _cache?.Meta.TemporarilySetGmpFile()
-         ?? utility.TemporarilyResetResource(MetaIndex.Gmp);
-
-    public MetaList.MetaReverter TemporarilySetCmpFile(CharacterUtility utility)
-        => _cache?.Meta.TemporarilySetCmpFile()
-         ?? utility.TemporarilyResetResource(MetaIndex.HumanCmp);
-
-    public MetaList.MetaReverter TemporarilySetEstFile(CharacterUtility utility, EstManipulation.EstType type)
-        => _cache?.Meta.TemporarilySetEstFile(type)
-         ?? utility.TemporarilyResetResource((MetaIndex)type);
 }

Penumbra/Collections/ModCollection.cs

@@ -1,7 +1,6 @@
-using Penumbra.Mods;
 using Penumbra.Mods.Manager;
 using Penumbra.Collections.Manager;
-using Penumbra.Mods.Subclasses;
+using Penumbra.Mods.Settings;
 using Penumbra.Services;
 
 namespace Penumbra.Collections;
@@ -13,196 +12,129 @@ namespace Penumbra.Collections;
 ///    - Index is the collections index in the ModCollection.Manager
 ///    - Settings has the same size as ModManager.Mods.
 ///    - any change in settings or inheritance of the collection causes a Save.
-///    - the name can not contain invalid path characters and has to be unique when lower-cased.
 /// </summary>
 public partial class ModCollection
 {
-    public const int    CurrentVersion        = 1;
-    public const string DefaultCollectionName = "Default";
-    public const string EmptyCollectionName   = "None";
+    public const int CurrentVersion = 2;
 
     /// <summary>
     /// Create the always available Empty Collection that will always sit at index 0,
     /// can not be deleted and does never create a cache.
     /// </summary>
-    public static readonly ModCollection Empty = CreateEmpty(EmptyCollectionName, 0, 0);
+    public static readonly ModCollection Empty = new(ModCollectionIdentity.Empty, 0, CurrentVersion, new ModSettingProvider(),
+        new ModCollectionInheritance());
 
-    /// <summary> The name of a collection can not contain characters invalid in a path. </summary>
-    public string Name { get; internal init; }
+    public ModCollectionIdentity Identity;
 
     public override string ToString()
-        => Name;
+        => Identity.ToString();
 
-    /// <summary> Get the first two letters of a collection name and its Index (or None if it is the empty collection). </summary>
-    public string AnonymizedName
-        => this == Empty ? Empty.Name : Name.Length > 2 ? $"{Name[..2]}... ({Index})" : $"{Name} ({Index})";
+    public readonly ModSettingProvider       Settings;
+    public          ModCollectionInheritance Inheritance;
+    public          CollectionCounters       Counters;
 
-    /// <summary> The index of the collection is set and kept up-to-date by the CollectionManager. </summary>
-    public int Index { get; internal set; }
 
-    /// <summary>
-    /// Count the number of changes of the effective file list.
-    /// This is used for material and imc changes.
-    /// </summary>
-    public int ChangeCounter { get; private set; }
-
-    /// <summary> Increment the number of changes in the effective file list. </summary>
-    public int IncrementCounter()
-        => ++ChangeCounter;
-
-    /// <summary>
-    /// If a ModSetting is null, it can be inherited from other collections.
-    /// If no collection provides a setting for the mod, it is just disabled.
-    /// </summary>
-    public readonly IReadOnlyList<ModSettings?> Settings;
-
-    /// <summary> Settings for deleted mods will be kept via the mods identifier (directory name). </summary>
-    public readonly IReadOnlyDictionary<string, ModSettings.SavedSettings> UnusedSettings;
-
-    /// <summary> Inheritances stored before they can be applied. </summary>
-    public IReadOnlyList<string>? InheritanceByName;
-
-    /// <summary> Contains all direct parent collections this collection inherits settings from. </summary>
-    public readonly IReadOnlyList<ModCollection> DirectlyInheritsFrom;
-
-    /// <summary> Contains all direct child collections that inherit from this collection. </summary>
-    public readonly IReadOnlyList<ModCollection> DirectParentOf = new List<ModCollection>();
-
-    /// <summary> All inherited collections in application order without filtering for duplicates. </summary>
-    public static IEnumerable<ModCollection> InheritedCollections(ModCollection collection)
-        => collection.DirectlyInheritsFrom.SelectMany(InheritedCollections).Prepend(collection);
-
-    /// <summary>
-    /// Iterate over all collections inherited from in depth-first order.
-    /// Skip already visited collections to avoid circular dependencies.
-    /// </summary>
-    public IEnumerable<ModCollection> GetFlattenedInheritance()
-        => InheritedCollections(this).Distinct();
-
-    /// <summary>
-    /// Obtain the actual settings for a given mod via index.
-    /// Also returns the collection the settings are taken from.
-    /// If no collection provides settings for this mod, this collection is returned together with null.
-    /// </summary>
-    public (ModSettings? Settings, ModCollection Collection) this[Index idx]
+    public ModSettings? GetOwnSettings(Index idx)
     {
-        get
+        if (Identity.Index <= 0)
+            return ModSettings.Empty;
+
+        return Settings.Settings[idx].Settings;
+    }
+
+    public TemporaryModSettings? GetTempSettings(Index idx)
+    {
+        if (Identity.Index <= 0)
+            return null;
+
+        return Settings.Settings[idx].TempSettings;
+    }
+
+    public (ModSettings? Settings, ModCollection Collection) GetInheritedSettings(Index idx)
+    {
+        if (Identity.Index <= 0)
+            return (ModSettings.Empty, this);
+
+        foreach (var collection in Inheritance.FlatHierarchy)
         {
-            if (Index <= 0)
-                return (ModSettings.Empty, this);
-
-            foreach (var collection in GetFlattenedInheritance())
-            {
-                var settings = collection.Settings[idx];
-                if (settings != null)
-                    return (settings, collection);
-            }
-
-            return (null, this);
+            var settings = collection.Settings.Settings[idx].Settings;
+            if (settings != null)
+                return (settings, collection);
         }
+
+        return (null, this);
+    }
+
+    public (ModSettings? Settings, ModCollection Collection) GetActualSettings(Index idx)
+    {
+        if (Identity.Index <= 0)
+            return (ModSettings.Empty, this);
+
+        // Check temp settings.
+        var ownTempSettings = Settings.Settings[idx].Resolve();
+        if (ownTempSettings != null)
+            return (ownTempSettings, this);
+
+        // Ignore temp settings for inherited collections.
+        foreach (var collection in Inheritance.FlatHierarchy.Skip(1))
+        {
+            var settings = collection.Settings.Settings[idx].Settings;
+            if (settings != null)
+                return (settings, collection);
+        }
+
+        return (null, this);
     }
 
     /// <summary> Evaluates all settings along the whole inheritance tree. </summary>
     public IEnumerable<ModSettings?> ActualSettings
-        => Enumerable.Range(0, Settings.Count).Select(i => this[i].Settings);
+        => Enumerable.Range(0, Settings.Count).Select(i => GetActualSettings(i).Settings);
 
     /// <summary>
     /// Constructor for duplication. Deep copies all settings and parent collections and adds the new collection to their children lists.
     /// </summary>
-    public ModCollection Duplicate(string name, int index)
+    public ModCollection Duplicate(string name, LocalCollectionId localId, int index)
     {
         Debug.Assert(index > 0, "Collection duplicated with non-positive index.");
-        return new ModCollection(name, index, 0, CurrentVersion, Settings.Select(s => s?.DeepCopy()).ToList(),
-            [.. DirectlyInheritsFrom], UnusedSettings.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.DeepCopy()));
+        return new ModCollection(ModCollectionIdentity.New(name, localId, index), 0, CurrentVersion, Settings.Clone(), Inheritance.Clone());
     }
 
     /// <summary> Constructor for reading from files. </summary>
-    public static ModCollection CreateFromData(SaveService saver, ModStorage mods, string name, int version, int index,
+    public static ModCollection CreateFromData(SaveService saver, ModStorage mods, ModCollectionIdentity identity, int version,
         Dictionary<string, ModSettings.SavedSettings> allSettings, IReadOnlyList<string> inheritances)
     {
-        Debug.Assert(index > 0, "Collection read with non-positive index.");
-        var ret = new ModCollection(name, index, 0, version, new List<ModSettings?>(), new List<ModCollection>(), allSettings)
-        {
-            InheritanceByName = inheritances,
-        };
-        ret.ApplyModSettings(saver, mods);
+        Debug.Assert(identity.Index > 0, "Collection read with non-positive index.");
+        var ret = new ModCollection(identity, 0, version, new ModSettingProvider(allSettings), new ModCollectionInheritance(inheritances));
+        ret.Settings.ApplyModSettings(ret, saver, mods);
         ModCollectionMigration.Migrate(saver, mods, version, ret);
         return ret;
     }
 
     /// <summary> Constructor for temporary collections. </summary>
-    public static ModCollection CreateTemporary(string name, int index, int changeCounter)
+    public static ModCollection CreateTemporary(string name, LocalCollectionId localId, int index, int changeCounter)
     {
         Debug.Assert(index < 0, "Temporary collection created with non-negative index.");
-        var ret = new ModCollection(name, index, changeCounter, CurrentVersion, new List<ModSettings?>(), new List<ModCollection>(),
-            new Dictionary<string, ModSettings.SavedSettings>());
+        var ret = new ModCollection(ModCollectionIdentity.New(name, localId, index), changeCounter, CurrentVersion, new ModSettingProvider(),
+            new ModCollectionInheritance());
         return ret;
     }
 
     /// <summary> Constructor for empty collections. </summary>
-    public static ModCollection CreateEmpty(string name, int index, int modCount)
+    public static ModCollection CreateEmpty(string name, LocalCollectionId localId, int index, int modCount)
     {
         Debug.Assert(index >= 0, "Empty collection created with negative index.");
-        return new ModCollection(name, index, 0, CurrentVersion, Enumerable.Repeat((ModSettings?)null, modCount).ToList(),
-            new List<ModCollection>(),
-            new Dictionary<string, ModSettings.SavedSettings>());
+        return new ModCollection(ModCollectionIdentity.New(name, localId, index), 0, CurrentVersion, ModSettingProvider.Empty(modCount),
+            new ModCollectionInheritance());
     }
 
-    /// <summary> Add settings for a new appended mod, by checking if the mod had settings from a previous deletion. </summary>
-    internal bool AddMod(Mod mod)
+    private ModCollection(ModCollectionIdentity identity, int changeCounter, int version, ModSettingProvider settings,
+        ModCollectionInheritance inheritance)
     {
-        if (UnusedSettings.TryGetValue(mod.ModPath.Name, out var save))
-        {
-            var ret = save.ToSettings(mod, out var settings);
-            ((List<ModSettings?>)Settings).Add(settings);
-            ((Dictionary<string, ModSettings.SavedSettings>)UnusedSettings).Remove(mod.ModPath.Name);
-            return ret;
-        }
-
-        ((List<ModSettings?>)Settings).Add(null);
-        return false;
-    }
-
-    /// <summary> Move settings from the current mod list to the unused mod settings. </summary>
-    internal void RemoveMod(Mod mod)
-    {
-        var settings = Settings[mod.Index];
-        if (settings != null)
-            ((Dictionary<string, ModSettings.SavedSettings>)UnusedSettings)[mod.ModPath.Name] = new ModSettings.SavedSettings(settings, mod);
-
-        ((List<ModSettings?>)Settings).RemoveAt(mod.Index);
-    }
-
-    /// <summary> Move all settings to unused settings for rediscovery. </summary>
-    internal void PrepareModDiscovery(ModStorage mods)
-    {
-        foreach (var (mod, setting) in mods.Zip(Settings).Where(s => s.Second != null))
-            ((Dictionary<string, ModSettings.SavedSettings>)UnusedSettings)[mod.ModPath.Name] = new ModSettings.SavedSettings(setting!, mod);
-
-        ((List<ModSettings?>)Settings).Clear();
-    }
-
-    /// <summary>
-    /// Apply all mod settings from unused settings to the current set of mods.
-    /// Also fixes invalid settings.
-    /// </summary>
-    internal void ApplyModSettings(SaveService saver, ModStorage mods)
-    {
-        ((List<ModSettings?>)Settings).Capacity = Math.Max(((List<ModSettings?>)Settings).Capacity, mods.Count);
-        if (mods.Aggregate(false, (current, mod) => current | AddMod(mod)))
-            saver.ImmediateSave(new ModCollectionSave(mods, this));
-    }
-
-    private ModCollection(string name, int index, int changeCounter, int version, List<ModSettings?> appliedSettings,
-        List<ModCollection> inheritsFrom, Dictionary<string, ModSettings.SavedSettings> settings)
-    {
-        Name                 = name;
-        Index                = index;
-        ChangeCounter        = changeCounter;
-        Settings             = appliedSettings;
-        UnusedSettings       = settings;
-        DirectlyInheritsFrom = inheritsFrom;
-        foreach (var c in DirectlyInheritsFrom)
-            ((List<ModCollection>)c.DirectParentOf).Add(this);
+        Identity    = identity;
+        Counters    = new CollectionCounters(changeCounter);
+        Settings    = settings;
+        Inheritance = inheritance;
+        ModCollectionInheritance.UpdateChildren(this);
+        ModCollectionInheritance.UpdateFlattenedInheritance(this);
     }
 }

Penumbra/Collections/ModCollectionIdentity.cs

@@ -0,0 +1,43 @@
+using OtterGui;
+using OtterGui.Extensions;
+using Penumbra.Collections.Manager;
+
+namespace Penumbra.Collections;
+
+public struct ModCollectionIdentity(Guid id, LocalCollectionId localId)
+{
+    public const string DefaultCollectionName = "Default";
+    public const string EmptyCollectionName   = "None";
+
+    public static readonly ModCollectionIdentity Empty = new(Guid.Empty, LocalCollectionId.Zero, EmptyCollectionName, 0);
+
+    public string            Name    { get; set; } = string.Empty;
+    public Guid              Id      { get; }      = id;
+    public LocalCollectionId LocalId { get; }      = localId;
+
+    /// <summary> The index of the collection is set and kept up-to-date by the CollectionManager. </summary>
+    public int Index { get; internal set; }
+
+    public string Identifier
+        => Id.ToString();
+
+    public string ShortIdentifier
+        => Id.ShortGuid();
+
+    /// <summary> Get the short identifier of a collection unless it is a well-known collection name. </summary>
+    public string AnonymizedName
+        => Id == Guid.Empty ? EmptyCollectionName : Name == DefaultCollectionName ? Name : ShortIdentifier;
+
+    public override string ToString()
+        => Name.Length > 0 ? Name : ShortIdentifier;
+
+    public ModCollectionIdentity(Guid id, LocalCollectionId localId, string name, int index)
+        : this(id, localId)
+    {
+        Name  = name;
+        Index = index;
+    }
+
+    public static ModCollectionIdentity New(string name, LocalCollectionId id, int index)
+        => new(Guid.NewGuid(), id, name, index);
+}

Penumbra/Collections/ModCollectionInheritance.cs

@@ -0,0 +1,92 @@
+using OtterGui.Filesystem;
+
+namespace Penumbra.Collections;
+
+public struct ModCollectionInheritance
+{
+    public           IReadOnlyList<string>? InheritanceByName { get; private set; }
+    private readonly List<ModCollection>    _directlyInheritsFrom = [];
+    private readonly List<ModCollection>    _directlyInheritedBy  = [];
+    private readonly List<ModCollection>    _flatHierarchy        = [];
+
+    public ModCollectionInheritance()
+    { }
+
+    private ModCollectionInheritance(List<ModCollection> inheritsFrom)
+        => _directlyInheritsFrom = [.. inheritsFrom];
+
+    public ModCollectionInheritance(IReadOnlyList<string> byName)
+        => InheritanceByName = byName;
+
+    public ModCollectionInheritance Clone()
+        => new(_directlyInheritsFrom);
+
+    public IEnumerable<string> Identifiers
+        => InheritanceByName ?? _directlyInheritsFrom.Select(c => c.Identity.Identifier);
+
+    public IReadOnlyList<string>? ConsumeNames()
+    {
+        var ret = InheritanceByName;
+        InheritanceByName = null;
+        return ret;
+    }
+
+    public static void UpdateChildren(ModCollection parent)
+    {
+        foreach (var inheritance in parent.Inheritance.DirectlyInheritsFrom)
+            inheritance.Inheritance._directlyInheritedBy.Add(parent);
+    }
+
+    public void AddInheritance(ModCollection inheritor, ModCollection newParent)
+    {
+        _directlyInheritsFrom.Add(newParent);
+        newParent.Inheritance._directlyInheritedBy.Add(inheritor);
+        UpdateFlattenedInheritance(inheritor);
+    }
+
+    public ModCollection RemoveInheritanceAt(ModCollection inheritor, int idx)
+    {
+        var parent = DirectlyInheritsFrom[idx];
+        _directlyInheritsFrom.RemoveAt(idx);
+        parent.Inheritance._directlyInheritedBy.Remove(parent);
+        UpdateFlattenedInheritance(inheritor);
+        return parent;
+    }
+
+    public bool MoveInheritance(ModCollection inheritor, int from, int to)
+    {
+        if (!_directlyInheritsFrom.Move(from, to))
+            return false;
+
+        UpdateFlattenedInheritance(inheritor);
+        return true;
+    }
+
+    public void RemoveChild(ModCollection child)
+        => _directlyInheritedBy.Remove(child);
+
+    /// <summary> Contains all direct parent collections this collection inherits settings from. </summary>
+    public readonly IReadOnlyList<ModCollection> DirectlyInheritsFrom
+        => _directlyInheritsFrom;
+
+    /// <summary> Contains all direct child collections that inherit from this collection. </summary>
+    public readonly IReadOnlyList<ModCollection> DirectlyInheritedBy
+        => _directlyInheritedBy;
+
+    /// <summary>
+    /// Iterate over all collections inherited from in depth-first order.
+    /// Skip already visited collections to avoid circular dependencies.
+    /// </summary>
+    public readonly IReadOnlyList<ModCollection> FlatHierarchy
+        => _flatHierarchy;
+
+    public static void UpdateFlattenedInheritance(ModCollection parent)
+    {
+        parent.Inheritance._flatHierarchy.Clear();
+        parent.Inheritance._flatHierarchy.AddRange(InheritedCollections(parent).Distinct());
+    }
+
+    /// <summary> All inherited collections in application order without filtering for duplicates. </summary>
+    private static IEnumerable<ModCollection> InheritedCollections(ModCollection parent)
+        => parent.Inheritance.DirectlyInheritsFrom.SelectMany(InheritedCollections).Prepend(parent);
+}

Penumbra/Collections/ModCollectionSave.cs

@@ -2,7 +2,7 @@ using Newtonsoft.Json.Linq;
 using Penumbra.Services;
 using Newtonsoft.Json;
 using Penumbra.Mods.Manager;
-using Penumbra.Mods.Subclasses;
+using Penumbra.Mods.Settings;
 
 namespace Penumbra.Collections;
 
@@ -15,7 +15,7 @@ internal readonly struct ModCollectionSave(ModStorage modStorage, ModCollection
         => fileNames.CollectionFile(modCollection);
 
     public string LogName(string _)
-        => modCollection.AnonymizedName;
+        => modCollection.Identity.AnonymizedName;
 
     public string TypeName
         => "Collection";
@@ -28,21 +28,23 @@ internal readonly struct ModCollectionSave(ModStorage modStorage, ModCollection
         j.WriteStartObject();
         j.WritePropertyName("Version");
         j.WriteValue(ModCollection.CurrentVersion);
-        j.WritePropertyName(nameof(ModCollection.Name));
-        j.WriteValue(modCollection.Name);
-        j.WritePropertyName(nameof(ModCollection.Settings));
+        j.WritePropertyName(nameof(ModCollectionIdentity.Id));
+        j.WriteValue(modCollection.Identity.Identifier);
+        j.WritePropertyName(nameof(ModCollectionIdentity.Name));
+        j.WriteValue(modCollection.Identity.Name);
+        j.WritePropertyName("Settings");
 
         // Write all used and unused settings by mod directory name.
         j.WriteStartObject();
-        var list = new List<(string, ModSettings.SavedSettings)>(modCollection.Settings.Count + modCollection.UnusedSettings.Count);
+        var list = new List<(string, ModSettings.SavedSettings)>(modCollection.Settings.Count + modCollection.Settings.Unused.Count);
         for (var i = 0; i < modCollection.Settings.Count; ++i)
         {
-            var settings = modCollection.Settings[i];
+            var settings = modCollection.GetOwnSettings(i);
             if (settings != null)
                 list.Add((modStorage[i].ModPath.Name, new ModSettings.SavedSettings(settings, modStorage[i])));
         }
 
-        list.AddRange(modCollection.UnusedSettings.Select(kvp => (kvp.Key, kvp.Value)));
+        list.AddRange(modCollection.Settings.Unused.Select(kvp => (kvp.Key, kvp.Value)));
         list.Sort((a, b) => string.Compare(a.Item1, b.Item1, StringComparison.OrdinalIgnoreCase));
 
         foreach (var (modDir, settings) in list)
@@ -55,20 +57,20 @@ internal readonly struct ModCollectionSave(ModStorage modStorage, ModCollection
 
         // Inherit by collection name.
         j.WritePropertyName("Inheritance");
-        x.Serialize(j, modCollection.InheritanceByName ?? modCollection.DirectlyInheritsFrom.Select(c => c.Name));
+        x.Serialize(j, modCollection.Inheritance.Identifiers);
         j.WriteEndObject();
     }
 
-    public static bool LoadFromFile(FileInfo file, out string name, out int version, out Dictionary<string, ModSettings.SavedSettings> settings,
+    public static bool LoadFromFile(FileInfo file, out Guid id, out string name, out int version, out Dictionary<string, ModSettings.SavedSettings> settings,
         out IReadOnlyList<string> inheritance)
     {
-        settings    = new Dictionary<string, ModSettings.SavedSettings>();
-        inheritance = Array.Empty<string>();
+        settings    = [];
+        inheritance = [];
         if (!file.Exists)
         {
             Penumbra.Log.Error("Could not read collection because file does not exist.");
-            name = string.Empty;
-
+            name    = string.Empty;
+            id      = Guid.Empty;
             version = 0;
             return false;
         }
@@ -76,10 +78,11 @@ internal readonly struct ModCollectionSave(ModStorage modStorage, ModCollection
         try
         {
             var obj = JObject.Parse(File.ReadAllText(file.FullName));
-            name    = obj[nameof(ModCollection.Name)]?.ToObject<string>() ?? string.Empty;
             version = obj["Version"]?.ToObject<int>() ?? 0;
+            name    = obj[nameof(ModCollectionIdentity.Name)]?.ToObject<string>() ?? string.Empty;
+            id      = obj[nameof(ModCollectionIdentity.Id)]?.ToObject<Guid>() ?? (version == 1 ? Guid.NewGuid() : Guid.Empty);
             // Custom deserialization that is converted with the constructor. 
-            settings    = obj[nameof(ModCollection.Settings)]?.ToObject<Dictionary<string, ModSettings.SavedSettings>>() ?? settings;
+            settings    = obj["Settings"]?.ToObject<Dictionary<string, ModSettings.SavedSettings>>() ?? settings;
             inheritance = obj["Inheritance"]?.ToObject<List<string>>() ?? inheritance;
             return true;
         }
@@ -87,6 +90,7 @@ internal readonly struct ModCollectionSave(ModStorage modStorage, ModCollection
         {
             name    = string.Empty;
             version = 0;
+            id      = Guid.Empty;
             Penumbra.Log.Error($"Could not read collection information from file:\n{e}");
             return false;
         }

Penumbra/Collections/ModSettingProvider.cs

@@ -0,0 +1,98 @@
+using Penumbra.Mods;
+using Penumbra.Mods.Manager;
+using Penumbra.Mods.Settings;
+using Penumbra.Services;
+
+namespace Penumbra.Collections;
+
+public readonly struct ModSettingProvider
+{
+    private ModSettingProvider(IEnumerable<FullModSettings> settings, Dictionary<string, ModSettings.SavedSettings> unusedSettings)
+    {
+        _settings = settings.Select(s => s.DeepCopy()).ToList();
+        _unused   = unusedSettings.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.DeepCopy());
+    }
+
+    public ModSettingProvider()
+    { }
+
+    public static ModSettingProvider Empty(int count)
+        => new(Enumerable.Repeat(FullModSettings.Empty, count), []);
+
+    public ModSettingProvider(Dictionary<string, ModSettings.SavedSettings> allSettings)
+        => _unused = allSettings;
+
+    private readonly List<FullModSettings> _settings = [];
+
+    /// <summary> Settings for deleted mods will be kept via the mods identifier (directory name). </summary>
+    private readonly Dictionary<string, ModSettings.SavedSettings> _unused = [];
+
+    public int Count
+        => _settings.Count;
+
+    public bool RemoveUnused(string key)
+        => _unused.Remove(key);
+
+    internal void Set(Index index, ModSettings? settings)
+        => _settings[index] = _settings[index] with { Settings = settings };
+
+    internal void SetTemporary(Index index, TemporaryModSettings? settings)
+        => _settings[index] = _settings[index] with { TempSettings = settings };
+
+    internal void SetAll(Index index, FullModSettings settings)
+        => _settings[index] = settings;
+
+    public IReadOnlyList<FullModSettings> Settings
+        => _settings;
+
+    public IReadOnlyDictionary<string, ModSettings.SavedSettings> Unused
+        => _unused;
+
+    public ModSettingProvider Clone()
+        => new(_settings, _unused);
+
+    /// <summary> Add settings for a new appended mod, by checking if the mod had settings from a previous deletion. </summary>
+    internal bool AddMod(Mod mod)
+    {
+        if (_unused.Remove(mod.ModPath.Name, out var save))
+        {
+            var ret = save.ToSettings(mod, out var settings);
+            _settings.Add(new FullModSettings(settings));
+            return ret;
+        }
+
+        _settings.Add(FullModSettings.Empty);
+        return false;
+    }
+
+    /// <summary> Move settings from the current mod list to the unused mod settings. </summary>
+    internal void RemoveMod(Mod mod)
+    {
+        var settings = _settings[mod.Index];
+        if (settings.Settings != null)
+            _unused[mod.ModPath.Name] = new ModSettings.SavedSettings(settings.Settings, mod);
+
+        _settings.RemoveAt(mod.Index);
+    }
+
+    /// <summary> Move all settings to unused settings for rediscovery. </summary>
+    internal void PrepareModDiscovery(ModStorage mods)
+    {
+        foreach (var (mod, setting) in mods.Zip(_settings).Where(s => s.Second.Settings != null))
+            _unused[mod.ModPath.Name] = new ModSettings.SavedSettings(setting.Settings!, mod);
+
+        _settings.Clear();
+    }
+
+    /// <summary>
+    /// Apply all mod settings from unused settings to the current set of mods.
+    /// Also fixes invalid settings.
+    /// </summary>
+    internal void ApplyModSettings(ModCollection parent, SaveService saver, ModStorage mods)
+    {
+        _settings.Capacity = Math.Max(_settings.Capacity, mods.Count);
+        var settings = this;
+        if (mods.Aggregate(false, (current, mod) => current | settings.AddMod(mod)))
+            saver.ImmediateSave(new ModCollectionSave(mods, parent));
+    }
+}

Penumbra/Collections/ResolveData.cs

@@ -23,7 +23,7 @@ public readonly struct ResolveData(ModCollection collection, nint gameObject)
     { }
 
     public override string ToString()
-        => ModCollection.Name;
+        => ModCollection.Identity.Name;
 }
 
 public static class ResolveDataExtensions

Penumbra/CommandHandler.cs

@@ -1,8 +1,10 @@
 using Dalamud.Game.Command;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Plugin.Services;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Classes;
+using OtterGui.Services;
+using Penumbra.Api.Api;
 using Penumbra.Api.Enums;
 using Penumbra.Collections;
 using Penumbra.Collections.Manager;
@@ -10,12 +12,12 @@ using Penumbra.GameData.Actors;
 using Penumbra.Interop.Services;
 using Penumbra.Mods;
 using Penumbra.Mods.Manager;
-using Penumbra.Services;
 using Penumbra.UI;
+using Penumbra.UI.Knowledge;
 
 namespace Penumbra;
 
-public class CommandHandler : IDisposable
+public class CommandHandler : IDisposable, IApiService
 {
     private const string CommandName = "/penumbra";
 
@@ -29,11 +31,12 @@ public class CommandHandler : IDisposable
     private readonly CollectionManager _collectionManager;
     private readonly Penumbra          _penumbra;
     private readonly CollectionEditor  _collectionEditor;
+    private readonly KnowledgeWindow   _knowledgeWindow;
 
     public CommandHandler(IFramework framework, ICommandManager commandManager, IChatGui chat, RedrawService redrawService,
-        Configuration config,
-        ConfigWindow configWindow, ModManager modManager, CollectionManager collectionManager, ActorManager actors, Penumbra penumbra,
-        CollectionEditor collectionEditor)
+        Configuration config, ConfigWindow configWindow, ModManager modManager, CollectionManager collectionManager, ActorManager actors,
+        Penumbra penumbra,
+        CollectionEditor collectionEditor, KnowledgeWindow knowledgeWindow)
     {
         _commandManager    = commandManager;
         _redrawService     = redrawService;
@@ -45,6 +48,7 @@ public class CommandHandler : IDisposable
         _chat              = chat;
         _penumbra          = penumbra;
         _collectionEditor  = collectionEditor;
+        _knowledgeWindow   = knowledgeWindow;
         framework.RunOnFrameworkThread(() =>
         {
             if (_commandManager.Commands.ContainsKey(CommandName))
@@ -69,21 +73,23 @@ public class CommandHandler : IDisposable
         var argumentList = arguments.Split(' ', 2);
         arguments = argumentList.Length == 2 ? argumentList[1] : string.Empty;
 
-        var _ = argumentList[0].ToLowerInvariant() switch
+        _ = argumentList[0].ToLowerInvariant() switch
         {
-            "window"     => ToggleWindow(arguments),
-            "enable"     => SetPenumbraState(arguments, true),
-            "disable"    => SetPenumbraState(arguments, false),
-            "toggle"     => SetPenumbraState(arguments, null),
-            "reload"     => Reload(arguments),
-            "redraw"     => Redraw(arguments),
-            "lockui"     => SetUiLockState(arguments),
-            "size"       => SetUiMinimumSize(arguments),
-            "debug"      => SetDebug(arguments),
-            "collection" => SetCollection(arguments),
-            "mod"        => SetMod(arguments),
-            "bulktag"    => SetTag(arguments),
-            _            => PrintHelp(argumentList[0]),
+            "window"        => ToggleWindow(arguments),
+            "enable"        => SetPenumbraState(arguments, true),
+            "disable"       => SetPenumbraState(arguments, false),
+            "toggle"        => SetPenumbraState(arguments, null),
+            "reload"        => Reload(arguments),
+            "redraw"        => Redraw(arguments),
+            "lockui"        => SetUiLockState(arguments),
+            "size"          => SetUiMinimumSize(arguments),
+            "debug"         => SetDebug(arguments),
+            "collection"    => SetCollection(arguments),
+            "mod"           => SetMod(arguments),
+            "bulktag"       => SetTag(arguments),
+            "clearsettings" => ClearSettings(arguments),
+            "knowledge"     => HandleKnowledge(arguments),
+            _               => PrintHelp(argumentList[0]),
         };
     }
 
@@ -121,6 +127,21 @@ public class CommandHandler : IDisposable
         _chat.Print(new SeStringBuilder()
             .AddCommand("bulktag", "Change multiple mods settings based on their tags. Use without further parameters for more detailed help.")
             .BuiltString);
+        _chat.Print(new SeStringBuilder()
+            .AddCommand("clearsettings",
+                "Clear all temporary settings applied manually through Penumbra in the current or all collections. Use with 'all' parameter for all.")
+            .BuiltString);
+        return true;
+    }
+
+    private bool ClearSettings(string arguments)
+    {
+        if (arguments.Trim().ToLowerInvariant() is "all")
+            foreach (var collection in _collectionManager.Storage)
+                _collectionEditor.ClearTemporarySettings(collection);
+        else
+            _collectionEditor.ClearTemporarySettings(_collectionManager.Active.Current);
+
         return true;
     }
 
@@ -304,7 +325,7 @@ public class CommandHandler : IDisposable
                     identifiers = _actors.FromUserString(split[2], false);
                 }
             }
-            catch (ActorManager.IdentifierParseError e)
+            catch (ActorIdentifierFactory.IdentifierParseError e)
             {
                 _chat.Print(new SeStringBuilder().AddText("The argument ").AddRed(split[2], true)
                     .AddText($" could not be converted to an identifier. {e.Message}")
@@ -321,7 +342,7 @@ public class CommandHandler : IDisposable
             {
                 _chat.Print(collection == null
                     ? $"The {type.ToName()} Collection{(identifier.IsValid ? $" for {identifier}" : string.Empty)} is already unassigned"
-                    : $"{collection.Name} already is the {type.ToName()} Collection{(identifier.IsValid ? $" for {identifier}." : ".")}");
+                    : $"{collection.Identity.Name} already is the {type.ToName()} Collection{(identifier.IsValid ? $" for {identifier}." : ".")}");
                 continue;
             }
 
@@ -358,13 +379,13 @@ public class CommandHandler : IDisposable
                 }
 
                 Print(
-                    $"Removed {oldCollection.Name} as {type.ToName()} Collection assignment {(identifier.IsValid ? $" for {identifier}." : ".")}");
+                    $"Removed {oldCollection.Identity.Name} as {type.ToName()} Collection assignment {(identifier.IsValid ? $" for {identifier}." : ".")}");
                 anySuccess = true;
                 continue;
             }
 
             _collectionManager.Active.SetCollection(collection!, type, individualIndex);
-            Print($"Assigned {collection!.Name} as {type.ToName()} Collection{(identifier.IsValid ? $" for {identifier}." : ".")}");
+            Print($"Assigned {collection!.Identity.Name} as {type.ToName()} Collection{(identifier.IsValid ? $" for {identifier}." : ".")}");
         }
 
         return anySuccess;
@@ -375,16 +396,18 @@ public class CommandHandler : IDisposable
         if (arguments.Length == 0)
         {
             var seString = new SeStringBuilder()
-                .AddText("Use with /penumbra mod ").AddBlue("[enable|disable|inherit|toggle]").AddText("  ").AddYellow("[Collection Name]")
+                .AddText("Use with /penumbra mod ").AddBlue("[enable|disable|inherit|toggle|").AddGreen("setting").AddBlue("]").AddText("  ")
+                .AddYellow("[Collection Name]")
                 .AddText(" | ")
-                .AddPurple("[Mod Name or Mod Directory Name]");
+                .AddPurple("[Mod Name or Mod Directory Name]")
+                .AddGreen(" <| [Option Group Name] | [Option1;Option2;...]>");
             _chat.Print(seString.BuiltString);
             return true;
         }
 
         var split = arguments.Split(' ', 2, StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
         var nameSplit = split.Length != 2
-            ? Array.Empty<string>()
+            ? []
             : split[1].Split('|', 2, StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
         if (nameSplit.Length != 2)
         {
@@ -402,6 +425,24 @@ public class CommandHandler : IDisposable
         if (!GetModCollection(nameSplit[0], out var collection) || collection == ModCollection.Empty)
             return false;
 
+        var groupName   = string.Empty;
+        var optionNames = Array.Empty<string>();
+        if (state is 4)
+        {
+            var split2 = nameSplit[1].Split('|', 3, StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
+            if (split2.Length < 2)
+            {
+                _chat.Print(
+                    "Not enough arguments for changing settings provided. Please add a group name and a list of setting names - which can be empty for multi options.");
+                return false;
+            }
+
+            nameSplit[1] = split2[0];
+            groupName    = split2[1];
+            if (split2.Length == 3)
+                optionNames = split2[2].Split(';', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
+        }
+
         if (!_modManager.TryGetMod(nameSplit[1], nameSplit[1], out var mod))
         {
             _chat.Print(new SeStringBuilder().AddText("The mod ").AddRed(nameSplit[1], true).AddText(" does not exist.")
@@ -409,12 +450,35 @@ public class CommandHandler : IDisposable
             return false;
         }
 
-        if (HandleModState(state, collection!, mod))
-            return true;
+        if (state < 4)
+        {
+            if (HandleModState(state, collection!, mod))
+                return true;
+
+            _chat.Print(new SeStringBuilder().AddText("Mod ").AddPurple(mod.Name, true)
+                .AddText("already had the desired state in collection ")
+                .AddYellow(collection!.Identity.Name, true).AddText(".").BuiltString);
+            return false;
+        }
+
+        switch (ModSettingsApi.ConvertModSetting(mod, groupName, optionNames, out var groupIndex, out var setting))
+        {
+            case PenumbraApiEc.OptionGroupMissing:
+                _chat.Print(new SeStringBuilder().AddText("The mod ").AddRed(nameSplit[1], true).AddText(" has no group ")
+                    .AddGreen(groupName, true).AddText(".").BuiltString);
+                return false;
+            case PenumbraApiEc.OptionMissing:
+                _chat.Print(new SeStringBuilder().AddText("Not all set options in the mod ").AddRed(nameSplit[1], true)
+                    .AddText(" could be found in group ").AddGreen(groupName, true).AddText(".").BuiltString);
+                return false;
+            case PenumbraApiEc.Success:
+                _collectionEditor.SetModSetting(collection!, mod, groupIndex, setting);
+                Print(() => new SeStringBuilder().AddText("Changed settings of group ").AddGreen(groupName, true).AddText(" in mod ")
+                    .AddPurple(mod.Name, true).AddText(" in collection ")
+                    .AddYellow(collection!.Identity.Name, true).AddText(".").BuiltString);
+                return true;
+        }
 
-        _chat.Print(new SeStringBuilder().AddText("Mod ").AddPurple(mod.Name, true)
-            .AddText("already had the desired state in collection ")
-            .AddYellow(collection!.Name, true).AddText(".").BuiltString);
         return false;
     }
 
@@ -496,7 +560,7 @@ public class CommandHandler : IDisposable
             changes |= HandleModState(state, collection!, mod);
 
         if (!changes)
-            Print(() => new SeStringBuilder().AddText("No mod states were changed in collection ").AddYellow(collection!.Name, true)
+            Print(() => new SeStringBuilder().AddText("No mod states were changed in collection ").AddYellow(collection!.Identity.Name, true)
                 .AddText(".").BuiltString);
 
         return true;
@@ -511,9 +575,9 @@ public class CommandHandler : IDisposable
             return true;
         }
 
-        collection = string.Equals(lowerName, ModCollection.Empty.Name, StringComparison.OrdinalIgnoreCase)
+        collection = string.Equals(lowerName, ModCollection.Empty.Identity.Name, StringComparison.OrdinalIgnoreCase)
             ? ModCollection.Empty
-            : _collectionManager.Storage.ByName(lowerName, out var c)
+            : _collectionManager.Storage.ByIdentifier(lowerName, out var c)
                 ? c
                 : null;
         if (collection != null)
@@ -552,12 +616,14 @@ public class CommandHandler : IDisposable
             "toggle"    => 2,
             "inherit"   => 3,
             "inherited" => 3,
+            "setting"   => 4,
+            "settings"  => 4,
             _           => -1,
         };
 
     private bool HandleModState(int settingState, ModCollection collection, Mod mod)
     {
-        var settings = collection.Settings[mod.Index];
+        var settings = collection.GetOwnSettings(mod.Index);
         switch (settingState)
         {
             case 0:
@@ -565,7 +631,7 @@ public class CommandHandler : IDisposable
                     return false;
 
                 Print(() => new SeStringBuilder().AddText("Enabled mod ").AddPurple(mod.Name, true).AddText(" in collection ")
-                    .AddYellow(collection.Name, true)
+                    .AddYellow(collection.Identity.Name, true)
                     .AddText(".").BuiltString);
                 return true;
 
@@ -574,7 +640,7 @@ public class CommandHandler : IDisposable
                     return false;
 
                 Print(() => new SeStringBuilder().AddText("Disabled mod ").AddPurple(mod.Name, true).AddText(" in collection ")
-                    .AddYellow(collection.Name, true)
+                    .AddYellow(collection.Identity.Name, true)
                     .AddText(".").BuiltString);
                 return true;
 
@@ -585,7 +651,7 @@ public class CommandHandler : IDisposable
 
                 Print(() => new SeStringBuilder().AddText(setting ? "Enabled mod " : "Disabled mod ").AddPurple(mod.Name, true)
                     .AddText(" in collection ")
-                    .AddYellow(collection.Name, true)
+                    .AddYellow(collection.Identity.Name, true)
                     .AddText(".").BuiltString);
                 return true;
 
@@ -594,7 +660,7 @@ public class CommandHandler : IDisposable
                     return false;
 
                 Print(() => new SeStringBuilder().AddText("Set mod ").AddPurple(mod.Name, true).AddText(" in collection ")
-                    .AddYellow(collection.Name, true)
+                    .AddYellow(collection.Identity.Name, true)
                     .AddText(" to inherit.").BuiltString);
                 return true;
         }
@@ -619,4 +685,10 @@ public class CommandHandler : IDisposable
         if (_config.PrintSuccessfulCommandsToChat)
             _chat.Print(text());
     }
+
+    private bool HandleKnowledge(string arguments)
+    {
+        _knowledgeWindow.Toggle();
+        return true;
+    }
 }

Penumbra/Communication/ChangedItemClick.cs

@@ -1,5 +1,7 @@
 using OtterGui.Classes;
+using Penumbra.Api.Api;
 using Penumbra.Api.Enums;
+using Penumbra.GameData.Data;
 
 namespace Penumbra.Communication;
 
@@ -10,11 +12,11 @@ namespace Penumbra.Communication;
 ///     <item>Parameter is the clicked object data if any. </item>
 /// </list>
 /// </summary>
-public sealed class ChangedItemClick() : EventWrapper<MouseButton, object?, ChangedItemClick.Priority>(nameof(ChangedItemClick))
+public sealed class ChangedItemClick() : EventWrapper<MouseButton, IIdentifiedObjectData, ChangedItemClick.Priority>(nameof(ChangedItemClick))
 {
     public enum Priority
     {
-        /// <seealso cref="Api.PenumbraApi.ChangedItemClicked"/>
+        /// <seealso cref="UiApi.OnChangedItemClick"/>
         Default = 0,
 
         /// <seealso cref="Penumbra.SetupApi"/>

Penumbra/Communication/ChangedItemHover.cs

@@ -1,4 +1,6 @@
 using OtterGui.Classes;
+using Penumbra.Api.Api;
+using Penumbra.GameData.Data;
 
 namespace Penumbra.Communication;
 
@@ -8,11 +10,11 @@ namespace Penumbra.Communication;
 ///     <item>Parameter is the hovered object data if any. </item>
 /// </list>
 /// </summary>
-public sealed class ChangedItemHover() : EventWrapper<object?, ChangedItemHover.Priority>(nameof(ChangedItemHover))
+public sealed class ChangedItemHover() : EventWrapper<IIdentifiedObjectData, ChangedItemHover.Priority>(nameof(ChangedItemHover))
 {
     public enum Priority
     {
-        /// <seealso cref="Api.PenumbraApi.ChangedItemTooltip"/>
+        /// <seealso cref="UiApi.OnChangedItemHover"/>
         Default = 0,
 
         /// <seealso cref="Penumbra.SetupApi"/>

Penumbra/Communication/CharacterUtilityFinished.cs

@@ -0,0 +1,23 @@
+using OtterGui.Classes;
+using Penumbra.Api;
+using Penumbra.Interop.Services;
+
+namespace Penumbra.Communication;
+
+/// <summary>
+/// Triggered when the Character Utility becomes ready.
+/// </summary>
+public sealed class CharacterUtilityFinished() : EventWrapper<CharacterUtilityFinished.Priority>(nameof(CharacterUtilityFinished))
+{
+    public enum Priority
+    {
+        /// <seealso cref="CharacterUtility"/>
+        OnFinishedLoading = int.MaxValue,
+
+        /// <seealso cref="IpcProviders.OnCharacterUtilityReady"/>
+        IpcProvider = int.MinValue,
+
+        /// <seealso cref="Collections.Cache.CollectionCacheManager"/>
+        CollectionCacheManager = 0,
+    }
+}

Penumbra/Communication/CollectionChange.cs

@@ -46,5 +46,8 @@ public sealed class CollectionChange()
 
         /// <seealso cref="UI.ModsTab.ModFileSystemSelector.OnCollectionChange"/>
         ModFileSystemSelector = 0,
+
+        /// <seealso cref="Mods.ModSelection.OnCollectionChange"/>
+        ModSelection = 10,
     }
 }