Revert "Validation Project v2" (#470 )

Reverts Ryubing/Ryujinx#444
Revert "misc: New Solution Format (.SLNX)"
2025-07-31 10:09:42 -06:00 · 2024-12-30 02:06:24 -06:00 · 2024-12-30 02:05:40 -06:00 · 2024-12-30 02:02:55 -06:00 · 2024-12-30 01:54:25 -06:00 · 2024-12-30 01:53:43 -06:00
9 changed files with 115 additions and 92 deletions
--- a/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs
@ -114,10 +114,10 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption
                }
            }

-            string usedCharacterStr = BitConverter.ToString(usedCharacter).Replace("-", "");
-            string variationStr = BitConverter.ToString(variation).Replace("-", "");
-            string amiiboIDStr = BitConverter.ToString(amiiboID).Replace("-", "");
-            string setIDStr = BitConverter.ToString(setID).Replace("-", "");
+            string usedCharacterStr = Convert.ToHexString(usedCharacter);
+            string variationStr = Convert.ToHexString(variation);
+            string amiiboIDStr = Convert.ToHexString(amiiboID);
+            string setIDStr = Convert.ToHexString(setID);
            string head = usedCharacterStr + variationStr;
            string tail = amiiboIDStr + setIDStr + "02";
            string finalID = head + tail;
@ -289,8 +289,8 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption

        private static void LogFinalData(byte[] titleId, byte[] appId, string head, string tail, string finalID, string nickName, DateTime initDateTime, DateTime writeDateTime, ushort settingsValue, ushort writeCounterValue, byte[] applicationAreas)
        {
-            Logger.Debug?.Print(LogClass.ServiceNfp, $"Title ID: 0x{BitConverter.ToString(titleId).Replace("-", "")}");
-            Logger.Debug?.Print(LogClass.ServiceNfp, $"Application Program ID: 0x{BitConverter.ToString(appId).Replace("-", "")}");
+            Logger.Debug?.Print(LogClass.ServiceNfp, $"Title ID: 0x{Convert.ToHexString(titleId)}");
+            Logger.Debug?.Print(LogClass.ServiceNfp, $"Application Program ID: 0x{Convert.ToHexString(appId)}");
            Logger.Debug?.Print(LogClass.ServiceNfp, $"Head: {head}");
            Logger.Debug?.Print(LogClass.ServiceNfp, $"Tail: {tail}");
            Logger.Debug?.Print(LogClass.ServiceNfp, $"Final ID: {finalID}");
--- a/src/Ryujinx/UI/ViewModels/SettingsHacksViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsHacksViewModel.cs
@ -0,0 +1,77 @@
+using Gommon;
+using Ryujinx.Ava.Utilities.Configuration;
+
+namespace Ryujinx.Ava.UI.ViewModels
+{
+    public class SettingsHacksViewModel : BaseModel
+    {
+        private readonly SettingsViewModel _baseViewModel;
+
+        public SettingsHacksViewModel() {}
+        
+        public SettingsHacksViewModel(SettingsViewModel settingsVm)
+        {
+            _baseViewModel = settingsVm;
+        }
+
+        private bool _xc2MenuSoftlockFix = ConfigurationState.Instance.Hacks.Xc2MenuSoftlockFix;
+        private bool _shaderTranslationThreadSleep = ConfigurationState.Instance.Hacks.EnableShaderTranslationDelay;
+        private int _shaderTranslationSleepDelay = ConfigurationState.Instance.Hacks.ShaderTranslationDelay;
+        
+        public bool Xc2MenuSoftlockFixEnabled
+        {
+            get => _xc2MenuSoftlockFix;
+            set
+            {
+                _xc2MenuSoftlockFix = value;
+                
+                OnPropertyChanged();
+            }
+        }
+        
+        public bool ShaderTranslationDelayEnabled
+        {
+            get => _shaderTranslationThreadSleep;
+            set
+            {
+                _shaderTranslationThreadSleep = value;
+                
+                OnPropertyChanged();
+            }
+        }
+
+        public string ShaderTranslationDelayTooltipText => $"Current value: {ShaderTranslationDelay}"; 
+        
+        public int ShaderTranslationDelay
+        {
+            get => _shaderTranslationSleepDelay;
+            set
+            {
+                _shaderTranslationSleepDelay = value;
+                
+                OnPropertiesChanged(nameof(ShaderTranslationDelay), nameof(ShaderTranslationDelayTooltipText));
+            }
+        }
+        
+        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.");
+        });
+
+        public static string ShaderTranslationDelayTooltip { get; } = Lambda.String(sb =>
+        {
+            sb.AppendLine("This hack applies the delay you specify every time shaders are attempted to be translated.")
+                .AppendLine();
+
+            sb.Append("Configurable via slider, only when this option is enabled.");
+        });
+    }
+}
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@ -65,9 +65,7 @@ namespace Ryujinx.Ava.UI.ViewModels
        private string _ldnPassphrase;
        private string _ldnServer;

