Merge pull request #62 from RWELabs/release-alpha

Push Release v220601 to Stable
RWELabs · Jun 15, 2022 · 7c83a1e · 7c83a1e
2 parents 40f54f1 + 0055f74
commit 7c83a1e
Show file tree

Hide file tree

Showing 195 changed files with 927 additions and 383 deletions.
diff --git a/... Development)/.vs/Mod Manager/FileContentIndex/2117adae-13ef-4e8d-b3d4-2410f7eb2643.vsidx b/... Development)/.vs/Mod Manager/FileContentIndex/2117adae-13ef-4e8d-b3d4-2410f7eb2643.vsidx
diff --git a/... Development)/.vs/Mod Manager/FileContentIndex/54ad446a-4e71-4499-9371-1b3af81f6a48.vsidx b/... Development)/.vs/Mod Manager/FileContentIndex/54ad446a-4e71-4499-9371-1b3af81f6a48.vsidx
diff --git a/source-code/Mod Manager (Facelift Development)/.vs/Mod Manager/FileContentIndex/read.lock b/source-code/Mod Manager (Facelift Development)/.vs/Mod Manager/FileContentIndex/read.lock
diff --git a/source-code/Mod Manager (Facelift Development)/.vs/Mod Manager/v17/.suo b/source-code/Mod Manager (Facelift Development)/.vs/Mod Manager/v17/.suo
diff --git a/source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/App.config b/source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/App.config
@@ -41,7 +41,7 @@
                 <value />
             </setting>
             <setting name="Version" serializeAs="String">
-                <value>220502</value>
+                <value>220601</value>
             </setting>
             <setting name="CheckUpdateOnStartup" serializeAs="String">
                 <value>TRUE</value>

diff --git a/...code/Mod Manager (Facelift Development)/Stardew Mod Manager/Forms/MPInstaller.Designer.cs b/...code/Mod Manager (Facelift Development)/Stardew Mod Manager/Forms/MPInstaller.Designer.cs
diff --git a/source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Forms/MPInstaller.cs b/source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Forms/MPInstaller.cs
@@ -78,7 +78,21 @@ private void DoModInstall_DoWork(object sender, DoWorkEventArgs e)
 
         private void DoModInstall_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
