refactor: add helper function for hook

LiteLDev · Jan 2, 2025 · e3d760e · e3d760e
1 parent 8c3a12b
commit e3d760e
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/src-server/ll/api/event/player/PlayerChatEvent.cpp b/src-server/ll/api/event/player/PlayerChatEvent.cpp
@@ -30,8 +30,7 @@ LL_TYPE_INSTANCE_HOOK(
     NetworkIdentifier const& identifier,
     TextPacket const&        packet
 ) {
-    auto handle = static_cast<decltype(this)>(reinterpret_cast<NetEventCallback*>(this));
-    if (auto player = handle->_getServerPlayer(identifier, packet.mClientSubId); player) {
+    if (auto player = thisFor<NetEventCallback>()->_getServerPlayer(identifier, packet.mClientSubId); player) {
         auto event = PlayerChatEvent{*player, const_cast<TextPacket&>(packet).mMessage};
         EventBus::getInstance().publish(event);
         if (event.isCancelled()) {

diff --git a/src-server/ll/api/event/player/PlayerJoinEvent.cpp b/src-server/ll/api/event/player/PlayerJoinEvent.cpp
@@ -17,8 +17,7 @@ LL_TYPE_INSTANCE_HOOK(
     NetworkIdentifier const&                 identifier,
     SetLocalPlayerAsInitializedPacket const& packet
 ) {
-    auto handle = static_cast<decltype(this)>(reinterpret_cast<NetEventCallback*>(this));
-    if (auto player = handle->_getServerPlayer(identifier, packet.mClientSubId); player) {
+    if (auto player = thisFor<NetEventCallback>()->_getServerPlayer(identifier, packet.mClientSubId); player) {
         auto event = PlayerJoinEvent{*player};
         EventBus::getInstance().publish(event);
         if (event.isCancelled()) {

diff --git a/src-server/ll/api/event/player/PlayerSneakAndSprintEvent.cpp b/src-server/ll/api/event/player/PlayerSneakAndSprintEvent.cpp
@@ -17,7 +17,7 @@ LL_TYPE_INSTANCE_HOOK(
     NetworkIdentifier const&  id,
     PlayerActionPacket const& packet
 ) {
-    auto handle = static_cast<decltype(this)>(reinterpret_cast<NetEventCallback*>(this));
+    auto handle = thisFor<NetEventCallback>();
     switch (packet.mAction) {
     case PlayerActionType::StartSprinting:
         if (auto player = handle->_getServerPlayer(id, packet.mClientSubId); player) {

diff --git a/src-server/ll/api/event/player/PlayerSwingEvent.cpp b/src-server/ll/api/event/player/PlayerSwingEvent.cpp
@@ -17,9 +17,8 @@ LL_TYPE_INSTANCE_HOOK(
     NetworkIdentifier const& id,
     AnimatePacket const&     packet
 ) {
-    auto handle = static_cast<decltype(this)>(reinterpret_cast<NetEventCallback*>(this));
     if (packet.mAction == AnimatePacket::Action::Swing) {
-        if (auto player = handle->_getServerPlayer(id, packet.mClientSubId); player) {
+        if (auto player = thisFor<NetEventCallback>()->_getServerPlayer(id, packet.mClientSubId); player) {
             EventBus::getInstance().publish(PlayerSwingEvent(*player));
         }
     }

diff --git a/src/ll/api/event/player/PlayerJumpEvent.cpp b/src/ll/api/event/player/PlayerJumpEvent.cpp
@@ -35,8 +35,7 @@ LL_TYPE_INSTANCE_HOOK(
         auto mode = settings->getPlayerMovementSettings().mUnk3c7e19.as<ServerAuthMovementMode>();
         if (mode == ServerAuthMovementMode::LegacyClientAuthoritativeV1) {
             if (packet.mAction == PlayerActionType::StartJump) {
-                auto handle = static_cast<decltype(this)>(reinterpret_cast<NetEventCallback*>(this));
-                if (auto player = handle->_getServerPlayer(source, packet.mClientSubId); player) {
+                if (auto player = thisFor<NetEventCallback>()->_getServerPlayer(source, packet.mClientSubId); player) {
                     EventBus::getInstance().publish(PlayerJumpEvent(*player));
                 }
             }

diff --git a/src/ll/api/memory/Hook.h b/src/ll/api/memory/Hook.h
@@ -160,7 +160,7 @@ struct LL_EBO Hook {};
         inline static _OriginFuncType _OriginalFunc{};                                                                 \
                                                                                                                        \
         template <class T>                                                                                             \
-        static consteval void detector() {                                                                             \
+        static consteval void _Detector() {                                                                            \
             if constexpr (requires { ::ll::memory::virtualDetector<T, IDENTIFIER>(); }) {                              \
                 if constexpr (::ll::memory::virtualDetector<T, IDENTIFIER>()) {                                        \
                     static_assert(                                                                                     \
@@ -172,6 +172,11 @@ struct LL_EBO Hook {};
         }                                                                                                              \
                                                                                                                        \
     public:                                                                                                            \
+        template <class T>                                                                                             \
+            requires(::std::is_polymorphic_v<TYPE> && ::std::is_base_of_v<T, TYPE>)                                    \
+        [[nodiscard]] TYPE* thisFor() {                                                                                \
+            return static_cast<decltype(this)>(reinterpret_cast<T*>(this));                                            \
+        }                                                                                                              \
         template <class... Args>                                                                                       \
         STATIC RET_TYPE origin(Args&&... params) {                                                                     \
             return CALL(std::forward<Args>(params)...);                                                                \
@@ -180,7 +185,7 @@ struct LL_EBO Hook {};
         STATIC RET_TYPE detour(__VA_ARGS__);                                                                           \
                                                                                                                        \
         static int hook(bool suspendThreads = true) {                                                                  \
-            detector<_OriginFuncType>();                                                                               \
+            _Detector<_OriginFuncType>();                                                                              \
             if (!_HookTarget) _HookTarget = ::ll::memory::resolveIdentifier<_OriginFuncType>(IDENTIFIER);              \
             return ::ll::memory::hook(                                                                                 \
                 _HookTarget,                                                                                           \