Merge branch 'develop' into stable

1 files changed, 18 insertions, 0 deletions

diff --git a/src/SMAPI.Installer/Framework/InstallerPaths.cs b/src/SMAPI.Installer/Framework/InstallerPaths.cs
index 9393e14f..ac6c3a8e 100644
--- a/src/SMAPI.Installer/Framework/InstallerPaths.cs
+++ b/src/SMAPI.Installer/Framework/InstallerPaths.cs
@@ -8,6 +8,9 @@ namespace StardewModdingAPI.Installer.Framework
         /*********
         ** Accessors
         *********/
+        /****
+        ** Main folders
+        ****/
         /// <summary>The directory path containing the files to copy into the game folder.</summary>
         public DirectoryInfo BundleDir { get; }
 
@@ -17,9 +20,18 @@ namespace StardewModdingAPI.Installer.Framework
         /// <summary>The directory into which to install mods.</summary>
         public DirectoryInfo ModsDir { get; }
 
+        /****
+        ** Installer paths
+        ****/
         /// <summary>The full path to directory path containing the files to copy into the game folder.</summary>
         public string BundlePath => this.BundleDir.FullName;
 
+        /// <summary>The full path to the backup API user settings folder, if applicable.</summary>
+        public string BundleApiUserConfigPath { get; }
+
+        /****
+        ** Game paths
+        ****/
         /// <summary>The full path to the directory containing the installed game.</summary>
         public string GamePath => this.GameDir.FullName;
 
@@ -29,6 +41,9 @@ namespace StardewModdingAPI.Installer.Framework
         /// <summary>The full path to SMAPI's internal configuration file.</summary>
         public string ApiConfigPath { get; }
 
+        /// <summary>The full path to the user's config overrides file.</summary>
+        public string ApiUserConfigPath { get; }
+
         /// <summary>The full path to the installed SMAPI executable file.</summary>
         public string ExecutablePath { get; }
 
@@ -55,11 +70,14 @@ namespace StardewModdingAPI.Installer.Framework
             this.GameDir = gameDir;
             this.ModsDir = new DirectoryInfo(Path.Combine(gameDir.FullName, "Mods"));
 
+            this.BundleApiUserConfigPath = Path.Combine(bundleDir.FullName, "smapi-internal", "config.user.json");
+
             this.ExecutablePath = Path.Combine(gameDir.FullName, gameExecutableName);
             this.UnixLauncherPath = Path.Combine(gameDir.FullName, "StardewValley");
             this.UnixSmapiLauncherPath = Path.Combine(gameDir.FullName, "StardewModdingAPI");
             this.UnixBackupLauncherPath = Path.Combine(gameDir.FullName, "StardewValley-original");
             this.ApiConfigPath = Path.Combine(gameDir.FullName, "smapi-internal", "config.json");
+            this.ApiUserConfigPath = Path.Combine(gameDir.FullName, "smapi-internal", "config.user.json");
         }
     }
 }