From 6fc31f9c73502efe0cd58f928231edfdb0ae34cd Mon Sep 17 00:00:00 2001 From: Zijian Zhang Date: Mon, 22 Jan 2024 17:19:51 +0800 Subject: [PATCH] style: format with IncludeBlocks: Regroup --- .clang-format | 1 + src/api/APIHelp.cpp | 13 +++++------ src/api/APIHelp.h | 13 +++++------ src/api/BaseAPI.cpp | 11 +++++----- src/api/BlockAPI.cpp | 2 ++ src/api/BlockAPI.h | 1 + src/api/BlockEntityAPI.cpp | 1 + src/api/CommandAPI.cpp | 2 ++ src/api/CommandCompatibleAPI.cpp | 1 + src/api/CommandCompatibleAPI.h | 1 + src/api/CommandOriginAPI.cpp | 1 + src/api/CommandOutputAPI.cpp | 1 + src/api/CommandOutputAPI.h | 1 + src/api/ContainerAPI.cpp | 1 + src/api/ContainerAPI.h | 1 + src/api/DataAPI.cpp | 2 ++ src/api/DataAPI.h | 1 + src/api/DeviceAPI.cpp | 2 ++ src/api/EntityAPI.cpp | 2 ++ src/api/EventAPI.cpp | 20 ++++++++--------- src/api/EventAPI.h | 1 - src/api/FileSystemAPI.cpp | 2 ++ src/api/GameUtilsAPI.cpp | 1 + src/api/GuiAPI.cpp | 2 ++ src/api/GuiAPI.h | 1 - src/api/InternationalAPI.cpp | 1 + src/api/ItemAPI.cpp | 2 ++ src/api/ItemAPI.h | 1 + src/api/LlAPI.cpp | 2 ++ src/api/LoggerAPI.cpp | 2 ++ src/api/McAPI.h | 1 + src/api/MoreGlobal.cpp | 1 + src/api/NativeAPI.cpp | 1 + src/api/NativeAPI.h | 1 + src/api/NativeStdString.cpp | 2 ++ src/api/NbtAPI.cpp | 2 ++ src/api/NbtAPI.h | 1 + src/api/NetworkAPI.cpp | 2 ++ src/api/NetworkAPI.h | 4 ++-- src/api/PacketAPI.cpp | 1 + src/api/PacketAPI.h | 1 + src/api/ParticleAPI.cpp | 1 + src/api/ParticleAPI.h | 1 + src/api/PlayerAPI.cpp | 28 ++++++++++++------------ src/api/ScoreboardAPI.cpp | 2 ++ src/api/ScriptAPI.cpp | 2 ++ src/api/ServerAPI.cpp | 2 ++ src/api/SimulatedPlayerAPI.cpp | 1 + src/api/SystemAPI.cpp | 2 ++ src/engine/EngineManager.cpp | 2 ++ src/engine/EngineManager.h | 1 + src/engine/EngineOwnData.h | 14 +++++------- src/engine/GlobalShareData.cpp | 2 ++ src/engine/GlobalShareData.h | 1 + src/engine/LocalShareData.cpp | 2 ++ src/engine/LocalShareData.h | 1 + src/engine/MessageSystem.cpp | 2 ++ src/engine/MessageSystem.h | 1 + src/engine/OperationCount.cpp | 2 ++ src/engine/RemoteCall.cpp | 2 ++ src/engine/RemoteCall.h | 1 + src/engine/TimeTaskSystem.cpp | 2 ++ src/engine/TimeTaskSystem.h | 1 + src/legacyapi/db/Any.h | 1 + src/legacyapi/db/ConnParams.cpp | 1 + src/legacyapi/db/ConnParams.h | 1 + src/legacyapi/db/Row.cpp | 2 ++ src/legacyapi/db/Row.h | 1 + src/legacyapi/db/RowSet.cpp | 2 ++ src/legacyapi/db/RowSet.h | 1 + src/legacyapi/db/Session.cpp | 1 + src/legacyapi/db/Session.h | 1 + src/legacyapi/db/impl/mysql/Session.cpp | 1 + src/legacyapi/db/impl/mysql/Stmt.cpp | 1 + src/legacyapi/db/impl/sqlite/Session.cpp | 1 + src/legacyapi/db/impl/sqlite/Stmt.cpp | 1 + src/legacyapi/utils/FileHelper.cpp | 7 +++--- src/legacyapi/utils/FileHelper.h | 1 + src/legacyapi/utils/StringReader.cpp | 1 + src/main/BuiltinCommands.cpp | 2 ++ src/main/EconomicSystem.h | 1 + src/main/EconomySystem.cpp | 1 + src/main/Global.h | 10 ++++----- src/main/Loader.cpp | 1 + src/main/Loader.h | 1 + src/main/NodeJsHelper.cpp | 1 + src/main/NodeJsHelper.h | 1 + src/main/PluginManager.cpp | 2 ++ src/main/PluginManager.h | 1 + src/main/PythonHelper.cpp | 1 + src/main/PythonHelper.h | 1 + src/main/SafeGuardRecord.cpp | 1 + src/main/ScriptEngine.cpp | 1 + src/utils/IniHelper.cpp | 2 ++ src/utils/IniHelper.h | 1 + src/utils/JsonHelper.h | 1 + src/utils/Utils.cpp | 5 +++-- 97 files changed, 173 insertions(+), 68 deletions(-) diff --git a/.clang-format b/.clang-format index 4a24aec4..344dea5b 100644 --- a/.clang-format +++ b/.clang-format @@ -44,3 +44,4 @@ PointerAlignment: Left TabWidth: 4 UseTab: Never SortIncludes: CaseSensitive +IncludeBlocks: Regroup diff --git a/src/api/APIHelp.cpp b/src/api/APIHelp.cpp index 2d5c21ae..6b458eff 100644 --- a/src/api/APIHelp.cpp +++ b/src/api/APIHelp.cpp @@ -1,11 +1,5 @@ #include "api/APIHelp.h" -#include -#include -#include -#include -#include - #include "api/BaseAPI.h" #include "api/BlockAPI.h" #include "api/ContainerAPI.h" @@ -15,13 +9,18 @@ #include "api/EntityAPI.h" #include "api/GuiAPI.h" #include "api/ItemAPI.h" +#include "api/NativeAPI.h" #include "api/NbtAPI.h" #include "api/NetworkAPI.h" #include "api/PlayerAPI.h" #include "engine/EngineOwnData.h" #include "main/Global.h" -#include "api/NativeAPI.h" +#include +#include +#include +#include +#include //////////////////// APIs //////////////////// template diff --git a/src/api/APIHelp.h b/src/api/APIHelp.h index e264a956..4fd28045 100644 --- a/src/api/APIHelp.h +++ b/src/api/APIHelp.h @@ -1,18 +1,15 @@ #pragma once -#include -#include - -#include - -#include "mc/world/level/Level.h" - #include "engine/EngineOwnData.h" +#include "ll/api/utils/ErrorUtils.h" #include "main/Global.h" +#include "mc/world/level/Level.h" #include "utils/JsonHelper.h" #include "utils/UsingScriptX.inc" -#include "ll/api/utils/ErrorUtils.h" +#include +#include +#include // 输出异常信息 inline void PrintException(const script::Exception& e) { diff --git a/src/api/BaseAPI.cpp b/src/api/BaseAPI.cpp index 7dc58cb6..60f12e1b 100644 --- a/src/api/BaseAPI.cpp +++ b/src/api/BaseAPI.cpp @@ -1,16 +1,15 @@ #include "api/BaseAPI.h" -#include - -#include "mc/world/Facing.h" -#include -#include - #include "api/APIHelp.h" #include "api/McAPI.h" #include "main/Global.h" #include "mc/common/Common.h" #include "mc/common/SharedConstants.h" +#include "mc/world/Facing.h" + +#include +#include +#include ///////////////////// Enum ////////////////////// ClassDefine DamageCauseEnumBuilder = EnumDefineBuilder::build("DamageCause"); diff --git a/src/api/BlockAPI.cpp b/src/api/BlockAPI.cpp index 3e7d0fb9..df665f12 100644 --- a/src/api/BlockAPI.cpp +++ b/src/api/BlockAPI.cpp @@ -1,4 +1,5 @@ #include "api/BlockAPI.h" + #include "ScriptX/ScriptX.h" #include "api/APIHelp.h" #include "api/BaseAPI.h" @@ -17,6 +18,7 @@ #include "mc/world/level/block/Block.h" #include "mc/world/level/block/actor/BlockActor.h" #include "mc/world/level/dimension/Dimension.h" + #include //////////////////// Class Definition //////////////////// diff --git a/src/api/BlockAPI.h b/src/api/BlockAPI.h index 730c0d9e..b147b59a 100644 --- a/src/api/BlockAPI.h +++ b/src/api/BlockAPI.h @@ -1,6 +1,7 @@ #pragma once #include "api/APIHelp.h" #include "main/Global.h" + #include //////////////////// Classes //////////////////// diff --git a/src/api/BlockEntityAPI.cpp b/src/api/BlockEntityAPI.cpp index fa279fa2..9bd00404 100644 --- a/src/api/BlockEntityAPI.cpp +++ b/src/api/BlockEntityAPI.cpp @@ -1,4 +1,5 @@ #include "api/BlockEntityAPI.h" + #include "api/APIHelp.h" #include "api/BaseAPI.h" #include "api/BlockAPI.h" diff --git a/src/api/CommandAPI.cpp b/src/api/CommandAPI.cpp index 225f3ee3..6b11ee3e 100644 --- a/src/api/CommandAPI.cpp +++ b/src/api/CommandAPI.cpp @@ -1,5 +1,6 @@ // #include "api/DynamicCommandAPI.h" #include "api/CommandAPI.h" + #include "api/BaseAPI.h" #include "api/BlockAPI.h" #include "api/CommandOriginAPI.h" @@ -32,6 +33,7 @@ #include "mc/world/item/registry/ItemStack.h" #include "mc/world/level/dimension/Dimension.h" #include "utils/Utils.h" + #include #include #include diff --git a/src/api/CommandCompatibleAPI.cpp b/src/api/CommandCompatibleAPI.cpp index d837b25d..9b49ad01 100644 --- a/src/api/CommandCompatibleAPI.cpp +++ b/src/api/CommandCompatibleAPI.cpp @@ -13,6 +13,7 @@ #include "main/Configs.h" #include "main/Global.h" #include "utils/Utils.h" + #include #include #include diff --git a/src/api/CommandCompatibleAPI.h b/src/api/CommandCompatibleAPI.h index 5f6ea1b8..96d941b9 100644 --- a/src/api/CommandCompatibleAPI.h +++ b/src/api/CommandCompatibleAPI.h @@ -1,5 +1,6 @@ #pragma once #include "api/APIHelp.h" + #include #include diff --git a/src/api/CommandOriginAPI.cpp b/src/api/CommandOriginAPI.cpp index f7d541e0..cdb72578 100644 --- a/src/api/CommandOriginAPI.cpp +++ b/src/api/CommandOriginAPI.cpp @@ -1,4 +1,5 @@ #include "api/CommandOriginAPI.h" + #include "api/APIHelp.h" #include "api/BaseAPI.h" #include "api/BlockAPI.h" diff --git a/src/api/CommandOutputAPI.cpp b/src/api/CommandOutputAPI.cpp index 254dfcf0..1bf4046b 100644 --- a/src/api/CommandOutputAPI.cpp +++ b/src/api/CommandOutputAPI.cpp @@ -1,4 +1,5 @@ #include "api/CommandOutputAPI.h" + #include "mc/server/commands/CommandOutputMessageType.h" //////////////////// Class Definition //////////////////// diff --git a/src/api/CommandOutputAPI.h b/src/api/CommandOutputAPI.h index 00f30834..e6546ebc 100644 --- a/src/api/CommandOutputAPI.h +++ b/src/api/CommandOutputAPI.h @@ -1,5 +1,6 @@ #pragma once #include "api/APIHelp.h" + #include class CommandOutputClass; diff --git a/src/api/ContainerAPI.cpp b/src/api/ContainerAPI.cpp index 0dffb9a9..8e211816 100644 --- a/src/api/ContainerAPI.cpp +++ b/src/api/ContainerAPI.cpp @@ -1,4 +1,5 @@ #include "api/ContainerAPI.h" + #include "api/APIHelp.h" #include "api/ItemAPI.h" #include "api/NativeAPI.h" diff --git a/src/api/ContainerAPI.h b/src/api/ContainerAPI.h index c447ae47..fa0e02f0 100644 --- a/src/api/ContainerAPI.h +++ b/src/api/ContainerAPI.h @@ -1,6 +1,7 @@ #pragma once #include "api/APIHelp.h" #include "mc/world/Container.h" + #include //////////////////// Classes //////////////////// diff --git a/src/api/DataAPI.cpp b/src/api/DataAPI.cpp index e39c4b25..45d18cfb 100644 --- a/src/api/DataAPI.cpp +++ b/src/api/DataAPI.cpp @@ -1,6 +1,8 @@ #include "api/DataAPI.h" + #include "api/APIHelp.h" #include "api/DatabaseAPI.h" + #include #include #include diff --git a/src/api/DataAPI.h b/src/api/DataAPI.h index 11a43a04..b1cff33a 100644 --- a/src/api/DataAPI.h +++ b/src/api/DataAPI.h @@ -2,6 +2,7 @@ #include "api/APIHelp.h" #include "utils/IniHelper.h" #include "utils/JsonHelper.h" + #include #include diff --git a/src/api/DeviceAPI.cpp b/src/api/DeviceAPI.cpp index f38aacb5..fbc0677c 100644 --- a/src/api/DeviceAPI.cpp +++ b/src/api/DeviceAPI.cpp @@ -1,4 +1,5 @@ #include "api/DeviceAPI.h" + #include "api/APIHelp.h" #include "ll/api/service/Bedrock.h" #include "magic_enum.hpp" @@ -7,6 +8,7 @@ #include "mc/network/ServerNetworkHandler.h" #include "mc/world/actor/player/Player.h" #include "mc/world/level/Level.h" + #include //////////////////// Class Definition //////////////////// diff --git a/src/api/EntityAPI.cpp b/src/api/EntityAPI.cpp index 3cf0c717..d2f55604 100644 --- a/src/api/EntityAPI.cpp +++ b/src/api/EntityAPI.cpp @@ -1,4 +1,5 @@ #include "api/EntityAPI.h" + #include "api/APIHelp.h" #include "api/BaseAPI.h" #include "api/BlockAPI.h" @@ -19,6 +20,7 @@ #include "mc/world/effect/MobEffectInstance.h" #include "mc/world/level/Spawner.h" #include "mc/world/level/block/Block.h" + #include #include #include diff --git a/src/api/EventAPI.cpp b/src/api/EventAPI.cpp index 3ab051cd..c476185b 100644 --- a/src/api/EventAPI.cpp +++ b/src/api/EventAPI.cpp @@ -1,4 +1,6 @@ #include "api/EventAPI.h" + +#include "EntityAPI.h" #include "api/APIHelp.h" #include "api/McAPI.h" #include "api/PlayerAPI.h" @@ -6,25 +8,23 @@ #include "engine/GlobalShareData.h" #include "ll/api/chrono/GameChrono.h" #include "ll/api/event/EventBus.h" -#include "ll/api/schedule/Scheduler.h" -#include "ll/api/schedule/Task.h" -#include "ll/api/service/Bedrock.h" -#include "main/Global.h" -#include -#include -#include - -#include "EntityAPI.h" -#include "ll/api/event/EventBus.h" #include "ll/api/event/player/PlayerChatEvent.h" #include "ll/api/event/player/PlayerConnectEvent.h" #include "ll/api/event/player/PlayerDieEvent.h" #include "ll/api/event/player/PlayerJoinEvent.h" #include "ll/api/event/player/PlayerLeaveEvent.h" #include "ll/api/event/player/PlayerRespawnEvent.h" +#include "ll/api/schedule/Scheduler.h" +#include "ll/api/schedule/Task.h" +#include "ll/api/service/Bedrock.h" +#include "main/Global.h" #include "mc/world/actor/player/Player.h" #include "mc/world/level/dimension/Dimension.h" +#include +#include +#include + //////////////////// Listeners //////////////////// enum class EVENT_TYPES : int { diff --git a/src/api/EventAPI.h b/src/api/EventAPI.h index 6e8e10e3..3fd90388 100644 --- a/src/api/EventAPI.h +++ b/src/api/EventAPI.h @@ -1,6 +1,5 @@ #pragma once #include "api/APIHelp.h" - #include "main/EconomicSystem.h" //////////////////// Funcs //////////////////// diff --git a/src/api/FileSystemAPI.cpp b/src/api/FileSystemAPI.cpp index 45efc8c3..6f82c9ff 100644 --- a/src/api/FileSystemAPI.cpp +++ b/src/api/FileSystemAPI.cpp @@ -1,9 +1,11 @@ #include "api/FileSystemAPI.h" + #include "api/APIHelp.h" #include "engine/EngineManager.h" #include "engine/LocalShareData.h" #include "engine/TimeTaskSystem.h" #include "ll/api/service/ServerInfo.h" + #include #include #include diff --git a/src/api/GameUtilsAPI.cpp b/src/api/GameUtilsAPI.cpp index 96a09b7f..c2c5ecf9 100644 --- a/src/api/GameUtilsAPI.cpp +++ b/src/api/GameUtilsAPI.cpp @@ -1,4 +1,5 @@ #include "api/GameUtilsAPI.h" + #include "api/APIHelp.h" diff --git a/src/api/GuiAPI.cpp b/src/api/GuiAPI.cpp index bc7b7c39..6e8e006a 100644 --- a/src/api/GuiAPI.cpp +++ b/src/api/GuiAPI.cpp @@ -1,4 +1,5 @@ #include "api/GuiAPI.h" + #include "api/APIHelp.h" #include "api/McAPI.h" #include "api/PlayerAPI.h" @@ -9,6 +10,7 @@ // #include //todo #include "ll/api/service/ServerInfo.h" + #include #include diff --git a/src/api/GuiAPI.h b/src/api/GuiAPI.h index 0a40004c..a07d2a20 100644 --- a/src/api/GuiAPI.h +++ b/src/api/GuiAPI.h @@ -1,6 +1,5 @@ #pragma once #include "api/APIHelp.h" - #include "ll/api/form/CustomForm.h" #include "ll/api/form/FormBase.h" #include "ll/api/form/SimpleForm.h" diff --git a/src/api/InternationalAPI.cpp b/src/api/InternationalAPI.cpp index 6e1f6bb4..ace19395 100644 --- a/src/api/InternationalAPI.cpp +++ b/src/api/InternationalAPI.cpp @@ -1,5 +1,6 @@ #define NEW_DEFINES #include "api/InternationalAPI.h" + #include #include diff --git a/src/api/ItemAPI.cpp b/src/api/ItemAPI.cpp index b1dd4d41..67f14e13 100644 --- a/src/api/ItemAPI.cpp +++ b/src/api/ItemAPI.cpp @@ -1,4 +1,5 @@ #include "api/ItemAPI.h" + #include "api/APIHelp.h" #include "api/BaseAPI.h" #include "api/EntityAPI.h" @@ -9,6 +10,7 @@ #include "mc/world/actor/Actor.h" #include "mc/world/level/Spawner.h" #include "mc/world/level/dimension/Dimension.h" + #include #include #include diff --git a/src/api/ItemAPI.h b/src/api/ItemAPI.h index 5e746c40..8e803b0e 100644 --- a/src/api/ItemAPI.h +++ b/src/api/ItemAPI.h @@ -1,5 +1,6 @@ #pragma once #include "api/APIHelp.h" + #include diff --git a/src/api/LlAPI.cpp b/src/api/LlAPI.cpp index 94e0a2a8..db2d52d1 100644 --- a/src/api/LlAPI.cpp +++ b/src/api/LlAPI.cpp @@ -1,9 +1,11 @@ #include "api/LlAPI.h" + #include "api/APIHelp.h" #include "engine/EngineOwnData.h" #include "engine/GlobalShareData.h" #include "ll/api/utils/WinUtils.h" #include "utils/Utils.h" + #include #include #include diff --git a/src/api/LoggerAPI.cpp b/src/api/LoggerAPI.cpp index e3fc9ecb..5a9649e6 100644 --- a/src/api/LoggerAPI.cpp +++ b/src/api/LoggerAPI.cpp @@ -1,9 +1,11 @@ #include "api/LoggerAPI.h" + #include "api/APIHelp.h" #include "api/PlayerAPI.h" #include "engine/EngineOwnData.h" #include "mc/world/actor/player/Player.h" #include "utils/Utils.h" + #include #include #include diff --git a/src/api/McAPI.h b/src/api/McAPI.h index 02f06c85..2794b9ea 100644 --- a/src/api/McAPI.h +++ b/src/api/McAPI.h @@ -1,5 +1,6 @@ #pragma once #include "api/APIHelp.h" + #include diff --git a/src/api/MoreGlobal.cpp b/src/api/MoreGlobal.cpp index d4e79b92..43baa6e6 100644 --- a/src/api/MoreGlobal.cpp +++ b/src/api/MoreGlobal.cpp @@ -1,4 +1,5 @@ #include "MoreGlobal.h" + #include "ll/api/memory/Hook.h" #include "mc/world/level/storage/DBStorage.h" #include "mc/world/level/storage/DBStorageConfig.h" diff --git a/src/api/NativeAPI.cpp b/src/api/NativeAPI.cpp index b000662d..01e98e34 100644 --- a/src/api/NativeAPI.cpp +++ b/src/api/NativeAPI.cpp @@ -2,6 +2,7 @@ #include "demangler/MicrosoftDemangle.h" #include "ll/api/memory/Hook.h" + #include diff --git a/src/api/NativeAPI.h b/src/api/NativeAPI.h index 94343af3..0ec345de 100644 --- a/src/api/NativeAPI.h +++ b/src/api/NativeAPI.h @@ -1,6 +1,7 @@ #pragma once #include "api/APIHelp.h" #include "demangler/MicrosoftDemangleNodes.h" + #include #include #include diff --git a/src/api/NativeStdString.cpp b/src/api/NativeStdString.cpp index cd23793b..8099a57b 100644 --- a/src/api/NativeStdString.cpp +++ b/src/api/NativeStdString.cpp @@ -1,5 +1,7 @@ #include "api/NativeStdString.h" + #include "api/NativeAPI.h" + #include //////////////////// Class Definition //////////////////// diff --git a/src/api/NbtAPI.cpp b/src/api/NbtAPI.cpp index dc376824..7f1f2b40 100644 --- a/src/api/NbtAPI.cpp +++ b/src/api/NbtAPI.cpp @@ -1,4 +1,5 @@ #include "api/NbtAPI.h" + #include "api/APIHelp.h" #include "api/BlockAPI.h" #include "api/ItemAPI.h" @@ -14,6 +15,7 @@ #include "mc/nbt/ShortTag.h" #include "mc/nbt/StringTag.h" #include "mc/nbt/TagMemoryChunk.h" + #include #include #include diff --git a/src/api/NbtAPI.h b/src/api/NbtAPI.h index 83f24bb7..203af283 100644 --- a/src/api/NbtAPI.h +++ b/src/api/NbtAPI.h @@ -3,6 +3,7 @@ #include "mc/nbt/ByteArrayTag.h" #include "mc/nbt/DoubleTag.h" #include "mc/nbt/Tag.h" + #include #include #include diff --git a/src/api/NetworkAPI.cpp b/src/api/NetworkAPI.cpp index 81157f79..add66641 100644 --- a/src/api/NetworkAPI.cpp +++ b/src/api/NetworkAPI.cpp @@ -1,9 +1,11 @@ #include "api/NetworkAPI.h" + #include "api/APIHelp.h" #include "engine/EngineManager.h" #include "engine/TimeTaskSystem.h" #include "ll/api/service/ServerInfo.h" #include "main/SafeGuardRecord.h" + #include #include diff --git a/src/api/NetworkAPI.h b/src/api/NetworkAPI.h index 6e39e8c3..4a9b7b7d 100644 --- a/src/api/NetworkAPI.h +++ b/src/api/NetworkAPI.h @@ -1,8 +1,8 @@ #pragma once -#include "api/APIHelp.h" - #include "WebSocketClient.h" +#include "api/APIHelp.h" #include "httplib.h" + #include using namespace cyanray; diff --git a/src/api/PacketAPI.cpp b/src/api/PacketAPI.cpp index dfb06eaa..55b3789f 100644 --- a/src/api/PacketAPI.cpp +++ b/src/api/PacketAPI.cpp @@ -1,4 +1,5 @@ #include "api/PacketAPI.h" + #include "api/APIHelp.h" #include "api/BaseAPI.h" #include "api/BlockAPI.h" diff --git a/src/api/PacketAPI.h b/src/api/PacketAPI.h index a475acad..51176a53 100644 --- a/src/api/PacketAPI.h +++ b/src/api/PacketAPI.h @@ -2,6 +2,7 @@ #include "api/APIHelp.h" #include "main/Global.h" #include "mc/deps/core/utility/BinaryStream.h" + #include //////////////////// Classes //////////////////// diff --git a/src/api/ParticleAPI.cpp b/src/api/ParticleAPI.cpp index 0749e066..05532136 100644 --- a/src/api/ParticleAPI.cpp +++ b/src/api/ParticleAPI.cpp @@ -2,6 +2,7 @@ // Created by OEOTYAN on 2022/08/27. // #include "ParticleAPI.h" + #include "McAPI.h" #include "mc/deps/core/mce/Color.h" diff --git a/src/api/ParticleAPI.h b/src/api/ParticleAPI.h index 8233dfab..62a22d05 100644 --- a/src/api/ParticleAPI.h +++ b/src/api/ParticleAPI.h @@ -3,6 +3,7 @@ // #pragma once #include "BaseAPI.h" + #include class ParticleSpawner : public ParticleCUI, public ScriptClass { diff --git a/src/api/PlayerAPI.cpp b/src/api/PlayerAPI.cpp index fc814bfa..344b7d05 100644 --- a/src/api/PlayerAPI.cpp +++ b/src/api/PlayerAPI.cpp @@ -1,4 +1,7 @@ #include "api/PlayerAPI.h" + +#include "MoreGlobal.h" +#include "ScriptX/ScriptX.h" #include "api/APIHelp.h" #include "api/BaseAPI.h" #include "api/BlockAPI.h" @@ -16,31 +19,22 @@ #include "engine/GlobalShareData.h" #include "ll/api/form/CustomForm.h" #include "ll/api/form/FormBase.h" +#include "ll/api/form/ModalForm.h" #include "ll/api/form/SimpleForm.h" #include "ll/api/service/Bedrock.h" #include "ll/api/service/PlayerInfo.h" #include "ll/api/service/ServerInfo.h" #include "main/EconomicSystem.h" -#include "mc/entity/utilities/ActorDataIDs.h" -#include "mc/enums/BossBarColor.h" -#include "mc/enums/ScorePacketType.h" -#include "mc/network/NetworkIdentifier.h" -#include "mc/server/ServerPlayer.h" -#include -#include -#include -#include - -#include "MoreGlobal.h" -#include "ScriptX/ScriptX.h" -#include "ll/api/form/ModalForm.h" -#include "ll/api/service/PlayerInfo.h" #include "main/SafeGuardRecord.h" #include "mc/certificates/WebToken.h" #include "mc/dataloadhelper/DataLoadHelper.h" #include "mc/dataloadhelper/DefaultDataLoadHelper.h" +#include "mc/entity/utilities/ActorDataIDs.h" +#include "mc/enums/BossBarColor.h" +#include "mc/enums/ScorePacketType.h" #include "mc/enums/TextPacketType.h" #include "mc/network/ConnectionRequest.h" +#include "mc/network/NetworkIdentifier.h" #include "mc/network/ServerNetworkHandler.h" #include "mc/network/packet/AddEntityPacket.h" #include "mc/network/packet/BossEventPacket.h" @@ -54,6 +48,7 @@ #include "mc/network/packet/TransferPacket.h" #include "mc/network/packet/UpdateAbilitiesPacket.h" #include "mc/network/packet/UpdateAdventureSettingsPacket.h" +#include "mc/server/ServerPlayer.h" #include "mc/server/commands/MinecraftCommands.h" #include "mc/server/commands/PlayerCommandOrigin.h" #include "mc/world/ActorUniqueID.h" @@ -72,13 +67,18 @@ #include "mc/world/scores/ScoreInfo.h" #include "mc/world/scores/Scoreboard.h" #include "mc/world/scores/ScoreboardId.h" + #include #include #include #include #include +#include #include #include +#include +#include +#include #include #include #include diff --git a/src/api/ScoreboardAPI.cpp b/src/api/ScoreboardAPI.cpp index 01065610..c6d73dcc 100644 --- a/src/api/ScoreboardAPI.cpp +++ b/src/api/ScoreboardAPI.cpp @@ -1,9 +1,11 @@ #include "api/ScoreboardAPI.h" + #include "api/APIHelp.h" #include "api/McAPI.h" #include "api/PlayerAPI.h" #include "ll/api/service/Bedrock.h" #include "mc/world/scores/ScoreInfo.h" + #include #include #include diff --git a/src/api/ScriptAPI.cpp b/src/api/ScriptAPI.cpp index ae272447..a874807b 100644 --- a/src/api/ScriptAPI.cpp +++ b/src/api/ScriptAPI.cpp @@ -1,9 +1,11 @@ #include "api/ScriptAPI.h" + #include "api/APIHelp.h" #include "engine/EngineOwnData.h" #include "engine/GlobalShareData.h" #include "engine/LocalShareData.h" #include "engine/TimeTaskSystem.h" + #include #include #include diff --git a/src/api/ServerAPI.cpp b/src/api/ServerAPI.cpp index ec64fad9..4ff86ed6 100644 --- a/src/api/ServerAPI.cpp +++ b/src/api/ServerAPI.cpp @@ -1,10 +1,12 @@ #include "api/ServerAPI.h" + #include "api/APIHelp.h" #include "api/McAPI.h" #include "ll/api/utils/RandomUtils.h" #include "main/SafeGuardRecord.h" #include "mc/network/ServerNetworkHandler.h" #include "mc/network/packet/SetTimePacket.h" + #include Local McClass::setMotd(const Arguments& args) { diff --git a/src/api/SimulatedPlayerAPI.cpp b/src/api/SimulatedPlayerAPI.cpp index 03940f6a..04f3fb4b 100644 --- a/src/api/SimulatedPlayerAPI.cpp +++ b/src/api/SimulatedPlayerAPI.cpp @@ -13,6 +13,7 @@ #include "main/SafeGuardRecord.h" #include "mc/scripting/modules/minecraft/ScriptNavigationResult.h" #include "mc/server/SimulatedPlayer.h" + #include #include #include diff --git a/src/api/SystemAPI.cpp b/src/api/SystemAPI.cpp index 29445c6d..9e53de12 100644 --- a/src/api/SystemAPI.cpp +++ b/src/api/SystemAPI.cpp @@ -1,4 +1,5 @@ #include "api/SystemAPI.h" + #include "api/APIHelp.h" #include "engine/EngineManager.h" #include "engine/TimeTaskSystem.h" @@ -10,6 +11,7 @@ #include "ll/api/utils/StringUtils.h" #include "main/SafeGuardRecord.h" #include "utils/Utils.h" + #include #include diff --git a/src/engine/EngineManager.cpp b/src/engine/EngineManager.cpp index 1ae2d09c..8949a28c 100644 --- a/src/engine/EngineManager.cpp +++ b/src/engine/EngineManager.cpp @@ -1,9 +1,11 @@ #include "engine/EngineManager.h" + #include "engine/EngineOwnData.h" #include "engine/GlobalShareData.h" #include "legacyapi/utils/STLHelper.h" #include "ll/api/utils/StringUtils.h" #include "main/NodeJsHelper.h" + #include #include #include diff --git a/src/engine/EngineManager.h b/src/engine/EngineManager.h index fb62a755..d9ee5fcc 100644 --- a/src/engine/EngineManager.h +++ b/src/engine/EngineManager.h @@ -1,6 +1,7 @@ #pragma once #include "ScriptX/ScriptX.h" #include "main/PluginManager.h" + #include #include #include diff --git a/src/engine/EngineOwnData.h b/src/engine/EngineOwnData.h index 1b2a77ac..0a6385ef 100644 --- a/src/engine/EngineOwnData.h +++ b/src/engine/EngineOwnData.h @@ -1,19 +1,17 @@ #pragma once -#include -#include -#include -#include -#include - #include "dyncall/dyncall.h" - #include "ll/api/Logger.h" - #include "ll/api/i18n/I18nAPI.h" #include "main/Configs.h" #include "utils/UsingScriptX.inc" +#include +#include +#include +#include +#include + struct FormCallbackData { script::ScriptEngine* engine; script::Global func; diff --git a/src/engine/GlobalShareData.cpp b/src/engine/GlobalShareData.cpp index 74754f69..5db73f3e 100644 --- a/src/engine/GlobalShareData.cpp +++ b/src/engine/GlobalShareData.cpp @@ -1,7 +1,9 @@ #include "engine/GlobalShareData.h" + #include "api/APIHelp.h" #include "engine/LocalShareData.h" #include "main/Configs.h" + #include #include #include diff --git a/src/engine/GlobalShareData.h b/src/engine/GlobalShareData.h index 0e373be3..c9ae76e4 100644 --- a/src/engine/GlobalShareData.h +++ b/src/engine/GlobalShareData.h @@ -1,5 +1,6 @@ #include "api/APIHelp.h" #include "engine/EngineManager.h" + #include #include #include diff --git a/src/engine/LocalShareData.cpp b/src/engine/LocalShareData.cpp index d9939fb3..7662522f 100644 --- a/src/engine/LocalShareData.cpp +++ b/src/engine/LocalShareData.cpp @@ -1,6 +1,8 @@ #include "engine/LocalShareData.h" + #include "ThreadPool.h" #include "main/Configs.h" + #include // DLL本地共享数据 diff --git a/src/engine/LocalShareData.h b/src/engine/LocalShareData.h index 54a8d20f..058f185f 100644 --- a/src/engine/LocalShareData.h +++ b/src/engine/LocalShareData.h @@ -1,6 +1,7 @@ #pragma once #include "ThreadPool.h" #include "api/APIHelp.h" + #include #include #include diff --git a/src/engine/MessageSystem.cpp b/src/engine/MessageSystem.cpp index 3faaed56..fd4e6e1f 100644 --- a/src/engine/MessageSystem.cpp +++ b/src/engine/MessageSystem.cpp @@ -1,4 +1,5 @@ #include "engine/MessageSystem.h" + #include "api/APIHelp.h" #include "engine/GlobalShareData.h" #include "engine/LocalShareData.h" @@ -6,6 +7,7 @@ #include "ll/api/event/server/ServerStoppingEvent.h" #include "utils/IniHelper.h" #include "utils/Utils.h" + #include #include #include diff --git a/src/engine/MessageSystem.h b/src/engine/MessageSystem.h index fc3cabe9..f0d12651 100644 --- a/src/engine/MessageSystem.h +++ b/src/engine/MessageSystem.h @@ -1,6 +1,7 @@ #pragma once #include "api/APIHelp.h" #include "engine/OperationCount.h" + #include #include #include diff --git a/src/engine/OperationCount.cpp b/src/engine/OperationCount.cpp index b70f53aa..82bd3e7f 100644 --- a/src/engine/OperationCount.cpp +++ b/src/engine/OperationCount.cpp @@ -1,7 +1,9 @@ #include "engine/OperationCount.h" + #include "engine/GlobalShareData.h" #include "ll/api/plugin/PluginManager.h" #include "main/Configs.h" + #include OperationCount::OperationCount(const string& name) : name(name) {} diff --git a/src/engine/RemoteCall.cpp b/src/engine/RemoteCall.cpp index 6be37cb8..c176763e 100644 --- a/src/engine/RemoteCall.cpp +++ b/src/engine/RemoteCall.cpp @@ -1,10 +1,12 @@ #include "engine/RemoteCall.h" + #include "api/APIHelp.h" #include "api/LlAPI.h" #include "engine/GlobalShareData.h" #include "engine/MessageSystem.h" #include "legacyapi/utils/STLHelper.h" #include "main/Configs.h" + #include #include #include diff --git a/src/engine/RemoteCall.h b/src/engine/RemoteCall.h index 5574616d..fbd775ea 100644 --- a/src/engine/RemoteCall.h +++ b/src/engine/RemoteCall.h @@ -1,5 +1,6 @@ #pragma once #include "api/APIHelp.h" + #include //////////////////// Funcs //////////////////// diff --git a/src/engine/TimeTaskSystem.cpp b/src/engine/TimeTaskSystem.cpp index 69572dcd..2190b4fe 100644 --- a/src/engine/TimeTaskSystem.cpp +++ b/src/engine/TimeTaskSystem.cpp @@ -1,10 +1,12 @@ #include "engine/TimeTaskSystem.h" + #include "api/APIHelp.h" #include "engine/EngineManager.h" #include "engine/EngineOwnData.h" #include "engine/MessageSystem.h" #include "legacyapi/utils/STLHelper.h" #include "ll/api/schedule/Scheduler.h" + #include #include #include diff --git a/src/engine/TimeTaskSystem.h b/src/engine/TimeTaskSystem.h index 40fc7cc5..4d9ab688 100644 --- a/src/engine/TimeTaskSystem.h +++ b/src/engine/TimeTaskSystem.h @@ -1,6 +1,7 @@ #pragma once #include "api/APIHelp.h" #include "engine/MessageSystem.h" + #include ///////////////////////// API ///////////////////////// diff --git a/src/legacyapi/db/Any.h b/src/legacyapi/db/Any.h index 67f1a064..3918b7a7 100644 --- a/src/legacyapi/db/Any.h +++ b/src/legacyapi/db/Any.h @@ -1,5 +1,6 @@ #pragma once #include "legacyapi/db/Types.h" + #include #include #include diff --git a/src/legacyapi/db/ConnParams.cpp b/src/legacyapi/db/ConnParams.cpp index 9dc654a3..1efc1ba4 100644 --- a/src/legacyapi/db/ConnParams.cpp +++ b/src/legacyapi/db/ConnParams.cpp @@ -1,4 +1,5 @@ #include "legacyapi/db/ConnParams.h" + #include "ll/api/Logger.h" #include "ll/api/utils/StringUtils.h" diff --git a/src/legacyapi/db/ConnParams.h b/src/legacyapi/db/ConnParams.h index 1400f55e..fa6c3be5 100644 --- a/src/legacyapi/db/ConnParams.h +++ b/src/legacyapi/db/ConnParams.h @@ -1,5 +1,6 @@ #pragma once #include "legacyapi/db/Any.h" + #include #include diff --git a/src/legacyapi/db/Row.cpp b/src/legacyapi/db/Row.cpp index cd7f2e4b..43eca2a6 100644 --- a/src/legacyapi/db/Row.cpp +++ b/src/legacyapi/db/Row.cpp @@ -1,5 +1,7 @@ #include "legacyapi/db/Row.h" + #include "ll/api/utils/HashUtils.h" + #include namespace DB { diff --git a/src/legacyapi/db/Row.h b/src/legacyapi/db/Row.h index 544bac68..ab3a474a 100644 --- a/src/legacyapi/db/Row.h +++ b/src/legacyapi/db/Row.h @@ -1,5 +1,6 @@ #pragma once #include "Any.h" + #include #include #include diff --git a/src/legacyapi/db/RowSet.cpp b/src/legacyapi/db/RowSet.cpp index 7a5b579f..7d389917 100644 --- a/src/legacyapi/db/RowSet.cpp +++ b/src/legacyapi/db/RowSet.cpp @@ -1,5 +1,7 @@ #include "legacyapi/db/RowSet.h" + #include "fmt/core.h" + #include diff --git a/src/legacyapi/db/RowSet.h b/src/legacyapi/db/RowSet.h index cca7d959..088846a1 100644 --- a/src/legacyapi/db/RowSet.h +++ b/src/legacyapi/db/RowSet.h @@ -1,5 +1,6 @@ #pragma once #include "legacyapi/db/Row.h" + #include #undef max diff --git a/src/legacyapi/db/Session.cpp b/src/legacyapi/db/Session.cpp index 5d58c9a9..a0f38595 100644 --- a/src/legacyapi/db/Session.cpp +++ b/src/legacyapi/db/Session.cpp @@ -1,4 +1,5 @@ #include "legacyapi/db/Session.h" + #include "legacyapi/db/impl/mysql/Session.h" #include "legacyapi/db/impl/sqlite/Session.h" diff --git a/src/legacyapi/db/Session.h b/src/legacyapi/db/Session.h index c25f7389..cf46efd8 100644 --- a/src/legacyapi/db/Session.h +++ b/src/legacyapi/db/Session.h @@ -3,6 +3,7 @@ #include "legacyapi/db/Pointer.h" #include "legacyapi/db/RowSet.h" #include "legacyapi/db/Stmt.h" + #include namespace DB { diff --git a/src/legacyapi/db/impl/mysql/Session.cpp b/src/legacyapi/db/impl/mysql/Session.cpp index 37455dd4..80b3ca74 100644 --- a/src/legacyapi/db/impl/mysql/Session.cpp +++ b/src/legacyapi/db/impl/mysql/Session.cpp @@ -1,4 +1,5 @@ #include "legacyapi/db/impl/mysql/Session.h" + #include "legacyapi/db/impl/mysql/Stmt.h" #define OK 0 diff --git a/src/legacyapi/db/impl/mysql/Stmt.cpp b/src/legacyapi/db/impl/mysql/Stmt.cpp index 50fec8ec..73c960bd 100644 --- a/src/legacyapi/db/impl/mysql/Stmt.cpp +++ b/src/legacyapi/db/impl/mysql/Stmt.cpp @@ -1,4 +1,5 @@ #include "legacyapi/db/impl/mysql/Stmt.h" + #include "legacyapi/db/impl/mysql/Session.h" #include "legacyapi/utils/StringReader.h" #include "ll/api/Logger.h" diff --git a/src/legacyapi/db/impl/sqlite/Session.cpp b/src/legacyapi/db/impl/sqlite/Session.cpp index 1b7cfbf1..adffd15f 100644 --- a/src/legacyapi/db/impl/sqlite/Session.cpp +++ b/src/legacyapi/db/impl/sqlite/Session.cpp @@ -1,4 +1,5 @@ #include "legacyapi/db/impl/sqlite/Session.h" + #include "legacyapi/db/impl/sqlite/Stmt.h" #include "sqlite3.h" diff --git a/src/legacyapi/db/impl/sqlite/Stmt.cpp b/src/legacyapi/db/impl/sqlite/Stmt.cpp index 3d5e28a2..75b347cb 100644 --- a/src/legacyapi/db/impl/sqlite/Stmt.cpp +++ b/src/legacyapi/db/impl/sqlite/Stmt.cpp @@ -1,4 +1,5 @@ #include "legacyapi/db/impl/sqlite/Stmt.h" + #include "legacyapi/db/impl/sqlite/Session.h" #include "ll/api/Logger.h" #include "sqlite3.h" diff --git a/src/legacyapi/utils/FileHelper.cpp b/src/legacyapi/utils/FileHelper.cpp index f75777ef..8474b49f 100644 --- a/src/legacyapi/utils/FileHelper.cpp +++ b/src/legacyapi/utils/FileHelper.cpp @@ -1,12 +1,11 @@ #include "FileHelper.h" -#include - -#include - #include "ll/api/utils/StringUtils.h" #include "ll/api/utils/WinUtils.h" +#include +#include + extern ll::Logger logger; std::optional ReadAllFile(const std::string& filePath, bool isBinary) { diff --git a/src/legacyapi/utils/FileHelper.h b/src/legacyapi/utils/FileHelper.h index 69f5e286..dd134c6b 100644 --- a/src/legacyapi/utils/FileHelper.h +++ b/src/legacyapi/utils/FileHelper.h @@ -1,5 +1,6 @@ #pragma once #include "ll/api/Logger.h" + #include #include #include diff --git a/src/legacyapi/utils/StringReader.cpp b/src/legacyapi/utils/StringReader.cpp index f94dd4eb..5a002a91 100644 --- a/src/legacyapi/utils/StringReader.cpp +++ b/src/legacyapi/utils/StringReader.cpp @@ -1,4 +1,5 @@ #include "StringReader.h" + #include //////////////////////////////// CONSTRUCTOR //////////////////////////////// diff --git a/src/main/BuiltinCommands.cpp b/src/main/BuiltinCommands.cpp index d1af2167..3efc82bf 100644 --- a/src/main/BuiltinCommands.cpp +++ b/src/main/BuiltinCommands.cpp @@ -1,7 +1,9 @@ #include "main/BuiltinCommands.h" + #include "api/APIHelp.h" #include "ll/api/Logger.h" #include "ll/api/utils/StringUtils.h" + #include #ifdef LLSE_BACKEND_PYTHON diff --git a/src/main/EconomicSystem.h b/src/main/EconomicSystem.h index b3a4e1f1..24625536 100644 --- a/src/main/EconomicSystem.h +++ b/src/main/EconomicSystem.h @@ -1,5 +1,6 @@ #pragma once #include "LLMoney.h" + #include using std::string; diff --git a/src/main/EconomySystem.cpp b/src/main/EconomySystem.cpp index 773cd4a0..f9251d60 100644 --- a/src/main/EconomySystem.cpp +++ b/src/main/EconomySystem.cpp @@ -3,6 +3,7 @@ #include "engine/LocalShareData.h" #include "ll/api/Logger.h" #include "main/EconomicSystem.h" + #include ll::Logger economicLogger("EconomicSystem"); diff --git a/src/main/Global.h b/src/main/Global.h index df308565..01435014 100644 --- a/src/main/Global.h +++ b/src/main/Global.h @@ -8,15 +8,15 @@ #define CPPHTTPLIB_OPENSSL_SUPPORT #endif -#include "main/Configs.h" -#include "utils/JsonHelper.h" -#include -#include - #include "ll/api/Logger.h" #include "ll/api/service/Bedrock.h" +#include "main/Configs.h" #include "mc/math/Vec3.h" #include "mc/world/level/BlockPos.h" +#include "utils/JsonHelper.h" + +#include +#include using std::string; using std::vector; diff --git a/src/main/Loader.cpp b/src/main/Loader.cpp index e304138b..aac9d932 100644 --- a/src/main/Loader.cpp +++ b/src/main/Loader.cpp @@ -7,6 +7,7 @@ #include "main/NodeJsHelper.h" #include "main/PluginManager.h" #include "utils/IniHelper.h" + #include #include #include diff --git a/src/main/Loader.h b/src/main/Loader.h index ab1e3c93..4a5ecd3d 100644 --- a/src/main/Loader.h +++ b/src/main/Loader.h @@ -1,5 +1,6 @@ #pragma once #include "api/APIHelp.h" + #include #include diff --git a/src/main/NodeJsHelper.cpp b/src/main/NodeJsHelper.cpp index ee365c7e..7061ff8e 100644 --- a/src/main/NodeJsHelper.cpp +++ b/src/main/NodeJsHelper.cpp @@ -9,6 +9,7 @@ #include "engine/RemoteCall.h" #include "main/Global.h" #include "main/NodeJsHelper.h" + #include #include #include diff --git a/src/main/NodeJsHelper.h b/src/main/NodeJsHelper.h index f5520062..21ea82b0 100644 --- a/src/main/NodeJsHelper.h +++ b/src/main/NodeJsHelper.h @@ -2,6 +2,7 @@ #if defined(LLSE_BACKEND_NODEJS) #pragma warning(disable : 4251) #include "main/Configs.h" + #include #include #include diff --git a/src/main/PluginManager.cpp b/src/main/PluginManager.cpp index 6fc967df..2c17a7fa 100644 --- a/src/main/PluginManager.cpp +++ b/src/main/PluginManager.cpp @@ -1,4 +1,5 @@ #include "main/PluginManager.h" + #include "api/APIHelp.h" #include "api/CommandAPI.h" #include "api/EventAPI.h" @@ -15,6 +16,7 @@ #include "main/Configs.h" #include "main/Global.h" #include "main/Loader.h" + #include #include diff --git a/src/main/PluginManager.h b/src/main/PluginManager.h index 95c2fd3e..4843df67 100644 --- a/src/main/PluginManager.h +++ b/src/main/PluginManager.h @@ -1,6 +1,7 @@ #pragma once #include "ll/api/plugin/Plugin.h" #include "ll/api/plugin/PluginManager.h" + #include #include #include diff --git a/src/main/PythonHelper.cpp b/src/main/PythonHelper.cpp index 48a03e52..fb0612ed 100644 --- a/src/main/PythonHelper.cpp +++ b/src/main/PythonHelper.cpp @@ -11,6 +11,7 @@ #include "engine/EngineOwnData.h" #include "engine/RemoteCall.h" #include "utils/Utils.h" + #include #include #include diff --git a/src/main/PythonHelper.h b/src/main/PythonHelper.h index eb72ab81..e84a268f 100644 --- a/src/main/PythonHelper.h +++ b/src/main/PythonHelper.h @@ -1,6 +1,7 @@ #pragma once #if defined(LLSE_BACKEND_PYTHON) #include "Configs.h" + #include #include #include diff --git a/src/main/SafeGuardRecord.cpp b/src/main/SafeGuardRecord.cpp index 1245ad48..7b580a64 100644 --- a/src/main/SafeGuardRecord.cpp +++ b/src/main/SafeGuardRecord.cpp @@ -1,4 +1,5 @@ #include "main/Configs.h" + #include #include #include diff --git a/src/main/ScriptEngine.cpp b/src/main/ScriptEngine.cpp index 87c791a4..bcb608b1 100644 --- a/src/main/ScriptEngine.cpp +++ b/src/main/ScriptEngine.cpp @@ -11,6 +11,7 @@ #include "main/EconomicSystem.h" #include "main/SafeGuardRecord.h" #include "utils/JsonHelper.h" + #include #include #include diff --git a/src/utils/IniHelper.cpp b/src/utils/IniHelper.cpp index 1d38ee0a..dd8e790d 100644 --- a/src/utils/IniHelper.cpp +++ b/src/utils/IniHelper.cpp @@ -1,6 +1,8 @@ #include "utils/IniHelper.h" + #include "legacyapi/utils/FileHelper.h" #include "ll/api/Logger.h" + #include extern ll::Logger logger; diff --git a/src/utils/IniHelper.h b/src/utils/IniHelper.h index 33c1f887..cf01c44d 100644 --- a/src/utils/IniHelper.h +++ b/src/utils/IniHelper.h @@ -1,5 +1,6 @@ #pragma once #include "SimpleIni.h" + #include using std::string; diff --git a/src/utils/JsonHelper.h b/src/utils/JsonHelper.h index 47163f1b..6c50eafc 100644 --- a/src/utils/JsonHelper.h +++ b/src/utils/JsonHelper.h @@ -3,6 +3,7 @@ #include "ll/api/Logger.h" #include "ll/api/i18n/I18nAPI.h" #include "ll/api/utils/StringUtils.h" + #include #include #include diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp index fe086d0e..e4e2fa2d 100644 --- a/src/utils/Utils.cpp +++ b/src/utils/Utils.cpp @@ -1,9 +1,10 @@ // Windows ComBase API -#include +#include "utils/Utils.h" #include "engine/LocalShareData.h" #include "ll/api/utils/StringUtils.h" -#include "utils/Utils.h" + +#include #include #include #include