Merge 05475de925 into 55536f5d78

you should not add entries to your language if they match the english entry

src/Ryujinx.Common/TitleIDs.cs

@@ -47,8 +47,7 @@ namespace Ryujinx.Common
             "01006f8002326000", // Animal Crossings: New Horizons
             "01009bf0072d4000", // Captain Toad: Treasure Tracker
             "01009510001ca000", // Fast RMX
-            "01005CA01580E000", // Persona 5 Royal
+            "01005CA01580E000", // Persona 5 Royale
-            "0100b880154fc000", // Persona 5 The Royal (Japan)
             "010015100b514000", // Super Mario Bros. Wonder
             "0100000000010000", // Super Mario Odyssey
 

src/Ryujinx.Horizon/HorizonStatic.cs

@@ -2,36 +2,35 @@ using MsgPack;
 using Ryujinx.Horizon.Common;
 using Ryujinx.Memory;
 using System;
-using System.Threading;
 
 namespace Ryujinx.Horizon
 {
     public static class HorizonStatic
     {
-        internal static void HandlePlayReport(MessagePackObject report) => 
+        internal static void HandlePlayReport(MessagePackObject report) => PlayReportPrinted?.Invoke(report);
-            new Thread(() => PlayReport?.Invoke(report))
-            {
-                Name = "HLE.PlayReportEvent", 
-                IsBackground = true,
-                Priority = ThreadPriority.AboveNormal
-            }.Start();
         
-        public static event Action<MessagePackObject> PlayReport;
+        public static event Action<MessagePackObject> PlayReportPrinted;
+        
+        [ThreadStatic]
+        private static HorizonOptions _options;
 
-        [field: ThreadStatic]
+        [ThreadStatic]
-        public static HorizonOptions Options { get; private set; }
+        private static ISyscallApi _syscall;
 
-        [field: ThreadStatic]
+        [ThreadStatic]
-        public static ISyscallApi Syscall { get; private set; }
+        private static IVirtualMemoryManager _addressSpace;
 
-        [field: ThreadStatic]
+        [ThreadStatic]
-        public static IVirtualMemoryManager AddressSpace { get; private set; }
+        private static IThreadContext _threadContext;
 
-        [field: ThreadStatic]
+        [ThreadStatic]
-        public static IThreadContext ThreadContext { get; private set; }
+        private static int _threadHandle;
 
-        [field: ThreadStatic]
+        public static HorizonOptions Options => _options;
-        public static int CurrentThreadHandle { get; private set; }
+        public static ISyscallApi Syscall => _syscall;
+        public static IVirtualMemoryManager AddressSpace => _addressSpace;
+        public static IThreadContext ThreadContext => _threadContext;
+        public static int CurrentThreadHandle => _threadHandle;
 
         public static void Register(
             HorizonOptions options,
@@ -40,11 +39,11 @@ namespace Ryujinx.Horizon
             IThreadContext threadContext,
             int threadHandle)
         {
-            Options = options;
+            _options = options;
-            Syscall = syscallApi;
+            _syscall = syscallApi;
-            AddressSpace = addressSpace;
+            _addressSpace = addressSpace;
-            ThreadContext = threadContext;
+            _threadContext = threadContext;
-            CurrentThreadHandle = threadHandle;
+            _threadHandle = threadHandle;
         }
     }
 }

src/Ryujinx.Horizon/Prepo/Ipc/PrepoService.cs

@@ -1,4 +1,3 @@
-using Gommon;
 using MsgPack;
 using MsgPack.Serialization;
 using Ryujinx.Common.Logging;
@@ -12,7 +11,6 @@ using Ryujinx.Horizon.Sdk.Sf;
 using Ryujinx.Horizon.Sdk.Sf.Hipc;
 using System;
 using System.Text;
-using System.Threading;
 using ApplicationId = Ryujinx.Horizon.Sdk.Ncm.ApplicationId;
 
 namespace Ryujinx.Horizon.Prepo.Ipc

src/Ryujinx/AppHost.cs

@@ -938,9 +938,7 @@ namespace Ryujinx.Ava
                 ConfigurationState.Instance.System.EnableInternetAccess,
                 ConfigurationState.Instance.System.EnableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
                 ConfigurationState.Instance.System.FsGlobalAccessLogMode,
-                ConfigurationState.Instance.System.MatchSystemTime 
+                ConfigurationState.Instance.System.SystemTimeOffset,
-                    ? 0 
-                    : ConfigurationState.Instance.System.SystemTimeOffset,
                 ConfigurationState.Instance.System.TimeZone,
                 ConfigurationState.Instance.System.MemoryManagerMode,
                 ConfigurationState.Instance.System.IgnoreMissingServices,

src/Ryujinx/DiscordIntegrationModule.cs

@@ -56,7 +56,7 @@ namespace Ryujinx.Ava
 
             ConfigurationState.Instance.EnableDiscordIntegration.Event += Update;
             TitleIDs.CurrentApplication.Event += (_, e) => Use(e.NewValue);
-            HorizonStatic.PlayReport += HandlePlayReport;
+            HorizonStatic.PlayReportPrinted += HandlePlayReport;
         }
 
         private static void Update(object sender, ReactiveEventArgs<bool> evnt)
@@ -117,6 +117,11 @@ namespace Ryujinx.Ava
             _currentApp = appMeta;
         }
 
+        private static void UpdatePlayingState()
+        {
+            _discordClient?.SetPresence(_discordPresencePlaying);
+        }
+
         private static void SwitchToMainState()
         {
             _discordClient?.SetPresence(_discordPresenceMain);
@@ -130,20 +135,21 @@ namespace Ryujinx.Ava
             if (!TitleIDs.CurrentApplication.Value.HasValue) return;
             if (_discordPresencePlaying is null) return;
 
-            PlayReportAnalyzer.FormattedValue formattedValue =
+            PlayReportFormattedValue value = PlayReport.Analyzer.Run(TitleIDs.CurrentApplication.Value, _currentApp, playReport);
-                PlayReport.Analyzer.Format(TitleIDs.CurrentApplication.Value, _currentApp, playReport);
 
-            if (!formattedValue.Handled) return;
+            if (!value.Handled) return;
 
-            _discordPresencePlaying.Details = formattedValue.Reset 
+            if (value.Reset)
-                ? $"Playing {_currentApp.Title}" 
+            {
-                : formattedValue.FormattedString;
+                _discordPresencePlaying.Details = $"Playing {_currentApp.Title}";
-
+                Logger.Info?.Print(LogClass.UI, "Reset Discord RPC based on a supported play report value formatter.");
-            if (_discordClient.CurrentPresence.Details.Equals(_discordPresencePlaying.Details))
+            }
-                return; //don't trigger an update if the set presence Details are identical to current
+            else
-
+            {
-            _discordClient.SetPresence(_discordPresencePlaying);
+                _discordPresencePlaying.Details = value.FormattedString;
-            Logger.Info?.Print(LogClass.UI, "Updated Discord RPC based on a supported play report.");
+                Logger.Info?.Print(LogClass.UI, "Updated Discord RPC based on a supported play report.");
+            }
+            UpdatePlayingState();
         }
 
         private static string TruncateToByteLength(string input)

src/Ryujinx/RyujinxApp.axaml.cs

@@ -32,9 +32,6 @@ namespace Ryujinx.Ava
         public static MainWindow MainWindow => Current!
             .ApplicationLifetime.Cast<IClassicDesktopStyleApplicationLifetime>()
             .MainWindow.Cast<MainWindow>();
