Merge branch 'master' into master

More changes 18.02.25

docs/compatibility.csv

@@ -1800,7 +1800,6 @@
 010005A00B312000,"Megaton Rainfall",gpu;opengl,boots,2022-08-04 18:29:43
 0100EA100DF92000,"Meiji Katsugeki Haikara Ryuuseigumi - Seibai Shimaseu, Yonaoshi Kagyou",32-bit;nvdec,playable,2022-12-05 13:19:12
 0100B360068B2000,"Mekorama",gpu,boots,2021-06-17 16:37:21
-010012301932A000,"Melatonin",,playable,2025-02-16 04:08:17
 01000FA010340000,"Melbits World",nvdec;online,menus,2021-11-26 13:51:22
 0100F68019636000,"Melon Journey",,playable,2023-04-23 21:20:01
 010079C012896000,"Memories Off -Innocent Fille- for Dearest",,playable,2020-08-04 07:31:22

src/Ryujinx.Common/SharedConstants.cs

@@ -1,9 +0,0 @@
-namespace Ryujinx.Common
-{
-    public static class SharedConstants
-    {
-        public const string DefaultLanPlayHost = "ryuldn.vudjun.com";
-        public const short LanPlayPort = 30456;
-        public const string DefaultLanPlayWebHost = "ryuldnweb.vudjun.com";
-    }
-}

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/IUserLocalCommunicationService.cs

@@ -23,6 +23,9 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 {
     class IUserLocalCommunicationService : IpcService, IDisposable
     {
+        public static string DefaultLanPlayHost = "ryuldn.vudjun.com";
+        public static short LanPlayPort = 30456;
+
         public INetworkClient NetworkClient { get; private set; }
 
         private const int NifmRequestID = 90;
@@ -1089,18 +1092,20 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                             case MultiplayerMode.LdnRyu:
                                 try
                                 {
-                                    string ldnServer = context.Device.Configuration.MultiplayerLdnServer 
-                                                       ?? throw new InvalidOperationException("Cannot initialize RyuLDN with a null Multiplayer server.");
-
+                                    string ldnServer = context.Device.Configuration.MultiplayerLdnServer;
+                                    if (string.IsNullOrEmpty(ldnServer))
+                                    {
+                                        ldnServer = DefaultLanPlayHost;
+                                    }
                                     if (!IPAddress.TryParse(ldnServer, out IPAddress ipAddress))
                                     {
                                         ipAddress = Dns.GetHostEntry(ldnServer).AddressList[0];
                                     }
-                                    NetworkClient = new LdnMasterProxyClient(ipAddress.ToString(), SharedConstants.LanPlayPort, context.Device.Configuration);
+                                    NetworkClient = new LdnMasterProxyClient(ipAddress.ToString(), LanPlayPort, context.Device.Configuration);
                                 }
                                 catch (Exception ex)
                                 {
-                                    Logger.Error?.Print(LogClass.ServiceLdn, "Could not locate RyuLDN server. Defaulting to stubbed wireless.");
+                                    Logger.Error?.Print(LogClass.ServiceLdn, "Could not locate LdnRyu server. Defaulting to stubbed wireless.");
                                     Logger.Error?.Print(LogClass.ServiceLdn, ex.Message);
                                     NetworkClient = new LdnDisabledClient();
                                 }

src/Ryujinx.Input.SDL2/SDL2Gamepad.cs

@@ -111,7 +111,7 @@ namespace Ryujinx.Input.SDL2
             byte blue = packedRgb > 0 ? (byte)(packedRgb % 256) : (byte)0;
             
             if (SDL_GameControllerSetLED(_gamepadHandle, red, green, blue) != 0)
-                Logger.Debug?.Print(LogClass.Hid, "LED setting failed; probably in the middle of disconnecting.");
+                Logger.Error?.Print(LogClass.Hid, "LED setting failed; probably in the middle of disconnecting.");
         }
 
         private GamepadFeaturesFlag GetFeaturesFlag()

src/Ryujinx/AppHost.cs

@@ -951,7 +951,7 @@ namespace Ryujinx.Ava
                 ConfigurationState.Instance.Multiplayer.Mode,
                 ConfigurationState.Instance.Multiplayer.DisableP2p,
                 ConfigurationState.Instance.Multiplayer.LdnPassphrase,
-                ConfigurationState.Instance.Multiplayer.GetLdnServer(),
+                ConfigurationState.Instance.Multiplayer.LdnServer,
                 ConfigurationState.Instance.Graphics.CustomVSyncInterval.Value,
                 ConfigurationState.Instance.Hacks.ShowDirtyHacks ? ConfigurationState.Instance.Hacks.EnabledHacks : null));
         }

src/Ryujinx/Assets/locales.json

@@ -24073,4 +24073,4 @@
       }
     }
   ]
-}
+}

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

