From 94ed8e270f1b1a3924857397a7fb31d6eae076e0 Mon Sep 17 00:00:00 2001
From: Mooshua <43320783+mooshua@users.noreply.github.com>
Date: Sun, 7 Jan 2024 18:43:18 -0800
Subject: [PATCH] Refactor namespaces Yes this is in the wrong branch. No I
 don't want to talk about it.

---
 mod/Jailbreak.Warden/Selection/QueueFavorState.cs           | 2 +-
 mod/Jailbreak.Warden/Selection/QueueState.cs                | 2 +-
 public/Jailbreak.Formatting/Objects/StringFormatObject.cs   | 4 +++-
 src/Jailbreak.Generic/GenericServiceExtension.cs            | 3 ++-
 .../PlayerState/Behaviors/AliveStateTracker.cs              | 6 ++----
 .../PlayerState/Behaviors/BaseStateTracker.cs               | 2 +-
 .../PlayerState/Behaviors/GlobalStateTracker.cs             | 2 +-
 .../PlayerState/Behaviors/RoundStateTracker.cs              | 6 ++----
 src/Jailbreak.Generic/PlayerState/ITrackedPlayerState.cs    | 2 +-
 9 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/mod/Jailbreak.Warden/Selection/QueueFavorState.cs b/mod/Jailbreak.Warden/Selection/QueueFavorState.cs
index 36ccbd27..fc8b4b82 100644
--- a/mod/Jailbreak.Warden/Selection/QueueFavorState.cs
+++ b/mod/Jailbreak.Warden/Selection/QueueFavorState.cs
@@ -1,4 +1,4 @@
-namespace Jailbreak.Warden.Queue;
+namespace Jailbreak.Warden.Selection;
 
 public class QueueFavorState
 {
diff --git a/mod/Jailbreak.Warden/Selection/QueueState.cs b/mod/Jailbreak.Warden/Selection/QueueState.cs
index 19f78507..ef885e29 100644
--- a/mod/Jailbreak.Warden/Selection/QueueState.cs
+++ b/mod/Jailbreak.Warden/Selection/QueueState.cs
@@ -1,4 +1,4 @@
-namespace Jailbreak.Warden.Queue;
+namespace Jailbreak.Warden.Selection;
 
 public class QueueState
 {
diff --git a/public/Jailbreak.Formatting/Objects/StringFormatObject.cs b/public/Jailbreak.Formatting/Objects/StringFormatObject.cs
index 6cf52d2f..2f0e29f9 100644
--- a/public/Jailbreak.Formatting/Objects/StringFormatObject.cs
+++ b/public/Jailbreak.Formatting/Objects/StringFormatObject.cs
@@ -1,6 +1,8 @@
 using CounterStrikeSharp.API.Modules.Utils;
 
-namespace Jailbreak.Formatting.Formatting;
+using Jailbreak.Formatting.Core;
+
+namespace Jailbreak.Formatting.Objects;
 
 public class StringFormatObject : FormatObject
 {
diff --git a/src/Jailbreak.Generic/GenericServiceExtension.cs b/src/Jailbreak.Generic/GenericServiceExtension.cs
index 0dd96e1f..c55984ff 100644
--- a/src/Jailbreak.Generic/GenericServiceExtension.cs
+++ b/src/Jailbreak.Generic/GenericServiceExtension.cs
@@ -1,6 +1,7 @@
 using CounterStrikeSharp.API.Core;
 
-using Jailbreak.Generic.Behaviors;
+using Jailbreak.Generic.PlayerState;
+using Jailbreak.Generic.PlayerState.Behaviors;
 using Jailbreak.Public.Extensions;
 using Jailbreak.Public.Generic;
 
diff --git a/src/Jailbreak.Generic/PlayerState/Behaviors/AliveStateTracker.cs b/src/Jailbreak.Generic/PlayerState/Behaviors/AliveStateTracker.cs
index 1ff3c8d6..e386c828 100644
--- a/src/Jailbreak.Generic/PlayerState/Behaviors/AliveStateTracker.cs
+++ b/src/Jailbreak.Generic/PlayerState/Behaviors/AliveStateTracker.cs
@@ -1,11 +1,9 @@
-using System.Reflection;
-
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
 
 using Jailbreak.Public.Behaviors;
 
-namespace Jailbreak.Generic.Behaviors;
+namespace Jailbreak.Generic.PlayerState.Behaviors;
 
 public class AliveStateTracker : BaseStateTracker, IPluginBehavior
 {
diff --git a/src/Jailbreak.Generic/PlayerState/Behaviors/BaseStateTracker.cs b/src/Jailbreak.Generic/PlayerState/Behaviors/BaseStateTracker.cs
index ef846748..9112588f 100644
--- a/src/Jailbreak.Generic/PlayerState/Behaviors/BaseStateTracker.cs
+++ b/src/Jailbreak.Generic/PlayerState/Behaviors/BaseStateTracker.cs
@@ -1,6 +1,6 @@
 using CounterStrikeSharp.API.Core;
 
-namespace Jailbreak.Generic.Behaviors;
+namespace Jailbreak.Generic.PlayerState.Behaviors;
 
 public class BaseStateTracker : IDisposable
 {
diff --git a/src/Jailbreak.Generic/PlayerState/Behaviors/GlobalStateTracker.cs b/src/Jailbreak.Generic/PlayerState/Behaviors/GlobalStateTracker.cs
index b15ca770..5eeeb7cb 100644
--- a/src/Jailbreak.Generic/PlayerState/Behaviors/GlobalStateTracker.cs
+++ b/src/Jailbreak.Generic/PlayerState/Behaviors/GlobalStateTracker.cs
@@ -3,7 +3,7 @@
 
 using Jailbreak.Public.Behaviors;
 
-namespace Jailbreak.Generic.Behaviors;
+namespace Jailbreak.Generic.PlayerState.Behaviors;
 
 public class GlobalStateTracker : BaseStateTracker, IPluginBehavior
 {
diff --git a/src/Jailbreak.Generic/PlayerState/Behaviors/RoundStateTracker.cs b/src/Jailbreak.Generic/PlayerState/Behaviors/RoundStateTracker.cs
index f10d2781..344ee4d5 100644
--- a/src/Jailbreak.Generic/PlayerState/Behaviors/RoundStateTracker.cs
+++ b/src/Jailbreak.Generic/PlayerState/Behaviors/RoundStateTracker.cs
@@ -1,13 +1,11 @@
-using System.Reflection;
-
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
 
 using Jailbreak.Public.Behaviors;
 
 using Serilog;
 
-namespace Jailbreak.Generic.Behaviors;
+namespace Jailbreak.Generic.PlayerState.Behaviors;
 
 public class RoundStateTracker : BaseStateTracker, IPluginBehavior
 {
diff --git a/src/Jailbreak.Generic/PlayerState/ITrackedPlayerState.cs b/src/Jailbreak.Generic/PlayerState/ITrackedPlayerState.cs
index 73a0af5d..8b4dca2c 100644
--- a/src/Jailbreak.Generic/PlayerState/ITrackedPlayerState.cs
+++ b/src/Jailbreak.Generic/PlayerState/ITrackedPlayerState.cs
@@ -1,6 +1,6 @@
 using CounterStrikeSharp.API.Core;
 
-namespace Jailbreak.Generic;
+namespace Jailbreak.Generic.PlayerState;
 
 public interface ITrackedPlayerState
 {