-        
-        public static IClassicDesktopStyleApplicationLifetime AppLifetime => Current!
-            .ApplicationLifetime.Cast<IClassicDesktopStyleApplicationLifetime>();
 
         public static bool IsClipboardAvailable(out IClipboard clipboard)
         {

src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml

@@ -19,17 +19,6 @@
         Header="{ext:Locale GameListContextMenuCreateShortcut}"
         Icon="{ext:Icon fa-solid fa-bookmark}"
         ToolTip.Tip="{OnPlatform Default={ext:Locale GameListContextMenuCreateShortcutToolTip}, macOS={ext:Locale GameListContextMenuCreateShortcutToolTipMacOS}}" />
-    <MenuItem
-        IsVisible="{Binding HasCompatibilityEntry}"
-        Click="OpenApplicationCompatibility_Click"
-        Header="{ext:Locale GameListContextMenuShowCompatEntry}"
-        Icon="{ext:Icon mdi-gamepad}"
-        ToolTip.Tip="{ext:Locale GameListContextMenuShowCompatEntryToolTip}"/>
-    <MenuItem
-        Click="OpenApplicationData_Click"
-        Header="{ext:Locale GameListContextMenuShowGameData}"
-        Icon="{ext:Icon mdi-chart-line}"
-        ToolTip.Tip="{ext:Locale GameListContextMenuShowGameDataToolTip}"/>
     <Separator />
     <MenuItem
         Click="OpenUserSaveDirectory_Click"
@@ -85,6 +74,7 @@
 		Header="{ext:Locale GameListContextMenuTrimXCI}"
         IsEnabled="{Binding TrimXCIEnabled}"
 		ToolTip.Tip="{ext:Locale GameListContextMenuTrimXCIToolTip}" />
+    <Separator />
     <MenuItem Header="{ext:Locale GameListContextMenuCacheManagement}" Icon="{ext:Icon mdi-cached}">
         <MenuItem
             Click="PurgePtcCache_Click"
@@ -122,7 +112,6 @@
             Header="{ext:Locale GameListContextMenuExtractDataRomFS}"
             ToolTip.Tip="{ext:Locale GameListContextMenuExtractDataRomFSToolTip}" />
         <MenuItem
-            IsVisible="{Binding HasDlc}"
             Click="ExtractAocRomFs_Click"
             Header="{ext:Locale GameListContextMenuExtractDataAocRomFS}"
             ToolTip.Tip="{ext:Locale GameListContextMenuExtractDataAocRomFSToolTip}" />

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

@@ -12,7 +12,6 @@ using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.Compat;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
 using Ryujinx.HLE.HOS;
@@ -334,7 +333,7 @@ namespace Ryujinx.Ava.UI.Controls
             if (sender is not MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
                 return;
 
-            DownloadableContentModel selectedDlc = await DlcSelectView.Show(viewModel.SelectedApplication.Id, viewModel.ApplicationLibrary);
+            DownloadableContentModel selectedDlc = await DlcSelectView.Show(viewModel.SelectedApplication.IdBase, viewModel.ApplicationLibrary);
             
             if (selectedDlc is not null)
             {
@@ -386,18 +385,6 @@ namespace Ryujinx.Ava.UI.Controls
                     viewModel.SelectedApplication.Icon
                 );
         }
-        
-        public async void OpenApplicationCompatibility_Click(object sender, RoutedEventArgs args)
-        {
-            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-                await CompatibilityList.Show(viewModel.SelectedApplication.IdString);
-        }
-        
-        public async void OpenApplicationData_Click(object sender, RoutedEventArgs args)
-        {
-            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-                await ApplicationDataView.Show(viewModel.SelectedApplication);
-        }
 
         public async void RunApplication_Click(object sender, RoutedEventArgs args)
         {
@@ -407,8 +394,12 @@ namespace Ryujinx.Ava.UI.Controls
 
         public async void TrimXCI_Click(object sender, RoutedEventArgs args)
         {
-            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
+            MainWindowViewModel viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
+
+            if (viewModel?.SelectedApplication != null)
+            {
                 await viewModel.TrimXCIFile(viewModel.SelectedApplication.Path);
+            }
         }
     }
 }

src/Ryujinx/UI/Controls/ApplicationDataView.axaml

@@ -1,114 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
-             xmlns:ext="using:Ryujinx.Ava.Common.Markup"
-             xmlns:viewModels="using:Ryujinx.Ava.UI.ViewModels"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Ryujinx.Ava.UI.Controls.ApplicationDataView"
-             x:DataType="viewModels:ApplicationDataViewModel">
-    <StackPanel Orientation="Horizontal">
-        <Image Margin="0"
-               MaxWidth="256"
-               MinWidth="256"
-               Source="{Binding AppData.Icon, Converter={x:Static helpers:BitmapArrayValueConverter.Instance}}" />
-        <Border Margin="5, 0" Width="1" Height="256" BorderBrush="Gray" Background="Gray" />
-        <StackPanel Orientation="Vertical">
-            <Grid
-                RowDefinitions="Auto,Auto,Auto"
-                ColumnDefinitions="*">
-                <StackPanel Grid.Row="0">
-                    <TextBlock HorizontalAlignment="Left"
-                               Text="{Binding FormattedVersion}"
-                               TextAlignment="Start"
-                               TextWrapping="Wrap" />
-                    <TextBlock HorizontalAlignment="Left"
-                               Text="{Binding FormattedDeveloper}"
-                               TextAlignment="Start"
-                               TextWrapping="Wrap" />
-                    <TextBlock HorizontalAlignment="Stretch"
-                               Text="{Binding FormattedFileExtension}"
-                               TextAlignment="Start"
-                               TextWrapping="Wrap" />
-                    <TextBlock HorizontalAlignment="Stretch"
-                               Text="{Binding FormattedFileSize}"
-                               TextAlignment="Start"
-                               TextWrapping="Wrap" />
-                </StackPanel>
-                <Separator Grid.Row="1" Margin="0, 10, 0, 10" Height="1" BorderBrush="Gray" Background="Gray" />
-                <StackPanel Grid.Row="2"
-                            HorizontalAlignment="Left"
-                            Orientation="Vertical"
-                            Spacing="5">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock Padding="0, 0, 5, 0" Text="{ext:Locale GameListHeaderCompatibilityStatus}" />
-                        <Button
-                            Click="PlayabilityStatus_OnClick"
-                            HorizontalContentAlignment="Left"
-                            VerticalAlignment="Center"
-                            IsVisible="{Binding AppData.HasPlayabilityInfo}"
-                            Background="{DynamicResource AppListBackgroundColor}"
-                            Padding="0">
-                            <TextBlock
-                                Margin="1.5"
-                                Tag="{Binding AppData.IdString}"
-                                Text="{Binding AppData.LocalizedStatus}"
-                                Foreground="{Binding AppData.PlayabilityStatus, Converter={x:Static helpers:PlayabilityStatusConverter.Shared}}"
-                                TextAlignment="Start"
-                                TextWrapping="Wrap" />
-                            <Button.Styles>
-                                <Style Selector="Button">
-                                    <Setter Property="MinWidth"
-                                            Value="0" />
-                                    <!-- avoids very wide buttons from the overall project avalonia style -->
-                                </Style>
-                            </Button.Styles>
-                        </Button>
-                    </StackPanel>
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock Padding="0, 0, 5, 0" Text="{ext:Locale GameListHeaderTitleId}" />
-                        <Button
-                            Click="IdString_OnClick"
-                            HorizontalContentAlignment="Left"
-                            VerticalAlignment="Center"
-                            Background="{DynamicResource AppListBackgroundColor}"
-                            Padding="0">
-                            <TextBlock
-                                Margin="1.5"
-                                HorizontalAlignment="Stretch"
-                                Text="{Binding AppData.IdString}"
-                                TextAlignment="Start"
-                                TextWrapping="Wrap" />
-                        </Button>
-                    </StackPanel>
-                </StackPanel>
-            </Grid>
-            <Separator Margin="0, 10, 0, 10" Height="1" BorderBrush="Gray" Background="Gray" />
-            <TextBlock
-                HorizontalAlignment="Stretch"
-                IsVisible="{Binding AppData.HasLdnGames}"
-                Text="{Binding FormattedLdnInfo}"
-                TextAlignment="Start"
-                TextWrapping="Wrap" />
-            <Separator IsVisible="{Binding AppData.HasLdnGames}" Margin="0, 10, 0, 10" Height="1" BorderBrush="Gray" Background="Gray" />
-            <StackPanel
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                Orientation="Vertical"
-                Spacing="5">
-                <TextBlock
-                    HorizontalAlignment="Stretch"
-                    Text="{Binding FormattedLastPlayed}"
-                    TextAlignment="Start"
-                    TextWrapping="Wrap" />
-                <TextBlock
-                    HorizontalAlignment="Stretch"
-                    Text="{Binding FormattedPlayTime}"
-                    IsVisible="{Binding AppData.HasPlayedPreviously}"
-                    TextAlignment="Start"
-                    TextWrapping="Wrap" />
-            </StackPanel>
-        </StackPanel>
-    </StackPanel>
-</UserControl>

src/Ryujinx/UI/Controls/ApplicationDataView.axaml.cs

