format: formatting files

OEOTYAN · OEOTYAN · commit 904c6f40443d · 2025-03-14T20:11:32.000+08:00
diff --git a/src-test/client/jsonUITest.cpp b/src-test/client/jsonUITest.cpp
@@ -48,9 +48,9 @@ LL_AUTO_TYPE_INSTANCE_HOOK(
     hovertext.append("§8");
     hovertext.append(stack.getTypeName());
     hovertext.append("§r");
-    uint64_t max = stack.getItem()->getMaxDamage();
+    uint64 max = stack.getItem()->getMaxDamage();
     if (max != 0) {
-        uint64_t current = max - stack.getDamageValue();
+        uint64 current = max - stack.getDamageValue();
         hovertext.append(fmt::format("\n§7耐久: {} / {}§r", current, max));
     }
 
diff --git a/src-test/server/FormTest.cpp b/src-test/server/FormTest.cpp
@@ -50,16 +50,7 @@ void registerFormTestCommand() {
                                 return;
                             }
                             for (auto [name, result] : *data) {
-                                static auto logDebugResult = [&](ll::form::CustomFormElementResult const& var) {
-                                    if (std::holds_alternative<uint64_t>(var)) {
-                                        logptr->info("CustomForm callback {} = {}", name, std::get<uint64_t>(var));
-                                    } else if (std::holds_alternative<double>(var)) {
-                                        logptr->info("CustomForm callback {} = {}", name, std::get<double>(var));
-                                    } else if (std::holds_alternative<std::string>(var)) {
-                                        logptr->info("CustomForm callback {} = {}", name, std::get<std::string>(var));
-                                    }
-                                };
-                                logDebugResult(result);
+                                visit([&](auto& v) { logptr->info("CustomForm callback {} = {}", name, v); }, result);
                             }
                         }
                     );
diff --git a/src/mc/deps/core/threading/SPSCQueue.h b/src/mc/deps/core/threading/SPSCQueue.h
@@ -10,8 +10,8 @@ class SPSCQueue {
     SPSCQueue(SPSCQueue const&);
     SPSCQueue();
 
-    std::atomic<void*> mFrontBlock;          // this+0x0
-    char               mCachelineFiller[56]; // this+0x8
-    std::atomic<void*> mTailBlock;           // this+0x40
-    uint64_t           mLargestBlockSize;    // this+0x48
+    std::atomic<void*> mFrontBlock;
+    char               mCachelineFiller[56];
+    std::atomic<void*> mTailBlock;
+    uint64             mLargestBlockSize;
 };
