Merge pull request #71 from RWELabs/release-alpha

Release alpha

README.md

@@ -10,8 +10,8 @@ The Stardew Valley Mod Manager and Modded Framework is an extension to SMAPI, th
 
 - [Features](#features)
 - [How-To/Documentation](#documentation)
-  - [Download and Install](#download-and-install)
-  - [Using the Mod Manager](#usage)
+  - [Download and Install](#setup-and-configuration)
+  - [Using the Mod Manager](#using-the-mod-manager)
 - [License](#license)
 - [Download](#download)
     - [System Requirements](#system-requirements)
@@ -47,23 +47,26 @@ Create backups and delete any of your farms with built in Game Save Management t
 ## Documentation
 <b>Important:</b> Please note that due to changes in the application's user interface with version 220501, some of the screenshots used in the documentation may be out of date and may not accurately reflect the visual experience you may be having. We believe that despite this, the instructions are still relevant - the appearance and names of labels, windows and user interface may differ but should still adhere closely enough to the written instructions.
 
-### Download and Install
+### Setup and Configuration
 Simply [download](#download) the latest release of Stardew Valley Mod Manager from this repository and follow the installation prompts. From there, you can keep your Mod Manager updated with the built in update check tools. Please note that you may have trouble with Chrome, Edge and Windows trying to block you from installing the application as it is not a commonly downloaded application.
 
-- [How-To: Downloading Stardew Valley Mod Manager](https://github.com/RyanWalpoleEnterprises/Stardew-Valley-Mod-Manager/wiki/How-To:-Downloading-Stardew-Valley-Mod-Manager)
-- [How-To: Setting Up Stardew Valley Mod Manager](https://github.com/RyanWalpoleEnterprises/Stardew-Valley-Mod-Manager/wiki/How-To:-Setting-Up-Stardew-Valley-Mod-Manager)
-- [How-To: Updating Stardew Valley Mod Manager](https://github.com/RyanWalpoleEnterprises/Stardew-Valley-Mod-Manager/wiki/How-To:-Updating-Stardew-Valley-Mod-Manager)
+- [Getting Started: Setup and Configuration](https://rwe-labs.gitbook.io/sdvmm/getting-started/setup-and-configuration)
+- [How-To: Downloading the Mod Manager](https://rwe-labs.gitbook.io/sdvmm/getting-started/setup-and-configuration/downloading-the-application)
+- [How-To: Installing the Mod Manager](https://rwe-labs.gitbook.io/sdvmm/getting-started/setup-and-configuration/installing-the-application)
+- [How-To: Setting up the Mod Manager](https://rwe-labs.gitbook.io/sdvmm/getting-started/setup-and-configuration/setting-up-the-application)
+- [How-To: Updating Stardew Valley Mod Manager](https://rwe-labs.gitbook.io/sdvmm/getting-started/updating-the-mod-manager)
+- [How-To: Navigating the Mod Manager](https://rwe-labs.gitbook.io/sdvmm/getting-started/navigating-the-mod-manager)
 
 ### Using the Mod Manager
 To make it easy for you to access, we've established a Wiki that contains a variety of "How-to" articles that outline and explain features and processes. We've got a couple of articles you can access here, or you can click "Visit our Wiki" to see more.
 
-- [How-To: Install a Mod](https://github.com/RyanWalpoleEnterprises/Stardew-Valley/wiki/How-To:-Add-and-Remove-Mods#adding-mods)
-- [How-To: Uninstall a Mod](https://github.com/RyanWalpoleEnterprises/Stardew-Valley/wiki/How-To:-Add-and-Remove-Mods#removing-mods)
-- [How-To: Backup a Game Save](https://github.com/RyanWalpoleEnterprises/Stardew-Valley-Mod-Manager/wiki/How-To:-Create-a-Game-Save-Backup)
-- [How-To: Create a Mod Preset](https://github.com/RyanWalpoleEnterprises/Stardew-Valley/wiki/How-To:-Create-Mod-Presets)
-- [How-To: Load a Mod Preset](https://github.com/RyanWalpoleEnterprises/Stardew-Valley/wiki/How-To:-Load-Mod-Presets)
+- [How-To: Installing Mods](https://rwe-labs.gitbook.io/sdvmm/mod-management/installing-mods)
+- [How-To: Enabling and Disabling Mods](https://rwe-labs.gitbook.io/sdvmm/mod-management/enabling-and-disabling-mods)
+- [How-To: Updating Mods](https://rwe-labs.gitbook.io/sdvmm/mod-management/updating-mods)
+- [How-To: Create a Mod Preset](https://rwe-labs.gitbook.io/sdvmm/mod-management/mod-presets/create-a-mod-preset)
+- [How-To: Load a Mod Preset](https://rwe-labs.gitbook.io/sdvmm/mod-management/mod-presets/load-a-mod-preset)
 
-Or for more articles and information, [Visit our Wiki](https://github.com/RyanWalpoleEnterprises/Stardew-Valley-Mod-Manager/wiki)
+Or for more articles and information, [Visit our Wiki](https://rwe-labs.gitbook.io/sdvmm/)
 
 ## License
 It's your responsibility to read the license agreement when installing the software if you intend on using it as much as it's our responsibility to do our best to show it to you.
@@ -110,7 +113,7 @@ If you're running into any issues with downloading or installing the application
 
 Please see a list of branches for this repository: 
 
-<p align="left" style="margin-bottom: 0px !important;">
+<p align="left" style="margin-bottom: 1px !important;">
   <a href="https://github.com/RyanWalpoleEnterprises/Stardew-Valley-Mod-Manager/tree/release-stable">
     <img  src="https://raw.githubusercontent.com/RyanWalpoleEnterprises/Stardew-Valley-Mod-Manager/release-stable/web/Srelease-stable.png" alt="Stable Release" align="left">
   </a>

source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/App.config

@@ -25,23 +25,23 @@
             <setting name="PresetsDir" serializeAs="String">
                 <value />
             </setting>
-            <setting name="TMP_ModsURL" serializeAs="String">
+            <setting name="SMAPI_UpdateURL" serializeAs="String">
                 <value />
             </setting>
-            <setting name="TMP_SMAPIVer" serializeAs="String">
+            <setting name="SMAPI_UpdateVersion" serializeAs="String">
                 <value />
             </setting>
             <setting name="TMP_Name" serializeAs="String">
                 <value />
             </setting>
-            <setting name="TMP_PresetURL" serializeAs="String">
+            <setting name="SMAPI_InstalledVersion" serializeAs="String">
                 <value />
             </setting>
             <setting name="IsNetworkConnected" serializeAs="String">
                 <value />
             </setting>
             <setting name="Version" serializeAs="String">
-                <value>220601</value>
+                <value>220701</value>
             </setting>
             <setting name="CheckUpdateOnStartup" serializeAs="String">
                 <value>TRUE</value>

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

@@ -31,7 +31,8 @@ public MPInstaller()
 
             string AppData = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
             string SDVAppData = AppData + @"\RWE Labs\SDV Mod Manager\";
-            string UnpackLocation = SDVAppData + @"\tmp\unpack\";
+            string UnpackLocation = Properties.Settings.Default.StardewDir + @"\tmp\unpack\";
+            string LA = Path.GetFileName(Properties.Settings.Default.LaunchArguments);
 
             foreach (string folder in Directory.GetDirectories(UnpackLocation))
             {
@@ -64,7 +65,8 @@ 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 UnpackLocation = Properties.Settings.Default.StardewDir + @"\tmp\unpack\";
+            string LA = Path.GetFileName(Properties.Settings.Default.LaunchArguments);
             //string ModsOld = Properties.Settings.Default.StardewDir + @"\vdsk\";
 
             foreach (string folder in Directory.GetDirectories(UnpackLocation))
@@ -105,7 +107,8 @@ 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\";
+            string UnpackLocation = Properties.Settings.Default.StardewDir + @"\tmp\unpack\";
+            string LA = Path.GetFileName(Properties.Settings.Default.LaunchArguments);
 
             foreach (string folder in Directory.GetDirectories(Path.GetFullPath(UnpackLocation)))
             {

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

@@ -22,7 +22,7 @@ public MPOpen()
 
             string AppData = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
             string SDVAppData = AppData + @"\RWE Labs\SDV Mod Manager\";
-            string UnpackLocation = SDVAppData + @"\tmp\unpack\";
+            string UnpackLocation = Properties.Settings.Default.StardewDir + @"\tmp\unpack\";
 
             if (Directory.Exists(UnpackLocation))
             {
@@ -33,7 +33,7 @@ public MPOpen()
             DriveInfo destDrive = new DriveInfo(Properties.Settings.Default.StardewDir);
             FileInfo fInfo = new FileInfo(Properties.Settings.Default.LaunchArguments);
 
-            if (cDrive.IsReady)
+            if (destDrive.IsReady)
             {
                 var drivekb = cDrive.AvailableFreeSpace / 1024;
                 var drivemb = drivekb / 1024;
@@ -48,7 +48,7 @@ public MPOpen()
                 var ddrivegb = ddrivemb / 1024;
 
                 DriveSpaceDestination.Text = ddrivemb.ToString() + " mb (on " + destDrive.Name + ")";
-                DriveSpaceAvailable.Text = drivemb.ToString() + " mb (" + drivegb + " gb) on (" + cDrive.Name + ")";
+                DriveSpaceAvailable.Text = ddrivemb.ToString() + " mb (" + ddrivegb + " gb) on (" + destDrive.Name + ")";
                 DriveSpaceRequired.Text = filemb.ToString() + " mb";
 
                 if(filemb < drivemb)
@@ -99,15 +99,16 @@ private void Continue_Click(object sender, EventArgs e)
         {
             string AppData = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
             string SDVAppData = AppData + @"\RWE Labs\SDV Mod Manager\";
-            string UnpackLocation = SDVAppData + @"\tmp\unpack\";
+            string UnpackLocation = Properties.Settings.Default.StardewDir + @"\tmp\unpack\";
+            string LA = Path.GetFileName(Properties.Settings.Default.LaunchArguments);
 
             ExtractProgress.Visible = true;
 
             Directory.CreateDirectory(UnpackLocation);
 
             if (Directory.Exists(UnpackLocation))
             {
-                File.Move(Properties.Settings.Default.LaunchArguments, Properties.Settings.Default.LaunchArguments.Replace(".sdvmp", ".zip"));
+                File.Move(Properties.Settings.Default.LaunchArguments, UnpackLocation + LA.Replace(".sdvmp", ".zip"));
 
                 Extract.RunWorkerAsync();
             }
@@ -117,13 +118,14 @@ private void Extract_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 UnpackLocation = Properties.Settings.Default.StardewDir + @"\tmp\unpack\";
+            string LA = Path.GetFileName(Properties.Settings.Default.LaunchArguments);
 
             try
             {
-                ZipFile.ExtractToDirectory(Properties.Settings.Default.LaunchArguments.Replace(".sdvmp", ".zip"), UnpackLocation);
+                ZipFile.ExtractToDirectory(UnpackLocation + LA.Replace(".sdvmp", ".zip"), UnpackLocation);
                 //MessageBox.Show("Done");
-                File.Move(Properties.Settings.Default.LaunchArguments.Replace(".sdvmp", ".zip"), Properties.Settings.Default.LaunchArguments);
+                File.Move(UnpackLocation + LA.Replace(".sdvmp", ".zip"), Properties.Settings.Default.LaunchArguments);
             }
             catch(Exception ex)
             {