refactor: remove more macro

Author: ShrBox

src/legacy/engine/MessageSystem.cpp

@@ -98,7 +98,7 @@ ModuleMessageResult ModuleMessage::broadcastLocal(MessageType type, string data,
     for (auto& engine : engines) {
         try {
             engine->messageQueue()->postMessage(
-                PackEngineMessage(LLSE_MODULE_TYPE, type, data, &msgId),
+                PackEngineMessage(LLSE_BACKEND_TYPE, type, data, &msgId),
                 std::chrono::milliseconds(delay)
             );
             engineList.push_back(engine);
@@ -184,7 +184,7 @@ ModuleMessageResult ModuleMessage::broadcastTo(std::string toModuleType, Message
 
 ModuleMessageResult ModuleMessage::sendTo(ScriptEngine* engine, MessageType type, std::string data, int64_t delay) {
     int    msgId        = -1;
-    string toModuleType = LLSE_MODULE_TYPE;
+    string toModuleType = LLSE_BACKEND_TYPE;
 
     try {
         engine->messageQueue()->postMessage(
@@ -342,14 +342,14 @@ void MessageSystemLoopOnce() {
         }
     }
     // messageLoopLock.unlock();
-    // lse::getSelfPluginInstance().getLogger().debug("Engine-{} Message Loop.", LLSE_MODULE_TYPE);
+    // lse::getSelfPluginInstance().getLogger().debug("Engine-{} Message Loop.", LLSE_BACKEND_TYPE);
 }
 
 void InitMessageSystem() {
 #ifdef NDEBUG
     ll::error_utils::initExceptionTranslator();
 #endif
-    globalShareData->messageSystemHandlers[LLSE_MODULE_TYPE] = {ModuleMessage::handle, ModuleMessage::cleanup};
+    globalShareData->messageSystemHandlers[LLSE_BACKEND_TYPE] = {ModuleMessage::handle, ModuleMessage::cleanup};
 
     ll::event::EventBus::getInstance().emplaceListener<ll::event::ServerStoppingEvent>(
         [](ll::event::ServerStoppingEvent&) { EndMessageSystemLoop(); }

src/legacy/engine/MessageSystem.h

@@ -53,7 +53,7 @@ class ModuleMessage {
         MessageHeader() {
             id                   = getNextMessageId();
             fromEngine           = EngineScope::currentEngine();
-            fromEngineModuleType = LLSE_MODULE_TYPE;
+            fromEngineModuleType = LLSE_BACKEND_TYPE;
         }
         int           id;
         ScriptEngine* fromEngine;

src/legacy/engine/RemoteCall.cpp

@@ -21,7 +21,7 @@ void inline StringTrim(string& str) {
 
 void RemoteSyncCallRequest(ModuleMessage& msg) {
     // lse::getSelfPluginInstance().getLogger().debug("*** Remote call request received.");
-    // lse::getSelfPluginInstance().getLogger().debug("*** Current Module:{}", LLSE_MODULE_TYPE);
+    // lse::getSelfPluginInstance().getLogger().debug("*** Current Module:{}", LLSE_BACKEND_TYPE);
 
     std::istringstream sin(msg.getData());
 
@@ -119,7 +119,7 @@ bool LLSEExportFunc(ScriptEngine *engine, const Local<Function> &func, const str
         return false;
     funcData->engine = engine;
     funcData->func = script::Global<Function>(func);
-    funcData->fromEngineType = LLSE_MODULE_TYPE;
+    funcData->fromEngineType = LLSE_BACKEND_TYPE;
     funcData->callback = [exportName](std::vector<std::string> params) -> std::string {
         auto data = globalShareData->exportedFuncs.find(exportName);
         if (data == globalShareData->exportedFuncs.end())

src/legacy/legacyapi/command/DynamicCommand.cpp

@@ -8,7 +8,6 @@
 #include "magic_enum.hpp"
 #include "mc/deps/core/utility/typeid_t.h"
 #include "mc/nbt/CompoundTag.h"
-#include "mc/network/packet/AvailableCommandsPacket.h"
 #include "mc/server/commands/BlockStateCommandParam.h"
 #include "mc/server/commands/Command.h"
 #include "mc/server/commands/CommandBlockName.h"
@@ -31,11 +30,8 @@
 #include "mc/world/item/ItemInstance.h"
 #include "mc/world/level/Level.h"
 
-#include <algorithm>
-#include <cstddef>
 #include <cstdint>
 #include <ll/api/command/CommandRegistrar.h>
-#include <ll/api/io/Logger.h>
 #include <memory>
 #include <sstream>
 #include <stdexcept>
@@ -54,8 +50,6 @@ bool CommandRegistry::parse<std::pair<
     return true;
 }
 
-#define logger lse::getSelfPluginInstance().getLogger()
-
 #define ForEachParameterType(func)                                                                                     \
     func(Bool);                                                                                                        \
     func(Int);                                                                                                         \
@@ -133,9 +127,9 @@ auto const ParameterSizeMap = std::unordered_map<ParameterType, size_t>{
 };
 
 inline void OutputError(const std::string& command, const std::string& func = __builtin_FUNCTION()) {
-    ll::error_utils::printCurrentException(logger);
-    logger.error("In Function ({})", func);
-    logger.error("In Command <{}>", command);
+    ll::error_utils::printCurrentException(lse::getSelfPluginInstance().getLogger());
+    lse::getSelfPluginInstance().getLogger().error("In Function ({})", func);
+    lse::getSelfPluginInstance().getLogger().error("In Command <{}>", command);
 }
 
 } // namespace
@@ -426,7 +420,7 @@ std::string DynamicCommand::Result::toDebugString() const {
             isSet ? getRaw<std::unique_ptr<Command>>()->getCommandName() : "Null"
         );
     default:
-        logger.error("Unknown Parameter Type {}, name: {}", typeName, name);
+        lse::getSelfPluginInstance().getLogger().error("Unknown Parameter Type {}, name: {}", typeName, name);
         return "";
     }
 }
@@ -446,7 +440,7 @@ DynamicCommandInstance*
 DynamicCommand::preSetup(CommandRegistry& registry, std::unique_ptr<class DynamicCommandInstance> commandInstance) {
     std::string name = commandInstance->getCommandName();
 #if defined(LEGACYSCRIPTENGINE_DEBUG)
-    logger.debug("Setting up command \"{}\"", name);
+    lse::getSelfPluginInstance().getLogger().debug("Setting up command \"{}\"", name);
 #endif
     // Check if there is another command with the same name
     auto signature = registry.findCommand(name);
@@ -556,7 +550,10 @@ DynamicCommand::~DynamicCommand() {
     std::string commandName = getCommandName();
     auto        iter        = dynamicCommandInstances.find(commandName);
     if (iter == dynamicCommandInstances.end()) {
-        logger.error("Error in DynamicCommand::~DynamicCommand(), command \"{}\" not found", commandName);
+        lse::getSelfPluginInstance().getLogger().error(
+            "Error in DynamicCommand::~DynamicCommand(), command \"{}\" not found",
+            commandName
+        );
         return;
     }
     auto& commandIns = *iter->second;
@@ -604,7 +601,7 @@ DynamicCommandInstance const*
 DynamicCommand::setup(CommandRegistry& registry, std::unique_ptr<class DynamicCommandInstance> commandInstance) {
     auto name = commandInstance->getCommandName();
     auto ptr  = preSetup(registry, std::move(commandInstance));
-    if (!ptr) logger.warn("Registering command \"{}\" failed", name);
+    if (!ptr) lse::getSelfPluginInstance().getLogger().warn("Registering command \"{}\" failed", name);
     updateAvailableCommands(registry);
     return ptr;
 }

src/legacy/main/Configs.h

@@ -20,7 +20,6 @@
 #endif
 
 // All backends information
-#define LLSE_MODULE_TYPE          LLSE_BACKEND_TYPE
 #define LLSE_VALID_BACKENDS_COUNT 4
 
 // Debug engine information

src/legacy/main/Global.h

@@ -1,12 +1,5 @@
 #pragma once
 
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#ifndef CPPHTTPLIB_OPENSSL_SUPPORT
-#define CPPHTTPLIB_OPENSSL_SUPPORT
-#endif
-
 #include "mc/deps/core/math/Vec3.h"
 #include "mc/world/level/BlockPos.h"