Merge remote-tracking branch 'origin/master' into api14-rollup

Fix NounProcessor BeastTribe column offset

.github/workflows/main.yml

@@ -23,7 +23,7 @@ jobs:
         uses: microsoft/setup-msbuild@v1.0.2
       - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '9.0.200'
+          dotnet-version: '10.0.100'
       - name: Define VERSION
         run: |
           $env:COMMIT = $env:GITHUB_SHA.Substring(0, 7)

.nuke/build.schema.json

@@ -87,7 +87,6 @@
               "CompileDalamudCrashHandler",
               "CompileImGuiNatives",
               "CompileInjector",
-              "CompileInjectorBoot",
               "Restore",
               "SetCILogging",
               "Test"
@@ -115,7 +114,6 @@
               "CompileDalamudCrashHandler",
               "CompileImGuiNatives",
               "CompileInjector",
-              "CompileInjectorBoot",
               "Restore",
               "SetCILogging",
               "Test"

Dalamud.Injector.Boot/Dalamud.Injector.Boot.vcxproj

@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8874326B-E755-4D13-90B4-59AB263A3E6B}</ProjectGuid>
-    <RootNamespace>Dalamud_Injector_Boot</RootNamespace>
-    <Configuration Condition=" '$(Configuration)'=='' ">Debug</Configuration>
-    <Platform>x64</Platform>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <TargetName>Dalamud.Injector</TargetName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <LinkIncremental>false</LinkIncremental>
-    <CharacterSet>Unicode</CharacterSet>
-    <OutDir>..\bin\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp23</LanguageStandard>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <PreprocessorDefinitions>CPPDLLTEMPLATE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableUAC>false</EnableUAC>
-      <AdditionalLibraryDirectories>..\lib\CoreCLR;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).Boot.pdb</ProgramDatabaseFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-      <OptimizeReferences>false</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <Content Include="..\lib\CoreCLR\nethost\nethost.dll">
-      <Link>nethost.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="dalamud.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="resources.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\Dalamud.Boot\logging.cpp" />
-    <ClCompile Include="..\Dalamud.Boot\unicode.cpp" />
-    <ClCompile Include="..\lib\CoreCLR\boot.cpp" />
-    <ClCompile Include="..\lib\CoreCLR\CoreCLR.cpp" />
-    <ClCompile Include="main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\Dalamud.Boot\logging.h" />
-    <ClInclude Include="..\Dalamud.Boot\unicode.h" />
-    <ClInclude Include="..\lib\CoreCLR\CoreCLR.h" />
-    <ClInclude Include="..\lib\CoreCLR\core\coreclr_delegates.h" />
-    <ClInclude Include="..\lib\CoreCLR\core\hostfxr.h" />
-    <ClInclude Include="..\lib\CoreCLR\nethost\nethost.h" />
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <Target Name="RemoveExtraFiles" AfterTargets="PostBuildEvent">
-    <Delete Files="$(OutDir)$(TargetName).lib" />
-    <Delete Files="$(OutDir)$(TargetName).exp" />
-  </Target>
-</Project>

Dalamud.Injector.Boot/Dalamud.Injector.Boot.vcxproj.filters

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{4faac519-3a73-4b2b-96e7-fb597f02c0be}</UniqueIdentifier>
-      <Extensions>ico;rc</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="dalamud.ico">
-      <Filter>Resource Files</Filter>
-    </Image>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="resources.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib\CoreCLR\boot.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib\CoreCLR\CoreCLR.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Dalamud.Boot\logging.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Dalamud.Boot\unicode.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\lib\CoreCLR\CoreCLR.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lib\CoreCLR\nethost\nethost.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lib\CoreCLR\core\hostfxr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lib\CoreCLR\core\coreclr_delegates.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Dalamud.Boot\logging.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Dalamud.Boot\unicode.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>

Dalamud.Injector.Boot/main.cpp

@@ -1,48 +0,0 @@
-#define WIN32_LEAN_AND_MEAN
-
-#include <filesystem>
-#include <Windows.h>
-#include <shellapi.h>
-#include "..\Dalamud.Boot\logging.h"
-#include "..\lib\CoreCLR\CoreCLR.h"
-#include "..\lib\CoreCLR\boot.h"
-
-int wmain(int argc, wchar_t** argv)
-{
-    // Take care: don't redirect stderr/out here, we need to write our pid to stdout for XL to read
-    //logging::start_file_logging("dalamud.injector.boot.log", false);
-    logging::I("Dalamud Injector, (c) 2021 XIVLauncher Contributors");
-    logging::I("Built at : " __DATE__ "@" __TIME__);
-
-    wchar_t _module_path[MAX_PATH];
-    GetModuleFileNameW(NULL, _module_path, sizeof _module_path / 2);
-    std::filesystem::path fs_module_path(_module_path);
-
-    std::wstring runtimeconfig_path = _wcsdup(fs_module_path.replace_filename(L"Dalamud.Injector.runtimeconfig.json").c_str());
-    std::wstring module_path = _wcsdup(fs_module_path.replace_filename(L"Dalamud.Injector.dll").c_str());
-
-    // =========================================================================== //
-
-    void* entrypoint_vfn;
-    const auto result = InitializeClrAndGetEntryPoint(
-        GetModuleHandleW(nullptr),
-        false,
-        runtimeconfig_path,
-        module_path,
-        L"Dalamud.Injector.EntryPoint, Dalamud.Injector",
-        L"Main",
-        L"Dalamud.Injector.EntryPoint+MainDelegate, Dalamud.Injector",
-        &entrypoint_vfn);
-
-    if (FAILED(result))
-        return result;
-
-    typedef int (CORECLR_DELEGATE_CALLTYPE* custom_component_entry_point_fn)(int, wchar_t**);
-    custom_component_entry_point_fn entrypoint_fn = reinterpret_cast<custom_component_entry_point_fn>(entrypoint_vfn);
-
-    logging::I("Running Dalamud Injector...");
-    const auto ret = entrypoint_fn(argc, argv);
-    logging::I("Done!");
-
-    return ret;
-}

Dalamud.Injector.Boot/pch.h

@@ -1 +0,0 @@
-#pragma once

Dalamud.Injector.Boot/resources.rc

@@ -1 +0,0 @@
-MAINICON ICON "dalamud.ico"

Dalamud.Injector/Dalamud.Injector.csproj

@@ -13,12 +13,13 @@
     </PropertyGroup>
 
     <PropertyGroup Label="Output">
-        <OutputType>Library</OutputType>
+        <OutputType>Exe</OutputType>
         <OutputPath>..\bin\$(Configuration)\</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
         <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
         <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
+        <ApplicationIcon>dalamud.ico</ApplicationIcon>
     </PropertyGroup>
 
     <PropertyGroup Label="Documentation">

Dalamud.Injector/Program.cs

@@ -25,34 +25,20 @@ namespace Dalamud.Injector
     /// <summary>
     /// Entrypoint to the program.
     /// </summary>
