feat: adapt to LeviLamina 1.2.0-rc.1

Author: ShrBox

src/legacy/api/EntityAPI.cpp

@@ -30,14 +30,12 @@
 #include "mc/world/actor/ActorDamageSource.h"
 #include "mc/world/actor/ActorDefinitionIdentifier.h"
 #include "mc/world/actor/ActorType.h"
-#include "mc/world/actor/BuiltInActorComponents.h"
 #include "mc/world/actor/Mob.h"
 #include "mc/world/actor/item/ItemActor.h"
 #include "mc/world/actor/player/Player.h"
 #include "mc/world/actor/provider/ActorAttribute.h"
 #include "mc/world/actor/provider/ActorEquipment.h"
 #include "mc/world/actor/provider/SynchedActorDataAccess.h"
-#include "mc/world/attribute/AttributeModificationContext.h"
 #include "mc/world/attribute/MutableAttributeWithContext.h"
 #include "mc/world/attribute/SharedAttributes.h"
 #include "mc/world/effect/EffectDuration.h"
@@ -46,7 +44,6 @@
 #include "mc/world/level/Spawner.h"
 #include "mc/world/level/biome/Biome.h"
 #include "mc/world/level/block/Block.h"
-#include "mc/world/level/block/CachedComponentData.h"
 #include "mc/world/level/block/VanillaBlockTypeIds.h"
 #include "mc/world/level/dimension/Dimension.h"
 #include "mc/world/level/material/Material.h"
@@ -550,7 +547,9 @@ Local<Value> EntityClass::getInClouds() {
         Actor* entity = get();
         if (!entity) return Local<Value>();
 
-        return Boolean::newBoolean(entity->isInClouds());
+        short cloudHeight = entity->getDimension().getCloudHeight();
+        float y           = entity->getPosition().y;
+        return Boolean::newBoolean(y > cloudHeight && y < cloudHeight + 4.0f);
     }
     CATCH("Fail in getInClouds!")
 }

src/legacy/api/PlayerAPI.cpp

@@ -99,6 +99,7 @@
 #include "mc/world/level/block/Block.h"
 #include "mc/world/level/block/CachedComponentData.h"
 #include "mc/world/level/block/VanillaBlockTypeIds.h"
+#include "mc/world/level/dimension/Dimension.h"
 #include "mc/world/level/material/Material.h"
 #include "mc/world/level/storage/AdventureSettings.h"
 #include "mc/world/level/storage/DBStorage.h"
@@ -1128,7 +1129,9 @@ Local<Value> PlayerClass::getInClouds() {
             return Local<Value>();
         }
 
-        return Boolean::newBoolean(player->isInClouds());
+        short cloudHeight = player->getDimension().getCloudHeight();
+        float y           = player->getPosition().y;
+        return Boolean::newBoolean(y > cloudHeight && y < cloudHeight + 4.0f);
     }
     CATCH("Fail in getInClouds!")
 }

src/lse/events/BlockEvents.cpp

@@ -34,7 +34,7 @@
 #include "mc/world/level/block/FarmBlock.h"
 #include "mc/world/level/block/FenceGateBlock.h"
 #include "mc/world/level/block/HopperBlock.h"
-#include "mc/world/level/block/LiquidBlockDynamic.h"
+#include "mc/world/level/block/LiquidBlock.h"
 #include "mc/world/level/block/NoteBlock.h"
 #include "mc/world/level/block/PoweredRailBlock.h"
 #include "mc/world/level/block/RedStoneWireBlock.h"
@@ -337,8 +337,8 @@ REDSTONEHOOK(TntBlock)
 LL_TYPE_INSTANCE_HOOK(
     LiquidFlowHook,
     HookPriority::Normal,
-    LiquidBlockDynamic,
-    &LiquidBlockDynamic::_trySpreadTo,
+    LiquidBlock,
+    &LiquidBlock::_trySpreadTo,
     void,
     ::BlockSource&    region,
     ::BlockPos const& pos,

src/lse/events/PlayerEvents.cpp

@@ -47,6 +47,7 @@
 #include "mc/world/level/block/actor/BarrelBlockActor.h"
 #include "mc/world/level/block/actor/ChestBlockActor.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"
 #include "mc/world/phys/AABB.h"
@@ -244,23 +245,22 @@ LL_TYPE_INSTANCE_HOOK(
     UseFrameHook1,
     HookPriority::Normal,
     ItemFrameBlock,
-    &ItemFrameBlock::$use,
-    bool,
-    Player&         player,
-    BlockPos const& pos,
-    uchar           face
+    &ItemFrameBlock::use,
+    void,
+    BlockEvents::BlockPlayerInteractEvent& eventData
 ) {
     IF_LISTENED(EVENT_TYPES::onUseFrameBlock) {
+        Player& player = eventData.mUnk765a41.as<Player&>();
         if (!CallEvent(
                 EVENT_TYPES::onUseFrameBlock,
                 PlayerClass::newPlayer(&player),
-                BlockClass::newBlock(pos, player.getDimensionId())
+                BlockClass::newBlock(eventData.mUnkd82caf.as<BlockPos>(), player.getDimensionId())
             )) {
-            return false;
+            return;
         }
     }
     IF_LISTENED_END(EVENT_TYPES::onUseFrameBlock);
-    return origin(player, pos, face);
+    return origin(eventData);
 }
 
 LL_TYPE_INSTANCE_HOOK(

xmake.lua

@@ -3,9 +3,9 @@ add_rules("mode.debug", "mode.release")
 add_repositories("levimc-repo https://github.com/LiteLDev/xmake-repo.git")
 
 if is_config("target_type", "server") then
-    add_requires("levilamina c59145f8bd574cfd181343590a56f0b30462764c", {configs = {target_type = "server"}})
+    add_requires("levilamina 1.2.0-rc.1", {configs = {target_type = "server"}})
 else
-    add_requires("levilamina c59145f8bd574cfd181343590a56f0b30462764c", {configs = {target_type = "client"}})
+    add_requires("levilamina 1.2.0-rc.1", {configs = {target_type = "client"}})
 end
 
 add_requires("levibuildscript")