feat: add onProjectileHitEntity & onProjectileHitBlock #87

Author: ShrBox

src/legacy/api/EventAPI.cpp

@@ -295,18 +295,6 @@ void EnableEventListener(int eventId) {
             IF_LISTENED_END(EVENT_TYPES::afterPlaceBlock);
         });
         break;
-        // Deprecated
-        /*case EVENT_TYPES::onMove:
-            Event::PlayerMoveEvent::subscribe([](const PlayerMoveEvent& ev) {
-                IF_LISTENED(EVENT_TYPES::onMove) {
-                    CallEvent(EVENT_TYPES::onMove,
-           PlayerClass::newPlayer(ev.mPlayer), FloatPos::newPos(ev.mPos,
-           ev.mPlayer->getDimensionId()));
-                }
-                IF_LISTENED_END(EVENT_TYPES::onMove);
-            });
-            break;*/
-
     case EVENT_TYPES::onJump:
         bus.emplaceListener<PlayerJumpEvent>([](PlayerJumpEvent& ev) {
             IF_LISTENED(EVENT_TYPES::onJump) {
@@ -595,17 +583,9 @@ void EnableEventListener(int eventId) {
         lse::events::ProjectileCreatedEvent();
         break;
 
-        // case EVENT_TYPES::onProjectileHitEntity:
-        //   Event::ProjectileHitEntityEvent::subscribe(
-        //       [](const ProjectileHitEntityEvent &ev) {
-        //         IF_LISTENED(EVENT_TYPES::onProjectileHitEntity) {
-        //           CallEvent(EVENT_TYPES::onProjectileHitEntity,
-        //                     EntityClass::newEntity(ev.mTarget),
-        //                     EntityClass::newEntity(ev.mSource));
-        //         }
-        //         IF_LISTENED_END(EVENT_TYPES::onProjectileHitEntity);
-        //       });
-        //   break;
+    case EVENT_TYPES::onProjectileHitEntity:
+        lse::events::ProjectileHitEntityEvent();
+        break;
 
         // case EVENT_TYPES::onEntityTransformation:
         //   Event::EntityTransformEvent::subscribe([](const EntityTransformEvent
@@ -619,17 +599,9 @@ void EnableEventListener(int eventId) {
         //   });
         //   break;
 
-        // case EVENT_TYPES::onProjectileHitBlock:
-        //   Event::ProjectileHitBlockEvent::subscribe(
-        //       [](const ProjectileHitBlockEvent &ev) {
-        //         IF_LISTENED(EVENT_TYPES::onProjectileHitBlock) {
-        //           CallEvent(EVENT_TYPES::onProjectileHitBlock,
-        //                     BlockClass::newBlock(ev.mBlockInstance),
-        //                     EntityClass::newEntity(ev.mSource));
-        //         }
-        //         IF_LISTENED_END(EVENT_TYPES::onProjectileHitBlock);
-        //       });
-        //   break;
+    case EVENT_TYPES::onProjectileHitBlock:
+        lse::events::ProjectileHitBlockEvent();
+        break;
 
     case EVENT_TYPES::onLiquidFlow:
         lse::events::LiquidFlowEvent();

src/legacy/events/EventHooks.cpp

@@ -17,6 +17,7 @@
 #include <ll/api/memory/Memory.h>
 #include <mc/common/wrapper/InteractionResult.h>
 #include <mc/entity/WeakEntityRef.h>
+#include <mc/entity/components/ProjectileComponent.h>
 #include <mc/entity/utilities/ActorType.h>
 #include <mc/server/module/VanillaServerGameplayEventListener.h>
 #include <mc/world/actor/ActorDefinitionIdentifier.h>
@@ -964,6 +965,47 @@ LL_TYPE_INSTANCE_HOOK(
     origin(std::move(armorSlot), item);
 }
 
+LL_TYPE_INSTANCE_HOOK(
+    ProjectileHitEntityHook,
+    HookPriority::Normal,
+    ProjectileComponent,
+    &ProjectileComponent::onHit,
+    void,
+    Actor&           owner,
+    HitResult const& res
+) {
+    IF_LISTENED(EVENT_TYPES::onProjectileHitEntity) {
+        CallEventVoid(
+            EVENT_TYPES::onProjectileHitEntity,
+            EntityClass::newEntity(res.getEntity()),
+            EntityClass::newEntity(&owner)
+        );
+    }
+    IF_LISTENED_END(EVENT_TYPES::onProjectileHitEntity);
+    origin(owner, res);
+}
+
+LL_TYPE_INSTANCE_HOOK(
+    ProjectileHitBlockHook,
+    HookPriority::Normal,
+    Block,
+    &Block::onProjectileHit,
+    void,
+    BlockSource&    region,
+    BlockPos const& pos,
+    Actor const&    projectile
+) {
+    IF_LISTENED(EVENT_TYPES::onProjectileHitBlock) {
+        CallEventVoid(
+            EVENT_TYPES::onProjectileHitBlock,
+            BlockClass::newBlock(this, &pos, &region),
+            EntityClass::newEntity(&const_cast<Actor&>(projectile))
+        );
+    }
+    IF_LISTENED_END(EVENT_TYPES::onProjectileHitBlock);
+    origin(region, pos, projectile);
+}
+
 void PlayerStartDestroyBlock() { PlayerStartDestroyHook::hook(); }
 void PlayerDropItem() { PlayerDropItemHook::hook(); }
 void PlayerOpenContainerEvent() { PlayerOpenContainerHook::hook(); }
@@ -1015,6 +1057,8 @@ void PlayerUseBucketTakeEvent() {
 }
 void PlayerConsumeTotemEvent() { PlayerConsumeTotemHook::hook(); }
 void PlayerSetArmorEvent() { PlayerSetArmorHook::hook(); }
+void ProjectileHitEntityEvent() { ProjectileHitEntityHook::hook(); }
+void ProjectileHitBlockEvent() { ProjectileHitBlockHook::hook(); }
 
 // NOLINTEND(cppcoreguidelines-pro-type-reinterpret-cast)
 // NOLINTEND(cppcoreguidelines-avoid-non-const-global-variables)

src/legacy/events/EventHooks.h

@@ -36,5 +36,7 @@ void PlayerUseBucketPlaceEvent();
 void PlayerUseBucketTakeEvent();
 void PlayerConsumeTotemEvent();
 void PlayerSetArmorEvent();
+void ProjectileHitEntityEvent();
+void ProjectileHitBlockEvent();
 
 } // namespace lse::events