Merge pull request #447 from amazingalek/dev

2.5.0

Author: misternebula

src/OWML.Common/Interfaces/IModStorage.cs

@@ -1,8 +1,10 @@
-namespace OWML.Common
+using Newtonsoft.Json;
+
+namespace OWML.Common
 {
 	public interface IModStorage
 	{
-		T Load<T>(string filename);
+		T Load<T>(string filename, bool fixBackslashes = true, JsonSerializerSettings settings = null);
 
 		void Save<T>(T obj, string filename);
 	}

src/OWML.Launcher/OWML.Manifest.json

@@ -2,7 +2,7 @@
   "author": "Alek",
   "name": "OWML",
   "uniqueName": "Alek.OWML",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "minGameVersion": "1.1.10.47",
   "maxGameVersion": "1.1.12.201"
 }

src/OWML.ModHelper/ModStorage.cs

@@ -1,4 +1,5 @@
-using OWML.Common;
+using Newtonsoft.Json;
+using OWML.Common;
 using OWML.Utils;
 
 namespace OWML.ModHelper
@@ -14,11 +15,11 @@ public ModStorage(IModManifest manifest, IModConsole console)
 			_console = console;
 		}
 
-		public T Load<T>(string filename)
+		public T Load<T>(string filename, bool fixBackslashes = true, JsonSerializerSettings settings = null)
 		{
 			var path = _manifest.ModFolderPath + filename;
 			_console.WriteLine($"Loading config from {path}", MessageType.Debug);
-			return JsonHelper.LoadJsonObject<T>(path);
+			return JsonHelper.LoadJsonObject<T>(path, fixBackslashes, settings);
 		}
 
 		public void Save<T>(T obj, string filename)