Merge branch 'master' into validation-v2

isGitRunner is now a variable passed to all tasks.
Validation project can now accept more arguments, only the first argument is used at the moment.
Execute is no longer static, and you can now pass extra data to the task constructor if needed.

Ryujinx.sln

@@ -255,13 +255,12 @@ Global
 		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C08931FA-1191-417A-864F-3882D93E683B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C08931FA-1191-417A-864F-3882D93E683B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C08931FA-1191-417A-864F-3882D93E683B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C08931FA-1191-417A-864F-3882D93E683B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Release|Any CPU.ActiveCfg = Release|Any CPU

src/Ryujinx.BuildValidationTasks/LocaleValidationTask.cs

@@ -1,73 +0,0 @@
-using System;
-using Microsoft.Build.Utilities;
-using System.Collections.Generic;
-using System.Linq;
-using System.IO;
-using Newtonsoft.Json;
-using Microsoft.Build.Framework;
-
-namespace Ryujinx.BuildValidationTasks
-{
-    public class LocaleValidationTask : Task
-    {
-        public override bool Execute()
-        {
-            string path = System.Reflection.Assembly.GetExecutingAssembly().Location;
-
-            if (path.Split(["src"], StringSplitOptions.None).Length == 1)
-            {
-                //i assume that we are in a build directory in the solution dir
-                path = new FileInfo(path).Directory!.Parent!.GetDirectories("src")[0].GetDirectories("Ryujinx")[0].GetDirectories("Assets")[0].GetFiles("locales.json")[0].FullName;
-            }
-            else
-            {
-                path = path.Split(["src"], StringSplitOptions.None)[0];
-                path = new FileInfo(path).Directory!.GetDirectories("src")[0].GetDirectories("Ryujinx")[0].GetDirectories("Assets")[0].GetFiles("locales.json")[0].FullName;
-            }
-
-            string data;
-
-            using (StreamReader sr = new(path))
-            {
-                data = sr.ReadToEnd();
-            }
-
-            LocalesJson json = JsonConvert.DeserializeObject<LocalesJson>(data);
-
-            for (int i = 0; i < json.Locales.Count; i++)
-            {
-                LocalesEntry locale = json.Locales[i];
-
-                foreach (string langCode in json.Languages.Where(it => !locale.Translations.ContainsKey(it)))
-                {
-                    locale.Translations.Add(langCode, string.Empty);
-                    Log.LogMessage(MessageImportance.High, $"Added '{langCode}' to Locale '{locale.ID}'");
-                }
-
-                locale.Translations = locale.Translations.OrderBy(pair => pair.Key).ToDictionary(pair => pair.Key, pair => pair.Value);
-                json.Locales[i] = locale;
-            }
-
-            string jsonString = JsonConvert.SerializeObject(json, Formatting.Indented);
-
-            using (StreamWriter sw = new(path))
-            {
-                sw.Write(jsonString);
-            }
-
-            return true;
-        }
-
-        struct LocalesJson
-        {
-            public List<string> Languages { get; set; }
-            public List<LocalesEntry> Locales { get; set; }
-        }
-
-        struct LocalesEntry
-        {
-            public string ID { get; set; }
-            public Dictionary<string, string> Translations { get; set; }
-        }
-    }
-}

src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs

@@ -0,0 +1,117 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.IO;
+using System.Text.Json;
+using System.Text.Encodings.Web;
+
+namespace Ryujinx.BuildValidationTasks
+{
+    public class LocalesValidationTask : ValidationTask
+    {
+        public LocalesValidationTask() { }
+
+        public bool Execute(string projectPath, bool isGitRunner)
+        {
+            Console.WriteLine("Running Locale Validation Task...");
+
+            string path = projectPath + "src/Ryujinx/Assets/locales.json";
+            string data;
+
+            using (StreamReader sr = new(path))
+            {
+                data = sr.ReadToEnd();
+            }
+
+            LocalesJson json;
+
+            if (isGitRunner && data.Contains("\r\n"))
+                throw new FormatException("locales.json is using CRLF line endings! It should be using LF line endings, build locally to fix...");
+
+            try
+            {
+                json = JsonSerializer.Deserialize<LocalesJson>(data);
+
+            }
+            catch (JsonException e)
+            {
+                throw new JsonException(e.Message); //shorter and easier stacktrace
+            }
+
+
+
+            bool encounteredIssue = false;
+
+            for (int i = 0; i < json.Locales.Count; i++)
+            {
+                LocalesEntry locale = json.Locales[i];
+
+                foreach (string langCode in json.Languages.Where(lang => !locale.Translations.ContainsKey(lang)))
+                {
+                    encounteredIssue = true;
+
+                    if (!isGitRunner)
+                    {
+                        locale.Translations.Add(langCode, string.Empty);
+                        Console.WriteLine($"Added '{langCode}' to Locale '{locale.ID}'");
+                    }
+                    else
+                    {
+                        Console.WriteLine($"Missing '{langCode}' in Locale '{locale.ID}'!");
+                    }
+                }
+
+                foreach (string langCode in json.Languages.Where(lang => locale.Translations.ContainsKey(lang) && lang != "en_US" && locale.Translations[lang] == locale.Translations["en_US"]))
+                {
+                    encounteredIssue = true;
+
+                    if (!isGitRunner)
+                    {
+                        locale.Translations[langCode] = string.Empty;
+                        Console.WriteLine($"Lanugage '{langCode}' is a duplicate of en_US in Locale '{locale.ID}'! Resetting it...");
+                    }
+                    else
+                    {
+                        Console.WriteLine($"Lanugage '{langCode}' is a duplicate of en_US in Locale '{locale.ID}'!");
+                    }
+                }
+
+                locale.Translations = locale.Translations.OrderBy(pair => pair.Key).ToDictionary(pair => pair.Key, pair => pair.Value);
+                json.Locales[i] = locale;
+            }
+
+            if (isGitRunner && encounteredIssue)
+                throw new JsonException("1 or more locales are invalid!");
+
+            JsonSerializerOptions jsonOptions = new JsonSerializerOptions()
+            {
+                WriteIndented = true,
+                NewLine = "\n",
+                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+            };
+
+            string jsonString = JsonSerializer.Serialize(json, jsonOptions);
+
+            using (StreamWriter sw = new(path))
+            {
+                sw.Write(jsonString);
+            }
+
+            Console.WriteLine("Finished Locale Validation Task!");
+
+            return true;
+        }
+
+        struct LocalesJson
+        {
+            public List<string> Languages { get; set; }
+            public List<LocalesEntry> Locales { get; set; }
+        }
+
+        struct LocalesEntry
+        {
+            public string ID { get; set; }
+            public Dictionary<string, string> Translations { get; set; }
+        }
+    }
+}

