API 10

.dockerignore

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

.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

Dockerfile

@@ -1,14 +1,14 @@
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-preview 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 -a $TARGETARCH
+RUN dotnet restore Server/Server/Pal.Server.csproj -a $TARGETARCH
 
 COPY . ./
-RUN dotnet publish Pal.Server/Pal.Server.csproj -a $TARGETARCH --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-preview
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
 
 # fix later
 ENV DOTNET_ROLL_FORWARD=Major

Pal.Client/Commands/PalNearCommand.cs

@@ -1,7 +1,7 @@
 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;
@@ -12,11 +12,11 @@ namespace Pal.Client.Commands;
 internal sealed class PalNearCommand : ISubCommand
 {
     private readonly Chat _chat;
-    private readonly ClientState _clientState;
+    private readonly IClientState _clientState;
     private readonly TerritoryState _territoryState;
     private readonly FloorService _floorService;
 
-    public PalNearCommand(Chat chat, ClientState clientState, TerritoryState territoryState,
+    public PalNearCommand(Chat chat, IClientState clientState, TerritoryState territoryState,
         FloorService floorService)
     {
         _chat = chat;
@@ -50,7 +50,7 @@ internal sealed class PalNearCommand : ISubCommand
 
         var nearbyMarkers = state.Locations
             .Where(m => predicate(m))
-            .Where(m => m.RenderElement != null && m.RenderElement.Color != RenderData.ColorInvisible)
+            .Where(m => m.RenderElement != null && m.RenderElement.Enabled)
             .Select(m => new { m, distance = (playerPosition.Value - m.Position).Length() })
             .OrderBy(m => m.distance)
             .Take(5)

Pal.Client/Configuration/AccountConfigurationV7.cs

@@ -10,9 +10,6 @@ public sealed class AccountConfigurationV7 : IAccountConfiguration
 {
     private const int DefaultEntropyLength = 16;
 
-    private static readonly ILogger _logger =
-        DependencyInjectionContext.LoggerProvider.CreateLogger<AccountConfigurationV7>();
-
     [JsonConstructor]
     public AccountConfigurationV7()
     {
@@ -75,9 +72,8 @@ public sealed class AccountConfigurationV7 : IAccountConfiguration
                 byte[] guidBytes = ProtectedData.Unprotect(Convert.FromBase64String(EncryptedId), Entropy, DataProtectionScope.CurrentUser);
                 return new Guid(guidBytes);
             }
-            catch (Exception e)
+            catch (Exception)
             {
-                _logger.LogTrace(e, "Could not load account id {Id}", EncryptedId);
                 return null;
             }
         }

Pal.Client/Configuration/ConfigurationData.cs

@@ -7,15 +7,13 @@ namespace Pal.Client.Configuration;
 
 internal static class ConfigurationData
 {
-    private static readonly ILogger _logger =
-        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;
+
     public static bool SupportsDpapi
     {
         get
@@ -34,9 +32,8 @@ internal static class ConfigurationData
                 {
                     _supportsDpapi = false;
                 }
-
-                _logger.LogTrace("DPAPI support: {Supported}", _supportsDpapi);
             }
+
             return _supportsDpapi.Value;
         }
     }

Pal.Client/Configuration/ConfigurationManager.cs

@@ -18,12 +18,12 @@ namespace Pal.Client.Configuration;
 internal sealed class ConfigurationManager
 {
     private readonly ILogger<ConfigurationManager> _logger;
-    private readonly DalamudPluginInterface _pluginInterface;
+    private readonly IDalamudPluginInterface _pluginInterface;
     private readonly IServiceProvider _serviceProvider;
 
     public event EventHandler<IPalacePalConfiguration>? Saved;
 
-    public ConfigurationManager(ILogger<ConfigurationManager> logger, DalamudPluginInterface pluginInterface,
+    public ConfigurationManager(ILogger<ConfigurationManager> logger, IDalamudPluginInterface pluginInterface,
         IServiceProvider serviceProvider)
     {
         _logger = logger;

Pal.Client/Configuration/Legacy/ConfigurationV1.cs

@@ -50,7 +50,7 @@ public sealed class ConfigurationV1
     public string BetaKey { get; set; } = "";
     #endregion
 
-    public void Migrate(DalamudPluginInterface pluginInterface, ILogger<ConfigurationV1> logger)
+    public void Migrate(IDalamudPluginInterface pluginInterface, ILogger<ConfigurationV1> logger)
     {
         if (Version == 1)
         {
@@ -137,7 +137,7 @@ public sealed class ConfigurationV1
         }
     }
 
-    public void Save(DalamudPluginInterface pluginInterface)
+    public void Save(IDalamudPluginInterface pluginInterface)
     {
         File.WriteAllText(pluginInterface.ConfigFile.FullName, JsonConvert.SerializeObject(this, Formatting.Indented, new JsonSerializerSettings
         {

Pal.Client/Configuration/Legacy/JsonMigration.cs

@@ -21,10 +21,10 @@ internal sealed class JsonMigration
 {
     private readonly ILogger<JsonMigration> _logger;
     private readonly IServiceScopeFactory _serviceScopeFactory;
-    private readonly DalamudPluginInterface _pluginInterface;
+    private readonly IDalamudPluginInterface _pluginInterface;
 
     public JsonMigration(ILogger<JsonMigration> logger, IServiceScopeFactory serviceScopeFactory,
-        DalamudPluginInterface pluginInterface)
+        IDalamudPluginInterface pluginInterface)
     {
         _logger = logger;
         _serviceScopeFactory = serviceScopeFactory;

Pal.Client/DependencyContextInitializer.cs

@@ -84,7 +84,7 @@ internal sealed class DependencyContextInitializer
     private async Task RemoveOldBackups()
     {
         await using var scope = _serviceProvider.CreateAsyncScope();
-        var pluginInterface = scope.ServiceProvider.GetRequiredService<DalamudPluginInterface>();
+        var pluginInterface = scope.ServiceProvider.GetRequiredService<IDalamudPluginInterface>();
         var configuration = scope.ServiceProvider.GetRequiredService<IPalacePalConfiguration>();
 
         var paths = Directory.GetFiles(pluginInterface.GetPluginConfigDirectory(), "backup-*.data.sqlite3",
@@ -136,7 +136,7 @@ internal sealed class DependencyContextInitializer
     {
         await using var scope = _serviceProvider.CreateAsyncScope();
 
-        var pluginInterface = scope.ServiceProvider.GetRequiredService<DalamudPluginInterface>();
+        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(),

Pal.Client/DependencyInjection/Chat.cs

@@ -1,15 +1,16 @@
-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;
 
 internal sealed class Chat
 {
-    private readonly ChatGui _chatGui;
+    private readonly IChatGui _chatGui;
 
-    public Chat(ChatGui chatGui)
+    public Chat(IChatGui chatGui)
     {
         _chatGui = chatGui;
     }

Pal.Client/DependencyInjection/ChatService.cs

@@ -1,10 +1,9 @@
 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;
@@ -13,14 +12,14 @@ namespace Pal.Client.DependencyInjection;
 
 internal sealed class ChatService : IDisposable
 {
-    private readonly ChatGui _chatGui;
+    private readonly IChatGui _chatGui;
     private readonly TerritoryState _territoryState;
     private readonly IPalacePalConfiguration _configuration;
-    private readonly DataManager _dataManager;
+    private readonly IDataManager _dataManager;
     private readonly LocalizedChatMessages _localizedChatMessages;
 
-    public ChatService(ChatGui chatGui, TerritoryState territoryState, IPalacePalConfiguration configuration,
+    public ChatService(IChatGui chatGui, TerritoryState territoryState, IPalacePalConfiguration configuration,
-        DataManager dataManager)
+        IDataManager dataManager)
     {
         _chatGui = chatGui;
         _territoryState = territoryState;
@@ -35,7 +34,7 @@ internal sealed class ChatService : IDisposable
     public void Dispose()
         => _chatGui.ChatMessage -= OnChatMessage;
 
-    private void OnChatMessage(XivChatType type, uint senderId, ref SeString sender, ref SeString seMessage,
+    private void OnChatMessage(XivChatType type, int senderId, ref SeString sender, ref SeString seMessage,
         ref bool isHandled)
     {
         if (_configuration.FirstUse)

Pal.Client/DependencyInjection/GameHooks.cs

@@ -4,6 +4,7 @@ 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;
@@ -13,7 +14,7 @@ namespace Pal.Client.DependencyInjection;
 internal sealed unsafe class GameHooks : IDisposable
 {
     private readonly ILogger<GameHooks> _logger;
-    private readonly ObjectTable _objectTable;
+    private readonly IObjectTable _objectTable;
     private readonly TerritoryState _territoryState;
     private readonly FrameworkService _frameworkService;
 
@@ -24,7 +25,7 @@ internal sealed unsafe class GameHooks : IDisposable
     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;
@@ -32,7 +33,7 @@ internal sealed unsafe class GameHooks : IDisposable
         _frameworkService = frameworkService;
 
         _logger.LogDebug("Initializing game hooks");
-        SignatureHelper.Initialise(this);
+        gameInteropProvider.InitializeFromAttributes(this);
         ActorVfxCreateHook.Enable();
 
         _logger.LogDebug("Game hooks initialized");
@@ -80,7 +81,7 @@ internal sealed unsafe class GameHooks : IDisposable
                     _chat.PalPrint($"{vfxPath} on {obj}");
                 */
 
-                if (obj is BattleChara bc && (bc.NameId == /* potd */ 5042 || bc.NameId == /* hoh */ 7395))
+                if (obj is IBattleChara bc && (bc.NameId == /* potd */ 5042 || bc.NameId == /* hoh */ 7395))
                 {
                     if (vfxPath == "vfx/common/eff/dk05th_stdn0t.avfx" || vfxPath == "vfx/common/eff/dk05ht_ipws0t.avfx")
                     {

Pal.Client/DependencyInjection/RepoVerification.cs

@@ -10,7 +10,7 @@ namespace Pal.Client.DependencyInjection;
 
 internal sealed class RepoVerification
 {
-    public RepoVerification(ILogger<RepoVerification> logger, DalamudPluginInterface pluginInterface, Chat chat)
+    public RepoVerification(ILogger<RepoVerification> logger, IDalamudPluginInterface pluginInterface, Chat chat)
     {
         logger.LogInformation("Install source: {Repo}", pluginInterface.SourceRepository);
         if (!pluginInterface.IsDev && pluginInterface.SourceRepository.TrimEnd('/') != "https://plugins.carvel.li")

Pal.Client/DependencyInjectionContext.cs

@@ -10,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;
@@ -33,29 +34,32 @@ namespace Pal.Client;
 internal sealed class DependencyInjectionContext : IDisposable
 {
     public const string DatabaseFileName = "palace-pal.data.sqlite3";
-    public static DalamudLoggerProvider LoggerProvider { get; } = new(typeof(Plugin).Assembly);
 
     /// <summary>
     /// 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 ILogger _logger;
 
     private readonly string _sqliteConnectionString;
     private readonly ServiceCollection _serviceCollection = new();
     private ServiceProvider? _serviceProvider;
 
     public DependencyInjectionContext(
-        DalamudPluginInterface pluginInterface,
+        IDalamudPluginInterface pluginInterface,
-        ClientState clientState,
+        IClientState clientState,
-        GameGui gameGui,
+        IGameGui gameGui,
-        ChatGui chatGui,
+        IChatGui chatGui,
-        ObjectTable objectTable,
+        IObjectTable objectTable,
-        Framework framework,
+        IFramework framework,
-        Condition condition,
+        ICondition condition,
-        CommandManager commandManager,
+        ICommandManager commandManager,
-        DataManager dataManager,
+        IDataManager dataManager,
+        IGameInteropProvider gameInteropProvider,
+        IPluginLog pluginLog,
         Plugin plugin)
     {
+        var loggerProvider = new DalamudLoggerProvider(pluginLog);
+        _logger = loggerProvider.CreateLogger<DependencyInjectionContext>();
         _logger.LogInformation("Building dalamud service container for {Assembly}",
             typeof(DependencyInjectionContext).Assembly.FullName);
 
@@ -70,7 +74,7 @@ internal sealed class DependencyInjectionContext : IDisposable
                 .AddFilter("Microsoft.EntityFrameworkCore.Database", LogLevel.Warning)
                 .AddFilter("Grpc", LogLevel.Debug)
                 .ClearProviders()
-                .AddDalamudLogger(plugin));
+                .AddDalamudLogger(pluginLog));
 
         // dalamud
         _serviceCollection.AddSingleton<IDalamudPlugin>(plugin);
@@ -84,6 +88,7 @@ internal sealed class DependencyInjectionContext : IDisposable
         _serviceCollection.AddSingleton(condition);
         _serviceCollection.AddSingleton(commandManager);
         _serviceCollection.AddSingleton(dataManager);
+        _serviceCollection.AddSingleton(gameInteropProvider);
         _serviceCollection.AddSingleton(new WindowSystem(typeof(DependencyInjectionContext).AssemblyQualifiedName));
 
         _sqliteConnectionString =

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;
@@ -24,15 +22,15 @@ internal sealed class FrameworkService : IDisposable
 {
     private readonly IServiceProvider _serviceProvider;
     private readonly ILogger<FrameworkService> _logger;
-    private readonly Framework _framework;
+    private readonly IFramework _framework;
     private readonly ConfigurationManager _configurationManager;
     private readonly IPalacePalConfiguration _configuration;
-    private readonly ClientState _clientState;
+    private readonly IClientState _clientState;
     private readonly TerritoryState _territoryState;
     private readonly FloorService _floorService;
     private readonly DebugState _debugState;
     private readonly RenderAdapter _renderAdapter;
-    private readonly ObjectTable _objectTable;
+    private readonly IObjectTable _objectTable;
     private readonly RemoteApi _remoteApi;
 
     internal Queue<IQueueOnFrameworkThread> EarlyEventQueue { get; } = new();
@@ -42,15 +40,15 @@ internal sealed class FrameworkService : IDisposable
     public FrameworkService(
         IServiceProvider serviceProvider,
         ILogger<FrameworkService> logger,
-        Framework framework,
+        IFramework framework,
         ConfigurationManager configurationManager,
         IPalacePalConfiguration configuration,
-        ClientState clientState,
+        IClientState clientState,
         TerritoryState territoryState,
         FloorService floorService,
         DebugState debugState,
         RenderAdapter renderAdapter,
-        ObjectTable objectTable,
+        IObjectTable objectTable,
         RemoteApi remoteApi)
     {
         _serviceProvider = serviceProvider;
@@ -79,7 +77,7 @@ internal sealed class FrameworkService : IDisposable
     private void OnSaved(object? sender, IPalacePalConfiguration? config)
         => EarlyEventQueue.Enqueue(new QueuedConfigUpdate());
 
-    private void OnUpdate(Framework framework)
+    private void OnUpdate(IFramework framework)
     {
         if (_configuration.FirstUse)
             return;
@@ -177,12 +175,20 @@ internal sealed class FrameworkService : IDisposable
             {
                 foreach (var location in memoryTerritory.Locations)
                 {
-                    uint desiredColor = DetermineColor(location, visibleLocations);
+                    bool isEnabled = DetermineVisibility(location, visibleLocations);
-                    if (location.RenderElement == null || !location.RenderElement.IsValid)
+                    if (location.RenderElement == null)
+                    {
+                        if (isEnabled)
+                            return true;
+                        else
+                            continue;
+                    }
+
+                    if (!location.RenderElement.IsValid)
                         return true;
 
-                    if (location.RenderElement.Color != desiredColor)
+                    if (location.RenderElement.Enabled != isEnabled)
-                        location.RenderElement.Color = desiredColor;
+                        location.RenderElement.Enabled = isEnabled;
                 }
             }
             catch (Exception e)
@@ -227,12 +233,12 @@ internal sealed class FrameworkService : IDisposable
         {
             if (location.Type == MemoryLocation.EType.Trap)
             {
-                CreateRenderElement(location, elements, DetermineColor(location, visibleMarkers),
+                CreateRenderElement(location, elements, DetermineVisibility(location, visibleMarkers),
                     _configuration.DeepDungeons.Traps);
             }
             else if (location.Type == MemoryLocation.EType.Hoard)
             {
-                CreateRenderElement(location, elements, DetermineColor(location, visibleMarkers),
+                CreateRenderElement(location, elements, DetermineVisibility(location, visibleMarkers),
                     _configuration.DeepDungeons.HoardCoffers);
             }
         }
@@ -253,14 +259,12 @@ internal sealed class FrameworkService : IDisposable
             if (location.Type == MemoryLocation.EType.SilverCoffer &&
                 _configuration.DeepDungeons.SilverCoffers.Show)
             {
-                CreateRenderElement(location, elements, DetermineColor(location),
+                CreateRenderElement(location, elements, true, _configuration.DeepDungeons.SilverCoffers);
-                    _configuration.DeepDungeons.SilverCoffers);
             }
             else if (location.Type == MemoryLocation.EType.GoldCoffer &&
                      _configuration.DeepDungeons.GoldCoffers.Show)
             {
-                CreateRenderElement(location, elements, DetermineColor(location),
+                CreateRenderElement(location, elements, true, _configuration.DeepDungeons.GoldCoffers);
-                    _configuration.DeepDungeons.GoldCoffers);
             }
         }
 
@@ -270,7 +274,7 @@ internal sealed class FrameworkService : IDisposable
         _renderAdapter.SetLayer(ELayer.RegularCoffers, elements);
     }
 
-    private uint DetermineColor(PersistentLocation location, IReadOnlyList<PersistentLocation> visibleLocations)
+    private bool DetermineVisibility(PersistentLocation location, IReadOnlyList<PersistentLocation> visibleLocations)
     {
         switch (location.Type)
         {
@@ -278,34 +282,28 @@ internal sealed class FrameworkService : IDisposable
                 when _territoryState.PomanderOfSight == PomanderState.Inactive ||
                      !_configuration.DeepDungeons.Traps.OnlyVisibleAfterPomander ||
                      visibleLocations.Any(x => x == location):
-                return _configuration.DeepDungeons.Traps.Color;
+                return true;
             case MemoryLocation.EType.Hoard
                 when _territoryState.PomanderOfIntuition == PomanderState.Inactive ||
                      !_configuration.DeepDungeons.HoardCoffers.OnlyVisibleAfterPomander ||
                      visibleLocations.Any(x => x == location):
-                return _configuration.DeepDungeons.HoardCoffers.Color;
+                return true;
             default:
-                return RenderData.ColorInvisible;
+                return false;
         }
     }
 
-    private uint DetermineColor(EphemeralLocation location)
+    private void CreateRenderElement(MemoryLocation location, List<IRenderElement> elements, bool enabled,
-    {
-        return location.Type switch
-        {
-            MemoryLocation.EType.SilverCoffer => _configuration.DeepDungeons.SilverCoffers.Color,
-            MemoryLocation.EType.GoldCoffer => _configuration.DeepDungeons.GoldCoffers.Color,
-            _ => RenderData.ColorInvisible
-        };
-    }
-
-    private void CreateRenderElement(MemoryLocation location, List<IRenderElement> elements, uint color,
         MarkerConfiguration config)
     {
         if (!config.Show)
+        {
+            location.RenderElement = null;
             return;
+        }
 
-        var element = _renderAdapter.CreateElement(location.Type, location.Position, color, config.Fill);
+        var element =
+            _renderAdapter.CreateElement(location.Type, location.Position, enabled, config.Color, config.Fill);
         location.RenderElement = element;
         elements.Add(element);
     }
@@ -385,7 +383,7 @@ internal sealed class FrameworkService : IDisposable
         List<EphemeralLocation> ephemeralLocations = new();
         for (int i = 246; i < _objectTable.Length; i++)
         {
-            GameObject? obj = _objectTable[i];
+            IGameObject? obj = _objectTable[i];
             if (obj == null)
                 continue;
 
@@ -449,7 +447,6 @@ internal sealed class FrameworkService : IDisposable
                     Position = obj.Position,
                     Seen = true,
                     Source = ClientLocation.ESource.ExplodedLocally,
-
                 });
             }
         }

Pal.Client/Floors/ObjectTableDebug.cs

@@ -1,12 +1,10 @@
 using System;
 using System.Numerics;
 using System.Runtime.InteropServices;
-using Dalamud.Game.ClientState;
-using Dalamud.Game.ClientState.Objects;
 using Dalamud.Game.ClientState.Objects.SubKinds;
 using Dalamud.Game.ClientState.Objects.Types;
-using Dalamud.Game.Gui;
 using Dalamud.Plugin;
+using Dalamud.Plugin.Services;
 using ImGuiNET;
 
 namespace Pal.Client.Floors;
@@ -20,12 +18,13 @@ internal sealed class ObjectTableDebug : IDisposable
 {
     public const string FeatureName = nameof(ObjectTableDebug);
 
-    private readonly DalamudPluginInterface _pluginInterface;
+    private readonly IDalamudPluginInterface _pluginInterface;
-    private readonly ObjectTable _objectTable;
+    private readonly IObjectTable _objectTable;
-    private readonly GameGui _gameGui;
+    private readonly IGameGui _gameGui;
-    private readonly ClientState _clientState;
+    private readonly IClientState _clientState;
 
-    public ObjectTableDebug(DalamudPluginInterface pluginInterface, ObjectTable objectTable, GameGui gameGui, ClientState clientState)
+    public ObjectTableDebug(IDalamudPluginInterface pluginInterface, IObjectTable objectTable, IGameGui gameGui,
+        IClientState clientState)
     {
         _pluginInterface = pluginInterface;
         _objectTable = objectTable;
@@ -38,9 +37,9 @@ internal sealed class ObjectTableDebug : IDisposable
     private void Draw()
     {
         int index = 0;
-        foreach (GameObject obj in _objectTable)
+        foreach (IGameObject obj in _objectTable)
         {
-            if (obj is EventObj eventObj && string.IsNullOrEmpty(eventObj.Name.ToString()))
+            if (obj is IEventObj eventObj && string.IsNullOrEmpty(eventObj.Name.ToString()))
             {
                 ++index;
                 int model = Marshal.ReadInt32(obj.Address + 128);
@@ -52,7 +51,7 @@ internal sealed class ObjectTableDebug : IDisposable
                     // produce a new viewport, and skip rendering it if so
                     float distance = DistanceToPlayer(obj.Position);
                     var objectText =
-                        $"{obj.Address.ToInt64():X}:{obj.ObjectId:X}[{index}]\nkind: {obj.ObjectKind} sub: {obj.SubKind}\nmodel: {model}\nname: {obj.Name}\ndata id: {obj.DataId}";
+                        $"{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;

Pal.Client/Floors/Tasks/DbTask.cs

@@ -24,14 +24,20 @@ internal abstract class DbTask<T>
             {
                 using var scope = _serviceScopeFactory.CreateScope();
                 ILogger<T> logger = scope.ServiceProvider.GetRequiredService<ILogger<T>>();
-                using var dbContext = scope.ServiceProvider.GetRequiredService<PalClientContext>();
+                try
+                {
+                    using var dbContext = scope.ServiceProvider.GetRequiredService<PalClientContext>();
 
-                Run(dbContext, logger);
+                    Run(dbContext, logger);
+                }
+                catch (Exception e)
+                {
+                    logger.LogError(e, "Failed to run DbTask");
+                }
             }
-            catch (Exception e)
+            catch (Exception)
             {
-                DependencyInjectionContext.LoggerProvider.CreateLogger<DbTask<T>>()
+                // nothing we can do here but catch it, if we don't we crash the game
-                    .LogError(e, "Failed to run DbTask");
             }
         });
     }

Pal.Client/Floors/Tasks/MarkLocalSeen.cs

@@ -24,7 +24,8 @@ internal sealed class MarkLocalSeen : DbTask<MarkLocalSeen>
     {
         lock (_territory.LockObj)
         {
-            logger.LogInformation("Marking {Count} locations as seen locally in territory {Territory}", _locations.Count,
+            logger.LogInformation("Marking {Count} locations as seen locally in territory {Territory}",
+                _locations.Count,
                 _territory.TerritoryType);
             List<int> localIds = _locations.Select(l => l.LocalId).Where(x => x != null).Cast<int>().ToList();
             dbContext.Locations

Pal.Client/Floors/TerritoryState.cs

@@ -1,15 +1,15 @@
-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;
 
 public sealed class TerritoryState
 {
-    private readonly ClientState _clientState;
+    private readonly IClientState _clientState;
-    private readonly Condition _condition;
+    private readonly ICondition _condition;
 
-    public TerritoryState(ClientState clientState, Condition condition)
+    public TerritoryState(IClientState clientState, ICondition condition)
     {
         _clientState = clientState;
         _condition = condition;
@@ -23,7 +23,6 @@ public sealed class TerritoryState
         _clientState.IsLoggedIn
         && _condition[ConditionFlag.InDeepDungeon]
         && typeof(ETerritoryType).IsEnumDefined(_clientState.TerritoryType);
-
 }
 
 public enum PomanderState

Pal.Client/Net/JwtClaims.cs

@@ -40,7 +40,8 @@ internal sealed class JwtClaims
             payload += "=";
 
         string content = Encoding.UTF8.GetString(Convert.FromBase64String(payload));
-        return JsonSerializer.Deserialize<JwtClaims>(content) ?? throw new InvalidOperationException("token deserialization returned null");
+        return JsonSerializer.Deserialize<JwtClaims>(content) ??
+               throw new InvalidOperationException("token deserialization returned null");
     }
 }
 
@@ -73,5 +74,6 @@ internal sealed class JwtRoleConverter : JsonConverter<List<string>>
             throw new JsonException("bad token type");
     }
 
-    public override void Write(Utf8JsonWriter writer, List<string> value, JsonSerializerOptions options) => throw new NotImplementedException();
+    public override void Write(Utf8JsonWriter writer, List<string> value, JsonSerializerOptions options) =>
+        throw new NotImplementedException();
 }

Pal.Client/Net/JwtDateConverter.cs

@@ -16,5 +16,6 @@ public sealed class JwtDateConverter : JsonConverter<DateTimeOffset>
         return Zero.AddSeconds(reader.GetInt64());
     }
 
-    public override void Write(Utf8JsonWriter writer, DateTimeOffset value, JsonSerializerOptions options) => throw new NotImplementedException();
+    public override void Write(Utf8JsonWriter writer, DateTimeOffset value, JsonSerializerOptions options) =>
+        throw new NotImplementedException();
 }

Pal.Client/Net/RemoteApi.AccountService.cs

@@ -11,11 +11,13 @@ using Microsoft.Extensions.Logging;
 using Pal.Client.Configuration;
 using Pal.Client.Extensions;
 using Pal.Client.Properties;
+using Version = System.Version;
 
 namespace Pal.Client.Net;
 
 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,
@@ -73,7 +75,14 @@ internal partial class RemoteApi
             if (configuredAccount == null)
             {
                 _logger.LogInformation("No account information saved for {Url}, creating new account", RemoteUrl);
-                var createAccountReply = await accountClient.CreateAccountAsync(new CreateAccountRequest(),
+                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)
@@ -115,7 +124,15 @@ internal partial class RemoteApi
                 _logger.LogInformation("Logging in with account id {AccountId}",
                     configuredAccount.AccountId.ToPartialId());
                 LoginReply loginReply = await accountClient.LoginAsync(
-                    new LoginRequest { AccountId = configuredAccount.AccountId.ToString() },
+                    new LoginRequest
+                    {
+                        AccountId = configuredAccount.AccountId.ToString(),
+                        Version = new()
+                        {
+                            Major = PluginVersion.Major,
+                            Minor = PluginVersion.Minor,
+                        },
+                    },
                     headers: UnauthorizedHeaders(), deadline: DateTime.UtcNow.AddSeconds(10),
                     cancellationToken: cancellationToken);
 

Pal.Client/Net/RemoteApi.ExportService.cs

@@ -14,9 +14,10 @@ internal partial class RemoteApi
 
         var exportClient = new ExportService.ExportServiceClient(_channel);
         var exportReply = await exportClient.ExportAsync(new ExportRequest
-        {
+            {
-            ServerUrl = RemoteUrl,
+                ServerUrl = RemoteUrl,
-        }, headers: AuthorizedHeaders(), deadline: DateTime.UtcNow.AddSeconds(120), cancellationToken: cancellationToken);
+            }, headers: AuthorizedHeaders(), deadline: DateTime.UtcNow.AddSeconds(120),
+            cancellationToken: cancellationToken);
         return (exportReply.Success, exportReply.Data);
     }
 }

Pal.Client/Net/RemoteApi.PalaceService.cs

@@ -12,17 +12,21 @@ namespace Pal.Client.Net;
 
 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);
+        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)
+    public async Task<(bool, List<PersistentLocation>)> UploadLocations(ushort territoryType,
+        IReadOnlyList<PersistentLocation> locations, CancellationToken cancellationToken = default)
     {
         if (locations.Count == 0)
             return (true, new());
@@ -42,11 +46,13 @@ internal partial class RemoteApi
             Y = m.Position.Y,
             Z = m.Position.Z
         }));
-        var uploadReply = await palaceClient.UploadFloorsAsync(uploadRequest, headers: AuthorizedHeaders(), cancellationToken: cancellationToken);
+        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)
+    public async Task<bool> MarkAsSeen(ushort territoryType, IReadOnlyList<PersistentLocation> locations,
+        CancellationToken cancellationToken = default)
     {
         if (locations.Count == 0)
             return true;
@@ -59,7 +65,8 @@ internal partial class RemoteApi
         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);
+        var seenReply = await palaceClient.MarkObjectsSeenAsync(seenRequest, headers: AuthorizedHeaders(),
+            deadline: DateTime.UtcNow.AddSeconds(10), cancellationToken: cancellationToken);
         return seenReply.Success;
     }
 
@@ -80,7 +87,9 @@ internal partial class RemoteApi
             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);
+        var statisticsReply = await palaceClient.FetchStatisticsAsync(new StatisticsRequest(),
+            headers: AuthorizedHeaders(), deadline: DateTime.UtcNow.AddSeconds(30),
+            cancellationToken: cancellationToken);
         return (statisticsReply.Success, statisticsReply.FloorStatistics.ToList());
     }
 }

Pal.Client/Pal.Client.csproj

@@ -1,107 +1,54 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Dalamud.NET.Sdk/9.0.2">
-
     <PropertyGroup>
-        <TargetFramework>net7.0-windows</TargetFramework>
+        <Version>6.0</Version>
-        <LangVersion>11.0</LangVersion>
-        <Nullable>enable</Nullable>
-        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
-        <PlatformTarget>x64</PlatformTarget>
         <AssemblyName>Palace Pal</AssemblyName>
-        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+        <PlatformTarget>x64</PlatformTarget>
-        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-        <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>
-        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     </PropertyGroup>
 
+    <Import Project="..\vendor\LLib\LLib.targets"/>
+    <Import Project="..\vendor\LLib\RenameZip.targets"/>
+
     <PropertyGroup Condition="'$(Configuration)' == 'Release'">
         <OutputPath>dist</OutputPath>
     </PropertyGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Release' And Exists('Certificate.pfx')">
-        <None Remove="Certificate.pfx" />
+        <None Remove="Certificate.pfx"/>
     </ItemGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Release' And Exists('Certificate.pfx')">
-        <EmbeddedResource Include="Certificate.pfx" />
+        <EmbeddedResource Include="Certificate.pfx"/>
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="DalamudPackager" Version="2.1.11" />
+        <PackageReference Include="Dalamud.Extensions.MicrosoftLogging" Version="4.0.1"/>
-        <PackageReference Include="Dalamud.Extensions.MicrosoftLogging" Version="1.0.0" />
+        <PackageReference Include="Google.Protobuf" Version="3.27.2" />
-        <PackageReference Include="Google.Protobuf" Version="3.22.1" />
+        <PackageReference Include="Grpc.Net.Client" Version="2.63.0"/>
-        <PackageReference Include="Grpc.Net.Client" Version="2.52.0" />
+        <PackageReference Include="Grpc.Tools" Version="2.64.0">
-        <PackageReference Include="GitInfo" Version="2.3.0">
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
-        <PackageReference Include="Grpc.Tools" Version="2.53.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.4" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.6" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.4">
+        <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="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0"/>
-        <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="7.0.1" />
+        <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0"/>
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Pal.Common\Pal.Common.csproj" />
+        <ProjectReference Include="..\Pal.Common\Pal.Common.csproj"/>
-        <ProjectReference Include="..\vendor\ECommons\ECommons\ECommons.csproj" />
+        <ProjectReference Include="..\vendor\ECommons\ECommons\ECommons.csproj"/>
+        <ProjectReference Include="..\vendor\LLib\LLib.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-        <Protobuf Include="..\Pal.Common\Protos\account.proto" Link="Protos\account.proto" GrpcServices="Client" Access="Internal" />
+        <Protobuf Include="..\Pal.Common\Protos\account.proto" Link="Protos\account.proto" GrpcServices="Client" Access="Internal"/>
-        <Protobuf Include="..\Pal.Common\Protos\palace.proto" Link="Protos\palace.proto" GrpcServices="Client" Access="Internal" />
+        <Protobuf Include="..\Pal.Common\Protos\palace.proto" Link="Protos\palace.proto" GrpcServices="Client" Access="Internal"/>
-        <Protobuf Include="..\Pal.Common\Protos\export.proto" Link="Protos\export.proto" GrpcServices="Client" Access="Internal" />
+        <Protobuf Include="..\Pal.Common\Protos\export.proto" Link="Protos\export.proto" GrpcServices="Client" Access="Internal"/>
-    </ItemGroup>
-
-    <ItemGroup>
-        <!--You may need to adjust these paths yourself. These point to a Dalamud assembly in AppData.-->
-        <Reference Include="Dalamud">
-            <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>
@@ -116,18 +63,7 @@
         </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" />
+        <RemoveDir Directories="dist"/>
     </Target>
 </Project>

Pal.Client/Palace Pal.json

@@ -4,7 +4,7 @@
   "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://git.carvel.li/liza/PalacePal",
-  "IconUrl": "https://git.carvel.li/liza/plugin-repo/raw/branch/master/dist/Palace%20Pal.png",
+  "IconUrl": "https://plugins.carvel.li/icons/PalacePal.png",
   "Tags": [
     "potd",
     "palace",

Pal.Client/Plugin.cs

@@ -5,12 +5,11 @@ 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 Dalamud.Plugin;
+using Dalamud.Plugin.Services;
 using ECommons;
 using ECommons.DalamudServices;
 using Microsoft.Extensions.DependencyInjection;
@@ -32,33 +31,35 @@ internal sealed class Plugin : IDalamudPlugin
 {
     private readonly CancellationTokenSource _initCts = new();
 
-    private readonly DalamudPluginInterface _pluginInterface;
+    private readonly IDalamudPluginInterface _pluginInterface;
-    private readonly CommandManager _commandManager;
+    private readonly ICommandManager _commandManager;
-    private readonly ClientState _clientState;
+    private readonly IClientState _clientState;
-    private readonly ChatGui _chatGui;
+    private readonly IChatGui _chatGui;
-    private readonly Framework _framework;
+    private readonly IFramework _framework;
 
     private readonly TaskCompletionSource<IServiceScope> _rootScopeCompletionSource = new();
     private ELoadState _loadState = ELoadState.Initializing;
 
     private DependencyInjectionContext? _dependencyInjectionContext;
-    private ILogger _logger = DependencyInjectionContext.LoggerProvider.CreateLogger<Plugin>();
+    private ILogger _logger;
     private WindowSystem? _windowSystem;
     private IServiceScope? _rootScope;
     private Action? _loginAction;
 
     public Plugin(
-        DalamudPluginInterface pluginInterface,
+        IDalamudPluginInterface pluginInterface,
-        CommandManager commandManager,
+        ICommandManager commandManager,
-        ClientState clientState,
+        IClientState clientState,
-        ChatGui chatGui,
+        IChatGui chatGui,
-        Framework framework)
+        IFramework framework,
+        IPluginLog pluginLog)
     {
         _pluginInterface = pluginInterface;
         _commandManager = commandManager;
         _clientState = clientState;
         _chatGui = chatGui;
         _framework = framework;
+        _logger = new DalamudLoggerProvider(pluginLog).CreateLogger<Plugin>();
 
         // set up the current UI language before creating anything
         Localization.Culture = new CultureInfo(_pluginInterface.UiLanguage);
@@ -75,8 +76,6 @@ internal sealed class Plugin : IDalamudPlugin
         Task.Run(async () => await CreateDependencyContext());
     }
 
-    public string Name => Localization.Palace_Pal;
-
     private async Task CreateDependencyContext()
     {
         try
@@ -134,7 +133,7 @@ internal sealed class Plugin : IDalamudPlugin
             _loginAction = loginAction;
     }
 
-    private void Login(object? sender, EventArgs eventArgs)
+    private void Login()
     {
         _loginAction?.Invoke();
         _loginAction = null;

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/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/IRenderElement.cs

@@ -4,5 +4,5 @@ public interface IRenderElement
 {
     bool IsValid { get; }
 
-    uint Color { get; set; }
+    bool Enabled { get; set; }
 }

Pal.Client/Rendering/IRenderer.cs

@@ -13,7 +13,7 @@ internal interface IRenderer
 
     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);
 }

Pal.Client/Rendering/RenderAdapter.cs

@@ -60,8 +60,9 @@ internal sealed class RenderAdapter : IRenderer, IDisposable
     public void ResetLayer(ELayer layer)
         => _implementation.ResetLayer(layer);
 
-    public IRenderElement CreateElement(MemoryLocation.EType type, Vector3 pos, uint color, bool fill = false)
+    public IRenderElement CreateElement(MemoryLocation.EType type, Vector3 pos, bool enabled, uint color,
-        => _implementation.CreateElement(type, pos, color, fill);
+        bool fill = false)
+        => _implementation.CreateElement(type, pos, enabled, color, fill);
 
     public ERenderer GetConfigValue()
         => throw new NotImplementedException();

Pal.Client/Rendering/RenderData.cs

@@ -2,6 +2,5 @@
 
 internal static class RenderData
 {
-    public static readonly uint ColorInvisible = 0;
     public static readonly long TestLayerTimeout = 10_000;
 }

Pal.Client/Rendering/SimpleRenderer.cs

@@ -3,12 +3,10 @@ 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 Dalamud.Interface;
 using ImGuiNET;
 using Pal.Client.Configuration;
-using Pal.Client.DependencyInjection;
 using Pal.Client.Floors;
 
 namespace Pal.Client.Rendering;
@@ -24,13 +22,13 @@ internal sealed class SimpleRenderer : IRenderer, IDisposable
 {
     private const int SegmentCount = 20;
 
-    private readonly ClientState _clientState;
+    private readonly IClientState _clientState;
-    private readonly GameGui _gameGui;
+    private readonly IGameGui _gameGui;
     private readonly IPalacePalConfiguration _configuration;
     private readonly TerritoryState _territoryState;
     private readonly ConcurrentDictionary<ELayer, SimpleLayer> _layers = new();
 
-    public SimpleRenderer(ClientState clientState, GameGui gameGui, IPalacePalConfiguration configuration,
+    public SimpleRenderer(IClientState clientState, IGameGui gameGui, IPalacePalConfiguration configuration,
         TerritoryState territoryState)
     {
         _clientState = clientState;
@@ -54,13 +52,15 @@ internal sealed class SimpleRenderer : IRenderer, IDisposable
             l.Dispose();
     }
 
-    public IRenderElement CreateElement(MemoryLocation.EType type, Vector3 pos, uint color, bool fill = false)
+    public IRenderElement CreateElement(MemoryLocation.EType type, Vector3 pos, bool enabled, uint color,
+        bool fill = false)
     {
         var config = MarkerConfig.ForType(type);
         return new SimpleElement
         {
             Type = type,
             Position = pos + new Vector3(0, config.OffsetY, 0),
+            Enabled = enabled,
             Color = color,
             Radius = config.Radius,
             Fill = fill,
@@ -77,10 +77,12 @@ internal sealed class SimpleRenderer : IRenderer, IDisposable
                 (SimpleElement)CreateElement(
                     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
@@ -120,7 +122,7 @@ internal sealed class SimpleRenderer : IRenderer, IDisposable
 
     private void Draw(SimpleElement e)
     {
-        if (e.Color == RenderData.ColorInvisible)
+        if (!e.Enabled)
             return;
 
         switch (e.Type)
@@ -181,7 +183,7 @@ internal sealed class SimpleRenderer : IRenderer, IDisposable
         public required IReadOnlyList<SimpleElement> Elements { get; init; }
         public long ExpiresAt { get; init; } = long.MaxValue;
 
-        public bool IsValid(ClientState clientState) =>
+        public bool IsValid(IClientState clientState) =>
             TerritoryType == clientState.TerritoryType && ExpiresAt >= Environment.TickCount64;
 
         public void Dispose()
@@ -196,6 +198,7 @@ internal sealed class SimpleRenderer : IRenderer, IDisposable
         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

@@ -4,8 +4,8 @@ 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;
@@ -23,15 +23,15 @@ internal sealed class SplatoonRenderer : IRenderer, IDisposable
 
     private readonly ILogger<SplatoonRenderer> _logger;
     private readonly DebugState _debugState;
-    private readonly ClientState _clientState;
+    private readonly IClientState _clientState;
     private readonly Chat _chat;
 
     public SplatoonRenderer(
         ILogger<SplatoonRenderer> logger,
-        DalamudPluginInterface pluginInterface,
+        IDalamudPluginInterface pluginInterface,
         IDalamudPlugin dalamudPlugin,
         DebugState debugState,
-        ClientState clientState,
+        IClientState clientState,
         Chat chat)
     {
         _logger = logger;
@@ -80,7 +80,7 @@ internal sealed class SplatoonRenderer : IRenderer, IDisposable
     private string ToLayerName(ELayer layer)
         => $"PalacePal.{layer}";
 
-    public IRenderElement CreateElement(MemoryLocation.EType type, Vector3 pos, uint color, bool fill = false)
+    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)
@@ -96,6 +96,7 @@ internal sealed class SplatoonRenderer : IRenderer, IDisposable
             FillStep = 1,
             color = color,
             thicc = 2,
+            Enabled = enabled,
         };
         return new SplatoonElement(this, element);
     }
@@ -111,8 +112,8 @@ internal sealed class SplatoonRenderer : IRenderer, IDisposable
 
                 var elements = new List<IRenderElement>
                 {
-                    CreateElement(MemoryLocation.EType.Trap, pos.Value, trapColor),
+                    CreateElement(MemoryLocation.EType.Trap, pos.Value, true, trapColor),
-                    CreateElement(MemoryLocation.EType.Hoard, pos.Value, hoardColor),
+                    CreateElement(MemoryLocation.EType.Hoard, pos.Value, true, hoardColor),
                 };
 
                 if (!Splatoon.AddDynamicElements(ToLayerName(ELayer.Test),
@@ -186,10 +187,10 @@ internal sealed class SplatoonRenderer : IRenderer, IDisposable
 
         public bool IsValid => !_renderer.IsDisposed && Delegate.IsValid();
 
-        public uint Color
+        public bool Enabled
         {
-            get => Delegate.color;
+            get => Delegate.Enabled;
-            set => Delegate.color = value;
+            set => Delegate.Enabled = value;
         }
     }
 }

Pal.Client/Windows/AgreementWindow.cs

@@ -99,6 +99,6 @@ internal sealed class AgreementWindow : Window, IDisposable, ILanguageChanged
         ImGui.Separator();
 
         if (ImGui.Button(Localization.Agreement_ViewPluginAndServerSourceCode))
-            GenericHelpers.ShellStart("https://github.com/carvelli/PalPalace");
+            GenericHelpers.ShellStart("https://git.carvel.li/liza/PalacePal");
     }
 }

Pal.Client/Windows/ConfigWindow.cs

@@ -12,6 +12,8 @@ using ECommons;
 using Export;
 using Google.Protobuf;
 using ImGuiNET;
+using LLib;
+using LLib.ImGui;
 using Microsoft.Extensions.Logging;
 using Pal.Client.Configuration;
 using Pal.Client.Database;
@@ -25,7 +27,7 @@ using Pal.Client.Scheduled;
 
 namespace Pal.Client.Windows;
 
-internal sealed class ConfigWindow : Window, ILanguageChanged, IDisposable
+internal sealed class ConfigWindow : LWindow, ILanguageChanged, IDisposable
 {
     private const string WindowId = "###PalPalaceConfig";
 
@@ -97,6 +99,12 @@ internal sealed class ConfigWindow : Window, ILanguageChanged, IDisposable
         Position = new Vector2(300, 300);
         PositionCondition = ImGuiCond.FirstUseEver;
 
+        SizeConstraints = new WindowSizeConstraints
+        {
+            MinimumSize = new Vector2(300, 300),
+            MaximumSize = new Vector2(9999, 9999),
+        };
+
         _importDialog = new FileDialogManager
         { AddedWindowFlags = ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoDocking };
         _exportDialog = new FileDialogManager
@@ -284,11 +292,13 @@ internal sealed class ConfigWindow : Window, ILanguageChanged, IDisposable
             ImGui.TextWrapped(Localization.Config_ImportExplanation1);
             ImGui.TextWrapped(Localization.Config_ImportExplanation2);
             ImGui.TextWrapped(Localization.Config_ImportExplanation3);
+            /* FIXME
             ImGui.Separator();
             ImGui.TextWrapped(string.Format(Localization.Config_ImportDownloadLocation,
                 "https://github.com/carvelli/PalacePal/releases/"));
             if (ImGui.Button(Localization.Config_Import_VisitGitHub))
                 GenericHelpers.ShellStart("https://github.com/carvelli/PalacePal/releases/latest");
+            */
             ImGui.Separator();
             ImGui.Text(Localization.Config_SelectImportFile);
             ImGui.SameLine();

Pal.Client/packages.lock.json

@@ -1,280 +1,302 @@
 {
   "version": 1,
   "dependencies": {
-    "net7.0-windows7.0": {
+    "net8.0-windows7.0": {
       "Dalamud.Extensions.MicrosoftLogging": {
         "type": "Direct",
-        "requested": "[1.0.0, )",
+        "requested": "[4.0.1, )",
-        "resolved": "1.0.0",
+        "resolved": "4.0.1",
-        "contentHash": "nPjMrT9n9GJ+TYF1lyVhlvhmFyN4ajMX2ccclgyMc8MNpOGZwxrJ4VEtrUUk7UkuX2wAhtnNsjrcf5sER3/CbA==",
+        "contentHash": "fMEL2ajtF/30SBBku7vMyG0yye5eHN/A9fgT//1CEjUth/Wz2CYco5Ehye21T8KN1IuAPwoqJuu49rB71j+8ug==",
         "dependencies": {
-          "Microsoft.Extensions.Logging": "7.0.0"
+          "Microsoft.Extensions.Logging": "8.0.0"
         }
       },
       "DalamudPackager": {
         "type": "Direct",
-        "requested": "[2.1.11, )",
+        "requested": "[2.1.13, )",
-        "resolved": "2.1.11",
+        "resolved": "2.1.13",
-        "contentHash": "9qlAWoRRTiL/geAvuwR/g6Bcbrd/bJJgVnB/RurBiyKs6srsP0bvpoo8IK+Eg8EA6jWeM6/YJWs66w4FIAzqPw=="
+        "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ=="
       },
-      "GitInfo": {
+      "DotNet.ReproducibleBuilds": {
         "type": "Direct",
-        "requested": "[2.3.0, )",
+        "requested": "[1.1.1, )",
-        "resolved": "2.3.0",
+        "resolved": "1.1.1",
-        "contentHash": "LdnsKNdwQvdDvpPYQuoGjXML75dY7NybKRe+qlkPPQaTY4dE5Fy8VCrD8YBhXO0fH/5xnmvKeSq4yztzg5KY0Q=="
+        "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.22.1, )",
+        "requested": "[3.27.2, )",
-        "resolved": "3.22.1",
+        "resolved": "3.27.2",
-        "contentHash": "Ul4gVJWLya83Z8/n3+O4QKhD8ukCCwNLDyoWpUdJSnmzxRe8o3pWiuCzzvN2z/LVH60nozlKpTzhJo3ctI+G4Q=="
+        "contentHash": "0wdgA3LO9mBS477jieBFs4pU1sWhVtwv/P+i9nAEiFDQyUA7PPHDBbJL1CeqYtV18jLiq9og4n7wSVCO171OBg=="
       },
       "Grpc.Net.Client": {
         "type": "Direct",
-        "requested": "[2.52.0, )",
+        "requested": "[2.63.0, )",
-        "resolved": "2.52.0",
+        "resolved": "2.63.0",
-        "contentHash": "hWVH9g/Nnjz40ni//2S8UIOyEmhueQREoZIkD0zKHEPqLxXcNlbp4eebXIOicZtkwDSx0TFz9NpkbecEDn6rBw==",
+        "contentHash": "847zG24daOP1242OpbnjhbKtplH/EfV/76QReQA3cbS5SL78uIXsWMe9IN9JlIb4+kT3eE4fjMCXTn8BAQ91Ng==",
         "dependencies": {
-          "Grpc.Net.Common": "2.52.0",
+          "Grpc.Net.Common": "2.63.0",
-          "Microsoft.Extensions.Logging.Abstractions": "3.0.3"
+          "Microsoft.Extensions.Logging.Abstractions": "6.0.0"
         }
       },
       "Grpc.Tools": {
         "type": "Direct",
-        "requested": "[2.53.0, )",
+        "requested": "[2.64.0, )",
-        "resolved": "2.53.0",
+        "resolved": "2.64.0",
-        "contentHash": "vm8iRSAF/4PN9g555iYZwhCQptSE4cZ8xk5W1TQ+JcHwaHSrBhD+P6H4l0+SqqfzuX7sGpjjOMQJXHSyrERTgw=="
+        "contentHash": "W5RrhDFHUhioASktxfuDs5fTjWUxwegljZAig9zFL8nWNskeyQA6OXN2choWKYxGrljer25VqCJCMbWz7XHvqg=="
       },
       "Microsoft.EntityFrameworkCore.Sqlite": {
         "type": "Direct",
-        "requested": "[7.0.4, )",
+        "requested": "[8.0.6, )",
-        "resolved": "7.0.4",
+        "resolved": "8.0.6",
-        "contentHash": "d1cIR5upwzTZmzycqWEoxfso5b3qD0G43IeECtfeMSPoG8JD4OJHHtbun0wS9RzwAORMa/4Zb3vuogTYY3mtaQ==",
+        "contentHash": "nC4cZN4zReTb22qd9WDU0eDmlXvkyf2g2pqQ3VIHJbkpJcdWSY/PDgwGpbpShsVcAjXbkjGiUcv9aGwa61xQPw==",
         "dependencies": {
-          "Microsoft.EntityFrameworkCore.Sqlite.Core": "7.0.4",
+          "Microsoft.EntityFrameworkCore.Sqlite.Core": "8.0.6",
-          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4"
+          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.6"
-        }
-      },
-      "Microsoft.EntityFrameworkCore.Tools": {
-        "type": "Direct",
-        "requested": "[7.0.4, )",
-        "resolved": "7.0.4",
-        "contentHash": "58hDB+ENGisuSjJBl1RBHL9qzFJTukFSQFl/wCU8/3ApcOH/rPrRG4PWThiJTmfHRmh8H8HExdYbtkv7wa7BLg==",
-        "dependencies": {
-          "Microsoft.EntityFrameworkCore.Design": "7.0.4"
         }
       },
       "Microsoft.Extensions.Logging": {
         "type": "Direct",
-        "requested": "[7.0.0, )",
+        "requested": "[8.0.0, )",
-        "resolved": "7.0.0",
+        "resolved": "8.0.0",
-        "contentHash": "Nw2muoNrOG5U5qa2ZekXwudUn2BJcD41e65zwmDHb1fQegTX66UokLWZkJRpqSSHXDOWZ5V0iqhbxOEky91atA==",
+        "contentHash": "tvRkov9tAJ3xP51LCv3FJ2zINmv1P8Hi8lhhtcKGqM+ImiTCC84uOPEI4z8Cdq2C3o9e+Aa0Gw0rmrsJD77W+w==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection": "7.0.0",
+          "Microsoft.Extensions.DependencyInjection": "8.0.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "8.0.0",
-          "Microsoft.Extensions.Logging.Abstractions": "7.0.0",
+          "Microsoft.Extensions.Options": "8.0.0"
-          "Microsoft.Extensions.Options": "7.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": "[7.0.1, )",
+        "requested": "[8.0.0, )",
-        "resolved": "7.0.1",
+        "resolved": "8.0.0",
-        "contentHash": "3evI3sBfKqwYSwuBcYgShbmEgtXcg8N5Qu+jExLdkBXPty2yGDXq5m1/4sx9Exb8dqdeMPUs/d9DQ0wy/9Adwg=="
+        "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg=="
       },
       "Grpc.Core.Api": {
         "type": "Transitive",
-        "resolved": "2.52.0",
+        "resolved": "2.63.0",
-        "contentHash": "SQiPyBczG4vKPmI6Fd+O58GcxxDSFr6nfRAJuBDUNj+PgdokhjWJvZE/La1c09AkL2FVm/jrDloG89nkzmVF7A==",
+        "contentHash": "t3+/MF8AxIqKq5UmPB9EWAnM9C/+lXOB8TRFfeVMDntf6dekfJmjpKDebaT4t2bbuwVwwvthxxox9BuGr59kYA=="
-        "dependencies": {
-          "System.Memory": "4.5.3"
-        }
       },
       "Grpc.Net.Common": {
         "type": "Transitive",
-        "resolved": "2.52.0",
+        "resolved": "2.63.0",
-        "contentHash": "di9qzpdx525IxumZdYmu6sG2y/gXJyYeZ1ruFUzB9BJ1nj4kU1/dTAioNCMt1VLRvNVDqh8S8B1oBdKhHJ4xRg==",
+        "contentHash": "RLt6p31ZMsXRcHNeu1dQuIFLYZvnwP6LUzoDPlV3KoR4w9btmwrXIvz9Jbp1SOmxW7nXw9zShAeIt5LsqFAx5w==",
         "dependencies": {
-          "Grpc.Core.Api": "2.52.0"
+          "Grpc.Core.Api": "2.63.0"
         }
       },
-      "Humanizer.Core": {
+      "Microsoft.Build.Tasks.Git": {
         "type": "Transitive",
-        "resolved": "2.14.1",
+        "resolved": "8.0.0",
-        "contentHash": "lQKvtaTDOXnoVJ20ibTuSIOf2i0uO0MPbDhd1jm238I+U/2ZnRENj0cktKZhtchBMtCUSRQ5v4xBCUbKNmyVMw=="
+        "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
       },
       "Microsoft.Data.Sqlite.Core": {
         "type": "Transitive",
-        "resolved": "7.0.4",
+        "resolved": "8.0.6",
-        "contentHash": "AUBM1KZ7EvmkYhC/ECXL4cjx+q55DJ3lmSf0NwAyRNArubNPRdroGono5uN6aW7Kqp+IUZwEK0Ywd1Gh7FDM2A==",
+        "contentHash": "umhZ0ZF2RI81rGFTnYmCxI+Euj4Aqe/6Y4+8CxN9OVJNGDNIqB5laJ3wxQTU8zXCcm2k9F7FL+/6RVoOT4z1Fw==",
         "dependencies": {
-          "SQLitePCLRaw.core": "2.1.4"
+          "SQLitePCLRaw.core": "2.1.6"
         }
       },
       "Microsoft.EntityFrameworkCore": {
         "type": "Transitive",
-        "resolved": "7.0.4",
+        "resolved": "8.0.6",
-        "contentHash": "eNcsY3rft5ERJJcen80Jyg57EScjWZmvhwmFLYXmEOTdVqHG+wQZiMOXnO1b5RH3u2qTQq+Tpci7KGfLAG5Gtg==",
+        "contentHash": "Ms5e5QuBAjVIuQsGumeLvkgMiOpnj6wxPvwBIoe1NfTkseWK4NZYztnhgDlpkCPkrUmJEXLv69kl349Ours30Q==",
         "dependencies": {
-          "Microsoft.EntityFrameworkCore.Abstractions": "7.0.4",
+          "Microsoft.EntityFrameworkCore.Abstractions": "8.0.6",
-          "Microsoft.EntityFrameworkCore.Analyzers": "7.0.4",
+          "Microsoft.EntityFrameworkCore.Analyzers": "8.0.6",
-          "Microsoft.Extensions.Caching.Memory": "7.0.0",
+          "Microsoft.Extensions.Caching.Memory": "8.0.0",
-          "Microsoft.Extensions.DependencyInjection": "7.0.0",
+          "Microsoft.Extensions.Logging": "8.0.0"
-          "Microsoft.Extensions.Logging": "7.0.0"
         }
       },
       "Microsoft.EntityFrameworkCore.Abstractions": {
         "type": "Transitive",
-        "resolved": "7.0.4",
+        "resolved": "8.0.6",
-        "contentHash": "6GbYvs4L5oFpYpMzwF05kdDgvX09UmMX7MpDtDlGI5ymijFwquwv+yvdijbtodOuu0yLUpc4n71x6eBdJ8v1xQ=="
+        "contentHash": "X7wSSBNFRuN8j8M9HDYG7rPpEeyhY+PdJZR9rftmgvsZH0eK5+bZ3b3As8iO4rLEpjsBzDnrgSIY6q2F3HQatw=="
       },
       "Microsoft.EntityFrameworkCore.Analyzers": {
         "type": "Transitive",
-        "resolved": "7.0.4",
+        "resolved": "8.0.6",
-        "contentHash": "YRD4bViuaEPEsaBIL52DzXGzLCt3jYoE3wztYEW1QZYDl89hQ+ca0nvBO2mnMHmCXpU/2wlErrUyDp4x5B/3mg=="
+        "contentHash": "fDNtuQ4lAaPaCOlsrwUck/GvnF4QLeDpMmE1L5QtxZpMSmWfnL2/vk8sDL9OVTWcfprooI9V5MNpIx3/Tq5ehg=="
-      },
-      "Microsoft.EntityFrameworkCore.Design": {
-        "type": "Transitive",
-        "resolved": "7.0.4",
-        "contentHash": "LI/ML3w17ap5IUmEKOPVnGJYi/XSDJW3Rf42utNF0e1tidmKtSkjwoTqIKLt2hE+jQJrlzeaqu5YiqdoFWVuZw==",
-        "dependencies": {
-          "Humanizer.Core": "2.14.1",
-          "Microsoft.EntityFrameworkCore.Relational": "7.0.4",
-          "Microsoft.Extensions.DependencyModel": "7.0.0",
-          "Mono.TextTemplating": "2.2.1"
-        }
       },
       "Microsoft.EntityFrameworkCore.Relational": {
         "type": "Transitive",
-        "resolved": "7.0.4",
+        "resolved": "8.0.6",
-        "contentHash": "L41+VonK6L0IurFHopoe5yY+m3MD26OMocKLPPR/XKxnazzZUcGPz0IGJpVnwpZyKVPfEIAnD5vmm60meYr1NA==",
+        "contentHash": "chhfmLusCGLGvNYtvMji6KGQlduPDnJsStG/LjS8qJhFWJDDzTZpSr2LHowewcxMrMo/Axc6Jwe+WwSi/vlkTg==",
         "dependencies": {
-          "Microsoft.EntityFrameworkCore": "7.0.4",
+          "Microsoft.EntityFrameworkCore": "8.0.6",
-          "Microsoft.Extensions.Configuration.Abstractions": "7.0.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
         }
       },
       "Microsoft.EntityFrameworkCore.Sqlite.Core": {
         "type": "Transitive",
-        "resolved": "7.0.4",
+        "resolved": "8.0.6",
-        "contentHash": "FeuV57+U4A4DO018Jy5Wkv0uYNZhyFVUUdwyVYz8TMghsZAj+3i+fOeFtD/jAWWMzDOFOF7eMni3YqLA+ufu9Q==",
+        "contentHash": "87xfPtqSouxWWdynYZv/rubd0rOUeiN9+XeoMWQzpZm/5svH1TuvzFODGIY0zKuXS18NiOFyHl9N6///eaEs/Q==",
         "dependencies": {
-          "Microsoft.Data.Sqlite.Core": "7.0.4",
+          "Microsoft.Data.Sqlite.Core": "8.0.6",
-          "Microsoft.EntityFrameworkCore.Relational": "7.0.4",
+          "Microsoft.EntityFrameworkCore.Relational": "8.0.6",
-          "Microsoft.Extensions.DependencyModel": "7.0.0"
+          "Microsoft.Extensions.DependencyModel": "8.0.0"
         }
       },
       "Microsoft.Extensions.Caching.Abstractions": {
         "type": "Transitive",
-        "resolved": "7.0.0",
+        "resolved": "8.0.0",
-        "contentHash": "IeimUd0TNbhB4ded3AbgBLQv2SnsiVugDyGV1MvspQFVlA07nDC7Zul7kcwH5jWN3JiTcp/ySE83AIJo8yfKjg==",
+        "contentHash": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==",
         "dependencies": {
-          "Microsoft.Extensions.Primitives": "7.0.0"
+          "Microsoft.Extensions.Primitives": "8.0.0"
         }
       },
       "Microsoft.Extensions.Caching.Memory": {
         "type": "Transitive",
-        "resolved": "7.0.0",
+        "resolved": "8.0.0",
-        "contentHash": "xpidBs2KCE2gw1JrD0quHE72kvCaI3xFql5/Peb2GRtUuZX+dYPoK/NTdVMiM67Svym0M0Df9A3xyU0FbMQhHw==",
+        "contentHash": "7pqivmrZDzo1ADPkRwjy+8jtRKWRCPag9qPI+p7sgu7Q4QreWhcvbiWXsbhP+yY8XSiDvZpu2/LWdBv7PnmOpQ==",
         "dependencies": {
-          "Microsoft.Extensions.Caching.Abstractions": "7.0.0",
+          "Microsoft.Extensions.Caching.Abstractions": "8.0.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
-          "Microsoft.Extensions.Logging.Abstractions": "7.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "8.0.0",
-          "Microsoft.Extensions.Options": "7.0.0",
+          "Microsoft.Extensions.Options": "8.0.0",
-          "Microsoft.Extensions.Primitives": "7.0.0"
+          "Microsoft.Extensions.Primitives": "8.0.0"
         }
       },
       "Microsoft.Extensions.Configuration.Abstractions": {
         "type": "Transitive",
-        "resolved": "7.0.0",
+        "resolved": "8.0.0",
-        "contentHash": "f34u2eaqIjNO9YLHBz8rozVZ+TcFiFs0F3r7nUJd7FRkVSxk8u4OpoK226mi49MwexHOR2ibP9MFvRUaLilcQQ==",
+        "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==",
         "dependencies": {
-          "Microsoft.Extensions.Primitives": "7.0.0"
+          "Microsoft.Extensions.Primitives": "8.0.0"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
         "type": "Transitive",
-        "resolved": "7.0.0",
+        "resolved": "8.0.0",
-        "contentHash": "elNeOmkeX3eDVG6pYVeV82p29hr+UKDaBhrZyWvWLw/EVZSYEkZlQdkp0V39k/Xehs2Qa0mvoCvkVj3eQxNQ1Q==",
+        "contentHash": "V8S3bsm50ig6JSyrbcJJ8bW2b9QLGouz+G1miK3UTaOWmMtFwNNNzUf4AleyDWUmTrWMLNnFSLEQtxmxgNQnNQ==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0"
         }
       },
       "Microsoft.Extensions.DependencyInjection.Abstractions": {
         "type": "Transitive",
-        "resolved": "7.0.0",
+        "resolved": "8.0.0",
-        "contentHash": "h3j/QfmFN4S0w4C2A6X7arXij/M/OVw3uQHSOFxnND4DyAzO1F9eMX7Eti7lU/OkSthEE0WzRsfT/Dmx86jzCw=="
+        "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg=="
       },
       "Microsoft.Extensions.DependencyModel": {
         "type": "Transitive",
-        "resolved": "7.0.0",
+        "resolved": "8.0.0",
-        "contentHash": "oONNYd71J3LzkWc4fUHl3SvMfiQMYUCo/mDHDEu76hYYxdhdrPYv6fvGv9nnKVyhE9P0h20AU8RZB5OOWQcAXg==",
+        "contentHash": "NSmDw3K0ozNDgShSIpsZcbFIzBX4w28nDag+TfaQujkXGazBm+lid5onlWoCBy4VsLxqnnKjEBbGSJVWJMf43g==",
         "dependencies": {
-          "System.Text.Encodings.Web": "7.0.0",
+          "System.Text.Encodings.Web": "8.0.0",
-          "System.Text.Json": "7.0.0"
+          "System.Text.Json": "8.0.0"
         }
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "Transitive",
-        "resolved": "7.0.0",
+        "resolved": "8.0.0",
-        "contentHash": "kmn78+LPVMOWeITUjIlfxUPDsI0R6G0RkeAMBmQxAJ7vBJn4q2dTva7pWi65ceN5vPGjJ9q/Uae2WKgvfktJAw=="
+        "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0"
+        }
       },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
-        "resolved": "7.0.0",
+        "resolved": "8.0.0",
-        "contentHash": "lP1yBnTTU42cKpMozuafbvNtQ7QcBjr/CcK3bYOGEMH55Fjt+iecXjT6chR7vbgCMqy3PG3aNQSZgo/EuY/9qQ==",
+        "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
-          "Microsoft.Extensions.Primitives": "7.0.0"
+          "Microsoft.Extensions.Primitives": "8.0.0"
         }
       },
       "Microsoft.Extensions.Primitives": {
         "type": "Transitive",
-        "resolved": "7.0.0",
+        "resolved": "8.0.0",
-        "contentHash": "um1KU5kxcRp3CNuI8o/GrZtD4AIOXDk+RLsytjZ9QPok3ttLUelLKpilVPuaFT3TFjOhSibUAso0odbOaCDj3Q=="
+        "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g=="
       },
-      "Mono.TextTemplating": {
+      "Microsoft.SourceLink.AzureRepos.Git": {
         "type": "Transitive",
-        "resolved": "2.2.1",
+        "resolved": "1.1.1",
-        "contentHash": "KZYeKBET/2Z0gY1WlTAK7+RHTl7GSbtvTLDXEZZojUdAPqpQNDL6tHv7VUpqfX5VEOh+uRGKaZXkuD253nEOBQ==",
+        "contentHash": "qB5urvw9LO2bG3eVAkuL+2ughxz2rR7aYgm2iyrB8Rlk9cp2ndvGRCvehk3rNIhRuNtQaeKwctOl1KvWiklv5w==",
         "dependencies": {
-          "System.CodeDom": "4.4.0"
+          "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.4",
+        "resolved": "2.1.6",
-        "contentHash": "EWI1olKDjFEBMJu0+3wuxwziIAdWDVMYLhuZ3Qs84rrz+DHwD00RzWPZCa+bLnHCf3oJwuFZIRsHT5p236QXww==",
+        "contentHash": "BmAf6XWt4TqtowmiWe4/5rRot6GerAeklmOPfviOvwLoF5WwgxcJHAxZtySuyW9r9w+HLILnm8VfJFLCUJYW8A==",
         "dependencies": {
-          "SQLitePCLRaw.lib.e_sqlite3": "2.1.4",
+          "SQLitePCLRaw.lib.e_sqlite3": "2.1.6",
-          "SQLitePCLRaw.provider.e_sqlite3": "2.1.4"
+          "SQLitePCLRaw.provider.e_sqlite3": "2.1.6"
         }
       },
       "SQLitePCLRaw.core": {
         "type": "Transitive",
-        "resolved": "2.1.4",
+        "resolved": "2.1.6",
-        "contentHash": "inBjvSHo9UDKneGNzfUfDjK08JzlcIhn1+SP5Y3m6cgXpCxXKCJDy6Mka7LpgSV+UZmKSnC8rTwB0SQ0xKu5pA==",
+        "contentHash": "wO6v9GeMx9CUngAet8hbO7xdm+M42p1XeJq47ogyRoYSvNSp0NGLI+MgC0bhrMk9C17MTVFlLiN6ylyExLCc5w==",
         "dependencies": {
           "System.Memory": "4.5.3"
         }
       },
       "SQLitePCLRaw.lib.e_sqlite3": {
         "type": "Transitive",
-        "resolved": "2.1.4",
+        "resolved": "2.1.6",
-        "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg=="
+        "contentHash": "2ObJJLkIUIxRpOUlZNGuD4rICpBnrBR5anjyfUFQep4hMOIeqW+XGQYzrNmHSVz5xSWZ3klSbh7sFR6UyDj68Q=="
       },
       "SQLitePCLRaw.provider.e_sqlite3": {
         "type": "Transitive",
-        "resolved": "2.1.4",
+        "resolved": "2.1.6",
-        "contentHash": "CSlb5dUp1FMIkez9Iv5EXzpeq7rHryVNqwJMWnpq87j9zWZexaEMdisDktMsnnrzKM6ahNrsTkjqNodTBPBxtQ==",
+        "contentHash": "PQ2Oq3yepLY4P7ll145P3xtx2bX8xF4PzaKPRpw9jZlKvfe4LE/saAV82inND9usn1XRpmxXk7Lal3MTI+6CNg==",
         "dependencies": {
-          "SQLitePCLRaw.core": "2.1.4"
+          "SQLitePCLRaw.core": "2.1.6"
         }
       },
-      "System.CodeDom": {
-        "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "2sCCb7doXEwtYAbqzbF/8UAeDRMNmPaQbU2q50Psg1J9KzumyVVCgKQY8s53WIPTufNT0DpSe9QRvVjOzfDWBA=="
-      },
       "System.Memory": {
         "type": "Transitive",
         "resolved": "4.5.3",
@@ -282,34 +304,40 @@
       },
       "System.Text.Encodings.Web": {
         "type": "Transitive",
-        "resolved": "7.0.0",
+        "resolved": "8.0.0",
-        "contentHash": "OP6umVGxc0Z0MvZQBVigj4/U31Pw72ITihDWP9WiWDm+q5aoe0GaJivsfYGq53o6dxH7DcXWiCTl7+0o2CGdmg=="
+        "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ=="
       },
       "System.Text.Json": {
         "type": "Transitive",
-        "resolved": "7.0.0",
+        "resolved": "8.0.0",
-        "contentHash": "DaGSsVqKsn/ia6RG8frjwmJonfos0srquhw09TlT8KRw5I43E+4gs+/bZj4K0vShJ5H9imCuXupb4RmS+dBy3w==",
+        "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==",
         "dependencies": {
-          "System.Text.Encodings.Web": "7.0.0"
+          "System.Text.Encodings.Web": "8.0.0"
         }
       },
       "ecommons": {
         "type": "Project"
       },
+      "llib": {
+        "type": "Project",
+        "dependencies": {
+          "DalamudPackager": "[2.1.13, )"
+        }
+      },
       "pal.common": {
         "type": "Project"
       }
     },
-    "net7.0-windows7.0/win-x64": {
+    "net8.0-windows7.0/win-x64": {
       "SQLitePCLRaw.lib.e_sqlite3": {
         "type": "Transitive",
-        "resolved": "2.1.4",
+        "resolved": "2.1.6",
-        "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg=="
+        "contentHash": "2ObJJLkIUIxRpOUlZNGuD4rICpBnrBR5anjyfUFQep4hMOIeqW+XGQYzrNmHSVz5xSWZ3klSbh7sFR6UyDj68Q=="
       },
       "System.Text.Encodings.Web": {
         "type": "Transitive",
-        "resolved": "7.0.0",
+        "resolved": "8.0.0",
-        "contentHash": "OP6umVGxc0Z0MvZQBVigj4/U31Pw72ITihDWP9WiWDm+q5aoe0GaJivsfYGq53o6dxH7DcXWiCTl7+0o2CGdmg=="
+        "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ=="
       }
     }
   }

Pal.Common/EnumExtensions.cs

@@ -1,4 +1,6 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
 using System.Reflection;
 
 namespace Pal.Common;

Pal.Common/Pal.Common.csproj

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

Pal.Common/PalaceMath.cs

@@ -1,4 +1,5 @@
-using System.Numerics;
+using System;
+using System.Numerics;
 
 namespace Pal.Common;
 

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 {
@@ -56,3 +58,8 @@ message VerifyRequest {
 
 message VerifyReply {
 }
+
+message Version {
+  int32 major = 1;
+  int32 minor = 2;
+}

Pal.Common/packages.lock.json

@@ -1,6 +1,6 @@
 {
   "version": 1,
   "dependencies": {
-    "net7.0": {}
+    "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
@@ -25,7 +25,9 @@ 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", "Pal.Server.Tests\Pal.Server.Tests.csproj", "{AEC052FA-F178-492C-9A09-ED28DBE1EF5E}"
+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
@@ -75,6 +77,14 @@ Global
 		{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

@@ -15,4 +15,4 @@ Please check [Splatoon's Installation Instructions](https://github.com/Nightmare
 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,
-[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).

Server

@@ -0,0 +1 @@
+Subproject commit e59583fac353fdd960556ed2fa65220d66db5637

docker-build.sh

@@ -1,3 +1,4 @@
 git fetch origin master
 git reset --hard origin/master
-docker buildx build -t git.carvel.li/liza/palacepal/server --platform linux/amd64,linux/arm64 --push .
+git submodule update --checkout
+docker buildx build -t palacepal-server --platform linux/amd64,linux/arm64 .

vendor/ECommons

@@ -1 +1 @@
-Subproject commit d9dc8c1c6e914cf37ad47703579d85094246f2e5
+Subproject commit dcd85f8cca504360eda4b2cb5327632cc500a22c

vendor/LLib

@@ -0,0 +1 @@
+Subproject commit e206782c1106e1a5292a06af61783faef1ac0c42