refactor: adapt to LeviLamina 1.0.0 (WIP)

Author: ShrBox

docs/apis/ScriptAPI/i18n.md

@@ -11,7 +11,7 @@ As our community gets bigger and bigger, language becomes a barrier for users an
   - path: `String`  
     The file[^1]/directory[^2] where the translation data is located
   - defaultLocaleName: `String`  
-    default locale name, in the form of `zh_CN` or `en` (this parameter will be used if the target language is not provided for the translation of `i18n.tr` or `i18n.get`)  
+    **This parameter is deprecated since 0.9.0, it will follows LeviLamina's language**. default locale name, in the form of `zh_CN` or `en` (this parameter will be used if the target language is not provided for the translation of `i18n.tr` or `i18n.get`)  
     If an empty string is passed in, the default follows the system language
   - defaultLangData: `Object`  
     This parameter will be used to complete or create translation files in the form of

docs/apis/ScriptAPI/i18n.zh.md

@@ -12,7 +12,7 @@
   - path: `String`  
     翻译数据所在的文件[^1]/目录[^2]
   - defaultLocaleName: `String`  
-    默认的语言名称，形如`zh_CN`或`en`（如果没有提供目标语言给`i18n.tr`或`i18n.get`的翻译，这个参数将被使用）  
+    **该参数在0.9.0中废弃，将使用LeviLamina的默认语言**。默认的语言名称，形如`zh_CN`或`en`（如果没有提供目标语言给`i18n.tr`或`i18n.get`的翻译，这个参数将被使用）  
     若传入空字符串，则默认跟随系统语言
   - defaultLangData: `Object`  
     该参数将用于补全或创建翻译文件，形如

manifest.json

@@ -4,7 +4,7 @@
     "type": "native",
     "description": "A plugin engine for running LLSE plugins on LeviLamina",
     "author": "LiteLDev",