src/Ryujinx.BuildValidationTasks/Program.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ryujinx.BuildValidationTasks
+{
+    public class Program
+    {
+        static void Main(string[] args)
+        {
+            // Display the number of command line arguments.
+            if (args.Length == 0)
+                throw new ArgumentException("Error: too few arguments!");
+
+            string path = args[0];
+
+            if (string.IsNullOrEmpty(path))
+                throw new ArgumentException("Error: path is null or empty!");
+
+            if (!Path.Exists(path))
+                throw new FileLoadException($"path {{{path}}} does not exist!");
+
+            path = Path.GetFullPath(path);
+
+            if (!Directory.GetDirectories(path).Contains($"{path}src"))
+                throw new FileLoadException($"path {{{path}}} is not a valid ryujinx project!");
+
+            bool isGitRunner = path.Contains("runner") || path.Contains("D:\\a\\Ryujinx\\Ryujinx");
+            if (isGitRunner)
+                Console.WriteLine("Is Git Runner!");
+
+            // Run tasks
+            // Pass extra info needed in the task constructors
+            new LocalesValidationTask().Execute(path, isGitRunner);
+        }
+    }
+}

src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj

@@ -1,19 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Utilities.Core" />
-    <PackageReference Include="Newtonsoft.Json" />
-  </ItemGroup>
+  <Target Name="PostBuildTarget" AfterTargets="AfterBuild">
+    <Message Text="Running Validation Project" Importance="high" />
 
-  <UsingTask TaskName="Ryujinx.BuildValidationTasks.LocaleValidationTask" TaskFactory="TaskHostFactory" AssemblyFile="$(OutDir)Ryujinx.BuildValidationTasks.dll" />
-
-  <Target Name="LocalesJsonValidation" AfterTargets="AfterRebuild">
-    <LocaleValidationTask />
+    <Exec WorkingDirectory="$(ProjectDir)bin\Debug\$(TargetFramework)\"
+      Command="dotnet Ryujinx.BuildValidationTasks.dll &quot;$(ProjectDir)..\..\\&quot;" 
+      ConsoleToMsBuild="true"
+      />
   </Target>
 
-</Project>
+</Project>

src/Ryujinx.BuildValidationTasks/ValidationTask.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ryujinx.BuildValidationTasks
+{
+    public interface ValidationTask
+    {
+        public bool Execute(string projectPath, bool isGitRunner);
+    }
+}

src/Ryujinx.Common/Configuration/DirtyHacks.cs

@@ -1,11 +0,0 @@
-using System;
-
-namespace Ryujinx.Common.Configuration
-{
-    [Flags]
-    public enum DirtyHacks
-    {
-        None = 0,
-        Xc2MenuSoftlockFix = 1 << 10
-    }
-}

src/Ryujinx.Common/TitleIDs.cs

