Edit TileIDs.cs (ryubing/ryujinx!81)

See merge request ryubing/ryujinx!81

Directory.Packages.props

@@ -40,8 +40,10 @@
     <PackageVersion Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" />
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.AllArch" Version="6.1.2-build3" />
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
-    <PackageVersion Include="Ryujinx.LibHac" Version="0.20.0" />
+    <PackageVersion Include="Ryujinx.LibHac" Version="0.21.0-alpha.116" />
     <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
+    <PackageVersion Include="Ryujinx.UpdateClient" Version="1.0.29" />
+    <PackageVersion Include="Ryujinx.Systems.Update.Common" Version="1.0.29" />
     <PackageVersion Include="Gommon" Version="2.7.1.1" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageVersion Include="Sep" Version="0.6.0" />

README.md

@@ -7,8 +7,8 @@
           
 # Ryujinx
 
-[![Latest release](https://img.shields.io/gitlab/v/release/ryubing%2Fryujinx?gitlab_url=https%3A%2F%2Fgit.ryujinx.app&label=stable&color=32cd32)](https://git.ryujinx.app/ryubing/ryujinx/-/releases)
+[![Latest release](https://img.shields.io/gitlab/v/release/ryubing%2Fryujinx?gitlab_url=https%3A%2F%2Fgit.ryujinx.app&label=stable&color=32cd32)](https://update.ryujinx.app/latest/stable)
-[![Latest canary release](https://img.shields.io/gitlab/v/release/ryubing%2Fcanary?gitlab_url=https%3A%2F%2Fgit.ryujinx.app&label=canary&color=FF4500)](https://git.ryujinx.app/ryubing/canary/-/releases)
+[![Latest canary release](https://img.shields.io/gitlab/v/release/ryubing%2Fcanary?gitlab_url=https%3A%2F%2Fgit.ryujinx.app&label=canary&color=FF4500)](https://update.ryujinx.app/latest/canary)
 <br>
 <a href="https://discord.gg/PEuzjrFXUA">
 <img src="https://img.shields.io/discord/1294443224030511104?color=5865F2&label=Ryubing&logo=discord&logoColor=white" alt="Discord">

docs/compatibility.csv

@@ -2257,6 +2257,7 @@
 010086F0064CE000,"Poi: Explorer Edition",nvdec,playable,2021-01-21 19:32:00
 0100EB6012FD2000,"Poison Control",,playable,2021-05-16 14:01:54
 010072400E04A000,"Pokémon Café ReMix",,playable,2021-08-17 20:00:04
+010008c01e742000,"Pokémon Friends",crash;services,menus,2025-07-24 13:32:00
 01003D200BAA2000,"Pokémon Mystery Dungeon™: Rescue Team DX",mac-bug,playable,2024-01-21 00:16:32
 01008DB008C2C000,"Pokémon Shield + Pokémon Shield Expansion Pass",deadlock;crash;online-broken;ldn-works;LAN,ingame,2024-08-12 07:20:22
 0100ABF008968000,"Pokémon Sword + Pokémon Sword Expansion Pass",deadlock;crash;online-broken;ldn-works;LAN,ingame,2024-08-26 15:40:37
@@ -2436,6 +2437,7 @@
 0100E9C010EA8000,"Rise of Insanity",,playable,2020-08-30 15:42:14
 01006BA00E652000,"Rise: Race The Future",,playable,2021-02-27 13:29:06
 010020C012F48000,"Rising Hell",,playable,2022-10-31 13:54:02
+0100D1801A0F4000,"Risk of Rain Returns",,playable,2025-06-28 04:24:04
 010076D00E4BA000,"Risk of Rain 2",online-broken,playable,2024-03-04 17:01:05
 0100E8300A67A000,"RISK® Global Domination",nvdec;online-broken,playable,2022-08-01 18:53:28
 010042500FABA000,"Ritual: Crown of Horns",,playable,2021-01-26 16:01:47
@@ -3017,6 +3019,7 @@
 01009B101044C000,"The Legend of Heroes: Trails of Cold Steel III Demo",demo;nvdec,playable,2021-04-23 01:07:32
 0100D3C010DE8000,"The Legend of Heroes: Trails of Cold Steel IV",nvdec,playable,2021-04-23 14:01:05
 01005E5013862000,"THE LEGEND OF HEROES: ZERO NO KISEKI KAI [英雄傳說 零之軌跡：改]",crash,nothing,2021-09-30 14:41:07
+01009C901ACEE000,"The Legend of Nayuta: Boundless Trails",,ingame,2025-06-12 15:47
 01008CF01BAAC000,"The Legend of Zelda Echoes of Wisdom",nvdec;ASTC;intel-vendor-bug,playable,2024-10-01 14:11:01
 0100509005AF2000,"The Legend of Zelda: Breath of the Wild Demo",demo,ingame,2022-12-24 05:02:58
 01007EF00011E000,"The Legend of Zelda™: Breath of the Wild",gpu;amd-vendor-bug;mac-bug,ingame,2024-09-23 19:35:46

nuget.config

@@ -5,19 +5,21 @@
         <clear />
         <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
         <!-- Only needed when using pre-release versions of Ryujinx.LibHac. -->
-        <!--<add key="LibHacAlpha" value="https://git.ryujinx.app/api/v4/projects/17/packages/nuget/index.json" />-->
+        <add key="LibHacAlpha" value="https://git.ryujinx.app/api/v4/projects/17/packages/nuget/index.json" />
         <add key="Ryujinx.UpdateClient" value="https://git.ryujinx.app/api/v4/projects/71/packages/nuget/index.json" />
     </packageSources>
     <packageSourceMapping>
         <!-- key value for <packageSource> should match key values from <packageSources> element -->
+        <!-- These are defined and .NET still yells about multiple package sources with no mappings. Not sure what to do, this is in the docs lol -->
         <packageSource key="nuget.org">
             <package pattern="*" />
         </packageSource>
         <packageSource key="Ryujinx.UpdateClient">
             <package pattern="Ryujinx.UpdateClient" />
+            <package pattern="Ryujinx.Systems.Update.Common" />
         </packageSource>
-        <!--<packageSource key="LibHacAlpha">
+        <packageSource key="LibHacAlpha">
             <package pattern="Ryujinx.LibHac" />
-        </packageSource>-->
+        </packageSource>
     </packageSourceMapping>
 </configuration>

src/Ryujinx.Common/TitleIDs.cs

@@ -93,6 +93,7 @@ namespace Ryujinx.Common
                           //The Pokémon Franchise
             "0100f4300bf2c000", // New Pokémon Snap
             "0100000011d90000", // Pokémon Brilliant Diamond
+            "010008c01e742000", // Pokémon Friends
             "01001f5010dfa000", // Pokémon Legends: Arceus
             "01003d200baa2000", // Pokémon Mystery Dungeon - Rescue Team DX
             "0100a3d008c5c000", // Pokémon Scarlet

src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ILibraryAppletCreator.cs

@@ -21,6 +21,21 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
             return ResultCode.Success;
         }
 
+        [CommandCmif(3)] // 20.0.0+
+        // CreateLibraryAppletEx(u32, u32, u64) -> object<nn::am::service::ILibraryAppletAccessor>
+        public ResultCode CreateLibraryAppletEx(ServiceCtx context)
+        {
+            AppletId appletId = (AppletId)context.RequestData.ReadInt32();
+
+            _ = context.RequestData.ReadInt32(); // libraryAppletMode
+
+            _ = context.RequestData.ReadUInt64(); // threadId
+
+            MakeObject(context, new ILibraryAppletAccessor(appletId, context.Device.System));
+
+            return ResultCode.Success;
+        }
+
         [CommandCmif(10)]
         // CreateStorage(u64) -> object<nn::am::service::IStorage>
         public ResultCode CreateStorage(ServiceCtx context)

src/Ryujinx/Common/Models/Github/GithubReleaseAssetJsonResponse.cs

@@ -1,9 +0,0 @@
-namespace Ryujinx.Ava.Common.Models.Github
-{
-    public class GithubReleaseAssetJsonResponse
-    {
-        public string Name { get; set; }
-        public string State { get; set; }
-        public string BrowserDownloadUrl { get; set; }
-    }
-}

src/Ryujinx/Common/Models/Github/GithubReleasesJsonResponse.cs

@@ -1,12 +0,0 @@
-using System.Collections.Generic;
-
-namespace Ryujinx.Ava.Common.Models.Github
-{
-    public class GithubReleasesJsonResponse
-    {
-        public string Name { get; set; }
-
-        public string TagName { get; set; }
-        public List<GithubReleaseAssetJsonResponse> Assets { get; set; }
-    }
-}

src/Ryujinx/Common/Models/Github/GithubReleasesJsonSerializerContext.cs

@@ -1,7 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace Ryujinx.Ava.Common.Models.Github
-{
-    [JsonSerializable(typeof(GithubReleasesJsonResponse), GenerationMode = JsonSourceGenerationMode.Metadata)]
-    public partial class GithubReleasesJsonSerializerContext : JsonSerializerContext;
-}

src/Ryujinx/Ryujinx.csproj

@@ -65,6 +65,8 @@
     <PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" />
     <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies.AllArch" />
     <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64' AND '$(RuntimeIdentifier)' != 'win-arm64'" />
+    <PackageReference Include="Ryujinx.UpdateClient" />
+    <PackageReference Include="Ryujinx.Systems.Update.Common" />
     <PackageReference Include="securifybv.ShellLink" />
     <PackageReference Include="Sep" />
     <PackageReference Include="Silk.NET.Vulkan" />

src/Ryujinx/Systems/AppHost.cs

@@ -75,6 +75,7 @@ namespace Ryujinx.Ava.Systems
 
         private readonly long _ticksPerFrame;
         private readonly Stopwatch _chrono;
+        private readonly Stopwatch _playTimer;
         private long _ticks;
 
         private readonly AccountManager _accountManager;
@@ -175,6 +176,7 @@ namespace Ryujinx.Ava.Systems
 
             _chrono = new Stopwatch();
             _ticksPerFrame = Stopwatch.Frequency / TargetFps;
+            _playTimer = new Stopwatch();
 
             if (ApplicationPath.StartsWith("@SystemContent"))
             {
@@ -565,6 +567,7 @@ namespace Ryujinx.Ava.Systems
         public void Stop()
         {
             _isActive = false;
+            _playTimer.Stop();
         }
 
         private void Exit()
@@ -616,7 +619,7 @@ namespace Ryujinx.Ava.Systems
         private void Dispose()
         {
             if (Device.Processes != null)
-                MainWindowViewModel.UpdateGameMetadata(Device.Processes.ActiveApplication.ProgramIdText);
+                MainWindowViewModel.UpdateGameMetadata(Device.Processes.ActiveApplication.ProgramIdText, _playTimer.Elapsed);
 
             ConfigurationState.Instance.System.IgnoreMissingServices.Event -= UpdateIgnoreMissingServicesState;
             ConfigurationState.Instance.Graphics.AspectRatio.Event -= UpdateAspectRatioState;
@@ -635,6 +638,7 @@ namespace Ryujinx.Ava.Systems
             _gpuCancellationTokenSource.Dispose();
 
             _chrono.Stop();
+            _playTimer.Stop();
         }
 
         public void DisposeGpu()
@@ -868,6 +872,7 @@ namespace Ryujinx.Ava.Systems
             ApplicationLibrary.LoadAndSaveMetaData(Device.Processes.ActiveApplication.ProgramIdText,
                 appMetadata => appMetadata.UpdatePreGame()
             );
+            _playTimer.Start();
 
             return true;
         }
@@ -877,6 +882,7 @@ namespace Ryujinx.Ava.Systems
             Device?.System.TogglePauseEmulation(false);
 
             _viewModel.IsPaused = false;
+            _playTimer.Start();
             _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI);
             Logger.Info?.Print(LogClass.Emulation, "Emulation was resumed");
         }
@@ -886,6 +892,7 @@ namespace Ryujinx.Ava.Systems
             Device?.System.TogglePauseEmulation(true);
 
             _viewModel.IsPaused = true;
+            _playTimer.Stop();
             _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI, LocaleManager.Instance[LocaleKeys.Paused]);
             Logger.Info?.Print(LogClass.Emulation, "Emulation was paused");
         }

src/Ryujinx/Systems/AppLibrary/ApplicationMetadata.cs

@@ -33,19 +33,11 @@ namespace Ryujinx.Ava.Systems.AppLibrary
         /// <summary>
         /// Updates <see cref="LastPlayed"/> and <see cref="TimePlayed"/>. Call this after a game ends.
         /// </summary>
-        public void UpdatePostGame()
+        /// <param name="playTime">The active gameplay time this past session.</param>
+        public void UpdatePostGame(TimeSpan playTime)
         {
-            DateTime? prevLastPlayed = LastPlayed;
             UpdatePreGame();
-
+            TimePlayed += playTime;
-            if (!prevLastPlayed.HasValue)
-            {
-                return;
-            }
-
-            TimeSpan diff = DateTime.UtcNow - prevLastPlayed.Value;
-            double newTotalSeconds = TimePlayed.Add(diff).TotalSeconds;
-            TimePlayed = TimeSpan.FromSeconds(Math.Round(newTotalSeconds, MidpointRounding.AwayFromZero));
         }
     }
 }

src/Ryujinx/Systems/Updater/Updater.GitLab.cs

@@ -4,42 +4,26 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Common;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
+using Ryujinx.Systems.Update.Client;
+using Ryujinx.Systems.Update.Common;
 using System;
-using System.Net.Http;
-using System.Net.Http.Json;
-using System.Runtime.InteropServices;
-using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.Systems
 {
     internal static partial class Updater
     {
-        private static string CreateUpdateQueryUrl()
+        private static VersionResponse _versionResponse;
-        {
-#pragma warning disable CS8524
-            var os = RunningPlatform.CurrentOS switch
-#pragma warning restore CS8524
-            {
-                OperatingSystemType.MacOS => "mac",
-                OperatingSystemType.Linux => "linux",
-                OperatingSystemType.Windows => "win"
-            };
 
-            var arch = RunningPlatform.Architecture switch
+        private static UpdateClient CreateUpdateClient()
-            {
+            => UpdateClient.Builder()
-                Architecture.Arm64 => "arm",
+                .WithServerEndpoint("https://update.ryujinx.app") // This is the default, and doesn't need to be provided; it's here for transparency.
-                Architecture.X64 => "amd64",
+                .WithLogger((format, args, caller) => 
-                _ => null
+                    Logger.Info?.Print(
-            };
+                        LogClass.Application, 
-
+                        args.Length is 0 ? format : format.Format(args), 
-            if (arch is null)
+                        caller: caller)
-                return null;
+                    );
-
-            var rc = ReleaseInformation.IsCanaryBuild ? "canary" : "stable";
-
-            return $"https://update.ryujinx.app/latest/query?os={os}&arch={arch}&rc={rc}";
-        }
 
         public static async Task<Optional<(Version Current, Version Incoming)>> CheckVersionAsync(bool showVersionUpToDate = false)
         {
@@ -57,39 +41,31 @@ namespace Ryujinx.Ava.Systems
                 return default;
             }
 
-            if (CreateUpdateQueryUrl() is not {} updateUrl)
+            using UpdateClient updateClient = CreateUpdateClient();
-            {
-                Logger.Error?.Print(LogClass.Application, "Could not determine URL for updates.");
-                
-                _running = false;
-
-                return default;
-            }
-
-            Logger.Info?.Print(LogClass.Application, $"Checking for updates from {updateUrl}.");
-
-            // Get latest version number from update.ryujinx.app API
-            using HttpClient jsonClient = ConstructHttpClient();
 
             try
             {
-                UpdaterResponse response =
+                _versionResponse = await updateClient.QueryLatestAsync(ReleaseInformation.IsCanaryBuild
-                    await jsonClient.GetFromJsonAsync(updateUrl, UpdaterResponseJsonContext.Default.UpdaterResponse);
+                    ? ReleaseChannel.Canary
-
+                    : ReleaseChannel.Stable);
-                _buildVer = response.Tag;
-                _buildUrl = response.DownloadUrl;
-                _changelogUrlFormat = response.ReleaseUrlFormat;
             }
             catch (Exception e)
             {
-                Logger.Error?.Print(LogClass.Application, $"An error occurred when parsing JSON response from API ({e.GetType().AsFullNamePrettyString()}): {e.Message}");
+                Logger.Error?.Print(LogClass.Application, $"An error occurred when requesting for updates ({e.GetType().AsFullNamePrettyString()}): {e.Message}");
 
                 _running = false;
                 return default;
             }
+            
+            if (_versionResponse == null)
+            {
+                // logging is done via the UpdateClient library
+                _running = false;
+                return default;
+            }
 
             // If build URL not found, assume no new update is available.
-            if (_buildUrl is null or "")
+            if (_versionResponse.ArtifactUrl is null or "")
             {
                 if (showVersionUpToDate)
                 {
@@ -99,7 +75,7 @@ namespace Ryujinx.Ava.Systems
 
                     if (userResult is UserResult.Ok)
                     {
-                        OpenHelper.OpenUrl(_changelogUrlFormat.Format(currentVersion));
+                        OpenHelper.OpenUrl(_versionResponse.ReleaseUrlFormat.Format(currentVersion));
                     }
                 }
 
@@ -111,7 +87,7 @@ namespace Ryujinx.Ava.Systems
             }
 
 
-            if (!Version.TryParse(_buildVer, out Version newVersion))
+            if (!Version.TryParse(_versionResponse.Version, out Version newVersion))
             {
                 Logger.Error?.Print(LogClass.Application,
                     $"Failed to convert the received {RyujinxApp.FullAppName} version from the update server!");
@@ -127,17 +103,5 @@ namespace Ryujinx.Ava.Systems
 
             return (currentVersion, newVersion);
         }
-        
-        [JsonSerializable(typeof(UpdaterResponse))]
-        partial class UpdaterResponseJsonContext : JsonSerializerContext;
-
-        public class UpdaterResponse
-        {
-            [JsonPropertyName("tag")] public string Tag { get; set; }
-            [JsonPropertyName("download_url")] public string DownloadUrl { get; set; }
-            [JsonPropertyName("web_url")] public string ReleaseUrl { get; set; }
-
-            [JsonIgnore] public string ReleaseUrlFormat => ReleaseUrl.Replace(Tag, "{0}");
-        }
     }
 }

src/Ryujinx/Systems/Updater/Updater.cs

@@ -5,13 +5,11 @@ using ICSharpCode.SharpZipLib.GZip;
 using ICSharpCode.SharpZipLib.Tar;
 using ICSharpCode.SharpZipLib.Zip;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Common.Models.Github;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Common;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
-using Ryujinx.Common.Utilities;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -35,17 +33,13 @@ namespace Ryujinx.Ava.Systems
         private static readonly string _updateDir = Path.Combine(Path.GetTempPath(), "Ryujinx", "update");
         private static readonly string _updatePublishDir = Path.Combine(_updateDir, "publish");
         private const int ConnectionCount = 4;
-
+        
-        private static string _buildVer;
-        private static string _buildUrl;
         private static long _buildSize;
         private static bool _updateSuccessful;
         private static bool _running;
 
         private static readonly string[] _windowsDependencyDirs = [];
         
-        private static string _changelogUrlFormat = null;
-        
         public static async Task BeginUpdateAsync(bool showVersionUpToDate = false)
         {
             if (_running)
@@ -72,7 +66,7 @@ namespace Ryujinx.Ava.Systems
 
                     if (userResult is UserResult.Ok)
                     {
-                        OpenHelper.OpenUrl(_changelogUrlFormat.Format(currentVersion));
+                        OpenHelper.OpenUrl(_versionResponse.ReleaseUrlFormat.Format(currentVersion));
                     }
                 }
 
@@ -92,7 +86,7 @@ namespace Ryujinx.Ava.Systems
                 // GitLab instance is located in Ukraine. Connection times will vary across the world.
                 buildSizeClient.Timeout = TimeSpan.FromSeconds(10);
 
-                HttpResponseMessage message = await buildSizeClient.GetAsync(new Uri(_buildUrl), HttpCompletionOption.ResponseHeadersRead);
+                HttpResponseMessage message = await buildSizeClient.GetAsync(new Uri(_versionResponse.ArtifactUrl), HttpCompletionOption.ResponseHeadersRead);
 
                 _buildSize = message.Content.Headers.ContentRange.Length.Value;
             }
