support mc 26.2, update viaversion dependencies

creeper123123321 · creeper123123321 · commit d865021bfcfd · 2026-07-01T11:08:29.000-03:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -68,11 +68,11 @@ dependencies {
     implementation(kotlin("stdlib-jdk8"))
     implementation(kotlin("reflect"))
 
-    val vvVer = "5.9.2-SNAPSHOT"
-    val vbVer = "5.9.2-SNAPSHOT"
-    val vrVer = "4.1.1"
-    val vafVer = "4.2.0"
-    val vlVer = "3.0.16-SNAPSHOT"
+    val vvVer = "5.10.1-SNAPSHOT"
+    val vbVer = "5.10.1-SNAPSHOT"
+    val vrVer = "4.1.3-SNAPSHOT"
+    val vafVer = "4.2.2-SNAPSHOT"
+    val vlVer = "3.0.17-SNAPSHOT"
     implementation("com.viaversion:viaversion-common:$vvVer") { isTransitive = false }
     implementation("com.viaversion:viabackwards-common:$vbVer") { isTransitive = false }
     implementation("com.viaversion:viarewind-common:$vrVer") { isTransitive = false }
diff --git a/src/main/kotlin/com/viaversion/aas/codec/packet/PacketRegistry.kt b/src/main/kotlin/com/viaversion/aas/codec/packet/PacketRegistry.kt
@@ -61,64 +61,64 @@ object PacketRegistry {
         // Configuration packets
         register(
             State.CONFIGURATION, Direction.CLIENTBOUND, ::ConfigurationCookieRequest,
-            ProtocolVersion.v1_20_5..ProtocolVersion.v26_1, 0x00
+            ProtocolVersion.v1_20_5..ProtocolVersion.v26_2, 0x00
         )
         register(
             State.CONFIGURATION, Direction.CLIENTBOUND, ::ConfigurationPluginMessage, mapOf(
                 ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to 0x00,
-                ProtocolVersion.v1_20_5..ProtocolVersion.v26_1 to 0x01
+                ProtocolVersion.v1_20_5..ProtocolVersion.v26_2 to 0x01
             )
         )
         register(
             State.CONFIGURATION, Direction.CLIENTBOUND, ::ConfigurationDisconnect, mapOf(
                 ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to 0x01,
-                ProtocolVersion.v1_20_5..ProtocolVersion.v26_1 to 0x02
+                ProtocolVersion.v1_20_5..ProtocolVersion.v26_2 to 0x02
             )
         )
         register(
             State.CONFIGURATION, Direction.CLIENTBOUND, ::FinishConfig, mapOf(
                 ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to 0x02,
-                ProtocolVersion.v1_20_5..ProtocolVersion.v26_1 to 0x03
+                ProtocolVersion.v1_20_5..ProtocolVersion.v26_2 to 0x03
             )
         )
         register(
             State.CONFIGURATION, Direction.CLIENTBOUND, ::ConfigurationKeepAlive, mapOf(
                 ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to 0x03,
-                ProtocolVersion.v1_20_5..ProtocolVersion.v26_1 to 0x04
+                ProtocolVersion.v1_20_5..ProtocolVersion.v26_2 to 0x04
             )
         )
         register(
             State.CONFIGURATION, Direction.CLIENTBOUND, ::ConfigurationTransfer,
-            ProtocolVersion.v1_20_5..ProtocolVersion.v26_1, 0x0B
+            ProtocolVersion.v1_20_5..ProtocolVersion.v26_2, 0x0B
         )
 
         register(
             State.CONFIGURATION, Direction.SERVERBOUND, ::ConfigurationCookieResponse,
-            ProtocolVersion.v1_20_5..ProtocolVersion.v26_1, 0x01
+            ProtocolVersion.v1_20_5..ProtocolVersion.v26_2, 0x01
         )
         register(
             State.CONFIGURATION, Direction.SERVERBOUND, ::ConfigurationPluginMessage, mapOf(
                 ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to 0x01,
-                ProtocolVersion.v1_20_5..ProtocolVersion.v26_1 to 0x02
+                ProtocolVersion.v1_20_5..ProtocolVersion.v26_2 to 0x02
             )
         )
         register(
             State.CONFIGURATION, Direction.SERVERBOUND, ::FinishConfigAck, mapOf(
                 ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to 0x02,
-                ProtocolVersion.v1_20_5..ProtocolVersion.v26_1 to 0x03
+                ProtocolVersion.v1_20_5..ProtocolVersion.v26_2 to 0x03
             )
         )
         register(
             State.CONFIGURATION, Direction.SERVERBOUND, ::ConfigurationKeepAlive, mapOf(
                 ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to 0x03,
-                ProtocolVersion.v1_20_5..ProtocolVersion.v26_1 to 0x04
+                ProtocolVersion.v1_20_5..ProtocolVersion.v26_2 to 0x04
             )
         )
 
         register(
             State.CONFIGURATION, Direction.SERVERBOUND, ::ConfigurationPing, mapOf(
                 ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to 0x04,
-                ProtocolVersion.v1_20_5..ProtocolVersion.v26_1 to 0x05
+                ProtocolVersion.v1_20_5..ProtocolVersion.v26_2 to 0x05
             )
         )
 
@@ -140,7 +140,7 @@ object PacketRegistry {
                 ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to 0x1B,
                 ProtocolVersion.v1_20_5..ProtocolVersion.v1_21_4 to 0x1D,
                 ProtocolVersion.v1_21_5..ProtocolVersion.v1_21_7 to 0x1C,
-                ProtocolVersion.v1_21_9..ProtocolVersion.v26_1 to 0x20
+                ProtocolVersion.v1_21_9..ProtocolVersion.v26_2 to 0x20
             )
         )
         register(
@@ -159,7 +159,7 @@ object PacketRegistry {
                 ProtocolVersion.v1_19_4..ProtocolVersion.v1_20 to 0x17,
                 ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to 0x18,
                 ProtocolVersion.v1_20_5..ProtocolVersion.v1_21_4 to 0x19,
-                ProtocolVersion.v1_21_5..ProtocolVersion.v26_1 to 0x18
+                ProtocolVersion.v1_21_5..ProtocolVersion.v26_2 to 0x18
             )
         )
         register(
@@ -170,7 +170,7 @@ object PacketRegistry {
                 ProtocolVersion.v1_21_2..ProtocolVersion.v1_21_4 to 0x70,
                 ProtocolVersion.v1_21_5..ProtocolVersion.v1_21_7 to 0x6F,
                 ProtocolVersion.v1_21_9..ProtocolVersion.v1_21_11 to 0x74,
-                ProtocolVersion.v26_1.sRange to 0x76
+                ProtocolVersion.v26_1..ProtocolVersion.v26_2 to 0x76
             )
         )
         register(
@@ -183,7 +183,7 @@ object PacketRegistry {
                 ProtocolVersion.v1_20_5..ProtocolVersion.v1_21 to ServerboundPackets1_20_5.CONFIGURATION_ACKNOWLEDGED.id,
                 ProtocolVersion.v1_21_2..ProtocolVersion.v1_21_5 to ServerboundPackets1_21_2.CONFIGURATION_ACKNOWLEDGED.id,
                 ProtocolVersion.v1_21_6..ProtocolVersion.v1_21_11 to ServerboundPackets1_21_6.CONFIGURATION_ACKNOWLEDGED.id,
-                ProtocolVersion.v26_1.sRange to 0x10
+                ProtocolVersion.v26_1..ProtocolVersion.v26_2 to 0x10
             )
         )
         register(
diff --git a/src/main/kotlin/com/viaversion/aas/codec/packet/login/LoginSuccess.kt b/src/main/kotlin/com/viaversion/aas/codec/packet/login/LoginSuccess.kt
@@ -13,6 +13,7 @@ class LoginSuccess : Packet {
     lateinit var id: UUID
     lateinit var username: String
     lateinit var properties: Array<GameProfile.Property>
+    lateinit var sessionId: UUID
     private var strictErrorHandling: Boolean = false
 
     override fun decode(byteBuf: ByteBuf, protocolVersion: ProtocolVersion) {
@@ -33,6 +34,9 @@ class LoginSuccess : Packet {
             && protocolVersion <= ProtocolVersion.v1_21) {
             strictErrorHandling = byteBuf.readBoolean()
         }
+        if (protocolVersion >= ProtocolVersion.v26_2) {
+            sessionId = Types.UUID.read(byteBuf)
+        }
     }
 
     override fun encode(byteBuf: ByteBuf, protocolVersion: ProtocolVersion) {
@@ -53,5 +57,8 @@ class LoginSuccess : Packet {
             && protocolVersion <= ProtocolVersion.v1_21) {
             byteBuf.writeBoolean(strictErrorHandling)
         }
+        if (protocolVersion >= ProtocolVersion.v26_2) {
+            Types.UUID.write(byteBuf, sessionId)
+        }
     }
 }
diff --git a/src/main/resources/web/index.html b/src/main/resources/web/index.html
@@ -115,6 +115,8 @@
                     </div>
                     <datalist id="backend_version_list">
                         <option>AUTO</option>
+                        <option>26.2</option>
+                        <option>26.1</option>
                         <option>1.21.11</option>
                         <option value="1.21.10">1.21.9/10</option>
                         <option value="1.21.8">1.21.7/8</option>

Original file line number	Diff line number	Diff line change
`@@ -61,64 +61,64 @@ object PacketRegistry {`
`61`	`61`	`// Configuration packets`
`62`	`62`	`register(`
`63`	`63`	`State.CONFIGURATION, Direction.CLIENTBOUND, ::ConfigurationCookieRequest,`
`64`		`- ProtocolVersion.v1_20_5..ProtocolVersion.v26_1, 0x00`
	`64`	`+ ProtocolVersion.v1_20_5..ProtocolVersion.v26_2, 0x00`
`65`	`65`	`)`
`66`	`66`	`register(`
`67`	`67`	`State.CONFIGURATION, Direction.CLIENTBOUND, ::ConfigurationPluginMessage, mapOf(`
`68`	`68`	`ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to 0x00,`
`69`		`- ProtocolVersion.v1_20_5..ProtocolVersion.v26_1 to 0x01`
	`69`	`+ ProtocolVersion.v1_20_5..ProtocolVersion.v26_2 to 0x01`
`70`	`70`	`)`
`71`	`71`	`)`
`72`	`72`	`register(`
`73`	`73`	`State.CONFIGURATION, Direction.CLIENTBOUND, ::ConfigurationDisconnect, mapOf(`
`74`	`74`	`ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to 0x01,`
`75`		`- ProtocolVersion.v1_20_5..ProtocolVersion.v26_1 to 0x02`
	`75`	`+ ProtocolVersion.v1_20_5..ProtocolVersion.v26_2 to 0x02`
`76`	`76`	`)`
`77`	`77`	`)`
`78`	`78`	`register(`
`79`	`79`	`State.CONFIGURATION, Direction.CLIENTBOUND, ::FinishConfig, mapOf(`
`80`	`80`	`ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to 0x02,`
`81`		`- ProtocolVersion.v1_20_5..ProtocolVersion.v26_1 to 0x03`
	`81`	`+ ProtocolVersion.v1_20_5..ProtocolVersion.v26_2 to 0x03`
`82`	`82`	`)`
`83`	`83`	`)`
`84`	`84`	`register(`
`85`	`85`	`State.CONFIGURATION, Direction.CLIENTBOUND, ::ConfigurationKeepAlive, mapOf(`
`86`	`86`	`ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to 0x03,`
`87`		`- ProtocolVersion.v1_20_5..ProtocolVersion.v26_1 to 0x04`
	`87`	`+ ProtocolVersion.v1_20_5..ProtocolVersion.v26_2 to 0x04`
`88`	`88`	`)`
`89`	`89`	`)`
`90`	`90`	`register(`
`91`	`91`	`State.CONFIGURATION, Direction.CLIENTBOUND, ::ConfigurationTransfer,`
`92`		`- ProtocolVersion.v1_20_5..ProtocolVersion.v26_1, 0x0B`
	`92`	`+ ProtocolVersion.v1_20_5..ProtocolVersion.v26_2, 0x0B`
`93`	`93`	`)`
`94`	`94`
`95`	`95`	`register(`
`96`	`96`	`State.CONFIGURATION, Direction.SERVERBOUND, ::ConfigurationCookieResponse,`
`97`		`- ProtocolVersion.v1_20_5..ProtocolVersion.v26_1, 0x01`
	`97`	`+ ProtocolVersion.v1_20_5..ProtocolVersion.v26_2, 0x01`
`98`	`98`	`)`
`99`	`99`	`register(`
`100`	`100`	`State.CONFIGURATION, Direction.SERVERBOUND, ::ConfigurationPluginMessage, mapOf(`
`101`	`101`	`ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to 0x01,`
`102`		`- ProtocolVersion.v1_20_5..ProtocolVersion.v26_1 to 0x02`
	`102`	`+ ProtocolVersion.v1_20_5..ProtocolVersion.v26_2 to 0x02`
`103`	`103`	`)`
`104`	`104`	`)`
`105`	`105`	`register(`
`106`	`106`	`State.CONFIGURATION, Direction.SERVERBOUND, ::FinishConfigAck, mapOf(`
`107`	`107`	`ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to 0x02,`
`108`		`- ProtocolVersion.v1_20_5..ProtocolVersion.v26_1 to 0x03`
	`108`	`+ ProtocolVersion.v1_20_5..ProtocolVersion.v26_2 to 0x03`
`109`	`109`	`)`
`110`	`110`	`)`
`111`	`111`	`register(`
`112`	`112`	`State.CONFIGURATION, Direction.SERVERBOUND, ::ConfigurationKeepAlive, mapOf(`
`113`	`113`	`ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to 0x03,`
`114`		`- ProtocolVersion.v1_20_5..ProtocolVersion.v26_1 to 0x04`
	`114`	`+ ProtocolVersion.v1_20_5..ProtocolVersion.v26_2 to 0x04`
`115`	`115`	`)`
`116`	`116`	`)`
`117`	`117`
`118`	`118`	`register(`
`119`	`119`	`State.CONFIGURATION, Direction.SERVERBOUND, ::ConfigurationPing, mapOf(`
`120`	`120`	`ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to 0x04,`
`121`		`- ProtocolVersion.v1_20_5..ProtocolVersion.v26_1 to 0x05`
	`121`	`+ ProtocolVersion.v1_20_5..ProtocolVersion.v26_2 to 0x05`
`122`	`122`	`)`
`123`	`123`	`)`
`124`	`124`
`@@ -140,7 +140,7 @@ object PacketRegistry {`
`140`	`140`	`ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to 0x1B,`
`141`	`141`	`ProtocolVersion.v1_20_5..ProtocolVersion.v1_21_4 to 0x1D,`
`142`	`142`	`ProtocolVersion.v1_21_5..ProtocolVersion.v1_21_7 to 0x1C,`
`143`		`- ProtocolVersion.v1_21_9..ProtocolVersion.v26_1 to 0x20`
	`143`	`+ ProtocolVersion.v1_21_9..ProtocolVersion.v26_2 to 0x20`
`144`	`144`	`)`
`145`	`145`	`)`
`146`	`146`	`register(`
`@@ -159,7 +159,7 @@ object PacketRegistry {`
`159`	`159`	`ProtocolVersion.v1_19_4..ProtocolVersion.v1_20 to 0x17,`
`160`	`160`	`ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to 0x18,`
`161`	`161`	`ProtocolVersion.v1_20_5..ProtocolVersion.v1_21_4 to 0x19,`
`162`		`- ProtocolVersion.v1_21_5..ProtocolVersion.v26_1 to 0x18`
	`162`	`+ ProtocolVersion.v1_21_5..ProtocolVersion.v26_2 to 0x18`
`163`	`163`	`)`
`164`	`164`	`)`
`165`	`165`	`register(`
`@@ -170,7 +170,7 @@ object PacketRegistry {`
`170`	`170`	`ProtocolVersion.v1_21_2..ProtocolVersion.v1_21_4 to 0x70,`
`171`	`171`	`ProtocolVersion.v1_21_5..ProtocolVersion.v1_21_7 to 0x6F,`
`172`	`172`	`ProtocolVersion.v1_21_9..ProtocolVersion.v1_21_11 to 0x74,`
`173`		`- ProtocolVersion.v26_1.sRange to 0x76`
	`173`	`+ ProtocolVersion.v26_1..ProtocolVersion.v26_2 to 0x76`
`174`	`174`	`)`
`175`	`175`	`)`
`176`	`176`	`register(`
`@@ -183,7 +183,7 @@ object PacketRegistry {`
`183`	`183`	`ProtocolVersion.v1_20_5..ProtocolVersion.v1_21 to ServerboundPackets1_20_5.CONFIGURATION_ACKNOWLEDGED.id,`
`184`	`184`	`ProtocolVersion.v1_21_2..ProtocolVersion.v1_21_5 to ServerboundPackets1_21_2.CONFIGURATION_ACKNOWLEDGED.id,`
`185`	`185`	`ProtocolVersion.v1_21_6..ProtocolVersion.v1_21_11 to ServerboundPackets1_21_6.CONFIGURATION_ACKNOWLEDGED.id,`
`186`		`- ProtocolVersion.v26_1.sRange to 0x10`
	`186`	`+ ProtocolVersion.v26_1..ProtocolVersion.v26_2 to 0x10`
`187`	`187`	`)`
`188`	`188`	`)`
`189`	`189`	`register(`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ class LoginSuccess : Packet {`
`13`	`13`	`lateinit var id: UUID`
`14`	`14`	`lateinit var username: String`
`15`	`15`	`lateinit var properties: Array<GameProfile.Property>`
	`16`	`+ lateinit var sessionId: UUID`
`16`	`17`	`private var strictErrorHandling: Boolean = false`
`17`	`18`
`18`	`19`	`override fun decode(byteBuf: ByteBuf, protocolVersion: ProtocolVersion) {`
`@@ -33,6 +34,9 @@ class LoginSuccess : Packet {`
`33`	`34`	`&& protocolVersion <= ProtocolVersion.v1_21) {`
`34`	`35`	`strictErrorHandling = byteBuf.readBoolean()`
`35`	`36`	`}`
	`37`	`+ if (protocolVersion >= ProtocolVersion.v26_2) {`
	`38`	`+ sessionId = Types.UUID.read(byteBuf)`
	`39`	`+ }`
`36`	`40`	`}`
`37`	`41`
`38`	`42`	`override fun encode(byteBuf: ByteBuf, protocolVersion: ProtocolVersion) {`
`@@ -53,5 +57,8 @@ class LoginSuccess : Packet {`
`53`	`57`	`&& protocolVersion <= ProtocolVersion.v1_21) {`
`54`	`58`	`byteBuf.writeBoolean(strictErrorHandling)`
`55`	`59`	`}`
	`60`	`+ if (protocolVersion >= ProtocolVersion.v26_2) {`
	`61`	`+ Types.UUID.write(byteBuf, sessionId)`
	`62`	`+ }`
`56`	`63`	`}`
`57`	`64`	`}`