feat: 1.17+ support, gradle token replacement

Author: rmilansky

base/src/main/java/by/milansky/protocol/base/packet/handler/annotation/AnnotationBasedHandler.java

@@ -63,8 +63,8 @@ public static PacketHandler create(final Object... handlers) {
 
                         try {
                             return (PacketHandleResult) declaredMethod.invoke(handler, channel, packet);
-                        } catch (final InvocationTargetException | IllegalAccessException e) {
-                            log.catching(e);
+                        } catch (final InvocationTargetException | IllegalAccessException throwable) {
+                            log.catching(throwable);
                         } finally {
                             declaredMethod.setAccessible(false);
                         }

build.gradle

@@ -1,10 +1,12 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+
 plugins {
     id 'com.gradleup.shadow' version '9.0.0-beta4' apply false
 }
 
 allprojects {
     group = 'by.milansky.protocol'
-    version = '1.0.1'
+    version = '1.1.0'
 }
 
 configure(subprojects - project(':examples')) {
@@ -27,6 +29,7 @@ configure(subprojects - project(':examples')) {
         testCompileOnly libs.lombok
         testAnnotationProcessor libs.lombok
 
+        compileOnly libs.fastutil
         compileOnly libs.netty.all
         compileOnly libs.log4j.core
         compileOnly libs.jetbrains.annotations
@@ -76,6 +79,23 @@ configure(subprojects - project(':examples')) {
         }
     }
 
+    tasks {
+        register('processSource', Copy) {
+            from(sourceSets.main.java)
+            into("$buildDir/src")
+
+            inputs.property 'version', version
+            filter(ReplaceTokens, tokens: [version: version], beginToken: '${', endToken: '}')
+        }
+
+        compileJava {
+            sourceCompatibility = JavaVersion.VERSION_17
+            targetCompatibility = JavaVersion.VERSION_17
+
+            source = processSource.outputs
+        }
+    }
+
     test {
         useJUnitPlatform()
     }

bukkit/src/main/java/by/milansky/protocol/bukkit/ProtocolBukkit.java

@@ -19,7 +19,7 @@
  * @author milansky
  */
 @Log4j2
-@Plugin(name = "Protocol", version = "1.0.1-BETA")
+@Plugin(name = "Protocol", version = "${version}")
 public class ProtocolBukkit extends JavaPlugin {
     private Injector injector;
 

examples/bukkit-disguise/src/main/java/by/milansky/protocol/example/DisguisePlugin.java

@@ -16,7 +16,7 @@
 @Commands({
         @Command(name = "disguise")
 })
-@Plugin(name = "Disguise", version = "1.0.0-TEST")
+@Plugin(name = "Disguise", version = "${version}")
 @Description("An example plugin that shows how to use minecraft protocol library")
 public final class DisguisePlugin extends JavaPlugin {
     @Override

examples/bukkit-disguise/src/main/java/by/milansky/protocol/example/command/DisguiseCommand.java

@@ -11,8 +11,6 @@
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Optional;
-
 /**
  * @author milansky
  */

examples/bukkit-disguise/src/main/java/by/milansky/protocol/example/player/DisguisePlayerStorage.java

@@ -8,7 +8,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * @author milansky

examples/bukkit-nametags/src/main/java/by/milansky/protocol/example/NametagPlugin.java

@@ -8,7 +8,7 @@
 /**
  * @author milansky
  */
-@Plugin(name = "Nametags", version = "1.0.0-TEST")
+@Plugin(name = "Nametags", version = "${version}")
 @Description("An example plugin that shows how to use minecraft protocol library")
 public final class NametagPlugin extends JavaPlugin {
     @Override

examples/bukkit-nametags/src/main/java/by/milansky/protocol/example/listener/NametagListener.java

@@ -33,7 +33,8 @@ public void onPlayerCreate(final ProtocolPlayerCreateEvent event) {
                 Component.text(" JOB", NamedTextColor.GREEN, TextDecoration.BOLD),
                 ClientboundTeam.NameTagVisibility.ALWAYS,
                 ClientboundTeam.CollisionRule.NEVER,
-                0, (byte) 0, new String[]{protocolPlayer.nativePlayer().getName()}
+                NamedTextColor.WHITE,
+                (byte) 0, new String[]{protocolPlayer.nativePlayer().getName()}
         ));
     }
 }

readme.md

@@ -2,23 +2,27 @@
   <img src=".assets/illustration.png" width="500"/>
   <br>
   <img src="https://img.shields.io/badge/language-java-gold?style=flat" />
-  <img src="https://img.shields.io/badge/beta-v1.0.1-gold?style=flat" />
+  <img src="https://img.shields.io/badge/v1.1.0-gold?style=flat" />
   <img src="https://img.shields.io/github/stars/rmilansky/minecraft-protocol-java?style=flat" />
 </div>
 
 # Introduction
 
-Minecraft Protocol is a project I developed because all existing libraries for packet handling are either outdated or insufficiently lightweight for use in my projects (also due to a complete rewrite of the [Abelix](https://abelix.team) codebase).
+Minecraft Protocol is a project I developed because all existing libraries for packet handling are either outdated or
+insufficiently lightweight for use in my projects (also due to a complete rewrite of the [Abelix](https://abelix.team)
+codebase).
 
-The project was written in a single attempt by one person, so there might be bugs or less-than-perfect code. I would greatly appreciate any pull requests or issues.
+The project was written in a single attempt by one person, so there might be bugs or less-than-perfect code. I would
+greatly appreciate any pull requests or issues.
 
 <img src=".assets/time.jpg" width="500"/>
 
 # Project Overview
 
 ## Purpose
 
-This project is designed for the most convenient and integrable development of systems that require the use of Minecraft protocol packets (e.g., fake entities, nametags for servers, proxy systems).
+This project is designed for the most convenient and integrable development of systems that require the use of Minecraft
+protocol packets (e.g., fake entities, nametags for servers, proxy systems).
 
 ## Key Objectives
 
@@ -33,7 +37,8 @@ This project is designed for the most convenient and integrable development of s
 
 1. Add a repository:
 
-Maven: 
+Maven:
+
 ```xml
 <repositories>
     <repository>
@@ -42,7 +47,9 @@ Maven:
     </repository>
 </repositories>
 ```
+
 Gradle:
+
 ```groovy
 repositories {
     maven {
@@ -54,9 +61,10 @@ repositories {
 2. Add dependencies
 
 Maven:
+
 ```xml
 <properties>
-    <protocol.version>1.0.1</protocol.version>
+    <protocol.version>1.1.0</protocol.version>
 </properties>
 
 <dependencies>
@@ -85,11 +93,12 @@ Maven:
 </dependencies>
 ```
 
-Gradle: 
+Gradle:
+
 ```groovy
 dependencies {
     // It's better to use gradle's dependencyResolutionManagement
-    def protocolVersion = '1.0.1'
+    def protocolVersion = '1.1.0'
     
     compileOnly "by.milansky.protocol:api:${protocolVersion}"
     compileOnly "by.milansky.protocol:base:${protocolVersion}"
@@ -102,7 +111,8 @@ dependencies {
 
 ## Java API usage
 
-More detailed usage examples can be found in the [examples](examples) directory. However, to briefly explain, here's how you can listen to all `ClientboundTeam` packets:
+More detailed usage examples can be found in the [examples](examples) directory. However, to briefly explain, here's how
+you can listen to all `ClientboundTeam` packets:
 
 1. Create a handler to process packets:
 
@@ -144,5 +154,6 @@ public final class NametagListener implements Listener {
 
 Special thanks for ideas and inspiration to these projects:
 
-* [Velocity](https://github.com/PaperMC/Velocity), [BungeeCord](https://github.com/SpigotMC/BungeeCord) -  for some ideas and packet structures.
+* [Velocity](https://github.com/PaperMC/Velocity), [BungeeCord](https://github.com/SpigotMC/BungeeCord) - for some ideas
+  and packet structures.
 * [BridgeNet](https://github.com/MikhailSterkhov/bridgenet) - for the idea of this beautiful readme

vanilla-protocol/src/main/java/by/milansky/protocol/vanilla/channel/ProxiedInboundChannelHandler.java

@@ -0,0 +1,39 @@
+package by.milansky.protocol.vanilla.channel;
+
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.log4j.Log4j2;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author milansky
+ */
+@Log4j2
+@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
+@RequiredArgsConstructor(staticName = "create", access = AccessLevel.PACKAGE)
+final class ProxiedInboundChannelHandler extends ChannelDuplexHandler {
+    ChannelDuplexHandler parent;
+    Runnable afterWrite;
+
+    @Override
+    public void write(
+            final @NotNull ChannelHandlerContext ctx,
+            final @NotNull Object msg,
+            final @NotNull ChannelPromise promise
+    ) throws Exception {
+        parent.write(ctx, msg, promise);
+        afterWrite.run();
+    }
+
+    @Override
+    public void channelRead(
+            final @NotNull ChannelHandlerContext ctx,
+            final @NotNull Object msg
+    ) throws Exception {
+        parent.channelRead(ctx, msg);
+    }
+}