@@ -8,8 +8,6 @@ namespace Ryujinx.Common
 {
     public static class TitleIDs
     {
-        public static Optional<string> CurrentApplication;
-        
         public static GraphicsBackend SelectGraphicsBackend(string titleId, GraphicsBackend currentBackend)
         {
             switch (currentBackend)
@@ -35,7 +33,6 @@ namespace Ryujinx.Common
             "010028600EBDA000", // Mario 3D World
             "0100152000022000", // Mario Kart 8 Deluxe
             "01005CA01580E000", // Persona 5
-            "01001f5010dfa000", // Pokemon Legends Arceus
             "01008C0016544000", // Sea of Stars
             "01006A800016E000", // Smash Ultimate
             "0100000000010000", // Super Mario Odyessy

src/Ryujinx.Graphics.Gpu/GraphicsConfig.cs

@@ -47,6 +47,12 @@ namespace Ryujinx.Graphics.Gpu
         /// </summary>
         public static bool EnableMacroHLE = true;
 
+        /// <summary>
+        /// Title id of the current running game.
+        /// Used by the shader cache.
+        /// </summary>
+        public static string TitleId;
+
         /// <summary>
         /// Enables or disables the shader cache.
         /// </summary>

src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs

@@ -1,4 +1,3 @@
-using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
@@ -117,8 +116,8 @@ namespace Ryujinx.Graphics.Gpu.Shader
         /// </summary>
         private static string GetDiskCachePath()
         {
-            return GraphicsConfig.EnableShaderCache && TitleIDs.CurrentApplication.HasValue
-                ? Path.Combine(AppDataManager.GamesDirPath, TitleIDs.CurrentApplication, "cache", "shader")
+            return GraphicsConfig.EnableShaderCache && GraphicsConfig.TitleId != null
+                ? Path.Combine(AppDataManager.GamesDirPath, GraphicsConfig.TitleId, "cache", "shader")
                 : null;
         }
 

src/Ryujinx.Graphics.Metal/Window.cs

@@ -22,15 +22,13 @@ namespace Ryujinx.Graphics.Metal
 
         private int _requestedWidth;
         private int _requestedHeight;
-        
+
+        // private bool _vsyncEnabled;
         private AntiAliasing _currentAntiAliasing;
         private bool _updateEffect;
         private IPostProcessingEffect _effect;
         private IScalingFilter _scalingFilter;
         private bool _isLinear;
-
-        public bool IsVSyncEnabled => _metalLayer.DisplaySyncEnabled;
-        
         // private float _scalingFilterLevel;
         private bool _updateScalingFilter;
         private ScalingFilter _currentScalingFilter;
@@ -42,7 +40,7 @@ namespace Ryujinx.Graphics.Metal
             _metalLayer = metalLayer;
         }
 
-        private void ResizeIfNeeded()
+        private unsafe void ResizeIfNeeded()
         {
             if (_requestedWidth != 0 && _requestedHeight != 0)
             {
@@ -56,7 +54,7 @@ namespace Ryujinx.Graphics.Metal
             }
         }
 
-        public void Present(ITexture texture, ImageCrop crop, Action swapBuffersCallback)
+        public unsafe void Present(ITexture texture, ImageCrop crop, Action swapBuffersCallback)
         {
             if (_renderer.Pipeline is Pipeline pipeline && texture is Texture tex)
             {
@@ -143,7 +141,15 @@ namespace Ryujinx.Graphics.Metal
         
         public void ChangeVSyncMode(VSyncMode vSyncMode)
         {
-            _metalLayer.DisplaySyncEnabled = vSyncMode is VSyncMode.Switch;
+            switch (vSyncMode)
+            {
+                case VSyncMode.Unbounded:
+                    _metalLayer.DisplaySyncEnabled = false;
+                    break;
+                case VSyncMode.Switch:
+                    _metalLayer.DisplaySyncEnabled = true;
+                    break;
+            }
         }
 
         public void SetAntiAliasing(AntiAliasing effect)

src/Ryujinx.Graphics.Nvdec.Vp9/BitDepth.cs

@@ -2,8 +2,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9
 {
     internal enum BitDepth
     {
-        Bits8 = 8,   // <  8 bits
-        Bits10 = 10, // < 10 bits
-        Bits12 = 12, // < 12 bits
+        Bits8 = 8,   /**<  8 bits */
+        Bits10 = 10, /**< 10 bits */
+        Bits12 = 12, /**< 12 bits */
     }
 }

src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs

@@ -1,4 +1,3 @@
-using Gommon;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
@@ -891,12 +890,7 @@ namespace Ryujinx.Graphics.Vulkan
 
         private void PrintGpuInformation()
         {
-            string gpuInfoMessage = $"{GpuRenderer} ({GpuVersion})";
-            if (!GpuRenderer.StartsWithIgnoreCase(GpuVendor))
-                gpuInfoMessage = gpuInfoMessage.Prepend(GpuVendor);
-
-            Logger.Notice.Print(LogClass.Gpu, gpuInfoMessage);
-            
+            Logger.Notice.Print(LogClass.Gpu, $"{GpuVendor} {GpuRenderer} ({GpuVersion})");
             Logger.Notice.Print(LogClass.Gpu, $"GPU Memory: {GetTotalGPUMemory() / (1024 * 1024)} MiB");
         }
 

src/Ryujinx.HLE/HLEConfiguration.cs

@@ -188,11 +188,6 @@ namespace Ryujinx.HLE
         /// An action called when HLE force a refresh of output after docked mode changed.
         /// </summary>
         public Action RefreshInputConfig { internal get; set; }
-        
-        /// <summary>
-        ///     The desired hacky workarounds.
-        /// </summary>
-        public DirtyHacks Hacks { internal get; set; }
 
         public HLEConfiguration(VirtualFileSystem virtualFileSystem,
                                 LibHacHorizonManager libHacHorizonManager,
@@ -223,8 +218,7 @@ namespace Ryujinx.HLE
                                 bool multiplayerDisableP2p,
                                 string multiplayerLdnPassphrase,
                                 string multiplayerLdnServer,
-                                int customVSyncInterval,
-                                DirtyHacks dirtyHacks = DirtyHacks.None)
+                                int customVSyncInterval)
         {
             VirtualFileSystem = virtualFileSystem;
             LibHacHorizonManager = libHacHorizonManager;
@@ -256,7 +250,6 @@ namespace Ryujinx.HLE
             MultiplayerDisableP2p = multiplayerDisableP2p;
             MultiplayerLdnPassphrase = multiplayerLdnPassphrase;
             MultiplayerLdnServer = multiplayerLdnServer;
-            Hacks = dirtyHacks;
         }
     }
 }

src/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IStorage.cs

@@ -1,9 +1,6 @@
 using LibHac;
 using LibHac.Common;
 using LibHac.Sf;
-using Ryujinx.Common;
-using Ryujinx.Common.Configuration;
-using System.Threading;
 
 namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
 {
@@ -16,8 +13,6 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
             _baseStorage = SharedRef<LibHac.FsSrv.Sf.IStorage>.CreateMove(ref baseStorage);
         }
 
-        private const string Xc2TitleId = "0100e95004038000";
-
         [CommandCmif(0)]
         // Read(u64 offset, u64 length) -> buffer<u8, 0x46, 0> buffer
         public ResultCode Read(ServiceCtx context)
@@ -38,13 +33,6 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
 
                 using var region = context.Memory.GetWritableRegion(bufferAddress, (int)bufferLen, true);
                 Result result = _baseStorage.Get.Read((long)offset, new OutBuffer(region.Memory.Span), (long)size);
-                
-                if (context.Device.DirtyHacks.HasFlag(DirtyHacks.Xc2MenuSoftlockFix) && TitleIDs.CurrentApplication == Xc2TitleId)
-                {
-                    // Add a load-bearing sleep to avoid XC2 softlock
-                    // https://web.archive.org/web/20240728045136/https://github.com/Ryujinx/Ryujinx/issues/2357
-                    Thread.Sleep(2);
-                }
 
                 return (ResultCode)result.Value;
             }

src/Ryujinx.HLE/Loaders/Processes/Extensions/FileSystemExtensions.cs

@@ -4,7 +4,6 @@ using LibHac.Fs.Fsa;
 using LibHac.Loader;
 using LibHac.Ns;
 using LibHac.Tools.FsSystem;
-using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.Loaders.Executables;
@@ -103,7 +102,7 @@ namespace Ryujinx.HLE.Loaders.Processes.Extensions
             }
 
             // Initialize GPU.
-            TitleIDs.CurrentApplication = programId.ToString("X16");
+            Graphics.Gpu.GraphicsConfig.TitleId = programId.ToString("X16");
             device.Gpu.HostInitalized.Set();
 
             if (!MemoryBlock.SupportsFlags(MemoryAllocationFlags.ViewCompatible))

src/Ryujinx.HLE/Loaders/Processes/ProcessLoader.cs

@@ -6,7 +6,6 @@ using LibHac.Ns;
 using LibHac.Tools.Fs;
 using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
-using Ryujinx.Common;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.Loaders.Executables;
 using Ryujinx.HLE.Loaders.Processes.Extensions;
@@ -205,7 +204,7 @@ namespace Ryujinx.HLE.Loaders.Processes
             }
 
             // Explicitly null TitleId to disable the shader cache.