diff --git a/src/mc/entity/components/TagsComponent.h b/src/mc/entity/components/TagsComponent.h
@@ -7,4 +7,4 @@ template <typename T>
 class TagsComponent : public TagsComponentBase {
 public:
     T mTagSetID;
-};
+};
diff --git a/src/mc/server/commands/CommandOrigin.h b/src/mc/server/commands/CommandOrigin.h
@@ -150,12 +150,9 @@ class CommandOrigin {
     MCAPI ::std::unique_ptr<::CommandArea>
     getAreaAt(::BlockPos const& min, ::BlockPos const& max, int commandVersion, bool allowUnloadedChunks) const;
 
-    MCAPI ::std::unique_ptr<::CommandArea> getAreaAtWithBuffer(
-        ::BlockPos const& min,
-        ::BlockPos const& max,
-        int               commandVersion,
-        bool              allowUnloadedChunks
-    ) const;
+    MCAPI ::std::unique_ptr<::CommandArea>
+    getAreaAtWithBuffer(::BlockPos const& min, ::BlockPos const& max, int commandVersion, bool allowUnloadedChunks)
+        const;
     // NOLINTEND
 
 public:
diff --git a/src/mc/server/commands/CommandSelectorBase.h b/src/mc/server/commands/CommandSelectorBase.h
@@ -44,18 +44,18 @@ class CommandSelectorBase {
     ::CommandPosition                                                            mPosition{};
     ::Vec3                                                                       mBoxDeltas{};
     float                                                                        mRadiusMinSqr{0.0f};
-    float                                                                        mRadiusMaxSqr{std::numeric_limits<float>::max()};
-    uint64                                                                       mCount{std::numeric_limits<uint>::max()};
-    bool                                                                         mIncludeDeadPlayers{};
-    bool                                                                         mIsPositionBound{};
-    bool                                                                         mDistanceFiltered{};
-    bool                                                                         mPositionFiltered{};
-    bool                                                                         mCountFiltered{};
-    bool                                                                         mHaveDeltas{};
-    bool                                                                         mForcePlayer{};
-    bool                                                                         mExcludeAgents{};
-    bool                                                                         mIsExplicitIdSelector{};
-    bool                                                                         mForceDimensionFiltering{};
+    float  mRadiusMaxSqr{std::numeric_limits<float>::max()};
+    uint64 mCount{std::numeric_limits<uint>::max()};
+    bool   mIncludeDeadPlayers{};
+    bool   mIsPositionBound{};
+    bool   mDistanceFiltered{};
+    bool   mPositionFiltered{};
+    bool   mCountFiltered{};
+    bool   mHaveDeltas{};
+    bool   mForcePlayer{};
+    bool   mExcludeAgents{};
+    bool   mIsExplicitIdSelector{};
+    bool   mForceDimensionFiltering{};
     // NOLINTEND
 
     CommandSelectorBase() = default;
diff --git a/src/mc/util/IDType.h b/src/mc/util/IDType.h
@@ -4,5 +4,5 @@
 
 template <typename T>
 struct IDType {
-    std::optional<uint64_t> mID;
+    std::optional<uint64> mID;
 };
diff --git a/src/mc/util/TagRegistry.h b/src/mc/util/TagRegistry.h
@@ -8,10 +8,10 @@
 template <typename TagID, typename TagSetID>
 class TagRegistry {
 public:
-    std::unordered_map<HashedString, unsigned long> mTagIndexMap;
-    std::vector<std::string>                        mTags;
-    std::vector<IndexSet>                           mSets;
-    TagSetID                                        mEmptyTagSet;
+    std::unordered_map<HashedString, uint64> mTagIndexMap;
+    std::vector<std::string>                 mTags;
+    std::vector<IndexSet>                    mSets;
+    TagSetID                                 mEmptyTagSet;
 
     MCAPI TagID tryGetTagID(const std::string&) const;
     MCAPI std::vector<std::string> const getTagsInSet(TagSetID);
@@ -20,4 +20,4 @@ class TagRegistry {
     MCAPI TagID                          acquireTag(const std::string&);
     MCAPI TagSetID                       getTagSetID(const IndexSet&);
     MCAPI TagSetID                       getTagSetID(const std::vector<TagID>&);
-};
+};
diff --git a/src/mc/world/events/ItemGameplayEvent.h b/src/mc/world/events/ItemGameplayEvent.h
@@ -9,5 +9,4 @@ template <typename Return>
 struct ItemGameplayEvent;
 
 template <>
-struct ItemGameplayEvent<void>
-: ConstEventVariant<ShapedRecipeTriggeredEvent, CraftUpdateResultItemClientEvent> {};
+struct ItemGameplayEvent<void> : ConstEventVariant<ShapedRecipeTriggeredEvent, CraftUpdateResultItemClientEvent> {};
diff --git a/src/mc/world/scores/PlayerScoreboardId.h b/src/mc/world/scores/PlayerScoreboardId.h
@@ -24,4 +24,4 @@ template <>
 struct hash<PlayerScoreboardId> {
     int64 operator()(PlayerScoreboardId const& d) const noexcept { return d.mActorUniqueId; }
 };
-} // namespace std
+} // namespace std

Original file line number	Diff line number	Diff line change
`@@ -50,16 +50,7 @@ void registerFormTestCommand() {`
`50`	`50`	`return;`
`51`	`51`	`}`
`52`	`52`	`for (auto [name, result] : *data) {`
`53`		`- static auto logDebugResult = [&](ll::form::CustomFormElementResult const& var) {`
`54`		`- if (std::holds_alternative<uint64_t>(var)) {`
`55`		`- logptr->info("CustomForm callback {} = {}", name, std::get<uint64_t>(var));`
`56`		`- } else if (std::holds_alternative<double>(var)) {`
`57`		`- logptr->info("CustomForm callback {} = {}", name, std::get<double>(var));`
`58`		`- } else if (std::holds_alternative<std::string>(var)) {`
`59`		`- logptr->info("CustomForm callback {} = {}", name, std::get<std::string>(var));`
`60`		`- }`
`61`		`- };`
`62`		`- logDebugResult(result);`
	`53`	`+ visit([&](auto& v) { logptr->info("CustomForm callback {} = {}", name, v); }, result);`
`63`	`54`	`}`
`64`	`55`	`}`
`65`	`56`	`);`