-    public sealed class EntryPoint
+    public sealed class Program
     {
-        /// <summary>
-        /// A delegate used during initialization of the CLR from Dalamud.Injector.Boot.
-        /// </summary>
-        /// <param name="argc">Count of arguments.</param>
-        /// <param name="argvPtr">char** string arguments.</param>
-        /// <returns>Return value (HRESULT).</returns>
-        public delegate int MainDelegate(int argc, IntPtr argvPtr);
-
         /// <summary>
         /// Start the Dalamud injector.
         /// </summary>
-        /// <param name="argc">Count of arguments.</param>
-        /// <param name="argvPtr">byte** string arguments.</param>
+        /// <param name="argsArray">Command line arguments.</param>
         /// <returns>Return value (HRESULT).</returns>
-        public static int Main(int argc, IntPtr argvPtr)
+        public static int Main(string[] argsArray)
         {
             try
             {
-                List<string> args = new(argc);
-
-                unsafe
-                {
-                    var argv = (IntPtr*)argvPtr;
-                    for (var i = 0; i < argc; i++)
-                        args.Add(Marshal.PtrToStringUni(argv[i]));
-                }
+                // API14 TODO: Refactor
+                var args = argsArray.ToList();
+                args.Insert(0, Assembly.GetExecutingAssembly().Location);
 
                 Init(args);
                 args.Remove("-v"); // Remove "verbose" flag

Dalamud.Test/Pipes/DalamudUriTests.cs

@@ -0,0 +1,107 @@
+using System;
+using System.Linq;
+
+using Dalamud.Networking.Pipes;
+using Xunit;
+
+namespace Dalamud.Test.Pipes
+{
+    public class DalamudUriTests
+    {
+        [Theory]
+        [InlineData("https://www.google.com/", false)]
+        [InlineData("dalamud://PluginInstaller/Dalamud.FindAnything", true)]
+        public void ValidatesScheme(string uri, bool valid)
+        {
+            Action act = () => { _ = DalamudUri.FromUri(uri); };
+
+            var ex = Record.Exception(act);
+            if (valid)
+            {
+                Assert.Null(ex);
+            }
+            else
+            {
+                Assert.NotNull(ex);
+                Assert.IsType<ArgumentOutOfRangeException>(ex);
+            }
+        }
+
+        [Theory]
+        [InlineData("dalamud://PluginInstaller/Dalamud.FindAnything", "plugininstaller")]
+        [InlineData("dalamud://Plugin/Dalamud.FindAnything/OpenWindow", "plugin")]
+        [InlineData("dalamud://Test", "test")]
+        public void ExtractsNamespace(string uri, string expectedNamespace)
+        {
+            var dalamudUri = DalamudUri.FromUri(uri);
+            Assert.Equal(expectedNamespace, dalamudUri.Namespace);
+        }
+
+        [Theory]
+        [InlineData("dalamud://foo/bar/baz/qux/?cow=moo", "/bar/baz/qux/")]
+        [InlineData("dalamud://foo/bar/baz/qux?cow=moo", "/bar/baz/qux")]
+        [InlineData("dalamud://foo/bar/baz", "/bar/baz")]
+        [InlineData("dalamud://foo/bar", "/bar")]
+        [InlineData("dalamud://foo/bar/", "/bar/")]
+        [InlineData("dalamud://foo/", "/")]
+        public void ExtractsPath(string uri, string expectedPath)
+        {
+            var dalamudUri = DalamudUri.FromUri(uri);
+            Assert.Equal(expectedPath, dalamudUri.Path);
+        }
+
+        [Theory]
+        [InlineData("dalamud://foo/bar/baz/qux/?cow=moo#frag", "/bar/baz/qux/?cow=moo#frag")]
+        [InlineData("dalamud://foo/bar/baz/qux/?cow=moo", "/bar/baz/qux/?cow=moo")]
+        [InlineData("dalamud://foo/bar/baz/qux?cow=moo", "/bar/baz/qux?cow=moo")]
+        [InlineData("dalamud://foo/bar/baz", "/bar/baz")]
+        [InlineData("dalamud://foo/bar?cow=moo", "/bar?cow=moo")]
+        [InlineData("dalamud://foo/bar", "/bar")]
+        [InlineData("dalamud://foo/bar/?cow=moo", "/bar/?cow=moo")]
+        [InlineData("dalamud://foo/bar/", "/bar/")]
+        [InlineData("dalamud://foo/?cow=moo#chicken", "/?cow=moo#chicken")]
+        [InlineData("dalamud://foo/?cow=moo", "/?cow=moo")]
+        [InlineData("dalamud://foo/", "/")]
+        public void ExtractsData(string uri, string expectedData)
+        {
+            var dalamudUri = DalamudUri.FromUri(uri);
+
+            Assert.Equal(expectedData, dalamudUri.Data);
+        }
+
+        [Theory]
+        [InlineData("dalamud://foo/bar", 0)]
+        [InlineData("dalamud://foo/bar?cow=moo", 1)]
+        [InlineData("dalamud://foo/bar?cow=moo&wolf=awoo", 2)]
+        [InlineData("dalamud://foo/bar?cow=moo&wolf=awoo&cat", 3)]
+        public void ExtractsQueryParams(string uri, int queryCount)
+        {
+            var dalamudUri = DalamudUri.FromUri(uri);
+            Assert.Equal(queryCount, dalamudUri.QueryParams.Count);
+        }
+
+        [Theory]
+        [InlineData("dalamud://foo/bar/baz/qux/meh/?foo=bar", 5, true)]
+        [InlineData("dalamud://foo/bar/baz/qux/meh/", 5, true)]
+        [InlineData("dalamud://foo/bar/baz/qux/meh", 5)]
+        [InlineData("dalamud://foo/bar/baz/qux", 4)]
+        [InlineData("dalamud://foo/bar/baz", 3)]
+        [InlineData("dalamud://foo/bar/", 2)]
+        [InlineData("dalamud://foo/bar", 2)]
+        public void ExtractsSegments(string uri, int segmentCount, bool finalSegmentEndsWithSlash = false)
+        {
+            var dalamudUri = DalamudUri.FromUri(uri);
+            var segments = dalamudUri.Segments;
+
+            // First segment must always be `/`
+            Assert.Equal("/", segments[0]);
+
+            Assert.Equal(segmentCount, segments.Length);
+
+            if (finalSegmentEndsWithSlash)
+            {
+                Assert.EndsWith("/", segments.Last());
+            }
+        }
+    }
+}

Dalamud.sln

@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32319.34
 MinimumVisualStudioVersion = 10.0.40219.1
@@ -27,8 +27,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dalamud.Boot", "Dalamud.Boo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dalamud.Injector", "Dalamud.Injector\Dalamud.Injector.csproj", "{5B832F73-5F54-4ADC-870F-D0095EF72C9A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dalamud.Injector.Boot", "Dalamud.Injector.Boot\Dalamud.Injector.Boot.vcxproj", "{8874326B-E755-4D13-90B4-59AB263A3E6B}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dalamud.Test", "Dalamud.Test\Dalamud.Test.csproj", "{C8004563-1806-4329-844F-0EF6274291FC}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{E15BDA6D-E881-4482-94BA-BE5527E917FF}"
@@ -49,8 +47,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InteropGenerator", "lib\FFX
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InteropGenerator.Runtime", "lib\FFXIVClientStructs\InteropGenerator.Runtime\InteropGenerator.Runtime.csproj", "{A6AA1C3F-9470-4922-9D3F-D4549657AB22}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Injector", "Injector", "{19775C83-7117-4A5F-AA00-18889F46A490}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{8F079208-C227-4D96-9427-2BEBE0003944}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cimgui", "external\cimgui\cimgui.vcxproj", "{8430077C-F736-4246-A052-8EA1CECE844E}"
@@ -103,10 +99,6 @@ Global
 		{5B832F73-5F54-4ADC-870F-D0095EF72C9A}.Debug|Any CPU.Build.0 = Debug|x64
 		{5B832F73-5F54-4ADC-870F-D0095EF72C9A}.Release|Any CPU.ActiveCfg = Release|x64
 		{5B832F73-5F54-4ADC-870F-D0095EF72C9A}.Release|Any CPU.Build.0 = Release|x64
-		{8874326B-E755-4D13-90B4-59AB263A3E6B}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{8874326B-E755-4D13-90B4-59AB263A3E6B}.Debug|Any CPU.Build.0 = Debug|x64
-		{8874326B-E755-4D13-90B4-59AB263A3E6B}.Release|Any CPU.ActiveCfg = Release|x64
-		{8874326B-E755-4D13-90B4-59AB263A3E6B}.Release|Any CPU.Build.0 = Release|x64
 		{C8004563-1806-4329-844F-0EF6274291FC}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{C8004563-1806-4329-844F-0EF6274291FC}.Debug|Any CPU.Build.0 = Debug|x64
 		{C8004563-1806-4329-844F-0EF6274291FC}.Release|Any CPU.ActiveCfg = Release|x64
@@ -188,8 +180,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{5B832F73-5F54-4ADC-870F-D0095EF72C9A} = {19775C83-7117-4A5F-AA00-18889F46A490}
-		{8874326B-E755-4D13-90B4-59AB263A3E6B} = {19775C83-7117-4A5F-AA00-18889F46A490}
 		{4AFDB34A-7467-4D41-B067-53BC4101D9D0} = {8F079208-C227-4D96-9427-2BEBE0003944}
 		{C9B87BD7-AF49-41C3-91F1-D550ADEB7833} = {8BBACF2D-7AB8-4610-A115-0E363D35C291}
 		{E0D51896-604F-4B40-8CFE-51941607B3A1} = {8BBACF2D-7AB8-4610-A115-0E363D35C291}

Dalamud/Dalamud.csproj

@@ -81,6 +81,7 @@
         <PackageReference Include="Serilog.Sinks.Console" />
         <PackageReference Include="Serilog.Sinks.File" />
         <PackageReference Include="sqlite-net-pcl" />
+        <PackageReference Include="StreamJsonRpc" />
         <PackageReference Include="StyleCop.Analyzers">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Dalamud/Game/ClientState/Aetherytes/AetheryteEntry.cs

@@ -63,47 +63,37 @@ public interface IAetheryteEntry
 }
 
 /// <summary>
-/// Class representing an aetheryte entry available to the game.
+/// This struct represents an aetheryte entry available to the game.
 /// </summary>
-internal sealed class AetheryteEntry : IAetheryteEntry
+/// <param name="data">Data read from the Aetheryte List.</param>
+internal readonly struct AetheryteEntry(TeleportInfo data) : IAetheryteEntry
 {
-    private readonly TeleportInfo data;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="AetheryteEntry"/> class.
-    /// </summary>
-    /// <param name="data">Data read from the Aetheryte List.</param>
-    internal AetheryteEntry(TeleportInfo data)
-    {
-        this.data = data;
-    }
+    /// <inheritdoc />
+    public uint AetheryteId => data.AetheryteId;
 
     /// <inheritdoc />
-    public uint AetheryteId => this.data.AetheryteId;
+    public uint TerritoryId => data.TerritoryId;
 
     /// <inheritdoc />
-    public uint TerritoryId => this.data.TerritoryId;
+    public byte SubIndex => data.SubIndex;
 
     /// <inheritdoc />
-    public byte SubIndex => this.data.SubIndex;
+    public byte Ward => data.Ward;
 
     /// <inheritdoc />
-    public byte Ward => this.data.Ward;
+    public byte Plot => data.Plot;
 
     /// <inheritdoc />
-    public byte Plot => this.data.Plot;
+    public uint GilCost => data.GilCost;
 
     /// <inheritdoc />
-    public uint GilCost => this.data.GilCost;
+    public bool IsFavourite => data.IsFavourite;
 
     /// <inheritdoc />
-    public bool IsFavourite => this.data.IsFavourite;
+    public bool IsSharedHouse => data.IsSharedHouse;
 
     /// <inheritdoc />
-    public bool IsSharedHouse => this.data.IsSharedHouse;
-
-    /// <inheritdoc />
-    public bool IsApartment => this.data.IsApartment;
+    public bool IsApartment => data.IsApartment;
 
     /// <inheritdoc />
     public RowRef<Lumina.Excel.Sheets.Aetheryte> AetheryteData => LuminaUtils.CreateRef<Lumina.Excel.Sheets.Aetheryte>(this.AetheryteId);

Dalamud/Game/ClientState/Aetherytes/AetheryteList.cs

@@ -88,10 +88,7 @@ internal sealed partial class AetheryteList
     /// <inheritdoc/>
     public IEnumerator<IAetheryteEntry> GetEnumerator()
     {
-        for (var i = 0; i < this.Length; i++)
-        {
-            yield return this[i];
-        }
+        return new Enumerator(this);
     }
 
     /// <inheritdoc/>
@@ -99,4 +96,30 @@ internal sealed partial class AetheryteList
     {
         return this.GetEnumerator();
     }
+
+    private struct Enumerator(AetheryteList aetheryteList) : IEnumerator<IAetheryteEntry>
+    {
+        private int index = 0;
+
+        public IAetheryteEntry Current { get; private set; }
+
+        object IEnumerator.Current => this.Current;
+
+        public bool MoveNext()
+        {
+            if (this.index == aetheryteList.Length) return false;
+            this.Current = aetheryteList[this.index];
+            this.index++;
+            return true;
+        }
+
+        public void Reset()
+        {
+            this.index = 0;
+        }
+
+        public void Dispose()
+        {
+        }
+    }
 }

Dalamud/Game/ClientState/Buddy/BuddyList.cs

@@ -8,6 +8,7 @@ using Dalamud.IoC.Internal;
 using Dalamud.Plugin.Services;
 
 using CSBuddy = FFXIVClientStructs.FFXIV.Client.Game.UI.Buddy;
+using CSBuddyMember = FFXIVClientStructs.FFXIV.Client.Game.UI.Buddy.BuddyMember;
 using CSUIState = FFXIVClientStructs.FFXIV.Client.Game.UI.UIState;
 
 namespace Dalamud.Game.ClientState.Buddy;
@@ -23,7 +24,7 @@ namespace Dalamud.Game.ClientState.Buddy;
 #pragma warning restore SA1015
 internal sealed partial class BuddyList : IServiceType, IBuddyList
 {
-    private const uint InvalidObjectID = 0xE0000000;
+    private const uint InvalidEntityId = 0xE0000000;
 
     [ServiceManager.ServiceDependency]
     private readonly PlayerState playerState = Service<PlayerState>.Get();
@@ -84,37 +85,37 @@ internal sealed partial class BuddyList : IServiceType, IBuddyList
     }
 
     /// <inheritdoc/>
-    public unsafe IntPtr GetCompanionBuddyMemberAddress()
+    public unsafe nint GetCompanionBuddyMemberAddress()
     {
-        return (IntPtr)this.BuddyListStruct->CompanionInfo.Companion;
+        return (nint)this.BuddyListStruct->CompanionInfo.Companion;
     }
 
     /// <inheritdoc/>
-    public unsafe IntPtr GetPetBuddyMemberAddress()
+    public unsafe nint GetPetBuddyMemberAddress()
     {
-        return (IntPtr)this.BuddyListStruct->PetInfo.Pet;
+        return (nint)this.BuddyListStruct->PetInfo.Pet;
     }
 
     /// <inheritdoc/>
-    public unsafe IntPtr GetBattleBuddyMemberAddress(int index)
+    public unsafe nint GetBattleBuddyMemberAddress(int index)
     {
         if (index < 0 || index >= 3)
-            return IntPtr.Zero;
+            return 0;
 
-        return (IntPtr)Unsafe.AsPointer(ref this.BuddyListStruct->BattleBuddies[index]);
+        return (nint)Unsafe.AsPointer(ref this.BuddyListStruct->BattleBuddies[index]);
     }
 
     /// <inheritdoc/>
-    public IBuddyMember? CreateBuddyMemberReference(IntPtr address)
+    public unsafe IBuddyMember? CreateBuddyMemberReference(nint address)
     {
-        if (address == IntPtr.Zero)
+        if (address == 0)
             return null;
 
-        if (!this.playerState.IsLoaded)
+        if (this.playerState.ContentId == 0)
             return null;
 
-        var buddy = new BuddyMember(address);
-        if (buddy.ObjectId == InvalidObjectID)
+        var buddy = new BuddyMember((CSBuddyMember*)address);
+        if (buddy.EntityId == InvalidEntityId)
             return null;
 
         return buddy;
@@ -132,12 +133,35 @@ internal sealed partial class BuddyList
     /// <inheritdoc/>
     public IEnumerator<IBuddyMember> GetEnumerator()
     {
-        for (var i = 0; i < this.Length; i++)
-        {
-            yield return this[i];
-        }
+        return new Enumerator(this);
     }
 
     /// <inheritdoc/>
     IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
+
+    private struct Enumerator(BuddyList buddyList) : IEnumerator<IBuddyMember>
+    {
+        private int index = 0;
+
+        public IBuddyMember Current { get; private set; }
+
+        object IEnumerator.Current => this.Current;
+
+        public bool MoveNext()
+        {
+            if (this.index == buddyList.Length) return false;
+            this.Current = buddyList[this.index];
+            this.index++;
+            return true;
+        }
+
+        public void Reset()
+        {
+            this.index = 0;
+        }
+
+        public void Dispose()
+        {
+        }
+    }
 }

Dalamud/Game/ClientState/Buddy/BuddyMember.cs

@@ -1,20 +1,24 @@
+using System.Diagnostics.CodeAnalysis;
+
 using Dalamud.Data;
 using Dalamud.Game.ClientState.Objects;
 using Dalamud.Game.ClientState.Objects.Types;
 
 using Lumina.Excel;
 
+using CSBuddyMember = FFXIVClientStructs.FFXIV.Client.Game.UI.Buddy.BuddyMember;
+
 namespace Dalamud.Game.ClientState.Buddy;
 
 /// <summary>
 /// Interface representing represents a buddy such as the chocobo companion, summoned pets, squadron groups and trust parties.
 /// </summary>
-public interface IBuddyMember
+public interface IBuddyMember : IEquatable<IBuddyMember>
 {
     /// <summary>
     /// Gets the address of the buddy in memory.
     /// </summary>
-    IntPtr Address { get; }
+    nint Address { get; }
 
     /// <summary>
     /// Gets the object ID of this buddy.
@@ -67,42 +71,34 @@ public interface IBuddyMember
 }
 
 /// <summary>
-/// This class represents a buddy such as the chocobo companion, summoned pets, squadron groups and trust parties.
+/// This struct represents a buddy such as the chocobo companion, summoned pets, squadron groups and trust parties.
 /// </summary>
-internal unsafe class BuddyMember : IBuddyMember
+/// <param name="ptr">A pointer to the BuddyMember.</param>
+internal readonly unsafe struct BuddyMember(CSBuddyMember* ptr) : IBuddyMember
 {
     [ServiceManager.ServiceDependency]
     private readonly ObjectTable objectTable = Service<ObjectTable>.Get();
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="BuddyMember"/> class.
-    /// </summary>
-    /// <param name="address">Buddy address.</param>
-    internal BuddyMember(IntPtr address)
-    {
-        this.Address = address;
-    }
+    /// <inheritdoc />
+    public nint Address => (nint)ptr;
 
     /// <inheritdoc />
-    public IntPtr Address { get; }
+    public uint ObjectId => this.EntityId;
 
     /// <inheritdoc />
-    public uint ObjectId => this.Struct->EntityId;
+    public uint EntityId => ptr->EntityId;
 
     /// <inheritdoc />
-    public uint EntityId => this.Struct->EntityId;
+    public IGameObject? GameObject => this.objectTable.SearchById(this.EntityId);
 
     /// <inheritdoc />
-    public IGameObject? GameObject => this.objectTable.SearchById(this.ObjectId);
+    public uint CurrentHP => ptr->CurrentHealth;
 
     /// <inheritdoc />
-    public uint CurrentHP => this.Struct->CurrentHealth;
+    public uint MaxHP => ptr->MaxHealth;
 
     /// <inheritdoc />
-    public uint MaxHP => this.Struct->MaxHealth;
-
-    /// <inheritdoc />
-    public uint DataID => this.Struct->DataId;
+    public uint DataID => ptr->DataId;
 
     /// <inheritdoc />
     public RowRef<Lumina.Excel.Sheets.Mount> MountData => LuminaUtils.CreateRef<Lumina.Excel.Sheets.Mount>(this.DataID);
@@ -113,5 +109,25 @@ internal unsafe class BuddyMember : IBuddyMember
     /// <inheritdoc />
     public RowRef<Lumina.Excel.Sheets.DawnGrowMember> TrustData => LuminaUtils.CreateRef<Lumina.Excel.Sheets.DawnGrowMember>(this.DataID);
 
-    private FFXIVClientStructs.FFXIV.Client.Game.UI.Buddy.BuddyMember* Struct => (FFXIVClientStructs.FFXIV.Client.Game.UI.Buddy.BuddyMember*)this.Address;
+    public static bool operator ==(BuddyMember x, BuddyMember y) => x.Equals(y);
+
+    public static bool operator !=(BuddyMember x, BuddyMember y) => !(x == y);
+
+    /// <inheritdoc/>
+    public bool Equals(IBuddyMember? other)
+    {
+        return this.EntityId == other.EntityId;
+    }
+
+    /// <inheritdoc/>
+    public override bool Equals([NotNullWhen(true)] object? obj)
+    {
+        return obj is BuddyMember fate && this.Equals(fate);
+    }
+
+    /// <inheritdoc/>
+    public override int GetHashCode()
+    {
+        return this.EntityId.GetHashCode();
+    }
 }

Dalamud/Game/ClientState/Fates/Fate.cs

@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using System.Numerics;
 
 using Dalamud.Data;
@@ -7,10 +8,12 @@ using Dalamud.Memory;
 
 using Lumina.Excel;
 
+using CSFateContext = FFXIVClientStructs.FFXIV.Client.Game.Fate.FateContext;
+
 namespace Dalamud.Game.ClientState.Fates;
 
 /// <summary>
-/// Interface representing an fate entry that can be seen in the current area.
+/// Interface representing a fate entry that can be seen in the current area.
 /// </summary>
 public interface IFate : IEquatable<IFate>
 {
@@ -112,129 +115,96 @@ public interface IFate : IEquatable<IFate>
     /// <summary>
     /// Gets the address of this Fate in memory.
     /// </summary>
-    IntPtr Address { get; }
+    nint Address { get; }
 }
 
 /// <summary>
-/// This class represents an FFXIV Fate.
+/// This struct represents a Fate.
 /// </summary>
-internal unsafe partial class Fate
+/// <param name="ptr">A pointer to the FateContext.</param>
+internal readonly unsafe struct Fate(CSFateContext* ptr) : IFate
 {
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Fate"/> class.
-    /// </summary>
-    /// <param name="address">The address of this fate in memory.</param>
-    internal Fate(IntPtr address)
-    {
-        this.Address = address;
-    }
-
     /// <inheritdoc />
-    public IntPtr Address { get; }
-
-    private FFXIVClientStructs.FFXIV.Client.Game.Fate.FateContext* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Fate.FateContext*)this.Address;
-
-    public static bool operator ==(Fate fate1, Fate fate2)
-    {
-        if (fate1 is null || fate2 is null)
-            return Equals(fate1, fate2);
-
-        return fate1.Equals(fate2);
-    }
-
-    public static bool operator !=(Fate fate1, Fate fate2) => !(fate1 == fate2);
-
-    /// <summary>
-    /// Gets a value indicating whether this Fate is still valid in memory.
-    /// </summary>
-    /// <param name="fate">The fate to check.</param>
-    /// <returns>True or false.</returns>
-    public static bool IsValid(Fate fate)
-    {
-        if (fate == null)
-            return false;
-
-        var playerState = Service<PlayerState>.Get();
-        return playerState.IsLoaded == true;
-    }
-
-    /// <summary>
-    /// Gets a value indicating whether this actor is still valid in memory.
-    /// </summary>
-    /// <returns>True or false.</returns>
-    public bool IsValid() => IsValid(this);
+    public nint Address => (nint)ptr;
 
     /// <inheritdoc/>
-    bool IEquatable<IFate>.Equals(IFate other) => this.FateId == other?.FateId;
-
-    /// <inheritdoc/>
-    public override bool Equals(object obj) => ((IEquatable<IFate>)this).Equals(obj as IFate);
-
-    /// <inheritdoc/>
-    public override int GetHashCode() => this.FateId.GetHashCode();
-}
-
-/// <summary>
-/// This class represents an FFXIV Fate.
-/// </summary>
-internal unsafe partial class Fate : IFate
-{
-    /// <inheritdoc/>
-    public ushort FateId => this.Struct->FateId;
+    public ushort FateId => ptr->FateId;
 
     /// <inheritdoc/>
     public RowRef<Lumina.Excel.Sheets.Fate> GameData => LuminaUtils.CreateRef<Lumina.Excel.Sheets.Fate>(this.FateId);
 
     /// <inheritdoc/>
-    public int StartTimeEpoch => this.Struct->StartTimeEpoch;
+    public int StartTimeEpoch => ptr->StartTimeEpoch;
 
     /// <inheritdoc/>
-    public short Duration => this.Struct->Duration;
+    public short Duration => ptr->Duration;
 
     /// <inheritdoc/>
     public long TimeRemaining => this.StartTimeEpoch + this.Duration - DateTimeOffset.Now.ToUnixTimeSeconds();
 
     /// <inheritdoc/>
-    public SeString Name => MemoryHelper.ReadSeString(&this.Struct->Name);
+    public SeString Name => MemoryHelper.ReadSeString(&ptr->Name);
 
     /// <inheritdoc/>
-    public SeString Description => MemoryHelper.ReadSeString(&this.Struct->Description);
+    public SeString Description => MemoryHelper.ReadSeString(&ptr->Description);
 
     /// <inheritdoc/>
-    public SeString Objective => MemoryHelper.ReadSeString(&this.Struct->Objective);
+    public SeString Objective => MemoryHelper.ReadSeString(&ptr->Objective);
 
     /// <inheritdoc/>
-    public FateState State => (FateState)this.Struct->State;
+    public FateState State => (FateState)ptr->State;
 
     /// <inheritdoc/>
-    public byte HandInCount => this.Struct->HandInCount;
+    public byte HandInCount => ptr->HandInCount;
 
     /// <inheritdoc/>
-    public byte Progress => this.Struct->Progress;
+    public byte Progress => ptr->Progress;
 
     /// <inheritdoc/>
-    public bool HasBonus => this.Struct->IsBonus;
+    public bool HasBonus => ptr->IsBonus;
 
     /// <inheritdoc/>
-    public uint IconId => this.Struct->IconId;
+    public uint IconId => ptr->IconId;
 
     /// <inheritdoc/>
-    public byte Level => this.Struct->Level;
+    public byte Level => ptr->Level;
 
     /// <inheritdoc/>
-    public byte MaxLevel => this.Struct->MaxLevel;
+    public byte MaxLevel => ptr->MaxLevel;
 
     /// <inheritdoc/>
-    public Vector3 Position => this.Struct->Location;
+    public Vector3 Position => ptr->Location;
 
     /// <inheritdoc/>
-    public float Radius => this.Struct->Radius;
+    public float Radius => ptr->Radius;
 
     /// <inheritdoc/>
-    public uint MapIconId => this.Struct->MapIconId;
+    public uint MapIconId => ptr->MapIconId;
 
     /// <summary>
     /// Gets the territory this <see cref="Fate"/> is located in.
     /// </summary>
-    public RowRef<Lumina.Excel.Sheets.TerritoryType> TerritoryType => LuminaUtils.CreateRef<Lumina.Excel.Sheets.TerritoryType>(this.Struct->MapMarkers[0].MapMarkerData.TerritoryTypeId);
+    public RowRef<Lumina.Excel.Sheets.TerritoryType> TerritoryType => LuminaUtils.CreateRef<Lumina.Excel.Sheets.TerritoryType>(ptr->MapMarkers[0].MapMarkerData.TerritoryTypeId);
+
+    public static bool operator ==(Fate x, Fate y) => x.Equals(y);
+
+    public static bool operator !=(Fate x, Fate y) => !(x == y);
+
+    /// <inheritdoc/>
+    public bool Equals(IFate? other)
+    {
+        return this.FateId == other.FateId;
+    }
+
+    /// <inheritdoc/>
+    public override bool Equals([NotNullWhen(true)] object? obj)
+    {
+        return obj is Fate fate && this.Equals(fate);
+    }
+
+    /// <inheritdoc/>
+    public override int GetHashCode()
+    {
+        return this.FateId.GetHashCode();
+    }
 }

Dalamud/Game/ClientState/Fates/FateTable.cs

@@ -6,6 +6,7 @@ using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Dalamud.Plugin.Services;
 
+using CSFateContext = FFXIVClientStructs.FFXIV.Client.Game.Fate.FateContext;
 using CSFateManager = FFXIVClientStructs.FFXIV.Client.Game.Fate.FateManager;
 
 namespace Dalamud.Game.ClientState.Fates;
@@ -26,7 +27,7 @@ internal sealed partial class FateTable : IServiceType, IFateTable
     }
 
     /// <inheritdoc/>
-    public unsafe IntPtr Address => (nint)CSFateManager.Instance();
+    public unsafe nint Address => (nint)CSFateManager.Instance();
 
     /// <inheritdoc/>
     public unsafe int Length
@@ -69,29 +70,29 @@ internal sealed partial class FateTable : IServiceType, IFateTable
     }
 
     /// <inheritdoc/>