@@ -122,7 +116,7 @@ namespace Ryujinx.Ava.Systems
                 switch (shouldUpdate)
                 {
                     case UserResult.Yes:
-                        await UpdateRyujinx(_buildUrl);
+                        await UpdateRyujinx(_versionResponse.ArtifactUrl);
                         break;
                     // Secondary button maps to no, which in this case is the show changelog button.
                     case UserResult.No:

src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml

@@ -41,32 +41,34 @@
         Command="{Binding OpenApplicationCompatibility}"
         CommandParameter="{Binding}"
         Header="{ext:Locale GameListContextMenuShowCompatEntry}"
-        Icon="{ext:Icon mdi-gamepad}"
+        Icon="{ext:Icon fa-solid fa-database}"
         ToolTip.Tip="{ext:Locale GameListContextMenuShowCompatEntryToolTip}"/>
     <MenuItem
         Command="{Binding OpenApplicationData}"
         CommandParameter="{Binding}"
         Header="{ext:Locale GameListContextMenuShowGameData}"
-        Icon="{ext:Icon mdi-chart-line}"
+        Icon="{ext:Icon fa-solid fa-chart-line}"
         ToolTip.Tip="{ext:Locale GameListContextMenuShowGameDataToolTip}"/>
     <Separator />
     <MenuItem
         Command="{Binding OpenUserSaveDirectory}"
         CommandParameter="{Binding}"
         Header="{ext:Locale GameListContextMenuOpenUserSaveDirectory}"
-        Icon="{ext:Icon mdi-folder-account}"
+        Icon="{ext:Icon fa-solid fa-sd-card}"
         IsEnabled="{Binding OpenUserSaveDirectoryEnabled}"
         ToolTip.Tip="{ext:Locale GameListContextMenuOpenUserSaveDirectoryToolTip}" />
     <MenuItem
         Command="{Binding OpenDeviceSaveDirectory}"
         CommandParameter="{Binding}"
         Header="{ext:Locale GameListContextMenuOpenDeviceSaveDirectory}"
+        Icon="{ext:Icon fa-solid fa-hard-drive}"
         IsEnabled="{Binding OpenDeviceSaveDirectoryEnabled}"
         ToolTip.Tip="{ext:Locale GameListContextMenuOpenDeviceSaveDirectoryToolTip}" />
     <MenuItem
         Command="{Binding OpenBcatSaveDirectory}"
         CommandParameter="{Binding}"
         Header="{ext:Locale GameListContextMenuOpenBcatSaveDirectory}"
+        Icon="{ext:Icon fa-solid fa-box-archive}"
         IsEnabled="{Binding OpenBcatSaveDirectoryEnabled}"
         ToolTip.Tip="{ext:Locale GameListContextMenuOpenBcatSaveDirectoryToolTip}" />
     <Separator />
@@ -92,20 +94,20 @@
         Command="{Binding OpenModManager}"
         CommandParameter="{Binding}"
         Header="{ext:Locale GameListContextMenuManageMod}"
-        Icon="{ext:Icon mdi-view-module}"
+        Icon="{ext:Icon fa-solid fa-sliders}"
         ToolTip.Tip="{ext:Locale GameListContextMenuManageModToolTip}" />
     <Separator />
     <MenuItem
         Command="{Binding OpenModsDirectory}"
         CommandParameter="{Binding}"
         Header="{ext:Locale GameListContextMenuOpenModsDirectory}"
-        Icon="{ext:Icon mdi-folder-file}"
+        Icon="{ext:Icon fa-solid fa-folder}"
         ToolTip.Tip="{ext:Locale GameListContextMenuOpenModsDirectoryToolTip}" />
     <MenuItem
         Command="{Binding OpenSdModsDirectory}"
         CommandParameter="{Binding}"
         Header="{ext:Locale GameListContextMenuOpenSdModsDirectory}"
-        Icon="{ext:Icon mdi-folder-file}"
+        Icon="{ext:Icon fa-solid fa-folder}"
         ToolTip.Tip="{ext:Locale GameListContextMenuOpenSdModsDirectoryToolTip}" />
     <Separator />
 	<MenuItem
@@ -113,40 +115,41 @@
         CommandParameter="{Binding}"
 		Header="{ext:Locale GameListContextMenuTrimXCI}"
         IsEnabled="{Binding TrimXCIEnabled}"
+        Icon="{ext:Icon fa-solid fa-scissors}"
 		ToolTip.Tip="{ext:Locale GameListContextMenuTrimXCIToolTip}" />
-    <MenuItem Header="{ext:Locale GameListContextMenuCacheManagement}" Icon="{ext:Icon mdi-cached}">
+    <MenuItem Header="{ext:Locale GameListContextMenuCacheManagement}" Icon="{ext:Icon fa-solid fa-memory}">
         <MenuItem
             Command="{Binding PurgePtcCache}"
             CommandParameter="{Binding}"
             Header="{ext:Locale GameListContextMenuCacheManagementPurgePptc}"
-            Icon="{ext:Icon mdi-refresh}"
+            Icon="{ext:Icon fa-solid fa-arrow-rotate-right}"
             ToolTip.Tip="{ext:Locale GameListContextMenuCacheManagementPurgePptcToolTip}" />
         <MenuItem
             Command="{Binding NukePtcCache}"
             CommandParameter="{Binding}"
             Header="{ext:Locale GameListContextMenuCacheManagementNukePptc}"
-            Icon="{ext:Icon mdi-delete-alert}"
+            Icon="{ext:Icon fa-solid fa-trash-can}"
             ToolTip.Tip="{ext:Locale GameListContextMenuCacheManagementNukePptcToolTip}" />
         <MenuItem
             Command="{Binding PurgeShaderCache}"
             CommandParameter="{Binding}"
             Header="{ext:Locale GameListContextMenuCacheManagementPurgeShaderCache}"
-            Icon="{ext:Icon mdi-delete-alert}"
+            Icon="{ext:Icon fa-solid fa-trash-can}"
             ToolTip.Tip="{ext:Locale GameListContextMenuCacheManagementPurgeShaderCacheToolTip}" />
         <MenuItem
             Command="{Binding OpenPtcDirectory}"
             CommandParameter="{Binding}"
             Header="{ext:Locale GameListContextMenuCacheManagementOpenPptcDirectory}"
-            Icon="{ext:Icon mdi-folder-arrow-up-down}"
+            Icon="{ext:Icon fa-solid fa-folder}"
             ToolTip.Tip="{ext:Locale GameListContextMenuCacheManagementOpenPptcDirectoryToolTip}" />
         <MenuItem
             Command="{Binding OpenShaderCacheDirectory}"
             CommandParameter="{Binding}"
             Header="{ext:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectory}"
-            Icon="{ext:Icon mdi-folder-arrow-up-down}"
+            Icon="{ext:Icon fa-solid fa-folder}"
             ToolTip.Tip="{ext:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectoryToolTip}" />
     </MenuItem>
-    <MenuItem Header="{ext:Locale GameListContextMenuExtractData}">
+    <MenuItem Header="{ext:Locale GameListContextMenuExtractData}" Icon="{ext:Icon fa-solid fa-file-export}">
         <MenuItem
             Command="{Binding ExtractApplicationExeFs}"
             CommandParameter="{Binding}"

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -310,10 +310,15 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         private void TotalTimePlayed_Recalculated(Optional<TimeSpan> ts)
         {
-            ShowTotalTimePlayed = ts.HasValue;
-
             if (ts.HasValue)
-                LocaleManager.Instance.SetDynamicValues(LocaleKeys.GameListLabelTotalTimePlayed, ValueFormatUtils.FormatTimeSpan(ts.Value));
+            {
+                var formattedPlayTime = ValueFormatUtils.FormatTimeSpan(ts.Value);
+                LocaleManager.Instance.SetDynamicValues(LocaleKeys.GameListLabelTotalTimePlayed, formattedPlayTime);
+                ShowTotalTimePlayed = formattedPlayTime != string.Empty;
+                return;
+            }
+            
+            ShowTotalTimePlayed = ts.HasValue;
         }
 
         public bool ShowTotalTimePlayed
@@ -334,7 +339,6 @@ namespace Ryujinx.Ava.UI.ViewModels
                 _listSelectedApplication = value;
 
                 if (_listSelectedApplication != null && ListAppContextMenu == null)
-
                     ListAppContextMenu = new ApplicationContextMenu();
                 else if (_listSelectedApplication == null && ListAppContextMenu != null)
                     ListAppContextMenu = null!;
@@ -1688,8 +1692,8 @@ namespace Ryujinx.Ava.UI.ViewModels
                 RendererHostControl.Focus();
             });
 
