closes #81

closes #70 closes #58
R2NorthstarTools · Jan 20, 2024 · fc9d885 · fc9d885
1 parent df58b96
commit fc9d885
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 26 deletions.
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/0883e2ab-a343-421b-976d-3af068158ce8.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/0883e2ab-a343-421b-976d-3af068158ce8.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/33e7d992-618e-4968-af02-6c32d9b60813.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/33e7d992-618e-4968-af02-6c32d9b60813.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/3fbf181a-ded0-44f8-89b1-1b68d5c7532f.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/3fbf181a-ded0-44f8-89b1-1b68d5c7532f.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/51d93959-d706-46ee-9fce-0c0dfa0e6b68.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/51d93959-d706-46ee-9fce-0c0dfa0e6b68.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/54a92ab2-6ce0-4c4e-a351-91d22fe774d8.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/54a92ab2-6ce0-4c4e-a351-91d22fe774d8.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/ad3cd1c1-3eb4-48f0-a0a4-3f2ea1ddb25f.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/ad3cd1c1-3eb4-48f0-a0a4-3f2ea1ddb25f.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/e3075c83-2184-4426-8990-819fac5a54e8.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/e3075c83-2184-4426-8990-819fac5a54e8.vsidx
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/ef6573e4-c734-4c30-a098-8c9474e1899d.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/ef6573e4-c734-4c30-a098-8c9474e1899d.vsidx
diff --git a/VTOL_2.0.0/Pages/Page_Home.xaml.cs b/VTOL_2.0.0/Pages/Page_Home.xaml.cs
@@ -3798,24 +3798,18 @@ private void Unpack_To_Location(string Target_Zip, string Destination_Zip)
             try
             {
                 unpack_flg = false;
-                if (Directory.Exists(Current_Install_Folder + User_Settings_Vars.Profile_Path + @"\packages\Northstar.Client\Locked_Folder"))
-                {
-                    TryDeleteDirectory(Current_Install_Folder + User_Settings_Vars.Profile_Path + @"\packages\Northstar.Client\Locked_Folder", true);
-
-                }
-                if (Directory.Exists(Current_Install_Folder + User_Settings_Vars.Profile_Path + @"\packages\Northstar.Custom\Locked_Folder"))
-                {
-                    TryDeleteDirectory(Current_Install_Folder + User_Settings_Vars.Profile_Path + @"\packages\Northstar.Custom\Locked_Folder", true);
+                string searchPattern = @"Northstar.*";
+                string baseFolderPath = Path.Combine(Current_Install_Folder, User_Settings_Vars.Profile_Path, @"packages\");
 
+                string[] matchingFolders = Directory.GetDirectories(baseFolderPath, searchPattern, SearchOption.AllDirectories);
 
 
-                }
-                if (Directory.Exists(Current_Install_Folder + User_Settings_Vars.Profile_Path + @"\packages\Northstar.CustomServers\Locked_Folder"))
+                foreach (string folderPath in matchingFolders)
                 {
-                    TryDeleteDirectory(Current_Install_Folder + User_Settings_Vars.Profile_Path + @"\packages\Northstar.CustomServers\Locked_Folder", true);
-
-
+                    TryDeleteDirectory(folderPath, true);
                 }
+
+
                 string nrml = GetFile(Current_Install_Folder, @"ns_startup_args.txt");
                 string cfg = GetFile(Current_Install_Folder, @"autoexec_ns_server.cfg");
                 string dedi = GetFile(Current_Install_Folder, @"ns_startup_args_dedi.txt");

diff --git a/VTOL_2.0.0/Resources/Languages/Language.Designer.cs b/VTOL_2.0.0/Resources/Languages/Language.Designer.cs
diff --git a/VTOL_2.0.0/Resources/Languages/Language.resx b/VTOL_2.0.0/Resources/Languages/Language.resx
@@ -732,9 +732,6 @@
   <data name="MANIFEST_FILE_NOT_FOUND" xml:space="preserve">
     <value>MANIFEST FILE NOT FOUND</value>
   </data>
-  <data name="YouHaveInstalledModSettingsModSettingsHasBeenDepreceatedAndWillCauseErrorsNDeleteItNow" xml:space="preserve">
-    <value> "You have Installed Mod Settings!, Mod Settings has been Depreceated and will cause Errors. \nDelete it Now?</value>
-  </data>
   <data name="WARNING" xml:space="preserve">
     <value> "WARNING</value>
   </data>