From 477be1d2ebcfcbc2b0768e8c87f0400aa886c497 Mon Sep 17 00:00:00 2001 From: zimuya4153 Date: Sat, 29 Mar 2025 18:23:01 +0800 Subject: [PATCH] fix: fix event api --- src/BinaryStreamApi.cpp | 4 +- src/CompatibilityApi.cpp | 80 ++++++++------- src/Entry.cpp | 2 +- src/EventAPI.cpp | 209 ++++++++++++++++++--------------------- 4 files changed, 139 insertions(+), 156 deletions(-) diff --git a/src/BinaryStreamApi.cpp b/src/BinaryStreamApi.cpp index 31f43d9..57c20e7 100644 --- a/src/BinaryStreamApi.cpp +++ b/src/BinaryStreamApi.cpp @@ -4,7 +4,7 @@ class LegacyScriptBinaryStreamManager { private: - int64 mNextBinaryStreamId = 0; + int64 mNextBinaryStreamId = 0; std::unordered_map> mBinaryStream; public: @@ -15,7 +15,7 @@ public: uint64 copyBinaryStream(uint id) { auto nextId = getNextId(); cretateBinaryStream(nextId); - if(auto bs = getBinaryStream(nextId); bs !=nullptr){ + if (auto bs = getBinaryStream(nextId); bs != nullptr) { getBinaryStream(nextId)->mBuffer = getBinaryStream(id)->mBuffer; } return nextId; diff --git a/src/CompatibilityApi.cpp b/src/CompatibilityApi.cpp index 7951160..b18080a 100644 --- a/src/CompatibilityApi.cpp +++ b/src/CompatibilityApi.cpp @@ -15,18 +15,18 @@ void Export_Compatibility_API() { }); RemoteCall::exportAs("GMLIB_API", "getServerMspt", []() -> double { return GMLevel::getInstance().transform( - [](GMLevel& level) -> double { return level.getServerMspt(); } + [](GMLevel& level) -> double { return level.getServerMspt(); } ).value_or(0.0); }); RemoteCall::exportAs("GMLIB_API", "getServerCurrentTps", []() -> float { - return GMLevel::getInstance() - .transform([](GMLevel& level) -> float { return level.getServerCurrentTps(); }) - .value_or(0.0); + return GMLevel::getInstance().transform( + [](GMLevel& level) -> float { return level.getServerCurrentTps(); } + ).value_or(0.0); }); RemoteCall::exportAs("GMLIB_API", "getServerAverageTps", []() -> double { - return GMLevel::getInstance() - .transform([](GMLevel& level) -> double { return level.getServerAverageTps(); }) - .value_or(0.0); + return GMLevel::getInstance().transform( + [](GMLevel& level) -> double { return level.getServerAverageTps(); } + ).value_or(0.0); }); RemoteCall::exportAs("GMLIB_API", "getAllPlayerUuids", []() -> std::vector { std::vector result; @@ -59,7 +59,7 @@ void Export_Compatibility_API() { GMCompoundTag::writeNbtTags(nbt2, *nbt, tags); return player->setNbt(nbt2); } - return false; + return false; } ); RemoteCall::exportAs("GMLIB_API", "deletePlayerNbt", [](std::string const& uuid) -> bool { @@ -116,7 +116,7 @@ void Export_Compatibility_API() { return false; }); RemoteCall::exportAs("GMLIB_API", "removeFloatingTextFromPlayer", [](uint64 id, Player* pl) -> bool { - if (auto ft = FloatingTextManager::getInstance().get(id); !ft.expired()){ + if (auto ft = FloatingTextManager::getInstance().get(id); !ft.expired()) { ft.lock()->removeFrom((GMPlayer&)*pl); return true; } @@ -143,9 +143,13 @@ void Export_Compatibility_API() { } return false; }); - RemoteCall::exportAs("GMLIB_API", "isVersionMatched", [](std::uint16_t a, std::uint16_t b, std::uint16_t c) -> bool { - return LIB_VERSION >= ll::data::Version(a, b, c, "", ""); - }); + RemoteCall::exportAs( + "GMLIB_API", + "isVersionMatched", + [](std::uint16_t a, std::uint16_t b, std::uint16_t c) -> bool { + return LIB_VERSION >= ll::data::Version(a, b, c, "", ""); + } + ); RemoteCall::exportAs("GMLIB_API", "getVersion_LRCA", []() -> std::string { return LIB_VERSION.to_string(); }); RemoteCall::exportAs("GMLIB_API", "getVersion_GMLIB", []() -> std::string { return GMLIB_VERSION_TO_STRING(GMLIB_VERSION_MAJOR) "." GMLIB_VERSION_TO_STRING(GMLIB_VERSION_MINOR @@ -406,7 +410,7 @@ void Export_Compatibility_API() { std::vector> result; for (auto& player : GMScoreboard::getInstance()->getAllPlayers()) { result.push_back({ - {"Type", "Player" }, + {"Type", "Player" }, {"Uuid", player.getUUID().asString()} }); } @@ -418,7 +422,7 @@ void Export_Compatibility_API() { } for (auto& uniqueId : GMScoreboard::getInstance()->getAllEntities()) { result.push_back({ - {"Type", "Entity" }, + {"Type", "Entity" }, {"UniqueId", std::to_string(uniqueId.rawID)} }); } @@ -440,10 +444,10 @@ void Export_Compatibility_API() { RemoteCall::exportAs("GMLIB_API", "setWorldSpawn", [](std::pair pos) -> bool { if (pos.second != 0) return false; GMLevel::getInstance()->getLevelData().setSpawnPos(pos.first); - auto pkt = SetSpawnPositionPacket(); + auto pkt = SetSpawnPositionPacket(); pkt.mSpawnBlockPos = NetworkBlockPosition(pos.first); pkt.mDimensionType = 0; - pkt.mSpawnPosType = SpawnPositionType::WorldSpawn; + pkt.mSpawnPosType = SpawnPositionType::WorldSpawn; pkt.sendToClients(); return true; }); @@ -483,21 +487,21 @@ void Export_Compatibility_API() { return UserCache::getNameByXuid(xuid).value_or(""); }); RemoteCall::exportAs("GMLIB_API", "getUuidByXuid", [](std::string const& xuid) -> std::string { - return UserCache::getUuidByXuid(xuid) - .transform([](mce::UUID&& uuid) -> std::string { return uuid.asString(); }) - .value_or(""); + return UserCache::getUuidByXuid(xuid).transform( + [](mce::UUID&& uuid) -> std::string { return uuid.asString(); } + ).value_or(""); }); RemoteCall::exportAs("GMLIB_API", "getUuidByName", [](std::string const& name) -> std::string { - return UserCache::getUuidByName(name) - .transform([](mce::UUID&& uuid) -> std::string { return uuid.asString(); }) - .value_or(""); + return UserCache::getUuidByName(name).transform( + [](mce::UUID&& uuid) -> std::string { return uuid.asString(); } + ).value_or(""); }); RemoteCall::exportAs( "GMLIB_API", "getAllPlayerInfo", []() -> std::vector> { std::vector> result; - for (auto entry : UserCache::entries()){ + for (auto entry : UserCache::entries()) { result.push_back({ {"Name", entry.mName }, {"Xuid", entry.mXuid }, @@ -607,22 +611,22 @@ void Export_Compatibility_API() { switch (gameRule.mType) { case GameRule::Type::Bool: result.push_back({ - {"Name", gameRule.mName }, - {"Type", "Bool" }, + {"Name", gameRule.mName }, + {"Type", "Bool" }, {"Value", std::to_string(gameRule.mValue->mUnk29fff1.as())} }); break; case GameRule::Type::Float: result.push_back({ - {"Name", gameRule.mName }, - {"Type", "Float" }, + {"Name", gameRule.mName }, + {"Type", "Float" }, {"Value", std::to_string(gameRule.mValue->mUnk768db5.as())} }); break; case GameRule::Type::Int: result.push_back({ - {"Name", gameRule.mName }, - {"Type", "Int" }, + {"Name", gameRule.mName }, + {"Type", "Int" }, {"Value", std::to_string(gameRule.mValue->mUnk2ab4f3.as())} }); break; @@ -634,7 +638,7 @@ void Export_Compatibility_API() { } ); RemoteCall::exportAs("GMLIB_API", "getEnchantTypeNameFromId", [](size_t id) -> std::string { - if (id < Enchant::mEnchants().size()){ + if (id < Enchant::mEnchants().size()) { return Enchant::mEnchants()[id]->mStringId->getString(); } return ""; @@ -651,9 +655,7 @@ void Export_Compatibility_API() { ); } ); - RemoteCall::exportAs("GMLIB_API", "removeEnchants", [](ItemStack* item) -> void { - item->removeEnchants(); - }); + RemoteCall::exportAs("GMLIB_API", "removeEnchants", [](ItemStack* item) -> void { item->removeEnchants(); }); RemoteCall::exportAs("GMLIB_API", "hasEnchant", [](ItemStack* item, std::string const& typeName) -> bool { return EnchantUtils::hasEnchant(Enchant::mEnchantNameToType()[HashedString(typeName)], *item); }); @@ -694,8 +696,8 @@ void Export_Compatibility_API() { auto nbt = ((GMItemStack*)item)->getNbt(); if (value) { (*nbt)["tags"]["minecraft:keep_on_death"] = true; - }else{ - if (nbt->contains("tags") && (*nbt)["tags"].contains("minecraft:keep_on_death")){ + } else { + if (nbt->contains("tags") && (*nbt)["tags"].contains("minecraft:keep_on_death")) { (*nbt)["tags"].get().erase("minecraft:keep_on_death"); } } @@ -766,7 +768,7 @@ void Export_Compatibility_API() { return entity->getOwnerId().rawID; }); RemoteCall::exportAs("GMLIB_API", "getItemCategoryName", [](ItemStack const* item) -> std::string { - if (auto item2 = item->mItem){ + if (auto item2 = item->mItem) { return item2->buildCategoryDescriptionName(); } return ""; @@ -775,7 +777,7 @@ void Export_Compatibility_API() { return item->getCustomName(); }); RemoteCall::exportAs("GMLIB_API", "getItemEffecName", [](ItemStack const* item) -> std::string { - if (auto item2 = item->mItem){ + if (auto item2 = item->mItem) { return item2->buildEffectDescriptionName(*item); } return ""; @@ -803,7 +805,9 @@ void Export_Compatibility_API() { return magic_enum::enum_name(container->mContainerType).data(); }); RemoteCall::exportAs("GMLIB_API", "hasPlayerNbt", [](std::string const& uuid) -> bool { - return OfflinePlayer::getOfflinePlayer(mce::UUID::fromString(uuid)).transform([&](auto&& player) -> bool { return player.hasNbt(); }).value_or(false); + return OfflinePlayer::getOfflinePlayer(mce::UUID::fromString(uuid)) + .transform([&](auto&& player) -> bool { return player.hasNbt(); }) + .value_or(false); }); RemoteCall::exportAs("GMLIB_API", "getItemMaxCount", [](ItemStack const* item) -> int { return item->getMaxStackSize(); diff --git a/src/Entry.cpp b/src/Entry.cpp index 69929a6..b0d6dc6 100644 --- a/src/Entry.cpp +++ b/src/Entry.cpp @@ -13,7 +13,7 @@ bool LegacyRemoteCallApi::load() { Export_Legacy_GMLib_ServerAPI(); Export_Compatibility_API(); ExportPAPI(); - // Export_Event_API(); + Export_Event_API(); Export_BinaryStream_API(); // Export_Form_API(); auto logger = ll::io::LoggerRegistry::getInstance().getOrCreate(PLUGIN_NAME); diff --git a/src/EventAPI.cpp b/src/EventAPI.cpp index 8e34ed0..d3ae8f6 100644 --- a/src/EventAPI.cpp +++ b/src/EventAPI.cpp @@ -88,10 +88,7 @@ void Export_Event_API() { std::string const& uuid, std::string const& serverXuid, std::string const& clientXuid), - (event.realName(), - event.uuid().asString(), - event.serverAuthXuid(), - event.clientAuthXuid()), + (event.realName(), event.uuid().asString(), event.serverAuthXuid(), event.clientAuthXuid()), if (result) event.disConnectClient(); ); } @@ -116,12 +113,10 @@ void Export_Event_API() { ); } case doHash("gmlib::MobPickupItemBeforeEvent"): { - REGISTER_EVENT_LISTEN( - ila::mc::ActorPickupItemBeforeEvent, - (Actor * mob, Actor * item, bool isCancelled), - (&event.self(), (Actor*)&event.itemActor(), event.isCancelled()), - event.setCancelled(result); - ); + REGISTER_EVENT_LISTEN(ila::mc::ActorPickupItemBeforeEvent, + (Actor * mob, Actor * item, bool isCancelled), + (&event.self(), (Actor*)&event.itemActor(), event.isCancelled()), + event.setCancelled(result);); } case doHash("gmlib::MobPickupItemAfterEvent"): { REGISTER_EVENT_LISTEN( @@ -153,12 +148,10 @@ void Export_Event_API() { ); } case doHash("gmlib::ActorChangeDimensionBeforeEvent"): { - REGISTER_EVENT_LISTEN( - ila::mc::ActorChangeDimensionBeforeEvent, - (Actor * entity, int toDimId, bool isCancelled), - (&event.self(), event.toDimensionId(), event.isCancelled()), - event.setCancelled(result); - ); + REGISTER_EVENT_LISTEN(ila::mc::ActorChangeDimensionBeforeEvent, + (Actor * entity, int toDimId, bool isCancelled), + (&event.self(), event.toDimensionId(), event.isCancelled()), + event.setCancelled(result);); } case doHash("gmlib::ActorChangeDimensionAfterEvent"): { REGISTER_EVENT_LISTEN( @@ -224,37 +217,25 @@ void Export_Event_API() { // ); // } case doHash("gmlib::EndermanTakeBlockBeforeEvent"): { - REGISTER_EVENT_LISTEN( - ila::mc::EndermanTakeBlockBeforeEvent, - (Actor * mob, bool isCancelled), - (&event.self(), event.isCancelled()), - event.setCancelled(result); - ); + REGISTER_EVENT_LISTEN(ila::mc::EndermanTakeBlockBeforeEvent, + (Actor * mob, bool isCancelled), + (&event.self(), event.isCancelled()), + event.setCancelled(result);); } case doHash("gmlib::DragonRespawnBeforeEvent"): { - REGISTER_EVENT_LISTEN( - ila::mc::DragonRespawnBeforeEvent, - (bool isCancelled), - (event.isCancelled()), - event.setCancelled(result); - ); + REGISTER_EVENT_LISTEN(ila::mc::DragonRespawnBeforeEvent, + (bool isCancelled), + (event.isCancelled()), + event.setCancelled(result);); } case doHash("gmlib::DragonRespawnAfterEvent"): { - REGISTER_EVENT_LISTEN( - ila::mc::DragonRespawnAfterEvent, - (Actor * mob), - (&event.self()), - ); + REGISTER_EVENT_LISTEN(ila::mc::DragonRespawnAfterEvent, (Actor * mob), (&event.self()), ); } 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); - ); + 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( @@ -264,12 +245,10 @@ void Export_Event_API() { ); } case doHash("gmlib::SpawnWanderingTraderBeforeEvent"): { - REGISTER_EVENT_LISTEN( - ila::mc::SpawnWanderingTraderBeforeEvent, - (std::pair pos, bool isCancelled), - ({event.pos(), event.blockSource().getDimensionId()}, event.isCancelled()), - event.setCancelled(result); - ); + REGISTER_EVENT_LISTEN(ila::mc::SpawnWanderingTraderBeforeEvent, + (std::pair pos, bool isCancelled), + ({event.pos(), event.blockSource().getDimensionId()}, event.isCancelled()), + event.setCancelled(result);); } case doHash("gmlib::SpawnWanderingTraderAfterEvent"): { REGISTER_EVENT_LISTEN( @@ -278,74 +257,74 @@ void Export_Event_API() { ({event.pos(), event.blockSource().getDimensionId()}), ); } - // case doHash("gmlib::HandleRequestActionBeforeEvent"): { - // // clang-format off - // REGISTER_EVENT_LISTEN( - // GMLIB::Event::PlayerEvent::HandleRequestActionBeforeEvent, - // ( - // Player * player, - // std::string const& actionType, - // int count, - // std::string const& sourceContainerNetId, - // int sourceSlot, - // std::string const& destinationContainerNetId, - // int destinationSlot, - // bool isCancelled - // ), - // ( - // (Player*)&event.self(), - // magic_enum::enum_name(requestAction.mActionType).data(), - // (int)requestAction.mAmount, - // magic_enum::enum_name(requestAction.mSrc->mFullContainerName.mName).data(), - // (int)requestAction.mSrc->mSlot, - // magic_enum::enum_name(requestAction.mDst->mFullContainerName.mName).data(), - // (int)requestAction.mDst->mSlot, - // event.isCancelled() - // ), - // event.setCancelled(result);, - // auto& requestAction = (ItemStackRequestActionTransferBase&)event.getRequestAction(); - // ); - // // clang-format on - // } - // case doHash("gmlib::HandleRequestActionAfterEvent"): { - // // clang-format off - // REGISTER_EVENT_LISTEN( - // GMLIB::Event::PlayerEvent::HandleRequestActionAfterEvent, - // ( - // Player * player, - // std::string const& actionType, - // int count, - // std::string const& sourceContainerNetId, - // int sourceSlot, - // std::string const& destinationContainerNetId, - // int destinationSlot - // ), - // ( - // (Player*)&event.self(), - // magic_enum::enum_name(requestAction.mActionType).data(), - // (int)requestAction.mAmount, - // magic_enum::enum_name(requestAction.mSrc->mFullContainerName.mName).data(), - // (int)requestAction.mSrc->mSlot, - // magic_enum::enum_name(requestAction.mDst->mFullContainerName.mName).data(), - // (int)requestAction.mDst->mSlot - // ), - // , - // auto& requestAction = (ItemStackRequestActionTransferBase&)event.getRequestAction(); - // ); - // // clang-format on - // } - // case doHash("gmlib::ContainerClosePacketSendAfterEvent"): { - // REGISTER_EVENT_LISTEN( - // GMLIB::Event::PacketEvent::ContainerClosePacketSendAfterEvent, - // (Player * player, int containerId, bool serverInitiatedClose, bool), - // (event.getServerNetworkHandler() - // ._getServerPlayer(event.getNetworkIdentifier(), event.getPacket().mClientSubId), - // (int)event.getPacket().mContainerId, - // event.getPacket().mServerInitiatedClose, - // false), - // , - // ); - // } + // case doHash("gmlib::HandleRequestActionBeforeEvent"): { + // // clang-format off + // REGISTER_EVENT_LISTEN( + // GMLIB::Event::PlayerEvent::HandleRequestActionBeforeEvent, + // ( + // Player * player, + // std::string const& actionType, + // int count, + // std::string const& sourceContainerNetId, + // int sourceSlot, + // std::string const& destinationContainerNetId, + // int destinationSlot, + // bool isCancelled + // ), + // ( + // (Player*)&event.self(), + // magic_enum::enum_name(requestAction.mActionType).data(), + // (int)requestAction.mAmount, + // magic_enum::enum_name(requestAction.mSrc->mFullContainerName.mName).data(), + // (int)requestAction.mSrc->mSlot, + // magic_enum::enum_name(requestAction.mDst->mFullContainerName.mName).data(), + // (int)requestAction.mDst->mSlot, + // event.isCancelled() + // ), + // event.setCancelled(result);, + // auto& requestAction = (ItemStackRequestActionTransferBase&)event.getRequestAction(); + // ); + // // clang-format on + // } + // case doHash("gmlib::HandleRequestActionAfterEvent"): { + // // clang-format off + // REGISTER_EVENT_LISTEN( + // GMLIB::Event::PlayerEvent::HandleRequestActionAfterEvent, + // ( + // Player * player, + // std::string const& actionType, + // int count, + // std::string const& sourceContainerNetId, + // int sourceSlot, + // std::string const& destinationContainerNetId, + // int destinationSlot + // ), + // ( + // (Player*)&event.self(), + // magic_enum::enum_name(requestAction.mActionType).data(), + // (int)requestAction.mAmount, + // magic_enum::enum_name(requestAction.mSrc->mFullContainerName.mName).data(), + // (int)requestAction.mSrc->mSlot, + // magic_enum::enum_name(requestAction.mDst->mFullContainerName.mName).data(), + // (int)requestAction.mDst->mSlot + // ), + // , + // auto& requestAction = (ItemStackRequestActionTransferBase&)event.getRequestAction(); + // ); + // // clang-format on + // } + // case doHash("gmlib::ContainerClosePacketSendAfterEvent"): { + // REGISTER_EVENT_LISTEN( + // GMLIB::Event::PacketEvent::ContainerClosePacketSendAfterEvent, + // (Player * player, int containerId, bool serverInitiatedClose, bool), + // (event.getServerNetworkHandler() + // ._getServerPlayer(event.getNetworkIdentifier(), event.getPacket().mClientSubId), + // (int)event.getPacket().mContainerId, + // event.getPacket().mServerInitiatedClose, + // false), + // , + // ); + // } } return -1; }