misc: Code cleanups & remove references to Patreon & Twitter.

.github/workflows/build.yml

@@ -6,7 +6,7 @@ on:
 env:
   POWERSHELL_TELEMETRY_OPTOUT: 1
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
-  RYUJINX_BASE_VERSION: "1.1.0"
+  RYUJINX_BASE_VERSION: "1.2.0"
 
 jobs:
   build:

.github/workflows/nightly_pr_comment.yml

@@ -9,7 +9,6 @@ jobs:
   pr_comment:
     if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
     runs-on: ubuntu-latest
-    timeout-minutes: ${{ fromJSON(vars.JOB_TIMEOUT) }}
     steps:
       - uses: actions/github-script@v6
         with:
@@ -39,24 +38,19 @@ jobs:
               return core.error(`No artifacts found`);
             }
             let body = `Download the artifacts for this pull request:\n`;
-            let hidden_gtk_artifacts = `\n\n <details><summary>Old GUI (GTK3)</summary>\n`;
             let hidden_headless_artifacts = `\n\n <details><summary>GUI-less (SDL2)</summary>\n`;
             let hidden_debug_artifacts = `\n\n <details><summary>Only for Developers</summary>\n`;
             for (const art of artifacts) {
               if(art.name.includes('Debug')) {
                 hidden_debug_artifacts += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
-              } else if(art.name.includes('gtk-ryujinx')) {
-                hidden_gtk_artifacts += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
               } else if(art.name.includes('sdl2-ryujinx-headless')) {
                 hidden_headless_artifacts += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
               } else {
                 body += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
               }
             }
-            hidden_gtk_artifacts += `\n</details>`;
             hidden_headless_artifacts += `\n</details>`;
             hidden_debug_artifacts += `\n</details>`;
-            body += hidden_gtk_artifacts;
             body += hidden_headless_artifacts;
             body += hidden_debug_artifacts;
 

src/Ryujinx.Common/Pools/ObjectPool.cs

@@ -3,19 +3,11 @@
 
 namespace Ryujinx.Common
 {
-    public class ObjectPool<T>
+    public class ObjectPool<T>(Func<T> factory, int size)
         where T : class
     {
         private T _firstItem;
-        private readonly T[] _items;
-
-        private readonly Func<T> _factory;
-
-        public ObjectPool(Func<T> factory, int size)
-        {
-            _items = new T[size - 1];
-            _factory = factory;
-        }
+        private readonly T[] _items = new T[size - 1];
 
         public T Allocate()
         {
@@ -43,7 +35,7 @@ private T AllocateInternal()
                 }
             }
 
-            return _factory();
+            return factory();
         }
 
         public void Release(T obj)

src/Ryujinx.Common/ReactiveObject.cs

@@ -47,15 +47,9 @@ public static implicit operator T(ReactiveObject<T> obj)
         }
     }
 
-    public class ReactiveEventArgs<T>
+    public class ReactiveEventArgs<T>(T oldValue, T newValue)
     {
-        public T OldValue { get; }
-        public T NewValue { get; }
-
-        public ReactiveEventArgs(T oldValue, T newValue)
-        {
-            OldValue = oldValue;
-            NewValue = newValue;
-        }
+        public T OldValue { get; } = oldValue;
+        public T NewValue { get; } = newValue;
     }
 }

src/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs

@@ -158,10 +158,7 @@ private void ParseErrorCommonArg()
 
             if (message == "")
             {
-                message = "An error has occured.\n\n"
-                        + "Please try again later.\n\n"
-                        + "If the problem persists, please refer to the Ryujinx website.\n"
-                        + "www.ryujinx.org";
+                message = "An error has occured.\n\nPlease try again later.";
             }
 
             string[] buttons = GetButtonsText(module, description, "DlgBtn");

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

@@ -659,7 +659,7 @@ public ResultCode PrepareForJit(ServiceCtx context)
 
                 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/Ryujinx/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 @@ FontInfo CreateFont(string name)
                                 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/Ryujinx/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/HOS/Services/Ssl/BuiltInCertificateManager.cs

