From 1afc6e7d5bc5b59fd143edbfe8e8fdacb5edcc21 Mon Sep 17 00:00:00 2001
From: Asriel Camora <asriel@camora.dev>
Date: Sat, 22 Jun 2024 07:32:25 -0700
Subject: [PATCH] Fix STJ populate serialization

---
 Craftimizer/Configuration.cs | 12 +++++-------
 Craftimizer/LuminaSheets.cs  |  2 --
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Craftimizer/Configuration.cs b/Craftimizer/Configuration.cs
index d6e35cf..c6854c1 100644
--- a/Craftimizer/Configuration.cs
+++ b/Craftimizer/Configuration.cs
@@ -1,6 +1,5 @@
 using Craftimizer.Simulator.Actions;
 using Craftimizer.Solver;
-using Craftimizer.Utils;
 using Dalamud.Configuration;
 using System;
 using System.Collections.Generic;
@@ -72,10 +71,9 @@ public class MacroCopyConfiguration
     public bool CombineMacro { get; set; }
 }
 
-public partial class Configuration : IPluginConfiguration
+[JsonObjectCreationHandling(JsonObjectCreationHandling.Populate)]
+public partial class Configuration
 {
-    public int Version { get; set; } = 1;
-
     public static event Action? OnMacroListChanged;
 
     [JsonInclude] [JsonPropertyName("Macros")]
@@ -148,13 +146,13 @@ public partial class Configuration : IPluginConfiguration
 
     public static Configuration Load()
     {
-        // return Service.PluginInterface.GetPluginConfig() as Configuration ?? new();
-
         var f = Service.PluginInterface.ConfigFile;
         if (f.Exists)
         {
             using var stream = f.OpenRead();
-            return JsonSerializer.Deserialize(stream, JsonContext.Default.Configuration) ?? new();
+            
+            // System.InvalidOperationException: Setting init-only properties is not supported in source generation mode.
+            return JsonSerializer.Deserialize<Configuration>(stream) ?? new();
         }
         return new();
     }
diff --git a/Craftimizer/LuminaSheets.cs b/Craftimizer/LuminaSheets.cs
index 7d04bb8..5a0ea45 100644
--- a/Craftimizer/LuminaSheets.cs
+++ b/Craftimizer/LuminaSheets.cs
@@ -1,7 +1,5 @@
 using Dalamud;
 using ExdSheets;
-using Lumina;
-using Lumina.Data;
 using Lumina.Excel;
 using System.Collections.Concurrent;