Merge branch 'WiIIiam278:master' into master

Author: Prince527GitHub

.github/workflows/ci.yml

@@ -132,4 +132,5 @@ jobs:
             1.21.7
             1.21.8
             1.21.9
+            1.21.11
           java: 21

.github/workflows/release.yml

@@ -121,4 +121,5 @@ jobs:
             1.21.7
             1.21.8
             1.21.9
+            1.21.11
           java: 21

build.gradle

@@ -171,9 +171,10 @@ publishing {
 }
 
 tasks {
-    var papi = papi_proxy_bridge_minimum_version
     runVelocity {
-        velocityVersion("${velocity_api_version}-SNAPSHOT")
+        var snapshotSuffix = velocity_snapshot.toBoolean() ? "-SNAPSHOT" : ""
+        println "Using Velocity API version: ${velocity_api_version}${snapshotSuffix}"
+        velocityVersion("${velocity_api_version}" + snapshotSuffix)
 
         downloadPlugins {
 //            github ("WiIIiam278", "PAPIProxyBridge", "1.7.1", "PAPIProxyBridge-Velocity-1.7.1.jar")

gradle.properties

@@ -3,10 +3,11 @@ javaVersion=21
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
 org.gradle.daemon=true
 
-plugin_version=1.7.9
+plugin_version=1.7.11
 plugin_archive=velocitab
 plugin_description=A beautiful and versatile TAB list plugin for Velocity proxies
 
-velocity_api_version=3.4.0
-velocity_minimum_build=539
+velocity_api_version=3.5.0
+velocity_snapshot=true
+velocity_minimum_build=584
 papi_proxy_bridge_minimum_version=1.8

src/main/java/net/william278/velocitab/config/Metadata.java

@@ -50,7 +50,7 @@ public void validateApiVersion(@NotNull Version version) {
 
     public void validateBuild(@NotNull Version version) {
         int serverBuild = getBuildNumber(version.toString());
-        if (serverBuild < velocityMinimumBuild) {
+        if (serverBuild > 0 && serverBuild < velocityMinimumBuild) {
             throw new IllegalStateException("Your Velocity build version (#" + serverBuild + ") is not supported! " +
                     "Disabling Velocitab. Please update to at least Velocity v" + velocityApiVersion
                     + " build #" + velocityMinimumBuild + " or newer.");
@@ -70,6 +70,12 @@ private int getBuildNumber(@NotNull String proxyVersion) {
         if (matcher.find(1)) {
             return Integer.parseInt(matcher.group(1));
         }
+
+        final Matcher simpleMatcher = Pattern.compile("^(\\d+)\\.(\\d+)\\.(\\d+)$").matcher(proxyVersion);
+        if (simpleMatcher.matches()) {
+            return 0;
+        }
+
         throw new IllegalArgumentException("No build number found for proxy version: " + proxyVersion);
     }
 

src/main/java/net/william278/velocitab/packet/Protocol770Adapter.java

@@ -39,7 +39,9 @@ public Protocol770Adapter(@NotNull Velocitab plugin) {
                 ProtocolVersion.MINECRAFT_1_21_5,
                 ProtocolVersion.MINECRAFT_1_21_6,
                 ProtocolVersion.MINECRAFT_1_21_7,
-                ProtocolVersion.MINECRAFT_1_21_9
+                ProtocolVersion.MINECRAFT_1_21_9,
+                ProtocolVersion.MINECRAFT_1_21_11,
+                ProtocolVersion.MINECRAFT_26_1
         ));
     }
 

src/main/java/net/william278/velocitab/packet/ScoreboardManager.java

@@ -424,7 +424,8 @@ public void registerPacket() {
                     .mapping(0x60, MINECRAFT_1_20_5, false)
                     .mapping(0x67, MINECRAFT_1_21_2, false)
                     .mapping(0x66, MINECRAFT_1_21_5, false)
-                    .mapping(0x6B, MINECRAFT_1_21_9, false);
+                    .mapping(0x6B, MINECRAFT_1_21_9, false)
+                    .mapping(0x6D, MINECRAFT_26_1, false);
             packetRegistration.register();
         } catch (Throwable e) {
             plugin.log(Level.ERROR, "Failed to register UpdateTeamsPacket", e);