From 8fd0bed224f85927b6ae39657d065735fafd2722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=90=E6=B2=90=E5=91=80?= <163636894+zimuya4153@users.noreply.github.com> Date: Sun, 12 Jan 2025 02:42:06 +0800 Subject: [PATCH] refactor: refactoring the api file architecture --- src/API/APIHelper.cc | 5 +--- src/API/APIHelper.h | 1 - src/API/{ => Actor}/ActorAPI.cc | 2 +- src/API/{ => Actor}/ActorAPI.h | 3 +-- src/API/{ => Actor}/MobAPI.cc | 6 +---- src/API/{ => Actor}/MobAPI.h | 5 ++-- src/API/{ => Command}/CommandAPI.cc | 7 +++--- src/API/{ => Command}/CommandAPI.h | 5 ++-- src/API/{ => Command}/CommandSenderAPI.cc | 6 ++--- src/API/{ => Command}/CommandSenderAPI.h | 7 +++--- src/API/{ => JSE}/EnumAPI.cc | 10 ++++---- src/API/{ => JSE}/EnumAPI.h | 1 - src/API/{ => JSE}/FileAPI.cc | 5 ++-- src/API/{ => JSE}/FileAPI.h | 1 - src/API/{ => JSE}/JSEAPI.cc | 9 ++----- src/API/{ => JSE}/JSEAPI.h | 0 src/API/{ => JSE}/PluginAPI.cc | 8 +++---- src/API/{ => JSE}/PluginAPI.h | 1 - src/API/{ => JSE}/PluginDescriptionAPI.cc | 7 +++--- src/API/{ => JSE}/PluginDescriptionAPI.h | 2 -- src/API/LoggerAPI.cc | 10 ++------ src/API/LoggerAPI.h | 1 - src/API/{ => Permissions}/PermissibleAPI.cc | 19 +++++++-------- src/API/{ => Permissions}/PermissibleAPI.h | 4 +--- src/API/{ => Permissions}/PermissionAPI.cc | 6 ++--- src/API/{ => Permissions}/PermissionAPI.h | 5 +--- src/API/PlayerAPI.cc | 6 +---- src/API/PlayerAPI.h | 5 ++-- src/Loader/JavaScriptPlugin.cc | 11 ++++----- src/Loader/JavaScriptPlugin.h | 7 +++--- src/Loader/JavaScriptPluginLoader.cc | 5 ++-- src/Loader/JavaScriptPluginLoader.h | 2 +- src/Manager/BindAPI.h | 22 ++++++++--------- src/Manager/EngineData.h | 12 ++++------ src/Manager/NodeManager.cc | 26 +++++++++------------ src/Manager/NodeManager.h | 5 ++-- 36 files changed, 90 insertions(+), 147 deletions(-) rename src/API/{ => Actor}/ActorAPI.cc (99%) rename src/API/{ => Actor}/ActorAPI.h (97%) rename src/API/{ => Actor}/MobAPI.cc (96%) rename src/API/{ => Actor}/MobAPI.h (92%) rename src/API/{ => Command}/CommandAPI.cc (97%) rename src/API/{ => Command}/CommandAPI.h (96%) rename src/API/{ => Command}/CommandSenderAPI.cc (97%) rename src/API/{ => Command}/CommandSenderAPI.h (92%) rename src/API/{ => JSE}/EnumAPI.cc (84%) rename src/API/{ => JSE}/EnumAPI.h (99%) rename src/API/{ => JSE}/FileAPI.cc (98%) rename src/API/{ => JSE}/FileAPI.h (99%) rename src/API/{ => JSE}/JSEAPI.cc (93%) rename src/API/{ => JSE}/JSEAPI.h (100%) rename src/API/{ => JSE}/PluginAPI.cc (97%) rename src/API/{ => JSE}/PluginAPI.h (99%) rename src/API/{ => JSE}/PluginDescriptionAPI.cc (97%) rename src/API/{ => JSE}/PluginDescriptionAPI.h (99%) rename src/API/{ => Permissions}/PermissibleAPI.cc (92%) rename src/API/{ => Permissions}/PermissibleAPI.h (95%) rename src/API/{ => Permissions}/PermissionAPI.cc (94%) rename src/API/{ => Permissions}/PermissionAPI.h (92%) diff --git a/src/API/APIHelper.cc b/src/API/APIHelper.cc index 4dfcc7f5..07cc2529 100644 --- a/src/API/APIHelper.cc +++ b/src/API/APIHelper.cc @@ -1,14 +1,11 @@ #include "APIHelper.h" #include "Entry.h" #include "Utils/Util.h" -#include "fmt/core.h" -#include "fmt/format.h" +#include #include - namespace jse { - bool IsFloat(Local const& num) { try { return fabs(num.asNumber().toDouble() - num.asNumber().toInt64()) >= 1e-15; diff --git a/src/API/APIHelper.h b/src/API/APIHelper.h index 22c79f36..44ebcfc2 100644 --- a/src/API/APIHelper.h +++ b/src/API/APIHelper.h @@ -2,7 +2,6 @@ #include "Manager/EngineData.h" #include "Utils/Using.h" - namespace jse { bool IsFloat(Local const& num); diff --git a/src/API/ActorAPI.cc b/src/API/Actor/ActorAPI.cc similarity index 99% rename from src/API/ActorAPI.cc rename to src/API/Actor/ActorAPI.cc index ba144551..581fcaa5 100644 --- a/src/API/ActorAPI.cc +++ b/src/API/Actor/ActorAPI.cc @@ -1,6 +1,6 @@ #include "ActorAPI.h" #include "API/APIHelper.h" -#include "APIHelper.h" +#include "API/APIHelper.h" #include "Utils/Convert.h" #include "Utils/Using.h" #include diff --git a/src/API/ActorAPI.h b/src/API/Actor/ActorAPI.h similarity index 97% rename from src/API/ActorAPI.h rename to src/API/Actor/ActorAPI.h index a3ccd237..fb1b733a 100644 --- a/src/API/ActorAPI.h +++ b/src/API/Actor/ActorAPI.h @@ -1,6 +1,5 @@ #pragma once - -#include "API/CommandSenderAPI.h" +#include "API/Command/CommandSenderAPI.h" #include "Utils/Defines.h" #include "Utils/Using.h" #include "endstone/actor/actor.h" diff --git a/src/API/MobAPI.cc b/src/API/Actor/MobAPI.cc similarity index 96% rename from src/API/MobAPI.cc rename to src/API/Actor/MobAPI.cc index a63fbfbe..f690c514 100644 --- a/src/API/MobAPI.cc +++ b/src/API/Actor/MobAPI.cc @@ -1,10 +1,6 @@ -#include "MobAPI.h" -#include "API/APIHelper.h" -#include "APIHelper.h" +#include "API/Actor/MobAPI.h" #include "Utils/Convert.h" #include "Utils/Using.h" -#include -#include namespace jse { diff --git a/src/API/MobAPI.h b/src/API/Actor/MobAPI.h similarity index 92% rename from src/API/MobAPI.h rename to src/API/Actor/MobAPI.h index 8e3f88d4..68b5e40c 100644 --- a/src/API/MobAPI.h +++ b/src/API/Actor/MobAPI.h @@ -1,9 +1,8 @@ #pragma once - -#include "API/ActorAPI.h" +#include "API/Actor/ActorAPI.h" #include "Utils/Defines.h" #include "Utils/Using.h" -#include "endstone/actor/mob.h" +#include namespace jse { diff --git a/src/API/CommandAPI.cc b/src/API/Command/CommandAPI.cc similarity index 97% rename from src/API/CommandAPI.cc rename to src/API/Command/CommandAPI.cc index c19eae86..359ebe38 100644 --- a/src/API/CommandAPI.cc +++ b/src/API/Command/CommandAPI.cc @@ -1,11 +1,10 @@ -#include "CommandAPI.h" +#include "API/Command/CommandAPI.h" #include "API/APIHelper.h" -#include "API/CommandSenderAPI.h" +#include "API/Command/CommandSenderAPI.h" #include "Utils/Convert.h" #include "Utils/Defines.h" #include "Utils/Using.h" -#include "endstone/command/command.h" -#include +#include namespace jse { diff --git a/src/API/CommandAPI.h b/src/API/Command/CommandAPI.h similarity index 96% rename from src/API/CommandAPI.h rename to src/API/Command/CommandAPI.h index ca700d20..99bec164 100644 --- a/src/API/CommandAPI.h +++ b/src/API/Command/CommandAPI.h @@ -1,11 +1,10 @@ #pragma once - #include "API/APIHelper.h" #include "Utils/Defines.h" #include "Utils/Using.h" -#include "endstone/command/command.h" -namespace jse { +#include +namespace jse { class CommandAPI : public ScriptClass { endstone::Command* mCommand; diff --git a/src/API/CommandSenderAPI.cc b/src/API/Command/CommandSenderAPI.cc similarity index 97% rename from src/API/CommandSenderAPI.cc rename to src/API/Command/CommandSenderAPI.cc index b7539c8b..67c1b482 100644 --- a/src/API/CommandSenderAPI.cc +++ b/src/API/Command/CommandSenderAPI.cc @@ -1,13 +1,11 @@ -#include "CommandSenderAPI.h" -#include "ActorAPI.h" -#include "PlayerAPI.h" +#include "API/Command/CommandSenderAPI.h" +#include "API/PlayerAPI.h" #include "API/APIHelper.h" #include "Utils/Convert.h" #include "Utils/Using.h" #include #include - namespace jse { ClassDefine CommandSenderAPI::builder = diff --git a/src/API/CommandSenderAPI.h b/src/API/Command/CommandSenderAPI.h similarity index 92% rename from src/API/CommandSenderAPI.h rename to src/API/Command/CommandSenderAPI.h index 4a6ca6c7..bd058d71 100644 --- a/src/API/CommandSenderAPI.h +++ b/src/API/Command/CommandSenderAPI.h @@ -1,11 +1,10 @@ #pragma once - -#include "API/PermissibleAPI.h" +#include "API/Permissions/PermissibleAPI.h" #include "Utils/Defines.h" #include "Utils/Using.h" -#include "endstone/command/command_sender.h" -namespace jse { +#include +namespace jse { class CommandSenderAPI : public PermissibleAPI { endstone::CommandSender* mSender; diff --git a/src/API/EnumAPI.cc b/src/API/JSE/EnumAPI.cc similarity index 84% rename from src/API/EnumAPI.cc rename to src/API/JSE/EnumAPI.cc index 5ce517cf..13b2f668 100644 --- a/src/API/EnumAPI.cc +++ b/src/API/JSE/EnumAPI.cc @@ -1,9 +1,11 @@ -#include "EnumAPI.h" -#include "APIHelper.h" +#include "API/JSE/EnumAPI.h" #include "Utils/Using.h" +#include "Utils/Convert.h" +#include +#include #include -#include -#include +#include +#include #define REGISTER_ENUM_MACRO(ENUM, NAME) \ for (auto [value, key] : magic_enum::enum_entries()) { \ diff --git a/src/API/EnumAPI.h b/src/API/JSE/EnumAPI.h similarity index 99% rename from src/API/EnumAPI.h rename to src/API/JSE/EnumAPI.h index 4ee55199..e55e7662 100644 --- a/src/API/EnumAPI.h +++ b/src/API/JSE/EnumAPI.h @@ -1,5 +1,4 @@ #pragma once - #include "Utils/Using.h" namespace jse::EnumAPI { diff --git a/src/API/FileAPI.cc b/src/API/JSE/FileAPI.cc similarity index 98% rename from src/API/FileAPI.cc rename to src/API/JSE/FileAPI.cc index 8e204cfd..0db35633 100644 --- a/src/API/FileAPI.cc +++ b/src/API/JSE/FileAPI.cc @@ -1,6 +1,5 @@ -#include "FileAPI.h" -#include "APIHelper.h" -#include "Manager/EngineData.h" +#include "API/JSE/FileAPI.h" +#include "API/APIHelper.h" #include "Utils/FileUtils.h" #include diff --git a/src/API/FileAPI.h b/src/API/JSE/FileAPI.h similarity index 99% rename from src/API/FileAPI.h rename to src/API/JSE/FileAPI.h index fcde27ae..0f21f641 100644 --- a/src/API/FileAPI.h +++ b/src/API/JSE/FileAPI.h @@ -1,5 +1,4 @@ #pragma once - #include "Utils/Defines.h" #include "Utils/Using.h" diff --git a/src/API/JSEAPI.cc b/src/API/JSE/JSEAPI.cc similarity index 93% rename from src/API/JSEAPI.cc rename to src/API/JSE/JSEAPI.cc index 94aaaf13..52dc8d61 100644 --- a/src/API/JSEAPI.cc +++ b/src/API/JSE/JSEAPI.cc @@ -1,15 +1,10 @@ -#include "JSEAPI.h" -#include "APIHelper.h" -#include "Entry.h" +#include "API/JSE/JSEAPI.h" +#include "API/APIHelper.h" #include "Manager/EngineData.h" -#include "Manager/NodeManager.h" #include "PluginAPI.h" #include "Utils/Using.h" -#include "fmt/core.h" #include - - namespace jse { ClassDefine JSEAPI::builder = defineClass("JSE") diff --git a/src/API/JSEAPI.h b/src/API/JSE/JSEAPI.h similarity index 100% rename from src/API/JSEAPI.h rename to src/API/JSE/JSEAPI.h diff --git a/src/API/PluginAPI.cc b/src/API/JSE/PluginAPI.cc similarity index 97% rename from src/API/PluginAPI.cc rename to src/API/JSE/PluginAPI.cc index e02a027f..f2d4ef2e 100644 --- a/src/API/PluginAPI.cc +++ b/src/API/JSE/PluginAPI.cc @@ -1,11 +1,9 @@ -#include "PluginAPI.h" +#include "API/JSE/PluginAPI.h" +#include "API/JSE/PluginDescriptionAPI.h" +#include "API/APIHelper.h" #include "API/LoggerAPI.h" -#include "API/PluginDescriptionAPI.h" -#include "APIHelper.h" #include "Manager/EngineData.h" #include "Utils/Using.h" -#include - namespace jse { diff --git a/src/API/PluginAPI.h b/src/API/JSE/PluginAPI.h similarity index 99% rename from src/API/PluginAPI.h rename to src/API/JSE/PluginAPI.h index 79921e78..72f72a8e 100644 --- a/src/API/PluginAPI.h +++ b/src/API/JSE/PluginAPI.h @@ -2,7 +2,6 @@ #include "Utils/Defines.h" #include "Utils/Using.h" - namespace jse { diff --git a/src/API/PluginDescriptionAPI.cc b/src/API/JSE/PluginDescriptionAPI.cc similarity index 97% rename from src/API/PluginDescriptionAPI.cc rename to src/API/JSE/PluginDescriptionAPI.cc index ccca3990..c0cd52c5 100644 --- a/src/API/PluginDescriptionAPI.cc +++ b/src/API/JSE/PluginDescriptionAPI.cc @@ -1,12 +1,11 @@ -#include "PluginDescriptionAPI.h" +#include "API/JSE/PluginDescriptionAPI.h" #include "API/APIHelper.h" -#include "API/CommandAPI.h" -#include "API/PermissionAPI.h" +#include "API/Command/CommandAPI.h" +#include "API/Permissions/PermissionAPI.h" #include "Manager/EngineData.h" #include "Utils/Convert.h" #include "Utils/Using.h" - namespace jse { ClassDefine PluginDescriptionAPI::builder = diff --git a/src/API/PluginDescriptionAPI.h b/src/API/JSE/PluginDescriptionAPI.h similarity index 99% rename from src/API/PluginDescriptionAPI.h rename to src/API/JSE/PluginDescriptionAPI.h index 1ba8ffb8..f0906ce8 100644 --- a/src/API/PluginDescriptionAPI.h +++ b/src/API/JSE/PluginDescriptionAPI.h @@ -2,10 +2,8 @@ #include "Utils/Defines.h" #include "Utils/Using.h" - namespace jse { - class PluginDescriptionAPI : public ScriptClass { public: explicit PluginDescriptionAPI() : ScriptClass(ScriptClass::ConstructFromCpp{}) {} diff --git a/src/API/LoggerAPI.cc b/src/API/LoggerAPI.cc index 8cae8849..3f932385 100644 --- a/src/API/LoggerAPI.cc +++ b/src/API/LoggerAPI.cc @@ -1,12 +1,6 @@ -#include "LoggerAPI.h" -#include "APIHelper.h" -#include "Entry.h" +#include "API/LoggerAPI.h" +#include "API/APIHelper.h" #include "Manager/EngineData.h" -#include "Manager/NodeManager.h" -#include "fmt/args.h" -#include "fmt/format.h" - - namespace jse { diff --git a/src/API/LoggerAPI.h b/src/API/LoggerAPI.h index 188c8e3f..9c2003df 100644 --- a/src/API/LoggerAPI.h +++ b/src/API/LoggerAPI.h @@ -4,7 +4,6 @@ namespace jse { - class LoggerAPI : public ScriptClass { public: explicit LoggerAPI() : ScriptClass(ScriptClass::ConstructFromCpp{}){}; diff --git a/src/API/PermissibleAPI.cc b/src/API/Permissions/PermissibleAPI.cc similarity index 92% rename from src/API/PermissibleAPI.cc rename to src/API/Permissions/PermissibleAPI.cc index ec400c4c..251775ca 100644 --- a/src/API/PermissibleAPI.cc +++ b/src/API/Permissions/PermissibleAPI.cc @@ -1,19 +1,16 @@ -#include "PermissibleAPI.h" -#include "API/CommandSenderAPI.h" -#include "API/PermissionAPI.h" -#include "API/PluginAPI.h" -#include "APIHelper.h" -#include "Loader/JavaScriptPlugin.h" +#include "API/Permissions/PermissibleAPI.h" +#include "API/APIHelper.h" +#include "API/Command/CommandSenderAPI.h" +#include "API/JSE/PluginAPI.h" +#include "API/Permissions/PermissionAPI.h" #include "Utils/Convert.h" #include "Utils/Defines.h" #include "Utils/Using.h" -#include "endstone/permissions/permissible.h" -#include "endstone/plugin/plugin.h" -#include "endstone/util/result.h" -#include "fmt/core.h" +#include +#include +#include #include - namespace jse { ClassDefine PermissibleAPI::builder = diff --git a/src/API/PermissibleAPI.h b/src/API/Permissions/PermissibleAPI.h similarity index 95% rename from src/API/PermissibleAPI.h rename to src/API/Permissions/PermissibleAPI.h index 5cf53a73..9fc7ff90 100644 --- a/src/API/PermissibleAPI.h +++ b/src/API/Permissions/PermissibleAPI.h @@ -1,12 +1,10 @@ #pragma once #include "Utils/Defines.h" #include "Utils/Using.h" -#include "endstone/permissions/permissible.h" - +#include namespace jse { - class PermissibleAPI : public ScriptClass { endstone::Permissible* mPermissible; diff --git a/src/API/PermissionAPI.cc b/src/API/Permissions/PermissionAPI.cc similarity index 94% rename from src/API/PermissionAPI.cc rename to src/API/Permissions/PermissionAPI.cc index 99c0af09..b2dca46a 100644 --- a/src/API/PermissionAPI.cc +++ b/src/API/Permissions/PermissionAPI.cc @@ -1,9 +1,9 @@ -#include "PermissionAPI.h" +#include "API/Permissions/PermissionAPI.h" #include "API/APIHelper.h" -#include "API/PermissibleAPI.h" +#include "API/Permissions/PermissibleAPI.h" #include "Utils/Convert.h" #include "Utils/Defines.h" -#include "endstone/permissions/permission_default.h" +#include namespace jse { diff --git a/src/API/PermissionAPI.h b/src/API/Permissions/PermissionAPI.h similarity index 92% rename from src/API/PermissionAPI.h rename to src/API/Permissions/PermissionAPI.h index ecaf6787..0fec3190 100644 --- a/src/API/PermissionAPI.h +++ b/src/API/Permissions/PermissionAPI.h @@ -1,13 +1,10 @@ #pragma once -#include "API/APIHelper.h" #include "Utils/Defines.h" #include "Utils/Using.h" -#include "endstone/permissions/permission.h" - +#include namespace jse { - class PermissionAPI : public ScriptClass { endstone::Permission* mPermission; diff --git a/src/API/PlayerAPI.cc b/src/API/PlayerAPI.cc index f60ab843..f537303f 100644 --- a/src/API/PlayerAPI.cc +++ b/src/API/PlayerAPI.cc @@ -1,12 +1,8 @@ -#include "PlayerAPI.h" +#include "API/PlayerAPI.h" #include "API/APIHelper.h" #include "APIHelper.h" #include "Utils/Convert.h" #include "Utils/Using.h" -#include -#include -#include - namespace jse { diff --git a/src/API/PlayerAPI.h b/src/API/PlayerAPI.h index 00c72f4f..1ccae031 100644 --- a/src/API/PlayerAPI.h +++ b/src/API/PlayerAPI.h @@ -1,9 +1,8 @@ #pragma once - -#include "API/MobAPI.h" +#include "API/Actor/MobAPI.h" #include "Utils/Defines.h" #include "Utils/Using.h" -#include "endstone/player.h" +#include namespace jse { diff --git a/src/Loader/JavaScriptPlugin.cc b/src/Loader/JavaScriptPlugin.cc index f010c100..e151715a 100644 --- a/src/Loader/JavaScriptPlugin.cc +++ b/src/Loader/JavaScriptPlugin.cc @@ -1,17 +1,16 @@ -#include "JavaScriptPlugin.h" +#include "Loader/JavaScriptPlugin.h" #include "API/APIHelper.h" -#include "API/CommandAPI.h" -#include "API/CommandSenderAPI.h" +#include "API/Command/CommandAPI.h" +#include "API/Command/CommandSenderAPI.h" #include "Entry.h" #include "Manager/EngineData.h" #include "Manager/NodeManager.h" #include "Utils/Convert.h" #include "Utils/Using.h" -#include "endstone/command/command.h" -#include "endstone/logger.h" +#include +#include #include - namespace jse { diff --git a/src/Loader/JavaScriptPlugin.h b/src/Loader/JavaScriptPlugin.h index 6bef6a86..504b7f6f 100644 --- a/src/Loader/JavaScriptPlugin.h +++ b/src/Loader/JavaScriptPlugin.h @@ -1,10 +1,9 @@ #pragma once -#include "endstone/detail/plugin/plugin_description_builder.h" -#include "endstone/plugin/plugin.h" -#include "endstone/plugin/plugin_description.h" +#include +#include +#include #include - namespace jse { class JsPluginDescriptionBuilder : public endstone::detail::PluginDescriptionBuilder { diff --git a/src/Loader/JavaScriptPluginLoader.cc b/src/Loader/JavaScriptPluginLoader.cc index 950509e1..f5b7d7c4 100644 --- a/src/Loader/JavaScriptPluginLoader.cc +++ b/src/Loader/JavaScriptPluginLoader.cc @@ -1,6 +1,6 @@ -#include "JavaScriptPluginLoader.h" +#include "Loader/JavaScriptPluginLoader.h" #include "Entry.h" -#include "JavaScriptPlugin.h" +#include "Loader/JavaScriptPlugin.h" #include "Manager/EngineData.h" #include "Manager/NodeManager.h" #include "Utils/Using.h" @@ -9,7 +9,6 @@ #include #include - namespace jse { JavaScriptPluginLoader::JavaScriptPluginLoader(endstone::Server& server) : PluginLoader(server) {} diff --git a/src/Loader/JavaScriptPluginLoader.h b/src/Loader/JavaScriptPluginLoader.h index 38890f1c..0bf785a8 100644 --- a/src/Loader/JavaScriptPluginLoader.h +++ b/src/Loader/JavaScriptPluginLoader.h @@ -1,5 +1,5 @@ #pragma once -#include "endstone/plugin/plugin_loader.h" +#include #include #include diff --git a/src/Manager/BindAPI.h b/src/Manager/BindAPI.h index 31bf92c2..e2e967a7 100644 --- a/src/Manager/BindAPI.h +++ b/src/Manager/BindAPI.h @@ -1,16 +1,16 @@ #pragma once -#include "API/ActorAPI.h" -#include "API/PlayerAPI.h" -#include "API/CommandAPI.h" -#include "API/CommandSenderAPI.h" -#include "API/EnumAPI.h" -#include "API/FileAPI.h" -#include "API/JSEAPI.h" +#include "API/Actor/ActorAPI.h" +#include "API/Actor/MobAPI.h" +#include "API/Command/CommandAPI.h" +#include "API/Command/CommandSenderAPI.h" +#include "API/JSE/EnumAPI.h" +#include "API/JSE/FileAPI.h" +#include "API/JSE/JSEAPI.h" #include "API/LoggerAPI.h" -#include "API/MobAPI.h" -#include "API/PermissibleAPI.h" -#include "API/PluginAPI.h" -#include "API/PluginDescriptionAPI.h" +#include "API/JSE/PluginAPI.h" +#include "API/JSE/PluginDescriptionAPI.h" +#include "API/Permissions/PermissibleAPI.h" +#include "API/PlayerAPI.h" #include "Utils/Using.h" namespace jse { diff --git a/src/Manager/EngineData.h b/src/Manager/EngineData.h index 089d3c18..5992dd4d 100644 --- a/src/Manager/EngineData.h +++ b/src/Manager/EngineData.h @@ -4,14 +4,12 @@ #include "Utils/Convert.h" #include "Utils/StringUtils.h" #include "Utils/Using.h" -#include "endstone/command/command.h" -#include "endstone/permissions/permission.h" -#include "endstone/permissions/permission_default.h" -#include "endstone/plugin/plugin_load_order.h" -#include "magic_enum/magic_enum.hpp" -#include #include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/Manager/NodeManager.cc b/src/Manager/NodeManager.cc index 9be21405..c0d2c8d9 100644 --- a/src/Manager/NodeManager.cc +++ b/src/Manager/NodeManager.cc @@ -1,27 +1,23 @@ #pragma warning(disable : 4996) -#include "NodeManager.h" +#include "Manager/NodeManager.h" #include "API/APIHelper.h" -#include "BindAPI.h" -#include "EngineData.h" #include "Entry.h" -#include "Utils/Using.h" +#include "Manager/BindAPI.h" +#include "Manager/EngineData.h" #include "Utils/Util.h" -#include "endstone/scheduler/scheduler.h" -#include "fmt/core.h" -#include "nlohmann/json.hpp" -#include "node.h" -#include "uv.h" -#include "v8-cppgc.h" -#include "v8.h" +#include "Utils/Using.h" +#include #include +#include #include +#include +#include #include -#include -#include +#include #ifdef _WIN32 -#include "Windows.h" -#include "shellapi.h" +#include +#include #else #include #endif diff --git a/src/Manager/NodeManager.h b/src/Manager/NodeManager.h index f9b47d66..db46e3bc 100644 --- a/src/Manager/NodeManager.h +++ b/src/Manager/NodeManager.h @@ -1,15 +1,14 @@ #pragma once #include "Utils/Using.h" -#include "endstone/scheduler/task.h" -#include "node.h" #include +#include #include #include +#include #include #include #include - namespace jse {