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

adapt: adapt to GMLIB v0.12.4

Browse Source
This commit is contained in:
Tsubasa6848
2024-05-03 01:39:59 +08:00
Unverified
parent 105228aba6
commit 3918069ce4
4 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SDK-GMLIB
+1 -1
Submodule SDK-GMLIB updated: e4f3e2a188...fd8463224f
lib/GMLIB_API-JS.js
+3 -10
View File
@@ -280,22 +280,15 @@ class Minecraft {
} }
static getPlayerNbt(uuid) { static getPlayerNbt(uuid) {
let snbt = GMLIB_API.getPlayerNbt(uuid); return GMLIB_API.getPlayerNbt(uuid);
if (snbt == "null") {
return null;
}
let nbt = NBT.parseSNBT(snbt);
return nbt;
} }
static setPlayerNbt(uuid, nbt, forceCreate = true) { static setPlayerNbt(uuid, nbt, forceCreate = true) {
let snbt = nbt.toSNBT(); return GMLIB_API.setPlayerNbt(uuid, nbt, forceCreate);
return GMLIB_API.setPlayerNbt(uuid, snbt, forceCreate);
} }
static setPlayerNbtTags(uuid, nbt, tags) { static setPlayerNbtTags(uuid, nbt, tags) {
let snbt = nbt.toSNBT(); return GMLIB_API.setPlayerNbtTags(uuid, nbt, tags);
return GMLIB_API.setPlayerNbtTags(uuid, snbt, tags);
} }
static getPlayerPosition(uuid) { static getPlayerPosition(uuid) {
src/CompatibilityApi.cpp
+8 -12
View File
@@ -53,25 +53,21 @@ void Export_Compatibility_API() {
} }
return result; return result;
}); });
RemoteCall::exportAs("GMLIB_API", "getPlayerNbt", [](std::string uuid) -> std::string { RemoteCall::exportAs("GMLIB_API", "getPlayerNbt", [](std::string uuid) -> std::unique_ptr<CompoundTag> {
auto uid = mce::UUID::fromString(uuid); auto uid = mce::UUID::fromString(uuid);
auto nbt = GMLIB_Player::getPlayerNbt(uid); return std::move(GMLIB_Player::getPlayerNbt(uid));
if (nbt) {
return nbt->toSnbt();
}
return "null";
}); });
RemoteCall::exportAs("GMLIB_API", "setPlayerNbt", [](std::string uuid, std::string snbt, bool forceCreate) -> bool { RemoteCall::exportAs("GMLIB_API", "setPlayerNbt", [](std::string uuid, CompoundTag* nbt, bool forceCreate) -> bool {
auto uid = mce::UUID::fromString(uuid); auto uid = mce::UUID::fromString(uuid);
auto nbt = CompoundTag::fromSnbt(snbt); logger.warn(nbt->toSnbt());
return GMLIB_Player::setPlayerNbt(uid, *nbt, forceCreate); return GMLIB_Player::setPlayerNbt(uid, *nbt, forceCreate);
}); });
RemoteCall::exportAs( RemoteCall::exportAs(
"GMLIB_API", "GMLIB_API",
"setPlayerNbtTags", "setPlayerNbtTags",
[](std::string uuid, std::string snbt, std::vector<std::string> tags) -> bool { [](std::string uuid, CompoundTag* nbt, std::vector<std::string> tags) -> bool {
auto uid = mce::UUID::fromString(uuid); auto uid = mce::UUID::fromString(uuid);
auto nbt = CompoundTag::fromSnbt(snbt); logger.warn(nbt->toSnbt());
return GMLIB_Player::setPlayerNbtTags(uid, *nbt, tags); return GMLIB_Player::setPlayerNbtTags(uid, *nbt, tags);
} }
); );
@@ -176,8 +172,8 @@ void Export_Compatibility_API() {
} }
}); });
RemoteCall::exportAs("GMLIB_API", "getResourcePackI18nLanguage", []() -> std::string { RemoteCall::exportAs("GMLIB_API", "getResourcePackI18nLanguage", []() -> std::string {
if (auto result = I18nAPI::getCurrentLanguageCode()) { if (GMLIB_Level::getInstance()) {
return result.value(); return I18nAPI::getCurrentLanguageCode();
} }
return "unknown"; return "unknown";
}); });
src/LegacyServerApi.cpp
+6 -4
View File
@@ -2,16 +2,18 @@
void Export_Legacy_GMLib_ServerAPI() { void Export_Legacy_GMLib_ServerAPI() {
RemoteCall::exportAs("GMLib_ServerAPI", "setEducationFeatureEnabled", []() -> void { RemoteCall::exportAs("GMLib_ServerAPI", "setEducationFeatureEnabled", []() -> void {
GMLIB_Level::addEducationEditionRequired(); GMLIB_Level::tryEnableEducationEdition();
}); });
RemoteCall::exportAs("GMLib_ServerAPI", "registerAbilityCommand", []() -> void { RemoteCall::exportAs("GMLib_ServerAPI", "registerAbilityCommand", []() -> void {
GMLIB_Level::forceEnableAbilityCommand(); GMLIB_Level::tryRegisterAbilityCommand();
}); });
RemoteCall::exportAs("GMLib_ServerAPI", "setEnableAchievement", []() -> void { RemoteCall::exportAs("GMLib_ServerAPI", "setEnableAchievement", []() -> void {
GMLIB_Level::setForceAchievementsEnabled(); GMLIB_Level::setForceAchievementsEnabled();
}); });
RemoteCall::exportAs("GMLib_ServerAPI", "setForceTrustSkins", []() -> void { GMLIB_Level::setForceTrustSkin(); }); RemoteCall::exportAs("GMLib_ServerAPI", "setForceTrustSkins", []() -> void { GMLIB_Level::trustAllSkins(); });
RemoteCall::exportAs("GMLib_ServerAPI", "enableCoResourcePack", []() -> void { GMLIB_Level::setCoResourcePack(); }); RemoteCall::exportAs("GMLib_ServerAPI", "enableCoResourcePack", []() -> void {
GMLIB_Level::requireServerResourcePackAndAllowClientResourcePack();
});
RemoteCall::exportAs("GMLib_ServerAPI", "getLevelName", []() -> std::string { RemoteCall::exportAs("GMLib_ServerAPI", "getLevelName", []() -> std::string {
auto level = GMLIB_Level::getInstance(); auto level = GMLIB_Level::getInstance();
if (!level) { if (!level) {