Finalize v2.1.0 update

pizzaboxer · pizzaboxer · commit f8dd388f8855 · 2023-03-13T18:22:44.000Z
extra quality assurance and stuff
diff --git a/.gitignore b/.gitignore
@@ -174,7 +174,7 @@ publish/
 *.azurePubxml
 # Note: Comment the next line if you want to checkin your web deploy settings,
 # but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
+# *.pubxml
 *.publishproj
 
 # Microsoft Azure Web App publish settings. Comment the next line if you want to
diff --git a/Bloxstrap/App.xaml.cs b/Bloxstrap/App.xaml.cs
@@ -84,7 +84,7 @@ protected override void OnStartup(StartupEventArgs e)
             Logger.WriteLine($"[App::OnStartup] Starting {ProjectName} v{Version}");
 
             // todo: remove this once 32-bit support is fully gone
-            if (!Environment.Is64BitOperatingSystem)
+            if (!App.IsQuiet && !Environment.Is64BitOperatingSystem)
             {
                 string message = "In the near future, Roblox will no longer support 32-bit Windows devices. To keep playing Roblox, please use a device that is 64-bit compatible.";
 
@@ -158,11 +158,12 @@ protected override void OnStartup(StartupEventArgs e)
                     BaseDirectory = Path.Combine(Directories.LocalAppData, ProjectName);
                     InitLog();
 
+                    // we have reshade enabled by default so we need this
+                    FastFlags.SetRenderingMode("Direct3D 11");
+
                     if (!IsQuiet)
                     {
                         IsSetupComplete = false;
-                        // we have reshade enabled by default so we need this
-                        FastFlags.SetRenderingMode("Direct3D 11");
                         new MainWindow().ShowDialog();
                     }
                 }
diff --git a/Bloxstrap/Bloxstrap.csproj b/Bloxstrap/Bloxstrap.csproj
@@ -7,8 +7,8 @@
     <UseWPF>true</UseWPF>
     <UseWindowsForms>True</UseWindowsForms>
     <ApplicationIcon>Bloxstrap.ico</ApplicationIcon>
-    <Version>2.0.0</Version>
-    <FileVersion>2.0.0.0</FileVersion>
+    <Version>2.1.0</Version>
+    <FileVersion>2.1.0.0</FileVersion>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs
@@ -158,6 +158,11 @@ public async Task Run()
                 App.FastFlags.Save();
             }
 
+            if (App.Settings.Prop.UseReShade)
+                SetStatus("Configuring/Downloading ReShade...");
+
+            await ReShade.CheckModifications();
+
             await ApplyModifications();
 
             if (App.IsFirstRun || FreshInstall)
@@ -369,7 +374,10 @@ private async Task StartRoblox()
             }
 
             if (App.Settings.Prop.UseDiscordRichPresence || App.Settings.Prop.ShowServerDetails)
+            {
                 activityWatcher = new();
+                shouldWait = true;
+            }
 
             if (App.Settings.Prop.UseDiscordRichPresence)
             {
@@ -381,7 +389,6 @@ private async Task StartRoblox()
             {
                 App.Logger.WriteLine("[Bootstrapper::StartRoblox] Using server details notifier");
                 serverNotifier = new(activityWatcher!);
-                shouldWait = true;
             }
 
             // launch custom integrations now
@@ -796,8 +803,6 @@ private async Task ApplyModifications()
             await CheckModPreset(App.Settings.Prop.UseOldMouseCursor, @"content\textures\Cursors\KeyboardMouse\ArrowFarCursor.png", "OldFarCursor.png");
             await CheckModPreset(App.Settings.Prop.UseDisableAppPatch, @"ExtraContent\places\Mobile.rbxl", "");
 
-            await ReShade.CheckModifications();
-
             foreach (string file in Directory.GetFiles(modFolder, "*.*", SearchOption.AllDirectories))
             {
                 // get relative directory path
diff --git a/Bloxstrap/Helpers/FastFlagManager.cs b/Bloxstrap/Helpers/FastFlagManager.cs
@@ -80,6 +80,8 @@ public override void Save()
             Directory.CreateDirectory(Path.GetDirectoryName(FileLocation)!);
             File.WriteAllText(FileLocation, JsonSerializer.Serialize(Prop, new JsonSerializerOptions { WriteIndented = true }));
 
+            Changes.Clear();
+
             App.Logger.WriteLine($"[FastFlagManager::Save] JSON saved!");
         }
     }
