From 488c4395ff048fe586121d1688c176f4eb7567bf Mon Sep 17 00:00:00 2001
From: hhhxiao <1417599491@qq.com>
Date: Thu, 27 Aug 2020 18:12:37 +0800
Subject: [PATCH] repair all bugs

---
 .idea/encodings.xml         |   4 +-
 .idea/workspace.xml         | 116 +++---
 CMakeLists.txt              |  37 +-
 Tools.h                     |   1 -
 block/Block.cpp             |  93 +++++
 block/Block.h               |  80 ----
 commands/Shell.cpp          |  35 +-
 commands/Shell.h            |  24 +-
 commands/VanillaCommand.cpp |  46 +++
 commands/VanillaCommand.h   |  16 +
 common/BlockPos.h           |   8 +
 common/Common.cpp           |  23 ++
 common/Common.h             |  51 +--
 common/Vec3.h               |  11 +-
 dllmain.cpp                 |  42 +-
 entity/Actor.cpp            | 167 ++++++++
 entity/Actor.h              |  99 +----
 entity/ActorHook.h          |  73 ----
 lib/SymHook.h               | 263 ++++++------
 lib/framework.h             |   2 +-
 lib/mod.cpp                 |  36 +-
 lib/mod.h                   |   4 +-
 lib/pch.cpp                 |   3 +-
 lib/pch.h                   |  10 +-
 spawn/Spawn.cpp             |  15 +
 spawn/Spawn.h               |  13 +-
 symbol.txt                  |   6 +-
 tick/Tick.cpp               | 326 +++++++++++++++
 tick/Tick.h                 | 111 +----
 tick/TickHook.h             | 224 ----------
 tools/MathTool.cpp          |  23 ++
 tools/MathTool.h            |  19 +-
 tools/Message.cpp           |  26 ++
 tools/Message.h             |  31 +-
 tools/MessageBuilder.cpp    |  13 +-
 tools/MessageBuilder.h      |  11 +-
 tools/Particle.cpp          |  68 +++
 tools/Particle.h            |  67 +--
 tools/dbg.h                 | 800 ++++++++++++++++++++++++++++++++++++
 village/Village.cpp         | 167 ++++++++
 village/Village.h           | 171 ++------
 village/VillagerHook.h      |  22 -
 42 files changed, 2170 insertions(+), 1187 deletions(-)
 delete mode 100644 Tools.h
 create mode 100644 block/Block.cpp
 create mode 100644 commands/VanillaCommand.cpp
 create mode 100644 commands/VanillaCommand.h
 create mode 100644 common/Common.cpp
 create mode 100644 entity/Actor.cpp
 delete mode 100644 entity/ActorHook.h
 create mode 100644 spawn/Spawn.cpp
 create mode 100644 tick/Tick.cpp
 delete mode 100644 tick/TickHook.h
 create mode 100644 tools/MathTool.cpp
 create mode 100644 tools/Message.cpp
 create mode 100644 tools/Particle.cpp
 create mode 100644 tools/dbg.h
 create mode 100644 village/Village.cpp
 delete mode 100644 village/VillagerHook.h

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index e49f7fa..e88a604 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -2,8 +2,10 @@
 <project version="4">
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$/PDB.txt" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/SymHook.h" charset="GBK" />
     <file url="file://$PROJECT_DIR$/bedrock_server的PDB符号信息.txt" charset="GBK" />
     <file url="file://$PROJECT_DIR$/lib/SymHook.h" charset="GBK" />
-    <file url="file://$PROJECT_DIR$/lib/SymHook.h" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/lib/mod.cpp" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/tools/dbg.h" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0dd5a61..d22c6ff 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,7 +5,7 @@
       <config projectName="TrapDoor" targetName="TrapDoor" />
     </generated>
   </component>
-  <component name="CMakeSettings">
+  <component name="CMakeSettings" AUTO_RELOAD="true">
     <configurations>
       <configuration PROFILE_NAME="Release" CONFIG_NAME="Release" />
       <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
@@ -13,41 +13,47 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="b8a60db2-baf4-4087-8601-d054cc921b14" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/commands/Shell.cpp" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/commands/Shell.h" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/common/AABB.h" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/common/BlockPos.h" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/common/Vec3.h" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/entity/ActorHook.h" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/SymHook.h" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/tick/TickHook.h" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/tools/MathTool.h" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/tools/Message.h" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/tools/MessageBuilder.cpp" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/tools/MessageBuilder.h" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/tools/Particle.h" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/village/VillagerHook.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/block/Block.cpp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/commands/VanillaCommand.cpp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/commands/VanillaCommand.h" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/Common.cpp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/entity/Actor.cpp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/spawn/Spawn.cpp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tick/Tick.cpp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tools/MathTool.cpp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tools/Message.cpp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tools/Particle.cpp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/village/Village.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Actor.h" beforeDir="false" afterPath="$PROJECT_DIR$/entity/Actor.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Block.h" beforeDir="false" afterPath="$PROJECT_DIR$/block/Block.h" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/CMakeLists.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Cons.h" beforeDir="false" afterPath="$PROJECT_DIR$/common/Common.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Shell.h" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Spawn.h" beforeDir="false" afterPath="$PROJECT_DIR$/spawn/Spawn.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/SymHook.h" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Tick.h" beforeDir="false" afterPath="$PROJECT_DIR$/tick/Tick.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Village.h" beforeDir="false" afterPath="$PROJECT_DIR$/village/Village.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/detours.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/detours.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/detver.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/detver.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Tools.h" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/block/Block.h" beforeDir="false" afterPath="$PROJECT_DIR$/block/Block.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/commands/Shell.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/commands/Shell.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/commands/Shell.h" beforeDir="false" afterPath="$PROJECT_DIR$/commands/Shell.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/BlockPos.h" beforeDir="false" afterPath="$PROJECT_DIR$/common/BlockPos.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/Common.h" beforeDir="false" afterPath="$PROJECT_DIR$/common/Common.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/Vec3.h" beforeDir="false" afterPath="$PROJECT_DIR$/common/Vec3.h" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/dllmain.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/dllmain.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/framework.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mod.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/lib/mod.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mod.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/mod.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pch.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/lib/pch.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pch.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/pch.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/entity/Actor.h" beforeDir="false" afterPath="$PROJECT_DIR$/entity/Actor.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/entity/ActorHook.h" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/SymHook.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/SymHook.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/framework.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/framework.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/mod.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/lib/mod.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/mod.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/mod.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/pch.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/lib/pch.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/pch.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/pch.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spawn/Spawn.h" beforeDir="false" afterPath="$PROJECT_DIR$/spawn/Spawn.h" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/symbol.txt" beforeDir="false" afterPath="$PROJECT_DIR$/symbol.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tick/Tick.h" beforeDir="false" afterPath="$PROJECT_DIR$/tick/Tick.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tick/TickHook.h" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/tools/MathTool.h" beforeDir="false" afterPath="$PROJECT_DIR$/tools/MathTool.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tools/Message.h" beforeDir="false" afterPath="$PROJECT_DIR$/tools/Message.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tools/MessageBuilder.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/tools/MessageBuilder.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tools/MessageBuilder.h" beforeDir="false" afterPath="$PROJECT_DIR$/tools/MessageBuilder.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tools/Particle.h" beforeDir="false" afterPath="$PROJECT_DIR$/tools/Particle.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/village/Village.h" beforeDir="false" afterPath="$PROJECT_DIR$/village/Village.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/village/VillagerHook.h" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -61,6 +67,9 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="NamedScopeManager">
+    <scope name="Trapdoor" pattern="!file:cvdump.exe&amp;&amp;!file:PDB导出工具.exe" />
+  </component>
   <component name="ProjectId" id="1gPeI5asxovqHB8dxz0p5WrKTOo" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
@@ -78,18 +87,13 @@
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
       <recent name="C:\Users\xhy\dev\TrapDoor\lib" />
+      <recent name="C:\Users\xhy\dev\TrapDoor\tick" />
+      <recent name="C:\Users\xhy\dev\TrapDoor\commands" />
+      <recent name="C:\Users\xhy\dev\TrapDoor" />
       <recent name="C:\Users\xhy\dev\TrapDoor\common" />
-      <recent name="C:\Users\xhy\dev\TrapDoor\block" />
-      <recent name="C:\Users\xhy\dev\TrapDoor\village" />
-      <recent name="C:\Users\xhy\dev\TrapDoor\spawn" />
     </key>
   </component>
   <component name="RunManager">
-    <configuration default="true" type="CLionExternalRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" PASS_PARENT_ENVS_2="true">
-      <method v="2">
-        <option name="CLION.EXTERNAL.BUILD" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="TrapDoor" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="TrapDoor" TARGET_NAME="TrapDoor" CONFIG_NAME="Debug">
       <method v="2">
         <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
@@ -111,34 +115,44 @@
       <workItem from="1598259610836" duration="550000" />
       <workItem from="1598260189183" duration="4193000" />
       <workItem from="1598265278595" duration="6506000" />
-      <workItem from="1598276860521" duration="3950000" />
+      <workItem from="1598276860521" duration="4683000" />
+      <workItem from="1598326484129" duration="15729000" />
+      <workItem from="1598412456190" duration="3199000" />
+      <workItem from="1598418022397" duration="2259000" />
+      <workItem from="1598514432355" duration="5175000" />
+      <workItem from="1598521390317" duration="173000" />
+      <workItem from="1598521618674" duration="75000" />
     </task>
     <servers />
   </component>
   <component name="WindowStateProjectService">
-    <state x="230" y="71" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1598178377055">
+    <state x="230" y="71" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1598353747711">
+      <screen x="0" y="0" width="1549" height="831" />
+    </state>
+    <state x="230" y="71" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1549.831@0.0.1549.831" timestamp="1598353747711" />
+    <state x="521" y="205" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1598352302891">
       <screen x="0" y="0" width="1549" height="831" />
     </state>
-    <state x="230" y="71" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1549.831@0.0.1549.831" timestamp="1598178377055" />
-    <state x="505" y="162" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1598270355739">
+    <state x="521" y="205" key="#com.intellij.fileTypes.FileTypeChooser/0.0.1549.831@0.0.1549.831" timestamp="1598352302891" />
+    <state x="505" y="162" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1598412574378">
       <screen x="0" y="0" width="1549" height="831" />
     </state>
-    <state x="505" y="162" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1549.831@0.0.1549.831" timestamp="1598270355739" />
-    <state x="213" y="100" width="1046" height="710" key="SettingsEditor" timestamp="1598277034031">
+    <state x="505" y="162" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1549.831@0.0.1549.831" timestamp="1598412574378" />
+    <state x="55" y="61" width="1170" height="707" key="SettingsEditor" timestamp="1598521695170">
       <screen x="0" y="0" width="1549" height="831" />
     </state>
-    <state x="213" y="100" width="1046" height="710" key="SettingsEditor/0.0.1549.831@0.0.1549.831" timestamp="1598277034031" />
-    <state x="567" y="53" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1598280271768">
+    <state x="55" y="61" width="1170" height="707" key="SettingsEditor/0.0.1549.831@0.0.1549.831" timestamp="1598521695170" />
+    <state x="567" y="53" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1598519023770">
       <screen x="0" y="0" width="1549" height="831" />
     </state>
-    <state x="567" y="53" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.0.1549.831@0.0.1549.831" timestamp="1598280271768" />
+    <state x="567" y="53" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.0.1549.831@0.0.1549.831" timestamp="1598519023770" />
     <state x="474" y="0" width="600" height="831" key="find.popup" timestamp="1598268539707">
       <screen x="0" y="0" width="1549" height="831" />
     </state>
     <state x="474" y="0" width="600" height="831" key="find.popup/0.0.1549.831@0.0.1549.831" timestamp="1598268539707" />
-    <state x="437" y="152" width="672" height="678" key="search.everywhere.popup" timestamp="1598198229868">
+    <state x="437" y="152" width="672" height="678" key="search.everywhere.popup" timestamp="1598517801276">
       <screen x="0" y="0" width="1549" height="831" />
     </state>
-    <state x="437" y="152" width="672" height="678" key="search.everywhere.popup/0.0.1549.831@0.0.1549.831" timestamp="1598198229868" />
+    <state x="437" y="152" width="672" height="678" key="search.everywhere.popup/0.0.1549.831@0.0.1549.831" timestamp="1598517801276" />
   </component>
 </project>
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3ec9a0..17b107d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,27 +1,22 @@
 cmake_minimum_required(VERSION 3.17)
 project(TrapDoor)
 
-set(CMAKE_CXX_STANDARD 14)
-
+set(CMAKE_CXX_STANDARD 17)
+#set(CMAKE_CXX_FLAGS "/IGNORE:C4819")
 include_directories(.)
-
-add_library (TrapDoor SHARED
-        entity/Actor.h
-        block/Block.h
-        common/Common.h
-        lib/detours.h
-        lib/detver.h
+add_library(TrapDoor SHARED
         dllmain.cpp
-        lib/framework.h
-        lib/mod.cpp
-        lib/mod.h
-        lib/pch.cpp
-        lib/pch.h
-        spawn/Spawn.h
-        lib/SymHook.h
-        Tools.h
-        village/Village.h
+        tools/MathTool.cpp
         tools/MessageBuilder.cpp
-        common/Vec3.h common/BlockPos.h common/AABB.h
-        tick/Tick.h
-        commands/Shell.cpp commands/Shell.h entity/ActorHook.h tick/TickHook.h tools/MathTool.h tools/Particle.h tools/Message.h village/VillagerHook.h)
+        tools/Particle.cpp
+        tools/Message.cpp
+        lib/pch.cpp
+        lib/mod.cpp
+        village/Village.cpp
+        common/Common.cpp
+        spawn/Spawn.cpp
+        entity/Actor.cpp
+        tick/Tick.cpp
+        commands/Shell.cpp
+        commands/Shell.h
+        block/Block.cpp commands/VanillaCommand.cpp commands/VanillaCommand.h)
diff --git a/Tools.h b/Tools.h
deleted file mode 100644
index 6f70f09..0000000
--- a/Tools.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/block/Block.cpp b/block/Block.cpp
new file mode 100644
index 0000000..ac4bb1d
--- /dev/null
+++ b/block/Block.cpp
@@ -0,0 +1,93 @@
+//
+// Created by xhy on 2020/8/26.
+//
+#include "Block.h"
+#include "tools/Message.h"
+#include "common/Vec3.h"
+#include "common/BlockPos.h"
+#include "tools/MathTool.h"
+
+using namespace SymHook;
+
+namespace block {
+    std::vector<Vec3> posCache;
+}
+
+
+/**
+ * Hook 用铲子右击方块的函数
+ * 老实说这里的功能蛮费的
+ */
+
+THook(
+        void,
+        MSSYM_B2QUA5useOnB1AE10ShovelItemB2AAA4EEBAB1UE14NAEAVItemStackB2AAA9AEAVActorB2AAA9VBlockPosB2AAA4EMMMB1AA1Z,
+        void *a1,
+        void *a2,
+        void *actor,
+        int *blockPos,
+        float a4,
+        float a5,
+        float a6
+) {
+    Vec3 pos(blockPos[0], blockPos[1], blockPos[2]);
+    BlockPos bp(blockPos[0], blockPos[1], blockPos[2]);
+    //printf("%d %d %d\commandMap", blockPos[0], blockPos[1], blockPos[2]);
+    //   villageHelper.POIBelong(&bp);
+    if (enableMarkPos) {
+        if (block::posCache.empty()) {
+            block::posCache.emplace_back(pos);
+            block::posCache.emplace_back(pos);
+        } else {
+            block::posCache[0] = block::posCache[1];
+            block::posCache[1] = pos;
+        }
+        if (block::posCache[0] != block::posCache[1]) {
+            gamePrintf("(%d,%d,%d),(%d,%d,%d):%.2f(%.2f),%d(%d)\n",
+                       (int) block::posCache[0].x,
+                       (int) block::posCache[0].y,
+                       (int) block::posCache[0].z,
+                       (int) block::posCache[1].x,
+                       (int) block::posCache[1].y,
+                       (int) block::posCache[1].z,
+                       math::distance(block::posCache[0], block::posCache[1], false, true),
+                       math::distance(block::posCache[0], block::posCache[1], false, false),
+                       (int) math::distance(block::posCache[0], block::posCache[1], true, true),
+                       (int) math::distance(block::posCache[0], block::posCache[1], true, false)
+            );
+            std::string str = "minecraft:redstone_wire_dust_particle";
+        }
+    } else {
+        original(a1, a2, actor, blockPos, a4, a5, a6);
+    }
+}
+
+
+
+//海绵放置
+THook(
+        void,
+        MSSYM_B1QA7onPlaceB1AE11SpongeBlockB2AAE20UEBAXAEAVBlockSourceB2AAE12AEBVBlockPosB3AAAA1Z,
+        void *b,
+        void *bs,
+        BlockPos * blockPos
+) {
+    void *block = SYM_CALL(
+            void* (*)(void * , int, int, int),
+            MSSYM_B1QA8getBlockB1AE11BlockSourceB2AAE13QEBAAEBVBlockB2AAA3HHHB1AA1Z, globalBlockSource,
+            blockPos->x, blockPos->y - 1, blockPos->z
+    );
+    if (block) {
+        for (int i = 0; i < 10; i++) {
+            BlockPos p(blockPos->x, blockPos->y + i, blockPos->z);
+            SYM_CALL(
+                    void(*)(void * , BlockPos *, void *, int, void *),
+                    MSSYM_B1QA8setBlockB1AE11BlockSourceB2AAA4QEAAB1UE13NAEBVBlockPosB2AAA9AEBVBlockB2AAE26HPEBUActorBlockSyncMessageB3AAAA1Z,
+                    globalBlockSource, &p, block, 0, nullptr
+            );
+        }
+    } else {
+        gamePrintf("can't get block");
+    }
+
+}
diff --git a/block/Block.h b/block/Block.h
index ff01ad6..22d7adf 100644
--- a/block/Block.h
+++ b/block/Block.h
@@ -1,91 +1,11 @@
 #pragma once
 
 #include "common/Common.h"
-#include "lib/pch.h"
 #include "lib/mod.h"
 #include "lib/SymHook.h"
 #include <vector>
 
-using namespace SymHook;
 
-std::vector<Vec3> cachePosList;
-
-/**
- * Hook 用铲子右击方块的函数
- * 老实说这里的功能蛮费的
- */
-THook(
-        void,
-        MSSYM_B2QUA5useOnB1AE10ShovelItemB2AAA4EEBAB1UE14NAEAVItemStackB2AAA9AEAVActorB2AAA9VBlockPosB2AAA4EMMMB1AA1Z,
-        void *a1,
-        void *a2,
-        void *actor,
-        int *blockPos,
-        float a4,
-        float a5,
-        float a6
-) {
-    Vec3 pos(blockPos[0], blockPos[1], blockPos[2]);
-    BlockPos bp(blockPos[0], blockPos[1], blockPos[2]);
-    //printf("%d %d %d\commandMap", blockPos[0], blockPos[1], blockPos[2]);
-    //   villageHelper.POIBelong(&bp);
-    if (enableMarkPos) {
-        if (cachePosList.empty()) {
-            cachePosList.emplace_back(pos);
-            cachePosList.emplace_back(pos);
-        } else {
-            cachePosList[0] = cachePosList[1];
-            cachePosList[1] = pos;
-        }
-        if (cachePosList[0] != cachePosList[1]) {
-            gamePrintf("(%d,%d,%d),(%d,%d,%d):%.2f(%.2f),%d(%d)\n",
-                       (int) cachePosList[0].x,
-                       (int) cachePosList[0].y,
-                       (int) cachePosList[0].z,
-                       (int) cachePosList[1].x,
-                       (int) cachePosList[1].y,
-                       (int) cachePosList[1].z,
-                       distance(cachePosList[0], cachePosList[1], false, true),
-                       distance(cachePosList[0], cachePosList[1], false, false),
-                       (int) distance(cachePosList[0], cachePosList[1], true, true),
-                       (int) distance(cachePosList[0], cachePosList[1], true, false)
-            );
-            std::string str = "minecraft:redstone_wire_dust_particle";
-        }
-    } else {
-        original(a1, a2, actor, blockPos, a4, a5, a6);
-    }
-}
-
-
-
-//海绵放置
-THook(
-        void,
-        MSSYM_B1QA7onPlaceB1AE11SpongeBlockB2AAE20UEBAXAEAVBlockSourceB2AAE12AEBVBlockPosB3AAAA1Z,
-        void *b,
-        void *bs,
-        BlockPos * blockPos
-) {
-    void *block = SYM_CALL(
-            void* (*)(void * , int, int, int),
-            MSSYM_B1QA8getBlockB1AE11BlockSourceB2AAE13QEBAAEBVBlockB2AAA3HHHB1AA1Z, globalBlockSource,
-            blockPos->x, blockPos->y - 1, blockPos->z
-    );
-    if (block) {
-        for (int i = 0; i < 10; i++) {
-            BlockPos p(blockPos->x, blockPos->y + i, blockPos->z);
-            SYM_CALL(
-                    void(*)(void * , BlockPos*, void *, int, void *),
-                    MSSYM_B1QA8setBlockB1AE11BlockSourceB2AAA4QEAAB1UE13NAEBVBlockPosB2AAA9AEBVBlockB2AAE26HPEBUActorBlockSyncMessageB3AAAA1Z,
-                    globalBlockSource, &p, block, 0, nullptr
-            );
-        }
-    } else {
-        gamePrintf("can't get block");
-    }
-
-}
 
 //这里是红石粉右击事件，暂时关闭了
 //THook(
