fix: fix save command broken

Bug other mod probably breaks the save command

Author: xiaoqch

scripts/generate_hooks.py

@@ -10,7 +10,8 @@
     # "mc\\server\\ServerPlayer.h",
     # "mc\\server\\SimulatedPlayer.h",
     # "mc\\network\\LoopbackPacketSender.h",
-    "mc\\network\\ServerNetworkHandler.h",
+    # "mc\\network\\ServerNetworkHandler.h",
+    "mc\\server\\commands\\CommandRegistry.h",
     # "mc\\network\\PacketObserver.h",
     # "mc\\gametest\\MinecraftGameTestHelper.h",
 ]
@@ -96,11 +97,15 @@ def gen_hook_cpp(include_path):
             print(api)
             if api.startswith(f"{className}("):
                 continue
-            m = re.match(
-                r"^(?P<static>static )?(?P<rtn>.+[^,]) (?P<name>\$?[\w_]+)\((?P<params>.*) *\)( const)?;",
-                api,
-            ).groupdict()
-            print(m)
+            if not (
+                m := re.match(
+                    r"^(?P<static>static )?(?P<rtn>.+[^,]) (?P<name>\$?[\w_]+)\((?P<params>.*) *\)( const)?;",
+                    api,
+                )
+            ):
+                continue
+            groupdict=m.groupdict()
+            print(groupdict)
 
             def iter_params(params: str):
                 last_index = 0
@@ -146,21 +151,21 @@ def iter_params(params: str):
             #         m["params"],
             #     ),
             # )
-            params = iter_params(m["params"])
+            params = iter_params(groupdict["params"])
             params = list(params)
             print(params)
             hook_type = (
                 "LL_AUTO_TYPE_STATIC_HOOK"
-                if m["static"]
+                if groupdict["static"]
                 else "LL_AUTO_TYPE_INSTANCE_HOOK"
             )
-            hook_id = f"HOOK_{className}_{m["name"]}"
+            hook_id = f"HOOK_{className}_{groupdict["name"]}"
             name_count[hook_id] += 1
             if name_count[hook_id] > 0:
                 hook_id = f"{hook_id}{name_count[hook_id]}"
-            hook_addr = f"&{className}::{m["name"]}"
+            hook_addr = f"&{className}::{groupdict["name"]}"
             hook_priority = "ll::memory::HookPriority::Normal"
-            hook_rtn = m["rtn"]
+            hook_rtn = groupdict["rtn"]
             alias_list = []
             if hook_rtn.find(",") >= 0:
                 alias_list.append(f"using {hook_id}_rtn = {hook_rtn};")
@@ -185,7 +190,7 @@ def build_marco_param(index: int, param: dict[str, str]):
             call_name = "onHookCall"
             call_params = f'"{hook_id}"'
             if (
-                m["name"] == "$handle"
+                groupdict["name"] == "$handle"
                 and params[0]["type"] == "::NetworkIdentifier const&"
             ):
                 call_name = "onHandlePacket"

src/lfp/LeviFakePlayer.cpp

@@ -59,15 +59,21 @@ bool LeviFakePlayer::load() {
 bool LeviFakePlayer::enable() {
     getSelf().getLogger().debug("Enabling...");
 
-    auto& config = getConfig().config;
-    if (config.command.enabled) {
-        FakePlayerCommand::setup(config.command);
+    mFixManager->onPluginEnable();
+
+    ll::thread::ServerThreadExecutor::getDefault().executeAfter(
+        []() {
+            auto& config = lfp::LeviFakePlayer::getInstance().getConfig().config;
+            if (config.command.enabled) {
+                FakePlayerCommand::setup(config.command);
 #ifndef LFP_DEBUG
-        if (config.command.enableTickingCommand && *config.command.enableTickingCommand)
+                if (config.command.enableTickingCommand && *config.command.enableTickingCommand)
 #endif // always enabled in debug build
-            TickingCommand::setup();
-    }
-    mFixManager->onPluginEnable();
+                    TickingCommand::setup();
+            }
+        },
+        ll::chrono::ticks{1}
+    );
     // TODO: crash
     // auto& eventBus = ll::event::EventBus::getInstance();
     // auto stoppingListener = eventBus.emplaceListener<ll::event::ServerStoppingEvent>([](auto) {

src/lfp/command/FakePlayerCommand.cpp

@@ -3,10 +3,13 @@
 #include <string>
 #include <vector>
 
+#include "lfp/Config.h"
 #include "lfp/utils/DebugUtils.h"
 #include "ll/api/command/EnumName.h"
 #include "mc/server/commands/CommandOutput.h"
 #include "mc/server/commands/CommandPosition.h"
+#include "mc/server/commands/CommandRegistry.h"
+#include "mc/world/Minecraft.h"
 #include "mc/world/level/BlockPos.h"
 #include "mc/world/level/dimension/Dimension.h"
 
@@ -50,7 +53,7 @@ struct LFPCreateCommand {
     ll::command::Optional<CommandPosition> pos;
     ll::command::Optional<DimensionType>   dim;
 };
-struct LFPCommandWithString {
+struct LFPCommandWithNameStr {
     std::string name;
 };
 
@@ -148,6 +151,7 @@ void FakePlayerCommand::setup(LeviFakePlayerConfig::CommandConfig const& config)
             }
         }
     );