-    "version": "0.8.20",
+    "version": "0.9.0-rc.1",
     "dependencies": [
         {
             "name": "LegacyMoney"

src/legacy/api/BlockAPI.cpp

@@ -18,6 +18,7 @@
 #include "mc/world/level/block/actor/BlockActor.h"
 #include "mc/world/level/block/components/BlockLiquidDetectionComponent.h"
 #include "mc/world/level/dimension/Dimension.h"
+#include "mc/world/level/block/block_serialization_utils/BlockSerializationUtils.h"
 
 #include <exception>
 
@@ -290,8 +291,6 @@ Local<Value> BlockClass::getNbt(const Arguments&) {
     CATCH("Fail in getNbt!");
 }
 
-#include "mc/world/level/block/block_serialization_utils/BlockSerializationUtils.h"
-
 Local<Value> BlockClass::setNbt(const Arguments& args) {
     CHECK_ARGS_COUNT(args, 1);
 

src/legacy/api/EntityAPI.cpp

@@ -296,9 +296,7 @@ Local<Value> EntityClass::isOnHotBlock() {
         Actor* entity = get();
         if (!entity) return Local<Value>();
 
-        return Boolean::newBoolean(
-            entity->getDimensionBlockSource().getBlock(entity->getFeetBlockPos()).getMaterial().isSuperHot()
-        ); // TODO: Unsure
+        return Boolean::newBoolean(false); // todo: check IsOnHotBlockTest to get the correct value
     }
     CATCH("Fail in isOnHotBlock!")
 }

src/legacy/api/InternationalAPI.cpp

@@ -193,9 +193,10 @@ Local<Value> I18nClass::load(const Arguments& args) {
 
     try {
         auto        path = args[0].toStr();
-        std::string defaultLocaleName;
+        // Deprecated because it follows LeviLamina's default locale
+        // std::string defaultLocaleName;
         if (args.size() > 1) {
-            defaultLocaleName = args[1].toStr();
+        // defaultLocaleName = args[1].toStr();
         }
 
         if (args.size() > 2) {
@@ -216,22 +217,16 @@ Local<Value> I18nClass::load(const Arguments& args) {
                     if (str.getKind() != ValueKind::kString) {
                         throw Exception("Value in SubLangData must be a string");
                     }
-                    ll::i18n::getInstance().set(localeName, objKeys[j].toString(), str.toStr());
+                    EngineOwnData().i18n->set(localeName, objKeys[j].toString(), str.toStr());
                 }
             }
         }
 
-        auto& i18nInstance = ll::i18n::getInstance();
-        auto  result       = i18nInstance.load(path);
-
-        if (result.has_value()) {
-            if (!defaultLocaleName.empty()) {
-                ll::i18n::getDefaultLocaleCode() = defaultLocaleName;
-            }
-            return Boolean::newBoolean(true);
+        EngineOwnData().i18n = std::make_shared<ll::i18n::I18n>();;
+        if (auto  result       = EngineOwnData().i18n->load(path); !result) {
+            return Boolean::newBoolean(false);
         }
-
-        return Boolean::newBoolean(false);
+        return Boolean::newBoolean(true);
     }
     CATCH_AND_THROW;
 }

src/legacy/engine/EngineOwnData.h

@@ -71,7 +71,7 @@ struct EngineOwnData {
     */
 
     // I18nAPI
-    ll::i18n::I18n* i18n = nullptr;
+    std::shared_ptr<ll::i18n::I18n> i18n = nullptr;
 
     // 玩家绑定数据
     std::unordered_map<std::string, script::Global<Value>> playerDataDB;

src/legacy/legacyapi/db/Session.cpp

@@ -1,5 +1,6 @@
 #include "legacyapi/db/Session.h"
 
+#include "lse/Entry.h"
 #include "legacyapi/db/impl/mysql/Session.h"
 #include "legacyapi/db/impl/sqlite/Session.h"
 #include "ll/api/io/LoggerRegistry.h"
@@ -26,12 +27,12 @@ ResultSet Session::query(const std::string& query) {
     });
     IF_ENDBG {
         if (result.valid()) {
-            ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug("Session::query: Results >");
+            lse::getSelfPluginInstance().getLogger().debug("Session::query: Results >");
             for (auto& str : ll::string_utils::splitByPattern(result.toTableString(), "\n")) {
-                ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug(str);
+                lse::getSelfPluginInstance().getLogger().debug(str);
             }
         } else {
-            ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug(
+            lse::getSelfPluginInstance().getLogger().debug(
                 "Session::query: Query returned no result"
             );
         }
@@ -43,7 +44,7 @@ std::string Session::getLastError() const { throw std::runtime_error("Session::g
 
 std::weak_ptr<Session> Session::getOrSetSelf() {
     if (self.expired()) {
-        IF_ENDBG ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug(
+        IF_ENDBG lse::getSelfPluginInstance().getLogger().debug(
             "Session::getOrSetSelf: `self` expired, trying fetching"
         );
         return self = getSession(this);

src/legacy/legacyapi/db/impl/mysql/Session.cpp

@@ -1,3 +1,4 @@
+// #include "lse/Entry.h"
 // #include "legacyapi/db/impl/mysql/Session.h"
 
 // #include "legacyapi/db/impl/mysql/Stmt.h"
@@ -7,16 +8,16 @@
 // namespace DB {
 
 // MySQLSession::MySQLSession() {
-//     IF_ENDBG ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->info("MySQLSession::MySQLSession:
+//     IF_ENDBG lse::getSelfPluginInstance().getLogger().info("MySQLSession::MySQLSession:
 //     Constructed! this: {}", (void*)this); conn = mysql_init(nullptr);
 // }
 // MySQLSession::MySQLSession(const ConnParams& params) {
-//     IF_ENDBG ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->info("MySQLSession::MySQLSession:
+//     IF_ENDBG lse::getSelfPluginInstance().getLogger().info("MySQLSession::MySQLSession:
 //     Constructed! this: {}", (void*)this); conn = mysql_init(nullptr); open(params);
 // }
 
 // MySQLSession::~MySQLSession() {
-//     IF_ENDBG ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->info("MySQLSession::MySQLSession:
+//     IF_ENDBG lse::getSelfPluginInstance().getLogger().info("MySQLSession::MySQLSession:
 //     Destructor: this: {}", (void*)this); close();
 // }
 
@@ -68,7 +69,7 @@
 //         "true",
 //         "utf8"
 //     );
-//     // IF_ENDBG ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug("MySQLSession::open: MySQL default
+//     // IF_ENDBG lse::getSelfPluginInstance().getLogger().debug("MySQLSession::open: MySQL default
 //     charset name:
 //     // {}", defaultCharset);
 //     mysql_options(conn, MYSQL_SET_CHARSET_NAME, charset.c_str());
@@ -87,7 +88,7 @@
 //             "MySQLSession::MySQLSession: Failed to open database: " + std::string(mysql_error(conn))
 //         );
 //     }
-//     IF_ENDBG ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug(
+//     IF_ENDBG lse::getSelfPluginInstance().getLogger().debug(
 //         "MySQLSession::open: Opened database: " + std::string(p.getHost()) + ":" + std::to_string(port) + "/" + db
 //     );
 // #if defined(LLDB_DEBUG_MODE)
@@ -96,18 +97,18 @@
 // }
 
 // bool MySQLSession::execute(const std::string& query) {
-//     IF_ENDBG ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug("MySQLSession::execute: Executing > "
+//     IF_ENDBG lse::getSelfPluginInstance().getLogger().debug("MySQLSession::execute: Executing > "
 //     + query); auto     res = mysql_query(conn, query.c_str()); return res == OK;
 // }
 
 // bool MySQLSession::relogin(const std::string& user, const std::string& password, const std::string& db) {
-//     IF_ENDBG ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug("MySQLSession::change: Changing user
+//     IF_ENDBG lse::getSelfPluginInstance().getLogger().debug("MySQLSession::change: Changing user
 //     to {} and database to {}", user, db); auto     res = mysql_change_user(conn, user.c_str(), password.c_str(),
 //     (db.empty() ? nullptr : db.c_str())); return res == OK;
 // }
 
 // Session& MySQLSession::query(const std::string& query, std::function<bool(const Row&)> callback) {
-//     IF_ENDBG ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug("MySQLSession::query: Querying > " +
+//     IF_ENDBG lse::getSelfPluginInstance().getLogger().debug("MySQLSession::query: Querying > " +
 //     query); auto     res = mysql_query(conn, query.c_str()); if (res != OK) {
 //         throw std::runtime_error("MySQLSession::query: Failed to query database: " + std::string(mysql_error(conn)));
 //     }
@@ -120,7 +121,7 @@
 //     auto     numFields = mysql_num_fields(result);
 //     auto     numRows   = mysql_num_rows(result);
 //     auto     fields    = mysql_fetch_fields(result);
-//     IF_ENDBG ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug("MySQLSession::query: Query returned
+//     IF_ENDBG lse::getSelfPluginInstance().getLogger().debug("MySQLSession::query: Query returned
 //     {} rows and {} fields", numRows, numFields);
 //     // Fetch column names
 //     RowHeader header;
@@ -204,7 +205,7 @@
 //     if (conn) {
 //         mysql_close(conn);
 //         conn = nullptr;
-//         IF_ENDBG ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug("MySQLSession::close: Closed
+//         IF_ENDBG lse::getSelfPluginInstance().getLogger().debug("MySQLSession::close: Closed
 //         database");
 //     }
 // }

src/legacy/legacyapi/db/impl/mysql/Stmt.cpp

@@ -1,3 +1,4 @@
+// #include "lse/Entry.h"
 // #include "legacyapi/db/impl/mysql/Stmt.h"
 
 // #include "legacyapi/db/impl/mysql/Session.h"
@@ -171,7 +172,7 @@
 //     if (len) {
 //         auto buffer = std::shared_ptr<char[]>(new char[len]);
 // #if defined(LLDB_DEBUG_MODE)
-//         ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug("AllocateBuffer: Allocated! Buffer size:
+//         lse::getSelfPluginInstance().getLogger().debug("AllocateBuffer: Allocated! Buffer size:
 //         {}", len);
 // #endif
 //         return std::make_pair(buffer, len);
@@ -235,7 +236,7 @@
 //     // case MYSQL_TYPE_GEOMETRY:
 //     case MYSQL_TYPE_JSON:
 // #if defined(LLDB_DEBUG_MODE)
-//         ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug("ReceiverToAny: string: length: {}, buffer
+//         lse::getSelfPluginInstance().getLogger().debug("ReceiverToAny: string: length: {}, buffer
 //         {}", rec.length, rec.buffer.get());
 // #endif
 //         return Any(std::string(rec.buffer.get()));
@@ -244,15 +245,15 @@
 //     case MYSQL_TYPE_MEDIUM_BLOB:
 //     case MYSQL_TYPE_LONG_BLOB:
 // #if defined(LLDB_DEBUG_MODE)
-//         ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug("ReceiverToAny: blob: length: {}, buffer
+//         lse::getSelfPluginInstance().getLogger().debug("ReceiverToAny: blob: length: {}, buffer
 //         {}", rec.length, rec.buffer.get());
 // #endif
 //         // Unknown bug: rec.length is 0
 //         return Any(ByteArray(rec.buffer.get(), rec.buffer.get() + rec.length));
 //     case MYSQL_TYPE_DECIMAL:
 //     case MYSQL_TYPE_NEWDECIMAL:
 //         // TODO: Decimal
-//         ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug("MySQL_Decimal: {}",
+//         lse::getSelfPluginInstance().getLogger().debug("MySQL_Decimal: {}",
 //         std::string(rec.buffer.get(), rec.length)); return Any();
 //     default:
 //         throw std::runtime_error("ReceiverToAny: Unsupported MySQL data type: " + std::to_string(rec.field.type));
@@ -278,7 +279,7 @@
 //             result++;
 //         }
 //     }
-//     IF_ENDBG ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug("MySQLStmt::getNextParamIndex: The
+//     IF_ENDBG lse::getSelfPluginInstance().getLogger().debug("MySQLStmt::getNextParamIndex: The
 //     next param index is {}", result + 1); return result + 1;
 // }
 
@@ -290,7 +291,7 @@
 //         );
 //     }
 //     if (!metadata) {
-//         IF_ENDBG ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug("MySQLStmt::bindResult: No result
+//         IF_ENDBG lse::getSelfPluginInstance().getLogger().debug("MySQLStmt::bindResult: No result
 //         metadata"); return;
 //     }
 //     // Set the attribute UPDATE_MAX_LENGTH to true
@@ -301,7 +302,7 @@
 //     // later
 //     mysql_stmt_store_result(stmt);
 //     auto     cnt = mysql_num_fields(metadata);
-//     IF_ENDBG ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug("MySQLStmt::bindResult:
+//     IF_ENDBG lse::getSelfPluginInstance().getLogger().debug("MySQLStmt::bindResult:
 //     mysql_num_fields: {}", cnt); auto     fields = mysql_fetch_fields(metadata); result.reset(new MYSQL_BIND[cnt]);
 //     // Allocate result bindings resultHeader.reset(new RowHeader); // Allocate result header for (auto i = 0U; i <
 //     cnt; i++) {
@@ -398,7 +399,7 @@
 //         params[index].buffer_length = sz;
 //         params[index].is_null       = 0;
 //         params[index].length        = (unsigned long*)&param.length;
-//         IF_ENDBG ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug("MySQLStmt::bind: Bound string
+//         IF_ENDBG lse::getSelfPluginInstance().getLogger().debug("MySQLStmt::bind: Bound string
 //         param at {}: {}", index, param.buffer.get()); break;
 //     }
 //     case Any::Type::Date:
@@ -490,17 +491,17 @@
 //     if (fetched) {
 //         throw std::runtime_error("MySQLStmt::_Fetch: No more rows");
 //     }
-//     IF_ENDBG ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug("MySQLStmt::_Fetch: Fetching
+//     IF_ENDBG lse::getSelfPluginInstance().getLogger().debug("MySQLStmt::_Fetch: Fetching
 //     row..."); Row      row(resultHeader); IF_ENDBG
-//     ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug("MySQLStmt::_Fetch: RowHeader size
+//     lse::getSelfPluginInstance().getLogger().debug("MySQLStmt::_Fetch: RowHeader size
 //     {}", row.header->size()); int      i = 0; for (auto& col : resultValues) {
 //         // Because of the inexplicable problems of MySQL C API,
 //         //  we must set the length of the field manually.
 //         auto length = *(stmt->bind + i)->length;
 //         col.length  = length;
 //         auto v      = ReceiverToAny(col);
 //         row.push_back(v);
-//         IF_ENDBG ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug(
+//         IF_ENDBG lse::getSelfPluginInstance().getLogger().debug(
 //             "MySQLStmt::_Fetch: Fetched column `{}`, type {}, value {}",
 //             col.field.name,
 //             Any::type2str(v.type),
@@ -590,11 +591,11 @@
 //     auto query  = sql;
 //     auto params = ParseStmtParams(query);
 //     if (raw->debugOutput && !params.empty()) {
-//         ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug("MySQLStmt::create: Parsed named
+//         lse::getSelfPluginInstance().getLogger().debug("MySQLStmt::create: Parsed named
 //         parameters in query: ");
-//         ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug("MySQLStmt::create: - SQL without named
+//         lse::getSelfPluginInstance().getLogger().debug("MySQLStmt::create: - SQL without named
 //         parameters: {}", query); for (auto& [k, v] : params) {
-//             ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug("MySQLStmt::create: - {}: {}", k, v);
+//             lse::getSelfPluginInstance().getLogger().debug("MySQLStmt::create: - {}: {}", k, v);
 //         }
 //     }
 //     auto res = mysql_stmt_prepare(stmt, query.c_str(), query.size());
@@ -605,7 +606,7 @@
 //     result->query        = sql;
 //     result->paramIndexes = params;
 //     result->setDebugOutput(raw->debugOutput);
-//     if (raw->debugOutput) ll::io::LoggerRegistry::getInstance().getOrCreate("LLSEDB")->debug("MySQLStmt::create:
+//     if (raw->debugOutput) lse::getSelfPluginInstance().getLogger().debug("MySQLStmt::create:
 //     Prepared > " + query); auto shared  = SharedPointer<Stmt>(result); result->self = shared; return shared;
 // }