Merge branch 'develop' into stable

4 files changed, 11 insertions, 41 deletions

diff --git a/src/SMAPI/Framework/Serialisation/SmapiConverters/ModCompatibilityArrayConverter.cs b/src/SMAPI/Framework/Serialisation/SmapiConverters/ManifestContentPackForConverter.cs
index 3232dde4..af7558f6 100644
--- a/src/SMAPI/Framework/Serialisation/SmapiConverters/ModCompatibilityArrayConverter.cs
+++ b/src/SMAPI/Framework/Serialisation/SmapiConverters/ManifestContentPackForConverter.cs
@@ -1,13 +1,11 @@
 using System;
-using System.Collections.Generic;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using StardewModdingAPI.Framework.Models;
 
 namespace StardewModdingAPI.Framework.Serialisation.SmapiConverters
 {
-    /// <summary>Handles deserialisation of <see cref="ModCompatibility"/> arrays.</summary>
-    internal class ModCompatibilityArrayConverter : JsonConverter
+    /// <summary>Handles deserialisation of <see cref="IManifestContentPackFor"/> arrays.</summary>
+    internal class ManifestContentPackForConverter : JsonConverter
     {
         /*********
         ** Accessors
@@ -23,7 +21,7 @@ namespace StardewModdingAPI.Framework.Serialisation.SmapiConverters
         /// <param name="objectType">The object type.</param>
         public override bool CanConvert(Type objectType)
         {
-            return objectType == typeof(ModCompatibility[]);
+            return objectType == typeof(IManifestContentPackFor[]);
         }
 
 
@@ -37,16 +35,7 @@ namespace StardewModdingAPI.Framework.Serialisation.SmapiConverters
         /// <param name="serializer">The calling serializer.</param>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            List<ModCompatibility> result = new List<ModCompatibility>();
-            foreach (JProperty property in JObject.Load(reader).Properties())
-            {
-                string range = property.Name;
-                ModStatus status = (ModStatus)Enum.Parse(typeof(ModStatus), property.Value.Value<string>(nameof(ModCompatibility.Status)));
-                string reasonPhrase = property.Value.Value<string>(nameof(ModCompatibility.ReasonPhrase));
-
-                result.Add(new ModCompatibility(range, status, reasonPhrase));
-            }
-            return result.ToArray();
+            return serializer.Deserialize<ManifestContentPackFor>(reader);
         }
 
         /// <summary>Writes the JSON representation of the object.</summary>
diff --git a/src/SMAPI/Framework/Serialisation/SmapiConverters/ManifestDependencyArrayConverter.cs b/src/SMAPI/Framework/Serialisation/SmapiConverters/ManifestDependencyArrayConverter.cs
index 6352e367..4150d5fb 100644
--- a/src/SMAPI/Framework/Serialisation/SmapiConverters/ManifestDependencyArrayConverter.cs
+++ b/src/SMAPI/Framework/Serialisation/SmapiConverters/ManifestDependencyArrayConverter.cs
@@ -40,9 +40,9 @@ namespace StardewModdingAPI.Framework.Serialisation.SmapiConverters
             List<IManifestDependency> result = new List<IManifestDependency>();
             foreach (JObject obj in JArray.Load(reader).Children<JObject>())
             {
-                string uniqueID = obj.Value<string>(nameof(IManifestDependency.UniqueID));
-                string minVersion = obj.Value<string>(nameof(IManifestDependency.MinimumVersion));
-                bool required = obj.Value<bool?>(nameof(IManifestDependency.IsRequired)) ?? true;
+                string uniqueID = obj.ValueIgnoreCase<string>(nameof(IManifestDependency.UniqueID));
+                string minVersion = obj.ValueIgnoreCase<string>(nameof(IManifestDependency.MinimumVersion));
+                bool required = obj.ValueIgnoreCase<bool?>(nameof(IManifestDependency.IsRequired)) ?? true;
                 result.Add(new ManifestDependency(uniqueID, minVersion, required));
             }
             return result.ToArray();
diff --git a/src/SMAPI/Framework/Serialisation/SmapiConverters/ModDataIdConverter.cs b/src/SMAPI/Framework/Serialisation/SmapiConverters/ModDataIdConverter.cs
deleted file mode 100644
index 8a10db47..00000000
--- a/src/SMAPI/Framework/Serialisation/SmapiConverters/ModDataIdConverter.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using StardewModdingAPI.Framework.Models;
-
-namespace StardewModdingAPI.Framework.Serialisation.SmapiConverters
-{
-    /// <summary>Handles deserialisation of <see cref="ModDataID"/>.</summary>
-    internal class ModDataIdConverter : SimpleReadOnlyConverter<ModDataID>
-    {
-        /*********
-        ** Protected methods
-        *********/
-        /// <summary>Read a JSON string.</summary>
-        /// <param name="str">The JSON string value.</param>
-        /// <param name="path">The path to the current JSON node.</param>
-        protected override ModDataID ReadString(string str, string path)
-        {
-            return new ModDataID(str);
-        }
-    }
-}
diff --git a/src/SMAPI/Framework/Serialisation/SmapiConverters/SemanticVersionConverter.cs b/src/SMAPI/Framework/Serialisation/SmapiConverters/SemanticVersionConverter.cs
index 50181809..7ee7e29b 100644
--- a/src/SMAPI/Framework/Serialisation/SmapiConverters/SemanticVersionConverter.cs
+++ b/src/SMAPI/Framework/Serialisation/SmapiConverters/SemanticVersionConverter.cs
@@ -14,10 +14,10 @@ namespace StardewModdingAPI.Framework.Serialisation.SmapiConverters
         /// <param name="path">The path to the current JSON node.</param>
         protected override ISemanticVersion ReadObject(JObject obj, string path)
         {
-            int major = obj.Value<int>(nameof(ISemanticVersion.MajorVersion));
-            int minor = obj.Value<int>(nameof(ISemanticVersion.MinorVersion));
-            int patch = obj.Value<int>(nameof(ISemanticVersion.PatchVersion));
-            string build = obj.Value<string>(nameof(ISemanticVersion.Build));
+            int major = obj.ValueIgnoreCase<int>(nameof(ISemanticVersion.MajorVersion));
+            int minor = obj.ValueIgnoreCase<int>(nameof(ISemanticVersion.MinorVersion));
+            int patch = obj.ValueIgnoreCase<int>(nameof(ISemanticVersion.PatchVersion));
+            string build = obj.ValueIgnoreCase<string>(nameof(ISemanticVersion.Build));
             return new LegacyManifestVersion(major, minor, patch, build);
         }