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/.gitmodules b/.gitmodules deleted file mode 100644 index 973fe68..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "SDK-GMLIB"] - path = SDK-GMLIB - url = https://github.com/GroupMountain/SDK-GMLIB.git diff --git a/SDK-GMLIB b/SDK-GMLIB deleted file mode 160000 index 920b4e2..0000000 --- a/SDK-GMLIB +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 920b4e243aa0961ee3c0ad011d8b5e249d8717ca diff --git a/src/Entry.cpp b/src/Entry.cpp index 3c394eb..d2376b2 100644 --- a/src/Entry.cpp +++ b/src/Entry.cpp @@ -31,6 +31,7 @@ bool Entry::enable() { mI18n->updateOrCreateLanguage("en_US", en_US); mI18n->updateOrCreateLanguage("zh_CN", zh_CN); mI18n->loadAllLanguages(); + mI18n->chooseLanguage(mConfig->language);//maybe checkBanTimeTask(); RegisterCommands(); listenEvent(); diff --git a/xmake.lua b/xmake.lua index 011570d..43780db 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") -- Option 2: Use a specific version of LeviLamina released on GitHub. -- add_requires("levilamina x.x.x") @@ -51,15 +53,12 @@ target("GMBlacklist") -- 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 @@ -67,6 +66,7 @@ target("GMBlacklist") -- Change this to your plugin name. set_exceptions("none") -- To avoid conflicts with /EHa set_kind("shared") set_languages("cxx23") + set_symbols("debug") after_build(function (target) local plugin_packer = import("scripts.after_build")