-        private bool _xc2MenuSoftlockFix = ConfigurationState.Instance.Hacks.Xc2MenuSoftlockFix;
-        private bool _shaderTranslationThreadSleep = ConfigurationState.Instance.Hacks.EnableShaderCompilationThreadSleep;
-        private int _shaderTranslationSleepDelay = ConfigurationState.Instance.Hacks.ShaderCompilationThreadSleepDelay;
+        public SettingsHacksViewModel DirtyHacks { get; }

        public int ResolutionScale
        {
@ -279,41 +277,6 @@ namespace Ryujinx.Ava.UI.ViewModels
            }
        }

-        public bool Xc2MenuSoftlockFixEnabled
-        {
-            get => _xc2MenuSoftlockFix;
-            set
-            {
-                _xc2MenuSoftlockFix = value;
-                
-                OnPropertyChanged();
-            }
-        }
-        
-        public bool ShaderTranslationDelayEnabled
-        {
-            get => _shaderTranslationThreadSleep;
-            set
-            {
-                _shaderTranslationThreadSleep = value;
-                
-                OnPropertyChanged();
-            }
-        }
-
-        public string ShaderTranslationDelayTooltipText => $"Current value: {ShaderTranslationDelay}"; 
-        
-        public int ShaderTranslationDelay
-        {
-            get => _shaderTranslationSleepDelay;
-            set
-            {
-                _shaderTranslationSleepDelay = value;
-                
-                OnPropertiesChanged(nameof(ShaderTranslationDelay), nameof(ShaderTranslationDelayTooltipText));
-            }
-        }
-
        public int Language { get; set; }
        public int Region { get; set; }
        public int FsGlobalAccessLogMode { get; set; }
@ -426,9 +389,12 @@ namespace Ryujinx.Ava.UI.ViewModels
        {
            _virtualFileSystem = virtualFileSystem;
            _contentManager = contentManager;
+            
            if (Program.PreviewerDetached)
            {
                Task.Run(LoadTimeZones);
+                
+                DirtyHacks = new SettingsHacksViewModel(this);
            }
        }

@ -448,6 +414,8 @@ namespace Ryujinx.Ava.UI.ViewModels
            {
                Task.Run(LoadAvailableGpus);
                LoadCurrentConfiguration();
+
+                DirtyHacks = new SettingsHacksViewModel(this);
            }
        }

@ -662,9 +630,9 @@ namespace Ryujinx.Ava.UI.ViewModels
            OpenglDebugLevel = (int)config.Logger.GraphicsDebugLevel.Value;

            MultiplayerModeIndex = (int)config.Multiplayer.Mode.Value;
-            DisableP2P = config.Multiplayer.DisableP2p.Value;
-            LdnPassphrase = config.Multiplayer.LdnPassphrase.Value;
-            LdnServer = config.Multiplayer.LdnServer.Value;
+            DisableP2P = config.Multiplayer.DisableP2p;
+            LdnPassphrase = config.Multiplayer.LdnPassphrase;
+            LdnServer = config.Multiplayer.LdnServer;
        }

        public void SaveSettings()
@ -788,9 +756,9 @@ namespace Ryujinx.Ava.UI.ViewModels
            config.Multiplayer.LdnServer.Value = LdnServer;
            
            // Dirty Hacks
-            config.Hacks.Xc2MenuSoftlockFix.Value = Xc2MenuSoftlockFixEnabled;
-            config.Hacks.EnableShaderCompilationThreadSleep.Value = ShaderTranslationDelayEnabled;
-            config.Hacks.ShaderCompilationThreadSleepDelay.Value = ShaderTranslationDelay;
+            config.Hacks.Xc2MenuSoftlockFix.Value = DirtyHacks.Xc2MenuSoftlockFixEnabled;
+            config.Hacks.EnableShaderTranslationDelay.Value = DirtyHacks.ShaderTranslationDelayEnabled;
+            config.Hacks.ShaderTranslationDelay.Value = DirtyHacks.ShaderTranslationDelay;

            config.ToFileFormat().SaveConfig(Program.ConfigurationPath);

