feat: adapt to levilamina 1.7.x

Author: zimuya4153

.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
         run: xmake repo -u
 
       - name: Update Project
-        run: xmake f -a x64 -m release -p windows -v -y
+        run: xmake f -a x64 -m release -p windows -y
 
       - name: Build Project
         run: xmake -v -y

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
         run: xmake repo -u
 
       - name: Update Project
-        run: xmake f -a x64 -m release -p windows -v -y
+        run: xmake f -a x64 -m release -p windows -y
 
       - name: Build Project
         run: xmake -v -y

src/gmsidebar/GMSidebar.cpp

@@ -211,7 +211,7 @@ struct GMSidebar::Impl {
             if (auto interval = config.update_interval; !interval) {
                 if (cache.second.empty()) {
                     // clang-format off
-                    cache.second = std::move(gmlib::PlaceholderAPI::translate(
+                    cache.second = std::move(gmlib::PlaceholderAPI::getInstance().translate(
                         std::string{config.content[0]},
                         player,
                         {},
@@ -226,39 +226,26 @@ struct GMSidebar::Impl {
                     return true;
                 }
             } else {
-                auto length   = config.content.size();
-                auto newIndex = length > 1 ? (now / interval) % length : 0;
-                ll::DenseMap<
-                    std::string,
-                    std::variant<
-                        std::string,
-                        std::function<std::optional<std::string>(
-                            optional_ref<Actor>               actor,
-                            ll::StringMap<std::string> const& params,
-                            std::string const&                language
-                        )>>>
-                    params = {
-                        {"currentIndex",   std::to_string(newIndex)             },
-                        {"rawContent",     config.content[newIndex]             },
-                        {"updateInterval", std::to_string(interval)             },
-                        {"contentSize",    std::to_string(config.content.size())}
+                auto                                      length   = config.content.size();
+                auto                                      newIndex = length > 1 ? (now / interval) % length : 0;
+                gmlib::PlaceholderAPI::TranslateVariables params   = {
+                    {"currentIndex",   std::to_string(newIndex)             },
+                    {"rawContent",     config.content[newIndex]             },
+                    {"updateInterval", std::to_string(interval)             },
+                    {"contentSize",    std::to_string(config.content.size())}
                 };
                 if (newIndex != cache.first) {
-                    if (auto newValue = gmlib::PlaceholderAPI::translate(
-                            std::string{config.content[newIndex]},
-                            player,
-                            {},
-                            params
-                        );
+                    if (auto newValue = gmlib::PlaceholderAPI::getInstance()
+                                            .translate(std::string{config.content[newIndex]}, player, {}, params);
                         newValue != cache.second) {
                         cache.second = std::move(newValue);
                         cache.first  = newIndex;
                         return true;
                     }
                     cache.first = newIndex;
                 } else if (length == 1) {
-                    if (auto newValue =
-                            gmlib::PlaceholderAPI::translate(std::string{config.content[0]}, player, {}, params);
+                    if (auto newValue = gmlib::PlaceholderAPI::getInstance()
+                                            .translate(std::string{config.content[0]}, player, {}, params);
                         newValue != cache.second) {
                         cache.second = std::move(newValue);
                         return true;

tooth.json

@@ -1,7 +1,7 @@
 {
     "format_version": 2,
     "tooth": "github.com/GroupMountain/GMSidebar",
-    "version": "1.1.1",
+    "version": "1.2.0",
     "info": {
         "name": "GMSidebar",
         "description": "High Performance Sidebar Mod",
@@ -15,8 +15,8 @@
     },
     "asset_url": "https://github.com/GroupMountain/GMSidebar/releases/download/v$(version)/GMSidebar-windows-x64.zip",
     "dependencies": {
-        "github.com/LiteLDev/LeviLamina": ">=1.6.0",
-        "github.com/GroupMountain/GMLIB": ">=1.6.0"
+        "github.com/LiteLDev/LeviLamina": ">=1.7.0",
+        "github.com/GroupMountain/GMLIB": ">=1.7.0"
     },
     "files": {
         "place": [

xmake.lua

@@ -3,9 +3,9 @@ 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")
 
-add_requires("levilamina 1.6.0", {configs = {target_type = "server"}})
+add_requires("levilamina 1.7.1", {configs = {target_type = "server"}})
 add_requires("levibuildscript 0.5.2")
-add_requires("gmlib 1.6.0")
+add_requires("gmlib 1.7.0")
 
 if not has_config("vs_runtime") then
     set_runtimes("MD")