From 40f54f1e39a3e4e3901691e96318859ea100bf2a Mon Sep 17 00:00:00 2001 From: Ryan Walpole Date: Tue, 7 Jun 2022 15:57:16 +1000 Subject: [PATCH] Fix random github error Re-push update to files Co-Authored-By: Ryan Walpole <69621127+RyanWalpole@users.noreply.github.com> --- .../.vs/Mod Manager/v17/.suo | Bin 173056 -> 150528 bytes .../Stardew Mod Manager/Forms/MPInstaller.cs | 39 +++++++++++++----- .../Properties.Resources.Designer.cs.dll | Bin 11264 -> 11264 bytes 3 files changed, 29 insertions(+), 10 deletions(-) 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 index 6c7049a10e1cb08acc31415c5ab427170ec981d2..fc2d47a67fb6f0b585c8f0b223e13a65aa3fb9e0 100644 GIT binary patch delta 6568 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 delta 9309 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 DePrvj 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 index d5900c24..89186ab2 100644 --- 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 @@ -35,14 +35,13 @@ public MPInstaller() foreach (string folder in Directory.GetDirectories(UnpackLocation)) { - if(Directory.Exists(Properties.Settings.Default.InactiveModsDir + Path.GetFileName(folder))) + if (Directory.Exists(Properties.Settings.Default.InactiveModsDir + Path.GetFileName(folder))) { OverwriteMods.Items.Add(Path.GetFileName(folder)); } ModsToInstall.Items.Add(Path.GetFileName(folder)); } - } private void MPInstaller_FormClosed(object sender, FormClosedEventArgs e) @@ -66,6 +65,7 @@ private void DoModInstall_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\"; + //string ModsOld = Properties.Settings.Default.StardewDir + @"\vdsk\"; foreach (string folder in Directory.GetDirectories(UnpackLocation)) { @@ -74,30 +74,49 @@ private void DoModInstall_DoWork(object sender, DoWorkEventArgs e) Directory.Delete(Properties.Settings.Default.InactiveModsDir + Path.GetFileName(folder), true); } } + } - foreach (string folder in Directory.GetDirectories(UnpackLocation)) + private void DoModInstall_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e) + { + DoMovementOperation.Start(); + } + + private void DoMovementOperation_Tick(object sender, EventArgs e) + { + DoMovementOperation.Stop(); + DoModDelete.RunWorkerAsync(); + } + + 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\"; + + foreach (string folder in Directory.GetDirectories(Path.GetFullPath(UnpackLocation))) { - Directory.Move(folder, Properties.Settings.Default.InactiveModsDir + Path.GetFileName(folder));// + Directory.Move(folder, Properties.Settings.Default.InactiveModsDir + Path.GetFileName(folder)); } } - private void DoModInstall_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e) + private void DoModDelete_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e) { string PresetName = Path.GetFileNameWithoutExtension(Properties.Settings.Default.LaunchArguments); - foreach(string item in ModsToInstall.Items) + foreach (string item in ModsToInstall.Items) { PresetGenerator.AppendText(item + Environment.NewLine); } - PresetGenerator.AppendText("ConsoleCommands"+ Environment.NewLine); + PresetGenerator.AppendText("ConsoleCommands" + Environment.NewLine); PresetGenerator.AppendText("ErrorHandler" + Environment.NewLine); PresetGenerator.AppendText("SaveBackup" + Environment.NewLine); PresetGenerator.SaveFile(Properties.Settings.Default.PresetsDir + PresetName + ".txt", RichTextBoxStreamType.PlainText); - + 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) + if (dr == DialogResult.Yes) { this.Hide(); @@ -116,4 +135,4 @@ private void DoModInstall_RunWorkerCompleted(object sender, RunWorkerCompletedEv } } } -} +} \ No newline at end of file diff --git a/source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/obj/Release/TempPE/Properties.Resources.Designer.cs.dll index 9b33407634a130ac62187b4bfbcb4f512579ace3..244fc572ed2b520ebed1e99f5f8c44c27e195ad2 100644 GIT binary patch delta 36 scmZpOXo#55!R+y5-p1~^Y67v-I~KXz2y~c#)A&viKf}h&7V0Nh05Nh92LJ#7 delta 36 ucmV+<0Nek7Sb$iNhy#+`g|UmBCJ?8R=Y699p-!exp_G