@ -824,24 +792,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.");
-        });
-        
-        public static string ShaderTranslationDelayTooltip { get; } = Lambda.String(sb =>
-        {
-            sb.Append(
-                "This hack applies the delay you specify every time shaders are attempted to be translated.");
-        });
    }
 }
--- a/src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml
@ -34,10 +34,10 @@
                    Margin="0,10,0,0"
                    Orientation="Horizontal"
                    HorizontalAlignment="Center"
-                    ToolTip.Tip="{Binding Xc2MenuFixTooltip}">
+                    ToolTip.Tip="{Binding DirtyHacks.Xc2MenuFixTooltip}">
                    <CheckBox
                        Margin="0"
-                        IsChecked="{Binding Xc2MenuSoftlockFixEnabled}"/>
+                        IsChecked="{Binding DirtyHacks.Xc2MenuSoftlockFixEnabled}"/>
                    <TextBlock
                        VerticalAlignment="Center"
                        Text="Xenoblade Chronicles 2 Menu Softlock Fix" />
@ -47,16 +47,17 @@
                    Margin="0,10,0,0"
                    Orientation="Horizontal"
                    HorizontalAlignment="Center"
-                    ToolTip.Tip="{Binding ShaderTranslationDelayTooltip}">
+                    ToolTip.Tip="{Binding DirtyHacks.ShaderTranslationDelayTooltip}">
                    <CheckBox
                        Margin="0"
-                        IsChecked="{Binding ShaderTranslationDelayEnabled}"/>
+                        IsChecked="{Binding DirtyHacks.ShaderTranslationDelayEnabled}"/>
                    <TextBlock VerticalAlignment="Center"
                               Text="Arbitrary Delay on Shader Translation"/>
                </StackPanel>
-                <Slider HorizontalAlignment="Center" 
-                        Value="{Binding ShaderTranslationDelay}"
-                        ToolTip.Tip="{Binding ShaderTranslationDelayTooltipText}"
+                <Slider IsVisible="{Binding DirtyHacks.ShaderTranslationDelayEnabled}"
+                        HorizontalAlignment="Center" 
+                        Value="{Binding DirtyHacks.ShaderTranslationDelay}"
+                        ToolTip.Tip="{Binding DirtyHacks.ShaderTranslationDelayTooltipText}"
                        Width="175"
                        Margin="0,-3,0,0"
                        Height="32"