-        public static void UpdateGameMetadata(string titleId)
+        public static void UpdateGameMetadata(string titleId, TimeSpan playTime)
-            => ApplicationLibrary.LoadAndSaveMetaData(titleId, appMetadata => appMetadata.UpdatePostGame());
+            => ApplicationLibrary.LoadAndSaveMetaData(titleId, appMetadata => appMetadata.UpdatePostGame(playTime));
 
         public void RefreshFirmwareStatus()
         {

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml

@@ -37,7 +37,7 @@
                 <MenuItem
                     Command="{Binding OpenFolder}"
                     Header="{ext:Locale MenuBarFileOpenUnpacked}"
-                    Icon="{ext:Icon fa-solid fa-folder}"
+                    Icon="{ext:Icon fa-solid fa-folder-open}"
                     IsEnabled="{Binding EnableNonGameRunningControls}"
                     ToolTip.Tip="{ext:Locale LoadApplicationFolderTooltip}" />
                 <MenuItem
@@ -52,7 +52,7 @@
                     Icon="{ext:Icon fa-solid fa-code-compare}"
                     IsEnabled="{Binding EnableNonGameRunningControls}"
                     ToolTip.Tip="{ext:Locale LoadTitleUpdatesFromFolderTooltip}" />
-                <MenuItem Header="{ext:Locale MenuBarFileOpenApplet}" IsEnabled="{Binding IsAppletMenuActive}" Icon="{ext:Icon mdi-launch}">
+                <MenuItem Header="{ext:Locale MenuBarFileOpenApplet}" IsEnabled="{Binding IsAppletMenuActive}" Icon="{ext:Icon fa-solid fa-microchip}">
                     <MenuItem
                         Name="MiiAppletMenuItem"
                         Header="{ext:Locale MenuBarFileOpenAppletOpenMiiApplet}"
@@ -63,20 +63,23 @@
                 <MenuItem
                     Command="{Binding OpenRyujinxFolder}"
                     Header="{ext:Locale MenuBarFileOpenEmuFolder}"
+                    Icon="{ext:Icon fa-solid fa-folder-closed}"
                     ToolTip.Tip="{ext:Locale OpenRyujinxFolderTooltip}" />
                 <MenuItem
                     Command="{Binding OpenScreenshotsFolder}"
                     Header="{ext:Locale MenuBarFileOpenScreenshotsFolder}"
+                    Icon="{ext:Icon fa-solid fa-desktop}"
                     ToolTip.Tip="{ext:Locale OpenScreenshotFolderTooltip}"/>
                 <MenuItem
                     Command="{Binding OpenLogsFolder}"
                     Header="{ext:Locale MenuBarFileOpenLogsFolder}"
+                    Icon="{ext:Icon fa-solid fa-file-lines}"
                     ToolTip.Tip="{ext:Locale OpenRyujinxLogsTooltip}" />
                 <Separator />
                 <MenuItem
                     Name="CloseRyujinxMenuItem"
                     Header="{ext:Locale MenuBarFileExit}"
-                    Icon="{ext:Icon fa-solid fa-xmark}"
+                    Icon="{ext:Icon fa-solid fa-power-off}"
                     ToolTip.Tip="{ext:Locale ExitTooltip}" />
             </MenuItem>
             <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarOptions}">