+
     // lfp create <name: string> [pos: x y z] [dim: Dimension]
     command.overload<LFPCreateCommand>()
         .text("create")
@@ -179,8 +183,8 @@ void FakePlayerCommand::setup(LeviFakePlayerConfig::CommandConfig const& config)
         });
 
     // lfp import name
-    command.overload<LFPCommandWithString>().text("import").optional("name").execute(
-        [](CommandOrigin const&, CommandOutput& output, LFPCommandWithString const& params) {
+    command.overload<LFPCommandWithNameStr>().text("import").optional("name").execute(
+        [](CommandOrigin const&, CommandOutput& output, LFPCommandWithNameStr const& params) {
             auto& manager = FakePlayerManager::getManager();
             auto& name    = params.name;
             if (!name.empty()) {

src/test/TestManager.cpp

@@ -72,7 +72,7 @@ ll::coro::CoroTask<void> testEntry() {
 #elif defined(NDEBUG)
     testLogger.warn("Testing in Release Mode");
 #endif
-    co_await 10_tick;
+    co_await 1_tick;
     auto result = co_await TestManager::getInstance().runAllTest();
     if (!result) {
         testLogger.error("Test Failed!!!");

src/test/tests/OtherTest.cpp

@@ -1,15 +1,57 @@
 #include "../TestManager.h"
 #include "../utils/TestUtils.h"
 #include "test/utils/CoroUtils.h"
+
+#include "magic_enum.hpp"
+#include "mc/server/commands/CommandRegistry.h"
 #include <string>
 
 #include "ll/api/chrono/GameChrono.h"
+#include "ll/api/memory/Hook.h"
+#include "ll/api/service/Bedrock.h"
+
 
 using namespace ll::chrono_literals;
 
 namespace lfp::test {
 
+LL_TYPE_INSTANCE_HOOK(
+    HOOK_CommandRegistry_registerCommand1,
+    ll::memory::HookPriority::Normal,
+    CommandRegistry,
+    &CommandRegistry::registerCommand,
+    void,
+    ::std::string const&     name,
+    char const*              description,
+    ::CommandPermissionLevel requirement,
+    ::CommandFlag            f1,
+    ::CommandFlag            f2
+) {
+    fmt::println(
+        "CommandRegistry::registerCommand({}, {}, {}, {}, {})",
+        name,
+        description,
+        magic_enum::enum_name(requirement),
+        magic_enum::enum_name(f1.value),
+        magic_enum::enum_name(f2.value)
+    );
+    return origin(
+        std::forward<::std::string const&>(name),
+        std::forward<char const*>(description),
+        std::forward<::CommandPermissionLevel>(requirement),
+        std::forward<::CommandFlag>(f1),
+        std::forward<::CommandFlag>(f2)
+    );
+};
+
 LFP_CO_TEST(OtherTest, BdsSaveCommand) {
+    co_await waitUntil([] {
+        return ll::service::getCommandRegistry()
+            .transform([](CommandRegistry& reg) {
+                return nullptr != reg.findCommand("levifakeplayer");
+            })
+            .value_or(false);
+    });
     auto result                    = executeCommandEx("save hold");
     auto& [success, count, output] = result;
     testLogger.debug("success: {}, count: {}, output: {}", success, count, output);