refactor: apply some suggestions from clang-tidy

ShrBox · ShrBox · commit 98d74faad209 · 2026-03-30T18:15:46.000+08:00
diff --git a/src-client/lse/PluginManager.cpp b/src-client/lse/PluginManager.cpp
@@ -46,7 +46,7 @@ constexpr auto PluginManagerName = "lse-nodejs";
 #endif
 
 // Do not use legacy headers directly, otherwise there will be tons of errors.
-void BindAPIs(std::shared_ptr<ScriptEngine> engine);
+void BindAPIs(std::shared_ptr<ScriptEngine> const& engine);
 void LLSERemoveTimeTaskData(std::shared_ptr<ScriptEngine> const& engine);
 bool LLSERemoveAllEventListeners(std::shared_ptr<ScriptEngine> engine);
 bool LLSERemoveCmdRegister(std::shared_ptr<ScriptEngine> engine);
diff --git a/src/lse/Entry.cpp b/src/lse/Entry.cpp
@@ -129,9 +129,9 @@ bool LegacyScriptEngine::unload() {
     return true;
 }
 
-Config const& LegacyScriptEngine::getConfig() { return config; }
+Config const& LegacyScriptEngine::getConfig() const { return config; }
 
-PluginManager& LegacyScriptEngine::getManager() {
+PluginManager& LegacyScriptEngine::getManager() const {
     if (!pluginManager) {
         throw std::runtime_error("pluginManager is null");
     }
diff --git a/src/lse/Entry.h b/src/lse/Entry.h
@@ -16,9 +16,9 @@ class LegacyScriptEngine {
 
     [[nodiscard]] ll::mod::NativeMod& getSelf() const { return mSelf; }
 
-    [[nodiscard]] Config const& getConfig();
+    [[nodiscard]] Config const& getConfig() const;
 
-    [[nodiscard]] PluginManager& getManager();
+    [[nodiscard]] PluginManager& getManager() const;
 
     bool load();
 
diff --git a/src/lse/PluginMigration.cpp b/src/lse/PluginMigration.cpp
@@ -7,7 +7,6 @@
 #include "lse/Entry.h"
 
 #include <filesystem>
-#include <fmt/format.h>
 #include <fstream>
 #include <nlohmann/json.hpp>
 #include <unordered_set>
@@ -45,18 +44,18 @@ namespace lse {
 
 namespace {
 
-auto migratePlugin(const PluginManager& pluginManager, const std::filesystem::path& path) -> void {
+auto migratePlugin(PluginManager const& pluginManager, std::filesystem::path const& path) -> void {
     auto& self = LegacyScriptEngine::getInstance().getSelf();
 
     auto& logger = self.getLogger();
 
     logger.info("Migrating legacy plugin at {0}"_tr(ll::string_utils::u8str2str(path.u8string())));
 
-    const auto& pluginType = pluginManager.getType();
+    auto const& pluginType = pluginManager.getType();
 
-    const auto& pluginFileName     = path.filename();
-    const auto& pluginFileBaseName = path.stem();
-    const auto& pluginDir          = ll::mod::getModsRoot() / pluginFileBaseName;
+    auto const& pluginFileName     = path.filename();
+    auto const& pluginFileBaseName = path.stem();
+    auto const& pluginDir          = ll::mod::getModsRoot() / pluginFileBaseName;
 
     if (std::filesystem::exists(pluginDir / pluginFileName)) {
         throw std::runtime_error(
@@ -115,7 +114,7 @@ auto migratePlugin(const PluginManager& pluginManager, const std::filesystem::pa
 
 } // namespace
 
-auto migratePlugins(const PluginManager& pluginManager) -> void {
+auto migratePlugins(PluginManager const& pluginManager) -> void {
     auto& self = LegacyScriptEngine::getInstance().getSelf();
 
     auto& logger = self.getLogger();
@@ -125,9 +124,9 @@ auto migratePlugins(const PluginManager& pluginManager) -> void {
     // Discover plugins.
     // logger.info("Discovering legacy plugins..."_tr());
 
-    const auto& pluginBaseDir = ll::mod::getModsRoot();
+    auto const& pluginBaseDir = ll::mod::getModsRoot();
 
-    for (const auto& entry : std::filesystem::directory_iterator(pluginBaseDir)) {
+    for (auto const& entry : std::filesystem::directory_iterator(pluginBaseDir)) {
         if (!entry.is_regular_file() || entry.path().extension() != PluginExtName) {
             continue;
         }
@@ -143,7 +142,7 @@ auto migratePlugins(const PluginManager& pluginManager) -> void {
     // Migrate plugins.
     logger.info("Migrating legacy plugins..."_tr());
 
-    for (const auto& path : pluginPaths) {
+    for (auto const& path : pluginPaths) {
         migratePlugin(pluginManager, path);
     }
 
diff --git a/src/lse/PluginMigration.h b/src/lse/PluginMigration.h
@@ -4,6 +4,6 @@
 
 namespace lse {
 
-auto migratePlugins(const PluginManager& pluginManager) -> void;
+auto migratePlugins(PluginManager const& pluginManager) -> void;
 
 } // namespace lse
diff --git a/src/lse/api/DirectFormatter.cpp b/src/lse/api/DirectFormatter.cpp
@@ -1,7 +1,7 @@
 #include "lse/api/DirectFormatter.h"
 
 namespace lse::io {
-void DirectFormatter::format(const ll::io::LogMessageView& view, std::string& buffer) const noexcept {
+void DirectFormatter::format(const LogMessageView& view, std::string& buffer) const noexcept {
     buffer = view.msg;
 }
-} // namespace lse::io
+} // namespace lse::io
diff --git a/src/lse/api/DirectFormatter.h b/src/lse/api/DirectFormatter.h
@@ -1,13 +1,15 @@
+#pragma once
+
 #include "ll/api/io/Formatter.h"
 
 namespace lse::io {
 using namespace ll::io;
 class DirectFormatter : public Formatter {
 public:
-    DirectFormatter()                   = default;
-    virtual ~DirectFormatter() override = default;
+    DirectFormatter()           = default;
+    ~DirectFormatter() override = default;
 
     void format(LogMessageView const& view, std::string& buffer) const noexcept override;
 };
 
-} // namespace lse::io
+} // namespace lse::io
diff --git a/src/lse/api/Hash.h b/src/lse/api/Hash.h
@@ -1,11 +1,13 @@
+#pragma once
+
 #include <openssl/evp.h>
 #include <string>
 
 namespace lse::api::hash {
 
 enum HashType { MD5, SHA1 };
 
-std::string caculateHash(HashType type, const std::string& data) {
+inline std::string caculateHash(HashType type, std::string const& data) {
     unsigned char digest[EVP_MAX_MD_SIZE];
     unsigned int  digest_len = 0;
 
@@ -26,4 +28,4 @@ std::string caculateHash(HashType type, const std::string& data) {
     EVP_MD_CTX_free(ctx);
     return {};
 }
-} // namespace lse::api::hash
+} // namespace lse::api::hash
diff --git a/src/lse/api/MoreGlobal.cpp b/src/lse/api/MoreGlobal.cpp
@@ -1,6 +1,5 @@
 #include "MoreGlobal.h"
 
-#include "ll/api/memory/Hook.h"
 #include "mc/dataloadhelper/DefaultDataLoadHelper.h"
 
 namespace lse::api::MoreGlobal {
diff --git a/src/lse/api/MoreGlobal.h b/src/lse/api/MoreGlobal.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include "mc/dataloadhelper/DefaultDataLoadHelper.h"
 
 namespace lse::api::MoreGlobal {
diff --git a/src/lse/api/NetworkPacket.h b/src/lse/api/NetworkPacket.h
@@ -18,10 +18,10 @@ class NetworkPacket final : public Packet {
     NetworkPacket()                                   = default;
     NetworkPacket(NetworkPacket&&)                    = default;
     auto operator=(NetworkPacket&&) -> NetworkPacket& = default;
-    ~NetworkPacket()                                  = default;
+    ~NetworkPacket() override                         = default;
 
-    NetworkPacket(const NetworkPacket&)                    = delete;
-    auto operator=(const NetworkPacket&) -> NetworkPacket& = delete;
+    NetworkPacket(NetworkPacket const&)                    = delete;
+    auto operator=(NetworkPacket const&) -> NetworkPacket& = delete;
 
     [[nodiscard]] auto getId() const -> MinecraftPacketIds override { return packetId; }
 
diff --git a/src/lse/api/PlayerSink.cpp b/src/lse/api/PlayerSink.cpp
@@ -1,6 +1,5 @@
 #include "lse/api/PlayerSink.h"
 
-#include "ll/api/io/FileUtils.h"
 #include "ll/api/io/PatternFormatter.h"
 #include "ll/api/service/Bedrock.h"
 #include "mc/world/actor/player/Player.h"
@@ -28,4 +27,4 @@ void PlayerSink::append(ll::io::LogMessageView const& view) {
 }
 
 void PlayerSink::setUUID(mce::UUID const& uuid) { playerUuid = uuid; }
-} // namespace lse::io
+} // namespace lse::io
diff --git a/src/lse/api/helper/AttributeHelper.h b/src/lse/api/helper/AttributeHelper.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "mc/world/attribute/AttributeInstanceHandle.h"
 #include "mc/world/attribute/BaseAttributeMap.h"
 
 namespace lse::api {
diff --git a/src/lse/api/helper/BlockHelper.cpp b/src/lse/api/helper/BlockHelper.cpp
@@ -4,7 +4,7 @@
 #include "mc/world/level/dimension/DimensionHeightRange.h"
 
 namespace lse::api {
-bool BlockHelper::isValidHeight(WeakRef<Dimension> dimension, std::variant<int, float> height) {
+bool BlockHelper::isValidHeight(WeakRef<Dimension> const& dimension, std::variant<int, float> height) {
     if (auto dim = dimension.lock()) {
         if (std::holds_alternative<int>(height)) {
             int y = std::get<int>(height);
diff --git a/src/lse/api/helper/BlockHelper.h b/src/lse/api/helper/BlockHelper.h
@@ -1,8 +1,9 @@
+#pragma once
 #include "mc/world/level/dimension/Dimension.h"
 
 namespace lse::api {
 class BlockHelper {
 public:
-    static bool isValidHeight(WeakRef<Dimension> dimension, std::variant<int, float> height);
+    static bool isValidHeight(WeakRef<Dimension> const& dimension, std::variant<int, float> height);
 };
-} // namespace lse::api
+} // namespace lse::api
diff --git a/src/lse/api/helper/ItemHelper.cpp b/src/lse/api/helper/ItemHelper.cpp
@@ -1,17 +1,15 @@
 #include "ItemHelper.h"
 
-#include "mc/nbt/CompoundTag.h"
 #include "mc/world/item/Item.h"
 
 namespace lse::api {
-void ItemHelper::load(ItemStack& itemStack, CompoundTag& tag) {
+void ItemHelper::load(ItemStack& itemStack, CompoundTag const& tag) {
     itemStack._loadItem(tag);
-    auto mItem = itemStack.mItem;
-    if (mItem) {
+    if (auto mItem = itemStack.mItem) {
         mItem->fixupCommon(itemStack);
         if (itemStack.getAuxValue() == 0x7FFF) {
             itemStack.mAuxValue = 0;
         }
     }
 };
-} // namespace lse::api
+} // namespace lse::api
diff --git a/src/lse/api/helper/ItemHelper.h b/src/lse/api/helper/ItemHelper.h
@@ -1,8 +1,9 @@
+#pragma once
 #include "mc/world/item/ItemStack.h"
 
 namespace lse::api {
 class ItemHelper {
 public:
-    static void load(ItemStack& itemStack, CompoundTag& tag);
+    static void load(ItemStack& itemStack, CompoundTag const& tag);
 };
-} // namespace lse::api
+} // namespace lse::api
diff --git a/src/lse/api/helper/ItemStackSerializerHelpers.h b/src/lse/api/helper/ItemStackSerializerHelpers.h
@@ -1,9 +1,9 @@
-#include "mc/deps/core/utility/BinaryStream.h"
+#pragma once
 #include "mc/platform/Result.h"
 
 namespace ItemStackSerializerHelpers {
 template <typename T>
 MCAPI void write(const T& item, BinaryStream& stream);
 template <typename T>
 MCAPI Bedrock::Result<T> read(ReadOnlyBinaryStream& stream);
-} // namespace ItemStackSerializerHelpers
+} // namespace ItemStackSerializerHelpers
diff --git a/src/lse/api/helper/PlayerHelper.h b/src/lse/api/helper/PlayerHelper.h
@@ -1,3 +1,5 @@
+#pragma once
+
 class Player;
 
 namespace lse::api {
diff --git a/src/lse/api/helper/ScoreboardHelper.h b/src/lse/api/helper/ScoreboardHelper.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include "mc/world/scores/PlayerScoreboardId.h"
 #include "mc/world/scores/Scoreboard.h"
 #include "mc/world/scores/ScoreboardId.h"
@@ -7,4 +9,4 @@ class ScoreboardHelper {
 public:
     static ScoreboardId getId(Scoreboard const& scoreboard, PlayerScoreboardId const& playerId);
 };
-} // namespace lse::api
+} // namespace lse::api
diff --git a/src/lse/api/helper/SimulatedPlayerHelper.cpp b/src/lse/api/helper/SimulatedPlayerHelper.cpp
@@ -1,19 +1,11 @@
 #include "SimulatedPlayerHelper.h"
 
 #include "mc/entity/components_json_legacy/NavigationComponent.h"
-#include "mc/server/sim/MoveInDirectionIntent.h"
-#include "mc/server/sim/MoveToPositionIntent.h"
-#include "mc/server/sim/NavigateToEntityIntent.h"
-#include "mc/server/sim/NavigateToPositionsIntent.h"
-#include "mc/server/sim/sim.h"
-#include "mc/world/actor/ai/navigation/PathNavigation.h"
-#include "mc/world/actor/provider/MobMovement.h"
 #include "mc/world/gamemode/GameMode.h"
-#include "mc/world/level/BlockPos.h"
 
 namespace lse::api {
 
-bool SimulatedPlayerHelper::simulateUseItem(SimulatedPlayer& player, ItemStack& item) {
+bool SimulatedPlayerHelper::simulateUseItem(SimulatedPlayer const& player, ItemStack& item) {
     if (player.isAlive() && item.mValid_DeprecatedSeeComment && item.mItem && !item.isNull() && item.mCount) {
         return player.mGameMode->useItem(item);
     }
@@ -23,12 +15,12 @@ bool SimulatedPlayerHelper::simulateUseItem(SimulatedPlayer& player, ItemStack&
 bool SimulatedPlayerHelper::simulateUseItemInSlotOnBlock(
     SimulatedPlayer&                    player,
     int                                 slot,
-    const BlockPos&                     pos,
+    BlockPos const&                     pos,
     ScriptModuleMinecraft::ScriptFacing face,
-    const Vec3&                         facePos
+    Vec3 const&                         facePos
 ) {
     auto& itemStack = player.setSelectedSlot(slot);
     return player.simulateUseItemOnBlock(const_cast<ItemStack&>(itemStack), pos, face, facePos);
 }
 
-} // namespace lse::api
+} // namespace lse::api
diff --git a/src/lse/api/helper/SimulatedPlayerHelper.h b/src/lse/api/helper/SimulatedPlayerHelper.h
@@ -1,10 +1,11 @@
+#pragma once
+
 #include "mc/server/SimulatedPlayer.h"
-#include "mc/server/sim/LookDuration.h"
 
 namespace lse::api {
 class SimulatedPlayerHelper {
 public:
-    static bool simulateUseItem(SimulatedPlayer& player, ItemStack& item);
+    static bool simulateUseItem(SimulatedPlayer const& player, ItemStack& item);
     static bool simulateUseItemInSlotOnBlock(
         SimulatedPlayer&                    player,
         int                                 slot,
@@ -13,4 +14,4 @@ class SimulatedPlayerHelper {
         Vec3 const&                         facePos
     );
 };
-} // namespace lse::api
+} // namespace lse::api
diff --git a/src/lse/events/BlockEvents.cpp b/src/lse/events/BlockEvents.cpp
@@ -104,7 +104,7 @@ LL_TYPE_INSTANCE_HOOK(
                     EVENT_TYPES::onChangeArmorStand,
                     EntityClass::newEntity(this),
                     PlayerClass::newPlayer(&player),
-                    Number::newNumber((int)slot)
+                    Number::newNumber(static_cast<int>(slot))
                 )) {
                 return false;
             }
@@ -318,7 +318,8 @@ LL_TYPE_INSTANCE_HOOK(
 }
 
 namespace redstone {
-inline bool RedstoneUpdateEvent(BlockSource& region, BlockPos const& pos, int& strength, bool& isFirstTime) {
+inline bool
+RedstoneUpdateEvent(BlockSource const& region, BlockPos const& pos, int const& strength, bool const& isFirstTime) {
     if (!CallEvent(
             EVENT_TYPES::onRedStoneUpdate,
             BlockClass::newBlock(pos, region.getDimensionId()),
@@ -437,16 +438,16 @@ bool materialsAreEqual(Material const& a, Material const& b) {
 }
 
 bool liquidBlockCanSpreadTo(
-    LiquidBlock&    liquidBlock,
-    BlockSource&    region,
-    BlockPos const& pos,
-    BlockPos const& flowFromPos,
-    uchar           flowFromDirection
+    LiquidBlock const& liquidBlock,
+    BlockSource&       region,
+    BlockPos const&    pos,
+    BlockPos const&    flowFromPos,
+    uchar              flowFromDirection
 ) {
     if (pos.y < region.getMinHeight()) {
         return false;
     }
-    if (const auto& block = region.getLiquidBlock(pos);
+    if (auto const& block = region.getLiquidBlock(pos);
         materialsAreEqual(block.getBlockType().mMaterial, liquidBlock.mMaterial)
         || block.getBlockType().mMaterial.mType == MaterialType::Lava
         || liquidBlock._isLiquidBlocking(region, pos, flowFromPos, flowFromDirection)) {
diff --git a/src/lse/events/EntityEvents.cpp b/src/lse/events/EntityEvents.cpp
diff --git a/src/lse/events/PlayerEvents.cpp b/src/lse/events/PlayerEvents.cpp

Original file line number	Diff line number	Diff line change
`@@ -129,9 +129,9 @@ bool LegacyScriptEngine::unload() {`
`129`	`129`	`return true;`
`130`	`130`	`}`
`131`	`131`
`132`		`-Config const& LegacyScriptEngine::getConfig() { return config; }`
	`132`	`+Config const& LegacyScriptEngine::getConfig() const { return config; }`
`133`	`133`
`134`		`-PluginManager& LegacyScriptEngine::getManager() {`
	`134`	`+PluginManager& LegacyScriptEngine::getManager() const {`
`135`	`135`	`if (!pluginManager) {`
`136`	`136`	`throw std::runtime_error("pluginManager is null");`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#include "lse/api/DirectFormatter.h"`
`2`	`2`
`3`	`3`	`namespace lse::io {`
`4`		`-void DirectFormatter::format(const ll::io::LogMessageView& view, std::string& buffer) const noexcept {`
	`4`	`+void DirectFormatter::format(const LogMessageView& view, std::string& buffer) const noexcept {`
`5`	`5`	`buffer = view.msg;`
`6`	`6`	`}`
`7`		`-} // namespace lse::io`
	`7`	`+} // namespace lse::io`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#pragma once`
	`2`	`+`
`1`	`3`	`#include "mc/dataloadhelper/DefaultDataLoadHelper.h"`
`2`	`4`
`3`	`5`	`namespace lse::api::MoreGlobal {`