diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs
index 801a7237..4746c2ce 100644
--- a/src/SMAPI/Framework/SCore.cs
+++ b/src/SMAPI/Framework/SCore.cs
@@ -168,8 +168,8 @@ namespace StardewModdingAPI.Framework
/// Construct an instance.
/// The path to search for mods.
/// Whether to output log messages to the console.
- /// null if not modified else whether to use developer mode
- public SCore(string modsPath, bool writeToConsole, bool? developerModeValue)
+ /// Whether to enable development features, or null to use the value from the settings file.
+ public SCore(string modsPath, bool writeToConsole, bool? developerMode)
{
SCore.Instance = this;
@@ -184,12 +184,7 @@ namespace StardewModdingAPI.Framework
// init basics
this.Settings = JsonConvert.DeserializeObject(File.ReadAllText(Constants.ApiConfigPath));
-
- // temporary overwrite DeveloperMode Setting
- if (developerModeValue.HasValue)
- {
- this.Settings.DeveloperMode = developerModeValue.Value;
- }
+ this.Settings.DeveloperMode = developerMode ?? this.Settings.DeveloperMode;
if (File.Exists(Constants.ApiUserConfigPath))
JsonConvert.PopulateObject(File.ReadAllText(Constants.ApiUserConfigPath), this.Settings);
diff --git a/src/SMAPI/Program.cs b/src/SMAPI/Program.cs
index 32bf0bdd..1e3b2000 100644
--- a/src/SMAPI/Program.cs
+++ b/src/SMAPI/Program.cs
@@ -179,7 +179,7 @@ namespace StardewModdingAPI
bool writeToConsole = !args.Contains("--no-terminal") && Environment.GetEnvironmentVariable("SMAPI_NO_TERMINAL") == null;
// get mods path
- bool? developerModeValue = null;
+ bool? developerMode = null;
string modsPath;
{
string rawModsPath = null;
@@ -190,31 +190,23 @@ namespace StardewModdingAPI
rawModsPath = args[pathIndex];
// get developer mode from command line args
- int developerModeValueIndex = Array.LastIndexOf(args, "--developer-mode") + 1;
- if (developerModeValueIndex >= 1 && args.Length >= developerModeValueIndex)
- {
- if (args[developerModeValueIndex].ToLower().Equals("true"))
- {
- developerModeValue = true;
- }
- else if (args[developerModeValueIndex].ToLower().Equals("false"))
- {
- developerModeValue = false;
- }
- }
+ if (args.Contains("--developer-mode"))
+ developerMode = true;
+ if (args.Contains("--developer-mode-off"))
+ developerMode = false;
// get from environment variables
if (string.IsNullOrWhiteSpace(rawModsPath))
rawModsPath = Environment.GetEnvironmentVariable("SMAPI_MODS_PATH");
- // normalise
+ // normalize
modsPath = !string.IsNullOrWhiteSpace(rawModsPath)
? Path.Combine(Constants.GamePath, rawModsPath)
: Constants.DefaultModsPath;
}
// load SMAPI
- using SCore core = new SCore(modsPath, writeToConsole, developerModeValue);
+ using SCore core = new SCore(modsPath, writeToConsole, developerMode);
core.RunInteractively();
}