feat: add PlayerRespawnEvent

HosihikariArchive · Jul 28, 2023 · b675f62 · b675f62
1 parent 80da85a
commit b675f62
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 56 deletions.
diff --git a/src/Events/Events.cs b/src/Events/Events.cs
@@ -14,4 +14,6 @@ public static class Events
     public static JoinEvent PlayerJoin => PlayerJoinEvent.Value;
     private static readonly Lazy<LeftEvent> PlayerLeftEvent = new(() => new());
     public static LeftEvent PlayerLeft => PlayerLeftEvent.Value;
-}
+    private static readonly Lazy<RespawnEvent> PlayerRespawnEvent = new(() => new());
+    public static RespawnEvent PlayerRespawn => PlayerRespawnEvent.Value;
+}
diff --git a/src/Events/Implements/Player/InitializedEvent.cs b/src/Events/Implements/Player/InitializedEvent.cs
@@ -9,23 +9,25 @@ public class InitializedEvent : HookEventBase<InitializedEventArgs, InitializedE
 {
     public unsafe delegate void HookDelegate(void* serverPlayerPtr);
 
-    public InitializedEvent() : base("_ZN12ServerPlayer27setLocalPlayerAsInitializedEv") { }
+    public InitializedEvent()
+        : base("_ZN12ServerPlayer27setLocalPlayerAsInitializedEv") { }
 
-    public override unsafe HookDelegate HookedFunc => (serverPlayerPtr) =>
-    {
-        try
+    public override unsafe HookDelegate HookedFunc =>
+        (serverPlayerPtr) =>
         {
-            var e = new InitializedEventArgs()
+            try
             {
-                ServerPlayer = new ServerPlayer(serverPlayerPtr)
-            }; 
-            OnEventBefore(e);
-            Original(serverPlayerPtr);
-            OnEventAfter(e);
-        }
-        catch (Exception ex)
-        {
-            Log.Logger.Error(nameof(InitializedEvent), ex);
-        }
-    };
-}
+                var e = new InitializedEventArgs
+                {
+                    ServerPlayer = new ServerPlayer(serverPlayerPtr)
+                };
+                OnEventBefore(e);
+                Original(serverPlayerPtr);
+                OnEventAfter(e);
+            }
+            catch (Exception ex)
+            {
+                Log.Logger.Error(nameof(InitializedEvent), ex);
+            }
+        };
+}
diff --git a/src/Events/Implements/Player/JoinEvent.cs b/src/Events/Implements/Player/JoinEvent.cs
@@ -7,26 +7,31 @@ public class JoinEventArgs : EventArgsBase
 
 public class JoinEvent : HookEventBase<JoinEventArgs, JoinEvent.HookDelegate>
 {
-    public unsafe delegate void HookDelegate(void* serverNetworkHandler,
+    public unsafe delegate void HookDelegate(
+        void* serverNetworkHandler,
         void* networkIdentifier,
-        void* connectionRequest, void* serverPlayerPtr);
-    public JoinEvent() : base(
-        "_ZN20ServerNetworkHandler21sendLoginMessageLocalERK17NetworkIdentifierRK17ConnectionRequestR12ServerPlayer") { }
-    public override unsafe HookDelegate HookedFunc => (handler, identifier, request, serverPlayerPtr) =>
-    {
-        try
+        void* connectionRequest,
+        void* serverPlayerPtr
+    );
+
+    public JoinEvent()
+        : base(
+            "_ZN20ServerNetworkHandler21sendLoginMessageLocalERK17NetworkIdentifierRK17ConnectionRequestR12ServerPlayer"
+        ) { }
+
+    public override unsafe HookDelegate HookedFunc =>
+        (handler, identifier, request, serverPlayerPtr) =>
         {
-            var e = new JoinEventArgs()
+            try
             {
-                ServerPlayer = new ServerPlayer(serverPlayerPtr)
-            };
-            OnEventBefore(e);
-            Original(handler, identifier, request, serverPlayerPtr);
-            OnEventAfter(e);
-        }
-        catch (Exception ex)
-        {
-            Log.Logger.Error(nameof(InitializedEvent), ex);
-        }
-    };
-}
+                var e = new JoinEventArgs { ServerPlayer = new ServerPlayer(serverPlayerPtr) };
+                OnEventBefore(e);
+                Original(handler, identifier, request, serverPlayerPtr);
+                OnEventAfter(e);
+            }
+            catch (Exception ex)
+            {
+                Log.Logger.Error(nameof(InitializedEvent), ex);
+            }
+        };
+}
diff --git a/src/Events/Implements/Player/LeftEvent.cs b/src/Events/Implements/Player/LeftEvent.cs
@@ -9,24 +9,22 @@ public class LeftEvent : HookEventBase<LeftEventArgs, LeftEvent.HookDelegate>
 {
     public unsafe delegate void HookDelegate(void* serverPlayerPtr);
 
-    public LeftEvent() : base(
-        "_ZN12ServerPlayer10disconnectEv") { }
+    public LeftEvent()
+        : base("_ZN12ServerPlayer10disconnectEv") { }
 
-    public override unsafe HookDelegate HookedFunc => (serverPlayerPtr) =>
-    {
-        try
+    public override unsafe HookDelegate HookedFunc =>
+        (serverPlayerPtr) =>
         {
-            var e = new LeftEventArgs()
+            try
             {
-                ServerPlayer = new ServerPlayer(serverPlayerPtr)
-            };
-            OnEventBefore(e);
-            Original(serverPlayerPtr);
-            OnEventAfter(e);
-        }
-        catch (Exception ex)
-        {
-            Log.Logger.Error(nameof(InitializedEvent), ex);
-        }
-    };
-}
+                var e = new LeftEventArgs { ServerPlayer = new ServerPlayer(serverPlayerPtr) };
+                OnEventBefore(e);
+                Original(serverPlayerPtr);
+                OnEventAfter(e);
+            }
+            catch (Exception ex)
+            {
+                Log.Logger.Error(nameof(InitializedEvent), ex);
+            }
+        };
+}
diff --git a/src/Events/Implements/Player/RespawnEvent.cs b/src/Events/Implements/Player/RespawnEvent.cs
@@ -0,0 +1,35 @@
+using Hosihikari.Minecraft.Extension.Events;
+using Hosihikari.Minecraft;
+using Hosihikari.NativeInterop.Hook.ObjectOriented;
+
+public class RespawnEventArgs : EventArgsBase
+{
+    public required ServerPlayer ServerPlayer { get; init; }
+}
+
+namespace Hosihikari.Minecraft.Extension.Events.Implements.Player
+{
+    public class RespawnEvent : HookEventBase<RespawnEventArgs, RespawnEvent.HookDelegate>
+    {
+        public unsafe delegate void HookDelegate(void* serverPlayerPtr);
+
+        public RespawnEvent()
+            : base("?respawn@ServerPlayer@@UEAAXXZ") { }
+
+        public override unsafe HookDelegate HookedFunc =>
+            serverPlayerPtr =>
+            {
+                try
+                { //Actor::getIsExperienceDropEnabled
+                    var e = new RespawnEventArgs { ServerPlayer = new ServerPlayer(serverPlayerPtr) };
+                    OnEventBefore(e);
+                    Original(serverPlayerPtr);
+                    OnEventAfter(e);
+                }
+                catch (Exception ex)
+                {
+                    Log.Logger.Error(nameof(InitializedEvent), ex);
+                }
+            };
+    }
+}