-    public unsafe IntPtr GetFateAddress(int index)
+    public unsafe nint GetFateAddress(int index)
     {
         if (index >= this.Length)
-            return IntPtr.Zero;
+            return 0;
 
         var fateManager = CSFateManager.Instance();
         if (fateManager == null)
-            return IntPtr.Zero;
+            return 0;
 
-        return (IntPtr)fateManager->Fates[index].Value;
+        return (nint)fateManager->Fates[index].Value;
     }
 
     /// <inheritdoc/>
-    public IFate? CreateFateReference(IntPtr offset)
+    public unsafe IFate? CreateFateReference(IntPtr address)
     {
-        if (offset == IntPtr.Zero)
+        if (address == 0)
             return null;
 
-        var playerState = Service<PlayerState>.Get();
-        if (!playerState.IsLoaded)
+        var clientState = Service<ClientState>.Get();
+        if (clientState.LocalContentId == 0)
             return null;
 
-        return new Fate(offset);
+        return new Fate((CSFateContext*)address);
     }
 }
 
@@ -106,12 +107,35 @@ internal sealed partial class FateTable
     /// <inheritdoc/>
     public IEnumerator<IFate> GetEnumerator()
     {
-        for (var i = 0; i < this.Length; i++)
-        {
-            yield return this[i];
-        }
+        return new Enumerator(this);
     }
 
     /// <inheritdoc/>
     IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
+
+    private struct Enumerator(FateTable fateTable) : IEnumerator<IFate>
+    {
+        private int index = 0;
+
+        public IFate Current { get; private set; }
+
+        object IEnumerator.Current => this.Current;
+
+        public bool MoveNext()
+        {
+            if (this.index == fateTable.Length) return false;
+            this.Current = fateTable[this.index];
+            this.index++;
+            return true;
+        }
+
+        public void Reset()
+        {
+            this.index = 0;
+        }
+
+        public void Dispose()
+        {
+        }
+    }
 }

Dalamud/Game/ClientState/Objects/ObjectTable.cs

@@ -13,8 +13,6 @@ using Dalamud.Utility;
 
 using FFXIVClientStructs.Interop;
 
-using Microsoft.Extensions.ObjectPool;
-
 using CSGameObject = FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject;
 using CSGameObjectManager = FFXIVClientStructs.FFXIV.Client.Game.Object.GameObjectManager;
 
@@ -37,8 +35,6 @@ internal sealed partial class ObjectTable : IServiceType, IObjectTable
 
     private readonly CachedEntry[] cachedObjectTable;
 
