From 02ef60b69ce746b2b3c14b5270776f6d8c489b11 Mon Sep 17 00:00:00 2001 From: EpsilonZunsat <2748716171@qq.com> Date: Fri, 21 Jun 2024 13:51:38 +0800 Subject: [PATCH] adapt: adapt GMLIB v0.13.0 --- .github/workflows/build.yml | 3 ++- .github/workflows/release.yml | 3 ++- SDK-GMLIB | 1 - manifest.json | 2 +- src/Global.h | 2 +- tooth.json | 6 +++--- xmake.lua | 9 ++++----- 7 files changed, 13 insertions(+), 13 deletions(-) delete mode 160000 SDK-GMLIB diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bf80ebc..ffeb4f3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,8 @@ jobs: - uses: actions/checkout@v4 - uses: xmake-io/github-action-setup-xmake@v1 - + with: + xmake-version: branch@master - run: | xmake repo -u diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d01ad80..8de589a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,8 @@ jobs: - uses: actions/checkout@v4 - uses: xmake-io/github-action-setup-xmake@v1 - + with: + xmake-version: branch@master - run: | xmake repo -u diff --git a/SDK-GMLIB b/SDK-GMLIB deleted file mode 160000 index 710cc6e..0000000 --- a/SDK-GMLIB +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 710cc6e4c3b0e85fd793fba807d8fffd6c4b607f diff --git a/manifest.json b/manifest.json index 045d2b8..684413c 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name": "${pluginName}", "entry": "${pluginFile}", - "version": "0.12.1", + "version": "0.13.0", "author": "GroupMountain", "description": "Check Player's Inventory", "type": "native", diff --git a/src/Global.h b/src/Global.h index cf5f131..7821251 100644 --- a/src/Global.h +++ b/src/Global.h @@ -2,7 +2,7 @@ #include #define PLUGIN_NAME "InventoryCheck" -#define TARGET_PROTOCOL 671 +#define TARGET_PROTOCOL 685 extern ll::Logger logger; diff --git a/tooth.json b/tooth.json index 2f5145b..a15eb3e 100644 --- a/tooth.json +++ b/tooth.json @@ -1,7 +1,7 @@ { "format_version": 2, "tooth": "github.com/GroupMountain/InventoryCheck", - "version": "0.12.1", + "version": "0.13.0", "info": { "name": "InventoryCheck", "description": "Check Player's Inventory", @@ -14,9 +14,9 @@ "gmlib" ] }, - "asset_url": "https://github.com/GroupMountain/InventoryCheck/releases/download/v0.12.1/InventoryCheck-windows-x64.zip", + "asset_url": "https://github.com/GroupMountain/InventoryCheck/releases/download/v0.13.0/InventoryCheck-windows-x64.zip", "dependencies": { - "github.com/GroupMountain/GMLIB": ">=0.12.6" + "github.com/GroupMountain/GMLIB": ">=0.13.0" }, "files": { "place": [ diff --git a/xmake.lua b/xmake.lua index e1208de..e0764e2 100644 --- a/xmake.lua +++ b/xmake.lua @@ -1,6 +1,7 @@ add_rules("mode.debug", "mode.release") add_repositories("liteldev-repo https://github.com/LiteLDev/xmake-repo.git") +add_repositories("groupmountain-repo https://github.com/GroupMountain/xmake-repo.git") if not has_config("vs_runtime") then set_runtimes("MD") @@ -8,6 +9,7 @@ end -- Option 1: Use the latest version of LeviLamina released on GitHub. add_requires("levilamina") +add_requires("gmlib") -- Option 2: Use a specific version of LeviLamina released on GitHub. -- add_requires("levilamina x.x.x") @@ -52,15 +54,12 @@ target("InventoryCheck") -- Change this to your plugin name. add_files( "src/**.cpp" ) - add_links( - "SDK-GMLIB/Lib/GMLIB" - ) add_includedirs( - "SDK-GMLIB", "src" ) add_packages( - "levilamina" + "levilamina", + "gmlib" ) add_shflags( "/DELAYLOAD:bedrock_server.dll" -- Magic to import symbols from BDS