Merge branch 'develop' into stable

4 files changed, 4 insertions, 65 deletions

diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDataModel.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataModel.cs
index 18039762..8b40c301 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModDataModel.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModDataModel.cs
@@ -25,12 +25,6 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
         /// </remarks>
         public string FormerIDs { get; set; }
 
-        /// <summary>Maps local versions to a semantic version for update checks.</summary>
-        public IDictionary<string, string> MapLocalVersions { get; set; } = new Dictionary<string, string>();
-
-        /// <summary>Maps remote versions to a semantic version for update checks.</summary>
-        public IDictionary<string, string> MapRemoteVersions { get; set; } = new Dictionary<string, string>();
-
         /// <summary>The mod warnings to suppress, even if they'd normally be shown.</summary>
         public ModWarning SuppressWarnings { get; set; }
 
@@ -112,8 +106,8 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
         /*********
         ** Private methods
         *********/
-        /// <summary>The method invoked after JSON deserialisation.</summary>
-        /// <param name="context">The deserialisation context.</param>
+        /// <summary>The method invoked after JSON deserialization.</summary>
+        /// <param name="context">The deserialization context.</param>
         [OnDeserialized]
         private void OnDeserialized(StreamingContext context)
         {
diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs
index 794ad2e4..c892d820 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs
@@ -22,12 +22,6 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
         /// <summary>The mod warnings to suppress, even if they'd normally be shown.</summary>
         public ModWarning SuppressWarnings { get; set; }
 
-        /// <summary>Maps local versions to a semantic version for update checks.</summary>
-        public IDictionary<string, string> MapLocalVersions { get; }
-
-        /// <summary>Maps remote versions to a semantic version for update checks.</summary>
-        public IDictionary<string, string> MapRemoteVersions { get; }
-
         /// <summary>The versioned field data.</summary>
         public ModDataField[] Fields { get; }
 
@@ -44,8 +38,6 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
             this.ID = model.ID;
             this.FormerIDs = model.GetFormerIDs().ToArray();
             this.SuppressWarnings = model.SuppressWarnings;
-            this.MapLocalVersions = new Dictionary<string, string>(model.MapLocalVersions, StringComparer.InvariantCultureIgnoreCase);
-            this.MapRemoteVersions = new Dictionary<string, string>(model.MapRemoteVersions, StringComparer.InvariantCultureIgnoreCase);
             this.Fields = model.GetFields().ToArray();
         }
 
@@ -67,29 +59,6 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
             return false;
         }
 
-        /// <summary>Get a semantic local version for update checks.</summary>
-        /// <param name="version">The remote version to normalise.</param>
-        public ISemanticVersion GetLocalVersionForUpdateChecks(ISemanticVersion version)
-        {
-            return this.MapLocalVersions != null && this.MapLocalVersions.TryGetValue(version.ToString(), out string newVersion)
-                ? new SemanticVersion(newVersion)
-                : version;
-        }
-
-        /// <summary>Get a semantic remote version for update checks.</summary>
-        /// <param name="version">The remote version to normalise.</param>
-        public string GetRemoteVersionForUpdateChecks(string version)
-        {
-            // normalise version if possible
-            if (SemanticVersion.TryParse(version, out ISemanticVersion parsed))
-                version = parsed.ToString();
-
-            // fetch remote version
-            return this.MapRemoteVersions != null && this.MapRemoteVersions.TryGetValue(version, out string newVersion)
-                ? newVersion
-                : version;
-        }
-
         /// <summary>Get the possible mod IDs.</summary>
         public IEnumerable<string> GetIDs()
         {
diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs
index 237f2c66..598da66a 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs
@@ -26,29 +26,5 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
 
         /// <summary>The upper version for which the <see cref="Status"/> applies (if any).</summary>
         public ISemanticVersion StatusUpperVersion { get; set; }
-
-
-        /*********
-        ** Public methods
-        *********/
-        /// <summary>Get a semantic local version for update checks.</summary>
-        /// <param name="version">The remote version to normalise.</param>
-        public ISemanticVersion GetLocalVersionForUpdateChecks(ISemanticVersion version)
-        {
-            return this.DataRecord.GetLocalVersionForUpdateChecks(version);
-        }
-
-        /// <summary>Get a semantic remote version for update checks.</summary>
-        /// <param name="version">The remote version to normalise.</param>
-        public ISemanticVersion GetRemoteVersionForUpdateChecks(ISemanticVersion version)
-        {
-            if (version == null)
-                return null;
-
-            string rawVersion = this.DataRecord.GetRemoteVersionForUpdateChecks(version.ToString());
-            return rawVersion != null
-                ? new SemanticVersion(rawVersion)
-                : version;
-        }
     }
 }
diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModWarning.cs b/src/SMAPI.Toolkit/Framework/ModData/ModWarning.cs
index d61c427f..e67616d0 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModWarning.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModWarning.cs
@@ -13,7 +13,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
         BrokenCodeLoaded = 1,
 
         /// <summary>The mod affects the save serializer in a way that may make saves unloadable without the mod.</summary>
-        ChangesSaveSerialiser = 2,
+        ChangesSaveSerializer = 2,
 
         /// <summary>The mod patches the game in a way that may impact stability.</summary>
         PatchesGame = 4,
@@ -21,7 +21,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
         /// <summary>The mod uses the <c>dynamic</c> keyword which won't work on Linux/Mac.</summary>
         UsesDynamic = 8,
 
-        /// <summary>The mod references specialised 'unvalided update tick' events which may impact stability.</summary>
+        /// <summary>The mod references specialized 'unvalidated update tick' events which may impact stability.</summary>
         UsesUnvalidatedUpdateTick = 16,
 
         /// <summary>The mod has no update keys set.</summary>