From 72b949e4c016c1895ca3b4fa9aea3b4b21b097fa Mon Sep 17 00:00:00 2001
From: hhhxiao <1417599491@qq.com>
Date: Fri, 4 Dec 2020 23:09:43 +0800
Subject: [PATCH] repair commandPacket hook

---
 .idea/workspace.xml  | 44 +++++++++++++++++---------------------------
 CMakeLists.txt       |  2 +-
 commands/Command.cpp | 26 +++++++++++++-------------
 dllmain.cpp          |  3 ++-
 test/testMain.cpp    | 11 ++++++++---
 tools/Message.cpp    | 16 ++++++++++++++++
 tools/Message.h      |  4 ++++
 7 files changed, 61 insertions(+), 45 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8783661..5f9ced4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -17,25 +17,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="b8a60db2-baf4-4087-8601-d054cc921b14" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/block/Block.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/block/Block.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/block/Hopper.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/block/Hopper.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/CMakeLists.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/commands/Command.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/commands/Command.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/commands/CommandManager.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/commands/CommandManager.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/ConfigManager.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/common/ConfigManager.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/Trapdoor.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/common/Trapdoor.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/Trapdoor.h" beforeDir="false" afterPath="$PROJECT_DIR$/common/Trapdoor.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/entity/Actor.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/entity/Actor.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/entity/Item.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/entity/Item.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/entity/Player.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/entity/Player.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/level/Dimension.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/level/Dimension.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/level/Level.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/level/Level.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tick/GameTick.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/tick/GameTick.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/DirtyLogger.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/tools/DirtyLogger.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dllmain.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/dllmain.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/testMain.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/test/testMain.cpp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/tools/Message.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/tools/Message.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/Particle.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/tools/Particle.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/village/Village.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/village/Village.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tools/Message.h" beforeDir="false" afterPath="$PROJECT_DIR$/tools/Message.h" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -258,7 +246,9 @@
       <workItem from="1606906678135" duration="79000" />
       <workItem from="1606906772675" duration="108000" />
       <workItem from="1606906896030" duration="5892000" />
-      <workItem from="1607004411845" duration="3519000" />
+      <workItem from="1607004411845" duration="3938000" />
+      <workItem from="1607089817058" duration="2942000" />
+      <workItem from="1607092847152" duration="1473000" />
     </task>
     <task id="LOCAL-00001" summary="1. 命令解释器投入使用，和switch case 彻底告别&#10;2. 支持游戏模式切换命令 ./gm mode n (n=3是观察模式)">
       <created>1604761522583</created>
@@ -315,22 +305,22 @@
       <screen x="0" y="0" width="1549" height="831" />
     </state>
     <state x="497" y="108" key="FileChooserDialogImpl/0.0.1549.831@0.0.1549.831" timestamp="1606644181264" />
-    <state width="1528" height="371" key="GridCell.Tab.0.bottom" timestamp="1606922372814">
+    <state width="1513" height="2" key="GridCell.Tab.0.bottom" timestamp="1607092826859">
       <screen x="0" y="0" width="1549" height="831" />
     </state>
-    <state width="1528" height="371" key="GridCell.Tab.0.bottom/0.0.1549.831@0.0.1549.831" timestamp="1606922372814" />
-    <state width="1528" height="371" key="GridCell.Tab.0.center" timestamp="1606922372814">
+    <state width="1513" height="2" key="GridCell.Tab.0.bottom/0.0.1549.831@0.0.1549.831" timestamp="1607092826859" />
+    <state width="1513" height="2" key="GridCell.Tab.0.center" timestamp="1607092826859">
       <screen x="0" y="0" width="1549" height="831" />
     </state>
-    <state width="1528" height="371" key="GridCell.Tab.0.center/0.0.1549.831@0.0.1549.831" timestamp="1606922372814" />
-    <state width="1528" height="371" key="GridCell.Tab.0.left" timestamp="1606922372814">
+    <state width="1513" height="2" key="GridCell.Tab.0.center/0.0.1549.831@0.0.1549.831" timestamp="1607092826859" />
+    <state width="1513" height="2" key="GridCell.Tab.0.left" timestamp="1607092826858">
       <screen x="0" y="0" width="1549" height="831" />
     </state>
