From 0cfc4ba805613bb7e8822a342924fda475bde63c Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Fri, 8 Mar 2024 17:35:03 +0000 Subject: [PATCH 1/3] refactor: remove dx9 --- src/XIVLauncher.Core/Components/MainPage/MainPage.cs | 4 ++-- .../Components/SettingsPage/Tabs/SettingsTabGame.cs | 5 ----- src/XIVLauncher.Core/Configuration/ILauncherConfig.cs | 2 -- src/XIVLauncher.Core/Program.cs | 1 - src/XIVLauncher.Core/Support/Troubleshooting.cs | 9 +++------ 5 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/XIVLauncher.Core/Components/MainPage/MainPage.cs b/src/XIVLauncher.Core/Components/MainPage/MainPage.cs index 7f72dfb0..9b62d4d1 100644 --- a/src/XIVLauncher.Core/Components/MainPage/MainPage.cs +++ b/src/XIVLauncher.Core/Components/MainPage/MainPage.cs @@ -653,7 +653,7 @@ public async Task StartGameAndAddon(Launcher.LoginResult loginResult, b */ } - if (App.Settings.DalamudEnabled.GetValueOrDefault(true) && !forceNoDalamud && App.Settings.IsDx11.GetValueOrDefault(true)) + if (App.Settings.DalamudEnabled.GetValueOrDefault(true) && !forceNoDalamud) { try { @@ -829,7 +829,7 @@ public async Task StartGameAndAddon(Launcher.LoginResult loginResult, b isSteam, gameArgs, App.Settings.GamePath, - App.Settings.IsDx11 ?? true, + true, App.Settings.ClientLanguage.GetValueOrDefault(ClientLanguage.English), App.Settings.IsEncryptArgs.GetValueOrDefault(true), App.Settings.DpiAwareness.GetValueOrDefault(DpiAwareness.Unaware)); diff --git a/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabGame.cs b/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabGame.cs index ccea203d..fa319e37 100644 --- a/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabGame.cs +++ b/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabGame.cs @@ -28,11 +28,6 @@ public class SettingsTabGame : SettingsTab CheckVisibility = () => Environment.OSVersion.Platform == PlatformID.Unix, }, - new SettingsEntry("Use DirectX11", "Use the modern DirectX11 version of the game.", () => Program.Config.IsDx11 ?? true, x => Program.Config.IsDx11 = x) - { - CheckWarning = x => !x ? "DirectX 9 is no longer supported by the game or Dalamud. Things may not work." : null - }, - new SettingsEntry("Additional Game Arguments", "Follows Steam conventions: VAR1=value VAR2=value %command% -arg1 -arg2.\nCan't pass programs (like gamescope -- %command%). Does not accept flatpak args (--parent-pid=1, etc.)", () => Program.Config.AdditionalArgs, x => Program.Config.AdditionalArgs = x), new SettingsEntry("Game Language", "Select the game's language.", () => Program.Config.ClientLanguage ?? ClientLanguage.English, x => Program.Config.ClientLanguage = x), new SettingsEntry("Game DPI Awareness", "Select the game's DPI Awareness. Change this if the game's scaling looks wrong.", () => Program.Config.DpiAwareness ?? DpiAwareness.Unaware, x => Program.Config.DpiAwareness = x), diff --git a/src/XIVLauncher.Core/Configuration/ILauncherConfig.cs b/src/XIVLauncher.Core/Configuration/ILauncherConfig.cs index ed7fb2be..bfc4a4a2 100644 --- a/src/XIVLauncher.Core/Configuration/ILauncherConfig.cs +++ b/src/XIVLauncher.Core/Configuration/ILauncherConfig.cs @@ -38,8 +38,6 @@ public interface ILauncherConfig public List? Addons { get; set; } - public bool? IsDx11 { get; set; } - public bool? IsEncryptArgs { get; set; } public bool? IsFt { get; set; } diff --git a/src/XIVLauncher.Core/Program.cs b/src/XIVLauncher.Core/Program.cs index 071c0c31..865d52e4 100644 --- a/src/XIVLauncher.Core/Program.cs +++ b/src/XIVLauncher.Core/Program.cs @@ -103,7 +103,6 @@ private static void LoadConfig(Storage storage) Config.DoVersionCheck ??= true; Config.FontPxSize ??= 22.0f; - Config.IsDx11 ??= true; Config.IsEncryptArgs ??= true; Config.IsFt ??= false; Config.IsOtpServer ??= false; diff --git a/src/XIVLauncher.Core/Support/Troubleshooting.cs b/src/XIVLauncher.Core/Support/Troubleshooting.cs index 8c3cbdcb..7acf08b0 100644 --- a/src/XIVLauncher.Core/Support/Troubleshooting.cs +++ b/src/XIVLauncher.Core/Support/Troubleshooting.cs @@ -29,7 +29,7 @@ public static void LogException(Exception exception, string context) try { - var fixedContext = context?.Split(new []{'\r', '\n'}, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault(); + var fixedContext = context?.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault(); var payload = new ExceptionPayload { @@ -65,7 +65,7 @@ internal static void LogTroubleshooting() internal static string GetTroubleshootingJson() { - + var gamePath = Program.Config.GamePath; var integrity = TroubleshootingPayload.IndexIntegrityResult.Success; @@ -93,7 +93,7 @@ internal static string GetTroubleshootingJson() { integrity = TroubleshootingPayload.IndexIntegrityResult.Exception; } - + var ffxivVer = Repository.Ffxiv.GetVer(gamePath); var ffxivVerBck = Repository.Ffxiv.GetVer(gamePath, true); var ex1Ver = Repository.Ex1.GetVer(gamePath); @@ -108,7 +108,6 @@ internal static string GetTroubleshootingJson() var payload = new TroubleshootingPayload { When = DateTime.Now, - IsDx11 = Program.Config.IsDx11.GetValueOrDefault(), IsAutoLogin = Program.Config.IsAutologin.GetValueOrDefault(), IsUidCache = Program.Config.IsUidCacheEnabled.GetValueOrDefault(), DalamudEnabled = Program.Config.DalamudEnabled.GetValueOrDefault(), @@ -149,8 +148,6 @@ private class TroubleshootingPayload { public DateTime When { get; set; } - public bool IsDx11 { get; set; } - public bool IsAutoLogin { get; set; } public bool IsUidCache { get; set; } From 551b59ef3a37cae81a8a67c7e0c16e502a740464 Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Wed, 13 Mar 2024 23:45:48 +0000 Subject: [PATCH 2/3] refactor: update submodule to remove dx11 bool --- lib/FFXIVQuickLauncher | 2 +- src/XIVLauncher.Core/Components/MainPage/MainPage.cs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/FFXIVQuickLauncher b/lib/FFXIVQuickLauncher index c8a5471e..8bee1b2f 160000 --- a/lib/FFXIVQuickLauncher +++ b/lib/FFXIVQuickLauncher @@ -1 +1 @@ -Subproject commit c8a5471e0343c5ef89ccce698179324c44a3bce9 +Subproject commit 8bee1b2f60a6f0ee7009379b065969471c9bca30 diff --git a/src/XIVLauncher.Core/Components/MainPage/MainPage.cs b/src/XIVLauncher.Core/Components/MainPage/MainPage.cs index 9b62d4d1..dd4ac281 100644 --- a/src/XIVLauncher.Core/Components/MainPage/MainPage.cs +++ b/src/XIVLauncher.Core/Components/MainPage/MainPage.cs @@ -168,7 +168,7 @@ public async Task Login(string username, string password, bool isOtp, bool else gameRunner = new UnixGameRunner(Program.CompatibilityTools, null, false); - App.Launcher.LaunchGame(gameRunner, "0", 1, 2, false, "", App.Settings.GamePath!, true, ClientLanguage.Japanese, true, DpiAwareness.Unaware); + App.Launcher.LaunchGame(gameRunner, "0", 1, 2, false, "", App.Settings.GamePath!, ClientLanguage.Japanese, true, DpiAwareness.Unaware); return false; } @@ -829,7 +829,6 @@ public async Task StartGameAndAddon(Launcher.LoginResult loginResult, b isSteam, gameArgs, App.Settings.GamePath, - true, App.Settings.ClientLanguage.GetValueOrDefault(ClientLanguage.English), App.Settings.IsEncryptArgs.GetValueOrDefault(true), App.Settings.DpiAwareness.GetValueOrDefault(DpiAwareness.Unaware)); From 4fc7c1d2de43475664184784bd1a6856b8f54bb2 Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Tue, 19 Mar 2024 07:00:07 +0000 Subject: [PATCH 3/3] chore: update submodule --- lib/FFXIVQuickLauncher | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/FFXIVQuickLauncher b/lib/FFXIVQuickLauncher index 8bee1b2f..e2810d23 160000 --- a/lib/FFXIVQuickLauncher +++ b/lib/FFXIVQuickLauncher @@ -1 +1 @@ -Subproject commit 8bee1b2f60a6f0ee7009379b065969471c9bca30 +Subproject commit e2810d23144d8acf63e3259d9e34f1acd958359e