diff --git a/SRML/SRML.csproj b/SRML/SRML.csproj index fade635..01cd5ae 100644 --- a/SRML/SRML.csproj +++ b/SRML/SRML.csproj @@ -81,9 +81,14 @@ ..\packages\MonoMod.Utils.21.4.21.3\lib\net40\MonoMod.Utils.dll False + + ..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + - + + True + ..\libs\Unity.TextMeshPro.dll False diff --git a/SRML/SRModLoader.cs b/SRML/SRModLoader.cs index 6fe5d93..d88a597 100644 --- a/SRML/SRModLoader.cs +++ b/SRML/SRModLoader.cs @@ -6,6 +6,7 @@ using System.IO; using System.Linq; using System.Reflection; +using Newtonsoft.Json; using Exception = System.Exception; namespace SRML @@ -300,14 +301,11 @@ public static ProtoMod ParseFromJson(String jsonFile) public static ProtoMod ParseFromJson(String jsonData, string path) { - //var proto = - // JsonConvert.DeserializeObject(jsonData); - //proto.path = Path.GetDirectoryName(path); - //proto.entryFile = path; - //proto.ValidateFields(); - //return proto; - - return null; + var proto = JsonConvert.DeserializeObject(jsonData); + proto.path = Path.GetDirectoryName(path); + proto.entryFile = path; + proto.ValidateFields(); + return proto; } /// diff --git a/libs/System.Runtime.Serialization.dll b/libs/System.Runtime.Serialization.dll new file mode 100644 index 0000000..9557d9d Binary files /dev/null and b/libs/System.Runtime.Serialization.dll differ