--- a/src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml.cs
@ -1,13 +1,9 @@
 using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Ryujinx.Ava.UI.ViewModels;

 namespace Ryujinx.Ava.UI.Views.Settings
 {
    public partial class SettingsHacksView : UserControl
    {
-        public SettingsViewModel ViewModel;
-        
        public SettingsHacksView()
        {
            InitializeComponent();
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
@ -170,7 +170,7 @@ namespace Ryujinx.Ava.UI.Windows
            {
                var ldnGameDataArray = e.LdnData.ToList();
                ViewModel.LdnData.Clear();
-                foreach (var application in ViewModel.Applications)
+                foreach (var application in ViewModel.Applications.Where(it => it.HasControlHolder))
                {
                    ref var controlHolder = ref application.ControlHolder.Value;
                    
--- a/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
@ -87,7 +87,7 @@ namespace Ryujinx.Ava.UI.Windows
                        NavPanel.Content = LoggingPage;
                        break;
                    case nameof(HacksPage):
-                        HacksPage.ViewModel = ViewModel;
+                        HacksPage.DataContext = ViewModel;
                        NavPanel.Content = HacksPage;
                        break;
                    default:
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
+++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
@ -758,8 +758,8 @@ namespace Ryujinx.Ava.Utilities.Configuration
                
                var shaderCompilationThreadSleep = hacks.FirstOrDefault(it => 
                    it.Hack == DirtyHacks.ShaderCompilationThreadSleep);
-                Hacks.EnableShaderCompilationThreadSleep.Value = shaderCompilationThreadSleep != null;
-                Hacks.ShaderCompilationThreadSleepDelay.Value = shaderCompilationThreadSleep?.Value ?? 0;
+                Hacks.EnableShaderTranslationDelay.Value = shaderCompilationThreadSleep != null;
+                Hacks.ShaderTranslationDelay.Value = shaderCompilationThreadSleep?.Value ?? 0;
            }

            if (configurationFileUpdated)
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs
+++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs
@ -629,18 +629,18 @@ namespace Ryujinx.Ava.Utilities.Configuration
            
            public ReactiveObject<bool> Xc2MenuSoftlockFix { get; private set; }
            
-            public ReactiveObject<bool> EnableShaderCompilationThreadSleep { get; private set; }
+            public ReactiveObject<bool> EnableShaderTranslationDelay { get; private set; }
            
-            public ReactiveObject<int> ShaderCompilationThreadSleepDelay { get; private set; }
+            public ReactiveObject<int> ShaderTranslationDelay { get; private set; }

            public HacksSection()
            {
                ShowDirtyHacks = new ReactiveObject<bool>();
                Xc2MenuSoftlockFix = new ReactiveObject<bool>();
                Xc2MenuSoftlockFix.Event += HackChanged;
-                EnableShaderCompilationThreadSleep = new ReactiveObject<bool>();
-                EnableShaderCompilationThreadSleep.Event += HackChanged;
-                ShaderCompilationThreadSleepDelay = new ReactiveObject<int>();
+                EnableShaderTranslationDelay = new ReactiveObject<bool>();
+                EnableShaderTranslationDelay.Event += HackChanged;
+                ShaderTranslationDelay = new ReactiveObject<int>();
            }

            private void HackChanged(object sender, ReactiveEventArgs<bool> rxe)
@ -651,7 +651,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
                if (newHacks != _lastHackCollection)
                {
                    RyuLogger.Info?.Print(LogClass.Configuration, 
-                        $"EnabledDirtyHacks set to: [{_lastHackCollection}]", "LogValueChange");
+                        $"EnabledDirtyHacks set to: [{newHacks}]", "LogValueChange");

                    _lastHackCollection = newHacks;
                }
@ -668,8 +668,8 @@ namespace Ryujinx.Ava.Utilities.Configuration
                    if (Xc2MenuSoftlockFix)
                        Apply(DirtyHacks.Xc2MenuSoftlockFix);
                    
-                    if (EnableShaderCompilationThreadSleep)
-                        Apply(DirtyHacks.ShaderCompilationThreadSleep, ShaderCompilationThreadSleepDelay);
+                    if (EnableShaderTranslationDelay)
+                        Apply(DirtyHacks.ShaderCompilationThreadSleep, ShaderTranslationDelay);
                    
                    return enabledHacks.ToArray();
Author	SHA1	Message	Date
Evan Husted	c88518bce2	Revert "Validation Project v2" (#470 ) Reverts Ryubing/Ryujinx#444	2024-12-30 02:06:24 -06:00
Evan Husted	a3888ed7cf	Revert "misc: New Solution Format (.SLNX)" This reverts commit `7cbbd02973`.	2024-12-30 02:05:40 -06:00
Evan Husted	7cbbd02973	misc: New Solution Format (.SLNX)	2024-12-30 02:02:55 -06:00
LotP1	b2e1e553e4	Validation Project v2 (#444 ) Refactor of the Validation System for more ease of use in the future. The project now builds a standalone executable and executes it before the main project is built or published. Since it is now a standalone executable we are also able to use .NET Core features as we are no longer locked to netstandard. The project currently includes 1 task, LocalesValidationTask, that will check if the locales.json file has any of the following issues: The json is invalid. The json has locales with missing languages. The json has locales with langauges that are just duplicates of the en_US field. If the project is built or published locally it will also fix any missing languages or duplicate fields. --------- Co-authored-by: Evan Husted <gr33m11@gmail.com> Co-authored-by: Evan Husted <greem@greemdev.net>	2024-12-30 01:54:25 -06:00
Marco Carvalho	699e1962b1	Prefer 'Convert.ToHexString' over call chains based on 'BitConverter.ToString' (#428 ) [ci-skip] Co-authored-by: Evan Husted <greem@greemdev.net>	2024-12-30 01:53:43 -06:00
WilliamWsyHK	e486b902b1	Skip processing application for LDN if it does not have control holder (#460 ) [ci-skip]	2024-12-30 01:53:06 -06:00
Evan Husted	0ab5b41c4b	misc: Move dirty hack related stuff into a separate viewmodel, only show slider when translation delay is enabled.	2024-12-30 01:33:07 -06:00