From 1517a4a6be88a1b68bf060f09a6fd5f893f63cde Mon Sep 17 00:00:00 2001 From: AeonLucid Date: Sun, 18 Oct 2020 21:39:52 +0200 Subject: [PATCH] Fix namespaces --- .../Impostor.Patcher.Cli/Program.cs | 20 +++++++++---------- .../AmongUsModifier.cs | 6 +++--- .../Impostor.Patcher.Shared/Configuration.cs | 2 +- .../Events/ErrorEventArgs.cs | 2 +- .../Events/SavedEventArgs.cs | 2 +- .../Forms/FrmMain.Designer.cs | 2 +- .../Forms/FrmMain.cs | 6 +++--- .../Impostor.Patcher.WinForms/Program.cs | 4 ++-- .../Properties/Resources.Designer.cs | 2 +- .../Properties/Settings.Designer.cs | 2 +- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/Impostor.Patcher/Impostor.Patcher.Cli/Program.cs b/src/Impostor.Patcher/Impostor.Patcher.Cli/Program.cs index f07e1ab..cdcc12c 100644 --- a/src/Impostor.Patcher/Impostor.Patcher.Cli/Program.cs +++ b/src/Impostor.Patcher/Impostor.Patcher.Cli/Program.cs @@ -1,32 +1,32 @@ using System; using System.Threading.Tasks; -using Impostor.Client.Shared; -using Impostor.Client.Shared.Events; +using Impostor.Patcher.Shared; +using Impostor.Patcher.Shared.Events; -namespace Impostor.Client.Cli +namespace Impostor.Patcher.Cli { internal static class Program { - private static readonly AmongUsModifier _modifier = new AmongUsModifier(); + private static readonly AmongUsModifier Modifier = new AmongUsModifier(); /// IP Address of the server, will prompt if not specified /// Name for server region private static Task Main(string address = null, string name = AmongUsModifier.DefaultRegionName) { - _modifier.RegionName = name; - _modifier.Error += ModifierOnError; - _modifier.Saved += ModifierOnSaved; + Modifier.RegionName = name; + Modifier.Error += ModifierOnError; + Modifier.Saved += ModifierOnSaved; Console.WriteLine("Welcome to Impostor"); - if (_modifier.TryLoadRegionInfo(out var regionInfo)) + if (Modifier.TryLoadRegionInfo(out var regionInfo)) { Console.WriteLine($"Currently selected region: {regionInfo.Name} ({regionInfo.Ping}, {regionInfo.Servers.Count} server(s))"); } if (address != null) { - return _modifier.SaveIpAsync(address); + return Modifier.SaveIpAsync(address); } return PromptAsync(); @@ -60,7 +60,7 @@ namespace Impostor.Client.Cli { Console.Write("> "); - if (await _modifier.SaveIpAsync(Console.ReadLine())) + if (await Modifier.SaveIpAsync(Console.ReadLine())) { return; } diff --git a/src/Impostor.Patcher/Impostor.Patcher.Shared/AmongUsModifier.cs b/src/Impostor.Patcher/Impostor.Patcher.Shared/AmongUsModifier.cs index c94009b..130a6a4 100644 --- a/src/Impostor.Patcher/Impostor.Patcher.Shared/AmongUsModifier.cs +++ b/src/Impostor.Patcher/Impostor.Patcher.Shared/AmongUsModifier.cs @@ -8,11 +8,11 @@ using System.Runtime.InteropServices; using System.Threading.Tasks; using Gameloop.Vdf; using Gameloop.Vdf.Linq; -using Impostor.Client.Shared.Events; +using Impostor.Patcher.Shared.Events; using Impostor.Shared.Innersloth; -using ErrorEventArgs = Impostor.Client.Shared.Events.ErrorEventArgs; +using ErrorEventArgs = Impostor.Patcher.Shared.Events.ErrorEventArgs; -namespace Impostor.Client.Shared +namespace Impostor.Patcher.Shared { public class AmongUsModifier { diff --git a/src/Impostor.Patcher/Impostor.Patcher.Shared/Configuration.cs b/src/Impostor.Patcher/Impostor.Patcher.Shared/Configuration.cs index f19f741..b256156 100644 --- a/src/Impostor.Patcher/Impostor.Patcher.Shared/Configuration.cs +++ b/src/Impostor.Patcher/Impostor.Patcher.Shared/Configuration.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; -namespace Impostor.Client.Shared +namespace Impostor.Patcher.Shared { public class Configuration { diff --git a/src/Impostor.Patcher/Impostor.Patcher.Shared/Events/ErrorEventArgs.cs b/src/Impostor.Patcher/Impostor.Patcher.Shared/Events/ErrorEventArgs.cs index 128570d..7211d5d 100644 --- a/src/Impostor.Patcher/Impostor.Patcher.Shared/Events/ErrorEventArgs.cs +++ b/src/Impostor.Patcher/Impostor.Patcher.Shared/Events/ErrorEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace Impostor.Client.Shared.Events +namespace Impostor.Patcher.Shared.Events { public class ErrorEventArgs : EventArgs { diff --git a/src/Impostor.Patcher/Impostor.Patcher.Shared/Events/SavedEventArgs.cs b/src/Impostor.Patcher/Impostor.Patcher.Shared/Events/SavedEventArgs.cs index 01fae13..c91d071 100644 --- a/src/Impostor.Patcher/Impostor.Patcher.Shared/Events/SavedEventArgs.cs +++ b/src/Impostor.Patcher/Impostor.Patcher.Shared/Events/SavedEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace Impostor.Client.Shared.Events +namespace Impostor.Patcher.Shared.Events { public class SavedEventArgs : EventArgs { diff --git a/src/Impostor.Patcher/Impostor.Patcher.WinForms/Forms/FrmMain.Designer.cs b/src/Impostor.Patcher/Impostor.Patcher.WinForms/Forms/FrmMain.Designer.cs index 70e3837..0f6320b 100644 --- a/src/Impostor.Patcher/Impostor.Patcher.WinForms/Forms/FrmMain.Designer.cs +++ b/src/Impostor.Patcher/Impostor.Patcher.WinForms/Forms/FrmMain.Designer.cs @@ -1,4 +1,4 @@ -namespace Impostor.Client.WinForms.Forms +namespace Impostor.Patcher.WinForms.Forms { partial class FrmMain { diff --git a/src/Impostor.Patcher/Impostor.Patcher.WinForms/Forms/FrmMain.cs b/src/Impostor.Patcher/Impostor.Patcher.WinForms/Forms/FrmMain.cs index 71c3a7d..5c06669 100644 --- a/src/Impostor.Patcher/Impostor.Patcher.WinForms/Forms/FrmMain.cs +++ b/src/Impostor.Patcher/Impostor.Patcher.WinForms/Forms/FrmMain.cs @@ -1,10 +1,10 @@ using System; using System.Diagnostics; using System.Windows.Forms; -using Impostor.Client.Shared; -using Impostor.Client.Shared.Events; +using Impostor.Patcher.Shared; +using Impostor.Patcher.Shared.Events; -namespace Impostor.Client.WinForms.Forms +namespace Impostor.Patcher.WinForms.Forms { public partial class FrmMain : Form { diff --git a/src/Impostor.Patcher/Impostor.Patcher.WinForms/Program.cs b/src/Impostor.Patcher/Impostor.Patcher.WinForms/Program.cs index 6fc458a..7ca9035 100644 --- a/src/Impostor.Patcher/Impostor.Patcher.WinForms/Program.cs +++ b/src/Impostor.Patcher/Impostor.Patcher.WinForms/Program.cs @@ -1,8 +1,8 @@ using System; using System.Windows.Forms; -using Impostor.Client.WinForms.Forms; +using Impostor.Patcher.WinForms.Forms; -namespace Impostor.Client.WinForms +namespace Impostor.Patcher.WinForms { internal static class Program { diff --git a/src/Impostor.Patcher/Impostor.Patcher.WinForms/Properties/Resources.Designer.cs b/src/Impostor.Patcher/Impostor.Patcher.WinForms/Properties/Resources.Designer.cs index ef33343..bb5c4cf 100644 --- a/src/Impostor.Patcher/Impostor.Patcher.WinForms/Properties/Resources.Designer.cs +++ b/src/Impostor.Patcher/Impostor.Patcher.WinForms/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Impostor.Client.WinForms.Properties +namespace Impostor.Patcher.WinForms.Properties { /// /// A strongly-typed resource class, for looking up localized strings, etc. diff --git a/src/Impostor.Patcher/Impostor.Patcher.WinForms/Properties/Settings.Designer.cs b/src/Impostor.Patcher/Impostor.Patcher.WinForms/Properties/Settings.Designer.cs index 84df4f7..42356db 100644 --- a/src/Impostor.Patcher/Impostor.Patcher.WinForms/Properties/Settings.Designer.cs +++ b/src/Impostor.Patcher/Impostor.Patcher.WinForms/Properties/Settings.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Impostor.Client.Properties +namespace Impostor.Patcher.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute( -- 2.39.5