-    private readonly Enumerator?[] frameworkThreadEnumerators = new Enumerator?[4];
-
     [ServiceManager.ServiceConstructor]
     private unsafe ObjectTable()
     {
@@ -48,9 +44,6 @@ internal sealed partial class ObjectTable : IServiceType, IObjectTable
         this.cachedObjectTable = new CachedEntry[objectTableLength];
         for (var i = 0; i < this.cachedObjectTable.Length; i++)
             this.cachedObjectTable[i] = new(nativeObjectTable.GetPointer(i));
-
-        for (var i = 0; i < this.frameworkThreadEnumerators.Length; i++)
-            this.frameworkThreadEnumerators[i] = new(this, i);
     }
 
     /// <inheritdoc/>
@@ -243,30 +236,14 @@ internal sealed partial class ObjectTable
     public IEnumerator<IGameObject> GetEnumerator()
     {
         ThreadSafety.AssertMainThread();
-
-        // If we're on the framework thread, see if there's an already allocated enumerator available for use.
-        foreach (ref var x in this.frameworkThreadEnumerators.AsSpan())
-        {
-            if (x is not null)
-            {
-                var t = x;
-                x = null;
-                t.Reset();
-                return t;
-            }
-        }
-
-        // No reusable enumerator is available; allocate a new temporary one.
-        return new Enumerator(this, -1);
+        return new Enumerator(this);
     }
 
     /// <inheritdoc/>
     IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
 
-    private sealed class Enumerator(ObjectTable owner, int slotId) : IEnumerator<IGameObject>, IResettable
+    private struct Enumerator(ObjectTable owner) : IEnumerator<IGameObject>
     {
-        private ObjectTable? owner = owner;
-
         private int index = -1;
 
         public IGameObject Current { get; private set; } = null!;
@@ -278,7 +255,7 @@ internal sealed partial class ObjectTable
             if (this.index == objectTableLength)
                 return false;
 
-            var cache = this.owner!.cachedObjectTable.AsSpan();
+            var cache = owner.cachedObjectTable.AsSpan();
             for (this.index++; this.index < objectTableLength; this.index++)
             {
                 if (cache[this.index].Update() is { } ao)
@@ -295,17 +272,6 @@ internal sealed partial class ObjectTable
 
         public void Dispose()
         {
-            if (this.owner is not { } o)
-                return;
-
-            if (slotId != -1)
-                o.frameworkThreadEnumerators[slotId] = this;
-        }
-
-        public bool TryReset()
-        {
-            this.Reset();
-            return true;
         }
     }
 }

Dalamud/Game/ClientState/Party/PartyList.cs

@@ -9,6 +9,7 @@ using Dalamud.IoC.Internal;
 using Dalamud.Plugin.Services;
 
 using CSGroupManager = FFXIVClientStructs.FFXIV.Client.Game.Group.GroupManager;
+using CSPartyMember = FFXIVClientStructs.FFXIV.Client.Game.Group.PartyMember;
 
 namespace Dalamud.Game.ClientState.Party;
 
@@ -43,20 +44,20 @@ internal sealed unsafe partial class PartyList : IServiceType, IPartyList
     public bool IsAlliance => this.GroupManagerStruct->MainGroup.AllianceFlags > 0;
 
     /// <inheritdoc/>
-    public unsafe IntPtr GroupManagerAddress => (nint)CSGroupManager.Instance();
+    public unsafe nint GroupManagerAddress => (nint)CSGroupManager.Instance();
 
     /// <inheritdoc/>
-    public IntPtr GroupListAddress => (IntPtr)Unsafe.AsPointer(ref GroupManagerStruct->MainGroup.PartyMembers[0]);
+    public nint GroupListAddress => (nint)Unsafe.AsPointer(ref GroupManagerStruct->MainGroup.PartyMembers[0]);
 
     /// <inheritdoc/>
-    public IntPtr AllianceListAddress => (IntPtr)Unsafe.AsPointer(ref this.GroupManagerStruct->MainGroup.AllianceMembers[0]);
+    public nint AllianceListAddress => (nint)Unsafe.AsPointer(ref this.GroupManagerStruct->MainGroup.AllianceMembers[0]);
 
     /// <inheritdoc/>
     public long PartyId => this.GroupManagerStruct->MainGroup.PartyId;
 
-    private static int PartyMemberSize { get; } = Marshal.SizeOf<FFXIVClientStructs.FFXIV.Client.Game.Group.PartyMember>();
+    private static int PartyMemberSize { get; } = Marshal.SizeOf<CSPartyMember>();
 
-    private FFXIVClientStructs.FFXIV.Client.Game.Group.GroupManager* GroupManagerStruct => (FFXIVClientStructs.FFXIV.Client.Game.Group.GroupManager*)this.GroupManagerAddress;
+    private CSGroupManager* GroupManagerStruct => (CSGroupManager*)this.GroupManagerAddress;
 
     /// <inheritdoc/>
     public IPartyMember? this[int index]
@@ -81,39 +82,45 @@ internal sealed unsafe partial class PartyList : IServiceType, IPartyList
     }
 
     /// <inheritdoc/>
-    public IntPtr GetPartyMemberAddress(int index)
+    public nint GetPartyMemberAddress(int index)
     {
         if (index < 0 || index >= GroupLength)
-            return IntPtr.Zero;
+            return 0;
 
         return this.GroupListAddress + (index * PartyMemberSize);
     }
 
     /// <inheritdoc/>
-    public IPartyMember? CreatePartyMemberReference(IntPtr address)
+    public IPartyMember? CreatePartyMemberReference(nint address)
     {
-        if (address == IntPtr.Zero || !this.playerState.IsLoaded)
+        if (this.playerState.ContentId == 0)
             return null;
 
-        return new PartyMember(address);
+        if (address == 0)
+            return null;
+
+        return new PartyMember((CSPartyMember*)address);
     }
 
     /// <inheritdoc/>
-    public IntPtr GetAllianceMemberAddress(int index)
+    public nint GetAllianceMemberAddress(int index)
     {
         if (index < 0 || index >= AllianceLength)
-            return IntPtr.Zero;
+            return 0;
 
         return this.AllianceListAddress + (index * PartyMemberSize);
     }
 
     /// <inheritdoc/>
-    public IPartyMember? CreateAllianceMemberReference(IntPtr address)
+    public IPartyMember? CreateAllianceMemberReference(nint address)
     {
-        if (address == IntPtr.Zero || !this.playerState.IsLoaded)
+        if (this.playerState.ContentId == 0)
             return null;
 
-        return new PartyMember(address);
+        if (address == 0)
+            return null;
+
+        return new PartyMember((CSPartyMember*)address);
     }
 }
 
@@ -128,18 +135,44 @@ internal sealed partial class PartyList
     /// <inheritdoc/>
     public IEnumerator<IPartyMember> GetEnumerator()
     {
-        // Normally using Length results in a recursion crash, however we know the party size via ptr.
-        for (var i = 0; i < this.Length; i++)
-        {
-            var member = this[i];
-
-            if (member == null)
-                break;
-
-            yield return member;
-        }
+        return new Enumerator(this);
     }
 
     /// <inheritdoc/>
     IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
+
+    private struct Enumerator(PartyList partyList) : IEnumerator<IPartyMember>
+    {
+        private int index = 0;
+
+        public IPartyMember Current { get; private set; }
+
+        object IEnumerator.Current => this.Current;
+
+        public bool MoveNext()
+        {
+            if (this.index == partyList.Length) return false;
+
+            for (; this.index < partyList.Length; this.index++)
+            {
+                var partyMember = partyList[this.index];
+                if (partyMember != null)
+                {
+                    this.Current = partyMember;
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public void Reset()
+        {
+            this.index = 0;
+        }
+
+        public void Dispose()
+        {
+        }
+    }
 }

Dalamud/Game/ClientState/Party/PartyMember.cs

@@ -1,26 +1,27 @@
+using System.Diagnostics.CodeAnalysis;
 using System.Numerics;
-using System.Runtime.CompilerServices;
 
 using Dalamud.Data;
 using Dalamud.Game.ClientState.Objects;
 using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Game.ClientState.Statuses;
 using Dalamud.Game.Text.SeStringHandling;
-using Dalamud.Memory;
 
 using Lumina.Excel;
 
+using CSPartyMember = FFXIVClientStructs.FFXIV.Client.Game.Group.PartyMember;
+
 namespace Dalamud.Game.ClientState.Party;
 
 /// <summary>
 /// Interface representing a party member.
 /// </summary>
-public interface IPartyMember
+public interface IPartyMember : IEquatable<IPartyMember>
 {
     /// <summary>
     /// Gets the address of this party member in memory.
     /// </summary>
-    IntPtr Address { get; }
+    nint Address { get; }
 
     /// <summary>
     /// Gets a list of buffs or debuffs applied to this party member.
@@ -108,69 +109,81 @@ public interface IPartyMember
 }
 
 /// <summary>
-/// This class represents a party member in the group manager.
+/// This struct represents a party member in the group manager.
 /// </summary>
-internal unsafe class PartyMember : IPartyMember
+/// <param name="ptr">A pointer to the PartyMember.</param>
+internal unsafe readonly struct PartyMember(CSPartyMember* ptr) : IPartyMember
 {
-    /// <summary>
-    /// Initializes a new instance of the <see cref="PartyMember"/> class.
-    /// </summary>
-    /// <param name="address">Address of the party member.</param>
-    internal PartyMember(IntPtr address)
-    {
-        this.Address = address;
-    }
+    /// <inheritdoc/>
+    public nint Address => (nint)ptr;
 
     /// <inheritdoc/>
-    public IntPtr Address { get; }
+    public StatusList Statuses => new(&ptr->StatusManager);
 
     /// <inheritdoc/>
-    public StatusList Statuses => new(&this.Struct->StatusManager);
+    public Vector3 Position => ptr->Position;
 
     /// <inheritdoc/>
-    public Vector3 Position => this.Struct->Position;
+    public long ContentId => (long)ptr->ContentId;
 
     /// <inheritdoc/>
-    public long ContentId => (long)this.Struct->ContentId;
+    public uint ObjectId => ptr->EntityId;
 
     /// <inheritdoc/>
-    public uint ObjectId => this.Struct->EntityId;
-
-    /// <inheritdoc/>
-    public uint EntityId => this.Struct->EntityId;
+    public uint EntityId => ptr->EntityId;
 
     /// <inheritdoc/>
     public IGameObject? GameObject => Service<ObjectTable>.Get().SearchById(this.EntityId);
 
     /// <inheritdoc/>
-    public uint CurrentHP => this.Struct->CurrentHP;
+    public uint CurrentHP => ptr->CurrentHP;
 
     /// <inheritdoc/>
-    public uint MaxHP => this.Struct->MaxHP;
+    public uint MaxHP => ptr->MaxHP;
 
     /// <inheritdoc/>
-    public ushort CurrentMP => this.Struct->CurrentMP;
+    public ushort CurrentMP => ptr->CurrentMP;
 
     /// <inheritdoc/>
-    public ushort MaxMP => this.Struct->MaxMP;
+    public ushort MaxMP => ptr->MaxMP;
 
     /// <inheritdoc/>
-    public RowRef<Lumina.Excel.Sheets.TerritoryType> Territory => LuminaUtils.CreateRef<Lumina.Excel.Sheets.TerritoryType>(this.Struct->TerritoryType);
+    public RowRef<Lumina.Excel.Sheets.TerritoryType> Territory => LuminaUtils.CreateRef<Lumina.Excel.Sheets.TerritoryType>(ptr->TerritoryType);
 
     /// <inheritdoc/>
-    public RowRef<Lumina.Excel.Sheets.World> World => LuminaUtils.CreateRef<Lumina.Excel.Sheets.World>(this.Struct->HomeWorld);
+    public RowRef<Lumina.Excel.Sheets.World> World => LuminaUtils.CreateRef<Lumina.Excel.Sheets.World>(ptr->HomeWorld);
 
     /// <inheritdoc/>
-    public SeString Name => SeString.Parse(this.Struct->Name);
+    public SeString Name => SeString.Parse(ptr->Name);
 
     /// <inheritdoc/>
-    public byte Sex => this.Struct->Sex;
+    public byte Sex => ptr->Sex;
 
     /// <inheritdoc/>
-    public RowRef<Lumina.Excel.Sheets.ClassJob> ClassJob => LuminaUtils.CreateRef<Lumina.Excel.Sheets.ClassJob>(this.Struct->ClassJob);
+    public RowRef<Lumina.Excel.Sheets.ClassJob> ClassJob => LuminaUtils.CreateRef<Lumina.Excel.Sheets.ClassJob>(ptr->ClassJob);
 
     /// <inheritdoc/>
-    public byte Level => this.Struct->Level;
+    public byte Level => ptr->Level;
 
-    private FFXIVClientStructs.FFXIV.Client.Game.Group.PartyMember* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Group.PartyMember*)this.Address;
+    public static bool operator ==(PartyMember x, PartyMember y) => x.Equals(y);
+
+    public static bool operator !=(PartyMember x, PartyMember y) => !(x == y);
+
+    /// <inheritdoc/>
+    public bool Equals(IPartyMember? other)
+    {
+        return this.EntityId == other.EntityId;
+    }
+
+    /// <inheritdoc/>
+    public override bool Equals([NotNullWhen(true)] object? obj)
+    {
+        return obj is PartyMember fate && this.Equals(fate);
+    }
+
+    /// <inheritdoc/>
+    public override int GetHashCode()
+    {
+        return this.EntityId.GetHashCode();
+    }
 }

Dalamud/Game/ClientState/Statuses/Status.cs

@@ -1,61 +1,49 @@
+using System.Diagnostics.CodeAnalysis;
+
 using Dalamud.Data;
 using Dalamud.Game.ClientState.Objects;
 using Dalamud.Game.ClientState.Objects.Types;
 
 using Lumina.Excel;
 
+using CSStatus = FFXIVClientStructs.FFXIV.Client.Game.Status;
+
 namespace Dalamud.Game.ClientState.Statuses;
 
 /// <summary>
-/// This class represents a status effect an actor is afflicted by.
+/// Interface representing a status.
 /// </summary>
-public unsafe class Status
+public interface IStatus : IEquatable<IStatus>
 {
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Status"/> class.
-    /// </summary>
-    /// <param name="address">Status address.</param>
-    internal Status(IntPtr address)
-    {
-        this.Address = address;
-    }
-
     /// <summary>
     /// Gets the address of the status in memory.
     /// </summary>
-    public IntPtr Address { get; }
+    nint Address { get; }
 
     /// <summary>
     /// Gets the status ID of this status.
     /// </summary>
-    public uint StatusId => this.Struct->StatusId;
+    uint StatusId { get; }
 
     /// <summary>
     /// Gets the GameData associated with this status.
     /// </summary>
-    public RowRef<Lumina.Excel.Sheets.Status> GameData => LuminaUtils.CreateRef<Lumina.Excel.Sheets.Status>(this.Struct->StatusId);
+    RowRef<Lumina.Excel.Sheets.Status> GameData { get; }
 
     /// <summary>
     /// Gets the parameter value of the status.
     /// </summary>
-    public ushort Param => this.Struct->Param;
-
-    /// <summary>
-    /// Gets the stack count of this status.
-    /// Only valid if this is a non-food status.
-    /// </summary>
-    [Obsolete($"Replaced with {nameof(Param)}", true)]
-    public byte StackCount => (byte)this.Struct->Param;
+    ushort Param { get; }
 
     /// <summary>
     /// Gets the time remaining of this status.
     /// </summary>
-    public float RemainingTime => this.Struct->RemainingTime;
+    float RemainingTime { get; }
 
     /// <summary>
     /// Gets the source ID of this status.
     /// </summary>
-    public uint SourceId => this.Struct->SourceObject.ObjectId;
+    uint SourceId { get; }
 
     /// <summary>
     /// Gets the source actor associated with this status.
@@ -63,7 +51,55 @@ public unsafe class Status
     /// <remarks>
     /// This iterates the actor table, it should be used with care.
     /// </remarks>
+    IGameObject? SourceObject { get; }
+}
+
+/// <summary>
+/// This struct represents a status effect an actor is afflicted by.
+/// </summary>
+/// <param name="ptr">A pointer to the Status.</param>
+internal unsafe readonly struct Status(CSStatus* ptr) : IStatus
+{
+    /// <inheritdoc/>
+    public nint Address => (nint)ptr;
+
+    /// <inheritdoc/>
+    public uint StatusId => ptr->StatusId;
+
+    /// <inheritdoc/>
+    public RowRef<Lumina.Excel.Sheets.Status> GameData => LuminaUtils.CreateRef<Lumina.Excel.Sheets.Status>(ptr->StatusId);
+
+    /// <inheritdoc/>
+    public ushort Param => ptr->Param;
+
+    /// <inheritdoc/>
+    public float RemainingTime => ptr->RemainingTime;
+
+    /// <inheritdoc/>
+    public uint SourceId => ptr->SourceObject.ObjectId;
+
+    /// <inheritdoc/>
     public IGameObject? SourceObject => Service<ObjectTable>.Get().SearchById(this.SourceId);
 
-    private FFXIVClientStructs.FFXIV.Client.Game.Status* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Status*)this.Address;
+    public static bool operator ==(Status x, Status y) => x.Equals(y);
+
+    public static bool operator !=(Status x, Status y) => !(x == y);
+
+    /// <inheritdoc/>
+    public bool Equals(IStatus? other)
+    {
+        return this.StatusId == other.StatusId && this.SourceId == other.SourceId && this.Param == other.Param && this.RemainingTime == other.RemainingTime;
+    }
+
+    /// <inheritdoc/>
+    public override bool Equals([NotNullWhen(true)] object? obj)
+    {
+        return obj is Status fate && this.Equals(fate);
+    }
+
+    /// <inheritdoc/>
+    public override int GetHashCode()
+    {
+        return HashCode.Combine(this.StatusId, this.SourceId, this.Param, this.RemainingTime);
+    }
 }

