Add logging in socket implementation (#661 )

Adds logging to most Socket calls to help with debugging network issues. Shouldn't affect any functionality. There's a small chance it could spam the log in some games.
UI: RPC: Remove git hash from RPC ryujinx logo hover information
2025-02-16 01:03:44 -06:00 · 2025-02-16 00:58:25 -06:00 · 2025-02-15 20:52:03 -06:00 · 2025-02-15 20:45:27 -06:00 · 2025-02-15 20:25:17 -06:00
30 changed files with 314 additions and 299 deletions
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -3,7 +3,6 @@
    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
  </PropertyGroup>
  <ItemGroup>
-    <PackageVersion Include="Alimer.Bindings.SDL" Version="3.7.1" />
    <PackageVersion Include="Avalonia" Version="11.0.13" />
    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.13" />
    <PackageVersion Include="Avalonia.Desktop" Version="11.0.13" />
--- a/Ryujinx.sln
+++ b/Ryujinx.sln
@@ -75,8 +75,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon", "src\Ryuj
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon.Kernel.Generators", "src\Ryujinx.Horizon.Kernel.Generators\Ryujinx.Horizon.Kernel.Generators.csproj", "{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Input.SDL3", "src\Ryujinx.Input.SDL3\Ryujinx.Input.SDL3.csproj", "{3BF24278-547D-42C2-9D43-182B978F54DD}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.HLE.Generators", "src\Ryujinx.HLE.Generators\Ryujinx.HLE.Generators.csproj", "{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics.Metal", "src\Ryujinx.Graphics.Metal\Ryujinx.Graphics.Metal.csproj", "{C08931FA-1191-417A-864F-3882D93E683B}"
@@ -261,10 +259,6 @@ Global
 		{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
 		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3BF24278-547D-42C2-9D43-182B978F54DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3BF24278-547D-42C2-9D43-182B978F54DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3BF24278-547D-42C2-9D43-182B978F54DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3BF24278-547D-42C2-9D43-182B978F54DD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/JsonMotionConfigControllerConverter.cs
+++ b/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/JsonMotionConfigControllerConverter.cs
@@ -56,7 +56,6 @@ namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
            return motionBackendType switch
            {
                MotionInputBackendType.GamepadDriver => JsonSerializer.Deserialize(ref reader, _serializerContext.StandardMotionConfigController),
-                MotionInputBackendType.Handheld => JsonSerializer.Deserialize(ref reader, _serializerContext.StandardMotionConfigController),
                MotionInputBackendType.CemuHook => JsonSerializer.Deserialize(ref reader, _serializerContext.CemuHookMotionConfigController),
                _ => throw new InvalidOperationException($"Unknown backend type {motionBackendType}"),
            };
@@ -67,7 +66,6 @@ namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
            switch (value.MotionBackend)
            {
                case MotionInputBackendType.GamepadDriver:
-                case MotionInputBackendType.Handheld:
                    JsonSerializer.Serialize(writer, value as StandardMotionConfigController, _serializerContext.StandardMotionConfigController);
                    break;
                case MotionInputBackendType.CemuHook:
--- a/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionInputBackendType.cs
+++ b/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionInputBackendType.cs
@@ -9,6 +9,5 @@ namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
        Invalid,
        GamepadDriver,
        CemuHook,
-        Handheld,
    }
 }
--- a/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs
@@ -34,6 +34,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
        {
            if (errorCode != LinuxError.SUCCESS)
            {
+                if (errorCode != LinuxError.EWOULDBLOCK)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Operation failed with error {errorCode}.");
+                }
                result = -1;
            }

@@ -66,6 +70,8 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
            BsdSocketType type = (BsdSocketType)context.RequestData.ReadInt32();
            ProtocolType protocol = (ProtocolType)context.RequestData.ReadInt32();

+            Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Creating socket with domain={domain}, type={type}, protocol={protocol}");
+
            BsdSocketCreationFlags creationFlags = (BsdSocketCreationFlags)((int)type >> (int)BsdSocketCreationFlags.FlagsShift);
            type &= BsdSocketType.TypeMask;

@@ -111,6 +117,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd

            if (exempt)
            {
+                Logger.Info?.Print(LogClass.ServiceBsd, "Disconnecting exempt socket.");
                newBsdSocket.Disconnect();
            }

@@ -797,7 +804,11 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
            {
                errno = socket.Listen(backlog);
            }
-
+            else
+            {
+                Logger.Warning?.PrintMsg(LogClass.ServiceBsd, $"Invalid socket fd '{socketFd}'.");
+            }
+            
            return WriteBsdResult(context, 0, errno);
        }

--- a/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Impl/ManagedSocket.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Impl/ManagedSocket.cs
@@ -92,18 +92,30 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
            {
                newSocket = new ManagedSocket(Socket.Accept());

+                IPEndPoint remoteEndPoint = newSocket.RemoteEndPoint;
+                bool isPrivateIp = remoteEndPoint.Address.ToString().StartsWith("192.168.");
+                Logger.Info?.PrintMsg(LogClass.ServiceBsd,
+                    isPrivateIp
+                        ? $"Accepted connection from {ProtocolType}/{remoteEndPoint.Address}:{remoteEndPoint.Port}"
+                        : $"Accepted connection from {ProtocolType}/***:{remoteEndPoint.Port}");
+
                return LinuxError.SUCCESS;
            }
            catch (SocketException exception)
            {
                newSocket = null;

+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
            }
        }

        public LinuxError Bind(IPEndPoint localEndPoint)
        {
+            Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Socket binding to: {ProtocolType}/{localEndPoint.Port}");
            try
            {
                Socket.Bind(localEndPoint);
@@ -112,6 +124,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
            }
            catch (SocketException exception)
            {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
            }
        }
@@ -123,6 +139,15 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl

        public LinuxError Connect(IPEndPoint remoteEndPoint)
        {
+            bool isLDNPrivateIP = remoteEndPoint.Address.ToString().StartsWith("192.168.");
+            if (isLDNPrivateIP)
+            {
+                Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Connecting to: {ProtocolType}/{remoteEndPoint.Address}:{remoteEndPoint.Port}");
+            }
+            else
+            {
+                Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Connecting to: {ProtocolType}/***:{remoteEndPoint.Port}");
+            }
            try
            {
                Socket.Connect(remoteEndPoint);
@@ -137,6 +162,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
                }
                else
                {
+                    if (exception.SocketErrorCode != SocketError.WouldBlock)
+                    {
+                        Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                    }
                    return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
                }
            }
@@ -144,11 +173,13 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl

        public void Disconnect()
        {
+            Logger.Info?.Print(LogClass.ServiceBsd, "Socket disconnecting");
            Socket.Disconnect(true);
        }

        public void Dispose()
        {
+            Logger.Info?.Print(LogClass.ServiceBsd, "Socket closed");
            Socket.Close();
            Socket.Dispose();
        }
@@ -159,10 +190,16 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
            {
                Socket.Listen(backlog);

+                Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Socket listening: {ProtocolType}/{(Socket.LocalEndPoint as IPEndPoint).Port}");
+
                return LinuxError.SUCCESS;
            }
            catch (SocketException exception)
            {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
            }
        }
@@ -182,11 +219,15 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
            }
            catch (SocketException exception)
            {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
            }
        }

-        bool hasEmittedBlockingWarning = false;
+        private bool _hasEmittedBlockingWarning;

        public LinuxError Receive(out int receiveSize, Span<byte> buffer, BsdSocketFlags flags)
        {
@@ -202,10 +243,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
                    shouldBlockAfterOperation = true;
                }

-                if (Blocking && !hasEmittedBlockingWarning)
+                if (Blocking && !_hasEmittedBlockingWarning)
                {
                    Logger.Warning?.PrintMsg(LogClass.ServiceBsd, "Blocking socket operations are not yet working properly. Expect network errors.");
-                    hasEmittedBlockingWarning = true;
+                    _hasEmittedBlockingWarning = true;
                }

                receiveSize = Socket.Receive(buffer, ConvertBsdSocketFlags(flags));
@@ -214,6 +255,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
            }
            catch (SocketException exception)
            {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                receiveSize = -1;

                result = WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
@@ -245,10 +290,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
                    shouldBlockAfterOperation = true;
                }

-                if (Blocking && !hasEmittedBlockingWarning)
+                if (Blocking && !_hasEmittedBlockingWarning)
                {
                    Logger.Warning?.PrintMsg(LogClass.ServiceBsd, "Blocking socket operations are not yet working properly. Expect network errors.");
-                    hasEmittedBlockingWarning = true;
+                    _hasEmittedBlockingWarning = true;
                }

                if (!Socket.IsBound)
@@ -265,6 +310,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
            }
            catch (SocketException exception)
            {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                receiveSize = -1;

                result = WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
@@ -288,6 +337,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
            }
            catch (SocketException exception)
            {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                sendSize = -1;

                return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
@@ -304,6 +357,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
            }
            catch (SocketException exception)
            {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                sendSize = -1;

                return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
@@ -341,6 +398,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
            }
            catch (SocketException exception)
            {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
            }
        }
@@ -387,6 +448,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
            }
            catch (SocketException exception)
            {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
            }
        }
@@ -519,6 +584,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
            }
            catch (SocketException exception)
            {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
            }
        }
@@ -557,6 +626,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
            }
            catch (SocketException exception)
            {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
            }
        }
--- a/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Proxy/SocketHelpers.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Proxy/SocketHelpers.cs
@@ -1,4 +1,6 @@
+using Ryujinx.Common.Logging;
 using Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy;
+using Ryujinx.HLE.HOS.Services.Sockets.Bsd.Types;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -64,10 +66,18 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Proxy
            {
                if (_proxy.Supported(domain, type, protocol))
                {
+                    Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Socket is using LDN proxy");
                    return new LdnProxySocket(domain, type, protocol, _proxy);
                }
+                else
+                {
+                    Logger.Warning?.PrintMsg(LogClass.ServiceBsd, $"LDN proxy does not support socket {domain}, {type}, {protocol}");
+                }
+            }
+            else
+            {
+                Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Opening socket using host networking stack");
            }
-
            return new DefaultSocket(domain, type, protocol, lanInterfaceId);
        }
    }
--- a/src/Ryujinx.Input.SDL3/Ryujinx.Input.SDL3.csproj
+++ b/src/Ryujinx.Input.SDL3/Ryujinx.Input.SDL3.csproj
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Ryujinx.Input\Ryujinx.Input.csproj" />
-    <PackageReference Include="Alimer.Bindings.SDL" />
-  </ItemGroup>
-
-</Project>
--- a/src/Ryujinx.Input.SDL3/SDL3MotionDriver.cs
+++ b/src/Ryujinx.Input.SDL3/SDL3MotionDriver.cs
@@ -1,85 +0,0 @@
-using SDL3;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Numerics;
-using static SDL3.SDL3;
-
-namespace Ryujinx.Input.SDL3
-{
-    public unsafe class SDL3MotionDriver : IHandheld, IDisposable
-    {
-        private readonly Dictionary<SDL_SensorType, SDL_Sensor> sensors;
-        private bool _disposed;
-
-        public SDL3MotionDriver()
-        {
-            int result = SDL_Init(SDL_InitFlags.Sensor);
-            if (result < 0)
-            {
-                throw new InvalidOperationException($"SDL sensor initialization failed: {SDL_GetError()}");
-            }
-            sensors = SDL_GetSensors().ToArray().ToDictionary(SDL_GetSensorTypeForID, SDL_OpenSensor);
-        }
-
-        ~SDL3MotionDriver()
-        {
-            Dispose(false);
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            if (disposing && sensors != null)
-            {
-                foreach (var sensor in sensors.Values)
-                {
-                    if (sensor != IntPtr.Zero)
-                    {
-                        SDL_CloseSensor(sensor);
-                    }
-                }
-            }
-
-            _disposed = true;
-        }
-
-        public Vector3 GetMotionData(MotionInputId inputType)
-        {
-            ObjectDisposedException.ThrowIf(_disposed, this);
-
-            return inputType switch
-            {
-                MotionInputId.Gyroscope => GetSensorVector(SDL_SensorType.Gyro) * 180 / MathF.PI,
-                MotionInputId.Accelerometer => GetSensorVector(SDL_SensorType.Accel) / SDL_STANDARD_GRAVITY,
-                _ => Vector3.Zero
-            };
-        }
-
-        private Vector3 GetSensorVector(SDL_SensorType sensorType)
-        {
-            if (!sensors.TryGetValue(sensorType, out SDL_Sensor sensor))
-            {
-                return Vector3.Zero;
-            }
-
-            var data = stackalloc float[3];
-            if (SDL_GetSensorData(sensor, data, 3) < 0)
-            {
-                return Vector3.Zero;
-            }
-
-            return new Vector3(data[0], data[1], data[2]);
-        }
-    }
-}
--- a/src/Ryujinx.Input/HLE/InputManager.cs
+++ b/src/Ryujinx.Input/HLE/InputManager.cs
@@ -2,13 +2,12 @@ using System;

 namespace Ryujinx.Input.HLE
 {
-    public class InputManager(IGamepadDriver keyboardDriver, IGamepadDriver gamepadDriver, IHandheld handheld)
+    public class InputManager(IGamepadDriver keyboardDriver, IGamepadDriver gamepadDriver)
        : IDisposable
    {
        public IGamepadDriver KeyboardDriver { get; } = keyboardDriver;
        public IGamepadDriver GamepadDriver { get; } = gamepadDriver;
        public IGamepadDriver MouseDriver { get; private set; }
-        public IHandheld Handheld { get; } = handheld;

        public void SetMouseDriver(IGamepadDriver mouseDriver)
        {
@@ -19,7 +18,7 @@ namespace Ryujinx.Input.HLE

        public NpadManager CreateNpadManager()
        {
-            return new NpadManager(KeyboardDriver, GamepadDriver, MouseDriver, Handheld);
+            return new NpadManager(KeyboardDriver, GamepadDriver, MouseDriver);
        }

        public TouchScreenManager CreateTouchScreenManager()
@@ -39,7 +38,6 @@ namespace Ryujinx.Input.HLE
                KeyboardDriver?.Dispose();
                GamepadDriver?.Dispose();
                MouseDriver?.Dispose();
-                Handheld?.Dispose();
            }
        }

--- a/src/Ryujinx.Input/HLE/NpadController.cs
+++ b/src/Ryujinx.Input/HLE/NpadController.cs
@@ -218,14 +218,12 @@ namespace Ryujinx.Input.HLE
        public string Id { get; private set; }

        private readonly CemuHookClient _cemuHookClient;
-        private readonly IHandheld _handheld;

-        public NpadController(CemuHookClient cemuHookClient, IHandheld handheld)
+        public NpadController(CemuHookClient cemuHookClient)
        {
            State = default;
            Id = null;
            _cemuHookClient = cemuHookClient;
-            _handheld = handheld;
        }

        public bool UpdateDriverConfiguration(IGamepadDriver gamepadDriver, InputConfig config)
@@ -289,18 +287,6 @@ namespace Ryujinx.Input.HLE

                if (_config is StandardControllerInputConfig controllerConfig && controllerConfig.Motion.EnableMotion)
                {
-                    if (controllerConfig.Motion.MotionBackend == MotionInputBackendType.Handheld)
-                    {
-                        Vector3 accelerometer = _handheld.GetMotionData(MotionInputId.Accelerometer);
-                        Vector3 gyroscope = _handheld.GetMotionData(MotionInputId.Gyroscope);
-
-                        accelerometer = new Vector3(accelerometer.X, -accelerometer.Z, accelerometer.Y);
-                        gyroscope = new Vector3(gyroscope.X, -gyroscope.Z, gyroscope.Y);
-
-                        _leftMotionInput.Update(accelerometer, gyroscope, (ulong)PerformanceCounter.ElapsedNanoseconds / 1000, controllerConfig.Motion.Sensitivity, (float)controllerConfig.Motion.GyroDeadzone);
-                        _rightMotionInput = _leftMotionInput;
-                    }
-
                    if (controllerConfig.Motion.MotionBackend == MotionInputBackendType.GamepadDriver)
                    {
                        if (gamepad.Features.HasFlag(GamepadFeaturesFlag.Motion))
--- a/src/Ryujinx.Input/HLE/NpadManager.cs
+++ b/src/Ryujinx.Input/HLE/NpadManager.cs
@@ -31,7 +31,6 @@ namespace Ryujinx.Input.HLE
        private readonly IGamepadDriver _keyboardDriver;
        private readonly IGamepadDriver _gamepadDriver;
        private readonly IGamepadDriver _mouseDriver;
-        private readonly IHandheld _handheld;
        private bool _isDisposed;

        private List<InputConfig> _inputConfig;
@@ -39,7 +38,7 @@ namespace Ryujinx.Input.HLE
        private bool _enableMouse;
        private Switch _device;

-        public NpadManager(IGamepadDriver keyboardDriver, IGamepadDriver gamepadDriver, IGamepadDriver mouseDriver, IHandheld handheld)
+        public NpadManager(IGamepadDriver keyboardDriver, IGamepadDriver gamepadDriver, IGamepadDriver mouseDriver)
        {
            _controllers = new NpadController[MaxControllers];
            _cemuHookClient = new CemuHookClient(this);
@@ -48,7 +47,6 @@ namespace Ryujinx.Input.HLE
            _gamepadDriver = gamepadDriver;
            _mouseDriver = mouseDriver;
            _inputConfig = [];
-            _handheld = handheld;

            _gamepadDriver.OnGamepadConnected += HandleOnGamepadConnected;
            _gamepadDriver.OnGamepadDisconnected += HandleOnGamepadDisconnected;
@@ -141,7 +139,7 @@ namespace Ryujinx.Input.HLE
                    }
                    else
                    {
-                        controller = new(_cemuHookClient, _handheld);
+                        controller = new(_cemuHookClient);
                    }

                    bool isValid = DriverConfigurationUpdate(ref controller, inputConfigEntry);
--- a/src/Ryujinx.Input/IHandheld.cs
+++ b/src/Ryujinx.Input/IHandheld.cs
@@ -1,10 +0,0 @@
-using System;
-using System.Numerics;
-
-namespace Ryujinx.Input
-{
-    public interface IHandheld : IDisposable
-    {
-        Vector3 GetMotionData(MotionInputId gyroscope);
-    }
-}
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -447,6 +447,31 @@
        "zh_TW": "開啟 Ryujinx 資料夾"
      }
    },
+    {
+      "ID": "MenuBarFileOpenScreenshotsFolder",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Open Screenshots Folder",
+        "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": "MenuBarFileOpenLogsFolder",
      "Translations": {
@@ -8172,31 +8197,6 @@
        "zh_TW": "使用與 CemuHook 相容的體感"
      }
    },
-    {
-      "ID": "ControllerSettingsMotionUseHandheldCompatibleMotion",
-      "Translations": {
-        "ar_SA": "استخدام الحركة المتوافقة مع Hendheld",
-        "de_DE": "Hendheld kompatible Bewegungssteuerung",
-        "el_GR": "Κίνηση συμβατή με Hendheld",
-        "en_US": "Use Hendheld compatible motion",
-        "es_ES": "Usar movimiento compatible con Hendheld",
-        "fr_FR": "Utiliser un capteur de mouvements Hendheld",
-        "he_IL": "השתמש בתנועת Hendheld תואמת ",
-        "it_IT": "Usa sensore compatibile con Hendheld",
-        "ja_JP": "Hendheld 互換モーションを使用",
-        "ko_KR": "Hendheld 호환 모션 사용",
-        "no_NO": "Bruk Hendheld kompatibel bevegelse",
-        "pl_PL": "Użyj ruchu zgodnego z Hendheld",
-        "pt_BR": "Usar sensor compatível com Hendheld",
-        "ru_RU": "Включить совместимость с Hendheld",
-        "sv_SE": "Använd Hendheld-kompatibel rörelse",
-        "th_TH": "ใช้การเคลื่อนไหวที่เข้ากันได้กับ Hendheld",
-        "tr_TR": "Hendheld uyumlu hareket kullan",
-        "uk_UA": "Використовувати рух, сумісний з Hendheld",
-        "zh_CN": "使用 Hendheld 兼容的体感协议",
-        "zh_TW": "使用與 Hendheld 相容的體感"
-      }
-    },
    {
      "ID": "ControllerSettingsMotionControllerSlot",
      "Translations": {
@@ -17222,6 +17222,31 @@
        "zh_TW": "開啟 Ryujinx 檔案系統資料夾"
      }
    },
+    {
+      "ID": "OpenScreenshotFolderTooltip",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Open Ryujinx screenshots folder",
+        "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": "OpenRyujinxLogsTooltip",
      "Translations": {
@@ -24098,4 +24123,4 @@
      }
    }
  ]
-}
+}
--- a/src/Ryujinx/DiscordIntegrationModule.cs
+++ b/src/Ryujinx/DiscordIntegrationModule.cs
@@ -24,7 +24,7 @@ namespace Ryujinx.Ava

        private static readonly string _description =
            ReleaseInformation.IsValid
-                ? $"{VersionString} {ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelSourceRepo}@{ReleaseInformation.BuildGitHash}"
+                ? $"{VersionString} {ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelSourceRepo}"
                : "dev build";

        private const string ApplicationId = "1293250299716173864";
--- a/src/Ryujinx/Headless/HeadlessRyujinx.cs
+++ b/src/Ryujinx/Headless/HeadlessRyujinx.cs
@@ -23,7 +23,6 @@ using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.Input;
 using Ryujinx.Input.HLE;
 using Ryujinx.Input.SDL2;
-using Ryujinx.Input.SDL3;
 using Ryujinx.SDL2.Common;
 using System;
 using System.Collections.Generic;
@@ -183,7 +182,7 @@ namespace Ryujinx.Headless
            _accountManager = new AccountManager(_libHacHorizonManager.RyujinxClient, option.UserProfile);
            _userChannelPersistence = new UserChannelPersistence();

-            _inputManager = new InputManager(new SDL2KeyboardDriver(), new SDL2GamepadDriver(), new SDL3MotionDriver());
+            _inputManager = new InputManager(new SDL2KeyboardDriver(), new SDL2GamepadDriver());

            GraphicsConfig.EnableShaderCache = !option.DisableShaderCache;

--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -76,7 +76,6 @@
    <ProjectReference Include="..\Ryujinx.Graphics.Metal\Ryujinx.Graphics.Metal.csproj" />
    <ProjectReference Include="..\Ryujinx.Input\Ryujinx.Input.csproj" />
    <ProjectReference Include="..\Ryujinx.Input.SDL2\Ryujinx.Input.SDL2.csproj" />
-    <ProjectReference Include="..\Ryujinx.Input.SDL3\Ryujinx.Input.SDL3.csproj" />
    <ProjectReference Include="..\Ryujinx.Audio.Backends.OpenAL\Ryujinx.Audio.Backends.OpenAL.csproj" />
    <ProjectReference Include="..\Ryujinx.Audio.Backends.SoundIo\Ryujinx.Audio.Backends.SoundIo.csproj" />
    <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />
--- a/src/Ryujinx/UI/Controls/ApplicationDataView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationDataView.axaml
@@ -119,17 +119,23 @@
                        TextWrapping="Wrap" >
                    </TextBlock>
                </StackPanel>
-                <StackPanel Orientation="Horizontal" Spacing="5">
-                    <ui:SymbolIcon Foreground="ForestGreen" Symbol="Checkmark" IsVisible="{Binding AppData.HasDynamicRichPresenceSupport}"/>
+                <StackPanel Orientation="Horizontal" Spacing="5" ToolTip.Tip="{Binding DynamicRichPresenceDescription}">
+                    <ui:SymbolIcon 
+                        Foreground="ForestGreen" 
+                        Symbol="Checkmark" 
+                        IsVisible="{Binding AppData.HasDynamicRichPresenceSupport}"/>
                    <TextBlock
                        Foreground="ForestGreen"
                        HorizontalAlignment="Stretch"
                        IsVisible="{Binding AppData.HasDynamicRichPresenceSupport}"
                        Text="{ext:Locale GameInfoRpcDynamic}"
                        TextAlignment="Start"
-                        TextWrapping="Wrap" >
+                        TextWrapping="Wrap">
                    </TextBlock>
-                    <ui:SymbolIcon Foreground="Red" Symbol="Cancel" IsVisible="{Binding !AppData.HasDynamicRichPresenceSupport}"/>
+                    <ui:SymbolIcon 
+                        Foreground="Red" 
+                        Symbol="Cancel" 
+                        IsVisible="{Binding !AppData.HasDynamicRichPresenceSupport}"/>
                    <TextBlock
                        Foreground="Red"
                        HorizontalAlignment="Stretch"
--- a/src/Ryujinx/UI/Models/Input/GamepadInputConfig.cs
+++ b/src/Ryujinx/UI/Models/Input/GamepadInputConfig.cs
@@ -10,7 +10,6 @@ namespace Ryujinx.Ava.UI.Models.Input
    public partial class GamepadInputConfig : BaseModel
    {
        public bool EnableCemuHookMotion { get; set; }
-        public bool EnableHandheldMotion { get; set; }
        public string DsuServerHost { get; set; }
        public int DsuServerPort { get; set; }
        public int Slot { get; set; }
@@ -163,7 +162,7 @@ namespace Ryujinx.Ava.UI.Models.Input
                    EnableMotion = controllerInput.Motion.EnableMotion;
                    GyroDeadzone = controllerInput.Motion.GyroDeadzone;
                    Sensitivity = controllerInput.Motion.Sensitivity;
-                    EnableHandheldMotion = controllerInput.Motion.MotionBackend == MotionInputBackendType.Handheld;
+
                    if (controllerInput.Motion is CemuHookMotionConfigController cemuHook)
                    {
                        EnableCemuHookMotion = true;
@@ -286,7 +285,7 @@ namespace Ryujinx.Ava.UI.Models.Input
                config.Motion = new StandardMotionConfigController
                {
                    EnableMotion = EnableMotion,
-                    MotionBackend = EnableHandheldMotion ? MotionInputBackendType.Handheld : MotionInputBackendType.GamepadDriver,
+                    MotionBackend = MotionInputBackendType.GamepadDriver,
                    GyroDeadzone = GyroDeadzone,
                    Sensitivity = Sensitivity,
                };
--- a/src/Ryujinx/UI/ViewModels/ApplicationDataViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/ApplicationDataViewModel.cs
@@ -1,6 +1,7 @@
 using Gommon;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.PlayReport;

 namespace Ryujinx.Ava.UI.ViewModels
 {
@@ -10,6 +11,11 @@ namespace Ryujinx.Ava.UI.ViewModels

        public ApplicationDataViewModel(ApplicationData appData) => AppData = appData;

+        public string DynamicRichPresenceDescription =>
+            AppData.HasDynamicRichPresenceSupport
+                ? AppData.RichPresenceSpec.Value.Description
+                : GameSpec.DefaultDescription;
+
        public string FormattedVersion => LocaleManager.Instance[LocaleKeys.GameListHeaderVersion].Format(AppData.Version);
        public string FormattedDeveloper => LocaleManager.Instance[LocaleKeys.GameListHeaderDeveloper].Format(AppData.Developer);
        public string FormattedFileExtension => LocaleManager.Instance[LocaleKeys.GameListHeaderFileExtension].Format(AppData.FileExtension);
--- a/src/Ryujinx/UI/ViewModels/Input/MotionInputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/MotionInputViewModel.cs
@@ -18,34 +18,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input

        [ObservableProperty] private double _gyroDeadzone;

-        private bool _enableCemuHookMotion;
-        public bool EnableCemuHookMotion
-        {
-            get => _enableCemuHookMotion;
-            set
-            {
-                if (value)
-                {
-                    EnableHandheldMotion = false;
-                }
-                _enableCemuHookMotion = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private bool _enableHandheldMotion;
-        public bool EnableHandheldMotion
-        {
-            get => _enableHandheldMotion;
-            set
-            {
-                if (value)
-                {
-                    EnableCemuHookMotion = false;
-                }
-                _enableHandheldMotion = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private bool _enableCemuHookMotion;
    }
 }
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -1347,6 +1347,25 @@ namespace Ryujinx.Ava.UI.ViewModels
            OpenHelper.OpenFolder(AppDataManager.BaseDirPath);
        }

+        public void OpenScreenshotsFolder()
+        {
+            string screenshotsDir = Path.Combine(AppDataManager.BaseDirPath, "screenshots");
+
+            try
+            {
+                if (!Directory.Exists(screenshotsDir))
+                    Directory.CreateDirectory(screenshotsDir);
+            }
+            catch (Exception ex)
+            {
+                Logger.Error?.Print(LogClass.Application, $"Failed to create directory at path {screenshotsDir}. Error : {ex.GetType().Name}", "Screenshot");
+
+                return;
+            }
+            
+            OpenHelper.OpenFolder(screenshotsDir);
+        }
+
        public void OpenLogsFolder()
        {
            string logPath = AppDataManager.GetOrCreateLogsDir();
--- a/src/Ryujinx/UI/Views/Input/MotionInputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/MotionInputView.axaml
@@ -61,17 +61,6 @@
                    Margin="5, 0"
                    Text="{Binding GyroDeadzone, StringFormat=\{0:0.00\}}" />
            </StackPanel>
-            <Separator
-                Height="1"
-                Margin="0,5" />
-            <CheckBox
-                Margin="5"
-                IsChecked="{Binding EnableHandheldMotion}">
-                <TextBlock
-                    Margin="0,3,0,0"
-                    VerticalAlignment="Center"
-                    Text="{ext:Locale ControllerSettingsMotionUseHandheldCompatibleMotion}" />
-            </CheckBox>
            <Separator
                Height="1"
                Margin="0,5" />
--- a/src/Ryujinx/UI/Views/Input/MotionInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/MotionInputView.axaml.cs
@@ -30,7 +30,6 @@ namespace Ryujinx.Ava.UI.Views.Input
                Sensitivity = config.Sensitivity,
                GyroDeadzone = config.GyroDeadzone,
                EnableCemuHookMotion = config.EnableCemuHookMotion,
-                EnableHandheldMotion = config.EnableHandheldMotion,
            };

            InitializeComponent();
@@ -59,7 +58,6 @@ namespace Ryujinx.Ava.UI.Views.Input
                config.DsuServerHost = content._viewModel.DsuServerHost;
                config.DsuServerPort = content._viewModel.DsuServerPort;
                config.EnableCemuHookMotion = content._viewModel.EnableCemuHookMotion;
-                config.EnableHandheldMotion = content._viewModel.EnableHandheldMotion;
                config.MirrorInput = content._viewModel.MirrorInput;
            };

--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
@@ -66,6 +66,10 @@
                    Command="{Binding OpenRyujinxFolder}"
                    Header="{ext:Locale MenuBarFileOpenEmuFolder}"
                    ToolTip.Tip="{ext:Locale OpenRyujinxFolderTooltip}" />
+                <MenuItem
+                    Command="{Binding OpenScreenshotsFolder}"
+                    Header="{ext:Locale MenuBarFileOpenScreenshotsFolder}"
+                    ToolTip.Tip="{ext:Locale OpenScreenshotFolderTooltip}"/>
                <MenuItem
                    Command="{Binding OpenLogsFolder}"
                    Header="{ext:Locale MenuBarFileOpenLogsFolder}"
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
@@ -31,7 +31,6 @@ using Ryujinx.HLE.HOS;
 using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.Input.HLE;
 using Ryujinx.Input.SDL2;
-using Ryujinx.Input.SDL3;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -110,7 +109,7 @@ namespace Ryujinx.Ava.UI.Windows

            if (Program.PreviewerDetached)
            {
-                InputManager = new InputManager(new AvaloniaKeyboardDriver(this), new SDL2GamepadDriver(), new SDL3MotionDriver());
+                InputManager = new InputManager(new AvaloniaKeyboardDriver(this), new SDL2GamepadDriver());

                _ = this.GetObservable(IsActiveProperty).Subscribe(it => ViewModel.IsActive = it);
                this.ScalingChanged += OnScalingChanged;
--- a/src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs
+++ b/src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs
@@ -10,6 +10,7 @@ using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Utilities.Compat;
+using Ryujinx.Ava.Utilities.PlayReport;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.Loaders.Processes.Extensions;
@@ -35,9 +36,14 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
            {
                _id = value;

-                Compatibility = CompatibilityCsv.Find(Id);
+                Compatibility = CompatibilityCsv.Find(value);
+                RichPresenceSpec = PlayReports.Analyzer.TryGetSpec(IdString, out GameSpec gameSpec) 
+                    ? gameSpec 
+                    : default(Optional<GameSpec>);
            }
        }
+        public Optional<GameSpec> RichPresenceSpec { get; set; }
+        
        public string Developer { get; set; } = "Unknown";
        public string Version { get; set; } = "0";
        public int PlayerCount { get; set; }
@@ -46,7 +52,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
        public bool HasLdnGames => PlayerCount != 0 && GameCount != 0;

        public bool HasRichPresenceAsset => DiscordIntegrationModule.HasAssetImage(IdString);
-        public bool HasDynamicRichPresenceSupport => DiscordIntegrationModule.HasAnalyzer(IdString);
+        public bool HasDynamicRichPresenceSupport => RichPresenceSpec.HasValue;
        
        public TimeSpan TimePlayed { get; set; }
        public DateTime? LastPlayed { get; set; }
--- a/src/Ryujinx/Utilities/PlayReport/Analyzer.cs
+++ b/src/Ryujinx/Utilities/PlayReport/Analyzer.cs
@@ -20,6 +20,11 @@ namespace Ryujinx.Ava.Utilities.PlayReport

        public IReadOnlyList<GameSpec> Specs => new ReadOnlyCollection<GameSpec>(_specs);

+        public GameSpec GetSpec(string titleId) => _specs.First(x => x.TitleIds.ContainsIgnoreCase(titleId));
+
+        public bool TryGetSpec(string titleId, out GameSpec gameSpec)
+            => (gameSpec = _specs.FirstOrDefault(x => x.TitleIds.ContainsIgnoreCase(titleId))) != null;
+
        /// <summary>
        /// Add an analysis spec matching a specific game by title ID, with the provided spec configuration.
        /// </summary>
@@ -128,13 +133,13 @@ namespace Ryujinx.Ava.Utilities.PlayReport
        {
            if (!playReport.ReportData.IsDictionary)
                return FormattedValue.Unhandled;
-
-            if (!_specs.TryGetFirst(s => runningGameId.EqualsAnyIgnoreCase(s.TitleIds), out GameSpec spec))
+            
+            if (!TryGetSpec(runningGameId, out GameSpec spec))
                return FormattedValue.Unhandled;

            foreach (FormatterSpecBase formatSpec in spec.ValueFormatters.OrderBy(x => x.Priority))
            {
-                if (!formatSpec.Format(appMeta, playReport, out FormattedValue value))
+                if (!formatSpec.TryFormat(appMeta, playReport, out FormattedValue value))
                    continue;

                return value;
--- a/src/Ryujinx/Utilities/PlayReport/PlayReports.cs
+++ b/src/Ryujinx/Utilities/PlayReport/PlayReports.cs
@@ -9,72 +9,89 @@ namespace Ryujinx.Ava.Utilities.PlayReport
            // init lazy value
            _ = Analyzer;
        }
-        
+
        public static Analyzer Analyzer => _analyzerLazy.Value;

-        private static readonly Lazy<Analyzer> _analyzerLazy = new(() =>
-            new Analyzer()
-                .AddSpec(
-                    "01007ef00011e000",
-                    spec => spec
-                        .AddValueFormatter("IsHardMode", BreathOfTheWild_MasterMode)
-                        // reset to normal status when switching between normal & master mode in title screen
-                        .AddValueFormatter("AoCVer", FormattedValue.SingleAlwaysResets)
-                )
-                .AddSpec(
-                    "0100f2c0115b6000",
-                    spec => spec
-                        .AddValueFormatter("PlayerPosY", TearsOfTheKingdom_CurrentField))
-                .AddSpec(
-                    "0100000000010000",
-                    spec =>
-                        spec.AddValueFormatter("is_kids_mode", SuperMarioOdyssey_AssistMode)
-                )
-                .AddSpec(
-                    "010075000ecbe000",
-                    spec =>
-                        spec.AddValueFormatter("is_kids_mode", SuperMarioOdysseyChina_AssistMode)
-                )
-                .AddSpec(
-                    "010028600ebda000",
-                    spec => spec.AddValueFormatter("mode", SuperMario3DWorldOrBowsersFury)
-                )
-                .AddSpec( // Global & China IDs
-                    ["0100152000022000", "010075100e8ec000"],
-                    spec => spec.AddValueFormatter("To", MarioKart8Deluxe_Mode)
-                )
-                .AddSpec(
-                    ["0100a3d008c5c000", "01008f6008c5e000"],
-                    spec => spec
-                        .AddValueFormatter("area_no", PokemonSVArea)
-                        .AddValueFormatter("team_circle", PokemonSVUnionCircle)
-                )
-                .AddSpec(
-                    "01006a800016e000",
-                    spec => spec
-                        .AddSparseMultiValueFormatter(
-                            [
-                                // Metadata to figure out what PlayReport we have.
-                                "match_mode", "match_submode", "anniversary", "fighter", "reason", "challenge_count",
-                                "adv_slot",
-                                // List of Fighters
-                                "player_1_fighter", "player_2_fighter", "player_3_fighter", "player_4_fighter",
-                                "player_5_fighter", "player_6_fighter", "player_7_fighter", "player_8_fighter",
-                                // List of rankings/placements
-                                "player_1_rank", "player_2_rank", "player_3_rank", "player_4_rank", "player_5_rank",
-                                "player_6_rank", "player_7_rank", "player_8_rank"
-                            ],
-                            SuperSmashBrosUltimate_Mode
-                        )
-                )
-                .AddSpec(
-                    [
-                        "0100c9a00ece6000", "01008d300c50c000", "0100d870045b6000",
-                        "010012f017576000", "0100c62011050000", "0100b3c014bda000"
-                    ],
-                    spec => spec.AddValueFormatter("launch_title_id", NsoEmulator_LaunchedGame)
-                )
-                .AddSpec("01002da013484000", spec => spec.AddValueFormatter("rupees", SkywardSwordHD_Rupees))
+        private static readonly Lazy<Analyzer> _analyzerLazy = new(() => new Analyzer()
+            .AddSpec(
+                "01007ef00011e000",
+                spec => spec
+                    .WithDescription("based on being in Master Mode.")
+                    .AddValueFormatter("IsHardMode", BreathOfTheWild_MasterMode)
+                    // reset to normal status when switching between normal & master mode in title screen
+                    .AddValueFormatter("AoCVer", FormattedValue.SingleAlwaysResets)
+            )
+            .AddSpec(
+                "0100f2c0115b6000",
+                spec => spec
+                    .WithDescription("based on where you are in Hyrule (Depths, Surface, Sky).")
+                    .AddValueFormatter("PlayerPosY", TearsOfTheKingdom_CurrentField))
+            .AddSpec(
+                "01002da013484000",
+                spec => spec
+                    .WithDescription("based on how many Rupees you have.")
+                    .AddValueFormatter("rupees", SkywardSwordHD_Rupees))
+            .AddSpec(
+                "0100000000010000",
+                spec => spec
+                    .WithDescription("based on if you're playing with Assist Mode.")
+                    .AddValueFormatter("is_kids_mode", SuperMarioOdyssey_AssistMode)
+            )
+            .AddSpec(
+                "010075000ecbe000",
+                spec => spec
+                    .WithDescription("based on if you're playing with Assist Mode.")
+                    .AddValueFormatter("is_kids_mode", SuperMarioOdysseyChina_AssistMode)
+            )
+            .AddSpec(
+                "010028600ebda000",
+                spec => spec
+                    .WithDescription("based on being in either Super Mario 3D World or Bowser's Fury.")
+                    .AddValueFormatter("mode", SuperMario3DWorldOrBowsersFury)
+            )
+            .AddSpec( // Global & China IDs
+                ["0100152000022000", "010075100e8ec000"],
+                spec => spec
+                    .WithDescription(
+                        "based on what modes you're selecting in the menu & whether or not you're in a race.")
+                    .AddValueFormatter("To", MarioKart8Deluxe_Mode)
+            )
+            .AddSpec(
+                ["0100a3d008c5c000", "01008f6008c5e000"],
+                spec => spec
+                    .WithDescription("based on what area of Paldea you're exploring.")
+                    .AddValueFormatter("area_no", PokemonSVArea)
+                    .AddValueFormatter("team_circle", PokemonSVUnionCircle)
+            )
+            .AddSpec(
+                "01006a800016e000",
+                spec => spec
+                    .WithDescription("based on what mode you're playing, who won, and what characters were present.")
+                    .AddSparseMultiValueFormatter(
+                        [
+                            // Metadata to figure out what PlayReport we have.
+                            "match_mode", "match_submode", "anniversary", "fighter", "reason", "challenge_count",
+                            "adv_slot",
+                            // List of Fighters
+                            "player_1_fighter", "player_2_fighter", "player_3_fighter", "player_4_fighter",
+                            "player_5_fighter", "player_6_fighter", "player_7_fighter", "player_8_fighter",
+                            // List of rankings/placements
+                            "player_1_rank", "player_2_rank", "player_3_rank", "player_4_rank", "player_5_rank",
+                            "player_6_rank", "player_7_rank", "player_8_rank"
+                        ],
+                        SuperSmashBrosUltimate_Mode
+                    )
+            )
+            .AddSpec(
+                [
+                    "0100c9a00ece6000", "01008d300c50c000", "0100d870045b6000",
+                    "010012f017576000", "0100c62011050000", "0100b3c014bda000"
+                ],
+                spec => spec
+                    .WithDescription(
+                        "based on what game you first launch.\n\nNSO emulators do not print any Play Report information past the first game launch so it's all we got.")
+                    .AddValueFormatter("launch_title_id", NsoEmulator_LaunchedGame)
+            )
        );

        private static string Playing(string game) => $"Playing {game}";
--- a/src/Ryujinx/Utilities/PlayReport/Specs.cs
+++ b/src/Ryujinx/Utilities/PlayReport/Specs.cs
@@ -23,6 +23,20 @@ namespace Ryujinx.Ava.Utilities.PlayReport

        public required string[] TitleIds { get; init; }

+        public const string DefaultDescription = "Formats the details on your Discord presence based on logged data from the game.";
+
+        private string _valueDescription;
+
+        public string Description => _valueDescription ?? DefaultDescription;
+
+        public GameSpec WithDescription(string description)
+        {
+            _valueDescription = description != null
+                ? $"Formats the details on your Discord presence {description}"
+                : null;
+            return this;
+        }
+        
        public List<FormatterSpecBase> ValueFormatters { get; } = [];


@@ -197,7 +211,7 @@ namespace Ryujinx.Ava.Utilities.PlayReport
        public string[] ReportKeys { get; init; }
        public Delegate Formatter { get; init; }

-        public bool Format(ApplicationMetadata appMeta, Horizon.Prepo.Types.PlayReport playReport,
+        public bool TryFormat(ApplicationMetadata appMeta, Horizon.Prepo.Types.PlayReport playReport,
            out FormattedValue formattedValue)
        {
            formattedValue = default;
Author	SHA1	Message	Date
Vudjun	61975ca44d	Add logging in socket implementation (#661 ) Adds logging to most Socket calls to help with debugging network issues. Shouldn't affect any functionality. There's a small chance it could spam the log in some games.	2025-02-16 01:03:44 -06:00
Evan Husted	66054dd225	UI: RPC: Remove git hash from RPC ryujinx logo hover information	2025-02-16 00:58:25 -06:00
Evan Husted	b1f61e5143	misc: chore: [ci skip] Reformat PlayReports.cs	2025-02-15 20:52:03 -06:00
Evan Husted	0d7d0e8092	UI: Add descriptions of what each dynamic RPC formatter actually shows when hovering whether it has support in the game info popup	2025-02-15 20:45:27 -06:00
Evan Husted	aa2178dbe5	UI: Button to open screenshots folder in File menu	2025-02-15 20:25:17 -06:00