Update actions and gradle

Author: UserNugget

.github/workflows/build.yml

@@ -13,16 +13,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.0.0
+        uses: actions/checkout@v4.2.2
       - name: Set up JDK
-        uses: actions/setup-java@v3.0.0
+        uses: actions/setup-java@v4.7.0
         with:
           distribution: adopt
           java-version: 17
       - name: Build VelocityTools
         run: ./gradlew build
       - name: Upload VelocityTools
-        uses: actions/upload-artifact@v3.0.0
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: VelocityTools
           path: "build/libs/*.jar"

.github/workflows/release.yml

@@ -9,16 +9,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.0.0
+        uses: actions/checkout@v4.2.2
       - name: Set up JDK
-        uses: actions/setup-java@v3.0.0
+        uses: actions/setup-java@v4.7.0
         with:
           distribution: adopt
           java-version: 17
       - name: Build VelocityTools
         run: ./gradlew build
       - name: Upload VelocityTools
-        uses: actions/upload-artifact@v3.0.0
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: VelocityTools
           path: "build/libs/*.jar"

build.gradle

@@ -1,10 +1,10 @@
 plugins() {
   id("java")
 
-  id("com.github.johnrengelman.shadow").version("8.1.1")
+  id("com.gradleup.shadow").version("8.3.6")
 
   id("checkstyle")
-  id("com.github.spotbugs").version("5.0.14")
+  id("com.github.spotbugs").version("6.1.7")
   id("org.cadixdev.licenser").version("0.6.1")
 
   id("com.github.gmazzo.buildconfig").version("4.1.2") // Kotlin :skull:
@@ -32,17 +32,12 @@ repositories() {
     name = "elytrium-repo"
     url = "https://maven.elytrium.net/repo/"
   }
-  maven {
-    name = "sonatype-oss-snapshots1"
-    url = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
-  }
 }
 
 dependencies() {
   annotationProcessor("net.java.dev.jna:jna-platform:5.13.0")
-  annotationProcessor("com.github.bsideup.jabel:jabel-javac-plugin:1.0.0")
 
-  compileOnly("com.github.spotbugs:spotbugs-annotations:4.7.3")
+  compileOnly("com.github.spotbugs:spotbugs-annotations:4.9.3")
 
   compileOnly("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT")
   annotationProcessor("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT")

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/net/elytrium/velocitytools/VelocityTools.java

@@ -92,7 +92,7 @@ public VelocityTools(ProxyServer server, @DataDirectory Path dataDirectory, Logg
       try {
         Files.move(oldDataDirectory, dataDirectory);
       } catch (IOException e) {
-        throw new RuntimeException(e);
+        logger.error("Failed to migrate data from pre-1.2.0", e);
       }
     }
 

src/main/java/net/elytrium/velocitytools/hooks/ChannelInitializerHook.java

@@ -22,33 +22,42 @@
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelPipeline;
-import java.lang.reflect.Method;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
 import net.elytrium.velocitytools.Settings;
 import org.jetbrains.annotations.NotNull;
 
 public class ChannelInitializerHook extends ChannelInitializer<Channel> {
 
-  private final Method initChannel;
+  private static final MethodHandle MH_initChannel;
+
   private final ChannelInitializer<Channel> originalInitializer;
 
   @SuppressFBWarnings("EI_EXPOSE_REP2")
   public ChannelInitializerHook(ChannelInitializer<Channel> originalInitializer) {
-    try {
-      this.initChannel = ChannelInitializer.class.getDeclaredMethod("initChannel", Channel.class);
-      this.initChannel.setAccessible(true);
-    } catch (NoSuchMethodException e) {
-      throw new RuntimeException(e);
-    }
-
     this.originalInitializer = originalInitializer;
   }
 
   @Override
   protected void initChannel(@NotNull Channel channel) throws Exception {
-    this.initChannel.invoke(this.originalInitializer, channel);
+    try {
+      MH_initChannel.invokeExact(this.originalInitializer, channel);
+    } catch (Throwable e) {
+      throw new Exception("failed to initialize channel", e);
+    }
     ChannelPipeline pipeline = channel.pipeline();
     if (Settings.IMP.TOOLS.DISABLE_LEGACY_PING && pipeline.names().contains(Connections.LEGACY_PING_DECODER)) {
       pipeline.remove(Connections.LEGACY_PING_DECODER);
     }
   }
+
+  static {
+    try {
+      MH_initChannel = MethodHandles.privateLookupIn(ChannelInitializer.class, MethodHandles.lookup())
+          .findVirtual(ChannelInitializer.class, "initChannel", MethodType.methodType(void.class, Channel.class));
+    } catch (Throwable e) {
+      throw new ExceptionInInitializerError(e);
+    }
+  }
 }

src/main/java/net/elytrium/velocitytools/listeners/ProtocolBlockerJoinListener.java

@@ -35,7 +35,8 @@
 
 public class ProtocolBlockerJoinListener {
 
-  private final MethodHandle delegate;
+  private static final MethodHandle MH_delegate;
+
   private final boolean whitelist;
   private final List<Integer> protocolNumbers;
   private final List<ProtocolVersion> protocolVersions;
@@ -44,13 +45,6 @@ public class ProtocolBlockerJoinListener {
   private final Component kickReason;
 
   public ProtocolBlockerJoinListener() {
-    try {
-      this.delegate = MethodHandles.privateLookupIn(LoginInboundConnection.class, MethodHandles.lookup())
-          .findGetter(LoginInboundConnection.class, "delegate", InitialInboundConnection.class);
-    } catch (NoSuchFieldException | IllegalAccessException e) {
-      throw new RuntimeException(e);
-    }
-
     this.whitelist = Settings.IMP.TOOLS.PROTOCOL_BLOCKER.WHITELIST;
     this.protocolNumbers = Settings.IMP.TOOLS.PROTOCOL_BLOCKER.PROTOCOLS;
     this.protocolVersions = Settings.IMP.TOOLS.PROTOCOL_BLOCKER.VERSIONS.stream()
@@ -64,7 +58,7 @@ public ProtocolBlockerJoinListener() {
   @Subscribe
   public void onJoin(PreLoginEvent event) {
     try {
-      InitialInboundConnection inbound = (InitialInboundConnection) this.delegate.invoke(event.getConnection());
+      InitialInboundConnection inbound = (InitialInboundConnection) MH_delegate.invoke(event.getConnection());
 
       inbound.getConnection().eventLoop().execute(() -> {
         ProtocolVersion playerProtocol = event.getConnection().getProtocolVersion();
@@ -79,4 +73,13 @@ public void onJoin(PreLoginEvent event) {
       throw new ReflectionException(e);
     }
   }
+
+  static {
+    try {
+      MH_delegate = MethodHandles.privateLookupIn(LoginInboundConnection.class, MethodHandles.lookup())
+          .findGetter(LoginInboundConnection.class, "delegate", InitialInboundConnection.class);
+    } catch (NoSuchFieldException | IllegalAccessException e) {
+      throw new RuntimeException(e);
+    }
+  }
 }