UI: RPC: Goat Simulator 3 asset image

src/Ryujinx.Common/Configuration/DirtyHack.cs

@@ -25,7 +25,7 @@ namespace Ryujinx.Common.Configuration
         {
             var unpackedFields = packedHack.UnpackBitFields(PackedFormat);
             if (unpackedFields is not [var hack, var value])
-                throw new ArgumentException(nameof(packedHack));
+                throw new Exception("The unpack operation on the integer resulted in an invalid unpacked result.");
             
             return new EnabledDirtyHack((DirtyHack)hack, (int)value);
         }

src/Ryujinx.Common/TitleIDs.cs

@@ -171,6 +171,7 @@ namespace Ryujinx.Common
             "0100b41013c82000", // Cruis'n Blast
             "01001b300b9be000", // Diablo III: Eternal Collection
             "01008c8012920000", // Dying Light Platinum Edition
+            "01001cc01b2d4000", // Goat Simulator 3
             "010073c01af34000", // LEGO Horizon Adventures
             "0100770008dd8000", // Monster Hunter Generations Ultimate
             "0100b04011742000", // Monster Hunter Rise

src/Ryujinx/AppHost.cs

@@ -3,7 +3,6 @@ using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
 using Avalonia.Threading;
-using Gommon;
 using LibHac.Common;
 using LibHac.Ns;
 using LibHac.Tools.FsSystem;
@@ -43,7 +42,6 @@ using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.SystemState;
 using Ryujinx.Input;
 using Ryujinx.Input.HLE;
-using Silk.NET.Vulkan;
 using SkiaSharp;
 using SPB.Graphics.Vulkan;
 using System;
@@ -1042,7 +1040,7 @@ namespace Ryujinx.Ava
                     _viewModel.WindowState = WindowState.FullScreen;
                 }
 
-                if (_viewModel.WindowState is WindowState.FullScreen || _viewModel.StartGamesWithoutUI)
+                if (_viewModel.WindowState is WindowState.FullScreen)
                 {
                     _viewModel.ShowMenuAndStatusBar = false;
                 }

src/Ryujinx/Assets/locales.json

@@ -572,31 +572,6 @@
         "zh_TW": "使用全螢幕模式啟動遊戲"
       }
     },
