Merge c21aa86a7b into 069f630776

This changes the controller LED color. Now I need to add the option to change it in the settings

.github/labeler.yml

@@ -18,10 +18,6 @@ gpu:
 - changed-files:
   - any-glob-to-any-file: ['src/Ryujinx.Graphics.Vulkan/**', 'src/Spv.Generator/**']
 
-'graphics-backend:metal':
-  - changed-files:
-      - any-glob-to-any-file: ['src/Ryujinx.Graphics.Metal/**', 'src/Ryujinx.Graphics.Metal.SharpMetalExtensions/**']
-
 gui:
 - changed-files:
   - any-glob-to-any-file: ['src/Ryujinx/**', 'src/Ryujinx.UI.Common/**', 'src/Ryujinx.UI.LocaleGenerator/**']

README.md

@@ -54,13 +54,12 @@ failing to meet this requirement may result in a poor gameplay experience or une
 
 ## Latest build
 
-Stable builds are made every so often, based on the `master` branch, that then gets put into the releases you know and love.
+Stable builds are made every so often onto a separate "release" branch that then gets put into the releases you know and love.
 These stable builds exist so that the end user can get a more **enjoyable and stable experience**.
-They are released every month or so, to ensure consistent updates, while not being an annoying amount of individual updates to download over the course of that month.
 
 You can find the latest stable release [here](https://github.com/GreemDev/Ryujinx/releases/latest).
 
-Canary builds are compiled automatically for each commit on the `master` branch.
+Canary builds are compiled automatically for each commit on the master branch.
 While we strive to ensure optimal stability and performance prior to pushing an update, these builds **may be unstable or completely broken**.
 These canary builds are only recommended for experienced users.
 
@@ -110,7 +109,7 @@ If you are planning to contribute or just want to learn more about this project
 - **Configuration**
 
   The emulator has settings for enabling or disabling some logging, remapping controllers, and more.
-  You can configure all of them through the graphical interface or manually through the config file, `Config.json`, found in the Ryujinx data folder which can be accessed by clicking `Open Ryujinx Folder` under the File menu in the GUI.
+  You can configure all of them through the graphical interface or manually through the config file, `Config.json`, found in the user folder which can be accessed by clicking `Open Ryujinx Folder` under the File menu in the GUI.
 
 ## License
 

src/Ryujinx.Common/Configuration/Hid/Controller/GenericControllerInputConfig.cs

@@ -78,10 +78,5 @@ namespace Ryujinx.Common.Configuration.Hid.Controller
         /// Controller Rumble Settings
         /// </summary>
         public RumbleConfigController Rumble { get; set; }
-        
-        /// <summary>
-        /// Controller LED Settings
-        /// </summary>
-        public LedConfigController Led { get; set; }
     }
 }

src/Ryujinx.Common/Configuration/Hid/Controller/LedConfigController.cs

@@ -1,15 +0,0 @@
-namespace Ryujinx.Common.Configuration.Hid.Controller
-{
-    public class LedConfigController
-    {
-        /// <summary>
-        ///     Packed RGB int of the color
-        /// </summary>
-        public uint LedColor { get; set; }
-
-        /// <summary>
-        /// Enable LED color changing by the emulator
-        /// </summary>
-        public bool EnableLed { get; set; }
-    }
-}

src/Ryujinx.Common/Helpers/RunningPlatform.cs

@@ -1,23 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-// ReSharper disable MemberCanBePrivate.Global
-// ReSharper disable InconsistentNaming
-
-namespace Ryujinx.Common.Helper
-{
-    public static class RunningPlatform
-    {
-        public static bool IsMacOS => OperatingSystem.IsMacOS();
-        public static bool IsWindows => OperatingSystem.IsWindows();
-        public static bool IsLinux => OperatingSystem.IsLinux();
-
-        public static bool IsIntelMac => IsMacOS && RuntimeInformation.OSArchitecture is Architecture.X64;
-        public static bool IsArmMac => IsMacOS && RuntimeInformation.OSArchitecture is Architecture.Arm64;
-        
-        public static bool IsX64Windows => IsWindows && (RuntimeInformation.OSArchitecture is Architecture.X64);
-        public static bool IsArmWindows => IsWindows && (RuntimeInformation.OSArchitecture is Architecture.Arm64);
-        
-        public static bool IsX64Linux => IsLinux && (RuntimeInformation.OSArchitecture is Architecture.X64);
-        public static bool IsArmLinux => IsLinux && (RuntimeInformation.OSArchitecture is Architecture.Arm64);
-    }
-}

