From 27d969d7f101347b22e011e1df522cd8f59b8675 Mon Sep 17 00:00:00 2001 From: Tsubasa6848 <116721335+Tsubasa6848@users.noreply.github.com> Date: Wed, 15 May 2024 20:26:39 +0800 Subject: [PATCH] feat: add getBlockRuntimeId --- lib/GMLIB_API-JS.js | 13 +++++++++---- src/CompatibilityApi.cpp | 6 ++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/lib/GMLIB_API-JS.js b/lib/GMLIB_API-JS.js index 04de1a4..c306641 100644 --- a/lib/GMLIB_API-JS.js +++ b/lib/GMLIB_API-JS.js @@ -105,7 +105,8 @@ const GMLIB_API = { getNameByXuid: ll.import("GMLIB_API", "getNameByXuid"), getXuidByName: ll.import("GMLIB_API", "getXuidByName"), getUuidByName: ll.import("GMLIB_API", "getUuidByName"), - getAllPlayerInfo: ll.import("GMLIB_API", "getAllPlayerInfo") + getAllPlayerInfo: ll.import("GMLIB_API", "getAllPlayerInfo"), + getBlockRuntimeId: ll.import("GMLIB_API", "getBlockRuntimeId") } const FloatingTextList = []; @@ -392,15 +393,19 @@ class Minecraft { } static getPlayerFromUuid(uuid) { - GMLIB_API.getPlayerFromUuid(uuid); + return GMLIB_API.getPlayerFromUuid(uuid); } static getPlayerFromUniqueId(uniqueId) { - GMLIB_API.getPlayerFromUniqueId(uniqueId); + return GMLIB_API.getPlayerFromUniqueId(uniqueId); } static getEntityFromUniqueId(uniqueId) { - GMLIB_API.getFromUniqueId(uniqueId); + return GMLIB_API.getFromUniqueId(uniqueId); + } + + static getBlockRuntimeId(block) { + return GMLIB_API.getBlockRuntimeId(block); } } diff --git a/src/CompatibilityApi.cpp b/src/CompatibilityApi.cpp index 2fa18bc..242bca8 100644 --- a/src/CompatibilityApi.cpp +++ b/src/CompatibilityApi.cpp @@ -539,4 +539,10 @@ void Export_Compatibility_API() { return result; } ); + RemoteCall::exportAs("GMLIB_API", "getBlockRuntimeId", [](std::string blockName) -> uint { + if (auto block = Block::tryGetFromRegistry(blockName)) { + return block->getRuntimeId(); + } + return 0; + }); } \ No newline at end of file