Delete EventTrait

src/main/java/net/minestom/server/event/EventNode.java

@@ -1,31 +1,30 @@
 package net.minestom.server.event;
 
 import net.minestom.server.event.handler.EventHandler;
-import net.minestom.server.event.trait.EventTrait;
 
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
-public class EventNode<T extends EventTrait> {
+public class EventNode<T extends Event> {
 
     private EventNode() {
     }
 
-    public static EventNode<?> create() {
+    public static EventNode<Event> create() {
-        return null;
-    }
-
-    public static <T extends EventTrait, E> EventNode<T> conditional(Class<T> eventType,
-                                                                     Class<E> handlerType,
-                                                                     Predicate<E> predicate) {
         return new EventNode<>();
     }
 
-    public static <T extends EventTrait> EventNode<T> conditional(Class<T> eventType) {
+    public static <T extends Event, E> EventNode<T> conditional(Class<T> eventType,
+                                                                Class<E> handlerType,
+                                                                Predicate<E> predicate) {
         return new EventNode<>();
     }
 
-    public static <T extends EventTrait> EventNode<T> unique(Class<T> eventType, EventHandler handler) {
+    public static <T extends Event> EventNode<T> conditional(Class<T> eventType) {
+        return new EventNode<>();
+    }
+
+    public static <T extends Event> EventNode<T> unique(Class<T> eventType, EventHandler handler) {
         return new EventNode<>();
     }
 

src/main/java/net/minestom/server/event/trait/EntityEvent.java

@@ -1,9 +1,10 @@
 package net.minestom.server.event.trait;
 
 import net.minestom.server.entity.Entity;
+import net.minestom.server.event.Event;
 import org.jetbrains.annotations.NotNull;
 
-public interface EntityEvent extends EventTrait {
+public interface EntityEvent extends Event {
 
     /**
      * Gets the entity of this event.

src/main/java/net/minestom/server/event/trait/EventTrait.java

@@ -1,6 +0,0 @@
-package net.minestom.server.event.trait;
-
-import net.minestom.server.event.Event;
-
-public interface EventTrait extends Event {
-}

src/main/java/net/minestom/server/event/trait/ItemEvent.java

@@ -1,8 +1,9 @@
 package net.minestom.server.event.trait;
 
+import net.minestom.server.event.Event;
 import net.minestom.server.item.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
-public interface ItemEvent extends EventTrait {
+public interface ItemEvent extends Event {
     @NotNull ItemStack getItemStack();
 }

src/main/java/net/minestom/server/event/trait/PlayerEvent.java

@@ -1,9 +1,10 @@
 package net.minestom.server.event.trait;
 
 import net.minestom.server.entity.Player;
+import net.minestom.server.event.Event;
 import org.jetbrains.annotations.NotNull;
 
-public interface PlayerEvent extends EventTrait {
+public interface PlayerEvent extends Event {
 
     /**
      * Gets the player.

src/test/java/demo/PlayerInit.java

@@ -142,6 +142,10 @@ public class PlayerInit {
                 .handler(playerTickEvent -> System.out.println("Player tick!"))
                 .build());
 
+        var empty = EventNode.create();
+        empty.addListener(PlayerMoveEvent.class, (event) -> {
+        });
+
         GlobalEventHandler globalEventHandler = MinecraftServer.getGlobalEventHandler();
         globalEventHandler.addEventCallback(EntityAttackEvent.class, event -> {
             final Entity source = event.getEntity();