From a43ece66f8832c25704eaa3c58649890c2fa5949 Mon Sep 17 00:00:00 2001 From: killcerr <93478098+killcerr@users.noreply.github.com> Date: Thu, 25 Jul 2024 11:10:16 +0800 Subject: [PATCH 1/5] adapt: adapt to GMLIB v0.13.1 --- src/Plugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Plugin.cpp b/src/Plugin.cpp index 23a9e8b..f6bf58d 100644 --- a/src/Plugin.cpp +++ b/src/Plugin.cpp @@ -44,8 +44,8 @@ ServerTimeScheduler& Entry::getScheduler() { return mScheduler.value(); } } // namespace Cleaner -LL_REGISTER_PLUGIN(Cleaner::Entry, Cleaner::instance); +LL_REGISTER_MOD(Cleaner::Entry, Cleaner::instance); std::string tr(std::string const& key, std::vector const& params) { return I18nAPI::get(key, params, Cleaner::Entry::getInstance().getConfig().language); -} \ No newline at end of file +} From 6e5fe4393c061e805e2da32e5eef4c11fc249be2 Mon Sep 17 00:00:00 2001 From: killcerr <93478098+killcerr@users.noreply.github.com> Date: Thu, 25 Jul 2024 11:10:48 +0800 Subject: [PATCH 2/5] adapt: adapt to GMLIB v0.13.1 --- src/Plugin.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Plugin.h b/src/Plugin.h index 418fe5d..1cd5405 100644 --- a/src/Plugin.h +++ b/src/Plugin.h @@ -1,7 +1,7 @@ #pragma once #include "Config.h" -#include +#include #include namespace Cleaner { @@ -13,9 +13,9 @@ class Entry { public: static Entry& getInstance(); - Entry(ll::plugin::NativePlugin& self) : mSelf(self) {} + Entry(ll::mod::NativeMod& self) : mSelf(self) {} - [[nodiscard]] ll::plugin::NativePlugin& getSelf() const { return mSelf; } + [[nodiscard]] ll::mod::NativeMod& getSelf() const { return mSelf; } /// @return True if the plugin is loaded successfully. bool load(); @@ -37,9 +37,9 @@ public: ServerTimeScheduler& getScheduler(); private: - ll::plugin::NativePlugin& mSelf; + ll::mod::NativeMod& mSelf; std::optional mConfig; std::optional mScheduler; }; -} // namespace Cleaner \ No newline at end of file +} // namespace Cleaner From 89773a5251bf92092c69ca7a2c2b398829a9ede7 Mon Sep 17 00:00:00 2001 From: killcerr <93478098+killcerr@users.noreply.github.com> Date: Thu, 25 Jul 2024 11:11:55 +0800 Subject: [PATCH 3/5] fix: fix clangd options --- .clangd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.clangd b/.clangd index c9f9efb..40ad7a5 100644 --- a/.clangd +++ b/.clangd @@ -1,5 +1,5 @@ Diagnostics: Suppress: ["-Wmicrosoft-enum-forward-reference", "-Wc++11-narrowing", "-Wc++2b-extensions", "-Wmicrosoft-cast"] CompileFlags: - Add: ["-ferror-limit=0", "-D__FUNCTION__=\"dummy\"", "-D_CRT_USE_BUILTIN_OFFSETOF", "-std:c++latest"] + Add: ["-ferror-limit=0", "-D__FUNCTION__=\"dummy\"", "-D_CRT_USE_BUILTIN_OFFSETOF", "-std=c++23"] Remove: ["/Yu_HeaderOutputPredefine.h", "/FI_HeaderOutputPredefine.h"] From 0235bd6aa6e2e2aeff4c559f89442e17df9c069f Mon Sep 17 00:00:00 2001 From: killcerr <93478098+killcerr@users.noreply.github.com> Date: Thu, 25 Jul 2024 11:14:33 +0800 Subject: [PATCH 4/5] fix: fix ci --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f86ed1c..c461c7c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: - uses: xmake-io/github-action-setup-xmake@v1 with: - xmake-version: branch@master + xmake-version: latest - run: | xmake repo -u From b64567f83983419788ed334052a8c414bb8ca617 Mon Sep 17 00:00:00 2001 From: killcerr <93478098+killcerr@users.noreply.github.com> Date: Thu, 25 Jul 2024 11:14:57 +0800 Subject: [PATCH 5/5] fix: fix ci --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9b097c5..c707d60 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - uses: xmake-io/github-action-setup-xmake@v1 with: - xmake-version: branch@master + xmake-version: latest - run: | xmake repo -u