Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-09-28 14:37:31 +02:00
Code Issues Projects Releases Wiki Activity

Remove predicate from the EventNode factory methods

Browse Source
This commit is contained in:
TheMode 2021-06-03 21:54:07 +02:00
parent a15717ae49
commit 734e6f5bcb
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,24 +31,24 @@ public class EventNode<T extends Event> {
return new EventNode<>(filter, (e, o) -> predicate.test(e, (V) o));
}
public static <E extends Event, V> EventNode<E> predicateEvent(@NotNull EventFilter<E, V> filter,
@NotNull Predicate<E> predicate) {
public static <E extends Event, V> EventNode<E> event(@NotNull EventFilter<E, V> filter,
@NotNull Predicate<E> predicate) {
return predicate(filter, (e, h) -> predicate.test(e));
}
public static <E extends Event, V> EventNode<E> predicateValue(@NotNull EventFilter<E, V> filter,
@NotNull Predicate<V> predicate) {
public static <E extends Event, V> EventNode<E> value(@NotNull EventFilter<E, V> filter,
@NotNull Predicate<V> predicate) {
return predicate(filter, (e, h) -> predicate.test(h));
}
public static <E extends Event> EventNode<E> predicateTag(@NotNull EventFilter<E, ? extends TagReadable> filter,
@NotNull Tag<?> tag) {
public static <E extends Event> EventNode<E> tag(@NotNull EventFilter<E, ? extends TagReadable> filter,
@NotNull Tag<?> tag) {
return predicate(filter, (e, h) -> h.hasTag(tag));
}
public static <E extends Event, V> EventNode<E> predicateTag(@NotNull EventFilter<E, ? extends TagReadable> filter,
@NotNull Tag<V> tag,
@NotNull Predicate<@Nullable V> consumer) {
public static <E extends Event, V> EventNode<E> tag(@NotNull EventFilter<E, ? extends TagReadable> filter,
@NotNull Tag<V> tag,
@NotNull Predicate<@Nullable V> consumer) {
return predicate(filter, (e, h) -> consumer.test(h.getTag(tag)));
}
@ -79,6 +79,7 @@ public class EventNode<T extends Event> {
*/
protected boolean condition(@NotNull T event) {
final var value = filter.getHandler(event);
System.out.println("test "+event+" "+value);
return predicate.test(event, value);
}

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

@ -150,13 +150,16 @@ public class PlayerInit {
.expirationCount(50)
.build());
var conditional = EventNode.predicateValue(EventFilter.PLAYER, Player::isCreative)
var conditional = EventNode.value(EventFilter.PLAYER, Player::isCreative)
.addListener(PlayerMoveEvent.class, (event) -> System.out.println("creative player moved"));
var tagNode = EventNode.predicateTag(EventFilter.ITEM, Tag.String("tag"));
var tagNode = EventNode.tag(EventFilter.ITEM, Tag.String("tag"));
node.addChild(conditional);
node.call(new PlayerTickEvent(null));
node.addChild(EventNode.value(EventFilter.PLAYER, player -> player.getUsername().equals("TheMode911"))
.addListener(PlayerMoveEvent.class, event -> System.out.println("move!"))
.addListener(PlayerTickEvent.class, event -> System.out.println("tick!")));
//node.addChild(tagNode); -> Error: cannot add an item listener to a player node
GlobalEventHandler globalEventHandler = MinecraftServer.getGlobalEventHandler();
globalEventHandler.addEventCallback(EntityAttackEvent.class, event -> {