API 10

Not sure how or why that even broke, the string doesn't seem to have changed in the LogMessage sheet.

Fixes #18.

.dockerignore

@@ -4,4 +4,6 @@
 .gitignore
 Dockerfile
 .dockerignore
+docker-build.sh
 .vs/
+.idea/

.editorconfig

@@ -0,0 +1,31 @@
+root = true
+
+[*]
+indent_style = space
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[{*.cs}]
+charset = utf-8-bom
+indent_size = 4
+dotnet_sort_system_directives_first = true
+csharp_style_implicit_object_creation_when_type_is_apparent = true
+csharp_trailing_comma_in_multiline_lists = true
+csharp_place_simple_embedded_block_on_same_line = false
+csharp_place_attribute_on_same_line = false
+
+resharper_indent_text = ZeroIndent
+
+# methods
+csharp_style_expression_bodied_methods = true
+
+# namespaces
+csharp_style_namespace_declarations = file_scoped
+
+# braces
+csharp_prefer_braces = when_multiline
+
+[{*.resx,*.Designer.cs,packages.lock.json}]
+generated_code = true
+ij_formatter_enabled = false

.github/workflows/build.yml

@@ -1,29 +0,0 @@
-name: dotnet build
-on:
-  push:
-    paths-ignore:
-      - '**.md'
-      - 'Dockerfile'
-jobs:
-  build:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-
-      - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v3
-        with:
-          dotnet-version: 7.0
-
-      - name: Download Dalamud
-        run: |
-          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/latest.zip -OutFile latest.zip
-          Expand-Archive -Force latest.zip "$env:AppData\XIVLauncher\addon\Hooks\dev\"
-
-      - name: Install dependencies
-        run: dotnet restore
-
-      - name: Build
-        run: dotnet build --configuration Release --no-restore

.github/workflows/server.yml

@@ -1,30 +0,0 @@
-name: docker build
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - '.github/workflows/server.yml'
-      - 'Pal.Common/**'
-      - 'Pal.Server/**'
-      - 'Dockerfile'
-permissions:
-  packages: write
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Login to GitHub Package Registry
-      uses: docker/login-action@v1
-      with:
-        registry: ghcr.io
-        username: ${{ github.repository_owner }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Build and push
-      uses: docker/build-push-action@v4
-      with:
-        push: true
-        tags: ghcr.io/${{ github.repository_owner }}/palace-pal:latest

.github/workflows/upload-crowdin.yml

@@ -1,24 +0,0 @@
-name: Upload to Crowdin
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - 'Pal.Client/Properties/*.resx'
-      - 'crowdin.yml'
-  workflow_dispatch: {}
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Crowdin Action
-      uses: crowdin/github-action@1.4.9
-      with:
-        upload_sources: true
-        upload_translations: true
-        download_translations: false
-        crowdin_branch_name: ${{ github.ref_name }}
-      env:
-        CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-        CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.gitmodules

@@ -1,3 +1,9 @@
 [submodule "vendor/ECommons"]
 	path = vendor/ECommons
 	url = https://github.com/NightmareXIV/ECommons
+[submodule "vendor/LLib"]
+	path = vendor/LLib
+	url = https://git.carvel.li/liza/LLib.git
+[submodule "Server"]
+	path = Server
+	url = https://git.carvel.li/liza/PalacePal.Server.git

Directory.Build.targets

@@ -0,0 +1,10 @@
+<Project>
+    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+        <WindowsKitsRoot Condition="'$(WindowsKitsRoot)' == ''">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots', 'KitsRoot10', null, RegistryView.Registry32, RegistryView.Default))</WindowsKitsRoot>
+        <SignToolPath Condition="'$(WindowsKitsRoot)' != '' And '$(SignToolPath)' == '' And exists('$(WindowsKitsRoot)bin\10.0.19041.0\')">$(WindowsKitsRoot)bin\10.0.19041.0\x86\</SignToolPath>
+    </PropertyGroup>
+
+    <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(SignToolPath)' != '' And Exists('$(SolutionDir)codesigning.pfx')">
+        <Exec Command="&quot;$(SignToolPath)signtool.exe&quot; sign /f $(SolutionDir)codesigning.pfx /t http://timestamp.digicert.com /fd SHA256 &quot;$(TargetPath)&quot;"/>
+    </Target>
+</Project>

Dockerfile

@@ -1,13 +1,19 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
+ARG TARGETARCH
 WORKDIR /build
 COPY Pal.Common/Pal.Common.csproj Pal.Common/
-COPY Pal.Server/Pal.Server.csproj Pal.Server/
+COPY Server/Server/Pal.Server.csproj Server/Server/
-RUN dotnet restore Pal.Server/Pal.Server.csproj
+RUN dotnet restore Server/Server/Pal.Server.csproj -a $TARGETARCH
 
 COPY . ./
-RUN dotnet publish Pal.Server/Pal.Server.csproj --configuration Release --no-restore -o /dist
+RUN dotnet publish Server/Server/Pal.Server.csproj -a $TARGETARCH --no-restore -o /dist
+
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
+
+# fix later
+ENV DOTNET_ROLL_FORWARD=Major
+ENV DOTNET_ROLL_FORWARD_PRE_RELEASE=1
 
-FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS runtime
 EXPOSE 5415
 ENV DOTNET_ENVIRONMENT=Production
 ENV ASPNETCORE_URLS=
@@ -21,4 +27,4 @@ WORKDIR /app
 COPY --from=build-env /dist .
 
 USER pal
-ENTRYPOINT ["dotnet", "Pal.Server.dll"]
+ENTRYPOINT ["dotnet", "Pal.Server.dll"]

Pal.Client/Commands/ISubCommand.cs

@@ -0,0 +1,9 @@
+using System;
+using System.Collections.Generic;
+
+namespace Pal.Client.Commands;
+
+public interface ISubCommand
+{
+    IReadOnlyDictionary<string, Action<string>> GetHandlers();
+}

Pal.Client/Commands/PalConfigCommand.cs

@@ -1,31 +1,39 @@
-using Dalamud.Interface.Windowing;
+using System;
+using System.Collections.Generic;
 using Pal.Client.Configuration;
 using Pal.Client.Windows;
 
-namespace Pal.Client.Commands
+namespace Pal.Client.Commands;
+
+internal class PalConfigCommand : ISubCommand
 {
-    internal class PalConfigCommand
+    private readonly IPalacePalConfiguration _configuration;
+    private readonly AgreementWindow _agreementWindow;
+    private readonly ConfigWindow _configWindow;
+
+    public PalConfigCommand(
+        IPalacePalConfiguration configuration,
+        AgreementWindow agreementWindow,
+        ConfigWindow configWindow)
     {
-        private readonly IPalacePalConfiguration _configuration;
+        _configuration = configuration;
-        private readonly AgreementWindow _agreementWindow;
+        _agreementWindow = agreementWindow;
-        private readonly ConfigWindow _configWindow;
+        _configWindow = configWindow;
+    }
 
-        public PalConfigCommand(
-            IPalacePalConfiguration configuration,
-            AgreementWindow agreementWindow,
-            ConfigWindow configWindow)
-        {
-            _configuration = configuration;
-            _agreementWindow = agreementWindow;
-            _configWindow = configWindow;
-        }
 
-        public void Execute()
+    public IReadOnlyDictionary<string, Action<string>> GetHandlers()
+        => new Dictionary<string, Action<string>>
         {
-            if (_configuration.FirstUse)
+            { "config", _ => Execute() },
-                _agreementWindow.IsOpen = true;
+            { "", _ => Execute() }
-            else
+        };
-                _configWindow.Toggle();
+
-        }
+    public void Execute()
+    {
+        if (_configuration.FirstUse)
+            _agreementWindow.IsOpen = true;
+        else
+            _configWindow.Toggle();
     }
 }

Pal.Client/Commands/PalNearCommand.cs

@@ -1,71 +1,62 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
-using Dalamud.Game.ClientState;
+using Dalamud.Plugin.Services;
 using Pal.Client.DependencyInjection;
 using Pal.Client.Extensions;
 using Pal.Client.Floors;
 using Pal.Client.Rendering;
 
-namespace Pal.Client.Commands
+namespace Pal.Client.Commands;
+
+internal sealed class PalNearCommand : ISubCommand
 {
-    internal sealed class PalNearCommand
+    private readonly Chat _chat;
+    private readonly IClientState _clientState;
+    private readonly TerritoryState _territoryState;
+    private readonly FloorService _floorService;
+
+    public PalNearCommand(Chat chat, IClientState clientState, TerritoryState territoryState,
+        FloorService floorService)
     {
-        private readonly Chat _chat;
+        _chat = chat;
-        private readonly ClientState _clientState;
+        _clientState = clientState;
-        private readonly TerritoryState _territoryState;
+        _territoryState = territoryState;
-        private readonly FloorService _floorService;
+        _floorService = floorService;
+    }
 
-        public PalNearCommand(Chat chat, ClientState clientState, TerritoryState territoryState,
+
-            FloorService floorService)
+    public IReadOnlyDictionary<string, Action<string>> GetHandlers()
+        => new Dictionary<string, Action<string>>
         {
-            _chat = chat;
+            { "near", _ => DebugNearest(_ => true) },
-            _clientState = clientState;
+            { "tnear", _ => DebugNearest(m => m.Type == MemoryLocation.EType.Trap) },
-            _territoryState = territoryState;
+            { "hnear", _ => DebugNearest(m => m.Type == MemoryLocation.EType.Hoard) },
-            _floorService = floorService;
+        };
-        }
 
-        public void Execute(string arguments)
+    private void DebugNearest(Predicate<PersistentLocation> predicate)
-        {
+    {
-            switch (arguments)
+        if (!_territoryState.IsInDeepDungeon())
-            {
+            return;
-                default:
-                    DebugNearest(_ => true);
-                    break;
 
-                case "tnear":
+        var state = _floorService.GetTerritoryIfReady(_clientState.TerritoryType);
-                    DebugNearest(m => m.Type == MemoryLocation.EType.Trap);
+        if (state == null)
-                    break;
+            return;
 
-                case "hnear":
+        var playerPosition = _clientState.LocalPlayer?.Position;
-                    DebugNearest(m => m.Type == MemoryLocation.EType.Hoard);
+        if (playerPosition == null)
-                    break;
+            return;
-            }
+        _chat.Message($"Your position: {playerPosition}");
-        }
 
-        private void DebugNearest(Predicate<PersistentLocation> predicate)
+        var nearbyMarkers = state.Locations
-        {
+            .Where(m => predicate(m))
-            if (!_territoryState.IsInDeepDungeon())
+            .Where(m => m.RenderElement != null && m.RenderElement.Enabled)
-                return;
+            .Select(m => new { m, distance = (playerPosition.Value - m.Position).Length() })
-
+            .OrderBy(m => m.distance)
-            var state = _floorService.GetTerritoryIfReady(_clientState.TerritoryType);
+            .Take(5)
-            if (state == null)
+            .ToList();
-                return;
+        foreach (var nearbyMarker in nearbyMarkers)
-
+            _chat.UnformattedMessage(
-            var playerPosition = _clientState.LocalPlayer?.Position;
+                $"{nearbyMarker.distance:F2} - {nearbyMarker.m.Type} {nearbyMarker.m.NetworkId?.ToPartialId(length: 8)} - {nearbyMarker.m.Position}");
-            if (playerPosition == null)
-                return;
-            _chat.Message($"{playerPosition}");
-
-            var nearbyMarkers = state.Locations
-                .Where(m => predicate(m))
-                .Where(m => m.RenderElement != null && m.RenderElement.Color != RenderData.ColorInvisible)
-                .Select(m => new { m, distance = (playerPosition.Value - m.Position).Length() })
-                .OrderBy(m => m.distance)
-                .Take(5)
-                .ToList();
-            foreach (var nearbyMarker in nearbyMarkers)
-                _chat.UnformattedMessage(
-                    $"{nearbyMarker.distance:F2} - {nearbyMarker.m.Type} {nearbyMarker.m.NetworkId?.ToPartialId(length: 8)} - {nearbyMarker.m.Position}");
-        }
     }
 }

Pal.Client/Commands/PalStatsCommand.cs

@@ -1,18 +1,24 @@
 using System;
+using System.Collections.Generic;
 using Pal.Client.DependencyInjection;
 
-namespace Pal.Client.Commands
+namespace Pal.Client.Commands;
+
+internal sealed class PalStatsCommand : ISubCommand
 {
-    internal sealed class PalStatsCommand
+    private readonly StatisticsService _statisticsService;
+
+    public PalStatsCommand(StatisticsService statisticsService)
     {
-        private readonly StatisticsService _statisticsService;
+        _statisticsService = statisticsService;
-
-        public PalStatsCommand(StatisticsService statisticsService)
-        {
-            _statisticsService = statisticsService;
-        }
-
-        public void Execute()
-            => _statisticsService.ShowGlobalStatistics();
     }
+
+    public IReadOnlyDictionary<string, Action<string>> GetHandlers()
+        => new Dictionary<string, Action<string>>
+        {
+            { "stats", _ => Execute() },
+        };
+
+    private void Execute()
+        => _statisticsService.ShowGlobalStatistics();
 }

Pal.Client/Commands/PalTestConnectionCommand.cs

@@ -1,20 +1,29 @@
-using ECommons.Schedulers;
+using System;
+using System.Collections.Generic;
+using ECommons.Schedulers;
 using Pal.Client.Windows;
 
-namespace Pal.Client.Commands
+namespace Pal.Client.Commands;
+
+internal sealed class PalTestConnectionCommand : ISubCommand
 {
-    internal sealed class PalTestConnectionCommand
+    private readonly ConfigWindow _configWindow;
+
+    public PalTestConnectionCommand(ConfigWindow configWindow)
     {
-        private readonly ConfigWindow _configWindow;
+        _configWindow = configWindow;
+    }
 
-        public PalTestConnectionCommand(ConfigWindow configWindow)
+    public IReadOnlyDictionary<string, Action<string>> GetHandlers()
+        => new Dictionary<string, Action<string>>
         {
-            _configWindow = configWindow;
+            { "test-connection", _ => Execute() },
-        }
+            { "tc", _ => Execute() },
+        };
 
-        public void Execute()
+    private void Execute()
-        {
+    {
-            var _ = new TickScheduler(() => _configWindow.TestConnection());
+        _configWindow.IsOpen = true;
-        }
+        var _ = new TickScheduler(() => _configWindow.TestConnection());
     }
 }

Pal.Client/Configuration/AccountConfigurationV7.cs

@@ -2,150 +2,143 @@
 using System.Collections.Generic;
 using System.Security.Cryptography;
 using System.Text.Json.Serialization;
-using Dalamud.Logging;
 using Microsoft.Extensions.Logging;
-using Pal.Client.DependencyInjection.Logging;
 
-namespace Pal.Client.Configuration
+namespace Pal.Client.Configuration;
+
+public sealed class AccountConfigurationV7 : IAccountConfiguration
 {
-    public sealed class AccountConfigurationV7 : IAccountConfiguration
+    private const int DefaultEntropyLength = 16;
+
+    [JsonConstructor]
+    public AccountConfigurationV7()
     {
-        private const int DefaultEntropyLength = 16;
+    }
 
-        private static readonly ILogger _logger =
+    public AccountConfigurationV7(string server, Guid accountId)
-            DependencyInjectionContext.LoggerProvider.CreateLogger<AccountConfigurationV7>();
+    {
+        Server = server;
+        (EncryptedId, Entropy, Format) = EncryptAccountId(accountId);
+    }
 
-        [JsonConstructor]
+    [Obsolete("for V1 import")]
-        public AccountConfigurationV7()
+    public AccountConfigurationV7(string server, string accountId)
+    {
+        Server = server;
+
+        if (accountId.StartsWith("s:"))
         {
+            EncryptedId = accountId.Substring(2);
+            Entropy = ConfigurationData.FixedV1Entropy;
+            Format = EFormat.UseProtectedData;
+            EncryptIfNeeded();
         }
+        else if (Guid.TryParse(accountId, out Guid guid))
+            (EncryptedId, Entropy, Format) = EncryptAccountId(guid);
+        else
+            throw new InvalidOperationException($"Invalid account id format, can't migrate account for server {server}");
+    }
 
-        public AccountConfigurationV7(string server, Guid accountId)
+    [JsonInclude]
+    [JsonRequired]
+    public EFormat Format { get; private set; } = EFormat.Unencrypted;
+
+    /// <summary>
+    /// Depending on <see cref="Format"/>, this is either a Guid as string or a base64 encoded byte array.
+    /// </summary>
+    [JsonPropertyName("Id")]
+    [JsonInclude]
+    [JsonRequired]
+    public string EncryptedId { get; private set; } = null!;
+
+    [JsonInclude]
+    public byte[]? Entropy { get; private set; }
+
+    [JsonRequired]
+    public string Server { get; init; } = null!;
+
+    [JsonIgnore] public bool IsUsable => DecryptAccountId() != null;
+
+    [JsonIgnore] public Guid AccountId => DecryptAccountId() ?? throw new InvalidOperationException("Account id can't be read");
+
+    public List<string> CachedRoles { get; set; } = new();
+
+    private Guid? DecryptAccountId()
+    {
+        if (Format == EFormat.UseProtectedData && ConfigurationData.SupportsDpapi)
         {
-            Server = server;
+            try
-            (EncryptedId, Entropy, Format) = EncryptAccountId(accountId);
-        }
-
-        [Obsolete("for V1 import")]
-        public AccountConfigurationV7(string server, string accountId)
-        {
-            Server = server;
-
-            if (accountId.StartsWith("s:"))
             {
-                EncryptedId = accountId.Substring(2);
+                byte[] guidBytes = ProtectedData.Unprotect(Convert.FromBase64String(EncryptedId), Entropy, DataProtectionScope.CurrentUser);
-                Entropy = ConfigurationData.FixedV1Entropy;
+                return new Guid(guidBytes);
-                Format = EFormat.UseProtectedData;
-                EncryptIfNeeded();
             }
-            else if (Guid.TryParse(accountId, out Guid guid))
+            catch (Exception)
-                (EncryptedId, Entropy, Format) = EncryptAccountId(guid);
-            else
-                throw new InvalidOperationException($"Invalid account id format, can't migrate account for server {server}");
-        }
-
-        [JsonInclude]
-        [JsonRequired]
-        public EFormat Format { get; private set; } = EFormat.Unencrypted;
-
-        /// <summary>
-        /// Depending on <see cref="Format"/>, this is either a Guid as string or a base64 encoded byte array.
-        /// </summary>
-        [JsonPropertyName("Id")]
-        [JsonInclude]
-        [JsonRequired]
-        public string EncryptedId { get; private set; } = null!;
-
-        [JsonInclude]
-        public byte[]? Entropy { get; private set; }
-
-        [JsonRequired]
-        public string Server { get; init; } = null!;
-
-        [JsonIgnore] public bool IsUsable => DecryptAccountId() != null;
-
-        [JsonIgnore] public Guid AccountId => DecryptAccountId() ?? throw new InvalidOperationException("Account id can't be read");
-
-        public List<string> CachedRoles { get; set; } = new();
-
-        private Guid? DecryptAccountId()
-        {
-            if (Format == EFormat.UseProtectedData && ConfigurationData.SupportsDpapi)
             {
-                try
-                {
-                    byte[] guidBytes = ProtectedData.Unprotect(Convert.FromBase64String(EncryptedId), Entropy, DataProtectionScope.CurrentUser);
-                    return new Guid(guidBytes);
-                }
-                catch (Exception e)
-                {
-                    _logger.LogTrace(e, "Could not load account id {Id}", EncryptedId);
-                    return null;
-                }
-            }
-            else if (Format == EFormat.Unencrypted)
-                return Guid.Parse(EncryptedId);
-            else if (Format == EFormat.ProtectedDataUnsupported && !ConfigurationData.SupportsDpapi)
-                return Guid.Parse(EncryptedId);
-            else
                 return null;
-        }
-
-        private (string encryptedId, byte[]? entropy, EFormat format) EncryptAccountId(Guid g)
-        {
-            if (!ConfigurationData.SupportsDpapi)
-                return (g.ToString(), null, EFormat.ProtectedDataUnsupported);
-            else
-            {
-                try
-                {
-                    byte[] entropy = RandomNumberGenerator.GetBytes(DefaultEntropyLength);
-                    byte[] guidBytes = ProtectedData.Protect(g.ToByteArray(), entropy, DataProtectionScope.CurrentUser);
-                    return (Convert.ToBase64String(guidBytes), entropy, EFormat.UseProtectedData);
-                }
-                catch (Exception)
-                {
-                    return (g.ToString(), null, EFormat.Unencrypted);
-                }
             }
         }
+        else if (Format == EFormat.Unencrypted)
+            return Guid.Parse(EncryptedId);
+        else if (Format == EFormat.ProtectedDataUnsupported && !ConfigurationData.SupportsDpapi)
+            return Guid.Parse(EncryptedId);
+        else
+            return null;
+    }
 
-        public bool EncryptIfNeeded()
+    private (string encryptedId, byte[]? entropy, EFormat format) EncryptAccountId(Guid g)
+    {
+        if (!ConfigurationData.SupportsDpapi)
+            return (g.ToString(), null, EFormat.ProtectedDataUnsupported);
+        else
         {
-            if (Format == EFormat.Unencrypted)
+            try
             {
-                var (newId, newEntropy, newFormat) = EncryptAccountId(Guid.Parse(EncryptedId));
+                byte[] entropy = RandomNumberGenerator.GetBytes(DefaultEntropyLength);
-                if (newFormat != EFormat.Unencrypted)
+                byte[] guidBytes = ProtectedData.Protect(g.ToByteArray(), entropy, DataProtectionScope.CurrentUser);
-                {
+                return (Convert.ToBase64String(guidBytes), entropy, EFormat.UseProtectedData);
-                    EncryptedId = newId;
-                    Entropy = newEntropy;
-                    Format = newFormat;
-                    return true;
-                }
             }
-            else if (Format == EFormat.UseProtectedData && Entropy is { Length: < DefaultEntropyLength })
+            catch (Exception)
             {
-                Guid? g = DecryptAccountId();
+                return (g.ToString(), null, EFormat.Unencrypted);
-                if (g != null)
-                {
-                    (EncryptedId, Entropy, Format) = EncryptAccountId(g.Value);
-                    return true;
-                }
             }
-
-            return false;
-        }
-
-        public enum EFormat
-        {
-            Unencrypted = 1,
-            UseProtectedData = 2,
-
-            /// <summary>
-            /// Used for filtering: We don't want to overwrite any entries of this value using DPAPI, ever.
-            /// This is mostly a wine fallback.
-            /// </summary>
-            ProtectedDataUnsupported = 3,
         }
     }
+
+    public bool EncryptIfNeeded()
+    {
+        if (Format == EFormat.Unencrypted)
+        {
+            var (newId, newEntropy, newFormat) = EncryptAccountId(Guid.Parse(EncryptedId));
+            if (newFormat != EFormat.Unencrypted)
+            {
+                EncryptedId = newId;
+                Entropy = newEntropy;
+                Format = newFormat;
+                return true;
+            }
+        }
+        else if (Format == EFormat.UseProtectedData && Entropy is { Length: < DefaultEntropyLength })
+        {
+            Guid? g = DecryptAccountId();
+            if (g != null)
+            {
+                (EncryptedId, Entropy, Format) = EncryptAccountId(g.Value);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public enum EFormat
+    {
+        Unencrypted = 1,
+        UseProtectedData = 2,
+
+        /// <summary>
+        /// Used for filtering: We don't want to overwrite any entries of this value using DPAPI, ever.
+        /// This is mostly a wine fallback.
+        /// </summary>
+        ProtectedDataUnsupported = 3,
+    }
 }

Pal.Client/Configuration/ConfigurationData.cs

@@ -3,42 +3,38 @@ using System.Linq;
 using System.Security.Cryptography;
 using Microsoft.Extensions.Logging;
 
-namespace Pal.Client.Configuration
+namespace Pal.Client.Configuration;
+
+internal static class ConfigurationData
 {
-    internal static class ConfigurationData
+    [Obsolete("for V1 import")]
+    internal static readonly byte[] FixedV1Entropy = { 0x22, 0x4b, 0xe7, 0x21, 0x44, 0x83, 0x69, 0x55, 0x80, 0x38 };
+
+    public const string ConfigFileName = "palace-pal.config.json";
+
+    private static bool? _supportsDpapi;
+
+    public static bool SupportsDpapi
     {
-        private static readonly ILogger _logger =
+        get
-            DependencyInjectionContext.LoggerProvider.CreateLogger(typeof(ConfigurationData));
-
-        [Obsolete("for V1 import")]
-        internal static readonly byte[] FixedV1Entropy = { 0x22, 0x4b, 0xe7, 0x21, 0x44, 0x83, 0x69, 0x55, 0x80, 0x38 };
-
-        public const string ConfigFileName = "palace-pal.config.json";
-
-        private static bool? _supportsDpapi = null;
-        public static bool SupportsDpapi
         {
-            get
+            if (_supportsDpapi == null)
             {
-                if (_supportsDpapi == null)
+                try
                 {
-                    try
+                    byte[] input = RandomNumberGenerator.GetBytes(32);
-                    {
+                    byte[] entropy = RandomNumberGenerator.GetBytes(16);
-                        byte[] input = RandomNumberGenerator.GetBytes(32);
+                    byte[] temp = ProtectedData.Protect(input, entropy, DataProtectionScope.CurrentUser);
-                        byte[] entropy = RandomNumberGenerator.GetBytes(16);
+                    byte[] output = ProtectedData.Unprotect(temp, entropy, DataProtectionScope.CurrentUser);
-                        byte[] temp = ProtectedData.Protect(input, entropy, DataProtectionScope.CurrentUser);
+                    _supportsDpapi = input.SequenceEqual(output);
-                        byte[] output = ProtectedData.Unprotect(temp, entropy, DataProtectionScope.CurrentUser);
+                }
-                        _supportsDpapi = input.SequenceEqual(output);
+                catch (Exception)
-                    }
+                {
-                    catch (Exception)
+                    _supportsDpapi = false;
-                    {
-                        _supportsDpapi = false;
-                    }
-
-                    _logger.LogTrace("DPAPI support: {Supported}", _supportsDpapi);
                 }
-                return _supportsDpapi.Value;
             }
+
+            return _supportsDpapi.Value;
         }
     }
 }

Pal.Client/Configuration/ConfigurationManager.cs

@@ -13,144 +13,158 @@ using Pal.Client.Configuration.Legacy;
 using Pal.Client.Database;
 using NJson = Newtonsoft.Json;
 
-namespace Pal.Client.Configuration
+namespace Pal.Client.Configuration;
+
+internal sealed class ConfigurationManager
 {
-    internal sealed class ConfigurationManager
+    private readonly ILogger<ConfigurationManager> _logger;
+    private readonly IDalamudPluginInterface _pluginInterface;
+    private readonly IServiceProvider _serviceProvider;
+
+    public event EventHandler<IPalacePalConfiguration>? Saved;
+
+    public ConfigurationManager(ILogger<ConfigurationManager> logger, IDalamudPluginInterface pluginInterface,
+        IServiceProvider serviceProvider)
     {
-        private readonly ILogger<ConfigurationManager> _logger;
+        _logger = logger;
-        private readonly DalamudPluginInterface _pluginInterface;
+        _pluginInterface = pluginInterface;
-        private readonly IServiceProvider _serviceProvider;
+        _serviceProvider = serviceProvider;
+    }
 
-        public event EventHandler<IPalacePalConfiguration>? Saved;
+    private string ConfigPath =>
+        Path.Join(_pluginInterface.GetPluginConfigDirectory(), ConfigurationData.ConfigFileName);
 
-        public ConfigurationManager(ILogger<ConfigurationManager> logger, DalamudPluginInterface pluginInterface,
+    public IPalacePalConfiguration Load()
-            IServiceProvider serviceProvider)
+    {
+        if (!File.Exists(ConfigPath))
         {
-            _logger = logger;
+            _logger.LogInformation("No config file exists, creating one");
-            _pluginInterface = pluginInterface;
+            Save(new ConfigurationV7(), false);
-            _serviceProvider = serviceProvider;
         }
 
-        private string ConfigPath =>
+        return JsonSerializer.Deserialize<ConfigurationV7>(File.ReadAllText(ConfigPath, Encoding.UTF8)) ??
-            Path.Join(_pluginInterface.GetPluginConfigDirectory(), ConfigurationData.ConfigFileName);
+               new ConfigurationV7();
+    }
 
-        public IPalacePalConfiguration Load()
+    public void Save(IConfigurationInConfigDirectory config, bool queue = true)
-        {
+    {
-            if (!File.Exists(ConfigPath))
+        File.WriteAllText(ConfigPath,
-            {
+            JsonSerializer.Serialize(config, config.GetType(),
-                _logger.LogInformation("No config file exists, creating one");
+                new JsonSerializerOptions
-                Save(new ConfigurationV7(), false);
+                { WriteIndented = true, Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping }),
-            }
+            Encoding.UTF8);
 
-            return JsonSerializer.Deserialize<ConfigurationV7>(File.ReadAllText(ConfigPath, Encoding.UTF8)) ??
+        if (queue && config is ConfigurationV7 v7)
-                   new ConfigurationV7();
+            Saved?.Invoke(this, v7);
-        }
+    }
-
-        public void Save(IConfigurationInConfigDirectory config, bool queue = true)
-        {
-            File.WriteAllText(ConfigPath,
-                JsonSerializer.Serialize(config, config.GetType(),
-                    new JsonSerializerOptions
-                    { WriteIndented = true, Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping }),
-                Encoding.UTF8);
-
-            if (queue && config is ConfigurationV7 v7)
-                Saved?.Invoke(this, v7);
-        }
 
 #pragma warning disable CS0612
 #pragma warning disable CS0618
-        public void Migrate()
+    public void Migrate()
+    {
+        if (_pluginInterface.ConfigFile.Exists)
         {
-            if (_pluginInterface.ConfigFile.Exists)
+            _logger.LogInformation("Migrating config file from v1-v6 format");
+
+            ConfigurationV1 configurationV1 =
+                NJson.JsonConvert.DeserializeObject<ConfigurationV1>(
+                    File.ReadAllText(_pluginInterface.ConfigFile.FullName)) ?? new ConfigurationV1();
+            configurationV1.Migrate(_pluginInterface,
+                _serviceProvider.GetRequiredService<ILogger<ConfigurationV1>>());
+            configurationV1.Save(_pluginInterface);
+
+            var v7 = MigrateToV7(configurationV1);
+            Save(v7, queue: false);
+
+            using (var scope = _serviceProvider.CreateScope())
             {
-                _logger.LogInformation("Migrating config file from v1-v6 format");
+                using var dbContext = scope.ServiceProvider.GetRequiredService<PalClientContext>();
+                dbContext.Imports.RemoveRange(dbContext.Imports);
 
-                ConfigurationV1 configurationV1 =
+                foreach (var importHistory in configurationV1.ImportHistory)
-                    NJson.JsonConvert.DeserializeObject<ConfigurationV1>(
-                        File.ReadAllText(_pluginInterface.ConfigFile.FullName)) ?? new ConfigurationV1();
-                configurationV1.Migrate(_pluginInterface,
-                    _serviceProvider.GetRequiredService<ILogger<ConfigurationV1>>());
-                configurationV1.Save(_pluginInterface);
-
-                var v7 = MigrateToV7(configurationV1);
-                Save(v7, queue: false);
-
-                using (var scope = _serviceProvider.CreateScope())
                 {
-                    using var dbContext = scope.ServiceProvider.GetRequiredService<PalClientContext>();
+                    _logger.LogInformation("Migrating import {Id}", importHistory.Id);
-                    dbContext.Imports.RemoveRange(dbContext.Imports);
+                    dbContext.Imports.Add(new ImportHistory
-
-                    foreach (var importHistory in configurationV1.ImportHistory)
                     {
-                        _logger.LogInformation("Migrating import {Id}", importHistory.Id);
+                        Id = importHistory.Id,
-                        dbContext.Imports.Add(new ImportHistory
+                        RemoteUrl = importHistory.RemoteUrl
-                        {
+                            ?.Replace(".μ.tv", ".liza.sh")
-                            Id = importHistory.Id,
+                            .Replace("pal.liza.sh", "connect.palacepal.com"),
-                            RemoteUrl = importHistory.RemoteUrl?.Replace(".μ.tv", ".liza.sh"),
+                        ExportedAt = importHistory.ExportedAt,
-                            ExportedAt = importHistory.ExportedAt,
+                        ImportedAt = importHistory.ImportedAt
-                            ImportedAt = importHistory.ImportedAt
+                    });
-                        });
-                    }
-
-                    dbContext.SaveChanges();
                 }
 
-                File.Move(_pluginInterface.ConfigFile.FullName, _pluginInterface.ConfigFile.FullName + ".old", true);
+                dbContext.SaveChanges();
             }
+
+            File.Move(_pluginInterface.ConfigFile.FullName, _pluginInterface.ConfigFile.FullName + ".old", true);
         }
 
-        private ConfigurationV7 MigrateToV7(ConfigurationV1 v1)
+        IPalacePalConfiguration? currentConfig = Load();
+        IAccountConfiguration? legacyAccount = currentConfig?.FindAccount("https://pal.liza.sh");
+        if (currentConfig != null && legacyAccount != null)
         {
-            ConfigurationV7 v7 = new()
+            IAccountConfiguration newAccount = currentConfig.CreateAccount("https://connect.palacepal.com", legacyAccount.AccountId);
-            {
+            newAccount.CachedRoles = legacyAccount.CachedRoles;
-                Version = 7,
-                FirstUse = v1.FirstUse,
-                Mode = v1.Mode,
-                BetaKey = v1.BetaKey,
 
-                DeepDungeons = new DeepDungeonConfiguration
+            currentConfig.RemoveAccount(legacyAccount.Server);
-                {
+            Save(currentConfig, false);
-                    Traps = new MarkerConfiguration
-                    {
-                        Show = v1.ShowTraps,
-                        Color = ImGui.ColorConvertFloat4ToU32(v1.TrapColor),
-                        OnlyVisibleAfterPomander = v1.OnlyVisibleTrapsAfterPomander,
-                        Fill = false
-                    },
-                    HoardCoffers = new MarkerConfiguration
-                    {
-                        Show = v1.ShowHoard,
-                        Color = ImGui.ColorConvertFloat4ToU32(v1.HoardColor),
-                        OnlyVisibleAfterPomander = v1.OnlyVisibleHoardAfterPomander,
-                        Fill = false
-                    },
-                    SilverCoffers = new MarkerConfiguration
-                    {
-                        Show = v1.ShowSilverCoffers,
-                        Color = ImGui.ColorConvertFloat4ToU32(v1.SilverCofferColor),
-                        OnlyVisibleAfterPomander = false,
-                        Fill = v1.FillSilverCoffers
-                    }
-                }
-            };
-
-            foreach (var (server, oldAccount) in v1.Accounts)
-            {
-                string? accountId = oldAccount.Id;
-                if (string.IsNullOrEmpty(accountId))
-                    continue;
-
-                string serverName = server.Replace(".μ.tv", ".liza.sh");
-                IAccountConfiguration newAccount = v7.CreateAccount(serverName, accountId);
-                newAccount.CachedRoles = oldAccount.CachedRoles.ToList();
-            }
-
-            // TODO Migrate ImportHistory
-
-            return v7;
         }
+    }
+
+    private ConfigurationV7 MigrateToV7(ConfigurationV1 v1)
+    {
+        ConfigurationV7 v7 = new()
+        {
+            Version = 7,
+            FirstUse = v1.FirstUse,
+            Mode = v1.Mode,
+            BetaKey = v1.BetaKey,
+
+            DeepDungeons = new DeepDungeonConfiguration
+            {
+                Traps = new MarkerConfiguration
+                {
+                    Show = v1.ShowTraps,
+                    Color = ImGui.ColorConvertFloat4ToU32(v1.TrapColor),
+                    OnlyVisibleAfterPomander = v1.OnlyVisibleTrapsAfterPomander,
+                    Fill = false
+                },
+                HoardCoffers = new MarkerConfiguration
+                {
+                    Show = v1.ShowHoard,
+                    Color = ImGui.ColorConvertFloat4ToU32(v1.HoardColor),
+                    OnlyVisibleAfterPomander = v1.OnlyVisibleHoardAfterPomander,
+                    Fill = false
+                },
+                SilverCoffers = new MarkerConfiguration
+                {
+                    Show = v1.ShowSilverCoffers,
+                    Color = ImGui.ColorConvertFloat4ToU32(v1.SilverCofferColor),
+                    OnlyVisibleAfterPomander = false,
+                    Fill = v1.FillSilverCoffers
+                }
+            }
+        };
+
+        foreach (var (server, oldAccount) in v1.Accounts)
+        {
+            string? accountId = oldAccount.Id;
+            if (string.IsNullOrEmpty(accountId))
+                continue;
+
+            string serverName = server
+                .Replace(".μ.tv", ".liza.sh")
+                .Replace("pal.liza.sh", "connect.palacepal.com");
+            IAccountConfiguration newAccount = v7.CreateAccount(serverName, accountId);
+            newAccount.CachedRoles = oldAccount.CachedRoles.ToList();
+        }
+
+        // TODO Migrate ImportHistory
+
+        return v7;
+    }
 #pragma warning restore CS0618
 #pragma warning restore CS0612
-    }
 }

Pal.Client/Configuration/ConfigurationV7.cs

@@ -2,53 +2,52 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Pal.Client.Configuration
+namespace Pal.Client.Configuration;
+
+public sealed class ConfigurationV7 : IPalacePalConfiguration, IConfigurationInConfigDirectory
 {
-    public sealed class ConfigurationV7 : IPalacePalConfiguration, IConfigurationInConfigDirectory
+    public int Version { get; set; } = 7;
+
+    public bool FirstUse { get; set; } = true;
+    public EMode Mode { get; set; }
+    public string BetaKey { get; init; } = "";
+
+    public DeepDungeonConfiguration DeepDungeons { get; set; } = new();
+    public RendererConfiguration Renderer { get; set; } = new();
+    public List<AccountConfigurationV7> Accounts { get; set; } = new();
+    public BackupConfiguration Backups { get; set; } = new();
+
+    public IAccountConfiguration CreateAccount(string server, Guid accountId)
     {
-        public int Version { get; set; } = 7;
+        var account = new AccountConfigurationV7(server, accountId);
+        Accounts.Add(account);
+        return account;
+    }
 
-        public bool FirstUse { get; set; } = true;
+    [Obsolete("for V1 import")]
-        public EMode Mode { get; set; }
+    internal IAccountConfiguration CreateAccount(string server, string accountId)
-        public string BetaKey { get; init; } = "";
+    {
+        var account = new AccountConfigurationV7(server, accountId);
+        Accounts.Add(account);
+        return account;
+    }
 
-        public DeepDungeonConfiguration DeepDungeons { get; set; } = new();
+    public IAccountConfiguration? FindAccount(string server)
-        public RendererConfiguration Renderer { get; set; } = new();
+    {
-        public List<AccountConfigurationV7> Accounts { get; set; } = new();
+        return Accounts.FirstOrDefault(a => a.Server == server && a.IsUsable);
-        public BackupConfiguration Backups { get; set; } = new();
+    }
 
-        public IAccountConfiguration CreateAccount(string server, Guid accountId)
+    public void RemoveAccount(string server)
-        {
+    {
-            var account = new AccountConfigurationV7(server, accountId);
+        Accounts.RemoveAll(a => a.Server == server && a.IsUsable);
-            Accounts.Add(account);
+    }
-            return account;
-        }
 
-        [Obsolete("for V1 import")]
+    public bool HasRoleOnCurrentServer(string server, string role)
-        internal IAccountConfiguration CreateAccount(string server, string accountId)
+    {
-        {
+        if (Mode != EMode.Online)
-            var account = new AccountConfigurationV7(server, accountId);
+            return false;
-            Accounts.Add(account);
-            return account;
-        }
 
-        public IAccountConfiguration? FindAccount(string server)
+        var account = FindAccount(server);
-        {
+        return account == null || account.CachedRoles.Contains(role);
-            return Accounts.FirstOrDefault(a => a.Server == server && a.IsUsable);
-        }
-
-        public void RemoveAccount(string server)
-        {
-            Accounts.RemoveAll(a => a.Server == server && a.IsUsable);
-        }
-
-        public bool HasRoleOnCurrentServer(string server, string role)
-        {
-            if (Mode != EMode.Online)
-                return false;
-
-            var account = FindAccount(server);
-            return account == null || account.CachedRoles.Contains(role);
-        }
     }
 }

Pal.Client/Configuration/EMode.cs

@@ -1,15 +1,14 @@
-namespace Pal.Client.Configuration
+namespace Pal.Client.Configuration;
-{
-    public enum EMode
-    {
-        /// <summary>
-        /// Fetches trap locations from remote server.
-        /// </summary>
-        Online = 1,
 
-        /// <summary>
+public enum EMode
-        /// Only shows traps found by yourself uisng a pomander of sight.
+{
-        /// </summary>
+    /// <summary>
-        Offline = 2,
+    /// Fetches trap locations from remote server.
-    }
+    /// </summary>
+    Online = 1,
+
+    /// <summary>
+    /// Only shows traps found by yourself using a pomander of sight.
+    /// </summary>
+    Offline = 2,
 }

Pal.Client/Configuration/ERenderer.cs

@@ -1,11 +1,10 @@
-namespace Pal.Client.Configuration
+namespace Pal.Client.Configuration;
-{
-    public enum ERenderer
-    {
-        /// <see cref="Rendering.SimpleRenderer"/>
-        Simple = 0,
 
-        /// <see cref="Rendering.SplatoonRenderer"/>
+public enum ERenderer
-        Splatoon = 1,
+{
-    }
+    /// <see cref="Rendering.SimpleRenderer"/>
+    Simple = 0,
+
+    /// <see cref="Rendering.SplatoonRenderer"/>
+    Splatoon = 1,
 }

Pal.Client/Configuration/IPalacePalConfiguration.cs

@@ -4,99 +4,107 @@ using System.Numerics;
 using ImGuiNET;
 using Newtonsoft.Json;
 
-namespace Pal.Client.Configuration
+namespace Pal.Client.Configuration;
+
+public interface IVersioned
 {
-    public interface IVersioned
+    int Version { get; set; }
-    {
+}
-        int Version { get; set; }
+public interface IConfigurationInConfigDirectory : IVersioned
-    }
+{
-    public interface IConfigurationInConfigDirectory : IVersioned
+}
-    {
+
-    }
+public interface IPalacePalConfiguration : IConfigurationInConfigDirectory
-
+{
-    public interface IPalacePalConfiguration : IConfigurationInConfigDirectory
+    bool FirstUse { get; set; }
-    {
+    EMode Mode { get; set; }
-        bool FirstUse { get; set; }
+    string BetaKey { get; }
-        EMode Mode { get; set; }
+    bool HasBetaFeature(string feature) => BetaKey.Contains(feature);
-        string BetaKey { get; }
+
-
+    DeepDungeonConfiguration DeepDungeons { get; set; }
-        DeepDungeonConfiguration DeepDungeons { get; set; }
+    RendererConfiguration Renderer { get; set; }
-        RendererConfiguration Renderer { get; set; }
+    BackupConfiguration Backups { get; set; }
-        BackupConfiguration Backups { get; set; }
+
-
+    IAccountConfiguration CreateAccount(string server, Guid accountId);
-        IAccountConfiguration CreateAccount(string server, Guid accountId);
+    IAccountConfiguration? FindAccount(string server);
-        IAccountConfiguration? FindAccount(string server);
+    void RemoveAccount(string server);
-        void RemoveAccount(string server);
+
-
+    bool HasRoleOnCurrentServer(string server, string role);
-        bool HasRoleOnCurrentServer(string server, string role);
+}
-    }
+
-
+public class DeepDungeonConfiguration
-    public class DeepDungeonConfiguration
+{
-    {
+    public MarkerConfiguration Traps { get; set; } = new()
-        public MarkerConfiguration Traps { get; set; } = new()
+    {
-        {
+        Show = true,
-            Show = true,
+        Color = ImGui.ColorConvertFloat4ToU32(new Vector4(1, 0, 0, 0.4f)),
-            Color = ImGui.ColorConvertFloat4ToU32(new Vector4(1, 0, 0, 0.4f)),
+        OnlyVisibleAfterPomander = true,
-            OnlyVisibleAfterPomander = true,
+        Fill = false
-            Fill = false
+    };
-        };
+
-
+    public MarkerConfiguration HoardCoffers { get; set; } = new()
-        public MarkerConfiguration HoardCoffers { get; set; } = new()
+    {
-        {
+        Show = true,
-            Show = true,
+        Color = ImGui.ColorConvertFloat4ToU32(new Vector4(0, 1, 1, 0.4f)),
-            Color = ImGui.ColorConvertFloat4ToU32(new Vector4(0, 1, 1, 0.4f)),
+        OnlyVisibleAfterPomander = true,
-            OnlyVisibleAfterPomander = true,
+        Fill = false
-            Fill = false
+    };
-        };
+
-
+    public MarkerConfiguration SilverCoffers { get; set; } = new()
-        public MarkerConfiguration SilverCoffers { get; set; } = new()
+    {
-        {
+        Show = false,
-            Show = false,
+        Color = ImGui.ColorConvertFloat4ToU32(new Vector4(1, 1, 1, 0.4f)),
-            Color = ImGui.ColorConvertFloat4ToU32(new Vector4(1, 1, 1, 0.4f)),
+        OnlyVisibleAfterPomander = false,
-            OnlyVisibleAfterPomander = false,
+        Fill = true
-            Fill = true
+    };
-        };
+
-    }
+    public MarkerConfiguration GoldCoffers { get; set; } = new()
-
+    {
-    public class MarkerConfiguration
+        Show = false,
-    {
+        Color = ImGui.ColorConvertFloat4ToU32(new Vector4(1, 1, 0, 0.4f)),
-        [JsonRequired]
+        OnlyVisibleAfterPomander = false,
-        public bool Show { get; set; }
+        Fill = true
-
+    };
-        [JsonRequired]
+}
-        public uint Color { get; set; }
+
-
+public class MarkerConfiguration
-        public bool OnlyVisibleAfterPomander { get; set; }
+{
-        public bool Fill { get; set; }
+    [JsonRequired]
-    }
+    public bool Show { get; set; }
-
+
-    public class RendererConfiguration
+    [JsonRequired]
-    {
+    public uint Color { get; set; }
-        public ERenderer SelectedRenderer { get; set; } = ERenderer.Splatoon;
+
-    }
+    public bool OnlyVisibleAfterPomander { get; set; }
-
+    public bool Fill { get; set; }
-    public interface IAccountConfiguration
+}
-    {
+
-        bool IsUsable { get; }
+public class RendererConfiguration
-        string Server { get; }
+{
-        Guid AccountId { get; }
+    public ERenderer SelectedRenderer { get; set; } = ERenderer.Splatoon;
-
+}
-        /// <summary>
+
-        /// This is taken from the JWT, and is only refreshed on a successful login.
+public interface IAccountConfiguration
-        ///
+{
-        /// If you simply reload the plugin without any server interaction, this doesn't change.
+    bool IsUsable { get; }
-        ///
+    string Server { get; }
-        /// This has no impact on what roles the JWT actually contains, but is just to make it
+    Guid AccountId { get; }
-        /// easier to draw a consistent UI. The server will still reject unauthorized calls.
+
-        /// </summary>
+    /// <summary>
-        List<string> CachedRoles { get; set; }
+    /// This is taken from the JWT, and is only refreshed on a successful login.
-
+    ///
-        bool EncryptIfNeeded();
+    /// If you simply reload the plugin without any server interaction, this doesn't change.
-    }
+    ///
-
+    /// This has no impact on what roles the JWT actually contains, but is just to make it
-    public class BackupConfiguration
+    /// easier to draw a consistent UI. The server will still reject unauthorized calls.
-    {
+    /// </summary>
-        public int MinimumBackupsToKeep { get; set; } = 3;
+    List<string> CachedRoles { get; set; }
-        public int DaysToDeleteAfter { get; set; } = 21;
+
-    }
+    bool EncryptIfNeeded();
+}
+
+public class BackupConfiguration
+{
+    public int MinimumBackupsToKeep { get; set; } = 3;
+    public int DaysToDeleteAfter { get; set; } = 21;
 }

Pal.Client/Configuration/Legacy/ConfigurationV1.cs

@@ -8,160 +8,159 @@ using Dalamud.Plugin;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 
-namespace Pal.Client.Configuration.Legacy
+namespace Pal.Client.Configuration.Legacy;
+
+[Obsolete]
+public sealed class ConfigurationV1
 {
+    public int Version { get; set; } = 6;
+
+    #region Saved configuration values
+    public bool FirstUse { get; set; } = true;
+    public EMode Mode { get; set; } = EMode.Offline;
+    public ERenderer Renderer { get; set; } = ERenderer.Splatoon;
+
     [Obsolete]
-    public sealed class ConfigurationV1
+    public string? DebugAccountId { private get; set; }
+
+    [Obsolete]
+    public string? AccountId { private get; set; }
+
+    [Obsolete]
+    public Dictionary<string, Guid> AccountIds { private get; set; } = new();
+    public Dictionary<string, AccountInfo> Accounts { get; set; } = new();
+
+    public List<ImportHistoryEntry> ImportHistory { get; set; } = new();
+
+    public bool ShowTraps { get; set; } = true;
+    public Vector4 TrapColor { get; set; } = new(1, 0, 0, 0.4f);
+    public bool OnlyVisibleTrapsAfterPomander { get; set; } = true;
+
+    public bool ShowHoard { get; set; } = true;
+    public Vector4 HoardColor { get; set; } = new(0, 1, 1, 0.4f);
+    public bool OnlyVisibleHoardAfterPomander { get; set; } = true;
+
+    public bool ShowSilverCoffers { get; set; }
+    public Vector4 SilverCofferColor { get; set; } = new(1, 1, 1, 0.4f);
+    public bool FillSilverCoffers { get; set; } = true;
+
+    /// <summary>
+    /// Needs to be manually set.
+    /// </summary>
+    public string BetaKey { get; set; } = "";
+    #endregion
+
+    public void Migrate(IDalamudPluginInterface pluginInterface, ILogger<ConfigurationV1> logger)
     {
-        public int Version { get; set; } = 6;
+        if (Version == 1)
-
-        #region Saved configuration values
-        public bool FirstUse { get; set; } = true;
-        public EMode Mode { get; set; } = EMode.Offline;
-        public ERenderer Renderer { get; set; } = ERenderer.Splatoon;
-
-        [Obsolete]
-        public string? DebugAccountId { private get; set; }
-
-        [Obsolete]
-        public string? AccountId { private get; set; }
-
-        [Obsolete]
-        public Dictionary<string, Guid> AccountIds { private get; set; } = new();
-        public Dictionary<string, AccountInfo> Accounts { get; set; } = new();
-
-        public List<ImportHistoryEntry> ImportHistory { get; set; } = new();
-
-        public bool ShowTraps { get; set; } = true;
-        public Vector4 TrapColor { get; set; } = new(1, 0, 0, 0.4f);
-        public bool OnlyVisibleTrapsAfterPomander { get; set; } = true;
-
-        public bool ShowHoard { get; set; } = true;
-        public Vector4 HoardColor { get; set; } = new(0, 1, 1, 0.4f);
-        public bool OnlyVisibleHoardAfterPomander { get; set; } = true;
-
-        public bool ShowSilverCoffers { get; set; }
-        public Vector4 SilverCofferColor { get; set; } = new(1, 1, 1, 0.4f);
-        public bool FillSilverCoffers { get; set; } = true;
-
-        /// <summary>
-        /// Needs to be manually set.
-        /// </summary>
-        public string BetaKey { get; set; } = "";
-        #endregion
-
-        public void Migrate(DalamudPluginInterface pluginInterface, ILogger<ConfigurationV1> logger)
         {
-            if (Version == 1)
+            logger.LogInformation("Updating config to version 2");
+
+            if (DebugAccountId != null && Guid.TryParse(DebugAccountId, out Guid debugAccountId))
+                AccountIds["http://localhost:5145"] = debugAccountId;
+
+            if (AccountId != null && Guid.TryParse(AccountId, out Guid accountId))
+                AccountIds["https://pal.μ.tv"] = accountId;
+
+            Version = 2;
+            Save(pluginInterface);
+        }
+
+        if (Version == 2)
+        {
+            logger.LogInformation("Updating config to version 3");
+
+            Accounts = AccountIds.ToDictionary(x => x.Key, x => new AccountInfo
             {
-                logger.LogInformation("Updating config to version 2");
+                Id = x.Value.ToString() // encryption happens in V7 migration at latest
+            });
+            Version = 3;
+            Save(pluginInterface);
+        }
 
-                if (DebugAccountId != null && Guid.TryParse(DebugAccountId, out Guid debugAccountId))
+        if (Version == 3)
-                    AccountIds["http://localhost:5145"] = debugAccountId;
+        {
+            Version = 4;
+            Save(pluginInterface);
+        }
 
-                if (AccountId != null && Guid.TryParse(AccountId, out Guid accountId))
+        if (Version == 4)
-                    AccountIds["https://pal.μ.tv"] = accountId;
+        {
-
+            // 2.2 had a bug that would mark chests as traps, there's no easy way to detect this -- or clean this up.
-                Version = 2;
+            // Not a problem for online players, but offline players might be fucked.
-                Save(pluginInterface);
+            //bool changedAnyFile = false;
-            }
+            JsonFloorState.ForEach(s =>
-
-            if (Version == 2)
             {
-                logger.LogInformation("Updating config to version 3");
+                foreach (var marker in s.Markers)
+                    marker.SinceVersion = "0.0";
 
-                Accounts = AccountIds.ToDictionary(x => x.Key, x => new AccountInfo
+                var lastModified = File.GetLastWriteTimeUtc(s.GetSaveLocation());
+                if (lastModified >= new DateTime(2023, 2, 3, 0, 0, 0, DateTimeKind.Utc))
                 {
-                    Id = x.Value.ToString() // encryption happens in V7 migration at latest
+                    s.Backup(suffix: "bak");
-                });
-                Version = 3;
-                Save(pluginInterface);
-            }
 
-            if (Version == 3)
+                    s.Markers = new ConcurrentBag<JsonMarker>(s.Markers.Where(m => m.SinceVersion != "0.0" || m.Type == JsonMarker.EType.Hoard || m.WasImported));
-            {
+                    s.Save();
-                Version = 4;
-                Save(pluginInterface);
-            }
 
-            if (Version == 4)
+                    //changedAnyFile = true;
-            {
-                // 2.2 had a bug that would mark chests as traps, there's no easy way to detect this -- or clean this up.
-                // Not a problem for online players, but offline players might be fucked.
-                //bool changedAnyFile = false;
-                JsonFloorState.ForEach(s =>
-                {
-                    foreach (var marker in s.Markers)
-                        marker.SinceVersion = "0.0";
-
-                    var lastModified = File.GetLastWriteTimeUtc(s.GetSaveLocation());
-                    if (lastModified >= new DateTime(2023, 2, 3, 0, 0, 0, DateTimeKind.Utc))
-                    {
-                        s.Backup(suffix: "bak");
-
-                        s.Markers = new ConcurrentBag<JsonMarker>(s.Markers.Where(m => m.SinceVersion != "0.0" || m.Type == JsonMarker.EType.Hoard || m.WasImported));
-                        s.Save();
-
-                        //changedAnyFile = true;
-                    }
-                    else
-                    {
-                        // just add version information, nothing else
-                        s.Save();
-                    }
-                });
-
-                /*
-                // Only notify offline users - we can just re-download the backup markers from the server seamlessly.
-                if (Mode == EMode.Offline && changedAnyFile)
-                {
-                    _ = new TickScheduler(delegate
-                    {
-                        Service.Chat.PalError("Due to a bug, some coffers were accidentally saved as traps. To fix the related display issue, locally cached data was cleaned up.");
-                        Service.Chat.PrintError($"If you have any backup tools installed, please restore the contents of '{Service.PluginInterface.GetPluginConfigDirectory()}' to any backup from February 2, 2023 or before.");
-                        Service.Chat.PrintError("You can also manually restore .json.bak files (by removing the '.bak') if you have not been in any deep dungeon since February 2, 2023.");
-                    }, 2500);
                 }
-                */
+                else
+                {
+                    // just add version information, nothing else
+                    s.Save();
+                }
+            });
 
-                Version = 5;
+            /*
-                Save(pluginInterface);
+            // Only notify offline users - we can just re-download the backup markers from the server seamlessly.
-            }
+            if (Mode == EMode.Offline && changedAnyFile)
-
-            if (Version == 5)
             {
-                JsonFloorState.UpdateAll();
+                _ = new TickScheduler(delegate
-
+                {
-                Version = 6;
+                    Service.Chat.PalError("Due to a bug, some coffers were accidentally saved as traps. To fix the related display issue, locally cached data was cleaned up.");
-                Save(pluginInterface);
+                    Service.Chat.PrintError($"If you have any backup tools installed, please restore the contents of '{Service.PluginInterface.GetPluginConfigDirectory()}' to any backup from February 2, 2023 or before.");
+                    Service.Chat.PrintError("You can also manually restore .json.bak files (by removing the '.bak') if you have not been in any deep dungeon since February 2, 2023.");
+                }, 2500);
             }
+            */
+
+            Version = 5;
+            Save(pluginInterface);
         }
 
-        public void Save(DalamudPluginInterface pluginInterface)
+        if (Version == 5)
         {
-            File.WriteAllText(pluginInterface.ConfigFile.FullName, JsonConvert.SerializeObject(this, Formatting.Indented, new JsonSerializerSettings
+            JsonFloorState.UpdateAll();
-            {
-                TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple,
-                TypeNameHandling = TypeNameHandling.Objects
-            }));
-        }
 
-        public sealed class AccountInfo
+            Version = 6;
-        {
+            Save(pluginInterface);
-            public string? Id { get; set; }
-            public List<string> CachedRoles { get; set; } = new();
-        }
-
-        public sealed class ImportHistoryEntry
-        {
-            public Guid Id { get; set; }
-            public string? RemoteUrl { get; set; }
-            public DateTime ExportedAt { get; set; }
-
-            /// <summary>
-            /// Set when the file is imported locally.
-            /// </summary>
-            public DateTime ImportedAt { get; set; }
         }
     }
+
+    public void Save(IDalamudPluginInterface pluginInterface)
+    {
+        File.WriteAllText(pluginInterface.ConfigFile.FullName, JsonConvert.SerializeObject(this, Formatting.Indented, new JsonSerializerSettings
+        {
+            TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple,
+            TypeNameHandling = TypeNameHandling.Objects
+        }));
+    }
+
+    public sealed class AccountInfo
+    {
+        public string? Id { get; set; }
+        public List<string> CachedRoles { get; set; } = new();
+    }
+
+    public sealed class ImportHistoryEntry
+    {
+        public Guid Id { get; set; }
+        public string? RemoteUrl { get; set; }
+        public DateTime ExportedAt { get; set; }
+
+        /// <summary>
+        /// Set when the file is imported locally.
+        /// </summary>
+        public DateTime ImportedAt { get; set; }
+    }
 }

Pal.Client/Configuration/Legacy/JsonFloorState.cs

@@ -7,162 +7,155 @@ using System.Text.Json;
 using Pal.Client.Extensions;
 using Pal.Common;
 
-namespace Pal.Client.Configuration.Legacy
+namespace Pal.Client.Configuration.Legacy;
+
+/// <summary>
+/// Legacy JSON file for marker locations.
+/// </summary>
+[Obsolete]
+public sealed class JsonFloorState
 {
-    /// <summary>
+    private static readonly JsonSerializerOptions JsonSerializerOptions = new() { IncludeFields = true };
-    /// Legacy JSON file for marker locations.
+    private const int CurrentVersion = 4;
-    /// </summary>
+
-    [Obsolete]
+    private static string _pluginConfigDirectory = null!;
-    public sealed class JsonFloorState
+
+    internal static void SetContextProperties(string pluginConfigDirectory)
     {
-        private static readonly JsonSerializerOptions JsonSerializerOptions = new() { IncludeFields = true };
+        _pluginConfigDirectory = pluginConfigDirectory;
-        private const int CurrentVersion = 4;
+    }
 
-        private static string _pluginConfigDirectory = null!;
+    public ushort TerritoryType { get; set; }
-        private static readonly EMode _mode = EMode.Online; // might not be true, but this is 'less strict filtering' for migrations
+    public ConcurrentBag<JsonMarker> Markers { get; set; } = new();
 
-        internal static void SetContextProperties(string pluginConfigDirectory)
+    public JsonFloorState(ushort territoryType)
+    {
+        TerritoryType = territoryType;
+    }
+
+    private void ApplyFilters()
+    {
+        Markers = new ConcurrentBag<JsonMarker>(Markers.Where(x => x.Seen || !x.WasImported || x.Imports.Count > 0));
+    }
+
+    public static JsonFloorState? Load(ushort territoryType)
+    {
+        string path = GetSaveLocation(territoryType);
+        if (!File.Exists(path))
+            return null;
+
+        string content = File.ReadAllText(path);
+        if (content.Length == 0)
+            return null;
+
+        JsonFloorState localState;
+        int version = 1;
+        if (content[0] == '[')
         {
-            _pluginConfigDirectory = pluginConfigDirectory;
+            // v1 only had a list of markers, not a JSON object as root
+            localState = new JsonFloorState(territoryType)
+            {
+                Markers = new ConcurrentBag<JsonMarker>(JsonSerializer.Deserialize<HashSet<JsonMarker>>(content, JsonSerializerOptions) ?? new()),
+            };
         }
-
+        else
-        public ushort TerritoryType { get; set; }
-        public ConcurrentBag<JsonMarker> Markers { get; set; } = new();
-
-        public JsonFloorState(ushort territoryType)
         {
-            TerritoryType = territoryType;
+            var save = JsonSerializer.Deserialize<SaveFile>(content, JsonSerializerOptions);
-        }
+            if (save == null)
-
-        private void ApplyFilters()
-        {
-            if (_mode == EMode.Offline)
-                Markers = new ConcurrentBag<JsonMarker>(Markers.Where(x => x.Seen || (x.WasImported && x.Imports.Count > 0)));
-            else
-                // ensure old import markers are removed if they are no longer part of a "current" import
-                // this MAY remove markers the server sent you (and that you haven't seen), but this should be fixed the next time you enter the zone
-                Markers = new ConcurrentBag<JsonMarker>(Markers.Where(x => x.Seen || !x.WasImported || x.Imports.Count > 0));
-        }
-
-        public static JsonFloorState? Load(ushort territoryType)
-        {
-            string path = GetSaveLocation(territoryType);
-            if (!File.Exists(path))
                 return null;
 
-            string content = File.ReadAllText(path);
+            localState = new JsonFloorState(territoryType)
-            if (content.Length == 0)
-                return null;
-
-            JsonFloorState localState;
-            int version = 1;
-            if (content[0] == '[')
             {
-                // v1 only had a list of markers, not a JSON object as root
+                Markers = new ConcurrentBag<JsonMarker>(save.Markers.Where(o => o.Type == JsonMarker.EType.Trap || o.Type == JsonMarker.EType.Hoard)),
-                localState = new JsonFloorState(territoryType)
+            };
-                {
+            version = save.Version;
-                    Markers = new ConcurrentBag<JsonMarker>(JsonSerializer.Deserialize<HashSet<JsonMarker>>(content, JsonSerializerOptions) ?? new()),
-                };
-            }
-            else
-            {
-                var save = JsonSerializer.Deserialize<SaveFile>(content, JsonSerializerOptions);
-                if (save == null)
-                    return null;
-
-                localState = new JsonFloorState(territoryType)
-                {
-                    Markers = new ConcurrentBag<JsonMarker>(save.Markers.Where(o => o.Type == JsonMarker.EType.Trap || o.Type == JsonMarker.EType.Hoard)),
-                };
-                version = save.Version;
-            }
-
-            localState.ApplyFilters();
-
-            if (version <= 3)
-            {
-                foreach (var marker in localState.Markers)
-                    marker.RemoteSeenOn = marker.RemoteSeenOn.Select(x => x.ToPartialId()).ToList();
-            }
-
-            if (version < CurrentVersion)
-                localState.Save();
-
-            return localState;
         }
 
-        public void Save()
+        localState.ApplyFilters();
-        {
-            string path = GetSaveLocation(TerritoryType);
 
-            ApplyFilters();
+        if (version <= 3)
+        {
+            foreach (var marker in localState.Markers)
+                marker.RemoteSeenOn = marker.RemoteSeenOn.Select(x => x.ToPartialId()).ToList();
+        }
+
+        if (version < CurrentVersion)
+            localState.Save();
+
+        return localState;
+    }
+
+    public void Save()
+    {
+        string path = GetSaveLocation(TerritoryType);
+
+        ApplyFilters();
+        SaveImpl(path);
+    }
+
+    public void Backup(string suffix)
+    {
+        string path = $"{GetSaveLocation(TerritoryType)}.{suffix}";
+        if (!File.Exists(path))
+        {
             SaveImpl(path);
         }
+    }
 
-        public void Backup(string suffix)
+    private void SaveImpl(string path)
+    {
+        foreach (var marker in Markers)
         {
-            string path = $"{GetSaveLocation(TerritoryType)}.{suffix}";
+            if (string.IsNullOrEmpty(marker.SinceVersion))
-            if (!File.Exists(path))
+                marker.SinceVersion = typeof(Plugin).Assembly.GetName().Version!.ToString(2);
+        }
+
+        if (Markers.Count == 0)
+            File.Delete(path);
+        else
+        {
+            File.WriteAllText(path, JsonSerializer.Serialize(new SaveFile
             {
-                SaveImpl(path);
+                Version = CurrentVersion,
-            }
+                Markers = new HashSet<JsonMarker>(Markers)
-        }
+            }, JsonSerializerOptions));
-
-        private void SaveImpl(string path)
-        {
-            foreach (var marker in Markers)
-            {
-                if (string.IsNullOrEmpty(marker.SinceVersion))
-                    marker.SinceVersion = typeof(Plugin).Assembly.GetName().Version!.ToString(2);
-            }
-
-            if (Markers.Count == 0)
-                File.Delete(path);
-            else
-            {
-                File.WriteAllText(path, JsonSerializer.Serialize(new SaveFile
-                {
-                    Version = CurrentVersion,
-                    Markers = new HashSet<JsonMarker>(Markers)
-                }, JsonSerializerOptions));
-            }
-        }
-
-        public string GetSaveLocation() => GetSaveLocation(TerritoryType);
-
-        private static string GetSaveLocation(uint territoryType) => Path.Join(_pluginConfigDirectory, $"{territoryType}.json");
-
-        public static void ForEach(Action<JsonFloorState> action)
-        {
-            foreach (ETerritoryType territory in typeof(ETerritoryType).GetEnumValues())
-            {
-                // we never had markers for eureka orthos, so don't bother
-                if (territory > ETerritoryType.HeavenOnHigh_91_100)
-                    break;
-
-                JsonFloorState? localState = Load((ushort)territory);
-                if (localState != null)
-                    action(localState);
-            }
-        }
-
-        public static void UpdateAll()
-        {
-            ForEach(s => s.Save());
-        }
-
-        public void UndoImport(List<Guid> importIds)
-        {
-            // When saving a floor state, any markers not seen, not remote seen, and not having an import id are removed;
-            // so it is possible to remove "wrong" markers by not having them be in the current import.
-            foreach (var marker in Markers)
-                marker.Imports.RemoveAll(importIds.Contains);
-        }
-
-        public sealed class SaveFile
-        {
-            public int Version { get; set; }
-            public HashSet<JsonMarker> Markers { get; set; } = new();
         }
     }
+
+    public string GetSaveLocation() => GetSaveLocation(TerritoryType);
+
+    private static string GetSaveLocation(uint territoryType) => Path.Join(_pluginConfigDirectory, $"{territoryType}.json");
+
+    public static void ForEach(Action<JsonFloorState> action)
+    {
+        foreach (ETerritoryType territory in typeof(ETerritoryType).GetEnumValues())
+        {
+            // we never had markers for eureka orthos, so don't bother
+            if (territory > ETerritoryType.HeavenOnHigh_91_100)
+                break;
+
+            JsonFloorState? localState = Load((ushort)territory);
+            if (localState != null)
+                action(localState);
+        }
+    }
+
+    public static void UpdateAll()
+    {
+        ForEach(s => s.Save());
+    }
+
+    public void UndoImport(List<Guid> importIds)
+    {
+        // When saving a floor state, any markers not seen, not remote seen, and not having an import id are removed;
+        // so it is possible to remove "wrong" markers by not having them be in the current import.
+        foreach (var marker in Markers)
+            marker.Imports.RemoveAll(importIds.Contains);
+    }
+
+    public sealed class SaveFile
+    {
+        public int Version { get; set; }
+        public HashSet<JsonMarker> Markers { get; set; } = new();
+    }
 }

Pal.Client/Configuration/Legacy/JsonMarker.cs

@@ -2,25 +2,24 @@
 using System.Collections.Generic;
 using System.Numerics;
 
-namespace Pal.Client.Configuration.Legacy
+namespace Pal.Client.Configuration.Legacy;
-{
-    [Obsolete]
-    public class JsonMarker
-    {
-        public EType Type { get; set; } = EType.Unknown;
-        public Vector3 Position { get; set; }
-        public bool Seen { get; set; }
-        public List<string> RemoteSeenOn { get; set; } = new();
-        public List<Guid> Imports { get; set; } = new();
-        public bool WasImported { get; set; }
-        public string? SinceVersion { get; set; }
 
-        public enum EType
+[Obsolete]
-        {
+public class JsonMarker
-            Unknown = 0,
+{
-            Trap = 1,
+    public EType Type { get; set; } = EType.Unknown;
-            Hoard = 2,
+    public Vector3 Position { get; set; }
-            Debug = 3,
+    public bool Seen { get; set; }
-        }
+    public List<string> RemoteSeenOn { get; set; } = new();
+    public List<Guid> Imports { get; set; } = new();
+    public bool WasImported { get; set; }
+    public string? SinceVersion { get; set; }
+
+    public enum EType
+    {
+        Unknown = 0,
+        Trap = 1,
+        Hoard = 2,
+        Debug = 3,
     }
 }

Pal.Client/Configuration/Legacy/JsonMigration.cs

@@ -12,136 +12,135 @@ using Microsoft.Extensions.Logging;
 using Pal.Client.Database;
 using Pal.Common;
 
-namespace Pal.Client.Configuration.Legacy
+namespace Pal.Client.Configuration.Legacy;
-{
-    /// <summary>
-    /// Imports legacy territoryType.json files into the database if it exists, and no markers for that territory exist.
-    /// </summary>
-    internal sealed class JsonMigration
-    {
-        private readonly ILogger<JsonMigration> _logger;
-        private readonly IServiceScopeFactory _serviceScopeFactory;
-        private readonly DalamudPluginInterface _pluginInterface;
 
-        public JsonMigration(ILogger<JsonMigration> logger, IServiceScopeFactory serviceScopeFactory,
+/// <summary>
-            DalamudPluginInterface pluginInterface)
+/// Imports legacy territoryType.json files into the database if it exists, and no markers for that territory exist.
-        {
+/// </summary>
-            _logger = logger;
+internal sealed class JsonMigration
-            _serviceScopeFactory = serviceScopeFactory;
+{
-            _pluginInterface = pluginInterface;
+    private readonly ILogger<JsonMigration> _logger;
-        }
+    private readonly IServiceScopeFactory _serviceScopeFactory;
+    private readonly IDalamudPluginInterface _pluginInterface;
+
+    public JsonMigration(ILogger<JsonMigration> logger, IServiceScopeFactory serviceScopeFactory,
+        IDalamudPluginInterface pluginInterface)
+    {
+        _logger = logger;
+        _serviceScopeFactory = serviceScopeFactory;
+        _pluginInterface = pluginInterface;
+    }
 
 #pragma warning disable CS0612
-        public async Task MigrateAsync(CancellationToken cancellationToken)
+    public async Task MigrateAsync(CancellationToken cancellationToken)
+    {
+        List<JsonFloorState> floorsToMigrate = new();
+        JsonFloorState.ForEach(floorsToMigrate.Add);
+
+        if (floorsToMigrate.Count == 0)
         {
-            List<JsonFloorState> floorsToMigrate = new();
+            _logger.LogInformation("Found no floors to migrate");
-            JsonFloorState.ForEach(floorsToMigrate.Add);
+            return;
+        }
 
-            if (floorsToMigrate.Count == 0)
+        cancellationToken.ThrowIfCancellationRequested();
-            {
-                _logger.LogInformation("Found no floors to migrate");
-                return;
-            }
 
-            cancellationToken.ThrowIfCancellationRequested();
+        await using var scope = _serviceScopeFactory.CreateAsyncScope();
+        await using var dbContext = scope.ServiceProvider.GetRequiredService<PalClientContext>();
 
-            await using var scope = _serviceScopeFactory.CreateAsyncScope();
+        var fileStream = new FileStream(
-            await using var dbContext = scope.ServiceProvider.GetRequiredService<PalClientContext>();
+            Path.Join(_pluginInterface.GetPluginConfigDirectory(),
+                $"territory-backup-{DateTime.Now:yyyyMMdd-HHmmss}.zip"),
+            FileMode.CreateNew);
+        using (var backup = new ZipArchive(fileStream, ZipArchiveMode.Create, false))
+        {
+            IReadOnlyDictionary<Guid, ImportHistory> imports =
+                await dbContext.Imports.ToDictionaryAsync(import => import.Id, cancellationToken);
 
-            var fileStream = new FileStream(
-                Path.Join(_pluginInterface.GetPluginConfigDirectory(),
-                    $"territory-backup-{DateTime.Now:yyyyMMdd-HHmmss}.zip"),
-                FileMode.CreateNew);
-            using (var backup = new ZipArchive(fileStream, ZipArchiveMode.Create, false))
-            {
-                IReadOnlyDictionary<Guid, ImportHistory> imports =
-                    await dbContext.Imports.ToDictionaryAsync(import => import.Id, cancellationToken);
-
-                foreach (var floorToMigrate in floorsToMigrate)
-                {
-                    backup.CreateEntryFromFile(floorToMigrate.GetSaveLocation(),
-                        Path.GetFileName(floorToMigrate.GetSaveLocation()), CompressionLevel.SmallestSize);
-                    await MigrateFloor(dbContext, floorToMigrate, imports, cancellationToken);
-                }
-
-                await dbContext.SaveChangesAsync(cancellationToken);
-            }
-
-            _logger.LogInformation("Removing {Count} old json files", floorsToMigrate.Count);
             foreach (var floorToMigrate in floorsToMigrate)
-                File.Delete(floorToMigrate.GetSaveLocation());
-        }
-
-        /// <returns>Whether to archive this file once complete</returns>
-        private async Task MigrateFloor(
-            PalClientContext dbContext,
-            JsonFloorState floorToMigrate,
-            IReadOnlyDictionary<Guid, ImportHistory> imports,
-            CancellationToken cancellationToken)
-        {
-            using var logScope = _logger.BeginScope($"Import {(ETerritoryType)floorToMigrate.TerritoryType}");
-            if (floorToMigrate.Markers.Count == 0)
             {
-                _logger.LogInformation("Skipping migration, floor has no markers");
+                backup.CreateEntryFromFile(floorToMigrate.GetSaveLocation(),
+                    Path.GetFileName(floorToMigrate.GetSaveLocation()), CompressionLevel.SmallestSize);
+                await MigrateFloor(dbContext, floorToMigrate, imports, cancellationToken);
             }
 
-            if (await dbContext.Locations.AnyAsync(o => o.TerritoryType == floorToMigrate.TerritoryType,
+            await dbContext.SaveChangesAsync(cancellationToken);
-                    cancellationToken))
-            {
-                _logger.LogInformation("Skipping migration, floor already has locations in the database");
-                return;
-            }
-
-            _logger.LogInformation("Starting migration of {Count} locations", floorToMigrate.Markers.Count);
-            List<ClientLocation> clientLocations = floorToMigrate.Markers
-                .Where(o => o.Type == JsonMarker.EType.Trap || o.Type == JsonMarker.EType.Hoard)
-                .Select(o =>
-                {
-                    var clientLocation = new ClientLocation
-                    {
-                        TerritoryType = floorToMigrate.TerritoryType,
-                        Type = MapJsonType(o.Type),
-                        X = o.Position.X,
-                        Y = o.Position.Y,
-                        Z = o.Position.Z,
-                        Seen = o.Seen,
-
-                        // the SelectMany is misleading here, each import has either 0 or 1 associated db entry with that id
-                        ImportedBy = o.Imports
-                            .Select(importId =>
-                                imports.TryGetValue(importId, out ImportHistory? import) ? import : null)
-                            .Where(import => import != null)
-                            .Cast<ImportHistory>()
-                            .Distinct()
-                            .ToList(),
-
-                        // if we have a location not encountered locally, which also wasn't imported,
-                        // it very likely is a download (but we have no information to track this).
-                        Source = o.Seen ? ClientLocation.ESource.SeenLocally :
-                            o.Imports.Count > 0 ? ClientLocation.ESource.Import : ClientLocation.ESource.Download,
-                        SinceVersion = o.SinceVersion ?? "0.0",
-                    };
-
-                    clientLocation.RemoteEncounters = o.RemoteSeenOn
-                        .Select(accountId => new RemoteEncounter(clientLocation, accountId))
-                        .ToList();
-
-                    return clientLocation;
-                }).ToList();
-            await dbContext.Locations.AddRangeAsync(clientLocations, cancellationToken);
-
-            _logger.LogInformation("Migrated {Count} locations", clientLocations.Count);
         }
 
-        private ClientLocation.EType MapJsonType(JsonMarker.EType type)
+        _logger.LogInformation("Removing {Count} old json files", floorsToMigrate.Count);
-        {
+        foreach (var floorToMigrate in floorsToMigrate)
-            return type switch
+            File.Delete(floorToMigrate.GetSaveLocation());
-            {
-                JsonMarker.EType.Trap => ClientLocation.EType.Trap,
-                JsonMarker.EType.Hoard => ClientLocation.EType.Hoard,
-                _ => throw new ArgumentOutOfRangeException(nameof(type), type, null)
-            };
-        }
-#pragma warning restore CS0612
     }
+
+    /// <returns>Whether to archive this file once complete</returns>
+    private async Task MigrateFloor(
+        PalClientContext dbContext,
+        JsonFloorState floorToMigrate,
+        IReadOnlyDictionary<Guid, ImportHistory> imports,
+        CancellationToken cancellationToken)
+    {
+        using var logScope = _logger.BeginScope($"Import {(ETerritoryType)floorToMigrate.TerritoryType}");
+        if (floorToMigrate.Markers.Count == 0)
+        {
+            _logger.LogInformation("Skipping migration, floor has no markers");
+        }
+
+        if (await dbContext.Locations.AnyAsync(o => o.TerritoryType == floorToMigrate.TerritoryType,
+                cancellationToken))
+        {
+            _logger.LogInformation("Skipping migration, floor already has locations in the database");
+            return;
+        }
+
+        _logger.LogInformation("Starting migration of {Count} locations", floorToMigrate.Markers.Count);
+        List<ClientLocation> clientLocations = floorToMigrate.Markers
+            .Where(o => o.Type == JsonMarker.EType.Trap || o.Type == JsonMarker.EType.Hoard)
+            .Select(o =>
+            {
+                var clientLocation = new ClientLocation
+                {
+                    TerritoryType = floorToMigrate.TerritoryType,
+                    Type = MapJsonType(o.Type),
+                    X = o.Position.X,
+                    Y = o.Position.Y,
+                    Z = o.Position.Z,
+                    Seen = o.Seen,
+
+                    // the SelectMany is misleading here, each import has either 0 or 1 associated db entry with that id
+                    ImportedBy = o.Imports
+                        .Select(importId =>
+                            imports.TryGetValue(importId, out ImportHistory? import) ? import : null)
+                        .Where(import => import != null)
+                        .Cast<ImportHistory>()
+                        .Distinct()
+                        .ToList(),
+
+                    // if we have a location not encountered locally, which also wasn't imported,
+                    // it very likely is a download (but we have no information to track this).
+                    Source = o.Seen ? ClientLocation.ESource.SeenLocally :
+                        o.Imports.Count > 0 ? ClientLocation.ESource.Import : ClientLocation.ESource.Download,
+                    SinceVersion = o.SinceVersion ?? "0.0",
+                };
+
+                clientLocation.RemoteEncounters = o.RemoteSeenOn
+                    .Select(accountId => new RemoteEncounter(clientLocation, accountId))
+                    .ToList();
+
+                return clientLocation;
+            }).ToList();
+        await dbContext.Locations.AddRangeAsync(clientLocations, cancellationToken);
+
+        _logger.LogInformation("Migrated {Count} locations", clientLocations.Count);
+    }
+
+    private ClientLocation.EType MapJsonType(JsonMarker.EType type)
+    {
+        return type switch
+        {
+            JsonMarker.EType.Trap => ClientLocation.EType.Trap,
+            JsonMarker.EType.Hoard => ClientLocation.EType.Hoard,
+            _ => throw new ArgumentOutOfRangeException(nameof(type), type, null)
+        };
+    }
+#pragma warning restore CS0612
 }

Pal.Client/DalamudPackager.targets

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-	<Target Name="PackagePlugin" AfterTargets="Build" Condition="'$(Configuration)' == 'Debug'">
+    <Target Name="PackagePlugin" AfterTargets="Build" Condition="'$(Configuration)' == 'Debug'">
-		<DalamudPackager
+        <DalamudPackager
-			ProjectDir="$(ProjectDir)"
+                ProjectDir="$(ProjectDir)"
-			OutputPath="$(OutputPath)"
+                OutputPath="$(OutputPath)"
-			AssemblyName="$(AssemblyName)"
+                AssemblyName="$(AssemblyName)"
-			MakeZip="false"
+                MakeZip="false"
-			VersionComponents="2"/>
+                VersionComponents="2"/>
-	</Target>
+    </Target>
 
-	<Target Name="PackagePlugin" AfterTargets="Build" Condition="'$(Configuration)' == 'Release'">
+    <Target Name="PackagePlugin" AfterTargets="Build" Condition="'$(Configuration)' == 'Release'">
-		<DalamudPackager
+        <DalamudPackager
-			ProjectDir="$(ProjectDir)"
+                ProjectDir="$(ProjectDir)"
-			OutputPath="$(OutputPath)"
+                OutputPath="$(OutputPath)"
-			AssemblyName="$(AssemblyName)"
+                AssemblyName="$(AssemblyName)"
-			MakeZip="true"
+                MakeZip="true"
-			VersionComponents="2"
+                VersionComponents="2"
-			Exclude="ECommons.pdb;ECommons.xml"/>
+                Exclude="ECommons.pdb;ECommons.xml"/>
-	</Target>
+    </Target>
 </Project>

Pal.Client/Database/Cleanup.cs

@@ -6,62 +6,61 @@ using Microsoft.Extensions.Logging;
 using Pal.Client.Configuration;
 using Pal.Common;
 
-namespace Pal.Client.Database
+namespace Pal.Client.Database;
+
+internal sealed class Cleanup
 {
-    internal sealed class Cleanup
+    private readonly ILogger<Cleanup> _logger;
+    private readonly IPalacePalConfiguration _configuration;
+
+    public Cleanup(ILogger<Cleanup> logger, IPalacePalConfiguration configuration)
     {
-        private readonly ILogger<Cleanup> _logger;
+        _logger = logger;
-        private readonly IPalacePalConfiguration _configuration;
+        _configuration = configuration;
+    }
 
-        public Cleanup(ILogger<Cleanup> logger, IPalacePalConfiguration configuration)
+    public void Purge(PalClientContext dbContext)
-        {
+    {
-            _logger = logger;
+        var toDelete = dbContext.Locations
-            _configuration = configuration;
+            .Include(o => o.ImportedBy)
-        }
+            .Include(o => o.RemoteEncounters)
+            .AsSplitQuery()
+            .Where(DefaultPredicate())
+            .Where(AnyRemoteEncounter())
+            .ToList();
+        _logger.LogInformation("Cleaning up {Count} outdated locations", toDelete.Count);
+        dbContext.Locations.RemoveRange(toDelete);
+    }
 
-        public void Purge(PalClientContext dbContext)
+    public void Purge(PalClientContext dbContext, ETerritoryType territoryType)
-        {
+    {
-            var toDelete = dbContext.Locations
+        var toDelete = dbContext.Locations
-                .Include(o => o.ImportedBy)
+            .Include(o => o.ImportedBy)
-                .Include(o => o.RemoteEncounters)
+            .Include(o => o.RemoteEncounters)
-                .AsSplitQuery()
+            .AsSplitQuery()
-                .Where(DefaultPredicate())
+            .Where(o => o.TerritoryType == (ushort)territoryType)
-                .Where(AnyRemoteEncounter())
+            .Where(DefaultPredicate())
-                .ToList();
+            .Where(AnyRemoteEncounter())
-            _logger.LogInformation("Cleaning up {Count} outdated locations", toDelete.Count);
+            .ToList();
-            dbContext.Locations.RemoveRange(toDelete);
+        _logger.LogInformation("Cleaning up {Count} outdated locations for territory {Territory}", toDelete.Count,
-        }
+            territoryType);
+        dbContext.Locations.RemoveRange(toDelete);
+    }
 
-        public void Purge(PalClientContext dbContext, ETerritoryType territoryType)
+    private Expression<Func<ClientLocation, bool>> DefaultPredicate()
-        {
+    {
-            var toDelete = dbContext.Locations
+        return o => !o.Seen &&
-                .Include(o => o.ImportedBy)
+                    o.ImportedBy.Count == 0 &&
-                .Include(o => o.RemoteEncounters)
+                    o.Source != ClientLocation.ESource.SeenLocally &&
-                .AsSplitQuery()
+                    o.Source != ClientLocation.ESource.ExplodedLocally;
-                .Where(o => o.TerritoryType == (ushort)territoryType)
+    }
-                .Where(DefaultPredicate())
-                .Where(AnyRemoteEncounter())
-                .ToList();
-            _logger.LogInformation("Cleaning up {Count} outdated locations for territory {Territory}", toDelete.Count,
-                territoryType);
-            dbContext.Locations.RemoveRange(toDelete);
-        }
 
-        private Expression<Func<ClientLocation, bool>> DefaultPredicate()
+    private Expression<Func<ClientLocation, bool>> AnyRemoteEncounter()
-        {
+    {
-            return o => !o.Seen &&
+        if (_configuration.Mode == EMode.Offline)
-                        o.ImportedBy.Count == 0 &&
+            return o => true;
-                        o.Source != ClientLocation.ESource.SeenLocally &&
+        else
-                        o.Source != ClientLocation.ESource.ExplodedLocally;
+            // keep downloaded markers
-        }
+            return o => o.Source != ClientLocation.ESource.Download;
-
-        private Expression<Func<ClientLocation, bool>> AnyRemoteEncounter()
-        {
-            if (_configuration.Mode == EMode.Offline)
-                return o => true;
-            else
-                // keep downloaded markers
-                return o => o.Source != ClientLocation.ESource.Download;
-        }
     }
 }

Pal.Client/Database/ClientLocation.cs

@@ -1,59 +1,58 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Pal.Client.Database
+namespace Pal.Client.Database;
+
+internal sealed class ClientLocation
 {
-    internal sealed class ClientLocation
+    [Key] public int LocalId { get; set; }
+    public ushort TerritoryType { get; set; }
+    public EType Type { get; set; }
+    public float X { get; set; }
+    public float Y { get; set; }
+    public float Z { get; set; }
+
+    /// <summary>
+    /// Whether we have encountered the trap/coffer at this location in-game.
+    /// </summary>
+    public bool Seen { get; set; }
+
+    /// <summary>
+    /// Which account ids this marker was seen. This is a list merely to support different remote endpoints
+    /// (where each server would assign you a different id).
+    /// </summary>
+    public List<RemoteEncounter> RemoteEncounters { get; set; } = new();
+
+    /// <summary>
+    /// To keep track of which markers were imported through a downloaded file, we save the associated import-id.
+    ///
+    /// Importing another file for the same remote server will remove the old import-id, and add the new import-id here.
+    /// </summary>
+    public List<ImportHistory> ImportedBy { get; set; } = new();
+
+    /// <summary>
+    /// Determines where this location is originally from.
+    /// </summary>
+    public ESource Source { get; set; }
+
+
+    /// <summary>
+    /// To make rollbacks of local data easier, keep track of the plugin version which was used to create this location initially.
+    /// </summary>
+    public string SinceVersion { get; set; } = "0.0";
+
+    public enum EType
     {
-        [Key] public int LocalId { get; set; }
+        Trap = 1,
-        public ushort TerritoryType { get; set; }
+        Hoard = 2,
-        public EType Type { get; set; }
+    }
-        public float X { get; set; }
-        public float Y { get; set; }
-        public float Z { get; set; }
 
-        /// <summary>
+    public enum ESource
-        /// Whether we have encountered the trap/coffer at this location in-game.
+    {
-        /// </summary>
+        Unknown = 0,
-        public bool Seen { get; set; }
+        SeenLocally = 1,
-
+        ExplodedLocally = 2,
-        /// <summary>
+        Import = 3,
-        /// Which account ids this marker was seen. This is a list merely to support different remote endpoints
+        Download = 4,
-        /// (where each server would assign you a different id).
-        /// </summary>
-        public List<RemoteEncounter> RemoteEncounters { get; set; } = new();
-
-        /// <summary>
-        /// To keep track of which markers were imported through a downloaded file, we save the associated import-id.
-        ///
-        /// Importing another file for the same remote server will remove the old import-id, and add the new import-id here.
-        /// </summary>
-        public List<ImportHistory> ImportedBy { get; set; } = new();
-
-        /// <summary>
-        /// Determines where this location is originally from.
-        /// </summary>
-        public ESource Source { get; set; }
-
-
-        /// <summary>
-        /// To make rollbacks of local data easier, keep track of the plugin version which was used to create this location initially.
-        /// </summary>
-        public string SinceVersion { get; set; } = "0.0";
-
-        public enum EType
-        {
-            Trap = 1,
-            Hoard = 2,
-        }
-
-        public enum ESource
-        {
-            Unknown = 0,
-            SeenLocally = 1,
-            ExplodedLocally = 2,
-            Import = 3,
-            Download = 4,
-        }
     }
 }

Pal.Client/Database/ImportHistory.cs

@@ -1,15 +1,14 @@
 using System;
 using System.Collections.Generic;
 
-namespace Pal.Client.Database
+namespace Pal.Client.Database;
-{
-    internal sealed class ImportHistory
-    {
-        public Guid Id { get; set; }
-        public string? RemoteUrl { get; set; }
-        public DateTime ExportedAt { get; set; }
-        public DateTime ImportedAt { get; set; }
 
-        public List<ClientLocation> ImportedLocations { get; set; } = new();
+internal sealed class ImportHistory
-    }
+{
+    public Guid Id { get; set; }
+    public string? RemoteUrl { get; set; }
+    public DateTime ExportedAt { get; set; }
+    public DateTime ImportedAt { get; set; }
+
+    public List<ClientLocation> ImportedLocations { get; set; } = new();
 }

Pal.Client/Database/PalClientContext.cs

@@ -1,24 +1,23 @@
 using Microsoft.EntityFrameworkCore;
 
-namespace Pal.Client.Database
+namespace Pal.Client.Database;
+
+internal class PalClientContext : DbContext
 {
-    internal class PalClientContext : DbContext
+    public DbSet<ClientLocation> Locations { get; set; } = null!;
+    public DbSet<ImportHistory> Imports { get; set; } = null!;
+    public DbSet<RemoteEncounter> RemoteEncounters { get; set; } = null!;
+
+    public PalClientContext(DbContextOptions<PalClientContext> options)
+        : base(options)
     {
-        public DbSet<ClientLocation> Locations { get; set; } = null!;
+    }
-        public DbSet<ImportHistory> Imports { get; set; } = null!;
-        public DbSet<RemoteEncounter> RemoteEncounters { get; set; } = null!;
 
-        public PalClientContext(DbContextOptions<PalClientContext> options)
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
-            : base(options)
+    {
-        {
+        modelBuilder.Entity<ClientLocation>()
-        }
+            .HasMany(o => o.ImportedBy)
-
+            .WithMany(o => o.ImportedLocations)
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
+            .UsingEntity(o => o.ToTable("LocationImports"));
-        {
-            modelBuilder.Entity<ClientLocation>()
-                .HasMany(o => o.ImportedBy)
-                .WithMany(o => o.ImportedLocations)
-                .UsingEntity(o => o.ToTable("LocationImports"));
-        }
     }
 }

Pal.Client/Database/RemoteEncounter.cs

@@ -2,40 +2,39 @@
 using Pal.Client.Extensions;
 using Pal.Client.Net;
 
-namespace Pal.Client.Database
+namespace Pal.Client.Database;
+
+/// <summary>
+/// To avoid sending too many requests to the server, we cache which locations have been seen
+/// locally. These never expire, and locations which have been seen with a specific account
+/// are never sent to the server again.
+///
+/// To be marked as seen, it needs to be essentially processed by <see cref="RemoteApi.MarkAsSeen"/>.
+/// </summary>
+internal sealed class RemoteEncounter
 {
+    [Key]
+    public int Id { get; private set; }
+
+    public int ClientLocationId { get; private set; }
+    public ClientLocation ClientLocation { get; private set; } = null!;
+
     /// <summary>
-    /// To avoid sending too many requests to the server, we cache which locations have been seen
+    /// Partial account id. This is partially unique - however problems would (in theory)
-    /// locally. These never expire, and locations which have been seen with a specific account
+    /// only occur once you have two account-ids where the first 13 characters are equal.
-    /// are never sent to the server again.
-    ///
-    /// To be marked as seen, it needs to be essentially processed by <see cref="RemoteApi.MarkAsSeen"/>.
     /// </summary>
-    internal sealed class RemoteEncounter
+    [MaxLength(13)]
+    public string AccountId { get; private set; }
+
+    private RemoteEncounter(int clientLocationId, string accountId)
     {
-        [Key]
+        ClientLocationId = clientLocationId;
-        public int Id { get; private set; }
+        AccountId = accountId;
+    }
 
-        public int ClientLocationId { get; private set; }
+    public RemoteEncounter(ClientLocation clientLocation, string accountId)
-        public ClientLocation ClientLocation { get; private set; } = null!;
+    {
-
+        ClientLocation = clientLocation;
-        /// <summary>
+        AccountId = accountId.ToPartialId();
-        /// Partial account id. This is partially unique - however problems would (in theory)
-        /// only occur once you have two account-ids where the first 13 characters are equal.
-        /// </summary>
-        [MaxLength(13)]
-        public string AccountId { get; private set; }
-
-        private RemoteEncounter(int clientLocationId, string accountId)
-        {
-            ClientLocationId = clientLocationId;
-            AccountId = accountId;
-        }
-
-        public RemoteEncounter(ClientLocation clientLocation, string accountId)
-        {
-            ClientLocation = clientLocation;
-            AccountId = accountId.ToPartialId();
-        }
     }
 }

Pal.Client/DependencyContextInitializer.cs

@@ -19,176 +19,177 @@ using Pal.Client.DependencyInjection;
 using Pal.Client.Floors;
 using Pal.Client.Windows;
 
-namespace Pal.Client
+namespace Pal.Client;
+
+/// <summary>
+/// Takes care of async plugin init - this is mostly everything that requires either the config or the database to
+/// be available.
+/// </summary>
+internal sealed class DependencyContextInitializer
 {
-    /// <summary>
+    private readonly ILogger<DependencyContextInitializer> _logger;
-    /// Takes care of async plugin init - this is mostly everything that requires either the config or the database to
+    private readonly IServiceProvider _serviceProvider;
-    /// be available.
+
-    /// </summary>
+    public DependencyContextInitializer(ILogger<DependencyContextInitializer> logger,
-    internal sealed class DependencyContextInitializer
+        IServiceProvider serviceProvider)
     {
-        private readonly ILogger<DependencyContextInitializer> _logger;
+        _logger = logger;
-        private readonly IServiceProvider _serviceProvider;
+        _serviceProvider = serviceProvider;
+    }
 
-        public DependencyContextInitializer(ILogger<DependencyContextInitializer> logger,
+    public async Task InitializeAsync(CancellationToken cancellationToken)
-            IServiceProvider serviceProvider)
+    {
-        {
+        using IDisposable? logScope = _logger.BeginScope("AsyncInit");
-            _logger = logger;
-            _serviceProvider = serviceProvider;
-        }
 
-        public async Task InitializeAsync(CancellationToken cancellationToken)
+        _logger.LogInformation("Starting async init");
-        {
-            using IDisposable? logScope = _logger.BeginScope("AsyncInit");
 
-            _logger.LogInformation("Starting async init");
+        await CreateBackup();
+        cancellationToken.ThrowIfCancellationRequested();
 
-            await CreateBackup();
+        await RunMigrations(cancellationToken);
-            cancellationToken.ThrowIfCancellationRequested();
+        cancellationToken.ThrowIfCancellationRequested();
 
-            await RunMigrations(cancellationToken);
+        // v1 migration: config migration for import history, json migration for markers
-            cancellationToken.ThrowIfCancellationRequested();
+        _serviceProvider.GetRequiredService<ConfigurationManager>().Migrate();
+        await _serviceProvider.GetRequiredService<JsonMigration>().MigrateAsync(cancellationToken);
+        cancellationToken.ThrowIfCancellationRequested();
 
-            // v1 migration: config migration for import history, json migration for markers
+        await RunCleanup();
-            _serviceProvider.GetRequiredService<ConfigurationManager>().Migrate();
+        cancellationToken.ThrowIfCancellationRequested();
-            await _serviceProvider.GetRequiredService<JsonMigration>().MigrateAsync(cancellationToken);
-            cancellationToken.ThrowIfCancellationRequested();
 
-            await RunCleanup();
+        await RemoveOldBackups();
-            cancellationToken.ThrowIfCancellationRequested();
+        cancellationToken.ThrowIfCancellationRequested();
 
-            await RemoveOldBackups();
+        // windows that have logic to open on startup
-            cancellationToken.ThrowIfCancellationRequested();
+        _serviceProvider.GetRequiredService<AgreementWindow>();
 
-            // windows that have logic to open on startup
+        // initialize components that are mostly self-contained/self-registered
-            _serviceProvider.GetRequiredService<AgreementWindow>();
+        _serviceProvider.GetRequiredService<GameHooks>();
+        _serviceProvider.GetRequiredService<FrameworkService>();
+        _serviceProvider.GetRequiredService<ChatService>();
 
-            // initialize components that are mostly self-contained/self-registered
+        // eager load any commands to find errors now, not when running them
-            _serviceProvider.GetRequiredService<GameHooks>();
+        _serviceProvider.GetRequiredService<IEnumerable<ISubCommand>>();
-            _serviceProvider.GetRequiredService<FrameworkService>();
-            _serviceProvider.GetRequiredService<ChatService>();
 
-            // eager load any commands to find errors now, not when running them
+        cancellationToken.ThrowIfCancellationRequested();
-            _serviceProvider.GetRequiredService<PalConfigCommand>();
-            _serviceProvider.GetRequiredService<PalNearCommand>();
-            _serviceProvider.GetRequiredService<PalStatsCommand>();
-            _serviceProvider.GetRequiredService<PalTestConnectionCommand>();
 
-            cancellationToken.ThrowIfCancellationRequested();
+        if (_serviceProvider.GetRequiredService<IPalacePalConfiguration>().HasBetaFeature(ObjectTableDebug.FeatureName))
+            _serviceProvider.GetRequiredService<ObjectTableDebug>();
 
-            _logger.LogInformation("Async init complete");
+        cancellationToken.ThrowIfCancellationRequested();
-        }
 
-        private async Task RemoveOldBackups()
+        _logger.LogInformation("Async init complete");
-        {
+    }
-            await using var scope = _serviceProvider.CreateAsyncScope();
-            var pluginInterface = scope.ServiceProvider.GetRequiredService<DalamudPluginInterface>();
-            var configuration = scope.ServiceProvider.GetRequiredService<IPalacePalConfiguration>();
 
-            var paths = Directory.GetFiles(pluginInterface.GetPluginConfigDirectory(), "backup-*.data.sqlite3",
+    private async Task RemoveOldBackups()
-                new EnumerationOptions
+    {
-                {
+        await using var scope = _serviceProvider.CreateAsyncScope();
-                    IgnoreInaccessible = true,
+        var pluginInterface = scope.ServiceProvider.GetRequiredService<IDalamudPluginInterface>();
-                    RecurseSubdirectories = false,
+        var configuration = scope.ServiceProvider.GetRequiredService<IPalacePalConfiguration>();
-                    MatchCasing = MatchCasing.CaseSensitive,
-                    AttributesToSkip = FileAttributes.ReadOnly | FileAttributes.Hidden | FileAttributes.System,
-                    ReturnSpecialDirectories = false,
-                });
-            if (paths.Length == 0)
-                return;
 
-            Regex backupRegex = new Regex(@"backup-([\d\-]{10})\.data\.sqlite3", RegexOptions.Compiled);
+        var paths = Directory.GetFiles(pluginInterface.GetPluginConfigDirectory(), "backup-*.data.sqlite3",
-            List<(DateTime Date, string Path)> backupFiles = new();
+            new EnumerationOptions
-            foreach (string path in paths)
             {
-                var match = backupRegex.Match(Path.GetFileName(path));
+                IgnoreInaccessible = true,
-                if (!match.Success)
+                RecurseSubdirectories = false,
-                    continue;
+                MatchCasing = MatchCasing.CaseSensitive,
+                AttributesToSkip = FileAttributes.ReadOnly | FileAttributes.Hidden | FileAttributes.System,
+                ReturnSpecialDirectories = false,
+            });
+        if (paths.Length == 0)
+            return;
 
-                if (DateTime.TryParseExact(match.Groups[1].Value, "yyyy-MM-dd", CultureInfo.InvariantCulture,
+        Regex backupRegex = new Regex(@"backup-([\d\-]{10})\.data\.sqlite3", RegexOptions.Compiled);
-                        DateTimeStyles.AssumeUniversal, out DateTime backupDate))
+        List<(DateTime Date, string Path)> backupFiles = new();
-                {
+        foreach (string path in paths)
-                    backupFiles.Add((backupDate, path));
+        {
-                }
+            var match = backupRegex.Match(Path.GetFileName(path));
-            }
+            if (!match.Success)
+                continue;
 
-            var toDelete = backupFiles.OrderByDescending(x => x.Date)
+            if (DateTime.TryParseExact(match.Groups[1].Value, "yyyy-MM-dd", CultureInfo.InvariantCulture,
-                .Skip(configuration.Backups.MinimumBackupsToKeep)
+                    DateTimeStyles.AssumeUniversal, out DateTime backupDate))
-                .Where(x => (DateTime.Now.ToUniversalTime() - x.Date).Days > configuration.Backups.DaysToDeleteAfter)
-                .Select(x => x.Path);
-            foreach (var path in toDelete)
             {
-                try
+                backupFiles.Add((backupDate, path));
-                {
-                    File.Delete(path);
-                    _logger.LogInformation("Deleted old backup file '{Path}'", path);
-                }
-                catch (Exception e)
-                {
-                    _logger.LogWarning(e, "Could not delete backup file '{Path}'", path);
-                }
             }
         }
 
-        private async Task CreateBackup()
+        var toDelete = backupFiles.OrderByDescending(x => x.Date)
+            .Skip(configuration.Backups.MinimumBackupsToKeep)
+            .Where(x => (DateTime.Now.ToUniversalTime() - x.Date).Days > configuration.Backups.DaysToDeleteAfter)
+            .Select(x => x.Path);
+        foreach (var path in toDelete)
         {
-            await using var scope = _serviceProvider.CreateAsyncScope();
+            try
-
-            var pluginInterface = scope.ServiceProvider.GetRequiredService<DalamudPluginInterface>();
-            string backupPath = Path.Join(pluginInterface.GetPluginConfigDirectory(),
-                $"backup-{DateTime.Now.ToUniversalTime():yyyy-MM-dd}.data.sqlite3");
-            string sourcePath = Path.Join(pluginInterface.GetPluginConfigDirectory(),
-                DependencyInjectionContext.DatabaseFileName);
-            if (File.Exists(sourcePath) && !File.Exists(backupPath))
             {
-                try
+                File.Delete(path);
-                {
+                _logger.LogInformation("Deleted old backup file '{Path}'", path);
-                    if (File.Exists(sourcePath + "-shm") || File.Exists(sourcePath + "-wal"))
+            }
-                    {
+            catch (Exception e)
-                        _logger.LogInformation("Creating database backup '{Path}' (open db)", backupPath);
+            {
-                        await using var db = scope.ServiceProvider.GetRequiredService<PalClientContext>();
+                _logger.LogWarning(e, "Could not delete backup file '{Path}'", path);
-                        await using SqliteConnection source = new(db.Database.GetConnectionString());
-                        await source.OpenAsync();
-                        await using SqliteConnection backup = new($"Data Source={backupPath}");
-                        source.BackupDatabase(backup);
-                        SqliteConnection.ClearPool(backup);
-                    }
-                    else
-                    {
-                        _logger.LogInformation("Creating database backup '{Path}' (file copy)", backupPath);
-                        File.Copy(sourcePath, backupPath);
-                    }
-                }
-                catch (Exception e)
-                {
-                    _logger.LogError(e, "Could not create backup");
-                }
             }
-            else
-                _logger.LogInformation("Database backup in '{Path}' already exists", backupPath);
-        }
-
-        private async Task RunMigrations(CancellationToken cancellationToken)
-        {
-            await using var scope = _serviceProvider.CreateAsyncScope();
-
-            _logger.LogInformation("Loading database & running migrations");
-            await using var dbContext = scope.ServiceProvider.GetRequiredService<PalClientContext>();
-
-            // takes 2-3 seconds with initializing connections, loading driver etc.
-            await dbContext.Database.MigrateAsync(cancellationToken);
-            _logger.LogInformation("Completed database migrations");
-        }
-
-        private async Task RunCleanup()
-        {
-            await using var scope = _serviceProvider.CreateAsyncScope();
-            await using var dbContext = scope.ServiceProvider.GetRequiredService<PalClientContext>();
-            var cleanup = scope.ServiceProvider.GetRequiredService<Cleanup>();
-
-            cleanup.Purge(dbContext);
-
-            await dbContext.SaveChangesAsync();
         }
     }
+
+    private async Task CreateBackup()
+    {
+        await using var scope = _serviceProvider.CreateAsyncScope();
+
+        var pluginInterface = scope.ServiceProvider.GetRequiredService<IDalamudPluginInterface>();
+        string backupPath = Path.Join(pluginInterface.GetPluginConfigDirectory(),
+            $"backup-{DateTime.Now.ToUniversalTime():yyyy-MM-dd}.data.sqlite3");
+        string sourcePath = Path.Join(pluginInterface.GetPluginConfigDirectory(),
+            DependencyInjectionContext.DatabaseFileName);
+        if (File.Exists(sourcePath) && !File.Exists(backupPath))
+        {
+            try
+            {
+                if (File.Exists(sourcePath + "-shm") || File.Exists(sourcePath + "-wal"))
+                {
+                    _logger.LogInformation("Creating database backup '{Path}' (open db)", backupPath);
+                    await using var db = scope.ServiceProvider.GetRequiredService<PalClientContext>();
+                    await using SqliteConnection source = new(db.Database.GetConnectionString());
+                    await source.OpenAsync();
+                    await using SqliteConnection backup = new($"Data Source={backupPath}");
+                    source.BackupDatabase(backup);
+                    SqliteConnection.ClearPool(backup);
+                }
+                else
+                {
+                    _logger.LogInformation("Creating database backup '{Path}' (file copy)", backupPath);
+                    File.Copy(sourcePath, backupPath);
+                }
+            }
+            catch (Exception e)
+            {
+                _logger.LogError(e, "Could not create backup");
+            }
+        }
+        else
+            _logger.LogInformation("Database backup in '{Path}' already exists", backupPath);
+    }
+
+    private async Task RunMigrations(CancellationToken cancellationToken)
+    {
+        await using var scope = _serviceProvider.CreateAsyncScope();
+
+        _logger.LogInformation("Loading database & running migrations");
+        await using var dbContext = scope.ServiceProvider.GetRequiredService<PalClientContext>();
+
+        // takes 2-3 seconds with initializing connections, loading driver etc.
+        await dbContext.Database.MigrateAsync(cancellationToken);
+        _logger.LogInformation("Completed database migrations");
+    }
+
+    private async Task RunCleanup()
+    {
+        await using var scope = _serviceProvider.CreateAsyncScope();
+        await using var dbContext = scope.ServiceProvider.GetRequiredService<PalClientContext>();
+        var cleanup = scope.ServiceProvider.GetRequiredService<Cleanup>();
+
+        cleanup.Purge(dbContext);
+
+        await dbContext.SaveChangesAsync();
+    }
 }

Pal.Client/DependencyInjection/Chat.cs

@@ -1,38 +1,38 @@
-using Dalamud.Game.Gui;
+using Dalamud.Game.Text;
-using Dalamud.Game.Text;
 using Dalamud.Game.Text.SeStringHandling;
+using Dalamud.Plugin.Services;
+using ECommons.DalamudServices.Legacy;
 using Pal.Client.Properties;
 
-namespace Pal.Client.DependencyInjection
+namespace Pal.Client.DependencyInjection;
+
+internal sealed class Chat
 {
-    internal sealed class Chat
+    private readonly IChatGui _chatGui;
+
+    public Chat(IChatGui chatGui)
     {
-        private readonly ChatGui _chatGui;
+        _chatGui = chatGui;
-
-        public Chat(ChatGui chatGui)
-        {
-            _chatGui = chatGui;
-        }
-
-        public void Error(string e)
-        {
-            _chatGui.PrintChat(new XivChatEntry
-            {
-                Message = new SeStringBuilder()
-                    .AddUiForeground($"[{Localization.Palace_Pal}] ", 16)
-                    .AddText(e).Build(),
-                Type = XivChatType.Urgent
-            });
-        }
-
-        public void Message(string message)
-        {
-            _chatGui.Print(new SeStringBuilder()
-                .AddUiForeground($"[{Localization.Palace_Pal}] ", 57)
-                .AddText(message).Build());
-        }
-
-        public void UnformattedMessage(string message)
-            => _chatGui.Print(message);
     }
+
+    public void Error(string e)
+    {
+        _chatGui.PrintChat(new XivChatEntry
+        {
+            Message = new SeStringBuilder()
+                .AddUiForeground($"[{Localization.Palace_Pal}] ", 16)
+                .AddText(e).Build(),
+            Type = XivChatType.Urgent
+        });
+    }
+
+    public void Message(string message)
+    {
+        _chatGui.Print(new SeStringBuilder()
+            .AddUiForeground($"[{Localization.Palace_Pal}] ", 57)
+            .AddText(message).Build());
+    }
+
+    public void UnformattedMessage(string message)
+        => _chatGui.Print(message);
 }

Pal.Client/DependencyInjection/ChatService.cs

@@ -1,110 +1,116 @@
 using System;
+using System.Text;
 using System.Text.RegularExpressions;
-using Dalamud.Data;
-using Dalamud.Game.Gui;
 using Dalamud.Game.Text;
 using Dalamud.Game.Text.SeStringHandling;
+using Dalamud.Plugin.Services;
 using Lumina.Excel.GeneratedSheets;
 using Pal.Client.Configuration;
 using Pal.Client.Floors;
 
-namespace Pal.Client.DependencyInjection
+namespace Pal.Client.DependencyInjection;
+
+internal sealed class ChatService : IDisposable
 {
-    internal sealed class ChatService : IDisposable
+    private readonly IChatGui _chatGui;
+    private readonly TerritoryState _territoryState;
+    private readonly IPalacePalConfiguration _configuration;
+    private readonly IDataManager _dataManager;
+    private readonly LocalizedChatMessages _localizedChatMessages;
+
+    public ChatService(IChatGui chatGui, TerritoryState territoryState, IPalacePalConfiguration configuration,
+        IDataManager dataManager)
     {
-        private readonly ChatGui _chatGui;
+        _chatGui = chatGui;
-        private readonly TerritoryState _territoryState;
+        _territoryState = territoryState;
-        private readonly IPalacePalConfiguration _configuration;
+        _configuration = configuration;
-        private readonly DataManager _dataManager;
+        _dataManager = dataManager;
-        private readonly LocalizedChatMessages _localizedChatMessages;
 
-        public ChatService(ChatGui chatGui, TerritoryState territoryState, IPalacePalConfiguration configuration,
+        _localizedChatMessages = LoadLanguageStrings();
-            DataManager dataManager)
+
+        _chatGui.ChatMessage += OnChatMessage;
+    }
+
+    public void Dispose()
+        => _chatGui.ChatMessage -= OnChatMessage;
+
+    private void OnChatMessage(XivChatType type, int senderId, ref SeString sender, ref SeString seMessage,
+        ref bool isHandled)
+    {
+        if (_configuration.FirstUse)
+            return;
+
+        if (type != (XivChatType)2105)
+            return;
+
+        string message = seMessage.ToString();
+        if (_localizedChatMessages.FloorChanged.IsMatch(message))
         {
-            _chatGui = chatGui;
+            _territoryState.PomanderOfSight = PomanderState.Inactive;
-            _territoryState = territoryState;
-            _configuration = configuration;
-            _dataManager = dataManager;
 
-            _localizedChatMessages = LoadLanguageStrings();
+            if (_territoryState.PomanderOfIntuition == PomanderState.FoundOnCurrentFloor)
-
+                _territoryState.PomanderOfIntuition = PomanderState.Inactive;
-            _chatGui.ChatMessage += OnChatMessage;
         }
-
+        else if (message.EndsWith(_localizedChatMessages.MapRevealed))
-        public void Dispose()
-            => _chatGui.ChatMessage -= OnChatMessage;
-
-        private void OnChatMessage(XivChatType type, uint senderId, ref SeString sender, ref SeString seMessage,
-            ref bool isHandled)
         {
-            if (_configuration.FirstUse)
+            _territoryState.PomanderOfSight = PomanderState.Active;
-                return;
-
-            if (type != (XivChatType)2105)
-                return;
-
-            string message = seMessage.ToString();
-            if (_localizedChatMessages.FloorChanged.IsMatch(message))
-            {
-                _territoryState.PomanderOfSight = PomanderState.Inactive;
-
-                if (_territoryState.PomanderOfIntuition == PomanderState.FoundOnCurrentFloor)
-                    _territoryState.PomanderOfIntuition = PomanderState.Inactive;
-            }
-            else if (message.EndsWith(_localizedChatMessages.MapRevealed))
-            {
-                _territoryState.PomanderOfSight = PomanderState.Active;
-            }
-            else if (message.EndsWith(_localizedChatMessages.AllTrapsRemoved))
-            {
-                _territoryState.PomanderOfSight = PomanderState.PomanderOfSafetyUsed;
-            }
-            else if (message.EndsWith(_localizedChatMessages.HoardNotOnCurrentFloor) ||
-                     message.EndsWith(_localizedChatMessages.HoardOnCurrentFloor))
-            {
-                // There is no functional difference between these - if you don't open the marked coffer,
-                // going to higher floors will keep the pomander active.
-                _territoryState.PomanderOfIntuition = PomanderState.Active;
-            }
-            else if (message.EndsWith(_localizedChatMessages.HoardCofferOpened))
-            {
-                _territoryState.PomanderOfIntuition = PomanderState.FoundOnCurrentFloor;
-            }
         }
-
+        else if (message.EndsWith(_localizedChatMessages.AllTrapsRemoved))
-        private LocalizedChatMessages LoadLanguageStrings()
         {
-            return new LocalizedChatMessages
+            _territoryState.PomanderOfSight = PomanderState.PomanderOfSafetyUsed;
-            {
-                MapRevealed = GetLocalizedString(7256),
-                AllTrapsRemoved = GetLocalizedString(7255),
-                HoardOnCurrentFloor = GetLocalizedString(7272),
-                HoardNotOnCurrentFloor = GetLocalizedString(7273),
-                HoardCofferOpened = GetLocalizedString(7274),
-                FloorChanged =
-                    new Regex("^" + GetLocalizedString(7270).Replace("\u0002 \u0003\ufffd\u0002\u0003", @"(\d+)") +
-                              "$"),
-            };
         }
-
+        else if (message.EndsWith(_localizedChatMessages.HoardNotOnCurrentFloor) ||
-        private string GetLocalizedString(uint id)
+                 message.EndsWith(_localizedChatMessages.HoardOnCurrentFloor))
         {
-            return _dataManager.GetExcelSheet<LogMessage>()?.GetRow(id)?.Text?.ToString() ?? "Unknown";
+            // There is no functional difference between these - if you don't open the marked coffer,
+            // going to higher floors will keep the pomander active.
+            _territoryState.PomanderOfIntuition = PomanderState.Active;
         }
-
+        else if (message.EndsWith(_localizedChatMessages.HoardCofferOpened))
-        private sealed class LocalizedChatMessages
         {
-            public string MapRevealed { get; init; } = "???"; //"The map for this floor has been revealed!";
+            _territoryState.PomanderOfIntuition = PomanderState.FoundOnCurrentFloor;
-            public string AllTrapsRemoved { get; init; } = "???"; // "All the traps on this floor have disappeared!";
-            public string HoardOnCurrentFloor { get; init; } = "???"; // "You sense the Accursed Hoard calling you...";
-
-            public string HoardNotOnCurrentFloor { get; init; } =
-                "???"; // "You do not sense the call of the Accursed Hoard on this floor...";
-
-            public string HoardCofferOpened { get; init; } = "???"; // "You discover a piece of the Accursed Hoard!";
-
-            public Regex FloorChanged { get; init; } =
-                new(@"This isn't a game message, but will be replaced"); // new Regex(@"^Floor (\d+)$");
         }
     }
+
+    private LocalizedChatMessages LoadLanguageStrings()
+    {
+        return new LocalizedChatMessages
+        {
+            MapRevealed = GetLocalizedString(7256),
+            AllTrapsRemoved = GetLocalizedString(7255),
+            HoardOnCurrentFloor = GetLocalizedString(7272),
+            HoardNotOnCurrentFloor = GetLocalizedString(7273),
+            HoardCofferOpened = GetLocalizedString(7274),
+            FloorChanged =
+                new Regex("^" + GetLocalizedString(7270, true).Replace("\u0002 \u0003\ufffd\u0002\u0003", @"(\d+)") +
+                          "$"),
+        };
+    }
+
+    private string GetLocalizedString(uint id, bool asRawData = false)
+    {
+        var text = _dataManager.GetExcelSheet<LogMessage>()?.GetRow(id)?.Text;
+        if (text == null)
+            return "Unknown";
+
+        if (asRawData)
+            return Encoding.UTF8.GetString(text.RawData);
+        else
+            return text.ToString();
+    }
+
+    private sealed class LocalizedChatMessages
+    {
+        public string MapRevealed { get; init; } = "???"; //"The map for this floor has been revealed!";
+        public string AllTrapsRemoved { get; init; } = "???"; // "All the traps on this floor have disappeared!";
+        public string HoardOnCurrentFloor { get; init; } = "???"; // "You sense the Accursed Hoard calling you...";
+
+        public string HoardNotOnCurrentFloor { get; init; } =
+            "???"; // "You do not sense the call of the Accursed Hoard on this floor...";
+
+        public string HoardCofferOpened { get; init; } = "???"; // "You discover a piece of the Accursed Hoard!";
+
+        public Regex FloorChanged { get; init; } =
+            new(@"This isn't a game message, but will be replaced"); // new Regex(@"^Floor (\d+)$");
+    }
 }

Pal.Client/DependencyInjection/DebugState.cs

@@ -1,15 +1,14 @@
 using System;
 
-namespace Pal.Client.DependencyInjection
+namespace Pal.Client.DependencyInjection;
+
+internal sealed class DebugState
 {
-    internal sealed class DebugState
+    public string? DebugMessage { get; set; }
-    {
-        public string? DebugMessage { get; set; }
 
-        public void SetFromException(Exception e)
+    public void SetFromException(Exception e)
-            => DebugMessage = $"{DateTime.Now}\n{e}";
+        => DebugMessage = $"{DateTime.Now}\n{e}";
 
-        public void Reset()
+    public void Reset()
-            => DebugMessage = null;
+        => DebugMessage = null;
-    }
 }

Pal.Client/DependencyInjection/GameHooks.cs

@@ -4,103 +4,103 @@ using Dalamud.Game.ClientState.Objects;
 using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Hooking;
 using Dalamud.Memory;
+using Dalamud.Plugin.Services;
 using Dalamud.Utility.Signatures;
 using Microsoft.Extensions.Logging;
 using Pal.Client.Floors;
 
-namespace Pal.Client.DependencyInjection
+namespace Pal.Client.DependencyInjection;
+
+internal sealed unsafe class GameHooks : IDisposable
 {
-    internal sealed unsafe class GameHooks : IDisposable
+    private readonly ILogger<GameHooks> _logger;
-    {
+    private readonly IObjectTable _objectTable;
-        private readonly ILogger<GameHooks> _logger;
+    private readonly TerritoryState _territoryState;
-        private readonly ObjectTable _objectTable;
+    private readonly FrameworkService _frameworkService;
-        private readonly TerritoryState _territoryState;
-        private readonly FrameworkService _frameworkService;
 
 #pragma warning disable CS0649
-        private delegate nint ActorVfxCreateDelegate(char* a1, nint a2, nint a3, float a4, char a5, ushort a6, char a7);
+    private delegate nint ActorVfxCreateDelegate(char* a1, nint a2, nint a3, float a4, char a5, ushort a6, char a7);
 
-        [Signature("40 53 55 56 57 48 81 EC ?? ?? ?? ?? 0F 29 B4 24 ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 0F B6 AC 24 ?? ?? ?? ?? 0F 28 F3 49 8B F8", DetourName = nameof(ActorVfxCreate))]
+    [Signature("40 53 55 56 57 48 81 EC ?? ?? ?? ?? 0F 29 B4 24 ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 0F B6 AC 24 ?? ?? ?? ?? 0F 28 F3 49 8B F8", DetourName = nameof(ActorVfxCreate))]
-        private Hook<ActorVfxCreateDelegate> ActorVfxCreateHook { get; init; } = null!;
+    private Hook<ActorVfxCreateDelegate> ActorVfxCreateHook { get; init; } = null!;
 #pragma warning restore CS0649
 
-        public GameHooks(ILogger<GameHooks> logger, ObjectTable objectTable, TerritoryState territoryState, FrameworkService frameworkService)
+    public GameHooks(ILogger<GameHooks> logger, IObjectTable objectTable, TerritoryState territoryState, FrameworkService frameworkService, IGameInteropProvider gameInteropProvider)
+    {
+        _logger = logger;
+        _objectTable = objectTable;
+        _territoryState = territoryState;
+        _frameworkService = frameworkService;
+
+        _logger.LogDebug("Initializing game hooks");
+        gameInteropProvider.InitializeFromAttributes(this);
+        ActorVfxCreateHook.Enable();
+
+        _logger.LogDebug("Game hooks initialized");
+    }
+
+    /// <summary>
+    /// Even with a pomander of sight, the BattleChara's position for the trap remains at {0, 0, 0} until it is activated.
+    /// Upon exploding, the trap's position is moved to the exact location that the pomander of sight would have revealed.
+    ///
+    /// That exact position appears to be used for VFX playing when you walk into it - even if you barely walk into the
+    /// outer ring of an otter/luring/impeding/landmine trap, the VFX plays at the exact center and not at your character's
+    /// location.
+    ///
+    /// Especially at higher floors, you're more likely to walk into an undiscovered trap compared to e.g. 51-60,
+    /// and you probably don't want to/can't use sight on every floor - yet the trap location is still useful information.
+    ///
+    /// Some (but not all) chests also count as BattleChara named 'Trap', however the effect upon opening isn't played via
+    /// ActorVfxCreate even if they explode (but probably as a Vfx with static location, doesn't matter for here).
+    ///
+    /// Landmines and luring traps also don't play a VFX attached to their BattleChara.
+    ///
+    /// otter:      vfx/common/eff/dk05th_stdn0t.avfx <br/>
+    /// toading:    vfx/common/eff/dk05th_stdn0t.avfx <br/>
+    /// enfeebling: vfx/common/eff/dk05th_stdn0t.avfx <br/>
+    /// landmine:   none <br/>
+    /// luring:     none <br/>
+    /// impeding:   vfx/common/eff/dk05ht_ipws0t.avfx (one of silence/pacification) <br/>
+    /// impeding:   vfx/common/eff/dk05ht_slet0t.avfx (the other of silence/pacification) <br/>
+    ///
+    /// It is of course annoying that, when testing, almost all traps are landmines.
+    /// There's also vfx/common/eff/dk01gd_inv0h.avfx for e.g. impeding when you're invulnerable, but not sure if that
+    /// has other trigger conditions.
+    /// </summary>
+    public nint ActorVfxCreate(char* a1, nint a2, nint a3, float a4, char a5, ushort a6, char a7)
+    {
+        try
         {
-            _logger = logger;
+            if (_territoryState.IsInDeepDungeon())
-            _objectTable = objectTable;
-            _territoryState = territoryState;
-            _frameworkService = frameworkService;
-
-            _logger.LogDebug("Initializing game hooks");
-            SignatureHelper.Initialise(this);
-            ActorVfxCreateHook.Enable();
-
-            _logger.LogDebug("Game hooks initialized");
-        }
-
-        /// <summary>
-        /// Even with a pomander of sight, the BattleChara's position for the trap remains at {0, 0, 0} until it is activated.
-        /// Upon exploding, the trap's position is moved to the exact location that the pomander of sight would have revealed.
-        ///
-        /// That exact position appears to be used for VFX playing when you walk into it - even if you barely walk into the
-        /// outer ring of an otter/luring/impeding/landmine trap, the VFX plays at the exact center and not at your character's
-        /// location.
-        ///
-        /// Especially at higher floors, you're more likely to walk into an undiscovered trap compared to e.g. 51-60,
-        /// and you probably don't want to/can't use sight on every floor - yet the trap location is still useful information.
-        ///
-        /// Some (but not all) chests also count as BattleChara named 'Trap', however the effect upon opening isn't played via 
-        /// ActorVfxCreate even if they explode (but probably as a Vfx with static location, doesn't matter for here).
-        /// 
-        /// Landmines and luring traps also don't play a VFX attached to their BattleChara.
-        /// 
-        /// otter:      vfx/common/eff/dk05th_stdn0t.avfx <br/>
-        /// toading:    vfx/common/eff/dk05th_stdn0t.avfx <br/>
-        /// enfeebling: vfx/common/eff/dk05th_stdn0t.avfx <br/>
-        /// landmine:   none <br/>
-        /// luring:     none <br/>
-        /// impeding:   vfx/common/eff/dk05ht_ipws0t.avfx (one of silence/pacification) <br/>
-        /// impeding:   vfx/common/eff/dk05ht_slet0t.avfx (the other of silence/pacification) <br/>
-        /// 
-        /// It is of course annoying that, when testing, almost all traps are landmines.
-        /// There's also vfx/common/eff/dk01gd_inv0h.avfx for e.g. impeding when you're invulnerable, but not sure if that
-        /// has other trigger conditions.
-        /// </summary>
-        public nint ActorVfxCreate(char* a1, nint a2, nint a3, float a4, char a5, ushort a6, char a7)
-        {
-            try
             {
-                if (_territoryState.IsInDeepDungeon())
+                var vfxPath = MemoryHelper.ReadString(new nint(a1), Encoding.ASCII, 256);
+                var obj = _objectTable.CreateObjectReference(a2);
+
+                /*
+                if (Service.Configuration.BetaKey == "VFX")
+                    _chat.PalPrint($"{vfxPath} on {obj}");
+                */
+
+                if (obj is IBattleChara bc && (bc.NameId == /* potd */ 5042 || bc.NameId == /* hoh */ 7395))
                 {
-                    var vfxPath = MemoryHelper.ReadString(new nint(a1), Encoding.ASCII, 256);
+                    if (vfxPath == "vfx/common/eff/dk05th_stdn0t.avfx" || vfxPath == "vfx/common/eff/dk05ht_ipws0t.avfx")
-                    var obj = _objectTable.CreateObjectReference(a2);
-
-                    /*
-                    if (Service.Configuration.BetaKey == "VFX")
-                        _chat.PalPrint($"{vfxPath} on {obj}");
-                    */
-
-                    if (obj is BattleChara bc && (bc.NameId == /* potd */ 5042 || bc.NameId == /* hoh */ 7395))
                     {
-                        if (vfxPath == "vfx/common/eff/dk05th_stdn0t.avfx" || vfxPath == "vfx/common/eff/dk05ht_ipws0t.avfx")
+                        _logger.LogDebug("VFX '{Path}' playing at {Location}", vfxPath, obj.Position);
-                        {
+                        _frameworkService.NextUpdateObjects.Enqueue(obj.Address);
-                            _logger.LogDebug("VFX '{Path}' playing at {Location}", vfxPath, obj.Position);
-                            _frameworkService.NextUpdateObjects.Enqueue(obj.Address);
-                        }
                     }
                 }
             }
-            catch (Exception e)
-            {
-                _logger.LogError(e, "VFX Create Hook failed");
-            }
-            return ActorVfxCreateHook.Original(a1, a2, a3, a4, a5, a6, a7);
         }
-
+        catch (Exception e)
-        public void Dispose()
         {
-            _logger.LogDebug("Disposing game hooks");
+            _logger.LogError(e, "VFX Create Hook failed");
-            ActorVfxCreateHook.Dispose();
         }
+        return ActorVfxCreateHook.Original(a1, a2, a3, a4, a5, a6, a7);
+    }
+
+    public void Dispose()
+    {
+        _logger.LogDebug("Disposing game hooks");
+        ActorVfxCreateHook.Dispose();
     }
 }

Pal.Client/DependencyInjection/ImportService.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Numerics;
 using System.Threading;
 using System.Threading.Tasks;
-using Account;
+using Export;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Pal.Client.Database;
@@ -12,155 +12,154 @@ using Pal.Client.Floors;
 using Pal.Client.Floors.Tasks;
 using Pal.Common;
 
-namespace Pal.Client.DependencyInjection
+namespace Pal.Client.DependencyInjection;
+
+internal sealed class ImportService
 {
-    internal sealed class ImportService
+    private readonly IServiceProvider _serviceProvider;
+    private readonly FloorService _floorService;
+    private readonly Cleanup _cleanup;
+
+    public ImportService(
+        IServiceProvider serviceProvider,
+        FloorService floorService,
+        Cleanup cleanup)
     {
-        private readonly IServiceProvider _serviceProvider;
+        _serviceProvider = serviceProvider;
-        private readonly FloorService _floorService;
+        _floorService = floorService;
-        private readonly Cleanup _cleanup;
+        _cleanup = cleanup;
+    }
 
-        public ImportService(
+    public async Task<ImportHistory?> FindLast(CancellationToken token = default)
-            IServiceProvider serviceProvider,
+    {
-            FloorService floorService,
+        await using var scope = _serviceProvider.CreateAsyncScope();
-            Cleanup cleanup)
+        await using var dbContext = scope.ServiceProvider.GetRequiredService<PalClientContext>();
+
+        return await dbContext.Imports.OrderByDescending(x => x.ImportedAt).ThenBy(x => x.Id)
+            .FirstOrDefaultAsync(cancellationToken: token);
+    }
+
+    public (int traps, int hoard) Import(ExportRoot import)
+    {
+        try
         {
-            _serviceProvider = serviceProvider;
+            _floorService.SetToImportState();
-            _floorService = floorService;
-            _cleanup = cleanup;
-        }
 
-        public async Task<ImportHistory?> FindLast(CancellationToken token = default)
+            using var scope = _serviceProvider.CreateScope();
-        {
+            using var dbContext = scope.ServiceProvider.GetRequiredService<PalClientContext>();
-            await using var scope = _serviceProvider.CreateAsyncScope();
-            await using var dbContext = scope.ServiceProvider.GetRequiredService<PalClientContext>();
 
-            return await dbContext.Imports.OrderByDescending(x => x.ImportedAt).ThenBy(x => x.Id)
+            dbContext.Imports.RemoveRange(dbContext.Imports.Where(x => x.RemoteUrl == import.ServerUrl).ToList());
-                .FirstOrDefaultAsync(cancellationToken: token);
+            dbContext.SaveChanges();
-        }
 
-        public (int traps, int hoard) Import(ExportRoot import)
+            ImportHistory importHistory = new ImportHistory
-        {
-            try
             {
-                _floorService.SetToImportState();
+                Id = Guid.Parse(import.ExportId),
+                RemoteUrl = import.ServerUrl,
+                ExportedAt = import.CreatedAt.ToDateTime(),
+                ImportedAt = DateTime.UtcNow,
+            };
+            dbContext.Imports.Add(importHistory);
 
-                using var scope = _serviceProvider.CreateScope();
+            int traps = 0;
-                using var dbContext = scope.ServiceProvider.GetRequiredService<PalClientContext>();
+            int hoard = 0;
+            foreach (var floor in import.Floors)
+            {
+                ETerritoryType territoryType = (ETerritoryType)floor.TerritoryType;
 
-                dbContext.Imports.RemoveRange(dbContext.Imports.Where(x => x.RemoteUrl == import.ServerUrl).ToList());
+                List<PersistentLocation> existingLocations = dbContext.Locations
-                dbContext.SaveChanges();
+                    .Where(loc => loc.TerritoryType == floor.TerritoryType)
-
+                    .ToList()
-                ImportHistory importHistory = new ImportHistory
+                    .Select(LoadTerritory.ToMemoryLocation)
+                    .ToList();
+                foreach (var exportLocation in floor.Objects)
                 {
-                    Id = Guid.Parse(import.ExportId),
+                    PersistentLocation persistentLocation = new PersistentLocation
-                    RemoteUrl = import.ServerUrl,
-                    ExportedAt = import.CreatedAt.ToDateTime(),
-                    ImportedAt = DateTime.UtcNow,
-                };
-                dbContext.Imports.Add(importHistory);
-
-                int traps = 0;
-                int hoard = 0;
-                foreach (var floor in import.Floors)
-                {
-                    ETerritoryType territoryType = (ETerritoryType)floor.TerritoryType;
-
-                    List<PersistentLocation> existingLocations = dbContext.Locations
-                        .Where(loc => loc.TerritoryType == floor.TerritoryType)
-                        .ToList()
-                        .Select(LoadTerritory.ToMemoryLocation)
-                        .ToList();
-                    foreach (var exportLocation in floor.Objects)
                     {
-                        PersistentLocation persistentLocation = new PersistentLocation
+                        Type = ToMemoryType(exportLocation.Type),
-                        {
+                        Position = new Vector3(exportLocation.X, exportLocation.Y, exportLocation.Z),
-                            Type = ToMemoryType(exportLocation.Type),
+                        Source = ClientLocation.ESource.Unknown,
-                            Position = new Vector3(exportLocation.X, exportLocation.Y, exportLocation.Z),
+                    };
-                            Source = ClientLocation.ESource.Unknown,
-                        };
 
-                        var existingLocation = existingLocations.FirstOrDefault(x => x == persistentLocation);
+                    var existingLocation = existingLocations.FirstOrDefault(x => x == persistentLocation);
-                        if (existingLocation != null)
+                    if (existingLocation != null)
-                        {
+                    {
-                            var clientLoc = dbContext.Locations.FirstOrDefault(o => o.LocalId == existingLocation.LocalId);
+                        var clientLoc = dbContext.Locations.FirstOrDefault(o => o.LocalId == existingLocation.LocalId);
-                            clientLoc?.ImportedBy.Add(importHistory);
+                        clientLoc?.ImportedBy.Add(importHistory);
 
-                            continue;
+                        continue;
-                        }
-
-                        ClientLocation clientLocation = new ClientLocation
-                        {
-                            TerritoryType = (ushort)territoryType,
-                            Type = ToClientLocationType(exportLocation.Type),
-                            X = exportLocation.X,
-                            Y = exportLocation.Y,
-                            Z = exportLocation.Z,
-                            Seen = false,
-                            Source = ClientLocation.ESource.Import,
-                            ImportedBy = new List<ImportHistory> { importHistory },
-                            SinceVersion = typeof(Plugin).Assembly.GetName().Version!.ToString(2),
-                        };
-                        dbContext.Locations.Add(clientLocation);
-
-                        if (exportLocation.Type == ExportObjectType.Trap)
-                            traps++;
-                        else if (exportLocation.Type == ExportObjectType.Hoard)
-                            hoard++;
                     }
+
+                    ClientLocation clientLocation = new ClientLocation
+                    {
+                        TerritoryType = (ushort)territoryType,
+                        Type = ToClientLocationType(exportLocation.Type),
+                        X = exportLocation.X,
+                        Y = exportLocation.Y,
+                        Z = exportLocation.Z,
+                        Seen = false,
+                        Source = ClientLocation.ESource.Import,
+                        ImportedBy = new List<ImportHistory> { importHistory },
+                        SinceVersion = typeof(Plugin).Assembly.GetName().Version!.ToString(2),
+                    };
+                    dbContext.Locations.Add(clientLocation);
+
+                    if (exportLocation.Type == ExportObjectType.Trap)
+                        traps++;
+                    else if (exportLocation.Type == ExportObjectType.Hoard)
+                        hoard++;
                 }
-
-                dbContext.SaveChanges();
-
-                _cleanup.Purge(dbContext);
-                dbContext.SaveChanges();
-
-                return (traps, hoard);
-            }
-            finally
-            {
-                _floorService.ResetAll();
             }
+
+            dbContext.SaveChanges();
+
+            _cleanup.Purge(dbContext);
+            dbContext.SaveChanges();
+
+            return (traps, hoard);
         }
-
+        finally
-        private MemoryLocation.EType ToMemoryType(ExportObjectType exportLocationType)
         {
-            return exportLocationType switch
+            _floorService.ResetAll();
-            {
-                ExportObjectType.Trap => MemoryLocation.EType.Trap,
-                ExportObjectType.Hoard => MemoryLocation.EType.Hoard,
-                _ => throw new ArgumentOutOfRangeException(nameof(exportLocationType), exportLocationType, null)
-            };
         }
+    }
 
-        private ClientLocation.EType ToClientLocationType(ExportObjectType exportLocationType)
+    private MemoryLocation.EType ToMemoryType(ExportObjectType exportLocationType)
+    {
+        return exportLocationType switch
         {
-            return exportLocationType switch
+            ExportObjectType.Trap => MemoryLocation.EType.Trap,
-            {
+            ExportObjectType.Hoard => MemoryLocation.EType.Hoard,
-                ExportObjectType.Trap => ClientLocation.EType.Trap,
+            _ => throw new ArgumentOutOfRangeException(nameof(exportLocationType), exportLocationType, null)
-                ExportObjectType.Hoard => ClientLocation.EType.Hoard,
+        };
-                _ => throw new ArgumentOutOfRangeException(nameof(exportLocationType), exportLocationType, null)
+    }
-            };
+
+    private ClientLocation.EType ToClientLocationType(ExportObjectType exportLocationType)
+    {
+        return exportLocationType switch
+        {
+            ExportObjectType.Trap => ClientLocation.EType.Trap,
+            ExportObjectType.Hoard => ClientLocation.EType.Hoard,
+            _ => throw new ArgumentOutOfRangeException(nameof(exportLocationType), exportLocationType, null)
+        };
+    }
+
+    public void RemoveById(Guid id)
+    {
+        try
+        {
+            _floorService.SetToImportState();
+            using var scope = _serviceProvider.CreateScope();
+            using var dbContext = scope.ServiceProvider.GetRequiredService<PalClientContext>();
+
+            dbContext.RemoveRange(dbContext.Imports.Where(x => x.Id == id));
+            dbContext.SaveChanges();
+
+            _cleanup.Purge(dbContext);
+            dbContext.SaveChanges();
         }
-
+        finally
-        public void RemoveById(Guid id)
         {
-            try
+            _floorService.ResetAll();
-            {
-                _floorService.SetToImportState();
-                using var scope = _serviceProvider.CreateScope();
-                using var dbContext = scope.ServiceProvider.GetRequiredService<PalClientContext>();
-
-                dbContext.RemoveRange(dbContext.Imports.Where(x => x.Id == id));
-                dbContext.SaveChanges();
-
-                _cleanup.Purge(dbContext);
-                dbContext.SaveChanges();
-            }
-            finally
-            {
-                _floorService.ResetAll();
-            }
         }
     }
 }

Pal.Client/DependencyInjection/Logging/DalamudLogger.cs

@@ -1,90 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Serilog.Events;
-
-namespace Pal.Client.DependencyInjection.Logging
-{
-    internal sealed class DalamudLogger : ILogger
-    {
-        private static readonly string AssemblyName = typeof(Plugin).Assembly.GetName().Name!;
-        private static readonly Serilog.ILogger PluginLogDelegate = Serilog.Log.ForContext("SourceContext", AssemblyName);
-        private readonly string _name;
-        private readonly IExternalScopeProvider? _scopeProvider;
-
-        public DalamudLogger(string name, IExternalScopeProvider? scopeProvider)
-        {
-            _name = name;
-            _scopeProvider = scopeProvider;
-        }
-
-        public IDisposable BeginScope<TState>(TState state)
-            where TState : notnull
-            => _scopeProvider?.Push(state) ?? NullScope.Instance;
-
-        public bool IsEnabled(LogLevel logLevel) => logLevel != LogLevel.None && IsEnabled(ToSerilogLevel(logLevel));
-
-        private bool IsEnabled(LogEventLevel logEventLevel) => PluginLogDelegate.IsEnabled(logEventLevel);
-
-        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception,
-            Func<TState, Exception?, string> formatter)
-        {
-            if (logLevel == LogLevel.None)
-                return;
-
-            LogEventLevel logEventLevel = ToSerilogLevel(logLevel);
-            if (!IsEnabled(logEventLevel))
-                return;
-
-            if (formatter == null)
-                throw new ArgumentNullException(nameof(formatter));
-
-            StringBuilder sb = new StringBuilder();
-            sb.Append('[').Append(AssemblyName).Append("] ");
-            _scopeProvider?.ForEachScope((scope, builder) =>
-                {
-                    if (scope is IEnumerable<KeyValuePair<string, object>> properties)
-                    {
-                        foreach (KeyValuePair<string, object> pair in properties)
-                        {
-                            builder.Append('<').Append(pair.Key).Append('=').Append(pair.Value)
-                                .Append("> ");
-                        }
-                    }
-                    else if (scope != null)
-                        builder.Append('<').Append(scope).Append("> ");
-                },
-                sb);
-            sb.Append(_name).Append(": ").Append(formatter(state, null));
-            PluginLogDelegate.Write(logEventLevel, exception, sb.ToString());
-        }
-
-        private LogEventLevel ToSerilogLevel(LogLevel logLevel)
-        {
-            return logLevel switch
-            {
-                LogLevel.Critical => LogEventLevel.Fatal,
-                LogLevel.Error => LogEventLevel.Error,
-                LogLevel.Warning => LogEventLevel.Warning,
-                LogLevel.Information => LogEventLevel.Information,
-                LogLevel.Debug => LogEventLevel.Debug,
-                LogLevel.Trace => LogEventLevel.Verbose,
-                _ => throw new ArgumentOutOfRangeException(nameof(logLevel), logLevel, null)
-            };
-        }
-
-        private sealed class NullScope : IDisposable
-        {
-            public static NullScope Instance { get; } = new();
-
-            private NullScope()
-            {
-            }
-
-            public void Dispose()
-            {
-            }
-        }
-    }
-}

Pal.Client/DependencyInjection/Logging/DalamudLoggerProvider.cs

@@ -1,31 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-
-namespace Pal.Client.DependencyInjection.Logging
-{
-    internal sealed class DalamudLoggerProvider : ILoggerProvider, ISupportExternalScope
-    {
-        private IExternalScopeProvider? _scopeProvider;
-
-        public ILogger CreateLogger(string categoryName) => new DalamudLogger(categoryName, _scopeProvider);
-
-        /// <summary>
-        /// Manual logger creation, doesn't handle scopes.
-        /// </summary>
-        public ILogger CreateLogger(Type type) => CreateLogger(type.FullName ?? type.ToString());
-
-        /// <summary>
-        /// Manual logger creation, doesn't handle scopes.
-        /// </summary>
-        public ILogger CreateLogger<T>() => CreateLogger(typeof(T));
-
-        public void SetScopeProvider(IExternalScopeProvider scopeProvider)
-        {
-            _scopeProvider = scopeProvider;
-        }
-
-        public void Dispose()
-        {
-        }
-    }
-}

Pal.Client/DependencyInjection/RepoVerification.cs

@@ -6,21 +6,22 @@ using Microsoft.Extensions.Logging;
 using Pal.Client.Extensions;
 using Pal.Client.Properties;
 
-namespace Pal.Client.DependencyInjection
+namespace Pal.Client.DependencyInjection;
+
+internal sealed class RepoVerification
 {
-    internal sealed class RepoVerification
+    public RepoVerification(ILogger<RepoVerification> logger, IDalamudPluginInterface pluginInterface, Chat chat)
     {
-        public RepoVerification(ILogger<RepoVerification> logger, DalamudPluginInterface pluginInterface, Chat chat)
+        logger.LogInformation("Install source: {Repo}", pluginInterface.SourceRepository);
+        if (!pluginInterface.IsDev && pluginInterface.SourceRepository.TrimEnd('/') != "https://plugins.carvel.li")
         {
-            logger.LogInformation("Install source: {Repo}", pluginInterface.SourceRepository);
+            chat.Error(string.Format(Localization.Error_WrongRepository,
-            if (!pluginInterface.IsDev
+                "https://plugins.carvel.li"));
-                && !pluginInterface.SourceRepository.StartsWith("https://raw.githubusercontent.com/carvelli/")
+            throw new RepoVerificationFailedException();
-                && !pluginInterface.SourceRepository.StartsWith("https://github.com/carvelli/"))
-            {
-                chat.Error(string.Format(Localization.Error_WrongRepository,
-                    "https://github.com/carvelli/Dalamud-Plugins"));
-                throw new InvalidOperationException();
-            }
         }
     }
+
+    internal sealed class RepoVerificationFailedException : Exception
+    {
+    }
 }

Pal.Client/DependencyInjection/StatisticsService.cs

@@ -2,64 +2,73 @@
 using System.Threading.Tasks;
 using Dalamud.Game.Gui;
 using Grpc.Core;
+using Microsoft.Extensions.Logging;
 using Pal.Client.Configuration;
 using Pal.Client.Extensions;
 using Pal.Client.Net;
 using Pal.Client.Properties;
 using Pal.Client.Windows;
 
-namespace Pal.Client.DependencyInjection
+namespace Pal.Client.DependencyInjection;
+
+internal sealed class StatisticsService
 {
-    internal sealed class StatisticsService
+    private readonly IPalacePalConfiguration _configuration;
+    private readonly ILogger<StatisticsService> _logger;
+    private readonly RemoteApi _remoteApi;
+    private readonly StatisticsWindow _statisticsWindow;
+    private readonly Chat _chat;
+
+    public StatisticsService(
+        IPalacePalConfiguration configuration,
+        ILogger<StatisticsService> logger,
+        RemoteApi remoteApi,
+        StatisticsWindow statisticsWindow,
+        Chat chat)
     {
-        private readonly IPalacePalConfiguration _configuration;
+        _configuration = configuration;
-        private readonly RemoteApi _remoteApi;
+        _logger = logger;
-        private readonly StatisticsWindow _statisticsWindow;
+        _remoteApi = remoteApi;
-        private readonly Chat _chat;
+        _statisticsWindow = statisticsWindow;
+        _chat = chat;
+    }
 
-        public StatisticsService(IPalacePalConfiguration configuration, RemoteApi remoteApi,
+    public void ShowGlobalStatistics()
-            StatisticsWindow statisticsWindow, Chat chat)
+    {
+        Task.Run(async () => await FetchFloorStatistics());
+    }
+
+    private async Task FetchFloorStatistics()
+    {
+        try
         {
-            _configuration = configuration;
+            if (!_configuration.HasRoleOnCurrentServer(RemoteApi.RemoteUrl, "statistics:view"))
-            _remoteApi = remoteApi;
-            _statisticsWindow = statisticsWindow;
-            _chat = chat;
-        }
-
-        public void ShowGlobalStatistics()
-        {
-            Task.Run(async () => await FetchFloorStatistics());
-        }
-
-        private async Task FetchFloorStatistics()
-        {
-            try
-            {
-                if (!_configuration.HasRoleOnCurrentServer(RemoteApi.RemoteUrl, "statistics:view"))
-                {
-                    _chat.Error(Localization.Command_pal_stats_CurrentFloor);
-                    return;
-                }
-
-                var (success, floorStatistics) = await _remoteApi.FetchStatistics();
-                if (success)
-                {
-                    _statisticsWindow.SetFloorData(floorStatistics);
-                    _statisticsWindow.IsOpen = true;
-                }
-                else
-                {
-                    _chat.Error(Localization.Command_pal_stats_UnableToFetchStatistics);
-                }
-            }
-            catch (RpcException e) when (e.StatusCode == StatusCode.PermissionDenied)
             {
                 _chat.Error(Localization.Command_pal_stats_CurrentFloor);
+                return;
             }
-            catch (Exception e)
+
+            var (success, floorStatistics) = await _remoteApi.FetchStatistics();
+            if (success)
             {
-                _chat.Error(e.ToString());
+                _statisticsWindow.SetFloorData(floorStatistics);
+                _statisticsWindow.IsOpen = true;
             }
+            else
+            {
+                _chat.Error(Localization.Command_pal_stats_UnableToFetchStatistics);
+            }
+        }
+        catch (RpcException e) when (e.StatusCode == StatusCode.PermissionDenied)
+        {
+            _logger.LogWarning(e, "Access denied while fetching floor statistics");
+            _chat.Error(Localization.Command_pal_stats_CurrentFloor);
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "Could not fetch floor statistics");
+            _chat.Error(string.Format(Localization.Error_CommandFailed,
+                $"{e.GetType()} - {e.Message}"));
         }
     }
 }

Pal.Client/DependencyInjectionContext.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using Dalamud.Data;
+using Dalamud.Extensions.MicrosoftLogging;
 using Dalamud.Game;
 using Dalamud.Game.ClientState;
 using Dalamud.Game.ClientState.Conditions;
@@ -9,6 +10,7 @@ using Dalamud.Game.Command;
 using Dalamud.Game.Gui;
 using Dalamud.Interface.Windowing;
 using Dalamud.Plugin;
+using Dalamud.Plugin.Services;
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
@@ -18,174 +20,175 @@ using Pal.Client.Configuration;
 using Pal.Client.Configuration.Legacy;
 using Pal.Client.Database;
 using Pal.Client.DependencyInjection;
-using Pal.Client.DependencyInjection.Logging;
 using Pal.Client.Floors;
 using Pal.Client.Net;
-using Pal.Client.Properties;
 using Pal.Client.Rendering;
 using Pal.Client.Scheduled;
 using Pal.Client.Windows;
 
-namespace Pal.Client
+namespace Pal.Client;
+
+/// <summary>
+/// DI-aware Plugin.
+/// </summary>
+internal sealed class DependencyInjectionContext : IDisposable
 {
+    public const string DatabaseFileName = "palace-pal.data.sqlite3";
+
     /// <summary>
-    /// DI-aware Plugin.
+    /// Initialized as temporary logger, will be overriden once context is ready with a logger that supports scopes.
     /// </summary>
-    internal sealed class DependencyInjectionContext : IDisposable
+    private ILogger _logger;
+
+    private readonly string _sqliteConnectionString;
+    private readonly ServiceCollection _serviceCollection = new();
+    private ServiceProvider? _serviceProvider;
+
+    public DependencyInjectionContext(
+        IDalamudPluginInterface pluginInterface,
+        IClientState clientState,
+        IGameGui gameGui,
+        IChatGui chatGui,
+        IObjectTable objectTable,
+        IFramework framework,
+        ICondition condition,
+        ICommandManager commandManager,
+        IDataManager dataManager,
+        IGameInteropProvider gameInteropProvider,
+        IPluginLog pluginLog,
+        Plugin plugin)
     {
-        public const string DatabaseFileName = "palace-pal.data.sqlite3";
+        var loggerProvider = new DalamudLoggerProvider(pluginLog);
-        public static DalamudLoggerProvider LoggerProvider { get; } = new();
+        _logger = loggerProvider.CreateLogger<DependencyInjectionContext>();
+        _logger.LogInformation("Building dalamud service container for {Assembly}",
+            typeof(DependencyInjectionContext).Assembly.FullName);
 
-        /// <summary>
+        // set up legacy services
-        /// Initialized as temporary logger, will be overriden once context is ready with a logger that supports scopes.
-        /// </summary>
-        private ILogger _logger = LoggerProvider.CreateLogger<DependencyInjectionContext>();
-
-        private readonly string _sqliteConnectionString;
-        private readonly ServiceCollection _serviceCollection = new();
-        private ServiceProvider? _serviceProvider;
-
-        public string Name => Localization.Palace_Pal;
-
-        public DependencyInjectionContext(
-            DalamudPluginInterface pluginInterface,
-            ClientState clientState,
-            GameGui gameGui,
-            ChatGui chatGui,
-            ObjectTable objectTable,
-            Framework framework,
-            Condition condition,
-            CommandManager commandManager,
-            DataManager dataManager,
-            Plugin plugin)
-        {
-            _logger.LogInformation("Building dalamud service container for {Assembly}",
-                typeof(DependencyInjectionContext).Assembly.FullName);
-
-            // set up legacy services
 #pragma warning disable CS0612
-            JsonFloorState.SetContextProperties(pluginInterface.GetPluginConfigDirectory());
+        JsonFloorState.SetContextProperties(pluginInterface.GetPluginConfigDirectory());
 #pragma warning restore CS0612
 
-            // set up logging
+        // set up logging
-            _serviceCollection.AddLogging(builder =>
+        _serviceCollection.AddLogging(builder =>
-                builder.AddFilter("Pal", LogLevel.Trace)
+            builder.AddFilter("Pal", LogLevel.Trace)
-                    .AddFilter("Microsoft.EntityFrameworkCore.Database", LogLevel.Warning)
+                .AddFilter("Microsoft.EntityFrameworkCore.Database", LogLevel.Warning)
-                    .AddFilter("Grpc", LogLevel.Debug)
+                .AddFilter("Grpc", LogLevel.Debug)
-                    .ClearProviders()
+                .ClearProviders()
-                    .AddProvider(LoggerProvider));
+                .AddDalamudLogger(pluginLog));
 
-            // dalamud
+        // dalamud
-            _serviceCollection.AddSingleton<IDalamudPlugin>(plugin);
+        _serviceCollection.AddSingleton<IDalamudPlugin>(plugin);
-            _serviceCollection.AddSingleton(pluginInterface);
+        _serviceCollection.AddSingleton(pluginInterface);
-            _serviceCollection.AddSingleton(clientState);
+        _serviceCollection.AddSingleton(clientState);
-            _serviceCollection.AddSingleton(gameGui);
+        _serviceCollection.AddSingleton(gameGui);
-            _serviceCollection.AddSingleton(chatGui);
+        _serviceCollection.AddSingleton(chatGui);
-            _serviceCollection.AddSingleton<Chat>();
+        _serviceCollection.AddSingleton<Chat>();
-            _serviceCollection.AddSingleton(objectTable);
+        _serviceCollection.AddSingleton(objectTable);
-            _serviceCollection.AddSingleton(framework);
+        _serviceCollection.AddSingleton(framework);
-            _serviceCollection.AddSingleton(condition);
+        _serviceCollection.AddSingleton(condition);
-            _serviceCollection.AddSingleton(commandManager);
+        _serviceCollection.AddSingleton(commandManager);
-            _serviceCollection.AddSingleton(dataManager);
+        _serviceCollection.AddSingleton(dataManager);
-            _serviceCollection.AddSingleton(new WindowSystem(typeof(DependencyInjectionContext).AssemblyQualifiedName));
+        _serviceCollection.AddSingleton(gameInteropProvider);
+        _serviceCollection.AddSingleton(new WindowSystem(typeof(DependencyInjectionContext).AssemblyQualifiedName));
 
-            _sqliteConnectionString =
+        _sqliteConnectionString =
-                $"Data Source={Path.Join(pluginInterface.GetPluginConfigDirectory(), DatabaseFileName)}";
+            $"Data Source={Path.Join(pluginInterface.GetPluginConfigDirectory(), DatabaseFileName)}";
-        }
+    }
 
-        public IServiceProvider BuildServiceContainer()
+    public IServiceProvider BuildServiceContainer()
+    {
+        _logger.LogInformation("Building async service container for {Assembly}",
+            typeof(DependencyInjectionContext).Assembly.FullName);
+
+        // EF core
+        _serviceCollection.AddDbContext<PalClientContext>(o => o
+            .UseSqlite(_sqliteConnectionString)
+            .UseModel(Database.Compiled.PalClientContextModel.Instance));
+        _serviceCollection.AddTransient<JsonMigration>();
+        _serviceCollection.AddScoped<Cleanup>();
+
+        // plugin-specific
+        _serviceCollection.AddScoped<DependencyContextInitializer>();
+        _serviceCollection.AddScoped<DebugState>();
+        _serviceCollection.AddScoped<GameHooks>();
+        _serviceCollection.AddScoped<RemoteApi>();
+        _serviceCollection.AddScoped<ConfigurationManager>();
+        _serviceCollection.AddScoped<IPalacePalConfiguration>(sp =>
+            sp.GetRequiredService<ConfigurationManager>().Load());
+        _serviceCollection.AddTransient<RepoVerification>();
+
+        // commands
+        _serviceCollection.AddScoped<PalConfigCommand>();
+        _serviceCollection.AddScoped<ISubCommand, PalConfigCommand>();
+        _serviceCollection.AddScoped<ISubCommand, PalNearCommand>();
+        _serviceCollection.AddScoped<ISubCommand, PalStatsCommand>();
+        _serviceCollection.AddScoped<ISubCommand, PalTestConnectionCommand>();
+
+        // territory & marker related services
+        _serviceCollection.AddScoped<TerritoryState>();
+        _serviceCollection.AddScoped<FrameworkService>();
+        _serviceCollection.AddScoped<ChatService>();
+        _serviceCollection.AddScoped<FloorService>();
+        _serviceCollection.AddScoped<ImportService>();
+        _serviceCollection.AddScoped<ObjectTableDebug>();
+
+        // windows & related services
+        _serviceCollection.AddScoped<AgreementWindow>();
+        _serviceCollection.AddScoped<ConfigWindow>();
+        _serviceCollection.AddScoped<StatisticsService>();
+        _serviceCollection.AddScoped<StatisticsWindow>();
+
+        // rendering
+        _serviceCollection.AddScoped<SimpleRenderer>();
+        _serviceCollection.AddScoped<SplatoonRenderer>();
+        _serviceCollection.AddScoped<RenderAdapter>();
+
+        // queue handling
+        _serviceCollection.AddTransient<IQueueOnFrameworkThread.Handler<QueuedImport>, QueuedImport.Handler>();
+        _serviceCollection
+            .AddTransient<IQueueOnFrameworkThread.Handler<QueuedUndoImport>, QueuedUndoImport.Handler>();
+        _serviceCollection
+            .AddTransient<IQueueOnFrameworkThread.Handler<QueuedConfigUpdate>, QueuedConfigUpdate.Handler>();
+        _serviceCollection
+            .AddTransient<IQueueOnFrameworkThread.Handler<QueuedSyncResponse>, QueuedSyncResponse.Handler>();
+
+        // build
+        _serviceProvider = _serviceCollection.BuildServiceProvider(new ServiceProviderOptions
         {
-            _logger.LogInformation("Building async service container for {Assembly}",
+            ValidateOnBuild = true,
-                typeof(DependencyInjectionContext).Assembly.FullName);
+            ValidateScopes = true,
-
+        });
-            // EF core
-            _serviceCollection.AddDbContext<PalClientContext>(o => o
-                .UseSqlite(_sqliteConnectionString)
-                .UseModel(Database.Compiled.PalClientContextModel.Instance));
-            _serviceCollection.AddTransient<JsonMigration>();
-            _serviceCollection.AddScoped<Cleanup>();
-
-            // plugin-specific
-            _serviceCollection.AddScoped<DependencyContextInitializer>();
-            _serviceCollection.AddScoped<DebugState>();
-            _serviceCollection.AddScoped<GameHooks>();
-            _serviceCollection.AddScoped<RemoteApi>();
-            _serviceCollection.AddScoped<ConfigurationManager>();
-            _serviceCollection.AddScoped<IPalacePalConfiguration>(sp =>
-                sp.GetRequiredService<ConfigurationManager>().Load());
-            _serviceCollection.AddTransient<RepoVerification>();
-
-            // commands
-            _serviceCollection.AddScoped<PalConfigCommand>();
-            _serviceCollection.AddScoped<PalNearCommand>();
-            _serviceCollection.AddScoped<PalStatsCommand>();
-            _serviceCollection.AddScoped<PalTestConnectionCommand>();
-
-            // territory & marker related services
-            _serviceCollection.AddScoped<TerritoryState>();
-            _serviceCollection.AddScoped<FrameworkService>();
-            _serviceCollection.AddScoped<ChatService>();
-            _serviceCollection.AddScoped<FloorService>();
-            _serviceCollection.AddScoped<ImportService>();
-
-            // windows & related services
-            _serviceCollection.AddScoped<AgreementWindow>();
-            _serviceCollection.AddScoped<ConfigWindow>();
-            _serviceCollection.AddScoped<StatisticsService>();
-            _serviceCollection.AddScoped<StatisticsWindow>();
-
-            // rendering
-            _serviceCollection.AddScoped<SimpleRenderer>();
-            _serviceCollection.AddScoped<SplatoonRenderer>();
-            _serviceCollection.AddScoped<RenderAdapter>();
-
-            // queue handling
-            _serviceCollection.AddTransient<IQueueOnFrameworkThread.Handler<QueuedImport>, QueuedImport.Handler>();
-            _serviceCollection
-                .AddTransient<IQueueOnFrameworkThread.Handler<QueuedUndoImport>, QueuedUndoImport.Handler>();
-            _serviceCollection
-                .AddTransient<IQueueOnFrameworkThread.Handler<QueuedConfigUpdate>, QueuedConfigUpdate.Handler>();
-            _serviceCollection
-                .AddTransient<IQueueOnFrameworkThread.Handler<QueuedSyncResponse>, QueuedSyncResponse.Handler>();
-
-            // build
-            _serviceProvider = _serviceCollection.BuildServiceProvider(new ServiceProviderOptions
-            {
-                ValidateOnBuild = true,
-                ValidateScopes = true,
-            });
 
 
 #if RELEASE
-            // You're welcome to remove this code in your fork, but please make sure that:
+        // You're welcome to remove this code in your fork, but please make sure that:
-            // - none of the links accessible within FFXIV open the original repo (e.g. in the plugin installer), and
+        // - none of the links accessible within FFXIV open the original repo (e.g. in the plugin installer), and
-            // - you host your own server instance
+        // - you host your own server instance
-            //
+        //
-            // This is mainly to avoid this plugin being included in 'mega-repos' that, for whatever reason, decide
+        // This is mainly to avoid this plugin being included in 'mega-repos' that, for whatever reason, decide
-            // that collecting all plugins is a good idea (and break half in the process).
+        // that collecting all plugins is a good idea (and break half in the process).
-            _serviceProvider.GetService<RepoVerification>();
+        _serviceProvider.GetService<RepoVerification>();
 #endif
 
-            // This is not ideal as far as loading the plugin goes, because there's no way to check for errors and
+        // This is not ideal as far as loading the plugin goes, because there's no way to check for errors and
-            // tell Dalamud that no, the plugin isn't ready -- so the plugin will count as properly initialized,
+        // tell Dalamud that no, the plugin isn't ready -- so the plugin will count as properly initialized,
-            // even if it's not.
+        // even if it's not.
-            //
+        //
-            // There's 2-3 seconds of slowdown primarily caused by the sqlite init, but that needs to happen for
+        // There's 2-3 seconds of slowdown primarily caused by the sqlite init, but that needs to happen for
-            // config stuff.
+        // config stuff.
-            _logger = _serviceProvider.GetRequiredService<ILogger<DependencyInjectionContext>>();
+        _logger = _serviceProvider.GetRequiredService<ILogger<DependencyInjectionContext>>();
-            _logger.LogInformation("Service container built");
+        _logger.LogInformation("Service container built");
 
-            return _serviceProvider;
+        return _serviceProvider;
-        }
+    }
 
-        public void Dispose()
+    public void Dispose()
-        {
+    {
-            _logger.LogInformation("Disposing DI Context");
+        _logger.LogInformation("Disposing DI Context");
-            _serviceProvider?.Dispose();
+        _serviceProvider?.Dispose();
 
-            // ensure we're not keeping the file open longer than the plugin is loaded
+        // ensure we're not keeping the file open longer than the plugin is loaded
-            using (SqliteConnection sqliteConnection = new(_sqliteConnectionString))
+        using (SqliteConnection sqliteConnection = new(_sqliteConnectionString))
-                SqliteConnection.ClearPool(sqliteConnection);
+            SqliteConnection.ClearPool(sqliteConnection);
-        }
     }
 }

Pal.Client/Extensions/GuidExtensions.cs

@@ -1,13 +1,12 @@
 using System;
 
-namespace Pal.Client.Extensions
+namespace Pal.Client.Extensions;
-{
-    public static class GuidExtensions
-    {
-        public static string ToPartialId(this Guid g, int length = 13)
-            => g.ToString().ToPartialId();
 
-        public static string ToPartialId(this string s, int length = 13)
+public static class GuidExtensions
-            => s.PadRight(length + 1).Substring(0, length);
+{
-    }
+    public static string ToPartialId(this Guid g, int length = 13)
+        => g.ToString().ToPartialId();
+
+    public static string ToPartialId(this string s, int length = 13)
+        => s.PadRight(length + 1).Substring(0, length);
 }

Pal.Client/Extensions/PalImGui.cs

@@ -3,34 +3,33 @@ using System.Runtime.InteropServices;
 using System.Text;
 using ImGuiNET;
 
-namespace Pal.Client.Extensions
+namespace Pal.Client.Extensions;
+
+internal static class PalImGui
 {
-    internal static class PalImGui
+    /// <summary>
+    /// None of the default BeginTabItem methods allow using flags without making the tab have a close button for some reason.
+    /// </summary>
+    internal static unsafe bool BeginTabItemWithFlags(string label, ImGuiTabItemFlags flags)
     {
-        /// <summary>
+        int labelLength = Encoding.UTF8.GetByteCount(label);
-        /// None of the default BeginTabItem methods allow using flags without making the tab have a close button for some reason.
+        byte* labelPtr = stackalloc byte[labelLength + 1];
-        /// </summary>
+        byte[] labelBytes = Encoding.UTF8.GetBytes(label);
-        internal static unsafe bool BeginTabItemWithFlags(string label, ImGuiTabItemFlags flags)
-        {
-            int labelLength = Encoding.UTF8.GetByteCount(label);
-            byte* labelPtr = stackalloc byte[labelLength + 1];
-            byte[] labelBytes = Encoding.UTF8.GetBytes(label);
 
-            Marshal.Copy(labelBytes, 0, (IntPtr)labelPtr, labelLength);
+        Marshal.Copy(labelBytes, 0, (IntPtr)labelPtr, labelLength);
-            labelPtr[labelLength] = 0;
+        labelPtr[labelLength] = 0;
 
-            return ImGuiNative.igBeginTabItem(labelPtr, null, flags) != 0;
+        return ImGuiNative.igBeginTabItem(labelPtr, null, flags) != 0;
-        }
+    }
 
-        public static void RadioButtonWrapped(string label, ref int choice, int value)
+    public static void RadioButtonWrapped(string label, ref int choice, int value)
-        {
+    {
-            ImGui.BeginGroup();
+        ImGui.BeginGroup();
-            ImGui.RadioButton($"##radio{value}", value == choice);
+        ImGui.RadioButton($"##radio{value}", value == choice);
-            ImGui.SameLine();
+        ImGui.SameLine();
-            ImGui.TextWrapped(label);
+        ImGui.TextWrapped(label);
-            ImGui.EndGroup();
+        ImGui.EndGroup();
-            if (ImGui.IsItemClicked())
+        if (ImGui.IsItemClicked())
-                choice = value;
+            choice = value;
-        }
     }
 }

Pal.Client/Floors/EphemeralLocation.cs

@@ -1,29 +1,28 @@
 using System;
 
-namespace Pal.Client.Floors
+namespace Pal.Client.Floors;
+
+/// <summary>
+/// This is a currently-visible marker.
+/// </summary>
+internal sealed class EphemeralLocation : MemoryLocation
 {
-    /// <summary>
+    public override bool Equals(object? obj) => obj is EphemeralLocation && base.Equals(obj);
-    /// This is a currently-visible marker.
+
-    /// </summary>
+    public override int GetHashCode() => base.GetHashCode();
-    internal sealed class EphemeralLocation : MemoryLocation
+
+    public static bool operator ==(EphemeralLocation? a, object? b)
     {
-        public override bool Equals(object? obj) => obj is EphemeralLocation && base.Equals(obj);
+        return Equals(a, b);
+    }
 
-        public override int GetHashCode() => base.GetHashCode();
+    public static bool operator !=(EphemeralLocation? a, object? b)
+    {
+        return !Equals(a, b);
+    }
 
-        public static bool operator ==(EphemeralLocation? a, object? b)
+    public override string ToString()
-        {
+    {
-            return Equals(a, b);
+        return $"EphemeralLocation(Position={Position}, Type={Type})";
-        }
-
-        public static bool operator !=(EphemeralLocation? a, object? b)
-        {
-            return !Equals(a, b);
-        }
-
-        public override string ToString()
-        {
-            return $"EphemeralLocation(Position={Position}, Type={Type})";
-        }
     }
 }

Pal.Client/Floors/FloorService.cs

@@ -10,154 +10,153 @@ using Pal.Client.Floors.Tasks;
 using Pal.Client.Net;
 using Pal.Common;
 
-namespace Pal.Client.Floors
+namespace Pal.Client.Floors;
+
+internal sealed class FloorService
 {
-    internal sealed class FloorService
+    private readonly IPalacePalConfiguration _configuration;
+    private readonly Cleanup _cleanup;
+    private readonly IServiceScopeFactory _serviceScopeFactory;
+    private readonly IReadOnlyDictionary<ETerritoryType, MemoryTerritory> _territories;
+
+    private ConcurrentBag<EphemeralLocation> _ephemeralLocations = new();
+
+    public FloorService(IPalacePalConfiguration configuration, Cleanup cleanup,
+        IServiceScopeFactory serviceScopeFactory)
     {
-        private readonly IPalacePalConfiguration _configuration;
+        _configuration = configuration;
-        private readonly Cleanup _cleanup;
+        _cleanup = cleanup;
-        private readonly IServiceScopeFactory _serviceScopeFactory;
+        _serviceScopeFactory = serviceScopeFactory;
-        private readonly IReadOnlyDictionary<ETerritoryType, MemoryTerritory> _territories;
+        _territories = Enum.GetValues<ETerritoryType>().ToDictionary(o => o, o => new MemoryTerritory(o));
+    }
 
-        private ConcurrentBag<EphemeralLocation> _ephemeralLocations = new();
+    public IReadOnlyCollection<EphemeralLocation> EphemeralLocations => _ephemeralLocations;
+    public bool IsImportRunning { get; private set; }
 
-        public FloorService(IPalacePalConfiguration configuration, Cleanup cleanup,
+    public void ChangeTerritory(ushort territoryType)
-            IServiceScopeFactory serviceScopeFactory)
+    {
+        _ephemeralLocations = new ConcurrentBag<EphemeralLocation>();
+
+        if (typeof(ETerritoryType).IsEnumDefined(territoryType))
+            ChangeTerritory((ETerritoryType)territoryType);
+    }
+
+    private void ChangeTerritory(ETerritoryType newTerritory)
+    {
+        var territory = _territories[newTerritory];
+        if (territory.ReadyState == MemoryTerritory.EReadyState.NotLoaded)
         {
-            _configuration = configuration;
+            territory.ReadyState = MemoryTerritory.EReadyState.Loading;
-            _cleanup = cleanup;
+            new LoadTerritory(_serviceScopeFactory, _cleanup, territory).Start();
-            _serviceScopeFactory = serviceScopeFactory;
-            _territories = Enum.GetValues<ETerritoryType>().ToDictionary(o => o, o => new MemoryTerritory(o));
         }
+    }
 
-        public IReadOnlyCollection<EphemeralLocation> EphemeralLocations => _ephemeralLocations;
+    public MemoryTerritory? GetTerritoryIfReady(ushort territoryType)
-        public bool IsImportRunning { get; private set; }
+    {
+        if (typeof(ETerritoryType).IsEnumDefined(territoryType))
+            return GetTerritoryIfReady((ETerritoryType)territoryType);
 
-        public void ChangeTerritory(ushort territoryType)
+        return null;
-        {
+    }
-            _ephemeralLocations = new ConcurrentBag<EphemeralLocation>();
-
-            if (typeof(ETerritoryType).IsEnumDefined(territoryType))
-                ChangeTerritory((ETerritoryType)territoryType);
-        }
-
-        private void ChangeTerritory(ETerritoryType newTerritory)
-        {
-            var territory = _territories[newTerritory];
-            if (territory.ReadyState == MemoryTerritory.EReadyState.NotLoaded)
-            {
-                territory.ReadyState = MemoryTerritory.EReadyState.Loading;
-                new LoadTerritory(_serviceScopeFactory, _cleanup, territory).Start();
-            }
-        }
-
-        public MemoryTerritory? GetTerritoryIfReady(ushort territoryType)
-        {
-            if (typeof(ETerritoryType).IsEnumDefined(territoryType))
-                return GetTerritoryIfReady((ETerritoryType)territoryType);
 
+    public MemoryTerritory? GetTerritoryIfReady(ETerritoryType territoryType)
+    {
+        var territory = _territories[territoryType];
+        if (territory.ReadyState != MemoryTerritory.EReadyState.Ready)
             return null;
-        }
 
-        public MemoryTerritory? GetTerritoryIfReady(ETerritoryType territoryType)
+        return territory;
+    }
+
+    public bool IsReady(ushort territoryId) => GetTerritoryIfReady(territoryId) != null;
+
+    public bool MergePersistentLocations(
+        ETerritoryType territoryType,
+        IReadOnlyList<PersistentLocation> visibleLocations,
+        bool recreateLayout,
+        out List<PersistentLocation> locationsToSync)
+    {
+        MemoryTerritory? territory = GetTerritoryIfReady(territoryType);
+        locationsToSync = new();
+        if (territory == null)
+            return false;
+
+        var partialAccountId = _configuration.FindAccount(RemoteApi.RemoteUrl)?.AccountId.ToPartialId();
+        var persistentLocations = territory.Locations.ToList();
+
+        List<PersistentLocation> markAsSeen = new();
+        List<PersistentLocation> newLocations = new();
+        foreach (var visibleLocation in visibleLocations)
         {
-            var territory = _territories[territoryType];
+            PersistentLocation? existingLocation = persistentLocations.SingleOrDefault(x => x == visibleLocation);
-            if (territory.ReadyState != MemoryTerritory.EReadyState.Ready)
+            if (existingLocation != null)
-                return null;
-
-            return territory;
-        }
-
-        public bool IsReady(ushort territoryId) => GetTerritoryIfReady(territoryId) != null;
-
-        public bool MergePersistentLocations(
-            ETerritoryType territoryType,
-            IReadOnlyList<PersistentLocation> visibleLocations,
-            bool recreateLayout,
-            out List<PersistentLocation> locationsToSync)
-        {
-            MemoryTerritory? territory = GetTerritoryIfReady(territoryType);
-            locationsToSync = new();
-            if (territory == null)
-                return false;
-
-            var partialAccountId = _configuration.FindAccount(RemoteApi.RemoteUrl)?.AccountId.ToPartialId();
-            var persistentLocations = territory.Locations.ToList();
-
-            List<PersistentLocation> markAsSeen = new();
-            List<PersistentLocation> newLocations = new();
-            foreach (var visibleLocation in visibleLocations)
             {
-                PersistentLocation? existingLocation = persistentLocations.SingleOrDefault(x => x == visibleLocation);
+                if (existingLocation is { Seen: false, LocalId: { } })
-                if (existingLocation != null)
                 {
-                    if (existingLocation is { Seen: false, LocalId: { } })
+                    existingLocation.Seen = true;
-                    {
+                    markAsSeen.Add(existingLocation);
-                        existingLocation.Seen = true;
-                        markAsSeen.Add(existingLocation);
-                    }
-
-                    // This requires you to have seen a trap/hoard marker once per floor to synchronize this for older local states,
-                    // markers discovered afterwards are automatically marked seen.
-                    if (partialAccountId != null &&
-                        existingLocation is { LocalId: { }, NetworkId: { }, RemoteSeenRequested: false } &&
-                        !existingLocation.RemoteSeenOn.Contains(partialAccountId))
-                    {
-                        existingLocation.RemoteSeenRequested = true;
-                        locationsToSync.Add(existingLocation);
-                    }
-
-                    continue;
                 }
 
-                territory.Locations.Add(visibleLocation);
+                // This requires you to have seen a trap/hoard marker once per floor to synchronize this for older local states,
-                newLocations.Add(visibleLocation);
+                // markers discovered afterwards are automatically marked seen.
-                recreateLayout = true;
+                if (partialAccountId != null &&
+                    existingLocation is { LocalId: { }, NetworkId: { }, RemoteSeenRequested: false } &&
+                    !existingLocation.RemoteSeenOn.Contains(partialAccountId))
+                {
+                    existingLocation.RemoteSeenRequested = true;
+                    locationsToSync.Add(existingLocation);
+                }
+
+                continue;
             }
 
-            if (markAsSeen.Count > 0)
+            territory.Locations.Add(visibleLocation);
-                new MarkLocalSeen(_serviceScopeFactory, territory, markAsSeen).Start();
+            newLocations.Add(visibleLocation);
-
+            recreateLayout = true;
-            if (newLocations.Count > 0)
-                new SaveNewLocations(_serviceScopeFactory, territory, newLocations).Start();
-
-            return recreateLayout;
         }
 
-        /// <returns>Whether the locations have changed</returns>
+        if (markAsSeen.Count > 0)
-        public bool MergeEphemeralLocations(IReadOnlyList<EphemeralLocation> visibleLocations, bool recreate)
+            new MarkLocalSeen(_serviceScopeFactory, territory, markAsSeen).Start();
+
+        if (newLocations.Count > 0)
+            new SaveNewLocations(_serviceScopeFactory, territory, newLocations).Start();
+
+        return recreateLayout;
+    }
+
+    /// <returns>Whether the locations have changed</returns>
+    public bool MergeEphemeralLocations(IReadOnlyList<EphemeralLocation> visibleLocations, bool recreate)
+    {
+        recreate |= _ephemeralLocations.Any(loc => visibleLocations.All(x => x != loc));
+        recreate |= visibleLocations.Any(loc => _ephemeralLocations.All(x => x != loc));
+
+        if (!recreate)
+            return false;
+
+        _ephemeralLocations.Clear();
+        foreach (var visibleLocation in visibleLocations)
+            _ephemeralLocations.Add(visibleLocation);
+
+        return true;
+    }
+
+    public void ResetAll()
+    {
+        IsImportRunning = false;
+        foreach (var memoryTerritory in _territories.Values)
         {
-            recreate |= _ephemeralLocations.Any(loc => visibleLocations.All(x => x != loc));
+            lock (memoryTerritory.LockObj)
-            recreate |= visibleLocations.Any(loc => _ephemeralLocations.All(x => x != loc));
+                memoryTerritory.Reset();
-
-            if (!recreate)
-                return false;
-
-            _ephemeralLocations.Clear();
-            foreach (var visibleLocation in visibleLocations)
-                _ephemeralLocations.Add(visibleLocation);
-
-            return true;
         }
+    }
 
-        public void ResetAll()
+    public void SetToImportState()
+    {
+        IsImportRunning = true;
+        foreach (var memoryTerritory in _territories.Values)
         {
-            IsImportRunning = false;
+            lock (memoryTerritory.LockObj)
-            foreach (var memoryTerritory in _territories.Values)
+                memoryTerritory.ReadyState = MemoryTerritory.EReadyState.Importing;
-            {
-                lock (memoryTerritory.LockObj)
-                    memoryTerritory.Reset();
-            }
-        }
-
-        public void SetToImportState()
-        {
-            IsImportRunning = true;
-            foreach (var memoryTerritory in _territories.Values)
-            {
-                lock (memoryTerritory.LockObj)
-                    memoryTerritory.ReadyState = MemoryTerritory.EReadyState.Importing;
-            }
         }
     }
 }

Pal.Client/Floors/FrameworkService.cs

@@ -4,10 +4,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
-using Dalamud.Game;
-using Dalamud.Game.ClientState;
-using Dalamud.Game.ClientState.Objects;
 using Dalamud.Game.ClientState.Objects.Types;
+using Dalamud.Plugin.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Pal.Client.Configuration;
@@ -18,427 +16,449 @@ using Pal.Client.Rendering;
 using Pal.Client.Scheduled;
 using Pal.Common;
 
-namespace Pal.Client.Floors
+namespace Pal.Client.Floors;
+
+internal sealed class FrameworkService : IDisposable
 {
-    internal sealed class FrameworkService : IDisposable
+    private readonly IServiceProvider _serviceProvider;
+    private readonly ILogger<FrameworkService> _logger;
+    private readonly IFramework _framework;
+    private readonly ConfigurationManager _configurationManager;
+    private readonly IPalacePalConfiguration _configuration;
+    private readonly IClientState _clientState;
+    private readonly TerritoryState _territoryState;
+    private readonly FloorService _floorService;
+    private readonly DebugState _debugState;
+    private readonly RenderAdapter _renderAdapter;
+    private readonly IObjectTable _objectTable;
+    private readonly RemoteApi _remoteApi;
+
+    internal Queue<IQueueOnFrameworkThread> EarlyEventQueue { get; } = new();
+    internal Queue<IQueueOnFrameworkThread> LateEventQueue { get; } = new();
+    internal ConcurrentQueue<nint> NextUpdateObjects { get; } = new();
+
+    public FrameworkService(
+        IServiceProvider serviceProvider,
+        ILogger<FrameworkService> logger,
+        IFramework framework,
+        ConfigurationManager configurationManager,
+        IPalacePalConfiguration configuration,
+        IClientState clientState,
+        TerritoryState territoryState,
+        FloorService floorService,
+        DebugState debugState,
+        RenderAdapter renderAdapter,
+        IObjectTable objectTable,
+        RemoteApi remoteApi)
     {
-        private readonly IServiceProvider _serviceProvider;
+        _serviceProvider = serviceProvider;
-        private readonly ILogger<FrameworkService> _logger;
+        _logger = logger;
-        private readonly Framework _framework;
+        _framework = framework;
-        private readonly ConfigurationManager _configurationManager;
+        _configurationManager = configurationManager;
-        private readonly IPalacePalConfiguration _configuration;
+        _configuration = configuration;
-        private readonly ClientState _clientState;
+        _clientState = clientState;
-        private readonly TerritoryState _territoryState;
+        _territoryState = territoryState;
-        private readonly FloorService _floorService;
+        _floorService = floorService;
-        private readonly DebugState _debugState;
+        _debugState = debugState;
-        private readonly RenderAdapter _renderAdapter;
+        _renderAdapter = renderAdapter;
-        private readonly ObjectTable _objectTable;
+        _objectTable = objectTable;
-        private readonly RemoteApi _remoteApi;
+        _remoteApi = remoteApi;
 
-        internal Queue<IQueueOnFrameworkThread> EarlyEventQueue { get; } = new();
+        _framework.Update += OnUpdate;
-        internal Queue<IQueueOnFrameworkThread> LateEventQueue { get; } = new();
+        _configurationManager.Saved += OnSaved;
-        internal ConcurrentQueue<nint> NextUpdateObjects { get; } = new();
+    }
 
-        public FrameworkService(
+    public void Dispose()
-            IServiceProvider serviceProvider,
+    {
-            ILogger<FrameworkService> logger,
+        _framework.Update -= OnUpdate;
-            Framework framework,
+        _configurationManager.Saved -= OnSaved;
-            ConfigurationManager configurationManager,
+    }
-            IPalacePalConfiguration configuration,
+
-            ClientState clientState,
+    private void OnSaved(object? sender, IPalacePalConfiguration? config)
-            TerritoryState territoryState,
+        => EarlyEventQueue.Enqueue(new QueuedConfigUpdate());
-            FloorService floorService,
+
-            DebugState debugState,
+    private void OnUpdate(IFramework framework)
-            RenderAdapter renderAdapter,
+    {
-            ObjectTable objectTable,
+        if (_configuration.FirstUse)
-            RemoteApi remoteApi)
+            return;
+
+        try
         {
-            _serviceProvider = serviceProvider;
+            bool recreateLayout = false;
-            _logger = logger;
-            _framework = framework;
-            _configurationManager = configurationManager;
-            _configuration = configuration;
-            _clientState = clientState;
-            _territoryState = territoryState;
-            _floorService = floorService;
-            _debugState = debugState;
-            _renderAdapter = renderAdapter;
-            _objectTable = objectTable;
-            _remoteApi = remoteApi;
 
-            _framework.Update += OnUpdate;
+            while (EarlyEventQueue.TryDequeue(out IQueueOnFrameworkThread? queued))
-            _configurationManager.Saved += OnSaved;
+                HandleQueued(queued, ref recreateLayout);
-        }
 
-        public void Dispose()
+            if (_territoryState.LastTerritory != _clientState.TerritoryType)
-        {
+            {
-            _framework.Update -= OnUpdate;
+                MemoryTerritory? oldTerritory = _floorService.GetTerritoryIfReady(_territoryState.LastTerritory);
-            _configurationManager.Saved -= OnSaved;
+                if (oldTerritory != null)
-        }
+                    oldTerritory.SyncState = ESyncState.NotAttempted;
 
-        private void OnSaved(object? sender, IPalacePalConfiguration? config)
+                _territoryState.LastTerritory = _clientState.TerritoryType;
-            => EarlyEventQueue.Enqueue(new QueuedConfigUpdate());
+                NextUpdateObjects.Clear();
 
-        private void OnUpdate(Framework framework)
+                _floorService.ChangeTerritory(_territoryState.LastTerritory);
-        {
+                _territoryState.PomanderOfSight = PomanderState.Inactive;
-            if (_configuration.FirstUse)
+                _territoryState.PomanderOfIntuition = PomanderState.Inactive;
+                recreateLayout = true;
+                _debugState.Reset();
+            }
+
+            if (!_territoryState.IsInDeepDungeon() || !_floorService.IsReady(_territoryState.LastTerritory))
                 return;
 
+            if (_renderAdapter.RequireRedraw)
+            {
+                recreateLayout = true;
+                _renderAdapter.RequireRedraw = false;
+            }
+
+            ETerritoryType territoryType = (ETerritoryType)_territoryState.LastTerritory;
+            MemoryTerritory memoryTerritory = _floorService.GetTerritoryIfReady(territoryType)!;
+            if (_configuration.Mode == EMode.Online && memoryTerritory.SyncState == ESyncState.NotAttempted)
+            {
+                memoryTerritory.SyncState = ESyncState.Started;
+                Task.Run(async () => await DownloadLocationsForTerritory(_territoryState.LastTerritory));
+            }
+
+            while (LateEventQueue.TryDequeue(out IQueueOnFrameworkThread? queued))
+                HandleQueued(queued, ref recreateLayout);
+
+            (IReadOnlyList<PersistentLocation> visiblePersistentMarkers,
+                    IReadOnlyList<EphemeralLocation> visibleEphemeralMarkers) =
+                GetRelevantGameObjects();
+
+            HandlePersistentLocations(territoryType, visiblePersistentMarkers, recreateLayout);
+
+            if (_floorService.MergeEphemeralLocations(visibleEphemeralMarkers, recreateLayout))
+                RecreateEphemeralLayout();
+        }
+        catch (Exception e)
+        {
+            _debugState.SetFromException(e);
+        }
+    }
+
+    #region Render Markers
+
+    private void HandlePersistentLocations(ETerritoryType territoryType,
+        IReadOnlyList<PersistentLocation> visiblePersistentMarkers,
+        bool recreateLayout)
+    {
+        bool recreatePersistentLocations = _floorService.MergePersistentLocations(
+            territoryType,
+            visiblePersistentMarkers,
+            recreateLayout,
+            out List<PersistentLocation> locationsToSync);
+        recreatePersistentLocations |= CheckLocationsForPomanders(visiblePersistentMarkers);
+        if (locationsToSync.Count > 0)
+        {
+            Task.Run(async () =>
+                await SyncSeenMarkersForTerritory(_territoryState.LastTerritory, locationsToSync));
+        }
+
+        UploadLocations();
+
+        if (recreatePersistentLocations)
+            RecreatePersistentLayout(visiblePersistentMarkers);
+    }
+
+    private bool CheckLocationsForPomanders(IReadOnlyList<PersistentLocation> visibleLocations)
+    {
+        MemoryTerritory? memoryTerritory = _floorService.GetTerritoryIfReady(_territoryState.LastTerritory);
+        if (memoryTerritory is { Locations.Count: > 0 } &&
+            (_configuration.DeepDungeons.Traps.OnlyVisibleAfterPomander ||
+             _configuration.DeepDungeons.HoardCoffers.OnlyVisibleAfterPomander))
+        {
             try
             {
-                bool recreateLayout = false;
+                foreach (var location in memoryTerritory.Locations)
-
-                while (EarlyEventQueue.TryDequeue(out IQueueOnFrameworkThread? queued))
-                    HandleQueued(queued, ref recreateLayout);
-
-                if (_territoryState.LastTerritory != _clientState.TerritoryType)
                 {
-                    MemoryTerritory? oldTerritory = _floorService.GetTerritoryIfReady(_territoryState.LastTerritory);
+                    bool isEnabled = DetermineVisibility(location, visibleLocations);
-                    if (oldTerritory != null)
+                    if (location.RenderElement == null)
-                        oldTerritory.SyncState = ESyncState.NotAttempted;
-
-                    _territoryState.LastTerritory = _clientState.TerritoryType;
-                    NextUpdateObjects.Clear();
-
-                    _floorService.ChangeTerritory(_territoryState.LastTerritory);
-                    _territoryState.PomanderOfSight = PomanderState.Inactive;
-                    _territoryState.PomanderOfIntuition = PomanderState.Inactive;
-                    recreateLayout = true;
-                    _debugState.Reset();
-                }
-
-                if (!_territoryState.IsInDeepDungeon() || !_floorService.IsReady(_territoryState.LastTerritory))
-                    return;
-
-                ETerritoryType territoryType = (ETerritoryType)_territoryState.LastTerritory;
-                MemoryTerritory memoryTerritory = _floorService.GetTerritoryIfReady(territoryType)!;
-                if (_configuration.Mode == EMode.Online && memoryTerritory.SyncState == ESyncState.NotAttempted)
-                {
-                    memoryTerritory.SyncState = ESyncState.Started;
-                    Task.Run(async () => await DownloadLocationsForTerritory(_territoryState.LastTerritory));
-                }
-
-                while (LateEventQueue.TryDequeue(out IQueueOnFrameworkThread? queued))
-                    HandleQueued(queued, ref recreateLayout);
-
-                (IReadOnlyList<PersistentLocation> visiblePersistentMarkers,
-                        IReadOnlyList<EphemeralLocation> visibleEphemeralMarkers) =
-                    GetRelevantGameObjects();
-
-                HandlePersistentLocations(territoryType, visiblePersistentMarkers, recreateLayout);
-
-                if (_floorService.MergeEphemeralLocations(visibleEphemeralMarkers, recreateLayout))
-                    RecreateEphemeralLayout();
-            }
-            catch (Exception e)
-            {
-                _debugState.SetFromException(e);
-            }
-        }
-
-        #region Render Markers
-
-        private void HandlePersistentLocations(ETerritoryType territoryType,
-            IReadOnlyList<PersistentLocation> visiblePersistentMarkers,
-            bool recreateLayout)
-        {
-            bool recreatePersistentLocations = _floorService.MergePersistentLocations(
-                territoryType,
-                visiblePersistentMarkers,
-                recreateLayout,
-                out List<PersistentLocation> locationsToSync);
-            recreatePersistentLocations |= CheckLocationsForPomanders(visiblePersistentMarkers);
-            if (locationsToSync.Count > 0)
-            {
-                Task.Run(async () =>
-                    await SyncSeenMarkersForTerritory(_territoryState.LastTerritory, locationsToSync));
-            }
-
-            UploadLocations();
-
-            if (recreatePersistentLocations)
-                RecreatePersistentLayout(visiblePersistentMarkers);
-        }
-
-        private bool CheckLocationsForPomanders(IReadOnlyList<PersistentLocation> visibleLocations)
-        {
-            MemoryTerritory? memoryTerritory = _floorService.GetTerritoryIfReady(_territoryState.LastTerritory);
-            if (memoryTerritory is { Locations.Count: > 0 } &&
-                (_configuration.DeepDungeons.Traps.OnlyVisibleAfterPomander ||
-                 _configuration.DeepDungeons.HoardCoffers.OnlyVisibleAfterPomander))
-            {
-                try
-                {
-                    foreach (var location in memoryTerritory.Locations)
                     {
-                        uint desiredColor = DetermineColor(location, visibleLocations);
+                        if (isEnabled)
-                        if (location.RenderElement == null || !location.RenderElement.IsValid)
                             return true;
-
+                        else
-                        if (location.RenderElement.Color != desiredColor)
+                            continue;
-                            location.RenderElement.Color = desiredColor;
                     }
+
+                    if (!location.RenderElement.IsValid)
+                        return true;
+
+                    if (location.RenderElement.Enabled != isEnabled)
+                        location.RenderElement.Enabled = isEnabled;
                 }
-                catch (Exception e)
-                {
-                    _debugState.SetFromException(e);
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        private void UploadLocations()
-        {
-            MemoryTerritory? memoryTerritory = _floorService.GetTerritoryIfReady(_territoryState.LastTerritory);
-            if (memoryTerritory == null || memoryTerritory.SyncState != ESyncState.Complete)
-                return;
-
-            List<PersistentLocation> locationsToUpload = memoryTerritory.Locations
-                .Where(loc => loc.NetworkId == null && loc.UploadRequested == false)
-                .ToList();
-            if (locationsToUpload.Count > 0)
-            {
-                foreach (var location in locationsToUpload)
-                    location.UploadRequested = true;
-
-                Task.Run(async () =>
-                    await UploadLocationsForTerritory(_territoryState.LastTerritory, locationsToUpload));
-            }
-        }
-
-        private void RecreatePersistentLayout(IReadOnlyList<PersistentLocation> visibleMarkers)
-        {
-            _renderAdapter.ResetLayer(ELayer.TrapHoard);
-
-            MemoryTerritory? memoryTerritory = _floorService.GetTerritoryIfReady(_territoryState.LastTerritory);
-            if (memoryTerritory == null)
-                return;
-
-            List<IRenderElement> elements = new();
-            foreach (var location in memoryTerritory.Locations)
-            {
-                if (location.Type == MemoryLocation.EType.Trap)
-                {
-                    CreateRenderElement(location, elements, DetermineColor(location, visibleMarkers),
-                        _configuration.DeepDungeons.Traps);
-                }
-                else if (location.Type == MemoryLocation.EType.Hoard)
-                {
-                    CreateRenderElement(location, elements, DetermineColor(location, visibleMarkers),
-                        _configuration.DeepDungeons.HoardCoffers);
-                }
-            }
-
-            if (elements.Count == 0)
-                return;
-
-            _renderAdapter.SetLayer(ELayer.TrapHoard, elements);
-        }
-
-        private void RecreateEphemeralLayout()
-        {
-            _renderAdapter.ResetLayer(ELayer.RegularCoffers);
-
-            List<IRenderElement> elements = new();
-            foreach (var location in _floorService.EphemeralLocations)
-            {
-                if (location.Type == MemoryLocation.EType.SilverCoffer &&
-                    _configuration.DeepDungeons.SilverCoffers.Show)
-                {
-                    CreateRenderElement(location, elements, DetermineColor(location),
-                        _configuration.DeepDungeons.SilverCoffers);
-                }
-            }
-
-            if (elements.Count == 0)
-                return;
-
-            _renderAdapter.SetLayer(ELayer.RegularCoffers, elements);
-        }
-
-        private uint DetermineColor(PersistentLocation location, IReadOnlyList<PersistentLocation> visibleLocations)
-        {
-            switch (location.Type)
-            {
-                case MemoryLocation.EType.Trap
-                    when _territoryState.PomanderOfSight == PomanderState.Inactive ||
-                         !_configuration.DeepDungeons.Traps.OnlyVisibleAfterPomander ||
-                         visibleLocations.Any(x => x == location):
-                    return _configuration.DeepDungeons.Traps.Color;
-                case MemoryLocation.EType.Hoard
-                    when _territoryState.PomanderOfIntuition == PomanderState.Inactive ||
-                         !_configuration.DeepDungeons.HoardCoffers.OnlyVisibleAfterPomander ||
-                         visibleLocations.Any(x => x == location):
-                    return _configuration.DeepDungeons.HoardCoffers.Color;
-                default:
-                    return RenderData.ColorInvisible;
-            }
-        }
-
-        private uint DetermineColor(EphemeralLocation location)
-        {
-            if (location.Type == MemoryLocation.EType.SilverCoffer)
-                return _configuration.DeepDungeons.SilverCoffers.Color;
-
-            return RenderData.ColorInvisible;
-        }
-
-        private void CreateRenderElement(MemoryLocation location, List<IRenderElement> elements, uint color,
-            MarkerConfiguration config)
-        {
-            if (!config.Show)
-                return;
-
-            var element = _renderAdapter.CreateElement(location.Type, location.Position, color, config.Fill);
-            location.RenderElement = element;
-            elements.Add(element);
-        }
-
-        #endregion
-
-        #region Up-/Download
-
-        private async Task DownloadLocationsForTerritory(ushort territoryId)
-        {
-            try
-            {
-                _logger.LogInformation("Downloading territory {Territory} from server", (ETerritoryType)territoryId);
-                var (success, downloadedMarkers) = await _remoteApi.DownloadRemoteMarkers(territoryId);
-                LateEventQueue.Enqueue(new QueuedSyncResponse
-                {
-                    Type = SyncType.Download,
-                    TerritoryType = territoryId,
-                    Success = success,
-                    Locations = downloadedMarkers
-                });
             }
             catch (Exception e)
             {
                 _debugState.SetFromException(e);
+                return true;
             }
         }
 
-        private async Task UploadLocationsForTerritory(ushort territoryId, List<PersistentLocation> locationsToUpload)
+        return false;
+    }
+
+    private void UploadLocations()
+    {
+        MemoryTerritory? memoryTerritory = _floorService.GetTerritoryIfReady(_territoryState.LastTerritory);
+        if (memoryTerritory == null || memoryTerritory.SyncState != ESyncState.Complete)
+            return;
+
+        List<PersistentLocation> locationsToUpload = memoryTerritory.Locations
+            .Where(loc => loc.NetworkId == null && loc.UploadRequested == false)
+            .ToList();
+        if (locationsToUpload.Count > 0)
         {
-            try
+            foreach (var location in locationsToUpload)
+                location.UploadRequested = true;
+
+            Task.Run(async () =>
+                await UploadLocationsForTerritory(_territoryState.LastTerritory, locationsToUpload));
+        }
+    }
+
+    private void RecreatePersistentLayout(IReadOnlyList<PersistentLocation> visibleMarkers)
+    {
+        _renderAdapter.ResetLayer(ELayer.TrapHoard);
+
+        MemoryTerritory? memoryTerritory = _floorService.GetTerritoryIfReady(_territoryState.LastTerritory);
+        if (memoryTerritory == null)
+            return;
+
+        List<IRenderElement> elements = new();
+        foreach (var location in memoryTerritory.Locations)
+        {
+            if (location.Type == MemoryLocation.EType.Trap)
             {
-                _logger.LogInformation("Uploading {Count} locations for territory {Territory} to server",
+                CreateRenderElement(location, elements, DetermineVisibility(location, visibleMarkers),
-                    locationsToUpload.Count, (ETerritoryType)territoryId);
+                    _configuration.DeepDungeons.Traps);
-                var (success, uploadedLocations) = await _remoteApi.UploadLocations(territoryId, locationsToUpload);
-                LateEventQueue.Enqueue(new QueuedSyncResponse
-                {
-                    Type = SyncType.Upload,
-                    TerritoryType = territoryId,
-                    Success = success,
-                    Locations = uploadedLocations
-                });
             }
-            catch (Exception e)
+            else if (location.Type == MemoryLocation.EType.Hoard)
             {
-                _debugState.SetFromException(e);
+                CreateRenderElement(location, elements, DetermineVisibility(location, visibleMarkers),
+                    _configuration.DeepDungeons.HoardCoffers);
             }
         }
 
-        private async Task SyncSeenMarkersForTerritory(ushort territoryId,
+        if (elements.Count == 0)
-            IReadOnlyList<PersistentLocation> locationsToUpdate)
+            return;
+
+        _renderAdapter.SetLayer(ELayer.TrapHoard, elements);
+    }
+
+    private void RecreateEphemeralLayout()
+    {
+        _renderAdapter.ResetLayer(ELayer.RegularCoffers);
+
+        List<IRenderElement> elements = new();
+        foreach (var location in _floorService.EphemeralLocations)
         {
-            try
+            if (location.Type == MemoryLocation.EType.SilverCoffer &&
+                _configuration.DeepDungeons.SilverCoffers.Show)
             {
-                _logger.LogInformation("Syncing {Count} seen locations for territory {Territory} to server",
+                CreateRenderElement(location, elements, true, _configuration.DeepDungeons.SilverCoffers);
-                    locationsToUpdate.Count, (ETerritoryType)territoryId);
-                var success = await _remoteApi.MarkAsSeen(territoryId, locationsToUpdate);
-                LateEventQueue.Enqueue(new QueuedSyncResponse
-                {
-                    Type = SyncType.MarkSeen,
-                    TerritoryType = territoryId,
-                    Success = success,
-                    Locations = locationsToUpdate,
-                });
             }
-            catch (Exception e)
+            else if (location.Type == MemoryLocation.EType.GoldCoffer &&
+                     _configuration.DeepDungeons.GoldCoffers.Show)
             {
-                _debugState.SetFromException(e);
+                CreateRenderElement(location, elements, true, _configuration.DeepDungeons.GoldCoffers);
             }
         }
 
-        #endregion
+        if (elements.Count == 0)
+            return;
 
-        private (IReadOnlyList<PersistentLocation>, IReadOnlyList<EphemeralLocation>) GetRelevantGameObjects()
+        _renderAdapter.SetLayer(ELayer.RegularCoffers, elements);
+    }
+
+    private bool DetermineVisibility(PersistentLocation location, IReadOnlyList<PersistentLocation> visibleLocations)
+    {
+        switch (location.Type)
         {
-            List<PersistentLocation> persistentLocations = new();
+            case MemoryLocation.EType.Trap
-            List<EphemeralLocation> ephemeralLocations = new();
+                when _territoryState.PomanderOfSight == PomanderState.Inactive ||
-            for (int i = 246; i < _objectTable.Length; i++)
+                     !_configuration.DeepDungeons.Traps.OnlyVisibleAfterPomander ||
+                     visibleLocations.Any(x => x == location):
+                return true;
+            case MemoryLocation.EType.Hoard
+                when _territoryState.PomanderOfIntuition == PomanderState.Inactive ||
+                     !_configuration.DeepDungeons.HoardCoffers.OnlyVisibleAfterPomander ||
+                     visibleLocations.Any(x => x == location):
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    private void CreateRenderElement(MemoryLocation location, List<IRenderElement> elements, bool enabled,
+        MarkerConfiguration config)
+    {
+        if (!config.Show)
+        {
+            location.RenderElement = null;
+            return;
+        }
+
+        var element =
+            _renderAdapter.CreateElement(location.Type, location.Position, enabled, config.Color, config.Fill);
+        location.RenderElement = element;
+        elements.Add(element);
+    }
+
+    #endregion
+
+    #region Up-/Download
+
+    private async Task DownloadLocationsForTerritory(ushort territoryId)
+    {
+        try
+        {
+            _logger.LogInformation("Downloading territory {Territory} from server", (ETerritoryType)territoryId);
+            var (success, downloadedMarkers) = await _remoteApi.DownloadRemoteMarkers(territoryId);
+            LateEventQueue.Enqueue(new QueuedSyncResponse
             {
-                GameObject? obj = _objectTable[i];
+                Type = SyncType.Download,
-                if (obj == null)
+                TerritoryType = territoryId,
-                    continue;
+                Success = success,
+                Locations = downloadedMarkers
+            });
+        }
+        catch (Exception e)
+        {
+            _debugState.SetFromException(e);
+        }
+    }
 
-                switch ((uint)Marshal.ReadInt32(obj.Address + 128))
+    private async Task UploadLocationsForTerritory(ushort territoryId, List<PersistentLocation> locationsToUpload)
-                {
+    {
-                    case 2007182:
+        try
-                    case 2007183:
+        {
-                    case 2007184:
+            _logger.LogInformation("Uploading {Count} locations for territory {Territory} to server",
-                    case 2007185:
+                locationsToUpload.Count, (ETerritoryType)territoryId);
-                    case 2007186:
+            var (success, uploadedLocations) = await _remoteApi.UploadLocations(territoryId, locationsToUpload);
-                    case 2009504:
+            LateEventQueue.Enqueue(new QueuedSyncResponse
-                        persistentLocations.Add(new PersistentLocation
-                        {
-                            Type = MemoryLocation.EType.Trap,
-                            Position = obj.Position,
-                            Seen = true,
-                            Source = ClientLocation.ESource.SeenLocally,
-                        });
-                        break;
-
-                    case 2007542:
-                    case 2007543:
-                        persistentLocations.Add(new PersistentLocation
-                        {
-                            Type = MemoryLocation.EType.Hoard,
-                            Position = obj.Position,
-                            Seen = true,
-                            Source = ClientLocation.ESource.SeenLocally,
-                        });
-                        break;
-
-                    case 2007357:
-                        ephemeralLocations.Add(new EphemeralLocation
-                        {
-                            Type = MemoryLocation.EType.SilverCoffer,
-                            Position = obj.Position,
-                            Seen = true,
-                        });
-                        break;
-                }
-            }
-
-            while (NextUpdateObjects.TryDequeue(out nint address))
             {
-                var obj = _objectTable.FirstOrDefault(x => x.Address == address);
+                Type = SyncType.Upload,
-                if (obj != null && obj.Position.Length() > 0.1)
+                TerritoryType = territoryId,
-                {
+                Success = success,
+                Locations = uploadedLocations
+            });
+        }
+        catch (Exception e)
+        {
+            _debugState.SetFromException(e);
+        }
+    }
+
+    private async Task SyncSeenMarkersForTerritory(ushort territoryId,
+        IReadOnlyList<PersistentLocation> locationsToUpdate)
+    {
+        try
+        {
+            _logger.LogInformation("Syncing {Count} seen locations for territory {Territory} to server",
+                locationsToUpdate.Count, (ETerritoryType)territoryId);
+            var success = await _remoteApi.MarkAsSeen(territoryId, locationsToUpdate);
+            LateEventQueue.Enqueue(new QueuedSyncResponse
+            {
+                Type = SyncType.MarkSeen,
+                TerritoryType = territoryId,
+                Success = success,
+                Locations = locationsToUpdate,
+            });
+        }
+        catch (Exception e)
+        {
+            _debugState.SetFromException(e);
+        }
+    }
+
+    #endregion
+
+    private (IReadOnlyList<PersistentLocation>, IReadOnlyList<EphemeralLocation>) GetRelevantGameObjects()
+    {
+        List<PersistentLocation> persistentLocations = new();
+        List<EphemeralLocation> ephemeralLocations = new();
+        for (int i = 246; i < _objectTable.Length; i++)
+        {
+            IGameObject? obj = _objectTable[i];
+            if (obj == null)
+                continue;
+
+            switch ((uint)Marshal.ReadInt32(obj.Address + 128))
+            {
+                case 2007182:
+                case 2007183:
+                case 2007184:
+                case 2007185:
+                case 2007186:
+                case 2009504:
+                case 2013284:
                     persistentLocations.Add(new PersistentLocation
                     {
                         Type = MemoryLocation.EType.Trap,
                         Position = obj.Position,
                         Seen = true,
-                        Source = ClientLocation.ESource.ExplodedLocally,
+                        Source = ClientLocation.ESource.SeenLocally,
-
                     });
-                }
+                    break;
+
+                case 2007542:
+                case 2007543:
+                    persistentLocations.Add(new PersistentLocation
+                    {
+                        Type = MemoryLocation.EType.Hoard,
+                        Position = obj.Position,
+                        Seen = true,
+                        Source = ClientLocation.ESource.SeenLocally,
+                    });
+                    break;
+
+                case 2007357:
+                    ephemeralLocations.Add(new EphemeralLocation
+                    {
+                        Type = MemoryLocation.EType.SilverCoffer,
+                        Position = obj.Position,
+                        Seen = true,
+                    });
+                    break;
+
+                case 2007358:
+                    ephemeralLocations.Add(new EphemeralLocation
+                    {
+                        Type = MemoryLocation.EType.GoldCoffer,
+                        Position = obj.Position,
+                        Seen = true
+                    });
+                    break;
             }
-
-            return (persistentLocations, ephemeralLocations);
         }
 
-        private void HandleQueued(IQueueOnFrameworkThread queued, ref bool recreateLayout)
+        while (NextUpdateObjects.TryDequeue(out nint address))
         {
-            Type handlerType = typeof(IQueueOnFrameworkThread.Handler<>).MakeGenericType(queued.GetType());
+            var obj = _objectTable.FirstOrDefault(x => x.Address == address);
-            var handler = (IQueueOnFrameworkThread.IHandler)_serviceProvider.GetRequiredService(handlerType);
+            if (obj != null && obj.Position.Length() > 0.1)
-
+            {
-            handler.RunIfCompatible(queued, ref recreateLayout);
+                persistentLocations.Add(new PersistentLocation
+                {
+                    Type = MemoryLocation.EType.Trap,
+                    Position = obj.Position,
+                    Seen = true,
+                    Source = ClientLocation.ESource.ExplodedLocally,
+                });
+            }
         }
+
+        return (persistentLocations, ephemeralLocations);
+    }
+
+    private void HandleQueued(IQueueOnFrameworkThread queued, ref bool recreateLayout)
+    {
+        Type handlerType = typeof(IQueueOnFrameworkThread.Handler<>).MakeGenericType(queued.GetType());
+        var handler = (IQueueOnFrameworkThread.IHandler)_serviceProvider.GetRequiredService(handlerType);
+
+        handler.RunIfCompatible(queued, ref recreateLayout);
     }
 }

Pal.Client/Floors/MemoryLocation.cs

@@ -5,62 +5,62 @@ using Pal.Client.Rendering;
 using Pal.Common;
 using Palace;
 
-namespace Pal.Client.Floors
+namespace Pal.Client.Floors;
+
+/// <summary>
+/// Base class for <see cref="MemoryLocation"/> and <see cref="EphemeralLocation"/>.
+/// </summary>
+internal abstract class MemoryLocation
 {
-    /// <summary>
+    public required EType Type { get; init; }
-    /// Base class for <see cref="MemoryLocation"/> and <see cref="EphemeralLocation"/>.
+    public required Vector3 Position { get; init; }
-    /// </summary>
+    public bool Seen { get; set; }
-    internal abstract class MemoryLocation
+
+    public IRenderElement? RenderElement { get; set; }
+
+    public enum EType
     {
-        public required EType Type { get; init; }
+        Unknown,
-        public required Vector3 Position { get; init; }
-        public bool Seen { get; set; }
 
-        public IRenderElement? RenderElement { get; set; }
+        Trap,
+        Hoard,
 
-        public enum EType
+        SilverCoffer,
-        {
+        GoldCoffer,
-            Unknown,
-
-            Trap,
-            Hoard,
-
-            SilverCoffer,
-        }
-
-        public override bool Equals(object? obj)
-        {
-            return obj is MemoryLocation otherLocation &&
-                   Type == otherLocation.Type &&
-                   PalaceMath.IsNearlySamePosition(Position, otherLocation.Position);
-        }
-
-        public override int GetHashCode()
-        {
-            return HashCode.Combine(Type, PalaceMath.GetHashCode(Position));
-        }
     }
 
-    internal static class ETypeExtensions
+    public override bool Equals(object? obj)
     {
-        public static MemoryLocation.EType ToMemoryType(this ObjectType objectType)
+        return obj is MemoryLocation otherLocation &&
-        {
+               Type == otherLocation.Type &&
-            return objectType switch
+               PalaceMath.IsNearlySamePosition(Position, otherLocation.Position);
-            {
+    }
-                ObjectType.Trap => MemoryLocation.EType.Trap,
-                ObjectType.Hoard => MemoryLocation.EType.Hoard,
-                _ => throw new ArgumentOutOfRangeException(nameof(objectType), objectType, null)
-            };
-        }
 
-        public static ObjectType ToObjectType(this MemoryLocation.EType type)
+    public override int GetHashCode()
-        {
+    {
-            return type switch
+        return HashCode.Combine(Type, PalaceMath.GetHashCode(Position));
-            {
+    }
-                MemoryLocation.EType.Trap => ObjectType.Trap,
+}
-                MemoryLocation.EType.Hoard => ObjectType.Hoard,
+
-                _ => throw new ArgumentOutOfRangeException(nameof(type), type, null)
+internal static class ETypeExtensions
-            };
+{
-        }
+    public static MemoryLocation.EType ToMemoryType(this ObjectType objectType)
+    {
+        return objectType switch
+        {
+            ObjectType.Trap => MemoryLocation.EType.Trap,
+            ObjectType.Hoard => MemoryLocation.EType.Hoard,
+            _ => throw new ArgumentOutOfRangeException(nameof(objectType), objectType, null)
+        };
+    }
+
+    public static ObjectType ToObjectType(this MemoryLocation.EType type)
+    {
+        return type switch
+        {
+            MemoryLocation.EType.Trap => ObjectType.Trap,
+            MemoryLocation.EType.Hoard => ObjectType.Hoard,
+            _ => throw new ArgumentOutOfRangeException(nameof(type), type, null)
+        };
     }
 }

Pal.Client/Floors/MemoryTerritory.cs

@@ -5,59 +5,58 @@ using Pal.Client.Configuration;
 using Pal.Client.Scheduled;
 using Pal.Common;
 
-namespace Pal.Client.Floors
+namespace Pal.Client.Floors;
+
+/// <summary>
+/// A single set of floors loaded entirely in memory, can be e.g. POTD 51-60.
+/// </summary>
+internal sealed class MemoryTerritory
 {
-    /// <summary>
+    public MemoryTerritory(ETerritoryType territoryType)
-    /// A single set of floors loaded entirely in memory, can be e.g. POTD 51-60.
-    /// </summary>
-    internal sealed class MemoryTerritory
     {
-        public MemoryTerritory(ETerritoryType territoryType)
+        TerritoryType = territoryType;
-        {
+    }
-            TerritoryType = territoryType;
-        }
 
-        public ETerritoryType TerritoryType { get; }
+    public ETerritoryType TerritoryType { get; }
-        public EReadyState ReadyState { get; set; } = EReadyState.NotLoaded;
+    public EReadyState ReadyState { get; set; } = EReadyState.NotLoaded;
-        public ESyncState SyncState { get; set; } = ESyncState.NotAttempted;
+    public ESyncState SyncState { get; set; } = ESyncState.NotAttempted;
 
-        public ConcurrentBag<PersistentLocation> Locations { get; } = new();
+    public ConcurrentBag<PersistentLocation> Locations { get; } = new();
-        public object LockObj { get; } = new();
+    public object LockObj { get; } = new();
 
-        public void Initialize(IEnumerable<PersistentLocation> locations)
+    public void Initialize(IEnumerable<PersistentLocation> locations)
-        {
+    {
-            Locations.Clear();
+        Locations.Clear();
-            foreach (var location in locations)
+        foreach (var location in locations)
-                Locations.Add(location);
+            Locations.Add(location);
 
-            ReadyState = EReadyState.Ready;
+        ReadyState = EReadyState.Ready;
-        }
+    }
 
-        public void Reset()
+    public void Reset()
-        {
+    {
-            Locations.Clear();
+        Locations.Clear();
-            SyncState = ESyncState.NotAttempted;
+        SyncState = ESyncState.NotAttempted;
-            ReadyState = EReadyState.NotLoaded;
+        ReadyState = EReadyState.NotLoaded;
-        }
+    }
 
-        public enum EReadyState
+    public enum EReadyState
-        {
+    {
-            NotLoaded,
+        NotLoaded,
 
-            /// <summary>
+        /// <summary>
-            /// Currently loading from the database.
+        /// Currently loading from the database.
-            /// </summary>
+        /// </summary>
-            Loading,
+        Loading,
 
-            /// <summary>
+        /// <summary>
-            /// Locations loaded, no import running.
+        /// Locations loaded, no import running.
-            /// </summary>
+        /// </summary>
-            Ready,
+        Ready,
 
-            /// <summary>
+        /// <summary>
-            /// Import running, should probably not interact with this too much.
+        /// Import running, should probably not interact with this too much.
-            /// </summary>
+        /// </summary>
-            Importing,
+        Importing,
-        }
     }
 }

Pal.Client/Floors/ObjectTableDebug.cs

@@ -0,0 +1,99 @@
+using System;
+using System.Numerics;
+using System.Runtime.InteropServices;
+using Dalamud.Game.ClientState.Objects.SubKinds;
+using Dalamud.Game.ClientState.Objects.Types;
+using Dalamud.Plugin;
+using Dalamud.Plugin.Services;
+using ImGuiNET;
+
+namespace Pal.Client.Floors;
+
+/// <summary>
+/// This isn't very useful for running deep dungeons normally, but it is for plugin dev.
+///
+/// Needs the corresponding beta feature to be enabled.
+/// </summary>
+internal sealed class ObjectTableDebug : IDisposable
+{
+    public const string FeatureName = nameof(ObjectTableDebug);
+
+    private readonly IDalamudPluginInterface _pluginInterface;
+    private readonly IObjectTable _objectTable;
+    private readonly IGameGui _gameGui;
+    private readonly IClientState _clientState;
+
+    public ObjectTableDebug(IDalamudPluginInterface pluginInterface, IObjectTable objectTable, IGameGui gameGui,
+        IClientState clientState)
+    {
+        _pluginInterface = pluginInterface;
+        _objectTable = objectTable;
+        _gameGui = gameGui;
+        _clientState = clientState;
+
+        _pluginInterface.UiBuilder.Draw += Draw;
+    }
+
+    private void Draw()
+    {
+        int index = 0;
+        foreach (IGameObject obj in _objectTable)
+        {
+            if (obj is IEventObj eventObj && string.IsNullOrEmpty(eventObj.Name.ToString()))
+            {
+                ++index;
+                int model = Marshal.ReadInt32(obj.Address + 128);
+
+                if (_gameGui.WorldToScreen(obj.Position, out var screenCoords))
+                {
+                    // So, while WorldToScreen will return false if the point is off of game client screen, to
+                    // to avoid performance issues, we have to manually determine if creating a window would
+                    // produce a new viewport, and skip rendering it if so
+                    float distance = DistanceToPlayer(obj.Position);
+                    var objectText =
+                        $"{obj.Address.ToInt64():X}:{obj.EntityId:X}[{index}]\nkind: {obj.ObjectKind} sub: {obj.SubKind}\nmodel: {model}\nname: {obj.Name}\ndata id: {obj.DataId}";
+
+                    var screenPos = ImGui.GetMainViewport().Pos;
+                    var screenSize = ImGui.GetMainViewport().Size;
+
+                    var windowSize = ImGui.CalcTextSize(objectText);
+
+                    // Add some extra safety padding
+                    windowSize.X += ImGui.GetStyle().WindowPadding.X + 10;
+                    windowSize.Y += ImGui.GetStyle().WindowPadding.Y + 10;
+
+                    if (screenCoords.X + windowSize.X > screenPos.X + screenSize.X ||
+                        screenCoords.Y + windowSize.Y > screenPos.Y + screenSize.Y)
+                        continue;
+
+                    if (distance > 50f)
+                        continue;
+
+                    ImGui.SetNextWindowPos(new Vector2(screenCoords.X, screenCoords.Y));
+
+                    ImGui.SetNextWindowBgAlpha(Math.Max(1f - (distance / 50f), 0.2f));
+                    if (ImGui.Begin(
+                            $"PalacePal_{nameof(ObjectTableDebug)}_{index}",
+                            ImGuiWindowFlags.NoDecoration |
+                            ImGuiWindowFlags.AlwaysAutoResize |
+                            ImGuiWindowFlags.NoSavedSettings |
+                            ImGuiWindowFlags.NoMove |
+                            ImGuiWindowFlags.NoMouseInputs |
+                            ImGuiWindowFlags.NoDocking |
+                            ImGuiWindowFlags.NoFocusOnAppearing |
+                            ImGuiWindowFlags.NoNav))
+                        ImGui.Text(objectText);
+                    ImGui.End();
+                }
+            }
+        }
+    }
+
+    private float DistanceToPlayer(Vector3 center)
+        => Vector3.Distance(_clientState.LocalPlayer?.Position ?? Vector3.Zero, center);
+
+    public void Dispose()
+    {
+        _pluginInterface.UiBuilder.Draw -= Draw;
+    }
+}

Pal.Client/Floors/PersistentLocation.cs

@@ -2,54 +2,53 @@
 using System.Collections.Generic;
 using Pal.Client.Database;
 
-namespace Pal.Client.Floors
+namespace Pal.Client.Floors;
+
+/// <summary>
+/// A <see cref="ClientLocation"/> loaded in memory, with certain extra attributes as needed.
+/// </summary>
+internal sealed class PersistentLocation : MemoryLocation
 {
+    /// <see cref="ClientLocation.LocalId"/>
+    public int? LocalId { get; set; }
+
     /// <summary>
-    /// A <see cref="ClientLocation"/> loaded in memory, with certain extra attributes as needed.
+    /// Network id for the server you're currently connected to.
     /// </summary>
-    internal sealed class PersistentLocation : MemoryLocation
+    public Guid? NetworkId { get; set; }
+
+    /// <summary>
+    /// For markers that the server you're connected to doesn't know: Whether this was requested to be uploaded, to avoid duplicate requests.
+    /// </summary>
+    public bool UploadRequested { get; set; }
+
+    /// <see cref="ClientLocation.RemoteEncounters"/>
+    ///
+    public List<string> RemoteSeenOn { get; set; } = new();
+
+    /// <summary>
+    /// Whether this marker was requested to be seen, to avoid duplicate requests.
+    /// </summary>
+    public bool RemoteSeenRequested { get; set; }
+
+    public ClientLocation.ESource Source { get; init; }
+
+    public override bool Equals(object? obj) => obj is PersistentLocation && base.Equals(obj);
+
+    public override int GetHashCode() => base.GetHashCode();
+
+    public static bool operator ==(PersistentLocation? a, object? b)
     {
-        /// <see cref="ClientLocation.LocalId"/>
+        return Equals(a, b);
-        public int? LocalId { get; set; }
+    }
 
-        /// <summary>
+    public static bool operator !=(PersistentLocation? a, object? b)
-        /// Network id for the server you're currently connected to.
+    {
-        /// </summary>
+        return !Equals(a, b);
-        public Guid? NetworkId { get; set; }
+    }
 
-        /// <summary>
+    public override string ToString()
-        /// For markers that the server you're connected to doesn't know: Whether this was requested to be uploaded, to avoid duplicate requests.
+    {
-        /// </summary>
+        return $"PersistentLocation(Position={Position}, Type={Type})";
-        public bool UploadRequested { get; set; }
-
-        /// <see cref="ClientLocation.RemoteEncounters"/>
-        ///
-        public List<string> RemoteSeenOn { get; set; } = new();
-
-        /// <summary>
-        /// Whether this marker was requested to be seen, to avoid duplicate requests.
-        /// </summary>
-        public bool RemoteSeenRequested { get; set; }
-
-        public ClientLocation.ESource Source { get; init; }
-
-        public override bool Equals(object? obj) => obj is PersistentLocation && base.Equals(obj);
-
-        public override int GetHashCode() => base.GetHashCode();
-
-        public static bool operator ==(PersistentLocation? a, object? b)
-        {
-            return Equals(a, b);
-        }
-
-        public static bool operator !=(PersistentLocation? a, object? b)
-        {
-            return !Equals(a, b);
-        }
-
-        public override string ToString()
-        {
-            return $"PersistentLocation(Position={Position}, Type={Type})";
-        }
     }
 }

Pal.Client/Floors/Tasks/DbTask.cs

@@ -4,38 +4,43 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Pal.Client.Database;
 
-namespace Pal.Client.Floors.Tasks
+namespace Pal.Client.Floors.Tasks;
+
+internal abstract class DbTask<T>
+    where T : DbTask<T>
 {
-    internal abstract class DbTask<T>
+    private readonly IServiceScopeFactory _serviceScopeFactory;
-        where T : DbTask<T>
+
+    protected DbTask(IServiceScopeFactory serviceScopeFactory)
     {
-        private readonly IServiceScopeFactory _serviceScopeFactory;
+        _serviceScopeFactory = serviceScopeFactory;
+    }
 
-        protected DbTask(IServiceScopeFactory serviceScopeFactory)
+    public void Start()
+    {
+        Task.Run(() =>
         {
-            _serviceScopeFactory = serviceScopeFactory;
+            try
-        }
-
-        public void Start()
-        {
-            Task.Run(() =>
             {
+                using var scope = _serviceScopeFactory.CreateScope();
+                ILogger<T> logger = scope.ServiceProvider.GetRequiredService<ILogger<T>>();
                 try
                 {
-                    using var scope = _serviceScopeFactory.CreateScope();
-                    ILogger<T> logger = scope.ServiceProvider.GetRequiredService<ILogger<T>>();
                     using var dbContext = scope.ServiceProvider.GetRequiredService<PalClientContext>();
 
                     Run(dbContext, logger);
                 }
                 catch (Exception e)
                 {
-                    DependencyInjectionContext.LoggerProvider.CreateLogger<DbTask<T>>()
+                    logger.LogError(e, "Failed to run DbTask");
-                        .LogError(e, "Failed to run DbTask");
                 }
-            });
+            }
-        }
+            catch (Exception)
-
+            {
-        protected abstract void Run(PalClientContext dbContext, ILogger<T> logger);
+                // nothing we can do here but catch it, if we don't we crash the game
+            }
+        });
     }
+
+    protected abstract void Run(PalClientContext dbContext, ILogger<T> logger);
 }

Pal.Client/Floors/Tasks/LoadTerritory.cs

@@ -7,73 +7,72 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Pal.Client.Database;
 
-namespace Pal.Client.Floors.Tasks
+namespace Pal.Client.Floors.Tasks;
+
+internal sealed class LoadTerritory : DbTask<LoadTerritory>
 {
-    internal sealed class LoadTerritory : DbTask<LoadTerritory>
+    private readonly Cleanup _cleanup;
+    private readonly MemoryTerritory _territory;
+
+    public LoadTerritory(IServiceScopeFactory serviceScopeFactory,
+        Cleanup cleanup,
+        MemoryTerritory territory)
+        : base(serviceScopeFactory)
     {
-        private readonly Cleanup _cleanup;
+        _cleanup = cleanup;
-        private readonly MemoryTerritory _territory;
+        _territory = territory;
+    }
 
-        public LoadTerritory(IServiceScopeFactory serviceScopeFactory,
+    protected override void Run(PalClientContext dbContext, ILogger<LoadTerritory> logger)
-            Cleanup cleanup,
+    {
-            MemoryTerritory territory)
+        lock (_territory.LockObj)
-            : base(serviceScopeFactory)
         {
-            _cleanup = cleanup;
+            if (_territory.ReadyState != MemoryTerritory.EReadyState.Loading)
-            _territory = territory;
-        }
-
-        protected override void Run(PalClientContext dbContext, ILogger<LoadTerritory> logger)
-        {
-            lock (_territory.LockObj)
             {
-                if (_territory.ReadyState != MemoryTerritory.EReadyState.Loading)
+                logger.LogInformation("Territory {Territory} is in state {State}", _territory.TerritoryType,
-                {
+                    _territory.ReadyState);
-                    logger.LogInformation("Territory {Territory} is in state {State}", _territory.TerritoryType,
+                return;
-                        _territory.ReadyState);
-                    return;
-                }
-
-                logger.LogInformation("Loading territory {Territory}", _territory.TerritoryType);
-
-                // purge outdated locations
-                _cleanup.Purge(dbContext, _territory.TerritoryType);
-
-                // load good locations
-                List<ClientLocation> locations = dbContext.Locations
-                    .Where(o => o.TerritoryType == (ushort)_territory.TerritoryType)
-                    .Include(o => o.ImportedBy)
-                    .Include(o => o.RemoteEncounters)
-                    .AsSplitQuery()
-                    .ToList();
-                _territory.Initialize(locations.Select(ToMemoryLocation));
-
-                logger.LogInformation("Loaded {Count} locations for territory {Territory}", locations.Count,
-                    _territory.TerritoryType);
             }
-        }
 
-        public static PersistentLocation ToMemoryLocation(ClientLocation location)
+            logger.LogInformation("Loading territory {Territory}", _territory.TerritoryType);
-        {
-            return new PersistentLocation
-            {
-                LocalId = location.LocalId,
-                Type = ToMemoryLocationType(location.Type),
-                Position = new Vector3(location.X, location.Y, location.Z),
-                Seen = location.Seen,
-                Source = location.Source,
-                RemoteSeenOn = location.RemoteEncounters.Select(o => o.AccountId).ToList(),
-            };
-        }
 
-        private static MemoryLocation.EType ToMemoryLocationType(ClientLocation.EType type)
+            // purge outdated locations
-        {
+            _cleanup.Purge(dbContext, _territory.TerritoryType);
-            return type switch
+
-            {
+            // load good locations
-                ClientLocation.EType.Trap => MemoryLocation.EType.Trap,
+            List<ClientLocation> locations = dbContext.Locations
-                ClientLocation.EType.Hoard => MemoryLocation.EType.Hoard,
+                .Where(o => o.TerritoryType == (ushort)_territory.TerritoryType)
-                _ => throw new ArgumentOutOfRangeException(nameof(type), type, null)
+                .Include(o => o.ImportedBy)
-            };
+                .Include(o => o.RemoteEncounters)
+                .AsSplitQuery()
+                .ToList();
+            _territory.Initialize(locations.Select(ToMemoryLocation));
+
+            logger.LogInformation("Loaded {Count} locations for territory {Territory}", locations.Count,
+                _territory.TerritoryType);
         }
     }
+
+    public static PersistentLocation ToMemoryLocation(ClientLocation location)
+    {
+        return new PersistentLocation
+        {
+            LocalId = location.LocalId,
+            Type = ToMemoryLocationType(location.Type),
+            Position = new Vector3(location.X, location.Y, location.Z),
+            Seen = location.Seen,
+            Source = location.Source,
+            RemoteSeenOn = location.RemoteEncounters.Select(o => o.AccountId).ToList(),
+        };
+    }
+
+    private static MemoryLocation.EType ToMemoryLocationType(ClientLocation.EType type)
+    {
+        return type switch
+        {
+            ClientLocation.EType.Trap => MemoryLocation.EType.Trap,
+            ClientLocation.EType.Hoard => MemoryLocation.EType.Hoard,
+            _ => throw new ArgumentOutOfRangeException(nameof(type), type, null)
+        };
+    }
 }

Pal.Client/Floors/Tasks/MarkLocalSeen.cs

@@ -5,32 +5,33 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Pal.Client.Database;
 
-namespace Pal.Client.Floors.Tasks
+namespace Pal.Client.Floors.Tasks;
+
+internal sealed class MarkLocalSeen : DbTask<MarkLocalSeen>
 {
-    internal sealed class MarkLocalSeen : DbTask<MarkLocalSeen>
+    private readonly MemoryTerritory _territory;
+    private readonly IReadOnlyList<PersistentLocation> _locations;
+
+    public MarkLocalSeen(IServiceScopeFactory serviceScopeFactory, MemoryTerritory territory,
+        IReadOnlyList<PersistentLocation> locations)
+        : base(serviceScopeFactory)
     {
-        private readonly MemoryTerritory _territory;
+        _territory = territory;
-        private readonly IReadOnlyList<PersistentLocation> _locations;
+        _locations = locations;
+    }
 
-        public MarkLocalSeen(IServiceScopeFactory serviceScopeFactory, MemoryTerritory territory,
+    protected override void Run(PalClientContext dbContext, ILogger<MarkLocalSeen> logger)
-            IReadOnlyList<PersistentLocation> locations)
+    {
-            : base(serviceScopeFactory)
+        lock (_territory.LockObj)
         {
-            _territory = territory;
+            logger.LogInformation("Marking {Count} locations as seen locally in territory {Territory}",
-            _locations = locations;
+                _locations.Count,
-        }
+                _territory.TerritoryType);
-
+            List<int> localIds = _locations.Select(l => l.LocalId).Where(x => x != null).Cast<int>().ToList();
-        protected override void Run(PalClientContext dbContext, ILogger<MarkLocalSeen> logger)
+            dbContext.Locations
-        {
+                .Where(loc => localIds.Contains(loc.LocalId))
-            lock (_territory.LockObj)
+                .ExecuteUpdate(loc => loc.SetProperty(l => l.Seen, true));
-            {
+            dbContext.SaveChanges();
-                logger.LogInformation("Marking {Count} locations as seen locally in territory {Territory}", _locations.Count,
-                    _territory.TerritoryType);
-                dbContext.Locations
-                    .Where(loc => _locations.Any(l => l.LocalId == loc.LocalId))
-                    .ExecuteUpdate(loc => loc.SetProperty(l => l.Seen, true));
-                dbContext.SaveChanges();
-            }
         }
     }
 }

Pal.Client/Floors/Tasks/MarkRemoteSeen.cs

@@ -5,47 +5,46 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Pal.Client.Database;
 
-namespace Pal.Client.Floors.Tasks
+namespace Pal.Client.Floors.Tasks;
+
+internal sealed class MarkRemoteSeen : DbTask<MarkRemoteSeen>
 {
-    internal sealed class MarkRemoteSeen : DbTask<MarkRemoteSeen>
+    private readonly MemoryTerritory _territory;
+    private readonly IReadOnlyList<PersistentLocation> _locations;
+    private readonly string _accountId;
+
+    public MarkRemoteSeen(IServiceScopeFactory serviceScopeFactory,
+        MemoryTerritory territory,
+        IReadOnlyList<PersistentLocation> locations,
+        string accountId)
+        : base(serviceScopeFactory)
     {
-        private readonly MemoryTerritory _territory;
+        _territory = territory;
-        private readonly IReadOnlyList<PersistentLocation> _locations;
+        _locations = locations;
-        private readonly string _accountId;
+        _accountId = accountId;
+    }
 
-        public MarkRemoteSeen(IServiceScopeFactory serviceScopeFactory,
+    protected override void Run(PalClientContext dbContext, ILogger<MarkRemoteSeen> logger)
-            MemoryTerritory territory,
+    {
-            IReadOnlyList<PersistentLocation> locations,
+        lock (_territory.LockObj)
-            string accountId)
-            : base(serviceScopeFactory)
         {
-            _territory = territory;
+            logger.LogInformation("Marking {Count} locations as seen remotely on {Account} in territory {Territory}",
-            _locations = locations;
+                _locations.Count, _accountId, _territory.TerritoryType);
-            _accountId = accountId;
-        }
 
-        protected override void Run(PalClientContext dbContext, ILogger<MarkRemoteSeen> logger)
+            List<int> locationIds = _locations.Select(x => x.LocalId).Where(x => x != null).Cast<int>().ToList();
-        {
+            List<ClientLocation> locationsToUpdate =
-            lock (_territory.LockObj)
+                dbContext.Locations
+                    .Include(x => x.RemoteEncounters)
+                    .Where(x => locationIds.Contains(x.LocalId))
+                    .ToList()
+                    .Where(x => x.RemoteEncounters.All(encounter => encounter.AccountId != _accountId))
+                    .ToList();
+            foreach (var clientLocation in locationsToUpdate)
             {
-                logger.LogInformation("Marking {Count} locations as seen remotely on {Account} in territory {Territory}",
+                clientLocation.RemoteEncounters.Add(new RemoteEncounter(clientLocation, _accountId));
-                    _locations.Count, _accountId, _territory.TerritoryType);
-
-                List<int> locationIds = _locations.Select(x => x.LocalId).Where(x => x != null).Cast<int>().ToList();
-                List<ClientLocation> locationsToUpdate =
-                    dbContext.Locations
-                        .Include(x => x.RemoteEncounters)
-                        .Where(x => locationIds.Contains(x.LocalId))
-                        .ToList()
-                        .Where(x => x.RemoteEncounters.All(encounter => encounter.AccountId != _accountId))
-                        .ToList();
-                foreach (var clientLocation in locationsToUpdate)
-                {
-                    clientLocation.RemoteEncounters.Add(new RemoteEncounter(clientLocation, _accountId));
-                }
-
-                dbContext.SaveChanges();
             }
+
+            dbContext.SaveChanges();
         }
     }
 }

Pal.Client/Floors/Tasks/SaveNewLocations.cs

@@ -6,72 +6,71 @@ using Microsoft.Extensions.Logging;
 using Pal.Client.Database;
 using Pal.Common;
 
-namespace Pal.Client.Floors.Tasks
+namespace Pal.Client.Floors.Tasks;
+
+internal sealed class SaveNewLocations : DbTask<SaveNewLocations>
 {
-    internal sealed class SaveNewLocations : DbTask<SaveNewLocations>
+    private readonly MemoryTerritory _territory;
+    private readonly List<PersistentLocation> _newLocations;
+
+    public SaveNewLocations(IServiceScopeFactory serviceScopeFactory, MemoryTerritory territory,
+        List<PersistentLocation> newLocations)
+        : base(serviceScopeFactory)
     {
-        private readonly MemoryTerritory _territory;
+        _territory = territory;
-        private readonly List<PersistentLocation> _newLocations;
+        _newLocations = newLocations;
+    }
 
-        public SaveNewLocations(IServiceScopeFactory serviceScopeFactory, MemoryTerritory territory,
+    protected override void Run(PalClientContext dbContext, ILogger<SaveNewLocations> logger)
-            List<PersistentLocation> newLocations)
+    {
-            : base(serviceScopeFactory)
+        Run(_territory, dbContext, logger, _newLocations);
-        {
+    }
-            _territory = territory;
-            _newLocations = newLocations;
-        }
 
-        protected override void Run(PalClientContext dbContext, ILogger<SaveNewLocations> logger)
+    public static void Run<T>(
+        MemoryTerritory territory,
+        PalClientContext dbContext,
+        ILogger<T> logger,
+        List<PersistentLocation> locations)
+    {
+        lock (territory.LockObj)
         {
-            Run(_territory, dbContext, logger, _newLocations);
+            logger.LogInformation("Saving {Count} new locations for territory {Territory}", locations.Count,
-        }
+                territory.TerritoryType);
 
-        public static void Run<T>(
+            Dictionary<PersistentLocation, ClientLocation> mapping =
-            MemoryTerritory territory,
+                locations.ToDictionary(x => x, x => ToDatabaseLocation(x, territory.TerritoryType));
-            PalClientContext dbContext,
+            dbContext.Locations.AddRange(mapping.Values);
-            ILogger<T> logger,
+            dbContext.SaveChanges();
-            List<PersistentLocation> locations)
+
-        {
+            foreach ((PersistentLocation persistentLocation, ClientLocation clientLocation) in mapping)
-            lock (territory.LockObj)
             {
-                logger.LogInformation("Saving {Count} new locations for territory {Territory}", locations.Count,
+                persistentLocation.LocalId = clientLocation.LocalId;
-                    territory.TerritoryType);
-
-                Dictionary<PersistentLocation, ClientLocation> mapping =
-                    locations.ToDictionary(x => x, x => ToDatabaseLocation(x, territory.TerritoryType));
-                dbContext.Locations.AddRange(mapping.Values);
-                dbContext.SaveChanges();
-
-                foreach ((PersistentLocation persistentLocation, ClientLocation clientLocation) in mapping)
-                {
-                    persistentLocation.LocalId = clientLocation.LocalId;
-                }
             }
         }
+    }
 
-        private static ClientLocation ToDatabaseLocation(PersistentLocation location, ETerritoryType territoryType)
+    private static ClientLocation ToDatabaseLocation(PersistentLocation location, ETerritoryType territoryType)
+    {
+        return new ClientLocation
         {
-            return new ClientLocation
+            TerritoryType = (ushort)territoryType,
-            {
+            Type = ToDatabaseType(location.Type),
-                TerritoryType = (ushort)territoryType,
+            X = location.Position.X,
-                Type = ToDatabaseType(location.Type),
+            Y = location.Position.Y,
-                X = location.Position.X,
+            Z = location.Position.Z,
-                Y = location.Position.Y,
+            Seen = location.Seen,
-                Z = location.Position.Z,
+            Source = location.Source,
-                Seen = location.Seen,
+            SinceVersion = typeof(Plugin).Assembly.GetName().Version!.ToString(2),
-                Source = location.Source,
+        };
-                SinceVersion = typeof(Plugin).Assembly.GetName().Version!.ToString(2),
+    }
-            };
-        }
 
-        private static ClientLocation.EType ToDatabaseType(MemoryLocation.EType type)
+    private static ClientLocation.EType ToDatabaseType(MemoryLocation.EType type)
+    {
+        return type switch
         {
-            return type switch
+            MemoryLocation.EType.Trap => ClientLocation.EType.Trap,
-            {
+            MemoryLocation.EType.Hoard => ClientLocation.EType.Hoard,
-                MemoryLocation.EType.Trap => ClientLocation.EType.Trap,
+            _ => throw new ArgumentOutOfRangeException(nameof(type), type, null)
-                MemoryLocation.EType.Hoard => ClientLocation.EType.Hoard,
+        };
-                _ => throw new ArgumentOutOfRangeException(nameof(type), type, null)
-            };
-        }
     }
 }

Pal.Client/Floors/TerritoryState.cs

@@ -1,36 +1,34 @@
-using Dalamud.Game.ClientState;
+using Dalamud.Game.ClientState.Conditions;
-using Dalamud.Game.ClientState.Conditions;
+using Dalamud.Plugin.Services;
 using Pal.Common;
 
-namespace Pal.Client.Floors
+namespace Pal.Client.Floors;
+
+public sealed class TerritoryState
 {
-    public sealed class TerritoryState
+    private readonly IClientState _clientState;
+    private readonly ICondition _condition;
+
+    public TerritoryState(IClientState clientState, ICondition condition)
     {
-        private readonly ClientState _clientState;
+        _clientState = clientState;
-        private readonly Condition _condition;
+        _condition = condition;
-
-        public TerritoryState(ClientState clientState, Condition condition)
-        {
-            _clientState = clientState;
-            _condition = condition;
-        }
-
-        public ushort LastTerritory { get; set; }
-        public PomanderState PomanderOfSight { get; set; } = PomanderState.Inactive;
-        public PomanderState PomanderOfIntuition { get; set; } = PomanderState.Inactive;
-
-        public bool IsInDeepDungeon() =>
-            _clientState.IsLoggedIn
-            && _condition[ConditionFlag.InDeepDungeon]
-            && typeof(ETerritoryType).IsEnumDefined(_clientState.TerritoryType);
-
     }
 
-    public enum PomanderState
+    public ushort LastTerritory { get; set; }
-    {
+    public PomanderState PomanderOfSight { get; set; } = PomanderState.Inactive;
-        Inactive,
+    public PomanderState PomanderOfIntuition { get; set; } = PomanderState.Inactive;
-        Active,
+
-        FoundOnCurrentFloor,
+    public bool IsInDeepDungeon() =>
-        PomanderOfSafetyUsed,
+        _clientState.IsLoggedIn
-    }
+        && _condition[ConditionFlag.InDeepDungeon]
+        && typeof(ETerritoryType).IsEnumDefined(_clientState.TerritoryType);
+}
+
+public enum PomanderState
+{
+    Inactive,
+    Active,
+    FoundOnCurrentFloor,
+    PomanderOfSafetyUsed,
 }

Pal.Client/ILanguageChanged.cs

@@ -4,10 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Pal.Client
+namespace Pal.Client;
+
+internal interface ILanguageChanged
 {
-    internal interface ILanguageChanged
+    void LanguageChanged();
-    {
-        void LanguageChanged();
-    }
 }

Pal.Client/Net/JwtClaims.cs

@@ -1,95 +1,79 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Text.Json.Serialization;
 using System.Text.Json;
-using System.Threading.Tasks;
+using System.Text.Json.Serialization;
 
-namespace Pal.Client.Net
+namespace Pal.Client.Net;
+
+internal sealed class JwtClaims
 {
-    internal sealed class JwtClaims
+    [JsonPropertyName("nameid")]
+    public Guid NameId { get; set; }
+
+    [JsonPropertyName("role")]
+    [JsonConverter(typeof(JwtRoleConverter))]
+    public List<string> Roles { get; set; } = new();
+
+    [JsonPropertyName("nbf")]
+    [JsonConverter(typeof(JwtDateConverter))]
+    public DateTimeOffset NotBefore { get; set; }
+
+    [JsonPropertyName("exp")]
+    [JsonConverter(typeof(JwtDateConverter))]
+    public DateTimeOffset ExpiresAt { get; set; }
+
+    public static JwtClaims FromAuthToken(string authToken)
     {
-        [JsonPropertyName("nameid")]
+        if (string.IsNullOrEmpty(authToken))
-        public Guid NameId { get; set; }
+            throw new ArgumentException("Server sent no auth token", nameof(authToken));
 
-        [JsonPropertyName("role")]
+        string[] parts = authToken.Split('.');
-        [JsonConverter(typeof(JwtRoleConverter))]
+        if (parts.Length != 3)
-        public List<string> Roles { get; set; } = new();
+            throw new ArgumentException("Unsupported token type", nameof(authToken));
 
-        [JsonPropertyName("nbf")]
+        // fix padding manually
-        [JsonConverter(typeof(JwtDateConverter))]
+        string payload = parts[1].Replace(",", "=").Replace("-", "+").Replace("/", "_");
-        public DateTimeOffset NotBefore { get; set; }
+        if (payload.Length % 4 == 2)
+            payload += "==";
+        else if (payload.Length % 4 == 3)
+            payload += "=";
 
-        [JsonPropertyName("exp")]
+        string content = Encoding.UTF8.GetString(Convert.FromBase64String(payload));
-        [JsonConverter(typeof(JwtDateConverter))]
+        return JsonSerializer.Deserialize<JwtClaims>(content) ??
-        public DateTimeOffset ExpiresAt { get; set; }
+               throw new InvalidOperationException("token deserialization returned null");
-
-        public static JwtClaims FromAuthToken(string authToken)
-        {
-            if (string.IsNullOrEmpty(authToken))
-                throw new ArgumentException("Server sent no auth token", nameof(authToken));
-
-            string[] parts = authToken.Split('.');
-            if (parts.Length != 3)
-                throw new ArgumentException("Unsupported token type", nameof(authToken));
-
-            // fix padding manually
-            string payload = parts[1].Replace(",", "=").Replace("-", "+").Replace("/", "_");
-            if (payload.Length % 4 == 2)
-                payload += "==";
-            else if (payload.Length % 4 == 3)
-                payload += "=";
-
-            string content = Encoding.UTF8.GetString(Convert.FromBase64String(payload));
-            return JsonSerializer.Deserialize<JwtClaims>(content) ?? throw new InvalidOperationException("token deserialization returned null");
-        }
-    }
-
-    internal sealed class JwtRoleConverter : JsonConverter<List<string>>
-    {
-        public override List<string> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            if (reader.TokenType == JsonTokenType.String)
-                return new List<string> { reader.GetString() ?? throw new JsonException("no value present") };
-            else if (reader.TokenType == JsonTokenType.StartArray)
-            {
-                List<string> result = new();
-                while (reader.Read())
-                {
-                    if (reader.TokenType == JsonTokenType.EndArray)
-                    {
-                        result.Sort();
-                        return result;
-                    }
-
-                    if (reader.TokenType != JsonTokenType.String)
-                        throw new JsonException("string expected");
-
-                    result.Add(reader.GetString() ?? throw new JsonException("no value present"));
-                }
-
-                throw new JsonException("read to end of document");
-            }
-            else
-                throw new JsonException("bad token type");
-        }
-
-        public override void Write(Utf8JsonWriter writer, List<string> value, JsonSerializerOptions options) => throw new NotImplementedException();
-    }
-
-    public sealed class JwtDateConverter : JsonConverter<DateTimeOffset>
-    {
-        static readonly DateTimeOffset Zero = new(1970, 1, 1, 0, 0, 0, TimeSpan.Zero);
-
-        public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            if (reader.TokenType != JsonTokenType.Number)
-                throw new JsonException("bad token type");
-
-            return Zero.AddSeconds(reader.GetInt64());
-        }
-
-        public override void Write(Utf8JsonWriter writer, DateTimeOffset value, JsonSerializerOptions options) => throw new NotImplementedException();
     }
 }
+
+internal sealed class JwtRoleConverter : JsonConverter<List<string>>
+{
+    public override List<string> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType == JsonTokenType.String)
+            return new List<string> { reader.GetString() ?? throw new JsonException("no value present") };
+        else if (reader.TokenType == JsonTokenType.StartArray)
+        {
+            List<string> result = new();
+            while (reader.Read())
+            {
+                if (reader.TokenType == JsonTokenType.EndArray)
+                {
+                    result.Sort();
+                    return result;
+                }
+
+                if (reader.TokenType != JsonTokenType.String)
+                    throw new JsonException("string expected");
+
+                result.Add(reader.GetString() ?? throw new JsonException("no value present"));
+            }
+
+            throw new JsonException("read to end of document");
+        }
+        else
+            throw new JsonException("bad token type");
+    }
+
+    public override void Write(Utf8JsonWriter writer, List<string> value, JsonSerializerOptions options) =>
+        throw new NotImplementedException();
+}

Pal.Client/Net/JwtDateConverter.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Pal.Client.Net;
+
+public sealed class JwtDateConverter : JsonConverter<DateTimeOffset>
+{
+    static readonly DateTimeOffset Zero = new(1970, 1, 1, 0, 0, 0, TimeSpan.Zero);
+
+    public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType != JsonTokenType.Number)
+            throw new JsonException("bad token type");
+
+        return Zero.AddSeconds(reader.GetInt64());
+    }
+
+    public override void Write(Utf8JsonWriter writer, DateTimeOffset value, JsonSerializerOptions options) =>
+        throw new NotImplementedException();
+}

Pal.Client/Net/RemoteApi.AccountService.cs

@@ -1,232 +1,248 @@
-using Account;
+using System;
-using Grpc.Core;
-using Grpc.Net.Client;
-using Microsoft.Extensions.Logging;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using Account;
+using Grpc.Core;
+using Grpc.Net.Client;
+using Microsoft.Extensions.Logging;
+using Pal.Client.Configuration;
 using Pal.Client.Extensions;
 using Pal.Client.Properties;
-using Pal.Client.Configuration;
+using Version = System.Version;
 
-namespace Pal.Client.Net
+namespace Pal.Client.Net;
+
+internal partial class RemoteApi
 {
-    internal partial class RemoteApi
+    private static readonly Version PluginVersion = typeof(Plugin).Assembly.GetName().Version!;
+    private readonly SemaphoreSlim _connectLock = new(1, 1);
+
+    private async Task<(bool Success, string Error)> TryConnect(CancellationToken cancellationToken,
+        ILoggerFactory? loggerFactory = null, bool retry = true)
     {
-        private readonly SemaphoreSlim _connectLock = new(1, 1);
+        using IDisposable? logScope = _logger.BeginScope("TryConnect");
 
-        private async Task<(bool Success, string Error)> TryConnect(CancellationToken cancellationToken,
+        var result = await TryConnectImpl(cancellationToken, loggerFactory);
-            ILoggerFactory? loggerFactory = null, bool retry = true)
+        if (retry && result.ShouldRetry)
+            result = await TryConnectImpl(cancellationToken, loggerFactory);
+
+        return (result.Success, result.Error);
+    }
+
+    private async Task<(bool Success, string Error, bool ShouldRetry)> TryConnectImpl(
+        CancellationToken cancellationToken,
+        ILoggerFactory? loggerFactory)
+    {
+        if (_configuration.Mode != EMode.Online)
         {
-            using IDisposable? logScope = _logger.BeginScope("TryConnect");
+            _logger.LogDebug("Not Online, not attempting to establish a connection");
-
+            return (false, Localization.ConnectionError_NotOnline, false);
-            var result = await TryConnectImpl(cancellationToken, loggerFactory);
-            if (retry && result.ShouldRetry)
-                result = await TryConnectImpl(cancellationToken, loggerFactory);
-
-            return (result.Success, result.Error);
         }
 
-        private async Task<(bool Success, string Error, bool ShouldRetry)> TryConnectImpl(
+        if (_channel == null ||
-            CancellationToken cancellationToken,
+            !(_channel.State == ConnectivityState.Ready || _channel.State == ConnectivityState.Idle))
-            ILoggerFactory? loggerFactory)
         {
-            if (_configuration.Mode != EMode.Online)
+            Dispose();
-            {
-                _logger.LogDebug("Not Online, not attempting to establish a connection");
-                return (false, Localization.ConnectionError_NotOnline, false);
-            }
 
-            if (_channel == null ||
+            _logger.LogInformation("Creating new gRPC channel");
-                !(_channel.State == ConnectivityState.Ready || _channel.State == ConnectivityState.Idle))
+            _channel = GrpcChannel.ForAddress(RemoteUrl, new GrpcChannelOptions
             {
-                Dispose();
+                HttpHandler = new SocketsHttpHandler
-
-                _logger.LogInformation("Creating new gRPC channel");
-                _channel = GrpcChannel.ForAddress(RemoteUrl, new GrpcChannelOptions
                 {
-                    HttpHandler = new SocketsHttpHandler
+                    ConnectTimeout = TimeSpan.FromSeconds(5),
-                    {
+                    SslOptions = GetSslClientAuthenticationOptions(),
-                        ConnectTimeout = TimeSpan.FromSeconds(5),
+                },
-                        SslOptions = GetSslClientAuthenticationOptions(),
+                LoggerFactory = loggerFactory,
-                    },
+            });
-                    LoggerFactory = loggerFactory,
-                });
 
-                _logger.LogInformation("Connecting to upstream service at {Url}", RemoteUrl);
+            _logger.LogInformation("Connecting to upstream service at {Url}", RemoteUrl);
-                await _channel.ConnectAsync(cancellationToken);
+            await _channel.ConnectAsync(cancellationToken);
+        }
+
+        cancellationToken.ThrowIfCancellationRequested();
+
+        _logger.LogTrace("Acquiring connect lock");
+        await _connectLock.WaitAsync(cancellationToken);
+        _logger.LogTrace("Obtained connect lock");
+
+        try
+        {
+            var accountClient = new AccountService.AccountServiceClient(_channel);
+            IAccountConfiguration? configuredAccount = _configuration.FindAccount(RemoteUrl);
+            if (configuredAccount == null)
+            {
+                _logger.LogInformation("No account information saved for {Url}, creating new account", RemoteUrl);
+                var createAccountReply = await accountClient.CreateAccountAsync(new CreateAccountRequest
+                    {
+                        Version = new()
+                        {
+                            Major = PluginVersion.Major,
+                            Minor = PluginVersion.Minor,
+                        },
+                    },
+                    headers: UnauthorizedHeaders(), deadline: DateTime.UtcNow.AddSeconds(10),
+                    cancellationToken: cancellationToken);
+                if (createAccountReply.Success)
+                {
+                    if (!Guid.TryParse(createAccountReply.AccountId, out Guid accountId))
+                        throw new InvalidOperationException("invalid account id returned");
+
+                    configuredAccount = _configuration.CreateAccount(RemoteUrl, accountId);
+                    _logger.LogInformation("Account created with id {AccountId}", accountId.ToPartialId());
+
+                    _configurationManager.Save(_configuration);
+                }
+                else
+                {
+                    _logger.LogError("Account creation failed with error {Error}", createAccountReply.Error);
+                    if (createAccountReply.Error == CreateAccountError.UpgradeRequired && !_warnedAboutUpgrade)
+                    {
+                        _chat.Error(Localization.ConnectionError_OldVersion);
+                        _warnedAboutUpgrade = true;
+                    }
+
+                    return (false,
+                        string.Format(Localization.ConnectionError_CreateAccountFailed, createAccountReply.Error),
+                        false);
+                }
             }
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            _logger.LogTrace("Acquiring connect lock");
+            // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
-            await _connectLock.WaitAsync(cancellationToken);
+            if (configuredAccount == null)
-            _logger.LogTrace("Obtained connect lock");
-
-            try
             {
-                var accountClient = new AccountService.AccountServiceClient(_channel);
+                _logger.LogWarning("No account to login with");
-                IAccountConfiguration? configuredAccount = _configuration.FindAccount(RemoteUrl);
+                return (false, Localization.ConnectionError_CreateAccountReturnedNoId, false);
-                if (configuredAccount == null)
+            }
-                {
-                    _logger.LogInformation("No account information saved for {Url}, creating new account", RemoteUrl);
-                    var createAccountReply = await accountClient.CreateAccountAsync(new CreateAccountRequest(),
-                        headers: UnauthorizedHeaders(), deadline: DateTime.UtcNow.AddSeconds(10),
-                        cancellationToken: cancellationToken);
-                    if (createAccountReply.Success)
-                    {
-                        if (!Guid.TryParse(createAccountReply.AccountId, out Guid accountId))
-                            throw new InvalidOperationException("invalid account id returned");
 
-                        configuredAccount = _configuration.CreateAccount(RemoteUrl, accountId);
+            if (!_loginInfo.IsValid)
-                        _logger.LogInformation("Account created with id {AccountId}", accountId.ToPartialId());
+            {
-
+                _logger.LogInformation("Logging in with account id {AccountId}",
-                        _configurationManager.Save(_configuration);
+                    configuredAccount.AccountId.ToPartialId());
-                    }
+                LoginReply loginReply = await accountClient.LoginAsync(
-                    else
+                    new LoginRequest
                     {
-                        _logger.LogError("Account creation failed with error {Error}", createAccountReply.Error);
+                        AccountId = configuredAccount.AccountId.ToString(),
-                        if (createAccountReply.Error == CreateAccountError.UpgradeRequired && !_warnedAboutUpgrade)
+                        Version = new()
                         {
-                            _chat.Error(Localization.ConnectionError_OldVersion);
+                            Major = PluginVersion.Major,
-                            _warnedAboutUpgrade = true;
+                            Minor = PluginVersion.Minor,
-                        }
+                        },
+                    },
+                    headers: UnauthorizedHeaders(), deadline: DateTime.UtcNow.AddSeconds(10),
+                    cancellationToken: cancellationToken);
 
-                        return (false,
+                if (loginReply.Success)
-                            string.Format(Localization.ConnectionError_CreateAccountFailed, createAccountReply.Error),
-                            false);
-                    }
-                }
-
-                cancellationToken.ThrowIfCancellationRequested();
-
-                // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
-                if (configuredAccount == null)
                 {
-                    _logger.LogWarning("No account to login with");
+                    _logger.LogInformation("Login successful with account id: {AccountId}",
-                    return (false, Localization.ConnectionError_CreateAccountReturnedNoId, false);
-                }
-
-                if (!_loginInfo.IsValid)
-                {
-                    _logger.LogInformation("Logging in with account id {AccountId}",
                         configuredAccount.AccountId.ToPartialId());
-                    LoginReply loginReply = await accountClient.LoginAsync(
+                    _loginInfo = new LoginInfo(loginReply.AuthToken);
-                        new LoginRequest { AccountId = configuredAccount.AccountId.ToString() },
-                        headers: UnauthorizedHeaders(), deadline: DateTime.UtcNow.AddSeconds(10),
-                        cancellationToken: cancellationToken);
 
-                    if (loginReply.Success)
+                    bool save = configuredAccount.EncryptIfNeeded();
+
+                    List<string> newRoles = _loginInfo.Claims?.Roles.ToList() ?? new();
+                    if (!newRoles.SequenceEqual(configuredAccount.CachedRoles))
                     {
-                        _logger.LogInformation("Login successful with account id: {AccountId}",
+                        configuredAccount.CachedRoles = newRoles;
-                            configuredAccount.AccountId.ToPartialId());
+                        save = true;
-                        _loginInfo = new LoginInfo(loginReply.AuthToken);
-
-                        bool save = configuredAccount.EncryptIfNeeded();
-
-                        List<string> newRoles = _loginInfo.Claims?.Roles.ToList() ?? new();
-                        if (!newRoles.SequenceEqual(configuredAccount.CachedRoles))
-                        {
-                            configuredAccount.CachedRoles = newRoles;
-                            save = true;
-                        }
-
-                        if (save)
-                            _configurationManager.Save(_configuration);
                     }
-                    else
-                    {
-                        _logger.LogError("Login failed with error {Error}", loginReply.Error);
-                        _loginInfo = new LoginInfo(null);
-                        if (loginReply.Error == LoginError.InvalidAccountId)
-                        {
-                            _configuration.RemoveAccount(RemoteUrl);
-                            _configurationManager.Save(_configuration);
 
-                            _logger.LogInformation("Attempting connection retry without account id");
+                    if (save)
-                            return (false, Localization.ConnectionError_InvalidAccountId, true);
+                        _configurationManager.Save(_configuration);
-                        }
-
-                        if (loginReply.Error == LoginError.UpgradeRequired && !_warnedAboutUpgrade)
-                        {
-                            _chat.Error(Localization.ConnectionError_OldVersion);
-                            _warnedAboutUpgrade = true;
-                        }
-
-                        return (false, string.Format(Localization.ConnectionError_LoginFailed, loginReply.Error),
-                            false);
-                    }
-                }
-
-                if (!_loginInfo.IsValid)
-                {
-                    _logger.LogError("Login state is loggedIn={LoggedIn}, expired={Expired}", _loginInfo.IsLoggedIn,
-                        _loginInfo.IsExpired);
-                    return (false, Localization.ConnectionError_LoginReturnedNoToken, false);
-                }
-
-                cancellationToken.ThrowIfCancellationRequested();
-                return (true, string.Empty, false);
-            }
-            finally
-            {
-                _logger.LogTrace("Releasing connectLock");
-                _connectLock.Release();
-            }
-        }
-
-        private async Task<bool> Connect(CancellationToken cancellationToken)
-        {
-            var result = await TryConnect(cancellationToken);
-            return result.Success;
-        }
-
-        public async Task<string> VerifyConnection(CancellationToken cancellationToken = default)
-        {
-            using IDisposable? logScope = _logger.BeginScope("VerifyConnection");
-
-            _warnedAboutUpgrade = false;
-
-            var connectionResult = await TryConnect(cancellationToken, loggerFactory: _loggerFactory);
-            if (!connectionResult.Success)
-                return string.Format(Localization.ConnectionError_CouldNotConnectToServer, connectionResult.Error);
-
-            _logger.LogInformation("Connection established, trying to verify auth token");
-            var accountClient = new AccountService.AccountServiceClient(_channel);
-            await accountClient.VerifyAsync(new VerifyRequest(), headers: AuthorizedHeaders(),
-                deadline: DateTime.UtcNow.AddSeconds(10), cancellationToken: cancellationToken);
-
-            _logger.LogInformation("Verification returned no errors.");
-            return Localization.ConnectionSuccessful;
-        }
-
-        internal sealed class LoginInfo
-        {
-            public LoginInfo(string? authToken)
-            {
-                if (!string.IsNullOrEmpty(authToken))
-                {
-                    IsLoggedIn = true;
-                    AuthToken = authToken;
-                    Claims = JwtClaims.FromAuthToken(authToken);
                 }
                 else
-                    IsLoggedIn = false;
+                {
+                    _logger.LogError("Login failed with error {Error}", loginReply.Error);
+                    _loginInfo = new LoginInfo(null);
+                    if (loginReply.Error == LoginError.InvalidAccountId)
+                    {
+                        _configuration.RemoveAccount(RemoteUrl);
+                        _configurationManager.Save(_configuration);
+
+                        _logger.LogInformation("Attempting connection retry without account id");
+                        return (false, Localization.ConnectionError_InvalidAccountId, true);
+                    }
+
+                    if (loginReply.Error == LoginError.UpgradeRequired && !_warnedAboutUpgrade)
+                    {
+                        _chat.Error(Localization.ConnectionError_OldVersion);
+                        _warnedAboutUpgrade = true;
+                    }
+
+                    return (false, string.Format(Localization.ConnectionError_LoginFailed, loginReply.Error),
+                        false);
+                }
             }
 
-            public bool IsLoggedIn { get; }
+            if (!_loginInfo.IsValid)
-            public string? AuthToken { get; }
+            {
-            public JwtClaims? Claims { get; }
+                _logger.LogError("Login state is loggedIn={LoggedIn}, expired={Expired}", _loginInfo.IsLoggedIn,
+                    _loginInfo.IsExpired);
+                return (false, Localization.ConnectionError_LoginReturnedNoToken, false);
+            }
 
-            private DateTimeOffset ExpiresAt =>
+            cancellationToken.ThrowIfCancellationRequested();
-                Claims?.ExpiresAt.Subtract(TimeSpan.FromMinutes(5)) ?? DateTimeOffset.MinValue;
+            return (true, string.Empty, false);
-
+        }
-            public bool IsExpired => ExpiresAt < DateTimeOffset.UtcNow;
+        finally
-
+        {
-            public bool IsValid => IsLoggedIn && !IsExpired;
+            _logger.LogTrace("Releasing connectLock");
+            _connectLock.Release();
         }
     }
+
+    private async Task<bool> Connect(CancellationToken cancellationToken)
+    {
+        var result = await TryConnect(cancellationToken);
+        return result.Success;
+    }
+
+    public async Task<string> VerifyConnection(CancellationToken cancellationToken = default)
+    {
+        using IDisposable? logScope = _logger.BeginScope("VerifyConnection");
+
+        _warnedAboutUpgrade = false;
+
+        var connectionResult = await TryConnect(cancellationToken, loggerFactory: _loggerFactory);
+        if (!connectionResult.Success)
+            return string.Format(Localization.ConnectionError_CouldNotConnectToServer, connectionResult.Error);
+
+        _logger.LogInformation("Connection established, trying to verify auth token");
+        var accountClient = new AccountService.AccountServiceClient(_channel);
+        await accountClient.VerifyAsync(new VerifyRequest(), headers: AuthorizedHeaders(),
+            deadline: DateTime.UtcNow.AddSeconds(10), cancellationToken: cancellationToken);
+
+        _logger.LogInformation("Verification returned no errors.");
+        return Localization.ConnectionSuccessful;
+    }
+
+    internal sealed class LoginInfo
+    {
+        public LoginInfo(string? authToken)
+        {
+            if (!string.IsNullOrEmpty(authToken))
+            {
+                IsLoggedIn = true;
+                AuthToken = authToken;
+                Claims = JwtClaims.FromAuthToken(authToken);
+            }
+            else
+                IsLoggedIn = false;
+        }
+
+        public bool IsLoggedIn { get; }
+        public string? AuthToken { get; }
+        public JwtClaims? Claims { get; }
+
+        private DateTimeOffset ExpiresAt =>
+            Claims?.ExpiresAt.Subtract(TimeSpan.FromMinutes(5)) ?? DateTimeOffset.MinValue;
+
+        public bool IsExpired => ExpiresAt < DateTimeOffset.UtcNow;
+
+        public bool IsValid => IsLoggedIn && !IsExpired;
+    }
 }

Pal.Client/Net/RemoteApi.ExportService.cs

@@ -1,23 +1,23 @@
-using Account;
+using System;
-using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Export;
 
-namespace Pal.Client.Net
+namespace Pal.Client.Net;
+
+internal partial class RemoteApi
 {
-    internal partial class RemoteApi
+    public async Task<(bool, ExportRoot)> DoExport(CancellationToken cancellationToken = default)
     {
-        public async Task<(bool, ExportRoot)> DoExport(CancellationToken cancellationToken = default)
+        if (!await Connect(cancellationToken))
-        {
+            return new(false, new());
-            if (!await Connect(cancellationToken))
-                return new(false, new());
 
-            var exportClient = new ExportService.ExportServiceClient(_channel);
+        var exportClient = new ExportService.ExportServiceClient(_channel);
-            var exportReply = await exportClient.ExportAsync(new ExportRequest
+        var exportReply = await exportClient.ExportAsync(new ExportRequest
             {
                 ServerUrl = RemoteUrl,
-            }, headers: AuthorizedHeaders(), deadline: DateTime.UtcNow.AddSeconds(120), cancellationToken: cancellationToken);
+            }, headers: AuthorizedHeaders(), deadline: DateTime.UtcNow.AddSeconds(120),
-            return (exportReply.Success, exportReply.Data);
+            cancellationToken: cancellationToken);
-        }
+        return (exportReply.Success, exportReply.Data);
     }
 }

Pal.Client/Net/RemoteApi.PalaceService.cs

@@ -1,5 +1,4 @@
-using Palace;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
@@ -7,81 +6,90 @@ using System.Threading;
 using System.Threading.Tasks;
 using Pal.Client.Database;
 using Pal.Client.Floors;
+using Palace;
 
-namespace Pal.Client.Net
+namespace Pal.Client.Net;
+
+internal partial class RemoteApi
 {
-    internal partial class RemoteApi
+    public async Task<(bool, List<PersistentLocation>)> DownloadRemoteMarkers(ushort territoryId,
+        CancellationToken cancellationToken = default)
     {
-        public async Task<(bool, List<PersistentLocation>)> DownloadRemoteMarkers(ushort territoryId, CancellationToken cancellationToken = default)
+        if (!await Connect(cancellationToken))
+            return (false, new());
+
+        var palaceClient = new PalaceService.PalaceServiceClient(_channel);
+        var downloadReply = await palaceClient.DownloadFloorsAsync(
+            new DownloadFloorsRequest { TerritoryType = territoryId }, headers: AuthorizedHeaders(),
+            cancellationToken: cancellationToken);
+        return (downloadReply.Success, downloadReply.Objects.Select(CreateLocationFromNetworkObject).ToList());
+    }
+
+    public async Task<(bool, List<PersistentLocation>)> UploadLocations(ushort territoryType,
+        IReadOnlyList<PersistentLocation> locations, CancellationToken cancellationToken = default)
+    {
+        if (locations.Count == 0)
+            return (true, new());
+
+        if (!await Connect(cancellationToken))
+            return (false, new());
+
+        var palaceClient = new PalaceService.PalaceServiceClient(_channel);
+        var uploadRequest = new UploadFloorsRequest
         {
-            if (!await Connect(cancellationToken))
+            TerritoryType = territoryType,
-                return (false, new());
+        };
-
+        uploadRequest.Objects.AddRange(locations.Select(m => new PalaceObject
-            var palaceClient = new PalaceService.PalaceServiceClient(_channel);
-            var downloadReply = await palaceClient.DownloadFloorsAsync(new DownloadFloorsRequest { TerritoryType = territoryId }, headers: AuthorizedHeaders(), cancellationToken: cancellationToken);
-            return (downloadReply.Success, downloadReply.Objects.Select(CreateLocationFromNetworkObject).ToList());
-        }
-
-        public async Task<(bool, List<PersistentLocation>)> UploadLocations(ushort territoryType, IReadOnlyList<PersistentLocation> locations, CancellationToken cancellationToken = default)
         {
-            if (locations.Count == 0)
+            Type = m.Type.ToObjectType(),
-                return (true, new());
+            X = m.Position.X,
+            Y = m.Position.Y,
+            Z = m.Position.Z
+        }));
+        var uploadReply = await palaceClient.UploadFloorsAsync(uploadRequest, headers: AuthorizedHeaders(),
+            cancellationToken: cancellationToken);
+        return (uploadReply.Success, uploadReply.Objects.Select(CreateLocationFromNetworkObject).ToList());
+    }
 
-            if (!await Connect(cancellationToken))
+    public async Task<bool> MarkAsSeen(ushort territoryType, IReadOnlyList<PersistentLocation> locations,
-                return (false, new());
+        CancellationToken cancellationToken = default)
+    {
+        if (locations.Count == 0)
+            return true;
 
-            var palaceClient = new PalaceService.PalaceServiceClient(_channel);
+        if (!await Connect(cancellationToken))
-            var uploadRequest = new UploadFloorsRequest
+            return false;
-            {
-                TerritoryType = territoryType,
-            };
-            uploadRequest.Objects.AddRange(locations.Select(m => new PalaceObject
-            {
-                Type = m.Type.ToObjectType(),
-                X = m.Position.X,
-                Y = m.Position.Y,
-                Z = m.Position.Z
-            }));
-            var uploadReply = await palaceClient.UploadFloorsAsync(uploadRequest, headers: AuthorizedHeaders(), cancellationToken: cancellationToken);
-            return (uploadReply.Success, uploadReply.Objects.Select(CreateLocationFromNetworkObject).ToList());
-        }
 
-        public async Task<bool> MarkAsSeen(ushort territoryType, IReadOnlyList<PersistentLocation> locations, CancellationToken cancellationToken = default)
+        var palaceClient = new PalaceService.PalaceServiceClient(_channel);
+        var seenRequest = new MarkObjectsSeenRequest { TerritoryType = territoryType };
+        foreach (var marker in locations)
+            seenRequest.NetworkIds.Add(marker.NetworkId.ToString());
+
+        var seenReply = await palaceClient.MarkObjectsSeenAsync(seenRequest, headers: AuthorizedHeaders(),
+            deadline: DateTime.UtcNow.AddSeconds(10), cancellationToken: cancellationToken);
+        return seenReply.Success;
+    }
+
+    private PersistentLocation CreateLocationFromNetworkObject(PalaceObject obj)
+    {
+        return new PersistentLocation
         {
-            if (locations.Count == 0)
+            Type = obj.Type.ToMemoryType(),
-                return true;
+            Position = new Vector3(obj.X, obj.Y, obj.Z),
+            NetworkId = Guid.Parse(obj.NetworkId),
+            Source = ClientLocation.ESource.Download,
+        };
+    }
 
-            if (!await Connect(cancellationToken))
+    public async Task<(bool, List<FloorStatistics>)> FetchStatistics(CancellationToken cancellationToken = default)
-                return false;
+    {
+        if (!await Connect(cancellationToken))
+            return new(false, new List<FloorStatistics>());
 
-            var palaceClient = new PalaceService.PalaceServiceClient(_channel);
+        var palaceClient = new PalaceService.PalaceServiceClient(_channel);
-            var seenRequest = new MarkObjectsSeenRequest { TerritoryType = territoryType };
+        var statisticsReply = await palaceClient.FetchStatisticsAsync(new StatisticsRequest(),
-            foreach (var marker in locations)
+            headers: AuthorizedHeaders(), deadline: DateTime.UtcNow.AddSeconds(30),
-                seenRequest.NetworkIds.Add(marker.NetworkId.ToString());
+            cancellationToken: cancellationToken);
-
+        return (statisticsReply.Success, statisticsReply.FloorStatistics.ToList());
-            var seenReply = await palaceClient.MarkObjectsSeenAsync(seenRequest, headers: AuthorizedHeaders(), deadline: DateTime.UtcNow.AddSeconds(10), cancellationToken: cancellationToken);
-            return seenReply.Success;
-        }
-
-        private PersistentLocation CreateLocationFromNetworkObject(PalaceObject obj)
-        {
-            return new PersistentLocation
-            {
-                Type = obj.Type.ToMemoryType(),
-                Position = new Vector3(obj.X, obj.Y, obj.Z),
-                NetworkId = Guid.Parse(obj.NetworkId),
-                Source = ClientLocation.ESource.Download,
-            };
-        }
-
-        public async Task<(bool, List<FloorStatistics>)> FetchStatistics(CancellationToken cancellationToken = default)
-        {
-            if (!await Connect(cancellationToken))
-                return new(false, new List<FloorStatistics>());
-
-            var palaceClient = new PalaceService.PalaceServiceClient(_channel);
-            var statisticsReply = await palaceClient.FetchStatisticsAsync(new StatisticsRequest(), headers: AuthorizedHeaders(), deadline: DateTime.UtcNow.AddSeconds(30), cancellationToken: cancellationToken);
-            return (statisticsReply.Success, statisticsReply.FloorStatistics.ToList());
-        }
     }
 }

Pal.Client/Net/RemoteApi.Utils.cs

@@ -1,58 +1,57 @@
 using System;
-using Dalamud.Logging;
-using Grpc.Core;
 using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
+using Dalamud.Logging;
+using Grpc.Core;
 using Microsoft.Extensions.Logging;
 
-namespace Pal.Client.Net
+namespace Pal.Client.Net;
+
+internal partial class RemoteApi
 {
-    internal partial class RemoteApi
+    private Metadata UnauthorizedHeaders() => new()
     {
-        private Metadata UnauthorizedHeaders() => new()
+        { "User-Agent", _userAgent },
-        {
+    };
-            { "User-Agent", _userAgent },
-        };
 
-        private Metadata AuthorizedHeaders() => new()
+    private Metadata AuthorizedHeaders() => new()
-        {
+    {
-            { "Authorization", $"Bearer {_loginInfo.AuthToken}" },
+        { "Authorization", $"Bearer {_loginInfo.AuthToken}" },
-            { "User-Agent", _userAgent },
+        { "User-Agent", _userAgent },
-        };
+    };
 
-        private SslClientAuthenticationOptions? GetSslClientAuthenticationOptions()
+    private SslClientAuthenticationOptions? GetSslClientAuthenticationOptions()
-        {
+    {
 #if !DEBUG
-            var secrets = typeof(RemoteApi).Assembly.GetType("Pal.Client.Secrets");
+        var secrets = typeof(RemoteApi).Assembly.GetType("Pal.Client.Secrets");
-            if (secrets == null)
+        if (secrets == null)
-                return null;
-
-            var pass = secrets.GetProperty("CertPassword")?.GetValue(null) as string;
-            if (pass == null)
-                return null;
-
-            var manifestResourceStream = typeof(RemoteApi).Assembly.GetManifestResourceStream("Pal.Client.Certificate.pfx");
-            if (manifestResourceStream == null)
-                return null;
-
-            var bytes = new byte[manifestResourceStream.Length];
-            int read = manifestResourceStream.Read(bytes, 0, bytes.Length);
-            if (read != bytes.Length)
-                throw new InvalidOperationException();
-
-            var certificate = new X509Certificate2(bytes, pass, X509KeyStorageFlags.DefaultKeySet);
-            _logger.LogDebug("Using client certificate {CertificateHash}", certificate.GetCertHashString());
-            return new SslClientAuthenticationOptions
-            {
-                ClientCertificates = new X509CertificateCollection()
-                {
-                    certificate,
-                },
-            };
-#else
-            _logger.LogDebug("Not using client certificate");
             return null;
+
+        var pass = secrets.GetProperty("CertPassword")?.GetValue(null) as string;
+        if (pass == null)
+            return null;
+
+        var manifestResourceStream = typeof(RemoteApi).Assembly.GetManifestResourceStream("Pal.Client.Certificate.pfx");
+        if (manifestResourceStream == null)
+            return null;
+
+        var bytes = new byte[manifestResourceStream.Length];
+        int read = manifestResourceStream.Read(bytes, 0, bytes.Length);
+        if (read != bytes.Length)
+            throw new InvalidOperationException();
+
+        var certificate = new X509Certificate2(bytes, pass, X509KeyStorageFlags.DefaultKeySet);
+        _logger.LogDebug("Using client certificate {CertificateHash}", certificate.GetCertHashString());
+        return new SslClientAuthenticationOptions
+        {
+            ClientCertificates = new X509CertificateCollection()
+            {
+                certificate,
+            },
+        };
+#else
+        _logger.LogDebug("Not using client certificate");
+        return null;
 #endif
-        }
     }
 }

Pal.Client/Net/RemoteApi.cs

@@ -1,52 +1,51 @@
-using Dalamud.Logging;
+using System;
+using Dalamud.Game.Gui;
+using Dalamud.Logging;
 using Grpc.Net.Client;
 using Microsoft.Extensions.Logging;
-using System;
-using Dalamud.Game.Gui;
 using Pal.Client.Configuration;
 using Pal.Client.DependencyInjection;
 
-namespace Pal.Client.Net
+namespace Pal.Client.Net;
+
+internal sealed partial class RemoteApi : IDisposable
 {
-    internal sealed partial class RemoteApi : IDisposable
-    {
 #if DEBUG
-        public const string RemoteUrl = "http://localhost:5415";
+    public const string RemoteUrl = "http://localhost:5415";
 #else
-        public const string RemoteUrl = "https://pal.liza.sh";
+    public const string RemoteUrl = "https://connect.palacepal.com";
 #endif
-        private readonly string _userAgent =
+    private readonly string _userAgent =
-            $"{typeof(RemoteApi).Assembly.GetName().Name?.Replace(" ", "")}/{typeof(RemoteApi).Assembly.GetName().Version?.ToString(2)}";
+        $"{typeof(RemoteApi).Assembly.GetName().Name?.Replace(" ", "")}/{typeof(RemoteApi).Assembly.GetName().Version?.ToString(2)}";
 
-        private readonly ILoggerFactory _loggerFactory;
+    private readonly ILoggerFactory _loggerFactory;
-        private readonly ILogger<RemoteApi> _logger;
+    private readonly ILogger<RemoteApi> _logger;
-        private readonly Chat _chat;
+    private readonly Chat _chat;
-        private readonly ConfigurationManager _configurationManager;
+    private readonly ConfigurationManager _configurationManager;
-        private readonly IPalacePalConfiguration _configuration;
+    private readonly IPalacePalConfiguration _configuration;
 
-        private GrpcChannel? _channel;
+    private GrpcChannel? _channel;
-        private LoginInfo _loginInfo = new(null);
+    private LoginInfo _loginInfo = new(null);
-        private bool _warnedAboutUpgrade;
+    private bool _warnedAboutUpgrade;
 
-        public RemoteApi(
+    public RemoteApi(
-            ILoggerFactory loggerFactory,
+        ILoggerFactory loggerFactory,
-            ILogger<RemoteApi> logger,
+        ILogger<RemoteApi> logger,
-            Chat chat,
+        Chat chat,
-            ConfigurationManager configurationManager,
+        ConfigurationManager configurationManager,
-            IPalacePalConfiguration configuration)
+        IPalacePalConfiguration configuration)
-        {
+    {
-            _loggerFactory = loggerFactory;
+        _loggerFactory = loggerFactory;
-            _logger = logger;
+        _logger = logger;
-            _chat = chat;
+        _chat = chat;
-            _configurationManager = configurationManager;
+        _configurationManager = configurationManager;
-            _configuration = configuration;
+        _configuration = configuration;
-        }
+    }
 
-        public void Dispose()
+    public void Dispose()
-        {
+    {
-            _logger.LogDebug("Disposing gRPC channel");
+        _logger.LogDebug("Disposing gRPC channel");
-            _channel?.Dispose();
+        _channel?.Dispose();
-            _channel = null;
+        _channel = null;
-        }
     }
 }

Pal.Client/Pal.Client.csproj

@@ -1,131 +1,69 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Dalamud.NET.Sdk/9.0.2">
+    <PropertyGroup>
+        <Version>6.0</Version>
+        <AssemblyName>Palace Pal</AssemblyName>
+        <PlatformTarget>x64</PlatformTarget>
+        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    </PropertyGroup>
 
-	<PropertyGroup>
+    <Import Project="..\vendor\LLib\LLib.targets"/>
-		<TargetFramework>net7.0-windows</TargetFramework>
+    <Import Project="..\vendor\LLib\RenameZip.targets"/>
-		<LangVersion>11.0</LangVersion>
-		<Nullable>enable</Nullable>
-		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
-	</PropertyGroup>
 
-	<PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-		<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
+        <OutputPath>dist</OutputPath>
-		<PlatformTarget>x64</PlatformTarget>
+    </PropertyGroup>
-		<AssemblyName>Palace Pal</AssemblyName>
-		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<DebugType>portable</DebugType>
-		<PathMap Condition="$(SolutionDir) != ''">$(SolutionDir)=X:\</PathMap>
-		<GitVersion>false</GitVersion>
-		<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-		<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-		<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
-	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)' == 'Release'">
+    <ItemGroup Condition="'$(Configuration)' == 'Release' And Exists('Certificate.pfx')">
-		<OutputPath>dist</OutputPath>
+        <None Remove="Certificate.pfx"/>
-	</PropertyGroup>
+    </ItemGroup>
 
-	<ItemGroup Condition="'$(Configuration)' == 'Release' And Exists('Certificate.pfx')">
+    <ItemGroup Condition="'$(Configuration)' == 'Release' And Exists('Certificate.pfx')">
-		<None Remove="Certificate.pfx" />
+        <EmbeddedResource Include="Certificate.pfx"/>
-	</ItemGroup>
+    </ItemGroup>
 
-	<ItemGroup Condition="'$(Configuration)' == 'Release' And Exists('Certificate.pfx')">
+    <ItemGroup>
-		<EmbeddedResource Include="Certificate.pfx" />
+        <PackageReference Include="Dalamud.Extensions.MicrosoftLogging" Version="4.0.1"/>
-	</ItemGroup>
+        <PackageReference Include="Google.Protobuf" Version="3.27.2" />
+        <PackageReference Include="Grpc.Net.Client" Version="2.63.0"/>
+        <PackageReference Include="Grpc.Tools" Version="2.64.0">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.6" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6" Condition="'$(Configuration)' == 'EF'">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0"/>
+        <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0"/>
+    </ItemGroup>
 
-	<ItemGroup>
+    <ItemGroup>
-		<PackageReference Include="DalamudPackager" Version="2.1.10" />
+        <ProjectReference Include="..\Pal.Common\Pal.Common.csproj"/>
-		<PackageReference Include="Google.Protobuf" Version="3.21.12" />
+        <ProjectReference Include="..\vendor\ECommons\ECommons\ECommons.csproj"/>
-		<PackageReference Include="Grpc.Net.Client" Version="2.51.0" />
+        <ProjectReference Include="..\vendor\LLib\LLib.csproj" />
-		<PackageReference Include="GitInfo" Version="2.3.0">
+    </ItemGroup>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="Grpc.Tools" Version="2.51.0">
-		  <PrivateAssets>all</PrivateAssets>
-		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.3" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-		<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="7.0.1" />
-	</ItemGroup>
 
-	<ItemGroup>
+    <ItemGroup>
-	  <ProjectReference Include="..\Pal.Common\Pal.Common.csproj" />
+        <Protobuf Include="..\Pal.Common\Protos\account.proto" Link="Protos\account.proto" GrpcServices="Client" Access="Internal"/>
-	  <ProjectReference Include="..\vendor\ECommons\ECommons\ECommons.csproj" />
+        <Protobuf Include="..\Pal.Common\Protos\palace.proto" Link="Protos\palace.proto" GrpcServices="Client" Access="Internal"/>
-	</ItemGroup>
+        <Protobuf Include="..\Pal.Common\Protos\export.proto" Link="Protos\export.proto" GrpcServices="Client" Access="Internal"/>
+    </ItemGroup>
 
-	<ItemGroup>
+    <ItemGroup>
-		<Protobuf Include="..\Pal.Common\Protos\account.proto" Link="Protos\account.proto" GrpcServices="Client" Access="Internal" />
+        <EmbeddedResource Update="Properties\Localization.resx">
-		<Protobuf Include="..\Pal.Common\Protos\palace.proto" Link="Protos\palace.proto" GrpcServices="Client" Access="Internal" />
+            <Generator>ResXFileCodeGenerator</Generator>
-		<Protobuf Include="..\Pal.Common\Protos\export.proto" Link="Protos\export.proto" GrpcServices="Client" Access="Internal" />
+            <LastGenOutput>Localization.Designer.cs</LastGenOutput>
-	</ItemGroup>
+        </EmbeddedResource>
+        <Compile Update="Properties\Localization.Designer.cs">
+            <DesignTime>True</DesignTime>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>Localization.resx</DependentUpon>
+        </Compile>
+    </ItemGroup>
 
-	<ItemGroup>
+    <Target Name="Clean">
-		<!--You may need to adjust these paths yourself. These point to a Dalamud assembly in AppData.-->
+        <RemoveDir Directories="dist"/>
-		<Reference Include="Dalamud">
+    </Target>
-			<HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\Dalamud.dll</HintPath>
-			<Private Condition="'$(Configuration)' != 'EF'">false</Private>
-		</Reference>
-		<Reference Include="ImGui.NET">
-			<HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\ImGui.NET.dll</HintPath>
-			<Private Condition="'$(Configuration)' != 'EF'">false</Private>
-		</Reference>
-		<Reference Include="ImGuiScene">
-			<HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\ImGuiScene.dll</HintPath>
-			<Private Condition="'$(Configuration)' != 'EF'">false</Private>
-		</Reference>
-		<Reference Include="Lumina">
-			<HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.dll</HintPath>
-			<Private Condition="'$(Configuration)' != 'EF'">false</Private>
-		</Reference>
-		<Reference Include="Lumina.Excel">
-			<HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.Excel.dll</HintPath>
-			<Private Condition="'$(Configuration)' != 'EF'">false</Private>
-		</Reference>
-		<Reference Include="Newtonsoft.Json">
-			<HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\Newtonsoft.Json.dll</HintPath>
-			<Private Condition="'$(Configuration)' != 'EF'">false</Private>
-		</Reference>
-		<Reference Include="FFXIVClientStructs">
-			<HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\FFXIVClientStructs.dll</HintPath>
-			<Private Condition="'$(Configuration)' != 'EF'">false</Private>
-		</Reference>
-		<Reference Include="Serilog">
-			<HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\Serilog.dll</HintPath>
-			<Private Condition="'$(Configuration)' != 'EF'">false</Private>
-		</Reference>
-	</ItemGroup>
-
-	<ItemGroup>
-		<EmbeddedResource Update="Properties\Localization.resx">
-			<Generator>ResXFileCodeGenerator</Generator>
-			<LastGenOutput>Localization.Designer.cs</LastGenOutput>
-		</EmbeddedResource>
-		<Compile Update="Properties\Localization.Designer.cs">
-			<DesignTime>True</DesignTime>
-			<AutoGen>True</AutoGen>
-			<DependentUpon>Localization.resx</DependentUpon>
-		</Compile>
-	</ItemGroup>
-
-	<Target Name="PopulateInfo" DependsOnTargets="GitVersion" BeforeTargets="GetAssemblyVersion;GenerateNuspec;GetPackageContents">
-		<PropertyGroup>
-			<Version>$(GitSemVerMajor).$(GitSemVerMinor)</Version>
-			<PackageVersion>$(Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
-
-	<Target Name="RenameLatestZip" AfterTargets="PackagePlugin" Condition="'$(Configuration)' == 'Release'">
-		<Exec Command="rename &quot;$(OutDir)$(AssemblyName)\latest.zip&quot; &quot;$(AssemblyName)-$(Version).zip&quot;" />
-	</Target>
-
-	<Target Name="Clean">
-		<RemoveDir Directories="dist" />
-	</Target>
 </Project>

Pal.Client/Palace Pal.json

@@ -3,7 +3,12 @@
   "Author": "Liza Carvelli",
   "Punchline": "Shows possible trap & hoard coffer locations in Palace of the Dead & Heaven on High.",
   "Description": "Shows possible trap & hoard coffer locations in Palace of the Dead & Heaven on High.\n\nThe default configuration requires Splatoon to be installed. If you do not wish to install Splatoon, you can switch to the experimental 'Simple' renderer in the configuration.",
-  "RepoUrl": "https://github.com/carvelli/PalacePal",
+  "RepoUrl": "https://git.carvel.li/liza/PalacePal",
-  "IconUrl": "https://raw.githubusercontent.com/carvelli/Dalamud-Plugins/master/dist/Palace Pal.png",
+  "IconUrl": "https://plugins.carvel.li/icons/PalacePal.png",
-  "Tags": [ "potd", "palace", "hoh", "splatoon" ]
+  "Tags": [
+    "potd",
+    "palace",
+    "hoh",
+    "splatoon"
+  ]
 }

Pal.Client/Plugin.cs

@@ -1,247 +1,235 @@
-using Dalamud.Interface.Windowing;
+using System;
-using Dalamud.Plugin;
+using System.Collections.Generic;
-using Pal.Client.Rendering;
-using System;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Dalamud.Game;
+using Dalamud.Extensions.MicrosoftLogging;
-using Dalamud.Game.ClientState;
 using Dalamud.Game.Command;
-using Dalamud.Game.Gui;
+using Dalamud.Interface.Windowing;
-using Pal.Client.Properties;
+using Dalamud.Plugin;
+using Dalamud.Plugin.Services;
 using ECommons;
+using ECommons.DalamudServices;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Pal.Client.Commands;
 using Pal.Client.Configuration;
 using Pal.Client.DependencyInjection;
+using Pal.Client.Properties;
+using Pal.Client.Rendering;
 
-namespace Pal.Client
+namespace Pal.Client;
+
+/// <summary>
+/// With all DI logic elsewhere, this plugin shell really only takes care of a few things around events that
+/// need to be sent to different receivers depending on priority or configuration .
+/// </summary>
+/// <see cref="DependencyInjectionContext"/>
+internal sealed class Plugin : IDalamudPlugin
 {
-    /// <summary>
+    private readonly CancellationTokenSource _initCts = new();
-    /// With all DI logic elsewhere, this plugin shell really only takes care of a few things around events that
+
-    /// need to be sent to different receivers depending on priority or configuration .
+    private readonly IDalamudPluginInterface _pluginInterface;
-    /// </summary>
+    private readonly ICommandManager _commandManager;
-    /// <see cref="DependencyInjectionContext"/>
+    private readonly IClientState _clientState;
-    internal sealed class Plugin : IDalamudPlugin
+    private readonly IChatGui _chatGui;
+    private readonly IFramework _framework;
+
+    private readonly TaskCompletionSource<IServiceScope> _rootScopeCompletionSource = new();
+    private ELoadState _loadState = ELoadState.Initializing;
+
+    private DependencyInjectionContext? _dependencyInjectionContext;
+    private ILogger _logger;
+    private WindowSystem? _windowSystem;
+    private IServiceScope? _rootScope;
+    private Action? _loginAction;
+
+    public Plugin(
+        IDalamudPluginInterface pluginInterface,
+        ICommandManager commandManager,
+        IClientState clientState,
+        IChatGui chatGui,
+        IFramework framework,
+        IPluginLog pluginLog)
     {
-        private readonly CancellationTokenSource _initCts = new();
+        _pluginInterface = pluginInterface;
+        _commandManager = commandManager;
+        _clientState = clientState;
+        _chatGui = chatGui;
+        _framework = framework;
+        _logger = new DalamudLoggerProvider(pluginLog).CreateLogger<Plugin>();
 
-        private readonly DalamudPluginInterface _pluginInterface;
+        // set up the current UI language before creating anything
-        private readonly CommandManager _commandManager;
+        Localization.Culture = new CultureInfo(_pluginInterface.UiLanguage);
-        private readonly ClientState _clientState;
-        private readonly ChatGui _chatGui;
-        private readonly Framework _framework;
 
-        private readonly TaskCompletionSource<IServiceScope> _rootScopeCompletionSource = new();
+        _commandManager.AddHandler("/pal", new CommandInfo(OnCommand)
-        private ELoadState _loadState = ELoadState.Initializing;
-
-        private DependencyInjectionContext? _dependencyInjectionContext;
-        private ILogger _logger = DependencyInjectionContext.LoggerProvider.CreateLogger<Plugin>();
-        private WindowSystem? _windowSystem;
-        private IServiceScope? _rootScope;
-        private Action? _loginAction;
-
-        public Plugin(
-            DalamudPluginInterface pluginInterface,
-            CommandManager commandManager,
-            ClientState clientState,
-            ChatGui chatGui,
-            Framework framework)
         {
-            _pluginInterface = pluginInterface;
+            HelpMessage = Localization.Command_pal_HelpText
-            _commandManager = commandManager;
+        });
-            _clientState = clientState;
-            _chatGui = chatGui;
-            _framework = framework;
 
-            // set up the current UI language before creating anything
+        // Using TickScheduler requires ECommons to at least be partially initialized
-            Localization.Culture = new CultureInfo(_pluginInterface.UiLanguage);
+        // ECommonsMain.Dispose leaves this untouched.
+        Svc.Init(pluginInterface);
 
-            _commandManager.AddHandler("/pal", new CommandInfo(OnCommand)
+        Task.Run(async () => await CreateDependencyContext());
+    }
+
+    private async Task CreateDependencyContext()
+    {
+        try
+        {
+            _dependencyInjectionContext = _pluginInterface.Create<DependencyInjectionContext>(this)
+                                          ?? throw new Exception("Could not create DI root context class");
+            var serviceProvider = _dependencyInjectionContext.BuildServiceContainer();
+            _initCts.Token.ThrowIfCancellationRequested();
+
+            _logger = serviceProvider.GetRequiredService<ILogger<Plugin>>();
+            _windowSystem = serviceProvider.GetRequiredService<WindowSystem>();
+            _rootScope = serviceProvider.CreateScope();
+
+            var loader = _rootScope.ServiceProvider.GetRequiredService<DependencyContextInitializer>();
+            await loader.InitializeAsync(_initCts.Token);
+
+            await _framework.RunOnFrameworkThread(() =>
             {
-                HelpMessage = Localization.Command_pal_HelpText
+                _pluginInterface.UiBuilder.Draw += Draw;
+                _pluginInterface.UiBuilder.OpenConfigUi += OpenConfigUi;
+                _pluginInterface.LanguageChanged += LanguageChanged;
+                _clientState.Login += Login;
             });
-
+            _rootScopeCompletionSource.SetResult(_rootScope);
-            Task.Run(async () => await CreateDependencyContext());
+            _loadState = ELoadState.Loaded;
         }
-
+        catch (Exception e) when (e is ObjectDisposedException
-        public string Name => Localization.Palace_Pal;
+                                      or OperationCanceledException
-
+                                      or RepoVerification.RepoVerificationFailedException
-        private async Task CreateDependencyContext()
+                                  || (e is FileLoadException && _pluginInterface.IsDev))
         {
+            _rootScopeCompletionSource.SetException(e);
+            _loadState = ELoadState.Error;
+        }
+        catch (Exception e)
+        {
+            _rootScopeCompletionSource.SetException(e);
+            _logger.LogError(e, "Async load failed");
+            ShowErrorOnLogin(() =>
+                new Chat(_chatGui).Error(string.Format(Localization.Error_LoadFailed,
+                    $"{e.GetType()} - {e.Message}")));
+
+            _loadState = ELoadState.Error;
+        }
+    }
+
+    private void ShowErrorOnLogin(Action? loginAction)
+    {
+        if (_clientState.IsLoggedIn)
+        {
+            loginAction?.Invoke();
+            _loginAction = null;
+        }
+        else
+            _loginAction = loginAction;
+    }
+
+    private void Login()
+    {
+        _loginAction?.Invoke();
+        _loginAction = null;
+    }
+
+    private void OnCommand(string command, string arguments)
+    {
+        arguments = arguments.Trim();
+
+        Task.Run(async () =>
+        {
+            IServiceScope rootScope;
+            Chat chat;
+
             try
             {
-                _dependencyInjectionContext = _pluginInterface.Create<DependencyInjectionContext>(this)
+                rootScope = await _rootScopeCompletionSource.Task;
-                                              ?? throw new Exception("Could not create DI root context class");
+                chat = rootScope.ServiceProvider.GetRequiredService<Chat>();
-                var serviceProvider = _dependencyInjectionContext.BuildServiceContainer();
-                _initCts.Token.ThrowIfCancellationRequested();
-
-                _logger = serviceProvider.GetRequiredService<ILogger<Plugin>>();
-                _windowSystem = serviceProvider.GetRequiredService<WindowSystem>();
-                _rootScope = serviceProvider.CreateScope();
-
-                var loader = _rootScope.ServiceProvider.GetRequiredService<DependencyContextInitializer>();
-                await loader.InitializeAsync(_initCts.Token);
-
-                await _framework.RunOnFrameworkThread(() =>
-                {
-                    _pluginInterface.UiBuilder.Draw += Draw;
-                    _pluginInterface.UiBuilder.OpenConfigUi += OpenConfigUi;
-                    _pluginInterface.LanguageChanged += LanguageChanged;
-                    _clientState.Login += Login;
-                });
-                _rootScopeCompletionSource.SetResult(_rootScope);
-                _loadState = ELoadState.Loaded;
-            }
-            catch (ObjectDisposedException e)
-            {
-                _rootScopeCompletionSource.SetException(e);
-                _loadState = ELoadState.Error;
-            }
-            catch (OperationCanceledException e)
-            {
-                _rootScopeCompletionSource.SetException(e);
-                _loadState = ELoadState.Error;
             }
             catch (Exception e)
             {
-                _rootScopeCompletionSource.SetException(e);
+                _logger.LogError(e, "Could not wait for command root scope");
-                _logger.LogError(e, "Async load failed");
+                return;
-                ShowErrorOnLogin(() =>
-                    new Chat(_chatGui).Error(string.Format(Localization.Error_LoadFailed,
-                        $"{e.GetType()} - {e.Message}")));
-
-                _loadState = ELoadState.Error;
             }
-        }
 
-        private void ShowErrorOnLogin(Action? loginAction)
+            try
-        {
-            if (_clientState.IsLoggedIn)
             {
-                loginAction?.Invoke();
+                IPalacePalConfiguration configuration =
-                _loginAction = null;
+                    rootScope.ServiceProvider.GetRequiredService<IPalacePalConfiguration>();
-            }
+                if (configuration.FirstUse && arguments != "" && arguments != "config")
-            else
-                _loginAction = loginAction;
-        }
-
-        private void Login(object? sender, EventArgs eventArgs)
-        {
-            _loginAction?.Invoke();
-            _loginAction = null;
-        }
-
-        private void OnCommand(string command, string arguments)
-        {
-            arguments = arguments.Trim();
-
-            Task.Run(async () =>
-            {
-                IServiceScope rootScope;
-                Chat chat;
-
-                try
                 {
-                    rootScope = await _rootScopeCompletionSource.Task;
+                    chat.Error(Localization.Error_FirstTimeSetupRequired);
-                    chat = rootScope.ServiceProvider.GetRequiredService<Chat>();
-                }
-                catch (Exception e)
-                {
-                    _logger.LogError(e, "Could not wait for command root scope");
                     return;
                 }
 
-                try
+                Action<string> commandHandler = rootScope.ServiceProvider
-                {
+                    .GetRequiredService<IEnumerable<ISubCommand>>()
-                    IPalacePalConfiguration configuration =
+                    .SelectMany(cmd => cmd.GetHandlers())
-                        rootScope.ServiceProvider.GetRequiredService<IPalacePalConfiguration>();
+                    .Where(cmd => cmd.Key == arguments.ToLowerInvariant())
-                    if (configuration.FirstUse && arguments != "" && arguments != "config")
+                    .Select(cmd => cmd.Value)
+                    .SingleOrDefault(missingCommand =>
                     {
-                        chat.Error(Localization.Error_FirstTimeSetupRequired);
+                        chat.Error(string.Format(Localization.Command_pal_UnknownSubcommand, missingCommand,
-                        return;
+                            command));
-                    }
+                    });
-
+                commandHandler.Invoke(arguments);
-                    var sp = rootScope.ServiceProvider;
-
-                    switch (arguments)
-                    {
-                        case "":
-                        case "config":
-                            sp.GetRequiredService<PalConfigCommand>().Execute();
-                            break;
-
-                        case "stats":
-                            sp.GetRequiredService<PalStatsCommand>().Execute();
-                            break;
-
-                        case "tc":
-                        case "test-connection":
-                            sp.GetRequiredService<PalTestConnectionCommand>().Execute();
-                            break;
-
-                        case "near":
-                        case "tnear":
-                        case "hnear":
-                            sp.GetRequiredService<PalNearCommand>().Execute(arguments);
-                            break;
-
-                        default:
-                            chat.Error(string.Format(Localization.Command_pal_UnknownSubcommand, arguments,
-                                command));
-                            break;
-                    }
-                }
-                catch (Exception e)
-                {
-                    chat.Error(e.ToString());
-                }
-            });
-        }
-
-        private void OpenConfigUi()
-            => _rootScope!.ServiceProvider.GetRequiredService<PalConfigCommand>().Execute();
-
-        private void LanguageChanged(string languageCode)
-        {
-            _logger.LogInformation("Language set to '{Language}'", languageCode);
-
-            Localization.Culture = new CultureInfo(languageCode);
-            _windowSystem!.Windows.OfType<ILanguageChanged>()
-                .Each(w => w.LanguageChanged());
-        }
-
-        private void Draw()
-        {
-            _rootScope!.ServiceProvider.GetRequiredService<RenderAdapter>().DrawLayers();
-            _windowSystem!.Draw();
-        }
-
-        public void Dispose()
-        {
-            _commandManager.RemoveHandler("/pal");
-
-            if (_loadState == ELoadState.Loaded)
-            {
-                _pluginInterface.UiBuilder.Draw -= Draw;
-                _pluginInterface.UiBuilder.OpenConfigUi -= OpenConfigUi;
-                _pluginInterface.LanguageChanged -= LanguageChanged;
-                _clientState.Login -= Login;
             }
+            catch (Exception e)
+            {
+                _logger.LogError(e, "Could not execute command '{Command}' with arguments '{Arguments}'", command,
+                    arguments);
+                chat.Error(string.Format(Localization.Error_CommandFailed,
+                    $"{e.GetType()} - {e.Message}"));
+            }
+        });
+    }
 
-            _initCts.Cancel();
+    private void OpenConfigUi()
-            _rootScope?.Dispose();
+        => _rootScope!.ServiceProvider.GetRequiredService<PalConfigCommand>().Execute();
-            _dependencyInjectionContext?.Dispose();
-        }
 
-        private enum ELoadState
+    private void LanguageChanged(string languageCode)
+    {
+        _logger.LogInformation("Language set to '{Language}'", languageCode);
+
+        Localization.Culture = new CultureInfo(languageCode);
+        _windowSystem!.Windows.OfType<ILanguageChanged>()
+            .Each(w => w.LanguageChanged());
+    }
+
+    private void Draw()
+    {
+        _rootScope!.ServiceProvider.GetRequiredService<RenderAdapter>().DrawLayers();
+        _windowSystem!.Draw();
+    }
+
+    public void Dispose()
+    {
+        _commandManager.RemoveHandler("/pal");
+
+        if (_loadState == ELoadState.Loaded)
         {
-            Initializing,
+            _pluginInterface.UiBuilder.Draw -= Draw;
-            Loaded,
+            _pluginInterface.UiBuilder.OpenConfigUi -= OpenConfigUi;
-            Error
+            _pluginInterface.LanguageChanged -= LanguageChanged;
+            _clientState.Login -= Login;
         }
+
+        _initCts.Cancel();
+        _rootScope?.Dispose();
+        _dependencyInjectionContext?.Dispose();
+    }
+
+    private enum ELoadState
+    {
+        Initializing,
+        Loaded,
+        Error
     }
 }

Pal.Client/Properties/AssemblyInfo.cs

@@ -1,8 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyVersion(ThisAssembly.Git.SemVer.Major + "." + ThisAssembly.Git.SemVer.Minor)]
-[assembly: AssemblyFileVersion(ThisAssembly.Git.SemVer.Major + "." + ThisAssembly.Git.SemVer.Minor)]
-[assembly: AssemblyInformationalVersion(
-    ThisAssembly.Git.SemVer.Major + "." +
-    ThisAssembly.Git.SemVer.Minor + "+" +
-    ThisAssembly.Git.Commit)]

Pal.Client/Properties/Localization.Designer.cs

@@ -176,6 +176,43 @@ namespace Pal.Client.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Gold Coffer color.
+        /// </summary>
+        internal static string Config_GoldCoffer_Color {
+            get {
+                return ResourceManager.GetString("Config_GoldCoffer_Color", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Draw filled.
+        /// </summary>
+        internal static string Config_GoldCoffer_Filled {
+            get {
+                return ResourceManager.GetString("Config_GoldCoffer_Filled", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Show gold coffers on current floor.
+        /// </summary>
+        internal static string Config_GoldCoffer_Show {
+            get {
+                return ResourceManager.GetString("Config_GoldCoffer_Show", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Shows nearby gold coffers (containing pomanders) on the current floor.
+        ///This is not synchronized with other players and not saved between floors/runs..
+        /// </summary>
+        internal static string Config_GoldCoffers_ToolTip {
+            get {
+                return ResourceManager.GetString("Config_GoldCoffers_ToolTip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Hoard Coffer color.
         /// </summary>
@@ -357,7 +394,7 @@ namespace Pal.Client.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Shows all the silver coffers visible to you on the current floor.
+        ///   Looks up a localized string similar to Shows nearby silver coffers (gear upgrades and magicites) on the current floor.
         ///This is not synchronized with other players and not saved between floors/runs..
         /// </summary>
         internal static string Config_SilverCoffers_ToolTip {
@@ -619,6 +656,15 @@ namespace Pal.Client.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Command could not be executed: {0}.
+        /// </summary>
+        internal static string Error_CommandFailed {
+            get {
+                return ResourceManager.GetString("Error_CommandFailed", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Please finish the initial setup first..
         /// </summary>

Pal.Client/Properties/Localization.de.resx

@@ -18,10 +18,39 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <!-- Common -->
+  <data name="PalaceOfTheDead" xml:space="preserve">
+        <value>Palast der Toten</value>
+    </data>
+  <data name="HeavenOnHigh" xml:space="preserve">
+        <value>Himmelssäule</value>
+    </data>
+  <data name="Save" xml:space="preserve">
+        <value>Speichern</value>
+    </data>
+  <data name="SaveAndClose" xml:space="preserve">
+        <value>Speichern &amp; Schließen</value>
+    </data>
   <!-- Generic Errors -->
   <!-- /pal commands -->
   <!-- Messages while connecting to the server. These are typically only visible when clicking 'Test connection'. -->
+  <data name="ConnectionSuccessful" xml:space="preserve">
+        <value>Verbindung erfolgreich.</value>
+    </data>
+  <data name="ConnectionError_NotOnline" xml:space="preserve">
+        <value>Sie sind nicht online.</value>
+        <comment>Shown if you attempt to connect to the server while you have selected 'never upload discoveries, only show traps and coffers i found myself'</comment>
+    </data>
+  <data name="ConnectionError_OldVersion" xml:space="preserve">
+        <value>Ihre Version von Palace Pal ist veraltet, bitte aktualisieren Sie das Plugin mit Hilfe des Plugin Installers.</value>
+        <comment>Shown if the version is too old to create an account or log in.</comment>
+    </data>
   <!-- Config Window: Deep Dungeons -->
+  <data name="ConfigTab_DeepDungeons" xml:space="preserve">
+        <value>Tiefe Gewölbe</value>
+    </data>
+  <data name="Config_Traps_Show" xml:space="preserve">
+        <value>Fallen anzeigen</value>
+    </data>
   <!-- Config Window: Community -->
   <!-- Config Window: Import -->
   <!-- Config Window: Export -->

Pal.Client/Properties/Localization.ja.resx

@@ -142,6 +142,20 @@
         <value>塗りつぶす</value>
         <comment>Whether silver coffers should only be drawn with the circle outline or as filled circle.</comment>
     </data>
+  <data name="Config_GoldCoffer_Show" xml:space="preserve">
+        <value>金の宝箱を表示</value>
+    </data>
+  <data name="Config_GoldCoffers_ToolTip" xml:space="preserve">
+        <value>現在のフロアにある全ての金の宝箱を表示します。
+これは他のプレイヤーと同期されず、データは保存されません。</value>
+    </data>
+  <data name="Config_GoldCoffer_Color" xml:space="preserve">
+        <value>金の宝箱の色</value>
+    </data>
+  <data name="Config_GoldCoffer_Filled" xml:space="preserve">
+        <value>塗りつぶす</value>
+        <comment>Whether gold coffers should only be drawn with the circle outline or as filled circle.</comment>
+    </data>
   <!-- Config Window: Community -->
   <data name="ConfigTab_Community" xml:space="preserve">
         <value>コミュニティ</value>

Pal.Client/Properties/Localization.resx

@@ -48,6 +48,7 @@
     </data>
     <data name="Error_LoadFailed" xml:space="preserve">
         <value>Plugin could not be loaded: {0}</value>
+        <comment>Shown when the plugin fails to load, with the placeholder filled with the exception message.</comment>
     </data>
     <data name="Error_WrongRepository" xml:space="preserve">
         <value>Please install this plugin from the official repository at {0} to continue using it.</value>
@@ -69,6 +70,10 @@
         <value>Unable to fetch statistics.</value>
         <comment>Shown when /pal stats produces a server-side error, and the statistics window can't be loaded.</comment>
     </data>
+    <data name="Error_CommandFailed" xml:space="preserve">
+        <value>Command could not be executed: {0}</value>
+        <comment>Shown when '/pal ...' fails, with the placeholder filled with the exception message.</comment>
+    </data>
 
     <!-- Messages while connecting to the server. These are typically only visible when clicking 'Test connection'. -->
     <data name="ConnectionSuccessful" xml:space="preserve">
@@ -141,7 +146,7 @@ When using a Pomander of Safety, all traps are hidden.</value>
         <value>Show silver coffers on current floor</value>
     </data>
     <data name="Config_SilverCoffers_ToolTip" xml:space="preserve">
-        <value>Shows all the silver coffers visible to you on the current floor.
+        <value>Shows nearby silver coffers (gear upgrades and magicites) on the current floor.
 This is not synchronized with other players and not saved between floors/runs.</value>
     </data>
     <data name="Config_SilverCoffer_Color" xml:space="preserve">
@@ -151,6 +156,20 @@ This is not synchronized with other players and not saved between floors/runs.</
         <value>Draw filled</value>
         <comment>Whether silver coffers should only be drawn with the circle outline or as filled circle.</comment>
     </data>
+    <data name="Config_GoldCoffer_Show" xml:space="preserve">
+        <value>Show gold coffers on current floor</value>
+    </data>
+    <data name="Config_GoldCoffers_ToolTip" xml:space="preserve">
+        <value>Shows nearby gold coffers (containing pomanders) on the current floor.
+This is not synchronized with other players and not saved between floors/runs.</value>
+    </data>
+    <data name="Config_GoldCoffer_Color" xml:space="preserve">
+        <value>Gold Coffer color</value>
+    </data>
+    <data name="Config_GoldCoffer_Filled" xml:space="preserve">
+        <value>Draw filled</value>
+        <comment>Whether gold coffers should only be drawn with the circle outline or as filled circle.</comment>
+    </data>
 
 	<!-- Config Window: Community -->
     <data name="ConfigTab_Community" xml:space="preserve">

Pal.Client/README.md

@@ -15,6 +15,7 @@ dotnet ef migrations add MigrationName --configuration EF
 ```
 
 To rebuild the compiled model:
+
 ```shell
 dotnet ef dbcontext optimize --output-dir Database/Compiled --namespace Pal.Client.Database.Compiled --configuration EF
 ```

Pal.Client/Rendering/ELayer.cs

@@ -1,9 +1,8 @@
-namespace Pal.Client.Rendering
+namespace Pal.Client.Rendering;
+
+internal enum ELayer
 {
-    internal enum ELayer
+    TrapHoard,
-    {
+    RegularCoffers,
-        TrapHoard,
+    Test,
-        RegularCoffers,
-        Test,
-    }
 }

Pal.Client/Rendering/IRenderElement.cs

@@ -1,9 +1,8 @@
-namespace Pal.Client.Rendering
+namespace Pal.Client.Rendering;
-{
-    public interface IRenderElement
-    {
-        bool IsValid { get; }
 
-        uint Color { get; set; }
+public interface IRenderElement
-    }
+{
+    bool IsValid { get; }
+
+    bool Enabled { get; set; }
 }

Pal.Client/Rendering/IRenderer.cs

@@ -3,18 +3,17 @@ using System.Numerics;
 using Pal.Client.Configuration;
 using Pal.Client.Floors;
 
-namespace Pal.Client.Rendering
+namespace Pal.Client.Rendering;
+
+internal interface IRenderer
 {
-    internal interface IRenderer
+    ERenderer GetConfigValue();
-    {
-        ERenderer GetConfigValue();
 
-        void SetLayer(ELayer layer, IReadOnlyList<IRenderElement> elements);
+    void SetLayer(ELayer layer, IReadOnlyList<IRenderElement> elements);
 
-        void ResetLayer(ELayer layer);
+    void ResetLayer(ELayer layer);
 
-        IRenderElement CreateElement(MemoryLocation.EType type, Vector3 pos, uint color, bool fill = false);
+    IRenderElement CreateElement(MemoryLocation.EType type, Vector3 pos, bool enabled, uint color, bool fill = false);
 
-        void DrawDebugItems(uint trapColor, uint hoardColor);
+    void DrawDebugItems(uint trapColor, uint hoardColor);
-    }
 }

Pal.Client/Rendering/MarkerConfig.cs

@@ -1,23 +1,23 @@
 using System.Collections.Generic;
 using Pal.Client.Floors;
 
-namespace Pal.Client.Rendering
+namespace Pal.Client.Rendering;
+
+internal sealed class MarkerConfig
 {
-    internal sealed class MarkerConfig
+    private static readonly MarkerConfig EmptyConfig = new();
+
+    private static readonly Dictionary<MemoryLocation.EType, MarkerConfig> MarkerConfigs = new()
     {
-        private static readonly MarkerConfig EmptyConfig = new();
+        { MemoryLocation.EType.Trap, new MarkerConfig { Radius = 1.7f } },
+        { MemoryLocation.EType.Hoard, new MarkerConfig { Radius = 1.7f, OffsetY = -0.03f } },
+        { MemoryLocation.EType.SilverCoffer, new MarkerConfig { Radius = 1f } },
+        { MemoryLocation.EType.GoldCoffer, new MarkerConfig { Radius = 1f } },
+    };
 
-        private static readonly Dictionary<MemoryLocation.EType, MarkerConfig> MarkerConfigs = new()
+    public float OffsetY { get; private init; }
-        {
+    public float Radius { get; private init; } = 0.25f;
-            { MemoryLocation.EType.Trap, new MarkerConfig { Radius = 1.7f } },
-            { MemoryLocation.EType.Hoard, new MarkerConfig { Radius = 1.7f, OffsetY = -0.03f } },
-            { MemoryLocation.EType.SilverCoffer, new MarkerConfig { Radius = 1f } },
-        };
 
-        public float OffsetY { get; private init; }
+    public static MarkerConfig ForType(MemoryLocation.EType type) =>
-        public float Radius { get; private init; } = 0.25f;
+        MarkerConfigs.GetValueOrDefault(type, EmptyConfig);
-
-        public static MarkerConfig ForType(MemoryLocation.EType type) =>
-            MarkerConfigs.GetValueOrDefault(type, EmptyConfig);
-    }
 }

Pal.Client/Rendering/RenderAdapter.cs

@@ -6,70 +6,73 @@ using Microsoft.Extensions.Logging;
 using Pal.Client.Configuration;
 using Pal.Client.Floors;
 
-namespace Pal.Client.Rendering
+namespace Pal.Client.Rendering;
+
+internal sealed class RenderAdapter : IRenderer, IDisposable
 {
-    internal sealed class RenderAdapter : IRenderer, IDisposable
+    private readonly IServiceScopeFactory _serviceScopeFactory;
+    private readonly ILogger<RenderAdapter> _logger;
+    private readonly IPalacePalConfiguration _configuration;
+
+    private IServiceScope? _renderScope;
+    private IRenderer _implementation;
+
+    public RenderAdapter(IServiceScopeFactory serviceScopeFactory, ILogger<RenderAdapter> logger,
+        IPalacePalConfiguration configuration)
     {
-        private readonly IServiceScopeFactory _serviceScopeFactory;
+        _serviceScopeFactory = serviceScopeFactory;
-        private readonly ILogger<RenderAdapter> _logger;
+        _logger = logger;
-        private readonly IPalacePalConfiguration _configuration;
+        _configuration = configuration;
 
-        private IServiceScope? _renderScope;
+        _implementation = Recreate(null);
-        private IRenderer _implementation;
+    }
 
-        public RenderAdapter(IServiceScopeFactory serviceScopeFactory, ILogger<RenderAdapter> logger,
+    public bool RequireRedraw { get; set; }
-            IPalacePalConfiguration configuration)
-        {
-            _serviceScopeFactory = serviceScopeFactory;
-            _logger = logger;
-            _configuration = configuration;
 
-            _implementation = Recreate(null);
+    private IRenderer Recreate(ERenderer? currentRenderer)
-        }
+    {
+        ERenderer targetRenderer = _configuration.Renderer.SelectedRenderer;
+        if (targetRenderer == currentRenderer)
+            return _implementation;
 
-        private IRenderer Recreate(ERenderer? currentRenderer)
+        _renderScope?.Dispose();
-        {
-            ERenderer targetRenderer = _configuration.Renderer.SelectedRenderer;
-            if (targetRenderer == currentRenderer)
-                return _implementation;
 
-            _renderScope?.Dispose();
+        _logger.LogInformation("Selected new renderer: {Renderer}", _configuration.Renderer.SelectedRenderer);
+        _renderScope = _serviceScopeFactory.CreateScope();
+        if (targetRenderer == ERenderer.Splatoon)
+            return _renderScope.ServiceProvider.GetRequiredService<SplatoonRenderer>();
+        else
+            return _renderScope.ServiceProvider.GetRequiredService<SimpleRenderer>();
+    }
 
-            _logger.LogInformation("Selected new renderer: {Renderer}", _configuration.Renderer.SelectedRenderer);
+    public void ConfigUpdated()
-            _renderScope = _serviceScopeFactory.CreateScope();
+    {
-            if (targetRenderer == ERenderer.Splatoon)
+        _implementation = Recreate(_implementation.GetConfigValue());
-                return _renderScope.ServiceProvider.GetRequiredService<SplatoonRenderer>();
+        RequireRedraw = true;
-            else
+    }
-                return _renderScope.ServiceProvider.GetRequiredService<SimpleRenderer>();
-        }
 
-        public void ConfigUpdated()
+    public void Dispose()
-        {
+        => _renderScope?.Dispose();
-            _implementation = Recreate(_implementation.GetConfigValue());
-        }
 
-        public void Dispose()
+    public void SetLayer(ELayer layer, IReadOnlyList<IRenderElement> elements)
-            => _renderScope?.Dispose();
+        => _implementation.SetLayer(layer, elements);
 
-        public void SetLayer(ELayer layer, IReadOnlyList<IRenderElement> elements)
+    public void ResetLayer(ELayer layer)
-            => _implementation.SetLayer(layer, elements);
+        => _implementation.ResetLayer(layer);
 
-        public void ResetLayer(ELayer layer)
+    public IRenderElement CreateElement(MemoryLocation.EType type, Vector3 pos, bool enabled, uint color,
-            => _implementation.ResetLayer(layer);
+        bool fill = false)
+        => _implementation.CreateElement(type, pos, enabled, color, fill);
 
-        public IRenderElement CreateElement(MemoryLocation.EType type, Vector3 pos, uint color, bool fill = false)
+    public ERenderer GetConfigValue()
-            => _implementation.CreateElement(type, pos, color, fill);
+        => throw new NotImplementedException();
 
-        public ERenderer GetConfigValue()
+    public void DrawDebugItems(uint trapColor, uint hoardColor)
-            => throw new NotImplementedException();
+        => _implementation.DrawDebugItems(trapColor, hoardColor);
 
-        public void DrawDebugItems(uint trapColor, uint hoardColor)
+    public void DrawLayers()
-            => _implementation.DrawDebugItems(trapColor, hoardColor);
+    {
-
+        if (_implementation is SimpleRenderer sr)
-        public void DrawLayers()
+            sr.DrawLayers();
-        {
-            if (_implementation is SimpleRenderer sr)
-                sr.DrawLayers();
-        }
     }
 }

Pal.Client/Rendering/RenderData.cs

@@ -1,8 +1,6 @@
-namespace Pal.Client.Rendering
+namespace Pal.Client.Rendering;
+
+internal static class RenderData
 {
-    internal static class RenderData
+    public static readonly long TestLayerTimeout = 10_000;
-    {
-        public static readonly uint ColorInvisible = 0;
-        public static readonly long TestLayerTimeout = 10_000;
-    }
 }

Pal.Client/Rendering/SimpleRenderer.cs

@@ -1,204 +1,206 @@
-using Dalamud.Interface;
+using System;
-using ImGuiNET;
-using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
-using Dalamud.Game.ClientState;
+using Dalamud.Interface.Utility;
-using Dalamud.Game.Gui;
+using Dalamud.Plugin.Services;
+using ImGuiNET;
 using Pal.Client.Configuration;
-using Pal.Client.DependencyInjection;
 using Pal.Client.Floors;
 
-namespace Pal.Client.Rendering
+namespace Pal.Client.Rendering;
+
+/// <summary>
+/// Simple renderer that only draws basic stuff.
+///
+/// This is based on what SliceIsRight uses, and what PalacePal used before it was
+/// remade into PalacePal (which is the third or fourth iteration on the same idea
+/// I made, just with a clear vision).
+/// </summary>
+internal sealed class SimpleRenderer : IRenderer, IDisposable
 {
-    /// <summary>
+    private const int SegmentCount = 20;
-    /// Simple renderer that only draws basic stuff. 
+
-    /// 
+    private readonly IClientState _clientState;
-    /// This is based on what SliceIsRight uses, and what PalacePal used before it was
+    private readonly IGameGui _gameGui;
-    /// remade into PalacePal (which is the third or fourth iteration on the same idea
+    private readonly IPalacePalConfiguration _configuration;
-    /// I made, just with a clear vision).
+    private readonly TerritoryState _territoryState;
-    /// </summary>
+    private readonly ConcurrentDictionary<ELayer, SimpleLayer> _layers = new();
-    internal sealed class SimpleRenderer : IRenderer, IDisposable
+
+    public SimpleRenderer(IClientState clientState, IGameGui gameGui, IPalacePalConfiguration configuration,
+        TerritoryState territoryState)
     {
-        private const int SegmentCount = 20;
+        _clientState = clientState;
+        _gameGui = gameGui;
+        _configuration = configuration;
+        _territoryState = territoryState;
+    }
 
-        private readonly ClientState _clientState;
+    public void SetLayer(ELayer layer, IReadOnlyList<IRenderElement> elements)
-        private readonly GameGui _gameGui;
+    {
-        private readonly IPalacePalConfiguration _configuration;
+        _layers[layer] = new SimpleLayer
-        private readonly TerritoryState _territoryState;
-        private readonly ConcurrentDictionary<ELayer, SimpleLayer> _layers = new();
-
-        public SimpleRenderer(ClientState clientState, GameGui gameGui, IPalacePalConfiguration configuration,
-            TerritoryState territoryState)
         {
-            _clientState = clientState;
+            TerritoryType = _clientState.TerritoryType,
-            _gameGui = gameGui;
+            Elements = elements.Cast<SimpleElement>().ToList()
-            _configuration = configuration;
+        };
-            _territoryState = territoryState;
+    }
-        }
 
-        public void SetLayer(ELayer layer, IReadOnlyList<IRenderElement> elements)
+    public void ResetLayer(ELayer layer)
+    {
+        if (_layers.Remove(layer, out var l))
+            l.Dispose();
+    }
+
+    public IRenderElement CreateElement(MemoryLocation.EType type, Vector3 pos, bool enabled, uint color,
+        bool fill = false)
+    {
+        var config = MarkerConfig.ForType(type);
+        return new SimpleElement
         {
-            _layers[layer] = new SimpleLayer
+            Type = type,
+            Position = pos + new Vector3(0, config.OffsetY, 0),
+            Enabled = enabled,
+            Color = color,
+            Radius = config.Radius,
+            Fill = fill,
+        };
+    }
+
+    public void DrawDebugItems(uint trapColor, uint hoardColor)
+    {
+        _layers[ELayer.Test] = new SimpleLayer
+        {
+            TerritoryType = _clientState.TerritoryType,
+            Elements = new List<SimpleElement>
             {
-                TerritoryType = _clientState.TerritoryType,
+                (SimpleElement)CreateElement(
-                Elements = elements.Cast<SimpleElement>().ToList()
+                    MemoryLocation.EType.Trap,
-            };
+                    _clientState.LocalPlayer?.Position ?? default,
-        }
+                    true,
+                    trapColor),
+                (SimpleElement)CreateElement(
+                    MemoryLocation.EType.Hoard,
+                    _clientState.LocalPlayer?.Position ?? default,
+                    true,
+                    hoardColor)
+            },
+            ExpiresAt = Environment.TickCount64 + RenderData.TestLayerTimeout
+        };
+    }
 
-        public void ResetLayer(ELayer layer)
+    public void DrawLayers()
-        {
+    {
-            if (_layers.Remove(layer, out var l))
+        if (_layers.Count == 0)
-                l.Dispose();
+            return;
-        }
 
-        public IRenderElement CreateElement(MemoryLocation.EType type, Vector3 pos, uint color, bool fill = false)
+        ImGuiHelpers.ForceNextWindowMainViewport();
+        ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, Vector2.Zero);
+        ImGuiHelpers.SetNextWindowPosRelativeMainViewport(Vector2.Zero, ImGuiCond.None, Vector2.Zero);
+        ImGui.SetNextWindowSize(ImGuiHelpers.MainViewport.Size);
+        if (ImGui.Begin("###PalacePalSimpleRender",
+                ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoBackground |
+                ImGuiWindowFlags.NoInputs | ImGuiWindowFlags.NoSavedSettings |
+                ImGuiWindowFlags.AlwaysUseWindowPadding))
         {
-            var config = MarkerConfig.ForType(type);
+            foreach (var layer in _layers.Values.Where(l => l.IsValid(_clientState)))
-            return new SimpleElement
             {
-                Type = type,
+                foreach (var e in layer.Elements)
-                Position = pos + new Vector3(0, config.OffsetY, 0),
+                    Draw(e);
-                Color = color,
-                Radius = config.Radius,
-                Fill = fill,
-            };
-        }
-
-        public void DrawDebugItems(uint trapColor, uint hoardColor)
-        {
-            _layers[ELayer.Test] = new SimpleLayer
-            {
-                TerritoryType = _clientState.TerritoryType,
-                Elements = new List<SimpleElement>
-                {
-                    (SimpleElement)CreateElement(
-                        MemoryLocation.EType.Trap,
-                        _clientState.LocalPlayer?.Position ?? default,
-                        trapColor),
-                    (SimpleElement)CreateElement(
-                        MemoryLocation.EType.Hoard,
-                        _clientState.LocalPlayer?.Position ?? default,
-                        hoardColor)
-                },
-                ExpiresAt = Environment.TickCount64 + RenderData.TestLayerTimeout
-            };
-        }
-
-        public void DrawLayers()
-        {
-            if (_layers.Count == 0)
-                return;
-
-            ImGuiHelpers.ForceNextWindowMainViewport();
-            ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, Vector2.Zero);
-            ImGuiHelpers.SetNextWindowPosRelativeMainViewport(Vector2.Zero, ImGuiCond.None, Vector2.Zero);
-            ImGui.SetNextWindowSize(ImGuiHelpers.MainViewport.Size);
-            if (ImGui.Begin("###PalacePalSimpleRender",
-                    ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoBackground |
-                    ImGuiWindowFlags.NoInputs | ImGuiWindowFlags.NoSavedSettings |
-                    ImGuiWindowFlags.AlwaysUseWindowPadding))
-            {
-                foreach (var layer in _layers.Values.Where(l => l.IsValid(_clientState)))
-                {
-                    foreach (var e in layer.Elements)
-                        Draw(e);
-                }
-
-                foreach (var key in _layers.Where(l => !l.Value.IsValid(_clientState))
-                             .Select(l => l.Key)
-                             .ToList())
-                    ResetLayer(key);
-
-                ImGui.End();
             }
 
-            ImGui.PopStyleVar();
+            foreach (var key in _layers.Where(l => !l.Value.IsValid(_clientState))
+                         .Select(l => l.Key)
+                         .ToList())
+                ResetLayer(key);
+
+            ImGui.End();
         }
 
-        private void Draw(SimpleElement e)
+        ImGui.PopStyleVar();
+    }
+
+    private void Draw(SimpleElement e)
+    {
+        if (!e.Enabled)
+            return;
+
+        switch (e.Type)
         {
-            if (e.Color == RenderData.ColorInvisible)
+            case MemoryLocation.EType.Hoard:
-                return;
+                // ignore distance if this is a found hoard coffer
-
+                if (_territoryState.PomanderOfIntuition == PomanderState.Active &&
-            switch (e.Type)
+                    _configuration.DeepDungeons.HoardCoffers.OnlyVisibleAfterPomander)
-            {
-                case MemoryLocation.EType.Hoard:
-                    // ignore distance if this is a found hoard coffer
-                    if (_territoryState.PomanderOfIntuition == PomanderState.Active &&
-                        _configuration.DeepDungeons.HoardCoffers.OnlyVisibleAfterPomander)
-                        break;
-
-                    goto case MemoryLocation.EType.Trap;
-
-                case MemoryLocation.EType.Trap:
-                    var playerPos = _clientState.LocalPlayer?.Position;
-                    if (playerPos == null)
-                        return;
-
-                    if ((playerPos.Value - e.Position).Length() > 65)
-                        return;
                     break;
-            }
 
-            bool onScreen = false;
+                goto case MemoryLocation.EType.Trap;
-            for (int index = 0; index < 2 * SegmentCount; ++index)
-            {
-                onScreen |= _gameGui.WorldToScreen(new Vector3(
-                        e.Position.X + e.Radius * (float)Math.Sin(Math.PI / SegmentCount * index),
-                        e.Position.Y,
-                        e.Position.Z + e.Radius * (float)Math.Cos(Math.PI / SegmentCount * index)),
-                    out Vector2 vector2);
 
-                ImGui.GetWindowDrawList().PathLineTo(vector2);
+            case MemoryLocation.EType.Trap:
-            }
+                var playerPos = _clientState.LocalPlayer?.Position;
+                if (playerPos == null)
+                    return;
 
-            if (onScreen)
+                if ((playerPos.Value - e.Position).Length() > 65)
-            {
+                    return;
-                if (e.Fill)
+                break;
-                    ImGui.GetWindowDrawList().PathFillConvex(e.Color);
-                else
-                    ImGui.GetWindowDrawList().PathStroke(e.Color, ImDrawFlags.Closed, 2);
-            }
-            else
-                ImGui.GetWindowDrawList().PathClear();
         }
 
-        public ERenderer GetConfigValue()
+        bool onScreen = false;
-            => ERenderer.Simple;
+        for (int index = 0; index < 2 * SegmentCount; ++index)
+        {
+            onScreen |= _gameGui.WorldToScreen(new Vector3(
+                    e.Position.X + e.Radius * (float)Math.Sin(Math.PI / SegmentCount * index),
+                    e.Position.Y,
+                    e.Position.Z + e.Radius * (float)Math.Cos(Math.PI / SegmentCount * index)),
+                out Vector2 vector2);
+
+            ImGui.GetWindowDrawList().PathLineTo(vector2);
+        }
+
+        if (onScreen)
+        {
+            if (e.Fill)
+                ImGui.GetWindowDrawList().PathFillConvex(e.Color);
+            else
+                ImGui.GetWindowDrawList().PathStroke(e.Color, ImDrawFlags.Closed, 2);
+        }
+        else
+            ImGui.GetWindowDrawList().PathClear();
+    }
+
+    public ERenderer GetConfigValue()
+        => ERenderer.Simple;
+
+    public void Dispose()
+    {
+        foreach (var l in _layers.Values)
+            l.Dispose();
+    }
+
+    public sealed class SimpleLayer : IDisposable
+    {
+        public required ushort TerritoryType { get; init; }
+        public required IReadOnlyList<SimpleElement> Elements { get; init; }
+        public long ExpiresAt { get; init; } = long.MaxValue;
+
+        public bool IsValid(IClientState clientState) =>
+            TerritoryType == clientState.TerritoryType && ExpiresAt >= Environment.TickCount64;
 
         public void Dispose()
         {
-            foreach (var l in _layers.Values)
+            foreach (var e in Elements)
-                l.Dispose();
+                e.IsValid = false;
-        }
-
-        public sealed class SimpleLayer : IDisposable
-        {
-            public required ushort TerritoryType { get; init; }
-            public required IReadOnlyList<SimpleElement> Elements { get; init; }
-            public long ExpiresAt { get; init; } = long.MaxValue;
-
-            public bool IsValid(ClientState clientState) =>
-                TerritoryType == clientState.TerritoryType && ExpiresAt >= Environment.TickCount64;
-
-            public void Dispose()
-            {
-                foreach (var e in Elements)
-                    e.IsValid = false;
-            }
-        }
-
-        public sealed class SimpleElement : IRenderElement
-        {
-            public bool IsValid { get; set; } = true;
-            public required MemoryLocation.EType Type { get; init; }
-            public required Vector3 Position { get; init; }
-            public required uint Color { get; set; }
-            public required float Radius { get; init; }
-            public required bool Fill { get; init; }
         }
     }
+
+    public sealed class SimpleElement : IRenderElement
+    {
+        public bool IsValid { get; set; } = true;
+        public required MemoryLocation.EType Type { get; init; }
+        public required Vector3 Position { get; init; }
+        public required bool Enabled { get; set; }
+        public required uint Color { get; set; }
+        public required float Radius { get; init; }
+        public required bool Fill { get; init; }
+    }
 }

Pal.Client/Rendering/SplatoonRenderer.cs

@@ -1,196 +1,196 @@
-using Dalamud.Plugin;
+using System;
-using ECommons;
-using ECommons.Reflection;
-using ECommons.Schedulers;
-using ECommons.SplatoonAPI;
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
 using System.Reflection;
-using Dalamud.Game.ClientState;
+using Dalamud.Plugin;
+using Dalamud.Plugin.Services;
+using ECommons;
+using ECommons.Reflection;
+using ECommons.Schedulers;
+using ECommons.SplatoonAPI;
 using Microsoft.Extensions.Logging;
 using Pal.Client.Configuration;
 using Pal.Client.DependencyInjection;
 using Pal.Client.Floors;
 
-namespace Pal.Client.Rendering
+namespace Pal.Client.Rendering;
+
+internal sealed class SplatoonRenderer : IRenderer, IDisposable
 {
-    internal sealed class SplatoonRenderer : IRenderer, IDisposable
+    private const long OnTerritoryChange = -2;
+
+    private readonly ILogger<SplatoonRenderer> _logger;
+    private readonly DebugState _debugState;
+    private readonly IClientState _clientState;
+    private readonly Chat _chat;
+
+    public SplatoonRenderer(
+        ILogger<SplatoonRenderer> logger,
+        IDalamudPluginInterface pluginInterface,
+        IDalamudPlugin dalamudPlugin,
+        DebugState debugState,
+        IClientState clientState,
+        Chat chat)
     {
-        private const long OnTerritoryChange = -2;
+        _logger = logger;
+        _debugState = debugState;
+        _clientState = clientState;
+        _chat = chat;
 
-        private readonly ILogger<SplatoonRenderer> _logger;
+        _logger.LogInformation("Initializing splatoon");
-        private readonly DebugState _debugState;
+        ECommonsMain.Init(pluginInterface, dalamudPlugin, ECommons.Module.SplatoonAPI);
-        private readonly ClientState _clientState;
+    }
-        private readonly Chat _chat;
 
-        public SplatoonRenderer(
+    private bool IsDisposed { get; set; }
-            ILogger<SplatoonRenderer> logger,
-            DalamudPluginInterface pluginInterface,
-            IDalamudPlugin dalamudPlugin,
-            DebugState debugState,
-            ClientState clientState,
-            Chat chat)
-        {
-            _logger = logger;
-            _debugState = debugState;
-            _clientState = clientState;
-            _chat = chat;
 
-            _logger.LogInformation("Initializing splatoon");
+    public void SetLayer(ELayer layer, IReadOnlyList<IRenderElement> elements)
-            ECommonsMain.Init(pluginInterface, dalamudPlugin, ECommons.Module.SplatoonAPI);
+    {
-        }
+        // we need to delay this, as the current framework update could be before splatoon's, in which case it would immediately delete the layout
-
+        _ = new TickScheduler(delegate
-        private bool IsDisposed { get; set; }
-
-        public void SetLayer(ELayer layer, IReadOnlyList<IRenderElement> elements)
-        {
-            // we need to delay this, as the current framework update could be before splatoon's, in which case it would immediately delete the layout
-            _ = new TickScheduler(delegate
-            {
-                try
-                {
-                    Splatoon.AddDynamicElements(ToLayerName(layer),
-                        elements.Cast<SplatoonElement>().Select(x => x.Delegate).ToArray(),
-                        new[] { Environment.TickCount64 + 60 * 60 * 1000, OnTerritoryChange });
-                }
-                catch (Exception e)
-                {
-                    _logger.LogError(e, "Could not create splatoon layer {Layer} with {Count} elements", layer,
-                        elements.Count);
-                    _debugState.SetFromException(e);
-                }
-            });
-        }
-
-        public void ResetLayer(ELayer layer)
         {
             try
             {
-                Splatoon.RemoveDynamicElements(ToLayerName(layer));
+                Splatoon.AddDynamicElements(ToLayerName(layer),
+                    elements.Cast<SplatoonElement>().Select(x => x.Delegate).ToArray(),
+                    new[] { Environment.TickCount64 + 60 * 60 * 1000, OnTerritoryChange });
             }
             catch (Exception e)
             {
-                _logger.LogError(e, "Could not reset splatoon layer {Layer}", layer);
+                _logger.LogError(e, "Could not create splatoon layer {Layer} with {Count} elements", layer,
+                    elements.Count);
+                _debugState.SetFromException(e);
+            }
+        });
+    }
+
+    public void ResetLayer(ELayer layer)
+    {
+        try
+        {
+            Splatoon.RemoveDynamicElements(ToLayerName(layer));
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "Could not reset splatoon layer {Layer}", layer);
+        }
+    }
+
+    private string ToLayerName(ELayer layer)
+        => $"PalacePal.{layer}";
+
+    public IRenderElement CreateElement(MemoryLocation.EType type, Vector3 pos, bool enabled, uint color, bool fill = false)
+    {
+        MarkerConfig config = MarkerConfig.ForType(type);
+        Element element = new Element(ElementType.CircleAtFixedCoordinates)
+        {
+            refX = pos.X,
+            refY = pos.Z, // z and y are swapped
+            refZ = pos.Y,
+            offX = 0,
+            offY = 0,
+            offZ = config.OffsetY,
+            Filled = fill,
+            radius = config.Radius,
+            FillStep = 1,
+            color = color,
+            thicc = 2,
+            Enabled = enabled,
+        };
+        return new SplatoonElement(this, element);
+    }
+
+    public void DrawDebugItems(uint trapColor, uint hoardColor)
+    {
+        try
+        {
+            Vector3? pos = _clientState.LocalPlayer?.Position;
+            if (pos != null)
+            {
+                ResetLayer(ELayer.Test);
+
+                var elements = new List<IRenderElement>
+                {
+                    CreateElement(MemoryLocation.EType.Trap, pos.Value, true, trapColor),
+                    CreateElement(MemoryLocation.EType.Hoard, pos.Value, true, hoardColor),
+                };
+
+                if (!Splatoon.AddDynamicElements(ToLayerName(ELayer.Test),
+                        elements.Cast<SplatoonElement>().Select(x => x.Delegate).ToArray(),
+                        new[] { Environment.TickCount64 + RenderData.TestLayerTimeout }))
+                {
+                    _chat.Message("Could not draw markers :(");
+                }
             }
         }
-
+        catch (Exception)
-        private string ToLayerName(ELayer layer)
-            => $"PalacePal.{layer}";
-
-        public IRenderElement CreateElement(MemoryLocation.EType type, Vector3 pos, uint color, bool fill = false)
-        {
-            MarkerConfig config = MarkerConfig.ForType(type);
-            Element element = new Element(ElementType.CircleAtFixedCoordinates)
-            {
-                refX = pos.X,
-                refY = pos.Z, // z and y are swapped
-                refZ = pos.Y,
-                offX = 0,
-                offY = 0,
-                offZ = config.OffsetY,
-                Filled = fill,
-                radius = config.Radius,
-                FillStep = 1,
-                color = color,
-                thicc = 2,
-            };
-            return new SplatoonElement(this, element);
-        }
-
-        public void DrawDebugItems(uint trapColor, uint hoardColor)
         {
             try
             {
-                Vector3? pos = _clientState.LocalPlayer?.Position;
+                var pluginManager = DalamudReflector.GetPluginManager();
-                if (pos != null)
+                IList installedPlugins =
+                    pluginManager.GetType().GetProperty("InstalledPlugins")?.GetValue(pluginManager) as IList ??
+                    new List<object>();
+
+                foreach (var t in installedPlugins)
                 {
-                    ResetLayer(ELayer.Test);
+                    AssemblyName? assemblyName =
-
+                        (AssemblyName?)t.GetType().GetProperty("AssemblyName")?.GetValue(t);
-                    var elements = new List<IRenderElement>
+                    string? pluginName = (string?)t.GetType().GetProperty("Name")?.GetValue(t);
+                    if (assemblyName?.Name == "Splatoon" && pluginName != "Splatoon")
                     {
-                        CreateElement(MemoryLocation.EType.Trap, pos.Value, trapColor),
+                        _chat.Error(
-                        CreateElement(MemoryLocation.EType.Hoard, pos.Value, hoardColor),
+                            $"Splatoon is installed under the plugin name '{pluginName}', which is incompatible with the Splatoon API.");
-                    };
+                        _chat.Message(
-
+                            "You need to install Splatoon from the official repository at https://github.com/NightmareXIV/MyDalamudPlugins.");
-                    if (!Splatoon.AddDynamicElements(ToLayerName(ELayer.Test),
+                        return;
-                            elements.Cast<SplatoonElement>().Select(x => x.Delegate).ToArray(),
-                            new[] { Environment.TickCount64 + RenderData.TestLayerTimeout }))
-                    {
-                        _chat.Message("Could not draw markers :(");
                     }
                 }
             }
             catch (Exception)
             {
-                try
+                // not relevant
-                {
-                    var pluginManager = DalamudReflector.GetPluginManager();
-                    IList installedPlugins =
-                        pluginManager.GetType().GetProperty("InstalledPlugins")?.GetValue(pluginManager) as IList ??
-                        new List<object>();
-
-                    foreach (var t in installedPlugins)
-                    {
-                        AssemblyName? assemblyName =
-                            (AssemblyName?)t.GetType().GetProperty("AssemblyName")?.GetValue(t);
-                        string? pluginName = (string?)t.GetType().GetProperty("Name")?.GetValue(t);
-                        if (assemblyName?.Name == "Splatoon" && pluginName != "Splatoon")
-                        {
-                            _chat.Error(
-                                $"Splatoon is installed under the plugin name '{pluginName}', which is incompatible with the Splatoon API.");
-                            _chat.Message(
-                                "You need to install Splatoon from the official repository at https://github.com/NightmareXIV/MyDalamudPlugins.");
-                            return;
-                        }
-                    }
-                }
-                catch (Exception)
-                {
-                    // not relevant
-                }
-
-                _chat.Error("Could not draw markers, is Splatoon installed and enabled?");
             }
+
+            _chat.Error("Could not draw markers, is Splatoon installed and enabled?");
+        }
+    }
+
+    public ERenderer GetConfigValue()
+        => ERenderer.Splatoon;
+
+    public void Dispose()
+    {
+        _logger.LogInformation("Disposing splatoon");
+
+        IsDisposed = true;
+
+        ResetLayer(ELayer.TrapHoard);
+        ResetLayer(ELayer.RegularCoffers);
+        ResetLayer(ELayer.Test);
+
+        ECommonsMain.Dispose();
+    }
+
+    private sealed class SplatoonElement : IRenderElement
+    {
+        private readonly SplatoonRenderer _renderer;
+
+        public SplatoonElement(SplatoonRenderer renderer, Element element)
+        {
+            _renderer = renderer;
+            Delegate = element;
         }
 
-        public ERenderer GetConfigValue()
+        public Element Delegate { get; }
-            => ERenderer.Splatoon;
 
-        public void Dispose()
+        public bool IsValid => !_renderer.IsDisposed && Delegate.IsValid();
+
+        public bool Enabled
         {
-            _logger.LogInformation("Disposing splatoon");
+            get => Delegate.Enabled;
-
+            set => Delegate.Enabled = value;
-            IsDisposed = true;
-
-            ResetLayer(ELayer.TrapHoard);
-            ResetLayer(ELayer.RegularCoffers);
-            ResetLayer(ELayer.Test);
-
-            ECommonsMain.Dispose();
-        }
-
-        private sealed class SplatoonElement : IRenderElement
-        {
-            private readonly SplatoonRenderer _renderer;
-
-            public SplatoonElement(SplatoonRenderer renderer, Element element)
-            {
-                _renderer = renderer;
-                Delegate = element;
-            }
-
-            public Element Delegate { get; }
-
-            public bool IsValid => !_renderer.IsDisposed && Delegate.IsValid();
-
-            public uint Color
-            {
-                get => Delegate.color;
-                set => Delegate.color = value;
-            }
         }
     }
 }

Pal.Client/Scheduled/IQueueOnFrameworkThread.cs

@@ -2,38 +2,37 @@
 using Dalamud.Logging;
 using Microsoft.Extensions.Logging;
 
-namespace Pal.Client.Scheduled
+namespace Pal.Client.Scheduled;
+
+internal interface IQueueOnFrameworkThread
 {
-    internal interface IQueueOnFrameworkThread
+    internal interface IHandler
     {
-        internal interface IHandler
+        void RunIfCompatible(IQueueOnFrameworkThread queued, ref bool recreateLayout);
+    }
+
+    internal abstract class Handler<T> : IHandler
+        where T : IQueueOnFrameworkThread
+    {
+        protected readonly ILogger<Handler<T>> _logger;
+
+        protected Handler(ILogger<Handler<T>> logger)
         {
-            void RunIfCompatible(IQueueOnFrameworkThread queued, ref bool recreateLayout);
+            _logger = logger;
         }
 
-        internal abstract class Handler<T> : IHandler
+        protected abstract void Run(T queued, ref bool recreateLayout);
-            where T : IQueueOnFrameworkThread
+
+        public void RunIfCompatible(IQueueOnFrameworkThread queued, ref bool recreateLayout)
         {
-            protected readonly ILogger<Handler<T>> _logger;
+            if (queued is T t)
-
-            protected Handler(ILogger<Handler<T>> logger)
             {
-                _logger = logger;
+                _logger.LogDebug("Handling {QueuedType}", queued.GetType());
+                Run(t, ref recreateLayout);
             }
-
+            else
-            protected abstract void Run(T queued, ref bool recreateLayout);
-
-            public void RunIfCompatible(IQueueOnFrameworkThread queued, ref bool recreateLayout)
             {
-                if (queued is T t)
+                _logger.LogError("Could not use queue handler {QueuedType}", queued.GetType());
-                {
-                    _logger.LogDebug("Handling {QueuedType}", queued.GetType());
-                    Run(t, ref recreateLayout);
-                }
-                else
-                {
-                    _logger.LogError("Could not use queue handler {QueuedType}", queued.GetType());
-                }
             }
         }
     }

Pal.Client/Scheduled/QueuedConfigUpdate.cs

@@ -4,27 +4,25 @@ using Pal.Client.DependencyInjection;
 using Pal.Client.Floors;
 using Pal.Client.Rendering;
 
-namespace Pal.Client.Scheduled
+namespace Pal.Client.Scheduled;
+
+internal sealed class QueuedConfigUpdate : IQueueOnFrameworkThread
 {
-    internal sealed class QueuedConfigUpdate : IQueueOnFrameworkThread
+    internal sealed class Handler : IQueueOnFrameworkThread.Handler<QueuedConfigUpdate>
     {
-        internal sealed class Handler : IQueueOnFrameworkThread.Handler<QueuedConfigUpdate>
+        private readonly RenderAdapter _renderAdapter;
+
+        public Handler(
+            ILogger<Handler> logger,
+            RenderAdapter renderAdapter)
+            : base(logger)
         {
-            private readonly RenderAdapter _renderAdapter;
+            _renderAdapter = renderAdapter;
+        }
 
-            public Handler(
+        protected override void Run(QueuedConfigUpdate queued, ref bool recreateLayout)
-                ILogger<Handler> logger,
+        {
-                RenderAdapter renderAdapter)
+            _renderAdapter.ConfigUpdated();
-                : base(logger)
-            {
-                _renderAdapter = renderAdapter;
-            }
-
-            protected override void Run(QueuedConfigUpdate queued, ref bool recreateLayout)
-            {
-                // TODO filter stuff if offline
-                _renderAdapter.ConfigUpdated();
-            }
         }
     }
 }

Pal.Client/Scheduled/QueuedImport.cs

@@ -1,123 +1,122 @@
-using Account;
+using System;
-using Pal.Common;
-using System;
 using System.IO;
 using System.Threading.Tasks;
+using Export;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Pal.Client.Database;
 using Pal.Client.DependencyInjection;
 using Pal.Client.Properties;
 using Pal.Client.Windows;
+using Pal.Common;
 
-namespace Pal.Client.Scheduled
+namespace Pal.Client.Scheduled;
+
+internal sealed class QueuedImport : IQueueOnFrameworkThread
 {
-    internal sealed class QueuedImport : IQueueOnFrameworkThread
+    private ExportRoot Export { get; }
-    {
+    private Guid ExportId { get; set; }
-        private ExportRoot Export { get; }
+    private int ImportedTraps { get; set; }
-        private Guid ExportId { get; set; }
+    private int ImportedHoardCoffers { get; set; }
-        private int ImportedTraps { get; set; }
-        private int ImportedHoardCoffers { get; set; }
 
-        public QueuedImport(string sourcePath)
+    public QueuedImport(string sourcePath)
+    {
+        using var input = File.OpenRead(sourcePath);
+        Export = ExportRoot.Parser.ParseFrom(input);
+    }
+
+    internal sealed class Handler : IQueueOnFrameworkThread.Handler<QueuedImport>
+    {
+        private readonly IServiceScopeFactory _serviceScopeFactory;
+        private readonly Chat _chat;
+        private readonly ImportService _importService;
+        private readonly ConfigWindow _configWindow;
+
+        public Handler(
+            ILogger<Handler> logger,
+            IServiceScopeFactory serviceScopeFactory,
+            Chat chat,
+            ImportService importService,
+            ConfigWindow configWindow)
+            : base(logger)
         {
-            using var input = File.OpenRead(sourcePath);
+            _serviceScopeFactory = serviceScopeFactory;
-            Export = ExportRoot.Parser.ParseFrom(input);
+            _chat = chat;
+            _importService = importService;
+            _configWindow = configWindow;
         }
 
-        internal sealed class Handler : IQueueOnFrameworkThread.Handler<QueuedImport>
+        protected override void Run(QueuedImport import, ref bool recreateLayout)
         {
-            private readonly IServiceScopeFactory _serviceScopeFactory;
+            recreateLayout = true;
-            private readonly Chat _chat;
-            private readonly ImportService _importService;
-            private readonly ConfigWindow _configWindow;
 
-            public Handler(
+            try
-                ILogger<Handler> logger,
-                IServiceScopeFactory serviceScopeFactory,
-                Chat chat,
-                ImportService importService,
-                ConfigWindow configWindow)
-                : base(logger)
             {
-                _serviceScopeFactory = serviceScopeFactory;
+                if (!Validate(import))
-                _chat = chat;
+                    return;
-                _importService = importService;
-                _configWindow = configWindow;
-            }
 
-            protected override void Run(QueuedImport import, ref bool recreateLayout)
+                Task.Run(() =>
-            {
-                recreateLayout = true;
-
-                try
                 {
-                    if (!Validate(import))
+                    try
-                        return;
-
-                    Task.Run(() =>
                     {
-                        try
+                        using (var scope = _serviceScopeFactory.CreateScope())
                         {
-                            using (var scope = _serviceScopeFactory.CreateScope())
+                            using var dbContext = scope.ServiceProvider.GetRequiredService<PalClientContext>();
-                            {
+                            (import.ImportedTraps, import.ImportedHoardCoffers) =
-                                using var dbContext = scope.ServiceProvider.GetRequiredService<PalClientContext>();
+                                _importService.Import(import.Export);
-                                (import.ImportedTraps, import.ImportedHoardCoffers) =
-                                    _importService.Import(import.Export);
-                            }
-
-                            _configWindow.UpdateLastImport();
-
-                            _logger.LogInformation(
-                                "Imported {ExportId} for {Traps} traps, {Hoard} hoard coffers", import.ExportId,
-                                import.ImportedTraps, import.ImportedHoardCoffers);
-                            _chat.Message(string.Format(Localization.ImportCompleteStatistics, import.ImportedTraps,
-                                import.ImportedHoardCoffers));
                         }
-                        catch (Exception e)
+
-                        {
+                        _configWindow.UpdateLastImport();
-                            _logger.LogError(e, "Import failed in inner task");
+
-                            _chat.Error(string.Format(Localization.Error_ImportFailed, e));
+                        _logger.LogInformation(
-                        }
+                            "Imported {ExportId} for {Traps} traps, {Hoard} hoard coffers", import.ExportId,
-                    });
+                            import.ImportedTraps, import.ImportedHoardCoffers);
-                }
+                        _chat.Message(string.Format(Localization.ImportCompleteStatistics, import.ImportedTraps,
-                catch (Exception e)
+                            import.ImportedHoardCoffers));
-                {
+                    }
-                    _logger.LogError(e, "Import failed");
+                    catch (Exception e)
-                    _chat.Error(string.Format(Localization.Error_ImportFailed, e));
+                    {
-                }
+                        _logger.LogError(e, "Import failed in inner task");
+                        _chat.Error(string.Format(Localization.Error_ImportFailed, e));
+                    }
+                });
             }
-
+            catch (Exception e)
-            private bool Validate(QueuedImport import)
             {
-                if (import.Export.ExportVersion != ExportConfig.ExportVersion)
+                _logger.LogError(e, "Import failed");
-                {
+                _chat.Error(string.Format(Localization.Error_ImportFailed, e));
-                    _logger.LogError(
-                        "Import: Different version in export file, {ExportVersion} != {ConfiguredVersion}",
-                        import.Export.ExportVersion, ExportConfig.ExportVersion);
-                    _chat.Error(Localization.Error_ImportFailed_IncompatibleVersion);
-                    return false;
-                }
-
-                if (!Guid.TryParse(import.Export.ExportId, out Guid exportId) || exportId == Guid.Empty)
-                {
-                    _logger.LogError("Import: Invalid export id '{Id}'", import.Export.ExportId);
-                    _chat.Error(Localization.Error_ImportFailed_InvalidFile);
-                    return false;
-                }
-
-                import.ExportId = exportId;
-
-                if (string.IsNullOrEmpty(import.Export.ServerUrl))
-                {
-                    // If we allow for backups as import/export, this should be removed
-                    _logger.LogError("Import: No server URL");
-                    _chat.Error(Localization.Error_ImportFailed_InvalidFile);
-                    return false;
-                }
-
-                return true;
             }
         }
+
+        private bool Validate(QueuedImport import)
+        {
+            if (import.Export.ExportVersion != ExportConfig.ExportVersion)
+            {
+                _logger.LogError(
+                    "Import: Different version in export file, {ExportVersion} != {ConfiguredVersion}",
+                    import.Export.ExportVersion, ExportConfig.ExportVersion);
+                _chat.Error(Localization.Error_ImportFailed_IncompatibleVersion);
+                return false;
+            }
+
+            if (!Guid.TryParse(import.Export.ExportId, out Guid exportId) || exportId == Guid.Empty)
+            {
+                _logger.LogError("Import: Invalid export id '{Id}'", import.Export.ExportId);
+                _chat.Error(Localization.Error_ImportFailed_InvalidFile);
+                return false;
+            }
+
+            import.ExportId = exportId;
+
+            if (string.IsNullOrEmpty(import.Export.ServerUrl))
+            {
+                // If we allow for backups as import/export, this should be removed
+                _logger.LogError("Import: No server URL");
+                _chat.Error(Localization.Error_ImportFailed_InvalidFile);
+                return false;
+            }
+
+            return true;
+        }
     }
 }

Pal.Client/Scheduled/QueuedSyncResponse.cs

@@ -11,151 +11,150 @@ using Pal.Client.Floors.Tasks;
 using Pal.Client.Net;
 using Pal.Common;
 
-namespace Pal.Client.Scheduled
+namespace Pal.Client.Scheduled;
+
+internal sealed class QueuedSyncResponse : IQueueOnFrameworkThread
 {
-    internal sealed class QueuedSyncResponse : IQueueOnFrameworkThread
+    public required SyncType Type { get; init; }
+    public required ushort TerritoryType { get; init; }
+    public required bool Success { get; init; }
+    public required IReadOnlyList<PersistentLocation> Locations { get; init; }
+
+    internal sealed class Handler : IQueueOnFrameworkThread.Handler<QueuedSyncResponse>
     {
-        public required SyncType Type { get; init; }
+        private readonly IServiceScopeFactory _serviceScopeFactory;
-        public required ushort TerritoryType { get; init; }
+        private readonly IPalacePalConfiguration _configuration;
-        public required bool Success { get; init; }
+        private readonly FloorService _floorService;
-        public required IReadOnlyList<PersistentLocation> Locations { get; init; }
+        private readonly TerritoryState _territoryState;
+        private readonly DebugState _debugState;
 
-        internal sealed class Handler : IQueueOnFrameworkThread.Handler<QueuedSyncResponse>
+        public Handler(
+            ILogger<Handler> logger,
+            IServiceScopeFactory serviceScopeFactory,
+            IPalacePalConfiguration configuration,
+            FloorService floorService,
+            TerritoryState territoryState,
+            DebugState debugState)
+            : base(logger)
         {
-            private readonly IServiceScopeFactory _serviceScopeFactory;
+            _serviceScopeFactory = serviceScopeFactory;
-            private readonly IPalacePalConfiguration _configuration;
+            _configuration = configuration;
-            private readonly FloorService _floorService;
+            _floorService = floorService;
-            private readonly TerritoryState _territoryState;
+            _territoryState = territoryState;
-            private readonly DebugState _debugState;
+            _debugState = debugState;
+        }
 
-            public Handler(
+        protected override void Run(QueuedSyncResponse queued, ref bool recreateLayout)
-                ILogger<Handler> logger,
+        {
-                IServiceScopeFactory serviceScopeFactory,
+            recreateLayout = true;
-                IPalacePalConfiguration configuration,
+
-                FloorService floorService,
+            _logger.LogDebug(
-                TerritoryState territoryState,
+                "Sync response for territory {Territory} of type {Type}, success = {Success}, response objects = {Count}",
-                DebugState debugState)
+                (ETerritoryType)queued.TerritoryType, queued.Type, queued.Success, queued.Locations.Count);
-                : base(logger)
+            var memoryTerritory = _floorService.GetTerritoryIfReady(queued.TerritoryType);
+            if (memoryTerritory == null)
             {
-                _serviceScopeFactory = serviceScopeFactory;
+                _logger.LogWarning("Discarding sync response for territory {Territory} as it isn't ready",
-                _configuration = configuration;
+                    (ETerritoryType)queued.TerritoryType);
-                _floorService = floorService;
+                return;
-                _territoryState = territoryState;
-                _debugState = debugState;
             }
 
-            protected override void Run(QueuedSyncResponse queued, ref bool recreateLayout)
+            try
             {
-                recreateLayout = true;
+                var remoteMarkers = queued.Locations;
-
+                if (_configuration.Mode == EMode.Online && queued.Success && remoteMarkers.Count > 0)
-                _logger.LogDebug(
-                    "Sync response for territory {Territory} of type {Type}, success = {Success}, response objects = {Count}",
-                    (ETerritoryType)queued.TerritoryType, queued.Type, queued.Success, queued.Locations.Count);
-                var memoryTerritory = _floorService.GetTerritoryIfReady(queued.TerritoryType);
-                if (memoryTerritory == null)
                 {
-                    _logger.LogWarning("Discarding sync response for territory {Territory} as it isn't ready",
+                    switch (queued.Type)
-                        (ETerritoryType)queued.TerritoryType);
+                    {
+                        case SyncType.Download:
+                        case SyncType.Upload:
+                            List<PersistentLocation> newLocations = new();
+                            foreach (var remoteMarker in remoteMarkers)
+                            {
+                                // Both uploads and downloads return the network id to be set, but only the downloaded marker is new as in to-be-saved.
+                                PersistentLocation? localLocation =
+                                    memoryTerritory.Locations.SingleOrDefault(x => x == remoteMarker);
+                                if (localLocation != null)
+                                {
+                                    localLocation.NetworkId = remoteMarker.NetworkId;
+                                    continue;
+                                }
+
+                                if (queued.Type == SyncType.Download)
+                                {
+                                    memoryTerritory.Locations.Add(remoteMarker);
+                                    newLocations.Add(remoteMarker);
+                                }
+                            }
+
+                            if (newLocations.Count > 0)
+                                new SaveNewLocations(_serviceScopeFactory, memoryTerritory, newLocations).Start();
+
+                            break;
+
+                        case SyncType.MarkSeen:
+                            var partialAccountId =
+                                _configuration.FindAccount(RemoteApi.RemoteUrl)?.AccountId.ToPartialId();
+                            if (partialAccountId == null)
+                                break;
+
+                            List<PersistentLocation> locationsToUpdate = new();
+                            foreach (var remoteMarker in remoteMarkers)
+                            {
+                                PersistentLocation? localLocation =
+                                    memoryTerritory.Locations.SingleOrDefault(x => x == remoteMarker);
+                                if (localLocation != null)
+                                {
+                                    localLocation.RemoteSeenOn.Add(partialAccountId);
+                                    locationsToUpdate.Add(localLocation);
+                                }
+                            }
+
+                            if (locationsToUpdate.Count > 0)
+                            {
+                                new MarkRemoteSeen(_serviceScopeFactory, memoryTerritory, locationsToUpdate,
+                                    partialAccountId).Start();
+                            }
+
+                            break;
+                    }
+                }
+
+                // don't modify state for outdated floors
+                if (_territoryState.LastTerritory != queued.TerritoryType)
                     return;
-                }
 
-                try
+                if (queued.Type == SyncType.Download)
                 {
-                    var remoteMarkers = queued.Locations;
+                    if (queued.Success)
-                    if (_configuration.Mode == EMode.Online && queued.Success && remoteMarkers.Count > 0)
+                        memoryTerritory.SyncState = ESyncState.Complete;
-                    {
+                    else
-                        switch (queued.Type)
-                        {
-                            case SyncType.Download:
-                            case SyncType.Upload:
-                                List<PersistentLocation> newLocations = new();
-                                foreach (var remoteMarker in remoteMarkers)
-                                {
-                                    // Both uploads and downloads return the network id to be set, but only the downloaded marker is new as in to-be-saved.
-                                    PersistentLocation? localLocation =
-                                        memoryTerritory.Locations.SingleOrDefault(x => x == remoteMarker);
-                                    if (localLocation != null)
-                                    {
-                                        localLocation.NetworkId = remoteMarker.NetworkId;
-                                        continue;
-                                    }
-
-                                    if (queued.Type == SyncType.Download)
-                                    {
-                                        memoryTerritory.Locations.Add(remoteMarker);
-                                        newLocations.Add(remoteMarker);
-                                    }
-                                }
-
-                                if (newLocations.Count > 0)
-                                    new SaveNewLocations(_serviceScopeFactory, memoryTerritory, newLocations).Start();
-
-                                break;
-
-                            case SyncType.MarkSeen:
-                                var partialAccountId =
-                                    _configuration.FindAccount(RemoteApi.RemoteUrl)?.AccountId.ToPartialId();
-                                if (partialAccountId == null)
-                                    break;
-
-                                List<PersistentLocation> locationsToUpdate = new();
-                                foreach (var remoteMarker in remoteMarkers)
-                                {
-                                    PersistentLocation? localLocation =
-                                        memoryTerritory.Locations.SingleOrDefault(x => x == remoteMarker);
-                                    if (localLocation != null)
-                                    {
-                                        localLocation.RemoteSeenOn.Add(partialAccountId);
-                                        locationsToUpdate.Add(localLocation);
-                                    }
-                                }
-
-                                if (locationsToUpdate.Count > 0)
-                                {
-                                    new MarkRemoteSeen(_serviceScopeFactory, memoryTerritory, locationsToUpdate,
-                                        partialAccountId).Start();
-                                }
-
-                                break;
-                        }
-                    }
-
-                    // don't modify state for outdated floors
-                    if (_territoryState.LastTerritory != queued.TerritoryType)
-                        return;
-
-                    if (queued.Type == SyncType.Download)
-                    {
-                        if (queued.Success)
-                            memoryTerritory.SyncState = ESyncState.Complete;
-                        else
-                            memoryTerritory.SyncState = ESyncState.Failed;
-                    }
-                }
-                catch (Exception e)
-                {
-                    _logger.LogError(e, "Sync failed for territory {Territory}", (ETerritoryType)queued.TerritoryType);
-                    _debugState.SetFromException(e);
-                    if (queued.Type == SyncType.Download)
                         memoryTerritory.SyncState = ESyncState.Failed;
                 }
             }
+            catch (Exception e)
+            {
+                _logger.LogError(e, "Sync failed for territory {Territory}", (ETerritoryType)queued.TerritoryType);
+                _debugState.SetFromException(e);
+                if (queued.Type == SyncType.Download)
+                    memoryTerritory.SyncState = ESyncState.Failed;
+            }
         }
     }
-
+}
-    public enum ESyncState
+
-    {
+public enum ESyncState
-        NotAttempted,
+{
-        NotNeeded,
+    NotAttempted,
-        Started,
+    NotNeeded,
-        Complete,
+    Started,
-        Failed,
+    Complete,
-    }
+    Failed,
-
+}
-    public enum SyncType
+
-    {
+public enum SyncType
-        Upload,
+{
-        Download,
+    Upload,
-        MarkSeen,
+    Download,
-    }
+    MarkSeen,
 }

Pal.Client/Scheduled/QueuedUndoImport.cs

@@ -7,36 +7,35 @@ using Pal.Client.Floors;
 using Pal.Client.Windows;
 using Pal.Common;
 
-namespace Pal.Client.Scheduled
+namespace Pal.Client.Scheduled;
+
+internal sealed class QueuedUndoImport : IQueueOnFrameworkThread
 {
-    internal sealed class QueuedUndoImport : IQueueOnFrameworkThread
+    public QueuedUndoImport(Guid exportId)
     {
-        public QueuedUndoImport(Guid exportId)
+        ExportId = exportId;
+    }
+
+    private Guid ExportId { get; }
+
+    internal sealed class Handler : IQueueOnFrameworkThread.Handler<QueuedUndoImport>
+    {
+        private readonly ImportService _importService;
+        private readonly ConfigWindow _configWindow;
+
+        public Handler(ILogger<Handler> logger, ImportService importService, ConfigWindow configWindow)
+            : base(logger)
         {
-            ExportId = exportId;
+            _importService = importService;
+            _configWindow = configWindow;
         }
 
-        private Guid ExportId { get; }
+        protected override void Run(QueuedUndoImport queued, ref bool recreateLayout)
-
-        internal sealed class Handler : IQueueOnFrameworkThread.Handler<QueuedUndoImport>
         {
-            private readonly ImportService _importService;
+            recreateLayout = true;
-            private readonly ConfigWindow _configWindow;
 
-            public Handler(ILogger<Handler> logger, ImportService importService, ConfigWindow configWindow)
+            _importService.RemoveById(queued.ExportId);
-                : base(logger)
+            _configWindow.UpdateLastImport();
-            {
-                _importService = importService;
-                _configWindow = configWindow;
-            }
-
-            protected override void Run(QueuedUndoImport queued, ref bool recreateLayout)
-            {
-                recreateLayout = true;
-
-                _importService.RemoveById(queued.ExportId);
-                _configWindow.UpdateLastImport();
-            }
         }
     }
 }

Pal.Client/Windows/AgreementWindow.cs

@@ -1,105 +1,104 @@
 using System;
+using System.Numerics;
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Windowing;
 using ECommons;
 using ImGuiNET;
-using System.Numerics;
 using Pal.Client.Configuration;
 using Pal.Client.Extensions;
 using Pal.Client.Properties;
 
-namespace Pal.Client.Windows
+namespace Pal.Client.Windows;
+
+internal sealed class AgreementWindow : Window, IDisposable, ILanguageChanged
 {
-    internal sealed class AgreementWindow : Window, IDisposable, ILanguageChanged
+    private const string WindowId = "###PalPalaceAgreement";
+    private readonly WindowSystem _windowSystem;
+    private readonly ConfigurationManager _configurationManager;
+    private readonly IPalacePalConfiguration _configuration;
+    private int _choice;
+
+    public AgreementWindow(
+        WindowSystem windowSystem,
+        ConfigurationManager configurationManager,
+        IPalacePalConfiguration configuration)
+        : base(WindowId)
     {
-        private const string WindowId = "###PalPalaceAgreement";
+        _windowSystem = windowSystem;
-        private readonly WindowSystem _windowSystem;
+        _configurationManager = configurationManager;
-        private readonly ConfigurationManager _configurationManager;
+        _configuration = configuration;
-        private readonly IPalacePalConfiguration _configuration;
-        private int _choice;
 
-        public AgreementWindow(
+        LanguageChanged();
-            WindowSystem windowSystem,
+
-            ConfigurationManager configurationManager,
+        Flags = ImGuiWindowFlags.NoCollapse;
-            IPalacePalConfiguration configuration)
+        Size = new Vector2(500, 500);
-            : base(WindowId)
+        SizeCondition = ImGuiCond.FirstUseEver;
+        PositionCondition = ImGuiCond.FirstUseEver;
+        Position = new Vector2(310, 310);
+
+        SizeConstraints = new WindowSizeConstraints
         {
-            _windowSystem = windowSystem;
+            MinimumSize = new Vector2(500, 500),
-            _configurationManager = configurationManager;
+            MaximumSize = new Vector2(2000, 2000),
-            _configuration = configuration;
+        };
 
-            LanguageChanged();
+        IsOpen = configuration.FirstUse;
+        _windowSystem.AddWindow(this);
+    }
 
-            Flags = ImGuiWindowFlags.NoCollapse;
+    public void Dispose()
-            Size = new Vector2(500, 500);
+        => _windowSystem.RemoveWindow(this);
-            SizeCondition = ImGuiCond.FirstUseEver;
-            PositionCondition = ImGuiCond.FirstUseEver;
-            Position = new Vector2(310, 310);
 
-            SizeConstraints = new WindowSizeConstraints
+    public void LanguageChanged()
-            {
+        => WindowName = $"{Localization.Palace_Pal}{WindowId}";
-                MinimumSize = new Vector2(500, 500),
-                MaximumSize = new Vector2(2000, 2000),
-            };
 
-            IsOpen = configuration.FirstUse;
+    public override void OnOpen()
-            _windowSystem.AddWindow(this);
+    {
+        _choice = -1;
+    }
+
+    public override void Draw()
+    {
+        ImGui.TextWrapped(Localization.Explanation_1);
+        ImGui.TextWrapped(Localization.Explanation_2);
+
+        ImGui.Spacing();
+
+        ImGui.TextWrapped(Localization.Explanation_3);
+        ImGui.TextWrapped(Localization.Explanation_4);
+
+        PalImGui.RadioButtonWrapped(Localization.Config_UploadMyDiscoveries_ShowOtherTraps, ref _choice,
+            (int)EMode.Online);
+        PalImGui.RadioButtonWrapped(Localization.Config_NeverUploadDiscoveries_ShowMyTraps, ref _choice,
+            (int)EMode.Offline);
+
+        ImGui.Separator();
+
+        ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
+        ImGui.TextWrapped(Localization.Agreement_Warning1);
+        ImGui.TextWrapped(Localization.Agreement_Warning2);
+        ImGui.TextWrapped(Localization.Agreement_Warning3);
+        ImGui.PopStyleColor();
+
+        ImGui.Separator();
+
+        if (_choice == -1)
+            ImGui.TextDisabled(Localization.Agreement_PickOneOption);
+        ImGui.BeginDisabled(_choice == -1);
+        if (ImGui.Button(Localization.Agreement_UsingThisOnMyOwnRisk))
+        {
+            _configuration.Mode = (EMode)_choice;
+            _configuration.FirstUse = false;
+            _configurationManager.Save(_configuration);
+
+            IsOpen = false;
         }
 
-        public void Dispose()
+        ImGui.EndDisabled();
-            => _windowSystem.RemoveWindow(this);
 
-        public void LanguageChanged()
+        ImGui.Separator();
-            => WindowName = $"{Localization.Palace_Pal}{WindowId}";
 
-        public override void OnOpen()
+        if (ImGui.Button(Localization.Agreement_ViewPluginAndServerSourceCode))
-        {
+            GenericHelpers.ShellStart("https://git.carvel.li/liza/PalacePal");
-            _choice = -1;
-        }
-
-        public override void Draw()
-        {
-            ImGui.TextWrapped(Localization.Explanation_1);
-            ImGui.TextWrapped(Localization.Explanation_2);
-
-            ImGui.Spacing();
-
-            ImGui.TextWrapped(Localization.Explanation_3);
-            ImGui.TextWrapped(Localization.Explanation_4);
-
-            PalImGui.RadioButtonWrapped(Localization.Config_UploadMyDiscoveries_ShowOtherTraps, ref _choice,
-                (int)EMode.Online);
-            PalImGui.RadioButtonWrapped(Localization.Config_NeverUploadDiscoveries_ShowMyTraps, ref _choice,
-                (int)EMode.Offline);
-
-            ImGui.Separator();
-
-            ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
-            ImGui.TextWrapped(Localization.Agreement_Warning1);
-            ImGui.TextWrapped(Localization.Agreement_Warning2);
-            ImGui.TextWrapped(Localization.Agreement_Warning3);
-            ImGui.PopStyleColor();
-
-            ImGui.Separator();
-
-            if (_choice == -1)
-                ImGui.TextDisabled(Localization.Agreement_PickOneOption);
-            ImGui.BeginDisabled(_choice == -1);
-            if (ImGui.Button(Localization.Agreement_UsingThisOnMyOwnRisk))
-            {
-                _configuration.Mode = (EMode)_choice;
-                _configuration.FirstUse = false;
-                _configurationManager.Save(_configuration);
-
-                IsOpen = false;
-            }
-
-            ImGui.EndDisabled();
-
-            ImGui.Separator();
-
-            if (ImGui.Button(Localization.Agreement_ViewPluginAndServerSourceCode))
-                GenericHelpers.ShellStart("https://github.com/carvelli/PalPalace");
-        }
     }
 }

Pal.Client/Windows/StatisticsWindow.cs

@@ -1,124 +1,125 @@
-using Dalamud.Interface.Windowing;
+using System;
-using ImGuiNET;
-using Pal.Common;
-using Palace;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
+using Dalamud.Interface.Windowing;
+using ImGuiNET;
 using Pal.Client.Properties;
+using Pal.Common;
+using Palace;
 
-namespace Pal.Client.Windows
+namespace Pal.Client.Windows;
+
+internal sealed class StatisticsWindow : Window, IDisposable, ILanguageChanged
 {
-    internal sealed class StatisticsWindow : Window, IDisposable, ILanguageChanged
+    private const string WindowId = "###PalacePalStats";
+    private readonly WindowSystem _windowSystem;
+    private readonly SortedDictionary<ETerritoryType, TerritoryStatistics> _territoryStatistics = new();
+
+    public StatisticsWindow(WindowSystem windowSystem)
+        : base(WindowId)
     {
-        private const string WindowId = "###PalacePalStats";
+        _windowSystem = windowSystem;
-        private readonly WindowSystem _windowSystem;
-        private readonly SortedDictionary<ETerritoryType, TerritoryStatistics> _territoryStatistics = new();
 
-        public StatisticsWindow(WindowSystem windowSystem)
+        LanguageChanged();
-            : base(WindowId)
+
+        Size = new Vector2(500, 500);
+        SizeCondition = ImGuiCond.FirstUseEver;
+        Flags = ImGuiWindowFlags.AlwaysAutoResize;
+
+        foreach (ETerritoryType territory in typeof(ETerritoryType).GetEnumValues())
         {
-            _windowSystem = windowSystem;
+            _territoryStatistics[territory] = new TerritoryStatistics(territory.ToString());
-
-            LanguageChanged();
-
-            Size = new Vector2(500, 500);
-            SizeCondition = ImGuiCond.FirstUseEver;
-            Flags = ImGuiWindowFlags.AlwaysAutoResize;
-
-            foreach (ETerritoryType territory in typeof(ETerritoryType).GetEnumValues())
-            {
-                _territoryStatistics[territory] = new TerritoryStatistics(territory.ToString());
-            }
-
-            _windowSystem.AddWindow(this);
         }
 
-        public void Dispose()
+        _windowSystem.AddWindow(this);
-            => _windowSystem.RemoveWindow(this);
+    }
 
-        public void LanguageChanged()
+    public void Dispose()
-            => WindowName = $"{Localization.Palace_Pal} - {Localization.Statistics}{WindowId}";
+        => _windowSystem.RemoveWindow(this);
 
-        public override void Draw()
+    public void LanguageChanged()
+        => WindowName = $"{Localization.Palace_Pal} - {Localization.Statistics}{WindowId}";
+
+    public override void Draw()
+    {
+        if (ImGui.BeginTabBar("Tabs"))
         {
-            if (ImGui.BeginTabBar("Tabs"))
+            DrawDungeonStats("Palace of the Dead", Localization.PalaceOfTheDead, ETerritoryType.Palace_1_10,
-            {
+                ETerritoryType.Palace_191_200);
-                DrawDungeonStats("Palace of the Dead", Localization.PalaceOfTheDead, ETerritoryType.Palace_1_10,
+            DrawDungeonStats("Heaven on High", Localization.HeavenOnHigh, ETerritoryType.HeavenOnHigh_1_10,
-                    ETerritoryType.Palace_191_200);
+                ETerritoryType.HeavenOnHigh_91_100);
-                DrawDungeonStats("Heaven on High", Localization.HeavenOnHigh, ETerritoryType.HeavenOnHigh_1_10,
+            DrawDungeonStats("Eureka Orthos", Localization.EurekaOrthos, ETerritoryType.EurekaOrthos_1_10,
-                    ETerritoryType.HeavenOnHigh_91_100);
+                ETerritoryType.EurekaOrthos_91_100);
-            }
         }
+    }
 
-        private void DrawDungeonStats(string id, string name, ETerritoryType minTerritory, ETerritoryType maxTerritory)
+    private void DrawDungeonStats(string id, string name, ETerritoryType minTerritory, ETerritoryType maxTerritory)
+    {
+        if (ImGui.BeginTabItem($"{name}###{id}"))
         {
-            if (ImGui.BeginTabItem($"{name}###{id}"))
+            if (ImGui.BeginTable($"TrapHoardStatistics{id}", 4,
+                    ImGuiTableFlags.Borders | ImGuiTableFlags.Resizable))
             {
-                if (ImGui.BeginTable($"TrapHoardStatistics{id}", 4,
+                ImGui.TableSetupColumn(Localization.Statistics_TerritoryId);
-                        ImGuiTableFlags.Borders | ImGuiTableFlags.Resizable))
+                ImGui.TableSetupColumn(Localization.Statistics_InstanceName);
+                ImGui.TableSetupColumn(Localization.Statistics_Traps);
+                ImGui.TableSetupColumn(Localization.Statistics_HoardCoffers);
+                ImGui.TableHeadersRow();
+
+                foreach (var (territoryType, stats) in _territoryStatistics
+                             .Where(x => x.Key >= minTerritory && x.Key <= maxTerritory)
+                             .OrderBy(x => x.Key.GetOrder() ?? (int)x.Key))
                 {
-                    ImGui.TableSetupColumn(Localization.Statistics_TerritoryId);
+                    ImGui.TableNextRow();
-                    ImGui.TableSetupColumn(Localization.Statistics_InstanceName);
+                    if (ImGui.TableNextColumn())
-                    ImGui.TableSetupColumn(Localization.Statistics_Traps);
+                        ImGui.Text($"{(uint)territoryType}");
-                    ImGui.TableSetupColumn(Localization.Statistics_HoardCoffers);
-                    ImGui.TableHeadersRow();
 
-                    foreach (var (territoryType, stats) in _territoryStatistics
+                    if (ImGui.TableNextColumn())
-                                 .Where(x => x.Key >= minTerritory && x.Key <= maxTerritory)
+                        ImGui.Text(stats.TerritoryName);
-                                 .OrderBy(x => x.Key.GetOrder() ?? (int)x.Key))
-                    {
-                        ImGui.TableNextRow();
-                        if (ImGui.TableNextColumn())
-                            ImGui.Text($"{(uint)territoryType}");
 
-                        if (ImGui.TableNextColumn())
+                    if (ImGui.TableNextColumn())
-                            ImGui.Text(stats.TerritoryName);
+                        ImGui.Text(stats.TrapCount?.ToString() ?? "-");
 
-                        if (ImGui.TableNextColumn())
+                    if (ImGui.TableNextColumn())
-                            ImGui.Text(stats.TrapCount?.ToString() ?? "-");
+                        ImGui.Text(stats.HoardCofferCount?.ToString() ?? "-");
-
-                        if (ImGui.TableNextColumn())
-                            ImGui.Text(stats.HoardCofferCount?.ToString() ?? "-");
-                    }
-
-                    ImGui.EndTable();
                 }
 
-                ImGui.EndTabItem();
+                ImGui.EndTable();
             }
+
+            ImGui.EndTabItem();
+        }
+    }
+
+    internal void SetFloorData(IEnumerable<FloorStatistics> floorStatistics)
+    {
+        foreach (var territoryStatistics in _territoryStatistics.Values)
+        {
+            territoryStatistics.TrapCount = null;
+            territoryStatistics.HoardCofferCount = null;
         }
 
-        internal void SetFloorData(IEnumerable<FloorStatistics> floorStatistics)
+        foreach (var floor in floorStatistics)
         {
-            foreach (var territoryStatistics in _territoryStatistics.Values)
+            if (_territoryStatistics.TryGetValue((ETerritoryType)floor.TerritoryType,
+                    out TerritoryStatistics? territoryStatistics))
             {
-                territoryStatistics.TrapCount = null;
+                territoryStatistics.TrapCount = floor.TrapCount;
-                territoryStatistics.HoardCofferCount = null;
+                territoryStatistics.HoardCofferCount = floor.HoardCount;
-            }
-
-            foreach (var floor in floorStatistics)
-            {
-                if (_territoryStatistics.TryGetValue((ETerritoryType)floor.TerritoryType,
-                        out TerritoryStatistics? territoryStatistics))
-                {
-                    territoryStatistics.TrapCount = floor.TrapCount;
-                    territoryStatistics.HoardCofferCount = floor.HoardCount;
-                }
-            }
-        }
-
-        private sealed class TerritoryStatistics
-        {
-            public string TerritoryName { get; }
-            public uint? TrapCount { get; set; }
-            public uint? HoardCofferCount { get; set; }
-
-            public TerritoryStatistics(string territoryName)
-            {
-                TerritoryName = territoryName;
             }
         }
     }
+
+    private sealed class TerritoryStatistics
+    {
+        public string TerritoryName { get; }
+        public uint? TrapCount { get; set; }
+        public uint? HoardCofferCount { get; set; }
+
+        public TerritoryStatistics(string territoryName)
+        {
+            TerritoryName = territoryName;
+        }
+    }
 }

Pal.Client/packages.lock.json

@@ -0,0 +1,344 @@
+{
+  "version": 1,
+  "dependencies": {
+    "net8.0-windows7.0": {
+      "Dalamud.Extensions.MicrosoftLogging": {
+        "type": "Direct",
+        "requested": "[4.0.1, )",
+        "resolved": "4.0.1",
+        "contentHash": "fMEL2ajtF/30SBBku7vMyG0yye5eHN/A9fgT//1CEjUth/Wz2CYco5Ehye21T8KN1IuAPwoqJuu49rB71j+8ug==",
+        "dependencies": {
+          "Microsoft.Extensions.Logging": "8.0.0"
+        }
+      },
+      "DalamudPackager": {
+        "type": "Direct",
+        "requested": "[2.1.13, )",
+        "resolved": "2.1.13",
+        "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ=="
+      },
+      "DotNet.ReproducibleBuilds": {
+        "type": "Direct",
+        "requested": "[1.1.1, )",
+        "resolved": "1.1.1",
+        "contentHash": "+H2t/t34h6mhEoUvHi8yGXyuZ2GjSovcGYehJrS2MDm2XgmPfZL2Sdxg+uL2lKgZ4M6tTwKHIlxOob2bgh0NRQ==",
+        "dependencies": {
+          "Microsoft.SourceLink.AzureRepos.Git": "1.1.1",
+          "Microsoft.SourceLink.Bitbucket.Git": "1.1.1",
+          "Microsoft.SourceLink.GitHub": "1.1.1",
+          "Microsoft.SourceLink.GitLab": "1.1.1"
+        }
+      },
+      "Google.Protobuf": {
+        "type": "Direct",
+        "requested": "[3.27.2, )",
+        "resolved": "3.27.2",
+        "contentHash": "0wdgA3LO9mBS477jieBFs4pU1sWhVtwv/P+i9nAEiFDQyUA7PPHDBbJL1CeqYtV18jLiq9og4n7wSVCO171OBg=="
+      },
+      "Grpc.Net.Client": {
+        "type": "Direct",
+        "requested": "[2.63.0, )",
+        "resolved": "2.63.0",
+        "contentHash": "847zG24daOP1242OpbnjhbKtplH/EfV/76QReQA3cbS5SL78uIXsWMe9IN9JlIb4+kT3eE4fjMCXTn8BAQ91Ng==",
+        "dependencies": {
+          "Grpc.Net.Common": "2.63.0",
+          "Microsoft.Extensions.Logging.Abstractions": "6.0.0"
+        }
+      },
+      "Grpc.Tools": {
+        "type": "Direct",
+        "requested": "[2.64.0, )",
+        "resolved": "2.64.0",
+        "contentHash": "W5RrhDFHUhioASktxfuDs5fTjWUxwegljZAig9zFL8nWNskeyQA6OXN2choWKYxGrljer25VqCJCMbWz7XHvqg=="
+      },
+      "Microsoft.EntityFrameworkCore.Sqlite": {
+        "type": "Direct",
+        "requested": "[8.0.6, )",
+        "resolved": "8.0.6",
+        "contentHash": "nC4cZN4zReTb22qd9WDU0eDmlXvkyf2g2pqQ3VIHJbkpJcdWSY/PDgwGpbpShsVcAjXbkjGiUcv9aGwa61xQPw==",
+        "dependencies": {
+          "Microsoft.EntityFrameworkCore.Sqlite.Core": "8.0.6",
+          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.6"
+        }
+      },
+      "Microsoft.Extensions.Logging": {
+        "type": "Direct",
+        "requested": "[8.0.0, )",
+        "resolved": "8.0.0",
+        "contentHash": "tvRkov9tAJ3xP51LCv3FJ2zINmv1P8Hi8lhhtcKGqM+ImiTCC84uOPEI4z8Cdq2C3o9e+Aa0Gw0rmrsJD77W+w==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection": "8.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "8.0.0",
+          "Microsoft.Extensions.Options": "8.0.0"
+        }
+      },
+      "Microsoft.SourceLink.Gitea": {
+        "type": "Direct",
+        "requested": "[8.0.0, )",
+        "resolved": "8.0.0",
+        "contentHash": "KOBodmDnlWGIqZt2hT47Q69TIoGhIApDVLCyyj9TT5ct8ju16AbHYcB4XeknoHX562wO1pMS/1DfBIZK+V+sxg==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "8.0.0",
+          "Microsoft.SourceLink.Common": "8.0.0"
+        }
+      },
+      "System.Security.Cryptography.ProtectedData": {
+        "type": "Direct",
+        "requested": "[8.0.0, )",
+        "resolved": "8.0.0",
+        "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg=="
+      },
+      "Grpc.Core.Api": {
+        "type": "Transitive",
+        "resolved": "2.63.0",
+        "contentHash": "t3+/MF8AxIqKq5UmPB9EWAnM9C/+lXOB8TRFfeVMDntf6dekfJmjpKDebaT4t2bbuwVwwvthxxox9BuGr59kYA=="
+      },
+      "Grpc.Net.Common": {
+        "type": "Transitive",
+        "resolved": "2.63.0",
+        "contentHash": "RLt6p31ZMsXRcHNeu1dQuIFLYZvnwP6LUzoDPlV3KoR4w9btmwrXIvz9Jbp1SOmxW7nXw9zShAeIt5LsqFAx5w==",
+        "dependencies": {
+          "Grpc.Core.Api": "2.63.0"
+        }
+      },
+      "Microsoft.Build.Tasks.Git": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
+      },
+      "Microsoft.Data.Sqlite.Core": {
+        "type": "Transitive",
+        "resolved": "8.0.6",
+        "contentHash": "umhZ0ZF2RI81rGFTnYmCxI+Euj4Aqe/6Y4+8CxN9OVJNGDNIqB5laJ3wxQTU8zXCcm2k9F7FL+/6RVoOT4z1Fw==",
+        "dependencies": {
+          "SQLitePCLRaw.core": "2.1.6"
+        }
+      },
+      "Microsoft.EntityFrameworkCore": {
+        "type": "Transitive",
+        "resolved": "8.0.6",
+        "contentHash": "Ms5e5QuBAjVIuQsGumeLvkgMiOpnj6wxPvwBIoe1NfTkseWK4NZYztnhgDlpkCPkrUmJEXLv69kl349Ours30Q==",
+        "dependencies": {
+          "Microsoft.EntityFrameworkCore.Abstractions": "8.0.6",
+          "Microsoft.EntityFrameworkCore.Analyzers": "8.0.6",
+          "Microsoft.Extensions.Caching.Memory": "8.0.0",
+          "Microsoft.Extensions.Logging": "8.0.0"
+        }
+      },
+      "Microsoft.EntityFrameworkCore.Abstractions": {
+        "type": "Transitive",
+        "resolved": "8.0.6",
+        "contentHash": "X7wSSBNFRuN8j8M9HDYG7rPpEeyhY+PdJZR9rftmgvsZH0eK5+bZ3b3As8iO4rLEpjsBzDnrgSIY6q2F3HQatw=="
+      },
+      "Microsoft.EntityFrameworkCore.Analyzers": {
+        "type": "Transitive",
+        "resolved": "8.0.6",
+        "contentHash": "fDNtuQ4lAaPaCOlsrwUck/GvnF4QLeDpMmE1L5QtxZpMSmWfnL2/vk8sDL9OVTWcfprooI9V5MNpIx3/Tq5ehg=="
+      },
+      "Microsoft.EntityFrameworkCore.Relational": {
+        "type": "Transitive",
+        "resolved": "8.0.6",
+        "contentHash": "chhfmLusCGLGvNYtvMji6KGQlduPDnJsStG/LjS8qJhFWJDDzTZpSr2LHowewcxMrMo/Axc6Jwe+WwSi/vlkTg==",
+        "dependencies": {
+          "Microsoft.EntityFrameworkCore": "8.0.6",
+          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
+        }
+      },
+      "Microsoft.EntityFrameworkCore.Sqlite.Core": {
+        "type": "Transitive",
+        "resolved": "8.0.6",
+        "contentHash": "87xfPtqSouxWWdynYZv/rubd0rOUeiN9+XeoMWQzpZm/5svH1TuvzFODGIY0zKuXS18NiOFyHl9N6///eaEs/Q==",
+        "dependencies": {
+          "Microsoft.Data.Sqlite.Core": "8.0.6",
+          "Microsoft.EntityFrameworkCore.Relational": "8.0.6",
+          "Microsoft.Extensions.DependencyModel": "8.0.0"
+        }
+      },
+      "Microsoft.Extensions.Caching.Abstractions": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==",
+        "dependencies": {
+          "Microsoft.Extensions.Primitives": "8.0.0"
+        }
+      },
+      "Microsoft.Extensions.Caching.Memory": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "7pqivmrZDzo1ADPkRwjy+8jtRKWRCPag9qPI+p7sgu7Q4QreWhcvbiWXsbhP+yY8XSiDvZpu2/LWdBv7PnmOpQ==",
+        "dependencies": {
+          "Microsoft.Extensions.Caching.Abstractions": "8.0.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "8.0.0",
+          "Microsoft.Extensions.Options": "8.0.0",
+          "Microsoft.Extensions.Primitives": "8.0.0"
+        }
+      },
+      "Microsoft.Extensions.Configuration.Abstractions": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==",
+        "dependencies": {
+          "Microsoft.Extensions.Primitives": "8.0.0"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "V8S3bsm50ig6JSyrbcJJ8bW2b9QLGouz+G1miK3UTaOWmMtFwNNNzUf4AleyDWUmTrWMLNnFSLEQtxmxgNQnNQ==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg=="
+      },
+      "Microsoft.Extensions.DependencyModel": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "NSmDw3K0ozNDgShSIpsZcbFIzBX4w28nDag+TfaQujkXGazBm+lid5onlWoCBy4VsLxqnnKjEBbGSJVWJMf43g==",
+        "dependencies": {
+          "System.Text.Encodings.Web": "8.0.0",
+          "System.Text.Json": "8.0.0"
+        }
+      },
+      "Microsoft.Extensions.Logging.Abstractions": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0"
+        }
+      },
+      "Microsoft.Extensions.Options": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
+          "Microsoft.Extensions.Primitives": "8.0.0"
+        }
+      },
+      "Microsoft.Extensions.Primitives": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g=="
+      },
+      "Microsoft.SourceLink.AzureRepos.Git": {
+        "type": "Transitive",
+        "resolved": "1.1.1",
+        "contentHash": "qB5urvw9LO2bG3eVAkuL+2ughxz2rR7aYgm2iyrB8Rlk9cp2ndvGRCvehk3rNIhRuNtQaeKwctOl1KvWiklv5w==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "1.1.1",
+          "Microsoft.SourceLink.Common": "1.1.1"
+        }
+      },
+      "Microsoft.SourceLink.Bitbucket.Git": {
+        "type": "Transitive",
+        "resolved": "1.1.1",
+        "contentHash": "cDzxXwlyWpLWaH0em4Idj0H3AmVo3L/6xRXKssYemx+7W52iNskj/SQ4FOmfCb8YQt39otTDNMveCZzYtMoucQ==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "1.1.1",
+          "Microsoft.SourceLink.Common": "1.1.1"
+        }
+      },
+      "Microsoft.SourceLink.Common": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
+      },
+      "Microsoft.SourceLink.GitHub": {
+        "type": "Transitive",
+        "resolved": "1.1.1",
+        "contentHash": "IaJGnOv/M7UQjRJks7B6p7pbPnOwisYGOIzqCz5ilGFTApZ3ktOR+6zJ12ZRPInulBmdAf1SrGdDG2MU8g6XTw==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "1.1.1",
+          "Microsoft.SourceLink.Common": "1.1.1"
+        }
+      },
+      "Microsoft.SourceLink.GitLab": {
+        "type": "Transitive",
+        "resolved": "1.1.1",
+        "contentHash": "tvsg47DDLqqedlPeYVE2lmiTpND8F0hkrealQ5hYltSmvruy/Gr5nHAKSsjyw5L3NeM/HLMI5ORv7on/M4qyZw==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "1.1.1",
+          "Microsoft.SourceLink.Common": "1.1.1"
+        }
+      },
+      "SQLitePCLRaw.bundle_e_sqlite3": {
+        "type": "Transitive",
+        "resolved": "2.1.6",
+        "contentHash": "BmAf6XWt4TqtowmiWe4/5rRot6GerAeklmOPfviOvwLoF5WwgxcJHAxZtySuyW9r9w+HLILnm8VfJFLCUJYW8A==",
+        "dependencies": {
+          "SQLitePCLRaw.lib.e_sqlite3": "2.1.6",
+          "SQLitePCLRaw.provider.e_sqlite3": "2.1.6"
+        }
+      },
+      "SQLitePCLRaw.core": {
+        "type": "Transitive",
+        "resolved": "2.1.6",
+        "contentHash": "wO6v9GeMx9CUngAet8hbO7xdm+M42p1XeJq47ogyRoYSvNSp0NGLI+MgC0bhrMk9C17MTVFlLiN6ylyExLCc5w==",
+        "dependencies": {
+          "System.Memory": "4.5.3"
+        }
+      },
+      "SQLitePCLRaw.lib.e_sqlite3": {
+        "type": "Transitive",
+        "resolved": "2.1.6",
+        "contentHash": "2ObJJLkIUIxRpOUlZNGuD4rICpBnrBR5anjyfUFQep4hMOIeqW+XGQYzrNmHSVz5xSWZ3klSbh7sFR6UyDj68Q=="
+      },
+      "SQLitePCLRaw.provider.e_sqlite3": {
+        "type": "Transitive",
+        "resolved": "2.1.6",
+        "contentHash": "PQ2Oq3yepLY4P7ll145P3xtx2bX8xF4PzaKPRpw9jZlKvfe4LE/saAV82inND9usn1XRpmxXk7Lal3MTI+6CNg==",
+        "dependencies": {
+          "SQLitePCLRaw.core": "2.1.6"
+        }
+      },
+      "System.Memory": {
+        "type": "Transitive",
+        "resolved": "4.5.3",
+        "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA=="
+      },
+      "System.Text.Encodings.Web": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ=="
+      },
+      "System.Text.Json": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==",
+        "dependencies": {
+          "System.Text.Encodings.Web": "8.0.0"
+        }
+      },
+      "ecommons": {
+        "type": "Project"
+      },
+      "llib": {
+        "type": "Project",
+        "dependencies": {
+          "DalamudPackager": "[2.1.13, )"
+        }
+      },
+      "pal.common": {
+        "type": "Project"
+      }
+    },
+    "net8.0-windows7.0/win-x64": {
+      "SQLitePCLRaw.lib.e_sqlite3": {
+        "type": "Transitive",
+        "resolved": "2.1.6",
+        "contentHash": "2ObJJLkIUIxRpOUlZNGuD4rICpBnrBR5anjyfUFQep4hMOIeqW+XGQYzrNmHSVz5xSWZ3klSbh7sFR6UyDj68Q=="
+      },
+      "System.Text.Encodings.Web": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ=="
+      }
+    }
+  }
+}

Pal.Common/ETerritoryType.cs

@@ -1,52 +1,62 @@
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 
-namespace Pal.Common
+namespace Pal.Common;
-{
-    [SuppressMessage("ReSharper", "UnusedMember.Global")]
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum ETerritoryType : ushort
-    {
-        Palace_1_10 = 561,
-        Palace_11_20,
-        Palace_21_30,
-        Palace_31_40,
-        Palace_41_50,
-        Palace_51_60 = 593,
-        Palace_61_70,
-        Palace_71_80,
-        Palace_81_90,
-        Palace_91_100,
-        Palace_101_110,
-        Palace_111_120,
-        Palace_121_130,
-        Palace_131_140,
-        Palace_141_150,
-        Palace_151_160,
-        Palace_161_170,
-        Palace_171_180,
-        Palace_181_190,
-        Palace_191_200,
 
-        [Display(Order = 1)]
+[SuppressMessage("ReSharper", "UnusedMember.Global")]
-        HeavenOnHigh_1_10 = 770,
+[SuppressMessage("ReSharper", "InconsistentNaming")]
-        [Display(Order = 2)]
+public enum ETerritoryType : ushort
-        HeavenOnHigh_11_20 = 771,
+{
-        [Display(Order = 3)]
+    Palace_1_10 = 561,
-        HeavenOnHigh_21_30 = 772,
+    Palace_11_20,
-        [Display(Order = 4)]
+    Palace_21_30,
-        HeavenOnHigh_31_40 = 782,
+    Palace_31_40,
-        [Display(Order = 5)]
+    Palace_41_50,
-        HeavenOnHigh_41_50 = 773,
+    Palace_51_60 = 593,
-        [Display(Order = 6)]
+    Palace_61_70,
-        HeavenOnHigh_51_60 = 783,
+    Palace_71_80,
-        [Display(Order = 7)]
+    Palace_81_90,
-        HeavenOnHigh_61_70 = 774,
+    Palace_91_100,
-        [Display(Order = 8)]
+    Palace_101_110,
-        HeavenOnHigh_71_80 = 784,
+    Palace_111_120,
-        [Display(Order = 9)]
+    Palace_121_130,
-        HeavenOnHigh_81_90 = 775,
+    Palace_131_140,
-        [Display(Order = 10)]
+    Palace_141_150,
-        HeavenOnHigh_91_100 = 785
+    Palace_151_160,
-    }
+    Palace_161_170,
+    Palace_171_180,
+    Palace_181_190,
+    Palace_191_200,
+
+    [Display(Order = 1)]
+    HeavenOnHigh_1_10 = 770,
+    [Display(Order = 2)]
+    HeavenOnHigh_11_20 = 771,
+    [Display(Order = 3)]
+    HeavenOnHigh_21_30 = 772,
+    [Display(Order = 4)]
+    HeavenOnHigh_31_40 = 782,
+    [Display(Order = 5)]
+    HeavenOnHigh_41_50 = 773,
+    [Display(Order = 6)]
+    HeavenOnHigh_51_60 = 783,
+    [Display(Order = 7)]
+    HeavenOnHigh_61_70 = 774,
+    [Display(Order = 8)]
+    HeavenOnHigh_71_80 = 784,
+    [Display(Order = 9)]
+    HeavenOnHigh_81_90 = 775,
+    [Display(Order = 10)]
+    HeavenOnHigh_91_100 = 785,
+
+    EurekaOrthos_1_10 = 1099,
+    EurekaOrthos_11_20,
+    EurekaOrthos_21_30,
+    EurekaOrthos_31_40,
+    EurekaOrthos_41_50,
+    EurekaOrthos_51_60,
+    EurekaOrthos_61_70,
+    EurekaOrthos_71_80,
+    EurekaOrthos_81_90,
+    EurekaOrthos_91_100
 }

Pal.Common/EnumExtensions.cs

@@ -1,16 +1,17 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
 using System.Reflection;
 
-namespace Pal.Common
+namespace Pal.Common;
+
+public static class EnumExtensions
 {
-    public static class EnumExtensions
+    public static int? GetOrder(this Enum e)
     {
-        public static int? GetOrder(this Enum e)
+        Type type = e.GetType();
-        {
+        MemberInfo field = type.GetMember(e.ToString()).Single();
-            Type type = e.GetType();
+        DisplayAttribute? attribute = field.GetCustomAttributes(typeof(DisplayAttribute), false).Cast<DisplayAttribute>().FirstOrDefault();
-            MemberInfo field = type.GetMember(e.ToString()).Single();
+        return attribute?.Order;
-            DisplayAttribute? attribute = field.GetCustomAttributes(typeof(DisplayAttribute), false).Cast<DisplayAttribute>().FirstOrDefault();
-            return attribute?.Order;
-        }
     }
 }

Pal.Common/ExportConfig.cs

@@ -4,10 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Pal.Common
+namespace Pal.Common;
+
+public static class ExportConfig
 {
-    public static class ExportConfig
+    public static int ExportVersion => 2;
-    {
-        public static int ExportVersion => 2;
-    }
 }

Pal.Common/Pal.Common.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
+    <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
-    <LangVersion>11.0</LangVersion>
+        <LangVersion>12.0</LangVersion>
-    <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
-    <Nullable>enable</Nullable>
+        <DebugType>portable</DebugType>
-    <DebugType>portable</DebugType>
+        <PathMap Condition="$(SolutionDir) != ''">$(SolutionDir)=X:\</PathMap>
-    <PathMap Condition="$(SolutionDir) != ''">$(SolutionDir)=X:\</PathMap>
+        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
-  </PropertyGroup>
+    </PropertyGroup>
 </Project>

Pal.Common/PalaceMath.cs

@@ -1,22 +1,22 @@
-using System.Numerics;
+using System;
+using System.Numerics;
 
-namespace Pal.Common
+namespace Pal.Common;
+
+public class PalaceMath
 {
-    public class PalaceMath
+    private static readonly Vector3 ScaleFactor = new(5);
+
+    public static bool IsNearlySamePosition(Vector3 a, Vector3 b)
     {
-        private static readonly Vector3 ScaleFactor = new(5);
+        a *= ScaleFactor;
+        b *= ScaleFactor;
+        return (int)a.X == (int)b.X && (int)a.Y == (int)b.Y && (int)a.Z == (int)b.Z;
+    }
 
-        public static bool IsNearlySamePosition(Vector3 a, Vector3 b)
+    public static int GetHashCode(Vector3 v)
-        {
+    {
-            a *= ScaleFactor;
+        v *= ScaleFactor;
-            b *= ScaleFactor;
+        return HashCode.Combine((int)v.X, (int)v.Y, (int)v.Z);
-            return (int)a.X == (int)b.X && (int)a.Y == (int)b.Y && (int)a.Z == (int)b.Z;
-        }
-
-        public static int GetHashCode(Vector3 v)
-        {
-            v *= ScaleFactor;
-            return HashCode.Combine((int)v.X, (int)v.Y, (int)v.Z);
-        }
     }
 }

Pal.Common/Protos/account.proto

@@ -18,6 +18,7 @@ service AccountService {
 }
 
 message CreateAccountRequest {
+  Version version = 1;
 }
 
 message CreateAccountReply {
@@ -35,6 +36,7 @@ enum CreateAccountError {
 
 message LoginRequest {
 	string accountId = 1;
+	Version version = 2;
 }
 
 message LoginReply {
@@ -55,4 +57,9 @@ message VerifyRequest {
 }
 
 message VerifyReply {
-}
+}
+
+message Version {
+  int32 major = 1;
+  int32 minor = 2;
+}

Pal.Common/Protos/export.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package account;
+package export;
 
 import "google/protobuf/timestamp.proto";
 

Pal.Common/packages.lock.json

@@ -0,0 +1,6 @@
+{
+  "version": 1,
+  "dependencies": {
+    "net8.0": {}
+  }
+}

Pal.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pal.Server", "Pal.Server\Pal.Server.csproj", "{AB3E2849-DB06-46F6-8457-9AC1096B4125}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pal.Server", "Server\Server\Pal.Server.csproj", "{AB3E2849-DB06-46F6-8457-9AC1096B4125}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pal.Client", "Pal.Client\Pal.Client.csproj", "{7F1985B3-D376-4A91-BC9B-46C2A860F9EF}"
 EndProject
@@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		Dockerfile = Dockerfile
 		README.md = README.md
+		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ECommons", "vendor\ECommons\ECommons\ECommons.csproj", "{D0B37096-5BC3-41B0-8D81-203CBA3932B0}"
@@ -24,6 +25,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "github-workflows", "github-
 		.github\workflows\upload-crowdin.yml = .github\workflows\upload-crowdin.yml
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pal.Server.Tests", "Server\Tests\Pal.Server.Tests.csproj", "{AEC052FA-F178-492C-9A09-ED28DBE1EF5E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LLib", "vendor\LLib\LLib.csproj", "{B1321FD5-7BBF-4C9D-83C1-F8D7C394F32A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -64,6 +69,22 @@ Global
 		{D0B37096-5BC3-41B0-8D81-203CBA3932B0}.Release|Any CPU.Build.0 = Release|x64
 		{D0B37096-5BC3-41B0-8D81-203CBA3932B0}.Release|x64.ActiveCfg = Release|x64
 		{D0B37096-5BC3-41B0-8D81-203CBA3932B0}.Release|x64.Build.0 = Release|x64
+		{AEC052FA-F178-492C-9A09-ED28DBE1EF5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AEC052FA-F178-492C-9A09-ED28DBE1EF5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AEC052FA-F178-492C-9A09-ED28DBE1EF5E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AEC052FA-F178-492C-9A09-ED28DBE1EF5E}.Debug|x64.Build.0 = Debug|Any CPU
+		{AEC052FA-F178-492C-9A09-ED28DBE1EF5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AEC052FA-F178-492C-9A09-ED28DBE1EF5E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AEC052FA-F178-492C-9A09-ED28DBE1EF5E}.Release|x64.ActiveCfg = Release|Any CPU
+		{AEC052FA-F178-492C-9A09-ED28DBE1EF5E}.Release|x64.Build.0 = Release|Any CPU
+		{B1321FD5-7BBF-4C9D-83C1-F8D7C394F32A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1321FD5-7BBF-4C9D-83C1-F8D7C394F32A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1321FD5-7BBF-4C9D-83C1-F8D7C394F32A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B1321FD5-7BBF-4C9D-83C1-F8D7C394F32A}.Debug|x64.Build.0 = Debug|Any CPU
+		{B1321FD5-7BBF-4C9D-83C1-F8D7C394F32A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1321FD5-7BBF-4C9D-83C1-F8D7C394F32A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1321FD5-7BBF-4C9D-83C1-F8D7C394F32A}.Release|x64.ActiveCfg = Release|Any CPU
+		{B1321FD5-7BBF-4C9D-83C1-F8D7C394F32A}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

README.md

@@ -1,19 +1,18 @@
 # Palace Pal
 
-Shows possible trap & hoard coffer locations in Palace of the Dead & Heaven on High. 
+Shows possible trap & hoard coffer locations in Palace of the Dead & Heaven on High.
 
 ## Installation
 
 To install this plugin from my plugin repository, please check the
-[Installation Instructions](https://github.com/carvelli/Dalamud-Plugins#installation).
+[Installation Instructions](https://git.carvel.li/liza/plugin-repo/src/branch/master/README.md).
 
 Additionally, you **need to install Splatoon**, which is used to render the visible overlays.
 Please check [Splatoon's Installation Instructions](https://github.com/NightmareXIV/MyDalamudPlugins#installation).
 
-
 ## Translation
 
 Please feel free to help by [translating this plugin into your language](https://crowdin.com/project/palace-pal).
 
-If you want to translate the plugin into a language that is currently not enabled, 
+If you want to translate the plugin into a language that is currently not enabled,
-[please create a new issue](https://github.com/carvelli/PalacePal/issues/new).
+[please create a new issue](https://git.carvel.li/liza/PalacePal/issues/new).