feat: add SubChunkBrightnessStorage

LiteLDev · Jul 14, 2023 · c9c1c8f · c9c1c8f
1 parent 1126f3e
commit c9c1c8f
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 24 deletions.
diff --git a/LiteLoader/include/llapi/mc/Block.hpp b/LiteLoader/include/llapi/mc/Block.hpp
@@ -33,25 +33,21 @@ class Block {
 
     LIAPI std::string getTypeName() const;
     LIAPI int getId() const;
-    inline unsigned short getTileData(){
+    inline unsigned short getTileData() const {
         return static_cast<unsigned short>(getVariant());
     }
 
     /**
      * @brief Obtain a copy of the NBT associated with this block. To obtain a reference to the original instance, use block->getSerializationId().
      */
-    LIAPI std::unique_ptr<CompoundTag> getNbt();
+    LIAPI std::unique_ptr<CompoundTag> getNbt() const;
+    [[deprecated("DO NOT USE THIS")]]
     LIAPI bool setNbt(CompoundTag* nbt);
 
     inline unsigned short getData() const {
         return dAccess<unsigned short, 8>(this);
     }
 
-    [[deprecated("Use MCAPI getLegacyBlock() instead.")]]
-    inline class BlockLegacy const* getLegacyBlockPtr() const {
-        return reinterpret_cast<class BlockLegacy const*>(&this->getLegacyBlock());
-    }
-
     inline bool operator==(class Block const& block) const {
         class BlockLegacy const* p1 = &this->getLegacyBlock();
         class BlockLegacy const* p2 = &block.getLegacyBlock();

diff --git a/LiteLoader/include/llapi/mc/SubChunk.hpp b/LiteLoader/include/llapi/mc/SubChunk.hpp
@@ -10,6 +10,15 @@
 #define BEFORE_EXTRA
 // Include Headers or Declare Types Here
 
+class SubChunkBrightnessStorage {
+public:
+    struct LightPair {
+        unsigned char blockLight : 4;
+        unsigned char skyLight : 4;
+    };
+    std::array<unsigned char,2048> mLightValues;
+};
+
 #undef BEFORE_EXTRA
 
 /**
@@ -20,7 +29,18 @@ struct SubChunk {
 
 #define AFTER_EXTRA
 // Add Member There
-    enum class SubChunkState;
+public:
+    enum class SubChunkState : int {
+        Invalid                    =-1,
+        Normal                     = 0,
+        IsLightingSystemSubChunk   = 1,
+        NeedsRequest               = 2,
+        ReceivedResponseFromServer = 3,
+        ProcessingSubChunk         = 4,
+        WaitingForCacheResponse    = 5,
+        ProcessedSubChunk          = 6,
+        RequestFinished            = 7,
+    };
 #undef AFTER_EXTRA
 #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SUBCHUNK
 public:

diff --git a/LiteLoader/src/llapi/mc/BlockAPI.cpp b/LiteLoader/src/llapi/mc/BlockAPI.cpp
@@ -61,8 +61,8 @@ int Block::getId() const {
     return getLegacyBlock().getBlockItemId();
 }
 
-std::unique_ptr<CompoundTag> Block::getNbt() {
-    return CompoundTag::fromBlock(this);
+std::unique_ptr<CompoundTag> Block::getNbt() const {
+    return getSerializationId().clone();
 }
 
 bool Block::setNbt(CompoundTag* nbt) {

diff --git a/ScriptEngine/src/api/BlockAPI.cpp b/ScriptEngine/src/api/BlockAPI.cpp
@@ -291,19 +291,7 @@ Local<Value> BlockClass::getNbt(const Arguments& args) {
 }
 
 Local<Value> BlockClass::setNbt(const Arguments& args) {
-    CHECK_ARGS_COUNT(args, 1);
-
-    try {
-        auto nbt = NbtCompoundClass::extract(args[0]);
-        if (!nbt)
-            return Local<Value>(); // Null
-
-        // update Pre Data
-        Level::setBlock(pos.getBlockPos(), pos.dim, Block::create(nbt));
-        preloadData(pos.getBlockPos(), pos.getDimensionId());
-        return Boolean::newBoolean(true);
-    }
-    CATCH("Fail in setNbt!")
+    return Boolean::newBoolean(false);
 }
 
 Local<Value> BlockClass::getBlockState(const Arguments& args) {

diff --git a/ScriptEngine/src/api/RemoteCallAPI.cpp b/ScriptEngine/src/api/RemoteCallAPI.cpp
@@ -124,7 +124,7 @@ Local<Value> _extractValue(Actor* v) {
     return EntityClass::newEntity(v);
 };
 Local<Value> _extractValue(Block* v) {
-    return BlockClass::newBlock(const_cast<Block*>(v), BlockPos::ZERO, -1);
+    return BlockClass::newBlock(v, BlockPos::ZERO, -1);
 };
 Local<Value> _extractValue(BlockActor* const& v) {
     return BlockEntityClass::newBlockEntity(v, -1);