-            TitleIDs.CurrentApplication = default;
+            Graphics.Gpu.GraphicsConfig.TitleId = null;
             _device.Gpu.HostInitalized.Set();
 
             ProcessResult processResult = ProcessLoaderHelper.LoadNsos(_device,

src/Ryujinx.HLE/Switch.cs

@@ -37,8 +37,6 @@ namespace Ryujinx.HLE
 
         public bool IsFrameAvailable => Gpu.Window.IsFrameAvailable;
 
-        public DirtyHacks DirtyHacks { get; }
-
         public Switch(HLEConfiguration configuration)
         {
             ArgumentNullException.ThrowIfNull(configuration.GpuRenderer);
@@ -74,7 +72,6 @@ namespace Ryujinx.HLE
             System.EnablePtc                        = Configuration.EnablePtc;
             System.FsIntegrityCheckLevel            = Configuration.FsIntegrityCheckLevel;
             System.GlobalAccessLogMode              = Configuration.FsGlobalAccessLogMode;
-            DirtyHacks                              = Configuration.Hacks;
             UpdateVSyncInterval();
 #pragma warning restore IDE0055
         }

src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs

@@ -17,7 +17,7 @@ namespace Ryujinx.UI.Common.Configuration
         /// <summary>
         /// The current version of the file format
         /// </summary>
-        public const int CurrentVersion = 58;
+        public const int CurrentVersion = 57;
 
         /// <summary>
         /// Version of the configuration file format
@@ -429,17 +429,7 @@ namespace Ryujinx.UI.Common.Configuration
         /// Uses Hypervisor over JIT if available
         /// </summary>
         public bool UseHypervisor { get; set; }
-        
-        /// <summary>
-        ///     Show toggles for dirty hacks in the UI.
-        /// </summary>
-        public bool ShowDirtyHacks { get; set; }
-        
-        /// <summary>
-        ///     The packed value of the enabled dirty hacks.
-        /// </summary>
-        public int EnabledDirtyHacks { get; set; }
-        
+
         /// <summary>
         /// Loads a configuration file from disk
         /// </summary>

src/Ryujinx.UI.Common/Configuration/ConfigurationState.Migration.cs

@@ -735,9 +735,6 @@ namespace Ryujinx.UI.Common.Configuration
             Multiplayer.DisableP2p.Value = configurationFileFormat.MultiplayerDisableP2p;
             Multiplayer.LdnPassphrase.Value = configurationFileFormat.MultiplayerLdnPassphrase;
             Multiplayer.LdnServer.Value = configurationFileFormat.LdnServer;
-            
-            Hacks.ShowDirtyHacks.Value = configurationFileFormat.ShowDirtyHacks;
-            Hacks.Xc2MenuSoftlockFix.Value = ((DirtyHacks)configurationFileFormat.EnabledDirtyHacks).HasFlag(DirtyHacks.Xc2MenuSoftlockFix);
 
             if (configurationFileUpdated)
             {

src/Ryujinx.UI.Common/Configuration/ConfigurationState.Model.cs

@@ -1,5 +1,4 @@
 using ARMeilleure;
-using Gommon;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
@@ -618,49 +617,6 @@ namespace Ryujinx.UI.Common.Configuration
             }
         }
 
-        public class HacksSection
-        {
-            /// <summary>
-            /// Show toggles for dirty hacks in the UI.
-            /// </summary>
-            public ReactiveObject<bool> ShowDirtyHacks { get; private set; }
-            
-            public ReactiveObject<bool> Xc2MenuSoftlockFix { get; private set; }
-
-            public HacksSection()
-            {
-                ShowDirtyHacks = new ReactiveObject<bool>();
-                Xc2MenuSoftlockFix = new ReactiveObject<bool>();
-                Xc2MenuSoftlockFix.Event += HackChanged;
-            }
-
-            private void HackChanged(object sender, ReactiveEventArgs<bool> rxe)
-            {
-                Ryujinx.Common.Logging.Logger.Info?.Print(LogClass.Configuration, $"EnabledDirtyHacks set to: {EnabledHacks}", "LogValueChange");
-            }
-
-            public DirtyHacks EnabledHacks
-            {
-                get
-                {
-                    DirtyHacks dirtyHacks = DirtyHacks.None;
-                    
-                    if (Xc2MenuSoftlockFix)
-                        Apply(DirtyHacks.Xc2MenuSoftlockFix);
-                    
-                    return dirtyHacks;
-
-                    void Apply(DirtyHacks hack)
-                    {
-                        if (dirtyHacks is not DirtyHacks.None)
-                            dirtyHacks |= hack;
-                        else
-                            dirtyHacks = hack;
-                    }
-                }
-            }
-        }
-
         /// <summary>
         /// The default configuration instance
         /// </summary>
@@ -695,11 +651,6 @@ namespace Ryujinx.UI.Common.Configuration
         /// The Multiplayer section
         /// </summary>
         public MultiplayerSection Multiplayer { get; private set; }
-        
-        /// <summary>
-        ///     The Dirty Hacks section
-        /// </summary>
-        public HacksSection Hacks { get; private set; }
 
         /// <summary>
         /// Enables or disables Discord Rich Presence
@@ -749,7 +700,6 @@ namespace Ryujinx.UI.Common.Configuration
             Graphics = new GraphicsSection();
             Hid = new HidSection();
             Multiplayer = new MultiplayerSection();
-            Hacks = new HacksSection();
             EnableDiscordIntegration = new ReactiveObject<bool>();
             CheckUpdatesOnStart = new ReactiveObject<bool>();
             ShowConfirmExit = new ReactiveObject<bool>();

src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs

@@ -138,8 +138,6 @@ namespace Ryujinx.UI.Common.Configuration
                 MultiplayerDisableP2p = Multiplayer.DisableP2p,
                 MultiplayerLdnPassphrase = Multiplayer.LdnPassphrase,
                 LdnServer = Multiplayer.LdnServer,
-                ShowDirtyHacks = Hacks.ShowDirtyHacks,
-                EnabledDirtyHacks = (int)Hacks.EnabledHacks,
             };
 
             return configurationFile;

src/Ryujinx/AppHost.cs

@@ -311,7 +311,6 @@ namespace Ryujinx.Ava
                 Device.VSyncMode = e.NewValue;
                 Device.UpdateVSyncInterval();
             }
-            
             _renderer.Window?.ChangeVSyncMode(e.NewValue);
 
             _viewModel.ShowCustomVSyncIntervalPicker = (e.NewValue == VSyncMode.Custom);
@@ -924,7 +923,7 @@ namespace Ryujinx.Ava
             // Initialize Configuration.
             var memoryConfiguration = ConfigurationState.Instance.System.DramSize.Value;
 
-            Device = new Switch(new HLEConfiguration(
+            Device = new HLE.Switch(new HLEConfiguration(
                 VirtualFileSystem,
                 _viewModel.LibHacHorizonManager,
                 ContentManager,
@@ -954,8 +953,7 @@ namespace Ryujinx.Ava
                 ConfigurationState.Instance.Multiplayer.DisableP2p,
                 ConfigurationState.Instance.Multiplayer.LdnPassphrase,
                 ConfigurationState.Instance.Multiplayer.LdnServer,
-                ConfigurationState.Instance.Graphics.CustomVSyncInterval.Value,
-                ConfigurationState.Instance.Hacks.ShowDirtyHacks ? ConfigurationState.Instance.Hacks.EnabledHacks : DirtyHacks.None));
+                ConfigurationState.Instance.Graphics.CustomVSyncInterval.Value));
         }
 
         private static IHardwareDeviceDriver InitializeAudio()

src/Ryujinx/Assets/locales.json

@@ -1564,7 +1564,7 @@
         "pl_PL": "Wersja",
         "pt_BR": "Versão",
         "ru_RU": "Версия",
