Skip to content

Commit feaa6df

Browse files
ShrBoxShrBox
committed
chore: format code
1 parent 2ff8d9d commit feaa6df

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+173
-144
lines changed

Diff for: ‎.clang-format

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ PackConstructorInitializers: CurrentLine
4343
PointerAlignment: Left
4444
TabWidth: 4
4545
UseTab: Never
46-
SortIncludes: Never
46+
SortIncludes: CaseSensitive
4747
IncludeBlocks: Regroup

Diff for: ‎src/legacy/api/APIHelp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#include "api/NbtAPI.h"
1313
#include "api/NetworkAPI.h"
1414
#include "api/PlayerAPI.h"
15-
#include "main/Global.h"
1615
#include "ll/api/utils/StringUtils.h"
16+
#include "main/Global.h"
1717

1818
#include <cmath>
1919
#include <iostream>

Diff for: ‎src/legacy/api/APIHelp.h

+29-23
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#pragma once
22

3+
#include "engine/EngineOwnData.h"
4+
#include "ll/api/utils/ErrorUtils.h"
35
#include "lse/Entry.h"
46
#include "main/Global.h"
7+
#include "mc/world/level/Level.h"
58
#include "utils/JsonHelper.h"
69
#include "utils/UsingScriptX.h"
7-
#include "engine/EngineOwnData.h"
8-
#include "ll/api/utils/ErrorUtils.h"
9-
#include "mc/world/level/Level.h"
1010

11-
#include <string>
1211
#include <exception>
1312
#include <magic_enum.hpp>
13+
#include <string>
1414

