From 376acdd99b7990f78d0fb9c4c6e6cd6859d517a8 Mon Sep 17 00:00:00 2001 From: zimuya4153 Date: Thu, 27 Mar 2025 16:33:18 +0800 Subject: [PATCH] fix: fix GMLIB_API::getBlockTranslateKey api and ProjectileCreate event --- src/CompatibilityApi.cpp | 2 +- src/EventAPI.cpp | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/CompatibilityApi.cpp b/src/CompatibilityApi.cpp index f1b38ea..9f86d3b 100644 --- a/src/CompatibilityApi.cpp +++ b/src/CompatibilityApi.cpp @@ -513,7 +513,7 @@ void Export_Compatibility_API() { .value_or(0); }); RemoteCall::exportAs("GMLIB_API", "getBlockTranslateKey", [](Block const* block) -> std::string { - return block->getLegacyBlock().mDescriptionId; + return block->getLegacyBlock().mDescriptionId + ".name"; }); RemoteCall::exportAs("GMLIB_API", "getItemTranslateKey", [](ItemStack* item) -> std::string { return item->getDescriptionId(); diff --git a/src/EventAPI.cpp b/src/EventAPI.cpp index 54c24d6..8e34ed0 100644 --- a/src/EventAPI.cpp +++ b/src/EventAPI.cpp @@ -246,23 +246,23 @@ void Export_Event_API() { (&event.self()), ); } - // case doHash("gmlib::ProjectileCreateBeforeEvent"): { - // REGISTER_EVENT_LISTEN( - // ila::mc::ProjectileCreateBeforeEvent, - // (Actor * mob, int64 uniqueId, bool isCancelled), - // (&event.self(), - // event.getShooter() ? event.getShooter()->getOrCreateUniqueID().rawID : -1, - // event.isCancelled()), - // event.setCancelled(result); - // ); - // } - // case doHash("gmlib::ProjectileCreateAfterEvent"): { - // REGISTER_EVENT_LISTEN( - // GMLIB::Event::EntityEvent::ProjectileCreateAfterEvent, - // (Actor * mob, int64 uniqueId), - // (&event.self(), event.getShooter() ? event.getShooter()->getOrCreateUniqueID().rawID : -1), - // ); - // } + case doHash("gmlib::ProjectileCreateBeforeEvent"): { + REGISTER_EVENT_LISTEN( + ila::mc::ProjectileCreateBeforeEvent, + (Actor * mob, int64 uniqueId, bool isCancelled), + (&event.self(), + event.self().getOwnerId().rawID, + event.isCancelled()), + event.setCancelled(result); + ); + } + case doHash("gmlib::ProjectileCreateAfterEvent"): { + REGISTER_EVENT_LISTEN( + ila::mc::ProjectileCreateAfterEvent, + (Actor * mob, int64 uniqueId), + (&event.self(), event.self().getOwnerId().rawID), + ); + } case doHash("gmlib::SpawnWanderingTraderBeforeEvent"): { REGISTER_EVENT_LISTEN( ila::mc::SpawnWanderingTraderBeforeEvent,