fix: try to fix action

适配

.github/workflows/build.yml

@@ -7,12 +7,19 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-      - name: Checkout repository
+      - uses: actions/checkout@v6
-        uses: actions/checkout@v2
 
       - uses: xmake-io/github-action-setup-xmake@v1
+        # with:
+        #   xmake-version: branch@master
+
+      - uses: actions/cache@v5
         with:
-          xmake-version: 3.0.0
+          path: |
+            ~/AppData/Local/.xmake
+          key: xmake-${{ hashFiles('xmake.lua') }}
+          restore-keys: |
+            xmake-
 
       - run: |
           xmake repo -u
@@ -23,7 +30,7 @@ jobs:
       - run: |
           xmake -w -y
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: ${{ github.event.repository.name }}-windows-x64-${{ github.sha }}
           path: |

.github/workflows/release.yml

@@ -7,12 +7,20 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-      - name: Checkout repository
+      - uses: actions/checkout@v6
-        uses: actions/checkout@v2
 
       - uses: xmake-io/github-action-setup-xmake@v1
+        # with:
+        #   xmake-version: branch@master
+
+      - uses: actions/cache@v5
         with:
-          xmake-version: 3.0.0
+          path: |
+            ~/AppData/Local/.xmake
+          key: xmake-${{ hashFiles('xmake.lua') }}
+          restore-keys: |
+            xmake-
+
       
       - run: |
           xmake repo -u
@@ -23,7 +31,7 @@ jobs:
       - run: |
           xmake -w -y
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: ${{ github.event.repository.name }}-windows-x64-${{ github.sha }}
           path: |
@@ -37,10 +45,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Download Mod
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: ${{ github.event.repository.name }}-windows-x64-${{ github.sha }}
           path: artifact
@@ -55,7 +63,7 @@ jobs:
         working-directory: artifact
 
       - name: Create GitHub Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v3
         with:
           files: |
             ${{ github.event.repository.name }}-windows-x64.zip

src/CompatibilityApi.cpp

@@ -1,4 +1,5 @@
 #include "Global.h"
+#include "gmlib/mc/world/actor/Player.h"
 #include "mc/platform/UUID.h"
 #include <regex>
 
