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

style: fix type mismatch in event listener maps

Browse Source
This commit is contained in:
子沐呀
2024-10-09 19:30:43 +08:00
Unverified
parent 3fdab50a1e
commit 5b1467c8ef
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/EventAPI.cpp
+18 -18
View File
@@ -4,7 +4,7 @@ using namespace ll::hash_utils;
class LegacyScriptEventManager { class LegacyScriptEventManager {
private: private:
int64 mNextEventId = 0; int64 mNextEventId = 0;
std::unordered_map<int64, ll::event::ListenerPtr> mEventListeners; std::unordered_map<uint64, ll::event::ListenerPtr> mEventListeners;
public: public:
std::string getNextEventId() { std::string getNextEventId() {
@@ -47,7 +47,7 @@ public:
if (!result) cancelFunction; \ if (!result) cancelFunction; \
}) \ }) \
); \ ); \
return true return true;
void Export_Event_API() { void Export_Event_API() {
RemoteCall::exportAs("GMLIB_Event_API", "getNextScriptEventId", []() -> std::string { RemoteCall::exportAs("GMLIB_Event_API", "getNextScriptEventId", []() -> std::string {
@@ -70,7 +70,7 @@ void Export_Event_API() {
std::string const& clientXuid), std::string const& clientXuid),
(ev.getRealName(), ev.getUuid().asString(), ev.getServerAuthXuid(), ev.getClientAuthXuid()), (ev.getRealName(), ev.getUuid().asString(), ev.getServerAuthXuid(), ev.getClientAuthXuid()),
logger.error("Event \"onClientLogin\" cannot be intercepted"), logger.error("Event \"onClientLogin\" cannot be intercepted"),
); )
} }
case doHash("onWeatherChange"): { case doHash("onWeatherChange"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(
@@ -78,7 +78,7 @@ void Export_Event_API() {
(int lightningLevel, int rainLevel, int lightningLast, int rainLast), (int lightningLevel, int rainLevel, int lightningLast, int rainLast),
(ev.getLightningLevel(), ev.getRainLevel(), ev.getLightningLastTick(), ev.getRainingLastTick()), (ev.getLightningLevel(), ev.getRainLevel(), ev.getLightningLastTick(), ev.getRainingLastTick()),
ev.cancel(), ev.cancel(),
); )
} }
case doHash("onMobPick"): { case doHash("onMobPick"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(
@@ -86,7 +86,7 @@ void Export_Event_API() {
(Actor * mob, Actor * item), (Actor * mob, Actor * item),
(&ev.self(), (Actor*)&ev.getItemActor()), (&ev.self(), (Actor*)&ev.getItemActor()),
ev.cancel(), ev.cancel(),
); )
} }
case doHash("onItemTrySpawn"): { case doHash("onItemTrySpawn"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(
@@ -96,7 +96,7 @@ void Export_Event_API() {
{ev.getPosition(), ev.getBlockSource().getDimensionId().id}, {ev.getPosition(), ev.getBlockSource().getDimensionId().id},
ev.getSpawner().has_value() ? ev.getSpawner()->getOrCreateUniqueID().id : -1), ev.getSpawner().has_value() ? ev.getSpawner()->getOrCreateUniqueID().id : -1),
ev.cancel(), ev.cancel(),
); )
} }
case doHash("onItemSpawned"): { case doHash("onItemSpawned"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(
@@ -107,7 +107,7 @@ void Export_Event_API() {
{ev.getPosition(), ev.getBlockSource().getDimensionId().id}, {ev.getPosition(), ev.getBlockSource().getDimensionId().id},
ev.getSpawner().has_value() ? ev.getSpawner()->getOrCreateUniqueID().id : -1), ev.getSpawner().has_value() ? ev.getSpawner()->getOrCreateUniqueID().id : -1),
logger.error("Event \"onItemSpawned\" cannot be intercepted"), logger.error("Event \"onItemSpawned\" cannot be intercepted"),
); )
} }
case doHash("onEntityTryChangeDim"): { case doHash("onEntityTryChangeDim"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(
@@ -115,7 +115,7 @@ void Export_Event_API() {
(Actor * entity, int toDimId), (Actor * entity, int toDimId),
(&ev.self(), ev.getToDimensionId()), (&ev.self(), ev.getToDimensionId()),
ev.cancel(), ev.cancel(),
); )
} }
case doHash("onLeaveBed"): { case doHash("onLeaveBed"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(
@@ -123,7 +123,7 @@ void Export_Event_API() {
(Player * pl), (Player * pl),
(&ev.self()), (&ev.self()),
ev.cancel(), ev.cancel(),
); )
} }
case doHash("onDeathMessage"): { case doHash("onDeathMessage"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(
@@ -131,7 +131,7 @@ void Export_Event_API() {
(std::string const& message, std::vector<std::string>, Actor* dead), (std::string const& message, std::vector<std::string>, Actor* dead),
(ev.getDeathMessage().first, ev.getDeathMessage().second, &ev.self()), (ev.getDeathMessage().first, ev.getDeathMessage().second, &ev.self()),
logger.error("Event \"onDeathMessage\" cannot be intercepted"), logger.error("Event \"onDeathMessage\" cannot be intercepted"),
); )
} }
case doHash("onMobHurted"): { case doHash("onMobHurted"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(
@@ -146,7 +146,7 @@ void Export_Event_API() {
source = ll::service::getLevel()->fetchEntity(uniqueId); source = ll::service::getLevel()->fetchEntity(uniqueId);
if (source->getOwner()) source = source->getOwner(); if (source->getOwner()) source = source->getOwner();
} }
); )
} }
case doHash("onEndermanTake"): { case doHash("onEndermanTake"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(
@@ -154,7 +154,7 @@ void Export_Event_API() {
(Actor * mob), (Actor * mob),
(&ev.self()), (&ev.self()),
ev.cancel(), ev.cancel(),
); )
} }
case doHash("onEntityChangeDim"): { case doHash("onEntityChangeDim"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(
@@ -162,7 +162,7 @@ void Export_Event_API() {
(Actor * mob, int fromDimId), (Actor * mob, int fromDimId),
(&ev.self(), ev.getFromDimensionId()), (&ev.self(), ev.getFromDimensionId()),
logger.error("Event \"onEntityChangeDim\" cannot be intercepted"), logger.error("Event \"onEntityChangeDim\" cannot be intercepted"),
); )
} }
case doHash("onDragonRespawn"): { case doHash("onDragonRespawn"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(
@@ -178,7 +178,7 @@ void Export_Event_API() {
(Actor * mob, int64 uniqueId), (Actor * mob, int64 uniqueId),
(&ev.self(), ev.getShooter() ? ev.getShooter()->getOrCreateUniqueID().id : -1), (&ev.self(), ev.getShooter() ? ev.getShooter()->getOrCreateUniqueID().id : -1),
ev.cancel(), ev.cancel(),
); )
} }
case doHash("onProjectileCreate"): { case doHash("onProjectileCreate"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(
@@ -186,7 +186,7 @@ void Export_Event_API() {
(Actor * mob, int64 uniqueId), (Actor * mob, int64 uniqueId),
(&ev.self(), ev.getShooter() ? ev.getShooter()->getOrCreateUniqueID().id : -1), (&ev.self(), ev.getShooter() ? ev.getShooter()->getOrCreateUniqueID().id : -1),
logger.error("Event \"onProjectileCreate\" cannot be intercepted"), logger.error("Event \"onProjectileCreate\" cannot be intercepted"),
); )
} }
case doHash("onSpawnWanderingTrader"): { case doHash("onSpawnWanderingTrader"): {
REGISTER_EVENT_LISTEN( REGISTER_EVENT_LISTEN(
@@ -194,7 +194,7 @@ void Export_Event_API() {
(std::pair<BlockPos, int> pos), (std::pair<BlockPos, int> pos),
({ev.getPos(), ev.getRegion().getDimensionId()}), ({ev.getPos(), ev.getRegion().getDimensionId()}),
ev.cancel(), ev.cancel(),
); )
} }
case doHash("onHandleRequestAction"): { case doHash("onHandleRequestAction"): {
// clang-format off // clang-format off
@@ -220,7 +220,7 @@ void Export_Event_API() {
), ),
ev.cancel(), ev.cancel(),
auto& requestAction = (ItemStackRequestActionTransferBase&)ev.getRequestAction(); auto& requestAction = (ItemStackRequestActionTransferBase&)ev.getRequestAction();
); )
// clang-format on // clang-format on
} }
case doHash("onSendContainerClosePacket"): { case doHash("onSendContainerClosePacket"): {
@@ -239,7 +239,7 @@ void Export_Event_API() {
(), (),
(), (),
logger.error("Event \"onServerStopping\" cannot be intercepted"), logger.error("Event \"onServerStopping\" cannot be intercepted"),
); )
} }
default: default:
return false; return false;