chore: replace some code with Block::isAir and ItemStackBase::isEnchanted

Author: ShrBox

src/legacy/api/BlockAPI.cpp

@@ -197,9 +197,7 @@ Local<Value> BlockClass::getThickness() {
 
 Local<Value> BlockClass::isAir() {
     try {
-        return Boolean::newBoolean(
-            BlockHelper::isAir(*get())
-        );
+        return Boolean::newBoolean(get()->isAir());
     }
     CATCH("Fail in isAir!");
 }

src/legacy/api/EntityAPI.cpp

@@ -1403,7 +1403,7 @@ Local<Value> EntityClass::getBlockFromViewVector(const Arguments& args) {
         }
         Block const&     bl     = actor->getDimensionBlockSource().getBlock(bp);
         BlockType const& legacy = bl.getBlockType();
-        if (lse::api::BlockHelper::isAir(bl)
+        if (bl.isAir()
             || (legacy.mProperties == BlockProperty::None && legacy.mMaterial.mType == MaterialType::Any)) {
             return Local<Value>();
         }

src/legacy/api/ItemAPI.cpp

@@ -224,9 +224,7 @@ Local<Value> ItemClass::isDamaged() {
 
 Local<Value> ItemClass::isEnchanted() {
     try {
-        return Boolean::newBoolean(
-            get()->mUserData && get()->mUserData->contains(ItemStackBase::TAG_ENCHANTS(), Tag::List)
-        );
+        return Boolean::newBoolean(get()->isEnchanted());
     }
     CATCH("Fail in isEnchanted!");
 }

src/legacy/api/PlayerAPI.cpp

@@ -3275,7 +3275,7 @@ Local<Value> PlayerClass::getBlockFromViewVector(const Arguments& args) {
         Block const&     bl     = player->getDimensionBlockSource().getBlock(bp);
         BlockType const& legacy = bl.getBlockType();
         // isEmpty()
-        if (lse::api::BlockHelper::isAir(bl)
+        if (bl.isAir()
             || (legacy.mProperties == BlockProperty::None && legacy.mMaterial.mType == MaterialType::Any)) {
             return Local<Value>();
         }

src/lse/api/helper/BlockHelper.cpp

@@ -19,8 +19,4 @@ bool BlockHelper::isValidHeight(WeakRef<Dimension> dimension, std::variant<int,
 
     return false;
 }
-
-bool BlockHelper::isAir(Block const& block) {
-    return block.getBlockType().mNameInfo->mFullName->mStrHash == BedrockBlockNames::Air().mStrHash;
-}
 } // namespace lse::api

src/lse/api/helper/BlockHelper.h

@@ -4,6 +4,5 @@ namespace lse::api {
 class BlockHelper {
 public:
     static bool isValidHeight(WeakRef<Dimension> dimension, std::variant<int, float> height);
-    static bool isAir(Block const& block);
 };
 } // namespace lse::api

src/lse/events/BlockEvents.cpp

@@ -165,7 +165,7 @@ LL_TYPE_INSTANCE_HOOK(
     uchar           pistonMoveFacing
 ) {
     IF_LISTENED(EVENT_TYPES::onPistonTryPush) {
-        if (api::BlockHelper::isAir(region.getBlock(curPos))) {
+        if (region.getBlock(curPos).isAir()) {
             return origin(region, curPos, curBranchFacing, pistonMoveFacing);
         }
         if (!CallEvent(
@@ -262,7 +262,7 @@ LL_TYPE_INSTANCE_HOOK(
     Actor*          source
 ) {
     IF_LISTENED(EVENT_TYPES::onBlockExploded) {
-        if (api::BlockHelper::isAir(destroyedBlock)) {
+        if (destroyedBlock.isAir()) {
             return origin(dimension, blockPos, destroyedBlock, source);
         }
         CallEvent(

src/lse/events/EntityEvents.cpp

@@ -194,7 +194,7 @@ LL_TYPE_INSTANCE_HOOK(
     IF_LISTENED(EVENT_TYPES::onProjectileHitBlock) {
         auto& region = owner.getDimensionBlockSourceConst();
         auto& block  = region.getBlock(res.mBlock);
-        if (res.mType == HitResultType::Tile && res.mBlock != BlockPos::ZERO() && !api::BlockHelper::isAir(block)) {
+        if (res.mType == HitResultType::Tile && res.mBlock != BlockPos::ZERO() && !block.isAir()) {
             if (!CallEvent(
                     EVENT_TYPES::onProjectileHitBlock,
                     BlockClass::newBlock(block, res.mBlock, region),

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 34dc3a47d8c83aa0fc64be14b6bfde2e11d7711a", {configs = {target_type = "server"}})
+    add_requires("levilamina 435ae9836047c827003bad585f1f452c24bda779", {configs = {target_type = "server"}})
 else
-    add_requires("levilamina 34dc3a47d8c83aa0fc64be14b6bfde2e11d7711a", {configs = {target_type = "client"}})
+    add_requires("levilamina 435ae9836047c827003bad585f1f452c24bda779", {configs = {target_type = "client"}})
 end
 
 add_requires("levibuildscript")