From fea122f928f8293c7361fcc1b8789ca03288c8dd Mon Sep 17 00:00:00 2001 From: pizzaboxer <41478239+pizzaboxer@users.noreply.github.com> Date: Mon, 16 Jan 2023 10:06:28 +0000 Subject: [PATCH] Followup on ReShade support Added ReShade/preset updating, UI fonts and Extravi's ReShade config --- Bloxstrap/Bootstrapper.cs | 7 +- .../BootstrapperDialogForm.cs | 2 + Bloxstrap/Dialogs/Preferences.xaml | 6 +- Bloxstrap/Dialogs/Preferences.xaml.cs | 5 + .../Helpers/Integrations/RbxFpsUnlocker.cs | 15 +- Bloxstrap/Helpers/Integrations/ReShade.cs | 233 +++++++++++++----- Bloxstrap/Helpers/Utilities.cs | 6 + Bloxstrap/Models/GithubCommit.cs | 28 --- Bloxstrap/Models/ReShadeVersionManifest.cs | 8 + Bloxstrap/Models/SettingsFormat.cs | 1 + 10 files changed, 202 insertions(+), 109 deletions(-) delete mode 100644 Bloxstrap/Models/GithubCommit.cs create mode 100644 Bloxstrap/Models/ReShadeVersionManifest.cs diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs index 66443a3..f46d55f 100644 --- a/Bloxstrap/Bootstrapper.cs +++ b/Bloxstrap/Bootstrapper.cs @@ -136,13 +136,10 @@ namespace Bloxstrap Program.SettingsManager.Save(); - if (Program.IsFirstRun && Program.IsNoLaunch) Dialog.ShowSuccess($"{Program.ProjectName} has successfully installed"); else if (!Program.IsNoLaunch) await StartRoblox(); - - Program.Exit(); } private async Task CheckForUpdates() @@ -184,9 +181,11 @@ namespace Bloxstrap foreach (string arg in Program.LaunchArgs) startInfo.ArgumentList.Add(arg); + Program.SettingsManager.Save(); + Process.Start(startInfo); - Program.Exit(); + Environment.Exit(0); } private async Task CheckLatestVersion() diff --git a/Bloxstrap/Dialogs/BootstrapperDialogs/BootstrapperDialogForm.cs b/Bloxstrap/Dialogs/BootstrapperDialogs/BootstrapperDialogForm.cs index 425df1b..963b3b6 100644 --- a/Bloxstrap/Dialogs/BootstrapperDialogs/BootstrapperDialogForm.cs +++ b/Bloxstrap/Dialogs/BootstrapperDialogs/BootstrapperDialogForm.cs @@ -112,6 +112,8 @@ namespace Bloxstrap.Dialogs.BootstrapperDialogs ShowError(message); } #endif + + Program.Exit(); } public virtual void ShowSuccess(string message) diff --git a/Bloxstrap/Dialogs/Preferences.xaml b/Bloxstrap/Dialogs/Preferences.xaml index 9f90e0f..d907b74 100644 --- a/Bloxstrap/Dialogs/Preferences.xaml +++ b/Bloxstrap/Dialogs/Preferences.xaml @@ -58,10 +58,12 @@ - + +