@@ -23,7 +23,7 @@ class BuiltInCertificateManager
     {
         private const long CertStoreTitleId = 0x0100000000000800;
 
-        private const string CertStoreTitleMissingErrorMessage = "CertStore system title not found! SSL CA retrieving will not work, provide the system archive to fix this error. (See https://github.com/Ryujinx/Ryujinx/wiki/Ryujinx-Setup-&-Configuration-Guide#initial-setup-continued---installation-of-firmware for more information)";
+        private const string CertStoreTitleMissingErrorMessage = "CertStore system title not found! SSL CA retrieving will not work, provide the system archive to fix this error.";
 
         private static BuiltInCertificateManager _instance;
 

src/Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZoneContentManager.cs

@@ -23,7 +23,7 @@ public class TimeZoneContentManager
     {
         private const long TimeZoneBinaryTitleId = 0x010000000000080E;
 
-        private const string TimeZoneSystemTitleMissingErrorMessage = "TimeZoneBinary system title not found! TimeZone conversions will not work, provide the system archive to fix this error. (See https://github.com/Ryujinx/Ryujinx/wiki/Ryujinx-Setup-&-Configuration-Guide#initial-setup-continued---installation-of-firmware for more information)";
+        private const string TimeZoneSystemTitleMissingErrorMessage = "TimeZoneBinary system title not found! TimeZone conversions will not work, provide the system archive to fix this error.";
 
         private VirtualFileSystem _virtualFileSystem;
         private IntegrityCheckLevel _fsIntegrityCheckLevel;

src/Ryujinx.UI.Common/Helper/FileAssociationHelper.cs

@@ -11,7 +11,7 @@ namespace Ryujinx.UI.Common.Helper
 {
     public static partial class FileAssociationHelper
     {
-        private static readonly string[] _fileExtensions = { ".nca", ".nro", ".nso", ".nsp", ".xci" };
+        private static readonly string[] _fileExtensions = [".nca", ".nro", ".nso", ".nsp", ".xci"];
 
         [SupportedOSPlatform("linux")]
         private static readonly string _mimeDbPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "share", "mime");

src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj

@@ -18,9 +18,7 @@
     <None Remove="Resources\Logo_Amiibo.png" />
     <None Remove="Resources\Logo_Discord.png" />
     <None Remove="Resources\Logo_GitHub.png" />
-    <None Remove="Resources\Logo_Patreon.png" />
     <None Remove="Resources\Logo_Ryujinx.png" />
-    <None Remove="Resources\Logo_Twitter.png" />
   </ItemGroup>
 
   <ItemGroup>
@@ -39,10 +37,6 @@
     <EmbeddedResource Include="Resources\Logo_Discord_Light.png" />
     <EmbeddedResource Include="Resources\Logo_GitHub_Dark.png" />
     <EmbeddedResource Include="Resources\Logo_GitHub_Light.png" />
-    <EmbeddedResource Include="Resources\Logo_Patreon_Dark.png" />
-    <EmbeddedResource Include="Resources\Logo_Patreon_Light.png" />
-    <EmbeddedResource Include="Resources\Logo_Twitter_Dark.png" />
-    <EmbeddedResource Include="Resources\Logo_Twitter_Light.png" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(RuntimeIdentifier)' == 'linux-x64' OR '$(RuntimeIdentifier)' == 'linux-arm64' OR '$(RuntimeIdentifier)' == ''">

src/Ryujinx.UI.Common/SystemInfo/SystemInfo.cs

@@ -33,17 +33,13 @@ public void Print()
         public static SystemInfo Gather()
         {
             if (OperatingSystem.IsWindows())
-            {
                 return new WindowsSystemInfo();
-            }
-            else if (OperatingSystem.IsLinux())
-            {
+
+            if (OperatingSystem.IsLinux())
                 return new LinuxSystemInfo();
-            }
-            else if (OperatingSystem.IsMacOS())
-            {
+
+            if (OperatingSystem.IsMacOS())
                 return new MacOSSystemInfo();
-            }
 
             Logger.Error?.Print(LogClass.Application, "SystemInfo unsupported on this platform");
 

src/Ryujinx.UI.Common/SystemInfo/WindowsSystemInfo.cs

@@ -40,7 +40,7 @@ private static string GetCpuNameWMI()
                 }
             }
 
-            return Environment.GetEnvironmentVariable("PROCESSOR_IDENTIFIER").Trim();
+            return Environment.GetEnvironmentVariable("PROCESSOR_IDENTIFIER")?.Trim();
         }
 
         [StructLayout(LayoutKind.Sequential)]

src/Ryujinx/App.axaml.cs

@@ -71,8 +71,7 @@ private void ShowRestartDialog()
 
                     if (result == UserResult.Yes)
                     {
-                        var path = Environment.ProcessPath;
-                        var proc = Process.Start(path, CommandLineState.Arguments);
+                        _ = Process.Start(Environment.ProcessPath!, CommandLineState.Arguments);
                         desktop.Shutdown();
                         Environment.Exit(0);
                     }

src/Ryujinx/AppHost.cs

@@ -825,7 +825,7 @@ private void InitializeSwitchInstance()
             {
                 renderer = new VulkanRenderer(
                     Vk.GetApi(),
-                    (RendererHost.EmbeddedWindow as EmbeddedWindowVulkan).CreateSurface,
+                    (RendererHost.EmbeddedWindow as EmbeddedWindowVulkan)!.CreateSurface,
                     VulkanHelper.GetRequiredInstanceExtensions,
                     ConfigurationState.Instance.Graphics.PreferredGpu.Value);
             }
@@ -845,36 +845,39 @@ private void InitializeSwitchInstance()
             Logger.Info?.PrintMsg(LogClass.Gpu, $"Backend Threading ({threadingMode}): {isGALThreaded}");
 
             // Initialize Configuration.
-            var memoryConfiguration = ConfigurationState.Instance.System.ExpandRam.Value ? MemoryConfiguration.MemoryConfiguration8GiB : MemoryConfiguration.MemoryConfiguration4GiB;
-
-            HLEConfiguration configuration = new(VirtualFileSystem,
-                                                 _viewModel.LibHacHorizonManager,
-                                                 ContentManager,
-                                                 _accountManager,
-                                                 _userChannelPersistence,
-                                                 renderer,
-                                                 InitializeAudio(),
-                                                 memoryConfiguration,
-                                                 _viewModel.UiHandler,
-                                                 (SystemLanguage)ConfigurationState.Instance.System.Language.Value,
-                                                 (RegionCode)ConfigurationState.Instance.System.Region.Value,
-                                                 ConfigurationState.Instance.Graphics.EnableVsync,
-                                                 ConfigurationState.Instance.System.EnableDockedMode,
-                                                 ConfigurationState.Instance.System.EnablePtc,
-                                                 ConfigurationState.Instance.System.EnableInternetAccess,
-                                                 ConfigurationState.Instance.System.EnableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
-                                                 ConfigurationState.Instance.System.FsGlobalAccessLogMode,
-                                                 ConfigurationState.Instance.System.SystemTimeOffset,
-                                                 ConfigurationState.Instance.System.TimeZone,
-                                                 ConfigurationState.Instance.System.MemoryManagerMode,
-                                                 ConfigurationState.Instance.System.IgnoreMissingServices,
-                                                 ConfigurationState.Instance.Graphics.AspectRatio,
-                                                 ConfigurationState.Instance.System.AudioVolume,
-                                                 ConfigurationState.Instance.System.UseHypervisor,
-                                                 ConfigurationState.Instance.Multiplayer.LanInterfaceId.Value,
-                                                 ConfigurationState.Instance.Multiplayer.Mode);
-
-            Device = new Switch(configuration);
+            var memoryConfiguration = ConfigurationState.Instance.System.ExpandRam 
+                ? MemoryConfiguration.MemoryConfiguration8GiB 
+                : MemoryConfiguration.MemoryConfiguration4GiB;
+
+            Device = new Switch(new HLEConfiguration(
+                VirtualFileSystem,
+                _viewModel.LibHacHorizonManager,
+                ContentManager,
+                _accountManager,
+                _userChannelPersistence,
+                renderer,
+                InitializeAudio(),
+                memoryConfiguration,
+                _viewModel.UiHandler,
+                (SystemLanguage)ConfigurationState.Instance.System.Language.Value,
+                (RegionCode)ConfigurationState.Instance.System.Region.Value,
+                ConfigurationState.Instance.Graphics.EnableVsync,
+                ConfigurationState.Instance.System.EnableDockedMode,
+                ConfigurationState.Instance.System.EnablePtc,
+                ConfigurationState.Instance.System.EnableInternetAccess,
+                ConfigurationState.Instance.System.EnableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
+                ConfigurationState.Instance.System.FsGlobalAccessLogMode,
+                ConfigurationState.Instance.System.SystemTimeOffset, 
+                ConfigurationState.Instance.System.TimeZone,
+                ConfigurationState.Instance.System.MemoryManagerMode,
+                ConfigurationState.Instance.System.IgnoreMissingServices,
+                ConfigurationState.Instance.Graphics.AspectRatio,
+                ConfigurationState.Instance.System.AudioVolume,
+                ConfigurationState.Instance.System.UseHypervisor,
+                ConfigurationState.Instance.Multiplayer.LanInterfaceId,
+                ConfigurationState.Instance.Multiplayer.Mode
+                )
+            );
         }
 
         private static IHardwareDeviceDriver InitializeAudio()