-        "sv_SE": "Version",
+        "sv_SE": "",
         "th_TH": "เวอร์ชั่น",
         "tr_TR": "Sürüm",
         "uk_UA": "Версія",
@@ -2213,8 +2213,8 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "ExeFS",
-        "sv_SE": "ExeFS",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -2263,8 +2263,8 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "RomFS",
-        "sv_SE": "RomFS",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -2310,7 +2310,7 @@
         "it_IT": "",
         "ja_JP": "ロゴ",
         "ko_KR": "로고",
-        "no_NO": "Logo",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Лого",
@@ -3260,11 +3260,11 @@
         "it_IT": "Sistema",
         "ja_JP": "システム",
         "ko_KR": "시스템",
-        "no_NO": "System",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "Sistema",
         "ru_RU": "Система",
-        "sv_SE": "System",
+        "sv_SE": "",
         "th_TH": "ระบบ",
         "tr_TR": "Sistem",
         "uk_UA": "Система",
@@ -3335,11 +3335,11 @@
         "it_IT": "Giappone",
         "ja_JP": "日本",
         "ko_KR": "일본",
-        "no_NO": "Japan",
+        "no_NO": "",
         "pl_PL": "Japonia",
         "pt_BR": "Japão",
         "ru_RU": "Япония",
-        "sv_SE": "Japan",
+        "sv_SE": "",
         "th_TH": "ญี่ปุ่น",
         "tr_TR": "Japonya",
         "uk_UA": "Японія",
@@ -3360,11 +3360,11 @@
         "it_IT": "Stati Uniti d'America",
         "ja_JP": "アメリカ",
         "ko_KR": "미국",
-        "no_NO": "USA",
+        "no_NO": "",
         "pl_PL": "Stany Zjednoczone",
         "pt_BR": "EUA",
         "ru_RU": "США",
-        "sv_SE": "USA",
+        "sv_SE": "",
         "th_TH": "สหรัฐอเมริกา",
         "tr_TR": "ABD",
         "uk_UA": "США",
@@ -3410,7 +3410,7 @@
         "it_IT": "",
         "ja_JP": "オーストラリア",
         "ko_KR": "호주",
-        "no_NO": "Australia",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "Austrália",
         "ru_RU": "Австралия",
@@ -3460,11 +3460,11 @@
         "it_IT": "Corea",
         "ja_JP": "韓国",
         "ko_KR": "한국",
-        "no_NO": "Korea",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "Coreia",
         "ru_RU": "Корея",
-        "sv_SE": "Korea",
+        "sv_SE": "",
         "th_TH": "เกาหลี",
         "tr_TR": "Kore",
         "uk_UA": "Корея",
@@ -3485,11 +3485,11 @@
         "it_IT": "",
         "ja_JP": "台湾",
         "ko_KR": "대만",
-        "no_NO": "Taiwan",
+        "no_NO": "",
         "pl_PL": "Tajwan",
         "pt_BR": "",
         "ru_RU": "Тайвань",
-        "sv_SE": "Taiwan",
+        "sv_SE": "",
         "th_TH": "ไต้หวัน",
         "tr_TR": "Tayvan",
         "uk_UA": "Тайвань",
@@ -3955,7 +3955,7 @@
         "el_GR": "Ζώνη Ώρας Συστήματος:",
         "en_US": "System Time Zone:",
         "es_ES": "Zona horaria del sistema:",
-        "fr_FR": "Fuseau horaire du système :",
+        "fr_FR": "Fuseau horaire du système\u00A0:",
         "he_IL": "אזור זמן מערכת:",
         "it_IT": "Fuso orario del sistema:",
         "ja_JP": "タイムゾーン:",
@@ -4135,11 +4135,11 @@
         "it_IT": "",
         "ja_JP": "ダミー",
         "ko_KR": "더미",
-        "no_NO": "Dummy",
+        "no_NO": "",
         "pl_PL": "Atrapa",
         "pt_BR": "Nenhuma",
         "ru_RU": "Без звука",
-        "sv_SE": "Dummy",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "Yapay",
         "uk_UA": "",
@@ -4163,8 +4163,8 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "OpenAL",
-        "sv_SE": "OpenAL",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -4188,8 +4188,8 @@
         "no_NO": "Lyd Inn/Ut",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "SoundIO",
-        "sv_SE": "SoundIO",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -4213,8 +4213,8 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "SDL2",
-        "sv_SE": "SDL2",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -4230,12 +4230,12 @@
         "el_GR": "Μικροδιορθώσεις",
         "en_US": "Hacks",
         "es_ES": "",
-        "fr_FR": "Hacks",
+        "fr_FR": "",
         "he_IL": "האצות",
         "it_IT": "Espedienti",
         "ja_JP": "ハック",
         "ko_KR": "핵",
-        "no_NO": "Hacks",
+        "no_NO": "",
         "pl_PL": "Hacki",
         "pt_BR": "",
         "ru_RU": "Хаки",
@@ -4314,7 +4314,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "4ГиБ",
-        "sv_SE": "4GiB",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "4Гб",
@@ -4339,7 +4339,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "6ГиБ",
-        "sv_SE": "6GiB",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "6Гб",
@@ -4364,7 +4364,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "8ГиБ",
-        "sv_SE": "8GiB",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "8Гб",
@@ -4389,7 +4389,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "12ГиБ",
-        "sv_SE": "12GiB",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "12Гб",
@@ -4585,11 +4585,11 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "2배",
-        "no_NO": "2x",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "2x",
-        "sv_SE": "2x",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -4610,11 +4610,11 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "4배",
-        "no_NO": "4x",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "4x",
-        "sv_SE": "4x",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -4635,11 +4635,11 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "8배",
-        "no_NO": "8x",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "8x",
-        "sv_SE": "8x",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -4660,11 +4660,11 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "16배",
-        "no_NO": "16x",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "16x",
-        "sv_SE": "16x",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -4760,11 +4760,11 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "2배(1440p/2160p)",
-        "no_NO": "2x (1440p/2160p)",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "2x (1440p/2160p)",
-        "sv_SE": "2x (1440p/2160p)",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -4785,11 +4785,11 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "3배(2160p/3240p)",
-        "no_NO": "3x (2160p/3240p)",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "3x (2160p/3240p)",
-        "sv_SE": "3x (2160p/3240p)",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -4863,8 +4863,8 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "4:3",
-        "sv_SE": "4:3",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -4888,8 +4888,8 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "16:9",
-        "sv_SE": "16:9",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -4913,8 +4913,8 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "16:10",
-        "sv_SE": "16:10",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -4938,8 +4938,8 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "21:9",
-        "sv_SE": "21:9",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -4960,11 +4960,11 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "32:9",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "32:9",
-        "sv_SE": "32:9",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -5060,7 +5060,7 @@
         "it_IT": "Log",
         "ja_JP": "ロギング",
         "ko_KR": "로그 기록",
