fix: start support levilamina 0.7.x

ShrBox · ShrBox · commit 3e9c5f31cfbd · 2024-02-06T14:45:11.000+08:00
diff --git a/src/legacy/api/APIHelp.cpp b/src/legacy/api/APIHelp.cpp
@@ -355,7 +355,7 @@ Local<Value> JsonToValue(std::string jsonStr) {
     } catch (const ordered_json::exception& e) {
         lse::getSelfPluginInstance().getLogger().warn(
             "{}{}",
-            tr("llse.apiHelp.parseJson.fail"),
+            "llse.apiHelp.parseJson.fail"_tr(),
             ll::string_utils::tou8str(e.what())
         );
         return String::newString(jsonStr);
diff --git a/src/legacy/api/BaseAPI.cpp b/src/legacy/api/BaseAPI.cpp
@@ -128,16 +128,16 @@ Local<Value> FloatPos::getDim() {
     string name;
     switch (dim) {
     case 0:
-        name = tr("base.getDimName.0");
+        name = "base.getDimName.0"_tr();
         break;
     case 1:
-        name = tr("base.getDimName.1");
+        name = "base.getDimName.1"_tr();
         break;
     case 2:
-        name = tr("base.getDimName.2");
+        name = "base.getDimName.2"_tr();
         break;
     default:
-        name = tr("base.getDimName.unknown");
+        name = "base.getDimName.unknown"_tr();
         break;
     }
     return String::newString(name);
diff --git a/src/legacy/api/EntityAPI.cpp b/src/legacy/api/EntityAPI.cpp
@@ -1447,7 +1447,7 @@ Local<Value> EntityClass::quickEvalMolangScript(const Arguments& args) {
     try {
         Actor* actor = get();
         if (!actor) return Local<Value>();
-        return Number::newNumber(actor->quickEvalMolangScript(args[0].toStr()));
+        return Number::newNumber(actor->evalMolang(args[0].toStr()));
     }
     CATCH("Fail in quickEvalMolangScript!");
 }
diff --git a/src/legacy/api/InternationalAPI.cpp b/src/legacy/api/InternationalAPI.cpp
@@ -2,7 +2,7 @@
 #include "api/InternationalAPI.h"
 
 #include <FMT/args.h>
-#include <ll/api/i18n/I18nAPI.h>
+#include <ll/api/i18n/I18n.h>
 
 void FormatHelper(
     std::vector<Local<Value>>&                          args,
diff --git a/src/legacy/api/PlayerAPI.cpp b/src/legacy/api/PlayerAPI.cpp
@@ -3026,7 +3026,7 @@ Local<Value> PlayerClass::quickEvalMolangScript(const Arguments& args) {
     try {
         Player* actor = get();
         if (!actor) return Local<Value>();
-        return Number::newNumber(actor->quickEvalMolangScript(args[0].toStr()));
+        return Number::newNumber(actor->evalMolang(args[0].toStr()));
     }
     CATCH("Fail in quickEvalMolangScript!");
 }
diff --git a/src/legacy/engine/EngineOwnData.h b/src/legacy/engine/EngineOwnData.h
@@ -2,7 +2,7 @@
 
 #include "dyncall/dyncall.h"
 #include "ll/api/Logger.h"
-#include "ll/api/i18n/I18nAPI.h"
+#include "ll/api/i18n/I18n.h"
 #include "main/Configs.h"
 #include "utils/UsingScriptX.h"
 
diff --git a/src/legacy/engine/GlobalShareData.cpp b/src/legacy/engine/GlobalShareData.cpp
@@ -24,14 +24,14 @@ void InitGlobalShareData() {
         (LLSE_GLOBAL_DATA_NAME + std::to_wstring(GetCurrentProcessId())).c_str()
     );
     if (hGlobalData == NULL) {
-        lse::getSelfPluginInstance().getLogger().error(tr("init.fileMapping.fail"));
+        lse::getSelfPluginInstance().getLogger().error("init.fileMapping.fail"_tr());
         localShareData->isFirstInstance = true;
         return;
     }
 
     LPVOID address = MapViewOfFile(hGlobalData, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0);
     if (address == NULL) {
-        lse::getSelfPluginInstance().getLogger().error(tr("init.mapFile.fail"));
+        lse::getSelfPluginInstance().getLogger().error("init.mapFile.fail"_tr());
         localShareData->isFirstInstance = true;
         return;
     }
diff --git a/src/legacy/legacyapi/command/DynamicCommand.cpp b/src/legacy/legacyapi/command/DynamicCommand.cpp
@@ -2,6 +2,7 @@
 
 #include "fmt/core.h"
 #include "ll/api/Logger.h"
+#include "ll/api/command/CommandRegistrar.h"
 #include "ll/api/memory/Closure.h"
 #include "ll/api/memory/Memory.h"
 #include "ll/api/utils/ErrorUtils.h"
@@ -34,6 +35,7 @@
 #include <algorithm>
 #include <cstddef>
 #include <cstdint>
+#include <ll/api/command/CommandRegistrar.h>
 #include <memory>
 #include <sstream>
 #include <stdexcept>
@@ -453,30 +455,24 @@ DynamicCommand::preSetup(CommandRegistry& registry, std::unique_ptr<class Dynami
             if (param.type == ParameterType::Enum) {
                 // clone BDS's enum
                 if (commandInstance->enumRanges.count(param.description) == 0) {
-                    auto namesInBds = registry.getEnumNames();
-                    auto iter       = std::find(namesInBds.begin(), namesInBds.end(), param.description);
-                    if (iter == namesInBds.end())
-                        throw std::runtime_error(
-                            "Enum " + std::string(param.description) + "not found in command and BDS"
-                        );
-                    commandInstance->setEnum(*iter, registry.getEnumValues(*iter));
+                    if (!ll::command::CommandRegistrar::getInstance().hasEnum(param.description))
+                        throw std::runtime_error("Enum " + param.description + "not found in command and BDS");
+                    commandInstance->setEnum(param.description, registry.getEnumValues(*iter));
                 }
             } else if (param.type == ParameterType::SoftEnum) {
                 // add empty Soft Enum if not found in command and BDS
                 if (commandInstance->softEnums.count(param.description) == 0) {
-                    auto namesInBds = registry.getSoftEnumNames();
-                    auto iter       = std::find(namesInBds.begin(), namesInBds.end(), param.description);
-                    if (iter == namesInBds.end()) commandInstance->setSoftEnum(param.description, {});
+                    if (!ll::command::CommandRegistrar::getInstance().hasSoftEnum(param.description))
+                        commandInstance->setSoftEnum(param.description, {});
                 }
             }
         }
 
         // fix enum name with prefix '_...' if Enum name is exists in BDS
-        auto                                                            namesInBds = registry.getEnumNames();
         std::unordered_map<std::string_view, std::pair<size_t, size_t>> convertedEnumRanges;
         for (auto& [desc, range] : commandInstance->enumRanges) {
             std::string fixedName = desc.data();
-            while (std::find(namesInBds.begin(), namesInBds.end(), fixedName) != namesInBds.end()) {
+            while (!ll::command::CommandRegistrar::getInstance().hasEnum(fixedName)) {
                 fixedName.append("_");
             }
             std::string_view fixedView = desc;
@@ -881,8 +877,7 @@ std::string DynamicCommandInstance::setSoftEnum(std::string const& name, std::ve
     if (!hasRegistered()) {
         softEnums.emplace(name, values);
     } else {
-        auto names = registry.getSoftEnumNames();
-        if (std::find(names.begin(), names.end(), name) == names.end()) {
+        if (!ll::command::CommandRegistrar::getInstance().hasSoftEnum(name)) {
             registry.addSoftEnum(name, values);
             return name;
         }
@@ -900,8 +895,7 @@ bool DynamicCommandInstance::addSoftEnumValues(std::string const& name, std::vec
             setSoftEnum(name, values);
         }
     } else {
-        auto names = registry.getSoftEnumNames();
-        if (std::find(names.begin(), names.end(), name) == names.end()) {
+        if (!ll::command::CommandRegistrar::getInstance().hasSoftEnum(name)) {
             registry.addSoftEnum(name, values);
             return true;
         }
diff --git a/src/legacy/legacyapi/command/DynamicCommand.h b/src/legacy/legacyapi/command/DynamicCommand.h
@@ -43,7 +43,6 @@
 #include <utility>
 #include <vector>
 
-
 namespace ll::memory {
 template <class Ret, class... Args>
 class NativeClosure;
@@ -276,7 +275,7 @@ class DynamicCommand : public Command {
         std::string                   toDebugString() const;
         DynamicCommandInstance const* getInstance() const;
 
-        template <ll::concepts::ConceptFor<valid_type> T>
+        template <ll::concepts::Require<valid_type> T>
         T const& getRaw() const {
 
             if (type == ParameterType::Enum) {
@@ -295,7 +294,7 @@ class DynamicCommand : public Command {
             ));
         }
 
-        template <ll::concepts::ConceptFor<valid_type> T>
+        template <ll::concepts::Require<valid_type> T>
         T const& value_or(T const& defaultValue) {
             if (isSet) return getRaw<T>();
             return defaultValue;
diff --git a/src/legacy/legacyapi/db/Session.cpp b/src/legacy/legacyapi/db/Session.cpp
@@ -2,6 +2,7 @@
 
 #include "legacyapi/db/impl/mysql/Session.h"
 #include "legacyapi/db/impl/sqlite/Session.h"
+#include "ll/api/utils/StringUtils.h"
 
 namespace DB {
 
diff --git a/src/legacy/legacyapi/db/impl/sqlite/Stmt.cpp b/src/legacy/legacyapi/db/impl/sqlite/Stmt.cpp
@@ -2,8 +2,10 @@
 
 #include "legacyapi/db/impl/sqlite/Session.h"
 #include "ll/api/Logger.h"
+#include "ll/api/utils/StringUtils.h"
 #include "sqlite3.h"
 
+
 namespace DB {
 
 SQLiteStmt::SQLiteStmt(sqlite3_stmt* stmt, const std::weak_ptr<Session> parent, bool autoExecute)
@@ -305,4 +307,4 @@ SQLiteStmt::create(const std::weak_ptr<Session>& session, const std::string& sql
     return shared;
 }
 
-} // namespace DB
+} // namespace DB
diff --git a/src/legacy/main/Global.h b/src/legacy/main/Global.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ll/api/i18n/I18nAPI.h"
+#include "ll/api/i18n/I18n.h"
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #endif
@@ -56,23 +56,22 @@ class FloatVec4 {
     }
 };
 
-using ll::i18n::detail::tr;
 using ll::i18n_literals::operator""_tr;
 
 inline std::string DimId2Name(int dimid) {
     std::string name;
     switch (dimid) {
     case 0:
-        name = tr("base.getDimName.0");
+        name = "base.getDimName.0"_tr();
         break;
     case 1:
-        name = tr("base.getDimName.1");
+        name = "base.getDimName.1"_tr();
         break;
     case 2:
-        name = tr("base.getDimName.2");
+        name = "base.getDimName.2"_tr();
         break;
     default:
-        name = tr("base.getDimName.unknown");
+        name = "base.getDimName.unknown"_tr();
         break;
     }
     return name;
diff --git a/src/legacy/utils/JsonHelper.h b/src/legacy/utils/JsonHelper.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "legacyapi/utils/FileHelper.h"
 #include "ll/api/Logger.h"
-#include "ll/api/i18n/I18nAPI.h"
+#include "ll/api/i18n/I18n.h"
 #include "ll/api/utils/StringUtils.h"
 #include "lse/Entry.h"
 
diff --git a/src/lse/PluginMigration.cpp b/src/lse/PluginMigration.cpp
@@ -8,8 +8,10 @@
 #include <ll/api/plugin/Manifest.h>
 #include <ll/api/plugin/Plugin.h>
 #include <ll/api/reflection/Serialization.h>
+#include <nlohmann/json.hpp>
 #include <unordered_set>
 
+
 #if LEGACY_SCRIPT_ENGINE_BACKEND_LUA
 
 constexpr auto PluginExtName = ".lua";
diff --git a/tooth.json b/tooth.json
@@ -1,7 +1,7 @@
 {
     "format_version": 2,
     "tooth": "github.com/LiteLDev/LegacyScriptEngine",
-    "version": "0.1.6",
+    "version": "0.2.0",
     "info": {
         "name": "LegacyScriptEngine",
         "description": "A plugin engine for running LLSE plugins on LeviLamina",
@@ -13,7 +13,7 @@
         ]
     },
     "dependencies": {
-        "gitea.litebds.com/LiteLDev/legacy-script-engine-lua": "0.1.6",
-        "gitea.litebds.com/LiteLDev/legacy-script-engine-quickjs": "0.1.6"
+        "gitea.litebds.com/LiteLDev/legacy-script-engine-lua": "0.2.0",
+        "gitea.litebds.com/LiteLDev/legacy-script-engine-quickjs": "0.2.0"
     }
 }
diff --git a/tooth.template.json b/tooth.template.json
@@ -1,7 +1,7 @@
 {
     "format_version": 2,
     "tooth": "gitea.litebds.com/LiteLDev/legacy-script-engine-${engine}",
-    "version": "0.1.6",
+    "version": "0.2.0",
     "info": {
         "name": "LegacyScriptEngine with ${engine} backend",
         "description": "A plugin engine for running LLSE plugins on LeviLamina",
@@ -13,10 +13,10 @@
         ]
     },
     "dependencies": {
-        "github.com/LiteLDev/LegacyRemoteCall": "0.1.x >=0.1.1",
-        "github.com/LiteLDev/LegacyParticleAPI": "0.1.x >=0.1.1",
-        "github.com/LiteLDev/LegacyMoney": "0.1.x >=0.1.6",
-        "github.com/LiteLDev/LeviLamina": "0.6.x >=0.6.3"
+        "github.com/LiteLDev/LegacyRemoteCall": "0.2.x",
+        "github.com/LiteLDev/LegacyParticleAPI": "0.2.x",
+        "github.com/LiteLDev/LegacyMoney": "0.2.x",
+        "github.com/LiteLDev/LeviLamina": "0.7.x"
     },
     "files": {
         "place": [
diff --git a/xmake.lua b/xmake.lua
@@ -5,8 +5,8 @@ add_requires(
     "demangler v2.0.0",
     "dyncall 1.4",
     "fmt 10.1.1",
-    "legacymoney 0.1.5",
-    "legacyparticleapi 0.1.1",
+    "legacymoney 0.2.0",
+    "legacyparticleapi 0.2.0",
     "levilamina 0.7.1",
     "lightwebsocketclient 1.0.0",
     "magic_enum v0.9.0",
@@ -15,7 +15,7 @@ add_requires(
     "simpleini v4.19",
     "sqlite3 3.43.0+200",
     "toml++ v3.4.0",
-    "legacyremotecall 0.1.1"
+    "legacyremotecall 0.2.0"
 )
 add_requires("cpp-httplib v0.14.0", {configs={shared=false, ssl=true, zlib=true}})
 add_requires("scriptx", {configs={backend=get_config("backend")}})

Original file line number	Diff line number	Diff line change
`@@ -1447,7 +1447,7 @@ Local<Value> EntityClass::quickEvalMolangScript(const Arguments& args) {`
`1447`	`1447`	`try {`
`1448`	`1448`	`Actor* actor = get();`
`1449`	`1449`	`if (!actor) return Local<Value>();`
`1450`		`- return Number::newNumber(actor->quickEvalMolangScript(args[0].toStr()));`
	`1450`	`+ return Number::newNumber(actor->evalMolang(args[0].toStr()));`
`1451`	`1451`	`}`
`1452`	`1452`	`CATCH("Fail in quickEvalMolangScript!");`
`1453`	`1453`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3026,7 +3026,7 @@ Local<Value> PlayerClass::quickEvalMolangScript(const Arguments& args) {`
`3026`	`3026`	`try {`
`3027`	`3027`	`Player* actor = get();`
`3028`	`3028`	`if (!actor) return Local<Value>();`
`3029`		`- return Number::newNumber(actor->quickEvalMolangScript(args[0].toStr()));`
	`3029`	`+ return Number::newNumber(actor->evalMolang(args[0].toStr()));`
`3030`	`3030`	`}`
`3031`	`3031`	`CATCH("Fail in quickEvalMolangScript!");`
`3032`	`3032`	`}`