chore: add some debug output

OEOTYAN · Oct 4, 2024 · dfec96d · dfec96d
1 parent 3ca9ad1
commit dfec96d
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 9 deletions.
diff --git a/src/command/CommandMacro.cpp b/src/command/CommandMacro.cpp
@@ -8,20 +8,20 @@ auto& setupCommandFunctions() {
 }
 void setupCommands() {
     for (auto& [name, fn] : setupCommandFunctions()) {
-        WE_DEBUG("setup command {}", name);
+        WE_DEBUG("setup command {0}", name);
         try {
             fn();
         } catch (...) {
-            logger().error("threw from setup command {}", name);
+            logger().error("threw from setup command {0}", name);
             ll::error_utils::printCurrentException(logger());
         }
-        WE_DEBUG("setup command {} done", name);
+        WE_DEBUG("setup command {0} done", name);
     }
 }
 bool SetupCommandFunctor::operator|(void (*fn)(ll::command::CommandHandle&)) noexcept {
     auto& map = setupCommandFunctions();
     WE_ASSERT(!map.contains(name), "setup same cmd twice");
-    setupCommandFunctions().try_emplace(std::move(name), [handler = handler, fn] {
+    map.try_emplace(std::move(name), [handler = handler, fn] {
         handler().transform([&](auto& handle) {
             fn(handle);
             return true;

diff --git a/src/command/CommandMacro.h b/src/command/CommandMacro.h
@@ -28,6 +28,14 @@ class CommandContextRef {
     template <class... Args>
     void success(fmt::format_string<Args...> fmt, Args&&... args) const {
         auto fsv = fmt.get();
+        WE_DEBUG(
+            "command [{0}] [success]: {0}",
+            cmd.getCommandName(),
+            fmt::vformat(
+                ll::i18n::getInstance().get({fsv.data(), fsv.size()}, {}),
+                fmt::make_format_args(args...)
+            )
+        );
         output.success(fmt::vformat(
             ll::i18n::getInstance().get({fsv.data(), fsv.size()}, {}),
             fmt::make_format_args(args...)
@@ -37,6 +45,14 @@ class CommandContextRef {
     template <class... Args>
     void error(fmt::format_string<Args...> fmt, Args&&... args) const {
         auto fsv = fmt.get();
+        WE_DEBUG(
+            "command [{0}] [error]: {0}",
+            cmd.getCommandName(),
+            fmt::vformat(
+                ll::i18n::getInstance().get({fsv.data(), fsv.size()}, {}),
+                fmt::make_format_args(args...)
+            )
+        );
         output.error(fmt::vformat(
             ll::i18n::getInstance().get({fsv.data(), fsv.size()}, {}),
             fmt::make_format_args(args...)
@@ -109,4 +125,4 @@ std::shared_ptr<PlayerContext> getPlayerContext(CommandContextRef const& ctx);
             }                                                                            \
         }                                                                                \
         | [](ll::command::CommandHandle & command)
-#endif
+#endif
diff --git a/src/command/region/Hpos1.cpp b/src/command/region/Hpos1.cpp
@@ -16,7 +16,6 @@ REG_CMD(region, hpos1, "sets the main position to the cursor position") {
         }
         if (hitResult.mIsHitLiquid && !player->isImmersedInWater()) {
             hitResult.mBlockPos = hitResult.mLiquid;
-            hitResult.mFacing   = hitResult.mLiquidFacing;
         }
         if (pctx->setMainPos({hitResult.mBlockPos, player->getDimensionId()})) {
             ctx.success("set main position at {0}", hitResult.mBlockPos);

diff --git a/src/command/region/Hpos2.cpp b/src/command/region/Hpos2.cpp
@@ -16,7 +16,6 @@ REG_CMD(region, hpos2, "sets the off position to the cursor position") {
         }
         if (hitResult.mIsHitLiquid && !player->isImmersedInWater()) {
             hitResult.mBlockPos = hitResult.mLiquid;
-            hitResult.mFacing   = hitResult.mLiquidFacing;
         }
         if (pctx->setOffPos({hitResult.mBlockPos, player->getDimensionId()})) {
             ctx.success("set off position at {0}", hitResult.mBlockPos);

diff --git a/src/command/region/Pos2.cpp b/src/command/region/Pos2.cpp
@@ -10,7 +10,7 @@ REG_CMD(region, pos2, "sets the off position to the given or current position")
         [](CommandContextRef const& ctx, Params const& params) {
             auto dim = checkDimension(ctx);
             if (!dim) return;
-            BlockPos pos  = params.pos.transform(ctx.transformPos()).value_or(ctx.pos());
+            BlockPos pos = params.pos.transform(ctx.transformPos()).value_or(ctx.pos());
             if (getPlayerContext(ctx)->setOffPos({pos, dim->getDimensionId()})) {
                 ctx.success("set off position at {0}", pos);
             } else {

diff --git a/src/worldedit/Macros.h b/src/worldedit/Macros.h
@@ -1,13 +1,31 @@
 #pragma once
 
+#if 0
+
+
+#ifndef WE_DEBUG
+#define WE_DEBUG(...) ((void)0)
+#endif
+
+#ifndef WE_ASSERT
+#define WE_ASSERT(...) ((void)0)
+#endif
+
+
+#else
+
+
 #ifndef WE_DEBUG
 #define WE_DEBUG(...) ::we::logger().debug(__VA_ARGS__)
 #endif
 
 #ifndef WE_ASSERT
 #define WE_ASSERT(expression, message)                                                   \
     (void)((!!(expression))                                                              \
-           || (::we::logger().debug("assert {} failed, {}", #expression, message),       \
+           || (::we::logger().debug("assert {0} failed, {1}", #expression, message),     \
                std::terminate(),                                                         \
                0))
 #endif
+
+
+#endif