Merge branch 'bloxstraplabs:main' into main

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -5,6 +5,9 @@ body:
   - type: markdown
     attributes:
       value: |
+        > [!IMPORTANT]
+        > Do not open an issue if you're getting a "Deserialised application settings is null!" error. This issue is caused by a server error on Roblox's end. 
+        > Wait for the problem to be resolved, and do not report an issue for it.
         ### **Preliminary instructions**
         - Before opening an issue, please [check the Wiki first](https://github.com/pizzaboxer/bloxstrap/wiki/) to see if your problem has been addressed there.
           - If it isn't, please confirm which pages that you read that were relevant to your issue.

Bloxstrap/App.xaml.cs

@@ -14,12 +14,16 @@ namespace Bloxstrap
     /// </summary>
     public partial class App : Application
     {
+#if QA_BUILD
+        public const string ProjectName = "Bloxstrap-QA";
+#else
         public const string ProjectName = "Bloxstrap";
-        public const string ProjectOwner = "pizzaboxer";
-        public const string ProjectRepository = "pizzaboxer/bloxstrap";
+#endif
+        public const string ProjectOwner = "Bloxstrap";
+        public const string ProjectRepository = "bloxstraplabs/bloxstrap";
         public const string ProjectDownloadLink = "https://bloxstraplabs.com";
-        public const string ProjectHelpLink = "https://github.com/pizzaboxer/bloxstrap/wiki";
-        public const string ProjectSupportLink = "https://github.com/pizzaboxer/bloxstrap/issues/new";
+        public const string ProjectHelpLink = "https://github.com/bloxstraplabs/bloxstrap/wiki";
+        public const string ProjectSupportLink = "https://github.com/bloxstraplabs/bloxstrap/issues/new";
 
         public const string RobloxPlayerAppName = "RobloxPlayerBeta";
         public const string RobloxStudioAppName = "RobloxStudioBeta";

Bloxstrap/Bloxstrap.csproj

@@ -51,7 +51,7 @@
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
     <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
     <PackageReference Include="Markdig" Version="0.37.0" />
-    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.18-beta">
+    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
       <!--<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>-->
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

Bloxstrap/Bootstrapper.cs

@@ -158,7 +158,7 @@ public async Task Run()
             if (connectionResult is not null)
                 HandleConnectionError(connectionResult);
 
-#if !DEBUG || DEBUG_UPDATER
+#if (!DEBUG || DEBUG_UPDATER) && !QA_BUILD
             if (App.Settings.Prop.CheckForUpdates && !App.LaunchSettings.UpgradeFlag.Active)
             {
                 bool updatePresent = await CheckForUpdates();
@@ -604,9 +604,6 @@ private async Task UpgradeRoblox()
                 {
                     App.Logger.WriteLine(LOG_IDENT, "Could not delete executable/folder, Roblox may still be running. Aborting update.");
                     App.Logger.WriteException(LOG_IDENT, ex);
-
-                    Directory.Delete(AppData.Directory);
-
                     return;
                 }
 
@@ -1076,7 +1073,7 @@ private async Task DownloadPackage(Package package)
 
                         Frontend.ShowConnectivityDialog(
                             Strings.Dialog_Connectivity_UnableToDownload,
-                            String.Format(Strings.Dialog_Connectivity_UnableToDownloadReason, "[https://github.com/pizzaboxer/bloxstrap/wiki/Bloxstrap-is-unable-to-download-Roblox](https://github.com/pizzaboxer/bloxstrap/wiki/Bloxstrap-is-unable-to-download-Roblox)"),
+                            String.Format(Strings.Dialog_Connectivity_UnableToDownloadReason, "[https://github.com/bloxstraplabs/bloxstrap/wiki/Bloxstrap-is-unable-to-download-Roblox](https://github.com/bloxstraplabs/bloxstrap/wiki/Bloxstrap-is-unable-to-download-Roblox)"),
                             MessageBoxImage.Error,
                             ex
                         );

Bloxstrap/Installer.cs

@@ -5,11 +5,11 @@ namespace Bloxstrap
 {
     internal class Installer
     {
-        private static string DesktopShortcut => Path.Combine(Paths.Desktop, "Bloxstrap.lnk");
+        private static string DesktopShortcut => Path.Combine(Paths.Desktop, $"{App.ProjectName}.lnk");
 
-        private static string StartMenuShortcut => Path.Combine(Paths.WindowsStartMenu, "Bloxstrap.lnk");
+        private static string StartMenuShortcut => Path.Combine(Paths.WindowsStartMenu, $"{App.ProjectName}.lnk");
 
-        public string InstallLocation = Path.Combine(Paths.LocalAppData, "Bloxstrap");
+        public string InstallLocation = Path.Combine(Paths.LocalAppData, App.ProjectName);
 
         public bool ExistingDataPresent => File.Exists(Path.Combine(InstallLocation, "Settings.json"));
 
@@ -52,7 +52,6 @@ public void DoInstall()
                 }
             }
 
-            // TODO: registry access checks, i'll need to look back on issues to see what the error looks like
             using (var uninstallKey = Registry.CurrentUser.CreateSubKey(App.UninstallKey))
             {
                 uninstallKey.SetValueSafe("DisplayIcon", $"{Paths.Application},0");
@@ -571,7 +570,7 @@ public static void HandleUpgrade()
 
                     App.FastFlags.SetValue("FFlagFixGraphicsQuality", null);
 
-                    Directory.Delete(Path.Combine(Paths.Base, "Versions"));
+                    Directory.Delete(Path.Combine(Paths.Base, "Versions"), true);
                 }
 
                 App.Settings.Save();

Bloxstrap/LaunchHandler.cs

@@ -78,6 +78,10 @@ public static void LaunchInstaller()
             }
             else
             {
+#if QA_BUILD
+                Frontend.ShowMessageBox("You are running a QA build of Bloxstrap. The red window border indicates that this is a QA build.", MessageBoxImage.Information);
+#endif
+
                 new LanguageSelectorDialog().ShowDialog();
 
                 var installer = new UI.Elements.Installer.MainWindow();

Bloxstrap/Locale.cs

@@ -1,7 +1,5 @@
 using System.Windows;
 
-using Bloxstrap.Resources;
-
 namespace Bloxstrap
 {
     internal static class Locale
@@ -104,6 +102,11 @@ public static void Initialize()
                 {
                     window.FontFamily = new System.Windows.Media.FontFamily(new Uri("pack://application:,,,/Resources/Fonts/"), "./#Noto Sans Thai");
                 }
+
+#if QA_BUILD
+                window.BorderBrush = System.Windows.Media.Brushes.Red;
+                window.BorderThickness = new Thickness(4);
+#endif
             }));
         }
     }

