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