diff options
author | Jesse Plamondon-Willard <github@jplamondonw.com> | 2018-01-20 21:29:47 -0500 |
---|---|---|
committer | Jesse Plamondon-Willard <github@jplamondonw.com> | 2018-01-20 21:29:47 -0500 |
commit | 894fd25a18cd5ddf31a905860aca95c438894efd (patch) | |
tree | 186d873b91e0b1bee2927aeef96b6513710af497 /src | |
parent | 9636d5b3aac99459e5933bc4fa6ddb8ca84917af (diff) | |
download | SMAPI-894fd25a18cd5ddf31a905860aca95c438894efd.tar.gz SMAPI-894fd25a18cd5ddf31a905860aca95c438894efd.tar.bz2 SMAPI-894fd25a18cd5ddf31a905860aca95c438894efd.zip |
move converters into namespace
Diffstat (limited to 'src')
-rw-r--r-- | src/SMAPI/Framework/Models/Manifest.cs | 1 | ||||
-rw-r--r-- | src/SMAPI/Framework/Models/ModDataRecord.cs | 1 | ||||
-rw-r--r-- | src/SMAPI/Framework/Serialisation/Converters/ColorConverter.cs (renamed from src/SMAPI/Framework/Serialisation/ColorConverter.cs) | 2 | ||||
-rw-r--r-- | src/SMAPI/Framework/Serialisation/Converters/PointConverter.cs (renamed from src/SMAPI/Framework/Serialisation/PointConverter.cs) | 2 | ||||
-rw-r--r-- | src/SMAPI/Framework/Serialisation/Converters/RectangleConverter.cs (renamed from src/SMAPI/Framework/Serialisation/RectangleConverter.cs) | 2 | ||||
-rw-r--r-- | src/SMAPI/Framework/Serialisation/Converters/SFieldConverter.cs (renamed from src/SMAPI/Framework/Serialisation/SFieldConverter.cs) | 2 | ||||
-rw-r--r-- | src/SMAPI/Framework/Serialisation/Converters/StringEnumConverter.cs (renamed from src/SMAPI/Framework/Serialisation/StringEnumConverter.cs) | 2 | ||||
-rw-r--r-- | src/SMAPI/Framework/Serialisation/JsonHelper.cs | 1 | ||||
-rw-r--r-- | src/SMAPI/StardewModdingAPI.csproj | 10 |
9 files changed, 13 insertions, 10 deletions
diff --git a/src/SMAPI/Framework/Models/Manifest.cs b/src/SMAPI/Framework/Models/Manifest.cs index b85787e5..c362be9b 100644 --- a/src/SMAPI/Framework/Models/Manifest.cs +++ b/src/SMAPI/Framework/Models/Manifest.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using Newtonsoft.Json; using StardewModdingAPI.Framework.Serialisation; +using StardewModdingAPI.Framework.Serialisation.Converters; namespace StardewModdingAPI.Framework.Models { diff --git a/src/SMAPI/Framework/Models/ModDataRecord.cs b/src/SMAPI/Framework/Models/ModDataRecord.cs index c6a12188..fa6fc68d 100644 --- a/src/SMAPI/Framework/Models/ModDataRecord.cs +++ b/src/SMAPI/Framework/Models/ModDataRecord.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using Newtonsoft.Json; using StardewModdingAPI.Framework.Serialisation; +using StardewModdingAPI.Framework.Serialisation.Converters; namespace StardewModdingAPI.Framework.Models { diff --git a/src/SMAPI/Framework/Serialisation/ColorConverter.cs b/src/SMAPI/Framework/Serialisation/Converters/ColorConverter.cs index d2315a00..7f830a0e 100644 --- a/src/SMAPI/Framework/Serialisation/ColorConverter.cs +++ b/src/SMAPI/Framework/Serialisation/Converters/ColorConverter.cs @@ -3,7 +3,7 @@ using Microsoft.Xna.Framework; using Newtonsoft.Json.Linq; using StardewModdingAPI.Framework.Exceptions; -namespace StardewModdingAPI.Framework.Serialisation +namespace StardewModdingAPI.Framework.Serialisation.Converters { /// <summary>Handles deserialisation of <see cref="Color"/> for crossplatform compatibility.</summary> /// <remarks> diff --git a/src/SMAPI/Framework/Serialisation/PointConverter.cs b/src/SMAPI/Framework/Serialisation/Converters/PointConverter.cs index bdcefaa5..87d0ff34 100644 --- a/src/SMAPI/Framework/Serialisation/PointConverter.cs +++ b/src/SMAPI/Framework/Serialisation/Converters/PointConverter.cs @@ -3,7 +3,7 @@ using Microsoft.Xna.Framework; using Newtonsoft.Json.Linq; using StardewModdingAPI.Framework.Exceptions; -namespace StardewModdingAPI.Framework.Serialisation +namespace StardewModdingAPI.Framework.Serialisation.Converters { /// <summary>Handles deserialisation of <see cref="PointConverter"/> for crossplatform compatibility.</summary> /// <remarks> diff --git a/src/SMAPI/Framework/Serialisation/RectangleConverter.cs b/src/SMAPI/Framework/Serialisation/Converters/RectangleConverter.cs index bbf60435..7cf912a7 100644 --- a/src/SMAPI/Framework/Serialisation/RectangleConverter.cs +++ b/src/SMAPI/Framework/Serialisation/Converters/RectangleConverter.cs @@ -4,7 +4,7 @@ using Microsoft.Xna.Framework; using Newtonsoft.Json.Linq; using StardewModdingAPI.Framework.Exceptions; -namespace StardewModdingAPI.Framework.Serialisation +namespace StardewModdingAPI.Framework.Serialisation.Converters { /// <summary>Handles deserialisation of <see cref="Rectangle"/> for crossplatform compatibility.</summary> /// <remarks> diff --git a/src/SMAPI/Framework/Serialisation/SFieldConverter.cs b/src/SMAPI/Framework/Serialisation/Converters/SFieldConverter.cs index 6e068599..69353491 100644 --- a/src/SMAPI/Framework/Serialisation/SFieldConverter.cs +++ b/src/SMAPI/Framework/Serialisation/Converters/SFieldConverter.cs @@ -5,7 +5,7 @@ using Newtonsoft.Json.Linq; using StardewModdingAPI.Framework.Exceptions; using StardewModdingAPI.Framework.Models; -namespace StardewModdingAPI.Framework.Serialisation +namespace StardewModdingAPI.Framework.Serialisation.Converters { /// <summary>Overrides how SMAPI reads and writes <see cref="ISemanticVersion"/> and <see cref="IManifestDependency"/> fields.</summary> internal class SFieldConverter : JsonConverter diff --git a/src/SMAPI/Framework/Serialisation/StringEnumConverter.cs b/src/SMAPI/Framework/Serialisation/Converters/StringEnumConverter.cs index 7afe86cd..0a612c74 100644 --- a/src/SMAPI/Framework/Serialisation/StringEnumConverter.cs +++ b/src/SMAPI/Framework/Serialisation/Converters/StringEnumConverter.cs @@ -1,7 +1,7 @@ using System; using Newtonsoft.Json.Converters; -namespace StardewModdingAPI.Framework.Serialisation +namespace StardewModdingAPI.Framework.Serialisation.Converters { /// <summary>A variant of <see cref="StringEnumConverter"/> which only converts a specified enum.</summary> /// <typeparam name="T">The enum type.</typeparam> diff --git a/src/SMAPI/Framework/Serialisation/JsonHelper.cs b/src/SMAPI/Framework/Serialisation/JsonHelper.cs index 90a6d258..1253f242 100644 --- a/src/SMAPI/Framework/Serialisation/JsonHelper.cs +++ b/src/SMAPI/Framework/Serialisation/JsonHelper.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using Microsoft.Xna.Framework.Input; using Newtonsoft.Json; +using StardewModdingAPI.Framework.Serialisation.Converters; namespace StardewModdingAPI.Framework.Serialisation { diff --git a/src/SMAPI/StardewModdingAPI.csproj b/src/SMAPI/StardewModdingAPI.csproj index dd4f6134..f5060e2d 100644 --- a/src/SMAPI/StardewModdingAPI.csproj +++ b/src/SMAPI/StardewModdingAPI.csproj @@ -111,9 +111,9 @@ <Compile Include="Framework\ModLoading\AssemblyLoadStatus.cs" /> <Compile Include="Framework\Reflection\InterfaceProxyBuilder.cs" /> <Compile Include="Framework\Serialisation\SimpleReadOnlyConverter.cs" /> - <Compile Include="Framework\Serialisation\RectangleConverter.cs" /> - <Compile Include="Framework\Serialisation\ColorConverter.cs" /> - <Compile Include="Framework\Serialisation\PointConverter.cs" /> + <Compile Include="Framework\Serialisation\Converters\RectangleConverter.cs" /> + <Compile Include="Framework\Serialisation\Converters\ColorConverter.cs" /> + <Compile Include="Framework\Serialisation\Converters\PointConverter.cs" /> <Compile Include="Framework\Utilities\ContextHash.cs" /> <Compile Include="IReflectedField.cs" /> <Compile Include="IReflectedMethod.cs" /> @@ -181,8 +181,8 @@ <Compile Include="Framework\SContentManager.cs" /> <Compile Include="Framework\Exceptions\SParseException.cs" /> <Compile Include="Framework\Serialisation\JsonHelper.cs" /> - <Compile Include="Framework\Serialisation\StringEnumConverter.cs" /> - <Compile Include="Framework\Serialisation\SFieldConverter.cs" /> + <Compile Include="Framework\Serialisation\Converters\StringEnumConverter.cs" /> + <Compile Include="Framework\Serialisation\Converters\SFieldConverter.cs" /> <Compile Include="IAssetEditor.cs" /> <Compile Include="IAssetInfo.cs" /> <Compile Include="IAssetLoader.cs" /> |