Bloxstrap/Resources/Strings.resx

@@ -354,7 +354,7 @@ If not, then please report this exception through a [GitHub issue]({1}) along wi
     <value>2015 (V1)</value>
   </data>
   <data name="Enums.FlagPresets.InGameMenuVersion.V2" xml:space="preserve">
-    <value>2022 (V2)</value>
+    <value>2020 (V2)</value>
   </data>
   <data name="Enums.FlagPresets.InGameMenuVersion.V4" xml:space="preserve">
     <value>2023 (V4)</value>
@@ -646,7 +646,7 @@ Do NOT use this to import large "flag lists" made by other people that promise t
     <value>Rendering mode</value>
   </data>
   <data name="Menu.FastFlags.Title" xml:space="preserve">
-    <value>Engine settings</value>
+    <value>Engine Settings</value>
   </data>
   <data name="Menu.FontFiles" xml:space="preserve">
     <value>Font files</value>
@@ -1221,4 +1221,12 @@ Would you like to enable test mode?</value>
   <data name="About.Translators.Description" xml:space="preserve">
     <value>All of Bloxstrap's translations are crowdsourced through [Crowdin]({0}). Everyone listed here are people who generously volunteered their time and effort to help localise Bloxstrap. A massive thank you to everyone here!</value>
   </data>
