.dockerignore

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

Dockerfile

@@ -1,14 +1,14 @@
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-preview AS build-env
 ARG TARGETARCH
 WORKDIR /build
 COPY Pal.Common/Pal.Common.csproj Pal.Common/
-COPY Server/Server/Pal.Server.csproj Server/Server/
+COPY Pal.Server/Pal.Server.csproj Pal.Server/
-RUN dotnet restore Server/Server/Pal.Server.csproj -a $TARGETARCH
+RUN dotnet restore Pal.Server/Pal.Server.csproj -a $TARGETARCH
 
 COPY . ./
-RUN dotnet publish Server/Server/Pal.Server.csproj -a $TARGETARCH --no-restore -o /dist
+RUN dotnet publish Pal.Server/Pal.Server.csproj -a $TARGETARCH --no-restore -o /dist
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-preview
 
 # fix later
 ENV DOTNET_ROLL_FORWARD=Major

Pal.Client/Commands/PalNearCommand.cs

@@ -50,7 +50,7 @@ internal sealed class PalNearCommand : ISubCommand
 
         var nearbyMarkers = state.Locations
             .Where(m => predicate(m))
-            .Where(m => m.RenderElement != null && m.RenderElement.Enabled)
+            .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)

Pal.Client/Configuration/ConfigurationManager.cs

