ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-15 20:37:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' into corehook

Browse source
This commit is contained in:
goaaats 2021-10-21 01:36:24 +02:00 • committed by GitHub
commit 05c2334aeb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1013 changed files with 51977 additions and 22291 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Dalamud/Configuration/Internal/DalamudConfiguration.cs
View file

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.IO;
using Dalamud.Game.Text;
using Dalamud.Interface.Internal.Windows.StyleEditor;
using Dalamud.Interface.Style;
using Newtonsoft.Json;
using Serilog;
using Serilog.Events;
@ -16,6 +16,13 @@ namespace Dalamud.Configuration.Internal
[Serializable]
internal sealed class DalamudConfiguration
{
private static readonly JsonSerializerSettings SerializerSettings = new()
{
TypeNameHandling = TypeNameHandling.All,
TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple,
Formatting = Formatting.Indented,
};
[JsonIgnore]
private string configPath;
@ -209,6 +216,13 @@ namespace Dalamud.Configuration.Internal
/// <summary>
/// Gets or sets a list of saved styles.
/// </summary>
[JsonProperty("SavedStyles")]
public List<StyleModelV1>? SavedStylesOld { get; set; }
/// <summary>
/// Gets or sets a list of saved styles.
/// </summary>
[JsonProperty("SavedStylesVersioned")]
public List<StyleModel>? SavedStyles { get; set; }
/// <summary>
@ -231,7 +245,7 @@ namespace Dalamud.Configuration.Internal
DalamudConfiguration deserialized;
try
{
deserialized = JsonConvert.DeserializeObject<DalamudConfiguration>(File.ReadAllText(path));
deserialized = JsonConvert.DeserializeObject<DalamudConfiguration>(File.ReadAllText(path), SerializerSettings);
}
catch (Exception ex)
{
@ -249,7 +263,7 @@ namespace Dalamud.Configuration.Internal
/// </summary>
public void Save()
{
File.WriteAllText(this.configPath, JsonConvert.SerializeObject(this, Formatting.Indented));
File.WriteAllText(this.configPath, JsonConvert.SerializeObject(this, SerializerSettings));
this.DalamudConfigurationSaved?.Invoke(this);
}
}