v1.1.3 Color Fix and Folder Fix

Tribow · Tribow · commit 6b9fd1651820 · 2025-04-14T17:57:04.000-04:00
- Properly saves color settings for cars so you don't have to redo color settings every time you open the game.
- No longer throws errors when you place cars in a folder named "Assets"
- Newtonsoft.json is no longer in use. Now using JsonFx
diff --git a/Distance.CustomCar/Data/Car/CarBuilder.cs b/Distance.CustomCar/Data/Car/CarBuilder.cs
@@ -135,7 +135,7 @@ private Dictionary<string, GameObject> LoadAssetsBundles()
 				}
 			}
 
-			try
+			/*try
 			{
 				foreach (FileInfo assetsFile in assetsDirectory.GetFiles("*", SearchOption.AllDirectories).Concat(globalCarsDirectory.GetFiles("*", SearchOption.AllDirectories)).OrderBy(x => x.Name))
 				{
@@ -178,9 +178,9 @@ private Dictionary<string, GameObject> LoadAssetsBundles()
 			catch(Exception ex)
             {
 				Mod.Log.LogWarning("No Assets folder in the custom car folder.");
-            }
+            }*/
 
-			try
+			/*try
             {
 				DirectoryInfo otherAssetsDirectory = new DirectoryInfo(Path.Combine(Directory.GetParent(Directory.GetParent(Path.GetDirectoryName(System.Reflection.Assembly.GetCallingAssembly().Location)).ToString()).ToString(), "Assets"));
 
@@ -224,7 +224,7 @@ private Dictionary<string, GameObject> LoadAssetsBundles()
 			catch (Exception ex)
             {
 				Mod.Log.LogWarning($"No Assets folder in toplevel directory.");
-            }
+            }*/
 
 			DirectoryInfo profileDirectory = new DirectoryInfo(Directory.GetParent(Path.GetDirectoryName(System.Reflection.Assembly.GetCallingAssembly().Location)).ToString());
 
diff --git a/Distance.CustomCar/Distance.CustomCar.csproj b/Distance.CustomCar/Distance.CustomCar.csproj
@@ -42,6 +42,9 @@
     <Reference Include="BepInEx">
       <HintPath>..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Distance\BepInEx\core\BepInEx.dll</HintPath>
     </Reference>
+    <Reference Include="JsonFx, Version=2.0.1209.2802, Culture=neutral, PublicKeyToken=315052dd637f8a52, processorArchitecture=MSIL">
+      <HintPath>..\packages\JsonFx.2.0.1209.2802\lib\net35\JsonFx.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Json.Net.Unity3D.9.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -65,6 +68,7 @@
     <Compile Include="Data\Materials\MaterialPropertyExport.cs" />
     <Compile Include="Data\Materials\MaterialPropertyInfo.cs" />
     <Compile Include="Data\Materials\PropertyType.cs" />
+    <Compile Include="Extensions\System\Collections\Generic\DictionaryExtensions.cs" />
     <Compile Include="Extensions\UnityEngine\UnityEngine\GameObject.cs" />
     <Compile Include="FileSystem.cs" />
     <Compile Include="MessageBox.cs" />
diff --git a/Distance.CustomCar/Extensions/System/Collections/Generic/DictionaryExtensions.cs b/Distance.CustomCar/Extensions/System/Collections/Generic/DictionaryExtensions.cs
@@ -0,0 +1,55 @@
+﻿#pragma warning disable RCS1110
+using System.Collections.Generic;
+
+public static class DictionaryExtensions
+{
+    public static bool ContainsKey<T>(this Dictionary<string, object> obj, string key)
+    {
+        try
+        {
+            obj.GetItem<T>(key);
+            return true;
+        }
+        catch
+        {
+            return false;
+        }
+    }
+
+    public static T GetItem<T>(this Dictionary<string, object> obj, string key)
+    {
+        if (!obj.ContainsKey(key))
+        {
+            throw new KeyNotFoundException($"The key requested doesn't exist in store: '{key}'.");
+        }
+
+        try
+        {
+            return (T)System.Convert.ChangeType(obj[key], typeof(T));
+        }
+        catch (System.Exception e)
+        {
+            throw new System.Exception($"Failed type conversion exception has been thrown.", e);
+        }
+    }
+
+    public static T GetOrCreate<T>(this Dictionary<string, object> obj, string key) where T : new()
+    {
+        if (!obj.ContainsKey(key))
+        {
+            obj[key] = new T();
+        }
+
+        return obj.GetItem<T>(key);
+    }
+
+    public static T GetOrCreate<T>(this Dictionary<string, object> obj, string key, T defaultValue)
+    {
+        if (!obj.ContainsKey<T>(key))
+        {
+            obj[key] = defaultValue;
+        }
+
+        return obj.GetItem<T>(key);
+    }
+}
diff --git a/Distance.CustomCar/Plugin.cs b/Distance.CustomCar/Plugin.cs
@@ -15,7 +15,7 @@ public sealed class Mod : BaseUnityPlugin
         //Mod Details
         private const string modGUID = "Distance.CustomCar";
         private const string modName = "Custom Car";
