Merge pull request #435 from bid-soft/dev

SimpleJson: fixed de/serialization for dictionaries
Valheim-Modding · Jul 31, 2024 · adc5b07 · adc5b07
2 parents 91c2183 + c62e1af
commit adc5b07
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/JotunnLib/Utils/SimpleJson.cs b/JotunnLib/Utils/SimpleJson.cs
@@ -1,4 +1,4 @@
-//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
 // <copyright file="SimpleJson.cs" company="The Outercurve Foundation">
 //    Copyright (c) 2011, The Outercurve Foundation.
 //
@@ -1387,6 +1387,19 @@ public virtual object DeserializeObject(object value, Type type)
                             ? Convert.ChangeType(value, type, CultureInfo.InvariantCulture)
                             : value;
             }
+            else if (value is JsonArray && ReflectionUtils.IsTypeDictionary(type))
+            {
+                var jarray = (JsonArray)value;
+
+                Type[] types = ReflectionUtils.GetGenericTypeArguments(type);
+                Type keyType = types[0];
+                Type valueType = types[1];
+                Type genericType = typeof(Dictionary<,>).MakeGenericType(keyType, valueType);
+                IDictionary dict = (IDictionary)ConstructorCache[genericType]();
+
+                foreach (JsonObject elem in jarray) dict.Add(DeserializeObject(elem[0], keyType), DeserializeObject(elem[1], valueType));
+                obj = dict;
+            }
             else
             {
                 IDictionary<string, object> objects = value as IDictionary<string, object>;
@@ -1416,7 +1429,10 @@ public virtual object DeserializeObject(object value, Type type)
                             obj = value;
                         else
                         {
-                            obj = ConstructorCache[type]();
+                            var constructorDelegate = ConstructorCache[type];
+                            if (constructorDelegate != null) obj = constructorDelegate();
+                            else throw new MissingMethodException($"No default constructor found for {type}");
+
                             foreach (KeyValuePair<string, KeyValuePair<Type, ReflectionUtils.SetDelegate>> setter in SetCache[type])
                             {
                                 object jsonValue;