-    {
-      "ID": "MenuBarOptionsStartGamesWithoutUI",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Start Games with UI Hidden",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
     {
       "ID": "MenuBarOptionsStopEmulation",
       "Translations": {

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -80,7 +80,9 @@ namespace Ryujinx.Ava.UI.ViewModels
         [ObservableProperty] private Brush _progressBarForegroundColor;
         [ObservableProperty] private Brush _progressBarBackgroundColor;
         [ObservableProperty] private Brush _vSyncModeColor;
-        [ObservableProperty] private byte[] _selectedIcon;
+        #nullable enable
+        [ObservableProperty] private byte[]? _selectedIcon;
+        #nullable disable
         [ObservableProperty] private int _statusBarProgressMaximum;
         [ObservableProperty] private int _statusBarProgressValue;
         [ObservableProperty] private string _statusBarProgressStatusText;
@@ -125,43 +127,6 @@ namespace Ryujinx.Ava.UI.ViewModels
         private ApplicationData _listSelectedApplication;
         private ApplicationData _gridSelectedApplication;
         
-        public ApplicationData ListSelectedApplication
-        {
-            get => _listSelectedApplication;
-            set
-            {
-                _listSelectedApplication = value;
-
-#pragma warning disable MVVMTK0034
-                if (_listSelectedApplication != null && _listAppContextMenu == null)
-
-                    ListAppContextMenu = new ApplicationContextMenu();
-                else if (_listSelectedApplication == null && _listAppContextMenu != null)
-                    ListAppContextMenu = null!;
-#pragma warning restore MVVMTK0034
-
-                OnPropertyChanged();
-            }
-        }
-
-        public ApplicationData GridSelectedApplication
-        {
-            get => _gridSelectedApplication;
-            set
-            {
-                _gridSelectedApplication = value;
-
-#pragma warning disable MVVMTK0034
-                if (_gridSelectedApplication != null && _gridAppContextMenu == null)
-                    GridAppContextMenu = new ApplicationContextMenu();
-                else if (_gridSelectedApplication == null && _gridAppContextMenu != null)
-                    GridAppContextMenu = null!;
-#pragma warning restore MVVMTK0034
-                
-                OnPropertyChanged();
-            }
-        }
-        
         // Key is Title ID
         public SafeDictionary<string, LdnGameData.Array> LdnData = [];
 
@@ -185,9 +150,8 @@ namespace Ryujinx.Ava.UI.ViewModels
                 .OnItemAdded(_ => OnPropertyChanged(nameof(AppsObservableList)))
                 .OnItemRemoved(_ => OnPropertyChanged(nameof(AppsObservableList)))
 #pragma warning disable MVVMTK0034 // Event to update is fired below
-                .Bind(out _appsObservableList)
+                .Bind(out _appsObservableList);
 #pragma warning restore MVVMTK0034
-                .AsObservableList();
 
             _rendererWaitEvent = new AutoResetEvent(false);
 
@@ -335,6 +299,43 @@ namespace Ryujinx.Ava.UI.ViewModels
                 OnPropertyChanged(nameof(ShowFirmwareStatus));
             }
         }
+        
+        public ApplicationData ListSelectedApplication
+        {
+            get => _listSelectedApplication;
+            set
+            {
+                _listSelectedApplication = value;
+
+#pragma warning disable MVVMTK0034
+                if (_listSelectedApplication != null && _listAppContextMenu == null)
+
+                    ListAppContextMenu = new ApplicationContextMenu();
+                else if (_listSelectedApplication == null && _listAppContextMenu != null)
+                    ListAppContextMenu = null!;
+#pragma warning restore MVVMTK0034
+
+                OnPropertyChanged();
+            }
+        }
+
+        public ApplicationData GridSelectedApplication
+        {
+            get => _gridSelectedApplication;
+            set
+            {
+                _gridSelectedApplication = value;
+
+#pragma warning disable MVVMTK0034
+                if (_gridSelectedApplication != null && _gridAppContextMenu == null)
+                    GridAppContextMenu = new ApplicationContextMenu();
+                else if (_gridSelectedApplication == null && _gridAppContextMenu != null)
+                    GridAppContextMenu = null!;
+#pragma warning restore MVVMTK0034
+                
+                OnPropertyChanged();
+            }
+        }
 
         public ApplicationData SelectedApplication
         {
@@ -488,19 +489,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public bool StartGamesWithoutUI
-        {
-            get => ConfigurationState.Instance.UI.StartNoUI;
-            set
-            {
-                ConfigurationState.Instance.UI.StartNoUI.Value = value;
-
-                ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.ConfigurationPath);
-
-                OnPropertyChanged();
-            }
-        }
-
         public bool ShowConsole
         {
             get => ConfigurationState.Instance.UI.ShowConsole;
@@ -1205,11 +1193,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             StartGamesInFullscreen = !StartGamesInFullscreen;
         }
 
-        public void ToggleStartGamesWithoutUI()
-        {
-            StartGamesWithoutUI = !StartGamesWithoutUI;
-        }
-
         public void ToggleShowConsole()
         {
             ShowConsole = !ShowConsole;
@@ -1773,7 +1756,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public async void ProcessTrimResult(String filename, Ryujinx.Common.Utilities.XCIFileTrimmer.OperationOutcome operationOutcome)
+        public async void ProcessTrimResult(String filename, XCIFileTrimmer.OperationOutcome operationOutcome)
         {
             string notifyUser = operationOutcome.ToLocalisedText();
 
@@ -1788,12 +1771,8 @@ namespace Ryujinx.Ava.UI.ViewModels
             {
                 switch (operationOutcome)
                 {
-                    case Ryujinx.Common.Utilities.XCIFileTrimmer.OperationOutcome.Successful:
-                        if (Avalonia.Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-                        {
-                            if (desktop.MainWindow is MainWindow mainWindow)
-                                mainWindow.LoadApplications();
-                        }
+                    case XCIFileTrimmer.OperationOutcome.Successful:
+                        RyujinxApp.MainWindow.LoadApplications();
                         break;
                 }
             }

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

@@ -119,29 +119,6 @@
                         </Style>
                     </MenuItem.Styles>
                 </MenuItem>
-                <MenuItem
-                    Padding="0"
-                    Command="{Binding ToggleStartGamesWithoutUI}"
-                    Header="{ext:Locale MenuBarOptionsStartGamesWithoutUI}">
-                    <MenuItem.Icon>
-                        <CheckBox
-                            MinWidth="{DynamicResource CheckBoxSize}"
-                            MinHeight="{DynamicResource CheckBoxSize}"
-                            IsChecked="{Binding StartGamesWithoutUI, Mode=TwoWay}"
-                            Padding="0" />
-                    </MenuItem.Icon>
-                    <MenuItem.Styles>
-                        <Style Selector="Viewbox#PART_IconPresenter">
-                            <Setter Property="MaxHeight" Value="36" />
-                            <Setter Property="MinHeight" Value="36" />
-                            <Setter Property="MaxWidth" Value="36" />
-                            <Setter Property="MinWidth" Value="36" />
-                        </Style>
-                        <Style Selector="ContentPresenter#PART_HeaderPresenter">
-                            <Setter Property="Padding" Value="-10,0,0,0" />
-                        </Style>
-                    </MenuItem.Styles>
-                </MenuItem>
                 <MenuItem
                     Padding="0"
                     IsVisible="{Binding ShowConsoleVisible}"

src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs

@@ -17,7 +17,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
         /// <summary>
         /// The current version of the file format
         /// </summary>
-        public const int CurrentVersion = 60;
+        public const int CurrentVersion = 59;
 
         /// <summary>
         /// Version of the configuration file format
@@ -351,11 +351,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
         /// </summary>
         public bool StartFullscreen { get; set; }
 
-        /// <summary>
-        /// Start games with UI hidden
-        /// </summary>
-        public bool StartNoUI { get; set; }
-
         /// <summary>
         /// Show console window
         /// </summary>

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

@@ -127,7 +127,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             UI.GridSize.Value = cff.GridSize;
             UI.ApplicationSort.Value = cff.ApplicationSort;
             UI.StartFullscreen.Value = cff.StartFullscreen;
-            UI.StartNoUI.Value = cff.StartNoUI;
             UI.ShowConsole.Value = cff.ShowConsole;
             UI.WindowStartup.WindowSizeWidth.Value = cff.WindowStartup.WindowSizeWidth;
             UI.WindowStartup.WindowSizeHeight.Value = cff.WindowStartup.WindowSizeHeight;
@@ -415,8 +414,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
                     // This was accidentally enabled by default when it was PRed. That is not what we want,
                     // so as a compromise users who want to use it will simply need to re-enable it once after updating.
                     cff.IgnoreApplet = false;
-                }),
-                (60, static cff => cff.StartNoUI = false)
+                })
             );
     }
 }

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