src/Ryujinx.Common/TitleIDs.cs

@@ -1,6 +1,5 @@
 using Gommon;
 using Ryujinx.Common.Configuration;
-using Ryujinx.Common.Helper;
 using System;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -9,7 +8,7 @@ namespace Ryujinx.Common
 {
     public static class TitleIDs
     {
-        public static ReactiveObject<Optional<string>> CurrentApplication { get; } = new();
+        public static ReactiveObject<Optional<string>> CurrentApplication { get; set; } = new();
         
         public static GraphicsBackend SelectGraphicsBackend(string titleId, GraphicsBackend currentBackend)
         {
@@ -22,7 +21,7 @@ namespace Ryujinx.Common
                     return currentBackend;
             }
 
-            if (!RunningPlatform.IsArmMac)
+            if (!(OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture is Architecture.Arm64))
                 return GraphicsBackend.Vulkan;
 
             return GreatMetalTitles.ContainsIgnoreCase(titleId) ? GraphicsBackend.Metal : GraphicsBackend.Vulkan;

src/Ryujinx.HLE/FileSystem/ContentManager.cs

@@ -710,8 +710,9 @@ namespace Ryujinx.HLE.FileSystem
                         {
                             updateNcasItem.Add((nca.Header.ContentType, entry.FullName));
                         }
-                        else if (updateNcas.TryAdd(nca.Header.TitleId, new List<(NcaContentType, string)>()))
+                        else
                         {
+                            updateNcas.Add(nca.Header.TitleId, new List<(NcaContentType, string)>());
                             updateNcas[nca.Header.TitleId].Add((nca.Header.ContentType, entry.FullName));
                         }
                     }
@@ -897,8 +898,9 @@ namespace Ryujinx.HLE.FileSystem
                     {
                         updateNcasItem.Add((nca.Header.ContentType, entry.FullPath));
                     }
-                    else if (updateNcas.TryAdd(nca.Header.TitleId, new List<(NcaContentType, string)>()))
+                    else
                     {
+                        updateNcas.Add(nca.Header.TitleId, new List<(NcaContentType, string)>());
                         updateNcas[nca.Header.TitleId].Add((nca.Header.ContentType, entry.FullPath));
                     }
 

src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs

@@ -659,7 +659,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati
 
                 if (string.IsNullOrWhiteSpace(filePath))
                 {
-                    throw new InvalidSystemResourceException("JIT (010000000000003B) system title not found! The JIT will not work, provide the system archive to fix this error. (See https://github.com/Ryubing/Ryujinx#requirements for more information)");
+                    throw new InvalidSystemResourceException("JIT (010000000000003B) system title not found! The JIT will not work, provide the system archive to fix this error. (See https://github.com/GreemDev/Ryujinx#requirements for more information)");
                 }
 
                 context.Device.LoadNca(filePath);

src/Ryujinx.HLE/HOS/Services/Sdb/Pl/SharedFontManager.cs

@@ -105,7 +105,7 @@ namespace Ryujinx.HLE.HOS.Services.Sdb.Pl
                                 titleName = "Unknown";
                             }
 
-                            throw new InvalidSystemResourceException($"{titleName} ({fontTitle:x8}) system title not found! This font will not work, provide the system archive to fix this error. (See https://github.com/Ryubing/Ryujinx#requirements for more information)");
+                            throw new InvalidSystemResourceException($"{titleName} ({fontTitle:x8}) system title not found! This font will not work, provide the system archive to fix this error. (See https://github.com/GreemDev/Ryujinx#requirements for more information)");
                         }
                     }
                     else

