feat(6.2.7): support Minecraft 1.20.5, 1.20.6, 1.21

CatCoderr · Oct 8, 2024 · 257a682 · 257a682
1 parent c47a688
commit 257a682
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 <a target="_blank"><img src="https://github.com/CatCoderr/ProtocolSidebar/actions/workflows/build.yaml/badge.svg" alt="Build" /></a>
 <a target="_blank"><img src="https://img.shields.io/github/license/CatCoderr/ProtocolSidebar" alt="License" /></a>
 <a target="_blank"><img src="https://img.shields.io/nexus/s/me.catcoder/bukkit-sidebar?server=https%3A%2F%2Foss.sonatype.org" alt="Nexus" /></a>
-<a target="_blank"><img src="https://img.shields.io/badge/Minecraft%20Versions-1.12.2--1.20.4-blue?style=flat" alt="Minecraft Versions" /></a>
+<a target="_blank"><img src="https://img.shields.io/badge/Minecraft%20Versions-1.12.2--1.21-blue?style=flat" alt="Minecraft Versions" /></a>
 </p>
 
 * [Features](#features)
@@ -66,7 +66,7 @@ or [maven-shade-plugin](https://maven.apache.org/plugins/maven-shade-plugin/) (f
 <dependency>
     <groupId>me.catcoder</groupId>
     <artifactId>bukkit-sidebar</artifactId>
-    <version>6.2.6-SNAPSHOT</version>
+    <version>6.2.7-SNAPSHOT</version>
 </dependency>
 ```
 
@@ -79,7 +79,7 @@ repositories {
 ```
 ```groovy
 dependencies {
-    implementation 'me.catcoder:bukkit-sidebar:6.2.6-SNAPSHOT'
+    implementation 'me.catcoder:bukkit-sidebar:6.2.7-SNAPSHOT'
 }
 ```
 
@@ -92,7 +92,7 @@ repositories {
 ```
 ```kotlin
 dependencies {
-    implementation("me.catcoder:bukkit-sidebar:6.2.6-SNAPSHOT")
+    implementation("me.catcoder:bukkit-sidebar:6.2.7-SNAPSHOT")
 }
 ```
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "me.catcoder"
-version = "6.2.6-SNAPSHOT"
+version = "6.2.7-SNAPSHOT"
 description = "Powerful feature-packed Minecraft scoreboard library"
 
 extra["sonatypeUsername"] = System.getenv("SONATYPE_USERNAME")

diff --git a/run_test_server.sh b/run_test_server.sh
@@ -1,4 +1,4 @@
-VIA_VERSION=4.9.3
+VIA_VERSION=5.0.3
 
 ./gradlew clean shadowJar
 

diff --git a/src/main/java/me/catcoder/sidebar/protocol/PacketIds.java b/src/main/java/me/catcoder/sidebar/protocol/PacketIds.java
@@ -17,7 +17,9 @@ public enum PacketIds {
             map(ProtocolConstants.MINECRAFT_1_19_3, 0x56),
             map(ProtocolConstants.MINECRAFT_1_19_4, 0x5A),
             map(ProtocolConstants.MINECRAFT_1_20_2, 0x5C),
-            map(ProtocolConstants.MINECRAFT_1_20_4, 0x5E)
+            map(ProtocolConstants.MINECRAFT_1_20_4, 0x5E),
+            map(ProtocolConstants.MINECRAFT_1_20_4, 0x5E),
+            map(ProtocolConstants.MINECRAFT_1_20_6, 0x60)
     ),
     UPDATE_SCORE(
             map(ProtocolConstants.MINECRAFT_1_12_2, 0x45),
@@ -29,12 +31,14 @@ public enum PacketIds {
             map(ProtocolConstants.MINECRAFT_1_19_3, 0x57),
             map(ProtocolConstants.MINECRAFT_1_19_4, 0x5B),
             map(ProtocolConstants.MINECRAFT_1_20_2, 0x5D),
-            map(ProtocolConstants.MINECRAFT_1_20_4, 0x5F)
+            map(ProtocolConstants.MINECRAFT_1_20_4, 0x5F),
+            map(ProtocolConstants.MINECRAFT_1_20_6, 0x61)
 
 
     ),
     RESET_SCORE(
-           map(ProtocolConstants.MINECRAFT_1_20_3, 0x42)
+            map(ProtocolConstants.MINECRAFT_1_20_3, 0x42),
+            map(ProtocolConstants.MINECRAFT_1_20_4, 0x44)
     ),
     OBJECTIVE_DISPLAY(
             map(ProtocolConstants.MINECRAFT_1_12_2, 0x3B),
@@ -46,7 +50,8 @@ public enum PacketIds {
             map(ProtocolConstants.MINECRAFT_1_19_3, 0x4D),
             map(ProtocolConstants.MINECRAFT_1_19_4, 0x51),
             map(ProtocolConstants.MINECRAFT_1_20_2, 0x53),
-            map(ProtocolConstants.MINECRAFT_1_20_4, 0x55)
+            map(ProtocolConstants.MINECRAFT_1_20_4, 0x55),
+            map(ProtocolConstants.MINECRAFT_1_20_6, 0x57)
 
     ),
     OBJECTIVE(
@@ -59,7 +64,8 @@ public enum PacketIds {
             map(ProtocolConstants.MINECRAFT_1_19_3, 0x54),
             map(ProtocolConstants.MINECRAFT_1_19_4, 0x58),
             map(ProtocolConstants.MINECRAFT_1_20_2, 0x5A),
-            map(ProtocolConstants.MINECRAFT_1_20_4, 0x5C)
+            map(ProtocolConstants.MINECRAFT_1_20_4, 0x5C),
+            map(ProtocolConstants.MINECRAFT_1_20_6, 0x5E)
     );
 
     private final ProtocolConstants.ProtocolMapping[] mappings;

diff --git a/src/main/java/me/catcoder/sidebar/protocol/ProtocolConstants.java b/src/main/java/me/catcoder/sidebar/protocol/ProtocolConstants.java
@@ -41,13 +41,14 @@ public class ProtocolConstants {
     public static final int MINECRAFT_1_19_4 = 762;
 
     public static final int MINECRAFT_1_20 = 763;
-    public static final int MINECRAFT_1_20_1 = 763;
     public static final int MINECRAFT_1_20_2 = 764;
     public static final int MINECRAFT_1_20_3 = 765;
     public static final int MINECRAFT_1_20_4 = 765;
+    public static final int MINECRAFT_1_20_6 = 766;
+    public static final int MINECRAFT_1_21 = 767;
 
     public static final int MINIMUM_SUPPORTED_VERSION = MINECRAFT_1_12_2;
-    public static final int MAXIMUM_SUPPORTED_VERSION = MINECRAFT_1_20_4;
+    public static final int MAXIMUM_SUPPORTED_VERSION = MINECRAFT_1_21;
 
     @Getter
     @RequiredArgsConstructor

diff --git a/src/main/java/me/catcoder/sidebar/util/version/MinecraftProtocolVersion.java b/src/main/java/me/catcoder/sidebar/util/version/MinecraftProtocolVersion.java
@@ -60,6 +60,9 @@ private static NavigableMap<MinecraftVersion, Integer> createLookup() {
 
         map.put(new MinecraftVersion(1, 20, 2), ProtocolConstants.MINECRAFT_1_20_2);
         map.put(new MinecraftVersion(1, 20, 3), ProtocolConstants.MINECRAFT_1_20_3);
+        map.put(new MinecraftVersion(1, 20, 4), ProtocolConstants.MINECRAFT_1_20_4);
+        map.put(new MinecraftVersion(1, 20, 6), ProtocolConstants.MINECRAFT_1_20_6);
+        map.put(new MinecraftVersion(1, 21, 0), ProtocolConstants.MINECRAFT_1_21);
 
         return map;
     }