From 7ae029bfb5974cc0f4cdbb59e2b79fd047bf9978 Mon Sep 17 00:00:00 2001 From: EpsilonZunsat <2748716171@qq.com> Date: Fri, 21 Jun 2024 13:09:44 +0800 Subject: [PATCH] adapt: adapt to GMLIB v0.13.0 --- .github/workflows/build.yml | 3 ++- .github/workflows/release.yml | 3 ++- SDK-GMLIB | 1 - manifest.json | 2 +- tooth.json | 6 +++--- xmake.lua | 9 ++++----- 6 files changed, 12 insertions(+), 12 deletions(-) delete mode 160000 SDK-GMLIB diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a74f60b..f86ed1c 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 48a0138..9b097c5 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 59fbc9b..bcde5fc 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "${pluginName}", "entry": "${pluginFile}", "type": "native", - "version": "0.12.3", + "version": "0.13.0", "author": "GroupMountain", "description": "Clean Entities", "dependencies": [ diff --git a/tooth.json b/tooth.json index 7ce5967..fa080f7 100644 --- a/tooth.json +++ b/tooth.json @@ -1,7 +1,7 @@ { "format_version": 2, "tooth": "github.com/GroupMountain/Cleaner", - "version": "0.12.3", + "version": "0.13.0", "info": { "name": "Cleaner", "description": "A Powerful Entities Cleaning up Plugin for BDS", @@ -13,9 +13,9 @@ "gmlib" ] }, - "asset_url": "https://github.com/GroupMountain/Cleaner/releases/download/v0.12.3/Cleaner-windows-x64.zip", + "asset_url": "https://github.com/GroupMountain/Cleaner/releases/download/v0.13.0/Cleaner-windows-x64.zip", "dependencies": { - "github.com/GroupMountain/GMLIB": ">=0.12.4" + "github.com/GroupMountain/GMLIB": ">=0.13.0" }, "files": { "place": [ diff --git a/xmake.lua b/xmake.lua index 23a455b..bb4e1fc 100644 --- a/xmake.lua +++ b/xmake.lua @@ -1,6 +1,7 @@ add_rules("mode.debug", "mode.release", "mode.releasedbg") 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") target("Cleaner") -- Change this to your plugin name. add_cxflags( @@ -17,15 +19,12 @@ target("Cleaner") -- 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"