src/Ryujinx.HLE/PerformanceStatistics.cs

@@ -161,20 +161,5 @@ namespace Ryujinx.HLE
         {
             return 1000 / _frameRate[FrameTypeGame];
         }
-        
-        public string FormatGameFrameRate()
-        {
-            double frameRate = GetGameFrameRate();
-            double frameTime = GetGameFrameTime();
-
-            return $"{frameRate:00.00} FPS ({frameTime:00.00}ms)";
-        }
-        
-        public string FormatFifoPercent()
-        {
-            double fifoPercent = GetFifoPercent();
-
-            return $"FIFO: {fifoPercent:00.00}%";
-        }
     }
 }

src/Ryujinx.HLE/Switch.cs

@@ -34,8 +34,8 @@ namespace Ryujinx.HLE
 
         public int CpuCoresCount = 4; //Switch 1 has 4 cores
 
-        public VSyncMode VSyncMode { get; set; }
+        public VSyncMode VSyncMode { get; set; } = VSyncMode.Switch;
-        public bool CustomVSyncIntervalEnabled { get; set; }
+        public bool CustomVSyncIntervalEnabled { get; set; } = false;
         public int CustomVSyncInterval { get; set; }
 
         public long TargetVSyncInterval { get; set; } = 60;

src/Ryujinx.Input.SDL2/SDL2Gamepad.cs

@@ -1,7 +1,6 @@
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Controller;
 using Ryujinx.Common.Logging;
-using SDL2;
 using System;
 using System.Collections.Generic;
 using System.Numerics;
@@ -87,6 +86,11 @@ namespace Ryujinx.Input.SDL2
             Features = GetFeaturesFlag();
             _triggerThreshold = 0.0f;
 
+            if (SDL_GameControllerHasLED(_gamepadHandle) == SDL_bool.SDL_TRUE)
+            {
+                SetLedColor("FFE3B5");
+            }
+            
             // Enable motion tracking
             if (Features.HasFlag(GamepadFeaturesFlag.Motion))
             {
@@ -102,6 +106,16 @@ namespace Ryujinx.Input.SDL2
             }
         }
 
+        public void SetLedColor(string hex)
+        {
+            ulong LEDcolor = Convert.ToUInt64(hex, 16);
+            byte red = (byte)((LEDcolor >> 16) % 256);
+            byte green = (byte)((LEDcolor >> 8) % 256);
+            byte blue = (byte)(LEDcolor % 256);
+                
+            SDL_GameControllerSetLED(_gamepadHandle, red, green, blue);
+        }
+
         private GamepadFeaturesFlag GetFeaturesFlag()
         {
             GamepadFeaturesFlag result = GamepadFeaturesFlag.None;
@@ -119,11 +133,6 @@ namespace Ryujinx.Input.SDL2
                 result |= GamepadFeaturesFlag.Rumble;
             }
 
-            if (SDL_GameControllerHasLED(_gamepadHandle) == SDL_bool.SDL_TRUE)
-            {
-                result |= GamepadFeaturesFlag.Led;
-            }
-
             return result;
         }
 

src/Ryujinx.Input/GamepadFeaturesFlag.cs

@@ -24,10 +24,5 @@ namespace Ryujinx.Input
         /// <remarks>Also named sixaxis</remarks>
         /// </summary>
         Motion,
-        
-        /// <summary>
-        ///     The LED on the back of modern PlayStation controllers (DualSense &amp; DualShock 4).
-        /// </summary>
-        Led,
     }
 }

src/Ryujinx/AppHost.cs

@@ -1151,8 +1151,8 @@ namespace Ryujinx.Ava
                 LocaleManager.Instance[LocaleKeys.VolumeShort] + $": {(int)(Device.GetVolume() * 100)}%",
                 dockedMode,
                 ConfigurationState.Instance.Graphics.AspectRatio.Value.ToText(),
-                Device.Statistics.FormatGameFrameRate(),
+                $"{Device.Statistics.GetGameFrameRate():00.00} FPS ({Device.Statistics.GetGameFrameTime():00.00} ms)",
-                Device.Statistics.FormatFifoPercent(),
+                $"FIFO: {Device.Statistics.GetFifoPercent():00.00} %",
                 _displayCount));
         }
 

