Fix STJ populate serialization
This commit is contained in:
@@ -1,6 +1,5 @@
|
|||||||
using Craftimizer.Simulator.Actions;
|
using Craftimizer.Simulator.Actions;
|
||||||
using Craftimizer.Solver;
|
using Craftimizer.Solver;
|
||||||
using Craftimizer.Utils;
|
|
||||||
using Dalamud.Configuration;
|
using Dalamud.Configuration;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
@@ -72,10 +71,9 @@ public class MacroCopyConfiguration
|
|||||||
public bool CombineMacro { get; set; }
|
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;
|
public static event Action? OnMacroListChanged;
|
||||||
|
|
||||||
[JsonInclude] [JsonPropertyName("Macros")]
|
[JsonInclude] [JsonPropertyName("Macros")]
|
||||||
@@ -148,13 +146,13 @@ public partial class Configuration : IPluginConfiguration
|
|||||||
|
|
||||||
public static Configuration Load()
|
public static Configuration Load()
|
||||||
{
|
{
|
||||||
// return Service.PluginInterface.GetPluginConfig() as Configuration ?? new();
|
|
||||||
|
|
||||||
var f = Service.PluginInterface.ConfigFile;
|
var f = Service.PluginInterface.ConfigFile;
|
||||||
if (f.Exists)
|
if (f.Exists)
|
||||||
{
|
{
|
||||||
using var stream = f.OpenRead();
|
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();
|
return new();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
using Dalamud;
|
using Dalamud;
|
||||||
using ExdSheets;
|
using ExdSheets;
|
||||||
using Lumina;
|
|
||||||
using Lumina.Data;
|
|
||||||
using Lumina.Excel;
|
using Lumina.Excel;
|
||||||
using System.Collections.Concurrent;
|
using System.Collections.Concurrent;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user