From: AeonLucid <aeonlucid@outlook.com>
Date: Sun, 25 Oct 2020 23:17:47 +0000 (+0100)
Subject: Move events to better directories
X-Git-Tag: v1.2.2~74^2~2
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=c749a8491029a0fef85486975fdf77046e823433;p=rhonda%2Fimpostor.git

Move events to better directories
---

diff --git a/docs/Writing-a-plugin.md b/docs/Writing-a-plugin.md
index 267d983..99e99a3 100644
--- a/docs/Writing-a-plugin.md
+++ b/docs/Writing-a-plugin.md
@@ -66,6 +66,13 @@ Make sure to get a prerelease if you are writing a plugin for a dev release of t
 5. Search for `Impostor.Api`.
 6. Click the `Impostor.Api` result and press install on the right side.
 
+### Dotnet CLI
+
+> Make sure to grab the latest (pre-)release version from NuGet [here](https://www.nuget.org/packages/Impostor.Api).
+
+1. Open your project folder in command prompt / bash.
+2. Run `dotnet add package Impostor.Api -v "1.2.0-ci.58"`.
+
 ## 4. The plugin class
 
 Now the `Impostor.Api` is installed, you need to create a class for your plugin. A plugin **must** contain exactly one. See the code below for an example.
diff --git a/src/Impostor.Api/Events/Game/MeetingEndedEvent.cs b/src/Impostor.Api/Events/Game/MeetingEndedEvent.cs
deleted file mode 100644
index 01be941..0000000
--- a/src/Impostor.Api/Events/Game/MeetingEndedEvent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Impostor.Api.Games;
-using Impostor.Api.Net.Inner.Objects;
-
-namespace Impostor.Api.Events
-{
-    public class MeetingEndedEvent : IEvent
-    {
-        public MeetingEndedEvent(IGame game, IInnerMeetingHud meetingHud)
-        {
-            Game = game;
-            MeetingHud = meetingHud;
-        }
-
-        public IGame Game { get; }
-
-        public IInnerMeetingHud MeetingHud { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Game/MeetingStartedEvent.cs b/src/Impostor.Api/Events/Game/MeetingStartedEvent.cs
deleted file mode 100644
index 1265b5b..0000000
--- a/src/Impostor.Api/Events/Game/MeetingStartedEvent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Impostor.Api.Games;
-using Impostor.Api.Net.Inner.Objects;
-
-namespace Impostor.Api.Events
-{
-    public class MeetingStartedEvent : IEvent
-    {
-        public MeetingStartedEvent(IGame game, IInnerMeetingHud meetingHud)
-        {
-            Game = game;
-            MeetingHud = meetingHud;
-        }
-
-        public IGame Game { get; }
-
-        public IInnerMeetingHud MeetingHud { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Game/PlayerChatEvent.cs b/src/Impostor.Api/Events/Game/PlayerChatEvent.cs
deleted file mode 100644
index 1d70536..0000000
--- a/src/Impostor.Api/Events/Game/PlayerChatEvent.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Impostor.Api.Games;
-using Impostor.Api.Net.Inner.Objects;
-
-namespace Impostor.Api.Events
-{
-    public class PlayerChatEvent : IGameEvent
-    {
-        public PlayerChatEvent(IGame game, IInnerPlayerControl playerControl, string message)
-        {
-            Game = game;
-            PlayerControl = playerControl;
-            Message = message;
-        }
-
-        public IGame Game { get; }
-
-        public IInnerPlayerControl PlayerControl { get; }
-
-        public string Message { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Game/PlayerDestroyedEvent.cs b/src/Impostor.Api/Events/Game/PlayerDestroyedEvent.cs
deleted file mode 100644
index 6d5d8c4..0000000
--- a/src/Impostor.Api/Events/Game/PlayerDestroyedEvent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Impostor.Api.Games;
-using Impostor.Api.Net.Inner.Objects;
-
-namespace Impostor.Api.Events.Net
-{
-    public class PlayerDestroyedEvent : IGameEvent
-    {
-        public PlayerDestroyedEvent(IGame game, IInnerPlayerControl playerControl)
-        {
-            Game = game;
-            PlayerControl = playerControl;
-        }
-
-        public IGame Game { get; }
-
-        public IInnerPlayerControl PlayerControl { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Game/PlayerJoinedGameEvent.cs b/src/Impostor.Api/Events/Game/PlayerJoinedGameEvent.cs
deleted file mode 100644
index 3c165aa..0000000
--- a/src/Impostor.Api/Events/Game/PlayerJoinedGameEvent.cs
+++ /dev/null
@@ -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; }
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Game/PlayerLeftGameEvent.cs b/src/Impostor.Api/Events/Game/PlayerLeftGameEvent.cs
deleted file mode 100644
index 5947ff2..0000000
--- a/src/Impostor.Api/Events/Game/PlayerLeftGameEvent.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Impostor.Api.Games;
-using Impostor.Api.Net;
-
-namespace Impostor.Api.Events
-{
-    public class PlayerLeftGameEvent : IGameEvent
-    {
-        public PlayerLeftGameEvent(IGame game, IClientPlayer player, bool isBan)
-        {
-            Game = game;
-            Player = player;
-            IsBan = isBan;
-        }
-
-        public IGame Game { get; }
-
-        public IClientPlayer Player { get; }
-
-        public bool IsBan { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Game/PlayerMovementEvent.cs b/src/Impostor.Api/Events/Game/PlayerMovementEvent.cs
deleted file mode 100644
index fd9238a..0000000
--- a/src/Impostor.Api/Events/Game/PlayerMovementEvent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Impostor.Api.Games;
-
-namespace Impostor.Api.Events
-{
-    public class PlayerMovementEvent : IGameEvent
-    {
-        public PlayerMovementEvent(IGame game)
-        {
-            Game = game;
-        }
-
-        public IGame Game { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Game/PlayerSpawnedEvent.cs b/src/Impostor.Api/Events/Game/PlayerSpawnedEvent.cs
deleted file mode 100644
index 9b1664a..0000000
--- a/src/Impostor.Api/Events/Game/PlayerSpawnedEvent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Impostor.Api.Games;
-using Impostor.Api.Net.Inner.Objects;
-
-namespace Impostor.Api.Events.Net
-{
-    public class PlayerSpawnedEvent : IGameEvent
-    {
-        public PlayerSpawnedEvent(IGame game, IInnerPlayerControl playerControl)
-        {
-            Game = game;
-            PlayerControl = playerControl;
-        }
-
-        public IGame Game { get; }
-
-        public IInnerPlayerControl PlayerControl { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Meeting/MeetingEndedEvent.cs b/src/Impostor.Api/Events/Meeting/MeetingEndedEvent.cs
new file mode 100644
index 0000000..2586c0b
--- /dev/null
+++ b/src/Impostor.Api/Events/Meeting/MeetingEndedEvent.cs
@@ -0,0 +1,18 @@
+using Impostor.Api.Games;
+using Impostor.Api.Net.Inner.Objects;
+
+namespace Impostor.Api.Events.Meeting
+{
+    public class MeetingEndedEvent : IEvent
+    {
+        public MeetingEndedEvent(IGame game, IInnerMeetingHud meetingHud)
+        {
+            Game = game;
+            MeetingHud = meetingHud;
+        }
+
+        public IGame Game { get; }
+
+        public IInnerMeetingHud MeetingHud { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Meeting/MeetingStartedEvent.cs b/src/Impostor.Api/Events/Meeting/MeetingStartedEvent.cs
new file mode 100644
index 0000000..1265b5b
--- /dev/null
+++ b/src/Impostor.Api/Events/Meeting/MeetingStartedEvent.cs
@@ -0,0 +1,18 @@
+using Impostor.Api.Games;
+using Impostor.Api.Net.Inner.Objects;
+
+namespace Impostor.Api.Events
+{
+    public class MeetingStartedEvent : IEvent
+    {
+        public MeetingStartedEvent(IGame game, IInnerMeetingHud meetingHud)
+        {
+            Game = game;
+            MeetingHud = meetingHud;
+        }
+
+        public IGame Game { get; }
+
+        public IInnerMeetingHud MeetingHud { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Player/PlayerChatEvent.cs b/src/Impostor.Api/Events/Player/PlayerChatEvent.cs
new file mode 100644
index 0000000..a5c62cd
--- /dev/null
+++ b/src/Impostor.Api/Events/Player/PlayerChatEvent.cs
@@ -0,0 +1,21 @@
+using Impostor.Api.Games;
+using Impostor.Api.Net.Inner.Objects;
+
+namespace Impostor.Api.Events.Player
+{
+    public class PlayerChatEvent : IGameEvent
+    {
+        public PlayerChatEvent(IGame game, IInnerPlayerControl playerControl, string message)
+        {
+            Game = game;
+            PlayerControl = playerControl;
+            Message = message;
+        }
+
+        public IGame Game { get; }
+
+        public IInnerPlayerControl PlayerControl { get; }
+
+        public string Message { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Player/PlayerDestroyedEvent.cs b/src/Impostor.Api/Events/Player/PlayerDestroyedEvent.cs
new file mode 100644
index 0000000..fcbb562
--- /dev/null
+++ b/src/Impostor.Api/Events/Player/PlayerDestroyedEvent.cs
@@ -0,0 +1,18 @@
+using Impostor.Api.Games;
+using Impostor.Api.Net.Inner.Objects;
+
+namespace Impostor.Api.Events.Player
+{
+    public class PlayerDestroyedEvent : IGameEvent
+    {
+        public PlayerDestroyedEvent(IGame game, IInnerPlayerControl playerControl)
+        {
+            Game = game;
+            PlayerControl = playerControl;
+        }
+
+        public IGame Game { get; }
+
+        public IInnerPlayerControl PlayerControl { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Player/PlayerJoinedGameEvent.cs b/src/Impostor.Api/Events/Player/PlayerJoinedGameEvent.cs
new file mode 100644
index 0000000..236580b
--- /dev/null
+++ b/src/Impostor.Api/Events/Player/PlayerJoinedGameEvent.cs
@@ -0,0 +1,18 @@
+using Impostor.Api.Games;
+using Impostor.Api.Net;
+
+namespace Impostor.Api.Events.Player
+{
+    public class PlayerJoinedGameEvent : IGameEvent
+    {
+        public PlayerJoinedGameEvent(IGame game, IClientPlayer player)
+        {
+            Game = game;
+            Player = player;
+        }
+
+        public IGame Game { get; }
+
+        public IClientPlayer Player { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Player/PlayerLeftGameEvent.cs b/src/Impostor.Api/Events/Player/PlayerLeftGameEvent.cs
new file mode 100644
index 0000000..925cab3
--- /dev/null
+++ b/src/Impostor.Api/Events/Player/PlayerLeftGameEvent.cs
@@ -0,0 +1,21 @@
+using Impostor.Api.Games;
+using Impostor.Api.Net;
+
+namespace Impostor.Api.Events.Player
+{
+    public class PlayerLeftGameEvent : IGameEvent
+    {
+        public PlayerLeftGameEvent(IGame game, IClientPlayer player, bool isBan)
+        {
+            Game = game;
+            Player = player;
+            IsBan = isBan;
+        }
+
+        public IGame Game { get; }
+
+        public IClientPlayer Player { get; }
+
+        public bool IsBan { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Player/PlayerMovementEvent.cs b/src/Impostor.Api/Events/Player/PlayerMovementEvent.cs
new file mode 100644
index 0000000..735328f
--- /dev/null
+++ b/src/Impostor.Api/Events/Player/PlayerMovementEvent.cs
@@ -0,0 +1,14 @@
+using Impostor.Api.Games;
+
+namespace Impostor.Api.Events.Player
+{
+    public class PlayerMovementEvent : IGameEvent
+    {
+        public PlayerMovementEvent(IGame game)
+        {
+            Game = game;
+        }
+
+        public IGame Game { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Player/PlayerSpawnedEvent.cs b/src/Impostor.Api/Events/Player/PlayerSpawnedEvent.cs
new file mode 100644
index 0000000..5dcedd2
--- /dev/null
+++ b/src/Impostor.Api/Events/Player/PlayerSpawnedEvent.cs
@@ -0,0 +1,18 @@
+using Impostor.Api.Games;
+using Impostor.Api.Net.Inner.Objects;
+
+namespace Impostor.Api.Events.Player
+{
+    public class PlayerSpawnedEvent : IGameEvent
+    {
+        public PlayerSpawnedEvent(IGame game, IInnerPlayerControl playerControl)
+        {
+            Game = game;
+            PlayerControl = playerControl;
+        }
+
+        public IGame Game { get; }
+
+        public IInnerPlayerControl PlayerControl { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Impostor.Plugins.Debugger/Pages/Index.razor b/src/Impostor.Plugins.Debugger/Pages/Index.razor
index 4d53b08..5548dbb 100644
--- a/src/Impostor.Plugins.Debugger/Pages/Index.razor
+++ b/src/Impostor.Plugins.Debugger/Pages/Index.razor
@@ -3,6 +3,7 @@
 @using Impostor.Api.Events.Managers
 @using Impostor.Api.Games.Managers
 @using Impostor.Api.Events
+@using Impostor.Api.Events.Player
 @implements Impostor.Api.Events.IEventListener
 @inject IEventManager EventManager
 @inject IGameManager GameManager
diff --git a/src/Impostor.Plugins.Example/Handlers/GameEventListener.cs b/src/Impostor.Plugins.Example/Handlers/GameEventListener.cs
index 19d9bc4..89947aa 100644
--- a/src/Impostor.Plugins.Example/Handlers/GameEventListener.cs
+++ b/src/Impostor.Plugins.Example/Handlers/GameEventListener.cs
@@ -1,5 +1,6 @@
 using System;
 using Impostor.Api.Events;
+using Impostor.Api.Events.Player;
 
 namespace Impostor.Plugins.Example.Handlers
 {
diff --git a/src/Impostor.Plugins.Example/Handlers/MeetingEventListener.cs b/src/Impostor.Plugins.Example/Handlers/MeetingEventListener.cs
index 1b98c41..fffa3a5 100644
--- a/src/Impostor.Plugins.Example/Handlers/MeetingEventListener.cs
+++ b/src/Impostor.Plugins.Example/Handlers/MeetingEventListener.cs
@@ -1,5 +1,6 @@
 using System;
 using Impostor.Api.Events;
+using Impostor.Api.Events.Meeting;
 
 namespace Impostor.Plugins.Example.Handlers
 {
diff --git a/src/Impostor.Plugins.Example/Handlers/PlayerEventListener.cs b/src/Impostor.Plugins.Example/Handlers/PlayerEventListener.cs
index eaaf833..50536a8 100644
--- a/src/Impostor.Plugins.Example/Handlers/PlayerEventListener.cs
+++ b/src/Impostor.Plugins.Example/Handlers/PlayerEventListener.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Impostor.Api.Events;
-using Impostor.Api.Events.Net;
+using Impostor.Api.Events.Player;
 
 namespace Impostor.Plugins.Example.Handlers
 {
diff --git a/src/Impostor.Plugins.Example/Impostor.Plugins.Example.csproj b/src/Impostor.Plugins.Example/Impostor.Plugins.Example.csproj
index 0cd6cd5..d72de82 100644
--- a/src/Impostor.Plugins.Example/Impostor.Plugins.Example.csproj
+++ b/src/Impostor.Plugins.Example/Impostor.Plugins.Example.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
-
+  
   <ItemGroup>
     <ProjectReference Include="..\Impostor.Api\Impostor.Api.csproj"/>
   </ItemGroup>
diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.cs b/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.cs
index 6a83227..29a803b 100644
--- a/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.cs
@@ -4,6 +4,7 @@ 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.Net.State;
diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs b/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs
index 0d6f39b..458d4bd 100644
--- a/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs
@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using Impostor.Api;
 using Impostor.Api.Events;
 using Impostor.Api.Events.Managers;
-using Impostor.Api.Events.Net;
+using Impostor.Api.Events.Player;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net;
 using Impostor.Api.Net.Inner.Objects;
diff --git a/src/Impostor.Server/Net/State/Game.Data.cs b/src/Impostor.Server/Net/State/Game.Data.cs
index 29d2069..32cff8b 100644
--- a/src/Impostor.Server/Net/State/Game.Data.cs
+++ b/src/Impostor.Server/Net/State/Game.Data.cs
@@ -4,7 +4,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Impostor.Api;
 using Impostor.Api.Events;
-using Impostor.Api.Events.Net;
+using Impostor.Api.Events.Player;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.S2C;
diff --git a/src/Impostor.Server/Net/State/Game.State.cs b/src/Impostor.Server/Net/State/Game.State.cs
index e51b2f7..c53a3d4 100644
--- a/src/Impostor.Server/Net/State/Game.State.cs
+++ b/src/Impostor.Server/Net/State/Game.State.cs
@@ -2,6 +2,7 @@
 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;