Dalamud/Game/ClientState/Statuses/StatusList.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-using Dalamud.Game.Player;
+using CSStatus = FFXIVClientStructs.FFXIV.Client.Game.Status;
 
 namespace Dalamud.Game.ClientState.Statuses;
 
@@ -16,7 +16,7 @@ public sealed unsafe partial class StatusList
     /// Initializes a new instance of the <see cref="StatusList"/> class.
     /// </summary>
     /// <param name="address">Address of the status list.</param>
-    internal StatusList(IntPtr address)
+    internal StatusList(nint address)
     {
         this.Address = address;
     }
@@ -26,14 +26,14 @@ public sealed unsafe partial class StatusList
     /// </summary>
     /// <param name="pointer">Pointer to the status list.</param>
     internal unsafe StatusList(void* pointer)
-        : this((IntPtr)pointer)
+        : this((nint)pointer)
     {
     }
 
     /// <summary>
     /// Gets the address of the status list in memory.
     /// </summary>
-    public IntPtr Address { get; }
+    public nint Address { get; }
 
     /// <summary>
     /// Gets the amount of status effect slots the actor has.
@@ -49,7 +49,7 @@ public sealed unsafe partial class StatusList
     /// </summary>
     /// <param name="index">Status Index.</param>
     /// <returns>The status at the specified index.</returns>