-        "no_NO": "Logging",
+        "no_NO": "",
         "pl_PL": "Dziennik zdarzeń",
         "pt_BR": "Log",
         "ru_RU": "Журналирование",
@@ -5085,7 +5085,7 @@
         "it_IT": "Log",
         "ja_JP": "ロギング",
         "ko_KR": "로그 기록",
-        "no_NO": "Logging",
+        "no_NO": "",
         "pl_PL": "Dziennik zdarzeń",
         "pt_BR": "Log",
         "ru_RU": "Журналирование",
@@ -6113,8 +6113,8 @@
         "no_NO": "",
         "pl_PL": "Pro Kontroler",
         "pt_BR": "",
-        "ru_RU": "Pro Controller",
-        "sv_SE": "Pro Controller",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "โปรคอนโทรลเลอร์",
         "tr_TR": "Profesyonel Kumanda",
         "uk_UA": "Контролер Pro",
@@ -8088,8 +8088,8 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "Enter",
-        "sv_SE": "Enter",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8114,7 +8114,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Esc",
-        "sv_SE": "Escape",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "Esc",
         "uk_UA": "",
@@ -8163,8 +8163,8 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "Tab",
-        "sv_SE": "Tab",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8188,8 +8188,8 @@
         "no_NO": "Tilbaketast",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "Backspace",
-        "sv_SE": "Backspace",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "Geri tuşu",
         "uk_UA": "",
@@ -8213,8 +8213,8 @@
         "no_NO": "Sett inn",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "Insert",
-        "sv_SE": "Insert",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8238,8 +8238,8 @@
         "no_NO": "Slett",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "Delete",
-        "sv_SE": "Delete",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8263,8 +8263,8 @@
         "no_NO": "Side opp",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "Page Up",
-        "sv_SE": "Page Up",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8288,8 +8288,8 @@
         "no_NO": "Side ned",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "Page Down",
-        "sv_SE": "Page Down",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8313,8 +8313,8 @@
         "no_NO": "Hjem",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "Home",
-        "sv_SE": "Home",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8338,8 +8338,8 @@
         "no_NO": "Avslutt",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "End",
-        "sv_SE": "End",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8363,8 +8363,8 @@
         "no_NO": "Skiftelås",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "Caps Lock",
-        "sv_SE": "Caps Lock",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8388,8 +8388,8 @@
         "no_NO": "Rullelås",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "Scroll Lock",
-        "sv_SE": "Scroll Lock",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8413,8 +8413,8 @@
         "no_NO": "Skjermbilde",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "Print Screen",
-        "sv_SE": "Print Screen",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8438,8 +8438,8 @@
         "no_NO": "Stans midlertidig",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "Pause",
-        "sv_SE": "Pause",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8463,8 +8463,8 @@
         "no_NO": "Numerisk Lås",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "Num Lock",
-        "sv_SE": "Num Lock",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8514,7 +8514,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Блок цифр 0",
-        "sv_SE": "Keypad 0",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8539,7 +8539,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Блок цифр 1",
-        "sv_SE": "Keypad 1",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8564,7 +8564,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Блок цифр 2",
-        "sv_SE": "Keypad 2",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8589,7 +8589,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Блок цифр 3",
-        "sv_SE": "Keypad 3",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8614,7 +8614,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Блок цифр 4",
-        "sv_SE": "Keypad 4",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8639,7 +8639,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Блок цифр 5",
-        "sv_SE": "Keypad 5",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8664,7 +8664,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Блок цифр 6",
-        "sv_SE": "Keypad 6",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8689,7 +8689,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Блок цифр 7",
-        "sv_SE": "Keypad 7",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8714,7 +8714,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Блок цифр 8",
-        "sv_SE": "Keypad 8",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8739,7 +8739,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Блок цифр 9",
-        "sv_SE": "Keypad 9",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8889,7 +8889,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Enter (блок цифр)",
-        "sv_SE": "Keypad Enter",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -8913,7 +8913,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "0",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -8938,7 +8938,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "1",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -8963,7 +8963,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "2",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -8988,7 +8988,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "3",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -9013,7 +9013,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "4",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -9038,7 +9038,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "5",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -9063,7 +9063,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "6",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -9088,7 +9088,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "7",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -9113,7 +9113,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "8",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -9138,7 +9138,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "9",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -9163,7 +9163,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "~",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -9188,7 +9188,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "`",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -9213,7 +9213,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "-",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -9238,7 +9238,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "+",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -9263,7 +9263,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "[",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -9288,7 +9288,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "]",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -9313,7 +9313,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": ";",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -9363,7 +9363,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": ",",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -9388,7 +9388,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": ".",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -9413,7 +9413,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "/",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -9738,7 +9738,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "-",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -9763,7 +9763,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "+",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "4",
@@ -9789,7 +9789,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Кнопка меню",
-        "sv_SE": "Guide",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "Rehber",
         "uk_UA": "",
@@ -12438,7 +12438,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "{0}: {1}",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -14289,7 +14289,7 @@
         "pl_PL": "Seria Amiibo",
         "pt_BR": "Franquia Amiibo",
         "ru_RU": "Серия Amiibo",
-        "sv_SE": "Amiibo Series",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "Amiibo Serisi",
         "uk_UA": "Серія Amiibo",
@@ -15755,7 +15755,7 @@
         "el_GR": "",
         "en_US": "Aspect Ratio applied to the renderer window.\n\nOnly change this if you're using an aspect ratio mod for your game, otherwise the graphics will be stretched.\n\nLeave on 16:9 if unsure.",
         "es_ES": "Relación de aspecto aplicada a la ventana del renderizador.\n\nSolamente modificar esto si estás utilizando un mod de relación de aspecto para su juego, en cualquier otro caso los gráficos se estirarán.\n\nDejar en 16:9 si no sabe que hacer.",
-        "fr_FR": "Format d'affichage appliqué à la fenêtre du moteur de rendu.\n\nChangez cela uniquement si vous utilisez un mod changeant le format d'affichage pour votre jeu, sinon les graphismes seront étirés.\n\nLaissez sur 16:9 si vous n'êtes pas sûr.",
+        "fr_FR": "Format\u00A0d'affichage appliqué à la fenêtre du moteur de rendu.\n\nChangez cela uniquement si vous utilisez un mod changeant le format\u00A0d'affichage pour votre jeu, sinon les graphismes seront étirés.\n\nLaissez sur 16:9 si vous n'êtes pas sûr.",
         "he_IL": "",
         "it_IT": "Proporzioni dello schermo applicate alla finestra di renderizzazione.\n\nCambialo solo se stai usando una mod di proporzioni per il tuo gioco, altrimenti la grafica verrà allungata.\n\nLasciare il 16:9 se incerto.",
         "ja_JP": "レンダリングウインドウに適用するアスペクト比です.\n\nゲームにアスペクト比を変更する mod を使用している場合のみ変更してください.\n\nわからない場合は16:9のままにしておいてください.\n",
