diff --git a/RecodeItLib/Models/ItemTemplateModel.cs b/RecodeItLib/Models/ItemTemplateModel.cs index c6995f3..078165a 100644 --- a/RecodeItLib/Models/ItemTemplateModel.cs +++ b/RecodeItLib/Models/ItemTemplateModel.cs @@ -1,9 +1,12 @@ -namespace ReCodeItLib.Models; +using System.Text.Json.Serialization; + +namespace ReCodeItLib.Models; public class ItemTemplateModel { - public string? _id; - public string? _name; - public string? _parent; - public string? _type; + [JsonPropertyName("_id")] + public string? Id { get; set; } + + [JsonPropertyName("_name")] + public string? Name { get; set; } } \ No newline at end of file diff --git a/RecodeItLib/Remapper/ReMapper.cs b/RecodeItLib/Remapper/ReMapper.cs index 53a4d1a..6e9f363 100644 --- a/RecodeItLib/Remapper/ReMapper.cs +++ b/RecodeItLib/Remapper/ReMapper.cs @@ -274,10 +274,12 @@ public class ReMapper var remap = new RemapModel { OriginalTypeName = type.Value.Name, - NewTypeName = $"{template._name}{extName}", + NewTypeName = $"{template.Name}{extName}", UseForceRename = true }; + Logger.LogSync($"{type.Value.Name} -> {template.Name}{extName}"); + _remaps.Add(remap); } } diff --git a/RecodeItLib/Utils/DataProvider.cs b/RecodeItLib/Utils/DataProvider.cs index 33ac8c6..8bcbd86 100644 --- a/RecodeItLib/Utils/DataProvider.cs +++ b/RecodeItLib/Utils/DataProvider.cs @@ -1,7 +1,9 @@ using System.Text.Json; using System.Text.Json.Serialization; using dnlib.DotNet; +using Newtonsoft.Json; using ReCodeItLib.Models; +using JsonSerializer = System.Text.Json.JsonSerializer; namespace ReCodeItLib.Utils; @@ -92,6 +94,12 @@ public static class DataProvider var itemsPath = Path.Combine(DataPath, "items.json"); var jsonText = File.ReadAllText(itemsPath); - return JsonSerializer.Deserialize>(jsonText)!; + JsonSerializerOptions settings = new() + { + RespectNullableAnnotations = true, + PropertyNameCaseInsensitive = true + }; + + return JsonSerializer.Deserialize>(jsonText, settings)!; } } \ No newline at end of file