Oops. Fix references & imports

edgegamers · Jan 8, 2024 · d00a603 · d00a603
1 parent 28e0fd1
commit d00a603
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 19 deletions.
diff --git 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
@@ -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
@@ -7,6 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+      <ProjectReference Include="..\..\public\Jailbreak.Formatting\Jailbreak.Formatting.csproj" />
       <ProjectReference Include="..\..\public\Jailbreak.Public\Jailbreak.Public.csproj" />
     </ItemGroup>
 

diff --git 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;
 
 /// <summary>
 /// 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-using Jailbreak.Formatting.Formatting;
+using Jailbreak.Formatting.Core;
 
 namespace Jailbreak.Formatting.Base;
 

diff --git a/...eak.Formatting/Formatting/FormatObject.cs → ...Jailbreak.Formatting/Core/FormatObject.cs b/...eak.Formatting/Formatting/FormatObject.cs → ...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/...eak.Formatting/Formatting/FormatWriter.cs → ...Jailbreak.Formatting/Core/FormatWriter.cs b/...eak.Formatting/Formatting/FormatWriter.cs → ...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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -2,7 +2,7 @@
 
 using Jailbreak.Public.Generic;
 
-namespace Jailbreak.Generic;
+namespace Jailbreak.Generic.PlayerState;
 
 public class PlayerStateImpl<TState> : IPlayerState<TState>, ITrackedPlayerState
 	where TState : class, new()