-            DoMovementOperation.Start();
+            if (e.Cancelled == true)
+            {
+                MessageBox.Show("The operation was cancelled by the user or the system.", "Stardew Valley Modpack Installer", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                Application.Exit();
+            }
+            else if (e.Error != null)
+            {
+                //resultLabel.Text = "Error: " + e.Error.Message;
+                MessageBox.Show("The application experienced an issue whilst trying to install the modpack:" + Environment.NewLine + e.Error.Message, "Stardew Valley Modpack Installer", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                Application.Exit();
+            }
+            else
+            {
+                DoMovementOperation.Start();
+            }
         }
 
         private void DoMovementOperation_Tick(object sender, EventArgs e)
@@ -89,7 +103,6 @@ private void DoMovementOperation_Tick(object sender, EventArgs e)
 
         private void DoModDelete_DoWork(object sender, DoWorkEventArgs e)
         {
-
             string AppData = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
             string SDVAppData = AppData + @"\RWE Labs\SDV Mod Manager\";
             string UnpackLocation = SDVAppData + @"\tmp\unpack\";
@@ -102,37 +115,61 @@ private void DoModDelete_DoWork(object sender, DoWorkEventArgs e)
 
         private void DoModDelete_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
-            string PresetName = Path.GetFileNameWithoutExtension(Properties.Settings.Default.LaunchArguments);
-
-            foreach (string item in ModsToInstall.Items)
+            if (e.Cancelled == true)
             {
-                PresetGenerator.AppendText(item + Environment.NewLine);
+                MessageBox.Show("The operation was cancelled by the user or the system.", "Stardew Valley Modpack Installer", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                Application.Exit();
             }
+            else if (e.Error != null)
+            {
+                //resultLabel.Text = "Error: " + e.Error.Message;
+                MessageBox.Show("The application experienced an issue whilst trying to install the modpack:" + Environment.NewLine + e.Error.Message, "Stardew Valley Modpack Installer", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                Application.Exit();
+            }
+            else
+            {
+                string PresetName = Path.GetFileNameWithoutExtension(Properties.Settings.Default.LaunchArguments);
 
-            PresetGenerator.AppendText("ConsoleCommands" + Environment.NewLine);
-            PresetGenerator.AppendText("ErrorHandler" + Environment.NewLine);
-            PresetGenerator.AppendText("SaveBackup" + Environment.NewLine);
+                foreach (string item in ModsToInstall.Items)
+                {
+                    PresetGenerator.AppendText(item + Environment.NewLine);
+                }
 
-            PresetGenerator.SaveFile(Properties.Settings.Default.PresetsDir + PresetName + ".txt", RichTextBoxStreamType.PlainText);
+                PresetGenerator.AppendText("ConsoleCommands" + Environment.NewLine);
+                PresetGenerator.AppendText("ErrorHandler" + Environment.NewLine);
+                PresetGenerator.AppendText("SaveBackup" + Environment.NewLine);
 
-            DialogResult dr = MessageBox.Show("The modpack has been successfully installed. We've added a preset so you can easily one-click enable this modpack. The preset is called: " + PresetName + Environment.NewLine + Environment.NewLine + "Would you like to open the Stardew Valley Mod Manager now, to re-enable your mods?", "Stardew Valley Mod Manager", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-            if (dr == DialogResult.Yes)
-            {
-                this.Hide();
+                PresetGenerator.SaveFile(Properties.Settings.Default.PresetsDir + PresetName + ".txt", RichTextBoxStreamType.PlainText);
 
-                Properties.Settings.Default.LaunchArguments = null;
-                Properties.Settings.Default.Save();
+                DialogResult dr = MessageBox.Show("The modpack has been successfully installed. We've added a preset so you can easily one-click enable this modpack. The preset is called: " + PresetName + Environment.NewLine + Environment.NewLine + "Would you like to open the Stardew Valley Mod Manager now, to re-enable your mods?", "Stardew Valley Mod Manager", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+                if (dr == DialogResult.Yes)
+                {
+                    this.Hide();
 
-                MainPage splash = new MainPage();
-                splash.Show();
-                splash.Activate();
-            }
-            else
-            {
-                Properties.Settings.Default.LaunchArguments = null;
-                Properties.Settings.Default.Save();
-                Application.Exit();
+                    Properties.Settings.Default.LaunchArguments = null;
+                    Properties.Settings.Default.Save();
+
+                    MainPage splash = new MainPage();
+                    splash.Show();
+                    splash.Activate();
+                }
+                else
+                {
+                    Properties.Settings.Default.LaunchArguments = null;
+                    Properties.Settings.Default.Save();
+                    Application.Exit();
+                }
             }
         }
+
+        private void DoModInstall_ProgressChanged(object sender, ProgressChangedEventArgs e)
+        {
+            //ExtractProgress.Value = e.ProgressPercentage;
+        }
+
+        private void DoModDelete_ProgressChanged(object sender, ProgressChangedEventArgs e)
+        {
+            //ExtractProgress.Value = e.ProgressPercentage;
+        }
     }
 }
diff --git a/source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Forms/MPOpen.Designer.cs b/source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Forms/MPOpen.Designer.cs
diff --git a/source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Forms/MPOpen.cs b/source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Forms/MPOpen.cs
@@ -74,6 +74,13 @@ public MPOpen()
                     IsValidSpace.Image = Properties.Resources.sdvError;
                     Continue.Enabled = false;
                 }
+
+                if(filemb > 40)
+                {
+                    WarningText.AppendText(Environment.NewLine + Environment.NewLine + "Modpacks may take a long time to install when they contain many mods. This modpack contains " + filemb + "mb of mods and may take a while to install.");
+                }
+
+                Continue.Focus();
             }
 
         }
@@ -127,10 +134,24 @@ private void Extract_DoWork(object sender, DoWorkEventArgs e)
 
         private void Extract_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
-            MPInstaller steptwo = new MPInstaller();
-            this.Hide();
-            steptwo.Show();
-            steptwo.Activate();
+
+            if (e.Cancelled == true)
+            {
+                MessageBox.Show("The operation was cancelled by the user or the system.", "Stardew Valley Modpack Installer", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                Application.Exit();
+            }
+            else if (e.Error != null)
+            {
+                MessageBox.Show("The application experienced an issue whilst trying to install the modpack:" + Environment.NewLine + e.Error.Message, "Stardew Valley Modpack Installer", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                Application.Exit();
+            }
+            else
+            {
+                MPInstaller steptwo = new MPInstaller();
+                this.Hide();
+                steptwo.Show();
+                steptwo.Activate();
+            }
         }
     }
 }