Skip to content

Commit 2f025d3

Browse files
ShrBoxShrBox
committed
refactor: split events
1 parent 262c4f2 commit 2f025d3

11 files changed

+1638
-1536
lines changed

‎src/legacy/api/EventAPI.cpp

+47-44
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@
4141
#include "ll/api/event/world/SpawnMobEvent.h"
4242
#include "ll/api/service/Bedrock.h"
4343
#include "lse/Entry.h"
44-
#include "lse/events/EventHooks.h"
44+
#include "lse/events/PlayerEvents.h"
45+
#include "lse/events/EntityEvents.h"
46+
#include "lse/events/BlockEvents.h"
47+
#include "lse/events/OtherEvents.h"
4548
#include "main/Global.h"
4649
#include "mc/common/ActorUniqueID.h"
4750
#include "mc/deps/core/string/HashedString.h"
@@ -196,7 +199,7 @@ void EnableEventListener(int eventId) {
196199
});
197200

198201
case EVENT_TYPES::onChangeDim:
199-
lse::events::PlayerChangeDimensionEvent();
202+
lse::events::player::ChangeDimensionEvent();
200203
break;
201204

202205
case EVENT_TYPES::onPlayerSwing:
@@ -225,7 +228,7 @@ void EnableEventListener(int eventId) {
225228
break;
226229

227230
case EVENT_TYPES::onAttackBlock:
228-
lse::events::PlayerAttackBlockEvent();
231+
lse::events::player::AttackBlockEvent();
229232
break;
230233

231234
case EVENT_TYPES::onPlayerDie:
@@ -254,7 +257,7 @@ void EnableEventListener(int eventId) {
254257
break;
255258

256259
case EVENT_TYPES::onStartDestroyBlock:
257-
lse::events::PlayerStartDestroyBlock();
260+
lse::events::player::StartDestroyBlock();
258261
break;
259262

260263
case EVENT_TYPES::onDestroyBlock:
@@ -331,7 +334,7 @@ void EnableEventListener(int eventId) {
331334
break;
332335

333336
case EVENT_TYPES::onDropItem:
334-
lse::events::PlayerDropItem();
337+
lse::events::player::DropItem();
335338
break;
336339

337340
case EVENT_TYPES::onTakeItem:
@@ -351,15 +354,15 @@ void EnableEventListener(int eventId) {
351354
break;
352355

353356
case EVENT_TYPES::onOpenContainer:
354-
lse::events::PlayerOpenContainerEvent();
357+
lse::events::player::OpenContainerEvent();
355358
break;
356359

357360
case EVENT_TYPES::onCloseContainer:
358-
lse::events::PlayerCloseContainerEvent();
361+
lse::events::player::CloseContainerEvent();
359362
break;
360363

361364
case EVENT_TYPES::onInventoryChange:
362-
lse::events::PlayerChangeSlotEvent();
365+
lse::events::player::ChangeSlotEvent();
363366
break;
364367

365368
case EVENT_TYPES::onUseItem:
@@ -396,18 +399,18 @@ void EnableEventListener(int eventId) {
396399
break;
397400

398401
case EVENT_TYPES::onUseBucketPlace:
399-
lse::events::PlayerUseBucketPlaceEvent();
402+
lse::events::player::UseBucketPlaceEvent();
400403
break;
401404
case EVENT_TYPES::onUseBucketTake:
402-
lse::events::PlayerUseBucketTakeEvent();
405+
lse::events::player::UseBucketTakeEvent();
403406
break;
404407

405408
case EVENT_TYPES::onContainerChange:
406-
lse::events::ContainerChangeEvent();
409+
lse::events::block::ContainerChangeEvent();
407410
break;
408411

409412
case EVENT_TYPES::onChangeArmorStand:
410-
lse::events::ArmorStandSwapItemEvent();
413+
lse::events::block::ArmorStandSwapItemEvent();
411414
break;
412415

413416
case EVENT_TYPES::onChangeSprinting:
@@ -453,11 +456,11 @@ void EnableEventListener(int eventId) {
453456
break;
454457

455458
case EVENT_TYPES::onOpenContainerScreen:
456-
lse::events::PlayerOpenContainerScreenEvent();
459+
lse::events::player::OpenContainerScreenEvent();
457460
break;
458461

459462
case EVENT_TYPES::onSetArmor:
460-
lse::events::PlayerSetArmorEvent();
463+
lse::events::player::SetArmorEvent();
461464
break;
462465

463466
case EVENT_TYPES::onEat:
@@ -481,11 +484,11 @@ void EnableEventListener(int eventId) {
481484
break;
482485

483486
case EVENT_TYPES::onAte:
484-
lse::events::PlayerEatEvent();
487+
lse::events::player::EatEvent();
485488
break;
486489

487490
case EVENT_TYPES::onConsumeTotem:
488-
lse::events::PlayerConsumeTotemEvent();
491+
lse::events::player::ConsumeTotemEvent();
489492
break;
490493

491494
// case EVENT_TYPES::onEffectAdded:
@@ -530,39 +533,39 @@ void EnableEventListener(int eventId) {
530533
// break;
531534

532535
case EVENT_TYPES::onUseRespawnAnchor:
533-
lse::events::PlayerUseRespawnAnchorEvent();
536+
lse::events::player::UseRespawnAnchorEvent();
534537
break;
535538

536539
case EVENT_TYPES::onRide:
537-
lse::events::ActorRideEvent();
540+
lse::events::entity::ActorRideEvent();
538541
break;
539542

540543
case EVENT_TYPES::onEntityExplode:
541-
lse::events::ExplodeEvent();
544+
lse::events::block::ExplodeEvent();
542545
break;
543546

544547
case EVENT_TYPES::onBlockExplode:
545-
lse::events::ExplodeEvent();
548+
lse::events::block::ExplodeEvent();
546549
break;
547550

548551
case EVENT_TYPES::onRespawnAnchorExplode:
549-
lse::events::RespawnAnchorExplodeEvent();
552+
lse::events::block::RespawnAnchorExplodeEvent();
550553
break;
551554

552555
case EVENT_TYPES::onBlockExploded:
553-
lse::events::BlockExplodedEvent();
556+
lse::events::block::BlockExplodedEvent();
554557
break;
555558

556559
case EVENT_TYPES::onCmdBlockExecute:
557-
lse::events::CommandBlockExecuteEvent();
560+
lse::events::block::CommandBlockExecuteEvent();
558561
break;
559562

560563
case EVENT_TYPES::onRedStoneUpdate:
561-
lse::events::RedstoneupdateEvent();
564+
lse::events::block::RedstoneupdateEvent();
562565
break;
563566

564567
case EVENT_TYPES::onWitherBossDestroy:
565-
lse::events::WitherDestroyEvent();
568+
lse::events::entity::WitherDestroyEvent();
566569
break;
567570

568571
case EVENT_TYPES::onMobHurt:
@@ -592,11 +595,11 @@ void EnableEventListener(int eventId) {
592595
}
593596
IF_LISTENED_END(EVENT_TYPES::onMobHurt)
594597
});
595-
lse::events::MobHurtEvent();
598+
lse::events::entity::MobHurtEvent();
596599
break;
597600

598601
case EVENT_TYPES::onStepOnPressurePlate:
599-
lse::events::PressurePlateTriggerEvent();
602+
lse::events::block::PressurePlateTriggerEvent();
600603
break;
601604

602605
case EVENT_TYPES::onMobDie:
@@ -622,15 +625,15 @@ void EnableEventListener(int eventId) {
622625
break;
623626

624627
case EVENT_TYPES::onSpawnProjectile:
625-
lse::events::ProjectileSpawnEvent();
628+
lse::events::entity::ProjectileSpawnEvent();
626629
break;
627630

628631
case EVENT_TYPES::onProjectileCreated:
629-
lse::events::ProjectileCreatedEvent();
632+
lse::events::entity::ProjectileCreatedEvent();
630633
break;
631634

632635
case EVENT_TYPES::onProjectileHitEntity:
633-
lse::events::ProjectileHitEntityEvent();
636+
lse::events::entity::ProjectileHitEntityEvent();
634637
break;
635638

636639
// case EVENT_TYPES::onEntityTransformation:
@@ -646,15 +649,15 @@ void EnableEventListener(int eventId) {
646649
// break;
647650

648651
case EVENT_TYPES::onProjectileHitBlock:
649-
lse::events::ProjectileHitBlockEvent();
652+
lse::events::entity::ProjectileHitBlockEvent();
650653
break;
651654

652655
case EVENT_TYPES::onLiquidFlow:
653-
lse::events::LiquidFlowEvent();
656+
lse::events::block::LiquidFlowEvent();
654657
break;
655658

656659
case EVENT_TYPES::onUseFrameBlock:
657-
lse::events::PlayerUseFrameEvent();
660+
lse::events::player::UseFrameEvent();
658661
break;
659662

660663
case EVENT_TYPES::onBlockInteracted:
@@ -672,23 +675,23 @@ void EnableEventListener(int eventId) {
672675
});
673676

674677
case EVENT_TYPES::onFarmLandDecay:
675-
lse::events::FarmDecayEvent();
678+
lse::events::block::FarmDecayEvent();
676679
break;
677680

678681
case EVENT_TYPES::onPistonTryPush:
679-
lse::events::PistonPushEvent();
682+
lse::events::block::PistonPushEvent();
680683
break;
681684

682685
case EVENT_TYPES::onPistonPush:
683-
lse::events::PistonPushEvent();
686+
lse::events::block::PistonPushEvent();
684687
break;
685688

686689
case EVENT_TYPES::onHopperSearchItem:
687-
lse::events::HopperEvent(true);
690+
lse::events::block::HopperEvent(true);
688691
break;
689692

690693
case EVENT_TYPES::onHopperPushOut:
691-
lse::events::HopperEvent(false);
694+
lse::events::block::HopperEvent(false);
692695
break;
693696

694697
case EVENT_TYPES::onFireSpread:
@@ -719,7 +722,7 @@ void EnableEventListener(int eventId) {
719722
break;
720723

721724
case EVENT_TYPES::onScoreChanged:
722-
lse::events::ScoreChangedEvent();
725+
lse::events::other::ScoreChangedEvent();
723726
break;
724727

725728
case EVENT_TYPES::onMobSpawn:
@@ -782,20 +785,20 @@ void EnableEventListener(int eventId) {
782785
break;
783786

784787
case EVENT_TYPES::onBedEnter:
785-
lse::events::PlayerSleepEvent();
788+
lse::events::player::SleepEvent();
786789
break;
787790

788791
case EVENT_TYPES::onOpenInventory:
789-
lse::events::PlayerOpenInventoryEvent();
792+
lse::events::player::OpenInventoryEvent();
790793
break;
791794
case EVENT_TYPES::onPlayerPullFishingHook:
792-
lse::events::PlayerPullFishingHookEvent();
795+
lse::events::player::PullFishingHookEvent();
793796
break;
794797
case EVENT_TYPES::onPlayerInteractEntity:
795-
lse::events::PlayerInteractEntityEvent();
798+
lse::events::player::InteractEntityEvent();
796799
break;
797800
case EVENT_TYPES::onNpcCmd:
798-
lse::events::NpcCommandEvent();
801+
lse::events::entity::NpcCommandEvent();
799802
break;
800803
default:
801804
break;

0 commit comments

Comments
 (0)