From b08e27d13a1f0c82656df95212fc40588b3b5314 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 24 Jun 2018 21:51:51 -0400
Subject: merge IManifest interfaces into new project (#532)

---
 src/SMAPI/Framework/ModLoading/ModResolver.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

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

diff --git a/src/SMAPI/Framework/ModLoading/ModResolver.cs b/src/SMAPI/Framework/ModLoading/ModResolver.cs
index 3366e8c1..fde921e6 100644
--- a/src/SMAPI/Framework/ModLoading/ModResolver.cs
+++ b/src/SMAPI/Framework/ModLoading/ModResolver.cs
@@ -4,10 +4,9 @@ using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using StardewModdingAPI.Framework.ModData;
-using StardewModdingAPI.Framework.Models;
 using StardewModdingAPI.Toolkit.Serialisation;
+using StardewModdingAPI.Toolkit.Serialisation.Models;
 using StardewModdingAPI.Toolkit.Utilities;
-using ToolkitManifest = StardewModdingAPI.Toolkit.Serialisation.Models.Manifest;
 
 namespace StardewModdingAPI.Framework.ModLoading
 {
@@ -33,15 +32,13 @@ namespace StardewModdingAPI.Framework.ModLoading
                     string path = Path.Combine(modDir.FullName, "manifest.json");
                     try
                     {
-                        ToolkitManifest rawManifest = jsonHelper.ReadJsonFile<ToolkitManifest>(path);
-                        if (rawManifest == null)
+                        manifest = jsonHelper.ReadJsonFile<Manifest>(path);
+                        if (manifest == null)
                         {
                             error = File.Exists(path)
                                 ? "its manifest is invalid."
                                 : "it doesn't have a manifest.";
                         }
-                        else
-                            manifest = new Manifest(rawManifest);
                     }
                     catch (SParseException ex)
                     {
-- 
cgit