fix: fix some events

Author: killcerr

src/lse/events/BlockEvents.cpp

@@ -50,7 +50,6 @@
 #include "mc/world/level/dimension/Dimension.h"
 #include "mc/world/level/material/Material.h"
 
-
 namespace lse::events::block {
 LL_TYPE_INSTANCE_HOOK(
     ContainerChangeHook,
@@ -256,7 +255,7 @@ LL_TYPE_INSTANCE_HOOK(
     BlockExplodedHook,
     HookPriority::Normal,
     ScriptModuleMinecraft::ScriptBlockGlobalEventListener,
-    &ScriptBlockGlobalEventListener::onBlockExploded,
+    &ScriptBlockGlobalEventListener::$onBlockExploded,
     EventResult,
     Dimension&      dimension,
     BlockPos const& blockPos,

src/lse/events/EntityEvents.cpp

@@ -182,29 +182,32 @@ LL_TYPE_INSTANCE_HOOK(
     IF_LISTENED_END(EVENT_TYPES::onProjectileHitEntity);
     origin(owner, res);
 }
-//fixme: this hook is not working
-// LL_TYPE_INSTANCE_HOOK(
-//     ProjectileHitBlockHook,
-//     HookPriority::Normal,
-//     ActorEventCoordinator,
-//     &ActorEventCoordinator::sendEvent,
-//     CoordinatorResult,
-//     EventRef<ActorGameplayEvent<CoordinatorResult>> const& event
-//) {
-//     IF_LISTENED(EVENT_TYPES::onProjectileHitBlock) {
-//         if (pos != BlockPos::ZERO() && !this->isAir()) {
-//             if (!CallEvent(
-//                     EVENT_TYPES::onProjectileHitBlock,
-//                     BlockClass::newBlock(*this, pos, region),
-//                     EntityClass::newEntity(&const_cast<Actor&>(projectile))
-//                 )) {
-//                 return CoordinatorResult::Cancel;
-//             }
-//         }
-//     }
-//     IF_LISTENED_END(EVENT_TYPES::onProjectileHitBlock);
-//     origin(event);
-// }
+
+LL_TYPE_INSTANCE_HOOK(
+    ProjectileHitBlockHook,
+    HookPriority::Normal,
+    ProjectileComponent,
+    &ProjectileComponent::onHit,
+    void,
+    ::Actor&           owner,
+    ::HitResult const& res
+) {
+    IF_LISTENED(EVENT_TYPES::onProjectileHitBlock) {
+        auto& region = owner.getDimensionBlockSourceConst();
+        auto& block  = region.getBlock(res.mBlock);
+        if (res.mType == HitResultType::Tile && res.mBlock != BlockPos::ZERO() && block.isAir()) {
+            if (!CallEvent(
+                    EVENT_TYPES::onProjectileHitBlock,
+                    BlockClass::newBlock(block, res.mBlock, region),
+                    EntityClass::newEntity(&owner)
+                )) {
+                return;
+            }
+        }
+    }
+    IF_LISTENED_END(EVENT_TYPES::onProjectileHitBlock);
+    return origin(owner, res);
+}
 
 LL_TYPE_INSTANCE_HOOK(
     MobHurtHook,
@@ -377,9 +380,7 @@ void ProjectileCreatedEvent() { ProjectileSpawnHook1::hook(); };
 void ActorRideEvent() { ActorRideHook::hook(); }
 void WitherDestroyEvent() { WitherDestroyHook::hook(); }
 void ProjectileHitEntityEvent() { ProjectileHitEntityHook::hook(); }
-void ProjectileHitBlockEvent() {
-    // ProjectileHitBlockHook::hook();
-}
+void ProjectileHitBlockEvent() { ProjectileHitBlockHook::hook(); }
 void MobHurtEvent() {
     MobHurtHook::hook();
     MobHurtEffectHook::hook();

src/lse/events/PlayerEvents.cpp

@@ -33,6 +33,7 @@
 #include "mc/world/item/BucketItem.h"
 #include "mc/world/item/ItemInstance.h"
 #include "mc/world/item/ItemStack.h"
+#include "mc/world/item/PotionItem.h"
 #include "mc/world/level/BedrockSpawner.h"
 #include "mc/world/level/BlockSource.h"
 #include "mc/world/level/ChangeDimensionRequest.h"
@@ -223,30 +224,30 @@ LL_TYPE_INSTANCE_HOOK(
     IF_LISTENED_END(EVENT_TYPES::onInventoryChange);
     origin(container, slot, oldItem, newItem, forceBalanced);
 }
-//fixme: this hook is not working
-// LL_TYPE_INSTANCE_HOOK(
-//     AttackBlockHook,
-//     HookPriority::Normal,
-//     Block,
-//     &Block::attack,
-//     bool,
-//     Player*         player,
-//     BlockPos const& pos
+// fixme: this hook is not working
+//  LL_TYPE_INSTANCE_HOOK(
+//      AttackBlockHook,
+//      HookPriority::Normal,
+//      Block,
+//      &Block::attack,
+//      bool,
+//      Player*         player,
+//      BlockPos const& pos
 //) {
-//     IF_LISTENED(EVENT_TYPES::onAttackBlock) {
-//         ItemStack const& item = player->getSelectedItem();
-//         if (!CallEvent(
-//                 EVENT_TYPES::onAttackBlock,
-//                 PlayerClass::newPlayer(player),
-//                 BlockClass::newBlock(pos, player->getDimensionId()),
-//                 !item.isNull() ? ItemClass::newItem(&const_cast<ItemStack&>(item)) : Local<Value>()
-//             )) {
-//             return false;
-//         }
-//     }
-//     IF_LISTENED_END(EVENT_TYPES::onAttackBlock);
-//     return origin(player, pos);
-// }
+//      IF_LISTENED(EVENT_TYPES::onAttackBlock) {
+//          ItemStack const& item = player->getSelectedItem();
+//          if (!CallEvent(
+//                  EVENT_TYPES::onAttackBlock,
+//                  PlayerClass::newPlayer(player),
+//                  BlockClass::newBlock(pos, player->getDimensionId()),
+//                  !item.isNull() ? ItemClass::newItem(&const_cast<ItemStack&>(item)) : Local<Value>()
+//              )) {
+//              return false;
+//          }
+//      }
+//      IF_LISTENED_END(EVENT_TYPES::onAttackBlock);
+//      return origin(player, pos);
+//  }
 
 LL_TYPE_INSTANCE_HOOK(
     UseFrameHook1,
@@ -306,26 +307,42 @@ LL_TYPE_INSTANCE_HOOK(EatHook1, HookPriority::Normal, Player, &Player::eat, void
     IF_LISTENED_END(EVENT_TYPES::onAte);
     origin(instance);
 }
-//fixme: this hook is not working
-// LL_TYPE_INSTANCE_HOOK(
-//     EatHook2,
-//     HookPriority::Normal,
-//     ItemStack,
-//     &ItemStack::useTimeDepleted,
-//     ::ItemUseMethod,
-//     Level*  level,
-//     Player* player
-//) {
-//     IF_LISTENED(EVENT_TYPES::onAte) {
-//         if (isPotionItem() || getTypeName() == "minecraft:milk_bucket") {
-//             if (!CallEvent(EVENT_TYPES::onAte, PlayerClass::newPlayer(player), ItemClass::newItem(this))) {
-//                 return ItemUseMethod::Unknown;
-//             }
-//         }
-//     }
-//     IF_LISTENED_END(EVENT_TYPES::onAte);
-//     return origin(level, player);
-// }
+LL_TYPE_INSTANCE_HOOK(
+    EatHook2,
+    HookPriority::Normal,
+    PotionItem,
+    &PotionItem::$useTimeDepleted,
+    ::ItemUseMethod,
+    ::ItemStack& inoutInstance,
+    Level*       level,
+    Player*      player
+) {
+    IF_LISTENED(EVENT_TYPES::onAte) {
+        if (!CallEvent(EVENT_TYPES::onAte, PlayerClass::newPlayer(player), ItemClass::newItem(&inoutInstance))) {
+            return ItemUseMethod::Unknown;
+        }
+    }
+    IF_LISTENED_END(EVENT_TYPES::onAte);
+    return origin(inoutInstance, level, player);
+}
+LL_TYPE_INSTANCE_HOOK(
+    EatHook3,
+    HookPriority::Normal,
+    Item,
+    (uintptr_t)BucketItem::$vftable()[79],
+    ::ItemUseMethod,
+    ::ItemStack& inoutInstance,
+    Level*       level,
+    Player*      player
+) {
+    IF_LISTENED(EVENT_TYPES::onAte) {
+        if (!CallEvent(EVENT_TYPES::onAte, PlayerClass::newPlayer(player), ItemClass::newItem(&inoutInstance))) {
+            return ItemUseMethod::Unknown;
+        }
+    }
+    IF_LISTENED_END(EVENT_TYPES::onAte);
+    return origin(inoutInstance, level, player);
+}
 
 LL_TYPE_INSTANCE_HOOK(
     ChangeDimensionHook,
@@ -665,7 +682,8 @@ void UseFrameEvent() {
 }
 void EatEvent() {
     EatHook1::hook();
-    //    EatHook2::hook();
+    EatHook2::hook();
+    EatHook3::hook();
 }
 void ChangeDimensionEvent() { ChangeDimensionHook::hook(); };
 void OpenContainerScreenEvent() { OpenContainerScreenHook::hook(); }