fix: fix onUseBucketTake

Author: ShrBox

src/legacy/api/PlayerAPI.cpp

@@ -3635,9 +3635,7 @@ Local<Value> PlayerClass::sendToast(Arguments const& args) const {
 
         if (!player) return {};
 
-        ToastRequestPacket pkt;
-        pkt.mTitle   = args[0].asString().toString();
-        pkt.mContent = args[1].asString().toString();
+        ToastRequestPacket pkt(args[0].asString().toString(), args[1].asString().toString());
         player->sendNetworkPacket(pkt);
         return Boolean::newBoolean(true);
     }

src/lse/events/EntityEvents.cpp

@@ -401,7 +401,7 @@ LL_TYPE_STATIC_HOOK(
 }
 
 namespace Transformation {
-std::pair<::OwnerPtr<::EntityContext>, Actor*> currentActor = {{}, nullptr};
+std::pair<EntityId, Actor*> currentActor = {{}, nullptr};
 LL_TYPE_INSTANCE_HOOK(
     TransformedActorHook,
     HookPriority::Normal,
@@ -412,7 +412,7 @@ LL_TYPE_INSTANCE_HOOK(
     ::Actor*                           from
 ) {
     auto context = origin(identifier, from);
-    currentActor = {context, from};
+    currentActor = {context->mEntity, from};
     return context;
 }
 
@@ -428,7 +428,7 @@ LL_TYPE_INSTANCE_HOOK(
     auto newActor = origin(region, entity);
     IF_LISTENED(EVENT_TYPES::onEntityTransformation) {
         if (isServerThread() && currentActor.first) {
-            if (currentActor.first->mEntity == entity->mEntity && currentActor.second) {
+            if (currentActor.first == entity->mEntity && currentActor.second) {
                 CallEvent(
                     EVENT_TYPES::onEntityTransformation,
                     String::newString(std::to_string(currentActor.second->getOrCreateUniqueID().rawID)),

src/lse/events/PlayerEvents.cpp

@@ -40,10 +40,12 @@
 #include "mc/world/level/block/Block.h"
 #include "mc/world/level/block/ItemFrameBlock.h"
 #include "mc/world/level/block/RespawnAnchorBlock.h"
+#include "mc/world/level/block/VanillaBlockTypeIds.h"
 #include "mc/world/level/block/VanillaStates.h"
 #include "mc/world/level/block/actor/PistonBlockActor.h"
 #include "mc/world/level/block/block_events/BlockPlayerInteractEvent.h"
 #include "mc/world/level/dimension/Dimension.h"
+#include "mc/world/level/material/Material.h"
 
 namespace lse::events::player {
 
@@ -492,59 +494,42 @@ LL_TYPE_INSTANCE_HOOK(
 }
 
 LL_TYPE_INSTANCE_HOOK(
-    UseBucketTakeHook1,
+    UseBucketTakeHook,
     HookPriority::Normal,
     BucketItem,
-    &BucketItem::_takeLiquid,
-    bool,
-    ItemStack&      item,
-    Actor&          entity,
-    BlockPos const& pos
+    &BucketItem::$_useOn,
+    InteractionResult,
+    ::ItemStack&  instance,
+    ::Actor&      entity,
+    ::BlockPos    pos,
+    uchar         face,
+    ::Vec3 const& clickPos
 ) {
     IF_LISTENED(EVENT_TYPES::onUseBucketTake) {
         if (isServerThread()) {
-            if (!CallEvent(
-                    EVENT_TYPES::onUseBucketTake,
-                    PlayerClass::newPlayer(&static_cast<Player&>(entity)),
-                    ItemClass::newItem(&item),
-                    BlockClass::newBlock(pos, entity.getDimensionId()),
-                    Number::newNumber(-1),
-                    FloatPos::newPos(pos, entity.getDimensionId())
-                )) {
-                return false;
+            auto& bs = entity.getDimensionBlockSource();
+            using ::SharedTypes::v1_26_20::MaterialType;
+            if (auto& type = bs.getMaterial(pos).mType; type != MaterialType::Water && type != MaterialType::Lava) {
+                return InteractionResult{false, true};
+            }
+            if (auto& bl = bs.getBlock(pos).mBlockType;
+                *bl->mNameInfo->mFullName != VanillaBlockTypeIds::PowderSnow()) {
+                return InteractionResult{false, true};
             }
-        }
-    }
-    IF_LISTENED_END(EVENT_TYPES::onUseBucketTake);
-    return origin(item, entity, pos);
-}
-
-LL_TYPE_INSTANCE_HOOK(
-    UseBucketTakeHook2,
-    HookPriority::Normal,
-    BucketItem,
-    &BucketItem::_takePowderSnow,
-    bool,
-    ItemStack&      item,
-    Actor&          entity,
-    BlockPos const& pos
-) {
-    IF_LISTENED(EVENT_TYPES::onUseBucketTake) {
-        if (isServerThread()) {
             if (!CallEvent(
                     EVENT_TYPES::onUseBucketTake,
                     PlayerClass::newPlayer(&static_cast<Player&>(entity)),
-                    ItemClass::newItem(&item),
+                    ItemClass::newItem(&instance),
                     BlockClass::newBlock(pos, entity.getDimensionId()),
                     Number::newNumber(-1),
                     FloatPos::newPos(pos, entity.getDimensionId())
                 )) {
-                return false;
+                return InteractionResult{false, true};
             }
         }
     }
     IF_LISTENED_END(EVENT_TYPES::onUseBucketTake);
-    return origin(item, entity, pos);
+    return origin(instance, entity, pos, face, clickPos);
 }
 
 LL_TYPE_INSTANCE_HOOK(ConsumeTotemHook, HookPriority::Normal, Player, &Player::$consumeTotem, bool) {
@@ -669,7 +654,7 @@ LL_TYPE_INSTANCE_HOOK(
     uchar               face,
     std::optional<Vec3> hit
 ) {
-    if (!isServerThread() || (!isInteractiveBlock() && !mBlockType->isCraftingBlock())) {
+    if (!isServerThread() || (!mBlockType->isInteractiveBlock() && !mBlockType->isCraftingBlock())) {
         return origin(player, pos, face, hit); // 提前把不可交互方块过滤掉
     }
     IF_LISTENED(EVENT_TYPES::onBlockInteracted) {
@@ -705,7 +690,7 @@ void SleepEvent() { static ll::memory::HookRegistrar<SleepHook> reg; }
 void OpenInventoryEvent() { static ll::memory::HookRegistrar<OpenInventoryHook> reg; }
 void PullFishingHookEvent() { static ll::memory::HookRegistrar<PullFishingHook> reg; }
 void UseBucketPlaceEvent() { static ll::memory::HookRegistrar<UseBucketPlaceHook> reg; }
-void UseBucketTakeEvent() { static ll::memory::HookRegistrar<UseBucketTakeHook1, UseBucketTakeHook2> reg; }
+void UseBucketTakeEvent() { static ll::memory::HookRegistrar<UseBucketTakeHook> reg; }
 void ConsumeTotemEvent() { static ll::memory::HookRegistrar<ConsumeTotemHook> reg; }
 void SetArmorEvent() { static ll::memory::HookRegistrar<SetArmorHook> reg; }
 void InteractEntityEvent() { static ll::memory::HookRegistrar<InteractEntityHook> reg; }

xmake.lua

@@ -3,15 +3,15 @@ add_rules("mode.debug", "mode.release")
 add_repositories("levimc-repo " .. (get_config("levimc_repo") or "https://github.com/LiteLDev/xmake-repo.git"))
 
 if is_config("target_type", "server") then
-    add_requires("levilamina 2bd38e02b2b57405d1258a639437d1df6539e47b", {configs = {target_type = "server"}})
+    add_requires("levilamina 8d5a11d0b130e51332690daf127823be2c9c37e2", {configs = {target_type = "server"}})
 else
-    add_requires("levilamina 2bd38e02b2b57405d1258a639437d1df6539e47b", {configs = {target_type = "client"}})
+    add_requires("levilamina 8d5a11d0b130e51332690daf127823be2c9c37e2", {configs = {target_type = "client"}})
 end
 
 add_requires("levibuildscript")
 
-add_requires("legacyremotecall e0f51bba07a9764a6fc2a5291bf14845d5b55875", {configs = {target_type = get_config(target_type)}})
-add_requires("legacymoney 898b64eb5827e79476068cc012785ce7c0712e8c", {configs = {target_type = get_config(target_type)}})
+add_requires("legacyremotecall ffb8d2a1b8fe449e27b227195f435cc1957c3d5d", {configs = {target_type = get_config(target_type)}})
+add_requires("legacymoney c675888be1aba973f5b8f9cbd91a040d6cd243b7", {configs = {target_type = get_config(target_type)}})
 
 add_requires(
     "lightwebsocketclient v1.0.3",