refactor: refactoring the api file architecture

IceBlcokMC · Jan 11, 2025 · 8fd0bed · 8fd0bed
1 parent a11a877
commit 8fd0bed
Show file tree

Hide file tree

Showing 36 changed files with 90 additions and 147 deletions.
diff --git 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 <fmt/core.h>
 #include <iostream>
 
-
 namespace jse {
 
-
 bool IsFloat(Local<Value> 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
@@ -2,7 +2,6 @@
 #include "Manager/EngineData.h"
 #include "Utils/Using.h"
 
-
 namespace jse {
 
 bool IsFloat(Local<Value> const& num);

diff --git a/src/API/ActorAPI.cc → src/API/Actor/ActorAPI.cc b/src/API/ActorAPI.cc → 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 <cstddef>

diff --git a/src/API/ActorAPI.h → src/API/Actor/ActorAPI.h b/src/API/ActorAPI.h → 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 → src/API/Actor/MobAPI.cc b/src/API/MobAPI.cc → 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 <cstddef>
-#include <sstream>
 
 namespace jse {
 

diff --git a/src/API/MobAPI.h → src/API/Actor/MobAPI.h b/src/API/MobAPI.h → 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 <endstone/actor/mob.h>
 
 namespace jse {
 

diff --git a/src/API/CommandAPI.cc → src/API/Command/CommandAPI.cc b/src/API/CommandAPI.cc → 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 <vector>
+#include <endstone/command/command.h>
 
 namespace jse {
 

diff --git a/src/API/CommandAPI.h → src/API/Command/CommandAPI.h b/src/API/CommandAPI.h → 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 <endstone/command/command.h>
 
+namespace jse {
 
 class CommandAPI : public ScriptClass {
     endstone::Command* mCommand;

diff --git a/src/API/CommandSenderAPI.cc → src/API/Command/CommandSenderAPI.cc b/src/API/CommandSenderAPI.cc → 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 <cstddef>
 #include <sstream>
 
-
 namespace jse {
 
 ClassDefine<CommandSenderAPI> CommandSenderAPI::builder =

diff --git a/src/API/CommandSenderAPI.h → src/API/Command/CommandSenderAPI.h b/src/API/CommandSenderAPI.h → 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 <endstone/command/command_sender.h>
 
+namespace jse {
 
 class CommandSenderAPI : public PermissibleAPI {
     endstone::CommandSender* mSender;

diff --git a/src/API/EnumAPI.cc → src/API/JSE/EnumAPI.cc b/src/API/EnumAPI.cc → 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 <endstone/game_mode.h>
+#include <endstone/logger.h>
 #include <endstone/permissions/permission_default.h>
-#include <string>
-#include <unordered_map>
+#include <endstone/plugin/plugin_load_order.h>
+#include <magic_enum/magic_enum.hpp>
 
 #define REGISTER_ENUM_MACRO(ENUM, NAME)                                                                                \
     for (auto [value, key] : magic_enum::enum_entries<ENUM>()) {                                                       \

diff --git a/src/API/EnumAPI.h → src/API/JSE/EnumAPI.h b/src/API/EnumAPI.h → 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 → src/API/JSE/FileAPI.cc b/src/API/FileAPI.cc → 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 <filesystem>
 

diff --git a/src/API/FileAPI.h → src/API/JSE/FileAPI.h b/src/API/FileAPI.h → 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 → src/API/JSE/JSEAPI.cc b/src/API/JSEAPI.cc → 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 <iostream>
 
-
-
 namespace jse {
 
 ClassDefine<void> JSEAPI::builder = defineClass("JSE")

diff --git a/src/API/JSEAPI.h → src/API/JSE/JSEAPI.h b/src/API/JSEAPI.h → src/API/JSE/JSEAPI.h
diff --git a/src/API/PluginAPI.cc → src/API/JSE/PluginAPI.cc b/src/API/PluginAPI.cc → 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 <cstddef>
-
 
 namespace jse {
 

diff --git a/src/API/PluginAPI.h → src/API/JSE/PluginAPI.h b/src/API/PluginAPI.h → 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 → src/API/JSE/PluginDescriptionAPI.cc b/src/API/PluginDescriptionAPI.cc → 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> PluginDescriptionAPI::builder =

diff --git a/src/API/PluginDescriptionAPI.h → src/API/JSE/PluginDescriptionAPI.h b/src/API/PluginDescriptionAPI.h → 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<PluginDescriptionAPI>{}) {}

diff --git 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
@@ -4,7 +4,6 @@
 
 namespace jse {
 
-
 class LoggerAPI : public ScriptClass {
 public:
     explicit LoggerAPI() : ScriptClass(ScriptClass::ConstructFromCpp<LoggerAPI>{}){};

diff --git a/src/API/PermissibleAPI.cc → src/API/Permissions/PermissibleAPI.cc b/src/API/PermissibleAPI.cc → 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 <endstone/permissions/permissible.h>
+#include <endstone/plugin/plugin.h>
+#include <endstone/util/result.h>
 #include <stdexcept>
 
-
 namespace jse {
 
 ClassDefine<PermissibleAPI> PermissibleAPI::builder =

diff --git a/src/API/PermissibleAPI.h → src/API/Permissions/PermissibleAPI.h b/src/API/PermissibleAPI.h → 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 <endstone/permissions/permissible.h>
 
 namespace jse {
 
-
 class PermissibleAPI : public ScriptClass {
     endstone::Permissible* mPermissible;
 

diff --git a/src/API/PermissionAPI.cc → src/API/Permissions/PermissionAPI.cc b/src/API/PermissionAPI.cc → 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 <endstone/permissions/permission_default.h>
 
 namespace jse {
 

diff --git a/src/API/PermissionAPI.h → src/API/Permissions/PermissionAPI.h b/src/API/PermissionAPI.h → 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 <endstone/permissions/permission.h>
 
 namespace jse {
 
-
 class PermissionAPI : public ScriptClass {
     endstone::Permission* mPermission;
 

diff --git 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 <cstddef>
-#include <sstream>
-#include <unordered_map>
-
 
 namespace jse {
 

diff --git 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 <endstone/player.h>
 
 namespace jse {
 

diff --git 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 <endstone/command/command.h>
+#include <endstone/logger.h>
 #include <iostream>
 
-
 namespace jse {
 
 

diff --git 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 <endstone/detail/plugin/plugin_description_builder.h>
+#include <endstone/plugin/plugin.h>
+#include <endstone/plugin/plugin_description.h>
 #include <cstdint>
 
-
 namespace jse {
 
 class JsPluginDescriptionBuilder : public endstone::detail::PluginDescriptionBuilder {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,7 +2,6 @@
		#include "Utils/Defines.h"
		#include "Utils/Using.h"


		namespace jse {


Expand Down
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,6 @@ @@
     namespace jse {
     class LoggerAPI : public ScriptClass {
     public:
         explicit LoggerAPI() : ScriptClass(ScriptClass::ConstructFromCpp<LoggerAPI>{}){};
@@ Expand Down @@