@@ -133,7 +136,7 @@
                     Name="ChangeLanguageMenuItem" 
                     Padding="0"
                     Header="{ext:Locale MenuBarOptionsChangeLanguage}"
-                    Icon="{ext:Icon fa-solid fa-language}"
+                    Icon="{ext:Icon fa-solid fa-globe}"
                     Classes="withCheckbox">
                 </MenuItem>
                 <MenuItem 
@@ -153,7 +156,7 @@
                     Command="{Binding ManageProfiles}"
                     Padding="0"
                     Header="{ext:Locale MenuBarOptionsManageUserProfiles}"
-                    Icon="{ext:Icon mdi-account}"
+                    Icon="{ext:Icon fa-solid fa-user}"
                     IsEnabled="{Binding EnableNonGameRunningControls}"
                     ToolTip.Tip="{ext:Locale OpenProfileManagerTooltip}"
                     Classes="withCheckbox">
@@ -185,33 +188,33 @@
                     InputGesture="Escape"
                     IsEnabled="{Binding IsGameRunning}"
                     ToolTip.Tip="{ext:Locale StopEmulationTooltip}" />
-                <MenuItem Command="{Binding SimulateWakeUpMessage}" Header="{ext:Locale MenuBarOptionsSimulateWakeUpMessage}" />
+                <MenuItem Command="{Binding SimulateWakeUpMessage}" Header="{ext:Locale MenuBarOptionsSimulateWakeUpMessage}" Icon="{ext:Icon fa-solid fa-sun}" />
                 <Separator />
                 <MenuItem
                     Command="{Binding OpenAmiiboWindow}"
                     AttachedToVisualTree="ScanAmiiboMenuItem_AttachedToVisualTree"
                     Header="{ext:Locale MenuBarActionsScanAmiibo}"
