mirror of
https://github.com/sp-tarkov/assembly-tool.git
synced 2025-02-12 15:10:44 -05:00
Remove newtonsoft and use System.Text instead
This commit is contained in:
parent
354ffc3d56
commit
65aec4b7c0
@ -10,7 +10,6 @@
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="dnlib" Version="4.4.0" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@ -1,5 +1,5 @@
|
||||
using dnlib.DotNet;
|
||||
using Newtonsoft.Json;
|
||||
using System.Text.Json;
|
||||
using dnlib.DotNet;
|
||||
using ReCodeItLib.Models;
|
||||
|
||||
namespace ReCodeItLib.Utils;
|
||||
@ -27,8 +27,8 @@ public static class DataProvider
|
||||
}
|
||||
|
||||
var jsonText = File.ReadAllText(path);
|
||||
|
||||
var remaps = JsonConvert.DeserializeObject<List<RemapModel>>(jsonText);
|
||||
|
||||
var remaps = JsonSerializer.Deserialize<List<RemapModel>>(jsonText);
|
||||
|
||||
return remaps ?? [];
|
||||
}
|
||||
@ -40,13 +40,13 @@ public static class DataProvider
|
||||
File.Create(path).Close();
|
||||
}
|
||||
|
||||
JsonSerializerSettings settings = new()
|
||||
JsonSerializerOptions settings = new()
|
||||
{
|
||||
NullValueHandling = ignoreNull ? NullValueHandling.Ignore : NullValueHandling.Include,
|
||||
Formatting = Formatting.Indented
|
||||
WriteIndented = true,
|
||||
RespectNullableAnnotations = ignoreNull
|
||||
};
|
||||
|
||||
var jsonText = JsonConvert.SerializeObject(remaps, settings);
|
||||
var jsonText = JsonSerializer.Serialize(remaps, settings);
|
||||
|
||||
File.WriteAllText(path, jsonText);
|
||||
|
||||
@ -73,7 +73,7 @@ public static class DataProvider
|
||||
var settingsPath = Path.Combine(DataPath, "Settings.jsonc");
|
||||
var jsonText = File.ReadAllText(settingsPath);
|
||||
|
||||
return JsonConvert.DeserializeObject<Settings>(jsonText);
|
||||
return JsonSerializer.Deserialize<Settings>(jsonText)!;
|
||||
}
|
||||
|
||||
private static Dictionary<string, ItemTemplateModel> LoadItems()
|
||||
@ -81,6 +81,6 @@ public static class DataProvider
|
||||
var itemsPath = Path.Combine(DataPath, "items.json");
|
||||
var jsonText = File.ReadAllText(itemsPath);
|
||||
|
||||
return JsonConvert.DeserializeObject<Dictionary<string, ItemTemplateModel>>(jsonText);
|
||||
return JsonSerializer.Deserialize<Dictionary<string, ItemTemplateModel>>(jsonText)!;
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user