@@ -152,11 +152,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             /// </summary>
             public ReactiveObject<bool> StartFullscreen { get; private set; }
 
-            /// <summary>
-            /// Start games with UI hidden
-            /// </summary>
-            public ReactiveObject<bool> StartNoUI { get; private set; }
-
             /// <summary>
             /// Hide / Show Console Window
             /// </summary>
@@ -197,7 +192,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 WindowStartup = new WindowStartupSettings();
                 BaseStyle = new ReactiveObject<string>();
                 StartFullscreen = new ReactiveObject<bool>();
-                StartNoUI = new ReactiveObject<bool>();
                 GameListViewMode = new ReactiveObject<int>();
                 ShowNames = new ReactiveObject<bool>();
                 GridSize = new ReactiveObject<int>();

src/Ryujinx/Utilities/Configuration/ConfigurationState.cs

@@ -125,7 +125,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 ApplicationSort = UI.ApplicationSort,
                 IsAscendingOrder = UI.IsAscendingOrder,
                 StartFullscreen = UI.StartFullscreen,
-                StartNoUI = UI.StartNoUI,
                 ShowConsole = UI.ShowConsole,
                 EnableKeyboard = Hid.EnableKeyboard,
                 EnableMouse = Hid.EnableMouse,
@@ -234,7 +233,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             UI.ApplicationSort.Value = 0;
             UI.IsAscendingOrder.Value = true;
             UI.StartFullscreen.Value = false;
-            UI.StartNoUI.Value = false;
             UI.ShowConsole.Value = true;
             UI.WindowStartup.WindowSizeWidth.Value = 1280;
             UI.WindowStartup.WindowSizeHeight.Value = 760;