From 454a2de2949deae90de4a936fb8fa7341d4a2990 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sat, 20 Jan 2018 21:45:21 -0500
Subject: split SFieldConverter into separate converters

---
 src/SMAPI/Framework/Models/Manifest.cs      | 9 ++++-----
 src/SMAPI/Framework/Models/ModDataRecord.cs | 7 +++----
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'src/SMAPI/Framework/Models')

diff --git a/src/SMAPI/Framework/Models/Manifest.cs b/src/SMAPI/Framework/Models/Manifest.cs
index c362be9b..f9762406 100644
--- a/src/SMAPI/Framework/Models/Manifest.cs
+++ b/src/SMAPI/Framework/Models/Manifest.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using StardewModdingAPI.Framework.Serialisation;
-using StardewModdingAPI.Framework.Serialisation.Converters;
+using StardewModdingAPI.Framework.Serialisation.SmapiConverters;
 
 namespace StardewModdingAPI.Framework.Models
 {
@@ -21,18 +20,18 @@ namespace StardewModdingAPI.Framework.Models
         public string Author { get; set; }
 
         /// <summary>The mod version.</summary>
-        [JsonConverter(typeof(SFieldConverter))]
+        [JsonConverter(typeof(SemanticVersionConverter))]
         public ISemanticVersion Version { get; set; }
 
         /// <summary>The minimum SMAPI version required by this mod, if any.</summary>
-        [JsonConverter(typeof(SFieldConverter))]
+        [JsonConverter(typeof(SemanticVersionConverter))]
         public ISemanticVersion MinimumApiVersion { get; set; }
 
         /// <summary>The name of the DLL in the directory that has the <see cref="IMod.Entry"/> method.</summary>
         public string EntryDll { get; set; }
 
         /// <summary>The other mods that must be loaded before this mod.</summary>
-        [JsonConverter(typeof(SFieldConverter))]
+        [JsonConverter(typeof(ManifestDependencyArrayConverter))]
         public IManifestDependency[] Dependencies { get; set; }
 
         /// <summary>The namespaced mod IDs to query for updates (like <c>Nexus:541</c>).</summary>
diff --git a/src/SMAPI/Framework/Models/ModDataRecord.cs b/src/SMAPI/Framework/Models/ModDataRecord.cs
index fa6fc68d..580acb70 100644
--- a/src/SMAPI/Framework/Models/ModDataRecord.cs
+++ b/src/SMAPI/Framework/Models/ModDataRecord.cs
@@ -1,8 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
-using StardewModdingAPI.Framework.Serialisation;
-using StardewModdingAPI.Framework.Serialisation.Converters;
+using StardewModdingAPI.Framework.Serialisation.SmapiConverters;
 
 namespace StardewModdingAPI.Framework.Models
 {
@@ -13,7 +12,7 @@ namespace StardewModdingAPI.Framework.Models
         ** Accessors
         *********/
         /// <summary>The unique mod identifier.</summary>
-        [JsonConverter(typeof(SFieldConverter))]
+        [JsonConverter(typeof(ModDataIdConverter))]
         public ModDataID ID { get; set; }
 
         /// <summary>A value to inject into <see cref="IManifest.UpdateKeys"/> field if it's not already set.</summary>
@@ -23,7 +22,7 @@ namespace StardewModdingAPI.Framework.Models
         public string AlternativeUrl { get; set; }
 
         /// <summary>The compatibility of given mod versions (if any).</summary>
-        [JsonConverter(typeof(SFieldConverter))]
+        [JsonConverter(typeof(ModCompatibilityArrayConverter))]
         public ModCompatibility[] Compatibility { get; set; } = new ModCompatibility[0];
 
         /// <summary>Map local versions to a semantic version for update checks.</summary>
-- 
cgit