src/Ryujinx/Assets/locales.json

@@ -7622,31 +7622,6 @@
         "zh_TW": "陀螺儀無感帶:"
       }
     },
-    {
-      "ID": "ControllerSettingsLedColor",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Custom LED",
-        "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": "ControllerSettingsSave",
       "Translations": {

src/Ryujinx/Headless/Options.cs

@@ -149,7 +149,7 @@ namespace Ryujinx.Headless
                 IgnoreMissingServices = configurationState.System.IgnoreMissingServices;
             
             if (NeedsOverride(nameof(IgnoreControllerApplet)))
-                IgnoreControllerApplet = configurationState.System.IgnoreApplet;
+                IgnoreControllerApplet = configurationState.IgnoreApplet;
             
             return;
             

src/Ryujinx/Program.cs

@@ -47,9 +47,9 @@ namespace Ryujinx.Ava
         {
             Version = ReleaseInformation.Version;
             
-            if (OperatingSystem.IsWindows() && !OperatingSystem.IsWindowsVersionAtLeast(10, 0, 19041))
+            if (OperatingSystem.IsWindows() && !OperatingSystem.IsWindowsVersionAtLeast(10, 0, 17134))
             {
-                _ = MessageBoxA(nint.Zero, "You are running an outdated version of Windows.\n\nRyujinx supports Windows 10 version 20H1 and newer.\n", $"Ryujinx {Version}", MbIconwarning);
+                _ = MessageBoxA(nint.Zero, "You are running an outdated version of Windows.\n\nRyujinx supports Windows 10 version 1803 and newer.\n", $"Ryujinx {Version}", MbIconwarning);
             }
 
             PreviewerDetached = true;

src/Ryujinx/UI/Applet/AvaHostUIHandler.cs

@@ -6,6 +6,7 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.ViewModels.Input;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
@@ -41,7 +42,7 @@ namespace Ryujinx.Ava.UI.Applet
 
             bool okPressed = false;
 
-            if (ConfigurationState.Instance.System.IgnoreApplet)
+            if (ConfigurationState.Instance.IgnoreApplet)
                 return false;
 
             Dispatcher.UIThread.InvokeAsync(async () =>

src/Ryujinx/UI/Models/Input/GamepadInputConfig.cs

@@ -1,4 +1,3 @@
-using Avalonia.Media;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Controller;
@@ -388,30 +387,6 @@ namespace Ryujinx.Ava.UI.Models.Input
             }
         }
 
-        private bool _enableLedChanging;
-
-        public bool EnableLedChanging
-        {
-            get => _enableLedChanging;
-            set
-            {
-                _enableLedChanging = value;
-                OnPropertyChanged();
-            }
-        }
-        
-        private Color _ledColor;
-
-        public Color LedColor
-        {
-            get => _ledColor;
-            set
-            {
-                _ledColor = value;
-                OnPropertyChanged();
-            }
-        }
-
         private bool _enableMotion;
         public bool EnableMotion
         {
@@ -508,23 +483,12 @@ namespace Ryujinx.Ava.UI.Models.Input
                     WeakRumble = controllerInput.Rumble.WeakRumble;
                     StrongRumble = controllerInput.Rumble.StrongRumble;
                 }
-                
-                if (controllerInput.Led != null)
-                {
-                    EnableLedChanging = controllerInput.Led.EnableLed;
-                    uint rawColor = controllerInput.Led.LedColor;
-                    byte alpha = (byte)(rawColor >> 24);
-                    byte red = (byte)(rawColor >> 16);
-                    byte green = (byte)(rawColor >> 8);
-                    byte blue = (byte)(rawColor % 256);
-                    LedColor = new Color(alpha, red, green, blue);
-                }
             }
         }
 
         public InputConfig GetConfig()
         {
-            StandardControllerInputConfig config = new()
+            var config = new StandardControllerInputConfig
             {
                 Id = Id,
                 Backend = InputBackendType.GamepadSDL2,
@@ -576,11 +540,6 @@ namespace Ryujinx.Ava.UI.Models.Input
                     WeakRumble = WeakRumble,
                     StrongRumble = StrongRumble,
                 },
-                Led = new LedConfigController
-                {
-                    EnableLed = EnableLedChanging,
-                    LedColor = LedColor.ToUInt32()
-                },
                 Version = InputConfig.CurrentVersion,
                 DeadzoneLeft = DeadzoneLeft,
                 DeadzoneRight = DeadzoneRight,

src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs

@@ -432,7 +432,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         {
             try
             {
-                HttpResponseMessage response = await _httpClient.SendAsync(new HttpRequestMessage(HttpMethod.Head, "https://raw.githubusercontent.com/Ryubing/Ryujinx/refs/heads/master/assets/amiibo/Amiibo.json"));
+                HttpResponseMessage response = await _httpClient.SendAsync(new HttpRequestMessage(HttpMethod.Head, "https://raw.githubusercontent.com/GreemDev/Ryujinx/refs/heads/master/assets/amiibo/Amiibo.json"));
 
                 if (response.IsSuccessStatusCode)
                 {
@@ -451,7 +451,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         {
             try
             {
-                HttpResponseMessage response = await _httpClient.GetAsync($"https://raw.githubusercontent.com/Ryubing/Ryujinx/refs/heads/master/assets/amiibo/Amiibo.json");
+                HttpResponseMessage response = await _httpClient.GetAsync($"https://raw.githubusercontent.com/GreemDev/Ryujinx/refs/heads/master/assets/amiibo/Amiibo.json");
 
                 if (response.IsSuccessStatusCode)
                 {

src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs

@@ -37,7 +37,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         [ObservableProperty] private SvgImage _image;
 
-        public InputViewModel ParentModel { get; }
+        public readonly InputViewModel ParentModel;
 
         public ControllerInputViewModel(InputViewModel model, GamepadInputConfig config)
         {

src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs

@@ -69,9 +69,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         public bool IsRight { get; set; }
         public bool IsLeft { get; set; }
 
-        public bool HasLed => false; //temporary
-            //SelectedGamepad.Features.HasFlag(GamepadFeaturesFlag.Led);
-
         public bool IsModified { get; set; }
         public event Action NotifyChangesEvent;
 

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -488,6 +488,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             EnableDiscordIntegration = config.EnableDiscordIntegration;
             CheckUpdatesOnStart = config.CheckUpdatesOnStart;
             ShowConfirmExit = config.ShowConfirmExit;
+            IgnoreApplet = config.IgnoreApplet;
             RememberWindowState = config.RememberWindowState;
             ShowTitleBar = config.ShowTitleBar;
             HideCursor = (int)config.HideCursor.Value;
@@ -531,7 +532,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             EnableFsIntegrityChecks = config.System.EnableFsIntegrityChecks;
             DramSize = config.System.DramSize;
             IgnoreMissingServices = config.System.IgnoreMissingServices;
-            IgnoreApplet = config.System.IgnoreApplet;
 
             // CPU
             EnablePptc = config.System.EnablePtc;
@@ -591,6 +591,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
             config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart;
             config.ShowConfirmExit.Value = ShowConfirmExit;
+            config.IgnoreApplet.Value = IgnoreApplet;
             config.RememberWindowState.Value = RememberWindowState;
             config.ShowTitleBar.Value = ShowTitleBar;
             config.HideCursor.Value = (HideCursorMode)HideCursor;
@@ -631,10 +632,12 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
 
             config.System.SystemTimeOffset.Value = Convert.ToInt64((CurrentDate.ToUnixTimeSeconds() + CurrentTime.TotalSeconds) - DateTimeOffset.Now.ToUnixTimeSeconds());
+            config.Graphics.VSyncMode.Value = VSyncMode;
+            config.Graphics.EnableCustomVSyncInterval.Value = EnableCustomVSyncInterval;
+            config.Graphics.CustomVSyncInterval.Value = CustomVSyncInterval;
             config.System.EnableFsIntegrityChecks.Value = EnableFsIntegrityChecks;
             config.System.DramSize.Value = DramSize;
             config.System.IgnoreMissingServices.Value = IgnoreMissingServices;
-            config.System.IgnoreApplet.Value = IgnoreApplet;
 
             // CPU
             config.System.EnablePtc.Value = EnablePptc;
@@ -643,9 +646,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.System.UseHypervisor.Value = UseHypervisor;
 
             // Graphics
-            config.Graphics.VSyncMode.Value = VSyncMode;
-            config.Graphics.EnableCustomVSyncInterval.Value = EnableCustomVSyncInterval;
-            config.Graphics.CustomVSyncInterval.Value = CustomVSyncInterval;
             config.Graphics.GraphicsBackend.Value = (GraphicsBackend)GraphicsBackendIndex;
             config.Graphics.PreferredGpu.Value = _gpuIds.ElementAtOrDefault(PreferredGpuIndex);
             config.Graphics.EnableShaderCache.Value = EnableShaderCache;

src/Ryujinx/UI/Views/Input/ControllerInputView.axaml

@@ -4,7 +4,6 @@
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Input"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
@@ -487,37 +486,6 @@
                             </Button>
                         </Grid>
                     </Border>
-                    <Border
-                        BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                        BorderThickness="1"
-                        CornerRadius="5"
-                        HorizontalAlignment="Stretch"
-                        Margin="0,-1,0,0">
-                        <Grid IsVisible="{Binding ParentModel.HasLed}">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <CheckBox
-                                Margin="10"
-                                MinWidth="0"
-                                Grid.Column="0"
-                                IsChecked="{Binding Config.EnableLedChanging, Mode=TwoWay}">
-                                <TextBlock Text="{ext:Locale ControllerSettingsLedColor}" />
-                            </CheckBox>
-                            <ui:ColorPickerButton 
-                                Grid.Column="1"
-                                Margin="10"
-                                IsMoreButtonVisible="False"
-                                UseColorPalette="False"
-                                UseColorTriangle="False"
-                                UseColorWheel="False"
-                                ShowAcceptDismissButtons="False"
-                                IsAlphaEnabled="False"
-                                Color="{Binding Config.LedColor, Mode=TwoWay}">
-                            </ui:ColorPickerButton>
-                        </Grid>
-                    </Border>
                 </StackPanel>
             </StackPanel>
             <!-- Right Controls -->

src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs

@@ -4,11 +4,14 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
+using DiscordRPC;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels.Input;
 using Ryujinx.Common.Configuration.Hid.Controller;
+using Ryujinx.Common.Logging;
 using Ryujinx.Input;
 using Ryujinx.Input.Assigner;
+using System;
 using StickInputId = Ryujinx.Common.Configuration.Hid.Controller.StickInputId;
 
 namespace Ryujinx.Ava.UI.Views.Input

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

@@ -264,19 +264,19 @@
                         Name="FaqMenuItem"
                         Header="{ext:Locale MenuBarHelpFaq}"
                         Icon="{ext:Icon fa-github}"
-                        CommandParameter="https://github.com/Ryubing/Ryujinx/wiki/FAQ-and-Troubleshooting"
+                        CommandParameter="https://github.com/GreemDev/Ryujinx/wiki/FAQ-and-Troubleshooting"
                         ToolTip.Tip="{ext:Locale MenuBarHelpFaqTooltip}" />
                     <MenuItem
                         Name="SetupGuideMenuItem"
                         Header="{ext:Locale MenuBarHelpSetup}"
                         Icon="{ext:Icon fa-github}"
-                        CommandParameter="https://github.com/Ryubing/Ryujinx/wiki/Ryujinx-Setup-&amp;-Configuration-Guide"
+                        CommandParameter="https://github.com/GreemDev/Ryujinx/wiki/Ryujinx-Setup-&amp;-Configuration-Guide"
                         ToolTip.Tip="{ext:Locale MenuBarHelpSetupTooltip}" />
                     <MenuItem
                         Name="LdnGuideMenuItem"
                         Header="{ext:Locale MenuBarHelpMultiplayer}"
                         Icon="{ext:Icon fa-github}"
-                        CommandParameter="https://github.com/Ryubing/Ryujinx/wiki/Multiplayer%E2%80%90(LDN%E2%80%90Local%E2%80%90Wireless)%E2%80%90Guide"
+                        CommandParameter="https://github.com/GreemDev/Ryujinx/wiki/Multiplayer%E2%80%90(LDN%E2%80%90Local%E2%80%90Wireless)%E2%80%90Guide"
                         ToolTip.Tip="{ext:Locale MenuBarHelpMultiplayerTooltip}" />
                 </MenuItem>
             </MenuItem>

src/Ryujinx/UI/Windows/AboutWindow.axaml

@@ -182,7 +182,7 @@
                     HorizontalAlignment="Left"
                     Background="Transparent"
                     Click="Button_OnClick"
-                    Tag="https://github.com/Ryubing/Ryujinx/graphs/contributors?type=a">
+                    Tag="https://github.com/GreemDev/Ryujinx/graphs/contributors?type=a">
                     <TextBlock
                         FontSize="10"
                         Text="{ext:Locale AboutRyujinxContributorsButtonHeader}"

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

@@ -736,7 +736,9 @@ namespace Ryujinx.Ava.UI.Windows
             });
         }
 
-        private static bool _intelMacWarningShown = !RunningPlatform.IsIntelMac;
+        private static bool _intelMacWarningShown = !(OperatingSystem.IsMacOS() &&
+                                                     (RuntimeInformation.OSArchitecture == Architecture.X64 ||
+                                                      RuntimeInformation.OSArchitecture == Architecture.X86));
 
         public static async Task ShowIntelMacWarningAsync()
         {

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 = 61;
+        public const int CurrentVersion = 60;
 
         /// <summary>
         /// Version of the configuration file format

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

@@ -45,6 +45,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
             EnableDiscordIntegration.Value = cff.EnableDiscordIntegration;
             CheckUpdatesOnStart.Value = cff.CheckUpdatesOnStart;
             ShowConfirmExit.Value = cff.ShowConfirmExit;
+            IgnoreApplet.Value = cff.IgnoreApplet;
             RememberWindowState.Value = cff.RememberWindowState;
             ShowTitleBar.Value = cff.ShowTitleBar;
             EnableHardwareAcceleration.Value = cff.EnableHardwareAcceleration;
@@ -96,7 +97,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             System.MemoryManagerMode.Value = cff.MemoryManagerMode;
             System.DramSize.Value = cff.DramSize;
             System.IgnoreMissingServices.Value = cff.IgnoreMissingServices;
-            System.IgnoreApplet.Value = cff.IgnoreApplet;
             System.UseHypervisor.Value = cff.UseHypervisor;
             
             UI.GuiColumns.FavColumn.Value = cff.GuiColumns.FavColumn;
@@ -263,12 +263,15 @@ namespace Ryujinx.Ava.Utilities.Configuration
                         }),
                 (30, static cff =>
                 {
-                    foreach (StandardControllerInputConfig config in cff.InputConfig.OfType<StandardControllerInputConfig>())
+                    foreach (InputConfig config in cff.InputConfig)
                     {
-                        config.Rumble = new RumbleConfigController
+                        if (config is StandardControllerInputConfig controllerConfig)
                         {
-                            EnableRumble = false, StrongRumble = 1f, WeakRumble = 1f,
+                            controllerConfig.Rumble = new RumbleConfigController
-                        };
+                            {
+                                EnableRumble = false, StrongRumble = 1f, WeakRumble = 1f,
+                            };
+                        }
                     }
                 }),
                 (31, static cff => cff.BackendThreading = BackendThreading.Auto),
@@ -413,18 +416,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
                     // 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),
+                (60, static cff => cff.StartNoUI = false)
-                (61, static cff =>
-                {
-                    foreach (StandardControllerInputConfig config in cff.InputConfig.OfType<StandardControllerInputConfig>())
-                    {
-                        config.Led = new LedConfigController
-                        {
-                            EnableLed = false,
-                            LedColor = 328189
-                        };
-                    }
-                })
             );
     }
 }

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

