Merge pull request #122 from RWELabs/release-alpha

No issues found, push update.

source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Forms/First Run/FirstRunSetup.cs

@@ -204,6 +204,7 @@ private void FinishSetup_Click(object sender, EventArgs e)
             }
 
             Properties.Settings.Default.SetupComplete = "TRUE";
+            Properties.Settings.Default.IsManuallyReset = "FALSE";
             Properties.Settings.Default.ModsDir = Properties.Settings.Default.StardewDir.ToString() + @"\Mods\";
             Properties.Settings.Default.InactiveModsDir = Properties.Settings.Default.StardewDir + @"\inactive-mods\";
             Properties.Settings.Default.PresetsDir = ModPresets;

source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Forms/MainPage.cs

@@ -46,6 +46,7 @@ public MainPage()
             CheckSDV.Start();
             GetColorProfile();
             CheckDoTelemetry();
+            ModsToMove.Clear();
 
             MainTabs.TabPanelBackColor = System.Drawing.Color.White;
             MainTabs.TabPages.Remove(Tab_Settings);
@@ -66,8 +67,13 @@ public MainPage()
 
             try
             {
-                var SMAPIVersion = FileVersionInfo.GetVersionInfo(Properties.Settings.Default.StardewDir + @"\StardewModdingAPI.exe");
-                string SMAPIVersionText = "SMAPI " + "v" + SMAPIVersion.ProductVersion;
+                //var SMAPIVersion = FileVersionInfo.GetVersionInfo(Properties.Settings.Default.StardewDir + @"\StardewModdingAPI.exe");
+                var SMAPI = FileVersionInfo.GetVersionInfo(Properties.Settings.Default.StardewDir + @"\StardewModdingAPI.exe");
+                string Name = SMAPI.ProductName;
+                string Publisher = SMAPI.LegalCopyright;
+                //string Version = SMAPI.FileVersion;
+
+                string SMAPIVersionText = "SMAPI " + "v" + SMAPI.FileVersion;
                 SMAPIVer.Text = SMAPIVersionText;
 
                 if (!File.Exists(Properties.Settings.Default.PresetsDir + "SMAPI Default.txt"))
@@ -1173,8 +1179,9 @@ private void InstallFromZIP_Click(object sender, EventArgs e)
             try
             {
                 string extractdir = Properties.Settings.Default.InactiveModsDir;
-                string extractpath = extractdir + @"\" + Properties.Settings.Default.TMP_ModSafeName;
+                string extractpath = extractdir + Properties.Settings.Default.TMP_ModSafeName;
 
+                //MessageBox.Show("SP: " + extractpath);
                 //MessageBox.Show("Install " + ModZipPath.Text + " to " + extractdir);
 
                 ZipFile.ExtractToDirectory(ModZipPath.Text, extractdir);
@@ -1184,6 +1191,7 @@ private void InstallFromZIP_Click(object sender, EventArgs e)
                     MainTabs.SelectedTab = Tab_Main;
                     InstallFromZIP.Enabled = false;
                     ModZipPath.Clear();
+                    ModsToMove.Clear();
                     RefreshObjects();
                     Tab_InstallOptions.Close();
                 }
@@ -1798,5 +1806,15 @@ private void VolunteerTelemetry_Click(object sender, EventArgs e)
                 MessageBox.Show("We ran into an issue sending your telemetry data to RWE Labs.", "Voluntary Submission | RWE Labs Telemetry");
             }
         }
+
+        private void SMAPIBundleInstall_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            string extractionpath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\RWE Labs\SDV Mod Manager\SMAPI\";
+
+            string appPath = Path.GetDirectoryName(Application.ExecutablePath);
+            Process.Start(appPath + @"\smapi.bat");
+
+            Application.Exit();
+        }
     }
 }

source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Forms/MainPage.resx

@@ -131,6 +131,9 @@ If you're experiencing problems with the application, consider resetting it with
   <metadata name="SaveBackups.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>863, 5</value>
   </metadata>
+  <metadata name="SaveBackups.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>863, 5</value>
+  </metadata>
   <metadata name="PresetManagement.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>705, 5</value>
   </metadata>
@@ -140,6 +143,9 @@ If you're experiencing problems with the application, consider resetting it with
   <data name="label9.Text" xml:space="preserve">
     <value>Please note that the mod install process was designed for mods distributed on NexusMods. If you received your ZIP file from a different vendor, it might not install correctly. If you're having issues, ensure that the ZIP archive contains a folder named after the mod and that the mod files are not in the root directory of the ZIP archive.</value>
   </data>
+  <metadata name="HelpTooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>984, 6</value>
+  </metadata>
   <metadata name="CheckSDV.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1099, 6</value>
   </metadata>

source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Program.cs

@@ -67,7 +67,23 @@ static void Main(string[] args)
 
                     if (File.Exists(SettingsINI))
                     {
-                        Application.Run(new UpdateVersion());
+                        if(Properties.Settings.Default.IsManuallyReset == "TRUE")
+                        {
+                            try
+                            {
+                                File.Delete(SettingsINI);
+                            }
+                            catch
+                            {
+                                //
+                            }
+
+                            Application.Run(new FirstRunSetup());
+                        }
+                        else
+                        {
+                            Application.Run(new UpdateVersion());
+                        }
                     }
                     else if (!File.Exists(SettingsINI))
                     {

source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Properties/AssemblyInfo.cs

@@ -11,7 +11,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("RWE Labs, Ryan Walpole Enterprises")]
 [assembly: AssemblyProduct("Stardew Mod Manager")]
-[assembly: AssemblyCopyright("Copyright © Ryan Walpole Enterprises, RWE Labs - 2023")]
+[assembly: AssemblyCopyright("Copyright © Ryan Walpole Enterprises, RWE Labs - 2024")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Properties/Settings.settings

@@ -33,7 +33,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="Version" Type="System.String" Scope="User">
-      <Value Profile="(Default)">230401</Value>
+      <Value Profile="(Default)">240401</Value>
     </Setting>
     <Setting Name="CheckUpdateOnStartup" Type="System.String" Scope="User">
       <Value Profile="(Default)">TRUE</Value>

source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/bin/Release/Stardew Mod Manager.exe.config

@@ -71,7 +71,7 @@
         <value />
       </setting>
       <setting name="Version" serializeAs="String">
-        <value>230401</value>
+        <value>240401</value>
       </setting>
       <setting name="CheckUpdateOnStartup" serializeAs="String">
         <value>TRUE</value>