From a2971c3a0cc77060f516cfa4ea79632731263cef Mon Sep 17 00:00:00 2001
From: Moritz Zwerger <bixilon@bixilon.de>
Date: Fri, 8 Dec 2023 18:50:30 +0100
Subject: [PATCH] signed chat test: fix reading wrong version

---
 .../s2c/play/chat/SignedChatMessageS2CPTest.kt    |  12 +++++++++---
 .../signed_chat_message/vanilla_1_20_4.bin        | Bin 0 -> 613 bytes
 2 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 src/integration-test/resources/packets/signed_chat_message/vanilla_1_20_4.bin

diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/protocol/packets/s2c/play/chat/SignedChatMessageS2CPTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/protocol/packets/s2c/play/chat/SignedChatMessageS2CPTest.kt
index 13089ad73..6fc616985 100644
--- a/src/integration-test/kotlin/de/bixilon/minosoft/protocol/packets/s2c/play/chat/SignedChatMessageS2CPTest.kt
+++ b/src/integration-test/kotlin/de/bixilon/minosoft/protocol/packets/s2c/play/chat/SignedChatMessageS2CPTest.kt
@@ -31,8 +31,8 @@ import org.testng.annotations.Test
 @Test(groups = ["packet"])
 class SignedChatMessageS2CPTest {
 
-    private fun connection(): PlayConnection {
-        val connection = createConnection()
+    private fun connection(version: String): PlayConnection {
+        val connection = createConnection(version = version)
         connection::language.forceSet(LanguageList(mutableListOf()))
         connection::tabList.forceSet(TabList())
         connection.registries.messageType[0] = ChatMessageType(minecraft("dummy"), TypeProperties("test", emptyList(), emptyMap()), null, ChatTextPositions.CHAT)
@@ -41,9 +41,15 @@ class SignedChatMessageS2CPTest {
     }
 
     fun vanilla_23w40a() {
-        val packet = PacketReadingTestUtil.read("signed_chat_message/vanilla_23w40a", "23w40a", connection(), constructor = ::SignedChatMessageS2CP)
+        val packet = PacketReadingTestUtil.read("signed_chat_message/vanilla_23w40a", "23w40a", connection("23w40a"), constructor = ::SignedChatMessageS2CP)
         assertEquals(packet.message.message, "abc")
         assertEquals(packet.message.sender, UnknownMessageSender("a21a6c65-bbd4-48ca-9d79-e07139e1780d".toUUID()))
     }
+
+    fun `vanilla 1_20_4`() {
+        val packet = PacketReadingTestUtil.read("signed_chat_message/vanilla_1_20_4", "1.20.4", connection("1.20.4"), constructor = ::SignedChatMessageS2CP)
+        assertEquals(packet.message.message, "very signed message")
+        assertEquals(packet.message.sender, UnknownMessageSender("24f0d4a2-1787-4761-aeef-39c90824e746".toUUID()))
+    }
 }
 
diff --git a/src/integration-test/resources/packets/signed_chat_message/vanilla_1_20_4.bin b/src/integration-test/resources/packets/signed_chat_message/vanilla_1_20_4.bin
new file mode 100644
index 0000000000000000000000000000000000000000..28e3eb033b760aeb43cc2fc148d280a450e2e3ac
GIT binary patch
literal 613
zcmY%SaAlEryL;lg_m(F)RGzyrFeddxzVuINsgQjwy0F}v^Mr}Gy424FM*aJycwI?a
z%X&!Hc2ct5=U#gQy;V-n98(wS=^3w7{<yx{x=Qr!-glxiRk&ZCZ|>I7jB%*Fv@Vce
zRweWkXYsS;=8~J{x=mkJ|KZ!D72juC$zQhTZ)!d{*+*g9%JbWM*QrD-;t00b%aCJT
zEN<9;{=>qrmES}KyBmW~uXb5G^OFV31^1aT^R6w(az4-@=Xy@?$FkSrFBko`I5vBd
z`ZdjyJYSTTWj#E6cx}_pX}J}_uFstvPa99D^Sf!8ZgOo+pvOuVq5biD992?3HTjFE
z#1_r1Y?#j0!R{Gk9htb#R%}hjmH^ucrOUW(L>v(=OD(EYD9%jJOHEP8O)V}?OiyKC
zVC?Z~(p`MxZ|L+X%mEA_z{SPDm5~or>{^zZSHi`>k({4b0%R3)FtFq$=B6@mmSm)s
zCzfR9rE@bdWu^eNu&AJgHc)9vWkD)~KyGGUYI0FxT8ULbPGV(h5d#MUTViraW_}(6
zcX393c|6eI%#un5pq<G%naSB;I}vL5i%ZkfQ;SRDlk;<P6Z29y7+A{^b4q~*>zAbF
z<S4*hq5w3QH90>gzleb~y(l#`kCTBlwW6dbkqhWNW;8jF>wuCB9MMidvom8sni-J1
Y1?DmUNzTl?;?yFrYZ0D?=>}>60MtC?N&o-=

literal 0
HcmV?d00001