From a89dbce8549abee867d0af65ac62155bb485a911 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sat, 23 Sep 2017 21:48:53 -0400
Subject: unify disabled-mod and compatibility lists (#361)

---
 .../Framework/Models/DisabledMod.cs                | 22 ----------------------
 .../Framework/Models/ModStatus.cs                  |  9 ++++++---
 src/StardewModdingAPI/Framework/Models/SConfig.cs  |  3 ---
 3 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 src/StardewModdingAPI/Framework/Models/DisabledMod.cs

(limited to 'src/StardewModdingAPI/Framework/Models')

diff --git a/src/StardewModdingAPI/Framework/Models/DisabledMod.cs b/src/StardewModdingAPI/Framework/Models/DisabledMod.cs
deleted file mode 100644
index 170fa760..00000000
--- a/src/StardewModdingAPI/Framework/Models/DisabledMod.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace StardewModdingAPI.Framework.Models
-{
-    /// <summary>Metadata about for a mod that should never be loaded.</summary>
-    internal class DisabledMod
-    {
-        /*********
-        ** Accessors
-        *********/
-        /****
-        ** From config
-        ****/
-        /// <summary>The unique mod IDs.</summary>
-        public string[] ID { get; set; }
-
-        /// <summary>The mod name.</summary>
-        public string Name { get; set; }
-
-        /// <summary>The reason phrase to show in the warning, or <c>null</c> to use the default value.</summary>
-        /// <example>"this mod is no longer supported or used"</example>
-        public string ReasonPhrase { get; set; }
-    }
-}
diff --git a/src/StardewModdingAPI/Framework/Models/ModStatus.cs b/src/StardewModdingAPI/Framework/Models/ModStatus.cs
index 4ab0b790..343ccb7e 100644
--- a/src/StardewModdingAPI/Framework/Models/ModStatus.cs
+++ b/src/StardewModdingAPI/Framework/Models/ModStatus.cs
@@ -4,12 +4,15 @@ namespace StardewModdingAPI.Framework.Models
     internal enum ModStatus
     {
         /// <summary>Don't override the status.</summary>
-        None = 0,
+        None,
+
+        /// <summary>The mod is obsolete and shouldn't be used, regardless of version.</summary>
+        Obsolete,
 
         /// <summary>Assume the mod is not compatible, even if SMAPI doesn't detect any incompatible code.</summary>
-        AssumeBroken = 0,
+        AssumeBroken,
 
         /// <summary>Assume the mod is compatible, even if SMAPI detects incompatible code.</summary>
-        AssumeCompatible = 1
+        AssumeCompatible
     }
 }
diff --git a/src/StardewModdingAPI/Framework/Models/SConfig.cs b/src/StardewModdingAPI/Framework/Models/SConfig.cs
index 36799400..720d4a6d 100644
--- a/src/StardewModdingAPI/Framework/Models/SConfig.cs
+++ b/src/StardewModdingAPI/Framework/Models/SConfig.cs
@@ -23,8 +23,5 @@ namespace StardewModdingAPI.Framework.Models
 
         /// <summary>A list of mod versions which should be considered compatible or incompatible regardless of whether SMAPI detects incompatible code.</summary>
         public ModCompatibility[] ModCompatibility { get; set; }
-
-        /// <summary>A list of mods which should be considered obsolete and not loaded.</summary>
-        public DisabledMod[] DisabledMods { get; set; }
     }
 }
-- 
cgit