diff --git a/commands/Shell.cpp b/commands/Shell.cpp
index b21b514..1df8431 100644
--- a/commands/Shell.cpp
+++ b/commands/Shell.cpp
@@ -1,9 +1,21 @@
-#pragma warning (disable:4819)
 //
-// Created by xhy on 2020/8/24.
+// Created by xhy on 2020/8/26.
 //
+#include "lib/mod.h"
+#include "village/Village.h"
+#include <map>
+#include "spawn/Spawn.h"
+#include <vector>
+#include "tick/Tick.h"
 #include "Shell.h"
+#include "entity/Actor.h"
+#include "VanillaCommand.h"
+/*
+ * Dirty Command Parser
+ * if else
+ */
 
+using namespace SymHook;
 std::map<std::string, CmdType> commandMap = {  // NOLINT(cert-err58-cpp)
         {"./tick",  CmdType::Tick},
         {"fw",      ParaType::TickForward},
@@ -29,11 +41,15 @@ std::vector<std::string> tokenize(std::string &commandString) {
     return tokens;
 }
 
-THook(void, MSSYM_MD5_c5508c07a9bc049d2b327ac921a4b334, void *self, std::string const &playerName,
+
+THook(void, //NOLINT
+      MSSYM_MD5_c5508c07a9bc049d2b327ac921a4b334,
+      void *self, std::string const &playerName,
       std::string &commandLine) {
     if (commandLine.size() < 2)return;
     if (!(commandLine[0] == '.' && commandLine[1] == '/'))return;
     auto tokens = tokenize(commandLine);
+
     auto result = commandMap.find(tokens[0]);
     if (result == commandMap.end()) {
         error("unknown command , use [./help] to show help");
@@ -41,6 +57,8 @@ THook(void, MSSYM_MD5_c5508c07a9bc049d2b327ac921a4b334, void *self, std::string
     }
 
     const char *banner = "§5§l          TRAPDOOR v0.1.4                \n";
+
+
     switch (result->second) {
         case CmdType::Tick:
             if (tokens.size() == 1)return;
@@ -51,11 +69,12 @@ THook(void, MSSYM_MD5_c5508c07a9bc049d2b327ac921a4b334, void *self, std::string
             } else if (tokens[1] == "forward" || tokens[1] == "fw") {//前进n tick
                 if (tokens.size() != 3)return;
                 int time = strtol(tokens[2].c_str(), nullptr, 10);
-                if (time < 0) {
-                    error("invalid parameter\n");
+                if (time <= 0) {
+                    error("invalid parameter in time\n");
                     return;
                 }
                 tick::forwardWorld(time);
+
             } else if (tokens[1] == "slow") {
                 if (tokens.size() != 3)return;
                 int time = strtol(tokens[2].c_str(), nullptr, 10);
@@ -71,6 +90,8 @@ THook(void, MSSYM_MD5_c5508c07a9bc049d2b327ac921a4b334, void *self, std::string
             tick::profileWorld();
             break;
 
+
+            //command about Village
         case CmdType::Village:
             if (tokens.size() == 1)return;
             if (tokens[1] == "draw") {
@@ -114,6 +135,9 @@ THook(void, MSSYM_MD5_c5508c07a9bc049d2b327ac921a4b334, void *self, std::string
                     } else {
                         error("invalid distance");
                     }
+                } else if (tokens[1] == "fillCloneRange" || tokens[1] == "fcr") {
+                    size_t newRange = strtol(tokens[2].c_str(), nullptr, 10);
+                    setFillCloneRange(newRange);
                 }
             } else {
                 error("unknown command");
@@ -158,4 +182,3 @@ THook(void, MSSYM_MD5_c5508c07a9bc049d2b327ac921a4b334, void *self, std::string
 }
 
 
-
diff --git a/commands/Shell.h b/commands/Shell.h
index 2f08d2b..88d99ee 100644
--- a/commands/Shell.h
+++ b/commands/Shell.h
@@ -1,27 +1,11 @@
 //
-// Created by xhy on 2020/8/24.
+// Created by xhy on 2020/8/26.
 //
 
 #ifndef TRAPDOOR_SHELL_H
 #define TRAPDOOR_SHELL_H
-#pragma once
-
-#include "lib/pch.h"
-#include "lib/mod.h"
-#include "lib/SymHook.h"
-#include "village/Village.h"
-#include <map>
-#include "spawn/Spawn.h"
 #include <vector>
-#include <sstream>
-#include "tick/Tick.h"
-#include "entity/Actor.h"
-/*
- * Dirty Command Parser
- * if else
- */
-
-using namespace SymHook;
+#include <string>
 enum class CmdType {
     Tick,
     TickForward,
@@ -37,8 +21,6 @@ enum class CmdType {
     Config
 };
 typedef CmdType ParaType;
-
-
-std::vector<std::string> tokenize(std::string &commandString);
+std::vector <std::string> tokenize(std::string &commandString);
 
 #endif //TRAPDOOR_SHELL_H
diff --git a/commands/VanillaCommand.cpp b/commands/VanillaCommand.cpp
new file mode 100644
index 0000000..85a6294
--- /dev/null
+++ b/commands/VanillaCommand.cpp
@@ -0,0 +1,46 @@
+//
+// Created by xhy on 2020/8/27.
+//
+/*
+ * useless code
+ */
+#include "VanillaCommand.h"
+#include "lib/SymHook.h"
+#include "tools/Message.h"
+
+using namespace SymHook;
+size_t fillCloneRange = 65535;
+
+void resetFillCloneRange() {
+    fillCloneRange = 65535;
+}
+
+void setFillCloneRange(size_t num) {
+    if (num <= 524288 && num > 0) {
+        fillCloneRange = num;
+        dbg(fillCloneRange);
+        info("set range successful");
+    } else {
+        error("invalid range require[0 524288]");
+    }
+}
+
+THook(
+        bool,
+        MSSYM_B1QE10validRangeB1AA7CommandB2AAA2SAB1UE21NHHHAEAVCommandOutputB3AAAA1Z,
+        void *self,
+        int flag,
+        int range,
+        void * output
+) {
+    dbg(range);
+    if (range == 65535) {
+        //fill and clone command
+        dbg(fillCloneRange);
+        return original(self, flag, fillCloneRange, output);
+    } else {
+        //others
+        return original(self, flag, range, output);
+    }
+}
+
diff --git a/commands/VanillaCommand.h b/commands/VanillaCommand.h
new file mode 100644
index 0000000..d62301c
--- /dev/null
+++ b/commands/VanillaCommand.h
@@ -0,0 +1,16 @@
+//
+// Created by xhy on 2020/8/27.
+//
+
+#ifndef TRAPDOOR_VANILLACOMMAND_H
+#define TRAPDOOR_VANILLACOMMAND_H
+
+#include "lib/mod.h"
+
+extern size_t fillCloneRange;
+
+void resetFillCloneRange();
+
+void setFillCloneRange(size_t num);
+
+#endif //TRAPDOOR_VANILLACOMMAND_H
diff --git a/common/BlockPos.h b/common/BlockPos.h
index 92f8815..d4adcbb 100644
--- a/common/BlockPos.h
+++ b/common/BlockPos.h
@@ -31,6 +31,12 @@ struct BlockPos {
         return x != v.x || y != v.y || z != v.z;
     }
 
+    float distanceTo(const BlockPos &blockPos) const {
+        return (float) ((blockPos.x - x) * (blockPos.x - x) +
+                        (blockPos.y - y) * (blockPos.y - y) +
+                        (blockPos.z - z) * (blockPos.z - z));
+    }
+
     friend std::ostream &operator<<(std::ostream &os, const BlockPos &vec3) {
         os << "[" << vec3.x << "," << vec3.y << "," << vec3.z << "]";
         return os;
@@ -39,6 +45,8 @@ struct BlockPos {
     Vec3 toVec3() const {
         return {x, y, z};
     }
+
+
 };
 
 #endif //TRAPDOOR_BLOCKPOS_H
diff --git a/common/Common.cpp b/common/Common.cpp
new file mode 100644
index 0000000..eeafc04
--- /dev/null
+++ b/common/Common.cpp
@@ -0,0 +1,23 @@
+//
+// Created by xhy on 2020/8/25.
+//
+#include "Common.h"
+
+void *globalPlayer = nullptr; //全局玩家对象
+void *globalLevel = nullptr; //全局存档对象
+void *globalDimension = nullptr; //全局维度对象
+void *globalBlockSource = nullptr; //全局bs对象
+void *globalSpawner = nullptr; //全局刷怪器对象
+void *globalVillageManager = nullptr; //全局村庄管理器对象
+
+//粒子效果配置(性能配置)
+int particleViewDistance = 128;
+
+
+bool enableMarkPos = false;
+bool enableVillageShow = false;
+bool enableBlockUpdate = true;
+bool enableExtraTickWork = true;
+bool enableExplosion = false;
+bool mobSpawnCounterStart = false;
+int mobTickCounter = 0;
\ No newline at end of file
diff --git a/common/Common.h b/common/Common.h
index 5395492..5a10082 100644
--- a/common/Common.h
+++ b/common/Common.h
@@ -1,35 +1,26 @@
-#pragma once
+//
+// Created by xhy on 2020/8/25.
+//
 
-#include <vector>
-#include "lib/pch.h"
-#include "lib/mod.h"
-#include "lib/SymHook.h"
-#include <string>
-#include <ostream>
-#include "Vec3.h"
-#include "BlockPos.h"
-#include "AABB.h"
-#include "tools/MathTool.h"
+#ifndef TRAPDOOR_COMMON_H
+#define TRAPDOOR_COMMON_H
+extern void *globalPlayer; //全局玩家对象
+extern void *globalLevel; //全局存档对象
+extern void *globalDimension; //全局维度对象
+extern void *globalBlockSource; //全局bs对象
+extern void *globalSpawner; //全局刷怪器对象
+extern void *globalVillageManager; //全局村庄管理器对象
 
-using namespace SymHook;
-void *globalPlayer = nullptr; //全局玩家对象
-void *globalLevel = nullptr; //全局存档对象
-void *globalDimension = nullptr; //全局维度对象
-void *globalBlockSource = nullptr; //全局bs对象
-void *globalSpawner = nullptr; //全局刷怪器对象
-void *globalVillageManager = nullptr; //全局村庄管理器对象
-
-
-//this code is from https://stackoverflow.com/questions/2342162/stdstring-formatting-like-sprintf
+//粒子效果配置(性能配置)
+extern int particleViewDistance;
 
 
+extern bool enableMarkPos;
+extern bool enableVillageShow;
+extern bool enableExtraTickWork;
+extern bool enableExplosion;
+extern bool mobSpawnCounterStart;
+extern bool enableBlockUpdate;
+extern int mobTickCounter;
 
-//粒子效果配置(性能配置)
-int particleViewDistance = 128;
-//等距切分坐标
-bool enableMarkPos = false;
-bool enableVillageShow = false;
-bool enableExtraTickWork = true;
-bool enableExplosion = true;
-bool mobSpawnCounterStart = false;
-int mobTickCounter = 0;
+#endif //TRAPDOOR_COMMON_H
diff --git a/common/Vec3.h b/common/Vec3.h
index 4feaabe..0e35f93 100644
--- a/common/Vec3.h
+++ b/common/Vec3.h
@@ -5,6 +5,8 @@
 #ifndef TRAPDOOR_VEC3_H
 #define TRAPDOOR_VEC3_H
 
+#include <iostream>
+
 struct Vec3 {
     float x;
     float y;
@@ -12,6 +14,10 @@ struct Vec3 {
 
     Vec3() = default;
 
+    explicit Vec3(int _x) : Vec3(_x, _x, _x) {}
+
+    explicit Vec3(float _x) : Vec3(_x, _x, _x) {}
+
     Vec3(int _x, int _y, int _z) : x((float) _x), y((float) _y), z((float) _z) {}
 
     Vec3(float _x, float _y, float _z) : x(_x), y(_y), z(_z) {}
@@ -30,11 +36,6 @@ struct Vec3 {
                (vec3.z - z) * (vec3.z - z);
     }
 
-
-    friend std::ostream &operator<<(std::ostream &os, const Vec3 &vec3) {
-        os << "[" << vec3.x << "," << vec3.y << "," << vec3.z << "]";
-        return os;
-    }
 };
 
 
diff --git a/dllmain.cpp b/dllmain.cpp
index f1c7289..58afa6e 100644
--- a/dllmain.cpp
+++ b/dllmain.cpp
@@ -1,25 +1,27 @@
-// dllmain.cpp : 定义 DLL 应用程序的入口点。
-#include "lib/pch.h"
-# pragma warning (disable:4819)
+// dllmain.cpp : 定义 DLL 应用程序的入口点。
+#include  "lib/pch.h"
+
+#define _SILENCE_CXX17_STRSTREAM_DEPRECATION_WARNING
+
 void mod_init();
+
 void mod_exit();
-BOOL APIENTRY DllMain( HMODULE hModule,
-                       DWORD  ul_reason_for_call,
-                       LPVOID lpReserved
-                     )
-{
-	switch (ul_reason_for_call)
-    {
-    case DLL_PROCESS_ATTACH:
- 	    mod_init();
-		break;
-	case DLL_THREAD_ATTACH:
-		break;
-    case DLL_THREAD_DETACH:
-		break;
-    case DLL_PROCESS_DETACH:
-		mod_exit();
-        break;
+
+BOOL APIENTRY DllMain(HMODULE hModule,
+                      DWORD ul_reason_for_call,
+                      LPVOID lpReserved
+) {
+    switch (ul_reason_for_call) {
+        case DLL_PROCESS_ATTACH:
+            mod_init();
+            break;
+        case DLL_THREAD_ATTACH:
+            break;
+        case DLL_THREAD_DETACH:
+            break;
+        case DLL_PROCESS_DETACH:
+            mod_exit();
+            break;
     }
     return TRUE;
 }
diff --git a/entity/Actor.cpp b/entity/Actor.cpp
new file mode 100644
index 0000000..0cdb5ad
--- /dev/null
+++ b/entity/Actor.cpp
@@ -0,0 +1,167 @@
+//
+// Created by xhy on 2020/8/25.
+//
+
+#include "Actor.h"
+#include "tools/MathTool.h"
+
+using namespace SymHook;
+
+namespace spawn {
+
+    std::map<std::string, std::vector<Vec3>> mobCounterList;//NOLINT
+
+    Vec3 *getPos(void *actor) {
+        return SYM_CALL(
+                Vec3*(*)(void * ),
+                MSSYM_B1QA6getPosB1AA5ActorB2AAE12UEBAAEBVVec3B2AAA2XZ,
+                actor
+        );
+    }
+
+    std::string actorIDtoString(char *actorID) {
+        auto str = reinterpret_cast<std::string *>(actorID + 32);
+        return std::string(*str);
+    }
+
+    std::vector<std::string> getActorText(void *actor) {
+        std::vector<std::string> info;
+        if (!actor)return info;
+        SYM_CALL(void(*)(void * , std::vector<std::string> &),
+                 MSSYM_MD5_f04fad6bac034f1e861181d3580320f2,
+                 actor, info);
+        return info;
+    }
+
+    void sendMobInfo() {
+        int mobNum = getMobCount(globalSpawner);
+        char str[64];
+        sprintf_s(str, "total mob count: %d", mobNum);
+        gamePrintf(str);
+    }
+
+    void startSpawnCounter() {
+        if (mobSpawnCounterStart) {
+            error("it's already start some ticks before");
+        } else {
+            mobCounterList.clear();
+            mobTickCounter = 0;
+            mobSpawnCounterStart = true;
+            gamePrintf("counter start, type ./spawner end to end the counter");
+        }
+    }
+
+    void endSpawnerCounter() {
+        if (!mobSpawnCounterStart) {
+            error("this command can only be run after the counter start");
+        } else {
+            mobSpawnCounterStart = false;
+            gamePrintf("counter end");
+        }
+    }
+
+    void spawnAnalysis(std::string &type) {
+        if (mobTickCounter == 0) {
+            warning("no data");
+            return;
+        }
+        if (type == "null") {
+            std::map<std::string, size_t> mobList;
+            std::map<int, int> heightMap;
+            std::map<int, int> disMap;
+            auto playerPos = getPos(globalPlayer);
+            size_t totalNum = 0;
+            for (const auto &item:mobCounterList) {
+                mobList[item.first] = item.second.size();
+                totalNum += item.second.size();
+
+                for (auto vec : item.second) {
+                    heightMap[(int) vec.y]++;
+                    disMap[(int) math::distance(vec, *playerPos)]++;
+                }
+            }
+            gamePrintf("total §2%d §r tick", mobTickCounter);
+            for (auto &i: mobList)
+                gamePrintf("%s : §2%d       §r(§2%.2f§r/h)\n", i.first.c_str(), i.second,
+                           (float) i.second * 72000.0 / (float) mobTickCounter);
+            gamePrintf("-------distance map---------");
+            for (auto &i: heightMap)
+                gamePrintf("[%d-%d]: §2%d", i.first, i.first + 1, i.second);
+            gamePrintf("--------height map--------");
+            for (auto &i: heightMap)
+                gamePrintf("%d: §2%d", i.first, i.second);
+
+        } else {
+
+            auto iter = mobCounterList.find(type);
+            if (iter == mobCounterList.end()) {
+                gamePrintf("no mob type named %s", type.c_str());
+            } else {
+                gamePrintf("function developing\n");
+            }
+        }
+    }
+
+    std::string getActorName(void *actor) {
+//#warning this func is hardcoded, it may need rewrite when update the game
+        return actor ? getActorText(actor)[0].substr(13) : "null";
+    }
+}
+
+THook(
+        void,
+        MSSYM_B1QA6attackB1AA6PlayerB2AAA4UEAAB1UE10NAEAVActorB3AAAA1Z,
+        void *p1,
+        void * p2
+) {
+    if (p1 && p2) {
+        // if (getActorName(p2) == "minecraft:villager_v2<>") {
+        original(p1, p2);
+        if (p2) {
+            std::string infoText;
+            SYM_CALL(void(*)(void * mob, std::string &),
+                     MSSYM_B1QE14buildDebugInfoB1AA3MobB2AAA9UEBAXAEAVB2QDA5basicB1UA6stringB1AA2DUB2QDA4charB1UA6traitsB1AA1DB1AA3stdB2AAA1VB2QDA9allocatorB1AA1DB1AA12B2AAA3stdB3AAAA1Z,
+                     p2, infoText
+            );
+
+            SYM_CALL(
+                    void(*)(void * actor,
+                    const std::string &str),
+                    MSSYM_B1QE10setNameTagB1AA5ActorB2AAA9UEAAXAEBVB2QDA5basicB1UA6stringB1AA2DUB2QDA4charB1UA6traitsB1AA1DB1AA3stdB2AAA1VB2QDA9allocatorB1AA1DB1AA12B2AAA3stdB3AAAA1Z,
+                    p2,
+                    infoText
+            );
+        }
+    }
+}
+
+THook(
+        void,
+        MSSYM_B1QA8spawnMobB1AA7SpawnerB2AAE11QEAAPEAVMobB2AAE15AEAVBlockSourceB2AAE29AEBUActorDefinitionIdentifierB2AAA9PEAVActorB2AAA8AEBVVec3B3AAUA3N44B1AA1Z,
+        void *sp,
+        void *bs,
+        char *actorId,
+        void *actor,
+        Vec3 *pos,
+        bool a6,
+        bool a7,
+        bool a8
+) {
+    // printf("spawn %s at %f %f %f \commandMap", actorIDtoString(actorId).c_str(), pos->x, pos->y, pos->z);
+    if (mobSpawnCounterStart && pos) {
+        auto mobName = spawn::actorIDtoString(actorId);
+        Vec3 vec(pos->x, pos->y, pos->z);
+        spawn::mobCounterList[mobName].emplace_back(vec);
+    }
+    original(sp, bs, actorId, actor, pos, a6, a7, a8);
+}
+
+THook(
+        void,
+        MSSYM_B1QA7explodeB1AA9ExplosionB2AAA7QEAAXXZ,
+        void * exp
+) {
+    if (enableExplosion) {
+        original(exp);
+    }
+}
\ No newline at end of file
diff --git a/entity/Actor.h b/entity/Actor.h
index 2aa89bd..5febb18 100644
--- a/entity/Actor.h
+++ b/entity/Actor.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "common/Common.h"
-#include "lib/pch.h"
 #include "lib/mod.h"
 #include "lib/SymHook.h"
 #include "spawn/Spawn.h"
@@ -15,104 +14,22 @@
  */
 namespace spawn {
 
-    std::map<std::string, std::vector<Vec3>> mobCounterList;//NOLINT
 
-    Vec3 *getPos(void *actor) {
-        return SYM_CALL(
-                Vec3*(*)(void * ),
-                MSSYM_B1QA6getPosB1AA5ActorB2AAE12UEBAAEBVVec3B2AAA2XZ,
-                actor
-        );
-    }
+    Vec3 *getPos(void *actor);
 
-    std::string actorIDtoString(char *actorID) {
-        auto str = reinterpret_cast<std::string *>(actorID + 32);
-        return std::string(*str);
-    }
+    std::string actorIDtoString(char *actorID);
 
-    std::vector<std::string> getActorText(void *actor) {
-        std::vector<std::string> info;
-        if (!actor)return info;
-        SYM_CALL(void(*)(void * , std::vector<std::string> &),
-                 MSSYM_MD5_f04fad6bac034f1e861181d3580320f2,
-                 actor, info);
-        return info;
-    }
+    std::vector<std::string> getActorText(void *actor);
 
-    void sendMobInfo() {
-        int mobNum = getMobCount(globalSpawner);
-        char str[64];
-        sprintf_s(str, "total mob count: %d", mobNum);
-        gamePrintf(str);
-    }
+    void sendMobInfo();
 
+    void startSpawnCounter();
 
-    void startSpawnCounter() {
-        if (mobSpawnCounterStart) {
-            error("it's already start some ticks before");
-        } else {
-            mobCounterList.clear();
-            mobTickCounter = 0;
-            mobSpawnCounterStart = true;
-            gamePrintf("counter start, type ./spawner end to end the counter");
-        }
-    }
+    void endSpawnerCounter();
 
-    void endSpawnerCounter() {
-        if (!mobSpawnCounterStart) {
-            error("this command can only be run after the counter start");
-        } else {
-            mobSpawnCounterStart = false;
-            gamePrintf("counter end");
-        }
-    }
+    void spawnAnalysis(std::string &type);
 
-    void spawnAnalysis(std::string &type) {
-        if (mobTickCounter == 0) {
-            warning("no data");
-            return;
-        }
-        if (type == "null") {
-            std::map<std::string, size_t> mobList;
-            std::map<int, int> heightMap;
-            std::map<int, int> disMap;
-            auto playerPos = getPos(globalPlayer);
-            size_t totalNum = 0;
-            for (const auto &item:mobCounterList) {
-                mobList[item.first] = item.second.size();
-                totalNum += item.second.size();
-
-                for (auto vec : item.second) {
-                    heightMap[(int) vec.y]++;
-                    disMap[(int) math::distance(vec, *playerPos)]++;
-                }
-            }
-            gamePrintf("total §2%d §r tick", mobTickCounter);
-            for (auto &i: mobList)
-                gamePrintf("%s : §2%d       §r(§2%.2f§r/h)\n", i.first.c_str(), i.second,
-                           (float) i.second * 72000.0 / (float) mobTickCounter);
-            gamePrintf("-------distance map---------");
-            for (auto &i: heightMap)
-                gamePrintf("[%d-%d]: §2%d", i.first, i.first + 1, i.second);
-            gamePrintf("--------height map--------");
-            for (auto &i: heightMap)
-                gamePrintf("%d: §2%d", i.first, i.second);
-
-        } else {
-
-            auto iter = mobCounterList.find(type);
-            if (iter == mobCounterList.end()) {
-                gamePrintf("no mob type named %s", type.c_str());
-            } else {
-                gamePrintf("function developing\n");
-            }
-        }
-    }
-
-    std::string getActorName(void *actor) {
-//#warning this func is hardcoded, it may need rewrite when update the game
-        return actor ? getActorText(actor)[0].substr(13) : "null";
-    }
+    std::string getActorName(void *actor);
 
 
 }
diff --git a/entity/ActorHook.h b/entity/ActorHook.h
deleted file mode 100644
index ef9c8f9..0000000
--- a/entity/ActorHook.h
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Created by xhy on 2020/8/24.
-//
-
-#ifndef TRAPDOOR_ACTORHOOK_H
-#define TRAPDOOR_ACTORHOOK_H
-
-#include "lib/pch.h"
-#include "lib/mod.h"
-#include "Actor.h"
-#include "lib/SymHook.h"
-
-namespace SymHook {
-    THook(
-            void,
-            MSSYM_B1QA6attackB1AA6PlayerB2AAA4UEAAB1UE10NAEAVActorB3AAAA1Z,
-            void *p1,
-            void * p2
-    ) {
-        if (p1 && p2) {
-            // if (getActorName(p2) == "minecraft:villager_v2<>") {
-            original(p1, p2);
-            if (p2) {
-                std::string infoText;
-                SYM_CALL(void(*)(void * mob, std::string &),
-                         MSSYM_B1QE14buildDebugInfoB1AA3MobB2AAA9UEBAXAEAVB2QDA5basicB1UA6stringB1AA2DUB2QDA4charB1UA6traitsB1AA1DB1AA3stdB2AAA1VB2QDA9allocatorB1AA1DB1AA12B2AAA3stdB3AAAA1Z,
-                         p2, infoText
-                );
-
-                SYM_CALL(
-                        void(*)(void * actor,
-                        const std::string &str),
-                        MSSYM_B1QE10setNameTagB1AA5ActorB2AAA9UEAAXAEBVB2QDA5basicB1UA6stringB1AA2DUB2QDA4charB1UA6traitsB1AA1DB1AA3stdB2AAA1VB2QDA9allocatorB1AA1DB1AA12B2AAA3stdB3AAAA1Z,
-                        p2,
-                        infoText
-                );
-            }
-        }
-    }
-
-    THook(
-            void,
-            MSSYM_B1QA8spawnMobB1AA7SpawnerB2AAE11QEAAPEAVMobB2AAE15AEAVBlockSourceB2AAE29AEBUActorDefinitionIdentifierB2AAA9PEAVActorB2AAA8AEBVVec3B3AAUA3N44B1AA1Z,
-            void *sp,
-            void *bs,
-            char *actorId,
-            void *actor,
-            Vec3 *pos,
-            bool a6,
-            bool a7,
-            bool a8
-    ) {
-        // printf("spawn %s at %f %f %f \commandMap", actorIDtoString(actorId).c_str(), pos->x, pos->y, pos->z);
-        if (mobSpawnCounterStart && pos) {
-            auto mobName = spawn::actorIDtoString(actorId);
-            Vec3 vec(pos->x, pos->y, pos->z);
-            spawn::mobCounterList[mobName].emplace_back(vec);
-        }
-        original(sp, bs, actorId, actor, pos, a6, a7, a8);
-    }
-
-    THook(
-            void,
-            MSSYM_B1QA7explodeB1AA9ExplosionB2AAA7QEAAXXZ,
-            void * exp
-    ) {
-        if (enableExplosion) {
-            original(exp);
-        }
-    }
-}
-
-#endif //TRAPDOOR_ACTORHOOK_H
diff --git a/lib/SymHook.h b/lib/SymHook.h
index 6e4f458..9daa50f 100644
--- a/lib/SymHook.h
+++ b/lib/SymHook.h
@@ -4,155 +4,164 @@
 // �����ķ��Ž������Ӧ��md5ֵ��ʾ�÷��Ŷ�Ӧ�ı�ʶ����
 #pragma once
 
-namespace SymHook {
-    using RVA = unsigned int;
-    // [ԭ��] private: static class std::unordered_map<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> >,class SharedPtr<class BlockLegacy>,struct std::hash<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > >,struct std::equal_to<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > >,class std::allocator<struct std::pair<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const ,class SharedPtr<class BlockLegacy> > > > BlockTypeRegistry::mBlockLookupMap
-    // [����] ?mBlockLookupMap@BlockTypeRegistry@@0V?$unordered_map@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$SharedPtr@VBlockLegacy@@@@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$SharedPtr@VBlockLegacy@@@@@std@@@2@@std@@A
-    constexpr RVA MSSYM_MD5_ceb8b47184006e4d7622b39978535236 = 0x0191AD20;
+namespace SymHook{
+	using RVA = unsigned int;
 
-    // [ԭ��] public: virtual void __cdecl MinecraftEventing::fireEventPlayerMessageChat(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const & __ptr64,class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const & __ptr64) __ptr64
-    // [����] ?fireEventPlayerMessageChat@MinecraftEventing@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@0@Z
-    constexpr RVA MSSYM_MD5_c5508c07a9bc049d2b327ac921a4b334 = 0x002EA910;
+	// [ԭ��] private: static class std::unordered_map<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> >,class SharedPtr<class BlockLegacy>,struct std::hash<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > >,struct std::equal_to<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > >,class std::allocator<struct std::pair<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const ,class SharedPtr<class BlockLegacy> > > > BlockTypeRegistry::mBlockLookupMap
+	// [����] ?mBlockLookupMap@BlockTypeRegistry@@0V?$unordered_map@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$SharedPtr@VBlockLegacy@@@@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$SharedPtr@VBlockLegacy@@@@@std@@@2@@std@@A
+	constexpr RVA MSSYM_MD5_ceb8b47184006e4d7622b39978535236 = 0x0191AD20;
 
-    // [ԭ��] public: void __cdecl Level::spawnParticleEffect(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const & __ptr64,class Vec3 const & __ptr64,class Dimension * __ptr64) __ptr64
-    // [����] ?spawnParticleEffect@Level@@QEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVVec3@@PEAVDimension@@@Z
-    constexpr RVA MSSYM_MD5_a2fdc6a066bbe9a360c9c9d76725a8fb = 0x00A75510;
+	// [ԭ��] public: virtual void __cdecl MinecraftEventing::fireEventPlayerMessageChat(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const & __ptr64,class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const & __ptr64) __ptr64
+	// [����] ?fireEventPlayerMessageChat@MinecraftEventing@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@0@Z
+	constexpr RVA MSSYM_MD5_c5508c07a9bc049d2b327ac921a4b334 = 0x002EA910;
 
-    // [ԭ��] void __cdecl CommandUtils::displayLocalizableMessage(bool,class Player & __ptr64,class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const & __ptr64,class std::vector<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> >,class std::allocator<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > > > const & __ptr64)
-    // [����] ?displayLocalizableMessage@CommandUtils@@YAX_NAEAVPlayer@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z
-    constexpr RVA MSSYM_MD5_24be62e9330073695808606844de0d99 = 0x00442330;
+	// [ԭ��] public: void __cdecl Level::spawnParticleEffect(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const & __ptr64,class Vec3 const & __ptr64,class Dimension * __ptr64) __ptr64
+	// [����] ?spawnParticleEffect@Level@@QEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBVVec3@@PEAVDimension@@@Z
+	constexpr RVA MSSYM_MD5_a2fdc6a066bbe9a360c9c9d76725a8fb = 0x00A75510;
 
-    // [ԭ��] public: virtual int __cdecl ServerPlayer::tickWorld(struct Tick const & __ptr64) __ptr64
-    // [����] ?tickWorld@ServerPlayer@@UEAAHAEBUTick@@@Z
-    constexpr RVA MSSYM_B1QA9tickWorldB1AE12ServerPlayerB2AAE13UEAAHAEBUTickB3AAAA1Z = 0x004E9A30;
+	// [ԭ��] void __cdecl CommandUtils::displayLocalizableMessage(bool,class Player & __ptr64,class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const & __ptr64,class std::vector<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> >,class std::allocator<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > > > const & __ptr64)
+	// [����] ?displayLocalizableMessage@CommandUtils@@YAX_NAEAVPlayer@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@4@@Z
+	constexpr RVA MSSYM_MD5_24be62e9330073695808606844de0d99 = 0x00442330;
 
-    // [ԭ��] public: virtual void __cdecl Dimension::tick(void) __ptr64
-    // [����] ?tick@Dimension@@UEAAXXZ
-    constexpr RVA MSSYM_B1QA4tickB1AA9DimensionB2AAA7UEAAXXZ = 0x00A5F260;
+	// [ԭ��] public: virtual int __cdecl ServerPlayer::tickWorld(struct Tick const & __ptr64) __ptr64
+	// [����] ?tickWorld@ServerPlayer@@UEAAHAEBUTick@@@Z
+	constexpr RVA MSSYM_B1QA9tickWorldB1AE12ServerPlayerB2AAE13UEAAHAEBUTickB3AAAA1Z = 0x004E9A30;
 
-    // [ԭ��] public: virtual void __cdecl Level::tick(void) __ptr64
-    // [����] ?tick@Level@@UEAAXXZ
-    constexpr RVA MSSYM_B1QA4tickB1AA5LevelB2AAA7UEAAXXZ = 0x00A718F0;
+	// [ԭ��] public: virtual void __cdecl Dimension::tick(void) __ptr64
+	// [����] ?tick@Dimension@@UEAAXXZ
+	constexpr RVA MSSYM_B1QA4tickB1AA9DimensionB2AAA7UEAAXXZ = 0x00A5F260;
 
-    // [ԭ��] public: void __cdecl LevelChunk::tick(class BlockSource & __ptr64,struct Tick const & __ptr64) __ptr64
-    // [����] ?tick@LevelChunk@@QEAAXAEAVBlockSource@@AEBUTick@@@Z
-    constexpr RVA MSSYM_B1QA4tickB1AE10LevelChunkB2AAE20QEAAXAEAVBlockSourceB2AAA8AEBUTickB3AAAA1Z = 0x00A2C880;
+	// [ԭ��] public: virtual void __cdecl Level::tick(void) __ptr64
+	// [����] ?tick@Level@@UEAAXXZ
+	constexpr RVA MSSYM_B1QA4tickB1AA5LevelB2AAA7UEAAXXZ = 0x00A718F0;
 
-    // [ԭ��] public: void __cdecl LevelChunk::tickBlocks(class BlockSource & __ptr64) __ptr64
-    // [����] ?tickBlocks@LevelChunk@@QEAAXAEAVBlockSource@@@Z
-    constexpr RVA MSSYM_B1QE10tickBlocksB1AE10LevelChunkB2AAE20QEAAXAEAVBlockSourceB3AAAA1Z = 0x00A2D760;
+	// [ԭ��] public: void __cdecl LevelChunk::tick(class BlockSource & __ptr64,struct Tick const & __ptr64) __ptr64
+	// [����] ?tick@LevelChunk@@QEAAXAEAVBlockSource@@AEBUTick@@@Z
+	constexpr RVA MSSYM_B1QA4tickB1AE10LevelChunkB2AAE20QEAAXAEAVBlockSourceB2AAA8AEBUTickB3AAAA1Z = 0x00A2C880;
 
-    // [ԭ��] public: void __cdecl LevelChunk::tickBlockEntities(class BlockSource & __ptr64) __ptr64
-    // [����] ?tickBlockEntities@LevelChunk@@QEAAXAEAVBlockSource@@@Z
-    constexpr RVA MSSYM_B1QE17tickBlockEntitiesB1AE10LevelChunkB2AAE20QEAAXAEAVBlockSourceB3AAAA1Z = 0x00A327B0;
+	// [ԭ��] public: void __cdecl LevelChunk::tickBlocks(class BlockSource & __ptr64) __ptr64
+	// [����] ?tickBlocks@LevelChunk@@QEAAXAEAVBlockSource@@@Z
+	constexpr RVA MSSYM_B1QE10tickBlocksB1AE10LevelChunkB2AAE20QEAAXAEAVBlockSourceB3AAAA1Z = 0x00A2D760;
 
-    // [ԭ��] public: void __cdecl Spawner::tick(class BlockSource & __ptr64,class LevelChunk const & __ptr64) __ptr64
-    // [����] ?tick@Spawner@@QEAAXAEAVBlockSource@@AEBVLevelChunk@@@Z
-    constexpr RVA MSSYM_B1QA4tickB1AA7SpawnerB2AAE20QEAAXAEAVBlockSourceB2AAE14AEBVLevelChunkB3AAAA1Z = 0x00B38310;
+	// [ԭ��] public: void __cdecl LevelChunk::tickBlockEntities(class BlockSource & __ptr64) __ptr64
+	// [����] ?tickBlockEntities@LevelChunk@@QEAAXAEAVBlockSource@@@Z
+	constexpr RVA MSSYM_B1QE17tickBlockEntitiesB1AE10LevelChunkB2AAE20QEAAXAEAVBlockSourceB3AAAA1Z = 0x00A327B0;
 
-    // [ԭ��] public: bool __cdecl BlockTickingQueue::tickPendingTicks(class BlockSource & __ptr64,struct Tick const & __ptr64,int,bool) __ptr64
-    // [����] ?tickPendingTicks@BlockTickingQueue@@QEAA_NAEAVBlockSource@@AEBUTick@@H_N@Z
-    constexpr RVA MSSYM_B1QE16tickPendingTicksB1AE17BlockTickingQueueB2AAA4QEAAB1UE16NAEAVBlockSourceB2AAA8AEBUTickB2AAA1HB1UA1NB1AA1Z = 0x00A1C5E0;
-
-    // [ԭ��] public: virtual void __cdecl Dimension::tickRedstone(void) __ptr64
-    // [����] ?tickRedstone@Dimension@@UEAAXXZ
-    constexpr RVA MSSYM_B1QE12tickRedstoneB1AA9DimensionB2AAA7UEAAXXZ = 0x00A5EEB0;
-
-    // [ԭ��] public: virtual void __cdecl Actor::getDebugText(class std::vector<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> >,class std::allocator<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > > > & __ptr64) __ptr64
-    // [����] ?getDebugText@Actor@@UEAAXAEAV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@std@@@Z
-    constexpr RVA MSSYM_MD5_f04fad6bac034f1e861181d3580320f2 = 0x00566170;
-
-    // [ԭ��] public: virtual class Vec3 const & __ptr64 __cdecl Actor::getPos(void)const __ptr64
-    // [����] ?getPos@Actor@@UEBAAEBVVec3@@XZ
-    constexpr RVA MSSYM_B1QA6getPosB1AA5ActorB2AAE12UEBAAEBVVec3B2AAA2XZ = 0x00551080;
-
-    // [ԭ��] public: virtual bool __cdecl Actor::attack(class Actor & __ptr64) __ptr64
-    // [����] ?attack@Actor@@UEAA_NAEAV1@@Z
-    constexpr RVA MSSYM_B1QA6attackB1AA5ActorB2AAA4UEAAB1UA6NAEAV1B2AAA1Z = 0x0054D230;
-
-    // [ԭ��] public: virtual bool __cdecl Player::attack(class Actor & __ptr64) __ptr64
-    // [����] ?attack@Player@@UEAA_NAEAVActor@@@Z
-    constexpr RVA MSSYM_B1QA6attackB1AA6PlayerB2AAA4UEAAB1UE10NAEAVActorB3AAAA1Z = 0x00718BD0;
-
-    // [ԭ��] public: void __cdecl Explosion::explode(void) __ptr64
-    // [����] ?explode@Explosion@@QEAAXXZ
-    constexpr RVA MSSYM_B1QA7explodeB1AA9ExplosionB2AAA7QEAAXXZ = 0x00A65710;
-
-    // [ԭ��] public: virtual void __cdecl Actor::setNameTag(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const & __ptr64) __ptr64
-    // [����] ?setNameTag@Actor@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z
-    constexpr RVA MSSYM_B1QE10setNameTagB1AA5ActorB2AAA9UEAAXAEBVB2QDA5basicB1UA6stringB1AA2DUB2QDA4charB1UA6traitsB1AA1DB1AA3stdB2AAA1VB2QDA9allocatorB1AA1DB1AA12B2AAA3stdB3AAAA1Z = 0x0055F3A0;
-
-    // [ԭ��] public: virtual void __cdecl Mob::buildDebugInfo(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > & __ptr64)const __ptr64
-    // [����] ?buildDebugInfo@Mob@@UEBAXAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z
-    constexpr RVA MSSYM_B1QE14buildDebugInfoB1AA3MobB2AAA9UEBAXAEAVB2QDA5basicB1UA6stringB1AA2DUB2QDA4charB1UA6traitsB1AA1DB1AA3stdB2AAA1VB2QDA9allocatorB1AA1DB1AA12B2AAA3stdB3AAAA1Z = 0x006F1660;
-
-    // [ԭ��] private: virtual bool __cdecl DyePowderItem::_useOn(class ItemStack & __ptr64,class Actor & __ptr64,class BlockPos,unsigned char,float,float,float)const __ptr64
-    // [����] ?_useOn@DyePowderItem@@EEBA_NAEAVItemStack@@AEAVActor@@VBlockPos@@EMMM@Z
-    constexpr RVA MSSYM_B2QUA5useOnB1AE13DyePowderItemB2AAA4EEBAB1UE14NAEAVItemStackB2AAA9AEAVActorB2AAA9VBlockPosB2AAA4EMMMB1AA1Z = 0x007D1EB0;
-
-    // [ԭ��] private: virtual bool __cdecl RedStoneDustItem::_useOn(class ItemStack & __ptr64,class Actor & __ptr64,class BlockPos,unsigned char,float,float,float)const __ptr64
-    // [����] ?_useOn@RedStoneDustItem@@EEBA_NAEAVItemStack@@AEAVActor@@VBlockPos@@EMMM@Z
-    constexpr RVA MSSYM_B2QUA5useOnB1AE16RedStoneDustItemB2AAA4EEBAB1UE14NAEAVItemStackB2AAA9AEAVActorB2AAA9VBlockPosB2AAA4EMMMB1AA1Z = 0x00805FC0;
-
-    // [ԭ��] public: class Block const & __ptr64 __cdecl BlockSource::getBlock(class BlockPos const & __ptr64)const __ptr64
-    // [����] ?getBlock@BlockSource@@QEBAAEBVBlock@@AEBVBlockPos@@@Z
-    constexpr RVA MSSYM_B1QA8getBlockB1AE11BlockSourceB2AAE13QEBAAEBVBlockB2AAE12AEBVBlockPosB3AAAA1Z = 0x00A12520;
-
-    // [ԭ��] public: class Block const & __ptr64 __cdecl BlockSource::getBlock(int,int,int)const __ptr64
-    // [����] ?getBlock@BlockSource@@QEBAAEBVBlock@@HHH@Z
-    constexpr RVA MSSYM_B1QA8getBlockB1AE11BlockSourceB2AAE13QEBAAEBVBlockB2AAA3HHHB1AA1Z = 0x00A19830;
-
-    // [ԭ��] public: class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > __cdecl Block::toDebugString(void)const __ptr64
-    // [����] ?toDebugString@Block@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ
-    constexpr RVA MSSYM_B1QE13toDebugStringB1AA5BlockB2AAA4QEBAB1QA2AVB2QDA5basicB1UA6stringB1AA2DUB2QDA4charB1UA6traitsB1AA1DB1AA3stdB2AAA1VB2QDA9allocatorB1AA1DB1AA12B2AAA3stdB2AAA2XZ = 0x008D39D0;
-
-    // [ԭ��] public: bool __cdecl BlockSource::setBlock(int,int,int,class Block const & __ptr64,int) __ptr64
-    // [����] ?setBlock@BlockSource@@QEAA_NHHHAEBVBlock@@H@Z
-    constexpr RVA MSSYM_B1QA8setBlockB1AE11BlockSourceB2AAA4QEAAB1UE13NHHHAEBVBlockB2AAA1HB1AA1Z = 0x00A125A0;
+	// [ԭ��] public: void __cdecl Spawner::tick(class BlockSource & __ptr64,class LevelChunk const & __ptr64) __ptr64
+	// [����] ?tick@Spawner@@QEAAXAEAVBlockSource@@AEBVLevelChunk@@@Z
+	constexpr RVA MSSYM_B1QA4tickB1AA7SpawnerB2AAE20QEAAXAEAVBlockSourceB2AAE14AEBVLevelChunkB3AAAA1Z = 0x00B38310;
 
-    // [ԭ��] public: bool __cdecl BlockSource::setBlock(class BlockPos const & __ptr64,class Block const & __ptr64,int,struct ActorBlockSyncMessage const * __ptr64) __ptr64
-    // [����] ?setBlock@BlockSource@@QEAA_NAEBVBlockPos@@AEBVBlock@@HPEBUActorBlockSyncMessage@@@Z
-    constexpr RVA MSSYM_B1QA8setBlockB1AE11BlockSourceB2AAA4QEAAB1UE13NAEBVBlockPosB2AAA9AEBVBlockB2AAE26HPEBUActorBlockSyncMessageB3AAAA1Z = 0x00A125F0;
+	// [ԭ��] public: bool __cdecl BlockTickingQueue::tickPendingTicks(class BlockSource & __ptr64,struct Tick const & __ptr64,int,bool) __ptr64
+	// [����] ?tickPendingTicks@BlockTickingQueue@@QEAA_NAEAVBlockSource@@AEBUTick@@H_N@Z
+	constexpr RVA MSSYM_B1QE16tickPendingTicksB1AE17BlockTickingQueueB2AAA4QEAAB1UE16NAEAVBlockSourceB2AAA8AEBUTickB2AAA1HB1UA1NB1AA1Z = 0x00A1C5E0;
 
-    // [ԭ��] private: virtual bool __cdecl ShovelItem::_useOn(class ItemStack & __ptr64,class Actor & __ptr64,class BlockPos,unsigned char,float,float,float)const __ptr64
-    // [����] ?_useOn@ShovelItem@@EEBA_NAEAVItemStack@@AEAVActor@@VBlockPos@@EMMM@Z
-    constexpr RVA MSSYM_B2QUA5useOnB1AE10ShovelItemB2AAA4EEBAB1UE14NAEAVItemStackB2AAA9AEAVActorB2AAA9VBlockPosB2AAA4EMMMB1AA1Z = 0x00809710;
+	// [ԭ��] public: virtual void __cdecl Dimension::tickRedstone(void) __ptr64
+	// [����] ?tickRedstone@Dimension@@UEAAXXZ
+	constexpr RVA MSSYM_B1QE12tickRedstoneB1AA9DimensionB2AAA7UEAAXXZ = 0x00A5EEB0;
 
-    // [ԭ��] public: virtual void __cdecl SpongeBlock::onPlace(class BlockSource & __ptr64,class BlockPos const & __ptr64)const __ptr64
-    // [����] ?onPlace@SpongeBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z
-    constexpr RVA MSSYM_B1QA7onPlaceB1AE11SpongeBlockB2AAE20UEBAXAEAVBlockSourceB2AAE12AEBVBlockPosB3AAAA1Z = 0x009C9F10;
+	// [ԭ��] public: virtual void __cdecl Actor::getDebugText(class std::vector<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> >,class std::allocator<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > > > & __ptr64) __ptr64
+	// [����] ?getDebugText@Actor@@UEAAXAEAV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@std@@@Z
+	constexpr RVA MSSYM_MD5_f04fad6bac034f1e861181d3580320f2 = 0x00566170;
 
-    // [ԭ��] public: void __cdecl Village::tick(struct Tick,class BlockSource & __ptr64) __ptr64
-    // [����] ?tick@Village@@QEAAXUTick@@AEAVBlockSource@@@Z
-    constexpr RVA MSSYM_B1QA4tickB1AA7VillageB2AAE10QEAAXUTickB2AAE15AEAVBlockSourceB3AAAA1Z = 0x00641170;
+	// [ԭ��] public: virtual class Vec3 const & __ptr64 __cdecl Actor::getPos(void)const __ptr64
+	// [����] ?getPos@Actor@@UEBAAEBVVec3@@XZ
+	constexpr RVA MSSYM_B1QA6getPosB1AA5ActorB2AAE12UEBAAEBVVec3B2AAA2XZ = 0x00551080;
 
-    // [ԭ��] public: float __cdecl Village::getApproximateRadius(void)const __ptr64
-    // [����] ?getApproximateRadius@Village@@QEBAMXZ
-    constexpr RVA MSSYM_B1QE20getApproximateRadiusB1AA7VillageB2AAA7QEBAMXZ = 0x00641E70;
+	// [ԭ��] public: virtual bool __cdecl Actor::attack(class Actor & __ptr64) __ptr64
+	// [����] ?attack@Actor@@UEAA_NAEAV1@@Z
+	constexpr RVA MSSYM_B1QA6attackB1AA5ActorB2AAA4UEAAB1UA6NAEAV1B2AAA1Z = 0x0054D230;
 
-    // [ԭ��] public: virtual void __cdecl VillagerV2::buildDebugInfo(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > & __ptr64)const __ptr64
-    // [����] ?buildDebugInfo@VillagerV2@@UEBAXAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z
-    constexpr RVA MSSYM_B1QE14buildDebugInfoB1AE10VillagerV2B2AAA9UEBAXAEAVB2QDA5basicB1UA6stringB1AA2DUB2QDA4charB1UA6traitsB1AA1DB1AA3stdB2AAA1VB2QDA9allocatorB1AA1DB1AA12B2AAA3stdB3AAAA1Z = 0x00707190;
+	// [ԭ��] public: virtual bool __cdecl Player::attack(class Actor & __ptr64) __ptr64
+	// [����] ?attack@Player@@UEAA_NAEAVActor@@@Z
+	constexpr RVA MSSYM_B1QA6attackB1AA6PlayerB2AAA4UEAAB1UE10NAEAVActorB3AAAA1Z = 0x00718BD0;
 
-    // [ԭ��] public: static bool __cdecl Village::isVillagePOI(class BlockSource const & __ptr64,class BlockPos const & __ptr64)
-    // [����] ?isVillagePOI@Village@@SA_NAEBVBlockSource@@AEBVBlockPos@@@Z
-    constexpr RVA MSSYM_B1QE12isVillagePOIB1AA7VillageB2AAA2SAB1UE16NAEBVBlockSourceB2AAE12AEBVBlockPosB3AAAA1Z = 0x0064C580;
+	// [ԭ��] public: void __cdecl Explosion::explode(void) __ptr64
+	// [����] ?explode@Explosion@@QEAAXXZ
+	constexpr RVA MSSYM_B1QA7explodeB1AA9ExplosionB2AAA7QEAAXXZ = 0x00A65710;
 
-    // [ԭ��] public: void __cdecl VillageManager::tick(struct Tick const & __ptr64) __ptr64
-    // [����] ?tick@VillageManager@@QEAAXAEBUTick@@@Z
-    constexpr RVA MSSYM_B1QA4tickB1AE14VillageManagerB2AAE13QEAAXAEBUTickB3AAAA1Z = 0x0064F6C0;
+	// [ԭ��] public: virtual void __cdecl Actor::setNameTag(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const & __ptr64) __ptr64
+	// [����] ?setNameTag@Actor@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z
+	constexpr RVA MSSYM_B1QE10setNameTagB1AA5ActorB2AAA9UEAAXAEBVB2QDA5basicB1UA6stringB1AA2DUB2QDA4charB1UA6traitsB1AA1DB1AA3stdB2AAA1VB2QDA9allocatorB1AA1DB1AA12B2AAA3stdB3AAAA1Z = 0x0055F3A0;
 
-    // [ԭ��] public: class std::weak_ptr<class POIInstance> __cdecl VillageManager::getPOI(class BlockPos const & __ptr64)const __ptr64
-    // [����] ?getPOI@VillageManager@@QEBA?AV?$weak_ptr@VPOIInstance@@@std@@AEBVBlockPos@@@Z
-    constexpr RVA MSSYM_B1QA6getPOIB1AE14VillageManagerB2AAA4QEBAB1QA2AVB2QDA4weakB1UA3ptrB1AE12VPOIInstanceB3AAAA3stdB2AAE12AEBVBlockPosB3AAAA1Z = 0x00652DD0;
+	// [ԭ��] public: virtual void __cdecl Mob::buildDebugInfo(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > & __ptr64)const __ptr64
+	// [����] ?buildDebugInfo@Mob@@UEBAXAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z
+	constexpr RVA MSSYM_B1QE14buildDebugInfoB1AA3MobB2AAA9UEBAXAEAVB2QDA5basicB1UA6stringB1AA2DUB2QDA4charB1UA6traitsB1AA1DB1AA3stdB2AAA1VB2QDA9allocatorB1AA1DB1AA12B2AAA3stdB3AAAA1Z = 0x006F1660;
 
-    // [ԭ��] public: unsigned __int64 __cdecl Village::getBedPOICount(void)const __ptr64
-    // [����] ?getBedPOICount@Village@@QEBA_KXZ
-    constexpr RVA MSSYM_B1QE14getBedPOICountB1AA7VillageB2AAA4QEBAB1UA3KXZ = 0x00641F10;
+	// [ԭ��] private: virtual bool __cdecl DyePowderItem::_useOn(class ItemStack & __ptr64,class Actor & __ptr64,class BlockPos,unsigned char,float,float,float)const __ptr64
+	// [����] ?_useOn@DyePowderItem@@EEBA_NAEAVItemStack@@AEAVActor@@VBlockPos@@EMMM@Z
+	constexpr RVA MSSYM_B2QUA5useOnB1AE13DyePowderItemB2AAA4EEBAB1UE14NAEAVItemStackB2AAA9AEAVActorB2AAA9VBlockPosB2AAA4EMMMB1AA1Z = 0x007D1EB0;
 
-    // [ԭ��] public: class Mob * __ptr64 __cdecl Spawner::spawnMob(class BlockSource & __ptr64,struct ActorDefinitionIdentifier const & __ptr64,class Actor * __ptr64,class Vec3 const & __ptr64,bool,bool,bool) __ptr64
-    // [����] ?spawnMob@Spawner@@QEAAPEAVMob@@AEAVBlockSource@@AEBUActorDefinitionIdentifier@@PEAVActor@@AEBVVec3@@_N44@Z
-    constexpr RVA MSSYM_B1QA8spawnMobB1AA7SpawnerB2AAE11QEAAPEAVMobB2AAE15AEAVBlockSourceB2AAE29AEBUActorDefinitionIdentifierB2AAA9PEAVActorB2AAA8AEBVVec3B3AAUA3N44B1AA1Z = 0x00B35930;
+	// [ԭ��] private: virtual bool __cdecl RedStoneDustItem::_useOn(class ItemStack & __ptr64,class Actor & __ptr64,class BlockPos,unsigned char,float,float,float)const __ptr64
+	// [����] ?_useOn@RedStoneDustItem@@EEBA_NAEAVItemStack@@AEAVActor@@VBlockPos@@EMMM@Z
+	constexpr RVA MSSYM_B2QUA5useOnB1AE16RedStoneDustItemB2AAA4EEBAB1UE14NAEAVItemStackB2AAA9AEAVActorB2AAA9VBlockPosB2AAA4EMMMB1AA1Z = 0x00805FC0;
+
+	// [ԭ��] public: class Block const & __ptr64 __cdecl BlockSource::getBlock(class BlockPos const & __ptr64)const __ptr64
+	// [����] ?getBlock@BlockSource@@QEBAAEBVBlock@@AEBVBlockPos@@@Z
+	constexpr RVA MSSYM_B1QA8getBlockB1AE11BlockSourceB2AAE13QEBAAEBVBlockB2AAE12AEBVBlockPosB3AAAA1Z = 0x00A12520;
+
+	// [ԭ��] public: class Block const & __ptr64 __cdecl BlockSource::getBlock(int,int,int)const __ptr64
+	// [����] ?getBlock@BlockSource@@QEBAAEBVBlock@@HHH@Z
+	constexpr RVA MSSYM_B1QA8getBlockB1AE11BlockSourceB2AAE13QEBAAEBVBlockB2AAA3HHHB1AA1Z = 0x00A19830;
+
+	// [ԭ��] public: class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > __cdecl Block::toDebugString(void)const __ptr64
+	// [����] ?toDebugString@Block@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ
+	constexpr RVA MSSYM_B1QE13toDebugStringB1AA5BlockB2AAA4QEBAB1QA2AVB2QDA5basicB1UA6stringB1AA2DUB2QDA4charB1UA6traitsB1AA1DB1AA3stdB2AAA1VB2QDA9allocatorB1AA1DB1AA12B2AAA3stdB2AAA2XZ = 0x008D39D0;
+
+	// [ԭ��] public: bool __cdecl BlockSource::setBlock(int,int,int,class Block const & __ptr64,int) __ptr64
+	// [����] ?setBlock@BlockSource@@QEAA_NHHHAEBVBlock@@H@Z
+	constexpr RVA MSSYM_B1QA8setBlockB1AE11BlockSourceB2AAA4QEAAB1UE13NHHHAEBVBlockB2AAA1HB1AA1Z = 0x00A125A0;
+
+	// [ԭ��] public: bool __cdecl BlockSource::setBlock(class BlockPos const & __ptr64,class Block const & __ptr64,int,struct ActorBlockSyncMessage const * __ptr64) __ptr64
+	// [����] ?setBlock@BlockSource@@QEAA_NAEBVBlockPos@@AEBVBlock@@HPEBUActorBlockSyncMessage@@@Z
+	constexpr RVA MSSYM_B1QA8setBlockB1AE11BlockSourceB2AAA4QEAAB1UE13NAEBVBlockPosB2AAA9AEBVBlockB2AAE26HPEBUActorBlockSyncMessageB3AAAA1Z = 0x00A125F0;
+
+	// [ԭ��] private: virtual bool __cdecl ShovelItem::_useOn(class ItemStack & __ptr64,class Actor & __ptr64,class BlockPos,unsigned char,float,float,float)const __ptr64
+	// [����] ?_useOn@ShovelItem@@EEBA_NAEAVItemStack@@AEAVActor@@VBlockPos@@EMMM@Z
+	constexpr RVA MSSYM_B2QUA5useOnB1AE10ShovelItemB2AAA4EEBAB1UE14NAEAVItemStackB2AAA9AEAVActorB2AAA9VBlockPosB2AAA4EMMMB1AA1Z = 0x00809710;
+
+	// [ԭ��] public: virtual void __cdecl SpongeBlock::onPlace(class BlockSource & __ptr64,class BlockPos const & __ptr64)const __ptr64
+	// [����] ?onPlace@SpongeBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z
+	constexpr RVA MSSYM_B1QA7onPlaceB1AE11SpongeBlockB2AAE20UEBAXAEAVBlockSourceB2AAE12AEBVBlockPosB3AAAA1Z = 0x009C9F10;
+
+	// [ԭ��] public: void __cdecl BlockSource::updateNeighborsAt(class BlockPos const & __ptr64) __ptr64
+	// [����] ?updateNeighborsAt@BlockSource@@QEAAXAEBVBlockPos@@@Z
+	constexpr RVA MSSYM_B1QE17updateNeighborsAtB1AE11BlockSourceB2AAE17QEAAXAEBVBlockPosB3AAAA1Z = 0x00A137D0;
+
+	// [ԭ��] public: void __cdecl Village::tick(struct Tick,class BlockSource & __ptr64) __ptr64
+	// [����] ?tick@Village@@QEAAXUTick@@AEAVBlockSource@@@Z
+	constexpr RVA MSSYM_B1QA4tickB1AA7VillageB2AAE10QEAAXUTickB2AAE15AEAVBlockSourceB3AAAA1Z = 0x00641170;
+
+	// [ԭ��] public: float __cdecl Village::getApproximateRadius(void)const __ptr64
+	// [����] ?getApproximateRadius@Village@@QEBAMXZ
+	constexpr RVA MSSYM_B1QE20getApproximateRadiusB1AA7VillageB2AAA7QEBAMXZ = 0x00641E70;
+
+	// [ԭ��] public: virtual void __cdecl VillagerV2::buildDebugInfo(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > & __ptr64)const __ptr64
+	// [����] ?buildDebugInfo@VillagerV2@@UEBAXAEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z
+	constexpr RVA MSSYM_B1QE14buildDebugInfoB1AE10VillagerV2B2AAA9UEBAXAEAVB2QDA5basicB1UA6stringB1AA2DUB2QDA4charB1UA6traitsB1AA1DB1AA3stdB2AAA1VB2QDA9allocatorB1AA1DB1AA12B2AAA3stdB3AAAA1Z = 0x00707190;
+
+	// [ԭ��] public: static bool __cdecl Village::isVillagePOI(class BlockSource const & __ptr64,class BlockPos const & __ptr64)
+	// [����] ?isVillagePOI@Village@@SA_NAEBVBlockSource@@AEBVBlockPos@@@Z
+	constexpr RVA MSSYM_B1QE12isVillagePOIB1AA7VillageB2AAA2SAB1UE16NAEBVBlockSourceB2AAE12AEBVBlockPosB3AAAA1Z = 0x0064C580;
+
+	// [ԭ��] public: void __cdecl VillageManager::tick(struct Tick const & __ptr64) __ptr64
+	// [����] ?tick@VillageManager@@QEAAXAEBUTick@@@Z
+	constexpr RVA MSSYM_B1QA4tickB1AE14VillageManagerB2AAE13QEAAXAEBUTickB3AAAA1Z = 0x0064F6C0;
+
+	// [ԭ��] public: class std::weak_ptr<class POIInstance> __cdecl VillageManager::getPOI(class BlockPos const & __ptr64)const __ptr64
+	// [����] ?getPOI@VillageManager@@QEBA?AV?$weak_ptr@VPOIInstance@@@std@@AEBVBlockPos@@@Z
+	constexpr RVA MSSYM_B1QA6getPOIB1AE14VillageManagerB2AAA4QEBAB1QA2AVB2QDA4weakB1UA3ptrB1AE12VPOIInstanceB3AAAA3stdB2AAE12AEBVBlockPosB3AAAA1Z = 0x00652DD0;
+
+	// [ԭ��] public: unsigned __int64 __cdecl Village::getBedPOICount(void)const __ptr64
+	// [����] ?getBedPOICount@Village@@QEBA_KXZ
+	constexpr RVA MSSYM_B1QE14getBedPOICountB1AA7VillageB2AAA4QEBAB1UA3KXZ = 0x00641F10;
+
+	// [ԭ��] public: class Mob * __ptr64 __cdecl Spawner::spawnMob(class BlockSource & __ptr64,struct ActorDefinitionIdentifier const & __ptr64,class Actor * __ptr64,class Vec3 const & __ptr64,bool,bool,bool) __ptr64
+	// [����] ?spawnMob@Spawner@@QEAAPEAVMob@@AEAVBlockSource@@AEBUActorDefinitionIdentifier@@PEAVActor@@AEBVVec3@@_N44@Z
+	constexpr RVA MSSYM_B1QA8spawnMobB1AA7SpawnerB2AAE11QEAAPEAVMobB2AAE15AEAVBlockSourceB2AAE29AEBUActorDefinitionIdentifierB2AAA9PEAVActorB2AAA8AEBVVec3B3AAUA3N44B1AA1Z = 0x00B35930;
+
+	// [ԭ��] public: static bool __cdecl Command::validRange(int,int,int,class CommandOutput & __ptr64)
+	// [����] ?validRange@Command@@SA_NHHHAEAVCommandOutput@@@Z
+	constexpr RVA MSSYM_B1QE10validRangeB1AA7CommandB2AAA2SAB1UE21NHHHAEAVCommandOutputB3AAAA1Z = 0x00416750;
 
 }
 
diff --git a/lib/framework.h b/lib/framework.h
index 98e549c..cec3624 100644
--- a/lib/framework.h
+++ b/lib/framework.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #define WIN32_LEAN_AND_MEAN             // 从 Windows 头文件中排除极少使用的内容
 // Windows 头文件
diff --git a/lib/mod.cpp b/lib/mod.cpp
index ea5767b..d661101 100644
--- a/lib/mod.cpp
+++ b/lib/mod.cpp
@@ -1,34 +1,5 @@
-#include "pch.h"
-#include "mod.h"
-#include "SymHook.h"
-#include<cctype>
-#include <string>
-#include<ctime>
-#include<map>
-#include <sstream>
-#include<vector>
+#include <cstdio>
 
-using namespace SymHook;
-/**——————————————————————————————————————**
- |              MOD C++文件               |
- **——————————————————————————————————————**
-说明：
-该cpp文件的目的是包含MOD功能主要代码，请将主要部分代码写在这个文件内！
-“T”开头的系列Hook宏在模块加载的时候调用，使用方法请参考MCMrARM的modloader。
-地址：https://github.com/minecraft-linux/server-modloader/wiki
-请注意：使用方法略有不同，本文件的函数符号用的是PDB工具生成的C++变量，而不是字符串字面量！
-另外，该文件包含两个函数mod_init和mod_exit，分别在该模块加载或退出时调用。
-本模块例子：
-THook(void,							// 函数返回类型
-	MSSYM_XXXXXXXXXXXXXXXXXXXXX,	// 函数符号名对应的C++变量（位于SymHook.h）
-	__int64 a1, __int64 a2) {		// 函数参数类型列表（假设存在参数a1与a2）
-	std::cout << "Hello world!" << std::endl;
-	original(a1, a2);				// 调用该函数Hook前的原始函数
-}
-*/
-
-// 此处开始编写MOD代码
-// 下面两个函数不是必要的，你可以使用，也可以不使用。
 void mod_init() {
     const char *banner = "\n"
                          "  _______                  _                   \n"
@@ -39,10 +10,9 @@ void mod_init() {
                          "    |_|_|  \\__,_| .__/ \\__,_|\\___/ \\___/|_|    \n"
                          "                | |                            \n"
                          "                |_|                            ";
-    printf("%s\nTrapdoor V0.1.4\ngithub:https://github.com/hhhxiao/MCBEtoolSet\nLicense: MIT\n", banner);
-    // 此处填写模块加载时候的操作
+    printf("%s\nTrapdoor V0.1.6-debug\ngithub:https://github.com/hhhxiao/MCBEtoolSet\nLicense: GPL\n", banner);
+    printf("build time: %s  %s\n", __DATE__, __TIME__);
 }
 
 void mod_exit() {
-    // 此处填写模块卸载时候的操作
 }
diff --git a/lib/mod.h b/lib/mod.h
index d5e6860..bdfe9b3 100644
--- a/lib/mod.h
+++ b/lib/mod.h
@@ -1,9 +1,7 @@
 #pragma once
-#include "lib/detours.h"
-#include "lib/detver.h"
+#include "pch.h"
 using VA = unsigned __int64;
 using RVA = unsigned long int;
-
 template<typename T>
 auto Hook(T* p, T f) {
 	int error = DetourTransactionBegin();
diff --git a/lib/pch.cpp b/lib/pch.cpp
index 07cf0e8..f3de53c 100644
--- a/lib/pch.cpp
+++ b/lib/pch.cpp
@@ -1,3 +1,2 @@
-#include "lib/pch.h"
-
+#include "pch.h"
 #pragma comment(lib, "detours.lib")
diff --git a/lib/pch.h b/lib/pch.h
index 875d51f..6ff0db5 100644
--- a/lib/pch.h
+++ b/lib/pch.h
@@ -5,7 +5,11 @@
 #include <Windows.h>
 #include <iostream>
 
-#include "detours.h"
-#include "detver.h"
+#include "./detours.h"
+#include "./detver.h"
 
-#endif //PCH_H
+#include "SymHook.h"
+#include "common/AABB.h"
+#include "common/Vec3.h"
+
+#endif //PCH_H
\ No newline at end of file
diff --git a/spawn/Spawn.cpp b/spawn/Spawn.cpp
new file mode 100644
index 0000000..70821f9
--- /dev/null
+++ b/spawn/Spawn.cpp
@@ -0,0 +1,15 @@
+//
+// Created by xhy on 2020/8/25.
+//
+
+#include "Spawn.h"
+
+bool isSlimeChunk(INT32 x, INT32 z) {
+    //todo:  slime generate algorithm
+    return false;
+}
+
+int getMobCount(void *sp) {
+    if (!sp)return -1;
+    return *(reinterpret_cast<UINT32 *>(sp) + 48);
+}
diff --git a/spawn/Spawn.h b/spawn/Spawn.h
index 9ff0b1d..6166955 100644
--- a/spawn/Spawn.h
+++ b/spawn/Spawn.h
@@ -1,20 +1,11 @@
 #pragma once
 
 #include "common/Common.h"
-#include "lib/pch.h"
 #include "lib/mod.h"
-#include "commands/Shell.h"
 #include <random>
-
 using namespace SymHook;
 
 
-bool isSlimeChunk(INT32 x, INT32 z) {
-    //todo:  slime generate algorithm
-    return false;
-}
+bool isSlimeChunk(INT32 x, INT32 z);
 
-int getMobCount(void *sp) {
-    if (!sp)return -1;
-    return *(reinterpret_cast<UINT32 *>(sp) + 48);
-}
+int getMobCount(void *sp);
diff --git a/symbol.txt b/symbol.txt
index 7efef35..d9b4518 100644
--- a/symbol.txt
+++ b/symbol.txt
@@ -97,7 +97,8 @@ Player::tickWorld
 ?_useOn@ShovelItem@@EEBA_NAEAVItemStack@@AEAVActor@@VBlockPos@@EMMM@Z
 #放置海绵方块
 ?onPlace@SpongeBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z
-
+#阻止NC更新
+?updateNeighborsAt@BlockSource@@QEAAXAEBVBlockPos@@@Z
 
 ########################################村庄#######################################
 
@@ -121,6 +122,9 @@ Player::tickWorld
 #生成怪物
 ?spawnMob@Spawner@@QEAAPEAVMob@@AEAVBlockSource@@AEBUActorDefinitionIdentifier@@PEAVActor@@AEBVVec3@@_N44@Z
 
+####################指令#############################
+##指令范围判定
+?validRange@Command@@SA_NHHHAEAVCommandOutput@@@Z
 
 
 
diff --git a/tick/Tick.cpp b/tick/Tick.cpp
new file mode 100644
index 0000000..e8f00af
--- /dev/null
+++ b/tick/Tick.cpp
@@ -0,0 +1,326 @@
+//
+// Created by xhy on 2020/8/25.
+//
+
+#include "Tick.h"
+
+using namespace SymHook;
+
+namespace tick {
+    //profile
+    const int TOTAL_PROFILE_ROUND = 100;
+    bool isProfiling = false;
+    int currentProfileRound = 0;
+
+    long long redstoneUpdateTime = 0;
+    long long playerTickTime = 0;
+    long long levelTickTime = 0;
+    long long dimTickTime = 0;
+    long long chunkTickTime = 0;
+    long long randTickTime = 0;
+    long long blockEntityTickTime = 0;
+    long long spawnerTickTime = 0;
+
+    //slow
+    int SlowDownTimes = 1;  //slow down time
+    int slowDownCounter = 0; //slow down counter
+    int forwardTickNum = 0; //forward tick num
+    TickStatus tickStatus = TickStatus::Normal;
+
+    void extraTickTask() {
+        //here are the tasks;
+        //task in normal status(heavy work)
+        if (tickStatus == TickStatus::Normal) {
+            village::villageTask();
+        }
+        //task in any status (light work)
+        if (mobSpawnCounterStart)++mobTickCounter;
+    }
+
+    void freezeWorld() {
+        dbg("freeze world");
+        if (tickStatus == TickStatus::Normal) {
+            tickStatus = TickStatus::Frozen;
+            forwardTickNum = 0;
+            info("the world has been frozen\n");
+        } else {
+            warning("this command must be run in normal status\n");
+        }
+    }
+
+    void resetWorld() {
+        if (forwardTickNum > 0) {
+            warning("forwarding, try later\n");
+        } else {
+            tickStatus = TickStatus::Normal;
+            SlowDownTimes = 0;
+            warning("reset tick status\n");
+        }
+    }
+
+    void forwardWorld(int tickNum) {
+        if (tickStatus == TickStatus::Frozen) {
+            forwardTickNum = tickNum;
+            tickStatus = TickStatus::Forward;
+        } else {
+            error("this command must be run at frozen status\n");
+        }
+    }
+
+    void profileWorld() {
+        info("start profiling...");
+        isProfiling = true;
+        currentProfileRound = TOTAL_PROFILE_ROUND;
+    }
+
+    void resetProfileCounter() {
+        redstoneUpdateTime = 0;
+        levelTickTime = 0;
+        dimTickTime = 0;
+        playerTickTime = 0;
+        chunkTickTime = 0;
+        randTickTime = 0;
+        blockEntityTickTime = 0;
+        spawnerTickTime = 0;
+    }
+
+    void calProfile() {
+        gamePrintf("mpst:            §2%.3f\n" \
+               "§rredstone:             §2%.3f\n" \
+               "§rlevel:                §2%.3f\n" \
+               "§rchunk & village:      §2%.3f\n" \
+               "§rplayer:               §2%.3f\n" \
+               "§rchunk tick:           §2%.3f\n" \
+               "§random tick & env:     §2%.3f\n" \
+               "§rblockEntities:   §2%.3f\n" \
+               "§r(de)spawn:       §2%.3f",
+                   (double) redstoneUpdateTime / 90000 + (double) levelTickTime / 100000,
+                   (double) redstoneUpdateTime / 90000,
+                   (double) levelTickTime / 100000,
+                   (double) dimTickTime / 100000,
+                   (double) playerTickTime / 100000,
+                   (double) chunkTickTime / 100000,
+                   (double) randTickTime / 100000,
+                   (double) blockEntityTickTime / 100000,
+                   (double) spawnerTickTime / 100000
+        );
+        resetProfileCounter();
+    }
+
+    void slowWorld(int times) {
+        if (tickStatus == TickStatus::Normal) {
+            gamePrintf("world has slowed\n");
+            tickStatus = TickStatus::Slow;
+            SlowDownTimes = times;
+        } else {
+            gamePrintf("this command must be run at normal status\n");
+        }
+    }
+}
+
+//Level::tick function, the top tick function(except redstone update)
+THook(void,
+      MSSYM_B1QA4tickB1AA5LevelB2AAA7UEAAXXZ,
+      void *l) {
+    if (!globalLevel) { globalLevel = l; }
+    //normal task
+    if (tick::tickStatus == TickStatus::Normal) {
+        if (tick::isProfiling) {
+            TIMER_START
+            original(l);
+            tick::extraTickTask();
+            TIMER_END
+            tick::levelTickTime += timeReslut;
+            tick::currentProfileRound--;
+            if (tick::currentProfileRound == 0) {
+                tick::isProfiling = false;
+                tick::calProfile();
+            }
+        } else {
+            original(l);
+            tick::extraTickTask();
+        }
+        //forward ticks
+    } else if (tick::tickStatus == TickStatus::Forward) {
+        gamePrintf("forward start ,please wait\n");
+        for (int i = 0; i < tick::forwardTickNum; i++) {
+            //先调用level::tick
+            original(l);
+            tick::extraTickTask();
+
+            //call Dimension::tickRedstone;
+            SYM_CALL(
+                    void(*)(void * ),
+                    MSSYM_B1QE12tickRedstoneB1AA9DimensionB2AAA7UEAAXXZ,
+                    globalDimension
+            );
+        }
+        gamePrintf("end forward\n");
+        tick::forwardTickNum = 0;
+        tick::tickStatus = TickStatus::Frozen;
+    } else if (tick::tickStatus == TickStatus::Slow) {
+        if (tick::slowDownCounter % tick::SlowDownTimes == 0) {
+            original(l);
+            tick::extraTickTask();
+        }
+        tick::slowDownCounter = (tick::slowDownCounter + 1) % tick::SlowDownTimes;
+    }
+}
+
+//ServerPlayer::tickWorld
+THook(
+        void,
+        MSSYM_B1QA9tickWorldB1AE12ServerPlayerB2AAE13UEAAHAEBUTickB3AAAA1Z,
+        void *p,
+        void * tick
+) {
+    if (!globalPlayer) {
+        dbg("player init");
+        globalPlayer = p;
+    }
+    //如果是一般状态
+    if (tick::isProfiling) {
+        TIMER_START
+        original(p, tick);
+        TIMER_END
+        tick::playerTickTime += timeReslut;
+    } else {
+        original(p, tick);
+    }
+}
+
+//Dimension::tick
+THook(
+        void,
+        MSSYM_B1QA4tickB1AA9DimensionB2AAA7UEAAXXZ,
+        void * dim
+) {
+    if (!globalDimension)globalDimension = dim;
+    if (tick::isProfiling) {
+        TIMER_START
+        original(dim);
+        TIMER_END
+        tick::dimTickTime += timeReslut;
+    } else {
+        original(dim);
+    }
+
+}
+//LevelChunk::tick
+THook(
+        void,
+        MSSYM_B1QA4tickB1AE10LevelChunkB2AAE20QEAAXAEAVBlockSourceB2AAA8AEBUTickB3AAAA1Z,
+        void *levelChunk,
+        void *blockSource,
+        void * tick
+) {
+    if (!globalBlockSource)globalBlockSource = blockSource;
+    if (tick::isProfiling) {
+        TIMER_START
+        original(levelChunk, blockSource, tick);
+        TIMER_END
+        tick::chunkTickTime += timeReslut;
+    } else {
+        original(levelChunk, blockSource, tick);
+    }
+}
+
+//LevelChunk::tickBlocks
+THook(
+        void,
+        MSSYM_B1QE10tickBlocksB1AE10LevelChunkB2AAE20QEAAXAEAVBlockSourceB3AAAA1Z,
+        void *levelChunk,
+        void *blockSource,
+        INT64 a3,
+        int a4
+) {
+
+    if (tick::isProfiling) {
+        TIMER_START
+        original(levelChunk, blockSource, a3, a4);
+        TIMER_END
+        tick::randTickTime += timeReslut;
+    } else {
+        original(levelChunk, blockSource, a3, a4);
+    }
+
+}
+
+
+//LevelChunk::tickEntities
+THook(
+        void,
+        MSSYM_B1QE17tickBlockEntitiesB1AE10LevelChunkB2AAE20QEAAXAEAVBlockSourceB3AAAA1Z,
+        void *levelChunk,
+        void * blockSource
+) {
+
+    if (tick::isProfiling) {
+        TIMER_START
+        original(levelChunk, blockSource);
+        TIMER_END
+        tick::blockEntityTickTime += timeReslut;
+    } else {
+        original(levelChunk, blockSource);
+    }
+}
+
+//mob spawn Spawner::tick
+THook(
+        void,
+        MSSYM_B1QA4tickB1AA7SpawnerB2AAE20QEAAXAEAVBlockSourceB2AAE14AEBVLevelChunkB3AAAA1Z,
+        void *swr,
+        void *blockSource,
+        void * chunk
+) {
+    if (!globalSpawner)globalSpawner = swr;
+    if (tick::isProfiling) {
+        TIMER_START
+        original(swr, blockSource, chunk);
+        TIMER_END
+        tick::spawnerTickTime += timeReslut;
+    } else {
+        original(swr, blockSource, chunk);
+    }
+
+}
+
+//BlockTickingQueue::pendingTicks
+//the server will crash if hook this function
+//THook(
+//        void,
+//        MSSYM_B1QE16tickPendingTicksB1AE17BlockTickingQueueB2AAA4QEAAB1UE16NAEAVBlockSourceB2AAA8AEBUTickB2AAA1HB1UA1NB1AA1Z,
+//        void *queue,
+//        void *source,
+//        int flag,
+//        bool a1
+//) {
+//    original(queue, source, flag, a1);
+//
+//}
+
+//Dimension::tick
+THook(
+        void,
+        MSSYM_B1QE12tickRedstoneB1AA9DimensionB2AAA7UEAAXXZ,
+        void * dim
+) {
+    if (tick::tickStatus == TickStatus::Normal) {
+        if (tick::isProfiling) {
+            TIMER_START
+            original(dim);
+            TIMER_END
+            tick::redstoneUpdateTime += timeReslut;
+        } else {
+            original(dim);
+        }
+    }
+
+    if (tick::tickStatus == TickStatus::Forward) {
+        original(dim);
+    } else if (tick::tickStatus == TickStatus::Slow) {
+        if (tick::slowDownCounter % tick::SlowDownTimes == 0) {
+            original(dim);
+        }
+    }
+}
diff --git a/tick/Tick.h b/tick/Tick.h
index 361480c..3a19dc6 100644
--- a/tick/Tick.h
+++ b/tick/Tick.h
@@ -1,10 +1,8 @@
 #pragma once
 
 #include "common/Common.h"
-#include "lib/pch.h"
 #include "lib/mod.h"
 #include "lib/SymHook.h"
-#include "commands/Shell.h"
 #include "village/Village.h"
 #include <vector>
 #include <chrono>
@@ -22,116 +20,23 @@ enum class TickStatus {
     Forward
 };
 
-TickStatus tickStatus = TickStatus::Normal;
 
 namespace tick {
-    //profile
-    const int TOTAL_PROFILE_ROUND = 100;
-    bool isProfiling = false;
-    int currentProfileRound = 0;
 
-    long long redstoneUpdateTime = 0;
-    long long playerTickTime = 0;
-    long long levelTickTime = 0;
-    long long dimTickTime = 0;
-    long long chunkTickTime = 0;
-    long long randTickTime = 0;
-    long long blockEntityTickTime = 0;
-    long long spawnerTickTime = 0;
+    void extraTickTask();
 
-    //slow
-    int SlowDownTimes = 1;  //slow down time
-    int slowDownCounter = 0; //slow down counter
-    int forwardTickNum = 0; //forward tick num
+    void freezeWorld();
 
+    void resetWorld();
 
-    void extraTickTask() {
-        //here are the tasks;
-        //task in normal status(heavy work)
-        if (tickStatus == TickStatus::Normal) {
-           village::villageTask();
-        }
-        //task in any status (light work)
-        if (mobSpawnCounterStart)++mobTickCounter;
-    }
+    void slowWorld(int times);
 
-    void freezeWorld() {
-        if (tickStatus == TickStatus::Normal) {
-            tickStatus = TickStatus::Frozen;
-            forwardTickNum = 0;
-            gamePrintf("the world has been frozen\n");
-        } else {
-            gamePrintf("this command must be run in normal status\n");
-        }
-    }
+    void forwardWorld(int tickNum);
 
-    void resetWorld() {
-        if (forwardTickNum > 0) {
-            gamePrintf("forwarding, try later\n");
-        } else {
-            tickStatus = TickStatus::Normal;
-            SlowDownTimes = 0;
-            gamePrintf("reset tick status\n");
-        }
-    }
 
-    void slowWorld(int times) {
-        if (tickStatus == TickStatus::Normal) {
-            gamePrintf("world has slowed\n");
-            tickStatus = TickStatus::Slow;
-            SlowDownTimes = times;
-        } else {
-            gamePrintf("this command must be run at normal status\n");
-        }
-    }
+    void profileWorld();
 
-    void forwardWorld(int tickNum) {
-        if (tickStatus == TickStatus::Frozen) {
-            forwardTickNum = tickNum;
-            tickStatus = TickStatus::Forward;
-        } else {
-            error("this command must be run at frozen status\n");
-        }
-    }
+    void resetProfileCounter();
 
-
-    void profileWorld() {
-        info("start profiling...");
-        isProfiling = true;
-        currentProfileRound = TOTAL_PROFILE_ROUND;
-    }
-
-    void resetProfileCounter() {
-        redstoneUpdateTime = 0;
-        levelTickTime = 0;
-        dimTickTime = 0;
-        playerTickTime = 0;
-        chunkTickTime = 0;
-        randTickTime = 0;
-        blockEntityTickTime = 0;
-        spawnerTickTime = 0;
-    }
-
-    void calProfile() {
-        gamePrintf("mpst:            §2%.3f\n" \
-               "§rredstone:             §2%.3f\n" \
-               "§rlevel:                §2%.3f\n" \
-               "§rchunk & village:      §2%.3f\n" \
-               "§rplayer:               §2%.3f\n" \
-               "§rchunk tick:           §2%.3f\n" \
-               "§random tick & env:     §2%.3f\n" \
-               "§rblockEntities:   §2%.3f\n" \
-               "§r(de)spawn:       §2%.3f",
-                   (double) redstoneUpdateTime / 90000 + (double) levelTickTime / 100000,
-                   (double) redstoneUpdateTime / 90000,
-                   (double) levelTickTime / 100000,
-                   (double) dimTickTime / 100000,
-                   (double) playerTickTime / 100000,
-                   (double) chunkTickTime / 100000,
-                   (double) randTickTime / 100000,
-                   (double) blockEntityTickTime / 100000,
-                   (double) spawnerTickTime / 100000
-        );
-        resetProfileCounter();
-    }
+    void calProfile();
 }
diff --git a/tick/TickHook.h b/tick/TickHook.h
deleted file mode 100644
index 3d3accd..0000000
--- a/tick/TickHook.h
+++ /dev/null
@@ -1,224 +0,0 @@
-#pragma clang diagnostic push
-#pragma ide diagnostic ignored "cert-err58-cpp"
-//
-// Created by xhy on 2020/8/24.
-//
-
-#ifndef TRAPDOOR_TICKHOOK_H
-#define TRAPDOOR_TICKHOOK_H
-
-#include "lib/pch.h"
-#include "lib/mod.h"
-#include "lib/SymHook.h"
-#include "Tick.h"
-
-namespace SymHook {
-
-    //Level::tick function, the top tick function(except redstone update)
-    THook(void,
-          MSSYM_B1QA4tickB1AA5LevelB2AAA7UEAAXXZ,
-          void *l) {
-        if (!globalLevel) { globalLevel = l; }
-        //normal task
-        if (tickStatus == TickStatus::Normal) {
-            if (tick::isProfiling) {
-                TIMER_START
-                original(l);
-                tick::extraTickTask();
-                TIMER_END
-                tick::levelTickTime += timeReslut;
-                tick::currentProfileRound--;
-                if (tick::currentProfileRound == 0) {
-                    tick::isProfiling = false;
-                    tick::calProfile();
-                }
-            } else {
-                original(l);
-                tick::extraTickTask();
-            }
-            //forward ticks
-        } else if (tickStatus == TickStatus::Forward) {
-            gamePrintf("forward start ,please wait\n");
-            for (int i = 0; i < tick::forwardTickNum; i++) {
-                //先调用level::tick
-                original(l);
-                tick::extraTickTask();
-
-                //call Dimension::tickRedstone;
-                SYM_CALL(
-                        void(*)(void * ),
-                        MSSYM_B1QE12tickRedstoneB1AA9DimensionB2AAA7UEAAXXZ,
-                        globalDimension
-                );
-            }
-            gamePrintf("end forward\n");
-            tick::forwardTickNum = 0;
-            tickStatus = TickStatus::Frozen;
-        } else if (tickStatus == TickStatus::Slow) {
-            if (tick::slowDownCounter % tick::SlowDownTimes == 0) {
-                original(l);
-                tick::extraTickTask();
-            }
-            tick::slowDownCounter = (tick::slowDownCounter + 1) % tick::SlowDownTimes;
-        }
-    }
-
-//ServerPlayer::tickWorld
-    THook(
-            void,
-            MSSYM_B1QA9tickWorldB1AE12ServerPlayerB2AAE13UEAAHAEBUTickB3AAAA1Z,
-            void *p,
-            void * tick
-    ) {
-        if (!globalPlayer)globalPlayer = p;
-        //如果是一般状态
-        if (tick::isProfiling) {
-            TIMER_START
-            original(p, tick);
-            TIMER_END
-            tick::playerTickTime += timeReslut;
-        } else {
-            original(p, tick);
-        }
-    }
-
-//Dimension::tick
-    THook(
-            void,
-            MSSYM_B1QA4tickB1AA9DimensionB2AAA7UEAAXXZ,
-            void * dim
-    ) {
-        if (!globalDimension)globalDimension = dim;
-        if (tick::isProfiling) {
-            TIMER_START
-            original(dim);
-            TIMER_END
-            tick::dimTickTime += timeReslut;
-        } else {
-            original(dim);
-        }
-
-    }
-//LevelChunk::tick
-    THook(
-            void,
-            MSSYM_B1QA4tickB1AE10LevelChunkB2AAE20QEAAXAEAVBlockSourceB2AAA8AEBUTickB3AAAA1Z,
-            void *levelChunk,
-            void *blockSource,
-            void * tick
-    ) {
-        if (!globalBlockSource)globalBlockSource = blockSource;
-        if (tick::isProfiling) {
-            TIMER_START
-            original(levelChunk, blockSource, tick);
-            TIMER_END
-            tick::chunkTickTime += timeReslut;
-        } else {
-            original(levelChunk, blockSource, tick);
-        }
-    }
-
-//LevelChunk::tickBlocks
-    THook(
-            void,
-            MSSYM_B1QE10tickBlocksB1AE10LevelChunkB2AAE20QEAAXAEAVBlockSourceB3AAAA1Z,
-            void *levelChunk,
-            void *blockSource,
-            INT64 a3,
-            int a4
-    ) {
-
-        if (tick::isProfiling) {
-            TIMER_START
-            original(levelChunk, blockSource, a3, a4);
-            TIMER_END
-            tick::randTickTime += timeReslut;
-        } else {
-            original(levelChunk, blockSource, a3, a4);
-        }
-
-    }
-
-
-//LevelChunk::tickEntities
-    THook(
-            void,
-            MSSYM_B1QE17tickBlockEntitiesB1AE10LevelChunkB2AAE20QEAAXAEAVBlockSourceB3AAAA1Z,
-            void *levelChunk,
-            void * blockSource
-    ) {
-
-        if (tick::isProfiling) {
-            TIMER_START
-            original(levelChunk, blockSource);
-            TIMER_END
-            tick::blockEntityTickTime += timeReslut;
-        } else {
-            original(levelChunk, blockSource);
-        }
-    }
-
-    //mob spawn Spawner::tick
-    THook(
-            void,
-            MSSYM_B1QA4tickB1AA7SpawnerB2AAE20QEAAXAEAVBlockSourceB2AAE14AEBVLevelChunkB3AAAA1Z,
-            void *swr,
-            void *blockSource,
-            void * chunk
-    ) {
-        if (!globalSpawner)globalSpawner = swr;
-        if (tick::isProfiling) {
-            TIMER_START
-            original(swr, blockSource, chunk);
-            TIMER_END
-            tick::spawnerTickTime += timeReslut;
-        } else {
-            original(swr, blockSource, chunk);
-        }
-
-    }
-
-//BlockTickingQueue::pendingTicks
-//the server will crash if hook this function
-//THook(
-//        void,
-//        MSSYM_B1QE16tickPendingTicksB1AE17BlockTickingQueueB2AAA4QEAAB1UE16NAEAVBlockSourceB2AAA8AEBUTickB2AAA1HB1UA1NB1AA1Z,
-//        void *queue,
-//        void *source,
-//        int flag,
-//        bool a1
-//) {
-//    original(queue, source, flag, a1);
-//
-//}
-
-//Dimension::tick
-    THook(
-            void,
-            MSSYM_B1QE12tickRedstoneB1AA9DimensionB2AAA7UEAAXXZ,
-            void * dim
-    ) {
-        if (tickStatus == TickStatus::Normal) {
-            if (tick::isProfiling) {
-                TIMER_START
-                original(dim);
-                TIMER_END
-                tick::redstoneUpdateTime += timeReslut;
-            } else {
-                original(dim);
-            }
-        }
-
-        if (tickStatus == TickStatus::Forward) {
-            original(dim);
-        } else if (tickStatus == TickStatus::Slow) {
-            if (slowDownCounter % SlowTimes == 0) {
-                original(dim);
-            }
-        }
-    }
-
-}
-
-#endif //TRAPDOOR_TICKHOOK_H
-#pragma clang diagnostic pop
\ No newline at end of file
diff --git a/tools/MathTool.cpp b/tools/MathTool.cpp
new file mode 100644
index 0000000..77b3c8c
--- /dev/null
+++ b/tools/MathTool.cpp
@@ -0,0 +1,23 @@
+//
+// Created by xhy on 2020/8/25.
+//
+
+#include "MathTool.h"
+
+namespace math {
+    double distance(Vec3 p1, Vec3 p2, bool useManhattan, bool withY) {
+        auto dx = fabs(p2.x - p1.x);
+        auto dy = withY ? fabs(p2.y - p1.y) : 0;
+        auto dz = fabs(p2.z - p1.z);
+        return useManhattan ? dx + dy + dz : sqrt(dx * dx + dy * dy + dz * dz);
+    }
+
+    std::vector<float> cut(float begin, float end, int num) {
+        float distance = (end - begin) / (float) num;
+        std::vector<float> result;
+        result.reserve(num);
+        for (int i = 0; i <= num; ++i)
+            result.emplace_back(begin + (float) i * distance);
+        return result;
+    }
+}
diff --git a/tools/MathTool.h b/tools/MathTool.h
index 0cceca2..497a816 100644
--- a/tools/MathTool.h
+++ b/tools/MathTool.h
@@ -6,23 +6,12 @@
 #define TRAPDOOR_MATHTOOL_H
 
 #include "common/Vec3.h"
-#include "cmath"
+#include <cmath>
+#include <vector>
 
 namespace math {
-    double distance(Vec3 p1, Vec3 p2, bool useManhattan = false, bool withY = true) {
-        auto dx = fabs(p2.x - p1.x);
-        auto dy = withY ? fabs(p2.y - p1.y) : 0;
-        auto dz = fabs(p2.z - p1.z);
-        return useManhattan ? dx + dy + dz : sqrt(dx * dx + dy * dy + dz * dz);
-    }
+    double distance(Vec3 p1, Vec3 p2, bool useManhattan = false, bool withY = true);
 
-    std::vector<float> cut(float begin, float end, int num) {
-        float distance = (end - begin) / (float) num;
-        std::vector<float> result;
-        result.reserve(num);
-        for (int i = 0; i <= num; ++i)
-            result.emplace_back(begin + (float) i * distance);
-        return result;
-    }
+    std::vector<float> cut(float begin, float end, int num);
 }
 #endif //TRAPDOOR_MATHTOOL_H
diff --git a/tools/Message.cpp b/tools/Message.cpp
new file mode 100644
index 0000000..34cca40
--- /dev/null
+++ b/tools/Message.cpp
@@ -0,0 +1,26 @@
+//
+// Created by xhy on 2020/8/25.
+//
+
+#include "Message.h"
+
+void warning(const std::string &message) {
+    gamePrintf("§6%s", message.c_str());
+}
+
+void error(const std::string &message) {
+    gamePrintf("§c%s", message.c_str());
+}
+
+void info(const std::string &message) {
+    gamePrintf("%s", message.c_str());
+}
+
+void sendLocalMessage(std::string &s, void *player) {
+    std::vector<std::string> v;
+    v.emplace_back("test");
+    SYM_CALL(
+            void(*)(bool, void *, std::string &, std::vector<std::string> &),
+            MSSYM_MD5_24be62e9330073695808606844de0d99,
+            true, player, s, v);
+}
diff --git a/tools/Message.h b/tools/Message.h
index 3a23661..4532ae8 100644
--- a/tools/Message.h
+++ b/tools/Message.h
@@ -5,21 +5,14 @@
 #ifndef TRAPDOOR_MESSAGE_H
 #define TRAPDOOR_MESSAGE_H
 
-#include "lib/pch.h"
 #include "lib/mod.h"
-#include "lib/SymHook.h"
 #include "common/Common.h"
+#include "dbg.h"
+#include "../lib/pch.h"
 
-namespace SymHook {
-    void sendLocalMessage( std::string &s, void *player) {
-        std::vector<std::string> v;
-        v.emplace_back("test");
-        SYM_CALL(
-                void(*)(bool, void *, std::string &, std::vector<std::string> &),
-                MSSYM_MD5_24be62e9330073695808606844de0d99,
-                true, player, s, v);
-    }
-}
+using namespace SymHook;
+
+void sendLocalMessage(std::string &s, void *player);
 
 template<typename ... Args>
 void gamePrintf(const std::string &format, Args ... args) {
@@ -31,20 +24,14 @@ void gamePrintf(const std::string &format, Args ... args) {
     std::unique_ptr<char[]> buf(new char[size]);
     snprintf(buf.get(), size, format.c_str(), args ...);
     auto str = std::string(buf.get(), buf.get() + size - 1);
-    SymHook::sendLocalMessage(str, globalPlayer);
+    sendLocalMessage(str, globalPlayer);
 }
 
-void info(const std::string &message) {
-    gamePrintf("%s", message.c_str());
-}
+void info(const std::string &message);
 
-void error(const std::string &message) {
-    gamePrintf("§c%s", message.c_str());
-}
+void error(const std::string &message);
 
-void warning(const std::string &message) {
-    gamePrintf("§6%s", message.c_str());
-}
+void warning(const std::string &message);
 
 
 #endif //TRAPDOOR_MESSAGE_H
diff --git a/tools/MessageBuilder.cpp b/tools/MessageBuilder.cpp
index c97c446..88b42e3 100644
--- a/tools/MessageBuilder.cpp
+++ b/tools/MessageBuilder.cpp
@@ -1,6 +1,13 @@
 //
-// Created by xhy on 2020/8/24.
+// Created by xhy on 2020/8/25.
 //
-
 #include "MessageBuilder.h"
-const std::string MessageBuilder::POS_COLOR = "$2";
\ No newline at end of file
+
+MessageBuilder &MessageBuilder::Text(const std::string &s) {
+    messageBuffer.emplace_back(s);
+    return *this;
+}
+
+MessageBuilder &MessageBuilder::pos() {
+    return *this;
+}
diff --git a/tools/MessageBuilder.h b/tools/MessageBuilder.h
index 1e3ecf6..dc532c7 100644
--- a/tools/MessageBuilder.h
+++ b/tools/MessageBuilder.h
@@ -10,17 +10,12 @@
 
 class MessageBuilder {
 public:
-    MessageBuilder &Text(const std::string &s) {
-        messageBuffer.emplace_back(s);
-        return *this;
-    }
-    MessageBuilder &pos(){
+    MessageBuilder &Text(const std::string &s);
 
-    }
-    const static std::string POS_COLOR;
+    MessageBuilder &pos();
+    //   const static std::string POS_COLOR;
 private:
     std::vector<std::string> messageBuffer;
 };
 
-
 #endif //TRAPDOOR_MESSAGEBUILDER_H
diff --git a/tools/Particle.cpp b/tools/Particle.cpp
new file mode 100644
index 0000000..2d65155
--- /dev/null
+++ b/tools/Particle.cpp
@@ -0,0 +1,68 @@
+//
+// Created by xhy on 2020/8/25.
+//
+#include "Particle.h"
+#include "common/Common.h"
+#include "../lib/mod.h"
+#include <string>
+
+using namespace SymHook;
+
+#include "entity/Actor.h"
+
+namespace particle {
+//    const ParticleType BALLOON_GAS = "minecraft:balloon_gas_particle";
+    //  const ParticleType HEART = "minecraft:heart_particle  ";
+}
+
+void spawnParticle(Vec3 p, std::string &type) {
+    if (math::distance(p, *spawn::getPos(globalPlayer)) > particleViewDistance)return;
+    p.x += 0.5;
+    p.y += 0.5;
+    p.z += 0.5;
+    if ((!globalLevel || !globalDimension))return;
+    SYM_CALL(
+            void(*)(void * , std::string, Vec3 *, void *),
+            MSSYM_MD5_a2fdc6a066bbe9a360c9c9d76725a8fb,
+            globalLevel, type, &p, globalDimension
+    );
+}
+
+
+void spawnRectangleParticle(AABB aabb, std::string &type) {
+
+    auto pointList = math::cut(aabb.p1.x, aabb.p2.x, (int) (aabb.p2.x - aabb.p1.x) / 3);
+    for (auto i :pointList) {
+        Vec3 point = {i, aabb.p1.y, aabb.p1.z};
+        spawnParticle(point, type); //p1y p1z
+        point.y = aabb.p2.y; //p2y 1z
+        spawnParticle(point, type);
+        point.z = aabb.p2.z; //p2y p2z
+        spawnParticle(point, type);
+        point.y = aabb.p1.y; //p1y p2z
+        spawnParticle(point, type);
+    }
+    pointList = math::cut(aabb.p1.y, aabb.p2.y, (int) (aabb.p2.y - aabb.p1.y) / 3);
+    for (auto i: pointList) {
+        Vec3 point = {aabb.p1.x, static_cast<float>(i), aabb.p1.z};
+        spawnParticle(point, type); //p1x p1z
+        point.x = aabb.p2.x; //p2x p1z
+        spawnParticle(point, type);
+        point.z = aabb.p2.z; //p2x p2z
+        spawnParticle(point, type);
+        point.x = aabb.p1.x; //p1x p2z
+        spawnParticle(point, type);
+    }
+
+    pointList = math::cut(aabb.p1.z, aabb.p2.z, (int) (aabb.p2.z - aabb.p1.z) / 3);
+    for (auto i:pointList) {
+        Vec3 point = {aabb.p1.x, aabb.p1.y, static_cast<float>(i)};
+        spawnParticle(point, type); //p1x p1z
+        point.x = aabb.p2.x; //p2x p1z
+        spawnParticle(point, type);
+        point.y = aabb.p2.y; //p2x p2z
+        spawnParticle(point, type);
+        point.x = aabb.p1.x; //p1x p2z
+        spawnParticle(point, type);
+    }
+}
\ No newline at end of file
diff --git a/tools/Particle.h b/tools/Particle.h
index 2afe8d0..dd99de9 100644
--- a/tools/Particle.h
+++ b/tools/Particle.h
@@ -5,74 +5,13 @@
 #ifndef TRAPDOOR_PARTICLE_H
 #define TRAPDOOR_PARTICLE_H
 
-#include "common/Common.h"
-#include "common/Vec3.h"
 #include <string>
 #include "MathTool.h"
-#include "entity/Actor.h"
-#include "tools/Message.h"
+#include "../lib/pch.h"
 
-void spawnParticle(Vec3 p, std::string &type) {
-    if (math::distance(p, *spawn::getPos(globalPlayer)) > particleViewDistance)return;
-    p.x += 0.5;
-    p.y += 0.5;
-    p.z += 0.5;
-    if ((!globalLevel || !globalDimension))return;
-    SYM_CALL(
-            void(*)(void * , std::string, Vec3 *, void *),
-            MSSYM_MD5_a2fdc6a066bbe9a360c9c9d76725a8fb,
-            globalLevel, type, &p, globalDimension
-    );
-}
 
-void spawnRectangleParticle(AABB aabb, std::string &type) {
-    auto pointList = math::cut(aabb.p1.x, aabb.p2.x, (int) (aabb.p2.x - aabb.p1.x) / 4);
-    for (auto i :pointList) {
-        Vec3 point = {i, aabb.p1.y, aabb.p1.z};
-        spawnParticle(point, type); //p1y p1z
-        point.y = aabb.p2.y; //p2y 1z
-        spawnParticle(point, type);
-        point.z = aabb.p2.z; //p2y p2z
-        spawnParticle(point, type);
-        point.y = aabb.p1.y; //p1y p2z
-        spawnParticle(point, type);
-    }
-    pointList = math::cut(aabb.p1.y, aabb.p2.y, (int) (aabb.p2.y - aabb.p1.y) / 4);
-    for (auto i: pointList) {
-        Vec3 point = {aabb.p1.x, static_cast<float>(i), aabb.p1.z};
-        spawnParticle(point, type); //p1x p1z
-        point.x = aabb.p2.x; //p2x p1z
-        spawnParticle(point, type);
-        point.z = aabb.p2.z; //p2x p2z
-        spawnParticle(point, type);
-        point.x = aabb.p1.x; //p1x p2z
-        spawnParticle(point, type);
-    }
+void spawnParticle(Vec3 p, std::string &type);
 
-    pointList = math::cut(aabb.p1.z, aabb.p2.z, (int) (aabb.p2.z - aabb.p1.z) / 4);
-    for (auto i:pointList) {
-        Vec3 point = {aabb.p1.x, aabb.p1.y, static_cast<float>(i)};
-        spawnParticle(point, type); //p1x p1z
-        point.x = aabb.p2.x; //p2x p1z
-        spawnParticle(point, type);
-        point.y = aabb.p2.y; //p2x p2z
-        spawnParticle(point, type);
-        point.x = aabb.p1.x; //p1x p2z
-        spawnParticle(point, type);
-    }
-}
-
-//void spawnLineParticle(Vec3 *p1, Vec3 *p2, std::string &type) {
-//    float num = sqrt((p1->x - p2->x) * (p1->x - p2->x) +
-//                     (p1->y - p2->y) * (p1->y - p2->y) +
-//                     (p1->z - p2->z) * (p1->z - p2->z));
-//    for (int i = 0; i <= num; i++) {
-//        float point[3] = {p1->x + (p2->x - p1->x) / num * (float) i,
-//                          p1->y + (p2->y - p1->y) / num * (float) i,
-//                          p1->z + (p2->z - p1->z) / num * (float) i,
-//        };
-//        spawnParticle(point, type);
-//    }
-//}
+void spawnRectangleParticle(AABB aabb, std::string &type);
 
 #endif //TRAPDOOR_PARTICLE_H
diff --git a/tools/dbg.h b/tools/dbg.h
new file mode 100644
index 0000000..d2f87a1
--- /dev/null
+++ b/tools/dbg.h
@@ -0,0 +1,800 @@
+/*****************************************************************************
+
+                                dbg(...) macro
+
+License (MIT):
+
+  Copyright (c) 2019 David Peter <mail@david-peter.de>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to
+  deal in the Software without restriction, including without limitation the
+  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+  sell copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+
+*****************************************************************************/
+
+#ifndef DBG_MACRO_DBG_H
+#define DBG_MACRO_DBG_H
+
+#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
+#define DBG_MACRO_UNIX
+#elif defined(_MSC_VER)
+#define DBG_MACRO_WINDOWS
+#endif
+
+#ifndef DBG_MACRO_NO_WARNING
+#pragma message("WARNING: the 'dbg.h' header is included in your code base")
+#endif  // DBG_MACRO_NO_WARNING
+
+#include <algorithm>
+#include <chrono>
+#include <ctime>
+#include <iomanip>
+#include <ios>
+#include <iostream>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <tuple>
+#include <type_traits>
+#include <vector>
+
+#ifdef DBG_MACRO_UNIX
+#include <unistd.h>
+#endif
+
+#if __cplusplus >= 201703L || defined(_MSC_VER)
+#define DBG_MACRO_CXX_STANDARD 17
+#elif __cplusplus >= 201402L
+#define DBG_MACRO_CXX_STANDARD 14
+#else
+#define DBG_MACRO_CXX_STANDARD 11
+#endif
+
+#if DBG_MACRO_CXX_STANDARD >= 17
+#include <optional>
+#include <variant>
+#endif
+
+namespace dbg {
+
+#ifdef DBG_MACRO_UNIX
+inline bool isColorizedOutputEnabled() {
+  return isatty(fileno(stderr));
+}
+#else
+inline bool isColorizedOutputEnabled() {
+  return true;
+}
+#endif
+
+struct time {};
+
+namespace pretty_function {
+
+// Compiler-agnostic version of __PRETTY_FUNCTION__ and constants to
+// extract the template argument in `type_name_impl`
+
+#if defined(__clang__)
+#define DBG_MACRO_PRETTY_FUNCTION __PRETTY_FUNCTION__
+static constexpr size_t PREFIX_LENGTH =
+    sizeof("const char *dbg::type_name_impl() [T = ") - 1;
+static constexpr size_t SUFFIX_LENGTH = sizeof("]") - 1;
+#elif defined(__GNUC__) && !defined(__clang__)
+#define DBG_MACRO_PRETTY_FUNCTION __PRETTY_FUNCTION__
+static constexpr size_t PREFIX_LENGTH =
+    sizeof("const char* dbg::type_name_impl() [with T = ") - 1;
+static constexpr size_t SUFFIX_LENGTH = sizeof("]") - 1;
+#elif defined(_MSC_VER)
+#define DBG_MACRO_PRETTY_FUNCTION __FUNCSIG__
+static constexpr size_t PREFIX_LENGTH =
+    sizeof("const char *__cdecl dbg::type_name_impl<") - 1;
+static constexpr size_t SUFFIX_LENGTH = sizeof(">(void)") - 1;
+#else
+#error "This compiler is currently not supported by dbg_macro."
+#endif
+
+}  // namespace pretty_function
+
+// Formatting helpers
+
+template <typename T>
+struct print_formatted {
+  static_assert(std::is_integral<T>::value,
+                "Only integral types are supported.");
+
+  print_formatted(T value, int numeric_base)
+      : inner(value), base(numeric_base) {}
+
+  operator T() const { return inner; }
+
+  const char* prefix() const {
+    switch (base) {
+      case 8:
+        return "0o";
+      case 16:
+        return "0x";
+      case 2:
+        return "0b";
+      default:
+        return "";
+    }
+  }
+
+  T inner;
+  int base;
+};
+
+template <typename T>
+print_formatted<T> hex(T value) {
+  return print_formatted<T>{value, 16};
+}
+
+template <typename T>
+print_formatted<T> oct(T value) {
+  return print_formatted<T>{value, 8};
+}
+
+template <typename T>
+print_formatted<T> bin(T value) {
+  return print_formatted<T>{value, 2};
+}
+
+// Implementation of 'type_name<T>()'
+
+template <typename T>
+const char* type_name_impl() {
+  return DBG_MACRO_PRETTY_FUNCTION;
+}
+
+template <typename T>
+struct type_tag {};
+
+template <int&... ExplicitArgumentBarrier, typename T>
+std::string get_type_name(type_tag<T>) {
+  namespace pf = pretty_function;
+
+  std::string type = type_name_impl<T>();
+  return type.substr(pf::PREFIX_LENGTH,
+                     type.size() - pf::PREFIX_LENGTH - pf::SUFFIX_LENGTH);
+}
+
+template <typename T>
+std::string type_name() {
+  if (std::is_volatile<T>::value) {
+    if (std::is_pointer<T>::value) {
+      return type_name<typename std::remove_volatile<T>::type>() + " volatile";
+    } else {
+      return "volatile " + type_name<typename std::remove_volatile<T>::type>();
+    }
+  }
+  if (std::is_const<T>::value) {
+    if (std::is_pointer<T>::value) {
+      return type_name<typename std::remove_const<T>::type>() + " const";
+    } else {
+      return "const " + type_name<typename std::remove_const<T>::type>();
+    }
+  }
+  if (std::is_pointer<T>::value) {
+    return type_name<typename std::remove_pointer<T>::type>() + "*";
+  }
+  if (std::is_lvalue_reference<T>::value) {
+    return type_name<typename std::remove_reference<T>::type>() + "&";
+  }
+  if (std::is_rvalue_reference<T>::value) {
+    return type_name<typename std::remove_reference<T>::type>() + "&&";
+  }
+  return get_type_name(type_tag<T>{});
+}
+
+inline std::string get_type_name(type_tag<short>) {
+  return "short";
+}
+
+inline std::string get_type_name(type_tag<unsigned short>) {
+  return "unsigned short";
+}
+
+inline std::string get_type_name(type_tag<long>) {
+  return "long";
+}
+
+inline std::string get_type_name(type_tag<unsigned long>) {
+  return "unsigned long";
+}
+
+inline std::string get_type_name(type_tag<std::string>) {
+  return "std::string";
+}
+
+template <typename T>
+std::string get_type_name(type_tag<std::vector<T, std::allocator<T>>>) {
+  return "std::vector<" + type_name<T>() + ">";
+}
+
+template <typename T1, typename T2>
+std::string get_type_name(type_tag<std::pair<T1, T2>>) {
+  return "std::pair<" + type_name<T1>() + ", " + type_name<T2>() + ">";
+}
+
+template <typename... T>
+std::string type_list_to_string() {
+  std::string result;
+  auto unused = {(result += type_name<T>() + ", ", 0)..., 0};
+  static_cast<void>(unused);
+
+  if (sizeof...(T) > 0) {
+    result.pop_back();
+    result.pop_back();
+  }
+  return result;
+}
+
+template <typename... T>
+std::string get_type_name(type_tag<std::tuple<T...>>) {
+  return "std::tuple<" + type_list_to_string<T...>() + ">";
+}
+
+template <typename T>
+inline std::string get_type_name(type_tag<print_formatted<T>>) {
+  return type_name<T>();
+}
+
+// Implementation of 'is_detected' to specialize for container-like types
+
+namespace detail_detector {
+
+struct nonesuch {
+  nonesuch() = delete;
+  ~nonesuch() = delete;
+  nonesuch(nonesuch const&) = delete;
+  void operator=(nonesuch const&) = delete;
+};
+
+template <typename...>
+using void_t = void;
+
+template <class Default,
+          class AlwaysVoid,
+          template <class...>
+          class Op,
+          class... Args>
+struct detector {
+  using value_t = std::false_type;
+  using type = Default;
+};
+
+template <class Default, template <class...> class Op, class... Args>
+struct detector<Default, void_t<Op<Args...>>, Op, Args...> {
+  using value_t = std::true_type;
+  using type = Op<Args...>;
+};
+
+}  // namespace detail_detector
+
+template <template <class...> class Op, class... Args>
+using is_detected = typename detail_detector::
+    detector<detail_detector::nonesuch, void, Op, Args...>::value_t;
+
+namespace detail {
+
+namespace {
+using std::begin;
+using std::end;
+#if DBG_MACRO_CXX_STANDARD < 17
+template <typename T>
+constexpr auto size(const T& c) -> decltype(c.size()) {
+  return c.size();
+}
+template <typename T, std::size_t N>
+constexpr std::size_t size(const T (&)[N]) {
+  return N;
+}
+#else
+using std::size;
+#endif
+}  // namespace
+
+template <typename T>
+using detect_begin_t = decltype(detail::begin(std::declval<T>()));
+
+template <typename T>
+using detect_end_t = decltype(detail::end(std::declval<T>()));
+
+template <typename T>
+using detect_size_t = decltype(detail::size(std::declval<T>()));
+
+template <typename T>
+struct is_container {
+  static constexpr bool value =
+      is_detected<detect_begin_t, T>::value &&
+      is_detected<detect_end_t, T>::value &&
+      is_detected<detect_size_t, T>::value &&
+      !std::is_same<std::string,
+                    typename std::remove_cv<
+                        typename std::remove_reference<T>::type>::type>::value;
+};
+
+template <typename T>
+using ostream_operator_t =
+    decltype(std::declval<std::ostream&>() << std::declval<T>());
+
+template <typename T>
+struct has_ostream_operator : is_detected<ostream_operator_t, T> {};
+
+}  // namespace detail
+
+// Helper to dbg(…)-print types
+template <typename T>
+struct print_type {};
+
+template <typename T>
+print_type<T> type() {
+  return print_type<T>{};
+}
+
+// Specializations of "pretty_print"
+
+template <typename T>
+inline void pretty_print(std::ostream& stream, const T& value, std::true_type) {
+  stream << value;
+}
+
+template <typename T>
+inline void pretty_print(std::ostream&, const T&, std::false_type) {
+  static_assert(detail::has_ostream_operator<const T&>::value,
+                "Type does not support the << ostream operator");
+}
+
+template <typename T>
+inline typename std::enable_if<!detail::is_container<const T&>::value &&
+                                   !std::is_enum<T>::value,
+                               bool>::type
+pretty_print(std::ostream& stream, const T& value) {
+  pretty_print(stream, value,
+               typename detail::has_ostream_operator<const T&>::type{});
+  return true;
+}
+
+inline bool pretty_print(std::ostream& stream, const bool& value) {
+  stream << std::boolalpha << value;
+  return true;
+}
+
+inline bool pretty_print(std::ostream& stream, const char& value) {
+  const bool printable = value >= 0x20 && value <= 0x7E;
+
+  if (printable) {
+    stream << "'" << value << "'";
+  } else {
+    stream << "'\\x" << std::setw(2) << std::setfill('0') << std::hex
+           << std::uppercase << (0xFF & value) << "'";
+  }
+  return true;
+}
+
+template <typename P>
+inline bool pretty_print(std::ostream& stream, P* const& value) {
+  if (value == nullptr) {
+    stream << "nullptr";
+  } else {
+    stream << value;
+  }
+  return true;
+}
+
+template <typename T, typename Deleter>
+inline bool pretty_print(std::ostream& stream,
+                         std::unique_ptr<T, Deleter>& value) {
+  pretty_print(stream, value.get());
+  return true;
+}
+
+template <typename T>
+inline bool pretty_print(std::ostream& stream, std::shared_ptr<T>& value) {
+  pretty_print(stream, value.get());
+  stream << " (use_count = " << value.use_count() << ")";
+
+  return true;
+}
+
+template <size_t N>
+inline bool pretty_print(std::ostream& stream, const char (&value)[N]) {
+  stream << value;
+  return false;
+}
+
+template <>
+inline bool pretty_print(std::ostream& stream, const char* const& value) {
+  stream << '"' << value << '"';
+  return true;
+}
+
+template <size_t Idx>
+struct pretty_print_tuple {
+  template <typename... Ts>
+  static void print(std::ostream& stream, const std::tuple<Ts...>& tuple) {
+    pretty_print_tuple<Idx - 1>::print(stream, tuple);
+    stream << ", ";
+    pretty_print(stream, std::get<Idx>(tuple));
+  }
+};
+
+template <>
+struct pretty_print_tuple<0> {
+  template <typename... Ts>
+  static void print(std::ostream& stream, const std::tuple<Ts...>& tuple) {
+    pretty_print(stream, std::get<0>(tuple));
+  }
+};
+
+template <typename... Ts>
+inline bool pretty_print(std::ostream& stream, const std::tuple<Ts...>& value) {
+  stream << "{";
+  pretty_print_tuple<sizeof...(Ts) - 1>::print(stream, value);
+  stream << "}";
+
+  return true;
+}
+
+template <>
+inline bool pretty_print(std::ostream& stream, const std::tuple<>&) {
+  stream << "{}";
+
+  return true;
+}
+
+template <>
+inline bool pretty_print(std::ostream& stream, const time&) {
+  using namespace std::chrono;
+
+  const auto now = system_clock::now();
+  const auto us =
+      duration_cast<microseconds>(now.time_since_epoch()).count() % 1000000;
+  const auto hms = system_clock::to_time_t(now);
+  const std::tm* tm = std::localtime(&hms);
+  stream << "current time = " << std::put_time(tm, "%H:%M:%S") << '.'
+         << std::setw(6) << std::setfill('0') << us;
+
+  return false;
+}
+
+// Converts decimal integer to binary string
+template <typename T>
+std::string decimalToBinary(T n) {
+  const size_t length = 8 * sizeof(T);
+  std::string toRet;
+  toRet.resize(length);
+
+  for (size_t i = 0; i < length; ++i) {
+    const auto bit_at_index_i = (n >> i) & 1;
+    toRet[length - 1 - i] = bit_at_index_i + '0';
+  }
+
+  return toRet;
+}
+
+template <typename T>
+inline bool pretty_print(std::ostream& stream,
+                         const print_formatted<T>& value) {
+  if (value.inner < 0) {
+    stream << "-";
+  }
+  stream << value.prefix();
+
+  // Print using setbase
+  if (value.base != 2) {
+    stream << std::setw(sizeof(T)) << std::setfill('0')
+           << std::setbase(value.base) << std::uppercase;
+
+    if (value.inner >= 0) {
+      // The '+' sign makes sure that a uint_8 is printed as a number
+      stream << +value.inner;
+    } else {
+      using unsigned_type = typename std::make_unsigned<T>::type;
+      stream << +(static_cast<unsigned_type>(-(value.inner + 1)) + 1);
+    }
+  } else {
+    // Print for binary
+    if (value.inner >= 0) {
+      stream << decimalToBinary(value.inner);
+    } else {
+      using unsigned_type = typename std::make_unsigned<T>::type;
+      stream << decimalToBinary<unsigned_type>(
+          static_cast<unsigned_type>(-(value.inner + 1)) + 1);
+    }
+  }
+
+  return true;
+}
+
+template <typename T>
+inline bool pretty_print(std::ostream& stream, const print_type<T>&) {
+  stream << type_name<T>();
+
+  stream << " [sizeof: " << sizeof(T) << " byte, ";
+
+  stream << "trivial: ";
+  if (std::is_trivial<T>::value) {
+    stream << "yes";
+  } else {
+    stream << "no";
+  }
+
+  stream << ", standard layout: ";
+  if (std::is_standard_layout<T>::value) {
+    stream << "yes";
+  } else {
+    stream << "no";
+  }
+  stream << "]";
+
+  return false;
+}
+
+template <typename Container>
+inline typename std::enable_if<detail::is_container<const Container&>::value,
+                               bool>::type
+pretty_print(std::ostream& stream, const Container& value) {
+  stream << "{";
+  const size_t size = detail::size(value);
+  const size_t n = std::min(size_t{10}, size);
+  size_t i = 0;
+  using std::begin;
+  using std::end;
+  for (auto it = begin(value); it != end(value) && i < n; ++it, ++i) {
+    pretty_print(stream, *it);
+    if (i != n - 1) {
+      stream << ", ";
+    }
+  }
+
+  if (size > n) {
+    stream << ", ...";
+    stream << " size:" << size;
+  }
+
+  stream << "}";
+  return true;
+}
+
+template <typename Enum>
+inline typename std::enable_if<std::is_enum<Enum>::value, bool>::type
+pretty_print(std::ostream& stream, Enum const& value) {
+  using UnderlyingType = typename std::underlying_type<Enum>::type;
+  stream << static_cast<UnderlyingType>(value);
+
+  return true;
+}
+
+inline bool pretty_print(std::ostream& stream, const std::string& value) {
+  stream << '"' << value << '"';
+  return true;
+}
+
+template <typename T1, typename T2>
+inline bool pretty_print(std::ostream& stream, const std::pair<T1, T2>& value) {
+  stream << "{";
+  pretty_print(stream, value.first);
+  stream << ", ";
+  pretty_print(stream, value.second);
+  stream << "}";
+  return true;
+}
+
+#if DBG_MACRO_CXX_STANDARD >= 17
+
+template <typename T>
+inline bool pretty_print(std::ostream& stream, const std::optional<T>& value) {
+  if (value) {
+    stream << '{';
+    pretty_print(stream, *value);
+    stream << '}';
+  } else {
+    stream << "nullopt";
+  }
+
+  return true;
+}
+
+template <typename... Ts>
+inline bool pretty_print(std::ostream& stream,
+                         const std::variant<Ts...>& value) {
+  stream << "{";
+  std::visit([&stream](auto&& arg) { pretty_print(stream, arg); }, value);
+  stream << "}";
+
+  return true;
+}
+
+#endif
+
+template <typename T, typename... U>
+struct last {
+  using type = typename last<U...>::type;
+};
+
+template <typename T>
+struct last<T> {
+  using type = T;
+};
+
+template <typename... T>
+using last_t = typename last<T...>::type;
+
+class DebugOutput {
+ public:
+  // Helper alias to avoid obscure type `const char* const*` in signature.
+  using expr_t = const char*;
+
+  DebugOutput(const char* filepath, int line, const char* function_name)
+      : m_use_colorized_output(isColorizedOutputEnabled()) {
+    std::string path = filepath;
+    const std::size_t path_length = path.length();
+    if (path_length > MAX_PATH_LENGTH) {
+      path = ".." + path.substr(path_length - MAX_PATH_LENGTH, MAX_PATH_LENGTH);
+    }
+    std::stringstream ss;
+    ss << ansi(ANSI_DEBUG) << "[" << path << ":" << line << " ("
+       << function_name << ")] " << ansi(ANSI_RESET);
+    m_location = ss.str();
+  }
+
+  template <typename... T>
+  auto print(std::initializer_list<expr_t> exprs,
+             std::initializer_list<std::string> types,
+             T&&... values) -> last_t<T...> {
+    if (exprs.size() != sizeof...(values)) {
+      std::cerr
+          << m_location << ansi(ANSI_WARN)
+          << "The number of arguments mismatch, please check unprotected comma"
+          << ansi(ANSI_RESET) << std::endl;
+    }
+    return print_impl(exprs.begin(), types.begin(), std::forward<T>(values)...);
+  }
+
+ private:
+  template <typename T>
+  T&& print_impl(const expr_t* expr, const std::string* type, T&& value) {
+    const T& ref = value;
+    std::stringstream stream_value;
+    const bool print_expr_and_type = pretty_print(stream_value, ref);
+
+    std::stringstream output;
+    output << m_location;
+    if (print_expr_and_type) {
+      output << ansi(ANSI_EXPRESSION) << *expr << ansi(ANSI_RESET) << " = ";
+    }
+    output << ansi(ANSI_VALUE) << stream_value.str() << ansi(ANSI_RESET);
+    if (print_expr_and_type) {
+      output << " (" << ansi(ANSI_TYPE) << *type << ansi(ANSI_RESET) << ")";
+    }
+    output << std::endl;
+    std::cerr << output.str();
+
+    return std::forward<T>(value);
+  }
+
+  template <typename T, typename... U>
+  auto print_impl(const expr_t* exprs,
+                  const std::string* types,
+                  T&& value,
+                  U&&... rest) -> last_t<T, U...> {
+    print_impl(exprs, types, std::forward<T>(value));
+    return print_impl(exprs + 1, types + 1, std::forward<U>(rest)...);
+  }
+
+  const char* ansi(const char* code) const {
+    if (m_use_colorized_output) {
+      return code;
+    } else {
+      return ANSI_EMPTY;
+    }
+  }
+
+  const bool m_use_colorized_output;
+
+  std::string m_location;
+
+  static constexpr std::size_t MAX_PATH_LENGTH = 20;
+
+  static constexpr const char* const ANSI_EMPTY = "";
+  static constexpr const char* const ANSI_DEBUG = "\x1b[02m";
+  static constexpr const char* const ANSI_WARN = "\x1b[33m";
+  static constexpr const char* const ANSI_EXPRESSION = "\x1b[36m";
+  static constexpr const char* const ANSI_VALUE = "\x1b[01m";
+  static constexpr const char* const ANSI_TYPE = "\x1b[32m";
+  static constexpr const char* const ANSI_RESET = "\x1b[0m";
+};
+
+// Identity function to suppress "-Wunused-value" warnings in DBG_MACRO_DISABLE
+// mode
+template <typename T>
+T&& identity(T&& t) {
+  return std::forward<T>(t);
+}
+
+template <typename T, typename... U>
+auto identity(T&&, U&&... u) -> last_t<U...> {
+  return identity(std::forward<U>(u)...);
+}
+
+}  // namespace dbg
+
+#ifndef DBG_MACRO_DISABLE
+
+// Force expanding argument with commas for MSVC, ref:
+// https://stackoverflow.com/questions/35210637/macro-expansion-argument-with-commas
+// Note that "args" should be a tuple with parentheses, such as "(e1, e2, ...)".
+#define DBG_IDENTITY(x) x
+#define DBG_CALL(fn, args) DBG_IDENTITY(fn args)
+
+#define DBG_CAT_IMPL(_1, _2) _1##_2
+#define DBG_CAT(_1, _2) DBG_CAT_IMPL(_1, _2)
+
+#define DBG_16TH_IMPL(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, \
+                      _14, _15, _16, ...)                                     \
+  _16
+#define DBG_16TH(args) DBG_CALL(DBG_16TH_IMPL, args)
+#define DBG_NARG(...) \
+  DBG_16TH((__VA_ARGS__, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0))
+
+// DBG_VARIADIC_CALL(fn, data, e1, e2, ...) => fn_N(data, (e1, e2, ...))
+#define DBG_VARIADIC_CALL(fn, data, ...) \
+  DBG_CAT(fn##_, DBG_NARG(__VA_ARGS__))(data, (__VA_ARGS__))
+
+// (e1, e2, e3, ...) => e1
+#define DBG_HEAD_IMPL(_1, ...) _1
+#define DBG_HEAD(args) DBG_CALL(DBG_HEAD_IMPL, args)
+
+// (e1, e2, e3, ...) => (e2, e3, ...)
+#define DBG_TAIL_IMPL(_1, ...) (__VA_ARGS__)
+#define DBG_TAIL(args) DBG_CALL(DBG_TAIL_IMPL, args)
+
+#define DBG_MAP_1(fn, args) DBG_CALL(fn, args)
+#define DBG_MAP_2(fn, args) fn(DBG_HEAD(args)), DBG_MAP_1(fn, DBG_TAIL(args))
+#define DBG_MAP_3(fn, args) fn(DBG_HEAD(args)), DBG_MAP_2(fn, DBG_TAIL(args))
+#define DBG_MAP_4(fn, args) fn(DBG_HEAD(args)), DBG_MAP_3(fn, DBG_TAIL(args))
+#define DBG_MAP_5(fn, args) fn(DBG_HEAD(args)), DBG_MAP_4(fn, DBG_TAIL(args))
+#define DBG_MAP_6(fn, args) fn(DBG_HEAD(args)), DBG_MAP_5(fn, DBG_TAIL(args))
+#define DBG_MAP_7(fn, args) fn(DBG_HEAD(args)), DBG_MAP_6(fn, DBG_TAIL(args))
+#define DBG_MAP_8(fn, args) fn(DBG_HEAD(args)), DBG_MAP_7(fn, DBG_TAIL(args))
+#define DBG_MAP_9(fn, args) fn(DBG_HEAD(args)), DBG_MAP_8(fn, DBG_TAIL(args))
+#define DBG_MAP_10(fn, args) fn(DBG_HEAD(args)), DBG_MAP_9(fn, DBG_TAIL(args))
+#define DBG_MAP_11(fn, args) fn(DBG_HEAD(args)), DBG_MAP_10(fn, DBG_TAIL(args))
+#define DBG_MAP_12(fn, args) fn(DBG_HEAD(args)), DBG_MAP_11(fn, DBG_TAIL(args))
+#define DBG_MAP_13(fn, args) fn(DBG_HEAD(args)), DBG_MAP_12(fn, DBG_TAIL(args))
+#define DBG_MAP_14(fn, args) fn(DBG_HEAD(args)), DBG_MAP_13(fn, DBG_TAIL(args))
+#define DBG_MAP_15(fn, args) fn(DBG_HEAD(args)), DBG_MAP_14(fn, DBG_TAIL(args))
+#define DBG_MAP_16(fn, args) fn(DBG_HEAD(args)), DBG_MAP_15(fn, DBG_TAIL(args))
+
+// DBG_MAP(fn, e1, e2, e3, ...) => fn(e1), fn(e2), fn(e3), ...
+#define DBG_MAP(fn, ...) DBG_VARIADIC_CALL(DBG_MAP, fn, __VA_ARGS__)
+
+#define DBG_STRINGIFY_IMPL(x) #x
+#define DBG_STRINGIFY(x) DBG_STRINGIFY_IMPL(x)
+
+#define DBG_TYPE_NAME(x) dbg::type_name<decltype(x)>()
+
+#define dbg(...)                                    \
+  dbg::DebugOutput(__FILE__, __LINE__, __func__)    \
+      .print({DBG_MAP(DBG_STRINGIFY, __VA_ARGS__)}, \
+             {DBG_MAP(DBG_TYPE_NAME, __VA_ARGS__)}, __VA_ARGS__)
+#else
+#define dbg(...) dbg::identity(__VA_ARGS__)
+#endif  // DBG_MACRO_DISABLE
+
+#endif  // DBG_MACRO_DBG_H
diff --git a/village/Village.cpp b/village/Village.cpp
new file mode 100644
index 0000000..c9f2051
--- /dev/null
+++ b/village/Village.cpp
@@ -0,0 +1,167 @@
+//
+// Created by xhy on 2020/8/25.
+//
+#include "Village.h"
+#include "common/Common.h"
+#include "tools/Message.h"
+#include "tools/Particle.h"
+
+using namespace SymHook;
+//village tick
+
+namespace village {
+    const size_t BOUND_OFFSET = 104;
+    const size_t POPULATION_OFFSET = 22;
+    const size_t GOLEM_NUM_OFFSET = 30;
+    VillageHelper villageHelper; //NOLINT
+
+    //get village population
+    int getPopulation(void *village) {
+        return (int) *((int64_t *) village + POPULATION_OFFSET);
+    }
+
+    //get village owned iron golem num
+    int getIronGolemNum(void *village) {
+        return (int) *((int64_t *) village + GOLEM_NUM_OFFSET);
+    }
+
+    //get village owned bed poi count(max is villager num + 32)
+    int getBedPOICount(void *village) {
+        return
+                SYM_CALL(
+                        int(*)(void * ),
+                        MSSYM_B1QE14getBedPOICountB1AA7VillageB2AAA4QEBAB1UA3KXZ,
+                        village
+                );
+    }
+
+    //get worked villager num
+    int getWorkedVillagerNum(void *village) {
+        auto timeOfDay = *(reinterpret_cast<int64_t *>(village) + 60) - 24000;
+        auto begin = *(reinterpret_cast<int64_t *>(village) + 85);
+        auto end = *(reinterpret_cast<int64_t *>(village) + 86);
+        int num;
+        for (num = 0; begin != end; begin += 16) {
+            if (*(int64_t *) (begin + 8) > timeOfDay)
+                ++num;
+        }
+        return num;
+    }
+
+    //check can spawn iron golem
+    bool canSpawnIronGolem(int population, int golemNum, int workedNum, int bedNUm) {
+        int max = 20 > population ? 20 : population;
+        return (float) workedNum > population * 0.75 && golemNum < population / 10 && bedNUm > max;
+    }
+
+    //get village center
+    Vec3 getVillageCenter(void *village) {
+        Vec3 center = {
+                (*((float *) village + BOUND_OFFSET + 3) + *((float *) village + BOUND_OFFSET)) / 2,
+                (*((float *) village + BOUND_OFFSET + 4) + *((float *) village + BOUND_OFFSET + 1)) / 2,
+                (*((float *) village + BOUND_OFFSET + 5) + *((float *) village + BOUND_OFFSET + 2)) / 2,
+        };
+        return center;
+    }
+
+    //get village bounds
+    AABB getVillageBound(void *village) {
+        Vec3 p1 = {*((float *) village + BOUND_OFFSET + 3),
+                   *((float *) village + BOUND_OFFSET + 4),
+                   *((float *) village + BOUND_OFFSET + 5)};
+        Vec3 p2 = {*((float *) village + BOUND_OFFSET),
+                   *((float *) village + BOUND_OFFSET + 1),
+                   *((float *) village + BOUND_OFFSET + 2)};
+        AABB aabb(p2, p1);
+        return aabb;
+    }
+
+    //get village radius
+    float getVillageRadius(void *village) {
+        if (!village)return -1.0;
+        return SYM_CALL(
+                float(*)(void * ),
+                MSSYM_B1QE20getApproximateRadiusB1AA7VillageB2AAA7QEBAMXZ,
+                village
+        );
+    }
+
+    int villageInterval = 0;
+
+    void villageTask() {
+        if (villageInterval % 15 == 0 && enableVillageShow) {
+            villageHelper.draw();
+        }
+        if (villageInterval % 100 == 0) {
+            villageHelper.clear();
+        }
+        villageInterval = (villageInterval + 1) % 300;
+    }
+
+    void listVillages() {
+        villageHelper.list();
+    }
+
+    void VillageHelper::clear() {
+        villageList.clear();
+    }
+
+    void VillageHelper::insert(void *village) {
+        villageList.insert(village);
+    }
+
+    void VillageHelper::draw() {
+        if (enableVillageShow) {
+            std::string borderParticleType = "minecraft:dragon_breath_trail";
+            std::string centerParticleType = "minecraft:heart_particle";
+            for (auto village:villageList) {
+                if (village) {
+                    spawnRectangleParticle(getVillageBound(village), borderParticleType);
+                    Vec3 center = getVillageCenter(village);
+                    spawnParticle(center, centerParticleType);
+                }
+            }
+        }
+    }
+
+    void VillageHelper::list() {
+        gamePrintf("here are all the ticking villages:\n");
+        int i = 0;
+        for (auto village : villageList) {
+            if (village) {
+                auto aabb = getVillageBound(village);
+                auto center = getVillageCenter(village);
+                auto population = getPopulation(village);
+                auto bedNum = getBedPOICount(village);
+                auto golem = getIronGolemNum(village);
+                auto worked = getWorkedVillagerNum(village);
+                gamePrintf("v§2%d§b: [%d,%d,%d],[%d,%d,%d]§rc:§b[%d,%d,%d]§rr:§2%.2f p:%d/%d g:%d b:%d  %d\n",
+                           i,
+                           (int) aabb.p1.x,
+                           (int) aabb.p1.y,
+                           (int) aabb.p1.z,
+                           (int) aabb.p2.x,
+                           (int) aabb.p2.y,
+                           (int) aabb.p2.z,
+                           (int) center.x,
+                           (int) center.y,
+                           (int) center.z,
+                           getVillageRadius(village),
+                           worked,
+                           population,
+                           golem,
+                           bedNum,
+                           canSpawnIronGolem(population, golem, worked, bedNum)
+                );
+                i++;
+            }
+        }
+    }
+}
+THook(
+        void, MSSYM_B1QA4tickB1AA7VillageB2AAE10QEAAXUTickB2AAE15AEAVBlockSourceB3AAAA1Z,
+        void *vill, void *tick, void * blockSource
+) {
+    original(vill, tick, blockSource);
+    village::villageHelper.insert(vill);
+}
diff --git a/village/Village.h b/village/Village.h
index cd167a8..cec6ef5 100644
--- a/village/Village.h
+++ b/village/Village.h
@@ -1,168 +1,49 @@
-#pragma clang diagnostic push
-#pragma ide diagnostic ignored "cert-err58-cpp"
 #pragma once
 
-#include "common/Common.h"
-#include "lib/pch.h"
 #include "lib/mod.h"
 #include "lib/SymHook.h"
-#include <strstream>
 #include<set>
-#include "tools/Particle.h"
-#include "tools/Message.h"
-
 namespace village {
 
 
-    const size_t BOUND_OFFSET = 104;
-    const size_t POPULATION_OFFSET = 22;
-    const size_t GOLEM_NUM_OFFSET = 30;
-
-    int getPopulation(void *village) {
-        return (int) *((int64_t *) village + POPULATION_OFFSET);
-    }
-
-    int getIronGolemNum(void *village) {
-        return (int) *((int64_t *) village + GOLEM_NUM_OFFSET);
-    }
-
-    int getBedPOICount(void *village) {
-        return
-                SYM_CALL(
-                        int(*)(void * ),
-                        MSSYM_B1QE14getBedPOICountB1AA7VillageB2AAA4QEBAB1UA3KXZ,
-                        village
-                );
-    }
-
-
-    int getWorkedVillagerNum(void *village) {
-        auto timeOfDay = *(reinterpret_cast<int64_t *>(village) + 60) - 24000;
-        auto begin = *(reinterpret_cast<int64_t *>(village) + 85);
-        auto end = *(reinterpret_cast<int64_t *>(village) + 86);
-        int num;
-        for (num = 0; begin != end; begin += 16) {
-            if (*(int64_t *) (begin + 8) > timeOfDay)
-                ++num;
-        }
-        return num;
-    }
-
-    bool canSpawnIronGolem(int population, int golemNum, int workedNum, int bedNUm) {
-        int max = 20 > population ? 20 : population;
-        return (float) workedNum > population * 0.75 && golemNum < population / 10 && bedNUm > max;
-    }
-
-
-    Vec3 getVillageCenter(void *village) {
-        Vec3 center = {
-                (*((float *) village + BOUND_OFFSET + 3) + *((float *) village + BOUND_OFFSET)) / 2,
-                (*((float *) village + BOUND_OFFSET + 4) + *((float *) village + BOUND_OFFSET + 1)) / 2,
-                (*((float *) village + BOUND_OFFSET + 5) + *((float *) village + BOUND_OFFSET + 2)) / 2,
-        };
-        return center;
-    }
-
-    AABB getVillageBound(void *village) {
-        Vec3 p1 = {*((float *) village + BOUND_OFFSET + 3), *((float *) village + BOUND_OFFSET + 4),
-                   *((float *) village + BOUND_OFFSET + 5)};
-        Vec3 p2 = {*((float *) village + BOUND_OFFSET), *((float *) village + BOUND_OFFSET + 3),
-                   *((float *) village + BOUND_OFFSET + 4)};
-        AABB aabb(p2, p1);
-        return aabb;
-    }
-
-    float getVillageRadius(void *village) {
-        if (!village)return -1.0;
-        return SYM_CALL(
-                float(*)(void * ),
-                MSSYM_B1QE20getApproximateRadiusB1AA7VillageB2AAA7QEBAMXZ,
-                village
-        );
-    }
+    int getPopulation(void *village);
+
+    int getIronGolemNum(void *village);
+
+    int getBedPOICount(void *village);
+
+
+    int getWorkedVillagerNum(void *village);
+
+    bool canSpawnIronGolem(int population, int golemNum, int workedNum, int bedNUm);
+
+
+    Vec3 getVillageCenter(void *village);
+
+    AABB getVillageBound(void *village);
+
+    float getVillageRadius(void *village);
 
     struct VillageHelper {
         VillageHelper() = default;
 
         std::set<void *> villageList;
 
-        void insert(void *village) {
-            villageList.insert(village);
-        }
-
-        void clear() {
-            villageList.clear();
-        }
-
-        void draw() {
-            if (enableVillageShow) {
-                std::string borderParticleType = "minecraft:dragon_breath_trail";
-                std::string centerParticleType = "minecraft:heart_particle";
-                for (auto village:villageList) {
-                    if (village) {
-                        spawnRectangleParticle(getVillageBound(village), borderParticleType);
-                        Vec3 center = getVillageCenter(village);
-                        //float pos[3] = {center.x, center.y + 0.3f, center.z};
-                        spawnParticle(center, centerParticleType);
-                    }
-                }
-            }
-        }
-
-        void list() {
-            gamePrintf("here are all the ticking villages:\n");
-            int i = 0;
-            for (auto village : villageList) {
-                if (village) {
-                    auto aabb = getVillageBound(village);
-                    auto center = getVillageCenter(village);
-                    auto population = getPopulation(village);
-                    auto bedNum = getBedPOICount(village);
-                    auto golem = getIronGolemNum(village);
-                    auto worked = getWorkedVillagerNum(village);
-                    gamePrintf("v§2%d§b: [%d,%d,%d],[%d,%d,%d]§rc:§b[%d,%d,%d]§rr:§2%.2f p:%d/%d g:%d b:%d  %d\n",
-                               i,
-                               (int) aabb.p1.x,
-                               (int) aabb.p1.y,
-                               (int) aabb.p1.z,
-                               (int) aabb.p2.x,
-                               (int) aabb.p2.y,
-                               (int) aabb.p2.z,
-                               (int) center.x,
-                               (int) center.y,
-                               (int) center.z,
-                               getVillageRadius(village),
-                               worked,
-                               population,
-                               golem,
-                               bedNum,
-                               canSpawnIronGolem(population, golem, worked, bedNum)
-                    );
-                    i++;
-                }
-            }
-        }
-    };
+        void insert(void *village);
 
+        void clear();
+
+        void draw();
+
+        void list();
+    };
 
-    VillageHelper villageHelper;
 
-    int villageInterval = 0;
 
-    void villageTask() {
-        if (villageInterval % 20 == 0 && enableVillageShow) {
-            villageHelper.draw();
-        }
-        if (villageInterval % 100 == 0) {
-            villageHelper.clear();
-        }
-        villageInterval = (villageInterval + 1) % 100;
-    }
 
+    void villageTask();
 
-    void listVillages() {
-        villageHelper.list();
-    }
+    void listVillages();
 }
 //THook(void,
 //      MSSYM_B1QA4tickB1AE14VillageManagerB2AAE13QEAAXAEBUTickB3AAAA1Z,
diff --git a/village/VillagerHook.h b/village/VillagerHook.h
deleted file mode 100644
index cef3ae1..0000000
--- a/village/VillagerHook.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// Created by xhy on 2020/8/24.
-//
-
-#ifndef TRAPDOOR_VILLAGERHOOK_H
-#define TRAPDOOR_VILLAGERHOOK_H
-
-#include "Village.h"
-
-namespace SymHook {
-    //village tick
-    THook(
-            void, MSSYM_B1QA4tickB1AA7VillageB2AAE10QEAAXUTickB2AAE15AEAVBlockSourceB3AAAA1Z,
-            void *vill, void *tick, void * blockSource
-    ) {
-        original(vill, tick, blockSource);
-        villageHelper.insert(vill);
-    }
-
-}
-
-#endif //TRAPDOOR_VILLAGERHOOK_H