@@ -442,25 +443,16 @@ void Export_Compatibility_API() {
     });
     RemoteCall::exportAs("GMLIB_API", "getWorldSpawn", []() -> std::pair<BlockPos, int> {
         constexpr static HashedString SPAWN_POS{"spawnPos"};
-        using mUnkfc867e = std::variant<
+
-            int,
-            bool,
-            float,
-            std::string,
-            GeneratorType,
-            GameType,
-            BlockPos,
-            LevelSeed64,
-            LevelDataValue::Tag,
-            DaylightCycle>;
         auto& levelData = GMLevel::getInstance()->getLevelData();
         if (auto it = levelData.mValues->find(SPAWN_POS); it != levelData.mValues->end()) {
-            if (auto value = std::get_if<BlockPos>(&it->second.mUnkfc867e.as<mUnkfc867e>()); value) {
+
+            if (auto value = std::get_if<BlockPos>(&it->second.mValue.get()); value) {
                 return {*value, 0};
             }
         }
         if (auto it = levelData.mOverrides->find(SPAWN_POS); it != levelData.mOverrides->end()) {
-            if (auto value = std::get_if<BlockPos>(&it->second.mUnkfc867e.as<mUnkfc867e>()); value) {
+            if (auto value = std::get_if<BlockPos>(&it->second.mValue.get()); value) {
                 return {*value, 0};
             }
         }
@@ -470,7 +462,8 @@ void Export_Compatibility_API() {
         if (pos.second != 0) return false;
         GMLevel::getInstance()->getLevelData().setSpawnPos(pos.first);
         auto pkt           = SetSpawnPositionPacket();
-        pkt.mSpawnBlockPos = NetworkBlockPosition(pos.first);
+        pkt.mSpawnBlockPos = pos.first;
+
         pkt.mDimensionType = 0;
         pkt.mSpawnPosType  = SpawnPositionType::WorldSpawn;
         pkt.sendToClients();
@@ -503,7 +496,7 @@ void Export_Compatibility_API() {
         return "";
     });
     RemoteCall::exportAs("GMLIB_API", "getXuidByName", [](std::string const& name) -> std::string {
-        if (auto uce = UserCache::getInstance()->from(name, UserCache::QueryType::Name)) {
+        if (auto uce = UserCache::getInstance()->from(name, UserCache::Name)) {
             return uce->mXuid;
         }
         return "";
@@ -515,19 +508,19 @@ void Export_Compatibility_API() {
         return "";
     });
     RemoteCall::exportAs("GMLIB_API", "getNameByXuid", [](std::string const& xuid) -> std::string {
-        if (auto uce = UserCache::getInstance()->from(xuid, UserCache::QueryType::Xuid)) {
+        if (auto uce = UserCache::getInstance()->from(xuid, UserCache::Xuid)) {
             return uce->mName;
         }
         return "";
     });
     RemoteCall::exportAs("GMLIB_API", "getUuidByXuid", [](std::string const& xuid) -> std::string {
-        if (auto uce = UserCache::getInstance()->from(xuid, UserCache::QueryType::Xuid)) {
+        if (auto uce = UserCache::getInstance()->from(xuid, UserCache::Xuid)) {
             return uce->mUuid.asString();
         }
         return "";
     });
     RemoteCall::exportAs("GMLIB_API", "getUuidByName", [](std::string const& name) -> std::string {
-        if (auto uce = UserCache::getInstance()->from(name, UserCache::QueryType::Name)) {
+        if (auto uce = UserCache::getInstance()->from(name, UserCache::Name)) {
             return uce->mUuid.asString();
         }
         return "";
@@ -552,7 +545,7 @@ void Export_Compatibility_API() {
                     return result;
                 }
             }
-            if (auto uce = UserCache::getInstance()->from(info, UserCache::QueryType::Default)) {
+            if (auto uce = UserCache::getInstance()->from(info, UserCache::Default)) {
                 ll::reflection::forEachMember(*uce, [&](std::string_view name, auto&& member) {
                     result[std::string{name.substr(1)}] = fmt::to_string(member);
                 });
@@ -751,7 +744,7 @@ void Export_Compatibility_API() {
         return entity->getNameTag();
     });
     RemoteCall::exportAs("GMLIB_API", "ItemisUnbreakable", [](ItemStack const* item) -> bool {
-        return ((GMItemStack*)item)->isUnbreakable();
+        return ((GMItemStack*)item)->getUnbreakable();
     });
     RemoteCall::exportAs("GMLIB_API", "setItemUnbreakable", [](ItemStack const* item, bool value) -> void {
         ((GMItemStack*)item)->setUnbreakable(value);
@@ -823,7 +816,7 @@ void Export_Compatibility_API() {
         }
     );
     RemoteCall::exportAs("GMLIB_API", "getPlayerHungry", [](Player* player) -> float {
-        return player->getMutableAttribute(Player::HUNGER()).mInstance->mCurrentValue;
+        return player->getAttribute(Player::HUNGER()).mPtr->mCurrentValue;
     });
     RemoteCall::exportAs("GMLIB_API", "getPlayerArmorCoverPercentage", [](Player* player) -> float {
         return player->getArmorCoverPercentage();

src/Global.h

@@ -22,8 +22,8 @@ using namespace modapi;
 #define PLUGIN_NAME fmt::format(fg(fmt::color::light_green), "GMLIB-LRCA")
 
 #define LIB_VERSION_MAJOR    1
-#define LIB_VERSION_MINOR    7
+#define LIB_VERSION_MINOR    8
-#define LIB_VERSION_PATCH    1
+#define LIB_VERSION_PATCH    0
 #define LIB_VERSION_PRERELEASE std::nullopt
 
 #ifdef LIB_VERSION_PRERELEASE

tooth.json

@@ -2,7 +2,7 @@
     "format_version": 3,
     "format_uuid": "289f771f-2c9a-4d73-9f3f-8492495a924d",
     "tooth": "github.com/GroupMountain/GMLIB-LegacyRemoteCallApi",
-    "version": "1.7.1",
+    "version": "1.10.0",
     "info": {
         "name": "GMLIB-LegacyRemoteCallApi",
         "description": "Legacy RemoteCall API for GMLIB",
@@ -19,10 +19,10 @@
         {
             "platform": "win-x64",
             "dependencies": {
-                "github.com/LiteLDev/LeviLamina": ">=1.7.0",
+                "github.com/LiteLDev/LeviLamina": ">=26.10.0",
-                "github.com/GroupMountain/GMLIB-Release": ">=1.7.0",
+                "github.com/GroupMountain/GMLIB-Release": ">=26.10.0",
-                "github.com/GroupMountain/ModAPI-Release": ">=0.3.0",
+                "github.com/GroupMountain/ModAPI-Release": ">=26.10.0",
-                "github.com/MiracleForest/iListenAttentively-Release": ">=0.10.0"
+                "github.com/MiracleForest/iListenAttentively-Release": ">=0.12.0"
             },
             "assets": [
                 {

xmake.lua

@@ -8,12 +8,18 @@ if not has_config("vs_runtime") then
     set_runtimes("MD")
 end
 
-add_requires("levilamina 1.7.3", {configs = {target_type = "server"}})
+add_requires("levilamina 26.10.5", {configs = {target_type = "server"}})
 add_requires("legacyremotecall")
-add_requires("levibuildscript 0.5.2")
+add_requires("levibuildscript 0.6.0")
-add_requires("ilistenattentively 0.10.0")
+add_requires("ilistenattentively 0.12.0")
-add_requires("gmlib 1.7.0")
+add_requires("gmlib 26.10.0")
-add_requires("modapi 0.3.0")
+add_requires("modapi 26.10.0")
+
+rule("package_envs")
+    before_link(function (target)
+        os.addenvs(target:pkgenvs())
+    end)
+rule_end()
 
 target("GMLIB-LegacyRemoteCallApi")
     add_cxflags(
@@ -26,6 +32,7 @@ target("GMLIB-LegacyRemoteCallApi")
         "UNICODE", 
         "_HAS_CXX23=1"
     )
+    add_defines("LL_PLAT_S")  --TODO: check client compatibility
     add_files(
         "src/**.cpp"
     )
@@ -35,10 +42,12 @@ target("GMLIB-LegacyRemoteCallApi")
     add_packages(
         "levilamina",
         "legacyremotecall",
+        "levibuildscript",
         "ilistenattentively",
         "gmlib",
         "modapi"
     )
+    add_rules("package_envs")
     add_rules("@levibuildscript/linkrule")
     add_rules("@levibuildscript/modpacker")
     set_exceptions("none")