-        private const string modVersion = "1.1.2";
+        private const string modVersion = "1.1.3";
 
         //Config Entry Strings
         public static string UseTrumpetKey = "Use Trumpet Horn";
diff --git a/Distance.CustomCar/ProfileCarColors.cs b/Distance.CustomCar/ProfileCarColors.cs
@@ -21,19 +21,21 @@ protected void Awake()
 			Save();
 		}
 
-		protected Section Profile(string profileName)
+		protected Dictionary<string, object> Profile(string profileName)
 		{
-			return Config.GetOrCreate(profileName, new Section());
+			Mod.Log.LogInfo("Assigning Profile Name...");
+			return Config.GetOrCreate(profileName, new Dictionary<string, object>());
 		}
 
-		protected Section Vehicle(string profileName, string vehicleName)
+		protected Dictionary<string, object> Vehicle(string profileName, string vehicleName)
 		{
-			return Profile(profileName).GetOrCreate(vehicleName, new Section());
+			Mod.Log.LogInfo("Assigning Vehicle Name...");
+			return Profile(profileName).GetOrCreate(vehicleName, new Dictionary<string, object>());
 		}
 
 		protected CarColors GetCarColors(string profileName, string vehicleName)
 		{
-			Section vehicle = Vehicle(profileName, vehicleName);
+			Dictionary<string, object> vehicle = Vehicle(profileName, vehicleName);
 			CarColors colors = new CarColors
 			{
 				primary_ = GetColor(vehicle, "primary", Colors.whiteSmoke),
@@ -45,28 +47,29 @@ protected CarColors GetCarColors(string profileName, string vehicleName)
 			return colors;
 		}
 
-		protected Color GetColor(Section vehicle, string category, Color defaultColor)
+		protected Color GetColor(Dictionary<string, object> vehicle, string category, Color defaultColor)
 		{
-			Section color = vehicle.GetOrCreate(category, new Section());
+				//Mod.Log.LogWarning(e);
+				Dictionary<string, object> color = vehicle.GetOrCreate(category, new Dictionary<string, object>());
 
-			var r = color.GetOrCreate("r", defaultColor.r);
-			var g = color.GetOrCreate("g", defaultColor.g);
-			var b = color.GetOrCreate("b", defaultColor.b);
-			var a = color.GetOrCreate("a", defaultColor.a);
+				float r = color.GetOrCreate("r", defaultColor.r);
+				float g = color.GetOrCreate("g", defaultColor.g);
+				float b = color.GetOrCreate("b", defaultColor.b);
+				float a = color.GetOrCreate("a", defaultColor.a);
 
-			return new Color(r, g, b, a);
+				return new Color(r, g, b, a);
 		}
 
 		protected void SetCarColors(string profileName, string vehicleName, CarColors colors)
 		{
-			Section vehicle = Vehicle(profileName, vehicleName);
+			Dictionary<string, object> vehicle = Vehicle(profileName, vehicleName);
 
 			vehicle["primary"] = ToSection(colors.primary_);
 			vehicle["secondary"] = ToSection(colors.secondary_);
 			vehicle["glow"] = ToSection(colors.glow_);
 			vehicle["sparkle"] = ToSection(colors.sparkle_);
 
-			Section profile = Profile(profileName);
+			Dictionary<string, object> profile = Profile(profileName);
 			profile[vehicleName] = vehicle;
 
 			Config[profileName] = profile;
@@ -108,7 +111,9 @@ public void LoadAll()
 					}
 
 					CarInfo carInfo = profileManager.CarInfos_[carIndex];
+					Mod.Log.LogInfo($"Getting car color in {currentProfile.FileName_}'s profile for the {carInfo.name_} car");
 					CarColors colors = GetCarColors(currentProfile.FileName_, carInfo.name_);
+					
 
 					carColors[carIndex] = colors;
 				}