@@ -148,11 +148,8 @@ namespace Ryujinx.Ava.UI.Windows
                 {
                     if ((firmwarePath.ExistsAsFile && firmwarePath.Extension is "xci" or "zip") ||
                         firmwarePath.ExistsAsDirectory)
-                    {
                         await Dispatcher.UIThread.InvokeAsync(() => 
                             ViewModel.HandleFirmwareInstallation(firmwarePath));
-                        CommandLineState.FirmwareToInstallPathArg = null;
-                    }
                     else
                         Logger.Notice.Print(LogClass.UI, "Invalid firmware type provided. Path must be a directory, or a .zip or .xci file.");
                 }

src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs

@@ -42,6 +42,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
 {
     public class ApplicationLibrary
     {
+        public const string DefaultLanPlayWebHost = "ryuldnweb.vudjun.com";
         public Language DesiredLanguage { get; set; }
         public event EventHandler<ApplicationCountUpdatedEventArgs> ApplicationCountUpdated;
         public event Action<LdnGameDataReceivedEventArgs> LdnGameDataReceived;
@@ -825,6 +826,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
 
         public async Task RefreshLdn()
         {
+
             if (ConfigurationState.Instance.Multiplayer.Mode == MultiplayerMode.LdnRyu)
             {
                 try
@@ -832,22 +834,33 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
                     string ldnWebHost = ConfigurationState.Instance.Multiplayer.LdnServer;
                     if (string.IsNullOrEmpty(ldnWebHost))
                     {
-                        ldnWebHost = SharedConstants.DefaultLanPlayWebHost;
+                        ldnWebHost = DefaultLanPlayWebHost;
                     }
-                    
+                    IEnumerable<LdnGameData> ldnGameDataArray = Array.Empty<LdnGameData>();
                     using HttpClient httpClient = new();
                     string ldnGameDataArrayString = await httpClient.GetStringAsync($"https://{ldnWebHost}/api/public_games");
-                    LdnGameData[] ldnGameDataArray = JsonHelper.Deserialize(ldnGameDataArrayString, _ldnDataSerializerContext.IEnumerableLdnGameData).ToArray();
-                    LdnGameDataReceived?.Invoke(new LdnGameDataReceivedEventArgs(ldnGameDataArray));
-                    return;
+                    ldnGameDataArray = JsonHelper.Deserialize(ldnGameDataArrayString, _ldnDataSerializerContext.IEnumerableLdnGameData);
+                    LdnGameDataReceived?.Invoke(new LdnGameDataReceivedEventArgs
+                    {
+                        LdnData = ldnGameDataArray
+                    });
                 }
                 catch (Exception ex)
                 {
                     Logger.Warning?.Print(LogClass.Application, $"Failed to fetch the public games JSON from the API. Player and game count in the game list will be unavailable.\n{ex.Message}");
+                    LdnGameDataReceived?.Invoke(new LdnGameDataReceivedEventArgs
+                    {
+                        LdnData = Array.Empty<LdnGameData>()
+                    });
                 }
             }
-            
-            LdnGameDataReceived?.Invoke(LdnGameDataReceivedEventArgs.Empty);
+            else
+            {
+                LdnGameDataReceived?.Invoke(new LdnGameDataReceivedEventArgs
+                {
+                    LdnData = Array.Empty<LdnGameData>()
+                });
+            }
         }
 
         // Replace the currently stored DLC state for the game with the provided DLC state.

src/Ryujinx/Utilities/AppLibrary/LdnGameDataReceivedEventArgs.cs

@@ -5,14 +5,6 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
 {
     public class LdnGameDataReceivedEventArgs : EventArgs
     {
-        public static new readonly LdnGameDataReceivedEventArgs Empty = new(null);
-        
-        public LdnGameDataReceivedEventArgs(LdnGameData[] ldnData)
-        {
-            LdnData = ldnData ?? [];
-        }
-        
-        
-        public LdnGameData[] LdnData { get; set; }
+        public IEnumerable<LdnGameData> LdnData { get; set; }
     }
 }

src/Ryujinx/Utilities/CommandLineState.cs

@@ -14,7 +14,7 @@ namespace Ryujinx.Ava.Utilities
         public static string OverrideBackendThreading { get; private set; }
         public static string OverrideHideCursor { get; private set; }
         public static string BaseDirPathArg { get; private set; }
-        public static FilePath FirmwareToInstallPathArg { get; set; }
+        public static FilePath FirmwareToInstallPathArg { get; private set; }
         public static string Profile { get; private set; }
         public static string LaunchPathArg { get; private set; }
         public static string LaunchApplicationId { get; private set; }

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

@@ -1,6 +1,5 @@
 using ARMeilleure;
 using Gommon;
-using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Configuration.System;
 using Ryujinx.Ava.Utilities.Configuration.UI;
 using Ryujinx.Common;
@@ -648,14 +647,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             /// </summary>
             public ReactiveObject<string> LdnServer { get; private set; }
 
-            public string GetLdnServer()
-            {
-                string ldnServer = LdnServer;
-                return string.IsNullOrEmpty(ldnServer) 
-                    ? SharedConstants.DefaultLanPlayHost 
-                    : ldnServer;
-            }
-
             public MultiplayerSection()
             {
                 LanInterfaceId = new ReactiveObject<string>();