Update Bootstrapper.cs

This commit is contained in:
idkthegithub 2023-05-15 11:56:46 +02:00
parent c7083ba184
commit 82ff710eb3

View File

@ -17,6 +17,7 @@ using Bloxstrap.Enums;
using Bloxstrap.Integrations; using Bloxstrap.Integrations;
using Bloxstrap.Models; using Bloxstrap.Models;
using Bloxstrap.Tools; using Bloxstrap.Tools;
using System.Globalization;
namespace Bloxstrap namespace Bloxstrap
{ {
@ -110,10 +111,6 @@ namespace Bloxstrap
{ {
App.Logger.WriteLine($"[Bootstrapper::SetStatus] {message}"); App.Logger.WriteLine($"[Bootstrapper::SetStatus] {message}");
// yea idk
if (App.Settings.Prop.BootstrapperStyle == BootstrapperStyle.ByfronDialog)
message = message.Replace("...", "");
if (Dialog is not null) if (Dialog is not null)
Dialog.Message = message; Dialog.Message = message;
} }
@ -216,8 +213,15 @@ namespace Bloxstrap
} }
private async Task CheckLatestVersion() private async Task CheckLatestVersion()
{
if (App.Settings.Prop.RemoveRobloxText == true)
{
SetStatus("Connecting to " + App.Settings.Prop.BootstrapperTitle + "...");
}
else
{ {
SetStatus("Connecting to Roblox..."); SetStatus("Connecting to Roblox...");
}
ClientVersion clientVersion = await RobloxDeployment.GetInfo(App.Settings.Prop.Channel); ClientVersion clientVersion = await RobloxDeployment.GetInfo(App.Settings.Prop.Channel);
@ -263,8 +267,18 @@ namespace Bloxstrap
} }
private async Task StartRoblox() private async Task StartRoblox()
{
// hi! epic cube
if (App.Settings.Prop.RemoveRobloxText == true)
{
SetStatus("Starting " + App.Settings.Prop.BootstrapperTitle + "...");
}
else
{ {
SetStatus("Starting Roblox..."); SetStatus("Starting Roblox...");
}
if (_launchCommandLine == "--app" && App.Settings.Prop.UseDisableAppPatch) if (_launchCommandLine == "--app" && App.Settings.Prop.UseDisableAppPatch)
{ {
@ -690,7 +704,14 @@ namespace Bloxstrap
{ {
_isInstalling = true; _isInstalling = true;
if (App.Settings.Prop.RemoveRobloxText == true)
{
SetStatus(FreshInstall ? "Installing " + App.Settings.Prop.BootstrapperTitle + "..." : "Upgrading" + App.Settings.Prop.BootstrapperTitle + "...");
}
else
{
SetStatus(FreshInstall ? "Installing Roblox..." : "Upgrading Roblox..."); SetStatus(FreshInstall ? "Installing Roblox..." : "Upgrading Roblox...");
}
Directory.CreateDirectory(Directories.Base); Directory.CreateDirectory(Directories.Base);
Directory.CreateDirectory(Directories.Downloads); Directory.CreateDirectory(Directories.Downloads);
@ -743,8 +764,15 @@ namespace Bloxstrap
if (Dialog is not null) if (Dialog is not null)
{ {
Dialog.ProgressStyle = ProgressBarStyle.Marquee; Dialog.ProgressStyle = ProgressBarStyle.Marquee;
if (App.Settings.Prop.RemoveRobloxText == true)
{
SetStatus("Configuring " + App.Settings.Prop.BootstrapperTitle + "...");
}
else
{
SetStatus("Configuring Roblox..."); SetStatus("Configuring Roblox...");
} }
}
// wait for all packages to finish extracting, with an exception for the webview2 runtime installer // wait for all packages to finish extracting, with an exception for the webview2 runtime installer
while (_packagesExtracted < _versionPackageManifest.Where(x => x.Name != "WebView2RuntimeInstaller.zip").Count()) while (_packagesExtracted < _versionPackageManifest.Where(x => x.Name != "WebView2RuntimeInstaller.zip").Count())
@ -793,11 +821,11 @@ namespace Bloxstrap
} }
} }
App.State.Prop.VersionGuid = _latestVersionGuid;
if (Dialog is not null) if (Dialog is not null)
Dialog.CancelEnabled = false; Dialog.CancelEnabled = false;
App.State.Prop.VersionGuid = _latestVersionGuid;
_isInstalling = false; _isInstalling = false;
} }
@ -852,7 +880,7 @@ namespace Bloxstrap
if (File.Exists(injectorLocation)) if (File.Exists(injectorLocation))
{ {
App.ShowMessageBox( App.ShowMessageBox(
"Roblox has now finished rolling out the new game client update, featuring 64-bit support and the Hyperion anticheat. ReShade does not work with this update, and so it has now been disabled and removed from Bloxstrap.\n\n"+ "Roblox has now completeted rollout of the new client update, featuring 64-bit support and the Hyperion anticheat. ReShade does not work with this update, and so it has now been removed from Bloxstrap.\n\n"+
"Your ReShade configuration files will still be saved, and you can locate them by opening the folder where Bloxstrap is installed to, and navigating to the Integrations folder. You can choose to delete these if you want.", "Your ReShade configuration files will still be saved, and you can locate them by opening the folder where Bloxstrap is installed to, and navigating to the Integrations folder. You can choose to delete these if you want.",
MessageBoxImage.Warning MessageBoxImage.Warning
); );
@ -865,8 +893,15 @@ namespace Bloxstrap
} }
private async Task ApplyModifications() private async Task ApplyModifications()
{
if (App.Settings.Prop.RemoveRobloxText == true)
{
SetStatus("Applying " + App.Settings.Prop.BootstrapperTitle + " modifications...");
}
else
{ {
SetStatus("Applying Roblox modifications..."); SetStatus("Applying Roblox modifications...");
}
// set executable flags for fullscreen optimizations // set executable flags for fullscreen optimizations
App.Logger.WriteLine("[Bootstrapper::ApplyModifications] Checking executable flags..."); App.Logger.WriteLine("[Bootstrapper::ApplyModifications] Checking executable flags...");