@@ -17428,23 +17428,23 @@
         "ar_SA": "الإصدار: {0}",
         "de_DE": "",
         "el_GR": "",
-        "en_US": "Version {0}",
-        "es_ES": "Versión {0}",
+        "en_US": "Version {0} - {1}",
+        "es_ES": "Versión {0} - {1}",
         "fr_FR": "",
-        "he_IL": "גרסה: {0}",
-        "it_IT": "Versione {0}",
-        "ja_JP": "バージョン {0}",
-        "ko_KR": "버전 {0}",
-        "no_NO": "Versjon {0}",
-        "pl_PL": "Wersja {0}",
-        "pt_BR": "Versão {0}",
-        "ru_RU": "Версия {0}",
-        "sv_SE": "Version {0}",
-        "th_TH": "เวอร์ชั่น {0}",
-        "tr_TR": "Sürüm {0}",
-        "uk_UA": "Версія {0}",
-        "zh_CN": "游戏更新的版本 {0}",
-        "zh_TW": "版本 {0}"
+        "he_IL": "גרסה {0} - {1}",
+        "it_IT": "Versione {0} - {1}",
+        "ja_JP": "バージョン {0} - {1}",
+        "ko_KR": "버전 {0} - {1}",
+        "no_NO": "Versjon {0} - {1}",
+        "pl_PL": "Wersja {0} - {1}",
+        "pt_BR": "Versão {0} - {1}",
+        "ru_RU": "Версия {0} - {1}",
+        "sv_SE": "",
+        "th_TH": "เวอร์ชั่น {0} - {1}",
+        "tr_TR": "Sürüm {0} - {1}",
+        "uk_UA": "Версія {0} - {1}",
+        "zh_CN": "游戏更新的版本 {0} - {1}",
+        "zh_TW": "版本 {0} - {1}"
       }
     },
     {
@@ -17664,7 +17664,7 @@
         "pl_PL": "",
         "pt_BR": "Ryujinx - Informação",
         "ru_RU": "Ryujinx - Информация",
-        "sv_SE": "Ryujinx - Info",
+        "sv_SE": "",
         "th_TH": "Ryujinx – ข้อมูล",
         "tr_TR": "Ryujinx - Bilgi",
         "uk_UA": "Ryujin x - Інформація",
@@ -18813,8 +18813,8 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "Amiibo",
-        "sv_SE": "Amiibo",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -19435,7 +19435,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "XCI 파일 트리머",
-        "no_NO": "XCI File Trimmer",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Уменьшение размера XCI файлов",
@@ -19639,7 +19639,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "{0:n0} Мб",
-        "sv_SE": "{0:n0} Mb",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "{0:n0} Мб",
@@ -20914,7 +20914,7 @@
         "pl_PL": "Głoś",
         "pt_BR": "",
         "ru_RU": "Громкость",
-        "sv_SE": "Vol",
+        "sv_SE": "",
         "th_TH": "ระดับเสียง",
         "tr_TR": "Ses",
         "uk_UA": "Гуч.",
@@ -21055,7 +21055,7 @@
         "el_GR": "Όνομα",
         "en_US": "Name",
         "es_ES": "Nombre",
-        "fr_FR": "Nom ",
+        "fr_FR": "Nom\u00A0",
         "he_IL": "שם",
         "it_IT": "Nome",
         "ja_JP": "名称",
@@ -21388,8 +21388,8 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "FSR",
-        "sv_SE": "FSR",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -21888,8 +21888,8 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "ldn_mitm",
-        "sv_SE": "ldn_mitm",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -21913,8 +21913,8 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "RyuLDN",
-        "sv_SE": "RyuLDN",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -22214,7 +22214,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Вертикальная синхронизация:",
-        "sv_SE": "VSync:",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Вертикальна синхронізація (VSync):",
@@ -22255,7 +22255,7 @@
         "el_GR": "",
         "en_US": "Switch",
         "es_ES": "",
-        "fr_FR": "Switch",
+        "fr_FR": "",
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
@@ -22264,7 +22264,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Консоль",
-        "sv_SE": "Switch",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -22598,4 +22598,4 @@
       }
     }
   ]
-}
+}

src/Ryujinx/Ryujinx.csproj

@@ -13,9 +13,13 @@
     <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
-  <Target Name="BuildValidationProj" BeforeTargets="BeforeRebuild">
-    <MSBuild Projects="..\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj" Targets="Rebuild">
-    </MSBuild>
+  <Target Name="BuildValidationProj" BeforeTargets="BeforeBuild">
+    <Message Text="Building Validation Project for $(TargetFramework)" Importance="high" Condition="'$(RuntimeIdentifier)' == ''" />
+    <Message Text="Building Validation Project for $(TargetFramework) with runtime $(RuntimeIdentifier)" Importance="high" Condition="'$(RuntimeIdentifier)' != ''" />
+    <Exec WorkingDirectory="..\Ryujinx.BuildValidationTasks\" Command="dotnet restore Ryujinx.BuildValidationTasks.csproj --force --ucr true" Condition="'$(RuntimeIdentifier)' == ''" />
+    <Exec WorkingDirectory="..\Ryujinx.BuildValidationTasks\" Command="dotnet restore Ryujinx.BuildValidationTasks.csproj --force --runtime $(RuntimeIdentifier)" Condition="'$(RuntimeIdentifier)' != ''" />
+    <MSBuild Projects="..\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj" Properties="Configuration=Debug" />
+    
   </Target>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="$([MSBuild]::IsOSPlatform('OSX'))">
@@ -139,10 +143,4 @@
   <ItemGroup>
     <AdditionalFiles Include="Assets\locales.json" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Update="UI\Views\Settings\SettingsHacksView.axaml.cs">
-      <DependentUpon>SettingsHacksView.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
 </Project>

src/Ryujinx/UI/ViewModels/BaseModel.cs

@@ -13,9 +13,8 @@ namespace Ryujinx.Ava.UI.ViewModels
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
         