@@ -366,11 +366,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             /// Enable or disable ignoring missing services
             /// </summary>
             public ReactiveObject<bool> IgnoreMissingServices { get; private set; }
-            
-            /// <summary>
-            ///  Ignore Controller Applet
-            /// </summary>
-            public ReactiveObject<bool> IgnoreApplet { get; private set; }
 
             /// <summary>
             /// Uses Hypervisor over JIT if available
@@ -409,8 +404,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 DramSize.LogChangesToValue(nameof(DramSize));
                 IgnoreMissingServices = new ReactiveObject<bool>();
                 IgnoreMissingServices.LogChangesToValue(nameof(IgnoreMissingServices));
-                IgnoreApplet = new ReactiveObject<bool>();
-                IgnoreApplet.LogChangesToValue(nameof(IgnoreApplet));
                 AudioVolume = new ReactiveObject<float>();
                 AudioVolume.LogChangesToValue(nameof(AudioVolume));
                 UseHypervisor = new ReactiveObject<bool>();
@@ -752,6 +745,11 @@ namespace Ryujinx.Ava.Utilities.Configuration
         /// </summary>
         public ReactiveObject<bool> ShowConfirmExit { get; private set; }
 
+        /// <summary>
+        /// Ignore Applet
+        /// </summary>
+        public ReactiveObject<bool> IgnoreApplet { get; private set; }
+
         /// <summary>
         /// Enables or disables save window size, position and state on close.
         /// </summary>
