Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-01 21:11:33 +01:00
Code Issues Projects Releases Wiki Activity

Remove EventNodeConditional.java

Browse Source
This commit is contained in:
TheMode 2021-06-03 03:56:05 +02:00
parent 493c397efe
commit 5fa750fde3
3 changed files with 41 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,48 +14,48 @@ import java.util.concurrent.CopyOnWriteArraySet;
import java.util.function.BiPredicate; import java.util.function.BiPredicate;
import java.util.function.Predicate; import java.util.function.Predicate;
public class EventNode<T extends Event> { public class EventNode<T extends Event, V> {
public static <E extends Event> EventNode<E> type(@NotNull EventFilter<E, ?> filter) { public static <E extends Event, V> EventNode<E, V> type(@NotNull EventFilter<E, V> filter) {
return new EventNode<>(filter); return new EventNode<>(filter, (e, v) -> true);
} }
public static EventNode<Event> all() { public static EventNode<Event, ?> all() {
return type(EventFilter.ALL); return type(EventFilter.ALL);
} }
public static <E extends Event, H> EventNodeConditional<E, H> conditional(@NotNull EventFilter<E, H> filter, public static <E extends Event, V> EventNode<E, V> predicate(@NotNull EventFilter<E, V> filter,
@NotNull BiPredicate<E, H> predicate) { @NotNull BiPredicate<E, V> predicate) {
return new EventNodeConditional<>(filter, predicate); return new EventNode<>(filter, predicate);
} }
public static <E extends Event, H> EventNodeConditional<E, H> conditionalEvent(@NotNull EventFilter<E, H> filter, public static <E extends Event, V> EventNode<E, V> predicateEvent(@NotNull EventFilter<E, V> filter,
@NotNull Predicate<E> predicate) { @NotNull Predicate<E> predicate) {
return conditional(filter, (e, h) -> predicate.test(e)); return predicate(filter, (e, h) -> predicate.test(e));
} }
public static <E extends Event, H> EventNodeConditional<E, H> conditionalHandler(@NotNull EventFilter<E, H> filter, public static <E extends Event, V> EventNode<E, V> predicateValue(@NotNull EventFilter<E, V> filter,
@NotNull Predicate<H> predicate) { @NotNull Predicate<V> predicate) {
return conditional(filter, (e, h) -> predicate.test(h)); return predicate(filter, (e, h) -> predicate.test(h));
} }
private volatile String name = "unknown";
private final Map<Class<? extends T>, List<EventListener<T>>> listenerMap = new ConcurrentHashMap<>(); private final Map<Class<? extends T>, List<EventListener<T>>> listenerMap = new ConcurrentHashMap<>();
private final Map<Object, RedirectionEntry<T>> redirectionMap = new ConcurrentHashMap<>(); private final Map<Object, RedirectionEntry<T>> redirectionMap = new ConcurrentHashMap<>();
private final Set<EventNode<T>> children = new CopyOnWriteArraySet<>(); private final Set<EventNode<T, ?>> children = new CopyOnWriteArraySet<>();
protected final EventFilter<T, ?> filter; protected final EventFilter<T, V> filter;
protected volatile BiPredicate<T, V> predicate;
private volatile String name = "unknown";
// Tree data // Tree data
private static final Object GLOBAL_CHILD_LOCK = new Object(); private static final Object GLOBAL_CHILD_LOCK = new Object();
private volatile EventNode<? super T, ?> parent;
private volatile EventNode<? super T> parent;
private final Object lock = new Object(); private final Object lock = new Object();
private final Object2IntMap<Class<? extends T>> childEventMap = new Object2IntOpenHashMap<>(); private final Object2IntMap<Class<? extends T>> childEventMap = new Object2IntOpenHashMap<>();
protected EventNode(EventFilter<T, ?> filter) { protected EventNode(EventFilter<T, V> filter, BiPredicate<T, V> predicate) {
this.filter = filter; this.filter = filter;
this.predicate = predicate;
} }
/** /**
@ -65,7 +65,7 @@ public class EventNode<T extends 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) {
return true; return predicate.test(event, filter.getHandler(event));
} }
public void call(@NotNull T event) { public void call(@NotNull T event) {
@ -107,9 +107,9 @@ public class EventNode<T extends Event> {
this.children.forEach(eventNode -> eventNode.call(event)); this.children.forEach(eventNode -> eventNode.call(event));
} }
public void addChild(@NotNull EventNode<? extends T> child) { public void addChild(@NotNull EventNode<? extends T, ?> child) {
synchronized (GLOBAL_CHILD_LOCK) { synchronized (GLOBAL_CHILD_LOCK) {
final boolean result = this.children.add((EventNode<T>) child); final boolean result = this.children.add((EventNode<T, ?>) child);
if (result) { if (result) {
child.parent = this; child.parent = this;
// Increase listener count // Increase listener count
@ -123,7 +123,7 @@ public class EventNode<T extends Event> {
} }
} }
public void removeChild(@NotNull EventNode<? extends T> child) { public void removeChild(@NotNull EventNode<? extends T, ?> child) {
synchronized (GLOBAL_CHILD_LOCK) { synchronized (GLOBAL_CHILD_LOCK) {
final boolean result = this.children.remove(child); final boolean result = this.children.remove(child);
if (result) { if (result) {
@ -167,7 +167,15 @@ public class EventNode<T extends Event> {
} }
} }
public <E extends T, V> void map(@NotNull EventFilter<E, V> filter, @NotNull V value, @NotNull EventNode<E> node) { public @NotNull BiPredicate<T, V> getPredicate() {
return predicate;
}
public void setPredicate(@NotNull BiPredicate<T, V> predicate) {
this.predicate = predicate;
}
public <E extends T, V2> void map(@NotNull EventFilter<E, V2> filter, @NotNull V2 value, @NotNull EventNode<E, V2> node) {
RedirectionEntry<E> entry = new RedirectionEntry<>(); RedirectionEntry<E> entry = new RedirectionEntry<>();
entry.filter = filter; entry.filter = filter;
entry.node = node; entry.node = node;
@ -186,7 +194,7 @@ public class EventNode<T extends Event> {
this.name = name; this.name = name;
} }
public @NotNull Set<@NotNull EventNode<T>> getChildren() { public @NotNull Set<@NotNull EventNode<T, ?>> getChildren() {
return Collections.unmodifiableSet(children); return Collections.unmodifiableSet(children);
} }
@ -210,6 +218,6 @@ public class EventNode<T extends Event> {
private static class RedirectionEntry<E extends Event> { private static class RedirectionEntry<E extends Event> {
EventFilter<E, ?> filter; EventFilter<E, ?> filter;
EventNode<E> node; EventNode<E, ?> node;
} }
} }

28
src/main/java/net/minestom/server/event/EventNodeConditional.java
View File

@ -1,28 +0,0 @@
package net.minestom.server.event;
import org.jetbrains.annotations.NotNull;
import java.util.function.BiPredicate;
public class EventNodeConditional<T extends Event, H> extends EventNode<T> {
private volatile BiPredicate<T, H> predicate;
protected EventNodeConditional(EventFilter<T, H> filter, BiPredicate<T, H> predicate) {
super(filter);
this.predicate = predicate;
}
@Override
protected boolean condition(@NotNull T event) {
return predicate.test(event, (H) filter.getHandler(event));
}
public @NotNull BiPredicate<T, H> getPredicate() {
return predicate;
}
public void setPredicate(@NotNull BiPredicate<T, H> predicate) {
this.predicate = predicate;
}
}

15
src/test/java/demo/PlayerInit.java
View File

@ -156,16 +156,8 @@ public class PlayerInit {
node.call(new PlayerTickEvent(null)); node.call(new PlayerTickEvent(null));
empty.call(new PlayerTickEvent(null)); empty.call(new PlayerTickEvent(null));
/*
* Map a node to a single element
*
* var test = EventNode.type(EventFilter.ENTITY);
* test.addListener(EventListener.of(PlayerMoveEvent.class, (event) ->
* System.out.println("creative player moved")));
* empty.map(EventFilter.ENTITY, entity, test);
*/
var conditional = EventNode.conditionalHandler(EventFilter.PLAYER, Player::isCreative); var conditional = EventNode.predicateValue(EventFilter.PLAYER, Player::isCreative);
conditional.addListener(EventListener.of(PlayerMoveEvent.class, (event) -> conditional.addListener(EventListener.of(PlayerMoveEvent.class, (event) ->
System.out.println("creative player moved"))); System.out.println("creative player moved")));
@ -188,6 +180,11 @@ public class PlayerInit {
if (source instanceof Player) { if (source instanceof Player) {
((Player) source).sendMessage("You attacked something!"); ((Player) source).sendMessage("You attacked something!");
} }
var test = EventNode.type(EventFilter.ENTITY);
test.addListener(EventListener.of(PlayerMoveEvent.class, (e) ->
System.out.println("Test movement")));
empty.map(EventFilter.ENTITY, source, test);
}); });
globalEventHandler.addEventCallback(PlayerDeathEvent.class, event -> { globalEventHandler.addEventCallback(PlayerDeathEvent.class, event -> {