-    <state width="1528" height="371" key="GridCell.Tab.0.left/0.0.1549.831@0.0.1549.831" timestamp="1606922372814" />
-    <state width="1528" height="371" key="GridCell.Tab.0.right" timestamp="1606922372814">
+    <state width="1513" height="2" key="GridCell.Tab.0.left/0.0.1549.831@0.0.1549.831" timestamp="1607092826858" />
+    <state width="1513" height="2" key="GridCell.Tab.0.right" timestamp="1607092826859">
       <screen x="0" y="0" width="1549" height="831" />
     </state>
-    <state width="1528" height="371" key="GridCell.Tab.0.right/0.0.1549.831@0.0.1549.831" timestamp="1606922372814" />
+    <state width="1513" height="2" key="GridCell.Tab.0.right/0.0.1549.831@0.0.1549.831" timestamp="1607092826859" />
     <state x="148" y="65" key="MergeDialog" timestamp="1604670663442">
       <screen x="0" y="0" width="1549" height="831" />
     </state>
@@ -343,10 +333,10 @@
       <screen x="0" y="0" width="1549" height="831" />
     </state>
     <state x="367" y="148" key="Vcs.Push.Dialog.v2/0.0.1549.831@0.0.1549.831" timestamp="1604898985160" />
-    <state x="567" y="18" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1606907337637">
+    <state x="567" y="18" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1607090949319">
       <screen x="0" y="0" width="1549" height="831" />
     </state>
-    <state x="567" y="18" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.0.1549.831@0.0.1549.831" timestamp="1606907337637" />
+    <state x="567" y="18" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.0.1549.831@0.0.1549.831" timestamp="1607090949319" />
     <state x="590" y="328" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1604898934302">
       <screen x="0" y="0" width="1549" height="831" />
     </state>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b43737c..34418d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ set(CMAKE_CXX_STANDARD 17)
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     add_compile_definitions(-O3 -Wall)
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-    add_compile_options(/wd4819 /EHsc)
+    add_compile_options(/wd4828 /wd4819 /EHsc /utf-8)
 endif ()
 include_directories(.)
 
