Migrate to gradle, java 17 and fix examples

.github/workflows/build.yml

@@ -0,0 +1,32 @@
+name: Java CI with Gradle
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    # Only run on PRs if the source branch is on someone else's repo
+    if: "${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}"
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        # See https://github.com/actions/checkout/commits
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
+
+      - name: Validate Gradle wrapper
+        # See https://github.com/gradle/wrapper-validation-action/commits
+        uses: gradle/wrapper-validation-action@342dbebe7272035434f9baccc29a816ec6dd2c7b
+
+      - name: Set up JDK 17
+        # See https://github.com/actions/setup-java/commits
+        uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0
+        with:
+          java-version: 17
+          distribution: temurin
+
+      - name: Build
+        # See https://github.com/gradle/gradle-build-action/commits
+        uses: gradle/gradle-build-action@3bfe3a46584a206fb8361cdedd0647b0c4204232
+        with:
+          arguments: build

.github/workflows/deploy.yml

@@ -15,20 +15,22 @@ jobs:
         # See https://github.com/actions/checkout/commits
         uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
 
+      - name: Validate Gradle wrapper
+        # See https://github.com/gradle/wrapper-validation-action/commits
+        uses: gradle/wrapper-validation-action@342dbebe7272035434f9baccc29a816ec6dd2c7b
+
       - name: Set up JDK 17
         # See https://github.com/actions/setup-java/commits
         uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0
         with:
           java-version: 17
           distribution: temurin
 
-      - uses: s4u/maven-settings-action@60912582505985be4cc55d2b890eb32767f8de5f
-        # See https://github.com/s4u/maven-settings-action/commits
-        with:
-          servers: '[{"id": "opencollab-release-repo", "username": "${env.MAVEN_USERNAME}", "password": "${env.MAVEN_PASSWORD}"},{"id": "opencollab-snapshot-repo", "username": "${env.MAVEN_USERNAME}", "password": "${env.MAVEN_PASSWORD}"}]'
-
-      - name: Deploy with Maven
-        run: mvn deploy -B -P deploy
+      - name: Publish to Maven Repository
+        if: ${{ success() && github.repository == 'GeyserMC/MCProtocolLib' && github.ref_name == 'master' }}
+        uses: gradle/gradle-build-action@3bfe3a46584a206fb8361cdedd0647b0c4204232
         env:
-          MAVEN_USERNAME: ${{ vars.DEPLOY_USER }}
-          MAVEN_PASSWORD: ${{ secrets.DEPLOY_PASS }}
+          OPENCOLLAB_USERNAME: ${{ vars.DEPLOY_USER }}
+          OPENCOLLAB_PASSWORD: ${{ secrets.DEPLOY_PASS }}
+        with:
+          arguments: publish

.gitignore

@@ -1,13 +1,31 @@
-bin
-lib
-target
-testing
+# Compiled plugin files
+target/
 
-.settings
+# IDE files
+.idea/
+.vscode/*
+.settings/*
+*.iml
+*.iws
+*.ipr
 .classpath
 .project
-.directory
+.factorypath
 
-*.iml
-.idea
+# UML
+*.plantuml
+
+# Gradle
+.gradle
+**/build/
+!src/**/build/
+**/run/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
 
+# Cache of project
+.gradletasknamecache

Jenkinsfile

