7 Commits

9 changed files with 20 additions and 20 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
Diagnostics: Diagnostics:
Suppress: ["-Wmicrosoft-enum-forward-reference", "-Wc++11-narrowing", "-Wc++2b-extensions", "-Wmicrosoft-cast"] Suppress: ["-Wmicrosoft-enum-forward-reference", "-Wc++11-narrowing", "-Wc++2b-extensions", "-Wmicrosoft-cast"]
CompileFlags: 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"] Remove: ["/Yu_HeaderOutputPredefine.h", "/FI_HeaderOutputPredefine.h"]
+2 -1
View File
@@ -15,7 +15,8 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: xmake-io/github-action-setup-xmake@v1 - uses: xmake-io/github-action-setup-xmake@v1
with:
xmake-version: latest
- run: | - run: |
xmake repo -u xmake repo -u
+2 -1
View File
@@ -15,7 +15,8 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: xmake-io/github-action-setup-xmake@v1 - uses: xmake-io/github-action-setup-xmake@v1
with:
xmake-version: latest
- run: | - run: |
xmake repo -u xmake repo -u
Submodule SDK-GMLIB deleted from 710cc6e4c3
+1 -1
View File
@@ -2,7 +2,7 @@
"name": "${pluginName}", "name": "${pluginName}",
"entry": "${pluginFile}", "entry": "${pluginFile}",
"type": "native", "type": "native",
"version": "0.12.3", "version": "0.13.0",
"author": "GroupMountain", "author": "GroupMountain",
"description": "Clean Entities", "description": "Clean Entities",
"dependencies": [ "dependencies": [
+1 -1
View File
@@ -44,7 +44,7 @@ ServerTimeScheduler& Entry::getScheduler() { return mScheduler.value(); }
} // namespace Cleaner } // 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<std::string> const& params) { std::string tr(std::string const& key, std::vector<std::string> const& params) {
return I18nAPI::get(key, params, Cleaner::Entry::getInstance().getConfig().language); return I18nAPI::get(key, params, Cleaner::Entry::getInstance().getConfig().language);
+4 -4
View File
@@ -1,7 +1,7 @@
#pragma once #pragma once
#include "Config.h" #include "Config.h"
#include <ll/api/plugin/NativePlugin.h> #include <ll/api/mod/NativeMod.h>
#include <ll/api/schedule/Scheduler.h> #include <ll/api/schedule/Scheduler.h>
namespace Cleaner { namespace Cleaner {
@@ -13,9 +13,9 @@ class Entry {
public: public:
static Entry& getInstance(); 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. /// @return True if the plugin is loaded successfully.
bool load(); bool load();
@@ -37,7 +37,7 @@ public:
ServerTimeScheduler& getScheduler(); ServerTimeScheduler& getScheduler();
private: private:
ll::plugin::NativePlugin& mSelf; ll::mod::NativeMod& mSelf;
std::optional<Config> mConfig; std::optional<Config> mConfig;
std::optional<ServerTimeScheduler> mScheduler; std::optional<ServerTimeScheduler> mScheduler;
}; };
+3 -3
View File
@@ -1,7 +1,7 @@
{ {
"format_version": 2, "format_version": 2,
"tooth": "github.com/GroupMountain/Cleaner", "tooth": "github.com/GroupMountain/Cleaner",
"version": "0.12.3", "version": "0.13.0",
"info": { "info": {
"name": "Cleaner", "name": "Cleaner",
"description": "A Powerful Entities Cleaning up Plugin for BDS", "description": "A Powerful Entities Cleaning up Plugin for BDS",
@@ -13,9 +13,9 @@
"gmlib" "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": { "dependencies": {
"github.com/GroupMountain/GMLIB": ">=0.12.4" "github.com/GroupMountain/GMLIB": ">=0.13.0"
}, },
"files": { "files": {
"place": [ "place": [
+4 -5
View File
@@ -1,6 +1,7 @@
add_rules("mode.debug", "mode.release", "mode.releasedbg") add_rules("mode.debug", "mode.release", "mode.releasedbg")
add_repositories("liteldev-repo https://github.com/LiteLDev/xmake-repo.git") 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 if not has_config("vs_runtime") then
set_runtimes("MD") set_runtimes("MD")
@@ -8,6 +9,7 @@ end
-- Option 1: Use the latest version of LeviLamina released on GitHub. -- Option 1: Use the latest version of LeviLamina released on GitHub.
add_requires("levilamina") add_requires("levilamina")
add_requires("gmlib")
target("Cleaner") -- Change this to your plugin name. target("Cleaner") -- Change this to your plugin name.
add_cxflags( add_cxflags(
@@ -17,15 +19,12 @@ target("Cleaner") -- Change this to your plugin name.
add_files( add_files(
"src/**.cpp" "src/**.cpp"
) )
add_links(
"SDK-GMLIB/Lib/GMLIB"
)
add_includedirs( add_includedirs(
"SDK-GMLIB",
"src" "src"
) )
add_packages( add_packages(
"levilamina" "levilamina",
"gmlib"
) )
add_shflags( add_shflags(
"/DELAYLOAD:bedrock_server.dll" "/DELAYLOAD:bedrock_server.dll"