Consolidate events

project-fika · Nov 25, 2024 · bfe7b8d · bfe7b8d
1 parent f57cc58
commit bfe7b8d
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 60 deletions.
diff --git a/Fika.Core/Modding/Events/FikaClientCreatedEvent.cs b/Fika.Core/Modding/Events/FikaClientCreatedEvent.cs
diff --git a/Fika.Core/Modding/Events/FikaClientDestroyedEvent.cs b/Fika.Core/Modding/Events/FikaClientDestroyedEvent.cs
diff --git a/Fika.Core/Modding/Events/FikaNetworkManagerCreatedEvent.cs b/Fika.Core/Modding/Events/FikaNetworkManagerCreatedEvent.cs
@@ -0,0 +1,14 @@
+using Fika.Core.Networking;
+
+namespace Fika.Core.Modding.Events
+{
+	public class FikaNetworkManagerCreatedEvent : FikaEvent
+	{
+		public IFikaNetworkManager Manager { get; }
+
+		internal FikaNetworkManagerCreatedEvent(IFikaNetworkManager manager)
+		{
+			Manager = manager;
+		}
+	}
+}
diff --git a/Fika.Core/Modding/Events/FikaNetworkManagerDestroyedEvent.cs b/Fika.Core/Modding/Events/FikaNetworkManagerDestroyedEvent.cs
@@ -0,0 +1,14 @@
+using Fika.Core.Networking;
+
+namespace Fika.Core.Modding.Events
+{
+	public class FikaNetworkManagerDestroyedEvent : FikaEvent
+	{
+		public IFikaNetworkManager Manager { get; }
+
+		public FikaNetworkManagerDestroyedEvent(IFikaNetworkManager server)
+		{
+			Manager = server;
+		}
+	}
+}
diff --git a/Fika.Core/Modding/Events/FikaServerCreatedEvent.cs b/Fika.Core/Modding/Events/FikaServerCreatedEvent.cs
diff --git a/Fika.Core/Modding/Events/FikaServerDestroyedEvent.cs b/Fika.Core/Modding/Events/FikaServerDestroyedEvent.cs
diff --git a/Fika.Core/Networking/FikaClient.cs b/Fika.Core/Networking/FikaClient.cs
@@ -206,7 +206,7 @@ public async void Init()
 				ServerConnection = netClient.Connect(ip, port, "fika.core");
 			}
 
-			FikaEventDispatcher.DispatchEvent(new FikaClientCreatedEvent(this));
+			FikaEventDispatcher.DispatchEvent(new FikaNetworkManagerCreatedEvent(this));
 		}
 
 		private void OnLoadingProfilePacketReceived(LoadingProfilePacket packet)
@@ -1208,7 +1208,7 @@ protected void OnDestroy()
 				Destroy(fikaChat);
 			}
 
-			FikaEventDispatcher.DispatchEvent(new FikaClientDestroyedEvent(this));
+			FikaEventDispatcher.DispatchEvent(new FikaNetworkManagerDestroyedEvent(this));
 		}
 
 		public void SendData<T>(ref T packet, DeliveryMethod deliveryMethod) where T : INetSerializable

diff --git a/Fika.Core/Networking/FikaServer.cs b/Fika.Core/Networking/FikaServer.cs
@@ -289,7 +289,7 @@ public async Task Init()
 
 			SetHostRequest body = new(Ips, port, FikaPlugin.UseNatPunching.Value, FikaBackendUtils.IsDedicatedGame);
 			FikaRequestHandler.UpdateSetHost(body);
-			FikaEventDispatcher.DispatchEvent(new FikaServerCreatedEvent(this));
+			FikaEventDispatcher.DispatchEvent(new FikaNetworkManagerCreatedEvent(this));
 		}
 
 		private void OnLoadingProfilePacketReceived(LoadingProfilePacket packet, NetPeer peer)
@@ -1214,7 +1214,7 @@ protected void OnDestroy()
 				Destroy(fikaChat);
 			}
 
-			FikaEventDispatcher.DispatchEvent(new FikaServerDestroyedEvent(this));
+			FikaEventDispatcher.DispatchEvent(new FikaNetworkManagerDestroyedEvent(this));
 		}
 
 		public void SendDataToAll<T>(ref T packet, DeliveryMethod deliveryMethod, NetPeer peerToExclude = null) where T : INetSerializable