ModAPI.Common: remove unused forced paths in LauncherSettings.cs

Author: Rosalie241

ModAPI.Common/LauncherSettings.cs

@@ -13,56 +13,6 @@ public static class LauncherSettings
 
         private static Dictionary<string, string> _dictionary = new Dictionary<string, string>();
 
-        public static string ForcedCoreSporeDataPath
-        {
-            get
-            {
-                string value = null;
-                _dictionary.TryGetValue("ForcedCoreSporeDataPath", out value);
-                return value;
-            }
-        }
-
-        /*public static string ForcedSporebinPath
-        {
-            get
-            {
-                string value = null;
-                _dictionary.TryGetValue("ForcedSporebinPath", out value);
-                return value;
-            }
-        }*/
-
-        public static string ForcedGalacticAdventuresDataPath
-        {
-            get
-            {
-                string value = null;
-                _dictionary.TryGetValue("ForcedGalacticAdventuresDataPath", out value);
-                return value;
-            }
-        }
-
-        public static string ForcedSporebinEP1Path
-        {
-            get
-            {
-                string value = null;
-                _dictionary.TryGetValue("ForcedSporebinEP1Path", out value);
-                return value;
-            }
-        }
-
-        public static string ForcedGalacticAdventuresSporeAppPath
-        {
-            get
-            {
-                string value = null;
-                _dictionary.TryGetValue("ForcedGalacticAdventuresSporeAppPath", out value);
-                return value;
-            }
-        }
-
         public static string GamePath
         {
             get

ModAPI.Common/SporePath.cs

@@ -230,27 +230,19 @@ public static string MoveToData(Game game, string installationDirectory)
         {
             if (game == Game.Spore)
             {
-                if (LauncherSettings.ForcedCoreSporeDataPath != null)
-                    return LauncherSettings.ForcedCoreSporeDataPath;
-                else
-                    return Path.Combine(new string[] {installationDirectory, "Data"});
+                return Path.Combine(new string[] {installationDirectory, "Data"});
             }
             else if (game == Game.GalacticAdventures)
             {
-                if (LauncherSettings.ForcedGalacticAdventuresDataPath != null)
-                    return LauncherSettings.ForcedGalacticAdventuresDataPath;
+                // Steam and GoG uses DataEP1
+                string outputPath = Path.Combine(new string[] { installationDirectory, "DataEP1" });
+                if (Directory.Exists(outputPath))
+                {
+                    return outputPath;
+                }
                 else
                 {
-                    // Steam and GoG uses DataEP1
-                    string outputPath = Path.Combine(new string[] { installationDirectory, "DataEP1" });
-                    if (Directory.Exists(outputPath))
-                    {
-                        return outputPath;
-                    }
-                    else
-                    {
-                        return Path.Combine(new string[] { installationDirectory, "Data" });
-                    }
+                    return Path.Combine(new string[] { installationDirectory, "Data" });
                 }
             }
             else

Spore ModAPI Easy Installer/XmlInstallerWindow.xaml.cs

@@ -70,9 +70,9 @@ public XmlInstallerWindow(string modName, bool configure, bool uninstall)
             //LauncherSettings.Load();
             installerWindows.Add(this);
 
-            if ((LauncherSettings.ForcedCoreSporeDataPath == null) && (!Directory.Exists(SporeDataPath)))
+            if (!Directory.Exists(SporeDataPath))
                 PathDialogs.ProcessSpore();
-            if ((LauncherSettings.ForcedGalacticAdventuresDataPath == null) && (!Directory.Exists(GaDataPath)))
+            if (!Directory.Exists(GaDataPath))
                 PathDialogs.ProcessGalacticAdventures();
 
             ModName = modName.Trim('"');

Spore ModAPI Launcher/Program.cs

@@ -74,59 +74,37 @@ void Execute()
                 // We try a new approach for Steam users.
                 // Before, we used Steam to launch the game and tried to find the new process and inject it.
                 // However, when the injection happens the game already executed a bit, so mods fail.
-                // Instead, we create a steam_appid.txt that allows us to execute SporeApp.exe directly
-                
-                if (LauncherSettings.ForcedGalacticAdventuresSporeAppPath != null)
-                    this.ExecutablePath = LauncherSettings.ForcedGalacticAdventuresSporeAppPath;
-
-                if (LauncherSettings.ForcedSporebinEP1Path == null)
-                {
-                    this.ProcessSporebinPath();
-                }
-                else
-                {
-                    SporebinPath = LauncherSettings.ForcedSporebinEP1Path;
-                }
+                // Instead, we create a steam_appid.txt that allows us to execute SporeApp.exe directly                
+                SporebinPath = PathDialogs.ProcessGalacticAdventures();
 
                 // use the default path for now (we might have to use a different one for Origin)
-                if (LauncherSettings.ForcedGalacticAdventuresSporeAppPath == null)
-                {
-                    this.ExecutablePath = this.SporebinPath + "SporeApp.exe";
-
-                    this.ProcessExecutableType();
-
+                this.ExecutablePath = this.SporebinPath + "SporeApp.exe";
+                this.ProcessExecutableType();
 
-                    if (this._executableType == GameVersionType.None)
-                    {
-                        // don't execute the game if the user closed the dialog
-                        return;
-                    }
-                }
-                else
+                if (this._executableType == GameVersionType.None)
                 {
-                    this._executableType = LauncherSettings.GameVersion;
+                    // don't execute the game if the user closed the dialog
+                    return;
                 }
 
                 // get the correct executable path
-                if (LauncherSettings.ForcedGalacticAdventuresSporeAppPath == null)
+                this.ExecutablePath = this.SporebinPath + GameVersion.ExecutableNames[(int)this._executableType];
+                if (!File.Exists(this.ExecutablePath))
                 {
-                    this.ExecutablePath = this.SporebinPath + GameVersion.ExecutableNames[(int)this._executableType];
-                    if (!File.Exists(this.ExecutablePath))
+                    // the file might only not exist in Origin (since Origin users will use a different executable compatible with ModAPI)
+                    if (GameVersion.RequiresModAPIFix(this._executableType))
                     {
-                        // the file might only not exist in Origin (since Origin users will use a different executable compatible with ModAPI)
-                        if (GameVersion.RequiresModAPIFix(this._executableType))
-                        {
-                            if (!HandleOriginUsers())
-                            {
-                                return;
-                            }
-                        }
-                        else
+                        if (!HandleOriginUsers())
                         {
-                            throw new Exception(CommonStrings.GalacticAdventuresNotFound);
+                            return;
                         }
                     }
+                    else
+                    {
+                        throw new Exception(CommonStrings.GalacticAdventuresNotFound);
+                    }
                 }
+                
 
                 // we must also check if the steam_api.dll doesn't exist (it's required for Origin users)
                 if (GameVersion.RequiresModAPIFix(this._executableType) && !File.Exists(this.SporebinPath + "steam_api.dll"))
@@ -292,14 +270,8 @@ void CreateSporeProcess()
                 i++;
             }
 
-            string currentSporebinPath = string.Empty;
-            if (LauncherSettings.ForcedSporebinEP1Path != null)
-                currentSporebinPath = LauncherSettings.ForcedSporebinEP1Path;
-            else
-                currentSporebinPath = this.SporebinPath;
-
             if (!NativeMethods.CreateProcess(null, "\"" + this.ExecutablePath + "\" " + sb,
-                    IntPtr.Zero, IntPtr.Zero, false, NativeTypes.ProcessCreationFlags.CREATE_SUSPENDED, IntPtr.Zero, currentSporebinPath, ref this.StartupInfo, out this.ProcessInfo))
+                    IntPtr.Zero, IntPtr.Zero, false, NativeTypes.ProcessCreationFlags.CREATE_SUSPENDED, IntPtr.Zero, this.SporebinPath, ref this.StartupInfo, out this.ProcessInfo))
             {
                 //throw new InjectException(Strings.ProcessNotStarted);
                 int lastError = System.Runtime.InteropServices.Marshal.GetLastWin32Error();