support 1.18.1.02

CMakeLists.txt

@@ -64,8 +64,8 @@ target_link_libraries(${MOD_API_NAME} ${PROJECT_SOURCE_DIR}/api/lib/detours.lib)
 
 ####################这里是具体功能##########################
 set(TRAPDOOR_VERSION 0.9.90)
-set(MCBE_VERSION 1.18.0.02)
-set(BETA ON)
+set(MCBE_VERSION 1.18.1.02)
+set(BETA OFF)
 set(TEST_NUMBER 1)
 add_definitions(-DTD_VERSION="${TRAPDOOR_VERSION}")
 add_definitions(-DMC_VERSION="${MCBE_VERSION}")

api/block/BlockSource.cpp

@@ -7,19 +7,19 @@
 #include "lib/SymHook.h"
 #include "lib/mod.h"
 #include "world/Biome.h"
-bool flag = false;
 namespace trapdoor {
     using namespace SymHook;
 
     Block *BlockSource::getBlock(int x, int y, int z) {
-        return getBlock({x, y, z});
+        //        return getBlock({x, y, z});
+        return SYM_CALL(Block * (*)(void *, int, int, int),
+                        BlockSource_getBlock_6df88a51, this, x, y, z);
     }
 
     Block *BlockSource::getBlock(const BlockPos &pos) {
-        flag = true;
-        auto *b = SYM_CALL(Block * (*)(void *, const BlockPos &),
-                           BlockSource_getBlock_b39e5e5d, this, pos);
-        return b;
+        return SYM_CALL(Block * (*)(void *, const BlockPos &),
+                        BlockSource_getBlock_b39e5e5d, this, pos);
+        //    return getBlock(pos.x, pos.y, pos.z);
     }
 
     void BlockSource::setBlock(BlockPos *blockPos, Block *block) {

api/entity/Actor.cpp

@@ -53,7 +53,9 @@ namespace trapdoor {
     BlockSource *Actor::getBlockSource() {
         //! from Player::tickWorld
         //  return offset_cast<BlockSource *>(this, 100);
-        return *((struct BlockSource **)this + off::PLAYER_GET_BLOCKSOURCE);
+        return SYM_CALL(trapdoor::BlockSource * (*)(trapdoor::Actor *),
+                        Actor_getRegion_757c8f63, this);
+        //  return *((struct BlockSource **)this + off::PLAYER_GET_BLOCKSOURCE);
     }
 
     void Actor::setGameMode(int mode) {

api/world/Biome.cpp

@@ -12,8 +12,9 @@ namespace trapdoor {
     using namespace SymHook;
 
     std::string Biome::getBiomeName() {
-        // char *str = reinterpret_cast<char *>(this) + off::BIOME_GET_NAME;
         return "Unknown";
+        // char *str = reinterpret_cast<char *>(this) + off::BIOME_GET_NAME;
+        // return std::string(str);
     }
 
     int Biome::getBiomeType() {

changelog.md

@@ -1,3 +1,10 @@
+# 1.18.1.02-0.9.90
+2021-12-05
+
+- 支持 1.18.1.02
+- `village list`无法再显示工作过的村民数量
+- `self`无法再显示所处群系名称
+
 # 1.1.40.6-0.9.80
 2021-11-07
 

mod/TrapdoorMod.cpp

@@ -193,7 +193,7 @@ namespace mod {
     void TrapdoorMod::useOnHook(Actor *player, const std::string &itemName,
                                 BlockPos &pos, unsigned int facing,
                                 const Vec3 &v) {
-        L_INFO("%.2f %.2f %.2f %s", v.x, v.y, v.z, itemName.c_str());
+        L_DEBUG("%.2f %.2f %.2f %s", v.x, v.y, v.z, itemName.c_str());
         //取消注释这一行可以看到右击地面的是什么东西
         if (itemName == "Bone" && this->spawnHelper.isEnable()) {
             spawnHelper.updateVerticalSpawnPositions(pos, player);
@@ -235,7 +235,7 @@ namespace mod {
         get_io_bytes(&ioRead, &ioWrite);
         std::string stringBuilder;
         stringBuilder += trapdoor::format(
-            "CPU: %d %%\n"
+            "CPU: %d %%%%\n"
             "Mem: " C_INT " MB VMem; " C_INT
             " MB\n"
             "Read/Write" C_INT "KB / " C_INT " KB",
@@ -283,7 +283,8 @@ namespace mod {
 #else
         const char *gameVersion = "unknown_mcbe_version";
 #endif
-        std::string version = std::string(modVersion) + "-" + gameVersion;
+        std::string version =
+            "TrapDoor-" + std::string(modVersion) + "-" + gameVersion;
 #ifdef BETA
         version += "-test";
 #endif

mod/function/BlockRotationHelper.cpp

@@ -14,10 +14,8 @@ namespace mod {
     void BlockRotationHelper::rotate(trapdoor::BlockPos &pos,
                                      trapdoor::BlockSource *blockSource) const {
         using trapdoor::BlockSource;
-        auto block = blockSource->getBlock(pos);
-        printf("%d(%s)", block->getLegacy()->getBlockID(),
-               block->getName().c_str());
         if (!this->enable) return;
+        auto block = blockSource->getBlock(pos.x, pos.y, pos.z);
         auto air = trapdoor::getBlockByID(trapdoor::AIR);
         auto variant = block->getVariant();
         auto name = block->getName();

mod/function/HopperCounter.cpp

@@ -93,12 +93,12 @@ namespace mod {
         trapdoor::MessageBuilder builder;
         stringBuilder +=
             trapdoor::format("channel: " C_INT "\ntotal " C_INT
-                             " items in " C_INT " gt(" C_FLOAT "min)\n",
+                             " items in " C_INT " gt  (" C_FLOAT "min)\n",
                              channel, n, gameTick, gameTick / 1200.0);
         for (const auto &i : counterList) {
             auto itemName = GetItemLocalName(i.first);
             stringBuilder += trapdoor::format(
-                "- %s  " C_INT "(" C_FLOAT "/hour)\n", itemName.c_str(),
+                "- %s  " C_INT " (" C_FLOAT " /hour)\n", itemName.c_str(),
                 i.second, i.second * 1.0 / gameTick * 72000);
         }
         trapdoor::info(actor, stringBuilder);

mod/function/SingleFunctions.cpp

@@ -10,27 +10,23 @@
 namespace mod {
     using namespace SymHook;
 
-    THook(void,
-          Explosion_explode_5adcea90, void *exp) {
+    THook(void, Explosion_explode_5adcea90, void *exp) {
         auto modInstance = trapdoor::bdsMod->asInstance<mod::TrapdoorMod>();
-        if (!modInstance->getSingFunction().preventExplosion)
-            original(exp);
+        if (!modInstance->getSingFunction().preventExplosion) original(exp);
     }
 
-/**
- *  SYM_CALL(
-            void(*)(BlockSource * self,const BlockPos *pos),
-            MSSYM_B1QE17updateNeighborsAtB1AE11BlockSourceB2AAE17QEAAXAEBVBlockPosB3AAAA1Z,
-            this, pos
-    );
- */
+    /**
+     *  SYM_CALL(
+                void(*)(BlockSource * self,const BlockPos *pos),
+                MSSYM_B1QE17updateNeighborsAtB1AE11BlockSourceB2AAE17QEAAXAEBVBlockPosB3AAAA1Z,
+                this, pos
+        );
+     */
 
-    THook(
-            void,
-            BlockSource_updateNeighborsAt_4c3f8cf7,
-            trapdoor::BlockSource *source, trapdoor::BlockPos *pos) {
+    THook(void, BlockSource_updateNeighborsAt_4c3f8cf7,
+          trapdoor::BlockSource *source, trapdoor::BlockPos *pos) {
         auto modInstance = trapdoor::bdsMod->asInstance<mod::TrapdoorMod>();
         if (!modInstance->getSingFunction().preventNCUpdate)
             original(source, pos);
     }
-} // namespace mod
+}  // namespace mod

mod/player/PlayerFunction.cpp

@@ -48,9 +48,8 @@ namespace mod {
         auto inSlimeChunk = chunkPos.isSlimeChunk();
         Vec3 viewVec{};
         player->getViewActor(&viewVec, 1);
-        //  auto biome = player->getBlockSource()->getBiome(&playerBlockPos);
-        // auto name = biome->getBiomeName();
-        std::string name = "Unknown";
+        auto biome = player->getBlockSource()->getBiome(&playerBlockPos);
+        auto name = biome->getBiomeName();
         auto modInstance = trapdoor::bdsMod->asInstance<mod::TrapdoorMod>();
 
         std::string xyz = format("XYZ: %.2f / %.2f / %.2f\n", position->x,
@@ -62,10 +61,8 @@ namespace mod {
         std::string facing = "Facing: " + viewVec.toDirString();
         facing +=
             format("(%.2f / %.2f / %.2f)\n", viewVec.x, viewVec.y, viewVec.z);
-        std::string biomeString =
-            format("Biome: minecraft:%s (%d)\n", name.c_str(),
-                   // biome->getBiomeType()
-                   -1);
+        std::string biomeString = format("Biome: minecraft:%s (%d)\n",
+                                         name.c_str(), biome->getBiomeType());
         std::string dimString =
             format("Dimension: %s (%d)\n", player->getDimensionName().c_str(),
                    player->getDimensionID());