@@ -1,86 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Input.Platform;
-using Avalonia.Interactivity;
-using Avalonia.Styling;
-using FluentAvalonia.UI.Controls;
-using Ryujinx.Ava;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
-using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.Compat;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Ryujinx.Ava.UI.Controls
-{
-    public partial class ApplicationDataView : UserControl
-    {
-        public static async Task Show(ApplicationData appData)
-        {
-            ContentDialog contentDialog = new()
-            {
-                Title = appData.Name,
-                PrimaryButtonText = string.Empty,
-                SecondaryButtonText = string.Empty,
-                CloseButtonText = LocaleManager.Instance[LocaleKeys.SettingsButtonClose],
-                MinWidth = 256,
-                Content = new ApplicationDataView { DataContext = new ApplicationDataViewModel(appData) }
-            };
-
-            Style closeButton = new(x => x.Name("CloseButton"));
-            closeButton.Setters.Add(new Setter(WidthProperty, 160d));
-
-            Style closeButtonParent = new(x => x.Name("CommandSpace"));
-            closeButtonParent.Setters.Add(new Setter(HorizontalAlignmentProperty,
-                Avalonia.Layout.HorizontalAlignment.Center));
-
-            contentDialog.Styles.Add(closeButton);
-            contentDialog.Styles.Add(closeButtonParent);
-
-            await ContentDialogHelper.ShowAsync(contentDialog);
-        }
-        
-        public ApplicationDataView()
-        {
-            InitializeComponent();
-        }
-        
-        private async void PlayabilityStatus_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (sender is not Button { Content: TextBlock playabilityLabel })
-                return;
-
-            if (RyujinxApp.AppLifetime.Windows.TryGetFirst(x => x is ContentDialogOverlayWindow, out Window window))
-                window.Close(ContentDialogResult.None);
-            
-            await CompatibilityList.Show((string)playabilityLabel.Tag);
-        }
-
-        private async void IdString_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (DataContext is not MainWindowViewModel mwvm)
-                return;
-            
-            if (sender is not Button { Content: TextBlock idText })
-                return;
-
-            if (!RyujinxApp.IsClipboardAvailable(out IClipboard clipboard))
-                return;
-            
-            ApplicationData appData = mwvm.Applications.FirstOrDefault(it => it.IdString == idText.Text);
-            if (appData is null)
-                return;
-            
-            await clipboard.SetTextAsync(appData.IdString);
-                
-            NotificationHelper.ShowInformation(
-                "Copied Title ID", 
-                $"{appData.Name} ({appData.IdString})");
-        }
-    }
-}
-

src/Ryujinx/UI/Controls/ApplicationListView.axaml

@@ -86,29 +86,6 @@
                                             Text="{Binding Version}"
                                             TextAlignment="Start"
                                             TextWrapping="Wrap" />
-                                        <Button 
-                                            Click="PlayabilityStatus_OnClick" 
-                                            HorizontalContentAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            IsVisible="{Binding HasPlayabilityInfo}"
-                                            Background="{DynamicResource AppListBackgroundColor}"
-                                            Margin="-1, 0, 0, 0"
-                                            Padding="0" >
-                                            <TextBlock
-                                                Margin="1.5"
-                                                Tag="{Binding IdString}"
-                                                Text="{Binding LocalizedStatus}"
-                                                Foreground="{Binding PlayabilityStatus, Converter={x:Static helpers:PlayabilityStatusConverter.Shared}}"
-                                                TextAlignment="Start"
-                                                TextWrapping="Wrap" />
-                                            <Button.Styles>
-                                                <Style Selector="Button">
-                                                    <Setter Property="MinWidth"
-                                                            Value="0" /> 
-                                <!-- avoids very wide buttons from the overall project avalonia style -->
-                                                </Style>
-                                            </Button.Styles>
-                                        </Button>
                                     </StackPanel>
                                 </Border>
                                 <StackPanel
@@ -140,7 +117,6 @@
                                         TextWrapping="Wrap" />
                                     <TextBlock
                                         HorizontalAlignment="Stretch"
-                                        IsVisible="{Binding HasLdnGames}"
                                         Text="{Binding Converter={helpers:MultiplayerInfoConverter}}"
                                         TextAlignment="Start"
                                         TextWrapping="Wrap"/>

src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs

@@ -5,9 +5,7 @@ using Avalonia.Interactivity;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.Compat;
 using System;
-using System.Globalization;
 using System.Linq;
 
 namespace Ryujinx.Ava.UI.Controls
@@ -30,17 +28,6 @@ namespace Ryujinx.Ava.UI.Controls
             if (sender is ListBox { SelectedItem: ApplicationData selected })
                 RaiseEvent(new ApplicationOpenedEventArgs(selected, ApplicationOpenedEvent));
         }
