From 61d857c41fc2b90cd495c4923251cb1ed472e5ca Mon Sep 17 00:00:00 2001
From: Patrick Müssig <patrick.muessig@gmx.de>
Date: Sat, 2 Apr 2022 03:47:52 +0200
Subject: Added support for `--developer-mode true|false`

Minimal changes required to enable/disable developer mode  via command
line argument. This commit does not include any error handling for
invalid values how ever they will be ignored and not crash the game.
---
 src/SMAPI/Framework/SCore.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/SMAPI/Framework')

diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs
index b4aa3595..801a7237 100644
--- a/src/SMAPI/Framework/SCore.cs
+++ b/src/SMAPI/Framework/SCore.cs
@@ -168,7 +168,8 @@ namespace StardewModdingAPI.Framework
         /// <summary>Construct an instance.</summary>
         /// <param name="modsPath">The path to search for mods.</param>
         /// <param name="writeToConsole">Whether to output log messages to the console.</param>
-        public SCore(string modsPath, bool writeToConsole)
+        /// <param name="developerModeValue">null if not modified else whether to use developer mode</param>
+        public SCore(string modsPath, bool writeToConsole, bool? developerModeValue)
         {
             SCore.Instance = this;
 
@@ -183,6 +184,13 @@ namespace StardewModdingAPI.Framework
 
             // init basics
             this.Settings = JsonConvert.DeserializeObject<SConfig>(File.ReadAllText(Constants.ApiConfigPath));
+
+            // temporary overwrite DeveloperMode Setting
+            if (developerModeValue.HasValue)
+            {
+                this.Settings.DeveloperMode = developerModeValue.Value;
+            }
+
             if (File.Exists(Constants.ApiUserConfigPath))
                 JsonConvert.PopulateObject(File.ReadAllText(Constants.ApiUserConfigPath), this.Settings);
 
-- 
cgit 


From 092f0aa4eaa23c169c1ca5e8b213915f563f5053 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 9 Apr 2022 11:52:20 -0400
Subject: simplify format for new CLI arguments

---
 src/SMAPI/Framework/SCore.cs | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'src/SMAPI/Framework')

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
         /// <summary>Construct an instance.</summary>
         /// <param name="modsPath">The path to search for mods.</param>
         /// <param name="writeToConsole">Whether to output log messages to the console.</param>
-        /// <param name="developerModeValue">null if not modified else whether to use developer mode</param>
-        public SCore(string modsPath, bool writeToConsole, bool? developerModeValue)
+        /// <param name="developerMode">Whether to enable development features, or <c>null</c> to use the value from the settings file.</param>
+        public SCore(string modsPath, bool writeToConsole, bool? developerMode)
         {
             SCore.Instance = this;
 
@@ -184,12 +184,7 @@ namespace StardewModdingAPI.Framework
 
             // init basics
             this.Settings = JsonConvert.DeserializeObject<SConfig>(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);
-- 
cgit 


From 6161cc91297dd215a35bfd4d8862d27a0d937898 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 9 Apr 2022 11:54:23 -0400
Subject: fix config.user.json overriding new CLI arguments

---
 src/SMAPI/Framework/SCore.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/SMAPI/Framework')

diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs
index 4746c2ce..44f46179 100644
--- a/src/SMAPI/Framework/SCore.cs
+++ b/src/SMAPI/Framework/SCore.cs
@@ -184,10 +184,9 @@ namespace StardewModdingAPI.Framework
 
             // init basics
             this.Settings = JsonConvert.DeserializeObject<SConfig>(File.ReadAllText(Constants.ApiConfigPath));
-            this.Settings.DeveloperMode = developerMode ?? this.Settings.DeveloperMode;
-
             if (File.Exists(Constants.ApiUserConfigPath))
                 JsonConvert.PopulateObject(File.ReadAllText(Constants.ApiUserConfigPath), this.Settings);
+            this.Settings.DeveloperMode = developerMode ?? this.Settings.DeveloperMode;
 
             this.LogManager = new LogManager(logPath: logPath, colorConfig: this.Settings.ConsoleColors, writeToConsole: writeToConsole, isVerbose: this.Settings.VerboseLogging, isDeveloperMode: this.Settings.DeveloperMode, getScreenIdForLog: this.GetScreenIdForLog);
             this.CommandManager = new CommandManager(this.Monitor);
-- 
cgit