@@ -1,7 +1,6 @@
 pipeline {
     agent any
     tools {
-        maven 'Maven 3'
         jdk 'Java 17'
     }
     options {
@@ -10,7 +9,7 @@ pipeline {
     stages {
         stage ('Build') {
             steps {
-                sh 'mvn clean package'
+                sh './gradlew clean build'
             }
         }
 
@@ -20,8 +19,8 @@ pipeline {
             }
 
             steps {
-                sh 'mvn javadoc:javadoc'
-                step([$class: 'JavadocArchiver', javadocDir: 'target/site/apidocs', keepAll: false])
+                sh './gradlew javadoc'
+                step([$class: 'JavadocArchiver', javadocDir: 'build/docs/javadoc', keepAll: false])
             }
         }
     }

README.md

@@ -45,6 +45,10 @@ dependencies {
 
 To use snapshot builds, switch the URL to `https://repo.opencollab.dev/maven-snapshots/`.
 
+### Javadocs
+
+You can find the Javadocs for MCProtocolLib [on opencollab](https://ci.opencollab.dev/job/GeyserMC/job/MCProtocolLib/job/master/javadoc/overview-summary.html).
+
 ## Building the Source
 
 MCProtocolLib uses Maven to manage dependencies. To build the source code, run `mvn clean install` in the project root directory.

build.gradle.kts

@@ -0,0 +1,112 @@
+plugins {
+    idea
+    `java-library`
+    `maven-publish`
+    alias(libs.plugins.indra)
+    alias(libs.plugins.indra.git)
+    alias(libs.plugins.indra.publishing)
+    alias(libs.plugins.lombok)
+}
+
+indra {
+    github("GeyserMC", "MCProtocolLib")
+
+    mitLicense()
+    publishReleasesTo("opencollab-release-repo", "https://repo.opencollab.dev/maven-releases/")
+    publishSnapshotsTo("opencollab-snapshot-repo", "https://repo.opencollab.dev/maven-snapshots/")
+
+    configurePublications {
+        pom {
+            name = "MCProtocolLib"
+            url = "https://github.com/GeyserMC/MCProtocolLib/"
+            organization {
+                name = "GeyserMC"
+                url = "https://github.com/GeyserMC"
+            }
+            developers {
+                developer {
+                    id = "steveice10"
+                    name = "Steveice10"
+                    email = "Steveice10@gmail.com"
+                }
+                developer {
+                    id = "GeyserMC"
+                    name = "GeyserMC"
+                    url = "https://geysermc.org/"
+                }
+            }
+        }
+
+        versionMapping {
+            usage(Usage.JAVA_API) { fromResolutionOf(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME) }
+            usage(Usage.JAVA_RUNTIME) { fromResolutionResult() }
+        }
+    }
+
+    javaVersions {
+        target(17)
+        strictVersions()
+        testWith(17)
+        minimumToolchain(17)
+    }
+}
+
+val repoName = if (version.toString().endsWith("SNAPSHOT")) "maven-snapshots" else "maven-releases"
+publishing {
+    repositories {
+        maven("https://repo.opencollab.dev/${repoName}/") {
+            credentials.username = System.getenv("OPENCOLLAB_USERNAME")
+            credentials.password = System.getenv("OPENCOLLAB_PASSWORD")
+            name = "opencollab"
+        }
+    }
+}
+
+dependencies {
+    // Minecraft related libraries
+    api(libs.opennbt)
+    api(libs.mcauthlib)
+
+    // Kyori adventure
+    api(libs.bundles.adventure)
+
+    // Math utilities
+    api(libs.bundles.math)
+
+    // Stripped down fastutil
+    api(libs.bundles.fastutil)
+
+    // Netty
+    api(libs.bundles.netty)
+
+    // Test dependencies
+    testImplementation(libs.junit.jupiter)
+}
+
+lombok {
+    version = libs.versions.lombok.version.get()
+}
+
+group = "com.github.steveice10"
+version = "1.20.4-2-SNAPSHOT"
+description = "MCProtocolLib is a simple library for communicating with Minecraft clients and servers."
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+    withSourcesJar()
+    withJavadocJar()
+}
+
+tasks.withType<JavaCompile> {
+    options.encoding = "UTF-8"
+    options.compilerArgs.add("-Xlint:all,-processing")
+}
+
+tasks.withType<Javadoc> {
+    title = "MCProtocolLib Javadocs"
+    val options = options as StandardJavadocDocletOptions
+    options.encoding = "UTF-8"
+    options.addStringOption("Xdoclint:all,-missing", "-quiet")
+}
+

example/build.gradle.kts

@@ -0,0 +1,11 @@
+plugins {
+    java
+}
+
+dependencies {
+    implementation(rootProject)
+}
+
+tasks.javadoc {
+    onlyIf { false }
+}

example/src/main/java/com/github/steveice10/mc/protocol/test/MinecraftProtocolTest.java

@@ -21,8 +21,6 @@
 import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundLoginPacket;
 import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundSystemChatPacket;
 import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundChatPacket;
-import com.github.steveice10.opennbt.NBTIO;
-import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.packetlib.ProxyInfo;
 import com.github.steveice10.packetlib.Server;
 import com.github.steveice10.packetlib.Session;
@@ -39,16 +37,11 @@
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextDecoration;
 
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.net.Proxy;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.BitSet;
-import java.util.zip.GZIPInputStream;
 
 public class MinecraftProtocolTest {
     private static final boolean SPAWN_SERVER = true;

example/com/github/steveice10/packetlib/test/PingPacket.java → example/src/main/java/com/github/steveice10/packetlib/test/PingPacket.java

@@ -2,13 +2,12 @@
 
 import com.github.steveice10.packetlib.codec.PacketCodecHelper;
 import com.github.steveice10.packetlib.packet.Packet;
-
-import java.io.IOException;
+import io.netty.buffer.ByteBuf;
 
 public class PingPacket implements Packet {
     private final String id;
 
-    public PingPacket(ByteBuf buf, PacketCodecHelper codecHelper) throws IOException {
+    public PingPacket(ByteBuf buf, PacketCodecHelper codecHelper) {
         this.id = codecHelper.readString(buf);
     }
 
@@ -19,14 +18,4 @@ public PingPacket(String id) {
     public String getPingId() {
         return this.id;
     }
-
-    @Override
-    public void write(ByteBuf buf, PacketCodecHelper codecHelper) throws IOException {
-        codecHelper.writeString(buf, this.id);
-    }
-
-    @Override
-    public boolean isPriority() {
-        return false;
-    }
 }

example/com/github/steveice10/packetlib/test/ServerListener.java → example/src/main/java/com/github/steveice10/packetlib/test/ServerListener.java

@@ -10,7 +10,7 @@
 import javax.crypto.SecretKey;
 
 public class ServerListener extends ServerAdapter {
-    private SecretKey key;
+    private final SecretKey key;
 
     public ServerListener(SecretKey key) {
         this.key = key;

example/com/github/steveice10/packetlib/test/TestProtocol.java → example/src/main/java/com/github/steveice10/packetlib/test/TestProtocol.java

@@ -2,11 +2,16 @@
 
 import com.github.steveice10.packetlib.Server;
 import com.github.steveice10.packetlib.Session;
+import com.github.steveice10.packetlib.codec.BasePacketCodecHelper;
+import com.github.steveice10.packetlib.codec.PacketCodecHelper;
+import com.github.steveice10.packetlib.codec.PacketDefinition;
+import com.github.steveice10.packetlib.codec.PacketSerializer;
 import com.github.steveice10.packetlib.crypt.AESEncryption;
 import com.github.steveice10.packetlib.crypt.PacketEncryption;
 import com.github.steveice10.packetlib.packet.DefaultPacketHeader;
 import com.github.steveice10.packetlib.packet.PacketHeader;
 import com.github.steveice10.packetlib.packet.PacketProtocol;
+import io.netty.buffer.ByteBuf;
 
 import javax.crypto.SecretKey;
 import java.security.GeneralSecurityException;
@@ -28,10 +33,21 @@ public PacketCodecHelper createHelper() {
     }
 
     public void setSecretKey(SecretKey key) {
-        this.register(0, PingPacket.class, PingPacket::new);
+        this.register(0, PingPacket.class, new PacketSerializer<>() {
+            @Override
+            public void serialize(ByteBuf buf, PacketCodecHelper helper, PingPacket packet) {
+                helper.writeString(buf, packet.getPingId());
+            }
+
+            @Override
+            public PingPacket deserialize(ByteBuf buf, PacketCodecHelper helper, PacketDefinition<PingPacket, PacketCodecHelper> definition) {
+                return new PingPacket(buf, helper);
+            }
+        });
+
         try {
             this.encrypt = new AESEncryption(key);
-        } catch(GeneralSecurityException e) {
+        } catch (GeneralSecurityException e) {
             e.printStackTrace();
         }
     }