Event stuff

Obsidian.API/Events/BaseMinecraftEventArgs.cs

@@ -3,13 +3,17 @@
 /// <summary>
 /// Represents the base class for classes that contain minecraft event data.
 /// </summary>
-public class BaseMinecraftEventArgs : AsyncEventArgs
+public abstract class BaseMinecraftEventArgs : AsyncEventArgs, INamedEvent
 {
+    public static string Name => string.Empty;
+
     /// <summary>
     /// Server this event took place in.
     /// </summary>
     public IServer Server { get; }
 
+    public static EventType EventType { get; }
+
     /// <summary>
     /// Constructs a new instance of the <see cref="BaseMinecraftEventArgs"/> class.
     /// </summary>

Obsidian.API/Events/BlockBreakEventArgs.cs

@@ -2,6 +2,8 @@
 
 public class BlockBreakEventArgs : BlockEventArgs, ICancellable
 {
+    public static new string Name => "BlockBreak";
+
     /// <summary>
     /// Player that has broken the block.
     /// </summary>

Obsidian.API/Events/BlockEventArgs.cs

@@ -2,6 +2,8 @@
 
 public abstract class BlockEventArgs : BaseMinecraftEventArgs
 {
+    public static new string Name => "BlockEvent";
+
     /// <summary>
     /// The impacted block.
     /// </summary>

Obsidian.API/Events/ContainerClickEventArgs.cs

@@ -1,9 +1,12 @@
-using System.Diagnostics.CodeAnalysis;
+using Obsidian.API.BlockStates;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Obsidian.API.Events;
 
 public sealed class ContainerClickEventArgs : ContainerEventArgs, ICancellable
 {
+    public static new string Name => "ContainerClick";
+
     /// <summary>
     /// Gets the current item that was clicked
     /// </summary>

Obsidian.API/Events/ContainerClosedEventArgs.cs

@@ -1,6 +1,8 @@
 namespace Obsidian.API.Events;
 public sealed class ContainerClosedEventArgs : ContainerEventArgs, ICancellable
 {
+    public static new string Name => "ContainerClosed";
+
     public bool IsCancelled { get; private set; }
 
     internal ContainerClosedEventArgs(IPlayer player, IServer server) : base(player, server)

Obsidian.API/Events/ContainerEventArgs.cs

@@ -2,6 +2,8 @@
 
 public class ContainerEventArgs : PlayerEventArgs
 {
+    public static new string Name => "ContainerEvent";
+
     public required BaseContainer Container { get; init; }
 
     protected ContainerEventArgs(IPlayer player, IServer server) : base(player, server)

Obsidian.API/Events/EntityEventArgs.cs

@@ -2,6 +2,8 @@
 
 public class EntityEventArgs : BaseMinecraftEventArgs, ICancellable
 {
+    public static new string Name => "EntityEvent";
+
     /// <summary>
     /// The entity involved in this event.
     /// </summary>

Obsidian.API/Events/EntityInteractEventArgs.cs

@@ -2,6 +2,8 @@
 
 public class EntityInteractEventArgs : EntityEventArgs
 {
+    public static new string Name => "EntityInteract";
+
     /// <summary>
     /// The player who interacted with the entity.
     /// </summary>

Obsidian.API/Events/IncomingChatMessageEventArgs.cs

@@ -2,6 +2,8 @@
 
 public class IncomingChatMessageEventArgs : PlayerEventArgs, ICancellable
 {
+    public static new string Name => "IncomingChatMessage";
+
     /// <summary>
     /// The message that was sent.
     /// </summary>

Obsidian.API/Events/PacketReceivedEventArgs.cs

@@ -2,6 +2,8 @@
 
 public sealed class PacketReceivedEventArgs : PlayerEventArgs, ICancellable
 {
+    public static new string Name => "PacketReceived";
+
     /// <summary>
     /// Id of the received packet.
     /// </summary>

Obsidian.API/Events/PermissionGrantedEventArgs.cs

@@ -2,6 +2,8 @@
 
 public class PermissionGrantedEventArgs : PlayerEventArgs
 {
+    public static new string Name => "PermissionGranted";
+
     public string Permission { get; }
 
     public PermissionGrantedEventArgs(IPlayer player, IServer server, string permission) : base(player, server)

Obsidian.API/Events/PermissionRevokedEventArgs.cs

@@ -2,6 +2,8 @@
 
 public class PermissionRevokedEventArgs : PlayerEventArgs
 {
+    public static new string Name => "PermissionRevoked";
+
     public string Permission { get; }
 
     public PermissionRevokedEventArgs(IPlayer player, IServer server, string permission) : base(player, server)

Obsidian.API/Events/PlayerAttackEntityEventArgs.cs

@@ -3,6 +3,8 @@
 //TODO check if player crits and calculate damage
 public class PlayerAttackEntityEventArgs : EntityEventArgs
 {
+    public static new string Name => "PlayerAttackEntity";
+
     /// <summary>
     /// The player who interacted with the entity.
     /// </summary>

Obsidian.API/Events/PlayerEventArgs.cs

@@ -2,6 +2,8 @@
 
 public class PlayerEventArgs : BaseMinecraftEventArgs
 {
+    public static new string Name => "PlayerEvent";
+
     /// <summary>
     /// The player involved in this event.
     /// </summary>

Obsidian.API/Events/PlayerInteractEventArgs.cs

@@ -7,6 +7,8 @@
 /// </summary>
 public sealed class PlayerInteractEventArgs : PlayerEventArgs, ICancellable
 {
+    public static new string Name => "PlayerInteract";
+
     /// <summary>
     /// The item that was being held when interacting.
     /// </summary>

Obsidian.API/Events/PlayerJoinEventArgs.cs

@@ -2,6 +2,8 @@
 
 public class PlayerJoinEventArgs : PlayerEventArgs
 {
+    public static new string Name => "PlayerJoin";
+
     /// <summary>
     /// The date the player joined.
     /// </summary>

Obsidian.API/Events/PlayerLeaveEventArgs.cs

@@ -2,6 +2,8 @@
 
 public class PlayerLeaveEventArgs : PlayerEventArgs
 {
+    public static new string Name => "PlayerLeave";
+
     /// <summary>
     /// The date the player left.
     /// </summary>

Obsidian.API/Events/PlayerTeleportEventArgs.cs

@@ -2,6 +2,8 @@
 
 public class PlayerTeleportEventArgs : PlayerEventArgs
 {
+    public static new string Name => "PlayerTeleport";
+
     public VectorF OldPosition { get; }
     public VectorF NewPosition { get; }
 

Obsidian.API/Events/ServerStatusRequestEventArgs.cs

@@ -2,6 +2,8 @@
 
 public class ServerStatusRequestEventArgs : BaseMinecraftEventArgs
 {
+    public static new string Name => "ServerStatusRequest";
+
     public IServerStatus Status { get; }
 
     internal ServerStatusRequestEventArgs(IServer server, IServerStatus status) : base(server)

Obsidian.API/_Enums/EventType.cs

@@ -0,0 +1,21 @@
+namespace Obsidian.API;
+
+public enum EventType
+{
+    PacketReceived,
+    QueuePacket,
+    PlayerJoin,
+    PlayerLeave,
+    PlayerTeleported,
+    PermissionGranted,
+    PermissionRevoked,
+    ContainerClick,
+    BlockBreak,
+    IncomingChatMessage,
+    ServerStatusRequest,
+    EntityInteract,
+    PlayerAttackEntity,
+    PlayerInteract,
+    ContainerClosed,
+    Custom
+}

Obsidian.API/_Interfaces/INamedEvent.cs

@@ -0,0 +1,5 @@
+namespace Obsidian.API;
+public interface INamedEvent
+{
+    public static abstract string Name { get; }
+}

Obsidian/Client.cs

@@ -317,7 +317,7 @@ public async Task StartConnectionAsync()
 
                     var configurationPacketReceived = new PacketReceivedEventArgs(Player, this.server, id, data);
 
-                    await this.server.Events.PacketReceived.InvokeAsync(configurationPacketReceived);
+                    await this.server.packetReceived.InvokeAsync(configurationPacketReceived);
 
                     if (!configurationPacketReceived.IsCancelled)
                         await this.handler.HandleConfigurationPackets(id, data, this);
@@ -328,7 +328,7 @@ public async Task StartConnectionAsync()
 
                     var playPacketReceived = new PacketReceivedEventArgs(Player, this.server, id, data);
 
-                    await this.server.Events.PacketReceived.InvokeAsync(playPacketReceived);
+                    await this.server.packetReceived.InvokeAsync(playPacketReceived);
 
                     if (!playPacketReceived.IsCancelled)
                         await handler.HandlePlayPackets(id, data, this);
@@ -345,7 +345,7 @@ public async Task StartConnectionAsync()
         if (State == ClientState.Play)
         {
             Debug.Assert(Player is not null);
-            await this.server.Events.PlayerLeave.InvokeAsync(new PlayerLeaveEventArgs(Player, this.server, DateTimeOffset.Now));
+            await this.server.playerLeave.InvokeAsync(new PlayerLeaveEventArgs(Player, this.server, DateTimeOffset.Now));
         }
 
         Disconnected?.Invoke(this);
@@ -365,7 +365,7 @@ private async Task HandleServerStatusRequestAsync()
     {
         var status = new ServerStatus(this.server);
 
-        _ = await this.server.Events.ServerStatusRequest.InvokeAsync(new ServerStatusRequestEventArgs(this.server, status));
+        _ = await this.server.serverStatusRequest.InvokeAsync(new ServerStatusRequestEventArgs(this.server, status));
 
         SendPacket(new RequestResponse(status));
     }
@@ -569,7 +569,7 @@ await QueuePacketAsync(new SynchronizePlayerPositionPacket
 
         await Player.UpdateChunksAsync(distance: 7);
         await SendInfoAsync();
-        await this.server.Events.PlayerJoin.InvokeAsync(new PlayerJoinEventArgs(Player, this.server, DateTimeOffset.Now));
+        await this.server.playerJoin.InvokeAsync(new PlayerJoinEventArgs(Player, this.server, DateTimeOffset.Now));
     }
 
     #region Packet sending
@@ -741,10 +741,10 @@ internal void SendPacket(IClientboundPacket packet)
 
     internal async Task QueuePacketAsync(IClientboundPacket packet)
     {
-        var args = await this.server.Events.QueuePacket.InvokeAsync(new QueuePacketEventArgs(this, packet));
+        var args = await this.server.queuePacket.InvokeAsync(new QueuePacketEventArgs(this.server, this, packet));
         if (args.IsCancelled)
         {
-            Logger.LogDebug("Packet {PacketId} was sent to the queue, however an event handler registered in {Name} has cancelled it.", args.Packet.Id, nameof(Server.Events));
+            Logger.LogDebug("Packet {PacketId} was sent to the queue, however an event handler has cancelled it.", args.Packet.Id);
         }
         else
         {

Obsidian/Entities/Player.cs

@@ -225,7 +225,7 @@ public async override Task TeleportAsync(VectorF pos)
 
         var tid = Globals.Random.Next(0, 999);
 
-        await client.server.Events.PlayerTeleported.InvokeAsync(
+        await client.server.playerTeleported.InvokeAsync(
             new PlayerTeleportEventArgs
             (
                 this,
@@ -786,7 +786,7 @@ public async Task<bool> GrantPermissionAsync(string permissionNode)
         await SavePermsAsync();
 
         if (result)
-            await this.client.server.Events.PermissionGranted.InvokeAsync(new PermissionGrantedEventArgs(this, this.client.server, permissionNode));
+            await this.client.server.permissionGranted.InvokeAsync(new PermissionGrantedEventArgs(this, this.client.server, permissionNode));
 
         return result;
     }
@@ -808,7 +808,7 @@ public async Task<bool> RevokePermissionAsync(string permissionNode)
                 parent.Children.Remove(childToRemove);
 
                 await this.SavePermsAsync();
-                await this.client.server.Events.PermissionRevoked.InvokeAsync(new PermissionRevokedEventArgs(this, this.client.server, permissionNode));
+                await this.client.server.permissionRevoked.InvokeAsync(new PermissionRevokedEventArgs(this, this.client.server, permissionNode));
 
                 return true;
             }

Obsidian/Events/AsyncEvent.T.cs

@@ -1,22 +1,30 @@
-using System.Reflection;
+using Obsidian.API.Events;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Threading;
 
 namespace Obsidian.Events;
 
-public sealed class AsyncEvent<T> : IEventRegistry
+public sealed class AsyncEvent<T> where T : BaseMinecraftEventArgs, INamedEvent
 {
-    public string? Name { get; } // Name must be set in order to be visible to plugins
+    public string Name { get; } // Name must be set in order to be visible to plugins
 
     private readonly SemaphoreSlim semaphore = new(1);
     private readonly List<Hook<T>> hooks = [];
     private readonly Action<AsyncEvent<T>, Exception>? exceptionHandler;
 
     public AsyncEvent()
     {
+        this.Name = T.Name;
     }
 
-    public AsyncEvent(string? name, Action<AsyncEvent<T>, Exception>? exceptionHandler)
+    public AsyncEvent(Action<AsyncEvent<T>, Exception>? exceptionHandler)
+    {
+        Name = T.Name;
+        this.exceptionHandler = exceptionHandler;
+    }
+
+    public AsyncEvent(string name, Action<AsyncEvent<T>, Exception>? exceptionHandler)
     {
         Name = name;
         this.exceptionHandler = exceptionHandler;

Obsidian/Events/EventArgs/BasePacketEventArgs.cs

@@ -3,7 +3,7 @@
 
 namespace Obsidian.Events.EventArgs;
 
-public class BasePacketEventArgs : AsyncEventArgs
+public class BasePacketEventArgs : BaseMinecraftEventArgs
 {
     /// <summary>
     /// The client that invoked the event.
@@ -15,7 +15,7 @@ public class BasePacketEventArgs : AsyncEventArgs
     /// </summary>
     public IPacket Packet { get; private set; }
 
-    internal BasePacketEventArgs(Client client, IPacket packet)
+    internal BasePacketEventArgs(Server server, Client client, IPacket packet) : base(server)
     {
         Client = client;
         Packet = packet;

Obsidian/Events/EventArgs/QueuePacketEventArgs.cs

@@ -5,10 +5,12 @@ namespace Obsidian.Events.EventArgs;
 
 public class QueuePacketEventArgs : BasePacketEventArgs, ICancellable
 {
+    public static new string Name => "QueuePacket";
+
     /// <inheritdoc />
     public bool IsCancelled { get; private set; }
 
-    internal QueuePacketEventArgs(Client client, IPacket packet) : base(client, packet)
+    internal QueuePacketEventArgs(Server server, Client client, IPacket packet) : base(server, client, packet)
     {
     }
 

Obsidian/Events/IEventRegistry.cs

@@ -4,7 +4,7 @@ namespace Obsidian.Events;
 
 public interface IEventRegistry
 {
-    public string? Name { get; }
+    public string Name { get; }
 
     public bool TryRegisterEvent(MethodInfo method, object? instance, out Delegate? @delegate);
     public bool UnregisterEvent(Delegate @delegate);

Obsidian/Events/MinecraftEvent.cs

@@ -7,13 +7,15 @@ internal readonly struct MinecraftEvent
 {
     public required Type EventType { get; init; }
 
-    public required Type ModuleType { get; init; }
+    public Type? ModuleType { get; init; }
 
     public required PluginContainer PluginContainer { get; init; }
 
     public required Priority Priority { get; init; }
 
-    public required ObjectFactory ModuleFactory { get; init; }
+    public ObjectFactory? ModuleFactory { get; init; }
 
-    public required ObjectMethodExecutor MethodExecutor { get; init; }
+    public ObjectMethodExecutor? MethodExecutor { get; init; }
+
+    public Delegate? MethodDelegate { get; init; }
 }