diff --git a/Bloxstrap/Helpers/GameActivityWatcher.cs b/Bloxstrap/Helpers/GameActivityWatcher.cs
@@ -32,6 +32,7 @@ public class GameActivityWatcher : IDisposable
         public long ActivityPlaceId = 0;
         public string ActivityJobId = "";
         public string ActivityMachineAddress = "";
+        public bool ActivityMachineUDMUX = false;
 
         public bool IsDisposed = false;
 
@@ -141,6 +142,7 @@ private void ExamineLogEntry(string entry)
                     }
 
                     ActivityMachineAddress = match.Groups[1].Value;
+                    ActivityMachineUDMUX = true;
 
                     App.Logger.WriteLine($"[GameActivityWatcher::ExamineLogEntry] Server is UDMUX protected ({ActivityPlaceId}/{ActivityJobId}/{ActivityMachineAddress})");
                 }
@@ -169,6 +171,7 @@ private void ExamineLogEntry(string entry)
                 ActivityPlaceId = 0;
                 ActivityJobId = "";
                 ActivityMachineAddress = "";
+                ActivityMachineUDMUX = false;
 
                 OnGameLeave?.Invoke(this, new EventArgs());
             }
diff --git a/Bloxstrap/Helpers/Updater.cs b/Bloxstrap/Helpers/Updater.cs
@@ -78,6 +78,14 @@ public static void CheckInstalledVersion()
                 
             Bootstrapper.Register();
 
+            // update check: if we're upgrading to v2.1.0 and have reshade enabled,
+            // we need to set our renderer to direct3d 11
+            if (App.Settings.Prop.UseReShade && App.FastFlags.GetValue(FastFlagManager.RenderingModes["Direct3D 11"]) is null)
+            {
+                App.FastFlags.SetRenderingMode("Direct3D 11");
+                App.FastFlags.Save();
+            }
+
             if (isAutoUpgrade)
             {
                 NotifyIcon notification = new()
diff --git a/Bloxstrap/Integrations/DiscordRichPresence.cs b/Bloxstrap/Integrations/DiscordRichPresence.cs
@@ -109,7 +109,7 @@ public async Task<bool> SetPresence()
             _rpcClient.SetPresence(new RichPresence
             {
                 Details = universeDetails.Name,
-                State = $"by {universeDetails.Creator.Name}",
+                State = $"by {universeDetails.Creator.Name}" + (universeDetails.Creator.HasVerifiedBadge ? " ☑️" : ""),
                 Timestamps = new Timestamps { Start = DateTime.UtcNow },
                 Buttons = buttons.ToArray(),
                 Assets = new Assets
diff --git a/Bloxstrap/Integrations/ServerNotifier.cs b/Bloxstrap/Integrations/ServerNotifier.cs
@@ -1,4 +1,5 @@
-﻿using System.Net.NetworkInformation;
+﻿using System;
+using System.Net.NetworkInformation;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -35,21 +36,30 @@ public async void Notify()
             locationRegion = locationRegion.ReplaceLineEndings("");
             locationCountry = locationCountry.ReplaceLineEndings("");
 
-            if (locationCity == locationRegion)
+            if (String.IsNullOrEmpty(locationCountry))
+                message = "Location: N/A";
+            else if (locationCity == locationRegion)
                 message = $"Location: {locationRegion}, {locationCountry}\n";
             else
                 message = $"Location: {locationCity}, {locationRegion}, {locationCountry}\n";
 
-            PingReply ping = await new Ping().SendPingAsync(machineAddress);
-
-            // UDMUX protected servers reject ICMP packets and so the ping fails
-            // we could get around this by doing a UDP ping but ehhhhhhhhhhhhh
-            if (ping.Status == IPStatus.Success)
-                message += $"Latency: ~{ping.RoundtripTime}ms";
+            // UDMUX protected servers don't respond to ICMP packets and so the ping fails
+            // we could probably get around this by doing a UDP latency test but ehhhhhhhh
+            if (_activityWatcher.ActivityMachineUDMUX)
+            {
+                message += "Latency: N/A (Server is UDMUX protected)";
+            }
             else
-                message += "Latency: N/A (server may be UDMUX protected)";
+            {
+                PingReply ping = await new Ping().SendPingAsync(machineAddress);
+
+                if (ping.Status == IPStatus.Success)
+                    message += $"Latency: ~{ping.RoundtripTime}ms";
+                else
+                    message += $"Latency: N/A (Code {ping.Status})";
+            }
 
-            App.Logger.WriteLine($"[ServerNotifier::Notify] {message}");
+            App.Logger.WriteLine($"[ServerNotifier::Notify] {message.ReplaceLineEndings("\\n")}");
 
             NotifyIcon notification = new()
             {
diff --git a/Bloxstrap/Properties/PublishProfiles/Publish-x64.pubxml b/Bloxstrap/Properties/PublishProfiles/Publish-x64.pubxml
@@ -0,0 +1,18 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\net6.0-windows\publish\win-x64\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <_TargetId>Folder</_TargetId>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>false</SelfContained>
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishReadyToRun>false</PublishReadyToRun>
+  </PropertyGroup>
+</Project>
diff --git a/Bloxstrap/Properties/PublishProfiles/Publish-x86.pubxml b/Bloxstrap/Properties/PublishProfiles/Publish-x86.pubxml
@@ -0,0 +1,18 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\net6.0-windows\publish\win-x86\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <_TargetId>Folder</_TargetId>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
+    <SelfContained>false</SelfContained>
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishReadyToRun>false</PublishReadyToRun>
+  </PropertyGroup>
+</Project>
diff --git a/Bloxstrap/ViewModels/MainWindowViewModel.cs b/Bloxstrap/ViewModels/MainWindowViewModel.cs
@@ -86,8 +86,8 @@ private void ConfirmSettings()
                 };
 
                 dialogControl.ShowAndWaitAsync(
-                    "Before you install", 
-                    "After installation, you can open the menu again by searching for it in the Start menu.\n" + 
+                    "What to know before you install", 
+                    "After installation, you can open this menu again by searching for it in the Start menu.\n" +
                     "If you want to revert back to the original Roblox launcher, just uninstall Bloxstrap and it will automatically revert."
                 );
             }
diff --git a/Bloxstrap/Views/Pages/IntegrationsPage.xaml b/Bloxstrap/Views/Pages/IntegrationsPage.xaml
@@ -116,7 +116,7 @@
         </StackPanel>
         
         <TextBlock Text="Miscellaneous" FontSize="16" FontWeight="Medium" Margin="0,16,0,0" />
-        <ui:CardControl Margin="0,8,0,0" Padding="16,13,16,12" IsEnabled="{Binding IsChecked, ElementName=RbxFpsUnlockerEnabledToggle, Mode=OneWay}">
+        <ui:CardControl Margin="0,8,0,0" Padding="16,13,16,12">
             <ui:CardControl.Header>
                 <StackPanel>
                     <TextBlock FontSize="14" Text="Show server details of current game" />

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ protected override void OnStartup(StartupEventArgs e)`
`84`	`84`	`Logger.WriteLine($"[App::OnStartup] Starting {ProjectName} v{Version}");`
`85`	`85`
`86`	`86`	`// todo: remove this once 32-bit support is fully gone`
`87`		`- if (!Environment.Is64BitOperatingSystem)`
	`87`	`+ if (!App.IsQuiet && !Environment.Is64BitOperatingSystem)`
`88`	`88`	`{`
`89`	`89`	`string message = "In the near future, Roblox will no longer support 32-bit Windows devices. To keep playing Roblox, please use a device that is 64-bit compatible.";`
`90`	`90`
`@@ -158,11 +158,12 @@ protected override void OnStartup(StartupEventArgs e)`
`158`	`158`	`BaseDirectory = Path.Combine(Directories.LocalAppData, ProjectName);`
`159`	`159`	`InitLog();`
`160`	`160`
	`161`	`+ // we have reshade enabled by default so we need this`
	`162`	`+ FastFlags.SetRenderingMode("Direct3D 11");`
	`163`	`+`
`161`	`164`	`if (!IsQuiet)`
`162`	`165`	`{`
`163`	`166`	`IsSetupComplete = false;`
`164`		`- // we have reshade enabled by default so we need this`
`165`		`- FastFlags.SetRenderingMode("Direct3D 11");`
`166`	`167`	`new MainWindow().ShowDialog();`
`167`	`168`	`}`
`168`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,11 @@ public async Task Run()`
`158`	`158`	`App.FastFlags.Save();`
`159`	`159`	`}`
`160`	`160`
	`161`	`+ if (App.Settings.Prop.UseReShade)`
	`162`	`+ SetStatus("Configuring/Downloading ReShade...");`
	`163`	`+`
	`164`	`+ await ReShade.CheckModifications();`
	`165`	`+`
`161`	`166`	`await ApplyModifications();`
`162`	`167`
`163`	`168`	`if (App.IsFirstRun \|\| FreshInstall)`
`@@ -369,7 +374,10 @@ private async Task StartRoblox()`
`369`	`374`	`}`
`370`	`375`
`371`	`376`	`if (App.Settings.Prop.UseDiscordRichPresence \|\| App.Settings.Prop.ShowServerDetails)`
	`377`	`+ {`
`372`	`378`	`activityWatcher = new();`
	`379`	`+ shouldWait = true;`
	`380`	`+ }`
`373`	`381`
`374`	`382`	`if (App.Settings.Prop.UseDiscordRichPresence)`
`375`	`383`	`{`
`@@ -381,7 +389,6 @@ private async Task StartRoblox()`
`381`	`389`	`{`
`382`	`390`	`App.Logger.WriteLine("[Bootstrapper::StartRoblox] Using server details notifier");`
`383`	`391`	`serverNotifier = new(activityWatcher!);`
`384`		`- shouldWait = true;`
`385`	`392`	`}`
`386`	`393`
`387`	`394`	`// launch custom integrations now`
`@@ -796,8 +803,6 @@ private async Task ApplyModifications()`
`796`	`803`	`await CheckModPreset(App.Settings.Prop.UseOldMouseCursor, @"content\textures\Cursors\KeyboardMouse\ArrowFarCursor.png", "OldFarCursor.png");`
`797`	`804`	`await CheckModPreset(App.Settings.Prop.UseDisableAppPatch, @"ExtraContent\places\Mobile.rbxl", "");`
`798`	`805`
`799`		`- await ReShade.CheckModifications();`
`800`		`-`
`801`	`806`	`foreach (string file in Directory.GetFiles(modFolder, ".", SearchOption.AllDirectories))`
`802`	`807`	`{`
`803`	`808`	`// get relative directory path`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,8 @@ public override void Save()`
`80`	`80`	`Directory.CreateDirectory(Path.GetDirectoryName(FileLocation)!);`
`81`	`81`	`File.WriteAllText(FileLocation, JsonSerializer.Serialize(Prop, new JsonSerializerOptions { WriteIndented = true }));`
`82`	`82`
	`83`	`+ Changes.Clear();`
	`84`	`+`
`83`	`85`	`App.Logger.WriteLine($"[FastFlagManager::Save] JSON saved!");`
`84`	`86`	`}`
`85`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ public class GameActivityWatcher : IDisposable`
`32`	`32`	`public long ActivityPlaceId = 0;`
`33`	`33`	`public string ActivityJobId = "";`
`34`	`34`	`public string ActivityMachineAddress = "";`
	`35`	`+ public bool ActivityMachineUDMUX = false;`
`35`	`36`
`36`	`37`	`public bool IsDisposed = false;`
`37`	`38`
`@@ -141,6 +142,7 @@ private void ExamineLogEntry(string entry)`
`141`	`142`	`}`
`142`	`143`
`143`	`144`	`ActivityMachineAddress = match.Groups[1].Value;`
	`145`	`+ ActivityMachineUDMUX = true;`
`144`	`146`
`145`	`147`	`App.Logger.WriteLine($"[GameActivityWatcher::ExamineLogEntry] Server is UDMUX protected ({ActivityPlaceId}/{ActivityJobId}/{ActivityMachineAddress})");`
`146`	`148`	`}`
`@@ -169,6 +171,7 @@ private void ExamineLogEntry(string entry)`
`169`	`171`	`ActivityPlaceId = 0;`
`170`	`172`	`ActivityJobId = "";`
`171`	`173`	`ActivityMachineAddress = "";`
	`174`	`+ ActivityMachineUDMUX = false;`
`172`	`175`
`173`	`176`	`OnGameLeave?.Invoke(this, new EventArgs());`
`174`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public async Task<bool> SetPresence()`
`109`	`109`	`_rpcClient.SetPresence(new RichPresence`
`110`	`110`	`{`
`111`	`111`	`Details = universeDetails.Name,`
`112`		`- State = $"by {universeDetails.Creator.Name}",`
	`112`	`+ State = $"by {universeDetails.Creator.Name}" + (universeDetails.Creator.HasVerifiedBadge ? " ☑️" : ""),`
`113`	`113`	`Timestamps = new Timestamps { Start = DateTime.UtcNow },`
`114`	`114`	`Buttons = buttons.ToArray(),`
`115`	`115`	`Assets = new Assets`