From d7b8efbc2c0a4131e307a907622f05bde6f79e05 Mon Sep 17 00:00:00 2001 From: pizzaboxer <41478239+pizzaboxer@users.noreply.github.com> Date: Fri, 27 Jan 2023 15:54:18 +0000 Subject: [PATCH] Cleanup namespace ordering --- Bloxstrap/App.xaml.cs | 17 +++++++-------- Bloxstrap/Bootstrapper.cs | 21 ++++++++----------- .../BootstrapperDialogForm.cs | 9 ++++---- .../BootstrapperDialogs/LegacyDialog2011.cs | 3 ++- .../BootstrapperDialogs/ProgressDialog.cs | 7 ++++--- .../BootstrapperDialogs/VistaDialog.cs | 5 +++-- Bloxstrap/Enums/BootstrapperStyle.cs | 5 +++-- Bloxstrap/Helpers/DeployManager.cs | 11 +++++----- Bloxstrap/Helpers/Directories.cs | 4 ++-- .../Integrations/DiscordRichPresence.cs | 14 ++++++------- .../Helpers/Integrations/RbxFpsUnlocker.cs | 5 ++--- Bloxstrap/Helpers/Integrations/ReShade.cs | 10 ++++----- Bloxstrap/Helpers/Protocol.cs | 9 ++++---- Bloxstrap/Helpers/RSMM/PackageManifest.cs | 7 +++---- Bloxstrap/Helpers/RSMM/SystemEvent.cs | 2 +- Bloxstrap/Helpers/ResourceHelper.cs | 2 +- Bloxstrap/Helpers/Updater.cs | 6 +++--- Bloxstrap/Helpers/Utilities.cs | 7 +++---- Bloxstrap/Helpers/WindowScaling.cs | 4 ---- Bloxstrap/Models/ClientVersion.cs | 4 ++-- Bloxstrap/Models/GithubRelease.cs | 4 ++-- Bloxstrap/Models/RobloxThumbnails.cs | 4 ++-- Bloxstrap/SettingsManager.cs | 6 +++--- 23 files changed, 80 insertions(+), 86 deletions(-) diff --git a/Bloxstrap/App.xaml.cs b/Bloxstrap/App.xaml.cs index 84ab14a..91d389e 100644 --- a/Bloxstrap/App.xaml.cs +++ b/Bloxstrap/App.xaml.cs @@ -1,21 +1,18 @@ -using Bloxstrap.Models; -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Data; +using System; +using System.Diagnostics; using System.Globalization; -using System.Linq; +using System.IO; using System.Net.Http; using System.Net; using System.Reflection; -using System.Threading.Tasks; using System.Windows; -using System.Diagnostics; + +using Microsoft.Win32; + +using Bloxstrap.Models; using Bloxstrap.Dialogs.Menu; using Bloxstrap.Enums; using Bloxstrap.Helpers; -using Microsoft.Win32; -using System.IO; namespace Bloxstrap { diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs index 1d37f9e..e6217ca 100644 --- a/Bloxstrap/Bootstrapper.cs +++ b/Bloxstrap/Bootstrapper.cs @@ -1,24 +1,21 @@ -using System.Diagnostics; +using System; +using System.Collections.Generic; +using System.Diagnostics; using System.IO; using System.IO.Compression; +using System.Linq; using System.Net.Http; +using System.Threading.Tasks; +using System.Windows.Forms; +using System.Windows; using Microsoft.Win32; -using Bloxstrap.Enums; using Bloxstrap.Dialogs.BootstrapperDialogs; using Bloxstrap.Helpers; using Bloxstrap.Helpers.Integrations; using Bloxstrap.Helpers.RSMM; using Bloxstrap.Models; -using System.Net; -using Bloxstrap.Properties; -using System.Threading.Tasks; -using System.Linq; -using System.Collections.Generic; -using System; -using System.Windows.Forms; -using System.Windows; namespace Bloxstrap { @@ -317,7 +314,7 @@ namespace Bloxstrap } #endregion -#region App Install + #region App Install public static void Register() { RegistryKey applicationKey = Registry.CurrentUser.CreateSubKey($@"Software\{App.ProjectName}"); @@ -451,7 +448,7 @@ namespace Bloxstrap } #endregion -#region Roblox Install + #region Roblox Install private void UpdateProgressbar() { int newProgress = (int)Math.Floor(ProgressIncrement * TotalDownloadedBytes); diff --git a/Bloxstrap/Dialogs/BootstrapperDialogs/BootstrapperDialogForm.cs b/Bloxstrap/Dialogs/BootstrapperDialogs/BootstrapperDialogForm.cs index 94bcc2e..c39ff8b 100644 --- a/Bloxstrap/Dialogs/BootstrapperDialogs/BootstrapperDialogForm.cs +++ b/Bloxstrap/Dialogs/BootstrapperDialogs/BootstrapperDialogForm.cs @@ -1,9 +1,10 @@ -using Bloxstrap.Enums; -using Bloxstrap.Helpers; -using System.Windows.Forms; +using System; using System.Threading.Tasks; using System.Windows; -using System; +using System.Windows.Forms; + +using Bloxstrap.Enums; +using Bloxstrap.Helpers; namespace Bloxstrap.Dialogs.BootstrapperDialogs { diff --git a/Bloxstrap/Dialogs/BootstrapperDialogs/LegacyDialog2011.cs b/Bloxstrap/Dialogs/BootstrapperDialogs/LegacyDialog2011.cs index 03f34db..124127d 100644 --- a/Bloxstrap/Dialogs/BootstrapperDialogs/LegacyDialog2011.cs +++ b/Bloxstrap/Dialogs/BootstrapperDialogs/LegacyDialog2011.cs @@ -1,7 +1,8 @@ -using Bloxstrap.Enums; using System; using System.Windows.Forms; +using Bloxstrap.Enums; + namespace Bloxstrap.Dialogs.BootstrapperDialogs { // https://youtu.be/3K9oCEMHj2s?t=35 diff --git a/Bloxstrap/Dialogs/BootstrapperDialogs/ProgressDialog.cs b/Bloxstrap/Dialogs/BootstrapperDialogs/ProgressDialog.cs index 74ba41d..487ed49 100644 --- a/Bloxstrap/Dialogs/BootstrapperDialogs/ProgressDialog.cs +++ b/Bloxstrap/Dialogs/BootstrapperDialogs/ProgressDialog.cs @@ -1,7 +1,8 @@ -using Bloxstrap.Enums; -using System; -using System.Windows.Forms; +using System; using System.Drawing; +using System.Windows.Forms; + +using Bloxstrap.Enums; namespace Bloxstrap.Dialogs.BootstrapperDialogs { diff --git a/Bloxstrap/Dialogs/BootstrapperDialogs/VistaDialog.cs b/Bloxstrap/Dialogs/BootstrapperDialogs/VistaDialog.cs index 35ee378..25e1186 100644 --- a/Bloxstrap/Dialogs/BootstrapperDialogs/VistaDialog.cs +++ b/Bloxstrap/Dialogs/BootstrapperDialogs/VistaDialog.cs @@ -1,6 +1,7 @@ -using Bloxstrap.Enums; +using System; using System.Windows.Forms; -using System; + +using Bloxstrap.Enums; namespace Bloxstrap.Dialogs.BootstrapperDialogs { diff --git a/Bloxstrap/Enums/BootstrapperStyle.cs b/Bloxstrap/Enums/BootstrapperStyle.cs index 8fa6775..73e8d8a 100644 --- a/Bloxstrap/Enums/BootstrapperStyle.cs +++ b/Bloxstrap/Enums/BootstrapperStyle.cs @@ -1,5 +1,6 @@ -using Bloxstrap.Dialogs.BootstrapperDialogs; -using System.Windows.Forms; +using System.Windows.Forms; + +using Bloxstrap.Dialogs.BootstrapperDialogs; namespace Bloxstrap.Enums { diff --git a/Bloxstrap/Helpers/DeployManager.cs b/Bloxstrap/Helpers/DeployManager.cs index 5e562f2..3a8032d 100644 --- a/Bloxstrap/Helpers/DeployManager.cs +++ b/Bloxstrap/Helpers/DeployManager.cs @@ -1,10 +1,11 @@ -using System.Net.Http; -using System.Text.Json; -using Bloxstrap.Models; -using System.Threading.Tasks; +using System; using System.Collections.Generic; -using System; using System.Linq; +using System.Net.Http; +using System.Text.Json; +using System.Threading.Tasks; + +using Bloxstrap.Models; namespace Bloxstrap.Helpers { diff --git a/Bloxstrap/Helpers/Directories.cs b/Bloxstrap/Helpers/Directories.cs index 1a44510..9af0938 100644 --- a/Bloxstrap/Helpers/Directories.cs +++ b/Bloxstrap/Helpers/Directories.cs @@ -1,5 +1,5 @@ -using System.IO; -using System; +using System; +using System.IO; namespace Bloxstrap.Helpers { diff --git a/Bloxstrap/Helpers/Integrations/DiscordRichPresence.cs b/Bloxstrap/Helpers/Integrations/DiscordRichPresence.cs index 0bc4fb8..fbd3a42 100644 --- a/Bloxstrap/Helpers/Integrations/DiscordRichPresence.cs +++ b/Bloxstrap/Helpers/Integrations/DiscordRichPresence.cs @@ -1,11 +1,11 @@ -using System.Diagnostics; -using System.IO; -using System.Text.RegularExpressions; -using System.Threading.Tasks; -using System; -using System.Linq; -using System.Threading; +using System; using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Text.RegularExpressions; +using System.Threading; +using System.Threading.Tasks; using Bloxstrap.Models; diff --git a/Bloxstrap/Helpers/Integrations/RbxFpsUnlocker.cs b/Bloxstrap/Helpers/Integrations/RbxFpsUnlocker.cs index b3d5fa9..f162a3e 100644 --- a/Bloxstrap/Helpers/Integrations/RbxFpsUnlocker.cs +++ b/Bloxstrap/Helpers/Integrations/RbxFpsUnlocker.cs @@ -1,11 +1,10 @@ -using System.Diagnostics; +using System; +using System.Diagnostics; using System.IO; using System.IO.Compression; -using System.Net.Http; using System.Threading.Tasks; using Bloxstrap.Models; -using System; namespace Bloxstrap.Helpers.Integrations { diff --git a/Bloxstrap/Helpers/Integrations/ReShade.cs b/Bloxstrap/Helpers/Integrations/ReShade.cs index 6eb12a9..77e6057 100644 --- a/Bloxstrap/Helpers/Integrations/ReShade.cs +++ b/Bloxstrap/Helpers/Integrations/ReShade.cs @@ -1,15 +1,15 @@ -using System.Diagnostics; +using System; +using System.Collections.Generic; +using System.Diagnostics; using System.IO; using System.IO.Compression; +using System.Linq; +using System.Threading.Tasks; using Bloxstrap.Models; using IniParser; using IniParser.Model; -using System.Threading.Tasks; -using System.Linq; -using System.Collections.Generic; -using System; namespace Bloxstrap.Helpers.Integrations { diff --git a/Bloxstrap/Helpers/Protocol.cs b/Bloxstrap/Helpers/Protocol.cs index 4fffdc0..b50daff 100644 --- a/Bloxstrap/Helpers/Protocol.cs +++ b/Bloxstrap/Helpers/Protocol.cs @@ -1,10 +1,11 @@ -using System.Diagnostics; +using System; +using System.Collections.Generic; +using System.Diagnostics; using System.Text; using System.Web; -using Microsoft.Win32; -using System.Collections.Generic; using System.Windows; -using System; + +using Microsoft.Win32; namespace Bloxstrap.Helpers { diff --git a/Bloxstrap/Helpers/RSMM/PackageManifest.cs b/Bloxstrap/Helpers/RSMM/PackageManifest.cs index 1920da9..bdd20d4 100644 --- a/Bloxstrap/Helpers/RSMM/PackageManifest.cs +++ b/Bloxstrap/Helpers/RSMM/PackageManifest.cs @@ -1,10 +1,9 @@ // https://github.com/MaximumADHD/Roblox-Studio-Mod-Manager/blob/main/ProjectSrc/Bootstrapper/PackageManifest.cs -using System.IO; -using System.Net.Http; -using System.Threading.Tasks; -using System.Collections.Generic; using System; +using System.Collections.Generic; +using System.IO; +using System.Threading.Tasks; namespace Bloxstrap.Helpers.RSMM { diff --git a/Bloxstrap/Helpers/RSMM/SystemEvent.cs b/Bloxstrap/Helpers/RSMM/SystemEvent.cs index 28e55a2..752fc28 100644 --- a/Bloxstrap/Helpers/RSMM/SystemEvent.cs +++ b/Bloxstrap/Helpers/RSMM/SystemEvent.cs @@ -1,8 +1,8 @@ // https://github.com/MaximumADHD/Roblox-Studio-Mod-Manager/blob/main/ProjectSrc/Utility/SystemEvent.cs +using System; using System.Threading; using System.Threading.Tasks; -using System; namespace Bloxstrap.Helpers.RSMM { diff --git a/Bloxstrap/Helpers/ResourceHelper.cs b/Bloxstrap/Helpers/ResourceHelper.cs index 7d82c01..def71f9 100644 --- a/Bloxstrap/Helpers/ResourceHelper.cs +++ b/Bloxstrap/Helpers/ResourceHelper.cs @@ -1,7 +1,7 @@ using System.IO; +using System.Linq; using System.Reflection; using System.Threading.Tasks; -using System.Linq; namespace Bloxstrap.Helpers { diff --git a/Bloxstrap/Helpers/Updater.cs b/Bloxstrap/Helpers/Updater.cs index 84b9733..38f5280 100644 --- a/Bloxstrap/Helpers/Updater.cs +++ b/Bloxstrap/Helpers/Updater.cs @@ -1,9 +1,9 @@ -using System.Diagnostics; +using System; +using System.Diagnostics; using System.IO; +using System.Windows; using Bloxstrap.Dialogs.Menu; -using System.Windows; -using System; namespace Bloxstrap.Helpers { diff --git a/Bloxstrap/Helpers/Utilities.cs b/Bloxstrap/Helpers/Utilities.cs index ac679fe..b6237df 100644 --- a/Bloxstrap/Helpers/Utilities.cs +++ b/Bloxstrap/Helpers/Utilities.cs @@ -1,11 +1,10 @@ -using System.Diagnostics; +using System; +using System.Diagnostics; using System.IO; -using System.IO.Compression; +using System.Linq; using System.Security.Cryptography; using System.Text.Json; using System.Threading.Tasks; -using System; -using System.Linq; namespace Bloxstrap.Helpers { diff --git a/Bloxstrap/Helpers/WindowScaling.cs b/Bloxstrap/Helpers/WindowScaling.cs index dd2e843..fe09ee0 100644 --- a/Bloxstrap/Helpers/WindowScaling.cs +++ b/Bloxstrap/Helpers/WindowScaling.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; using System.Windows.Forms; diff --git a/Bloxstrap/Models/ClientVersion.cs b/Bloxstrap/Models/ClientVersion.cs index 8fa2166..4f18c47 100644 --- a/Bloxstrap/Models/ClientVersion.cs +++ b/Bloxstrap/Models/ClientVersion.cs @@ -1,5 +1,5 @@ -using System.Text.Json.Serialization; -using System; +using System; +using System.Text.Json.Serialization; namespace Bloxstrap.Models { diff --git a/Bloxstrap/Models/GithubRelease.cs b/Bloxstrap/Models/GithubRelease.cs index e1c5058..a388586 100644 --- a/Bloxstrap/Models/GithubRelease.cs +++ b/Bloxstrap/Models/GithubRelease.cs @@ -1,5 +1,5 @@ -using System.Text.Json.Serialization; -using System.Collections.Generic; +using System.Collections.Generic; +using System.Text.Json.Serialization; namespace Bloxstrap.Models { diff --git a/Bloxstrap/Models/RobloxThumbnails.cs b/Bloxstrap/Models/RobloxThumbnails.cs index 11e701c..f3b1e58 100644 --- a/Bloxstrap/Models/RobloxThumbnails.cs +++ b/Bloxstrap/Models/RobloxThumbnails.cs @@ -1,5 +1,5 @@ -using System.Text.Json.Serialization; -using System.Collections.Generic; +using System.Collections.Generic; +using System.Text.Json.Serialization; namespace Bloxstrap.Models { diff --git a/Bloxstrap/SettingsManager.cs b/Bloxstrap/SettingsManager.cs index dde5a0e..f66b227 100644 --- a/Bloxstrap/SettingsManager.cs +++ b/Bloxstrap/SettingsManager.cs @@ -1,10 +1,10 @@ -using System.Diagnostics; +using System; +using System.Diagnostics; using System.IO; using System.Text.Json; +using System.Threading; using Bloxstrap.Models; -using System; -using System.Threading; namespace Bloxstrap {