spt/assembly-tool
spt/assembly-tool
0
0
Fork 0
mirror of https://github.com/sp-tarkov/assembly-tool.git synced 2025-02-12 21:10:45 -05:00
Code

Remove newtonsoft and use System.Text instead

Browse Source
This commit is contained in:
Cj 2025-01-11 02:30:18 -05:00
parent 354ffc3d56
commit 65aec4b7c0
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RecodeItLib/ReCodeItLib.csproj
View File

@ -10,7 +10,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="dnlib" Version="4.4.0" /> <PackageReference Include="dnlib" Version="4.4.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

20
RecodeItLib/Utils/DataProvider.cs
View File

@ -1,5 +1,5 @@
using dnlib.DotNet; using System.Text.Json;
using Newtonsoft.Json; using dnlib.DotNet;
using ReCodeItLib.Models; using ReCodeItLib.Models;
namespace ReCodeItLib.Utils; namespace ReCodeItLib.Utils;
@ -27,8 +27,8 @@ public static class DataProvider
} }
var jsonText = File.ReadAllText(path); var jsonText = File.ReadAllText(path);
var remaps = JsonConvert.DeserializeObject<List<RemapModel>>(jsonText); var remaps = JsonSerializer.Deserialize<List<RemapModel>>(jsonText);
return remaps ?? []; return remaps ?? [];
} }
@ -40,13 +40,13 @@ public static class DataProvider
File.Create(path).Close(); File.Create(path).Close();
} }
JsonSerializerSettings settings = new() JsonSerializerOptions settings = new()
{ {
NullValueHandling = ignoreNull ? NullValueHandling.Ignore : NullValueHandling.Include, WriteIndented = true,
Formatting = Formatting.Indented RespectNullableAnnotations = ignoreNull
}; };
var jsonText = JsonConvert.SerializeObject(remaps, settings); var jsonText = JsonSerializer.Serialize(remaps, settings);
File.WriteAllText(path, jsonText); File.WriteAllText(path, jsonText);
@ -73,7 +73,7 @@ public static class DataProvider
var settingsPath = Path.Combine(DataPath, "Settings.jsonc"); var settingsPath = Path.Combine(DataPath, "Settings.jsonc");
var jsonText = File.ReadAllText(settingsPath); var jsonText = File.ReadAllText(settingsPath);
return JsonConvert.DeserializeObject<Settings>(jsonText); return JsonSerializer.Deserialize<Settings>(jsonText)!;
} }
private static Dictionary<string, ItemTemplateModel> LoadItems() private static Dictionary<string, ItemTemplateModel> LoadItems()
@ -81,6 +81,6 @@ public static class DataProvider
var itemsPath = Path.Combine(DataPath, "items.json"); var itemsPath = Path.Combine(DataPath, "items.json");
var jsonText = File.ReadAllText(itemsPath); var jsonText = File.ReadAllText(itemsPath);
return JsonConvert.DeserializeObject<Dictionary<string, ItemTemplateModel>>(jsonText); return JsonSerializer.Deserialize<Dictionary<string, ItemTemplateModel>>(jsonText)!;
} }
} }