diff --git a/Distance.CustomCar/Section.cs b/Distance.CustomCar/Section.cs
@@ -1,13 +1,11 @@
-﻿using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
+﻿using System;
 using System.Collections.Generic;
 
 namespace Distance.CustomCar
 {
     public class Section : Dictionary<string, object>
     {
-        public bool Dirty { get; protected set; }
+
         public event EventHandler<SettingsChangedEventArgs> ValueChanged;
 
         public new object this[string key]
@@ -34,42 +32,26 @@ public class Section : Dictionary<string, object>
                     base[key] = value;
                     ValueChanged?.Invoke(this, new SettingsChangedEventArgs(key, oldValue, base[key]));
                 }
-
-                Dirty = true;
             }
         }
 
         public T GetItem<T>(string key)
         {
             if (!ContainsKey(key))
             {
-                Mod.Log.LogInfo($"The key requested doesn't exist in store: '{key}'.");
+                Mod.Log.LogError($"The key requested doesn't exist in store: '{key}'.");
                 throw new KeyNotFoundException($"The key requested doesn't exist in store: '{key}'.");
             }
 
+
             try
             {
-                if (this[key] is JToken jToken)
-                    return jToken.ToObject<T>();
-
                 return (T)Convert.ChangeType(this[key], typeof(T));
             }
-            catch (JsonException je)
-            {
-                Mod.Log.LogInfo($"Failed to convert a JSON token to the requested type. String: {key} \n{je}");
-                throw new SettingsException("Failed to convert a JSON token to the requested type.", key, true, je);
-            }
             catch (Exception e)
             {
-                try
-                {
-                    return (T)Enum.ToObject(typeof(T), (long)this[key]);
-                }
-                catch
-                {
-                    Mod.Log.LogInfo($".NET type conversion exception has been thrown. String: {key} \n{e}");
-                    throw new SettingsException($".NET type conversion exception has been thrown.", key, false, e);
-                }
+                Mod.Log.LogWarning($"Failed type conversion exception has been thrown. String: {key} \n{e}");
+                throw new SettingsException($"Failed type conversion exception has been thrown.", key, false, e);
             }
         }
 
@@ -86,12 +68,14 @@ public T GetItem<T>(string key)
 
         public T GetOrCreate<T>(string key, T defaultValue)
         {
-            if (!ContainsKey(key))
+            if (!ContainsKey<T>(key))
             {
                 this[key] = defaultValue;
                 ValueChanged?.Invoke(this, new SettingsChangedEventArgs(key, null, this[key]));
             }
 
+            //Mod.Log.LogInfo(T.GetType());
+
             return GetItem<T>(key);
         }
 
diff --git a/Distance.CustomCar/Settings.cs b/Distance.CustomCar/Settings.cs
@@ -1,5 +1,5 @@
-﻿using Newtonsoft.Json;
-using Formatting = Newtonsoft.Json.Formatting;
+﻿using JsonFx.Json;
+using JsonFx.Serialization;
 using System;
 using System.IO;
 using System.Reflection;
