feat: adapted to GMLIB version and remove some shit

This commit is contained in:
子沐呀
2024-10-22 21:24:16 +08:00
Unverified
parent ac64e23ee7
commit b0a9303e6c
12 changed files with 461 additions and 611 deletions
+17 -17
View File
@@ -63,7 +63,7 @@ void Export_Event_API() {
switch (doHash(eventName)) {
case doHash("onClientLogin"): {
REGISTER_EVENT_LISTEN(
Event::PacketEvent::ClientLoginAfterEvent,
gmlib::event::packet::ClientLoginAfterEvent,
(std::string const& realName,
std::string const& uuid,
std::string const& serverXuid,
@@ -74,7 +74,7 @@ void Export_Event_API() {
}
case doHash("onWeatherChange"): {
REGISTER_EVENT_LISTEN(
Event::LevelEvent::WeatherUpdateBeforeEvent,
gmlib::event::level::WeatherUpdateBeforeEvent,
(int lightningLevel, int rainLevel, int lightningLast, int rainLast),
(ev.getLightningLevel(), ev.getRainLevel(), ev.getLightningLastTick(), ev.getRainingLastTick()),
ev.cancel(),
@@ -82,7 +82,7 @@ void Export_Event_API() {
}
case doHash("onMobPick"): {
REGISTER_EVENT_LISTEN(
Event::EntityEvent::MobPickupItemBeforeEvent,
gmlib::event::entity::MobPickupItemBeforeEvent,
(Actor * mob, Actor * item),
(&ev.self(), (Actor*)&ev.getItemActor()),
ev.cancel(),
@@ -90,7 +90,7 @@ void Export_Event_API() {
}
case doHash("onItemTrySpawn"): {
REGISTER_EVENT_LISTEN(
Event::EntityEvent::ItemActorSpawnBeforeEvent,
gmlib::event::entity::ItemActorSpawnBeforeEvent,
(const ItemStack* item, std::pair<Vec3, int> position, int64 spawnerUniqueId),
(&ev.getItem(),
{ev.getPosition(), ev.getBlockSource().getDimensionId().id},
@@ -100,7 +100,7 @@ void Export_Event_API() {
}
case doHash("onItemSpawned"): {
REGISTER_EVENT_LISTEN(
Event::EntityEvent::ItemActorSpawnAfterEvent,
gmlib::event::entity::ItemActorSpawnAfterEvent,
(const ItemStack* item, Actor* itemActor, std::pair<Vec3, int> position, int64 spawnerUniqueId),
(&ev.getItem(),
(Actor*)&ev.getItemActor(),
@@ -111,7 +111,7 @@ void Export_Event_API() {
}
case doHash("onEntityTryChangeDim"): {
REGISTER_EVENT_LISTEN(
Event::EntityEvent::ActorChangeDimensionBeforeEvent,
gmlib::event::entity::ActorChangeDimensionBeforeEvent,
(Actor * entity, int toDimId),
(&ev.self(), ev.getToDimensionId()),
ev.cancel(),
@@ -119,7 +119,7 @@ void Export_Event_API() {
}
case doHash("onLeaveBed"): {
REGISTER_EVENT_LISTEN(
Event::PlayerEvent::PlayerStopSleepBeforeEvent,
gmlib::event::player::PlayerStopSleepBeforeEvent,
(Player * pl),
(&ev.self()),
ev.cancel(),
@@ -127,7 +127,7 @@ void Export_Event_API() {
}
case doHash("onDeathMessage"): {
REGISTER_EVENT_LISTEN(
Event::EntityEvent::DeathMessageAfterEvent,
gmlib::event::entity::DeathMessageAfterEvent,
(std::string const& message, std::vector<std::string>, Actor* dead),
(ev.getDeathMessage().first, ev.getDeathMessage().second, &ev.self()),
logger.error("Event \"onDeathMessage\" cannot be intercepted"),
@@ -135,7 +135,7 @@ void Export_Event_API() {
}
case doHash("onMobHurted"): {
REGISTER_EVENT_LISTEN(
Event::EntityEvent::MobHurtAfterEvent,
gmlib::event::entity::MobHurtAfterEvent,
(Actor * mob, Actor * source, float damage, int cause),
(&ev.self(), source, ev.getDamage(), (int)damageSource.getCause()),
logger.error("Event \"onMobHurted\" cannot be intercepted"),
@@ -150,7 +150,7 @@ void Export_Event_API() {
}
case doHash("onEndermanTake"): {
REGISTER_EVENT_LISTEN(
Event::EntityEvent::EndermanTakeBlockBeforeEvent,
gmlib::event::entity::EndermanTakeBlockBeforeEvent,
(Actor * mob),
(&ev.self()),
ev.cancel(),
@@ -158,7 +158,7 @@ void Export_Event_API() {
}
case doHash("onEntityChangeDim"): {
REGISTER_EVENT_LISTEN(
Event::EntityEvent::ActorChangeDimensionAfterEvent,
gmlib::event::entity::ActorChangeDimensionAfterEvent,
(Actor * mob, int fromDimId),
(&ev.self(), ev.getFromDimensionId()),
logger.error("Event \"onEntityChangeDim\" cannot be intercepted"),
@@ -166,7 +166,7 @@ void Export_Event_API() {
}
case doHash("onDragonRespawn"): {
REGISTER_EVENT_LISTEN(
Event::EntityEvent::DragonRespawnBeforeEvent,
gmlib::event::entity::DragonRespawnBeforeEvent,
(int64 enderDragonUniqueID),
(ev.getEnderDragon().id),
ev.cancel(),
@@ -174,7 +174,7 @@ void Export_Event_API() {
}
case doHash("onProjectileTryCreate"): {
REGISTER_EVENT_LISTEN(
Event::EntityEvent::ProjectileCreateBeforeEvent,
gmlib::event::entity::ProjectileCreateBeforeEvent,
(Actor * mob, int64 uniqueId),
(&ev.self(), ev.getShooter() ? ev.getShooter()->getOrCreateUniqueID().id : -1),
ev.cancel(),
@@ -182,7 +182,7 @@ void Export_Event_API() {
}
case doHash("onProjectileCreate"): {
REGISTER_EVENT_LISTEN(
Event::EntityEvent::ProjectileCreateAfterEvent,
gmlib::event::entity::ProjectileCreateAfterEvent,
(Actor * mob, int64 uniqueId),
(&ev.self(), ev.getShooter() ? ev.getShooter()->getOrCreateUniqueID().id : -1),
logger.error("Event \"onProjectileCreate\" cannot be intercepted"),
@@ -190,7 +190,7 @@ void Export_Event_API() {
}
case doHash("onSpawnWanderingTrader"): {
REGISTER_EVENT_LISTEN(
Event::EntityEvent::SpawnWanderingTraderBeforeEvent,
gmlib::event::entity::SpawnWanderingTraderBeforeEvent,
(std::pair<BlockPos, int> pos),
({ev.getPos(), ev.getRegion().getDimensionId()}),
ev.cancel(),
@@ -199,7 +199,7 @@ void Export_Event_API() {
case doHash("onHandleRequestAction"): {
// clang-format off
REGISTER_EVENT_LISTEN(
Event::PlayerEvent::HandleRequestActionBeforeEvent,
gmlib::event::player::HandleRequestActionBeforeEvent,
(
Player * player,
std::string const& actionType,
@@ -225,7 +225,7 @@ void Export_Event_API() {
}
case doHash("onSendContainerClosePacket"): {
REGISTER_EVENT_LISTEN(
Event::PacketEvent::ContainerClosePacketSendAfterEvent,
gmlib::event::packet::ContainerClosePacketSendAfterEvent,
(Player * player, int ContainerNetId),
(ev.getServerNetworkHandler()
.getServerPlayer(ev.getNetworkIdentifier(), ev.getPacket().mClientSubId),