Merge branch 'master' into new-block-api

This commit is contained in:
TheMode 2021-06-18 20:36:32 +02:00
commit 06ebb14991
3 changed files with 5 additions and 14 deletions

View File

@ -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")}"
}

View File

@ -39,18 +39,7 @@ public interface EventListener<T extends Event> {
*/
@Contract(pure = true)
static <T extends Event> @NotNull EventListener<T> of(@NotNull Class<T> eventType, @NotNull Consumer<@NotNull T> listener) {
return new EventListener<>() {
@Override
public @NotNull Class<T> 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<T extends Event> {

View File

@ -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<Player> playerInitialization) {
this.playerInitializations.add(playerInitialization);
}