@@ -25,65 +25,59 @@ public Settings(string fileName)
 
             if (File.Exists(FilePath))
             {
+                bool saveLater = false;
+
                 using (var sr = new StreamReader(FilePath))
                 {
-                    var json = sr.ReadToEnd();
+                    string json = sr.ReadToEnd();
+                    JsonReader reader = new JsonReader();
                     Section sec = null;
 
                     try
                     {
-                        sec = JsonConvert.DeserializeObject<Section>(json);
-                    }
-                    catch (JsonException je)
-                    {
-                        Mod.Log.LogInfo(je);
+                        sec = reader.Read<Section>(json);
                     }
                     catch (Exception e)
                     {
-                        Mod.Log.LogInfo(e);
+                        Mod.Log.LogWarning(e);
+                        saveLater = true;
                     }
 
-                    Mod.Log.LogInfo("Just Deserialized the json");
-
                     if (sec != null)
                     {
-                        foreach (var k in sec.Keys)
+                        foreach (string k in sec.Keys)
+                        {
                             Add(k, sec[k]);
+                        }
                     }
                 }
-            }
 
-            Dirty = false;
+                if (saveLater)
+                {
+                    Save();
+                }
+            }
         }
 
         public void Save(bool formatJson = true)
         {
             if (!Directory.Exists(SettingsDirectory))
                 Directory.CreateDirectory(SettingsDirectory);
 
+            DataWriterSettings st = new DataWriterSettings { PrettyPrint = formatJson };
+            JsonWriter writer = new JsonWriter(st);
+
             try
             {
                 using (var sw = new StreamWriter(FilePath, false))
                 {
-                    sw.WriteLine(JsonConvert.SerializeObject(this, Formatting.Indented));
+                    sw.WriteLine(writer.Write(this));
                 }
-
-                Dirty = false;
-            }
-            catch (JsonException je)
-            {
-                Mod.Log.LogInfo(je);
             }
             catch (Exception e)
             {
-                Mod.Log.LogInfo(e);
+                Mod.Log.LogWarning(e);
             }
         }
-
-        public void SaveIfDirty(bool formatJson = true)
-        {
-            if (Dirty)
-                Save(formatJson);
-        }
     }
 }
diff --git a/Distance.CustomCar/packages.config b/Distance.CustomCar/packages.config
@@ -1,4 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Json.Net.Unity3D" version="9.0.1" targetFramework="net35" />
+  <package id="JsonFx" version="2.0.1209.2802" targetFramework="net35" />
 </packages>

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ private Dictionary<string, GameObject> LoadAssetsBundles()`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`
`138`		`- try`
	`138`	`+ /*try`
`139`	`139`	`{`
`140`	`140`	`foreach (FileInfo assetsFile in assetsDirectory.GetFiles("", SearchOption.AllDirectories).Concat(globalCarsDirectory.GetFiles("", SearchOption.AllDirectories)).OrderBy(x => x.Name))`
`141`	`141`	`{`
`@@ -178,9 +178,9 @@ private Dictionary<string, GameObject> LoadAssetsBundles()`
`178`	`178`	`catch(Exception ex)`
`179`	`179`	`{`
`180`	`180`	`Mod.Log.LogWarning("No Assets folder in the custom car folder.");`
`181`		`- }`
	`181`	`+ }*/`
`182`	`182`
`183`		`- try`
	`183`	`+ /*try`
`184`	`184`	`{`
`185`	`185`	`DirectoryInfo otherAssetsDirectory = new DirectoryInfo(Path.Combine(Directory.GetParent(Directory.GetParent(Path.GetDirectoryName(System.Reflection.Assembly.GetCallingAssembly().Location)).ToString()).ToString(), "Assets"));`
`186`	`186`
`@@ -224,7 +224,7 @@ private Dictionary<string, GameObject> LoadAssetsBundles()`
`224`	`224`	`catch (Exception ex)`
`225`	`225`	`{`
`226`	`226`	`Mod.Log.LogWarning($"No Assets folder in toplevel directory.");`
`227`		`- }`
	`227`	`+ }*/`
`228`	`228`
`229`	`229`	`DirectoryInfo profileDirectory = new DirectoryInfo(Directory.GetParent(Path.GetDirectoryName(System.Reflection.Assembly.GetCallingAssembly().Location)).ToString());`
`230`	`230`
Original file line number	Diff line number	Diff line change
`@@ -21,19 +21,21 @@ protected void Awake()`
`21`	`21`	`Save();`
`22`	`22`	`}`
`23`	`23`
`24`		`- protected Section Profile(string profileName)`
	`24`	`+ protected Dictionary<string, object> Profile(string profileName)`