-        
-        private async void PlayabilityStatus_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (DataContext is not MainWindowViewModel mwvm)
-                return;
-            
-            if (sender is not Button { Content: TextBlock playabilityLabel })
-                return;
-
-            await CompatibilityList.Show((string)playabilityLabel.Tag);
-        }
 
         private async void IdString_OnClick(object sender, RoutedEventArgs e)
         {

src/Ryujinx/UI/Helpers/Converters/MultiplayerInfoConverter.cs

@@ -1,11 +1,8 @@
 using Avalonia.Data.Converters;
 using Avalonia.Markup.Xaml;
-using Gommon;
-using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using System;
 using System.Globalization;
-using System.Text;
 
 namespace Ryujinx.Ava.UI.Helpers
 {
@@ -15,17 +12,16 @@ namespace Ryujinx.Ava.UI.Helpers
 
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if (value is not ApplicationData { HasLdnGames: true } applicationData)
+            if (value is ApplicationData applicationData)
-                return "";
+            {
+                if (applicationData.PlayerCount != 0 && applicationData.GameCount != 0)
+                {
+                    return $"Hosted Games: {applicationData.GameCount}\nOnline Players: {applicationData.PlayerCount}";
+                }
+            }
+            
+            return "";
             
-            return new StringBuilder()
-                .AppendLine(
-                    LocaleManager.Instance[LocaleKeys.GameListHeaderHostedGames]
-                        .Format(applicationData.GameCount))
-                .Append(
-                    LocaleManager.Instance[LocaleKeys.GameListHeaderPlayerCount]
-                        .Format(applicationData.PlayerCount))
-                .ToString();
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

src/Ryujinx/UI/ViewModels/ApplicationDataViewModel.cs

@@ -1,26 +0,0 @@
-using Gommon;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Utilities.AppLibrary;
-
-namespace Ryujinx.Ava.UI.ViewModels
-{
-    public class ApplicationDataViewModel : BaseModel
-    {
-        public ApplicationData AppData { get; }
-
-        public ApplicationDataViewModel(ApplicationData appData) => AppData = appData;
-
-        public string FormattedVersion => LocaleManager.Instance[LocaleKeys.GameListHeaderVersion].Format(AppData.Version);
-        public string FormattedDeveloper => LocaleManager.Instance[LocaleKeys.GameListHeaderDeveloper].Format(AppData.Developer);
-        
-        public string FormattedFileExtension => LocaleManager.Instance[LocaleKeys.GameListHeaderFileExtension].Format(AppData.FileExtension);
-        public string FormattedLastPlayed => LocaleManager.Instance[LocaleKeys.GameListHeaderLastPlayed].Format(AppData.LastPlayedString);
-        public string FormattedPlayTime => LocaleManager.Instance[LocaleKeys.GameListHeaderTimePlayed].Format(AppData.TimePlayedString);
-        public string FormattedFileSize => LocaleManager.Instance[LocaleKeys.GameListHeaderFileSize].Format(AppData.FileSizeString);
-        
-        public string FormattedLdnInfo => 
-            $"{LocaleManager.Instance[LocaleKeys.GameListHeaderHostedGames].Format(AppData.GameCount)}" +
-            $"\n" +
-            $"{LocaleManager.Instance[LocaleKeys.GameListHeaderPlayerCount].Format(AppData.PlayerCount)}";
-    }
-}

src/Ryujinx/UI/ViewModels/DlcSelectViewModel.cs

@@ -14,7 +14,9 @@ namespace Ryujinx.Ava.UI.ViewModels
         
         public DlcSelectViewModel(ulong titleId, ApplicationLibrary appLibrary)
         {
-            _dlcs = appLibrary.FindDlcsFor(titleId)
+            _dlcs = appLibrary.DownloadableContents.Items
+                .Where(x => x.Dlc.TitleIdBase == titleId)
+                .Select(x => x.Dlc)
                 .OrderBy(it => it.IsBundled ? 0 : 1)
                 .ThenBy(it => it.TitleId)
                 .ToArray();

src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs

@@ -69,7 +69,8 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         private void LoadDownloadableContents()
         {
-            (DownloadableContentModel Dlc, bool IsEnabled)[] dlcs = _applicationLibrary.FindDlcConfigurationFor(_applicationData.Id);
+            IEnumerable<(DownloadableContentModel Dlc, bool IsEnabled)> dlcs = _applicationLibrary.DownloadableContents.Items
+                .Where(it => it.Dlc.TitleIdBase == _applicationData.IdBase);
 
             bool hasBundledContent = false;
             foreach ((DownloadableContentModel dlc, bool isEnabled) in dlcs)

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -349,10 +349,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public bool HasCompatibilityEntry => SelectedApplication.HasPlayabilityInfo;
-
-        public bool HasDlc => ApplicationLibrary.HasDlcs(SelectedApplication.Id);
-
         public bool OpenUserSaveDirectoryEnabled => SelectedApplication.HasControlHolder && SelectedApplication.ControlHolder.Value.UserAccountSaveDataSize > 0;
 
         public bool OpenDeviceSaveDirectoryEnabled => SelectedApplication.HasControlHolder && SelectedApplication.ControlHolder.Value.DeviceSaveDataSize > 0;

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -116,6 +116,10 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public bool IsOpenGLAvailable => !OperatingSystem.IsMacOS();
 
+        public bool IsAppleSiliconMac => OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64;
+
+        public bool IsMacOS => OperatingSystem.IsMacOS();
+
         public bool EnableDiscordIntegration { get; set; }
         public bool CheckUpdatesOnStart { get; set; }
         public bool ShowConfirmExit { get; set; }
@@ -197,7 +201,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         public bool EnableTextureRecompression { get; set; }
         public bool EnableMacroHLE { get; set; }
         public bool EnableColorSpacePassthrough { get; set; }
-        public bool ColorSpacePassthroughAvailable => RunningPlatform.IsMacOS;
+        public bool ColorSpacePassthroughAvailable => IsMacOS;
         public bool EnableFileLog { get; set; }
         public bool EnableStub { get; set; }
         public bool EnableInfo { get; set; }
@@ -293,8 +297,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        [ObservableProperty] private bool _matchSystemTime;
-
         public DateTimeOffset CurrentDate { get; set; }
 
         public TimeSpan CurrentTime { get; set; }
@@ -410,6 +412,17 @@ namespace Ryujinx.Ava.UI.ViewModels
             Dispatcher.UIThread.Post(() => OnPropertyChanged(nameof(PreferredGpuIndex)));
         }
 
+        public void MatchSystemTime()
+        {
+            (DateTimeOffset dto, TimeSpan timeOfDay) = DateTimeOffset.Now.Extract();
+            
+            CurrentDate = dto;
+            CurrentTime = timeOfDay;
+            
+            OnPropertyChanged(nameof(CurrentDate));
+            OnPropertyChanged(nameof(CurrentTime));
+        }
+
         public async Task LoadTimeZones()
         {
             _timeZoneContentManager = new TimeZoneContentManager();
@@ -511,9 +524,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             CurrentDate = currentDateTime.Date;
             CurrentTime = currentDateTime.TimeOfDay;
 
-            MatchSystemTime = config.System.MatchSystemTime;
+            EnableCustomVSyncInterval = config.Graphics.EnableCustomVSyncInterval.Value;
-
-            EnableCustomVSyncInterval = config.Graphics.EnableCustomVSyncInterval;
             CustomVSyncInterval = config.Graphics.CustomVSyncInterval;
             VSyncMode = config.Graphics.VSyncMode;
             EnableFsIntegrityChecks = config.System.EnableFsIntegrityChecks;
@@ -618,7 +629,6 @@ namespace Ryujinx.Ava.UI.ViewModels
                 config.System.TimeZone.Value = TimeZone;
             }
 
-            config.System.MatchSystemTime.Value = MatchSystemTime;
             config.System.SystemTimeOffset.Value = Convert.ToInt64((CurrentDate.ToUnixTimeSeconds() + CurrentTime.TotalSeconds) - DateTimeOffset.Now.ToUnixTimeSeconds());
             config.System.EnableFsIntegrityChecks.Value = EnableFsIntegrityChecks;
             config.System.DramSize.Value = DramSize;

src/Ryujinx/UI/ViewModels/TitleUpdateViewModel.cs

@@ -41,7 +41,8 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         private void LoadUpdates()
         {
-            (TitleUpdateModel TitleUpdate, bool IsSelected)[] updates = ApplicationLibrary.FindUpdateConfigurationFor(ApplicationData.Id);
+            IEnumerable<(TitleUpdateModel TitleUpdate, bool IsSelected)> updates = ApplicationLibrary.TitleUpdates.Items
+                .Where(it => it.TitleUpdate.TitleIdBase == ApplicationData.IdBase);
 
             bool hasBundledContent = false;
             SelectedUpdate = new TitleUpdateViewModelNoUpdate();

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

@@ -50,7 +50,7 @@ namespace Ryujinx.Ava.UI.Views.Main
             UninstallFileTypesMenuItem.Command = Commands.Create(UninstallFileTypes);
             XciTrimmerMenuItem.Command = Commands.Create(XCITrimmerWindow.Show);
             AboutWindowMenuItem.Command = Commands.Create(AboutWindow.Show);
-            CompatibilityListMenuItem.Command = Commands.Create(() => CompatibilityList.Show());
+            CompatibilityListMenuItem.Command = Commands.Create(CompatibilityList.Show);
             
             UpdateMenuItem.Command = Commands.Create(async () =>
             {

src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml

@@ -6,7 +6,6 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
     mc:Ignorable="d"
     x:DataType="viewModels:SettingsViewModel">
     <Design.DataContext>
@@ -70,7 +69,7 @@
                         </ComboBox>
                     </StackPanel>
                     <CheckBox IsChecked="{Binding UseHypervisor}"
-                              IsVisible="{x:Static helper:RunningPlatform.IsArmMac}"
+                              IsVisible="{Binding IsAppleSiliconMac}"
                               ToolTip.Tip="{ext:Locale UseHypervisorTooltip}">
                         <TextBlock Text="{ext:Locale SettingsTabSystemUseHypervisor}"
                                    ToolTip.Tip="{ext:Locale UseHypervisorTooltip}" />

src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml

@@ -8,7 +8,6 @@
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
     Design.Width="1000"
     mc:Ignorable="d"
     x:DataType="viewModels:SettingsViewModel">
@@ -49,7 +48,7 @@
                             <ComboBoxItem IsEnabled="{Binding IsOpenGLAvailable}">
                                 <TextBlock Text="OpenGL" />
                             </ComboBoxItem>
-                            <ComboBoxItem IsEnabled="{x:Static helper:RunningPlatform.IsArmMac}">
+                            <ComboBoxItem IsEnabled="{Binding IsAppleSiliconMac}">
                                 <TextBlock Text="Metal (ARM Mac only, Experimental)" />
                             </ComboBoxItem>
                         </ComboBox>

src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml

@@ -170,8 +170,7 @@
                             ToolTip.Tip="{ext:Locale TimeTooltip}"
                             Width="250"/>
                         <DatePicker
-                            VerticalAlignment="Center"
+                            VerticalAlignment="Center" 
-                            IsEnabled="{Binding !MatchSystemTime}"
                             SelectedDate="{Binding CurrentDate}"
                             ToolTip.Tip="{ext:Locale TimeTooltip}"
                             Width="350" />
@@ -182,21 +181,17 @@
                         <TimePicker
                             VerticalAlignment="Center"
                             ClockIdentifier="24HourClock"
-                            IsEnabled="{Binding !MatchSystemTime}"
                             SelectedTime="{Binding CurrentTime}"
                             Width="350"
                             ToolTip.Tip="{ext:Locale TimeTooltip}" />
-                    </StackPanel>
+                        <Button
-                    <StackPanel Orientation="Horizontal">
+                            Margin="10, 0, 0, 0"
-                        <TextBlock
                             VerticalAlignment="Center"
-                            Text="{ext:Locale SettingsTabSystemSystemTimeMatch}"
+                            Click="MatchSystemTime_OnClick"
-                            ToolTip.Tip="{ext:Locale MatchTimeTooltip}"
+                            Background="{DynamicResource SystemAccentColor}"
-                            Width="250"/>
+                            ToolTip.Tip="{ext:Locale MatchTimeTooltip}">
-                        <CheckBox
+                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemTimeMatch}" />
-                            VerticalAlignment="Center"
+                        </Button>
-                            IsChecked="{Binding MatchSystemTime}"
-                            ToolTip.Tip="{ext:Locale MatchTimeTooltip}"/>
                     </StackPanel>
                     <Separator />
                     <StackPanel Margin="0,10,0,10"

src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml.cs

@@ -34,5 +34,7 @@ namespace Ryujinx.Ava.UI.Views.Settings
                 ViewModel.ValidateAndSetTimeZone(timeZone.Location);
             }
         }
+
+        private void MatchSystemTime_OnClick(object sender, RoutedEventArgs e) => ViewModel.MatchSystemTime();
     }
 }

src/Ryujinx/UI/Windows/SettingsWindow.axaml

@@ -10,7 +10,6 @@
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     xmlns:settings="clr-namespace:Ryujinx.Ava.UI.Views.Settings"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
-    xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
     Width="1100"
     Height="768"
     MinWidth="800"
@@ -114,7 +113,7 @@
             Spacing="10"
             Orientation="Horizontal"
             HorizontalAlignment="Right"
-            ReverseOrder="{x:Static helper:RunningPlatform.IsMacOS}">
+            ReverseOrder="{Binding IsMacOS}">
             <Button
                 Classes="accent"
                 Content="{ext:Locale SettingsButtonOk}"

src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs

@@ -7,8 +7,6 @@ using LibHac.Ns;
 using LibHac.Tools.Fs;
 using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Utilities.Compat;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.Loaders.Processes.Extensions;
@@ -23,35 +21,11 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
         public bool Favorite { get; set; }
         public byte[] Icon { get; set; }
         public string Name { get; set; } = "Unknown";
-
+        public ulong Id { get; set; }
-        private ulong _id;
-
-        public ulong Id
-        {
-            get => _id;
-            set
-            {
-                _id = value;
-                PlayabilityStatus = CompatibilityCsv.GetStatus(Id);
-            }
-        }
         public string Developer { get; set; } = "Unknown";
         public string Version { get; set; } = "0";
-
-        public bool HasPlayabilityInfo => PlayabilityStatus != null;
-
-        public string LocalizedStatus =>
-            PlayabilityStatus.HasValue 
-                ? LocaleManager.Instance[PlayabilityStatus!.Value] 
-                : string.Empty;
-
-        public LocaleKeys? PlayabilityStatus { get; set; }
-        
         public int PlayerCount { get; set; }
         public int GameCount { get; set; }
-
-        public bool HasLdnGames => PlayerCount != 0 && GameCount != 0;
-        
         public TimeSpan TimePlayed { get; set; }
         public DateTime? LastPlayed { get; set; }
         public string FileExtension { get; set; }

src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs

@@ -128,50 +128,13 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
             DynamicData.Kernel.Optional<ApplicationData> appData = Applications.Lookup(id);
             if (appData.HasValue)
                 return appData.Value.Name;
-
-            if (!DownloadableContents.Keys.FindFirst(x => x.TitleId == id).TryGet(out DownloadableContentModel dlcData))
-                return id.ToString("X16");
             
-            string name = Path.GetFileNameWithoutExtension(dlcData.FileName)!;
+            if (DownloadableContents.Keys.FindFirst(x => x.TitleId == id).TryGet(out DownloadableContentModel dlcData))
-            int idx = name.IndexOf('[');
+                return Path.GetFileNameWithoutExtension(dlcData.FileName);
-            if (idx != -1)
-                name = name[..idx];
 
-            return name;
+            return id.ToString("X16");
         }
 