diff --git a/commands/Command.cpp b/commands/Command.cpp
index f17158b..493fd54 100644
--- a/commands/Command.cpp
+++ b/commands/Command.cpp
@@ -21,7 +21,7 @@ using namespace SymHook;
 //注册命令
 void initCommand() {
 
-    getCommandManager().registerCmd("tick", "chang level tick speed")
+    getCommandManager().registerCmd("tick", "改变世界运行状态")
             ->then(ARG("fz", "freeze the world", NONE, { tick::freezeTick(); }))
 
             ->then(ARG("slow", "slow the world run for [num] times", INT, {
@@ -34,7 +34,7 @@ void initCommand() {
             }))
 
 
-            ->then(ARG("acc", "accelerate the wold run for [num] times", INT, {
+            ->then(ARG("acc", "加速世界运行[num]倍速", INT, {
                 auto wrapTime = holder->getInt();
                 if (wrapTime > 1 && wrapTime <= 10) {
                     tick::wrapTick(wrapTime);
@@ -43,9 +43,9 @@ void initCommand() {
                 }
             }))
 
-            ->then(ARG("r", "reset the world run to default", NONE, { tick::resetTick(); }))
+            ->then(ARG("r", "重置世界运行", NONE, { tick::resetTick(); }))
 
-            ->then(ARG("fw", "forward the world run for [num] ticks", INT, { tick::forwardTick(holder->getInt()); }));
+            ->then(ARG("fw", "世界运行步进[num] gt", INT, { tick::forwardTick(holder->getInt()); }));
 
     getCommandManager().registerCmd("prof", "ticking profiling")->EXE({ tick::profileWorld(player); });
 
@@ -86,14 +86,14 @@ void initCommand() {
 
                   });
 
-    getCommandManager().registerCmd("vil", "village relative functions", MEMBER)
+    getCommandManager().registerCmd("village", "村庄相关功能", MEMBER)
             ->then(ARG("list", "list all ticking villages", NONE, { village::listVillages(player); }))
             ->then(ARG("show", "show ticking villages bounds and center", BOOL, {
                 enableVillageShow = holder->getBool();
                 // info(player, "developing...");
             }));
 
-    getCommandManager().registerCmd("cfg", "settings")
+    getCommandManager().registerCmd("cfg", "设置")
             ->then(ARG("pvd", "config particle view distance(default=128)", INT, {
                 particleViewDistance = holder->getInt();
                 info(player, "set particle view distance to %d", particleViewDistance);
@@ -152,7 +152,7 @@ THook(
         MSSYM_B1QA6handleB1AE20ServerNetworkHandlerB2AAE26UEAAXAEBVNetworkIdentifierB2AAE24AEBVCommandRequestPacketB3AAAA1Z,
         void *handler,
         NetworkIdentifier *id,
-        void * packet
+        void * commandPacket
 ) {
     //根据玩家的网络id值来寻找发送命令的玩家
     Actor *source = nullptr;
@@ -164,20 +164,20 @@ THook(
     });
     if (!source) {
         L_DEBUG("can't not find valid player");
-        original(handler, id, packet);
+        original(handler, id, commandPacket);
         return;
     }
 
     //! 这是一处强制转换
-    std::string commandString(reinterpret_cast<char *>(packet) + 40);
-    L_DEBUG("player %s execute command %s", source->getNameTag().c_str(), commandString.c_str());
+    auto *commandString = reinterpret_cast<std::string *>((char *) commandPacket + 40);
+    L_DEBUG("player %s execute command %s", source->getNameTag().c_str(), commandString->c_str());
     //截获命令数据包，获取命令字符串，如果是插件自定义的命令就直接处理，屏蔽原版，如果不是自定义命令就转发给原版去处理
-    if (getCommandManager().findCommand(commandString)) {
+    if (getCommandManager().findCommand(*commandString)) {
         //解析自定义命令
-        getCommandManager().parse(source, commandString);
+        getCommandManager().parse(source, *commandString);
     } else {
         //转发给原版
-        original(handler, id, packet);
+        original(handler, id, commandPacket);
     }
 
 }
diff --git a/dllmain.cpp b/dllmain.cpp
index 76d07da..85ccca1 100644
--- a/dllmain.cpp
+++ b/dllmain.cpp
@@ -6,7 +6,8 @@
 #define DBG_MACRO_NO_WARNING
 
 void mod_init() {
-    initLogger("trapdoor.log", false);
+    system("chcp 65001");
+    initLogger("trapdoor.log", true);
     HANDLE hOutput = GetStdHandle(STD_OUTPUT_HANDLE);
     DWORD dwMode;
     GetConsoleMode(hOutput, &dwMode);
diff --git a/test/testMain.cpp b/test/testMain.cpp
index 98b7060..fbca1a3 100644
--- a/test/testMain.cpp
+++ b/test/testMain.cpp
@@ -12,8 +12,13 @@
 using json = nlohmann::json;
 
 int main() {
-    initLogger("QAQ", true);
-    ConfigManager manager;
-    manager.initialize("config.json");
+    char *str = new char[12];
+    for (int i = 0; i < 12; ++i) {
+        str[i] = 'a';
+    }
+    str[11] = 0;
+    std::string s(str);
+    delete [] str;
+    std::cout<<s;
     return 0;
 }
diff --git a/tools/Message.cpp b/tools/Message.cpp
index ccd9340..8e4144f 100644
--- a/tools/Message.cpp
+++ b/tools/Message.cpp
@@ -23,3 +23,19 @@ void mcbe_sendMessage(std::string &s, Actor *player) {
 }
 
 
+std::string gbkToUtf8(const char *src_str) {
+    int len = MultiByteToWideChar(CP_ACP, 0, src_str, -1, nullptr, 0);
+    auto *wstr = new wchar_t[len + 1];
+    memset(wstr, 0, len + 1);
+    MultiByteToWideChar(CP_ACP, 0, src_str, -1, wstr, len);
+    len = WideCharToMultiByte(CP_UTF8, 0, wstr, -1, nullptr, 0, nullptr, nullptr);
+    char *str = new char[len + 1];
+    memset(str, 0, len + 1);
+    WideCharToMultiByte(CP_UTF8, 0, wstr, -1, str, len, nullptr, nullptr);
+    std::string strTemp(str);
+    delete[] wstr;
+    delete[] str;
+    return strTemp;
+}
+
+
diff --git a/tools/Message.h b/tools/Message.h
index 320a5be..0208bae 100644
--- a/tools/Message.h
+++ b/tools/Message.h
@@ -57,4 +57,8 @@ void broadcastMsg(const std::string &format, Args ... args) {
     });
 }
 
+//from  https://blog.csdn.net/u012234115/article/details/83186386
+std::string gbkToUtf8(const char *src_str);
+
+
 #endif //TRAPDOOR_MESSAGE_H