refactor: adapt to LeviLamina 1.0.0 (WIP)

Author: ShrBox

src/legacy/api/DataAPI.cpp

@@ -13,7 +13,7 @@
 #include "ll/api/io/FileUtils.h"
 #include "ll/api/service/Bedrock.h"
 #include "ll/api/service/PlayerInfo.h"
-#include "ll/api/utils/CryptoUtils.h"
+#include "mc/deps/crypto/hash/Hash.h"
 #include "ll/api/utils/StringUtils.h"
 #include "main/EconomicSystem.h"
 #include "mc/world/actor/player/Player.h"
@@ -876,7 +876,7 @@ Local<Value> DataClass::toMD5(const Arguments& args) {
     CHECK_ARGS_COUNT(args, 1);
 
     try {
-        string data;
+        std::string data;
         if (args[0].isString()) data = args[0].toStr();
         else if (args[0].isByteBuffer()) {
             Local<ByteBuffer> buf = args[0].asByteBuffer();
@@ -885,7 +885,7 @@ Local<Value> DataClass::toMD5(const Arguments& args) {
             LOG_WRONG_ARG_TYPE();
             return Local<Value>();
         }
-        return String::newString(ll::crypto_utils::md5(data));
+        return String::newString(Crypto::Hash::hash(Crypto::Hash::HashType::Md5, data));
     }
     CATCH("Fail in ToMD5!");
 }
@@ -894,7 +894,7 @@ Local<Value> DataClass::toSHA1(const Arguments& args) {
     CHECK_ARGS_COUNT(args, 1);
 
     try {
-        string data;
+        std::string data;
         if (args[0].isString()) data = args[0].toStr();
         else if (args[0].isByteBuffer()) {
             Local<ByteBuffer> buf = args[0].asByteBuffer();
@@ -903,7 +903,7 @@ Local<Value> DataClass::toSHA1(const Arguments& args) {
             LOG_WRONG_ARG_TYPE();
             return Local<Value>();
         }
-        return String::newString(ll::crypto_utils::sha1(data));
+        return String::newString(Crypto::Hash::hash(Crypto::Hash::HashType::Md5, data));
     }
     CATCH("Fail in ToSHA1!");
 }

src/legacy/api/DeviceAPI.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "api/APIHelp.h"
-#include "mc/entity/WeakEntityRef.h"
-#include "mc/world/ActorRuntimeID.h"
+#include "mc/deps/ecs/WeakEntityRef.h"
+#include "mc/common/ActorRuntimeID.h"
 
 //////////////////// Classes ////////////////////
 class Player;

src/legacy/api/EntityAPI.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "api/APIHelp.h"
-#include "mc/entity/WeakEntityRef.h"
+#include "mc/deps/ecs/WeakEntityRef.h"
 #include "mc/world/ActorRuntimeID.h"
 
 //////////////////// Classes ////////////////////

src/legacy/api/LoggerAPI.cpp

@@ -3,17 +3,21 @@
 #include "api/APIHelp.h"
 #include "api/PlayerAPI.h"
 #include "engine/EngineOwnData.h"
-#include "ll/api/Logger.h"
-#include "ll/api/service/Bedrock.h"
+#include "ll/api/io/Logger.h"
+#include "ll/api/io/FileSink.h"
+#include "ll/api/io/PatternFormatter.h"
+#include "ll/api/data/IndirectValue.h"
 #include "mc/world/actor/player/Player.h"
-#include "mc/world/level/Level.h"
 #include "utils/Utils.h"
+#include "lse/api/PlayerSink.h"
 
 #include <fstream>
 #include <iostream>
 #include <string>
 #include <string_view>
 
+using ll::io::LogLevel;
+
 //////////////////// Classes ////////////////////
 
 ClassDefine<void> LoggerClassBuilder = defineClass("logger")
@@ -45,18 +49,36 @@ string& StrReplace(string& str, const string& to_replaced, const string& new_str
 }
 ////////////////// Helper //////////////////
 
-void inline LogDataHelper(ll::OutputStream* outStream, const Arguments& args) {
+void inline LogDataHelper(LogLevel level, const Arguments& args) {
     std::string res;
     for (int i = 0; i < args.size(); ++i) res += ValueToString(args[i]);
-    (*outStream)(res);
+    switch (level) {
+    case LogLevel::Fatal:
+        ENGINE_OWN_DATA()->getModInstance()->getLogger().fatal(res);
+        break;
+    case LogLevel::Error:
+        ENGINE_OWN_DATA()->getModInstance()->getLogger().error(res);
+        break;
+    case LogLevel::Warn:
+        ENGINE_OWN_DATA()->getModInstance()->getLogger().warn(res);
+        break;
+    case LogLevel::Info:
+        ENGINE_OWN_DATA()->getModInstance()->getLogger().info(res);
+        break;
+    case LogLevel::Debug:
+        ENGINE_OWN_DATA()->getModInstance()->getLogger().debug(res);
+        break;
+    default:
+        break;
+    }
 }
 
 Local<Value> LoggerClass::log(const Arguments& args) {
     CHECK_ARGS_COUNT(args, 1)
 
     try {
         auto globalConf = ENGINE_OWN_DATA();
-        LogDataHelper(&globalConf->logger.info, args);
+        LogDataHelper(LogLevel::Info, args);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in LoggerLog!")
@@ -67,7 +89,7 @@ Local<Value> LoggerClass::debug(const Arguments& args) {
 
     try {
         auto globalConf = ENGINE_OWN_DATA();
-        LogDataHelper(&globalConf->logger.debug, args);
+        LogDataHelper(LogLevel::Debug, args);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in LoggerDebug!")
@@ -78,7 +100,7 @@ Local<Value> LoggerClass::info(const Arguments& args) {
 
     try {
         auto globalConf = ENGINE_OWN_DATA();
-        LogDataHelper(&globalConf->logger.info, args);
+        LogDataHelper(LogLevel::Info, args);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in LoggerInfo!")
@@ -89,7 +111,7 @@ Local<Value> LoggerClass::warn(const Arguments& args) {
 
     try {
         auto globalConf = ENGINE_OWN_DATA();
-        LogDataHelper(&globalConf->logger.warn, args);
+        LogDataHelper(LogLevel::Warn, args);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in LoggerWarn!")
@@ -100,7 +122,7 @@ Local<Value> LoggerClass::error(const Arguments& args) {
 
     try {
         auto globalConf = ENGINE_OWN_DATA();
-        LogDataHelper(&globalConf->logger.error, args);
+        LogDataHelper(LogLevel::Error, args);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in LoggerError!")
@@ -111,30 +133,21 @@ Local<Value> LoggerClass::fatal(const Arguments& args) {
 
     try {
         auto globalConf = ENGINE_OWN_DATA();
-        LogDataHelper(&globalConf->logger.fatal, args);
+        LogDataHelper(LogLevel::Fatal, args);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in LoggerFatal!")
 }
 
+// Deprecated
 Local<Value> LoggerClass::setTitle(const Arguments& args) {
     CHECK_ARGS_COUNT(args, 1)
     CHECK_ARG_TYPE(args[0], ValueKind::kString)
 
-    try {
-        ENGINE_OWN_DATA()->logger.title = args[0].asString().toString();
-        return Boolean::newBoolean(true);
-    }
-    CATCH("Fail in LoggerSetTitle!")
-}
+    return Boolean::newBoolean(false);
 
-///////////////// Helper /////////////////
-void UpdateMaxLogLevel() {
-    auto data         = ENGINE_OWN_DATA();
-    data->maxLogLevel = data->logger.consoleLevel;
-    if (data->maxLogLevel < data->logger.fileLevel) data->maxLogLevel = data->logger.fileLevel;
-    if (data->maxLogLevel < data->logger.playerLevel) data->maxLogLevel = data->logger.playerLevel;
 }
+
 ///////////////// Helper /////////////////
 
 Local<Value> LoggerClass::setConsole(const Arguments& args) {
@@ -144,12 +157,12 @@ Local<Value> LoggerClass::setConsole(const Arguments& args) {
 
     try {
         if (args.size() >= 2) {
-            ENGINE_OWN_DATA()->logger.consoleLevel = args[1].toInt();
+            ENGINE_OWN_DATA()->getModInstance()->getLogger().getSink(0)->setFlushLevel(static_cast<ll::io::LogLevel>(args[1].toInt() + 1
+            )); // See LSE's definition https://legacy-script-engine.levimc.org/apis/ScriptAPI/Logger/
         }
         if (!args[0].asBoolean().value()) {
-            ENGINE_OWN_DATA()->logger.consoleLevel = 0;
+            ENGINE_OWN_DATA()->getModInstance()->getLogger().getSink(0)->setFlushLevel(ll::io::LogLevel::Off);
         }
-        UpdateMaxLogLevel();
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in LoggerSetConsole!")
@@ -161,14 +174,12 @@ Local<Value> LoggerClass::setFile(const Arguments& args) {
     if (args.size() >= 2) CHECK_ARG_TYPE(args[1], ValueKind::kNumber)
 
     try {
-        string newFile = args[0].asString().toString();
-        ENGINE_OWN_DATA()->logger.setFile(newFile, std::ios::app);
-
+        std::filesystem::path newFile = std::filesystem::path(args[0].asString().toString());
+        std::shared_ptr<ll::io::FileSink> sink = std::make_shared<ll::io::FileSink>(newFile, ll::makePolymorphic<ll::io::PatternFormatter>("{3:.3%T.} {2} {1} {0}", ll::io::Formatter::supportColorLog(), 0b0010), std::ios::app);
         if (args.size() >= 2) {
-            ENGINE_OWN_DATA()->logger.fileLevel = args[1].toInt();
-            UpdateMaxLogLevel();
+            sink->setFlushLevel(static_cast<LogLevel>(args[1].toInt() + 1));
         }
-        return Boolean::newBoolean(ENGINE_OWN_DATA()->logger.ofs.value().is_open());
+        return Boolean::newBoolean(ENGINE_OWN_DATA()->getModInstance()->getLogger().addSink(sink));
     }
     CATCH("Fail in LoggerSetFile!")
 }
@@ -180,14 +191,11 @@ Local<Value> LoggerClass::setPlayer(const Arguments& args) {
         if (!player) {
             return Boolean::newBoolean(false);
         }
-        ENGINE_OWN_DATA()->logger.setPlayerOutputFunc([uuid(player->getUuid())](std::string_view str) {
-            ll::service::getLevel()->getPlayer(uuid)->sendMessage(str);
-        });
+        std::shared_ptr<lse::io::PlayerSink> sink = std::make_shared<lse::io::PlayerSink>(player->getUuid());
         if (args.size() >= 2) {
-            ENGINE_OWN_DATA()->logger.fileLevel = args[1].toInt();
-            UpdateMaxLogLevel();
+            sink->setFlushLevel(static_cast<LogLevel>(args[1].toInt() + 1));
         }
-        return Boolean::newBoolean(true);
+        return Boolean::newBoolean(ENGINE_OWN_DATA()->getModInstance()->getLogger().addSink(sink));
     }
     CATCH("Fail in LoggerSetPlayer!")
 }
@@ -198,8 +206,7 @@ Local<Value> LoggerClass::setLogLevel(const Arguments& args) {
 
     try {
         auto conf         = ENGINE_OWN_DATA();
-        conf->maxLogLevel = conf->logger.consoleLevel = conf->logger.fileLevel = conf->logger.playerLevel =
-            args[0].toInt();
+        conf->getModInstance()->getLogger().setFlushLevel(static_cast<LogLevel>(args[0].toInt() + 1));
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in SetLogLevel!")

src/legacy/api/PlayerAPI.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "api/APIHelp.h"
-#include "mc/entity/WeakEntityRef.h"
-#include "mc/world/ActorRuntimeID.h"
+#include "mc/deps/ecs/WeakEntityRef.h"
+#include "mc/common/ActorRuntimeID.h"
 
 class SimulatedPlayer;
 

src/legacy/api/ScriptAPI.cpp

@@ -104,7 +104,7 @@ Local<Value> FastLog(const Arguments& args) {
         for (int i = 0; i < args.size(); ++i) PrintValue(sout, args[i]);
 
         pool.addTask([str{sout.str()}, pluginName{ENGINE_OWN_DATA()->pluginName}]() {
-            ll::Logger fastLogger(pluginName);
+            ll::io::Logger fastLogger(pluginName);
             fastLogger.info(str);
         });
         return Boolean::newBoolean(true);

src/legacy/engine/EngineOwnData.h

@@ -5,7 +5,8 @@
 #include "utils/UsingScriptX.h"
 
 #include <ll/api/Expected.h>
-#include <ll/api/Logger.h>
+#include <ll/api/io/Logger.h>
+#include <ll/api/io/LoggerRegistry.h>
 #include <ll/api/i18n/I18n.h>
 #include <map>
 #include <string>
@@ -68,11 +69,7 @@ struct EngineOwnData {
     */
 
     // I18nAPI
-    ll::i18n::I18N* i18n = nullptr;
-
-    // LoggerAPI
-    ll::Logger logger      = ll::Logger("");
-    int        maxLogLevel = 4;
+    ll::i18n::I18n* i18n = nullptr;
 
     // 玩家绑定数据
     std::unordered_map<std::string, script::Global<Value>> playerDataDB;
@@ -94,6 +91,10 @@ struct EngineOwnData {
         dynamicCallVM = dcNewCallVM(4096);
         dcMode(dynamicCallVM, DC_CALL_C_DEFAULT);
     }
+
+    inline std::shared_ptr<ll::mod::Mod> getModInstance() {
+        return lse::getPluginManager().getMod(pluginName);
+    }
 };
 
 // 引擎附加数据

src/legacy/legacyapi/command/DynamicCommand.cpp

@@ -33,7 +33,7 @@
 #include <algorithm>
 #include <cstddef>
 #include <cstdint>
-#include <ll/api/Logger.h>
+#include <ll/api/io/Logger.h>
 #include <ll/api/command/CommandRegistrar.h>
 #include <memory>
 #include <sstream>
@@ -132,7 +132,7 @@ auto const ParameterSizeMap = std::unordered_map<ParameterType, size_t>{
 };
 
 inline void OutputError(const std::string& command, const std::string& func = __builtin_FUNCTION()) {
-    auto lock = ll::Logger::lock();
+    auto lock = ll::io::Logger::lock();
     ll::error_utils::printCurrentException(logger);
     logger.error("In Function ({})", func);
     logger.error("In Command <{}>", command);

src/legacy/legacyapi/command/DynamicCommand.h

@@ -7,9 +7,9 @@
 #include "ll/api/memory/Memory.h"
 #include "ll/api/service/Bedrock.h"
 #include "magic_enum.hpp"
-#include "mc/deps/core/common/bedrock/typeid_t.h"
+#include "mc/deps/core/utility/typeid_t.h"
 #include "mc/deps/json/Value.h"
-#include "mc/math/Vec3.h"
+#include "mc/deps/core/math/Vec3.h"
 #include "mc/server/commands/CommandBlockName.h"
 #include "mc/server/commands/CommandFlag.h"
 #include "mc/server/commands/CommandItem.h"
@@ -29,7 +29,7 @@
 #include "mc/world/actor/player/Player.h"
 #include "mc/world/effect/MobEffect.h"
 #include "mc/world/level/BlockPos.h"
-#include "mc/world/level/Command.h"
+#include "mc/server/commands/Command.h"
 
 #include <algorithm>
 #include <cstddef>
@@ -126,7 +126,7 @@ class DynamicCommandInstance;
  */
 class DynamicCommand : public Command {
     template <class T>
-    static constexpr bool valid_type_v = ll::concepts::is_one_of_v<
+    static constexpr bool valid_type_v = ll::traits::is_one_of_v<
         T,
         bool,
         int,

src/legacy/legacyapi/db/ConnParams.cpp

@@ -2,7 +2,7 @@
 
 #include "ll/api/utils/StringUtils.h"
 
-#include <ll/api/Logger.h>
+#include <ll/api/io/Logger.h>
 
 namespace DB {
 
@@ -78,7 +78,7 @@ URL ParseURL(const std::string& url) {
     return result;
 }
 
-extern ll::Logger dbLogger;
+extern ll::io::Logger dbLogger;
 void              PrintURL(const URL& url) {
     dbLogger.debug("Parsed URL");
     dbLogger.debug("scheme: {}", url.scheme);