From 2d8474282b5fec6b377831188fc5ada9954dbba3 Mon Sep 17 00:00:00 2001 From: TheMode Date: Wed, 2 Jun 2021 08:17:03 +0200 Subject: [PATCH] Made Event an interface --- .../java/net/minestom/server/event/CancellableEvent.java | 2 +- src/main/java/net/minestom/server/event/Event.java | 4 ++-- .../java/net/minestom/server/event/EventListener.java | 4 ++++ .../java/net/minestom/server/event/InstanceEvent.java | 2 +- .../java/net/minestom/server/event/InventoryEvent.java | 2 +- .../minestom/server/event/entity/EntityAttackEvent.java | 3 +-- .../minestom/server/event/entity/EntityDamageEvent.java | 3 +-- .../minestom/server/event/entity/EntityDeathEvent.java | 3 +-- .../net/minestom/server/event/entity/EntityFireEvent.java | 3 +-- .../server/event/entity/EntityItemMergeEvent.java | 3 +-- .../server/event/entity/EntityPotionAddEvent.java | 3 +-- .../server/event/entity/EntityPotionRemoveEvent.java | 3 +-- .../minestom/server/event/entity/EntityShootEvent.java | 3 +-- .../minestom/server/event/entity/EntitySpawnEvent.java | 3 +-- .../net/minestom/server/event/entity/EntityTickEvent.java | 3 +-- .../minestom/server/event/entity/EntityVelocityEvent.java | 3 +-- .../net/minestom/server/event/item/EntityEquipEvent.java | 2 +- .../net/minestom/server/event/item/ItemDropEvent.java | 2 +- .../minestom/server/event/item/ItemUpdateStateEvent.java | 2 +- .../minestom/server/event/item/PickupExperienceEvent.java | 2 +- .../net/minestom/server/event/item/PickupItemEvent.java | 2 +- .../minestom/server/event/player/AdvancementTabEvent.java | 2 +- .../server/event/player/AsyncPlayerPreLoginEvent.java | 2 +- .../server/event/player/PlayerBlockBreakEvent.java | 2 +- .../server/event/player/PlayerBlockInteractEvent.java | 2 +- .../server/event/player/PlayerBlockPlaceEvent.java | 2 +- .../server/event/player/PlayerChangeHeldSlotEvent.java | 2 +- .../net/minestom/server/event/player/PlayerChatEvent.java | 2 +- .../server/event/player/PlayerChunkLoadEvent.java | 2 +- .../server/event/player/PlayerChunkUnloadEvent.java | 2 +- .../minestom/server/event/player/PlayerCommandEvent.java | 2 +- .../minestom/server/event/player/PlayerDeathEvent.java | 2 +- .../server/event/player/PlayerDisconnectEvent.java | 2 +- .../net/minestom/server/event/player/PlayerEatEvent.java | 2 +- .../server/event/player/PlayerEntityInteractEvent.java | 2 +- .../server/event/player/PlayerHandAnimationEvent.java | 2 +- .../server/event/player/PlayerItemAnimationEvent.java | 2 +- .../minestom/server/event/player/PlayerLoginEvent.java | 2 +- .../net/minestom/server/event/player/PlayerMoveEvent.java | 2 +- .../server/event/player/PlayerPluginMessageEvent.java | 2 +- .../minestom/server/event/player/PlayerPreEatEvent.java | 2 +- .../event/player/PlayerResourcePackStatusEvent.java | 2 +- .../minestom/server/event/player/PlayerRespawnEvent.java | 2 +- .../server/event/player/PlayerSettingsChangeEvent.java | 2 +- .../minestom/server/event/player/PlayerSkinInitEvent.java | 2 +- .../minestom/server/event/player/PlayerSpawnEvent.java | 2 +- .../server/event/player/PlayerStartDiggingEvent.java | 2 +- .../server/event/player/PlayerStartFlyingEvent.java | 2 +- .../event/player/PlayerStartFlyingWithElytraEvent.java | 2 +- .../server/event/player/PlayerStartSneakingEvent.java | 2 +- .../server/event/player/PlayerStartSprintingEvent.java | 2 +- .../server/event/player/PlayerStopFlyingEvent.java | 2 +- .../event/player/PlayerStopFlyingWithElytraEvent.java | 2 +- .../server/event/player/PlayerStopSneakingEvent.java | 2 +- .../server/event/player/PlayerStopSprintingEvent.java | 2 +- .../minestom/server/event/player/PlayerSwapItemEvent.java | 2 +- .../net/minestom/server/event/player/PlayerTickEvent.java | 3 +-- .../minestom/server/event/player/PlayerUseItemEvent.java | 2 +- .../server/event/player/PlayerUseItemOnBlockEvent.java | 2 +- .../minestom/server/event/player/UpdateTagListEvent.java | 2 +- .../minestom/server/event/server/ServerListPingEvent.java | 7 +++---- .../java/net/minestom/server/event/trait/EventTrait.java | 4 +++- .../minestom/server/extras/query/event/QueryEvent.java | 7 +++---- src/test/java/demo/PlayerInit.java | 8 ++++++++ 64 files changed, 81 insertions(+), 81 deletions(-) diff --git a/src/main/java/net/minestom/server/event/CancellableEvent.java b/src/main/java/net/minestom/server/event/CancellableEvent.java index e04d9ea5b..8ae37b32b 100644 --- a/src/main/java/net/minestom/server/event/CancellableEvent.java +++ b/src/main/java/net/minestom/server/event/CancellableEvent.java @@ -3,7 +3,7 @@ package net.minestom.server.event; /** * Represents an {@link Event} which can be cancelled. */ -public interface CancellableEvent { +public interface CancellableEvent extends Event{ /** * Gets if the {@link Event} should be cancelled or not. diff --git a/src/main/java/net/minestom/server/event/Event.java b/src/main/java/net/minestom/server/event/Event.java index 047a6980e..6253a2cd4 100644 --- a/src/main/java/net/minestom/server/event/Event.java +++ b/src/main/java/net/minestom/server/event/Event.java @@ -3,9 +3,9 @@ package net.minestom.server.event; import net.minestom.server.event.handler.EventHandler; /** - * Object which can be listened to by an {@link EventHandler}. + * Event which can be listened to by an {@link EventHandler}. *

* Called using {@link EventHandler#callEvent(Class, Event)}. */ -public class Event { +public interface Event { } diff --git a/src/main/java/net/minestom/server/event/EventListener.java b/src/main/java/net/minestom/server/event/EventListener.java index b19b80d24..2c5379802 100644 --- a/src/main/java/net/minestom/server/event/EventListener.java +++ b/src/main/java/net/minestom/server/event/EventListener.java @@ -21,6 +21,10 @@ public class EventListener implements ListenerAttach { this.combined = combined; } + public static EventListener.Builder of(Class eventType) { + return new EventListener.Builder<>(eventType); + } + @Override public void attachTo(@NotNull EventHandler handler) { final boolean success = this.attach.add(handler); diff --git a/src/main/java/net/minestom/server/event/InstanceEvent.java b/src/main/java/net/minestom/server/event/InstanceEvent.java index fc7ba05da..d6348c345 100644 --- a/src/main/java/net/minestom/server/event/InstanceEvent.java +++ b/src/main/java/net/minestom/server/event/InstanceEvent.java @@ -3,7 +3,7 @@ package net.minestom.server.event; import net.minestom.server.instance.Instance; import org.jetbrains.annotations.NotNull; -public class InstanceEvent extends Event { +public class InstanceEvent implements Event { protected final Instance instance; diff --git a/src/main/java/net/minestom/server/event/InventoryEvent.java b/src/main/java/net/minestom/server/event/InventoryEvent.java index ada529220..58d4db57c 100644 --- a/src/main/java/net/minestom/server/event/InventoryEvent.java +++ b/src/main/java/net/minestom/server/event/InventoryEvent.java @@ -3,7 +3,7 @@ package net.minestom.server.event; import net.minestom.server.inventory.Inventory; import org.jetbrains.annotations.Nullable; -public class InventoryEvent extends Event { +public class InventoryEvent implements Event { protected Inventory inventory; diff --git a/src/main/java/net/minestom/server/event/entity/EntityAttackEvent.java b/src/main/java/net/minestom/server/event/entity/EntityAttackEvent.java index 4c0f89b58..b56323bfe 100644 --- a/src/main/java/net/minestom/server/event/entity/EntityAttackEvent.java +++ b/src/main/java/net/minestom/server/event/entity/EntityAttackEvent.java @@ -1,7 +1,6 @@ package net.minestom.server.event.entity; import net.minestom.server.entity.Entity; -import net.minestom.server.event.Event; import net.minestom.server.event.trait.EntityEvent; import org.jetbrains.annotations.NotNull; @@ -9,7 +8,7 @@ import org.jetbrains.annotations.NotNull; * Called when a player does a left click on an entity or with * {@link net.minestom.server.entity.EntityCreature#attack(Entity)}. */ -public class EntityAttackEvent extends Event implements EntityEvent { +public class EntityAttackEvent implements EntityEvent { private final Entity entity; private final Entity target; diff --git a/src/main/java/net/minestom/server/event/entity/EntityDamageEvent.java b/src/main/java/net/minestom/server/event/entity/EntityDamageEvent.java index a7b9ec8df..9caaeae2a 100644 --- a/src/main/java/net/minestom/server/event/entity/EntityDamageEvent.java +++ b/src/main/java/net/minestom/server/event/entity/EntityDamageEvent.java @@ -4,14 +4,13 @@ import net.minestom.server.entity.Entity; import net.minestom.server.entity.LivingEntity; import net.minestom.server.entity.damage.DamageType; import net.minestom.server.event.CancellableEvent; -import net.minestom.server.event.Event; import net.minestom.server.event.trait.EntityEvent; import org.jetbrains.annotations.NotNull; /** * Called with {@link LivingEntity#damage(DamageType, float)}. */ -public class EntityDamageEvent extends Event implements EntityEvent, CancellableEvent { +public class EntityDamageEvent implements EntityEvent, CancellableEvent { private final Entity entity; private final DamageType damageType; diff --git a/src/main/java/net/minestom/server/event/entity/EntityDeathEvent.java b/src/main/java/net/minestom/server/event/entity/EntityDeathEvent.java index 2e5a26e29..875a84dea 100644 --- a/src/main/java/net/minestom/server/event/entity/EntityDeathEvent.java +++ b/src/main/java/net/minestom/server/event/entity/EntityDeathEvent.java @@ -1,11 +1,10 @@ package net.minestom.server.event.entity; import net.minestom.server.entity.Entity; -import net.minestom.server.event.Event; import net.minestom.server.event.trait.EntityEvent; import org.jetbrains.annotations.NotNull; -public class EntityDeathEvent extends Event implements EntityEvent { +public class EntityDeathEvent implements EntityEvent { // TODO cause private final Entity entity; diff --git a/src/main/java/net/minestom/server/event/entity/EntityFireEvent.java b/src/main/java/net/minestom/server/event/entity/EntityFireEvent.java index 8ade431aa..656b6ea6c 100644 --- a/src/main/java/net/minestom/server/event/entity/EntityFireEvent.java +++ b/src/main/java/net/minestom/server/event/entity/EntityFireEvent.java @@ -2,12 +2,11 @@ package net.minestom.server.event.entity; import net.minestom.server.entity.Entity; import net.minestom.server.event.CancellableEvent; -import net.minestom.server.event.Event; import net.minestom.server.event.trait.EntityEvent; import net.minestom.server.utils.time.TimeUnit; import org.jetbrains.annotations.NotNull; -public class EntityFireEvent extends Event implements EntityEvent, CancellableEvent { +public class EntityFireEvent implements EntityEvent, CancellableEvent { private final Entity entity; private int duration; diff --git a/src/main/java/net/minestom/server/event/entity/EntityItemMergeEvent.java b/src/main/java/net/minestom/server/event/entity/EntityItemMergeEvent.java index 3e151a06b..9520d2e26 100644 --- a/src/main/java/net/minestom/server/event/entity/EntityItemMergeEvent.java +++ b/src/main/java/net/minestom/server/event/entity/EntityItemMergeEvent.java @@ -3,7 +3,6 @@ package net.minestom.server.event.entity; import net.minestom.server.entity.Entity; import net.minestom.server.entity.ItemEntity; import net.minestom.server.event.CancellableEvent; -import net.minestom.server.event.Event; import net.minestom.server.event.trait.EntityEvent; import net.minestom.server.item.ItemStack; import org.jetbrains.annotations.NotNull; @@ -11,7 +10,7 @@ import org.jetbrains.annotations.NotNull; /** * Called when two {@link ItemEntity} are merging their {@link ItemStack} together to form a sole entity. */ -public class EntityItemMergeEvent extends Event implements EntityEvent, CancellableEvent { +public class EntityItemMergeEvent implements EntityEvent, CancellableEvent { private Entity entity; private final ItemEntity merged; diff --git a/src/main/java/net/minestom/server/event/entity/EntityPotionAddEvent.java b/src/main/java/net/minestom/server/event/entity/EntityPotionAddEvent.java index 7f1290027..ee5517b21 100644 --- a/src/main/java/net/minestom/server/event/entity/EntityPotionAddEvent.java +++ b/src/main/java/net/minestom/server/event/entity/EntityPotionAddEvent.java @@ -1,12 +1,11 @@ package net.minestom.server.event.entity; import net.minestom.server.entity.Entity; -import net.minestom.server.event.Event; import net.minestom.server.event.trait.EntityEvent; import net.minestom.server.potion.Potion; import org.jetbrains.annotations.NotNull; -public class EntityPotionAddEvent extends Event implements EntityEvent { +public class EntityPotionAddEvent implements EntityEvent { private final Entity entity; private final Potion potion; diff --git a/src/main/java/net/minestom/server/event/entity/EntityPotionRemoveEvent.java b/src/main/java/net/minestom/server/event/entity/EntityPotionRemoveEvent.java index 0e1ee1552..e320cf4be 100644 --- a/src/main/java/net/minestom/server/event/entity/EntityPotionRemoveEvent.java +++ b/src/main/java/net/minestom/server/event/entity/EntityPotionRemoveEvent.java @@ -1,12 +1,11 @@ package net.minestom.server.event.entity; import net.minestom.server.entity.Entity; -import net.minestom.server.event.Event; import net.minestom.server.event.trait.EntityEvent; import net.minestom.server.potion.Potion; import org.jetbrains.annotations.NotNull; -public class EntityPotionRemoveEvent extends Event implements EntityEvent { +public class EntityPotionRemoveEvent implements EntityEvent { private final Entity entity; private final Potion potion; diff --git a/src/main/java/net/minestom/server/event/entity/EntityShootEvent.java b/src/main/java/net/minestom/server/event/entity/EntityShootEvent.java index db5a229df..4da755082 100644 --- a/src/main/java/net/minestom/server/event/entity/EntityShootEvent.java +++ b/src/main/java/net/minestom/server/event/entity/EntityShootEvent.java @@ -2,7 +2,6 @@ package net.minestom.server.event.entity; import net.minestom.server.entity.Entity; import net.minestom.server.event.CancellableEvent; -import net.minestom.server.event.Event; import net.minestom.server.event.trait.EntityEvent; import net.minestom.server.utils.Position; import org.jetbrains.annotations.NotNull; @@ -10,7 +9,7 @@ import org.jetbrains.annotations.NotNull; /** * Called with {@link net.minestom.server.entity.type.projectile.EntityProjectile#shoot(Position, double, double)} */ -public class EntityShootEvent extends Event implements EntityEvent, CancellableEvent { +public class EntityShootEvent implements EntityEvent, CancellableEvent { private final Entity entity; private final Entity projectile; diff --git a/src/main/java/net/minestom/server/event/entity/EntitySpawnEvent.java b/src/main/java/net/minestom/server/event/entity/EntitySpawnEvent.java index 4c8643135..1fa94e1b3 100644 --- a/src/main/java/net/minestom/server/event/entity/EntitySpawnEvent.java +++ b/src/main/java/net/minestom/server/event/entity/EntitySpawnEvent.java @@ -1,7 +1,6 @@ package net.minestom.server.event.entity; import net.minestom.server.entity.Entity; -import net.minestom.server.event.Event; import net.minestom.server.event.trait.EntityEvent; import net.minestom.server.instance.Instance; import org.jetbrains.annotations.NotNull; @@ -9,7 +8,7 @@ import org.jetbrains.annotations.NotNull; /** * Called when a new instance is set for an entity. */ -public class EntitySpawnEvent extends Event implements EntityEvent { +public class EntitySpawnEvent implements EntityEvent { private final Entity entity; private final Instance spawnInstance; diff --git a/src/main/java/net/minestom/server/event/entity/EntityTickEvent.java b/src/main/java/net/minestom/server/event/entity/EntityTickEvent.java index fc7c0c9cf..7ab2eb97b 100644 --- a/src/main/java/net/minestom/server/event/entity/EntityTickEvent.java +++ b/src/main/java/net/minestom/server/event/entity/EntityTickEvent.java @@ -1,7 +1,6 @@ package net.minestom.server.event.entity; import net.minestom.server.entity.Entity; -import net.minestom.server.event.Event; import net.minestom.server.event.trait.EntityEvent; import org.jetbrains.annotations.NotNull; @@ -9,7 +8,7 @@ import org.jetbrains.annotations.NotNull; * Called when an entity ticks itself. * Same event instance used for all tick events for the same entity. */ -public class EntityTickEvent extends Event implements EntityEvent { +public class EntityTickEvent implements EntityEvent { private final Entity entity; diff --git a/src/main/java/net/minestom/server/event/entity/EntityVelocityEvent.java b/src/main/java/net/minestom/server/event/entity/EntityVelocityEvent.java index 877b5cf85..58835077a 100644 --- a/src/main/java/net/minestom/server/event/entity/EntityVelocityEvent.java +++ b/src/main/java/net/minestom/server/event/entity/EntityVelocityEvent.java @@ -2,7 +2,6 @@ package net.minestom.server.event.entity; import net.minestom.server.entity.Entity; import net.minestom.server.event.CancellableEvent; -import net.minestom.server.event.Event; import net.minestom.server.event.trait.EntityEvent; import net.minestom.server.utils.Vector; import org.jetbrains.annotations.NotNull; @@ -10,7 +9,7 @@ import org.jetbrains.annotations.NotNull; /** * Called when a velocity is applied to an entity using {@link Entity#setVelocity(Vector)}. */ -public class EntityVelocityEvent extends Event implements EntityEvent, CancellableEvent { +public class EntityVelocityEvent implements EntityEvent, CancellableEvent { private final Entity entity; private Vector velocity; diff --git a/src/main/java/net/minestom/server/event/item/EntityEquipEvent.java b/src/main/java/net/minestom/server/event/item/EntityEquipEvent.java index 501273eaf..281dd3019 100644 --- a/src/main/java/net/minestom/server/event/item/EntityEquipEvent.java +++ b/src/main/java/net/minestom/server/event/item/EntityEquipEvent.java @@ -6,7 +6,7 @@ import net.minestom.server.event.Event; import net.minestom.server.item.ItemStack; import org.jetbrains.annotations.NotNull; -public class EntityEquipEvent extends Event { +public class EntityEquipEvent implements Event { private final Entity entity; private ItemStack equippedItem; diff --git a/src/main/java/net/minestom/server/event/item/ItemDropEvent.java b/src/main/java/net/minestom/server/event/item/ItemDropEvent.java index 4ec4591ab..14ef70248 100644 --- a/src/main/java/net/minestom/server/event/item/ItemDropEvent.java +++ b/src/main/java/net/minestom/server/event/item/ItemDropEvent.java @@ -6,7 +6,7 @@ import net.minestom.server.event.Event; import net.minestom.server.item.ItemStack; import org.jetbrains.annotations.NotNull; -public class ItemDropEvent extends Event implements CancellableEvent { +public class ItemDropEvent implements CancellableEvent { private final Player player; private final ItemStack itemStack; diff --git a/src/main/java/net/minestom/server/event/item/ItemUpdateStateEvent.java b/src/main/java/net/minestom/server/event/item/ItemUpdateStateEvent.java index 201602499..b08a67c18 100644 --- a/src/main/java/net/minestom/server/event/item/ItemUpdateStateEvent.java +++ b/src/main/java/net/minestom/server/event/item/ItemUpdateStateEvent.java @@ -5,7 +5,7 @@ import net.minestom.server.event.Event; import net.minestom.server.item.ItemStack; import org.jetbrains.annotations.NotNull; -public class ItemUpdateStateEvent extends Event { +public class ItemUpdateStateEvent implements Event { private final Player player; private final Player.Hand hand; diff --git a/src/main/java/net/minestom/server/event/item/PickupExperienceEvent.java b/src/main/java/net/minestom/server/event/item/PickupExperienceEvent.java index a1fa19188..dea63b993 100644 --- a/src/main/java/net/minestom/server/event/item/PickupExperienceEvent.java +++ b/src/main/java/net/minestom/server/event/item/PickupExperienceEvent.java @@ -5,7 +5,7 @@ import net.minestom.server.event.CancellableEvent; import net.minestom.server.event.Event; import org.jetbrains.annotations.NotNull; -public class PickupExperienceEvent extends Event implements CancellableEvent { +public class PickupExperienceEvent implements CancellableEvent { private final ExperienceOrb experienceOrb; private short experienceCount; diff --git a/src/main/java/net/minestom/server/event/item/PickupItemEvent.java b/src/main/java/net/minestom/server/event/item/PickupItemEvent.java index 04347c412..e2f150748 100644 --- a/src/main/java/net/minestom/server/event/item/PickupItemEvent.java +++ b/src/main/java/net/minestom/server/event/item/PickupItemEvent.java @@ -7,7 +7,7 @@ import net.minestom.server.event.Event; import net.minestom.server.item.ItemStack; import org.jetbrains.annotations.NotNull; -public class PickupItemEvent extends Event implements CancellableEvent { +public class PickupItemEvent implements CancellableEvent { private final LivingEntity livingEntity; private final ItemEntity itemEntity; diff --git a/src/main/java/net/minestom/server/event/player/AdvancementTabEvent.java b/src/main/java/net/minestom/server/event/player/AdvancementTabEvent.java index 33d40c021..8eea66777 100644 --- a/src/main/java/net/minestom/server/event/player/AdvancementTabEvent.java +++ b/src/main/java/net/minestom/server/event/player/AdvancementTabEvent.java @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; * Called when a {@link Player} opens the advancement screens or switch the tab * and when he closes the screen. */ -public class AdvancementTabEvent extends Event implements PlayerEvent { +public class AdvancementTabEvent implements PlayerEvent { private final Player player; private final AdvancementAction action; diff --git a/src/main/java/net/minestom/server/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/net/minestom/server/event/player/AsyncPlayerPreLoginEvent.java index 35363bf70..3b67b438d 100644 --- a/src/main/java/net/minestom/server/event/player/AsyncPlayerPreLoginEvent.java +++ b/src/main/java/net/minestom/server/event/player/AsyncPlayerPreLoginEvent.java @@ -11,7 +11,7 @@ import java.util.UUID; * Called before the player initialization, it can be used to kick the player before any connection * or to change his final username/uuid. */ -public class AsyncPlayerPreLoginEvent extends Event implements PlayerEvent { +public class AsyncPlayerPreLoginEvent implements PlayerEvent { private final Player player; private String username; diff --git a/src/main/java/net/minestom/server/event/player/PlayerBlockBreakEvent.java b/src/main/java/net/minestom/server/event/player/PlayerBlockBreakEvent.java index 2d89352fc..60d55afad 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerBlockBreakEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerBlockBreakEvent.java @@ -12,7 +12,7 @@ import net.minestom.server.utils.validate.Check; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public class PlayerBlockBreakEvent extends Event implements PlayerEvent, CancellableEvent { +public class PlayerBlockBreakEvent implements PlayerEvent, CancellableEvent { private static final BlockManager BLOCK_MANAGER = MinecraftServer.getBlockManager(); diff --git a/src/main/java/net/minestom/server/event/player/PlayerBlockInteractEvent.java b/src/main/java/net/minestom/server/event/player/PlayerBlockInteractEvent.java index a9fc6a365..a05f998fa 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerBlockInteractEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerBlockInteractEvent.java @@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull; * Called when a player interacts with a block (right-click). * This is also called when a block is placed. */ -public class PlayerBlockInteractEvent extends Event implements PlayerEvent, CancellableEvent { +public class PlayerBlockInteractEvent implements PlayerEvent, CancellableEvent { private final Player player; private final BlockPosition blockPosition; diff --git a/src/main/java/net/minestom/server/event/player/PlayerBlockPlaceEvent.java b/src/main/java/net/minestom/server/event/player/PlayerBlockPlaceEvent.java index 0e462dabb..448333f2c 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerBlockPlaceEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerBlockPlaceEvent.java @@ -17,7 +17,7 @@ import org.jetbrains.annotations.Nullable; /** * Called when a player tries placing a block. */ -public class PlayerBlockPlaceEvent extends Event implements PlayerEvent, CancellableEvent { +public class PlayerBlockPlaceEvent implements PlayerEvent, CancellableEvent { private static final BlockManager BLOCK_MANAGER = MinecraftServer.getBlockManager(); diff --git a/src/main/java/net/minestom/server/event/player/PlayerChangeHeldSlotEvent.java b/src/main/java/net/minestom/server/event/player/PlayerChangeHeldSlotEvent.java index b452f094c..facfd773a 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerChangeHeldSlotEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerChangeHeldSlotEvent.java @@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull; /** * Called when a player change his held slot (by pressing 1-9 keys). */ -public class PlayerChangeHeldSlotEvent extends Event implements PlayerEvent, CancellableEvent { +public class PlayerChangeHeldSlotEvent implements PlayerEvent, CancellableEvent { private final Player player; private byte slot; diff --git a/src/main/java/net/minestom/server/event/player/PlayerChatEvent.java b/src/main/java/net/minestom/server/event/player/PlayerChatEvent.java index 223c34158..8aa80e465 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerChatEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerChatEvent.java @@ -18,7 +18,7 @@ import java.util.function.Supplier; * Called every time a {@link Player} write and send something in the chat. * The event can be cancelled to do not send anything, and the format can be changed. */ -public class PlayerChatEvent extends Event implements PlayerEvent, CancellableEvent { +public class PlayerChatEvent implements PlayerEvent, CancellableEvent { private final Player player; private final Collection recipients; diff --git a/src/main/java/net/minestom/server/event/player/PlayerChunkLoadEvent.java b/src/main/java/net/minestom/server/event/player/PlayerChunkLoadEvent.java index d4317324c..ff3c66851 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerChunkLoadEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerChunkLoadEvent.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull; /** * Called when a player receive a new chunk data. */ -public class PlayerChunkLoadEvent extends Event implements PlayerEvent { +public class PlayerChunkLoadEvent implements PlayerEvent { private final Player player; private final int chunkX, chunkZ; diff --git a/src/main/java/net/minestom/server/event/player/PlayerChunkUnloadEvent.java b/src/main/java/net/minestom/server/event/player/PlayerChunkUnloadEvent.java index e2b79f751..5a11e9d95 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerChunkUnloadEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerChunkUnloadEvent.java @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; *

* Could be used to unload the chunk internally in order to save memory. */ -public class PlayerChunkUnloadEvent extends Event implements PlayerEvent { +public class PlayerChunkUnloadEvent implements PlayerEvent { private final Player player; private final int chunkX, chunkZ; diff --git a/src/main/java/net/minestom/server/event/player/PlayerCommandEvent.java b/src/main/java/net/minestom/server/event/player/PlayerCommandEvent.java index a1507bc85..f63079a73 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerCommandEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerCommandEvent.java @@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull; /** * Called every time a player send a message starting by '/'. */ -public class PlayerCommandEvent extends Event implements PlayerEvent, CancellableEvent { +public class PlayerCommandEvent implements PlayerEvent, CancellableEvent { private final Player player; private String command; diff --git a/src/main/java/net/minestom/server/event/player/PlayerDeathEvent.java b/src/main/java/net/minestom/server/event/player/PlayerDeathEvent.java index 34ab1abf4..c1d06195f 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerDeathEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerDeathEvent.java @@ -11,7 +11,7 @@ import org.jetbrains.annotations.Nullable; /** * Called when a player die in {@link Player#kill()}. */ -public class PlayerDeathEvent extends Event implements PlayerEvent { +public class PlayerDeathEvent implements PlayerEvent { private final Player player; private Component deathText; diff --git a/src/main/java/net/minestom/server/event/player/PlayerDisconnectEvent.java b/src/main/java/net/minestom/server/event/player/PlayerDisconnectEvent.java index fdfb5123c..acfe4898d 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerDisconnectEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerDisconnectEvent.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull; /** * Called when a player disconnect. */ -public class PlayerDisconnectEvent extends Event implements PlayerEvent { +public class PlayerDisconnectEvent implements PlayerEvent { private final Player player; diff --git a/src/main/java/net/minestom/server/event/player/PlayerEatEvent.java b/src/main/java/net/minestom/server/event/player/PlayerEatEvent.java index 28ead0f54..9983a4159 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerEatEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerEatEvent.java @@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull; /** * Called when a player is finished eating. */ -public class PlayerEatEvent extends Event implements PlayerEvent { +public class PlayerEatEvent implements PlayerEvent { private final Player player; private final ItemStack foodItem; diff --git a/src/main/java/net/minestom/server/event/player/PlayerEntityInteractEvent.java b/src/main/java/net/minestom/server/event/player/PlayerEntityInteractEvent.java index 2b41ac1ba..a3f4f3c44 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerEntityInteractEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerEntityInteractEvent.java @@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull; /** * Called when a {@link Player} interacts (right-click) with an {@link Entity}. */ -public class PlayerEntityInteractEvent extends Event implements PlayerEvent { +public class PlayerEntityInteractEvent implements PlayerEvent { private final Player player; private final Entity entityTarget; diff --git a/src/main/java/net/minestom/server/event/player/PlayerHandAnimationEvent.java b/src/main/java/net/minestom/server/event/player/PlayerHandAnimationEvent.java index 735ba6232..af0538a38 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerHandAnimationEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerHandAnimationEvent.java @@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull; /** * Called when the player swings his hand. */ -public class PlayerHandAnimationEvent extends Event implements PlayerEvent, CancellableEvent { +public class PlayerHandAnimationEvent implements PlayerEvent, CancellableEvent { private final Player player; private final Player.Hand hand; diff --git a/src/main/java/net/minestom/server/event/player/PlayerItemAnimationEvent.java b/src/main/java/net/minestom/server/event/player/PlayerItemAnimationEvent.java index 8f8cfb4f0..c6e223c73 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerItemAnimationEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerItemAnimationEvent.java @@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull; * * @see ItemAnimationType */ -public class PlayerItemAnimationEvent extends Event implements PlayerEvent, CancellableEvent { +public class PlayerItemAnimationEvent implements PlayerEvent, CancellableEvent { private final Player player; private final ItemAnimationType armAnimationType; diff --git a/src/main/java/net/minestom/server/event/player/PlayerLoginEvent.java b/src/main/java/net/minestom/server/event/player/PlayerLoginEvent.java index e55e1fb64..7de2e246d 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerLoginEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerLoginEvent.java @@ -17,7 +17,7 @@ import org.jetbrains.annotations.Nullable; *

* WARNING: defining the spawning instance is MANDATORY. */ -public class PlayerLoginEvent extends Event implements PlayerEvent { +public class PlayerLoginEvent implements PlayerEvent { private final Player player; private Instance spawningInstance; diff --git a/src/main/java/net/minestom/server/event/player/PlayerMoveEvent.java b/src/main/java/net/minestom/server/event/player/PlayerMoveEvent.java index 1bd8e0ee6..36a8d942f 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerMoveEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerMoveEvent.java @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; /** * Called when a player is modifying his position. */ -public class PlayerMoveEvent extends Event implements PlayerEvent, CancellableEvent { +public class PlayerMoveEvent implements PlayerEvent, CancellableEvent { private final Player player; private Position newPosition; diff --git a/src/main/java/net/minestom/server/event/player/PlayerPluginMessageEvent.java b/src/main/java/net/minestom/server/event/player/PlayerPluginMessageEvent.java index c72fff956..297829653 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerPluginMessageEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerPluginMessageEvent.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull; /** * Called when a player send {@link net.minestom.server.network.packet.client.play.ClientPluginMessagePacket}. */ -public class PlayerPluginMessageEvent extends Event implements PlayerEvent { +public class PlayerPluginMessageEvent implements PlayerEvent { private final Player player; private final String identifier; diff --git a/src/main/java/net/minestom/server/event/player/PlayerPreEatEvent.java b/src/main/java/net/minestom/server/event/player/PlayerPreEatEvent.java index 69fb087d9..9fd8ff8cf 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerPreEatEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerPreEatEvent.java @@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull; * or to cancel its processing, cancelling the event means that the player will * continue the animation indefinitely. */ -public class PlayerPreEatEvent extends Event implements PlayerEvent, CancellableEvent { +public class PlayerPreEatEvent implements PlayerEvent, CancellableEvent { private final Player player; private final ItemStack foodItem; diff --git a/src/main/java/net/minestom/server/event/player/PlayerResourcePackStatusEvent.java b/src/main/java/net/minestom/server/event/player/PlayerResourcePackStatusEvent.java index a2f516598..f9d00430e 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerResourcePackStatusEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerResourcePackStatusEvent.java @@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull; /** * Called when a player warns the server of a resource pack status. */ -public class PlayerResourcePackStatusEvent extends Event implements PlayerEvent { +public class PlayerResourcePackStatusEvent implements PlayerEvent { private final Player player; private final ResourcePackStatus status; diff --git a/src/main/java/net/minestom/server/event/player/PlayerRespawnEvent.java b/src/main/java/net/minestom/server/event/player/PlayerRespawnEvent.java index f7d4e9200..a064e0efb 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerRespawnEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerRespawnEvent.java @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; * Called when {@link Player#respawn()} is executed (for custom respawn or as a result of * {@link net.minestom.server.network.packet.client.play.ClientStatusPacket} */ -public class PlayerRespawnEvent extends Event implements PlayerEvent { +public class PlayerRespawnEvent implements PlayerEvent { private final Player player; private Position respawnPosition; diff --git a/src/main/java/net/minestom/server/event/player/PlayerSettingsChangeEvent.java b/src/main/java/net/minestom/server/event/player/PlayerSettingsChangeEvent.java index fdb4f3d94..18cb592ac 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerSettingsChangeEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerSettingsChangeEvent.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull; /** * Called after the player signals the server that his settings has been modified. */ -public class PlayerSettingsChangeEvent extends Event implements PlayerEvent { +public class PlayerSettingsChangeEvent implements PlayerEvent { private final Player player; diff --git a/src/main/java/net/minestom/server/event/player/PlayerSkinInitEvent.java b/src/main/java/net/minestom/server/event/player/PlayerSkinInitEvent.java index 0a1fb2ec6..0104d3dac 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerSkinInitEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerSkinInitEvent.java @@ -10,7 +10,7 @@ import org.jetbrains.annotations.Nullable; /** * Called at the player connection to initialize his skin. */ -public class PlayerSkinInitEvent extends Event implements PlayerEvent { +public class PlayerSkinInitEvent implements PlayerEvent { private final Player player; private PlayerSkin skin; diff --git a/src/main/java/net/minestom/server/event/player/PlayerSpawnEvent.java b/src/main/java/net/minestom/server/event/player/PlayerSpawnEvent.java index 6ed7c53b2..e975dc55a 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerSpawnEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerSpawnEvent.java @@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull; /** * Called when a new instance is set for a player. */ -public class PlayerSpawnEvent extends Event implements PlayerEvent { +public class PlayerSpawnEvent implements PlayerEvent { private final Player player; private final Instance spawnInstance; diff --git a/src/main/java/net/minestom/server/event/player/PlayerStartDiggingEvent.java b/src/main/java/net/minestom/server/event/player/PlayerStartDiggingEvent.java index 21a245937..4fe149a2c 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerStartDiggingEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerStartDiggingEvent.java @@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull; * (could be because of high latency or a modified client) so cancelling {@link PlayerBlockBreakEvent} is also necessary. * Could be fixed in future Minestom version. */ -public class PlayerStartDiggingEvent extends Event implements PlayerEvent, CancellableEvent { +public class PlayerStartDiggingEvent implements PlayerEvent, CancellableEvent { private final Player player; private final BlockPosition blockPosition; diff --git a/src/main/java/net/minestom/server/event/player/PlayerStartFlyingEvent.java b/src/main/java/net/minestom/server/event/player/PlayerStartFlyingEvent.java index be8c94a02..5ab26e589 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerStartFlyingEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerStartFlyingEvent.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull; /** * Called when a player start flying. */ -public class PlayerStartFlyingEvent extends Event implements PlayerEvent { +public class PlayerStartFlyingEvent implements PlayerEvent { private final Player player; diff --git a/src/main/java/net/minestom/server/event/player/PlayerStartFlyingWithElytraEvent.java b/src/main/java/net/minestom/server/event/player/PlayerStartFlyingWithElytraEvent.java index 8d35e9afb..9b29bd1c2 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerStartFlyingWithElytraEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerStartFlyingWithElytraEvent.java @@ -5,7 +5,7 @@ import net.minestom.server.event.Event; import net.minestom.server.event.trait.PlayerEvent; import org.jetbrains.annotations.NotNull; -public class PlayerStartFlyingWithElytraEvent extends Event implements PlayerEvent { +public class PlayerStartFlyingWithElytraEvent implements PlayerEvent { private final Player player; diff --git a/src/main/java/net/minestom/server/event/player/PlayerStartSneakingEvent.java b/src/main/java/net/minestom/server/event/player/PlayerStartSneakingEvent.java index 8e73326be..2e2c334ec 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerStartSneakingEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerStartSneakingEvent.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull; /** * Called when a player starts sneaking. */ -public class PlayerStartSneakingEvent extends Event implements PlayerEvent { +public class PlayerStartSneakingEvent implements PlayerEvent { private final Player player; diff --git a/src/main/java/net/minestom/server/event/player/PlayerStartSprintingEvent.java b/src/main/java/net/minestom/server/event/player/PlayerStartSprintingEvent.java index 273f4c22a..0f5e27ccd 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerStartSprintingEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerStartSprintingEvent.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull; /** * Called when a player starts sprinting. */ -public class PlayerStartSprintingEvent extends Event implements PlayerEvent { +public class PlayerStartSprintingEvent implements PlayerEvent { private final Player player; diff --git a/src/main/java/net/minestom/server/event/player/PlayerStopFlyingEvent.java b/src/main/java/net/minestom/server/event/player/PlayerStopFlyingEvent.java index 2b541e042..c2b8f449d 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerStopFlyingEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerStopFlyingEvent.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull; /** * Called when a player stop flying. */ -public class PlayerStopFlyingEvent extends Event implements PlayerEvent { +public class PlayerStopFlyingEvent implements PlayerEvent { private final Player player; diff --git a/src/main/java/net/minestom/server/event/player/PlayerStopFlyingWithElytraEvent.java b/src/main/java/net/minestom/server/event/player/PlayerStopFlyingWithElytraEvent.java index 320d7b2ad..d0715943a 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerStopFlyingWithElytraEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerStopFlyingWithElytraEvent.java @@ -5,7 +5,7 @@ import net.minestom.server.event.Event; import net.minestom.server.event.trait.PlayerEvent; import org.jetbrains.annotations.NotNull; -public class PlayerStopFlyingWithElytraEvent extends Event implements PlayerEvent { +public class PlayerStopFlyingWithElytraEvent implements PlayerEvent { private final Player player; diff --git a/src/main/java/net/minestom/server/event/player/PlayerStopSneakingEvent.java b/src/main/java/net/minestom/server/event/player/PlayerStopSneakingEvent.java index d51200aba..47c461ed3 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerStopSneakingEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerStopSneakingEvent.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull; /** * Called when a player stops sneaking. */ -public class PlayerStopSneakingEvent extends Event implements PlayerEvent { +public class PlayerStopSneakingEvent implements PlayerEvent { private final Player player; diff --git a/src/main/java/net/minestom/server/event/player/PlayerStopSprintingEvent.java b/src/main/java/net/minestom/server/event/player/PlayerStopSprintingEvent.java index 72e1eca23..6e1e05b26 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerStopSprintingEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerStopSprintingEvent.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull; /** * Called when a player stops sprinting. */ -public class PlayerStopSprintingEvent extends Event implements PlayerEvent { +public class PlayerStopSprintingEvent implements PlayerEvent { private final Player player; diff --git a/src/main/java/net/minestom/server/event/player/PlayerSwapItemEvent.java b/src/main/java/net/minestom/server/event/player/PlayerSwapItemEvent.java index 824ac5791..c1533801b 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerSwapItemEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerSwapItemEvent.java @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; /** * Called when a player is trying to swap his main and off hand item. */ -public class PlayerSwapItemEvent extends Event implements PlayerEvent, CancellableEvent { +public class PlayerSwapItemEvent implements PlayerEvent, CancellableEvent { private final Player player; private ItemStack mainHandItem; diff --git a/src/main/java/net/minestom/server/event/player/PlayerTickEvent.java b/src/main/java/net/minestom/server/event/player/PlayerTickEvent.java index 92e62c94b..57472ba7a 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerTickEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerTickEvent.java @@ -1,14 +1,13 @@ package net.minestom.server.event.player; import net.minestom.server.entity.Player; -import net.minestom.server.event.Event; import net.minestom.server.event.trait.PlayerEvent; import org.jetbrains.annotations.NotNull; /** * Called at each player tick. */ -public class PlayerTickEvent extends Event implements PlayerEvent { +public class PlayerTickEvent implements PlayerEvent { private final Player player; diff --git a/src/main/java/net/minestom/server/event/player/PlayerUseItemEvent.java b/src/main/java/net/minestom/server/event/player/PlayerUseItemEvent.java index 95404ca84..54108d29f 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerUseItemEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerUseItemEvent.java @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; /** * Event when an item is used without clicking on a block. */ -public class PlayerUseItemEvent extends Event implements PlayerEvent, CancellableEvent { +public class PlayerUseItemEvent implements PlayerEvent, CancellableEvent { private final Player player; private final Player.Hand hand; diff --git a/src/main/java/net/minestom/server/event/player/PlayerUseItemOnBlockEvent.java b/src/main/java/net/minestom/server/event/player/PlayerUseItemOnBlockEvent.java index 41345e6cd..b329a5b76 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerUseItemOnBlockEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerUseItemOnBlockEvent.java @@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull; /** * Used when a player is clicking on a block with an item (but is not a block in item form). */ -public class PlayerUseItemOnBlockEvent extends Event implements PlayerEvent { +public class PlayerUseItemOnBlockEvent implements PlayerEvent { private final Player player; private final Player.Hand hand; diff --git a/src/main/java/net/minestom/server/event/player/UpdateTagListEvent.java b/src/main/java/net/minestom/server/event/player/UpdateTagListEvent.java index a68777609..38ddedf7e 100644 --- a/src/main/java/net/minestom/server/event/player/UpdateTagListEvent.java +++ b/src/main/java/net/minestom/server/event/player/UpdateTagListEvent.java @@ -4,7 +4,7 @@ import net.minestom.server.event.Event; import net.minestom.server.network.packet.server.play.TagsPacket; import org.jetbrains.annotations.NotNull; -public class UpdateTagListEvent extends Event { +public class UpdateTagListEvent implements Event { private TagsPacket packet; diff --git a/src/main/java/net/minestom/server/event/server/ServerListPingEvent.java b/src/main/java/net/minestom/server/event/server/ServerListPingEvent.java index bc5f81f54..ab9551152 100644 --- a/src/main/java/net/minestom/server/event/server/ServerListPingEvent.java +++ b/src/main/java/net/minestom/server/event/server/ServerListPingEvent.java @@ -2,7 +2,6 @@ package net.minestom.server.event.server; import net.minestom.server.MinecraftServer; import net.minestom.server.event.CancellableEvent; -import net.minestom.server.event.Event; import net.minestom.server.network.player.PlayerConnection; import net.minestom.server.ping.ResponseData; import net.minestom.server.ping.ResponseDataConsumer; @@ -16,7 +15,7 @@ import java.util.Objects; * Called when a {@link PlayerConnection} sends a status packet, * usually to display information on the server list. */ -public class ServerListPingEvent extends Event implements CancellableEvent { +public class ServerListPingEvent implements CancellableEvent { private final PlayerConnection connection; private final ServerListPingType type; @@ -36,7 +35,7 @@ public class ServerListPingEvent extends Event implements CancellableEvent { * Creates a new server list ping event. * * @param connection the player connection, if the ping type is modern - * @param type the ping type to respond with + * @param type the ping type to respond with */ public ServerListPingEvent(@Nullable PlayerConnection connection, @NotNull ServerListPingType type) { //noinspection deprecation we need to continue doing this until the consumer is removed - todo remove @@ -86,7 +85,7 @@ public class ServerListPingEvent extends Event implements CancellableEvent { * @return the ping type */ public @NotNull ServerListPingType getPingType() { - return type; + return type; } @Override diff --git a/src/main/java/net/minestom/server/event/trait/EventTrait.java b/src/main/java/net/minestom/server/event/trait/EventTrait.java index ad07db749..1b5732094 100644 --- a/src/main/java/net/minestom/server/event/trait/EventTrait.java +++ b/src/main/java/net/minestom/server/event/trait/EventTrait.java @@ -1,4 +1,6 @@ package net.minestom.server.event.trait; -public interface EventTrait { +import net.minestom.server.event.Event; + +public interface EventTrait extends Event { } diff --git a/src/main/java/net/minestom/server/extras/query/event/QueryEvent.java b/src/main/java/net/minestom/server/extras/query/event/QueryEvent.java index d8365c1ba..88569c687 100644 --- a/src/main/java/net/minestom/server/extras/query/event/QueryEvent.java +++ b/src/main/java/net/minestom/server/extras/query/event/QueryEvent.java @@ -1,7 +1,6 @@ package net.minestom.server.extras.query.event; import net.minestom.server.event.CancellableEvent; -import net.minestom.server.event.Event; import net.minestom.server.utils.binary.Writeable; import org.jetbrains.annotations.NotNull; @@ -13,7 +12,7 @@ import java.util.Objects; * * @param the type of the response */ -public abstract class QueryEvent extends Event implements CancellableEvent { +public abstract class QueryEvent implements CancellableEvent { private final SocketAddress sender; private final int sessionID; @@ -23,9 +22,9 @@ public abstract class QueryEvent extends Event implements C /** * Creates a new query event. * - * @param sender the sender + * @param sender the sender * @param sessionID the session ID of the query sender - * @param response the initial response + * @param response the initial response */ public QueryEvent(@NotNull SocketAddress sender, int sessionID, @NotNull T response) { this.sender = sender; diff --git a/src/test/java/demo/PlayerInit.java b/src/test/java/demo/PlayerInit.java index 529d14f86..eb511aafc 100644 --- a/src/test/java/demo/PlayerInit.java +++ b/src/test/java/demo/PlayerInit.java @@ -11,11 +11,14 @@ import net.minestom.server.entity.GameMode; import net.minestom.server.entity.ItemEntity; import net.minestom.server.entity.Player; import net.minestom.server.entity.damage.DamageType; +import net.minestom.server.event.EventListener; +import net.minestom.server.event.EventNode; import net.minestom.server.event.GlobalEventHandler; import net.minestom.server.event.entity.EntityAttackEvent; import net.minestom.server.event.item.ItemDropEvent; import net.minestom.server.event.item.PickupItemEvent; import net.minestom.server.event.player.*; +import net.minestom.server.event.trait.PlayerEvent; import net.minestom.server.instance.Chunk; import net.minestom.server.instance.Instance; import net.minestom.server.instance.InstanceContainer; @@ -134,6 +137,11 @@ public class PlayerInit { // EVENT REGISTERING + var node = EventNode.create(PlayerEvent.class); + node.addListener(EventListener.of(PlayerTickEvent.class) + .handler(playerTickEvent -> System.out.println("Player tick!")) + .build()); + GlobalEventHandler globalEventHandler = MinecraftServer.getGlobalEventHandler(); globalEventHandler.addEventCallback(EntityAttackEvent.class, event -> { final Entity source = event.getEntity();