feat: add onPlayerPullFishingHook

chore: remove more-events from xmake.lua

Author: ShrBox

src/legacy/api/EventAPI.cpp

@@ -850,7 +850,9 @@ void EnableEventListener(int eventId) {
     case EVENT_TYPES::onOpenInventory:
         lse::events::PlayerOpenInventoryEvent();
         break;
-
+    case EVENT_TYPES::onPlayerPullFishingHook:
+        lse::events::PlayerPullFishingHookEvent();
+        break;
     default:
         break;
     }

src/legacy/events/EventHooks.cpp

@@ -17,7 +17,9 @@
 #include <mc/server/module/VanillaServerGameplayEventListener.h>
 #include <mc/world/actor/ActorDefinitionIdentifier.h>
 #include <mc/world/actor/ArmorStand.h>
+#include <mc/world/actor/FishingHook.h>
 #include <mc/world/actor/boss/WitherBoss.h>
+#include <mc/world/actor/item/ItemActor.h>
 #include <mc/world/actor/player/Player.h>
 #include <mc/world/containers/models/LevelContainerModel.h>
 #include <mc/world/events/EventResult.h>
@@ -773,6 +775,28 @@ LL_TYPE_INSTANCE_HOOK(
     origin();
 }
 
+LL_TYPE_INSTANCE_HOOK(
+    PlayerPullFishingHook,
+    HookPriority::Normal,
+    FishingHook,
+    &FishingHook::_pullCloser,
+    void,
+    Actor& inEntity,
+    float  inSpeed
+) {
+    IF_LISTENED(EVENT_TYPES::onPlayerPullFishingHook) {
+        CallEventVoid(
+            EVENT_TYPES::onPlayerPullFishingHook,
+            PlayerClass::newPlayer(this->getPlayerOwner()),
+            EntityClass::newEntity(&inEntity),
+            inEntity.isType(ActorType::ItemEntity) ? ItemClass::newItem(&static_cast<ItemActor&>(inEntity).item(), true)
+                                                   : Local<Value>()
+        );
+    }
+    IF_LISTENED_END(EVENT_TYPES::onPlayerPullFishingHook);
+    origin(inEntity, inSpeed);
+}
+
 void PlayerStartDestroyBlock() { PlayerStartDestroyHook::hook(); }
 void PlayerDropItem() { PlayerDropItemHook::hook(); }
 void PlayerOpenContainerEvent() { PlayerOpenContainerHook::hook(); }
@@ -815,6 +839,7 @@ void CommandBlockExecuteEvent() { CommandBlockExecuteHook::hook(); }
 void PlayerUseRespawnAnchorEvent() { PlayerUseRespawnAnchorHook::hook(); }
 void PlayerSleepEvent() { PlayerSleepHook::hook(); }
 void PlayerOpenInventoryEvent() { PlayerOpenInventoryHook::hook(); }
+void PlayerPullFishingHookEvent() { PlayerPullFishingHook::hook(); }
 
 // NOLINTEND(cppcoreguidelines-pro-type-reinterpret-cast)
 // NOLINTEND(cppcoreguidelines-avoid-non-const-global-variables)

src/legacy/events/EventHooks.h

@@ -30,5 +30,6 @@ void CommandBlockExecuteEvent();
 void PlayerUseRespawnAnchorEvent();
 void PlayerSleepEvent();
 void PlayerOpenInventoryEvent();
+void PlayerPullFishingHookEvent();
 
 } // namespace lse::events

xmake.lua

@@ -12,7 +12,6 @@ add_requires(
     "levilamina 0.9.2",
     "lightwebsocketclient",
     "magic_enum",
-    "more-events develop",
     "nlohmann_json",
     "openssl 1.1.1-w",
     "simpleini",
@@ -44,15 +43,6 @@ option("backend")
     set_default("lua")
     set_values("lua", "quickjs", "python", "nodejs")
 
-package("more-events")
-    add_urls("https://github.com/LiteLDev/MoreEvents.git")
-
-    add_deps("levilamina 0.9.2")
-
-    on_install(function (package)
-        import("package.tools.xmake").install(package)
-    end)
-
 target("legacy-script-engine")
     add_cxflags(
         "/EHa",
@@ -83,7 +73,6 @@ target("legacy-script-engine")
         "levilamina",
         "lightwebsocketclient",
         "magic_enum",
-        "more-events",
         "nlohmann_json",
         "scriptx",
         "simpleini",