-    public Status? this[int index]
+    public IStatus? this[int index]
     {
         get
         {
@@ -66,7 +66,7 @@ public sealed unsafe partial class StatusList
     /// </summary>
     /// <param name="address">The address of the status list in memory.</param>
     /// <returns>The status object containing the requested data.</returns>
-    public static StatusList? CreateStatusListReference(IntPtr address)
+    public static StatusList? CreateStatusListReference(nint address)
     {
         if (address == IntPtr.Zero)
             return null;
@@ -74,8 +74,12 @@ public sealed unsafe partial class StatusList
         // The use case for CreateStatusListReference and CreateStatusReference to be static is so
         // fake status lists can be generated. Since they aren't exposed as services, it's either
         // here or somewhere else.
-        var playerState = Service<PlayerState>.Get();
-        if (!playerState.IsLoaded)
+        var clientState = Service<ClientState>.Get();
+
+        if (clientState.LocalContentId == 0)
+            return null;
+
+        if (address == 0)
             return null;
 
         return new StatusList(address);
@@ -86,16 +90,15 @@ public sealed unsafe partial class StatusList
     /// </summary>
     /// <param name="address">The address of the status effect in memory.</param>
     /// <returns>The status object containing the requested data.</returns>
-    public static Status? CreateStatusReference(IntPtr address)
+    public static IStatus? CreateStatusReference(nint address)
     {
         if (address == IntPtr.Zero)
             return null;
 
-        var playerState = Service<PlayerState>.Get();
-        if (!playerState.IsLoaded)
+        if (address == 0)
             return null;
 
-        return new Status(address);
+        return new Status((CSStatus*)address);
     }
 
     /// <summary>
@@ -103,22 +106,22 @@ public sealed unsafe partial class StatusList
     /// </summary>
     /// <param name="index">The index of the status.</param>
     /// <returns>The memory address of the status.</returns>
-    public IntPtr GetStatusAddress(int index)
+    public nint GetStatusAddress(int index)
     {
         if (index < 0 || index >= this.Length)
-            return IntPtr.Zero;
+            return 0;
 
-        return (IntPtr)Unsafe.AsPointer(ref this.Struct->Status[index]);
+        return (nint)Unsafe.AsPointer(ref this.Struct->Status[index]);
     }
 }
 
 /// <summary>
 /// This collection represents the status effects an actor is afflicted by.
 /// </summary>
-public sealed partial class StatusList : IReadOnlyCollection<Status>, ICollection
+public sealed partial class StatusList : IReadOnlyCollection<IStatus>, ICollection
 {
     /// <inheritdoc/>
-    int IReadOnlyCollection<Status>.Count => this.Length;
+    int IReadOnlyCollection<IStatus>.Count => this.Length;
 
     /// <inheritdoc/>
     int ICollection.Count => this.Length;
@@ -130,17 +133,9 @@ public sealed partial class StatusList : IReadOnlyCollection<Status>, ICollectio
     object ICollection.SyncRoot => this;
 
     /// <inheritdoc/>
-    public IEnumerator<Status> GetEnumerator()
+    public IEnumerator<IStatus> GetEnumerator()
     {
-        for (var i = 0; i < this.Length; i++)
-        {
-            var status = this[i];
-
-            if (status == null || status.StatusId == 0)
-                continue;
-
-            yield return status;
-        }
+        return new Enumerator(this);
     }
 
     /// <inheritdoc/>
@@ -155,4 +150,39 @@ public sealed partial class StatusList : IReadOnlyCollection<Status>, ICollectio
             index++;
         }
     }
+
+    private struct Enumerator(StatusList statusList) : IEnumerator<IStatus>
+    {
+        private int index = 0;
+
+        public IStatus Current { get; private set; }
+
+        object IEnumerator.Current => this.Current;
+
+        public bool MoveNext()
+        {
+            if (this.index == statusList.Length) return false;
+
+            for (; this.index < statusList.Length; this.index++)
+            {
+                var status = statusList[this.index];
+                if (status != null && status.StatusId != 0)
+                {
+                    this.Current = status;
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public void Reset()
+        {
+            this.index = 0;
+        }
+
+        public void Dispose()
+        {
+        }
+    }
 }

Dalamud/Game/ClientState/Structs/StatusEffect.cs

@@ -1,35 +0,0 @@
-using System.Runtime.InteropServices;
-
-namespace Dalamud.Game.ClientState.Structs;
-
-/// <summary>
-/// Native memory representation of a FFXIV status effect.
-/// </summary>
-[StructLayout(LayoutKind.Sequential)]
-public struct StatusEffect
-{
-    /// <summary>
-    /// The effect ID.
-    /// </summary>
-    public short EffectId;
-
-    /// <summary>
-    /// How many stacks are present.
-    /// </summary>
-    public byte StackCount;
-
-    /// <summary>
-    /// Additional parameters.
-    /// </summary>
-    public byte Param;
-
-    /// <summary>
-    /// The duration remaining.
-    /// </summary>
-    public float Duration;
-
-    /// <summary>
-    /// The ID of the actor that caused this effect.
-    /// </summary>
-    public int OwnerId;
-}

Dalamud/Game/Text/Noun/NounParams.cs

@@ -60,8 +60,8 @@ internal record struct NounParams()
     /// </summary>
     public readonly int ColumnOffset => this.SheetName switch
     {
-        // See "E8 ?? ?? ?? ?? 44 8B 6B 08"
-        nameof(LSheets.BeastTribe) => 10,
+        // See "E8 ?? ?? ?? ?? 44 8B 66 ?? 8B E8"
+        nameof(LSheets.BeastTribe) => 11,
         nameof(LSheets.DeepDungeonItem) => 1,
         nameof(LSheets.DeepDungeonEquipment) => 1,
         nameof(LSheets.DeepDungeonMagicStone) => 1,

Dalamud/GlobalSuppressions.cs

@@ -21,6 +21,7 @@ using System.Diagnostics.CodeAnalysis;
 [assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1116:SplitParametersMustStartOnLineAfterDeclaration", Justification = "Reviewed.")]
 [assembly: SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:FileMayOnlyContainASingleType", Justification = "This would be nice, but a big refactor")]
 [assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649:FileNameMustMatchTypeName", Justification = "I don't like this one so much")]
+[assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1108:BlockStatementsMustNotContainEmbeddedComments", Justification = "I like having comments in blocks")]
 
 // ImRAII stuff
 [assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:ElementsMustBeDocumented", Justification = "Reviewed.", Scope = "namespaceanddescendants", Target = "Dalamud.Interface.Utility.Raii")]

Dalamud/Interface/Internal/Windows/SelfTest/Steps/NounProcessorSelfTestStep.cs

@@ -191,6 +191,29 @@ internal class NounProcessorSelfTestStep : ISelfTestStep
         new(nameof(LSheets.Item), 44348, ClientLanguage.French, 2, (int)FrenchArticleType.PossessiveFirstPerson, 1, "mes mémoquartz inhabituels fantasmagoriques"),
         new(nameof(LSheets.Item), 44348, ClientLanguage.French, 2, (int)FrenchArticleType.PossessiveSecondPerson, 1, "tes mémoquartz inhabituels fantasmagoriques"),
         new(nameof(LSheets.Item), 44348, ClientLanguage.French, 2, (int)FrenchArticleType.PossessiveThirdPerson, 1, "ses mémoquartz inhabituels fantasmagoriques"),
+
+        // ColumnOffset tests
+
+        new(nameof(LSheets.BeastTribe), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Indefinite, 1, "a Amalj'aa"),
+        new(nameof(LSheets.BeastTribe), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Definite, 1, "the Amalj'aa"),
+
+        new(nameof(LSheets.DeepDungeonEquipment), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Indefinite, 1, "an aetherpool arm"),
+        new(nameof(LSheets.DeepDungeonEquipment), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Definite, 1, "the aetherpool arm"),
+
+        new(nameof(LSheets.DeepDungeonItem), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Indefinite, 1, "a pomander of safety"),
+        new(nameof(LSheets.DeepDungeonItem), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Definite, 1, "the pomander of safety"),
+
+        new(nameof(LSheets.DeepDungeonMagicStone), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Indefinite, 1, "a splinter of Inferno magicite"),
+        new(nameof(LSheets.DeepDungeonMagicStone), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Definite, 1, "the splinter of Inferno magicite"),
+
+        new(nameof(LSheets.DeepDungeonDemiclone), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Indefinite, 1, "an Unei demiclone"),
+        new(nameof(LSheets.DeepDungeonDemiclone), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Definite, 1, "the Unei demiclone"),
+
+        new(nameof(LSheets.Glasses), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Indefinite, 1, "a pair of oval spectacles"),
+        new(nameof(LSheets.Glasses), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Definite, 1, "the pair of oval spectacles"),
+
+        new(nameof(LSheets.GlassesStyle), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Indefinite, 1, "a shaded spectacles"),
+        new(nameof(LSheets.GlassesStyle), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Definite, 1, "the shaded spectacles"),
     ];
 
     private enum GermanCases

Dalamud/Networking/Pipes/Api/PluginLinkHandler.cs

@@ -0,0 +1,56 @@
+using System.Linq;
+
+using Dalamud.Console;
+using Dalamud.IoC;
+using Dalamud.IoC.Internal;
+using Dalamud.Networking.Pipes.Internal;
+using Dalamud.Plugin.Internal.Types;
+using Dalamud.Plugin.Services;
+#pragma warning disable DAL_RPC
+
+namespace Dalamud.Networking.Pipes.Api;
+
+/// <inheritdoc cref="IPluginLinkHandler" />
+[PluginInterface]
+[ServiceManager.ScopedService]
+[ResolveVia<IPluginLinkHandler>]
+public class PluginLinkHandler : IInternalDisposableService, IPluginLinkHandler
+{
+    private readonly LinkHandlerService linkHandler;
+    private readonly LocalPlugin localPlugin;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PluginLinkHandler"/> class.
+    /// </summary>
+    /// <param name="localPlugin">The plugin to bind this service to.</param>
+    /// <param name="linkHandler">The central link handler.</param>
+    internal PluginLinkHandler(LocalPlugin localPlugin, LinkHandlerService linkHandler)
+    {
+        this.linkHandler = linkHandler;
+        this.localPlugin = localPlugin;
+
+        this.linkHandler.Register("plugin", this.HandleUri);
+    }
+
+    /// <inheritdoc/>
+    public event IPluginLinkHandler.PluginUriReceived? OnUriReceived;
+
+    /// <inheritdoc/>
+    public void DisposeService()
+    {
+        this.OnUriReceived = null;
+        this.linkHandler.Unregister("plugin", this.HandleUri);
+    }
+
+    private void HandleUri(DalamudUri uri)
+    {
+        var target = uri.Path.Split("/").FirstOrDefault();
+        var thisPlugin = ConsoleManagerPluginUtil.GetSanitizedNamespaceName(this.localPlugin.InternalName);
+        if (target == null || !string.Equals(target, thisPlugin, StringComparison.OrdinalIgnoreCase))
+        {
+            return;
+        }
+
+        this.OnUriReceived?.Invoke(uri);
+    }
+}

Dalamud/Networking/Pipes/DalamudUri.cs

@@ -0,0 +1,102 @@
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Web;
+
+namespace Dalamud.Networking.Pipes;
+
+/// <summary>
+/// A Dalamud Uri, in the format:
+/// <code>dalamud://{NAMESPACE}/{ARBITRARY}</code>
+/// </summary>
+public record DalamudUri
+{
+    private readonly Uri rawUri;
+
+    private DalamudUri(Uri uri)
+    {
+        if (uri.Scheme != "dalamud")
+        {
+            throw new ArgumentOutOfRangeException(nameof(uri), "URI must be of scheme dalamud.");
+        }
+
+        this.rawUri = uri;
+    }
+
+    /// <summary>
+    /// Gets the namespace that this URI should be routed to. Generally a high level component like "PluginInstaller".
+    /// </summary>
+    public string Namespace => this.rawUri.Authority;
+
+    /// <summary>
+    /// Gets the raw (untargeted) path and query params for this URI.
+    /// </summary>
+    public string Data =>
+        this.rawUri.GetComponents(UriComponents.PathAndQuery | UriComponents.Fragment, UriFormat.UriEscaped);
+
+    /// <summary>
+    /// Gets the raw (untargeted) path for this URI.
+    /// </summary>
+    public string Path => this.rawUri.AbsolutePath;
+
+    /// <summary>
+    /// Gets a list of segments based on the provided Data element.
+    /// </summary>
+    public string[] Segments => this.GetDataSegments();
+
+    /// <summary>
+    /// Gets the raw query parameters for this URI, if any.
+    /// </summary>
+    public string Query => this.rawUri.Query;
+
+    /// <summary>
+    /// Gets the query params (as a parsed NameValueCollection) in this URI.
+    /// </summary>
+    public NameValueCollection QueryParams => HttpUtility.ParseQueryString(this.Query);
+
+    /// <summary>
+    /// Gets the fragment (if one is specified) in this URI.
+    /// </summary>
+    public string Fragment => this.rawUri.Fragment;
+
+    /// <inheritdoc/>
+    public override string ToString() => this.rawUri.ToString();
+
+    /// <summary>
+    /// Build a DalamudURI from a given URI.
+    /// </summary>
+    /// <param name="uri">The URI to convert to a Dalamud URI.</param>
+    /// <returns>Returns a DalamudUri.</returns>
+    public static DalamudUri FromUri(Uri uri)
+    {
+        return new DalamudUri(uri);
+    }
+
+    /// <summary>
+    /// Build a DalamudURI from a URI in string format.
+    /// </summary>
+    /// <param name="uri">The URI to convert to a Dalamud URI.</param>
+    /// <returns>Returns a DalamudUri.</returns>
+    public static DalamudUri FromUri(string uri) => FromUri(new Uri(uri));
+
+    private string[] GetDataSegments()
+    {
+        // reimplementation of the System.URI#Segments, under MIT license.
+        var path = this.Path;
+
+        var segments = new List<string>();
+        var current = 0;
+        while (current < path.Length)
+        {
+            var next = path.IndexOf('/', current);
+            if (next == -1)
+            {
+                next = path.Length - 1;
+            }
+
+            segments.Add(path.Substring(current, (next - current) + 1));
+            current = next + 1;
+        }
+
+        return segments.ToArray();
+    }
+}

Dalamud/Networking/Pipes/Internal/ClientHelloService.cs

@@ -0,0 +1,121 @@
+using System.Threading.Tasks;
+
+using Dalamud.Data;
+using Dalamud.Game;
+using Dalamud.Game.ClientState;
+using Dalamud.Networking.Pipes.Rpc;
+using Dalamud.Utility;
+
+using Lumina.Excel.Sheets;
+
+namespace Dalamud.Networking.Pipes.Internal;
+
+/// <summary>
+/// A minimal service to respond with information about this client.
+/// </summary>
+[ServiceManager.EarlyLoadedService]
+internal sealed class ClientHelloService : IInternalDisposableService
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ClientHelloService"/> class.
+    /// </summary>
+    /// <param name="rpcHostService">Injected host service.</param>
+    [ServiceManager.ServiceConstructor]
+    public ClientHelloService(RpcHostService rpcHostService)
+    {
+        rpcHostService.AddMethod("hello", this.HandleHello);
+    }
+
+    /// <summary>
+    /// Handle a hello request.
+    /// </summary>
+    /// <param name="request">.</param>
+    /// <returns>Respond with information.</returns>
+    public async Task<ClientHelloResponse> HandleHello(ClientHelloRequest request)
+    {
+        var dalamud = await Service<Dalamud>.GetAsync();
+
+        return new ClientHelloResponse
+        {
+            ApiVersion = "1.0",
+            DalamudVersion = Util.GetScmVersion(),
+            GameVersion = dalamud.StartInfo.GameVersion?.ToString() ?? "Unknown",
+            ClientIdentifier = await this.GetClientIdentifier(),
+        };
+    }
+
+    /// <inheritdoc/>
+    public void DisposeService()
+    {
+    }
+
+    private async Task<string> GetClientIdentifier()
+    {
+        var framework = await Service<Framework>.GetAsync();
+        var clientState = await Service<ClientState>.GetAsync();
+        var dataManager = await Service<DataManager>.GetAsync();
+
+        var clientIdentifier = $"FFXIV Process ${Environment.ProcessId}";
+
+        await framework.RunOnFrameworkThread(() =>
+        {
+            if (clientState.IsLoggedIn)
+            {
+                var player = clientState.LocalPlayer;
+                if (player != null)
+                {
+                    var world = dataManager.GetExcelSheet<World>().GetRow(player.HomeWorld.RowId);
+                    clientIdentifier = $"Logged in as {player.Name.TextValue} @ {world.Name.ExtractText()}";
+                }
+            }
+            else
+            {
+                clientIdentifier = "On login screen";
+            }
+        });
+
+        return clientIdentifier;
+    }
+}
+
+/// <summary>
+/// A request from a client to say hello.
+/// </summary>
+internal record ClientHelloRequest
+{
+    /// <summary>
+    /// Gets the API version this client is expecting.
+    /// </summary>
+    public string ApiVersion { get; init; } = string.Empty;
+
+    /// <summary>
+    /// Gets the user agent of the client.
+    /// </summary>
+    public string UserAgent { get; init; } = string.Empty;
+}
+
+/// <summary>
+/// A response from Dalamud to a hello request.
+/// </summary>
+internal record ClientHelloResponse
+{
+    /// <summary>
+    /// Gets the API version this server has offered.
+    /// </summary>
+    public string? ApiVersion { get; init; }
+
+    /// <summary>
+    /// Gets the current Dalamud version.
+    /// </summary>
+    public string? DalamudVersion { get; init; }
+
+    /// <summary>
+    /// Gets the current game version.
+    /// </summary>
+    public string? GameVersion { get; init; }
+
+    /// <summary>
+    /// Gets an identifier for this client.
+    /// </summary>
+    public string? ClientIdentifier { get; init; }
+}

Dalamud/Networking/Pipes/Internal/LinkHandlerService.cs

@@ -0,0 +1,107 @@
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+
+using Dalamud.Logging.Internal;
+using Dalamud.Networking.Pipes.Rpc;
+using Dalamud.Utility;
+
+namespace Dalamud.Networking.Pipes.Internal;
+
+/// <summary>
+/// A service responsible for handling Dalamud URIs and dispatching them accordingly.
+/// </summary>
+[ServiceManager.EarlyLoadedService]
+internal class LinkHandlerService : IInternalDisposableService
+{
+    private readonly ModuleLog log = new("LinkHandler");
+
+    // key: namespace (e.g. "plugin" or "PluginInstaller") -> list of handlers
+    private readonly ConcurrentDictionary<string, List<Action<DalamudUri>>> handlers
+        = new(StringComparer.OrdinalIgnoreCase);
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="LinkHandlerService"/> class.
+    /// </summary>
+    /// <param name="rpcHostService">The injected RPC host service.</param>
+    [ServiceManager.ServiceConstructor]
+    public LinkHandlerService(RpcHostService rpcHostService)
+    {
+        rpcHostService.AddMethod("handleLink", this.HandleLinkCall);
+    }
+
+    /// <inheritdoc/>
+    public void DisposeService()
+    {
+    }
+
+    /// <summary>
+    /// Register a handler for a namespace. All URIs with this namespace will be dispatched to the handler.
+    /// </summary>
+    /// <param name="ns">The namespace to use for this subscription.</param>
+    /// <param name="handler">The command handler.</param>
+    public void Register(string ns, Action<DalamudUri> handler)
+    {
+        if (string.IsNullOrWhiteSpace(ns))
+            throw new ArgumentNullException(nameof(ns));
+
+        var list = this.handlers.GetOrAdd(ns, _ => []);
+        lock (list)
+        {
+            list.Add(handler);
+        }
+
+        this.log.Verbose("Registered handler for {Namespace}", ns);
+    }
+
+    /// <summary>
+    /// Unregister a handler.
+    /// </summary>
+    /// <param name="ns">The namespace to use for this subscription.</param>
+    /// <param name="handler">The command handler.</param>
+    public void Unregister(string ns, Action<DalamudUri> handler)
+    {
+        if (string.IsNullOrWhiteSpace(ns))
+            return;
+
+        if (!this.handlers.TryGetValue(ns, out var list))
+            return;
+
+        list.RemoveAll(x => x == handler);
+
+        if (list.Count == 0)
+            this.handlers.TryRemove(ns, out _);
+
+        this.log.Verbose("Unregistered handler for {Namespace}", ns);
+    }
+
+    /// <summary>
+    /// Dispatch a URI to matching handlers.
+    /// </summary>
+    /// <param name="uri">The URI to parse and dispatch.</param>
+    public void Dispatch(DalamudUri uri)
+    {
+        this.log.Information("Received URI: {Uri}", uri.ToString());
+
+        var ns = uri.Namespace;
+        if (!this.handlers.TryGetValue(ns, out var actions))
+            return;
+
+        foreach (var h in actions)
+        {
+            h.InvokeSafely(uri);
+        }
+    }
+
+    /// <summary>
+    /// The RPC-invokable link handler.
+    /// </summary>
+    /// <param name="uri">A plain-text URI to parse.</param>
+    public void HandleLinkCall(string uri)
+    {
+        if (string.IsNullOrWhiteSpace(uri))
+            return;
+
+        var du = DalamudUri.FromUri(uri);
+        this.Dispatch(du);
+    }
+}

Dalamud/Networking/Pipes/Rpc/PipeRpcHost.cs

@@ -0,0 +1,167 @@
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO.Pipes;
+using System.Security.AccessControl;
+using System.Security.Principal;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Dalamud.Logging.Internal;
+using Dalamud.Utility;
+
+namespace Dalamud.Networking.Pipes.Rpc;
+
+/// <summary>
+/// Simple multi-client JSON-RPC named pipe host using StreamJsonRpc.
+/// </summary>
+internal class PipeRpcHost : IDisposable
+{
+    private readonly ModuleLog log = new("RPC/Host");
+
+    private readonly RpcServiceRegistry registry = new();
+    private readonly CancellationTokenSource cts = new();
+    private readonly ConcurrentDictionary<Guid, RpcConnection> sessions = new();
+    private Task? acceptLoopTask;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PipeRpcHost"/> class.
+    /// </summary>
+    /// <param name="pipeName">The pipe name to create.</param>
+    public PipeRpcHost(string? pipeName = null)
+    {
+        // Default pipe name based on current process ID for uniqueness per Dalamud instance.
+        this.PipeName = pipeName ?? $"DalamudRPC.{Environment.ProcessId}";
+    }
+
+    /// <summary>
+    /// Gets the name of the named pipe this RPC host is using.
+    /// </summary>
+    public string PipeName { get; }
+
+    /// <summary>Adds a local object exposing RPC methods callable by clients.</summary>
+    /// <param name="service">An arbitrary service object that will be introspected to add to RPC.</param>
+    public void AddService(object service) => this.registry.AddService(service);
+
+    /// <summary>
+    /// Adds a standalone JSON-RPC method callable by clients.
+    /// </summary>
+    /// <param name="name">The name to add.</param>
+    /// <param name="handler">The delegate that acts as the handler.</param>
+    public void AddMethod(string name, Delegate handler) => this.registry.AddMethod(name, handler);
+
+    /// <summary>Starts accepting client connections.</summary>
+    public void Start()
+    {
+        if (this.acceptLoopTask != null) return;
+        this.acceptLoopTask = Task.Factory.StartNew(this.AcceptLoopAsync, TaskCreationOptions.LongRunning);
+    }
+
+    /// <summary>Invoke an RPC request on a specific client expecting a result.</summary>
+    /// <param name="clientId">The client ID to invoke.</param>
+    /// <param name="method">The method to invoke.</param>
+    /// <param name="arguments">Any arguments to invoke.</param>
+    /// <returns>An optional return based on the specified RPC.</returns>
+    /// <typeparam name="T">The expected response type.</typeparam>
+    public Task<T> InvokeClientAsync<T>(Guid clientId, string method, params object[] arguments)
+    {
+        if (!this.sessions.TryGetValue(clientId, out var session))
+            throw new KeyNotFoundException($"No client {clientId}");
+
+        return session.Rpc.InvokeAsync<T>(method, arguments);
+    }
+
+    /// <summary>Send a notification to all connected clients (no response expected).</summary>
+    /// <param name="method">The method name to broadcast.</param>
+    /// <param name="arguments">The arguments to broadcast.</param>
+    /// <returns>Returns a Task when completed.</returns>
+    public Task BroadcastNotifyAsync(string method, params object[] arguments)
+    {
+        var list = this.sessions.Values;
+        var tasks = new List<Task>(list.Count);
+        foreach (var s in list)
+        {
+            tasks.Add(s.Rpc.NotifyAsync(method, arguments));
+        }
+
+        return Task.WhenAll(tasks);
+    }
+
+    /// <summary>
+    /// Gets a list of connected client IDs.
+    /// </summary>
+    /// <returns>Connected client IDs.</returns>
+    public IReadOnlyCollection<Guid> GetClientIds() => this.sessions.Keys.AsReadOnlyCollection();
+
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        this.cts.Cancel();
+        this.acceptLoopTask?.Wait(1000);
+
+        foreach (var kv in this.sessions)
+        {
+            kv.Value.Dispose();
+        }
+
+        this.sessions.Clear();
+        this.cts.Dispose();
+        this.log.Information("PipeRpcHost disposed ({Pipe})", this.PipeName);
+        GC.SuppressFinalize(this);
+    }
+
+    private PipeSecurity BuildPipeSecurity()
+    {
+        var ps = new PipeSecurity();
+        ps.AddAccessRule(new PipeAccessRule(WindowsIdentity.GetCurrent().User!, PipeAccessRights.FullControl, AccessControlType.Allow));
+
+        return ps;
+    }
+
+    private async Task AcceptLoopAsync()
+    {
+        this.log.Information("PipeRpcHost starting on pipe {Pipe}", this.PipeName);
+        var token = this.cts.Token;
+        var security = this.BuildPipeSecurity();
+
+        while (!token.IsCancellationRequested)
+        {
+            NamedPipeServerStream? server = null;
+            try
+            {
+                server = NamedPipeServerStreamAcl.Create(
+                    this.PipeName,
+                    PipeDirection.InOut,
+                    NamedPipeServerStream.MaxAllowedServerInstances,
+                    PipeTransmissionMode.Message,
+                    PipeOptions.Asynchronous,
+                    65536,
+                    65536,
+                    security);
+
+                await server.WaitForConnectionAsync(token).ConfigureAwait(false);
+
+                var session = new RpcConnection(server, this.registry);
+                this.sessions.TryAdd(session.Id, session);
+
+                this.log.Debug("RPC connection created: {Id}", session.Id);
+
+                _ = session.Completion.ContinueWith(t =>
+                {
+                    this.sessions.TryRemove(session.Id, out _);
+                    this.log.Debug("RPC connection removed: {Id}", session.Id);
+                }, TaskScheduler.Default);
+            }
+            catch (OperationCanceledException)
+            {
+                server?.Dispose();
+                break;
+            }
+            catch (Exception ex)
+            {
+                server?.Dispose();
+                this.log.Error(ex, "Error in pipe accept loop");
+                await Task.Delay(500, token).ConfigureAwait(false);
+            }
+        }
+    }
+}

Dalamud/Networking/Pipes/Rpc/RpcConnection.cs

@@ -0,0 +1,92 @@
+using System.IO.Pipes;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Serilog;
+using StreamJsonRpc;
+
+namespace Dalamud.Networking.Pipes.Rpc;
+
+/// <summary>
+/// A single RPC client session connected via named pipe.
+/// </summary>
+internal class RpcConnection : IDisposable
+{
+    private readonly NamedPipeServerStream pipe;
+    private readonly RpcServiceRegistry registry;
+    private readonly CancellationTokenSource cts = new();
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RpcConnection"/> class.
+    /// </summary>
+    /// <param name="pipe">The named pipe that this connection will handle.</param>
+    /// <param name="registry">A registry of RPC services.</param>
+    public RpcConnection(NamedPipeServerStream pipe, RpcServiceRegistry registry)
+    {
+        this.Id = Guid.CreateVersion7();
+        this.pipe = pipe;
+        this.registry = registry;
+
+        var formatter = new JsonMessageFormatter();
+        var handler = new HeaderDelimitedMessageHandler(pipe, pipe, formatter);
+
+        this.Rpc = new JsonRpc(handler);
+        this.Rpc.AllowModificationWhileListening = true;
+        this.Rpc.Disconnected += this.OnDisconnected;
+        this.registry.Attach(this.Rpc);
+
+        this.Rpc.StartListening();
+    }
+
+    /// <summary>
+    /// Gets the GUID for this connection.
+    /// </summary>
+    public Guid Id { get; }
+
+    /// <summary>
+    /// Gets the JsonRpc instance for this connection.
+    /// </summary>
+    public JsonRpc Rpc { get; }
+
+    /// <summary>
+    /// Gets a task that's called on RPC completion.
+    /// </summary>
+    public Task Completion => this.Rpc.Completion;
+
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        if (!this.cts.IsCancellationRequested)
+        {
+            this.cts.Cancel();
+        }
+
+        try
+        {
+            this.Rpc.Dispose();
+        }
+        catch (Exception ex)
+        {
+            Log.Debug(ex, "Error disposing JsonRpc for client {Id}", this.Id);
+        }
+
+        try
+        {
+            this.pipe.Dispose();
+        }
+        catch (Exception ex)
+        {
+            Log.Debug(ex, "Error disposing pipe for client {Id}", this.Id);
+        }
+
+        this.cts.Dispose();
+        GC.SuppressFinalize(this);
+    }
+
+    private void OnDisconnected(object? sender, JsonRpcDisconnectedEventArgs e)
+    {
+        Log.Debug("RPC client {Id} disconnected: {Reason}", this.Id, e.Description);
+        this.registry.Detach(this.Rpc);
+        this.Dispose();
+    }
+}

Dalamud/Networking/Pipes/Rpc/RpcHostService.cs

@@ -0,0 +1,49 @@
+using Dalamud.Logging.Internal;
+
+namespace Dalamud.Networking.Pipes.Rpc;
+
+/// <summary>
+/// The Dalamud service repsonsible for hosting the RPC.
+/// </summary>
+[ServiceManager.EarlyLoadedService]
+internal class RpcHostService : IServiceType, IInternalDisposableService
+{
+    private readonly ModuleLog log = new("RPC");
+    private readonly PipeRpcHost host;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RpcHostService"/> class.
+    /// </summary>
+    [ServiceManager.ServiceConstructor]
+    public RpcHostService()
+    {
+        this.host = new PipeRpcHost();
+        this.host.Start();
+
+        this.log.Information("RpcHostService started on pipe {Pipe}", this.host.PipeName);
+    }
+
+    /// <summary>
+    /// Gets the RPC host to drill down.
+    /// </summary>
+    public PipeRpcHost Host => this.host;
+
+    /// <summary>
+    /// Add a new service Object to the RPC host.
+    /// </summary>
+    /// <param name="service">The object to add.</param>
+    public void AddService(object service) => this.host.AddService(service);
+
+    /// <summary>
+    /// Add a new standalone method to the RPC host.
+    /// </summary>
+    /// <param name="name">The method name to add.</param>
+    /// <param name="handler">The handler to add.</param>
+    public void AddMethod(string name, Delegate handler) => this.host.AddMethod(name, handler);
+
+    /// <inheritdoc/>
+    public void DisposeService()
+    {
+        this.host.Dispose();
+    }
+}

Dalamud/Networking/Pipes/Rpc/RpcServiceRegistry.cs

@@ -0,0 +1,85 @@
+using System.Collections.Generic;
+using System.Threading;
+
+using StreamJsonRpc;
+
+namespace Dalamud.Networking.Pipes.Rpc;
+
+/// <summary>
+/// Thread-safe registry of local RPC target objects that are exposed to every connected JsonRpc session.
+/// New sessions get all previously registered targets; newly added targets are attached to all active sessions.
+/// </summary>
+internal class RpcServiceRegistry
+{
+    private readonly Lock sync = new();
+    private readonly List<object> targets = [];
+    private readonly List<(string Name, Delegate Handler)> methods = [];
+    private readonly List<JsonRpc> activeRpcs = [];
+
+    /// <summary>
+    /// Registers a new local RPC target object. Its public JSON-RPC methods become callable by clients.
+    /// Adds <paramref name="service"/> to the registry and attaches it to all active RPC sessions.
+    /// </summary>
+    /// <param name="service">The service instance containing JSON-RPC callable methods to expose.</param>
+    public void AddService(object service)
+    {
+        lock (this.sync)
+        {
+            this.targets.Add(service);
+            foreach (var rpc in this.activeRpcs)
+            {
+                rpc.AddLocalRpcTarget(service);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Registers a new standalone JSON-RPC method.
+    /// </summary>
+    /// <param name="name">The name of the method to add.</param>
+    /// <param name="handler">The handler to add.</param>
+    public void AddMethod(string name, Delegate handler)
+    {
+        lock (this.sync)
+        {
+            this.methods.Add((name, handler));
+            foreach (var rpc in this.activeRpcs)
+            {
+                rpc.AddLocalRpcMethod(name, handler);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Attaches a JsonRpc instance <paramref name="rpc"/> to the registry so it receives all existing service targets.
+    /// </summary>
+    /// <param name="rpc">The JsonRpc instance to attach and populate with current targets.</param>
+    internal void Attach(JsonRpc rpc)
+    {
+        lock (this.sync)
+        {
+            this.activeRpcs.Add(rpc);
+            foreach (var t in this.targets)
+            {
+                rpc.AddLocalRpcTarget(t);
+            }
+
+            foreach (var m in this.methods)
+            {
+                rpc.AddLocalRpcMethod(m.Name, m.Handler);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Detaches a JsonRpc instance <paramref name="rpc"/> from the registry (e.g. when a client disconnects).
+    /// </summary>
+    /// <param name="rpc">The JsonRpc instance being detached.</param>
+    internal void Detach(JsonRpc rpc)
+    {
+        lock (this.sync)
+        {
+            this.activeRpcs.Remove(rpc);
+        }
+    }
+}

Dalamud/Plugin/SelfTest/ISelfTestRegistry.cs

@@ -1,5 +1,7 @@
 using System.Collections.Generic;
 
+using Dalamud.Plugin.Services;
+
 namespace Dalamud.Plugin.SelfTest;
 
 /// <summary>
@@ -44,7 +46,7 @@ namespace Dalamud.Plugin.SelfTest;
 /// }
 /// </code>
 /// </example>
-public interface ISelfTestRegistry
+public interface ISelfTestRegistry : IDalamudService
 {
     /// <summary>
     /// Registers the self-test steps for this plugin.

Dalamud/Plugin/Services/IPluginLinkHandler.cs

@@ -0,0 +1,24 @@
+using System.Diagnostics.CodeAnalysis;
+
+using Dalamud.Networking.Pipes;
+
+namespace Dalamud.Plugin.Services;
+
+/// <summary>
+/// A service to allow plugins to subscribe to dalamud:// URIs targeting them. Plugins will receive any URI sent to the
+/// <c>dalamud://plugin/{PLUGIN_INTERNAL_NAME}/...</c> namespace.
+/// </summary>
+[Experimental("DAL_RPC", Message = "This service will be finalized around 7.41 and may change before then.")]
+public interface IPluginLinkHandler : IDalamudService
+{
+    /// <summary>
+    /// A delegate containing the received URI.
+    /// </summary>
+    /// <param name="uri">The URI opened by the user.</param>
+    public delegate void PluginUriReceived(DalamudUri uri);
+
+    /// <summary>
+    /// The event fired when a URI targeting this plugin is received.
+    /// </summary>
+    event PluginUriReceived OnUriReceived;
+}

Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
 
     <PropertyGroup Label="Target">
-        <TargetFramework>net9.0-windows</TargetFramework>
+        <TargetFramework>net10.0-windows</TargetFramework>
         <PlatformTarget>x64</PlatformTarget>
         <Platforms>x64</Platforms>
         <LangVersion>13.0</LangVersion>

Directory.Packages.props

@@ -1,65 +1,68 @@
 <Project>
-    <PropertyGroup>
-        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
-    </PropertyGroup>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <!-- Analyzers -->
-        <PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4"/>
-        <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556"/>
-        <PackageVersion Include="JetBrains.Annotations" Version="2025.2.2"/>
+  <ItemGroup>
+    <!-- Analyzers -->
+    <PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4" />
+    <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
+    <PackageVersion Include="JetBrains.Annotations" Version="2025.2.2" />
 
-        <!-- Misc Libraries -->
-        <PackageVersion Include="BitFaster.Caching" Version="2.4.1"/>
-        <PackageVersion Include="CheapLoc" Version="1.1.8"/>
-        <PackageVersion Include="MinSharp" Version="1.0.4"/>
-        <PackageVersion Include="Newtonsoft.Json" Version="13.0.3"/>
-        <PackageVersion Include="Lumina" Version="6.5.1"/>
-        <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="8.0.7"/>
-        <PackageVersion Include="System.Collections.Immutable" Version="8.0.0"/>
-        <PackageVersion Include="System.Drawing.Common" Version="8.0.0"/>
-        <PackageVersion Include="System.Reactive" Version="5.0.0"/>
-        <PackageVersion Include="System.Reflection.MetadataLoadContext" Version="8.0.0"/>
-        <PackageVersion Include="System.Resources.Extensions" Version="8.0.0"/>
-        <PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.39"/>
-        <PackageVersion Include="sqlite-net-pcl" Version="1.8.116"/>
+    <!-- Misc Libraries -->
+    <PackageVersion Include="BitFaster.Caching" Version="2.4.1" />
+    <PackageVersion Include="CheapLoc" Version="1.1.8" />
+    <PackageVersion Include="MinSharp" Version="1.0.4" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="Lumina" Version="6.5.1" />
+    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="10.0.0" />
+    <PackageVersion Include="System.Collections.Immutable" Version="10.0.0" />
+    <PackageVersion Include="System.Drawing.Common" Version="10.0.0" />
+    <PackageVersion Include="System.Reactive" Version="5.0.0" />
+    <PackageVersion Include="System.Reflection.MetadataLoadContext" Version="10.0.0" />
+    <PackageVersion Include="System.Resources.Extensions" Version="10.0.0" />
+    <PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.39" />
+    <PackageVersion Include="sqlite-net-pcl" Version="1.8.116" />
 
-        <!-- DirectX / Win32 -->
-        <PackageVersion Include="TerraFX.Interop.Windows" Version="10.0.22621.2"/>
-        <PackageVersion Include="SharpDX.Direct3D11" Version="4.2.0"/>
-        <PackageVersion Include="SharpDX.Mathematics" Version="4.2.0"/>
-        <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.183"/>
+    <!-- DirectX / Win32 -->
+    <PackageVersion Include="TerraFX.Interop.Windows" Version="10.0.22621.2" />
+    <PackageVersion Include="SharpDX.Direct3D11" Version="4.2.0" />
+    <PackageVersion Include="SharpDX.Mathematics" Version="4.2.0" />
+    <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.183" />
 
-        <!-- Logging -->
-        <PackageVersion Include="Serilog" Version="4.0.2"/>
-        <PackageVersion Include="Serilog.Sinks.Async" Version="2.0.0"/>
-        <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0"/>
-        <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0"/>
+    <!-- Logging -->
+    <PackageVersion Include="Serilog" Version="4.0.2" />
+    <PackageVersion Include="Serilog.Sinks.Async" Version="2.0.0" />
+    <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
 
-        <!-- Injector Utilities -->
-        <PackageVersion Include="Iced" Version="1.17.0"/>
-        <PackageVersion Include="PeNet" Version="2.6.4"/>
+    <!-- Injector Utilities -->
+    <PackageVersion Include="Iced" Version="1.17.0" />
+    <PackageVersion Include="PeNet" Version="2.6.4" />
 
-        <!-- HexaGen -->
-        <PackageVersion Include="HexaGen.Runtime" Version="1.1.20"/>
+    <!-- HexaGen -->
+    <PackageVersion Include="HexaGen.Runtime" Version="1.1.20" />
 
-        <!-- Reloaded -->
-        <PackageVersion Include="goatcorp.Reloaded.Hooks" Version="4.2.0-goatcorp7"/>
-        <PackageVersion Include="goatcorp.Reloaded.Assembler" Version="1.0.14-goatcorp5"/>
-        <PackageVersion Include="Reloaded.Memory" Version="7.0.0"/>
-        <PackageVersion Include="Reloaded.Memory.Buffers" Version="2.0.0"/>
+    <!-- Reloaded -->
+    <PackageVersion Include="goatcorp.Reloaded.Hooks" Version="4.2.0-goatcorp7" />
+    <PackageVersion Include="goatcorp.Reloaded.Assembler" Version="1.0.14-goatcorp5" />
+    <PackageVersion Include="Reloaded.Memory" Version="7.0.0" />
+    <PackageVersion Include="Reloaded.Memory.Buffers" Version="2.0.0" />
 
-        <!-- Unit Testing -->
-        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.10.0"/>
-        <PackageVersion Include="xunit" Version="2.4.1"/>
-        <PackageVersion Include="xunit.abstractions" Version="2.0.3"/>
-        <PackageVersion Include="xunit.analyzers" Version="0.10.0"/>
-        <PackageVersion Include="xunit.assert" Version="2.4.1"/>
-        <PackageVersion Include="xunit.core" Version="2.4.1"/>
-        <PackageVersion Include="xunit.extensibility.core" Version="2.4.1"/>
-        <PackageVersion Include="xunit.extensibility.execution" Version="2.4.1"/>
-        <PackageVersion Include="xunit.runner.console" Version="2.4.1"/>
-        <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3"/>
-    </ItemGroup>
+    <!-- Named Pipes / RPC -->
+    <PackageVersion Include="StreamJsonRpc" Version="2.22.23" />
+
+    <!-- Unit Testing -->
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageVersion Include="xunit" Version="2.4.1" />
+    <PackageVersion Include="xunit.abstractions" Version="2.0.3" />
+    <PackageVersion Include="xunit.analyzers" Version="0.10.0" />
+    <PackageVersion Include="xunit.assert" Version="2.4.1" />
+    <PackageVersion Include="xunit.core" Version="2.4.1" />
+    <PackageVersion Include="xunit.extensibility.core" Version="2.4.1" />
+    <PackageVersion Include="xunit.extensibility.execution" Version="2.4.1" />
+    <PackageVersion Include="xunit.runner.console" Version="2.4.1" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
+  </ItemGroup>
 </Project>

build/DalamudBuild.cs

@@ -42,10 +42,7 @@ public class DalamudBuild : NukeBuild
 
     AbsolutePath InjectorProjectDir => RootDirectory / "Dalamud.Injector";
     AbsolutePath InjectorProjectFile => InjectorProjectDir / "Dalamud.Injector.csproj";
-
-    AbsolutePath InjectorBootProjectDir => RootDirectory / "Dalamud.Injector.Boot";
-    AbsolutePath InjectorBootProjectFile => InjectorBootProjectDir / "Dalamud.Injector.Boot.vcxproj";
-
+    
     AbsolutePath TestProjectDir => RootDirectory / "Dalamud.Test";
     AbsolutePath TestProjectFile => TestProjectDir / "Dalamud.Test.csproj";
 
@@ -172,14 +169,6 @@ public class DalamudBuild : NukeBuild
                 .EnableNoRestore());
         });
 
-    Target CompileInjectorBoot => _ => _
-        .Executes(() =>
-        {
-            MSBuildTasks.MSBuild(s => s
-                .SetTargetPath(InjectorBootProjectFile)
-                .SetConfiguration(Configuration));
-        });
-
     Target SetCILogging => _ => _
         .DependentFor(Compile)
         .OnlyWhenStatic(() => IsCIBuild)
@@ -196,7 +185,6 @@ public class DalamudBuild : NukeBuild
     .DependsOn(CompileDalamudBoot)
     .DependsOn(CompileDalamudCrashHandler)
     .DependsOn(CompileInjector)
-    .DependsOn(CompileInjectorBoot)
     ;
 
     Target CI => _ => _
@@ -250,11 +238,6 @@ public class DalamudBuild : NukeBuild
                 .SetProject(InjectorProjectFile)
                 .SetConfiguration(Configuration));
 
-            MSBuildTasks.MSBuild(s => s
-                .SetProjectFile(InjectorBootProjectFile)
-                .SetConfiguration(Configuration)
-                .SetTargets("Clean"));
-
             FileSystemTasks.DeleteDirectory(ArtifactsDirectory);
             Directory.CreateDirectory(ArtifactsDirectory);
         });

build/build.csproj

@@ -12,6 +12,7 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Nuke.Common" Version="6.2.1" />
-        <PackageReference Include="System.Runtime.Serialization.Formatters" Version="9.0.0" />
+        <PackageReference Include="System.Runtime.Serialization.Formatters" Version="10.0.0" />
+        <PackageReference Remove="Microsoft.CodeAnalysis.BannedApiAnalyzers" />
     </ItemGroup>
 </Project>

global.json

@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "9.0.0",
+    "version": "10.0.0",
     "rollForward": "latestMinor",
     "allowPrerelease": true
   }
-} 
+}

imgui/StandaloneImGuiTestbed/StandaloneImGuiTestbed.csproj

@@ -26,6 +26,7 @@
       <PackageReference Include="Veldrid" Version="4.9.0" />
       <PackageReference Include="Veldrid.SDL2" Version="4.9.0" />
       <PackageReference Include="Veldrid.StartupUtilities" Version="4.9.0" />
+      <PackageReference Remove="Microsoft.CodeAnalysis.BannedApiAnalyzers"/>
     </ItemGroup>
 
     <ItemGroup>