-                    Icon="{ext:Icon mdi-cube-scan}"
+                    Icon="{ext:Icon fa-solid fa-cube}"
                     InputGesture="Ctrl + A"
                     IsEnabled="{Binding IsAmiiboRequested}" />
                 <MenuItem
                     Command="{Binding OpenBinFile}"
                     AttachedToVisualTree="ScanBinAmiiboMenuItem_AttachedToVisualTree"
                     Header="{ext:Locale MenuBarActionsScanAmiiboBin}"
-                    Icon="{ext:Icon mdi-cube-scan}"
+                    Icon="{ext:Icon fa-solid fa-cube}"
                     IsVisible="{Binding CanScanAmiiboBinaries}"
                     InputGesture="Ctrl + B"
                     IsEnabled="{Binding IsAmiiboBinRequested}" />
                 <MenuItem
                     Command="{Binding TakeScreenshot}"
                     Header="{ext:Locale MenuBarFileToolsTakeScreenshot}"
-                    Icon="{ext:Icon mdi-monitor-screenshot}"
+                    Icon="{ext:Icon fa-solid fa-camera}"
                     InputGesture="{Binding ScreenshotKey}"
                     IsEnabled="{Binding IsGameRunning}" />
                 <MenuItem
                     Command="{Binding HideUi}"
                     Header="{ext:Locale MenuBarFileToolsHideUi}"
