From d00a6035ffbd9c18fd81b17202a4f4bacd66000a Mon Sep 17 00:00:00 2001 From: Mooshua <43320783+mooshua@users.noreply.github.com> Date: Sun, 7 Jan 2024 18:42:38 -0800 Subject: [PATCH] Oops. Fix references & imports --- .../Extensions/WardenFormatWriterExtensions.cs | 2 +- mod/Jailbreak.Warden/Global/WardenBehavior.cs | 3 ++- mod/Jailbreak.Warden/Jailbreak.Warden.csproj | 1 + mod/Jailbreak.Warden/Selection/WardenSelectionBehavior.cs | 7 +++---- mod/Jailbreak.Warden/Views/NewWardenView.cs | 2 +- mod/Jailbreak.Warden/Views/WardenNotifications.cs | 3 ++- mod/Jailbreak.Warden/WardenServiceExtension.cs | 2 +- public/Jailbreak.Formatting/Base/IView.cs | 2 +- public/Jailbreak.Formatting/Base/SimpleView.cs | 2 +- .../{Formatting => Core}/FormatObject.cs | 4 +++- .../{Formatting => Core}/FormatWriter.cs | 2 +- public/Jailbreak.Formatting/Extensions/ViewExtensions.cs | 3 ++- public/Jailbreak.Formatting/Objects/HiddenFormatObject.cs | 4 +++- public/Jailbreak.Formatting/Objects/PlayerFormatObject.cs | 3 ++- src/Jailbreak.Generic/PlayerState/PlayerStateFactory.cs | 4 ++-- src/Jailbreak.Generic/PlayerState/PlayerStateImpl.cs | 2 +- 16 files changed, 27 insertions(+), 19 deletions(-) rename public/Jailbreak.Formatting/{Formatting => Core}/FormatObject.cs (91%) rename public/Jailbreak.Formatting/{Formatting => Core}/FormatWriter.cs (92%) diff --git a/mod/Jailbreak.Warden/Extensions/WardenFormatWriterExtensions.cs b/mod/Jailbreak.Warden/Extensions/WardenFormatWriterExtensions.cs index d036c435..2e6a4e31 100644 --- a/mod/Jailbreak.Warden/Extensions/WardenFormatWriterExtensions.cs +++ b/mod/Jailbreak.Warden/Extensions/WardenFormatWriterExtensions.cs @@ -1,4 +1,4 @@ -namespace Jailbreak.Warden.Views; +namespace Jailbreak.Warden.Extensions; public class WardenFormatWriterExtensions { diff --git a/mod/Jailbreak.Warden/Global/WardenBehavior.cs b/mod/Jailbreak.Warden/Global/WardenBehavior.cs index 5e60e5da..c55a68cb 100644 --- a/mod/Jailbreak.Warden/Global/WardenBehavior.cs +++ b/mod/Jailbreak.Warden/Global/WardenBehavior.cs @@ -5,11 +5,12 @@ using CounterStrikeSharp.API.Core.Attributes.Registration; using CounterStrikeSharp.API.Modules.Utils; -using Jailbreak.Formatting.Formatting; using Jailbreak.Public.Behaviors; using Jailbreak.Public.Extensions; using Jailbreak.Public.Mod.Warden; using Jailbreak.Warden.Views; +using Jailbreak.Formatting.Core; +using Jailbreak.Formatting.Extensions; namespace Jailbreak.Warden.Global; diff --git a/mod/Jailbreak.Warden/Jailbreak.Warden.csproj b/mod/Jailbreak.Warden/Jailbreak.Warden.csproj index d809758e..e549f3ef 100644 --- a/mod/Jailbreak.Warden/Jailbreak.Warden.csproj +++ b/mod/Jailbreak.Warden/Jailbreak.Warden.csproj @@ -7,6 +7,7 @@ + diff --git a/mod/Jailbreak.Warden/Selection/WardenSelectionBehavior.cs b/mod/Jailbreak.Warden/Selection/WardenSelectionBehavior.cs index 0c3d31ee..c78c072d 100644 --- a/mod/Jailbreak.Warden/Selection/WardenSelectionBehavior.cs +++ b/mod/Jailbreak.Warden/Selection/WardenSelectionBehavior.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using System.Reflection; using System.Runtime.CompilerServices; using CounterStrikeSharp.API; @@ -9,7 +8,7 @@ using CounterStrikeSharp.API.Modules.Timers; using CounterStrikeSharp.API.Modules.Utils; -using Jailbreak.Formatting.Formatting; +using Jailbreak.Formatting.Extensions; using Jailbreak.Public.Behaviors; using Jailbreak.Public.Extensions; using Jailbreak.Public.Generic; @@ -20,7 +19,7 @@ using Timer = CounterStrikeSharp.API.Modules.Timers.Timer; -namespace Jailbreak.Warden.Queue; +namespace Jailbreak.Warden.Selection; /// /// Behavior responsible for choosing the next warden @@ -97,7 +96,7 @@ protected void OnChooseWarden() if (eligible.Count == 0) { - Server.PrintToChatAll("[Warden] No Wardens in queue!"); + WardenNotifications.NO_WARDENS.ToAllChat(); _queueInactive = true; return; diff --git a/mod/Jailbreak.Warden/Views/NewWardenView.cs b/mod/Jailbreak.Warden/Views/NewWardenView.cs index 880b408c..8998ecd5 100644 --- a/mod/Jailbreak.Warden/Views/NewWardenView.cs +++ b/mod/Jailbreak.Warden/Views/NewWardenView.cs @@ -1,7 +1,7 @@ using CounterStrikeSharp.API.Core; using Jailbreak.Formatting.Base; -using Jailbreak.Formatting.Formatting; +using Jailbreak.Formatting.Core; namespace Jailbreak.Warden.Views; diff --git a/mod/Jailbreak.Warden/Views/WardenNotifications.cs b/mod/Jailbreak.Warden/Views/WardenNotifications.cs index 68465bff..90f86671 100644 --- a/mod/Jailbreak.Warden/Views/WardenNotifications.cs +++ b/mod/Jailbreak.Warden/Views/WardenNotifications.cs @@ -1,7 +1,8 @@ using CounterStrikeSharp.API.Modules.Utils; using Jailbreak.Formatting.Base; -using Jailbreak.Formatting.Formatting; +using Jailbreak.Formatting.Core; +using Jailbreak.Formatting.Objects; namespace Jailbreak.Warden.Views; diff --git a/mod/Jailbreak.Warden/WardenServiceExtension.cs b/mod/Jailbreak.Warden/WardenServiceExtension.cs index d6f17af1..4646f63f 100644 --- a/mod/Jailbreak.Warden/WardenServiceExtension.cs +++ b/mod/Jailbreak.Warden/WardenServiceExtension.cs @@ -4,7 +4,7 @@ using Jailbreak.Public.Mod.Warden; using Jailbreak.Warden.Commands; using Jailbreak.Warden.Global; -using Jailbreak.Warden.Queue; +using Jailbreak.Warden.Selection; using Microsoft.Extensions.DependencyInjection; diff --git a/public/Jailbreak.Formatting/Base/IView.cs b/public/Jailbreak.Formatting/Base/IView.cs index 9b3c3550..9568bafe 100644 --- a/public/Jailbreak.Formatting/Base/IView.cs +++ b/public/Jailbreak.Formatting/Base/IView.cs @@ -1,4 +1,4 @@ -using Jailbreak.Formatting.Formatting; +using Jailbreak.Formatting.Core; namespace Jailbreak.Formatting.Base; diff --git a/public/Jailbreak.Formatting/Base/SimpleView.cs b/public/Jailbreak.Formatting/Base/SimpleView.cs index 9dca80fd..6cf13644 100644 --- a/public/Jailbreak.Formatting/Base/SimpleView.cs +++ b/public/Jailbreak.Formatting/Base/SimpleView.cs @@ -1,4 +1,4 @@ -using Jailbreak.Formatting.Formatting; +using Jailbreak.Formatting.Core; namespace Jailbreak.Formatting.Base; diff --git a/public/Jailbreak.Formatting/Formatting/FormatObject.cs b/public/Jailbreak.Formatting/Core/FormatObject.cs similarity index 91% rename from public/Jailbreak.Formatting/Formatting/FormatObject.cs rename to public/Jailbreak.Formatting/Core/FormatObject.cs index 14604714..bf00046f 100644 --- a/public/Jailbreak.Formatting/Formatting/FormatObject.cs +++ b/public/Jailbreak.Formatting/Core/FormatObject.cs @@ -1,6 +1,8 @@ using CounterStrikeSharp.API.Core; -namespace Jailbreak.Formatting.Formatting; +using Jailbreak.Formatting.Objects; + +namespace Jailbreak.Formatting.Core; public abstract class FormatObject { diff --git a/public/Jailbreak.Formatting/Formatting/FormatWriter.cs b/public/Jailbreak.Formatting/Core/FormatWriter.cs similarity index 92% rename from public/Jailbreak.Formatting/Formatting/FormatWriter.cs rename to public/Jailbreak.Formatting/Core/FormatWriter.cs index 81ca280b..feccfc30 100644 --- a/public/Jailbreak.Formatting/Formatting/FormatWriter.cs +++ b/public/Jailbreak.Formatting/Core/FormatWriter.cs @@ -1,4 +1,4 @@ -namespace Jailbreak.Formatting.Formatting; +namespace Jailbreak.Formatting.Core; public class FormatWriter { diff --git a/public/Jailbreak.Formatting/Extensions/ViewExtensions.cs b/public/Jailbreak.Formatting/Extensions/ViewExtensions.cs index 2af71b6a..981f483a 100644 --- a/public/Jailbreak.Formatting/Extensions/ViewExtensions.cs +++ b/public/Jailbreak.Formatting/Extensions/ViewExtensions.cs @@ -2,8 +2,9 @@ using CounterStrikeSharp.API.Core; using Jailbreak.Formatting.Base; +using Jailbreak.Formatting.Core; -namespace Jailbreak.Formatting.Formatting; +namespace Jailbreak.Formatting.Extensions; public static class ViewExtensions { diff --git a/public/Jailbreak.Formatting/Objects/HiddenFormatObject.cs b/public/Jailbreak.Formatting/Objects/HiddenFormatObject.cs index d8bf277c..a9cac122 100644 --- a/public/Jailbreak.Formatting/Objects/HiddenFormatObject.cs +++ b/public/Jailbreak.Formatting/Objects/HiddenFormatObject.cs @@ -1,4 +1,6 @@ -namespace Jailbreak.Formatting.Formatting; +using Jailbreak.Formatting.Core; + +namespace Jailbreak.Formatting.Objects; public class HiddenFormatObject : FormatObject { diff --git a/public/Jailbreak.Formatting/Objects/PlayerFormatObject.cs b/public/Jailbreak.Formatting/Objects/PlayerFormatObject.cs index d346410a..3dadab23 100644 --- a/public/Jailbreak.Formatting/Objects/PlayerFormatObject.cs +++ b/public/Jailbreak.Formatting/Objects/PlayerFormatObject.cs @@ -1,9 +1,10 @@ using CounterStrikeSharp.API.Core; using CounterStrikeSharp.API.Modules.Utils; +using Jailbreak.Formatting.Core; using Jailbreak.Public.Extensions; -namespace Jailbreak.Formatting.Formatting; +namespace Jailbreak.Formatting.Objects; public class PlayerFormatObject : FormatObject { diff --git a/src/Jailbreak.Generic/PlayerState/PlayerStateFactory.cs b/src/Jailbreak.Generic/PlayerState/PlayerStateFactory.cs index fdd4c730..8a38f352 100644 --- a/src/Jailbreak.Generic/PlayerState/PlayerStateFactory.cs +++ b/src/Jailbreak.Generic/PlayerState/PlayerStateFactory.cs @@ -1,7 +1,7 @@ -using Jailbreak.Generic.Behaviors; +using Jailbreak.Generic.PlayerState.Behaviors; using Jailbreak.Public.Generic; -namespace Jailbreak.Generic; +namespace Jailbreak.Generic.PlayerState; public class PlayerStateFactory : IPlayerStateFactory { diff --git a/src/Jailbreak.Generic/PlayerState/PlayerStateImpl.cs b/src/Jailbreak.Generic/PlayerState/PlayerStateImpl.cs index 1e9b4424..75d57cdf 100644 --- a/src/Jailbreak.Generic/PlayerState/PlayerStateImpl.cs +++ b/src/Jailbreak.Generic/PlayerState/PlayerStateImpl.cs @@ -2,7 +2,7 @@ using Jailbreak.Public.Generic; -namespace Jailbreak.Generic; +namespace Jailbreak.Generic.PlayerState; public class PlayerStateImpl : IPlayerState, ITrackedPlayerState where TState : class, new()