From 346fddda670704c1458e42104ee7405fc1de7ccc Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Thu, 10 Nov 2022 23:27:38 -0500 Subject: move validation logic out of Manifest model This avoids tightly coupling higher logic to the implementation class, since we can validate the interface. --- src/SMAPI/Framework/ModLoading/ModResolver.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/SMAPI') diff --git a/src/SMAPI/Framework/ModLoading/ModResolver.cs b/src/SMAPI/Framework/ModLoading/ModResolver.cs index 352c22cc..0b4fe3e9 100644 --- a/src/SMAPI/Framework/ModLoading/ModResolver.cs +++ b/src/SMAPI/Framework/ModLoading/ModResolver.cs @@ -4,6 +4,7 @@ using System.Diagnostics.CodeAnalysis; using System.IO; using System.Linq; using StardewModdingAPI.Toolkit; +using StardewModdingAPI.Toolkit.Framework; using StardewModdingAPI.Toolkit.Framework.ModData; using StardewModdingAPI.Toolkit.Framework.ModScanning; using StardewModdingAPI.Toolkit.Framework.UpdateData; @@ -138,7 +139,7 @@ namespace StardewModdingAPI.Framework.ModLoading } // validate manifest - if (mod.Manifest is Manifest manifest && !manifest.TryValidate(out string manifestError)) + if (!ManifestValidator.TryValidate(mod.Manifest, out string manifestError)) { mod.SetStatus(ModMetadataStatus.Failed, ModFailReason.InvalidManifest, $"its {manifestError}"); continue; -- cgit