refactor: adapt to ll develop

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -47,7 +47,7 @@ body:
   - type: input
     attributes:
       label: Version
-      description: The version of the plugin you are using. (e.g. 1.0.0)
+      description: The version of the mod you are using. (e.g. 1.0.0)
 
   - type: textarea
     attributes:

manifest.json

@@ -1,7 +1,7 @@
 {
-    "name": "${pluginName}",
-    "entry": "${pluginFile}",
-    "version": "${pluginVersion}",
+    "name": "${modName}",
+    "entry": "${modFile}",
+    "version": "${modVersion}",
     "type": "native",
     "dependencies": [
         {

src/command/Commands.cpp

@@ -0,0 +1,26 @@
+#include "command/Commands.h"
+#include "worldedit/WorldEdit.h"
+
+namespace we {
+
+std::vector<std::pair<std::string, std::function<void()>>> setupCommandFunctions;
+
+void setupCommands() {
+    for (auto& [name, fn] : setupCommandFunctions) {
+        WEDEBUG("setup command {}", name);
+        try {
+            fn();
+        } catch (...) {
+            logger().error("threw from setup command {}", name);
+            ll::error_utils::printCurrentException(logger());
+        }
+        WEDEBUG("setup command {} done", name);
+    }
+}
+
+bool addSetup(std::string name, std::function<void()> fn) noexcept {
+    setupCommandFunctions.emplace_back(std::move(name), std::move(fn));
+    return true;
+}
+
+} // namespace we

src/command/Commands.h

@@ -1,13 +1,11 @@
 #pragma once
 
-#include "command/region/RegionCommands.h"
+#include "worldedit/Global.h"
 
 namespace we {
-// void setupTick();
-// void setupbrush();
-void setupCommands() {
-    setupRegionCommands();
-    // setupTick();
-    // setupbrush();
-}
+
+void setupCommands();
+
+bool addSetup(std::string name, std::function<void()>) noexcept;
+
 } // namespace we

src/command/region/Chunk.cpp

@@ -1,9 +1,10 @@
+#include "command/Commands.h"
 #include "data/PlayerStateManager.h"
 #include "region/LoftRegion.h"
 #include "worldedit/WorldEdit.h"
 
 namespace we {
-void setupChunk() {
+static bool _ = addSetup("chunk", [] {
     auto& config = WorldEdit::getInstance().getConfig().commands.region.chunk;
     if (!config.enabled) {
         return;
@@ -37,5 +38,5 @@ void setupChunk() {
             state->regionType = RegionType::Cuboid;
             output.success("chunk selected"_tr());
         });
-}
+});
 } // namespace we

src/command/region/Hpos1.cpp

@@ -1,9 +1,10 @@
+#include "command/Commands.h"
 #include "data/PlayerStateManager.h"
 #include "region/LoftRegion.h"
 #include "worldedit/WorldEdit.h"
 
 namespace we {
-void setupHpos1() {
+static bool _ = addSetup("hpos1", [] {
     auto& config = WorldEdit::getInstance().getConfig().commands.region.hpos1;
     if (!config.enabled) {
         return;
@@ -44,5 +45,5 @@ void setupHpos1() {
                 output.error("can't set main position at {0}"_tr(hitResult.mBlockPos));
             }
         });
-}
+});
 } // namespace we

src/command/region/Hpos2.cpp

@@ -1,9 +1,10 @@
 #include "data/PlayerStateManager.h"
 #include "region/LoftRegion.h"
+#include "command/Commands.h"
 #include "worldedit/WorldEdit.h"
 
 namespace we {
-void setupHpos2() {
+static bool _ = addSetup("hpos2", [] {
     auto& config = WorldEdit::getInstance().getConfig().commands.region.hpos2;
     if (!config.enabled) {
         return;
@@ -44,5 +45,5 @@ void setupHpos2() {
                 output.error("can't set off position at {0}"_tr(hitResult.mBlockPos));
             }
         });
-}
+});
 } // namespace we

src/command/region/Loftcycle.cpp

@@ -1,3 +1,4 @@
+#include "command/Commands.h"
 #include "data/PlayerStateManager.h"
 #include "region/LoftRegion.h"
 #include "worldedit/WorldEdit.h"
@@ -8,7 +9,7 @@ struct Params {
     bool cycle;
 };
 
-void setupLoftcycle() {
+static bool _ = addSetup("loftcycle", [] {
     auto& config = WorldEdit::getInstance().getConfig().commands.region.loftcycle;
     if (!config.enabled) {
         return;
@@ -34,5 +35,5 @@ void setupLoftcycle() {
             output.success("set loft region cycle to {0}"_tr(params.cycle));
         }
     );
-}
+});
 } // namespace we

