From 6cbc31b11427c0e83676fc05cc536ed43f338e3d Mon Sep 17 00:00:00 2001
From: TheMode <themode@outlook.fr>
Date: Wed, 2 Jun 2021 21:18:18 +0200
Subject: [PATCH] Allow filtering on more than just EventHandler

---
 .../net/minestom/server/event/EventFilter.java  | 10 +++++-----
 .../net/minestom/server/event/EventNode.java    | 17 ++++++++---------
 .../server/event/EventNodeConditional.java      |  3 +--
 .../minestom/server/event/EventNodeImpl.java    |  3 +--
 .../minestom/server/event/EventNodeList.java    |  3 +--
 5 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/main/java/net/minestom/server/event/EventFilter.java b/src/main/java/net/minestom/server/event/EventFilter.java
index d3a9577b7..afcc0a167 100644
--- a/src/main/java/net/minestom/server/event/EventFilter.java
+++ b/src/main/java/net/minestom/server/event/EventFilter.java
@@ -10,15 +10,15 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Function;
 
-public interface EventFilter<E extends Event, H extends EventHandler> {
+public interface EventFilter<E extends Event, H> {
 
     EventFilter<Event, EventHandler> ALL = from(Event.class);
     EventFilter<EntityEvent, Entity> ENTITY = from(EntityEvent.class, Entity.class, EntityEvent::getEntity);
     EventFilter<PlayerEvent, Player> PLAYER = from(PlayerEvent.class, Player.class, PlayerEvent::getPlayer);
 
-    static <E extends Event, H extends EventHandler> EventFilter<E, H> from(@NotNull Class<E> eventType,
-                                                                            @NotNull Class<H> handlerType,
-                                                                            @NotNull Function<E, H> handlerGetter) {
+    static <E extends Event, H> EventFilter<E, H> from(@NotNull Class<E> eventType,
+                                                       @NotNull Class<H> handlerType,
+                                                       @NotNull Function<E, H> handlerGetter) {
         return new EventFilter<>() {
             @Override
             public @Nullable H getHandler(@NotNull E event) {
@@ -32,7 +32,7 @@ public interface EventFilter<E extends Event, H extends EventHandler> {
         };
     }
 
-    static <E extends Event, H extends EventHandler> EventFilter<E, H> from(@NotNull Class<E> type) {
+    static <E extends Event, H> EventFilter<E, H> from(@NotNull Class<E> type) {
         return new EventFilter<>() {
             @Override
             public @Nullable H getHandler(@NotNull E event) {
diff --git a/src/main/java/net/minestom/server/event/EventNode.java b/src/main/java/net/minestom/server/event/EventNode.java
index 67d6358b1..33dfb854e 100644
--- a/src/main/java/net/minestom/server/event/EventNode.java
+++ b/src/main/java/net/minestom/server/event/EventNode.java
@@ -1,6 +1,5 @@
 package net.minestom.server.event;
 
-import net.minestom.server.event.handler.EventHandler;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -9,7 +8,7 @@ import java.util.function.Predicate;
 
 public interface EventNode<T extends Event> {
 
-    static <E extends Event> EventNode<E> type(@NotNull EventFilter<E, ? extends EventHandler> filter) {
+    static <E extends Event> EventNode<E> type(@NotNull EventFilter<E, ?> filter) {
         return new EventNodeImpl<>(filter);
     }
 
@@ -17,22 +16,22 @@ public interface EventNode<T extends Event> {
         return type(EventFilter.ALL);
     }
 
-    static <E extends Event, H extends EventHandler> EventNodeConditional<E, H> conditional(@NotNull EventFilter<E, H> filter,
-                                                                                            @NotNull BiPredicate<E, H> predicate) {
+    static <E extends Event, H> EventNodeConditional<E, H> conditional(@NotNull EventFilter<E, H> filter,
+                                                                       @NotNull BiPredicate<E, H> predicate) {
         return new EventNodeConditional<>(filter, predicate);
     }
 
-    static <E extends Event, H extends EventHandler> EventNodeConditional<E, H> conditionalEvent(@NotNull EventFilter<E, H> filter,
-                                                                                                 @NotNull Predicate<E> predicate) {
+    static <E extends Event, H> EventNodeConditional<E, H> conditionalEvent(@NotNull EventFilter<E, H> filter,
+                                                                            @NotNull Predicate<E> predicate) {
         return conditional(filter, (e, h) -> predicate.test(e));
     }
 
-    static <E extends Event, H extends EventHandler> EventNodeConditional<E, H> conditionalHandler(@NotNull EventFilter<E, H> filter,
-                                                                                                   @NotNull Predicate<H> predicate) {
+    static <E extends Event, H> EventNodeConditional<E, H> conditionalHandler(@NotNull EventFilter<E, H> filter,
+                                                                              @NotNull Predicate<H> predicate) {
         return conditional(filter, (e, h) -> predicate.test(h));
     }
 
-    static <E extends Event, H extends EventHandler> EventNodeList<E, H> list(@NotNull EventFilter<E, H> filter) {
+    static <E extends Event, H> EventNodeList<E, H> list(@NotNull EventFilter<E, H> filter) {
         return new EventNodeList<>(filter);
     }
 
diff --git a/src/main/java/net/minestom/server/event/EventNodeConditional.java b/src/main/java/net/minestom/server/event/EventNodeConditional.java
index 308a0a4a1..4f0d5d68a 100644
--- a/src/main/java/net/minestom/server/event/EventNodeConditional.java
+++ b/src/main/java/net/minestom/server/event/EventNodeConditional.java
@@ -1,11 +1,10 @@
 package net.minestom.server.event;
 
-import net.minestom.server.event.handler.EventHandler;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.function.BiPredicate;
 
-public class EventNodeConditional<T extends Event, H extends EventHandler> extends EventNodeImpl<T, H> {
+public class EventNodeConditional<T extends Event, H> extends EventNodeImpl<T, H> {
 
     private volatile BiPredicate<T, H> predicate;
 
diff --git a/src/main/java/net/minestom/server/event/EventNodeImpl.java b/src/main/java/net/minestom/server/event/EventNodeImpl.java
index a50ff0088..b29c88aca 100644
--- a/src/main/java/net/minestom/server/event/EventNodeImpl.java
+++ b/src/main/java/net/minestom/server/event/EventNodeImpl.java
@@ -1,6 +1,5 @@
 package net.minestom.server.event;
 
-import net.minestom.server.event.handler.EventHandler;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
@@ -9,7 +8,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-class EventNodeImpl<T extends Event, H extends EventHandler> implements EventNode<T> {
+class EventNodeImpl<T extends Event, H> implements EventNode<T> {
 
     private final String name = "debug";
 
diff --git a/src/main/java/net/minestom/server/event/EventNodeList.java b/src/main/java/net/minestom/server/event/EventNodeList.java
index b7e383509..fe482591f 100644
--- a/src/main/java/net/minestom/server/event/EventNodeList.java
+++ b/src/main/java/net/minestom/server/event/EventNodeList.java
@@ -1,12 +1,11 @@
 package net.minestom.server.event;
 
-import net.minestom.server.event.handler.EventHandler;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-public class EventNodeList<T extends Event, H extends EventHandler> extends EventNodeImpl<T, H> {
+public class EventNodeList<T extends Event, H> extends EventNodeImpl<T, H> {
 
     private final List<H> entries = new CopyOnWriteArrayList<>();