@@ -18,12 +18,12 @@ namespace Pal.Client.Configuration;
 internal sealed class ConfigurationManager
 {
     private readonly ILogger<ConfigurationManager> _logger;
-    private readonly IDalamudPluginInterface _pluginInterface;
+    private readonly DalamudPluginInterface _pluginInterface;
     private readonly IServiceProvider _serviceProvider;
 
     public event EventHandler<IPalacePalConfiguration>? Saved;
 
-    public ConfigurationManager(ILogger<ConfigurationManager> logger, IDalamudPluginInterface pluginInterface,
+    public ConfigurationManager(ILogger<ConfigurationManager> logger, DalamudPluginInterface 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(IDalamudPluginInterface pluginInterface, ILogger<ConfigurationV1> logger)
+    public void Migrate(DalamudPluginInterface pluginInterface, ILogger<ConfigurationV1> logger)
     {
         if (Version == 1)
         {
@@ -137,7 +137,7 @@ public sealed class ConfigurationV1
         }
     }
 
-    public void Save(IDalamudPluginInterface pluginInterface)
+    public void Save(DalamudPluginInterface 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 IDalamudPluginInterface _pluginInterface;
+    private readonly DalamudPluginInterface _pluginInterface;
 
     public JsonMigration(ILogger<JsonMigration> logger, IServiceScopeFactory serviceScopeFactory,
-        IDalamudPluginInterface pluginInterface)
+        DalamudPluginInterface 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<IDalamudPluginInterface>();
+        var pluginInterface = scope.ServiceProvider.GetRequiredService<DalamudPluginInterface>();
         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<IDalamudPluginInterface>();
+        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(),

Pal.Client/DependencyInjection/ChatService.cs

@@ -34,7 +34,7 @@ internal sealed class ChatService : IDisposable
     public void Dispose()
         => _chatGui.ChatMessage -= OnChatMessage;
 
-    private void OnChatMessage(XivChatType type, int senderId, ref SeString sender, ref SeString seMessage,
+    private void OnChatMessage(XivChatType type, uint senderId, ref SeString sender, ref SeString seMessage,
         ref bool isHandled)
     {
         if (_configuration.FirstUse)

Pal.Client/DependencyInjection/GameHooks.cs

@@ -81,7 +81,7 @@ internal sealed unsafe class GameHooks : IDisposable
                     _chat.PalPrint($"{vfxPath} on {obj}");
                 */
 
-                if (obj is IBattleChara bc && (bc.NameId == /* potd */ 5042 || bc.NameId == /* hoh */ 7395))
+                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")
                     {

Pal.Client/DependencyInjection/RepoVerification.cs

@@ -10,7 +10,7 @@ namespace Pal.Client.DependencyInjection;
 
 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")

Pal.Client/DependencyInjectionContext.cs

@@ -45,7 +45,7 @@ internal sealed class DependencyInjectionContext : IDisposable
     private ServiceProvider? _serviceProvider;
 
     public DependencyInjectionContext(
-        IDalamudPluginInterface pluginInterface,
+        DalamudPluginInterface pluginInterface,
         IClientState clientState,
         IGameGui gameGui,
         IChatGui chatGui,

Pal.Client/Floors/FrameworkService.cs

@@ -175,20 +175,12 @@ internal sealed class FrameworkService : IDisposable
             {
                 foreach (var location in memoryTerritory.Locations)
                 {
-                    bool isEnabled = DetermineVisibility(location, visibleLocations);
+                    uint desiredColor = DetermineColor(location, visibleLocations);
-                    if (location.RenderElement == null)
+                    if (location.RenderElement == null || !location.RenderElement.IsValid)
-                    {
-                        if (isEnabled)
-                            return true;
-                        else
-                            continue;
-                    }
-
-                    if (!location.RenderElement.IsValid)
                         return true;
 
-                    if (location.RenderElement.Enabled != isEnabled)
+                    if (location.RenderElement.Color != desiredColor)
-                        location.RenderElement.Enabled = isEnabled;
+                        location.RenderElement.Color = desiredColor;
                 }
             }
             catch (Exception e)
@@ -233,12 +225,12 @@ internal sealed class FrameworkService : IDisposable
         {
             if (location.Type == MemoryLocation.EType.Trap)
             {
-                CreateRenderElement(location, elements, DetermineVisibility(location, visibleMarkers),
+                CreateRenderElement(location, elements, DetermineColor(location, visibleMarkers),
                     _configuration.DeepDungeons.Traps);
             }
             else if (location.Type == MemoryLocation.EType.Hoard)
             {
-                CreateRenderElement(location, elements, DetermineVisibility(location, visibleMarkers),
+                CreateRenderElement(location, elements, DetermineColor(location, visibleMarkers),
                     _configuration.DeepDungeons.HoardCoffers);
             }
         }
@@ -259,12 +251,14 @@ internal sealed class FrameworkService : IDisposable
             if (location.Type == MemoryLocation.EType.SilverCoffer &&
                 _configuration.DeepDungeons.SilverCoffers.Show)
             {
-                CreateRenderElement(location, elements, true, _configuration.DeepDungeons.SilverCoffers);
+                CreateRenderElement(location, elements, DetermineColor(location),
+                    _configuration.DeepDungeons.SilverCoffers);
             }
             else if (location.Type == MemoryLocation.EType.GoldCoffer &&
                      _configuration.DeepDungeons.GoldCoffers.Show)
             {
-                CreateRenderElement(location, elements, true, _configuration.DeepDungeons.GoldCoffers);
+                CreateRenderElement(location, elements, DetermineColor(location),
+                    _configuration.DeepDungeons.GoldCoffers);
             }
         }
 
@@ -274,7 +268,7 @@ internal sealed class FrameworkService : IDisposable
         _renderAdapter.SetLayer(ELayer.RegularCoffers, elements);
     }
 
-    private bool DetermineVisibility(PersistentLocation location, IReadOnlyList<PersistentLocation> visibleLocations)
+    private uint DetermineColor(PersistentLocation location, IReadOnlyList<PersistentLocation> visibleLocations)
     {
         switch (location.Type)
         {
@@ -282,28 +276,34 @@ internal sealed class FrameworkService : IDisposable
                 when _territoryState.PomanderOfSight == PomanderState.Inactive ||
                      !_configuration.DeepDungeons.Traps.OnlyVisibleAfterPomander ||
                      visibleLocations.Any(x => x == location):
-                return true;
+                return _configuration.DeepDungeons.Traps.Color;
             case MemoryLocation.EType.Hoard
                 when _territoryState.PomanderOfIntuition == PomanderState.Inactive ||
                      !_configuration.DeepDungeons.HoardCoffers.OnlyVisibleAfterPomander ||
                      visibleLocations.Any(x => x == location):
-                return true;
+                return _configuration.DeepDungeons.HoardCoffers.Color;
             default:
-                return false;
+                return RenderData.ColorInvisible;
         }
     }
 
-    private void CreateRenderElement(MemoryLocation location, List<IRenderElement> elements, bool enabled,
+    private uint DetermineColor(EphemeralLocation location)
+    {
+        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 =
+        var element = _renderAdapter.CreateElement(location.Type, location.Position, color, config.Fill);
-            _renderAdapter.CreateElement(location.Type, location.Position, enabled, config.Color, config.Fill);
         location.RenderElement = element;
         elements.Add(element);
     }
@@ -383,7 +383,7 @@ internal sealed class FrameworkService : IDisposable
         List<EphemeralLocation> ephemeralLocations = new();
         for (int i = 246; i < _objectTable.Length; i++)
         {
-            IGameObject? obj = _objectTable[i];
+            GameObject? obj = _objectTable[i];
             if (obj == null)
                 continue;
 

Pal.Client/Floors/ObjectTableDebug.cs

@@ -18,12 +18,12 @@ internal sealed class ObjectTableDebug : IDisposable
 {
     public const string FeatureName = nameof(ObjectTableDebug);
 
-    private readonly IDalamudPluginInterface _pluginInterface;
+    private readonly DalamudPluginInterface _pluginInterface;
     private readonly IObjectTable _objectTable;
     private readonly IGameGui _gameGui;
     private readonly IClientState _clientState;
 
-    public ObjectTableDebug(IDalamudPluginInterface pluginInterface, IObjectTable objectTable, IGameGui gameGui,
+    public ObjectTableDebug(DalamudPluginInterface pluginInterface, IObjectTable objectTable, IGameGui gameGui,
         IClientState clientState)
     {
         _pluginInterface = pluginInterface;
@@ -37,9 +37,9 @@ internal sealed class ObjectTableDebug : IDisposable
     private void Draw()
     {
         int index = 0;
-        foreach (IGameObject obj in _objectTable)
+        foreach (GameObject obj in _objectTable)
         {
-            if (obj is IEventObj eventObj && string.IsNullOrEmpty(eventObj.Name.ToString()))
+            if (obj is EventObj eventObj && string.IsNullOrEmpty(eventObj.Name.ToString()))
             {
                 ++index;
                 int model = Marshal.ReadInt32(obj.Address + 128);
@@ -51,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.EntityId:X}[{index}]\nkind: {obj.ObjectKind} sub: {obj.SubKind}\nmodel: {model}\nname: {obj.Name}\ndata id: {obj.DataId}";
+                        $"{obj.Address.ToInt64():X}:{obj.ObjectId: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/Pal.Client.csproj

@@ -1,14 +1,28 @@
-<Project Sdk="Dalamud.NET.Sdk/9.0.2">
+<Project Sdk="Microsoft.NET.Sdk">
+
     <PropertyGroup>
-        <Version>6.0</Version>
+        <TargetFramework>net7.0-windows</TargetFramework>
-        <AssemblyName>Palace Pal</AssemblyName>
+        <LangVersion>11.0</LangVersion>
-        <PlatformTarget>x64</PlatformTarget>
+        <Nullable>enable</Nullable>
         <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>
 
-    <Import Project="..\vendor\LLib\LLib.targets"/>
+    <PropertyGroup>
-    <Import Project="..\vendor\LLib\RenameZip.targets"/>
+        <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
+        <PlatformTarget>x64</PlatformTarget>
+        <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>
+        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+    </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)' == 'Release'">
         <OutputPath>dist</OutputPath>
@@ -23,20 +37,24 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Dalamud.Extensions.MicrosoftLogging" Version="4.0.1"/>
+        <PackageReference Include="DalamudPackager" Version="2.1.12"/>
-        <PackageReference Include="Google.Protobuf" Version="3.27.2" />
+        <PackageReference Include="Dalamud.Extensions.MicrosoftLogging" Version="2.0.0"/>
-        <PackageReference Include="Grpc.Net.Client" Version="2.63.0"/>
+        <PackageReference Include="Google.Protobuf" Version="3.25.0" />
-        <PackageReference Include="Grpc.Tools" Version="2.64.0">
+        <PackageReference Include="Grpc.Net.Client" Version="2.59.0"/>
+        <PackageReference Include="GitInfo" Version="2.3.0">
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="Grpc.Tools" Version="2.59.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.Sqlite" Version="7.0.13" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6" Condition="'$(Configuration)' == 'EF'">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.13">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0"/>
-        <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0"/>
+        <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="7.0.1"/>
     </ItemGroup>
 
     <ItemGroup>
@@ -51,6 +69,42 @@
         <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>
         <EmbeddedResource Update="Properties\Localization.resx">
             <Generator>ResXFileCodeGenerator</Generator>
@@ -63,6 +117,17 @@
         </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>

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

Pal.Client/Plugin.cs

@@ -31,7 +31,7 @@ internal sealed class Plugin : IDalamudPlugin
 {
     private readonly CancellationTokenSource _initCts = new();
 
-    private readonly IDalamudPluginInterface _pluginInterface;
+    private readonly DalamudPluginInterface _pluginInterface;
     private readonly ICommandManager _commandManager;
     private readonly IClientState _clientState;
     private readonly IChatGui _chatGui;
@@ -47,7 +47,7 @@ internal sealed class Plugin : IDalamudPlugin
     private Action? _loginAction;
 
     public Plugin(
-        IDalamudPluginInterface pluginInterface,
+        DalamudPluginInterface pluginInterface,
         ICommandManager commandManager,
         IClientState clientState,
         IChatGui chatGui,

Pal.Client/Properties/AssemblyInfo.cs

@@ -0,0 +1,8 @@
+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/Rendering/IRenderElement.cs

@@ -4,5 +4,5 @@ public interface IRenderElement
 {
     bool IsValid { get; }
 
-    bool Enabled { get; set; }
+    uint Color { 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, bool enabled, uint color, bool fill = false);
+    IRenderElement CreateElement(MemoryLocation.EType type, Vector3 pos, uint color, bool fill = false);
 
     void DrawDebugItems(uint trapColor, uint hoardColor);
 }

Pal.Client/Rendering/RenderAdapter.cs

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

Pal.Client/Rendering/RenderData.cs

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

Pal.Client/Rendering/SimpleRenderer.cs

@@ -52,15 +52,13 @@ internal sealed class SimpleRenderer : IRenderer, IDisposable
             l.Dispose();
     }
 
-    public IRenderElement CreateElement(MemoryLocation.EType type, Vector3 pos, bool enabled, uint color,
+    public IRenderElement CreateElement(MemoryLocation.EType type, Vector3 pos, uint color, bool fill = false)
-        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,12 +75,10 @@ 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
@@ -122,7 +118,7 @@ internal sealed class SimpleRenderer : IRenderer, IDisposable
 
     private void Draw(SimpleElement e)
     {
-        if (!e.Enabled)
+        if (e.Color == RenderData.ColorInvisible)
             return;
 
         switch (e.Type)
@@ -198,7 +194,6 @@ 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

@@ -28,7 +28,7 @@ internal sealed class SplatoonRenderer : IRenderer, IDisposable
 
     public SplatoonRenderer(
         ILogger<SplatoonRenderer> logger,
-        IDalamudPluginInterface pluginInterface,
+        DalamudPluginInterface pluginInterface,
         IDalamudPlugin dalamudPlugin,
         DebugState debugState,
         IClientState clientState,
@@ -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, bool enabled, uint color, bool fill = false)
+    public IRenderElement CreateElement(MemoryLocation.EType type, Vector3 pos, uint color, bool fill = false)
     {
         MarkerConfig config = MarkerConfig.ForType(type);
         Element element = new Element(ElementType.CircleAtFixedCoordinates)
@@ -96,7 +96,6 @@ internal sealed class SplatoonRenderer : IRenderer, IDisposable
             FillStep = 1,
             color = color,
             thicc = 2,
-            Enabled = enabled,
         };
         return new SplatoonElement(this, element);
     }
@@ -112,8 +111,8 @@ internal sealed class SplatoonRenderer : IRenderer, IDisposable
 
                 var elements = new List<IRenderElement>
                 {
-                    CreateElement(MemoryLocation.EType.Trap, pos.Value, true, trapColor),
+                    CreateElement(MemoryLocation.EType.Trap, pos.Value, trapColor),
-                    CreateElement(MemoryLocation.EType.Hoard, pos.Value, true, hoardColor),
+                    CreateElement(MemoryLocation.EType.Hoard, pos.Value, hoardColor),
                 };
 
                 if (!Splatoon.AddDynamicElements(ToLayerName(ELayer.Test),
@@ -187,10 +186,10 @@ internal sealed class SplatoonRenderer : IRenderer, IDisposable
 
         public bool IsValid => !_renderer.IsDisposed && Delegate.IsValid();
 
-        public bool Enabled
+        public uint Color
         {
-            get => Delegate.Enabled;
+            get => Delegate.color;
-            set => Delegate.Enabled = value;
+            set => Delegate.color = value;
         }
     }
 }

Pal.Client/Windows/ConfigWindow.cs

@@ -13,7 +13,6 @@ using Export;
 using Google.Protobuf;
 using ImGuiNET;
 using LLib;
-using LLib.ImGui;
 using Microsoft.Extensions.Logging;
 using Pal.Client.Configuration;
 using Pal.Client.Database;
@@ -27,7 +26,7 @@ using Pal.Client.Scheduled;
 
 namespace Pal.Client.Windows;
 
-internal sealed class ConfigWindow : LWindow, ILanguageChanged, IDisposable
+internal sealed class ConfigWindow : LImGui.LWindow, ILanguageChanged, IDisposable
 {
     private const string WindowId = "###PalPalaceConfig";
 

Pal.Client/packages.lock.json

@@ -1,302 +1,277 @@
 {
   "version": 1,
   "dependencies": {
-    "net8.0-windows7.0": {
+    "net7.0-windows7.0": {
       "Dalamud.Extensions.MicrosoftLogging": {
         "type": "Direct",
-        "requested": "[4.0.1, )",
+        "requested": "[2.0.0, )",
-        "resolved": "4.0.1",
+        "resolved": "2.0.0",
-        "contentHash": "fMEL2ajtF/30SBBku7vMyG0yye5eHN/A9fgT//1CEjUth/Wz2CYco5Ehye21T8KN1IuAPwoqJuu49rB71j+8ug==",
+        "contentHash": "qp2idn5GuPouUxHHFytMrorbhlcupsgPdO87HjxlBfTY+JID+qoTfPmA5V6HBP1a4DuXGPbk4JtoO/hMmnQrtw==",
         "dependencies": {
-          "Microsoft.Extensions.Logging": "8.0.0"
+          "Microsoft.Extensions.Logging": "7.0.0"
         }
       },
       "DalamudPackager": {
         "type": "Direct",
-        "requested": "[2.1.13, )",
+        "requested": "[2.1.12, )",
-        "resolved": "2.1.13",
+        "resolved": "2.1.12",
-        "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ=="
+        "contentHash": "Sc0PVxvgg4NQjcI8n10/VfUQBAS4O+Fw2pZrAqBdRMbthYGeogzu5+xmIGCGmsEZ/ukMOBuAqiNiB5qA3MRalg=="
       },
-      "DotNet.ReproducibleBuilds": {
+      "GitInfo": {
         "type": "Direct",
-        "requested": "[1.1.1, )",
+        "requested": "[2.3.0, )",
-        "resolved": "1.1.1",
+        "resolved": "2.3.0",
-        "contentHash": "+H2t/t34h6mhEoUvHi8yGXyuZ2GjSovcGYehJrS2MDm2XgmPfZL2Sdxg+uL2lKgZ4M6tTwKHIlxOob2bgh0NRQ==",
+        "contentHash": "LdnsKNdwQvdDvpPYQuoGjXML75dY7NybKRe+qlkPPQaTY4dE5Fy8VCrD8YBhXO0fH/5xnmvKeSq4yztzg5KY0Q=="
-        "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, )",
+        "requested": "[3.25.0, )",
-        "resolved": "3.27.2",
+        "resolved": "3.25.0",
-        "contentHash": "0wdgA3LO9mBS477jieBFs4pU1sWhVtwv/P+i9nAEiFDQyUA7PPHDBbJL1CeqYtV18jLiq9og4n7wSVCO171OBg=="
+        "contentHash": "pIEkH1IqZV1iK8J5MYdG1kOyY0EoQLB6yEKvBq12RYNtvGXwCvnQg5zQsFmcqAEPtIZvSqPozIbUZaEd5a2gCg=="
       },
       "Grpc.Net.Client": {
         "type": "Direct",
-        "requested": "[2.63.0, )",
+        "requested": "[2.59.0, )",
-        "resolved": "2.63.0",
+        "resolved": "2.59.0",
-        "contentHash": "847zG24daOP1242OpbnjhbKtplH/EfV/76QReQA3cbS5SL78uIXsWMe9IN9JlIb4+kT3eE4fjMCXTn8BAQ91Ng==",
+        "contentHash": "I2CP5aLTek9mz7OwmM8T94pzvuV2Jib91KqzHh+vohazx/rL0ks1GCsUrwf+7866UsSsOznaWRKqFxWPEYstpg==",
         "dependencies": {
-          "Grpc.Net.Common": "2.63.0",
+          "Grpc.Net.Common": "2.59.0",
           "Microsoft.Extensions.Logging.Abstractions": "6.0.0"
         }
       },
       "Grpc.Tools": {
         "type": "Direct",
-        "requested": "[2.64.0, )",
+        "requested": "[2.59.0, )",
-        "resolved": "2.64.0",
+        "resolved": "2.59.0",
-        "contentHash": "W5RrhDFHUhioASktxfuDs5fTjWUxwegljZAig9zFL8nWNskeyQA6OXN2choWKYxGrljer25VqCJCMbWz7XHvqg=="
+        "contentHash": "LzL71SCmx62zh6YMBOAEYxzK7LlhHYsBADnawyn8u3n/HL6qntZtGN2ep69T734zBQKWPBQVbVdiIaqaqOfhXg=="
       },
       "Microsoft.EntityFrameworkCore.Sqlite": {
         "type": "Direct",
-        "requested": "[8.0.6, )",
+        "requested": "[7.0.13, )",
-        "resolved": "8.0.6",
+        "resolved": "7.0.13",
-        "contentHash": "nC4cZN4zReTb22qd9WDU0eDmlXvkyf2g2pqQ3VIHJbkpJcdWSY/PDgwGpbpShsVcAjXbkjGiUcv9aGwa61xQPw==",
+        "contentHash": "owvXxHdI8+9OsVR7npTb1WBc+rU9tvdRXTJnqWDmqYCZEk0KyT4aU/gQKYbvdx+Vv7y1oNcprL246VbpXhKNSA==",
         "dependencies": {
-          "Microsoft.EntityFrameworkCore.Sqlite.Core": "8.0.6",
+          "Microsoft.EntityFrameworkCore.Sqlite.Core": "7.0.13",
-          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.6"
+          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4"
+        }
+      },
+      "Microsoft.EntityFrameworkCore.Tools": {
+        "type": "Direct",
+        "requested": "[7.0.13, )",
+        "resolved": "7.0.13",
+        "contentHash": "Z2edRVeoCqvWdNNHHoqbiNhRBetXfh/GBAga6bXM0mmRWzYZ0Y8F+jUFWF/8BUdnbv/8RAafIkWLVMT0jdxMLQ==",
+        "dependencies": {
+          "Microsoft.EntityFrameworkCore.Design": "7.0.13"
         }
       },
       "Microsoft.Extensions.Logging": {
         "type": "Direct",
-        "requested": "[8.0.0, )",
+        "requested": "[7.0.0, )",
-        "resolved": "8.0.0",
+        "resolved": "7.0.0",
-        "contentHash": "tvRkov9tAJ3xP51LCv3FJ2zINmv1P8Hi8lhhtcKGqM+ImiTCC84uOPEI4z8Cdq2C3o9e+Aa0Gw0rmrsJD77W+w==",
+        "contentHash": "Nw2muoNrOG5U5qa2ZekXwudUn2BJcD41e65zwmDHb1fQegTX66UokLWZkJRpqSSHXDOWZ5V0iqhbxOEky91atA==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection": "8.0.0",
+          "Microsoft.Extensions.DependencyInjection": "7.0.0",
-          "Microsoft.Extensions.Logging.Abstractions": "8.0.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0",
-          "Microsoft.Extensions.Options": "8.0.0"
+          "Microsoft.Extensions.Logging.Abstractions": "7.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": "[8.0.0, )",
+        "requested": "[7.0.1, )",
-        "resolved": "8.0.0",
+        "resolved": "7.0.1",
-        "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg=="
+        "contentHash": "3evI3sBfKqwYSwuBcYgShbmEgtXcg8N5Qu+jExLdkBXPty2yGDXq5m1/4sx9Exb8dqdeMPUs/d9DQ0wy/9Adwg=="
       },
       "Grpc.Core.Api": {
         "type": "Transitive",
-        "resolved": "2.63.0",
+        "resolved": "2.59.0",
-        "contentHash": "t3+/MF8AxIqKq5UmPB9EWAnM9C/+lXOB8TRFfeVMDntf6dekfJmjpKDebaT4t2bbuwVwwvthxxox9BuGr59kYA=="
+        "contentHash": "n0QpwXqri/Uu7pXWbE6PWVANEhKggC6QRX7qsSR4vyzZRDN2jBPoUNvrJP7RBw7g8Dgg8e2bWYuGKq4ph6VXeA=="
       },
       "Grpc.Net.Common": {
         "type": "Transitive",
-        "resolved": "2.63.0",
+        "resolved": "2.59.0",
-        "contentHash": "RLt6p31ZMsXRcHNeu1dQuIFLYZvnwP6LUzoDPlV3KoR4w9btmwrXIvz9Jbp1SOmxW7nXw9zShAeIt5LsqFAx5w==",
+        "contentHash": "9j1wKAeCzjnx/j8CC8chXRoLCuzJ9VhhlhwMkbW37mS1Ox4vv0i2pcefpDY5INIeE1BmPNIuPtqFLOUktkiKrQ==",
         "dependencies": {
-          "Grpc.Core.Api": "2.63.0"
+          "Grpc.Core.Api": "2.59.0"
         }
       },
-      "Microsoft.Build.Tasks.Git": {
+      "Humanizer.Core": {
         "type": "Transitive",
-        "resolved": "8.0.0",
+        "resolved": "2.14.1",
-        "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
+        "contentHash": "lQKvtaTDOXnoVJ20ibTuSIOf2i0uO0MPbDhd1jm238I+U/2ZnRENj0cktKZhtchBMtCUSRQ5v4xBCUbKNmyVMw=="
       },
       "Microsoft.Data.Sqlite.Core": {
         "type": "Transitive",
-        "resolved": "8.0.6",
+        "resolved": "7.0.13",
-        "contentHash": "umhZ0ZF2RI81rGFTnYmCxI+Euj4Aqe/6Y4+8CxN9OVJNGDNIqB5laJ3wxQTU8zXCcm2k9F7FL+/6RVoOT4z1Fw==",
+        "contentHash": "acRUY0iRrdIrhUXxu9GnonxV9P3VIeMnpnmHoY9vE9D5CAJeThro7vr63urSD0Qmav2gS2sxNAQ/NkP09OZJBQ==",
         "dependencies": {
-          "SQLitePCLRaw.core": "2.1.6"
+          "SQLitePCLRaw.core": "2.1.4"
         }
       },
       "Microsoft.EntityFrameworkCore": {
         "type": "Transitive",
-        "resolved": "8.0.6",
+        "resolved": "7.0.13",
-        "contentHash": "Ms5e5QuBAjVIuQsGumeLvkgMiOpnj6wxPvwBIoe1NfTkseWK4NZYztnhgDlpkCPkrUmJEXLv69kl349Ours30Q==",
+        "contentHash": "fACONzJtzLJQ29soFqBr0OzgmIYMHV7y9AEZ18hqGx2K0FMJNqezAcfzovc4WI+kT9IvOFQKhDNTl5DMimgkMA==",
         "dependencies": {
-          "Microsoft.EntityFrameworkCore.Abstractions": "8.0.6",
+          "Microsoft.EntityFrameworkCore.Abstractions": "7.0.13",
-          "Microsoft.EntityFrameworkCore.Analyzers": "8.0.6",
+          "Microsoft.EntityFrameworkCore.Analyzers": "7.0.13",
-          "Microsoft.Extensions.Caching.Memory": "8.0.0",
+          "Microsoft.Extensions.Caching.Memory": "7.0.0",
-          "Microsoft.Extensions.Logging": "8.0.0"
+          "Microsoft.Extensions.DependencyInjection": "7.0.0",
+          "Microsoft.Extensions.Logging": "7.0.0"
         }
       },
       "Microsoft.EntityFrameworkCore.Abstractions": {
         "type": "Transitive",
-        "resolved": "8.0.6",
+        "resolved": "7.0.13",
-        "contentHash": "X7wSSBNFRuN8j8M9HDYG7rPpEeyhY+PdJZR9rftmgvsZH0eK5+bZ3b3As8iO4rLEpjsBzDnrgSIY6q2F3HQatw=="
+        "contentHash": "VxChscv7EsedfuhMAqJ82IxWBYyScCnMwMb1j4+264rIZteeWhj0CJX+u139JCCE9TcvoT97IsCmbb5Jcav5tg=="
       },
       "Microsoft.EntityFrameworkCore.Analyzers": {
         "type": "Transitive",
-        "resolved": "8.0.6",
+        "resolved": "7.0.13",
-        "contentHash": "fDNtuQ4lAaPaCOlsrwUck/GvnF4QLeDpMmE1L5QtxZpMSmWfnL2/vk8sDL9OVTWcfprooI9V5MNpIx3/Tq5ehg=="
+        "contentHash": "3GiAd0b30L+31/86mtpLDf0Hf4Fnze4yx7hVXaW4wBd6KomIqacGaf+s9rMYNdJZEyKvUJPaBsghY+FgKOoAHg=="
+      },
+      "Microsoft.EntityFrameworkCore.Design": {
+        "type": "Transitive",
+        "resolved": "7.0.13",
+        "contentHash": "3DlpSAxQhuxlhblySbM5ujxHALRi5m25ORPGnKKW4LCY1CPleCStdMSRnUB53vnhWDJUX12eIIvprajN++c2Ag==",
+        "dependencies": {
+          "Humanizer.Core": "2.14.1",
+          "Microsoft.EntityFrameworkCore.Relational": "7.0.13",
+          "Microsoft.Extensions.DependencyModel": "7.0.0",
+          "Mono.TextTemplating": "2.2.1"
+        }
       },
       "Microsoft.EntityFrameworkCore.Relational": {
         "type": "Transitive",
-        "resolved": "8.0.6",
+        "resolved": "7.0.13",
-        "contentHash": "chhfmLusCGLGvNYtvMji6KGQlduPDnJsStG/LjS8qJhFWJDDzTZpSr2LHowewcxMrMo/Axc6Jwe+WwSi/vlkTg==",
+        "contentHash": "lIms3oaIW7XiQy3bLUB2+hcSZ4ISmdh3HKKuNSnewS3wurYaopqBEhYaQdhZeW6itl3skWyqybPGGxIlJrKqFA==",
         "dependencies": {
-          "Microsoft.EntityFrameworkCore": "8.0.6",
+          "Microsoft.EntityFrameworkCore": "7.0.13",
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "7.0.0"
         }
       },
       "Microsoft.EntityFrameworkCore.Sqlite.Core": {
         "type": "Transitive",
-        "resolved": "8.0.6",
+        "resolved": "7.0.13",
-        "contentHash": "87xfPtqSouxWWdynYZv/rubd0rOUeiN9+XeoMWQzpZm/5svH1TuvzFODGIY0zKuXS18NiOFyHl9N6///eaEs/Q==",
+        "contentHash": "EkOGeWK8KMT6TiK4V7vr654s7h5dg4fV0htXw4nfRIV6CfnTE8rC6cCrFI9PlDxBF7h7YSDSEkA9QsM0I4Hvvw==",
         "dependencies": {
-          "Microsoft.Data.Sqlite.Core": "8.0.6",
+          "Microsoft.Data.Sqlite.Core": "7.0.13",
-          "Microsoft.EntityFrameworkCore.Relational": "8.0.6",
+          "Microsoft.EntityFrameworkCore.Relational": "7.0.13",
-          "Microsoft.Extensions.DependencyModel": "8.0.0"
+          "Microsoft.Extensions.DependencyModel": "7.0.0"
         }
       },
       "Microsoft.Extensions.Caching.Abstractions": {
         "type": "Transitive",
-        "resolved": "8.0.0",
+        "resolved": "7.0.0",
-        "contentHash": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==",
+        "contentHash": "IeimUd0TNbhB4ded3AbgBLQv2SnsiVugDyGV1MvspQFVlA07nDC7Zul7kcwH5jWN3JiTcp/ySE83AIJo8yfKjg==",
         "dependencies": {
-          "Microsoft.Extensions.Primitives": "8.0.0"
+          "Microsoft.Extensions.Primitives": "7.0.0"
         }
       },
       "Microsoft.Extensions.Caching.Memory": {
         "type": "Transitive",
-        "resolved": "8.0.0",
+        "resolved": "7.0.0",
-        "contentHash": "7pqivmrZDzo1ADPkRwjy+8jtRKWRCPag9qPI+p7sgu7Q4QreWhcvbiWXsbhP+yY8XSiDvZpu2/LWdBv7PnmOpQ==",
+        "contentHash": "xpidBs2KCE2gw1JrD0quHE72kvCaI3xFql5/Peb2GRtUuZX+dYPoK/NTdVMiM67Svym0M0Df9A3xyU0FbMQhHw==",
         "dependencies": {
-          "Microsoft.Extensions.Caching.Abstractions": "8.0.0",
+          "Microsoft.Extensions.Caching.Abstractions": "7.0.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "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.Extensions.Primitives": "8.0.0"
+          "Microsoft.Extensions.Primitives": "7.0.0"
         }
       },
       "Microsoft.Extensions.Configuration.Abstractions": {
         "type": "Transitive",
-        "resolved": "8.0.0",
+        "resolved": "7.0.0",
-        "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==",
+        "contentHash": "f34u2eaqIjNO9YLHBz8rozVZ+TcFiFs0F3r7nUJd7FRkVSxk8u4OpoK226mi49MwexHOR2ibP9MFvRUaLilcQQ==",
         "dependencies": {
-          "Microsoft.Extensions.Primitives": "8.0.0"
+          "Microsoft.Extensions.Primitives": "7.0.0"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
         "type": "Transitive",
-        "resolved": "8.0.0",
+        "resolved": "7.0.0",
-        "contentHash": "V8S3bsm50ig6JSyrbcJJ8bW2b9QLGouz+G1miK3UTaOWmMtFwNNNzUf4AleyDWUmTrWMLNnFSLEQtxmxgNQnNQ==",
+        "contentHash": "elNeOmkeX3eDVG6pYVeV82p29hr+UKDaBhrZyWvWLw/EVZSYEkZlQdkp0V39k/Xehs2Qa0mvoCvkVj3eQxNQ1Q==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0"
         }
       },
       "Microsoft.Extensions.DependencyInjection.Abstractions": {
         "type": "Transitive",
-        "resolved": "8.0.0",
+        "resolved": "7.0.0",
-        "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg=="
+        "contentHash": "h3j/QfmFN4S0w4C2A6X7arXij/M/OVw3uQHSOFxnND4DyAzO1F9eMX7Eti7lU/OkSthEE0WzRsfT/Dmx86jzCw=="
       },
       "Microsoft.Extensions.DependencyModel": {
         "type": "Transitive",
-        "resolved": "8.0.0",
+        "resolved": "7.0.0",
-        "contentHash": "NSmDw3K0ozNDgShSIpsZcbFIzBX4w28nDag+TfaQujkXGazBm+lid5onlWoCBy4VsLxqnnKjEBbGSJVWJMf43g==",
+        "contentHash": "oONNYd71J3LzkWc4fUHl3SvMfiQMYUCo/mDHDEu76hYYxdhdrPYv6fvGv9nnKVyhE9P0h20AU8RZB5OOWQcAXg==",
         "dependencies": {
-          "System.Text.Encodings.Web": "8.0.0",
+          "System.Text.Encodings.Web": "7.0.0",
-          "System.Text.Json": "8.0.0"
+          "System.Text.Json": "7.0.0"
         }
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "Transitive",
-        "resolved": "8.0.0",
+        "resolved": "7.0.0",
-        "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==",
+        "contentHash": "kmn78+LPVMOWeITUjIlfxUPDsI0R6G0RkeAMBmQxAJ7vBJn4q2dTva7pWi65ceN5vPGjJ9q/Uae2WKgvfktJAw=="
-        "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0"
-        }
       },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
-        "resolved": "8.0.0",
+        "resolved": "7.0.0",
-        "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==",
+        "contentHash": "lP1yBnTTU42cKpMozuafbvNtQ7QcBjr/CcK3bYOGEMH55Fjt+iecXjT6chR7vbgCMqy3PG3aNQSZgo/EuY/9qQ==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0",
-          "Microsoft.Extensions.Primitives": "8.0.0"
+          "Microsoft.Extensions.Primitives": "7.0.0"
         }
       },
       "Microsoft.Extensions.Primitives": {
         "type": "Transitive",
-        "resolved": "8.0.0",
+        "resolved": "7.0.0",
-        "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g=="
+        "contentHash": "um1KU5kxcRp3CNuI8o/GrZtD4AIOXDk+RLsytjZ9QPok3ttLUelLKpilVPuaFT3TFjOhSibUAso0odbOaCDj3Q=="
       },
-      "Microsoft.SourceLink.AzureRepos.Git": {
+      "Mono.TextTemplating": {
         "type": "Transitive",
-        "resolved": "1.1.1",
+        "resolved": "2.2.1",
-        "contentHash": "qB5urvw9LO2bG3eVAkuL+2ughxz2rR7aYgm2iyrB8Rlk9cp2ndvGRCvehk3rNIhRuNtQaeKwctOl1KvWiklv5w==",
+        "contentHash": "KZYeKBET/2Z0gY1WlTAK7+RHTl7GSbtvTLDXEZZojUdAPqpQNDL6tHv7VUpqfX5VEOh+uRGKaZXkuD253nEOBQ==",
         "dependencies": {
-          "Microsoft.Build.Tasks.Git": "1.1.1",
+          "System.CodeDom": "4.4.0"
-          "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",
+        "resolved": "2.1.4",
-        "contentHash": "BmAf6XWt4TqtowmiWe4/5rRot6GerAeklmOPfviOvwLoF5WwgxcJHAxZtySuyW9r9w+HLILnm8VfJFLCUJYW8A==",
+        "contentHash": "EWI1olKDjFEBMJu0+3wuxwziIAdWDVMYLhuZ3Qs84rrz+DHwD00RzWPZCa+bLnHCf3oJwuFZIRsHT5p236QXww==",
         "dependencies": {
-          "SQLitePCLRaw.lib.e_sqlite3": "2.1.6",
+          "SQLitePCLRaw.lib.e_sqlite3": "2.1.4",
-          "SQLitePCLRaw.provider.e_sqlite3": "2.1.6"
+          "SQLitePCLRaw.provider.e_sqlite3": "2.1.4"
         }
       },
       "SQLitePCLRaw.core": {
         "type": "Transitive",
-        "resolved": "2.1.6",
+        "resolved": "2.1.4",
-        "contentHash": "wO6v9GeMx9CUngAet8hbO7xdm+M42p1XeJq47ogyRoYSvNSp0NGLI+MgC0bhrMk9C17MTVFlLiN6ylyExLCc5w==",
+        "contentHash": "inBjvSHo9UDKneGNzfUfDjK08JzlcIhn1+SP5Y3m6cgXpCxXKCJDy6Mka7LpgSV+UZmKSnC8rTwB0SQ0xKu5pA==",
         "dependencies": {
           "System.Memory": "4.5.3"
         }
       },
       "SQLitePCLRaw.lib.e_sqlite3": {
         "type": "Transitive",
-        "resolved": "2.1.6",
+        "resolved": "2.1.4",
-        "contentHash": "2ObJJLkIUIxRpOUlZNGuD4rICpBnrBR5anjyfUFQep4hMOIeqW+XGQYzrNmHSVz5xSWZ3klSbh7sFR6UyDj68Q=="
+        "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg=="
       },
       "SQLitePCLRaw.provider.e_sqlite3": {
         "type": "Transitive",
-        "resolved": "2.1.6",
+        "resolved": "2.1.4",
-        "contentHash": "PQ2Oq3yepLY4P7ll145P3xtx2bX8xF4PzaKPRpw9jZlKvfe4LE/saAV82inND9usn1XRpmxXk7Lal3MTI+6CNg==",
+        "contentHash": "CSlb5dUp1FMIkez9Iv5EXzpeq7rHryVNqwJMWnpq87j9zWZexaEMdisDktMsnnrzKM6ahNrsTkjqNodTBPBxtQ==",
         "dependencies": {
-          "SQLitePCLRaw.core": "2.1.6"
+          "SQLitePCLRaw.core": "2.1.4"
         }
       },
+      "System.CodeDom": {
+        "type": "Transitive",
+        "resolved": "4.4.0",
+        "contentHash": "2sCCb7doXEwtYAbqzbF/8UAeDRMNmPaQbU2q50Psg1J9KzumyVVCgKQY8s53WIPTufNT0DpSe9QRvVjOzfDWBA=="
+      },
       "System.Memory": {
         "type": "Transitive",
         "resolved": "4.5.3",
@@ -304,40 +279,37 @@
       },
       "System.Text.Encodings.Web": {
         "type": "Transitive",
-        "resolved": "8.0.0",
+        "resolved": "7.0.0",
-        "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ=="
+        "contentHash": "OP6umVGxc0Z0MvZQBVigj4/U31Pw72ITihDWP9WiWDm+q5aoe0GaJivsfYGq53o6dxH7DcXWiCTl7+0o2CGdmg=="
       },
       "System.Text.Json": {
         "type": "Transitive",
-        "resolved": "8.0.0",
+        "resolved": "7.0.0",
-        "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==",
+        "contentHash": "DaGSsVqKsn/ia6RG8frjwmJonfos0srquhw09TlT8KRw5I43E+4gs+/bZj4K0vShJ5H9imCuXupb4RmS+dBy3w==",
         "dependencies": {
-          "System.Text.Encodings.Web": "8.0.0"
+          "System.Text.Encodings.Web": "7.0.0"
         }
       },
       "ecommons": {
         "type": "Project"
       },
       "llib": {
-        "type": "Project",
+        "type": "Project"
-        "dependencies": {
-          "DalamudPackager": "[2.1.13, )"
-        }
       },
       "pal.common": {
         "type": "Project"
       }
     },
-    "net8.0-windows7.0/win-x64": {
+    "net7.0-windows7.0/win-x64": {
       "SQLitePCLRaw.lib.e_sqlite3": {
         "type": "Transitive",
-        "resolved": "2.1.6",
+        "resolved": "2.1.4",
-        "contentHash": "2ObJJLkIUIxRpOUlZNGuD4rICpBnrBR5anjyfUFQep4hMOIeqW+XGQYzrNmHSVz5xSWZ3klSbh7sFR6UyDj68Q=="
+        "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg=="
       },
       "System.Text.Encodings.Web": {
         "type": "Transitive",
-        "resolved": "8.0.0",
+        "resolved": "7.0.0",
-        "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ=="
+        "contentHash": "OP6umVGxc0Z0MvZQBVigj4/U31Pw72ITihDWP9WiWDm+q5aoe0GaJivsfYGq53o6dxH7DcXWiCTl7+0o2CGdmg=="
       }
     }
   }

Pal.Common/EnumExtensions.cs

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

Pal.Common/Pal.Common.csproj

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

Pal.Common/PalaceMath.cs

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

Pal.Common/packages.lock.json

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

Server

@@ -1 +1 @@
-Subproject commit e59583fac353fdd960556ed2fa65220d66db5637
+Subproject commit 299069b57b2d47f47ddd4b5069827c09ac17e66e

docker-build.sh

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

vendor/ECommons

@@ -1 +1 @@
-Subproject commit dcd85f8cca504360eda4b2cb5327632cc500a22c
+Subproject commit ff5ef161713f97dd4d9a857aa455c596d7a0534a

vendor/LLib

@@ -1 +1 @@
-Subproject commit e206782c1106e1a5292a06af61783faef1ac0c42
+Subproject commit 865a6080319f8ccbcd5fd5b0004404822b6e60d4