refactor(API): 使用builder替代JSEAPIClass等外部定义

IceBlcokMC · Dec 20, 2024 · b0c20e1 · b0c20e1
1 parent ac6eda6
commit b0c20e1
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 49 deletions.
diff --git a/src/API/JSEAPI.cc b/src/API/JSEAPI.cc
@@ -11,11 +11,11 @@
 
 namespace jse {
 
-ClassDefine<void> JSEAPIClass = defineClass("JSE")
-                                    .function("registerPlugin", &JSEAPI::registerPlugin)
-                                    .function("getPlugin", &JSEAPI::getPlugin)
-                                    .function("debug", &JSEAPI::debug)
-                                    .build();
+ClassDefine<void> JSEAPI::builder = defineClass("JSE")
+                                        .function("registerPlugin", &JSEAPI::registerPlugin)
+                                        .function("getPlugin", &JSEAPI::getPlugin)
+                                        .function("debug", &JSEAPI::debug)
+                                        .build();
 
 Local<Value> JSEAPI::registerPlugin(Arguments const& args) {
     CheckArgsCount(args, 1);

diff --git a/src/API/JSEAPI.h b/src/API/JSEAPI.h
@@ -11,8 +11,9 @@ class JSEAPI {
     static Local<Value> getPlugin(Arguments const& args);
 
     static Local<Value> debug(Arguments const& args);
-};
 
-extern ClassDefine<void> JSEAPIClass;
+
+    static ClassDefine<void> builder;
+};
 
 } // namespace jse
diff --git a/src/API/LoggerAPI.cc b/src/API/LoggerAPI.cc
@@ -9,20 +9,20 @@
 
 namespace jse {
 
-ClassDefine<LoggerAPI> LoggerAPIClass = defineClass<LoggerAPI>("Logger")
-                                            .constructor(nullptr)
-                                            .instanceFunction("toString", &LoggerAPI::toString)
-                                            .instanceFunction("log", &LoggerAPI::log)
-                                            .instanceFunction("info", &LoggerAPI::info)
-                                            .instanceFunction("warning", &LoggerAPI::warning)
-                                            .instanceFunction("error", &LoggerAPI::error)
-                                            .instanceFunction("debug", &LoggerAPI::debug)
-                                            .instanceFunction("trace", &LoggerAPI::trace)
-                                            .instanceFunction("critical", &LoggerAPI::critical)
-                                            .instanceFunction("setLevel", &LoggerAPI::setLevel)
-                                            .instanceFunction("isEnabledFor", &LoggerAPI::isEnabledFor)
-                                            .instanceFunction("getName", &LoggerAPI::getName)
-                                            .build();
+ClassDefine<LoggerAPI> LoggerAPI::builder = defineClass<LoggerAPI>("Logger")
+                                                .constructor(nullptr)
+                                                .instanceFunction("toString", &LoggerAPI::toString)
+                                                .instanceFunction("log", &LoggerAPI::log)
+                                                .instanceFunction("info", &LoggerAPI::info)
+                                                .instanceFunction("warning", &LoggerAPI::warning)
+                                                .instanceFunction("error", &LoggerAPI::error)
+                                                .instanceFunction("debug", &LoggerAPI::debug)
+                                                .instanceFunction("trace", &LoggerAPI::trace)
+                                                .instanceFunction("critical", &LoggerAPI::critical)
+                                                .instanceFunction("setLevel", &LoggerAPI::setLevel)
+                                                .instanceFunction("isEnabledFor", &LoggerAPI::isEnabledFor)
+                                                .instanceFunction("getName", &LoggerAPI::getName)
+                                                .build();
 
 Local<Value> LoggerAPIHelper(endstone::Logger::Level level, string const& message) {
     try {

diff --git a/src/API/LoggerAPI.h b/src/API/LoggerAPI.h
@@ -25,9 +25,10 @@ class LoggerAPI : public ScriptClass {
     METHODS(setLevel);
     METHODS(isEnabledFor);
     METHODS(getName);
-};
 
-extern ClassDefine<LoggerAPI> LoggerAPIClass;
+
+    static ClassDefine<LoggerAPI> builder;
+};
 
 
 } // namespace jse
diff --git a/src/API/PluginAPI.cc b/src/API/PluginAPI.cc
@@ -9,22 +9,22 @@
 
 namespace jse {
 
-ClassDefine<PluginAPI> PluginAPIClass = defineClass<PluginAPI>("Plugin")
-                                            .constructor(nullptr)
-                                            .instanceFunction("toString", &PluginAPI::toString)
-                                            .instanceFunction("getDescription", &PluginAPI::getDescription)
-                                            .instanceFunction("onLoad", &PluginAPI::onLoad)
-                                            .instanceFunction("onEnable", &PluginAPI::onEnable)
-                                            .instanceFunction("onDisable", &PluginAPI::onDisable)
-                                            .instanceFunction("getLogger", &PluginAPI::getLogger)
-                                            .instanceFunction("isEnabled", &PluginAPI::isEnabled)
-                                            .instanceFunction("getPluginLoader", &PluginAPI::getPluginLoader)
-                                            .instanceFunction("getServer", &PluginAPI::getServer)
-                                            .instanceFunction("getName", &PluginAPI::getName)
-                                            .instanceFunction("getCommand", &PluginAPI::getCommand)
-                                            .instanceFunction("getDataFolder", &PluginAPI::getDataFolder)
-                                            .instanceFunction("registerEvent", &PluginAPI::registerEvent)
-                                            .build();
+ClassDefine<PluginAPI> PluginAPI::builder = defineClass<PluginAPI>("Plugin")
+                                                .constructor(nullptr)
+                                                .instanceFunction("toString", &PluginAPI::toString)
+                                                .instanceFunction("getDescription", &PluginAPI::getDescription)
+                                                .instanceFunction("onLoad", &PluginAPI::onLoad)
+                                                .instanceFunction("onEnable", &PluginAPI::onEnable)
+                                                .instanceFunction("onDisable", &PluginAPI::onDisable)
+                                                .instanceFunction("getLogger", &PluginAPI::getLogger)
+                                                .instanceFunction("isEnabled", &PluginAPI::isEnabled)
+                                                .instanceFunction("getPluginLoader", &PluginAPI::getPluginLoader)
+                                                .instanceFunction("getServer", &PluginAPI::getServer)
+                                                .instanceFunction("getName", &PluginAPI::getName)
+                                                .instanceFunction("getCommand", &PluginAPI::getCommand)
+                                                .instanceFunction("getDataFolder", &PluginAPI::getDataFolder)
+                                                .instanceFunction("registerEvent", &PluginAPI::registerEvent)
+                                                .build();
 
 
 #define PLUGINAPI_MACRO(FUNC_NAME, ...)                                                                                \

diff --git a/src/API/PluginAPI.h b/src/API/PluginAPI.h
@@ -38,9 +38,10 @@ class PluginAPI : public ScriptClass {
     METHODS(getDataFolder);
 
     METHODS(registerEvent);
-};
 
-extern ClassDefine<PluginAPI> PluginAPIClass;
+
+    static ClassDefine<PluginAPI> builder;
+};
 
 
 } // namespace jse
