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

fix: fix event api

Browse Source
This commit is contained in:
zimuya4153
2025-03-29 18:23:01 +08:00
Unverified
parent 32487d402d
commit 477be1d2eb
4 changed files with 139 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BinaryStreamApi.cpp
+1 -1
View File
@@ -15,7 +15,7 @@ public:
uint64 copyBinaryStream(uint id) { uint64 copyBinaryStream(uint id) {
auto nextId = getNextId(); auto nextId = getNextId();
cretateBinaryStream(nextId); cretateBinaryStream(nextId);
if(auto bs = getBinaryStream(nextId); bs !=nullptr){ if (auto bs = getBinaryStream(nextId); bs != nullptr) {
getBinaryStream(nextId)->mBuffer = getBinaryStream(id)->mBuffer; getBinaryStream(nextId)->mBuffer = getBinaryStream(id)->mBuffer;
} }
return nextId; return nextId;
src/CompatibilityApi.cpp
+29 -25
View File
@@ -19,14 +19,14 @@ void Export_Compatibility_API() {
).value_or(0.0); ).value_or(0.0);
}); });
RemoteCall::exportAs("GMLIB_API", "getServerCurrentTps", []() -> float { RemoteCall::exportAs("GMLIB_API", "getServerCurrentTps", []() -> float {
return GMLevel::getInstance() return GMLevel::getInstance().transform(
.transform([](GMLevel& level) -> float { return level.getServerCurrentTps(); }) [](GMLevel& level) -> float { return level.getServerCurrentTps(); }
.value_or(0.0); ).value_or(0.0);
}); });
RemoteCall::exportAs("GMLIB_API", "getServerAverageTps", []() -> double { RemoteCall::exportAs("GMLIB_API", "getServerAverageTps", []() -> double {
return GMLevel::getInstance() return GMLevel::getInstance().transform(
.transform([](GMLevel& level) -> double { return level.getServerAverageTps(); }) [](GMLevel& level) -> double { return level.getServerAverageTps(); }
.value_or(0.0); ).value_or(0.0);
}); });
RemoteCall::exportAs("GMLIB_API", "getAllPlayerUuids", []() -> std::vector<std::string> { RemoteCall::exportAs("GMLIB_API", "getAllPlayerUuids", []() -> std::vector<std::string> {
std::vector<std::string> result; std::vector<std::string> result;
@@ -116,7 +116,7 @@ void Export_Compatibility_API() {
return false; return false;
}); });
RemoteCall::exportAs("GMLIB_API", "removeFloatingTextFromPlayer", [](uint64 id, Player* pl) -> bool { 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); ft.lock()->removeFrom((GMPlayer&)*pl);
return true; return true;
} }
@@ -143,9 +143,13 @@ void Export_Compatibility_API() {
} }
return false; return false;
}); });
RemoteCall::exportAs("GMLIB_API", "isVersionMatched", [](std::uint16_t a, std::uint16_t b, std::uint16_t c) -> bool { 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, "", ""); 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_LRCA", []() -> std::string { return LIB_VERSION.to_string(); });
RemoteCall::exportAs("GMLIB_API", "getVersion_GMLIB", []() -> std::string { RemoteCall::exportAs("GMLIB_API", "getVersion_GMLIB", []() -> std::string {
return GMLIB_VERSION_TO_STRING(GMLIB_VERSION_MAJOR) "." GMLIB_VERSION_TO_STRING(GMLIB_VERSION_MINOR return GMLIB_VERSION_TO_STRING(GMLIB_VERSION_MAJOR) "." GMLIB_VERSION_TO_STRING(GMLIB_VERSION_MINOR
@@ -483,21 +487,21 @@ void Export_Compatibility_API() {
return UserCache::getNameByXuid(xuid).value_or(""); return UserCache::getNameByXuid(xuid).value_or("");
}); });
RemoteCall::exportAs("GMLIB_API", "getUuidByXuid", [](std::string const& xuid) -> std::string { RemoteCall::exportAs("GMLIB_API", "getUuidByXuid", [](std::string const& xuid) -> std::string {
return UserCache::getUuidByXuid(xuid) return UserCache::getUuidByXuid(xuid).transform(
.transform([](mce::UUID&& uuid) -> std::string { return uuid.asString(); }) [](mce::UUID&& uuid) -> std::string { return uuid.asString(); }
.value_or(""); ).value_or("");
}); });
RemoteCall::exportAs("GMLIB_API", "getUuidByName", [](std::string const& name) -> std::string { RemoteCall::exportAs("GMLIB_API", "getUuidByName", [](std::string const& name) -> std::string {
return UserCache::getUuidByName(name) return UserCache::getUuidByName(name).transform(
.transform([](mce::UUID&& uuid) -> std::string { return uuid.asString(); }) [](mce::UUID&& uuid) -> std::string { return uuid.asString(); }
.value_or(""); ).value_or("");
}); });
RemoteCall::exportAs( RemoteCall::exportAs(
"GMLIB_API", "GMLIB_API",
"getAllPlayerInfo", "getAllPlayerInfo",
[]() -> std::vector<std::unordered_map<std::string, std::string>> { []() -> std::vector<std::unordered_map<std::string, std::string>> {
std::vector<std::unordered_map<std::string, std::string>> result; std::vector<std::unordered_map<std::string, std::string>> result;
for (auto entry : UserCache::entries()){ for (auto entry : UserCache::entries()) {
result.push_back({ result.push_back({
{"Name", entry.mName }, {"Name", entry.mName },
{"Xuid", entry.mXuid }, {"Xuid", entry.mXuid },
@@ -634,7 +638,7 @@ void Export_Compatibility_API() {
} }
); );
RemoteCall::exportAs("GMLIB_API", "getEnchantTypeNameFromId", [](size_t id) -> std::string { 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 Enchant::mEnchants()[id]->mStringId->getString();
} }
return ""; return "";
@@ -651,9 +655,7 @@ void Export_Compatibility_API() {
); );
} }
); );
RemoteCall::exportAs("GMLIB_API", "removeEnchants", [](ItemStack* item) -> void { RemoteCall::exportAs("GMLIB_API", "removeEnchants", [](ItemStack* item) -> void { item->removeEnchants(); });
item->removeEnchants();
});
RemoteCall::exportAs("GMLIB_API", "hasEnchant", [](ItemStack* item, std::string const& typeName) -> bool { RemoteCall::exportAs("GMLIB_API", "hasEnchant", [](ItemStack* item, std::string const& typeName) -> bool {
return EnchantUtils::hasEnchant(Enchant::mEnchantNameToType()[HashedString(typeName)], *item); return EnchantUtils::hasEnchant(Enchant::mEnchantNameToType()[HashedString(typeName)], *item);
}); });
@@ -694,8 +696,8 @@ void Export_Compatibility_API() {
auto nbt = ((GMItemStack*)item)->getNbt(); auto nbt = ((GMItemStack*)item)->getNbt();
if (value) { if (value) {
(*nbt)["tags"]["minecraft:keep_on_death"] = true; (*nbt)["tags"]["minecraft:keep_on_death"] = true;
}else{ } else {
if (nbt->contains("tags") && (*nbt)["tags"].contains("minecraft:keep_on_death")){ if (nbt->contains("tags") && (*nbt)["tags"].contains("minecraft:keep_on_death")) {
(*nbt)["tags"].get<CompoundTag>().erase("minecraft:keep_on_death"); (*nbt)["tags"].get<CompoundTag>().erase("minecraft:keep_on_death");
} }
} }
@@ -766,7 +768,7 @@ void Export_Compatibility_API() {
return entity->getOwnerId().rawID; return entity->getOwnerId().rawID;
}); });
RemoteCall::exportAs("GMLIB_API", "getItemCategoryName", [](ItemStack const* item) -> std::string { RemoteCall::exportAs("GMLIB_API", "getItemCategoryName", [](ItemStack const* item) -> std::string {
if (auto item2 = item->mItem){ if (auto item2 = item->mItem) {
return item2->buildCategoryDescriptionName(); return item2->buildCategoryDescriptionName();
} }
return ""; return "";
@@ -775,7 +777,7 @@ void Export_Compatibility_API() {
return item->getCustomName(); return item->getCustomName();
}); });
RemoteCall::exportAs("GMLIB_API", "getItemEffecName", [](ItemStack const* item) -> std::string { 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 item2->buildEffectDescriptionName(*item);
} }
return ""; return "";
@@ -803,7 +805,9 @@ void Export_Compatibility_API() {
return magic_enum::enum_name(container->mContainerType).data(); return magic_enum::enum_name(container->mContainerType).data();
}); });
RemoteCall::exportAs("GMLIB_API", "hasPlayerNbt", [](std::string const& uuid) -> bool { 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 { RemoteCall::exportAs("GMLIB_API", "getItemMaxCount", [](ItemStack const* item) -> int {
return item->getMaxStackSize(); return item->getMaxStackSize();
src/Entry.cpp
+1 -1
View File
@@ -13,7 +13,7 @@ bool LegacyRemoteCallApi::load() {
Export_Legacy_GMLib_ServerAPI(); Export_Legacy_GMLib_ServerAPI();
Export_Compatibility_API(); Export_Compatibility_API();
ExportPAPI(); ExportPAPI();
// Export_Event_API(); Export_Event_API();
Export_BinaryStream_API(); Export_BinaryStream_API();
// Export_Form_API(); // Export_Form_API();
auto logger = ll::io::LoggerRegistry::getInstance().getOrCreate(PLUGIN_NAME); auto logger = ll::io::LoggerRegistry::getInstance().getOrCreate(PLUGIN_NAME);
src/EventAPI.cpp
+15 -36
View File
@@ -88,10 +88,7 @@ void Export_Event_API() {
std::string const& uuid, std::string const& uuid,
std::string const& serverXuid, std::string const& serverXuid,
std::string const& clientXuid), std::string const& clientXuid),
(event.realName(), (event.realName(), event.uuid().asString(), event.serverAuthXuid(), event.clientAuthXuid()),
event.uuid().asString(),
event.serverAuthXuid(),
event.clientAuthXuid()),
if (result) event.disConnectClient(); if (result) event.disConnectClient();
); );
} }
@@ -116,12 +113,10 @@ void Export_Event_API() {
); );
} }
case doHash("gmlib::MobPickupItemBeforeEvent"): { case doHash("gmlib::MobPickupItemBeforeEvent"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(ila::mc::ActorPickupItemBeforeEvent,
ila::mc::ActorPickupItemBeforeEvent,
(Actor * mob, Actor * item, bool isCancelled), (Actor * mob, Actor * item, bool isCancelled),
(&event.self(), (Actor*)&event.itemActor(), event.isCancelled()), (&event.self(), (Actor*)&event.itemActor(), event.isCancelled()),
event.setCancelled(result); event.setCancelled(result););
);
} }
case doHash("gmlib::MobPickupItemAfterEvent"): { case doHash("gmlib::MobPickupItemAfterEvent"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(
@@ -153,12 +148,10 @@ void Export_Event_API() {
); );
} }
case doHash("gmlib::ActorChangeDimensionBeforeEvent"): { case doHash("gmlib::ActorChangeDimensionBeforeEvent"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(ila::mc::ActorChangeDimensionBeforeEvent,
ila::mc::ActorChangeDimensionBeforeEvent,
(Actor * entity, int toDimId, bool isCancelled), (Actor * entity, int toDimId, bool isCancelled),
(&event.self(), event.toDimensionId(), event.isCancelled()), (&event.self(), event.toDimensionId(), event.isCancelled()),
event.setCancelled(result); event.setCancelled(result););
);
} }
case doHash("gmlib::ActorChangeDimensionAfterEvent"): { case doHash("gmlib::ActorChangeDimensionAfterEvent"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(
@@ -224,37 +217,25 @@ void Export_Event_API() {
// ); // );
// } // }
case doHash("gmlib::EndermanTakeBlockBeforeEvent"): { case doHash("gmlib::EndermanTakeBlockBeforeEvent"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(ila::mc::EndermanTakeBlockBeforeEvent,
ila::mc::EndermanTakeBlockBeforeEvent,
(Actor * mob, bool isCancelled), (Actor * mob, bool isCancelled),
(&event.self(), event.isCancelled()), (&event.self(), event.isCancelled()),
event.setCancelled(result); event.setCancelled(result););
);
} }
case doHash("gmlib::DragonRespawnBeforeEvent"): { case doHash("gmlib::DragonRespawnBeforeEvent"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(ila::mc::DragonRespawnBeforeEvent,
ila::mc::DragonRespawnBeforeEvent,
(bool isCancelled), (bool isCancelled),
(event.isCancelled()), (event.isCancelled()),
event.setCancelled(result); event.setCancelled(result););
);
} }
case doHash("gmlib::DragonRespawnAfterEvent"): { case doHash("gmlib::DragonRespawnAfterEvent"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(ila::mc::DragonRespawnAfterEvent, (Actor * mob), (&event.self()), );
ila::mc::DragonRespawnAfterEvent,
(Actor * mob),
(&event.self()),
);
} }
case doHash("gmlib::ProjectileCreateBeforeEvent"): { case doHash("gmlib::ProjectileCreateBeforeEvent"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(ila::mc::ProjectileCreateBeforeEvent,
ila::mc::ProjectileCreateBeforeEvent,
(Actor * mob, int64 uniqueId, bool isCancelled), (Actor * mob, int64 uniqueId, bool isCancelled),
(&event.self(), (&event.self(), event.self().getOwnerId().rawID, event.isCancelled()),
event.self().getOwnerId().rawID, event.setCancelled(result););
event.isCancelled()),
event.setCancelled(result);
);
} }
case doHash("gmlib::ProjectileCreateAfterEvent"): { case doHash("gmlib::ProjectileCreateAfterEvent"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(
@@ -264,12 +245,10 @@ void Export_Event_API() {
); );
} }
case doHash("gmlib::SpawnWanderingTraderBeforeEvent"): { case doHash("gmlib::SpawnWanderingTraderBeforeEvent"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(ila::mc::SpawnWanderingTraderBeforeEvent,
ila::mc::SpawnWanderingTraderBeforeEvent,
(std::pair<BlockPos, int> pos, bool isCancelled), (std::pair<BlockPos, int> pos, bool isCancelled),
({event.pos(), event.blockSource().getDimensionId()}, event.isCancelled()), ({event.pos(), event.blockSource().getDimensionId()}, event.isCancelled()),
event.setCancelled(result); event.setCancelled(result););
);
} }
case doHash("gmlib::SpawnWanderingTraderAfterEvent"): { case doHash("gmlib::SpawnWanderingTraderAfterEvent"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(