Mod manager

src/Ryujinx.Ava/Assets/Locales/en_US.json

@@ -54,8 +54,6 @@
   "GameListContextMenuManageTitleUpdatesToolTip": "Opens the Title Update management window",
   "GameListContextMenuManageDlc": "Manage DLC",
   "GameListContextMenuManageDlcToolTip": "Opens the DLC management window",
-  "GameListContextMenuOpenModsDirectory": "Open Mods Directory",
-  "GameListContextMenuOpenModsDirectoryToolTip": "Opens the directory which contains Application's Mods",
   "GameListContextMenuCacheManagement": "Cache Management",
   "GameListContextMenuCacheManagementPurgePptc": "Queue PPTC Rebuild",
   "GameListContextMenuCacheManagementPurgePptcToolTip": "Trigger PPTC to rebuild at boot time on the next game launch",
@@ -388,6 +386,7 @@
   "DialogControllerSettingsModifiedConfirmMessage": "The current controller settings has been updated.",
   "DialogControllerSettingsModifiedConfirmSubMessage": "Do you want to save?",
   "DialogLoadNcaErrorMessage": "{0}. Errored File: {1}",
+  "DialogLoadModErrorMessage": "{0}. Errored File: {1}",
   "DialogDlcNoDlcErrorMessage": "The specified file does not contain a DLC for the selected title!",
   "DialogPerformanceCheckLoggingEnabledMessage": "You have trace logging enabled, which is designed to be used by developers only.",
   "DialogPerformanceCheckLoggingEnabledConfirmMessage": "For optimal performance, it's recommended to disable trace logging. Would you like to disable trace logging now?",
@@ -398,6 +397,8 @@
   "DialogUpdateAddUpdateErrorMessage": "The specified file does not contain an update for the selected title!",
   "DialogSettingsBackendThreadingWarningTitle": "Warning - Backend Threading",
   "DialogSettingsBackendThreadingWarningMessage": "Ryujinx must be restarted after changing this option for it to apply fully. Depending on your platform, you may need to manually disable your driver's own multithreading when using Ryujinx's.",
+  "DialogModManagerDeletionWarningMessage": "You are about to delete the mod: {0}\n\nAre you sure you want to proceed?",
+  "DialogModManagerDeletionAllWarningMessage": "You are about to delete all mods for this title.\n\nAre you sure you want to proceed?",
   "SettingsTabGraphicsFeaturesOptions": "Features",
   "SettingsTabGraphicsBackendMultithreading": "Graphics Backend Multithreading:",
   "CommonAuto": "Auto",
@@ -432,6 +433,7 @@
   "DlcManagerRemoveAllButton": "Remove All",
   "DlcManagerEnableAllButton": "Enable All",
   "DlcManagerDisableAllButton": "Disable All",
+  "ModManagerDeleteAllButton": "Delete All",
   "MenuBarOptionsChangeLanguage": "Change Language",
   "MenuBarShowFileTypes": "Show File Types",
   "CommonSort": "Sort",
@@ -506,6 +508,8 @@
   "EnableInternetAccessTooltip": "Allows the emulated application to connect to the Internet.\n\nGames with a LAN mode can connect to each other when this is enabled and the systems are connected to the same access point. This includes real consoles as well.\n\nDoes NOT allow connecting to Nintendo servers. May cause crashing in certain games that try to connect to the Internet.\n\nLeave OFF if unsure.",
   "GameListContextMenuManageCheatToolTip": "Manage Cheats",
   "GameListContextMenuManageCheat": "Manage Cheats",
+  "GameListContextMenuManageModToolTip": "Manage Mods",
+  "GameListContextMenuManageMod": "Manage Mods",
   "ControllerSettingsStickRange": "Range:",
   "DialogStopEmulationTitle": "Ryujinx - Stop Emulation",
   "DialogStopEmulationMessage": "Are you sure you want to stop emulation?",
@@ -517,8 +521,6 @@
   "SettingsTabCpuMemory": "CPU Mode",
   "DialogUpdaterFlatpakNotSupportedMessage": "Please update Ryujinx via FlatHub.",
   "UpdaterDisabledWarningTitle": "Updater Disabled!",
-  "GameListContextMenuOpenSdModsDirectory": "Open Atmosphere Mods Directory",
-  "GameListContextMenuOpenSdModsDirectoryToolTip": "Opens the alternative SD card Atmosphere directory which contains Application's Mods. Useful for mods that are packaged for real hardware.",
   "ControllerSettingsRotate90": "Rotate 90° Clockwise",
   "IconSize": "Icon Size",
   "IconSizeTooltip": "Change the size of game icons",
@@ -590,13 +592,15 @@
   "Writable": "Writable",
   "SelectDlcDialogTitle": "Select DLC files",
   "SelectUpdateDialogTitle": "Select update files",
+  "SelectModDialogTitle": "Select mod directory",
   "UserProfileWindowTitle": "User Profiles Manager",
   "CheatWindowTitle": "Cheats Manager",
   "DlcWindowTitle": "Manage Downloadable Content for {0} ({1})",
   "UpdateWindowTitle": "Title Update Manager",
   "CheatWindowHeading": "Cheats Available for {0} [{1}]",
   "BuildId": "BuildId:",
   "DlcWindowHeading": "{0} Downloadable Content(s)",