-                    Icon="{ext:Icon mdi-eye-off}"
+                    Icon="{ext:Icon fa-solid fa-eye-slash}"
                     InputGesture="{Binding ShowUiKey}"
                     IsEnabled="{Binding IsGameRunning}" />
                 <MenuItem
@@ -222,12 +225,12 @@
             </MenuItem>
             <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarActions}" IsVisible="{Binding EnableNonGameRunningControls}">
                 <MenuItem Header="{ext:Locale MenuBarActionsInstallKeys}" Icon="{ext:Icon fa-solid fa-key}">
-                    <MenuItem Command="{Binding InstallKeysFromFile}" Header="{ext:Locale MenuBarFileActionsInstallKeysFromFile}" Icon="{ext:Icon mdi-file-cog}" />
+                    <MenuItem Command="{Binding InstallKeysFromFile}" Header="{ext:Locale MenuBarFileActionsInstallKeysFromFile}" Icon="{ext:Icon fa-solid fa-file-code}" />
-                    <MenuItem Command="{Binding InstallKeysFromFolder}" Header="{ext:Locale MenuBarFileActionsInstallKeysFromFolder}" Icon="{ext:Icon mdi-folder-cog}" />
+                    <MenuItem Command="{Binding InstallKeysFromFolder}" Header="{ext:Locale MenuBarFileActionsInstallKeysFromFolder}" Icon="{ext:Icon fa-solid fa-folder-closed}" />
                 </MenuItem>
