Cleanup & Dependencies

Author: Pascalpex

.github/workflows/build.yml

@@ -6,9 +6,9 @@ jobs:
     steps:
       - uses: actions/[email protected]
       - name: Set up JDK 21
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
-          java-version: 21.0.6
+          java-version: 21.0.7
           distribution: 'temurin'
       - name: Configure Git
         run: |
@@ -19,7 +19,7 @@ jobs:
       - name: Build
         run: ./gradlew build
       - name: Upload Jar
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           name: PexNPC
           path: build/libs/PexNPC-2.0.jar

build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "2.0.0-beta.14"
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.17"
 }
 
 group = "de.pascalpex"
@@ -16,10 +16,10 @@ repositories {
 }
 
 dependencies {
-    testImplementation(platform("org.junit:junit-bom:5.12.0"))
+    testImplementation(platform("org.junit:junit-bom:5.12.2"))
     testImplementation("org.junit.jupiter:junit-jupiter")
     compileOnly("me.clip:placeholderapi:2.11.6")
-    paperweight.paperDevBundle("1.21.4-R0.1-SNAPSHOT")
+    paperweight.paperDevBundle("1.21.5-R0.1-SNAPSHOT")
 }
 
 java {

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -21,18 +21,20 @@ public class PacketReader {
     public static Map<UUID, Channel> channels = new HashMap<>();
     public static Map<UUID, Boolean> clicking = new HashMap<>();
 
+    private static final String PACKET_INJECTOR_NAME = "PacketInjector";
+
     public void inject(Player player) throws NoSuchFieldException, IllegalAccessException {
         CraftPlayer craftPlayer = (CraftPlayer) player;
         ServerGamePacketListenerImpl serverConnection = craftPlayer.getHandle().connection;
         channel = serverConnection.connection.channel;
         channels.put(player.getUniqueId(), channel);
 
-        if (channel.pipeline().get("PacketInjector") != null) {
+        if (channel.pipeline().get(PACKET_INJECTOR_NAME) != null) {
             return;
         }
 
         try {
-            channel.pipeline().addAfter("decoder", "PacketInjector", new MessageToMessageDecoder<ServerboundInteractPacket>() {
+            channel.pipeline().addAfter("decoder", PACKET_INJECTOR_NAME, new MessageToMessageDecoder<ServerboundInteractPacket>() {
 
                 @Override
                 protected void decode(ChannelHandlerContext channel, ServerboundInteractPacket packet, List<Object> arg) {
@@ -50,8 +52,8 @@ public void uninject(Player player) {
         if (channel == null) {
             return;
         }
-        if (channel.pipeline().get("PacketInjector") != null) {
-            channel.pipeline().remove("PacketInjector");
+        if (channel.pipeline().get(PACKET_INJECTOR_NAME) != null) {
+            channel.pipeline().remove(PACKET_INJECTOR_NAME);
         }
         channels.remove(player.getUniqueId());
     }

src/main/java/de/pascalpex/pexnpc/events/PacketReader.java

@@ -4,7 +4,7 @@ author: Pascalpex
 prefix: PexNPC
 main: de.pascalpex.pexnpc.PexNPC
 description: Lightweight, packet based NPC plugin with fast updates
-api-version: '1.21.4'
+api-version: '1.21.5'
 bootstrapper: de.pascalpex.pexnpc.PexNPCBootstrap
 loader: de.pascalpex.pexnpc.PexNPCLoader
 dependencies: