Whitespace formatting, move Integrations folder

Bloxstrap/Bootstrapper.cs

@@ -14,9 +14,9 @@ using Microsoft.Win32;
 
 using Bloxstrap.Dialogs;
 using Bloxstrap.Helpers;
-using Bloxstrap.Helpers.Integrations;
 using Bloxstrap.Helpers.RSMM;
 using Bloxstrap.Models;
+using Bloxstrap.Integrations;
 
 namespace Bloxstrap
 {

Bloxstrap/Integrations/DiscordRichPresence.cs

@@ -6,12 +6,13 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
+using Bloxstrap.Helpers;
 
 using Bloxstrap.Models;
 
 using DiscordRPC;
 
-namespace Bloxstrap.Helpers.Integrations
+namespace Bloxstrap.Integrations
 {
     class DiscordRichPresence : IDisposable
     {
@@ -62,7 +63,7 @@ namespace Bloxstrap.Helpers.Integrations
 
             // debug stats to ensure that the log reader is working correctly
             // if more than 5000 log entries have been read, only log per 100 to save on spam
-            if (_logEntriesRead <= 5000 &&  _logEntriesRead % 50 == 0)
+            if (_logEntriesRead <= 5000 && _logEntriesRead % 50 == 0)
                 App.Logger.WriteLine($"[DiscordRichPresence::ExamineLogEntry] Read {_logEntriesRead} log entries");
             else if (_logEntriesRead % 100 == 0)
                 App.Logger.WriteLine($"[DiscordRichPresence::ExamineLogEntry] Read {_logEntriesRead} log entries");
@@ -75,7 +76,7 @@ namespace Bloxstrap.Helpers.Integrations
                     return;
 
                 _activityInGame = false;
-                _activityPlaceId = Int64.Parse(match.Groups[2].Value);
+                _activityPlaceId = long.Parse(match.Groups[2].Value);
                 _activityJobId = match.Groups[1].Value;
                 _activityMachineAddress = match.Groups[3].Value;
 
@@ -160,7 +161,7 @@ namespace Bloxstrap.Helpers.Integrations
             {
                 string? log = await sr.ReadLineAsync();
 
-                if (String.IsNullOrEmpty(log))
+                if (string.IsNullOrEmpty(log))
                     logUpdatedEvent.WaitOne(1000);
                 else
                     await ExamineLogEntry(log);

Bloxstrap/Integrations/RbxFpsUnlocker.cs

@@ -3,10 +3,11 @@ using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
 using System.Threading.Tasks;
+using Bloxstrap.Helpers;
 
 using Bloxstrap.Models;
 
-namespace Bloxstrap.Helpers.Integrations
+namespace Bloxstrap.Integrations
 {
     internal class RbxFpsUnlocker
     {

Bloxstrap/Integrations/ReShade.cs

@@ -7,13 +7,14 @@ using System.IO;
 using System.IO.Compression;
 using System.Linq;
 using System.Threading.Tasks;
+using Bloxstrap.Helpers;
 
 using Bloxstrap.Models;
 
 using IniParser;
 using IniParser.Model;
 
-namespace Bloxstrap.Helpers.Integrations
+namespace Bloxstrap.Integrations
 {
     internal class ReShade
     {
@@ -114,8 +115,8 @@ namespace Bloxstrap.Helpers.Integrations
             "prod80",
             "qUINT",
             "StockLegacy",
-			"Stormshade",
+            "Stormshade",
-			"SweetFX",
+            "SweetFX",
         };
 
         private static string GetSearchPath(string type, string name)
@@ -378,7 +379,7 @@ namespace Bloxstrap.Helpers.Integrations
 
             string injectorLocation = Path.Combine(Directories.Modifications, "dxgi.dll");
 
-            if (!App.Settings.Prop.UseReShadeExtraviPresets && !String.IsNullOrEmpty(App.State.Prop.ExtraviReShadePresetsVersion))
+            if (!App.Settings.Prop.UseReShadeExtraviPresets && !string.IsNullOrEmpty(App.State.Prop.ExtraviReShadePresetsVersion))
             {
                 if (Utilities.GetProcessCount("RobloxPlayerBeta") > 0)
                     return;
@@ -398,7 +399,7 @@ namespace Bloxstrap.Helpers.Integrations
 
                 // we should already be uninstalled
                 // we want to ensure this is done one-time only as this could possibly interfere with other rendering hooks using dxgi.dll
-                if (String.IsNullOrEmpty(App.State.Prop.ReShadeConfigVersion))
+                if (string.IsNullOrEmpty(App.State.Prop.ReShadeConfigVersion))
                     return;
 
                 App.Logger.WriteLine("[ReShade::CheckModifications] Uninstalling ReShade...");
@@ -433,43 +434,43 @@ namespace Bloxstrap.Helpers.Integrations
                 if (injectorVersionInfo.ProductVersion != versionManifest.ReShade)
                     shouldFetchReShade = true;
 
-				// UPDATE CHECK - if we're upgrading to reshade 5.7.0, or we have extravi's presets
+                // UPDATE CHECK - if we're upgrading to reshade 5.7.0, or we have extravi's presets
                 // enabled with a known shader downloaded (like AlucardDH) but without stormshade downloaded (5.7.0+ specific),
                 // we need to redownload all our shaders fresh
-				if (
+                if (
                     injectorVersionInfo.ProductVersion != versionManifest.ReShade && versionManifest.ReShade == "5.7.0" ||
                     App.Settings.Prop.UseReShadeExtraviPresets && Directory.Exists(Path.Combine(ShadersFolder, "AlucardDH")) && !Directory.Exists(Path.Combine(ShadersFolder, "Stormshade"))
                 )
-				{
+                {
-					Directory.Delete(ShadersFolder, true);
+                    Directory.Delete(ShadersFolder, true);
-					Directory.Delete(TexturesFolder, true);
+                    Directory.Delete(TexturesFolder, true);
                     App.State.Prop.ExtraviReShadePresetsVersion = "";
                     App.Logger.WriteLine("[ReShade::CheckModifications] Upgrading to ReShade 5.7.0 - redownloading all shaders!");
-				}
+                }
-			}
+            }
             else
             {
                 App.Logger.WriteLine("[ReShade::CheckModifications] versionManifest is null!");
             }
 
-			// we're about to download - initialize directories
+            // we're about to download - initialize directories
-			Directory.CreateDirectory(BaseDirectory);
+            Directory.CreateDirectory(BaseDirectory);
-			Directory.CreateDirectory(FontsFolder);
+            Directory.CreateDirectory(FontsFolder);
-			Directory.CreateDirectory(ShadersFolder);
+            Directory.CreateDirectory(ShadersFolder);
-			Directory.CreateDirectory(TexturesFolder);
+            Directory.CreateDirectory(TexturesFolder);
-			Directory.CreateDirectory(PresetsFolder);
+            Directory.CreateDirectory(PresetsFolder);
 
-			// check if we should download a fresh copy of the config
+            // check if we should download a fresh copy of the config
-			// extravi may need to update the config ota, in which case we'll redownload it
+            // extravi may need to update the config ota, in which case we'll redownload it
-			if (!File.Exists(ConfigLocation) || versionManifest is not null && App.State.Prop.ReShadeConfigVersion != versionManifest.ConfigFile)
+            if (!File.Exists(ConfigLocation) || versionManifest is not null && App.State.Prop.ReShadeConfigVersion != versionManifest.ConfigFile)
                 shouldFetchConfig = true;
 
             if (shouldFetchReShade)
             {
                 App.Logger.WriteLine("[ReShade::CheckModifications] Installing/Upgrading ReShade...");
 
-				{
+                {
-					byte[] bytes = await App.HttpClient.GetByteArrayAsync($"{BaseUrl}/dxgi.zip");
+                    byte[] bytes = await App.HttpClient.GetByteArrayAsync($"{BaseUrl}/dxgi.zip");
                     using MemoryStream zipStream = new(bytes);
                     using ZipArchive archive = new(zipStream);
                     archive.ExtractToDirectory(Directories.Modifications, true);