-                <MenuItem Header="{ext:Locale MenuBarActionsInstallFirmware}" Icon="{ext:Icon fa-solid fa-download}">
+                <MenuItem Header="{ext:Locale MenuBarActionsInstallFirmware}" Icon="{ext:Icon fa-solid fa-floppy-disk}">
-                    <MenuItem Command="{Binding InstallFirmwareFromFile}" Header="{ext:Locale MenuBarActionsInstallFirmwareFromFile}" Icon="{ext:Icon mdi-file-cog}" />
+                    <MenuItem Command="{Binding InstallFirmwareFromFile}" Header="{ext:Locale MenuBarActionsInstallFirmwareFromFile}" Icon="{ext:Icon fa-solid fa-file-code}" />
-                    <MenuItem Command="{Binding InstallFirmwareFromFolder}" Header="{ext:Locale MenuBarActionsInstallFirmwareFromDirectory}" Icon="{ext:Icon mdi-folder-cog}" />
+                    <MenuItem Command="{Binding InstallFirmwareFromFolder}" Header="{ext:Locale MenuBarActionsInstallFirmwareFromDirectory}" Icon="{ext:Icon fa-solid fa-folder-closed}" />
                 </MenuItem>
                 <MenuItem Header="{ext:Locale MenuBarActionsManageFileTypes}" IsVisible="{Binding ManageFileTypesVisible}">
                     <MenuItem Name="InstallFileTypesMenuItem" Header="{ext:Locale MenuBarActionsInstallFileTypes}" IsEnabled="{Binding AreMimeTypesRegistered, Converter={x:Static BoolConverters.Not}}" />
