From 65aec4b7c0d1aa390b0e8065292f1aae9d16e3ae Mon Sep 17 00:00:00 2001
From: Cj <161484149+CJ-SPT@users.noreply.github.com>
Date: Sat, 11 Jan 2025 02:30:18 -0500
Subject: [PATCH] Remove newtonsoft and use System.Text instead

---
 RecodeItLib/ReCodeItLib.csproj    |  1 -
 RecodeItLib/Utils/DataProvider.cs | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/RecodeItLib/ReCodeItLib.csproj b/RecodeItLib/ReCodeItLib.csproj
index d4335ff..e28f504 100644
--- a/RecodeItLib/ReCodeItLib.csproj
+++ b/RecodeItLib/ReCodeItLib.csproj
@@ -10,7 +10,6 @@
   
   <ItemGroup>
     <PackageReference Include="dnlib" Version="4.4.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/RecodeItLib/Utils/DataProvider.cs b/RecodeItLib/Utils/DataProvider.cs
index 5832082..891bd96 100644
--- a/RecodeItLib/Utils/DataProvider.cs
+++ b/RecodeItLib/Utils/DataProvider.cs
@@ -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)!;
     }
 }
\ No newline at end of file