src/command/region/Pos1.cpp

@@ -1,3 +1,4 @@
+#include "command/Commands.h"
 #include "data/PlayerStateManager.h"
 #include "region/LoftRegion.h"
 #include "worldedit/WorldEdit.h"
@@ -6,7 +7,7 @@ namespace we {
 struct Params {
     ll::command::Optional<CommandPositionFloat> pos;
 };
-void setupPos1() {
+static bool _ = addSetup("pos1", [] {
     auto& config = WorldEdit::getInstance().getConfig().commands.region.pos1;
     if (!config.enabled) {
         return;
@@ -43,5 +44,5 @@ void setupPos1() {
                 output.error("can't set main position at {0}"_tr(pos));
             }
         });
-}
+});
 } // namespace we

src/command/region/Pos2.cpp

@@ -1,3 +1,4 @@
+#include "command/Commands.h"
 #include "data/PlayerStateManager.h"
 #include "region/LoftRegion.h"
 #include "worldedit/WorldEdit.h"
@@ -6,7 +7,7 @@ namespace we {
 struct Params {
     ll::command::Optional<CommandPositionFloat> pos;
 };
-void setupPos2() {
+static bool _ = addSetup("pos2", [] {
     auto& config = WorldEdit::getInstance().getConfig().commands.region.pos2;
     if (!config.enabled) {
         return;
@@ -43,5 +44,5 @@ void setupPos2() {
                 output.error("can't set off position at {0}"_tr(pos));
             }
         });
-}
+});
 } // namespace we

src/command/region/Sel.cpp

@@ -1,3 +1,4 @@
+#include "command/Commands.h"
 #include "data/PlayerStateManager.h"
 #include "region/Region.h"
 #include "worldedit/WorldEdit.h"
@@ -15,7 +16,7 @@ struct SelRm {
     SelRemoveType type;
 };
 
-void setupSel() {
+static bool _ = addSetup("sel", [] {
     auto& config = WorldEdit::getInstance().getConfig().commands.region.sel;
     if (!config.enabled) {
         return;
@@ -86,5 +87,5 @@ void setupSel() {
         state->offPos.reset();
         output.success("region switch to {0}"_tr(params.type));
     });
-}
+});
 } // namespace we

src/data/Config.h

@@ -40,11 +40,11 @@ struct Config {
         int   minimum_response_tick = 3;
     } player_state;
     struct {
-        int player_log_level = 3;
+        ll::io::LogLevel player_log_level{ll::io::LogLevel::Warn};
     } log;
 
     struct PlayerConfig {
-        RegionType   default_region_type{RegionType::Cuboid};
+        RegionType   default_region_type{RegionType::Expand};
         HashedString wand = VanillaItemNames::WoodenAxe;
     } player_default_config;
 };

src/data/PlayerState.cpp

@@ -14,7 +14,7 @@ void PlayerState::setMainPosInternal() {
         auto& we     = WorldEdit::getInstance();
         mainPos->geo = we.getGeo().box(
             mainPos->data.dim,
-            AABB{mainPos->data.pos}.shrink(-0.07),
+            AABB{mainPos->data.pos}.shrink(-0.07f),
             we.getConfig().colors.main_hand_color
         );
     }
@@ -24,7 +24,7 @@ void PlayerState::setOffPosInternal() {
         auto& we    = WorldEdit::getInstance();
         offPos->geo = we.getGeo().box(
             offPos->data.dim,
-            AABB{offPos->data.pos}.shrink(-0.06),
+            AABB{offPos->data.pos}.shrink(-0.06f),
             we.getConfig().colors.off_hand_color
         );
     }