Change all events to use interfaces and move them to a better namespace

docs/Writing-a-plugin.md

@@ -150,6 +150,7 @@ Create a new class called `GameEventListener`. Example code:
 
 ```csharp
 using Impostor.Api.Events;
+using Impostor.Api.Events.Player;
 using Microsoft.Extensions.Logging;
 
 namespace Impostor.Plugins.Example.Handlers
@@ -176,7 +177,7 @@ namespace Impostor.Plugins.Example.Handlers
         ///     The event you want to listen for.
         /// </param>
         [EventListener]
-        public void OnGameStarted(GameStartedEvent e)
+        public void OnGameStarted(IGameStartedEvent e)
         {
             _logger.LogInformation($"Game is starting.");
 
@@ -197,13 +198,13 @@ namespace Impostor.Plugins.Example.Handlers
         }
 
         [EventListener]
-        public void OnGameEnded(GameEndedEvent e)
+        public void OnGameEnded(IGameEndedEvent e)
         {
             _logger.LogInformation($"Game has ended.");
         }
 
         [EventListener]
-        public void OnPlayerChat(PlayerChatEvent e)
+        public void OnPlayerChat(IPlayerChatEvent e)
         {
             _logger.LogInformation($"{e.PlayerControl.PlayerInfo.PlayerName} said {e.Message}");
         }

src/.editorconfig

@@ -11,6 +11,7 @@ indent_style = space
 # Code files
 [*.{cs,csx,vb,vbx}]
 indent_size = 4
+insert_final_newline = true
 
 # XML project files
 [*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]

src/Impostor.Api/Events/Game/GameCreatedEvent.cs

@@ -1,22 +0,0 @@
-using Impostor.Api.Games;
-
-namespace Impostor.Api.Events
-{
-    /// <summary>
-    ///     Called whenever a new <see cref="IGame"/> is created.
-    /// </summary>
-    public sealed class GameCreatedEvent : IGameEvent
-    {
-        /// <summary>
-        ///     Initializes a new instance of the <see cref="GameCreatedEvent"/> class.
-        /// </summary>
-        /// <param name="game">Instance of the game.</param>
-        public GameCreatedEvent(IGame game)
-        {
-            Game = game;
-        }
-
-        /// <inheritdoc/>
-        public IGame Game { get; }
-    }
-}

src/Impostor.Api/Events/Game/GameDestroyedEvent.cs

@@ -1,22 +0,0 @@
-using Impostor.Api.Games;
-
-namespace Impostor.Api.Events
-{
-    /// <summary>
-    ///     Called whenever a new <see cref="IGame"/> is destroyed.
-    /// </summary>
-    public sealed class GameDestroyedEvent : IGameEvent
-    {
-        /// <summary>
-        ///     Initializes a new instance of the <see cref="GameDestroyedEvent"/> class.
-        /// </summary>
-        /// <param name="game">Instance of the game.</param>
-        public GameDestroyedEvent(IGame game)
-        {
-            Game = game;
-        }
-
-        /// <inheritdoc/>
-        public IGame Game { get; }
-    }
-}

src/Impostor.Api/Events/Game/GameEndedEvent.cs

@@ -1,14 +0,0 @@
-using Impostor.Api.Games;
-
-namespace Impostor.Api.Events
-{
-    public class GameEndedEvent : IGameEvent
-    {
-        public GameEndedEvent(IGame game)
-        {
-            Game = game;
-        }
-
-        public IGame Game { get; }
-    }
-}

src/Impostor.Api/Events/Game/GameStartedEvent.cs

@@ -1,17 +0,0 @@
-using Impostor.Api.Games;
-
-namespace Impostor.Api.Events
-{
-    /// <summary>
-    ///     The game is started here and players have been initialized.
-    /// </summary>
-    public class GameStartedEvent : IGameEvent
-    {
-        public GameStartedEvent(IGame game)
-        {
-            Game = game;
-        }
-
-        public IGame Game { get; }
-    }
-}

src/Impostor.Api/Events/Game/GameStartingEvent.cs

@@ -1,19 +0,0 @@
-using Impostor.Api.Games;
-
-namespace Impostor.Api.Events
-{
-    /// <summary>
-    ///     Called when the game is going to start.
-    ///     When this is called, not all players are initialized properly yet.
-    ///     If you want to get correct player states, use <see cref="GameStartedEvent"/>.
-    /// </summary>
-    public class GameStartingEvent : IGameEvent
-    {
-        public GameStartingEvent(IGame game)
-        {
-            Game = game;
-        }
-
-        public IGame Game { get; }
-    }
-}

src/Impostor.Api/Events/Game/IGameCreatedEvent.cs

@@ -0,0 +1,11 @@
+using Impostor.Api.Games;
+
+namespace Impostor.Api.Events
+{
+    /// <summary>
+    ///     Called whenever a new <see cref="IGame"/> is created.
+    /// </summary>
+    public interface IGameCreatedEvent : IGameEvent
+    {
+    }
+}

src/Impostor.Api/Events/Game/IGameDestroyedEvent.cs

@@ -0,0 +1,11 @@
+using Impostor.Api.Games;
+
+namespace Impostor.Api.Events
+{
+    /// <summary>
+    ///     Called whenever a new <see cref="IGame"/> is destroyed.
+    /// </summary>
+    public interface IGameDestroyedEvent : IGameEvent
+    {
+    }
+}

src/Impostor.Api/Events/Game/IGameEndedEvent.cs

@@ -0,0 +1,6 @@
+namespace Impostor.Api.Events
+{
+    public interface IGameEndedEvent : IGameEvent
+    {
+    }
+}

src/Impostor.Api/Events/Game/IGameEvent.cs

@@ -4,6 +4,9 @@ namespace Impostor.Api.Events
 {
     public interface IGameEvent : IEvent
     {
+        /// <summary>
+        ///     Gets the <see cref="IGame"/> this event belongs to.
+        /// </summary>
         IGame Game { get; }
     }
-}
+}

src/Impostor.Api/Events/Game/IGamePlayerJoinedEvent.cs

@@ -0,0 +1,6 @@
+namespace Impostor.Api.Events
+{
+    public interface IGamePlayerJoinedEvent : IGameEvent
+    {
+    }
+}

src/Impostor.Api/Events/Game/IGamePlayerLeftEvent.cs

@@ -0,0 +1,6 @@
+namespace Impostor.Api.Events
+{
+    public interface IGamePlayerLeftEvent : IGameEvent
+    {
+    }
+}

src/Impostor.Api/Events/Game/IGameStartedEvent.cs

@@ -0,0 +1,9 @@
+namespace Impostor.Api.Events
+{
+    /// <summary>
+    ///     The game is started here and players have been initialized.
+    /// </summary>
+    public interface IGameStartedEvent : IGameEvent
+    {
+    }
+}

src/Impostor.Api/Events/Game/IGameStartingEvent.cs

@@ -0,0 +1,11 @@
+namespace Impostor.Api.Events
+{
+    /// <summary>
+    ///     Called when the game is going to start.
+    ///     When this is called, not all players are initialized properly yet.
+    ///     If you want to get correct player states, use <see cref="IGameStartedEvent"/>.
+    /// </summary>
+    public interface IGameStartingEvent : IGameEvent
+    {
+    }
+}

src/Impostor.Api/Events/Game/Meeting/IMeetingEndedEvent.cs

@@ -0,0 +1,6 @@
+namespace Impostor.Api.Events.Meeting
+{
+    public interface IMeetingEndedEvent : IMeetingEvent
+    {
+    }
+}

src/Impostor.Api/Events/Game/Meeting/IMeetingEvent.cs

@@ -0,0 +1,9 @@
+using Impostor.Api.Net.Inner.Objects;
+
+namespace Impostor.Api.Events.Meeting
+{
+    public interface IMeetingEvent : IGameEvent
+    {
+        IInnerMeetingHud MeetingHud { get; }
+    }
+}

src/Impostor.Api/Events/Game/Meeting/IMeetingStartedEvent.cs

@@ -0,0 +1,6 @@
+namespace Impostor.Api.Events.Meeting
+{
+    public interface IMeetingStartedEvent : IMeetingEvent
+    {
+    }
+}

src/Impostor.Api/Events/Game/Player/IPlayerChatEvent.cs

@@ -0,0 +1,10 @@
+namespace Impostor.Api.Events.Player
+{
+    public interface IPlayerChatEvent : IPlayerEvent
+    {
+        /// <summary>
+        ///     Gets the message sent by the player.
+        /// </summary>
+        string Message { get; }
+    }
+}

src/Impostor.Api/Events/Game/Player/IPlayerDestroyedEvent.cs

@@ -0,0 +1,6 @@
+namespace Impostor.Api.Events.Player
+{
+    public interface IPlayerDestroyedEvent : IPlayerEvent
+    {
+    }
+}

src/Impostor.Api/Events/Game/Player/IPlayerSpawnedEvent.cs

@@ -0,0 +1,6 @@
+namespace Impostor.Api.Events.Player
+{
+    public interface IPlayerSpawnedEvent : IPlayerEvent
+    {
+    }
+}

src/Impostor.Api/Events/Game/Player/PlayerMovementEvent.cs

@@ -1,22 +0,0 @@
-// using Impostor.Api.Games;
-// using Impostor.Api.Net;
-// using Impostor.Api.Net.Inner.Objects;
-//
-// namespace Impostor.Api.Events.Player
-// {
-//     public class PlayerMovementEvent : IPlayerEvent
-//     {
-//         public PlayerMovementEvent(IGame game, IClientPlayer clientPlayer, IInnerPlayerControl playerControl)
-//         {
-//             Game = game;
-//             ClientPlayer = clientPlayer;
-//             PlayerControl = playerControl;
-//         }
-//
-//         public IGame Game { get; }
-//
-//         public IClientPlayer ClientPlayer { get; }
-//
-//         public IInnerPlayerControl PlayerControl { get; }
-//     }
-// }

src/Impostor.Api/Events/Game/PlayerJoinedGameEvent.cs

@@ -1,18 +0,0 @@
-using Impostor.Api.Games;
-using Impostor.Api.Net;
-
-namespace Impostor.Api.Events
-{
-    public class PlayerJoinedGameEvent : IGameEvent
-    {
-        public PlayerJoinedGameEvent(IGame game, IClientPlayer player)
-        {
-            Game = game;
-            Player = player;
-        }
-
-        public IGame Game { get; }
-
-        public IClientPlayer Player { get; }
-    }
-}

src/Impostor.Plugins.Debugger/Pages/Index.razor

@@ -48,10 +48,10 @@
 @code {
     private IDisposable _disposable;
 
-    [EventListener(typeof(GameCreatedEvent))]
-    [EventListener(typeof(GameDestroyedEvent))]
-    [EventListener(typeof(PlayerJoinedGameEvent))]
-    [EventListener(typeof(PlayerLeftGameEvent))]
+    [EventListener(typeof(IGameCreatedEvent))]
+    [EventListener(typeof(IGameDestroyedEvent))]
+    [EventListener(typeof(IGamePlayerJoinedEvent))]
+    [EventListener(typeof(IGamePlayerLeftEvent))]
     public void OnGameCreated(IGameEvent e)
     {
         StateHasChanged();

src/Impostor.Plugins.Example/Handlers/GameEventListener.cs

@@ -1,25 +1,24 @@
 using System;
 using Impostor.Api.Events;
-using Impostor.Api.Events.Player;
 
 namespace Impostor.Plugins.Example.Handlers
 {
     public class GameEventListener : IEventListener
     {
         [EventListener]
-        public void OnGameCreated(GameCreatedEvent e)
+        public void OnGameCreated(IGameCreatedEvent e)
         {
             Console.WriteLine("Game > created");
         }
 
         [EventListener]
-        public void OnGameStarting(GameStartingEvent e)
+        public void OnGameStarting(IGameStartingEvent e)
         {
             Console.WriteLine("Game > starting");
         }
 
         [EventListener]
-        public void OnGameStarted(GameStartedEvent e)
+        public void OnGameStarted(IGameStartedEvent e)
         {
             Console.WriteLine("Game > started");
 
@@ -32,27 +31,27 @@ namespace Impostor.Plugins.Example.Handlers
         }
 
         [EventListener]
-        public void OnGameEnded(GameEndedEvent e)
+        public void OnGameEnded(IGameEndedEvent e)
         {
             Console.WriteLine("Game > ended");
         }
 
         [EventListener]
-        public void OnGameDestroyed(GameDestroyedEvent e)
+        public void OnGameDestroyed(IGameDestroyedEvent e)
         {
             Console.WriteLine("Game > destroyed");
         }
 
         [EventListener]
-        public void OnPlayerJoined(PlayerJoinedGameEvent e)
+        public void OnPlayerJoined(IGamePlayerJoinedEvent e)
         {
             Console.WriteLine("Player joined a game.");
         }
 
         [EventListener]
-        public void OnPlayerLeftGame(PlayerLeftGameEvent e)
+        public void OnPlayerLeftGame(IGamePlayerLeftEvent e)
         {
             Console.WriteLine("Player left a game.");
         }
     }
-}
+}

src/Impostor.Plugins.Example/Handlers/MeetingEventListener.cs

@@ -7,15 +7,15 @@ namespace Impostor.Plugins.Example.Handlers
     public class MeetingEventListener : IEventListener
     {
         [EventListener]
-        public void OnMeetingStarted(MeetingStartedEvent e)
+        public void OnMeetingStarted(IMeetingStartedEvent e)
         {
             Console.WriteLine("Meeting > started");
         }
 
         [EventListener]
-        public void OnMeetingEnded(MeetingEndedEvent e)
+        public void OnMeetingEnded(IMeetingEndedEvent e)
         {
             Console.WriteLine("Meeting > ended");
         }
     }
-}
+}

src/Impostor.Plugins.Example/Handlers/PlayerEventListener.cs

@@ -8,19 +8,19 @@ namespace Impostor.Plugins.Example.Handlers
     public class PlayerEventListener : IEventListener
     {
         [EventListener]
-        public void OnPlayerSpawned(PlayerSpawnedEvent e)
+        public void OnPlayerSpawned(IPlayerSpawnedEvent e)
         {
             Console.WriteLine(e.PlayerControl.PlayerInfo.PlayerName + " spawned");
         }
 
         [EventListener]
-        public void OnPlayerDestroyed(PlayerDestroyedEvent e)
+        public void OnPlayerDestroyed(IPlayerDestroyedEvent e)
         {
             Console.WriteLine(e.PlayerControl.PlayerInfo.PlayerName + " destroyed");
         }
 
         [EventListener]
-        public async ValueTask OnPlayerChat(PlayerChatEvent e)
+        public async ValueTask OnPlayerChat(IPlayerChatEvent e)
         {
             Console.WriteLine(e.PlayerControl.PlayerInfo.PlayerName + " said " + e.Message);
 
@@ -37,4 +37,4 @@ namespace Impostor.Plugins.Example.Handlers
             await e.PlayerControl.SendChatAsync(e.Message);
         }
     }
-}
+}

src/Impostor.Server/Events/EventManager.cs

@@ -2,6 +2,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Threading.Tasks;
 using Impostor.Api.Events;
 using Impostor.Api.Events.Managers;
@@ -88,6 +89,16 @@ namespace Impostor.Server.Events
         private IEnumerable<EventHandler> GetHandlers<TEvent>(IServiceProvider services)
             where TEvent : IEvent
         {
+            var eventType = typeof(TEvent);
+            var interfaces = eventType.GetInterfaces();
+            if (interfaces.Length > 0 && _temporaryEventListeners.TryGetValue(interfaces[0], out var cb))
+            {
+                foreach (var eventListener in cb.GetEventListeners())
+                {
+                    yield return new EventHandler(null, eventListener);
+                }
+            }
+
             foreach (var handler in services.GetServices<IEventListener>())
             {
                 if (handler is IManualEventListener manualEventListener && manualEventListener.CanExecute<TEvent>())
@@ -109,7 +120,7 @@ namespace Impostor.Server.Events
                 }
             }
 
-            if (_temporaryEventListeners.TryGetValue(typeof(TEvent), out var cb))
+            if (_temporaryEventListeners.TryGetValue(eventType, out cb))
             {
                 foreach (var eventListener in cb.GetEventListeners())
                 {

src/Impostor.Server/Events/Game/GameCreatedEvent.cs

@@ -0,0 +1,15 @@
+using Impostor.Api.Events;
+using Impostor.Api.Games;
+
+namespace Impostor.Server.Events
+{
+    public class GameCreatedEvent : IGameCreatedEvent
+    {
+        public GameCreatedEvent(IGame game)
+        {
+            Game = game;
+        }
+
+        public IGame Game { get; }
+    }
+}

src/Impostor.Server/Events/Game/GameDestroyedEvent.cs

@@ -0,0 +1,15 @@
+using Impostor.Api.Events;
+using Impostor.Api.Games;
+
+namespace Impostor.Server.Events
+{
+    public class GameDestroyedEvent : IGameDestroyedEvent
+    {
+        public GameDestroyedEvent(IGame game)
+        {
+            Game = game;
+        }
+
+        public IGame Game { get; }
+    }
+}

src/Impostor.Server/Events/Game/GameEndedEvent.cs

@@ -0,0 +1,15 @@
+using Impostor.Api.Events;
+using Impostor.Api.Games;
+
+namespace Impostor.Server.Events
+{
+    public class GameEndedEvent : IGameEndedEvent
+    {
+        public GameEndedEvent(IGame game)
+        {
+            Game = game;
+        }
+
+        public IGame Game { get; }
+    }
+}

src/Impostor.Server/Events/Game/GamePlayerJoinedEvent.cs

@@ -0,0 +1,19 @@
+using Impostor.Api.Events;
+using Impostor.Api.Games;
+using Impostor.Api.Net;
+
+namespace Impostor.Server.Events
+{
+    public class GamePlayerJoinedEvent : IGamePlayerJoinedEvent
+    {
+        public GamePlayerJoinedEvent(IGame game, IClientPlayer player)
+        {
+            Game = game;
+            Player = player;
+        }
+
+        public IGame Game { get; }
+
+        public IClientPlayer Player { get; }
+    }
+}

src/Impostor.Server/Events/Game/GamePlayerLeftEvent.cs

@@ -1,11 +1,12 @@
-using Impostor.Api.Games;
+using Impostor.Api.Events;
+using Impostor.Api.Games;
 using Impostor.Api.Net;
 
-namespace Impostor.Api.Events
+namespace Impostor.Server.Events
 {
-    public class PlayerLeftGameEvent : IGameEvent
+    public class GamePlayerLeftEvent : IGamePlayerLeftEvent
     {
-        public PlayerLeftGameEvent(IGame game, IClientPlayer player, bool isBan)
+        public GamePlayerLeftEvent(IGame game, IClientPlayer player, bool isBan)
         {
             Game = game;
             Player = player;
@@ -18,4 +19,4 @@ namespace Impostor.Api.Events
 
         public bool IsBan { get; }
     }
-}
+}

src/Impostor.Server/Events/Game/GameStartedEvent.cs

@@ -0,0 +1,15 @@
+using Impostor.Api.Events;
+using Impostor.Api.Games;
+
+namespace Impostor.Server.Events
+{
+    public class GameStartedEvent : IGameStartedEvent
+    {
+        public GameStartedEvent(IGame game)
+        {
+            Game = game;
+        }
+
+        public IGame Game { get; }
+    }
+}

src/Impostor.Server/Events/Game/GameStartingEvent.cs

@@ -0,0 +1,15 @@
+using Impostor.Api.Events;
+using Impostor.Api.Games;
+
+namespace Impostor.Server.Events
+{
+    public class GameStartingEvent : IGameStartingEvent
+    {
+        public GameStartingEvent(IGame game)
+        {
+            Game = game;
+        }
+
+        public IGame Game { get; }
+    }
+}

src/Impostor.Server/Events/Game/Meeting/MeetingEndedEvent.cs

@@ -1,9 +1,10 @@
-using Impostor.Api.Games;
+using Impostor.Api.Events.Meeting;
+using Impostor.Api.Games;
 using Impostor.Api.Net.Inner.Objects;
 
-namespace Impostor.Api.Events.Meeting
+namespace Impostor.Server.Events.Meeting
 {
-    public class MeetingEndedEvent : IEvent
+    public class MeetingEndedEvent : IMeetingEndedEvent
     {
         public MeetingEndedEvent(IGame game, IInnerMeetingHud meetingHud)
         {
@@ -15,4 +16,4 @@ namespace Impostor.Api.Events.Meeting
 
         public IInnerMeetingHud MeetingHud { get; }
     }
-}
+}

src/Impostor.Server/Events/Game/Meeting/MeetingStartedEvent.cs

@@ -1,9 +1,10 @@
-using Impostor.Api.Games;
+using Impostor.Api.Events.Meeting;
+using Impostor.Api.Games;
 using Impostor.Api.Net.Inner.Objects;
 
-namespace Impostor.Api.Events.Meeting
+namespace Impostor.Server.Events.Meeting
 {
-    public class MeetingStartedEvent : IEvent
+    public class MeetingStartedEvent : IMeetingStartedEvent
     {
         public MeetingStartedEvent(IGame game, IInnerMeetingHud meetingHud)
         {
@@ -15,4 +16,4 @@ namespace Impostor.Api.Events.Meeting
 
         public IInnerMeetingHud MeetingHud { get; }
     }
-}
+}

src/Impostor.Server/Events/Game/Player/PlayerChatEvent.cs

@@ -1,10 +1,11 @@
-using Impostor.Api.Games;
+using Impostor.Api.Events.Player;
+using Impostor.Api.Games;
 using Impostor.Api.Net;
 using Impostor.Api.Net.Inner.Objects;
 
-namespace Impostor.Api.Events.Player
+namespace Impostor.Server.Events.Player
 {
-    public class PlayerChatEvent : IPlayerEvent
+    public class PlayerChatEvent : IPlayerChatEvent
     {
         public PlayerChatEvent(IGame game, IClientPlayer clientPlayer, IInnerPlayerControl playerControl, string message)
         {
@@ -14,18 +15,12 @@ namespace Impostor.Api.Events.Player
             Message = message;
         }
 
-        /// <inheritdoc/>
         public IGame Game { get; }
 
-        /// <inheritdoc/>
         public IClientPlayer ClientPlayer { get; }
 
-        /// <inheritdoc/>
         public IInnerPlayerControl PlayerControl { get; }
 
-        /// <summary>
-        ///     Gets the message sent by the player.
-        /// </summary>
         public string Message { get; }
     }
-}
+}

src/Impostor.Server/Events/Game/Player/PlayerDestroyedEvent.cs

@@ -1,10 +1,11 @@
-using Impostor.Api.Games;
+using Impostor.Api.Events.Player;
+using Impostor.Api.Games;
 using Impostor.Api.Net;
 using Impostor.Api.Net.Inner.Objects;
 
-namespace Impostor.Api.Events.Player
+namespace Impostor.Server.Events.Player
 {
-    public class PlayerDestroyedEvent : IPlayerEvent
+    public class PlayerDestroyedEvent : IPlayerDestroyedEvent
     {
         public PlayerDestroyedEvent(IGame game, IClientPlayer clientPlayer, IInnerPlayerControl playerControl)
         {
@@ -13,13 +14,10 @@ namespace Impostor.Api.Events.Player
             PlayerControl = playerControl;
         }
 
-        /// <inheritdoc/>
         public IGame Game { get; }
 
-        /// <inheritdoc/>
         public IClientPlayer ClientPlayer { get; }
 
-        /// <inheritdoc/>
         public IInnerPlayerControl PlayerControl { get; }
     }
-}
+}

src/Impostor.Server/Events/Game/Player/PlayerMovementEvent.cs

@@ -0,0 +1,24 @@
+using Impostor.Api.Events.Player;
+using Impostor.Api.Games;
+using Impostor.Api.Net;
+using Impostor.Api.Net.Inner.Objects;
+
+namespace Impostor.Server.Events.Player
+{
+    // TODO: Finish and use event, needs to be pooled
+    public class PlayerMovementEvent : IPlayerEvent
+    {
+        public PlayerMovementEvent(IGame game, IClientPlayer clientPlayer, IInnerPlayerControl playerControl)
+        {
+            Game = game;
+            ClientPlayer = clientPlayer;
+            PlayerControl = playerControl;
+        }
+
+        public IGame Game { get; }
+
+        public IClientPlayer ClientPlayer { get; }
+
+        public IInnerPlayerControl PlayerControl { get; }
+    }
+}

src/Impostor.Server/Events/Game/Player/PlayerSpawnedEvent.cs

@@ -1,10 +1,11 @@
-using Impostor.Api.Games;
+using Impostor.Api.Events.Player;
+using Impostor.Api.Games;
 using Impostor.Api.Net;
 using Impostor.Api.Net.Inner.Objects;
 
-namespace Impostor.Api.Events.Player
+namespace Impostor.Server.Events.Player
 {
-    public class PlayerSpawnedEvent : IPlayerEvent
+    public class PlayerSpawnedEvent : IPlayerSpawnedEvent
     {
         public PlayerSpawnedEvent(IGame game, IClientPlayer clientPlayer, IInnerPlayerControl playerControl)
         {
@@ -13,13 +14,10 @@ namespace Impostor.Api.Events.Player
             PlayerControl = playerControl;
         }
 
-        /// <inheritdoc/>
         public IGame Game { get; }
 
-        /// <inheritdoc/>
         public IClientPlayer ClientPlayer { get; }
 
-        /// <inheritdoc/>
         public IInnerPlayerControl PlayerControl { get; }
     }
-}
+}

src/Impostor.Server/Impostor.Server.csproj.DotSettings

@@ -1,2 +1,3 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=events_005Cgame/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=extensions/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/Impostor.Server/Net/Client.cs

@@ -9,7 +9,6 @@ using Impostor.Api.Net.Messages.C2S;
 using Impostor.Api.Net.Messages.S2C;
 using Impostor.Hazel;
 using Impostor.Server.Config;
-using Impostor.Server.Net.Hazel;
 using Impostor.Server.Net.Manager;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;

src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.cs

@@ -2,11 +2,10 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Impostor.Api;
-using Impostor.Api.Events;
 using Impostor.Api.Events.Managers;
-using Impostor.Api.Events.Meeting;
 using Impostor.Api.Net;
 using Impostor.Api.Net.Messages;
+using Impostor.Server.Events.Meeting;
 using Impostor.Server.Net.State;
 using Microsoft.Extensions.Logging;
 

src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs

@@ -1,13 +1,11 @@
 using System;
 using System.Threading.Tasks;
 using Impostor.Api;
-using Impostor.Api.Events;
 using Impostor.Api.Events.Managers;
-using Impostor.Api.Events.Player;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net;
-using Impostor.Api.Net.Inner.Objects;
 using Impostor.Api.Net.Messages;
+using Impostor.Server.Events.Player;
 using Impostor.Server.Net.Inner.Objects.Components;
 using Impostor.Server.Net.State;
 using Microsoft.Extensions.DependencyInjection;

src/Impostor.Server/Net/Manager/ClientManager.cs

@@ -5,7 +5,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net;
-using Impostor.Api.Net.Manager;
 using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.S2C;
 using Impostor.Hazel;

src/Impostor.Server/Net/Manager/GameManager.cs

@@ -5,12 +5,12 @@ using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using Impostor.Api;
-using Impostor.Api.Events;
 using Impostor.Api.Events.Managers;
 using Impostor.Api.Games;
 using Impostor.Api.Games.Managers;
 using Impostor.Api.Innersloth;
 using Impostor.Server.Config;
+using Impostor.Server.Events;
 using Impostor.Server.Net.Redirector;
 using Impostor.Server.Net.State;
 using Microsoft.Extensions.DependencyInjection;
@@ -147,4 +147,4 @@ namespace Impostor.Server.Net.Manager
             await _eventManager.CallAsync(new GameDestroyedEvent(game));
         }
     }
-}
+}

src/Impostor.Server/Net/State/Game.Data.cs

@@ -3,13 +3,12 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Impostor.Api;
-using Impostor.Api.Events;
-using Impostor.Api.Events.Meeting;
-using Impostor.Api.Events.Player;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.S2C;
 using Impostor.Hazel;
+using Impostor.Server.Events.Meeting;
+using Impostor.Server.Events.Player;
 using Impostor.Server.Net.Inner;
 using Impostor.Server.Net.Inner.Objects;
 using Impostor.Server.Net.Inner.Objects.Components;
@@ -120,7 +119,7 @@ namespace Impostor.Server.Net.State
         {
             switch (netObj)
             {
-                case InnerLobbyBehaviour lobby:
+                case InnerLobbyBehaviour:
                 {
                     GameNet.LobbyBehaviour = null;
                     break;

src/Impostor.Server/Net/State/Game.Incoming.cs

@@ -1,12 +1,12 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Impostor.Api.Events;
 using Impostor.Api.Games;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net;
 using Impostor.Api.Net.Messages;
 using Impostor.Hazel;
+using Impostor.Server.Events;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 

src/Impostor.Server/Net/State/Game.Outgoing.cs

@@ -5,7 +5,6 @@ using Impostor.Api.Net;
 using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.S2C;
 using Impostor.Hazel;
-using Impostor.Hazel.Udp;
 using Impostor.Server.Net.Inner;
 
 namespace Impostor.Server.Net.State

src/Impostor.Server/Net/State/Game.State.cs

@@ -1,12 +1,11 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Impostor.Api;
-using Impostor.Api.Events;
-using Impostor.Api.Events.Player;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net;
 using Impostor.Api.Net.Messages;
 using Impostor.Hazel;
+using Impostor.Server.Events;
 using Impostor.Server.Net.Hazel;
 using Microsoft.Extensions.Logging;
 
@@ -29,7 +28,7 @@ namespace Impostor.Server.Net.State
                 await InitGameDataAsync(player);
             }
 
-            await _eventManager.CallAsync(new PlayerJoinedGameEvent(this, player));
+            await _eventManager.CallAsync(new GamePlayerJoinedEvent(this, player));
         }
 
         private async ValueTask<bool> PlayerRemove(int playerId, bool isBan = false)
@@ -73,7 +72,7 @@ namespace Impostor.Server.Net.State
                 BanIp(player.Client.Connection.EndPoint.Address);
             }
 
-            await _eventManager.CallAsync(new PlayerLeftGameEvent(this, player, isBan));
+            await _eventManager.CallAsync(new GamePlayerLeftEvent(this, player, isBan));
 
             // Player can refuse to be kicked and keep the connection open, check for this.
             _ = Task.Run(async () =>

src/Impostor.Server/Net/State/Game.cs

@@ -4,13 +4,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-using Impostor.Api.Events;
 using Impostor.Api.Events.Managers;
 using Impostor.Api.Games;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net;
 using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.S2C;
+using Impostor.Server.Events;
 using Impostor.Server.Net.Manager;
 using Microsoft.Extensions.Logging;