+  "ModWindowHeading": "{0} Mod(s)",
   "UserProfilesEditProfile": "Edit Selected",
   "Cancel": "Cancel",
   "Save": "Save",

src/Ryujinx.Ava/UI/Controls/ApplicationContextMenu.axaml

@@ -47,13 +47,9 @@
         Header="{locale:Locale GameListContextMenuManageCheat}"
         ToolTip.Tip="{locale:Locale GameListContextMenuManageCheatToolTip}" />
     <MenuItem
-        Click="OpenModsDirectory_Click"
-        Header="{locale:Locale GameListContextMenuOpenModsDirectory}"
-        ToolTip.Tip="{locale:Locale GameListContextMenuOpenModsDirectoryToolTip}" />
-    <MenuItem
-        Click="OpenSdModsDirectory_Click"
-        Header="{locale:Locale GameListContextMenuOpenSdModsDirectory}"
-        ToolTip.Tip="{locale:Locale GameListContextMenuOpenSdModsDirectoryToolTip}" />
+        Click="OpenModManager_Click"
+        Header="{locale:Locale GameListContextMenuManageMod}"
+        ToolTip.Tip="{locale:Locale GameListContextMenuManageModToolTip}" />
     <Separator />
     <MenuItem Header="{locale:Locale GameListContextMenuCacheManagement}">
         <MenuItem

src/Ryujinx.Ava/UI/Controls/ApplicationContextMenu.axaml.cs

@@ -126,29 +126,13 @@ public async void OpenCheatManager_Click(object sender, RoutedEventArgs args)
             }
         }
 
-        public void OpenModsDirectory_Click(object sender, RoutedEventArgs args)
+        public async void OpenModManager_Click(object sender, RoutedEventArgs args)
         {
             var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
 
             if (viewModel?.SelectedApplication != null)
             {
-                string modsBasePath = ModLoader.GetModsBasePath();
-                string titleModsPath = ModLoader.GetTitleDir(modsBasePath, viewModel.SelectedApplication.TitleId);
-
-                OpenHelper.OpenFolder(titleModsPath);
-            }
-        }
-
-        public void OpenSdModsDirectory_Click(object sender, RoutedEventArgs args)
-        {
-            var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
-
-            if (viewModel?.SelectedApplication != null)
-            {
-                string sdModsBasePath = ModLoader.GetSdModsBasePath();
-                string titleModsPath = ModLoader.GetTitleDir(sdModsBasePath, viewModel.SelectedApplication.TitleId);
-
-                OpenHelper.OpenFolder(titleModsPath);
+                await ModManagerWindow.Show(ulong.Parse(viewModel.SelectedApplication.TitleId, NumberStyles.HexNumber), viewModel.SelectedApplication.TitleName);
             }
         }
 

src/Ryujinx.Ava/UI/Models/ModModel.cs

@@ -0,0 +1,30 @@
+using Ryujinx.Ava.UI.ViewModels;
+using System.IO;
+
+namespace Ryujinx.Ava.UI.Models
+{
+    public class ModModel : BaseModel
+    {
+        private bool _enabled;
+
+        public bool Enabled
+        {
+            get => _enabled;
+            set
+            {
+                _enabled = value;
+                OnPropertyChanged();
+            }
+        }
+
+        public string Path { get; }
+        public string Name { get; }
+
+        public ModModel(string path, string name, bool enabled)
+        {
+            Path = path;
+            Name = name;
+            Enabled = enabled;
+        }
+    }
+}

src/Ryujinx.Ava/UI/ViewModels/DownloadableContentManagerViewModel.cs

@@ -39,6 +39,7 @@ public class DownloadableContentManagerViewModel : BaseModel
 
         private string _search;
         private readonly ulong _titleId;
+        private readonly IStorageProvider _storageProvider;
 
         private static readonly DownloadableContentJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());
 
@@ -90,8 +91,6 @@ public string UpdateCount
             get => string.Format(LocaleManager.Instance[LocaleKeys.DlcWindowHeading], DownloadableContents.Count);
         }
 
-        public IStorageProvider StorageProvider;
-
         public DownloadableContentManagerViewModel(VirtualFileSystem virtualFileSystem, ulong titleId)
         {
             _virtualFileSystem = virtualFileSystem;
@@ -100,7 +99,7 @@ public DownloadableContentManagerViewModel(VirtualFileSystem virtualFileSystem,
 
             if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
             {
-                StorageProvider = desktop.MainWindow.StorageProvider;
+                _storageProvider = desktop.MainWindow.StorageProvider;
             }
 
             _downloadableContentJsonPath = Path.Combine(AppDataManager.GamesDirPath, titleId.ToString("x16"), "dlc.json");
@@ -203,7 +202,7 @@ private Nca TryOpenNca(IStorage ncaStorage, string containerPath)
 
         public async void Add()
         {
-            var result = await StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
+            var result = await _storageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
             {
                 Title = LocaleManager.Instance[LocaleKeys.SelectDlcDialogTitle],
                 AllowMultiple = true,