1.16.201 support

bedrock-dev · Jan 14, 2021 · c6123de · c6123de
1 parent 5a780c8
commit c6123de
Show file tree

Hide file tree

Showing 7 changed files with 368 additions and 392 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/api/block/BlockSource.cpp b/api/block/BlockSource.cpp
@@ -12,16 +12,17 @@ namespace trapdoor {
     using namespace SymHook;
 
     Block *BlockSource::getBlock(int x, int y, int z) {
-        return SYM_CALL(
-                Block* (*)(void * , int, int, int),
-                MSSYM_B1QA8getBlockB1AE11BlockSourceB2AAE13QEBAAEBVBlockB2AAA3HHHB1AA1Z, this,
-                x, y, z
-        );
+        return getBlock({x, y, z});
     }
 
 
     Block *BlockSource::getBlock(const BlockPos &blockPos) {
-        return getBlock(blockPos.x, blockPos.y, blockPos.z);
+        return SYM_CALL(
+                Block* (*)(void * ,const BlockPos &),
+                MSSYM_B1QA8getBlockB1AE11BlockSourceB2AAE13QEBAAEBVBlockB2AAE12AEBVBlockPosB3AAAA1Z, this,
+                blockPos
+        );
+        //    return getBlock(blockPos.x, blockPos.y, blockPos.z);
     }
 
     void BlockSource::setBlock(BlockPos *blockPos, Block *block) {
@@ -60,21 +61,21 @@ namespace trapdoor {
                 );
     }
 
-    uint8_t BlockSource::getRawBrightness(const BlockPos *pos) {
-        uint8_t result = 255;
-        auto r = SYM_CALL(
-                uint8_t *(*)(BlockSource * , uint8_t *,const BlockPos *, bool, bool),
-                MSSYM_B1QE16getRawBrightnessB1AE11BlockSourceB2AAA4QEBAB1QE12AUBrightnessB2AAE12AEBVBlockPosB3AAUA2N1B1AA1Z,
-                this,
-                &result,
-                pos,
-                true,
-                true
-        );
-        printf("%d %d\n", result, *r);
-        return result;
-
-    }
+//    uint8_t BlockSource::getRawBrightness(const BlockPos *pos) {
+//        uint8_t result = 255;
+//        auto r = SYM_CALL(
+//                uint8_t *(*)(BlockSource * , uint8_t *,const BlockPos *, bool, bool),
+//                MSSYM_B1QE16getRawBrightnessB1AE11BlockSourceB2AAA4QEBAB1QE12AUBrightnessB2AAE12AEBVBlockPosB3AAUA2N1B1AA1Z,
+//                this,
+//                &result,
+//                pos,
+//                true,
+//                true
+//        );
+//        printf("%d %d\n", result, *r);
+//        return result;
+//
+//    }
 
     int BlockSource::getMaterial(const BlockPos *pos) {
         return

diff --git a/api/entity/Actor.cpp b/api/entity/Actor.cpp
@@ -56,7 +56,7 @@ namespace trapdoor {
 
     BlockSource *Actor::getBlockSource() {
         //!from Player::tickWorld
-        return *((struct BlockSource **) this + 100);
+        return *((struct BlockSource **) this + 105);
     }
 
     void Actor::setGameMode(int mode) {
@@ -68,8 +68,6 @@ namespace trapdoor {
     }
 
 
-
-
     int Actor::getDimensionID() {
 
         return *(reinterpret_cast<int *>(this) + 51);
@@ -89,8 +87,8 @@ namespace trapdoor {
     }
 
     NetworkIdentifier *Actor::getClientID() {
-        //  ServerPlayer::isHostingPlayer
-        return reinterpret_cast<NetworkIdentifier *>((char *) this + 2432);
+        // ！from  ServerPlayer::isHostingPlayer
+        return reinterpret_cast<NetworkIdentifier *>((char *) this + 2536);
     }
 
     PlayerPermissionLevel Actor::getCommandLevel() {