summaryrefslogtreecommitdiff
path: root/src/StardewModdingAPI/Framework/ModLoading
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <github@jplamondonw.com>2017-07-10 14:33:36 -0400
committerJesse Plamondon-Willard <github@jplamondonw.com>2017-07-10 14:33:36 -0400
commitd82e57d3060c96923ba9a8efe3c9eb839abffe59 (patch)
treea6d9760bbb83444dc5418d9b3a996c5f6ce96c78 /src/StardewModdingAPI/Framework/ModLoading
parent61d13d370c07bec029336890eec9501a8efc3056 (diff)
downloadSMAPI-d82e57d3060c96923ba9a8efe3c9eb839abffe59.tar.gz
SMAPI-d82e57d3060c96923ba9a8efe3c9eb839abffe59.tar.bz2
SMAPI-d82e57d3060c96923ba9a8efe3c9eb839abffe59.zip
enable SMAPI 2.0 mode by default
This commit replaces the SMAPI_2_0 compile flag with SMAPI_1_x.
Diffstat (limited to 'src/StardewModdingAPI/Framework/ModLoading')
-rw-r--r--src/StardewModdingAPI/Framework/ModLoading/ModResolver.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/StardewModdingAPI/Framework/ModLoading/ModResolver.cs b/src/StardewModdingAPI/Framework/ModLoading/ModResolver.cs
index 69ef0b63..b75453b7 100644
--- a/src/StardewModdingAPI/Framework/ModLoading/ModResolver.cs
+++ b/src/StardewModdingAPI/Framework/ModLoading/ModResolver.cs
@@ -140,7 +140,7 @@ namespace StardewModdingAPI.Framework.ModLoading
}
// validate required fields
-#if SMAPI_2_0
+#if !SMAPI_1_x
{
List<string> missingFields = new List<string>(3);
@@ -158,7 +158,7 @@ namespace StardewModdingAPI.Framework.ModLoading
}
// validate IDs are unique
-#if SMAPI_2_0
+#if !SMAPI_1_x
{
var duplicatesByID = mods
.GroupBy(mod => mod.Manifest.UniqueID?.Trim(), mod => mod, StringComparer.InvariantCultureIgnoreCase)
@@ -255,10 +255,10 @@ namespace StardewModdingAPI.Framework.ModLoading
MinVersion = entry.MinimumVersion,
Mod = dependencyMod,
IsRequired =
-#if SMAPI_2_0
- entry.IsRequired
-#else
+#if SMAPI_1_x
true
+#else
+ entry.IsRequired
#endif
}
)