From e002890a91a0707811d1118a1090a50609efeb49 Mon Sep 17 00:00:00 2001 From: TheMode Date: Fri, 18 Jun 2021 03:21:03 +0200 Subject: [PATCH 1/3] Deprecate #addPlayerInitialization --- .../java/net/minestom/server/network/ConnectionManager.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/net/minestom/server/network/ConnectionManager.java b/src/main/java/net/minestom/server/network/ConnectionManager.java index 66024bb5c..8e4f8182b 100644 --- a/src/main/java/net/minestom/server/network/ConnectionManager.java +++ b/src/main/java/net/minestom/server/network/ConnectionManager.java @@ -305,7 +305,9 @@ public final class ConnectionManager { * or even {@link AsyncPlayerPreLoginEvent}. * * @param playerInitialization the {@link Player} initialization consumer + * @deprecated use the event API instead */ + @Deprecated public void addPlayerInitialization(@NotNull Consumer playerInitialization) { this.playerInitializations.add(playerInitialization); } From 787162bbe2110375670137ce56c8c8966aae2939 Mon Sep 17 00:00:00 2001 From: TheMode Date: Fri, 18 Jun 2021 18:24:35 +0200 Subject: [PATCH 2/3] Fix Eventlistener#of not ignoring cancelled events --- .../net/minestom/server/event/EventListener.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/main/java/net/minestom/server/event/EventListener.java b/src/main/java/net/minestom/server/event/EventListener.java index df6d7a1bd..83271d2ff 100644 --- a/src/main/java/net/minestom/server/event/EventListener.java +++ b/src/main/java/net/minestom/server/event/EventListener.java @@ -39,18 +39,7 @@ public interface EventListener { */ @Contract(pure = true) static @NotNull EventListener of(@NotNull Class eventType, @NotNull Consumer<@NotNull T> listener) { - return new EventListener<>() { - @Override - public @NotNull Class getEventType() { - return eventType; - } - - @Override - public @NotNull Result run(@NotNull T event) { - listener.accept(event); - return Result.SUCCESS; - } - }; + return builder(eventType).handler(listener).build(); } class Builder { From 731a1006a7ff7be799c86f80f99a6d2ad5e48dfe Mon Sep 17 00:00:00 2001 From: TheMode Date: Fri, 18 Jun 2021 20:06:29 +0200 Subject: [PATCH 3/3] Temporarily fix build --- code-generators/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code-generators/build.gradle b/code-generators/build.gradle index a4ef39178..1a0a6418b 100644 --- a/code-generators/build.gradle +++ b/code-generators/build.gradle @@ -14,7 +14,7 @@ application { } repositories { - maven { url "https://repo.minestom.net/repository/maven-public/" } + //maven { url "https://repo.minestom.net/repository/maven-public/" } } dependencies { @@ -26,7 +26,7 @@ dependencies { // SLF4J is the base logger for most libraries, therefore we can hook it into log4j2. implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.14.0' // This is the data Minestom uses. from https://github.com/Minestom/MinestomDataGenerator - implementation "net.minestom:minestom-data-full:${rootProject.properties.get("mcVersion")}" + //implementation "net.minestom:minestom-data-full:${rootProject.properties.get("mcVersion")}" }