+  <data name="Common.Navigation.Install" xml:space="preserve">
+    <value>Install</value>
+    <comment>The word "Install" is being used as a verb in this instance, like the other navigation button texts of "Next" and "Back"</comment>
+  </data>
+  <data name="LaunchMenu.Donate" xml:space="preserve">
+    <value>Support us on Ko-fi!</value>
+    <comment>Call-to-action button</comment>
+  </data>
 </root>

Bloxstrap/UI/Elements/About/Pages/AboutPage.xaml

@@ -40,15 +40,14 @@
         </Grid>
 
         <WrapPanel HorizontalAlignment="Center" Orientation="Horizontal">
-            <ui:Anchor Margin="0,0,8,8" Content="{x:Static resources:Strings.Menu_About_GithubRepository}" Icon="Code24" NavigateUri="https://github.com/pizzaboxer/bloxstrap" />
-            <ui:Anchor Margin="0,0,8,8" Content="{x:Static resources:Strings.Menu_About_HelpInformation}" Icon="BookQuestionMark24" NavigateUri="https://github.com/pizzaboxer/bloxstrap/wiki" />
-            <ui:Anchor Margin="0,0,8,8" Content="{x:Static resources:Strings.Menu_About_ReportIssue}" Icon="BookExclamationMark24" NavigateUri="https://github.com/pizzaboxer/bloxstrap/issues" />
+            <ui:Anchor Margin="0,0,8,8" Content="{x:Static resources:Strings.Menu_About_GithubRepository}" Icon="Code24" NavigateUri="https://github.com/bloxstraplabs/bloxstrap" />
+            <ui:Anchor Margin="0,0,8,8" Content="{x:Static resources:Strings.Menu_About_HelpInformation}" Icon="BookQuestionMark24" NavigateUri="https://github.com/bloxstraplabs/bloxstrap/wiki" />
+            <ui:Anchor Margin="0,0,8,8" Content="{x:Static resources:Strings.Menu_About_ReportIssue}" Icon="BookExclamationMark24" NavigateUri="https://github.com/bloxstraplabs/bloxstrap/issues" />
             <ui:Anchor Margin="0,0,0,8" Content="{x:Static resources:Strings.Menu_About_DiscordServer}" Icon="Chat48" NavigateUri="https://discord.gg/nKjV3mGq6R" />
         </WrapPanel>
 
         <StackPanel Visibility="{Binding BuildInformationVisibility, Mode=OneTime}">
             <TextBlock Text="Build Information" FontWeight="Medium" FontSize="20" Margin="0,16,0,0" />
-            <TextBlock Text="hmmmm" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
 
             <Grid Column="0" Margin="0,8,0,0">
                 <Grid.RowDefinitions>

Bloxstrap/UI/Elements/About/Pages/LicensesPage.xaml

@@ -25,7 +25,7 @@
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
 
-            <ui:CardAction Grid.Row="0" Grid.Column="0" Margin="0,8,8,0" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/pizzaboxer/bloxstrap/blob/main/LICENSE">
+            <ui:CardAction Grid.Row="0" Grid.Column="0" Margin="0,8,8,0" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/bloxstraplabs/bloxstrap/blob/main/LICENSE">
                 <StackPanel>
                     <TextBlock FontSize="14" Text="Bloxstrap" />
                     <TextBlock Margin="0,2,0,0" FontSize="12" Text="{x:Static resources:Strings.Menu_About_Licenses_MIT}" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />

Bloxstrap/UI/Elements/Base/WpfUiWindow.cs

@@ -20,6 +20,11 @@ public void ApplyTheme()
         {
             _themeService.SetTheme(App.Settings.Prop.Theme.GetFinal() == Enums.Theme.Dark ? ThemeType.Dark : ThemeType.Light);
             _themeService.SetSystemAccent();
+
+#if QA_BUILD
+            this.BorderBrush = System.Windows.Media.Brushes.Red;
+            this.BorderThickness = new Thickness(4);
+#endif
         }
 
         protected override void OnSourceInitialized(EventArgs e)

Bloxstrap/UI/Elements/Controls/MarkdownTextBlock.cs

