Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-04 23:47:59 +01:00
Code Issues Projects Releases Wiki Activity

Add WIP EventNode.Mapped

Browse Source
This commit is contained in:
TheMode 2021-08-14 02:11:22 +02:00
parent a075231770
commit 5f51448da6
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/net/minestom/server/event/EventNode.java
View File

@ -177,6 +177,12 @@ public class EventNode<T extends Event> {
return create(name, filter, (e, h) -> consumer.test(h.getTag(tag))); return create(name, filter, (e, h) -> consumer.test(h.getTag(tag)));
} }
public static <E extends Event, V> @NotNull Mapped<E, V> mapped(@NotNull String name,
@NotNull EventFilter<E, V> filter,
@NotNull V value) {
return new Mapped<>(name, filter, value);
}
private static <E extends Event, V> EventNode<E> create(@NotNull String name, private static <E extends Event, V> EventNode<E> create(@NotNull String name,
@NotNull EventFilter<E, V> filter, @NotNull EventFilter<E, V> filter,
@Nullable BiPredicate<E, V> predicate) { @Nullable BiPredicate<E, V> predicate) {
@ -188,6 +194,7 @@ public class EventNode<T extends Event> {
private final Map<Class<? extends T>, ListenerEntry<T>> listenerMap = new ConcurrentHashMap<>(); private final Map<Class<? extends T>, ListenerEntry<T>> listenerMap = new ConcurrentHashMap<>();
private final Set<EventNode<T>> children = new CopyOnWriteArraySet<>(); private final Set<EventNode<T>> children = new CopyOnWriteArraySet<>();
private final Map<Object, EventNode<T>> mappedNode = new ConcurrentHashMap<>();
protected final String name; protected final String name;
protected final EventFilter<T, ?> filter; protected final EventFilter<T, ?> filter;
@ -211,12 +218,11 @@ public class EventNode<T extends Event> {
* @param event the called event * @param event the called event
* @return true to enter the node, false otherwise * @return true to enter the node, false otherwise
*/ */
protected boolean condition(@NotNull T event) { protected boolean condition(@NotNull T event, @Nullable Object handler) {
if (predicate == null) if (predicate == null)
return true; return true;
final var value = filter.getHandler(event);
try { try {
return predicate.test(event, value); return predicate.test(event, handler);
} catch (Exception e) { } catch (Exception e) {
MinecraftServer.getExceptionManager().handleException(e); MinecraftServer.getExceptionManager().handleException(e);
return false; return false;
@ -238,10 +244,18 @@ public class EventNode<T extends Event> {
// Invalid event type // Invalid event type
return; return;
} }
if (!condition(event)) { final var value = filter.getHandler(event);
if (!condition(event, value)) {
// Cancelled by superclass // Cancelled by superclass
return; return;
} }
// Mapped listeners
if (value != null && !mappedNode.isEmpty()) {
// FIXME: `value` is always null when `EventFilter#all` is used
// we might need a way to retrieve all the possible handlers from an event class
final var map = mappedNode.get(value);
if (map != null) map.call(event);
}
// Process listener list // Process listener list
final var entry = listenerMap.get(eventClass); final var entry = listenerMap.get(eventClass);
if (entry == null) { if (entry == null) {
@ -514,6 +528,10 @@ public class EventNode<T extends Event> {
return this; return this;
} }
public <E extends T, V> void map(@NotNull Mapped<E, V> map) {
this.mappedNode.put(map.value, (EventNode<T>) map);
}
public <I> void addInter(@NotNull EventInterface<I> inter, @NotNull I value) { public <I> void addInter(@NotNull EventInterface<I> inter, @NotNull I value) {
inter.mapped.forEach((eventType, consumer) -> { inter.mapped.forEach((eventType, consumer) -> {
// TODO cache so listeners can be removed from the EventInterface // TODO cache so listeners can be removed from the EventInterface
@ -559,4 +577,13 @@ public class EventNode<T extends Event> {
return CHILD_UPDATER.addAndGet(entry, add); return CHILD_UPDATER.addAndGet(entry, add);
} }
} }
public static final class Mapped<T extends Event, V> extends EventNode<T> {
private final V value;
Mapped(@NotNull String name, @NotNull EventFilter<T, ?> filter, @NotNull V value) {
super(name, filter, null);
this.value = value;
}
}
} }