Merge branch 'develop' into stable

3 files changed, 26 insertions, 40 deletions

diff --git a/src/SMAPI/Framework/Serialisation/JsonHelper.cs b/src/SMAPI/Framework/Serialisation/JsonHelper.cs
index 3193aa3c..d923ec0c 100644
--- a/src/SMAPI/Framework/Serialisation/JsonHelper.cs
+++ b/src/SMAPI/Framework/Serialisation/JsonHelper.cs
@@ -1,9 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using Microsoft.Xna.Framework.Input;
 using Newtonsoft.Json;
-using StardewModdingAPI.Utilities;
 
 namespace StardewModdingAPI.Framework.Serialisation
 {
@@ -20,7 +19,9 @@ namespace StardewModdingAPI.Framework.Serialisation
             ObjectCreationHandling = ObjectCreationHandling.Replace, // avoid issue where default ICollection<T> values are duplicated each time the config is loaded
             Converters = new List<JsonConverter>
             {
-                new SelectiveStringEnumConverter(typeof(Buttons), typeof(Keys), typeof(SButton))
+                new StringEnumConverter<Buttons>(),
+                new StringEnumConverter<Keys>(),
+                new StringEnumConverter<SButton>()
             }
         };
 
diff --git a/src/SMAPI/Framework/Serialisation/SelectiveStringEnumConverter.cs b/src/SMAPI/Framework/Serialisation/SelectiveStringEnumConverter.cs
deleted file mode 100644
index 37108556..00000000
--- a/src/SMAPI/Framework/Serialisation/SelectiveStringEnumConverter.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Newtonsoft.Json.Converters;
-
-namespace StardewModdingAPI.Framework.Serialisation
-{
-    /// <summary>A variant of <see cref="StringEnumConverter"/> which only converts certain enums.</summary>
-    internal class SelectiveStringEnumConverter : StringEnumConverter
-    {
-        /*********
-        ** Properties
-        *********/
-        /// <summary>The enum type names to convert.</summary>
-        private readonly HashSet<string> Types;
-
-
-        /*********
-        ** Public methods
-        *********/
-        /// <summary>Construct an instance.</summary>
-        /// <param name="types">The enum types to convert.</param>
-        public SelectiveStringEnumConverter(params Type[] types)
-        {
-            this.Types = new HashSet<string>(types.Select(p => p.FullName));
-        }
-
-        /// <summary>Get whether this instance can convert the specified object type.</summary>
-        /// <param name="type">The object type.</param>
-        public override bool CanConvert(Type type)
-        {
-            return
-                base.CanConvert(type)
-                && this.Types.Contains((Nullable.GetUnderlyingType(type) ?? type).FullName);
-        }
-    }
-}
diff --git a/src/SMAPI/Framework/Serialisation/StringEnumConverter.cs b/src/SMAPI/Framework/Serialisation/StringEnumConverter.cs
new file mode 100644
index 00000000..7afe86cd
--- /dev/null
+++ b/src/SMAPI/Framework/Serialisation/StringEnumConverter.cs
@@ -0,0 +1,22 @@
+using System;
+using Newtonsoft.Json.Converters;
+
+namespace StardewModdingAPI.Framework.Serialisation
+{
+    /// <summary>A variant of <see cref="StringEnumConverter"/> which only converts a specified enum.</summary>
+    /// <typeparam name="T">The enum type.</typeparam>
+    internal class StringEnumConverter<T> : StringEnumConverter
+    {
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Get whether this instance can convert the specified object type.</summary>
+        /// <param name="type">The object type.</param>
+        public override bool CanConvert(Type type)
+        {
+            return
+                base.CanConvert(type)
+                && (Nullable.GetUnderlyingType(type) ?? type) == typeof(T);
+        }
+    }
+}