Merge pull request #44 from GroupMountain/develop

adapt: adapt LeviLamina 1.0.0-rc.3

src/EventAPI.cpp

@@ -1,6 +1,4 @@
 #include "Global.h"
-#include "ll/api/service/Bedrock.h"
-#include "ll/api/utils/ErrorUtils.h"
 using namespace ll::hash_utils;
 
 class EventManager {
@@ -28,7 +26,6 @@ public:
 
     bool removeListener(ullong id) {
         if (ll::event::EventBus::getInstance().removeListener(mEventIds[id])) {
-            ll::mod::NativeMod::current()->getLogger().warn("Removed listener with id {}", id);
             mEventIds[id] = nullptr;
             return true;
         }
@@ -299,7 +296,7 @@ void Export_Event_API() {
                             bool               isCancelled
                         ),
                         (
-                            &event.self(),
+                            (Player*)&event.self(),
                             magic_enum::enum_name(requestAction.mActionType).data(),
                             (int)requestAction.mAmount,
                             magic_enum::enum_name(requestAction.mSrc->mFullContainerName.mName).data(),
@@ -327,7 +324,7 @@ void Export_Event_API() {
                             int                destinationSlot
                         ),
                         (
-                            &event.self(),
+                            (Player*)&event.self(),
                             magic_enum::enum_name(requestAction.mActionType).data(),
                             (int)requestAction.mAmount,
                             magic_enum::enum_name(requestAction.mSrc->mFullContainerName.mName).data(),
@@ -344,8 +341,8 @@ void Export_Event_API() {
                 REGISTER_EVENT_LISTEN(
                     GMLIB::Event::PacketEvent::ContainerClosePacketSendAfterEvent,
                     (Player * player, int containerId, bool serverInitiatedClose, bool),
-                    (ll::service::getServerNetworkHandler()
-                         ->_getServerPlayer(event.getNetworkIdentifier(), event.getPacket().mClientSubId),
+                    (event.getServerNetworkHandler()
+                         ._getServerPlayer(event.getNetworkIdentifier(), event.getPacket().mClientSubId),
                      (int)event.getPacket().mContainerId,
                      event.getPacket().mServerInitiatedClose,
                      false),

xmake.lua

@@ -7,10 +7,10 @@ if not has_config("vs_runtime") then
     set_runtimes("MD")
 end
 
-add_requires("levilamina 1.0.0-rc.3", {configs = {target_type = "server"}})
-add_requires("legacyremotecall 0.9.0-rc.1")
-add_requires("gmlib 0.13.10")
-add_requires("levibuildscript 0.3.0")
+add_requires("levilamina", {configs = {target_type = "server"}})
+add_requires("legacyremotecall")
+add_requires("gmlib")
+add_requires("levibuildscript")
 
 target("GMLIB-LegacyRemoteCallApi")
     add_cxflags(
@@ -19,10 +19,7 @@ target("GMLIB-LegacyRemoteCallApi")
     )
     add_defines(
         "NOMINMAX",
-        "UNICODE",
-        "_HAS_CXX17",
-        "_HAS_CXX20",
-        "_HAS_CXX23"
+        "UNICODE"
     )
     add_files(
         "src/**.cpp"
@@ -38,7 +35,7 @@ target("GMLIB-LegacyRemoteCallApi")
     add_rules("@levibuildscript/linkrule")
     set_exceptions("none")
     set_kind("shared")
-    set_languages("cxx20")
+    set_languages("c++23")
     set_symbols("debug")
 
     after_build(function (target)