Merge branch 'develop'

Author: ShrBox

README.md

@@ -36,4 +36,4 @@ PRs are welcome.
 
 ## License
 
-GPL-3.0-only © LiteLDev
+GPL-3.0-or-later © LiteLDev

src/legacy/LegacyScriptEngine.cpp

@@ -1,15 +1,15 @@
 #pragma once
 
-#include "engine/EngineOwnData.h"
-#include "ll/api/utils/ErrorUtils.h"
 #include "lse/Entry.h"
 #include "main/Global.h"
-#include "mc/world/level/Level.h"
 #include "utils/JsonHelper.h"
 #include "utils/UsingScriptX.h"
 
+#include <engine/EngineOwnData.h>
 #include <exception>
+#include <ll/api/utils/ErrorUtils.h>
 #include <magic_enum.hpp>
+#include <mc/world/level/Level.h>
 #include <string>
 
 // 输出异常信息

src/legacy/api/APIHelp.h

@@ -13,6 +13,7 @@
 #include "api/PlayerAPI.h"
 #include "engine/EngineOwnData.h"
 #include "engine/GlobalShareData.h"
+#include "legacy/events/EventHooks.h"
 #include "ll/api/chrono/GameChrono.h"
 #include "ll/api/event/EventBus.h"
 #include "ll/api/event/command/ExecuteCommandEvent.h"
@@ -44,7 +45,6 @@
 #include "ll/api/schedule/Task.h"
 #include "ll/api/service/Bedrock.h"
 #include "ll/api/utils/StringUtils.h"
-#include "lse/events/EventHooks.h"
 #include "main/Global.h"
 #include "mc/server/commands/CommandOriginType.h"
 #include "mc/world/actor/player/Player.h"
@@ -58,6 +58,7 @@
 #include <shared_mutex>
 #include <string>
 
+
 //////////////////// Listeners ////////////////////
 
 // 监听器表

src/legacy/api/EventAPI.cpp

@@ -14,7 +14,7 @@ using namespace script;
 
 ///////////////////////////////// API /////////////////////////////////
 
-bool EngineManager::unRegisterEngine(ScriptEngine* toDelete) {
+bool EngineManager::unregisterEngine(ScriptEngine* toDelete) {
     std::unique_lock<std::shared_mutex> lock(globalShareData->engineListLock);
     for (auto engine = globalShareData->globalEngineList.begin(); engine != globalShareData->globalEngineList.end();
          ++engine)
@@ -92,4 +92,4 @@ ScriptEngine* EngineManager::getEngine(std::string name, bool onlyLocalEngine) {
     return nullptr;
 }
 
-std::string EngineManager::getEngineType(ScriptEngine* engine) { return ENGINE_GET_DATA(engine)->engineType; }
+std::string EngineManager::getEngineType(ScriptEngine* engine) { return ENGINE_GET_DATA(engine)->engineType; }

src/legacy/engine/EngineManager.cpp

@@ -1,6 +1,5 @@
 #pragma once
 #include "ScriptX/ScriptX.h"
-#include "main/PluginManager.h"
 
 #include <map>
 #include <string>
@@ -10,7 +9,7 @@ class EngineManager {
 public:
     static script::ScriptEngine* newEngine(std::string pluginName = "", bool isHotLoad = false);
     static bool                  registerEngine(script::ScriptEngine* engine);
-    static bool                  unRegisterEngine(script::ScriptEngine* engine);
+    static bool                  unregisterEngine(script::ScriptEngine* engine);
     static bool                  isValid(script::ScriptEngine* engine, bool onlyCheckLocal = false);
 
     static std::vector<script::ScriptEngine*> getLocalEngines();