diff --git a/RecodeItLib/Models/RemapModel.cs b/RecodeItLib/Models/RemapModel.cs index 364b5af..c01ea18 100644 --- a/RecodeItLib/Models/RemapModel.cs +++ b/RecodeItLib/Models/RemapModel.cs @@ -1,5 +1,5 @@ -using dnlib.DotNet; -using Newtonsoft.Json; +using System.Text.Json.Serialization; +using dnlib.DotNet; using ReCodeItLib.Enums; namespace ReCodeItLib.Models; @@ -15,7 +15,8 @@ public class RemapModel [JsonIgnore] public List NoMatchReasons { get; set; } = []; - [JsonIgnore] public string AmbiguousTypeMatch { get; set; } = string.Empty; + [JsonIgnore] + public string AmbiguousTypeMatch { get; set; } = string.Empty; /// /// This is a list of type candidates that made it through the filter diff --git a/RecodeItLib/Utils/DataProvider.cs b/RecodeItLib/Utils/DataProvider.cs index 891bd96..33ac8c6 100644 --- a/RecodeItLib/Utils/DataProvider.cs +++ b/RecodeItLib/Utils/DataProvider.cs @@ -1,4 +1,5 @@ using System.Text.Json; +using System.Text.Json.Serialization; using dnlib.DotNet; using ReCodeItLib.Models; @@ -28,7 +29,12 @@ public static class DataProvider var jsonText = File.ReadAllText(path); - var remaps = JsonSerializer.Deserialize>(jsonText); + JsonSerializerOptions settings = new() + { + AllowTrailingCommas = true, + }; + + var remaps = JsonSerializer.Deserialize>(jsonText, settings); return remaps ?? []; } @@ -43,7 +49,7 @@ public static class DataProvider JsonSerializerOptions settings = new() { WriteIndented = true, - RespectNullableAnnotations = ignoreNull + RespectNullableAnnotations = ignoreNull, }; var jsonText = JsonSerializer.Serialize(remaps, settings); @@ -73,7 +79,12 @@ public static class DataProvider var settingsPath = Path.Combine(DataPath, "Settings.jsonc"); var jsonText = File.ReadAllText(settingsPath); - return JsonSerializer.Deserialize(jsonText)!; + JsonSerializerOptions settings = new() + { + AllowTrailingCommas = true, + }; + + return JsonSerializer.Deserialize(jsonText, settings)!; } private static Dictionary LoadItems()