`25`	`25`	`{`
`26`		`- return Config.GetOrCreate(profileName, new Section());`
	`26`	`+ Mod.Log.LogInfo("Assigning Profile Name...");`
	`27`	`+ return Config.GetOrCreate(profileName, new Dictionary<string, object>());`
`27`	`28`	`}`
`28`	`29`
`29`		`- protected Section Vehicle(string profileName, string vehicleName)`
	`30`	`+ protected Dictionary<string, object> Vehicle(string profileName, string vehicleName)`
`30`	`31`	`{`
`31`		`- return Profile(profileName).GetOrCreate(vehicleName, new Section());`
	`32`	`+ Mod.Log.LogInfo("Assigning Vehicle Name...");`
	`33`	`+ return Profile(profileName).GetOrCreate(vehicleName, new Dictionary<string, object>());`
`32`	`34`	`}`
`33`	`35`
`34`	`36`	`protected CarColors GetCarColors(string profileName, string vehicleName)`
`35`	`37`	`{`
`36`		`- Section vehicle = Vehicle(profileName, vehicleName);`
	`38`	`+ Dictionary<string, object> vehicle = Vehicle(profileName, vehicleName);`
`37`	`39`	`CarColors colors = new CarColors`
`38`	`40`	`{`
`39`	`41`	`primary_ = GetColor(vehicle, "primary", Colors.whiteSmoke),`
`@@ -45,28 +47,29 @@ protected CarColors GetCarColors(string profileName, string vehicleName)`
`45`	`47`	`return colors;`
`46`	`48`	`}`
`47`	`49`
`48`		`- protected Color GetColor(Section vehicle, string category, Color defaultColor)`
	`50`	`+ protected Color GetColor(Dictionary<string, object> vehicle, string category, Color defaultColor)`
`49`	`51`	`{`
`50`		`- Section color = vehicle.GetOrCreate(category, new Section());`
	`52`	`+ //Mod.Log.LogWarning(e);`
	`53`	`+ Dictionary<string, object> color = vehicle.GetOrCreate(category, new Dictionary<string, object>());`
`51`	`54`
`52`		`- var r = color.GetOrCreate("r", defaultColor.r);`
`53`		`- var g = color.GetOrCreate("g", defaultColor.g);`
`54`		`- var b = color.GetOrCreate("b", defaultColor.b);`
`55`		`- var a = color.GetOrCreate("a", defaultColor.a);`
	`55`	`+ float r = color.GetOrCreate("r", defaultColor.r);`
	`56`	`+ float g = color.GetOrCreate("g", defaultColor.g);`
	`57`	`+ float b = color.GetOrCreate("b", defaultColor.b);`
	`58`	`+ float a = color.GetOrCreate("a", defaultColor.a);`
`56`	`59`
`57`		`- return new Color(r, g, b, a);`
	`60`	`+ return new Color(r, g, b, a);`
`58`	`61`	`}`
`59`	`62`
`60`	`63`	`protected void SetCarColors(string profileName, string vehicleName, CarColors colors)`
`61`	`64`	`{`
`62`		`- Section vehicle = Vehicle(profileName, vehicleName);`
	`65`	`+ Dictionary<string, object> vehicle = Vehicle(profileName, vehicleName);`
`63`	`66`
`64`	`67`	`vehicle["primary"] = ToSection(colors.primary_);`
`65`	`68`	`vehicle["secondary"] = ToSection(colors.secondary_);`
`66`	`69`	`vehicle["glow"] = ToSection(colors.glow_);`
`67`	`70`	`vehicle["sparkle"] = ToSection(colors.sparkle_);`
`68`	`71`
`69`		`- Section profile = Profile(profileName);`
	`72`	`+ Dictionary<string, object> profile = Profile(profileName);`
`70`	`73`	`profile[vehicleName] = vehicle;`
`71`	`74`
`72`	`75`	`Config[profileName] = profile;`
`@@ -108,7 +111,9 @@ public void LoadAll()`
`108`	`111`	`}`
`109`	`112`
`110`	`113`	`CarInfo carInfo = profileManager.CarInfos_[carIndex];`
	`114`	`+ Mod.Log.LogInfo($"Getting car color in {currentProfile.FileName_}'s profile for the {carInfo.name_} car");`
