From e0cf2e211f0ec211a57feccf3a562620ccc1b726 Mon Sep 17 00:00:00 2001
From: Adrian <68704415+4drian3d@users.noreply.github.com>
Date: Fri, 2 Jun 2023 21:12:03 -0500
Subject: [PATCH] Updated Guice to 6.0.0 and manually include updated ASM
 (#1016)

---
 gradle/libs.versions.toml                                      | 3 ++-
 proxy/build.gradle.kts                                         | 1 +
 .../com/velocitypowered/proxy/event/VelocityEventManager.java  | 3 +--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e2e762c018..a3e6182a5d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,6 +12,7 @@ spotless = "com.diffplug.spotless:6.12.0"
 [libraries]
 adventure-bom = "net.kyori:adventure-bom:4.13.1"
 adventure-facet = "net.kyori:adventure-platform-facet:4.3.0"
+asm = "org.ow2.asm:asm:9.5"
 asynchttpclient = "org.asynchttpclient:async-http-client:2.12.3"
 brigadier = "com.velocitypowered:velocity-brigadier:1.0.0-SNAPSHOT"
 bstats = "org.bstats:bstats-base:3.0.1"
@@ -30,7 +31,7 @@ jopt = "net.sf.jopt-simple:jopt-simple:5.0.4"
 junit = "org.junit.jupiter:junit-jupiter:5.9.0"
 guava = "com.google.guava:guava:25.1-jre"
 gson = "com.google.code.gson:gson:2.10.1"
-guice = "com.google.inject:guice:5.1.0"
+guice = "com.google.inject:guice:6.0.0"
 lmbda = "org.lanternpowered:lmbda:2.0.0"
 log4j-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
diff --git a/proxy/build.gradle.kts b/proxy/build.gradle.kts
index 997ddd4673..8d6ed59453 100644
--- a/proxy/build.gradle.kts
+++ b/proxy/build.gradle.kts
@@ -114,6 +114,7 @@ dependencies {
     implementation(libs.nightconfig)
     implementation(libs.bstats)
     implementation(libs.lmbda)
+    implementation(libs.asm)
     implementation(libs.bundles.flare)
     compileOnly(libs.spotbugs.annotations)
     testImplementation(libs.mockito)
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/event/VelocityEventManager.java b/proxy/src/main/java/com/velocitypowered/proxy/event/VelocityEventManager.java
index 5c8542708d..85bb7cceba 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/event/VelocityEventManager.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/event/VelocityEventManager.java
@@ -306,8 +306,7 @@ private void collectMethods(final Class<?> targetClass,
         if (returnType != void.class && continuationType == Continuation.class) {
           errors.add("method return type must be void if a continuation parameter is provided");
         } else if (returnType != void.class && returnType != EventTask.class) {
-          errors.add("method return type must be void, AsyncTask, "
-              + "AsyncTask.Basic or AsyncTask.WithContinuation");
+          errors.add("method return type must be void or EventTask");
         }
       }
       final short order = (short) subscribe.order().ordinal();