@@ -784,6 +782,8 @@ namespace Ryujinx.Ava.Utilities.Configuration
             EnableDiscordIntegration = new ReactiveObject<bool>();
             CheckUpdatesOnStart = new ReactiveObject<bool>();
             ShowConfirmExit = new ReactiveObject<bool>();
+            IgnoreApplet = new ReactiveObject<bool>();
+            IgnoreApplet.LogChangesToValue(nameof(IgnoreApplet));
             RememberWindowState = new ReactiveObject<bool>();
             ShowTitleBar = new ReactiveObject<bool>();
             EnableHardwareAcceleration = new ReactiveObject<bool>();

src/Ryujinx/Utilities/Configuration/ConfigurationState.cs

@@ -56,6 +56,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 EnableDiscordIntegration = EnableDiscordIntegration,
                 CheckUpdatesOnStart = CheckUpdatesOnStart,
                 ShowConfirmExit = ShowConfirmExit,
+                IgnoreApplet = IgnoreApplet,
                 RememberWindowState = RememberWindowState,
                 ShowTitleBar = ShowTitleBar,
                 EnableHardwareAcceleration = EnableHardwareAcceleration,
@@ -77,7 +78,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 MemoryManagerMode = System.MemoryManagerMode,
                 DramSize = System.DramSize,
                 IgnoreMissingServices = System.IgnoreMissingServices,
-                IgnoreApplet = System.IgnoreApplet,
                 UseHypervisor = System.UseHypervisor,
                 GuiColumns = new GuiColumns
                 {
@@ -176,6 +176,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
             EnableDiscordIntegration.Value = true;
             CheckUpdatesOnStart.Value = true;
             ShowConfirmExit.Value = true;
+            IgnoreApplet.Value = false;
             RememberWindowState.Value = true;
             ShowTitleBar.Value = !OperatingSystem.IsWindows();
             EnableHardwareAcceleration.Value = true;
@@ -199,7 +200,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             System.MemoryManagerMode.Value = MemoryManagerMode.HostMappedUnsafe;
             System.DramSize.Value = MemoryConfiguration.MemoryConfiguration4GiB;
             System.IgnoreMissingServices.Value = false;
-            System.IgnoreApplet.Value = false;
             System.UseHypervisor.Value = true;
             Multiplayer.LanInterfaceId.Value = "0";
             Multiplayer.Mode.Value = MultiplayerMode.Disabled;