`111`	`115`	`CarColors colors = GetCarColors(currentProfile.FileName_, carInfo.name_);`
	`116`	`+`
`112`	`117`
`113`	`118`	`carColors[carIndex] = colors;`
`114`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,11 @@`
`1`		`-using Newtonsoft.Json;`
`2`		`-using Newtonsoft.Json.Linq;`
`3`		`-using System;`
	`1`	`+using System;`
`4`	`2`	`using System.Collections.Generic;`
`5`	`3`
`6`	`4`	`namespace Distance.CustomCar`
`7`	`5`	`{`
`8`	`6`	`public class Section : Dictionary<string, object>`
`9`	`7`	`{`
`10`		`- public bool Dirty { get; protected set; }`
	`8`	`+`
`11`	`9`	`public event EventHandler<SettingsChangedEventArgs> ValueChanged;`
`12`	`10`
`13`	`11`	`public new object this[string key]`
`@@ -34,42 +32,26 @@ public class Section : Dictionary<string, object>`
`34`	`32`	`base[key] = value;`
`35`	`33`	`ValueChanged?.Invoke(this, new SettingsChangedEventArgs(key, oldValue, base[key]));`
`36`	`34`	`}`
`37`		`-`
`38`		`- Dirty = true;`
`39`	`35`	`}`
`40`	`36`	`}`
`41`	`37`
`42`	`38`	`public T GetItem<T>(string key)`
`43`	`39`	`{`
`44`	`40`	`if (!ContainsKey(key))`
`45`	`41`	`{`
`46`		`- Mod.Log.LogInfo($"The key requested doesn't exist in store: '{key}'.");`
	`42`	`+ Mod.Log.LogError($"The key requested doesn't exist in store: '{key}'.");`
`47`	`43`	`throw new KeyNotFoundException($"The key requested doesn't exist in store: '{key}'.");`
`48`	`44`	`}`
`49`	`45`
	`46`	`+`
`50`	`47`	`try`
`51`	`48`	`{`
`52`		`- if (this[key] is JToken jToken)`
`53`		`- return jToken.ToObject<T>();`
`54`		`-`
`55`	`49`	`return (T)Convert.ChangeType(this[key], typeof(T));`
`56`	`50`	`}`
`57`		`- catch (JsonException je)`
`58`		`- {`
`59`		`- Mod.Log.LogInfo($"Failed to convert a JSON token to the requested type. String: {key} \n{je}");`
`60`		`- throw new SettingsException("Failed to convert a JSON token to the requested type.", key, true, je);`
`61`		`- }`
`62`	`51`	`catch (Exception e)`
`63`	`52`	`{`
`64`		`- try`
`65`		`- {`
`66`		`- return (T)Enum.ToObject(typeof(T), (long)this[key]);`
`67`		`- }`
`68`		`- catch`
`69`		`- {`
`70`		`- Mod.Log.LogInfo($".NET type conversion exception has been thrown. String: {key} \n{e}");`
`71`		`- throw new SettingsException($".NET type conversion exception has been thrown.", key, false, e);`
`72`		`- }`
	`53`	`+ Mod.Log.LogWarning($"Failed type conversion exception has been thrown. String: {key} \n{e}");`
	`54`	`+ throw new SettingsException($"Failed type conversion exception has been thrown.", key, false, e);`
`73`	`55`	`}`
`74`	`56`	`}`
`75`	`57`
`@@ -86,12 +68,14 @@ public T GetItem<T>(string key)`
`86`	`68`
`87`	`69`	`public T GetOrCreate<T>(string key, T defaultValue)`
`88`	`70`	`{`
`89`		`- if (!ContainsKey(key))`
	`71`	`+ if (!ContainsKey<T>(key))`
`90`	`72`	`{`
`91`	`73`	`this[key] = defaultValue;`
`92`	`74`	`ValueChanged?.Invoke(this, new SettingsChangedEventArgs(key, null, this[key]));`
`93`	`75`	`}`
`94`	`76`
	`77`	`+ //Mod.Log.LogInfo(T.GetType());`
	`78`	`+`
`95`	`79`	`return GetItem<T>(key);`
`96`	`80`	`}`
`97`	`81`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-using Newtonsoft.Json;`
`2`		`-using Formatting = Newtonsoft.Json.Formatting;`
	`1`	`+using JsonFx.Json;`
	`2`	`+using JsonFx.Serialization;`
`3`	`3`	`using System;`
`4`	`4`	`using System.IO;`
`5`	`5`	`using System.Reflection;`
`@@ -25,65 +25,59 @@ public Settings(string fileName)`
`25`	`25`
`26`	`26`	`if (File.Exists(FilePath))`
`27`	`27`	`{`
	`28`	`+ bool saveLater = false;`
	`29`	`+`
`28`	`30`	`using (var sr = new StreamReader(FilePath))`
`29`	`31`	`{`
`30`		`- var json = sr.ReadToEnd();`
	`32`	`+ string json = sr.ReadToEnd();`
	`33`	`+ JsonReader reader = new JsonReader();`
`31`	`34`	`Section sec = null;`
`32`	`35`
`33`	`36`	`try`
`34`	`37`	`{`
`35`		`- sec = JsonConvert.DeserializeObject<Section>(json);`
`36`		`- }`
`37`		`- catch (JsonException je)`
`38`		`- {`
`39`		`- Mod.Log.LogInfo(je);`
	`38`	`+ sec = reader.Read<Section>(json);`
`40`	`39`	`}`
`41`	`40`	`catch (Exception e)`
`42`	`41`	`{`
`43`		`- Mod.Log.LogInfo(e);`
	`42`	`+ Mod.Log.LogWarning(e);`
	`43`	`+ saveLater = true;`
`44`	`44`	`}`
`45`	`45`
`46`		`- Mod.Log.LogInfo("Just Deserialized the json");`
`47`		`-`
`48`	`46`	`if (sec != null)`
`49`	`47`	`{`
`50`		`- foreach (var k in sec.Keys)`
	`48`	`+ foreach (string k in sec.Keys)`
	`49`	`+ {`
`51`	`50`	`Add(k, sec[k]);`
	`51`	`+ }`
`52`	`52`	`}`
`53`	`53`	`}`
`54`		`- }`
`55`	`54`
`56`		`- Dirty = false;`
	`55`	`+ if (saveLater)`
	`56`	`+ {`
	`57`	`+ Save();`
	`58`	`+ }`
	`59`	`+ }`
`57`	`60`	`}`
`58`	`61`
`59`	`62`	`public void Save(bool formatJson = true)`
`60`	`63`	`{`
`61`	`64`	`if (!Directory.Exists(SettingsDirectory))`
`62`	`65`	`Directory.CreateDirectory(SettingsDirectory);`
`63`	`66`
	`67`	`+ DataWriterSettings st = new DataWriterSettings { PrettyPrint = formatJson };`
	`68`	`+ JsonWriter writer = new JsonWriter(st);`
	`69`	`+`
`64`	`70`	`try`
`65`	`71`	`{`
`66`	`72`	`using (var sw = new StreamWriter(FilePath, false))`
`67`	`73`	`{`
`68`		`- sw.WriteLine(JsonConvert.SerializeObject(this, Formatting.Indented));`
	`74`	`+ sw.WriteLine(writer.Write(this));`
`69`	`75`	`}`
`70`		`-`
`71`		`- Dirty = false;`
`72`		`- }`
`73`		`- catch (JsonException je)`
`74`		`- {`
`75`		`- Mod.Log.LogInfo(je);`
`76`	`76`	`}`
`77`	`77`	`catch (Exception e)`
`78`	`78`	`{`
`79`		`- Mod.Log.LogInfo(e);`
	`79`	`+ Mod.Log.LogWarning(e);`
`80`	`80`	`}`
`81`	`81`	`}`
`82`		`-`
`83`		`- public void SaveIfDirty(bool formatJson = true)`
`84`		`- {`
`85`		`- if (Dirty)`
`86`		`- Save(formatJson);`
`87`		`- }`
`88`	`82`	`}`
`89`	`83`	`}`