-        protected void OnPropertiesChanged(string firstPropertyName, params ReadOnlySpan<string> propertyNames)
+        protected void OnPropertiesChanged(params ReadOnlySpan<string> propertyNames)
         {
-            OnPropertyChanged(firstPropertyName);
             foreach (var propertyName in propertyNames)
             {
                 OnPropertyChanged(propertyName);

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -1,7 +1,6 @@
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Threading;
-using Gommon;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.OpenAL;
 using Ryujinx.Audio.Backends.SDL2;
@@ -63,9 +62,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         private int _networkInterfaceIndex;
         private int _multiplayerModeIndex;
         private string _ldnPassphrase;
-        private string _ldnServer;
-
-        private bool _xc2MenuSoftlockFix = ConfigurationState.Instance.Hacks.Xc2MenuSoftlockFix;
+        private string _LdnServer;
 
         public int ResolutionScale
         {
@@ -165,7 +162,9 @@ namespace Ryujinx.Ava.UI.ViewModels
             get => _vSyncMode;
             set
             {
-                if (value is VSyncMode.Custom or VSyncMode.Switch or VSyncMode.Unbounded)
+                if (value == VSyncMode.Custom ||
+                    value == VSyncMode.Switch ||
+                    value == VSyncMode.Unbounded)
                 {
                     _vSyncMode = value;
                     OnPropertyChanged();
@@ -259,8 +258,6 @@ namespace Ryujinx.Ava.UI.ViewModels
         public bool UseHypervisor { get; set; }
         public bool DisableP2P { get; set; }
 
-        public bool ShowDirtyHacks => ConfigurationState.Instance.Hacks.ShowDirtyHacks;
-
         public string TimeZone { get; set; }
         public string ShaderDumpPath { get; set; }
 
@@ -277,17 +274,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public bool Xc2MenuSoftlockFixEnabled
-        {
-            get => _xc2MenuSoftlockFix;
-            set
-            {
-                _xc2MenuSoftlockFix = value;
-                
-                OnPropertyChanged();
-            }
-        }
-
         public int Language { get; set; }
         public int Region { get; set; }
         public int FsGlobalAccessLogMode { get; set; }
@@ -388,10 +374,10 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public string LdnServer
         {
-            get => _ldnServer;
+            get => _LdnServer;
             set
             {
-                _ldnServer = value;
+                _LdnServer = value;
                 OnPropertyChanged();
             }
         }
@@ -760,9 +746,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.Multiplayer.DisableP2p.Value = DisableP2P;
             config.Multiplayer.LdnPassphrase.Value = LdnPassphrase;
             config.Multiplayer.LdnServer.Value = LdnServer;
-            
-            // Dirty Hacks
-            config.Hacks.Xc2MenuSoftlockFix.Value = Xc2MenuSoftlockFixEnabled;
 
             config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
 
@@ -796,18 +779,5 @@ namespace Ryujinx.Ava.UI.ViewModels
             RevertIfNotSaved();
             CloseWindow?.Invoke();
         }
-
-        public static string Xc2MenuFixTooltip { get; } = Lambda.String(sb =>
-        {
-            sb.AppendLine(
-                "This fix applies a 2ms delay (via 'Thread.Sleep(2)') every time the game tries to read data from the emulated Switch filesystem.")
-                .AppendLine();
-            
-            sb.AppendLine("From the issue on GitHub:").AppendLine();
-            sb.Append(
-                "When clicking very fast from game main menu to 2nd submenu, " +
-                "there is a low chance that the game will softlock, " +
-                "the submenu won't show up, while background music is still there.");
-        });
     }
 }

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

@@ -1,48 +0,0 @@
-<UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsHacksView"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    mc:Ignorable="d"
-    x:DataType="viewModels:SettingsViewModel">
-    <Design.DataContext>
-        <viewModels:SettingsViewModel />
-    </Design.DataContext>
-    <ScrollViewer
-        Name="HacksPage"
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch"
-        HorizontalScrollBarVisibility="Disabled"
-        VerticalScrollBarVisibility="Auto">
-        <Border Classes="settings">
-            <StackPanel
-                Margin="10"
-                HorizontalAlignment="Center"
-                Orientation="Vertical"
-                Spacing="5">
-                <TextBlock
-                    HorizontalAlignment="Center"
-                    Classes="h1"
-                    Text="Dirty Hacks" />
-                <TextBlock
-                    Foreground="{DynamicResource SecondaryTextColor}"
-                    TextDecorations="Underline"
-                    Text="Game-specific hacks &amp; tricks to alleviate performance issues or crashing. May cause issues." />
-                <StackPanel
-                    Margin="0,10,0,0"
-                    Orientation="Horizontal"
-                    HorizontalAlignment="Center"
-                    ToolTip.Tip="{Binding Xc2MenuFixTooltip}">
-                    <CheckBox
-                        Margin="0"
-                        IsChecked="{Binding Xc2MenuSoftlockFixEnabled}"/>
-                    <TextBlock
-                        VerticalAlignment="Center"
-                        Text="Xenoblade Chronicles 2 Menu Softlock Fix" />
-                </StackPanel>
-            </StackPanel>
-        </Border>
-    </ScrollViewer>
-</UserControl>

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

@@ -1,17 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.UI.Common.Configuration;
-
-namespace Ryujinx.Ava.UI.Views.Settings
-{
-    public partial class SettingsHacksView : UserControl
-    {
-        public SettingsViewModel ViewModel;
-        
-        public SettingsHacksView()
-        {
-            InitializeComponent();
-        }
-    }
-}

src/Ryujinx/UI/Windows/SettingsWindow.axaml

@@ -37,7 +37,6 @@
             <settings:SettingsAudioView Name="AudioPage" />
             <settings:SettingsNetworkView Name="NetworkPage" />
             <settings:SettingsLoggingView Name="LoggingPage" />
-            <settings:SettingsHacksView Name="HacksPage" />
         </Grid>
         <ui:NavigationView
             Grid.Row="1"
@@ -92,11 +91,6 @@
                     Content="{ext:Locale SettingsTabLogging}"
                     Tag="LoggingPage"
                     IconSource="Document" />
-                <ui:NavigationViewItem
-                    IsVisible="{Binding ShowDirtyHacks}"
-                    Content="Dirty Hacks"
-                    Tag="HacksPage"
-                    IconSource="Code" />
             </ui:NavigationView.MenuItems>
             <ui:NavigationView.Styles>
                 <Style Selector="Grid#PlaceholderGrid">

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

@@ -86,10 +86,6 @@ namespace Ryujinx.Ava.UI.Windows
                     case nameof(LoggingPage):
                         NavPanel.Content = LoggingPage;
                         break;
-                    case nameof(HacksPage):
-                        HacksPage.ViewModel = ViewModel;
-                        NavPanel.Content = HacksPage;
-                        break;
                     default:
                         throw new NotImplementedException();
                 }