move manifest parsing into toolkit (#532)

3 files changed, 0 insertions, 139 deletions

diff --git a/src/SMAPI/Framework/Serialisation/CrossplatformConverters/ColorConverter.cs b/src/SMAPI/Framework/Serialisation/CrossplatformConverters/ColorConverter.cs
deleted file mode 100644
index f1b2f04f..00000000
--- a/src/SMAPI/Framework/Serialisation/CrossplatformConverters/ColorConverter.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using Microsoft.Xna.Framework;
-using Newtonsoft.Json.Linq;
-using StardewModdingAPI.Framework.Exceptions;
-
-namespace StardewModdingAPI.Framework.Serialisation.CrossplatformConverters
-{
-    /// <summary>Handles deserialisation of <see cref="Color"/> for crossplatform compatibility.</summary>
-    /// <remarks>
-    /// - Linux/Mac format: { "B": 76, "G": 51, "R": 25, "A": 102 }
-    /// - Windows format:   "26, 51, 76, 102"
-    /// </remarks>
-    internal class ColorConverter : SimpleReadOnlyConverter<Color>
-    {
-        /*********
-        ** Protected methods
-        *********/
-        /// <summary>Read a JSON object.</summary>
-        /// <param name="obj">The JSON object to read.</param>
-        /// <param name="path">The path to the current JSON node.</param>
-        protected override Color ReadObject(JObject obj, string path)
-        {
-            int r = obj.ValueIgnoreCase<int>(nameof(Color.R));
-            int g = obj.ValueIgnoreCase<int>(nameof(Color.G));
-            int b = obj.ValueIgnoreCase<int>(nameof(Color.B));
-            int a = obj.ValueIgnoreCase<int>(nameof(Color.A));
-            return new Color(r, g, b, a);
-        }
-
-        /// <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 Color ReadString(string str, string path)
-        {
-            string[] parts = str.Split(',');
-            if (parts.Length != 4)
-                throw new SParseException($"Can't parse {typeof(Color).Name} from invalid value '{str}' (path: {path}).");
-
-            int r = Convert.ToInt32(parts[0]);
-            int g = Convert.ToInt32(parts[1]);
-            int b = Convert.ToInt32(parts[2]);
-            int a = Convert.ToInt32(parts[3]);
-            return new Color(r, g, b, a);
-        }
-    }
-}
diff --git a/src/SMAPI/Framework/Serialisation/CrossplatformConverters/PointConverter.cs b/src/SMAPI/Framework/Serialisation/CrossplatformConverters/PointConverter.cs
deleted file mode 100644
index 434b7ea5..00000000
--- a/src/SMAPI/Framework/Serialisation/CrossplatformConverters/PointConverter.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using Microsoft.Xna.Framework;
-using Newtonsoft.Json.Linq;
-using StardewModdingAPI.Framework.Exceptions;
-
-namespace StardewModdingAPI.Framework.Serialisation.CrossplatformConverters
-{
-    /// <summary>Handles deserialisation of <see cref="PointConverter"/> for crossplatform compatibility.</summary>
-    /// <remarks>
-    /// - Linux/Mac format: { "X": 1, "Y": 2 }
-    /// - Windows format:   "1, 2"
-    /// </remarks>
-    internal class PointConverter : SimpleReadOnlyConverter<Point>
-    {
-        /*********
-        ** Protected methods
-        *********/
-        /// <summary>Read a JSON object.</summary>
-        /// <param name="obj">The JSON object to read.</param>
-        /// <param name="path">The path to the current JSON node.</param>
-        protected override Point ReadObject(JObject obj, string path)
-        {
-            int x = obj.ValueIgnoreCase<int>(nameof(Point.X));
-            int y = obj.ValueIgnoreCase<int>(nameof(Point.Y));
-            return new Point(x, y);
-        }
-
-        /// <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 Point ReadString(string str, string path)
-        {
-            string[] parts = str.Split(',');
-            if (parts.Length != 2)
-                throw new SParseException($"Can't parse {typeof(Point).Name} from invalid value '{str}' (path: {path}).");
-
-            int x = Convert.ToInt32(parts[0]);
-            int y = Convert.ToInt32(parts[1]);
-            return new Point(x, y);
-        }
-    }
-}
diff --git a/src/SMAPI/Framework/Serialisation/CrossplatformConverters/RectangleConverter.cs b/src/SMAPI/Framework/Serialisation/CrossplatformConverters/RectangleConverter.cs
deleted file mode 100644
index 62bc8637..00000000
--- a/src/SMAPI/Framework/Serialisation/CrossplatformConverters/RectangleConverter.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Text.RegularExpressions;
-using Microsoft.Xna.Framework;
-using Newtonsoft.Json.Linq;
-using StardewModdingAPI.Framework.Exceptions;
-
-namespace StardewModdingAPI.Framework.Serialisation.CrossplatformConverters
-{
-    /// <summary>Handles deserialisation of <see cref="Rectangle"/> for crossplatform compatibility.</summary>
-    /// <remarks>
-    /// - Linux/Mac format: { "X": 1, "Y": 2, "Width": 3, "Height": 4 }
-    /// - Windows format:   "{X:1 Y:2 Width:3 Height:4}"
-    /// </remarks>
-    internal class RectangleConverter : SimpleReadOnlyConverter<Rectangle>
-    {
-        /*********
-        ** Protected methods
-        *********/
-        /// <summary>Read a JSON object.</summary>
-        /// <param name="obj">The JSON object to read.</param>
-        /// <param name="path">The path to the current JSON node.</param>
-        protected override Rectangle ReadObject(JObject obj, string path)
-        {
-            int x = obj.ValueIgnoreCase<int>(nameof(Rectangle.X));
-            int y = obj.ValueIgnoreCase<int>(nameof(Rectangle.Y));
-            int width = obj.ValueIgnoreCase<int>(nameof(Rectangle.Width));
-            int height = obj.ValueIgnoreCase<int>(nameof(Rectangle.Height));
-            return new Rectangle(x, y, width, height);
-        }
-
-        /// <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 Rectangle ReadString(string str, string path)
-        {
-            if (string.IsNullOrWhiteSpace(str))
-                return Rectangle.Empty;
-
-            var match = Regex.Match(str, @"^\{X:(?<x>\d+) Y:(?<y>\d+) Width:(?<width>\d+) Height:(?<height>\d+)\}$", RegexOptions.IgnoreCase);
-            if (!match.Success)
-                throw new SParseException($"Can't parse {typeof(Rectangle).Name} from invalid value '{str}' (path: {path}).");
-
-            int x = Convert.ToInt32(match.Groups["x"].Value);
-            int y = Convert.ToInt32(match.Groups["y"].Value);
-            int width = Convert.ToInt32(match.Groups["width"].Value);
-            int height = Convert.ToInt32(match.Groups["height"].Value);
-
-            return new Rectangle(x, y, width, height);
-        }
-    }
-}