@@ -114,7 +114,7 @@ private static void OnTextMarkdownChanged(DependencyObject dependencyObject, Dep
             var lastBlock = document.Last();
 
             // matt was evidently very tired on the night he was first writing this
-            // https://github.com/pizzaboxer/bloxstrap/blob/289b9dec77cf35b2cc6504019bc9c7701626be1f/Bloxstrap/UI/Elements/Controls/MarkdownTextBlock.cs#L111
+            // https://github.com/bloxstraplabs/bloxstrap/blob/289b9dec77cf35b2cc6504019bc9c7701626be1f/Bloxstrap/UI/Elements/Controls/MarkdownTextBlock.cs#L111
             foreach (var block in document)
             {
                 if (block is not ParagraphBlock paragraphBlock || paragraphBlock.Inline is null)

Bloxstrap/UI/Elements/Dialogs/LaunchMenuDialog.xaml

@@ -28,7 +28,7 @@
 
         <Grid Grid.Row="1">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="280" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
 
@@ -52,8 +52,8 @@
                 </Grid>
 
                 <StackPanel Grid.Row="1" HorizontalAlignment="Center">
-                    <ui:Hyperlink Icon="QuestionCircle48" Content="About Bloxstrap" Margin="0,0,0,8" Command="{Binding LaunchAboutCommand, Mode=OneTime}" />
-                    <ui:Hyperlink Icon="Heart48" Content="Support us on Ko-fi!" NavigateUri="https://ko-fi.com/boxerpizza" />
+                    <ui:Hyperlink Icon="QuestionCircle48" Content="{x:Static resources:Strings.About_Title}" Margin="0,0,0,8" Command="{Binding LaunchAboutCommand, Mode=OneTime}" />
+                    <ui:Hyperlink Icon="Heart48" Content="{x:Static resources:Strings.LaunchMenu_Donate}" NavigateUri="https://ko-fi.com/boxerpizza" />
                 </StackPanel>
             </Grid>
 
@@ -72,7 +72,7 @@
 
                 <Border Margin="16" />
 
-                <ui:CardAction Margin="0,8,0,0" Icon="BookQuestionMark24" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/pizzaboxer/bloxstrap/wiki/">
+                <ui:CardAction Margin="0,8,0,0" Icon="BookQuestionMark24" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/bloxstraplabs/bloxstrap/wiki/">
                     <StackPanel>
                         <TextBlock FontSize="14" Text="{x:Static resources:Strings.LaunchMenu_Wiki_Title}" />
                         <TextBlock Margin="0,2,0,0" FontSize="12" Text="{x:Static resources:Strings.LaunchMenu_Wiki_Description}" Padding="0,0,16,0"  Foreground="{DynamicResource TextFillColorTertiaryBrush}" />

Bloxstrap/UI/Elements/Installer/MainWindow.xaml

@@ -7,8 +7,10 @@
         xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
         xmlns:base="clr-namespace:Bloxstrap.UI.Elements.Base"
         xmlns:resources="clr-namespace:Bloxstrap.Resources"
+        xmlns:dmodels="clr-namespace:Bloxstrap.UI.ViewModels.Installer"
         xmlns:local="clr-namespace:Bloxstrap.UI.Elements.Installer"
         mc:Ignorable="d"
+        d:DataContext="{d:DesignInstance dmodels:MainWindowViewModel, IsDesignTimeCreatable=True}"
         Title="{x:Static resources:Strings.Installer_Title}"
         Height="540" Width="840" MinWidth="840"
         Background="{ui:ThemeResource ApplicationBackgroundBrush}"

Bloxstrap/UI/Elements/Installer/Pages/CompletionPage.xaml.cs

@@ -28,7 +28,7 @@ private void UiPage_Loaded(object sender, RoutedEventArgs e)
         {
             if (Window.GetWindow(this) is MainWindow window)
             {
-                window.SetNextButtonText("Next");
+                window.SetNextButtonText(Strings.Common_Navigation_Next);
                 window.SetButtonEnabled("back", false);
             }
         }

Bloxstrap/UI/Elements/Installer/Pages/InstallPage.xaml

@@ -68,7 +68,7 @@
         </Grid>
 
         <TextBlock FontSize="20" FontWeight="SemiBold" Text="{x:Static resources:Strings.Common_Analytics}" TextWrapping="Wrap" Margin="0,16,0,0" />
-        <controls:MarkdownTextBlock FontSize="14" MarkdownText="{Binding Source={x:Static resources:Strings.Menu_Bloxstrap_Analytics_Description}, Converter={StaticResource StringFormatConverter}, ConverterParameter='https://github.com/pizzaboxer/bloxstrap/wiki/Privacy-Policy#analytical-functionality'}" TextWrapping="Wrap" />
+        <controls:MarkdownTextBlock FontSize="14" MarkdownText="{Binding Source={x:Static resources:Strings.Menu_Bloxstrap_Analytics_Description}, Converter={StaticResource StringFormatConverter}, ConverterParameter='https://github.com/bloxstraplabs/bloxstrap/wiki/Privacy-Policy#analytical-functionality'}" TextWrapping="Wrap" />
 
         <controls:OptionControl 
             Header="{x:Static resources:Strings.Menu_Bloxstrap_Analytics_Title}">

Bloxstrap/UI/Elements/Installer/Pages/InstallPage.xaml.cs

@@ -29,7 +29,7 @@ private void UiPage_Loaded(object sender, RoutedEventArgs e)
         {
             if (Window.GetWindow(this) is MainWindow window)
             {
-                window.SetNextButtonText("Install");
+                window.SetNextButtonText(Strings.Common_Navigation_Install);
                 window.NextPageCallback += NextPageCallback;
             }
         }

Bloxstrap/UI/Elements/Installer/Pages/WelcomePage.xaml

@@ -37,7 +37,7 @@
             </Grid.ColumnDefinitions>
             <Image Grid.Column="0" Width="32" RenderOptions.BitmapScalingMode="HighQuality" Source="pack://application:,,,/Resources/MessageBox/Warning.png" />
             <TextBlock Grid.Column="1" FontSize="14" Margin="12,0,12,0" Text="{Binding VersionNotice, Mode=OneWay}" TextWrapping="Wrap" />
-            <ui:Button Grid.Column="2" Icon="ArrowDownload16" Content="Download" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/pizzaboxer/bloxstrap/releases/latest" />
+            <ui:Button Grid.Column="2" Icon="ArrowDownload16" Content="Download" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/bloxstraplabs/bloxstrap/releases/latest" />
         </Grid>
 
         <StackPanel>

Bloxstrap/UI/Elements/Installer/Pages/WelcomePage.xaml.cs

@@ -25,7 +25,7 @@ public WelcomePage()
         private void UiPage_Loaded(object sender, RoutedEventArgs e)
         {
             if (Window.GetWindow(this) is MainWindow window)
-                window.SetNextButtonText("Next");
+                window.SetNextButtonText(Strings.Common_Navigation_Next);
 
             _viewModel.DoChecks();
         }

Bloxstrap/UI/Elements/Settings/Pages/BloxstrapPage.xaml

@@ -25,7 +25,7 @@
 
         <controls:OptionControl 
             Header="{x:Static resources:Strings.Menu_Bloxstrap_Analytics_Title}"
-            Description="{Binding Source={x:Static resources:Strings.Menu_Bloxstrap_Analytics_Description}, Converter={StaticResource StringFormatConverter}, ConverterParameter='https://github.com/pizzaboxer/bloxstrap/wiki/Privacy-Policy#analytical-functionality'}">
+            Description="{Binding Source={x:Static resources:Strings.Menu_Bloxstrap_Analytics_Description}, Converter={StaticResource StringFormatConverter}, ConverterParameter='https://github.com/bloxstraplabs/bloxstrap/wiki/Privacy-Policy#analytical-functionality'}">
             <ui:ToggleSwitch IsChecked="{Binding AnalyticsEnabled, Mode=TwoWay}" />
         </controls:OptionControl>
     </StackPanel>