wed150/GMLIB-LegacyRemoteCallApi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: adapt to levilamina 1.7.x

Browse Source
This commit is contained in:
zimuya4153
2025-11-07 22:15:32 +08:00
Unverified
parent 47d16a43c5
commit f352dc2215
11 changed files with 243 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PlaceholderApi.cpp
+39 -27
View File
@@ -2,10 +2,12 @@
#include <regex>
namespace PAPIRemoteCall {
std::string GetValue(std::string const& from) { return PlaceholderAPI::getValue(from, std::nullopt).value_or(""); }
std::string GetValue(std::string const& from) {
return PlaceholderAPI::getInstance().getValue(from, std::nullopt).value_or("");
}
std::string GetValueWithPlayer(std::string const& key, Player* player) {
return PlaceholderAPI::getValue(key, (GMActor*)player).value_or("");
return PlaceholderAPI::getInstance().getValue(key, (GMActor*)player).value_or("");
}
void registerPlayerPlaceholder(
@@ -15,15 +17,15 @@ void registerPlayerPlaceholder(
) {
if (!RemoteCall::hasFunc(PluginName, FuncName)) return;
auto func = [=]() -> void {
PlaceholderAPI::unregisterPlaceholder(PAPIName);
PlaceholderAPI::getInstance().unregisterPlaceholder(PAPIName);
std::weak_ptr mod = ll::mod::ModManagerRegistry::getInstance().getMod(PluginName);
if (mod.expired()) return;
PlaceholderAPI::registerPlaceholder(
PlaceholderAPI::getInstance().registerPlaceholder(
PAPIName,
[Call = RemoteCall::importAs<std::string(Player * pl, std::unordered_map<std::string, std::string>)>(
PluginName,
FuncName
)](optional_ref<Actor> actor, ll::StringMap<std::string> const& params, auto&&...
)](optional_ref<Actor> actor, ll::SmallStringMap<std::string> const& params, auto&&...
) -> std::optional<std::string> {
if (actor.has_value() && ((Actor*)actor.as_ptr())->isPlayer()) {
std::unordered_map<std::string, std::string> paramMap;
@@ -34,6 +36,7 @@ void registerPlayerPlaceholder(
}
return std::nullopt;
},
false,
mod
);
};
@@ -51,21 +54,22 @@ void registerServerPlaceholder(
) {
if (!RemoteCall::hasFunc(PluginName, FuncName)) return;
auto func = [=]() -> void {
PlaceholderAPI::unregisterPlaceholder(PAPIName);
PlaceholderAPI::getInstance().unregisterPlaceholder(PAPIName);
std::weak_ptr mod = ll::mod::ModManagerRegistry::getInstance().getMod(PluginName);
if (mod.expired()) return;
PlaceholderAPI::registerPlaceholder(
PlaceholderAPI::getInstance().registerPlaceholder(
PAPIName,
[Call = RemoteCall::importAs<std::string(std::unordered_map<std::string, std::string>)>(
PluginName,
FuncName
)](auto, ll::StringMap<std::string> const& params, auto&&...) -> std::optional<std::string> {
)](auto, ll::SmallStringMap<std::string> const& params, auto&&...) -> std::optional<std::string> {
std::unordered_map<std::string, std::string> paramMap;
for (auto& [key, val] : params) {
paramMap[key] = val;
}
return Call(paramMap);
},
false,
mod
);
};
@@ -84,13 +88,14 @@ void registerStaticPlaceholder(
) {
if (!RemoteCall::hasFunc(PluginName, FuncName)) return;
auto func = [=]() -> void {
PlaceholderAPI::unregisterPlaceholder(PAPIName);
PlaceholderAPI::getInstance().unregisterPlaceholder(PAPIName);
std::weak_ptr mod = ll::mod::ModManagerRegistry::getInstance().getMod(PluginName);
if (mod.expired()) return;
PlaceholderAPI::registerPlaceholder(
PlaceholderAPI::getInstance().registerPlaceholder(
PAPIName,
[Call = RemoteCall::importAs<std::string()>(PluginName, FuncName)](auto&&...)
-> std::optional<std::string> { return Call(); },
[Call = RemoteCall::importAs<std::string()>(PluginName, FuncName)](auto&&...
) -> std::optional<std::string> { return Call(); },
false,
mod
);
};
@@ -102,16 +107,18 @@ void registerStaticPlaceholder(
}
std::string translateStringWithPlayer(std::string const& str, Player* pl) {
return PlaceholderAPI::translate(str, (GMActor*)pl);
return PlaceholderAPI::getInstance().translate(str, (GMActor*)pl);
}
std::string translateString(std::string const& str) { return PlaceholderAPI::translate(str, std::nullopt); }
std::string translateString(std::string const& str) {
return PlaceholderAPI::getInstance().translate(str, std::nullopt);
}
bool unRegisterPlaceholder(std::string const& str) { return PlaceholderAPI::unregisterPlaceholder(str); }
bool unRegisterPlaceholder(std::string const& str) { return PlaceholderAPI::getInstance().unregisterPlaceholder(str); }
std::vector<std::string> getAllPAPI() {
std::vector<std::string> result;
for (auto& papi : PlaceholderAPI::getAllPlaceholderData()) {
for (auto& papi : PlaceholderAPI::getInstance().getAllPlaceholderData()) {
result.push_back(papi.first);
}
return result;
@@ -121,23 +128,23 @@ std::vector<std::string> getAllPAPI() {
namespace NewPapiRemoteCall {
std::string translate(std::string const& value, std::string const& language) {
return PlaceholderAPI::translate(value, std::nullopt, language);
return PlaceholderAPI::getInstance().translate(value, std::nullopt, language);
}
std::string translateFromActor(std::string const& value, Actor* actor, std::string const& language) {
return PlaceholderAPI::translate(value, (GMActor*)actor, language);
return PlaceholderAPI::getInstance().translate(value, (GMActor*)actor, language);
}
void registerPlaceholder(std::string const& placeholder, std::string const& funcName, std::string const& pluginName) {
if (!RemoteCall::hasFunc(pluginName, funcName)) return;
auto func = [=]() -> void {
if (std::weak_ptr mod = ll::mod::ModManagerRegistry::getInstance().getMod(pluginName); !mod.expired()) {
PlaceholderAPI::unregisterPlaceholder(placeholder);
PlaceholderAPI::registerPlaceholder(
PlaceholderAPI::getInstance().unregisterPlaceholder(placeholder);
PlaceholderAPI::getInstance().registerPlaceholder(
placeholder,
[Call = RemoteCall::importAs<
std::string(Actor*, std::unordered_map<std::string, std::string>, std::string)>(
pluginName,
funcName
)](optional_ref<Actor> actor, ll::StringMap<std::string> const& params, std::string const& language
)](optional_ref<Actor> actor, ll::SmallStringMap<std::string> const& params, std::string const& language
) -> std::optional<std::string> {
std::unordered_map<std::string, std::string> paramMap;
for (auto& [key, val] : params) {
@@ -146,6 +153,7 @@ void registerPlaceholder(std::string const& placeholder, std::string const& func
auto result = Call((Actor*)actor.as_ptr(), paramMap, language);
return result == "<std::nullopt>" ? std::nullopt : std::optional(result);
},
false,
mod
);
}
@@ -157,23 +165,25 @@ void registerPlaceholder(std::string const& placeholder, std::string const& func
}
}
bool unregisterPlaceholder(std::string const& placeholder) {
return PlaceholderAPI::unregisterPlaceholder(placeholder);
return PlaceholderAPI::getInstance().unregisterPlaceholder(placeholder);
}
bool unregisterPlaceholderFromModName(std::string const& pluginName) {
std::weak_ptr plugin = ll::mod::ModManagerRegistry::getInstance().getMod(pluginName);
if (plugin.expired()) return false;
return PlaceholderAPI::unregisterPlaceholder(plugin);
return PlaceholderAPI::getInstance().unregisterPlaceholder(plugin);
}
std::string getValue(
std::string const& placeholder,
std::unordered_map<std::string, std::string> params,
std::string const& language
) {
ll::StringMap<std::string> paramMap;
ll::SmallStringMap<std::string> paramMap;
for (auto& [key, val] : params) {
paramMap[key] = val;
}
return PlaceholderAPI::getValue(placeholder, std::nullopt, paramMap, language).value_or("<std::nullopt>");
return PlaceholderAPI::getInstance()
.getValue(placeholder, std::nullopt, paramMap, language)
.value_or("<std::nullopt>");
}
std::string getValueFromActor(
std::string const& placeholder,
@@ -181,11 +191,13 @@ std::string getValueFromActor(
std::unordered_map<std::string, std::string> params,
std::string const& language
) {
ll::StringMap<std::string> paramMap;
ll::SmallStringMap<std::string> paramMap;
for (auto& [key, val] : params) {
paramMap[key] = val;
}
return PlaceholderAPI::getValue(placeholder, (GMActor*)actor, paramMap, language).value_or("<std::nullopt>");
return PlaceholderAPI::getInstance()
.getValue(placeholder, (GMActor*)actor, paramMap, language)
.value_or("<std::nullopt>");
}
} // namespace NewPapiRemoteCall