Code cleanup and minor fixes

 - Fixed channel arg not being set when launching game client
 - Fixed preferences tooltip hiding too early
 - Fixed last deploy info not showing for the right channel
 - Last deploy info now shows deploy timestamp according to system timezone

Bloxstrap/Bloxstrap.csproj

@@ -9,8 +9,8 @@
  <PlatformTarget>AnyCPU</PlatformTarget>
  <Platforms>AnyCPU;x86</Platforms>
  <ApplicationIcon>Bloxstrap.ico</ApplicationIcon>
- <Version>1.4.0</Version>
- <FileVersion>1.4.0.0</FileVersion>
+ <Version>1.4.1</Version>
+ <FileVersion>1.4.1.0</FileVersion>
  <UseWPF>True</UseWPF>
  </PropertyGroup>
 

Bloxstrap/Bootstrapper.cs

@@ -83,40 +83,14 @@ public partial class Bootstrapper
  #endregion
 
  #region Core
- public Bootstrapper()
+ public Bootstrapper(string? launchCommandLine = null)
  {
+ LaunchCommandLine = launchCommandLine;
  FreshInstall = String.IsNullOrEmpty(Program.Settings.VersionGuid);
  Client.Timeout = TimeSpan.FromMinutes(10);
  }
 
- public void Initialize(string? launchCommandLine = null)
- {
- LaunchCommandLine = launchCommandLine;
-
- switch (Program.Settings.BootstrapperStyle)
- {
- case BootstrapperStyle.VistaDialog:
- Application.Run(new VistaDialog(this));
- break;
-
- case BootstrapperStyle.LegacyDialog2009:
- Application.Run(new LegacyDialog2009(this));
- break;
-
- case BootstrapperStyle.LegacyDialog2011:
- Application.Run(new LegacyDialog2011(this));
- break;
-
- case BootstrapperStyle.ProgressDialog:
- Application.Run(new ProgressDialog(this));
- break;
-
- case BootstrapperStyle.ProgressDialogDark:
- Application.Run(new ProgressDialogDark(this));
- break;
- }
- }
-
+ // this is called from BootstrapperStyleForm.SetupDialog()
  public async Task Run()
  {
  if (LaunchCommandLine == "-uninstall")
@@ -183,7 +157,12 @@ private async Task StartRoblox()
  Dialog.Message = "Starting Roblox...";
 
  // launch time isn't really required for all launches, but it's usually just safest to do this
- LaunchCommandLine += " --launchtime=" + DateTimeOffset.Now.ToUnixTimeSeconds() + " -startEvent " + startEventName;
+ LaunchCommandLine += " --launchtime=" + DateTimeOffset.Now.ToUnixTimeSeconds();
+
+ if (Program.Settings.Channel.ToLower() != DeployManager.DefaultChannel.ToLower())
+ LaunchCommandLine += " -channel " + Program.Settings.Channel.ToLower();
+
+ LaunchCommandLine += " -startEvent " + startEventName;
 
  using (SystemEvent startEvent = new(startEventName))
  {
@@ -400,8 +379,10 @@ private async Task InstallLatestVersion()
 
  Dialog.CancelEnabled = true;
 
- // i believe the original bootstrapper bases the progress bar off zip
- // extraction progress, but here i'm doing package download progress
+ // i believe the bootstrapper bases the progress bar off
+ // bytes downloaded / bytes total according to rbxPkgManifest?
+ // i'm too lazy for that, so here it's just based off how many packages
+ // have finished downloading
 
  Dialog.ProgressStyle = ProgressBarStyle.Continuous;
 
@@ -411,7 +392,7 @@ private async Task InstallLatestVersion()
 
  foreach (Package package in VersionPackageManifest)
  {
- // no await, download all the packages at once
+ // download all the packages at once
  DownloadPackage(package);
  }
 
@@ -430,6 +411,8 @@ private async Task InstallLatestVersion()
 
  Debug.WriteLine("Finished downloading");
 
+ Dialog.Message = "Configuring Roblox...";
+
  Directory.CreateDirectory(Directories.Versions);
 
  foreach (Package package in VersionPackageManifest)
@@ -440,8 +423,6 @@ private async Task InstallLatestVersion()
 
  Debug.WriteLine("Finished extracting packages");
 
- Dialog.Message = "Configuring Roblox...";
-
  string appSettingsLocation = Path.Combine(VersionFolder, "AppSettings.xml");
  await File.WriteAllTextAsync(appSettingsLocation, AppSettings);
 
@@ -529,7 +510,8 @@ private void ApplyModifications()
  File.Copy(fileModFolder, fileVersionFolder, true);
  }
 
- // now we check for files that have been deleted from the mod folder
+ // now check for files that have been deleted from the mod folder
+ // according to the manifest
  foreach (string fileLocation in manifestFiles)
  {
  if (modFolderFiles.Contains(fileLocation))

Bloxstrap/Dialogs/BootstrapperStyles/BootstrapperStyleForm.cs

@@ -1,5 +1,4 @@
-using Bloxstrap.Helpers;
-using Bloxstrap.Helpers.RSMM;
+using Bloxstrap.Enums;
 
 namespace Bloxstrap.Dialogs.BootstrapperStyles
 {
@@ -18,7 +17,7 @@ public string Message
  set 
  { 
  if (this.InvokeRequired)
- this.Invoke(new Action(() => { _message = value; }));
+ this.Invoke(() => _message = value);
  else
  _message = value;
  } 
@@ -30,7 +29,7 @@ public ProgressBarStyle ProgressStyle
  set
  {
  if (this.InvokeRequired)
- this.Invoke(new Action(() => { _progressStyle = value; }));
+ this.Invoke(() => _progressStyle = value);
  else
  _progressStyle = value;
  }
@@ -42,7 +41,7 @@ public int ProgressValue
  set
  {
  if (this.InvokeRequired)
- this.Invoke(new Action(() => { _progressValue = value; }));
+ this.Invoke(() => _progressValue = value);
  else
  _progressValue = value;
  }
@@ -54,7 +53,7 @@ public bool CancelEnabled
  set
  {
  if (this.InvokeRequired)
- this.Invoke(new Action(() => { _cancelEnabled = value; }));
+ this.Invoke(() => _cancelEnabled = value);
  else
  _cancelEnabled = value;
  }
@@ -63,7 +62,7 @@ public bool CancelEnabled
  public void SetupDialog()
  {
  this.Text = Program.ProjectName;
- this.Icon = IconManager.GetIconResource();
+ this.Icon = Program.Settings.BootstrapperIcon.GetIcon();
 
  if (Bootstrapper is null)
  {

Bloxstrap/Dialogs/BootstrapperStyles/LegacyDialog2011.cs

@@ -1,4 +1,4 @@
-using Bloxstrap.Helpers;
+using Bloxstrap.Enums;
 
 namespace Bloxstrap.Dialogs.BootstrapperStyles
 {
@@ -37,7 +37,7 @@ public LegacyDialog2011(Bootstrapper? bootstrapper = null)
  Bootstrapper = bootstrapper;
 
  // have to convert icon -> bitmap since winforms scaling is poop
- this.IconBox.Image = IconManager.GetIconResource().ToBitmap();
+ this.IconBox.Image = Program.Settings.BootstrapperIcon.GetIcon().ToBitmap();
 
  SetupDialog();
  }

Bloxstrap/Dialogs/BootstrapperStyles/ProgressDialog.cs

@@ -1,4 +1,4 @@
-using Bloxstrap.Helpers;
+using Bloxstrap.Enums;
 
 namespace Bloxstrap.Dialogs.BootstrapperStyles
 {
@@ -36,7 +36,7 @@ public ProgressDialog(Bootstrapper? bootstrapper = null)
 
  Bootstrapper = bootstrapper;
 
- this.IconBox.BackgroundImage = IconManager.GetBitmapResource();
+ this.IconBox.BackgroundImage = Program.Settings.BootstrapperIcon.GetBitmap();
 
  SetupDialog();
  }

Bloxstrap/Dialogs/BootstrapperStyles/ProgressDialogDark.cs

@@ -1,4 +1,4 @@
-using Bloxstrap.Helpers;
+using Bloxstrap.Enums;
 
 namespace Bloxstrap.Dialogs.BootstrapperStyles
 {
@@ -36,7 +36,7 @@ public ProgressDialogDark(Bootstrapper? bootstrapper = null)
 
  Bootstrapper = bootstrapper;
 
- this.IconBox.BackgroundImage = IconManager.GetBitmapResource();
+ this.IconBox.BackgroundImage = Program.Settings.BootstrapperIcon.GetBitmap();
 
  SetupDialog();
  }

Bloxstrap/Dialogs/BootstrapperStyles/VistaDialog.cs

@@ -1,5 +1,4 @@
-using Bloxstrap.Helpers;
-using Bloxstrap.Helpers.RSMM;
+using Bloxstrap.Enums;
 
 namespace Bloxstrap.Dialogs.BootstrapperStyles
 {
@@ -66,7 +65,7 @@ public VistaDialog(Bootstrapper? bootstrapper = null)
 
  Dialog = new TaskDialogPage()
  {
- Icon = new TaskDialogIcon(IconManager.GetIconResource()),
+ Icon = new TaskDialogIcon(Program.Settings.BootstrapperIcon.GetIcon()),
  Caption = Program.ProjectName,
 
  Buttons = { TaskDialogButton.Cancel },

Bloxstrap/Dialogs/Preferences.cs

@@ -3,7 +3,6 @@
 
 using Microsoft.Win32;
 
-using Bloxstrap.Dialogs.BootstrapperStyles;
 using Bloxstrap.Enums;
 using Bloxstrap.Helpers;
 using Bloxstrap.Helpers.Integrations;
@@ -58,10 +57,12 @@ private async Task GetChannelInfo(string channel)
 
  VersionDeploy info = await DeployManager.GetLastDeploy(channel);
 
- if (info.FileVersion is null || info.Date is null)
+ if (info.FileVersion is null || info.Timestamp is null)
  return;
 
- ChannelInfo = $"Last deploy:\nv{info.FileVersion} @ {info.Date}";
+ string strTimestamp = info.Timestamp.Value.ToString("MM/dd/yyyy hh:mm:ss tt", Program.CultureFormat);
+
+ ChannelInfo = $"Last deploy:\nv{info.FileVersion} @ {strTimestamp}";
  }
 
  public Preferences()
@@ -200,30 +201,7 @@ private void SaveButton_Click(object sender, EventArgs e)
  private void PreviewButton_Click(object sender, EventArgs e)
  {
  this.Visible = false;
-
- switch (Program.Settings.BootstrapperStyle)
- {
- case BootstrapperStyle.VistaDialog:
- new VistaDialog().ShowDialog();
- break;
-
- case BootstrapperStyle.LegacyDialog2009:
- new LegacyDialog2009().ShowDialog();
- break;
-
- case BootstrapperStyle.LegacyDialog2011:
- new LegacyDialog2011().ShowDialog();
- break;
-
- case BootstrapperStyle.ProgressDialog:
- new ProgressDialog().ShowDialog();
- break;
-
- case BootstrapperStyle.ProgressDialogDark:
- new ProgressDialogDark().ShowDialog();
- break;
- }
-
+ Program.Settings.BootstrapperStyle.Show();
  this.Visible = true;
  }
 
@@ -246,7 +224,7 @@ private void IconSelection_SelectedIndexChanged(object sender, EventArgs e)
  {
  BootstrapperIcon icon = SelectableIcons[this.IconSelection.Text];
 
- this.IconPreview.BackgroundImage = IconManager.GetBitmapResource(icon);
+ this.IconPreview.BackgroundImage = icon.GetBitmap();
 
  if (!this.Visible)
  return;
@@ -304,12 +282,10 @@ private void ButtonOpenModFolder_Click(object sender, EventArgs e)
 
  private void SelectChannel_SelectedValueChanged(object sender, EventArgs e)
  {
+ if (this.Visible)
+ Program.Settings.Channel = this.SelectChannel.Text;
+
  Task.Run(() => GetChannelInfo(Program.Settings.Channel));
-
- if (!this.Visible)
- return;
-
- Program.Settings.Channel = this.SelectChannel.Text;
  }
 
  private void ToggleCheckForUpdates_CheckedChanged(object sender, EventArgs e)

Bloxstrap/Enums/BootstrapperIcon.cs

@@ -11,4 +11,69 @@ public enum BootstrapperIcon
  Icon2019,
  Icon2022
  }
+
+ public static class BootstrapperIconEx
+ {
+ public static Icon GetIcon(this BootstrapperIcon icon)
+ {
+ switch (icon)
+ {
+ case BootstrapperIcon.Icon2009:
+ return Properties.Resources.Icon2009_ico;
+
+ case BootstrapperIcon.Icon2011:
+ return Properties.Resources.Icon2011_ico;
+
+ case BootstrapperIcon.IconEarly2015:
+ return Properties.Resources.IconEarly2015_ico;
+
+ case BootstrapperIcon.IconLate2015:
+ return Properties.Resources.IconLate2015_ico;
+
+ case BootstrapperIcon.Icon2017:
+ return Properties.Resources.Icon2017_ico;
+
+ case BootstrapperIcon.Icon2019:
+ return Properties.Resources.Icon2019_ico;
+
+ case BootstrapperIcon.Icon2022: 
+ return Properties.Resources.Icon2022_ico;
+
+ case BootstrapperIcon.IconBloxstrap:
+ default:
+ return Properties.Resources.IconBloxstrap_ico;
+ }
+ }
+
+ public static Bitmap GetBitmap(this BootstrapperIcon icon)
+ {
+ switch (icon)
+ {
+ case BootstrapperIcon.Icon2009:
+ return Properties.Resources.Icon2009_png;
+
+ case BootstrapperIcon.Icon2011:
+ return Properties.Resources.Icon2011_png;
+
+ case BootstrapperIcon.IconEarly2015:
+ return Properties.Resources.IconEarly2015_png;
+
+ case BootstrapperIcon.IconLate2015:
+ return Properties.Resources.IconLate2015_png;
+
+ case BootstrapperIcon.Icon2017:
+ return Properties.Resources.Icon2017_png;
+
+ case BootstrapperIcon.Icon2019:
+ return Properties.Resources.Icon2019_png;
+
+ case BootstrapperIcon.Icon2022:
+ return Properties.Resources.Icon2022_png;
+
+ case BootstrapperIcon.IconBloxstrap:
+ default:
+ return Properties.Resources.IconBloxstrap_png;
+ }
+ }
+ }
 }