diff --git a/src/API/PluginDescriptionAPI.cc b/src/API/PluginDescriptionAPI.cc
@@ -5,10 +5,9 @@
 #include "Utils/Using.h"
 
 
-
 namespace jse {
 
-ClassDefine<PluginDescriptionAPI> PluginDescriptionAPIClass =
+ClassDefine<PluginDescriptionAPI> PluginDescriptionAPI::builder =
     defineClass<PluginDescriptionAPI>("PluginDescription")
         .constructor(nullptr)
         .instanceFunction("toString", &PluginDescriptionAPI::toString)

diff --git a/src/API/PluginDescriptionAPI.h b/src/API/PluginDescriptionAPI.h
@@ -48,9 +48,10 @@ class PluginDescriptionAPI : public ScriptClass {
     METHODS(getCommands);
 
     METHODS(getPermissions);
-};
 
-extern ClassDefine<PluginDescriptionAPI> PluginDescriptionAPIClass;
+
+    static ClassDefine<PluginDescriptionAPI> builder;
+};
 
 
 } // namespace jse
diff --git a/src/Engine/BindAPI.h b/src/Engine/BindAPI.h
@@ -17,12 +17,12 @@ inline void BindAPI(ScriptEngine* engine) {
     EnumAPI::RegisterEnum(engine);
 
     // static class
-    engine->registerNativeClass(JSEAPIClass);
+    engine->registerNativeClass(JSEAPI::builder);
 
     // instance class
-    engine->registerNativeClass<PluginAPI>(PluginAPIClass);
-    engine->registerNativeClass<LoggerAPI>(LoggerAPIClass);
-    engine->registerNativeClass<PluginDescriptionAPI>(PluginDescriptionAPIClass);
+    engine->registerNativeClass<PluginAPI>(PluginAPI::builder);
+    engine->registerNativeClass<LoggerAPI>(LoggerAPI::builder);
+    engine->registerNativeClass<PluginDescriptionAPI>(PluginDescriptionAPI::builder);
     engine->registerNativeClass<PermissibleAPI>(PermissibleAPI::builder);
     engine->registerNativeClass<CommandSenderAPI>(CommandSenderAPI::builder);
 }