@@ -254,30 +257,30 @@
                     Name="UpdateMenuItem"
                     IsEnabled="{Binding CanUpdate}"
                     Header="{ext:Locale MenuBarHelpCheckForUpdates}"
-                    Icon="{ext:Icon mdi-update}"
+                    Icon="{ext:Icon fa-solid fa-rotate}"
                     ToolTip.Tip="{ext:Locale CheckUpdatesTooltip}" />
                 <MenuItem
                     Name="CompatibilityListMenuItem"
                     Header="{ext:Locale CompatibilityListOpen}"
-                    Icon="{ext:Icon mdi-gamepad}"/>
+                    Icon="{ext:Icon fa-solid fa-database}"/>
                 <Separator />
                 <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarHelpFaqAndGuides}" Icon="{ext:Icon fa-solid fa-question}" >
                     <MenuItem
                         Name="FaqMenuItem"
                         Header="{ext:Locale MenuBarHelpFaq}"
-                        Icon="{ext:Icon fa-github}"
+                        Icon="{ext:Icon fa-brands fa-gitlab}"
                         CommandParameter="https://git.ryujinx.app/ryubing/ryujinx/-/wikis/FAQ-&amp;-Troubleshooting"
                         ToolTip.Tip="{ext:Locale MenuBarHelpFaqTooltip}" />
                     <MenuItem
                         Name="SetupGuideMenuItem"
                         Header="{ext:Locale MenuBarHelpSetup}"
-                        Icon="{ext:Icon fa-github}"
+                        Icon="{ext:Icon fa-brands fa-gitlab}"
                         CommandParameter="https://git.ryujinx.app/ryubing/ryujinx/-/wikis/Setup-&amp;-Configuration-Guide"
                         ToolTip.Tip="{ext:Locale MenuBarHelpSetupTooltip}" />
                     <MenuItem
                         Name="LdnGuideMenuItem"
                         Header="{ext:Locale MenuBarHelpMultiplayer}"
-                        Icon="{ext:Icon fa-github}"
+                        Icon="{ext:Icon fa-brands fa-gitlab}"
                         CommandParameter="https://git.ryujinx.app/ryubing/ryujinx/-/wikis/Multiplayer-(LDN-Local-Wireless)-Guide"
                         ToolTip.Tip="{ext:Locale MenuBarHelpMultiplayerTooltip}" />
                 </MenuItem>

src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml

@@ -64,6 +64,7 @@
                     MinWidth="200"
                     Height="6"
                     VerticalAlignment="Center"
+                    Margin="0, 0, 5, 0"
                     Foreground="{DynamicResource SystemAccentColorLight2}"
                     IsVisible="{Binding StatusBarVisible}"
                     Maximum="{Binding StatusBarProgressMaximum}"

src/Ryujinx/UI/Windows/MainWindow.axaml.cs

@@ -213,13 +213,13 @@ namespace Ryujinx.Ava.UI.Windows
             }
         }
 
-        public void Application_Opened(object sender, ApplicationOpenedEventArgs args)
+        public async void Application_Opened(object sender, ApplicationOpenedEventArgs args)
         {
             if (args.Application != null)
             {
                 ViewModel.SelectedIcon = args.Application.Icon;
 
-                ViewModel.LoadApplication(args.Application).Wait();
+                await ViewModel.LoadApplication(args.Application);
             }
 
             args.Handled = true;