From cb9c8a015d8eea38591ce5e4b9bc47c4ff3e6907 Mon Sep 17 00:00:00 2001
From: Tsubasa6848 <116721335+Tsubasa6848@users.noreply.github.com>
Date: Fri, 23 Feb 2024 17:41:37 +0800
Subject: [PATCH] feat: adapt GMLIB 0.8.5

---
 SDK-GMLIB                  | 2 +-
 lib/BEPlaceholderAPI-JS.js | 9 ++++++++-
 src/PlaceholderApi.cpp     | 7 ++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/SDK-GMLIB b/SDK-GMLIB
index 0ad5f24..58cec5c 160000
--- a/SDK-GMLIB
+++ b/SDK-GMLIB
@@ -1 +1 @@
-Subproject commit 0ad5f249edef7c909497e385699eb527b7acab97
+Subproject commit 58cec5c0c5eeae94593df1235419fd180ea4a261
diff --git a/lib/BEPlaceholderAPI-JS.js b/lib/BEPlaceholderAPI-JS.js
index b0ac46a..afcc3af 100644
--- a/lib/BEPlaceholderAPI-JS.js
+++ b/lib/BEPlaceholderAPI-JS.js
@@ -5,6 +5,7 @@ const PAPIregisterServerPlaceholderAPI = ll.import("BEPlaceholderAPI", "register
 const PAPIregisterStaticPlaceholderAPI = ll.import("BEPlaceholderAPI", "registerStaticPlaceholder")
 const PAPItranslateStringAPI = ll.import("BEPlaceholderAPI", "translateString")
 const PAPIunRegisterPlaceholderAPI = ll.import("BEPlaceholderAPI", "unRegisterPlaceholder")
+const PAPIgetAllPAPI = ll.import("BEPlaceholderAPI", "getAllPAPI")
 
 Function.prototype.getName = function () {
 
@@ -13,7 +14,9 @@ Function.prototype.getName = function () {
 }
 
 class PAPI {
-    constructor() { }
+    constructor() {
+        throw new Error("Static class cannot be instantiated");
+    }
 
     static registerPlayerPlaceholder(func, PluginName, PAPIName) {
 
@@ -47,6 +50,10 @@ class PAPI {
         return PAPIunRegisterPlaceholderAPI(str)
     }
 
+    static getAllPAPI() {
+        return PAPIgetAllPAPI();
+    }
+
 }
 
 module.exports = {
diff --git a/src/PlaceholderApi.cpp b/src/PlaceholderApi.cpp
index ac7c4e5..bea552f 100644
--- a/src/PlaceholderApi.cpp
+++ b/src/PlaceholderApi.cpp
@@ -108,13 +108,13 @@ std::string registerStaticPlaceholder(
 }
 
 std::string translateString(std::string const& str, std::string const& xuid) {
-    std::string _str = str;
-    GMLIB::Server::PlaceholderAPI::translateString(_str, ll::service::bedrock::getLevel()->getPlayerByXuid(xuid));
-    return _str;
+    return GMLIB::Server::PlaceholderAPI::translate(str, ll::service::bedrock::getLevel()->getPlayerByXuid(xuid));
 }
 
 bool unRegisterPlaceholder(std::string const& str) { return GMLIB::Server::PlaceholderAPI::unRegisterPlaceholder(str); }
 
+std::vector<std::string> getAllPAPI() { return GMLIB::Server::PlaceholderAPI::getAllPAPI(); }
+
 } // namespace PAPIRemoteCall
 
 #define EXPORTAPI(T)                                                                                                   \
@@ -128,4 +128,5 @@ void ExportPAPI() {
     EXPORTAPI(PAPIRemoteCall::GetValueWithPlayer);
     EXPORTAPI(PAPIRemoteCall::translateString);
     EXPORTAPI(PAPIRemoteCall::unRegisterPlaceholder);
+    EXPORTAPI(PAPIRemoteCall::getAllPAPI);
 }
\ No newline at end of file