src/Ryujinx/Common/Locale/LocaleExtension.cs

@@ -6,33 +6,23 @@
 
 namespace Ryujinx.Ava.Common.Locale
 {
-    internal class LocaleExtension : MarkupExtension
+    internal class LocaleExtension(LocaleKeys key) : MarkupExtension
     {
-        public LocaleExtension(LocaleKeys key)
-        {
-            Key = key;
-        }
-
-        public LocaleKeys Key { get; }
+        public LocaleKeys Key { get; } = key;
 
         public override object ProvideValue(IServiceProvider serviceProvider)
         {
-            LocaleKeys keyToUse = Key;
-
             var builder = new CompiledBindingPathBuilder();
 
-            builder
-                .Property(new ClrPropertyInfo("Item",
-                obj => (LocaleManager.Instance[keyToUse]),
-                null,
-                typeof(string)), (weakRef, iPropInfo) =>
-                {
-                    return PropertyInfoAccessorFactory.CreateInpcPropertyAccessor(weakRef, iPropInfo);
-                });
-
-            var path = builder.Build();
+            builder.Property(
+                new ClrPropertyInfo("Item", 
+                    _ => LocaleManager.Instance[Key], 
+                    null, 
+                    typeof(string)
+                    ),
+                PropertyInfoAccessorFactory.CreateInpcPropertyAccessor);
 
-            var binding = new CompiledBindingExtension(path)
+            var binding = new CompiledBindingExtension(builder.Build())
             {
                 Source = LocaleManager.Instance
             };

src/Ryujinx/Program.cs

@@ -36,7 +36,7 @@ internal partial class Program
 
         private const uint MbIconwarning = 0x30;
 
-        public static void Main(string[] args)
+        public static int Main(string[] args)
         {
             Version = ReleaseInformation.Version;
 
@@ -51,7 +51,7 @@ public static void Main(string[] args)
 
             LoggerAdapter.Register();
 
-            BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+            return BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
         }
 
         public static AppBuilder BuildAvaloniaApp()

src/Ryujinx/UI/Applet/AvaloniaHostUITheme.cs

@@ -5,25 +5,15 @@
 
 namespace Ryujinx.Ava.UI.Applet
 {
-    class AvaloniaHostUITheme : IHostUITheme
+    class AvaloniaHostUITheme(MainWindow parent) : IHostUITheme
     {
-        public AvaloniaHostUITheme(MainWindow parent)
-        {
-            FontFamily = OperatingSystem.IsWindows() && OperatingSystem.IsWindowsVersionAtLeast(10, 0, 22000) ? "Segoe UI Variable" : parent.FontFamily.Name;
-            DefaultBackgroundColor = BrushToThemeColor(parent.Background);
-            DefaultForegroundColor = BrushToThemeColor(parent.Foreground);
-            DefaultBorderColor = BrushToThemeColor(parent.BorderBrush);
-            SelectionBackgroundColor = BrushToThemeColor(parent.ViewControls.SearchBox.SelectionBrush);
-            SelectionForegroundColor = BrushToThemeColor(parent.ViewControls.SearchBox.SelectionForegroundBrush);
-        }
-
-        public string FontFamily { get; }
+        public string FontFamily { get; } = OperatingSystem.IsWindows() && OperatingSystem.IsWindowsVersionAtLeast(10, 0, 22000) ? "Segoe UI Variable" : parent.FontFamily.Name;
 
-        public ThemeColor DefaultBackgroundColor { get; }
-        public ThemeColor DefaultForegroundColor { get; }
-        public ThemeColor DefaultBorderColor { get; }
-        public ThemeColor SelectionBackgroundColor { get; }
-        public ThemeColor SelectionForegroundColor { get; }
+        public ThemeColor DefaultBackgroundColor { get; } = BrushToThemeColor(parent.Background);
+        public ThemeColor DefaultForegroundColor { get; } = BrushToThemeColor(parent.Foreground);
+        public ThemeColor DefaultBorderColor { get; } = BrushToThemeColor(parent.BorderBrush);
+        public ThemeColor SelectionBackgroundColor { get; } = BrushToThemeColor(parent.ViewControls.SearchBox.SelectionBrush);
+        public ThemeColor SelectionForegroundColor { get; } = BrushToThemeColor(parent.ViewControls.SearchBox.SelectionForegroundBrush);
 
         private static ThemeColor BrushToThemeColor(IBrush brush)
         {