-        public bool FindApplication(ulong id, out ApplicationData foundData)
-        {
-            DynamicData.Kernel.Optional<ApplicationData> appData = Applications.Lookup(id);
-            foundData = appData.HasValue ? appData.Value : null;
-
-            return appData.HasValue;
-        }
-        
-        public bool FindUpdate(ulong id, out TitleUpdateModel foundData)
-        {
-            Gommon.Optional<TitleUpdateModel> appData = 
-                TitleUpdates.Keys.FindFirst(x => x.TitleId == id);
-            foundData = appData.HasValue ? appData.Value : null;
-
-            return appData.HasValue;
-        }
-        
-        public TitleUpdateModel[] FindUpdatesFor(ulong id)
-            => TitleUpdates.Keys.Where(x => x.TitleIdBase == (id & ~0x1FFFUL)).ToArray();
-        
-        public (TitleUpdateModel TitleUpdate, bool IsSelected)[] FindUpdateConfigurationFor(ulong id)
-            => TitleUpdates.Items.Where(x => x.TitleUpdate.TitleIdBase == (id & ~0x1FFFUL)).ToArray();
-        
-        public DownloadableContentModel[] FindDlcsFor(ulong id)
-            => DownloadableContents.Keys.Where(x => x.TitleIdBase == (id & ~0x1FFFUL)).ToArray();
-        
-        public (DownloadableContentModel Dlc, bool IsEnabled)[] FindDlcConfigurationFor(ulong id)
-            => DownloadableContents.Items.Where(x => x.Dlc.TitleIdBase == (id & ~0x1FFFUL)).ToArray();
-        
-        public bool HasDlcs(ulong id)
-            => DownloadableContents.Keys.Any(x => x.TitleIdBase == (id & ~0x1FFFUL));
-
         /// <exception cref="LibHac.Common.Keys.MissingKeyException">The configured key set is missing a key.</exception>
         /// <exception cref="InvalidDataException">The NCA header could not be decrypted.</exception>
         /// <exception cref="NotSupportedException">The NCA version is not supported.</exception>

src/Ryujinx/Utilities/Compat/CompatibilityCsv.cs

@@ -47,6 +47,11 @@ namespace Ryujinx.Ava.Utilities.Compat
             Logger.Debug?.Print(LogClass.UI, "Compatibility CSV loaded.", "LoadCompatibility");
         }
 
+        public static void Unload()
+        {
+            _entries = null;
+        }
+
         private static CompatibilityEntry[] _entries;
         
         public static CompatibilityEntry[] Entries 
@@ -59,11 +64,6 @@ namespace Ryujinx.Ava.Utilities.Compat
                 return _entries;
             }
         }
-
-        public static LocaleKeys? GetStatus(string titleId)
-            => Entries.FirstOrDefault(x => x.TitleId.HasValue && x.TitleId.Value.EqualsIgnoreCase(titleId))?.Status;
-        
-        public static LocaleKeys? GetStatus(ulong titleId) => GetStatus(titleId.ToString("X16"));
     }
 
     public class CompatibilityEntry
@@ -113,17 +113,20 @@ namespace Ryujinx.Ava.Utilities.Compat
             .Select(FormatLabelName)
             .JoinToString(", ");
 
