refactor: disable onLiquidFlow temporarily

Author: ShrBox

src/legacy/api/BlockAPI.cpp

@@ -11,15 +11,15 @@
 #include "ll/api/service/Bedrock.h"
 #include "mc/deps/core/string/HashedString.h"
 #include "mc/deps/core/utility/optional_ref.h"
-#include "mc/nbt/CompoundTag.h"
 #include "mc/world/level/BlockSource.h"
-#include "mc/world/level/Level.h"
 #include "mc/world/level/block/Block.h"
 #include "mc/world/level/block/actor/BlockActor.h"
 #include "mc/world/level/block/block_serialization_utils/BlockSerializationUtils.h"
 #include "mc/world/level/block/components/BlockLiquidDetectionComponent.h"
 #include "mc/world/level/dimension/Dimension.h"
 #include "mc/world/level/block/BedrockBlockNames.h"
+#include "mc/world/level/ChunkBlockPos.h"
+#include "mc/world/level/chunk/LevelChunk.h"
 
 #include <exception>
 
@@ -66,6 +66,24 @@ ClassDefine<BlockClass> BlockClassBuilder =
         .instanceFunction("getTag", &BlockClass::getNbt)
         .build();
 
+namespace lse::BlockAPI {
+inline bool isValidHeight(WeakRef<Dimension> dim, std::variant<int, float> height) {
+    if (dim) {
+        if (std::holds_alternative<int>(height)) {
+            int y = std::get<int>(height);
+            return dim->getMinHeight() <= y && dim->getHeight() >= y;
+        } else {
+            float y = std::get<float>(height);
+            return dim->getMinHeight() <= y && dim->getHeight() >= y;
+        }
+    }
+
+    return false;
+}
+} // namespace lse::BlockAPI
+
+using lse::BlockAPI::isValidHeight;
+
 //////////////////// Classes ////////////////////
 
 BlockClass::BlockClass(Block const& block) : ScriptClass(ScriptClass::ConstructFromCpp<BlockClass>{}), block(&block) {
@@ -85,9 +103,11 @@ Local<Object> BlockClass::newBlock(Block const& block, BlockPos const& pos, Dime
 }
 
 Local<Object> BlockClass::newBlock(BlockPos const& pos, DimensionType dim) {
-    if (pos.y < 320 && pos.y >= -64) {
-        auto& bl = ll::service::getLevel()->getDimension(dim)->getBlockSourceFromMainChunkSource().getBlock(pos);
-        return BlockClass::newBlock(bl, pos, dim);
+    if (auto dimension = ll::service::getLevel()->getDimension(dim)) {
+        if (isValidHeight(dimension, pos.y)) {
+            auto& bl = dimension->getBlockSourceFromMainChunkSource().getBlock(pos);
+            return BlockClass::newBlock(bl, pos, dim);
+        }
     }
     auto block = Block::tryGetFromRegistry(BedrockBlockNames::Air());
     if (!block) {
@@ -103,9 +123,11 @@ Local<Object> BlockClass::newBlock(Block const& block, BlockPos const& pos, Bloc
 
 Local<Object> BlockClass::newBlock(IntVec4 pos) {
     BlockPos bp = {(float)pos.x, (float)pos.y, (float)pos.z};
-    if (bp.y < 320 && bp.y >= -64) {
-        auto& bl = ll::service::getLevel()->getDimension(pos.dim)->getBlockSourceFromMainChunkSource().getBlock(bp);
-        return BlockClass::newBlock(bl, bp, pos.dim);
+    if (auto dimension = ll::service::getLevel()->getDimension(pos.dim)) {
+        if (isValidHeight(dimension, pos.y)) {
+            auto& bl = dimension->getBlockSourceFromMainChunkSource().getBlock(bp);
+            return BlockClass::newBlock(bl, bp, pos.dim);
+        }
     }
     auto block = Block::tryGetFromRegistry(BedrockBlockNames::Air());
     if (!block) {
@@ -390,8 +412,6 @@ Local<Value> BlockClass::removeBlockEntity(const Arguments&) {
     }
     CATCH("Fail in removeBlockEntity!");
 }
-#include "mc/world/level/ChunkBlockPos.h"
-#include "mc/world/level/chunk/LevelChunk.h"
 
 // public API
 Local<Value> McClass::getBlock(const Arguments& args) {
@@ -440,11 +460,15 @@ Local<Value> McClass::getBlock(const Arguments& args) {
         if (!dimPtr) {
             return {};
         }
-        BlockSource& bs = dimPtr->getBlockSourceFromMainChunkSource();
-        auto         lc = bs.getChunkAt(pos.getBlockPos());
-        if (!lc) return {};
-        short minHeight = dimPtr->getMinHeight();
-        if (pos.y < minHeight || pos.y > dimPtr->getHeight()) return {};
+        BlockSource& bs        = dimPtr->getBlockSourceFromMainChunkSource();
+        short        minHeight = dimPtr->getMinHeight();
+        if (pos.y < minHeight || pos.y > dimPtr->getHeight()) {
+            return {};
+        }
+        auto lc = bs.getChunkAt(pos.getBlockPos());
+        if (!lc) {
+            return {};
+        }
         ChunkBlockPos cbpos = ChunkBlockPos(pos.getBlockPos(), minHeight);
         auto&         block = lc->getBlock(cbpos);
         BlockPos      bp{pos.x, pos.y, pos.z};

src/legacy/api/EntityAPI.cpp

@@ -292,7 +292,7 @@ Local<Value> EntityClass::isOnHotBlock() {
         Actor* entity = get();
         if (!entity) return Local<Value>();
 
-        return Boolean::newBoolean(false); // todo: check IsOnHotBlockTest to get the correct value
+        return Boolean::newBoolean(false); // TODO: check IsOnHotBlockTest to get the correct value
     }
     CATCH("Fail in isOnHotBlock!")
 }

src/legacy/api/EventAPI.cpp

@@ -137,7 +137,7 @@ bool LLSECallEventsOnHotUnload(ScriptEngine* engine) {
 
 //////////////////// Events ////////////////////
 
-// Todo
+// TODO:
 void EnableEventListener(int eventId) {
     using namespace ll::event;
     EventBus& bus = EventBus::getInstance();
@@ -626,7 +626,8 @@ void EnableEventListener(int eventId) {
         break;
 
     case EVENT_TYPES::onLiquidFlow:
-        lse::events::LiquidFlowEvent();
+        // TODO:
+        //        lse::events::LiquidFlowEvent();
         break;
 
     case EVENT_TYPES::onUseFrameBlock:

src/legacy/api/PlayerAPI.cpp

@@ -1233,7 +1233,7 @@ Local<Value> PlayerClass::isOnHotBlock() {
             return Local<Value>();
         }
 
-        return Boolean::newBoolean(false); // todo: check IsOnHotBlockTest to get the correct value
+        return Boolean::newBoolean(false); // TODO: check IsOnHotBlockTest to get the correct value
     }
     CATCH("Fail in isOnHotBlock!")
 }

src/lse/events/EventHooks.cpp

@@ -587,8 +587,6 @@ LL_TYPE_INSTANCE_HOOK(PlayerEatHook, HookPriority::Normal, Player, &Player::eat,
 }
 
 LL_TYPE_INSTANCE_HOOK(ExplodeHook, HookPriority::Normal, Level, &Level::$explode, bool, ::Explosion& explosion) {
-    // Todo: broken need to be fixed
-
     IF_LISTENED(EVENT_TYPES::onEntityExplode) {
         if (explosion.mSourceID->rawID != ActorUniqueID::INVALID_ID().rawID) {
             if (!CallEvent(
@@ -762,29 +760,30 @@ LL_TYPE_INSTANCE_HOOK(
     origin(region, pos, strength, isFirstTime);
 }
 
+// TODO: It is broken, need to be fixed
 LL_TYPE_INSTANCE_HOOK(
     LiquidFlowHook,
     HookPriority::Normal,
     LiquidBlockDynamic,
-    &LiquidBlockDynamic::_spread,
+    &LiquidBlockDynamic::_trySpreadTo,
     void,
-    BlockSource&      region,
-    const ::BlockPos& pos,
-    int               depth,
-    bool              preserveExisting
+    ::BlockSource&    region,
+    ::BlockPos const& pos,
+    int               neighbor,
+    ::BlockPos const& flowFromPos,
+    uchar             flowFromDirection
 ) {
     IF_LISTENED(EVENT_TYPES::onLiquidFlow) {
         if (!CallEvent(
                 EVENT_TYPES::onLiquidFlow,
-                false,
                 BlockClass::newBlock(pos, region.getDimensionId()),
                 IntPos::newPos(pos, region.getDimensionId())
             )) {
             return;
         }
     }
     IF_LISTENED_END(EVENT_TYPES::onLiquidFlow);
-    return origin(region, pos, depth, preserveExisting);
+    return origin(region, pos, neighbor, flowFromPos, flowFromDirection);
 }
 
 LL_TYPE_INSTANCE_HOOK(