1515
// 实例类类型检查
1616
template <typename T>
@@ -189,33 +189,39 @@ inline void LOG_WRONG_ARGS_COUNT(std::string const& func = {}) {
189189

190190
#define CHECK_ARGS_LEAST_COUNT(count) \
191191
if (args.size() < count) { \
192-
throw Exception(fmt::format( \
193-
"Invalid arguments count: {}, expect at least {}, in API {}", \
194-
args.size(), \
195-
count, \
196-
__FUNCTION__ \
197-
)); \
192+
throw Exception( \
193+
fmt::format( \
194+
"Invalid arguments count: {}, expect at least {}, in API {}", \
195+
args.size(), \
196+
count, \
197+
__FUNCTION__ \
198+
) \
199+
); \
198200
}
199201

200202
#define CHECK_ARG_TYPE(index, type) \
201203
if (args[index].getKind() != ValueKind::type) { \
202-
throw Exception(fmt::format( \
203-
"Wrong type of arguments[{}]: {}, expect {}, in API {}", \
204-
index, \
205-
ValueKindToString(args[index].getKind()), \
206-
ValueKindToString(ValueKind::type), \
207-
__FUNCTION__ \
208-
)); \
204+
throw Exception( \
205+
fmt::format( \
206+
"Wrong type of arguments[{}]: {}, expect {}, in API {}", \
207+
index, \
208+
ValueKindToString(args[index].getKind()), \
209+
ValueKindToString(ValueKind::type), \
210+
__FUNCTION__ \
211+
) \
212+
); \
209213
}
210214

211215
#define CHECK_VAL_TYPE(val, type) \
212216
if (val.getKind() != ValueKind::type) { \
213-
throw Exception(fmt::format( \
214-
"Wrong type of value: {}, expect {}, in API {}", \
215-
ValueKindToString(val.getKind()), \
216-
ValueKindToString(ValueKind::type), \
217-
__FUNCTION__ \
218-
)); \
217+
throw Exception( \
218+
fmt::format( \
219+
"Wrong type of value: {}, expect {}, in API {}", \
220+
ValueKindToString(val.getKind()), \
221+
ValueKindToString(ValueKind::type), \
222+
__FUNCTION__ \
223+
) \
224+
); \
219225
}
220226

221227
#endif

Diff for: ‎src/legacy/api/BlockAPI.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
#include "mc/deps/core/string/HashedString.h"
1313
#include "mc/deps/core/utility/optional_ref.h"
1414
#include "mc/world/level/BlockSource.h"
15+
#include "mc/world/level/ChunkBlockPos.h"
16+
#include "mc/world/level/block/BedrockBlockNames.h"
1517
#include "mc/world/level/block/Block.h"
1618
#include "mc/world/level/block/actor/BlockActor.h"
1719
#include "mc/world/level/block/block_serialization_utils/BlockSerializationUtils.h"
1820
#include "mc/world/level/block/components/BlockLiquidDetectionComponent.h"
19-
#include "mc/world/level/dimension/Dimension.h"
20-
#include "mc/world/level/block/BedrockBlockNames.h"
21-
#include "mc/world/level/ChunkBlockPos.h"
2221
#include "mc/world/level/chunk/LevelChunk.h"
22+
#include "mc/world/level/dimension/Dimension.h"
2323

2424
#include <exception>
2525

Diff for: ‎src/legacy/api/CommandAPI.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,14 @@
1111
#include "engine/EngineOwnData.h"
1212
#include "engine/GlobalShareData.h"
1313
#include "engine/LocalShareData.h"
14+
#include "ll/api/command/CommandHandle.h"
15+
#include "ll/api/command/runtime/RuntimeCommand.h"
16+
#include "ll/api/command/runtime/RuntimeEnum.h"
17+
#include "ll/api/command/runtime/RuntimeOverload.h"
1418
#include "ll/api/event/EventBus.h"
1519
#include "ll/api/event/server/ServerStartedEvent.h"
1620
#include "ll/api/service/Bedrock.h"
21+
#include "ll/api/service/GamingStatus.h"
1722
#include "lse/Plugin.h"
1823
#include "magic_enum.hpp"
1924
#include "mc/_HeaderOutputPredefine.h"
@@ -37,11 +42,6 @@
3742
#include "mc/world/item/ItemInstance.h"
3843
#include "mc/world/item/ItemStack.h"
3944
#include "mc/world/level/dimension/Dimension.h"
40-
#include "ll/api/command/CommandHandle.h"
41-
#include "ll/api/command/runtime/RuntimeOverload.h"
42-
#include "ll/api/command/runtime/RuntimeEnum.h"
43-
#include "ll/api/command/runtime/RuntimeCommand.h"
44-
#include "ll/api/service/GamingStatus.h"
4545

4646
#include <string>
4747
#include <vector>

Diff for: ‎src/legacy/api/CommandCompatibleAPI.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
#include "engine/EngineOwnData.h"
55
#include "engine/GlobalShareData.h"
66
#include "engine/LocalShareData.h"
7+
#include "ll/api/command/CommandRegistrar.h"
78
#include "ll/api/service/Bedrock.h"
89
#include "main/Global.h"
910
#include "utils/Utils.h"
10-
#include "ll/api/command/CommandRegistrar.h"
1111

1212
#include <string>
1313
#include <vector>

Diff for: ‎src/legacy/api/CommandOriginAPI.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
#include <magic_enum.hpp>
1717

18-
1918
//////////////////// Class Definition ////////////////////
2019
ClassDefine<void> OriginTypeStaticBuilder = EnumDefineBuilder<CommandOriginType>::build("OriginType");
2120

@@ -39,7 +38,7 @@ ClassDefine<CommandOriginClass> CommandOriginClassBuilder =
3938

4039
CommandOriginClass::CommandOriginClass(CommandOrigin const* p)
4140
: ScriptClass(ScriptClass::ConstructFromCpp<CommandOriginClass>{}),
42-
ptr(p){};
41+
ptr(p) {};
4342

4443
Local<Object> CommandOriginClass::newCommandOrigin(CommandOrigin const* p) {
4544
auto newp = new CommandOriginClass(p);

Diff for: ‎src/legacy/api/DataAPI.cpp

+5-6
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,19 @@
22

33
#include "api/APIHelp.h"
44
#include "api/DatabaseAPI.h"
5-
6-
#include <fstream>
7-
#include <string>
8-
#include <vector>
9-
10-
#include "ll/api/utils/Base64Utils.h"
115
#include "ll/api/io/FileUtils.h"
126
#include "ll/api/service/Bedrock.h"
137
#include "ll/api/service/PlayerInfo.h"
8+
#include "ll/api/utils/Base64Utils.h"
149
#include "ll/api/utils/StringUtils.h"
1510
#include "main/EconomicSystem.h"
1611
#include "mc/deps/crypto/hash/Hash.h"
1712
#include "utils/JsonHelper.h"
1813

14+
#include <fstream>
15+
#include <string>
16+
#include <vector>
17+
1918
//////////////////// Class Definition ////////////////////
2019

2120
ClassDefine<void> DataClassBuilder = defineClass("data")

Diff for: ‎src/legacy/api/DeviceAPI.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#include "mc/certificates/WebToken.h"
77
#include "mc/common/ActorRuntimeID.h"
88
#include "mc/deps/input/InputMode.h"
9+
#include "mc/deps/json/Value.h"
910
#include "mc/network/ConnectionRequest.h"
1011
#include "mc/network/ServerNetworkHandler.h"
1112
#include "mc/world/actor/player/Player.h"
1213
#include "mc/world/level/Level.h"
13-
#include "mc/deps/json/Value.h"
1414

1515
#include <string>
1616

Diff for: ‎src/legacy/api/DeviceAPI.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22
#include "api/APIHelp.h"
3-
#include "mc/deps/ecs/WeakEntityRef.h"
43
#include "mc/common/ActorRuntimeID.h"
4+
#include "mc/deps/ecs/WeakEntityRef.h"
55

66
//////////////////// Classes ////////////////////
77
class Player;

Diff for: ‎src/legacy/api/EntityAPI.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "mc/common/ActorUniqueID.h"
1515
#include "mc/deps/core/math/Vec2.h"
1616
#include "mc/deps/core/string/HashedString.h"
17+
#include "mc/entity/components/IsOnHotBlockFlagComponent.h"
1718
#include "mc/entity/utilities/ActorMobilityUtils.h"
1819
#include "mc/nbt/CompoundTag.h"
1920
#include "mc/world/SimpleContainer.h"
@@ -31,12 +32,11 @@
3132
#include "mc/world/effect/MobEffectInstance.h"
3233
#include "mc/world/level/BlockSource.h"
3334
#include "mc/world/level/Spawner.h"
35+
#include "mc/world/level/biome/Biome.h"
3436
#include "mc/world/level/block/Block.h"
3537
#include "mc/world/level/material/Material.h"
3638
#include "mc/world/phys/AABB.h"
3739
#include "mc/world/phys/HitResult.h"
38-
#include "mc/world/level/biome/Biome.h"
39-
#include "mc/entity/components/IsOnHotBlockFlagComponent.h"
4040

4141
#include <climits>
4242
#include <memory>

Diff for: ‎src/legacy/api/EventAPI.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#include "api/EventAPI.h"
22

3-
#include "legacy/engine/LocalShareData.h"
4-
#include "legacy/main/BuiltinCommands.h"
53
#include "BaseAPI.h"
64
#include "BlockAPI.h"
75
#include "CommandCompatibleAPI.h"
@@ -12,6 +10,8 @@
1210
#include "api/PlayerAPI.h"
1311
#include "engine/EngineOwnData.h"
1412
#include "engine/GlobalShareData.h"
13+
#include "legacy/engine/LocalShareData.h"
14+
#include "legacy/main/BuiltinCommands.h"
1515
#include "ll/api/chrono/GameChrono.h"
1616
#include "ll/api/coro/CoroTask.h"
1717
#include "ll/api/event/EventBus.h"
@@ -40,11 +40,12 @@
4040
#include "ll/api/event/world/FireSpreadEvent.h"
4141
#include "ll/api/event/world/SpawnMobEvent.h"
4242
#include "ll/api/service/Bedrock.h"
43+
#include "ll/api/thread/ServerThreadExecutor.h"
4344
#include "lse/Entry.h"
44-
#include "lse/events/PlayerEvents.h"
45-
#include "lse/events/EntityEvents.h"
4645
#include "lse/events/BlockEvents.h"
46+
#include "lse/events/EntityEvents.h"
4747
#include "lse/events/OtherEvents.h"
48+
#include "lse/events/PlayerEvents.h"
4849
#include "main/Global.h"
4950
#include "mc/common/ActorUniqueID.h"
5051
#include "mc/deps/core/string/HashedString.h"
@@ -54,7 +55,6 @@
5455
#include "mc/world/item/Item.h"
5556
#include "mc/world/item/VanillaItemNames.h"
5657
#include "mc/world/level/dimension/Dimension.h"
57-
#include "ll/api/thread/ServerThreadExecutor.h"
5858

5959
#ifdef LEGACY_SCRIPT_ENGINE_BACKEND_NODEJS
6060
#include "legacy/main/NodeJsHelper.h"

Diff for: ‎src/legacy/api/InternationalAPI.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#define NEW_DEFINES
22
#include "api/InternationalAPI.h"
3+
34
#include "ll/api/i18n/I18n.h"
45

56
#include <FMT/args.h>

Diff for: ‎src/legacy/api/ItemAPI.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
#include "api/McAPI.h"
77
#include "api/NbtAPI.h"
88
#include "ll/api/service/Bedrock.h"
9+
#include "mc/nbt/CompoundTag.h"
910
#include "mc/safety/RedactableString.h"
1011
#include "mc/world/actor/Actor.h"
1112
#include "mc/world/actor/item/ItemActor.h"
13+
#include "mc/world/item/Item.h"
14+
#include "mc/world/item/ItemStack.h"
1215
#include "mc/world/item/SaveContextFactory.h"
1316
#include "mc/world/level/Spawner.h"
1417
#include "mc/world/level/dimension/Dimension.h"
15-
#include "mc/nbt/CompoundTag.h"
16-
#include "mc/world/item/Item.h"
17-
#include "mc/world/item/ItemStack.h"
1818

1919
#include <string>
2020
#include <variant>

Diff for: ‎src/legacy/api/LlAPI.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
#include "api/APIHelp.h"
44
#include "engine/GlobalShareData.h"
55
#include "ll/api/Versions.h"
6-
#include "ll/api/mod/ModManagerRegistry.h"
7-
#include "ll/api/utils/SystemUtils.h"
86
#include "ll/api/data/Version.h"
7+
#include "ll/api/mod/ModManagerRegistry.h"
98
#include "ll/api/reflection/Serialization.h"
9+
#include "ll/api/utils/SystemUtils.h"
1010

1111
#include <string>
1212

Diff for: ‎src/legacy/api/NetworkAPI.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#include "ll/api/service/GamingStatus.h"
1010
#include "ll/api/service/ServerInfo.h"
1111
#include "ll/api/thread/ThreadPoolExecutor.h"
12-
#include "main/SafeGuardRecord.h"
1312
#include "ll/api/utils/ErrorUtils.h"
13+
#include "main/SafeGuardRecord.h"
1414

1515
#include <string>
1616
#include <vector>

Diff for: ‎src/legacy/api/PacketAPI.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#include "api/NbtAPI.h"
1212
#include "mc/deps/core/utility/BinaryStream.h"
1313
#include "mc/network/MinecraftPackets.h"
14-
#include "mc/world/item/NetworkItemStackDescriptor.h"
1514
#include "mc/network/packet/Packet.h"
15+
#include "mc/world/item/NetworkItemStackDescriptor.h"
1616

1717
//////////////////// Class Definition ////////////////////
1818

0 commit comments

Comments
 (0)