-        public override string ToString() =>
+        public override string ToString()
-            new StringBuilder("CompatibilityEntry: {")
+        {
-                .Append($"{nameof(GameName)}=\"{GameName}\", ")
+            StringBuilder sb = new("CompatibilityEntry: {");
-                .Append($"{nameof(TitleId)}={TitleId}, ")
+            sb.Append($"{nameof(GameName)}=\"{GameName}\", ");
-                .Append($"{nameof(Labels)}={
+            sb.Append($"{nameof(TitleId)}={TitleId}, ");
-                    Labels.FormatCollection(it => $"\"{it}\"", separator: ", ", prefix: "[", suffix: "]")
+            sb.Append($"{nameof(Labels)}={
-                }, ")
+                Labels.FormatCollection(it => $"\"{it}\"", separator: ", ", prefix: "[", suffix: "]")
-                .Append($"{nameof(Status)}=\"{Status}\", ")
+            }, ");
-                .Append($"{nameof(LastUpdated)}=\"{LastUpdated}\"")
+            sb.Append($"{nameof(Status)}=\"{Status}\", ");
-                .Append('}')
+            sb.Append($"{nameof(LastUpdated)}=\"{LastUpdated}\"");
-                .ToString();
+            sb.Append('}');
+
+            return sb.ToString();
+        }
 
         public static string FormatLabelName(string labelName) => labelName.ToLower() switch
         {

src/Ryujinx/Utilities/Compat/CompatibilityList.axaml

@@ -34,7 +34,7 @@
                 Text="{ext:Locale CompatibilityListWarning}" />
         </Grid>
         <Grid Grid.Row="1" ColumnDefinitions="*,Auto,Auto">
-            <TextBox Name="SearchBox" Grid.Column="0" HorizontalAlignment="Stretch" Watermark="{ext:Locale CompatibilityListSearchBoxWatermark}" TextChanged="TextBox_OnTextChanged" />
+            <TextBox Grid.Column="0" HorizontalAlignment="Stretch" Watermark="{ext:Locale CompatibilityListSearchBoxWatermark}" TextChanged="TextBox_OnTextChanged" />
             <CheckBox Grid.Column="1" Margin="7, 0, 0, 0" IsChecked="{Binding OnlyShowOwnedGames}" />
             <TextBlock Grid.Column="2" Margin="-10, 0, 0, 0" Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />
         </Grid>

src/Ryujinx/Utilities/Compat/CompatibilityList.axaml.cs

@@ -9,7 +9,7 @@ namespace Ryujinx.Ava.Utilities.Compat
 {
     public partial class CompatibilityList : UserControl
     {
-        public static async Task Show(string titleId = null)
+        public static async Task Show()
         {
             ContentDialog contentDialog = new()
             {
@@ -18,10 +18,7 @@ namespace Ryujinx.Ava.Utilities.Compat
                 CloseButtonText = LocaleManager.Instance[LocaleKeys.SettingsButtonClose],
                 Content = new CompatibilityList
                 {
-                    DataContext = new CompatibilityViewModel(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary), 
+                    DataContext = new CompatibilityViewModel(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary)
-                    SearchBox = {
-                        Text = titleId ?? ""
-                    }
                 }
             };
 
@@ -35,6 +32,8 @@ namespace Ryujinx.Ava.Utilities.Compat
             contentDialog.Styles.Add(closeButtonParent);
 
             await ContentDialogHelper.ShowAsync(contentDialog);
+            
+            CompatibilityCsv.Unload();
         }
         
         public CompatibilityList()

src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs

@@ -15,7 +15,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
         /// <summary>
         /// The current version of the file format
         /// </summary>
-        public const int CurrentVersion = 63;
+        public const int CurrentVersion = 62;
 
         /// <summary>
         /// Version of the configuration file format
@@ -141,11 +141,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
         /// Change System Time Offset in seconds
         /// </summary>
         public long SystemTimeOffset { get; set; }
-        
-        /// <summary>
-        /// Instead of setting the time via configuration, use the values provided by the system.
-        /// </summary>
-        public bool MatchSystemTime { get; set; }
 
         /// <summary>
         /// Enables or disables Docked Mode

src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs

@@ -429,8 +429,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
                         };
                     }
                 }),
-                (62, static cff => cff.RainbowSpeed = 1f),
+                (62, static cff => cff.RainbowSpeed = 1f)
-                (63, static cff => cff.MatchSystemTime = false)
             );
     }
 }

src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs

@@ -312,11 +312,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             /// System Time Offset in Seconds
             /// </summary>
             public ReactiveObject<long> SystemTimeOffset { get; private set; }
-            
-            /// <summary>
-            /// Instead of setting the time via configuration, use the values provided by the system.
-            /// </summary>
-            public ReactiveObject<bool> MatchSystemTime { get; private set; }
 
             /// <summary>
             /// Enables or disables Docked Mode
@@ -393,8 +388,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 TimeZone.LogChangesToValue(nameof(TimeZone));
                 SystemTimeOffset = new ReactiveObject<long>();
                 SystemTimeOffset.LogChangesToValue(nameof(SystemTimeOffset));
-                MatchSystemTime = new ReactiveObject<bool>();
-                MatchSystemTime.LogChangesToValue(nameof(MatchSystemTime));
                 EnableDockedMode = new ReactiveObject<bool>();
                 EnableDockedMode.LogChangesToValue(nameof(EnableDockedMode));
                 EnablePtc = new ReactiveObject<bool>();

src/Ryujinx/Utilities/PlayReport.cs

@@ -1,4 +1,10 @@
-using PlayReportFormattedValue = Ryujinx.Ava.Utilities.PlayReportAnalyzer.FormattedValue;
+using Gommon;
+using MsgPack;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Common.Helper;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Ryujinx.Ava.Utilities
 {
@@ -7,55 +13,41 @@ namespace Ryujinx.Ava.Utilities
         public static PlayReportAnalyzer Analyzer { get; } = new PlayReportAnalyzer()
             .AddSpec(
                 "01007ef00011e000",
-                spec => spec
+                spec => spec.AddValueFormatter("IsHardMode", BreathOfTheWild_MasterMode)
-                    .AddValueFormatter("IsHardMode", BreathOfTheWild_MasterMode)
-                    // reset to normal status when switching between normal & master mode in title screen
-                    .AddValueFormatter("AoCVer", PlayReportFormattedValue.AlwaysResets)
             )
-            .AddSpec(
+            .AddSpec( // Super Mario Odyssey
-                "0100f2c0115b6000",
-                spec => spec.AddValueFormatter("PlayerPosY", TearsOfTheKingdom_CurrentField))
-            .AddSpec(
                 "0100000000010000",
                 spec =>
                     spec.AddValueFormatter("is_kids_mode", SuperMarioOdyssey_AssistMode)
             )
-            .AddSpec(
+            .AddSpec( // Super Mario Odyssey (China)
-                "010075000ecbe000",
+                "010075000ECBE000",
                 spec =>
                     spec.AddValueFormatter("is_kids_mode", SuperMarioOdysseyChina_AssistMode)
             )
-            .AddSpec(
+            .AddSpec( // Super Mario 3D World + Bowser's Fury
-                "010028600ebda000",
+                "010028600EBDA000",
                 spec => spec.AddValueFormatter("mode", SuperMario3DWorldOrBowsersFury)
             )
-            .AddSpec( // Global & China IDs
+            .AddSpec( // Mario Kart 8 Deluxe, Mario Kart 8 Deluxe (China)
-                ["0100152000022000", "010075100e8ec000"],
+                ["0100152000022000", "010075100E8EC000"],
                 spec => spec.AddValueFormatter("To", MarioKart8Deluxe_Mode)
             );
 
-        private static PlayReportFormattedValue BreathOfTheWild_MasterMode(PlayReportValue value)
+        private static PlayReportFormattedValue BreathOfTheWild_MasterMode(ref PlayReportValue value)
             => value.BoxedValue is 1 ? "Playing Master Mode" : PlayReportFormattedValue.ForceReset;
 
-        private static PlayReportFormattedValue TearsOfTheKingdom_CurrentField(PlayReportValue value) =>
+        private static PlayReportFormattedValue SuperMarioOdyssey_AssistMode(ref PlayReportValue value)
-            value.DoubleValue switch
-            {
-                > 800d => "Exploring the Sky Islands",
-                < -201d => "Exploring the Depths",
-                _ => "Roaming Hyrule"
-            };
-
-        private static PlayReportFormattedValue SuperMarioOdyssey_AssistMode(PlayReportValue value)
             => value.BoxedValue is 1 ? "Playing in Assist Mode" : "Playing in Regular Mode";
 
-        private static PlayReportFormattedValue SuperMarioOdysseyChina_AssistMode(PlayReportValue value)
+        private static PlayReportFormattedValue SuperMarioOdysseyChina_AssistMode(ref PlayReportValue value)
             => value.BoxedValue is 1 ? "Playing in 帮助模式" : "Playing in 普通模式";
 
-        private static PlayReportFormattedValue SuperMario3DWorldOrBowsersFury(PlayReportValue value)
+        private static PlayReportFormattedValue SuperMario3DWorldOrBowsersFury(ref PlayReportValue value)
             => value.BoxedValue is 0 ? "Playing Super Mario 3D World" : "Playing Bowser's Fury";
         
-        private static PlayReportFormattedValue MarioKart8Deluxe_Mode(PlayReportValue value) 
+        private static PlayReportFormattedValue MarioKart8Deluxe_Mode(ref PlayReportValue value) 
-            => value.StringValue switch
+            => value.BoxedValue switch
             {
                 // Single Player
                 "Single" => "Single Player",
@@ -82,4 +74,125 @@ namespace Ryujinx.Ava.Utilities
                 _ => PlayReportFormattedValue.ForceReset
             };
     }
+
+    #region Analyzer implementation
+    
+    public class PlayReportAnalyzer
+    {
+        private readonly List<PlayReportGameSpec> _specs = [];
+
+        public PlayReportAnalyzer AddSpec(string titleId, Func<PlayReportGameSpec, PlayReportGameSpec> transform)
+        {
+            _specs.Add(transform(new PlayReportGameSpec { TitleIds = [titleId] }));
+            return this;
+        }
+        
+        public PlayReportAnalyzer AddSpec(string titleId, Action<PlayReportGameSpec> transform)
+        {
+            _specs.Add(new PlayReportGameSpec { TitleIds = [titleId] }.Apply(transform));
+            return this;
+        }
+        
+        public PlayReportAnalyzer AddSpec(IEnumerable<string> titleIds, Func<PlayReportGameSpec, PlayReportGameSpec> transform)
+        {
+            _specs.Add(transform(new PlayReportGameSpec { TitleIds = [..titleIds] }));
+            return this;
+        }
+        
+        public PlayReportAnalyzer AddSpec(IEnumerable<string> titleIds, Action<PlayReportGameSpec> transform)
+        {
+            _specs.Add(new PlayReportGameSpec { TitleIds = [..titleIds] }.Apply(transform));
+            return this;
+        }
+
+        public PlayReportFormattedValue Run(string runningGameId, ApplicationMetadata appMeta, MessagePackObject playReport)
+        {
+            if (!playReport.IsDictionary) 
+                return PlayReportFormattedValue.Unhandled;
+
+            if (!_specs.TryGetFirst(s => runningGameId.EqualsAnyIgnoreCase(s.TitleIds), out PlayReportGameSpec spec))
+                return PlayReportFormattedValue.Unhandled;
+
+            foreach (PlayReportValueFormatterSpec formatSpec in spec.Analyses.OrderBy(x => x.Priority))
+            {
+                if (!playReport.AsDictionary().TryGetValue(formatSpec.ReportKey, out MessagePackObject valuePackObject))
+                    continue;
+
+                PlayReportValue value = new()
+                {
+                    Application = appMeta, 
+                    BoxedValue = valuePackObject.ToObject()
+                };
+
+                return formatSpec.ValueFormatter(ref value);
+            }
+            
+            return PlayReportFormattedValue.Unhandled;
+        }
+        
+    }
+
+    public class PlayReportGameSpec
+    {
+        public required string[] TitleIds { get; init; }
+        public List<PlayReportValueFormatterSpec> Analyses { get; } = [];
+
+        public PlayReportGameSpec AddValueFormatter(string reportKey, PlayReportValueFormatter valueFormatter)
+        {
+            Analyses.Add(new PlayReportValueFormatterSpec
+            {
+                Priority = Analyses.Count,
+                ReportKey = reportKey, 
+                ValueFormatter = valueFormatter
+            });
+            return this;
+        }
+        
+        public PlayReportGameSpec AddValueFormatter(int priority, string reportKey, PlayReportValueFormatter valueFormatter)
+        {
+            Analyses.Add(new PlayReportValueFormatterSpec
+            {
+                Priority = priority,
+                ReportKey = reportKey, 
+                ValueFormatter = valueFormatter
+            });
+            return this;
+        }
+    }
+
+    public struct PlayReportValue
+    {
+        public ApplicationMetadata Application { get; init; }
+        public object BoxedValue { get; init; }
+    }
+
+    public struct PlayReportFormattedValue
+    {
+        public bool Handled { get; private init; }
+        
+        public bool Reset { get; private init; }
+        
+        public string FormattedString { get; private init; }
+
+        public static implicit operator PlayReportFormattedValue(string formattedValue)
+            => new() { Handled = true, FormattedString = formattedValue };
+
+        public static PlayReportFormattedValue Unhandled => default;
+        public static PlayReportFormattedValue ForceReset => new() { Handled = true, Reset = true };
+
+        public static PlayReportValueFormatter AlwaysResets = AlwaysResetsImpl;
+        
+        private static PlayReportFormattedValue AlwaysResetsImpl(ref PlayReportValue _) => ForceReset;
+    }
+
+    public struct PlayReportValueFormatterSpec
+    {
+        public required int Priority { get; init; }
+        public required string ReportKey { get; init; }
+        public PlayReportValueFormatter ValueFormatter { get; init; }
+    }
+
+    public delegate PlayReportFormattedValue PlayReportValueFormatter(ref PlayReportValue value);
+
+    #endregion
 }

src/Ryujinx/Utilities/PlayReportAnalyzer.cs

@@ -1,282 +0,0 @@
-using Gommon;
-using MsgPack;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-
-namespace Ryujinx.Ava.Utilities
-{
-    /// <summary>
-    /// The entrypoint for the Play Report analysis system.
-    /// </summary>
-    public class PlayReportAnalyzer
-    {
-        private readonly List<PlayReportGameSpec> _specs = [];
-
-        /// <summary>
-        /// Add an analysis spec matching a specific game by title ID, with the provided spec configuration.
-        /// </summary>
-        /// <param name="titleId">The ID of the game to listen to Play Reports in.</param>
-        /// <param name="transform">The configuration function for the analysis spec.</param>
-        /// <returns>The current <see cref="PlayReportAnalyzer"/>, for chaining convenience.</returns>
-        public PlayReportAnalyzer AddSpec(string titleId, Func<PlayReportGameSpec, PlayReportGameSpec> transform)
-        {
-            Guard.Ensure(ulong.TryParse(titleId, NumberStyles.HexNumber, null, out _),
-                $"Cannot use a non-hexadecimal string as the Title ID for a {nameof(PlayReportGameSpec)}.");
-
-            _specs.Add(transform(new PlayReportGameSpec { TitleIds = [titleId] }));
-            return this;
-        }
-
-        /// <summary>
-        /// Add an analysis spec matching a specific game by title ID, with the provided spec configuration.
-        /// </summary>
-        /// <param name="titleId">The ID of the game to listen to Play Reports in.</param>
-        /// <param name="transform">The configuration function for the analysis spec.</param>
-        /// <returns>The current <see cref="PlayReportAnalyzer"/>, for chaining convenience.</returns>
-        public PlayReportAnalyzer AddSpec(string titleId, Action<PlayReportGameSpec> transform)
-        {
-            Guard.Ensure(ulong.TryParse(titleId, NumberStyles.HexNumber, null, out _),
-                $"Cannot use a non-hexadecimal string as the Title ID for a {nameof(PlayReportGameSpec)}.");
-
-            _specs.Add(new PlayReportGameSpec { TitleIds = [titleId] }.Apply(transform));
-            return this;
-        }
-
-        /// <summary>
-        /// Add an analysis spec matching a specific set of games by title IDs, with the provided spec configuration.
-        /// </summary>
-        /// <param name="titleIds">The IDs of the games to listen to Play Reports in.</param>
-        /// <param name="transform">The configuration function for the analysis spec.</param>
-        /// <returns>The current <see cref="PlayReportAnalyzer"/>, for chaining convenience.</returns>
-        public PlayReportAnalyzer AddSpec(IEnumerable<string> titleIds,
-            Func<PlayReportGameSpec, PlayReportGameSpec> transform)
-        {
-            string[] tids = titleIds.ToArray();
-            Guard.Ensure(tids.All(x => ulong.TryParse(x, NumberStyles.HexNumber, null, out _)),
-                $"Cannot use a non-hexadecimal string as the Title ID for a {nameof(PlayReportGameSpec)}.");
-
-            _specs.Add(transform(new PlayReportGameSpec { TitleIds = [..tids] }));
-            return this;
-        }
-
-        /// <summary>
-        /// Add an analysis spec matching a specific set of games by title IDs, with the provided spec configuration.
-        /// </summary>
-        /// <param name="titleIds">The IDs of the games to listen to Play Reports in.</param>
-        /// <param name="transform">The configuration function for the analysis spec.</param>
-        /// <returns>The current <see cref="PlayReportAnalyzer"/>, for chaining convenience.</returns>
-        public PlayReportAnalyzer AddSpec(IEnumerable<string> titleIds, Action<PlayReportGameSpec> transform)
-        {
-            string[] tids = titleIds.ToArray();
-            Guard.Ensure(tids.All(x => ulong.TryParse(x, NumberStyles.HexNumber, null, out _)),
-                $"Cannot use a non-hexadecimal string as the Title ID for a {nameof(PlayReportGameSpec)}.");
-
-            _specs.Add(new PlayReportGameSpec { TitleIds = [..tids] }.Apply(transform));
-            return this;
-        }
-
-        
-        /// <summary>
-        /// Runs the configured <see cref="PlayReportGameSpec.FormatterSpec"/> for the specified game title ID.
-        /// </summary>
-        /// <param name="runningGameId">The game currently running.</param>
-        /// <param name="appMeta">The Application metadata information, including localized game name and play time information.</param>
-        /// <param name="playReport">The Play Report received from HLE.</param>
-        /// <returns>A struct representing a possible formatted value.</returns>
-        public FormattedValue Format(
-            string runningGameId,
-            ApplicationMetadata appMeta,
-            MessagePackObject playReport
-        )
-        {
-            if (!playReport.IsDictionary)
-                return FormattedValue.Unhandled;
-
-            if (!_specs.TryGetFirst(s => runningGameId.EqualsAnyIgnoreCase(s.TitleIds), out PlayReportGameSpec spec))
-                return FormattedValue.Unhandled;
-
-            foreach (PlayReportGameSpec.FormatterSpec formatSpec in spec.SimpleValueFormatters.OrderBy(x => x.Priority))
-            {
-                if (!playReport.AsDictionary().TryGetValue(formatSpec.ReportKey, out MessagePackObject valuePackObject))
-                    continue;
-
-                return formatSpec.ValueFormatter(new PlayReportValue
-                {
-                    Application = appMeta, PackedValue = valuePackObject
-                });
-            }
-
-            return FormattedValue.Unhandled;
-        }
-
-        /// <summary>
-        /// A potential formatted value returned by a <see cref="PlayReportValueFormatter"/>.
-        /// </summary>
-        public readonly struct FormattedValue
-        {
-            /// <summary>
-            /// Was any handler able to match anything in the Play Report?
-            /// </summary>
-            public bool Handled { get; private init; }
-
-            /// <summary>
-            /// Did the handler request the caller of the <see cref="PlayReportAnalyzer"/> to reset the existing value?
-            /// </summary>
-            public bool Reset { get; private init; }
-
-            /// <summary>
-            /// The formatted value, only present if <see cref="Handled"/> is true, and <see cref="Reset"/> is false.
-            /// </summary>
-            public string FormattedString { get; private init; }
-
-            /// <summary>
-            /// The intended path of execution for having a string to return: simply return the string.
-            /// This implicit conversion will make the struct for you.<br/><br/>
-            ///
-            /// If the input is null, <see cref="Unhandled"/> is returned.
-            /// </summary>
-            /// <param name="formattedValue">The formatted string value.</param>
-            /// <returns>The automatically constructed <see cref="FormattedValue"/> struct.</returns>
-            public static implicit operator FormattedValue(string formattedValue)
-                => formattedValue is not null 
-                    ? new FormattedValue { Handled = true, FormattedString = formattedValue }
-                    : Unhandled;
-
-            /// <summary>
-            /// Return this to tell the caller there is no value to return.
-            /// </summary>
-            public static FormattedValue Unhandled => default;
-            
-            /// <summary>
-            /// Return this to suggest the caller reset the value it's using the <see cref="PlayReportAnalyzer"/> for.
-            /// </summary>
-            public static FormattedValue ForceReset => new() { Handled = true, Reset = true };
-
-            /// <summary>
-            /// A delegate singleton you can use to always return <see cref="ForceReset"/> in a <see cref="PlayReportValueFormatter"/>.
-            /// </summary>
-            public static readonly PlayReportValueFormatter AlwaysResets = _ => ForceReset;
-
-            /// <summary>
-            /// A delegate factory you can use to always return the specified
-            /// <paramref name="formattedValue"/> in a <see cref="PlayReportValueFormatter"/>.
-            /// </summary>
-            /// <param name="formattedValue">The string to always return for this delegate instance.</param>
-            public static PlayReportValueFormatter AlwaysReturns(string formattedValue) => _ => formattedValue;
-        }
-    }
-
-    /// <summary>
-    /// A mapping of title IDs to value formatter specs.
-    ///
-    /// <remarks>Generally speaking, use the <see cref="PlayReportAnalyzer"/>.AddSpec(...) methods instead of creating this class yourself.</remarks>
-    /// </summary>
-    public class PlayReportGameSpec
-    {
-        public required string[] TitleIds { get; init; }
-        public List<FormatterSpec> SimpleValueFormatters { get; } = [];
-
-        /// <summary>
-        /// Add a value formatter to the current <see cref="PlayReportGameSpec"/>
-        /// matching a specific key that could exist in a Play Report for the previously specified title IDs.
-        /// </summary>
-        /// <param name="reportKey">The key name to match.</param>
-        /// <param name="valueFormatter">The function which can return a potential formatted value.</param>
-        /// <returns>The current <see cref="PlayReportGameSpec"/>, for chaining convenience.</returns>
-        public PlayReportGameSpec AddValueFormatter(string reportKey, PlayReportValueFormatter valueFormatter)
-        {
-            SimpleValueFormatters.Add(new FormatterSpec
-            {
-                Priority = SimpleValueFormatters.Count, ReportKey = reportKey, ValueFormatter = valueFormatter
-            });
-            return this;
-        }
-
-        /// <summary>
-        /// Add a value formatter at a specific priority to the current <see cref="PlayReportGameSpec"/>
-        /// matching a specific key that could exist in a Play Report for the previously specified title IDs.
-        /// </summary>
-        /// <param name="priority">The resolution priority of this value formatter. Higher resolves sooner.</param>
-        /// <param name="reportKey">The key name to match.</param>
-        /// <param name="valueFormatter">The function which can return a potential formatted value.</param>
-        /// <returns>The current <see cref="PlayReportGameSpec"/>, for chaining convenience.</returns>
-        public PlayReportGameSpec AddValueFormatter(int priority, string reportKey,
-            PlayReportValueFormatter valueFormatter)
-        {
-            SimpleValueFormatters.Add(new FormatterSpec
-            {
-                Priority = priority, ReportKey = reportKey, ValueFormatter = valueFormatter
-            });
-            return this;
-        }
-
-        /// <summary>
-        /// A struct containing the data for a mapping of a key in a Play Report to a formatter for its potential value.
-        /// </summary>
-        public struct FormatterSpec
-        {
-            public required int Priority { get; init; }
-            public required string ReportKey { get; init; }
-            public PlayReportValueFormatter ValueFormatter { get; init; }
-        }
-    }
-
-    /// <summary>
-    /// The input data to a <see cref="PlayReportValueFormatter"/>,
-    /// containing the currently running application's <see cref="ApplicationMetadata"/>,
-    /// and the matched <see cref="MessagePackObject"/> from the Play Report.
-    /// </summary>
-    public class PlayReportValue
-    {
-        /// <summary>
-        /// The currently running application's <see cref="ApplicationMetadata"/>.
-        /// </summary>
-        public ApplicationMetadata Application { get; init; }
-
-        /// <summary>
-        /// The matched value from the Play Report.
-        /// </summary>
-        public MessagePackObject PackedValue { get; init; }
-
-        /// <summary>
-        /// Access the <see cref="PackedValue"/> as its underlying .NET type.<br/>
-        /// 
-        /// Does not seem to work well with comparing numeric types,
-        /// so use <see cref="PackedValue"/> and the AsX (where X is a numerical type name i.e. Int32) methods for that.
-        /// </summary>
-        public object BoxedValue => PackedValue.ToObject();
-
-        #region AsX accessors
-
-        public bool BooleanValue => PackedValue.AsBoolean();
-        public byte ByteValye => PackedValue.AsByte();
-        public sbyte SByteValye => PackedValue.AsSByte();
-        public short ShortValye => PackedValue.AsInt16();
-        public ushort UShortValye => PackedValue.AsUInt16();
-        public int IntValye => PackedValue.AsInt32();
-        public uint UIntValye => PackedValue.AsUInt32();
-        public long LongValye => PackedValue.AsInt64();
-        public ulong ULongValye => PackedValue.AsUInt64();
-        public float FloatValue => PackedValue.AsSingle();
-        public double DoubleValue => PackedValue.AsDouble();
-        public string StringValue => PackedValue.AsString();
-        public Span<byte> BinaryValue => PackedValue.AsBinary();
-
-        #endregion
-    }
-
-    /// <summary>
-    /// The delegate type that powers the entire analysis system (as it currently is).<br/>
-    /// Takes in the result value from the Play Report, and outputs:
-    /// <br/>
-    /// a formatted string,
-    /// <br/>
-    /// a signal that nothing was available to handle it,
-    /// <br/>
-    /// OR a signal to reset the value that the caller is using the <see cref="PlayReportAnalyzer"/> for. 
-    /// </summary>
-    public delegate PlayReportAnalyzer.FormattedValue PlayReportValueFormatter(PlayReportValue value);
-}