Fix join messages and /spawn on join on 1.19+.

retrixe · retrixe · commit f519614b3939 · 2022-12-20T01:31:49.000+05:30
diff --git a/src/minecraft/packets/chat.ts b/src/minecraft/packets/chat.ts
@@ -0,0 +1,35 @@
+import { concatPacketData, PacketDataTypes } from '../packet'
+import { protocolMap, writeVarInt } from '../utils'
+
+export const makeChatMessagePacket = (
+  msg: string,
+  protocolVersion: number,
+  msgSalt?: Buffer
+): [number, Buffer] => {
+  const is119 = protocolVersion >= protocolMap[1.19]
+  const is1191 = protocolVersion >= protocolMap['1.19.1']
+  if (!is119) {
+    return [0x03, concatPacketData([msg])]
+  } else {
+    const id = msg.startsWith('/')
+      ? is1191
+        ? 0x04
+        : 0x03
+      : is1191
+      ? 0x05
+      : 0x04
+    const timestamp = Buffer.alloc(8)
+    timestamp.writeIntBE(Date.now(), 2, 6) // writeBigInt64BE(BigInt(Date.now()))
+    const salt = msgSalt ?? Buffer.alloc(8)
+    // TODO-1.19: Send signature(s), preview chat, last seen messages and last received message if possible.
+    const data: PacketDataTypes[] = [
+      msg.startsWith('/') ? msg.substring(1) : msg,
+      timestamp,
+      salt,
+      writeVarInt(0),
+      false
+    ]
+    if (is1191) data.push(writeVarInt(0), writeVarInt(0))
+    return [id, concatPacketData(data)]
+  }
+}
diff --git a/src/screens/chat/ChatScreen.tsx b/src/screens/chat/ChatScreen.tsx
@@ -41,8 +41,7 @@ import {
   ClickEvent,
   ColorMap
 } from '../../minecraft/chatToJsx'
-import { protocolMap, writeVarInt } from '../../minecraft/utils'
-import { concatPacketData, PacketDataTypes } from '../../minecraft/packet'
+import { makeChatMessagePacket } from '../../minecraft/packets/chat'
 import TextField from '../../components/TextField'
 import Text from '../../components/Text'
 
@@ -254,38 +253,10 @@ const ChatScreen = ({ navigation, route }: Props) => {
     if (msg.startsWith('/') && saveHistory) {
       setCommandHistory(ch => ch.concat([msg]))
     }
-    const is119 =
-      connection.connection.options.protocolVersion >= protocolMap[1.19]
-    const is1191 =
-      connection.connection.options.protocolVersion >= protocolMap['1.19.1']
-    if (!is119) {
-      connection.connection
-        .writePacket(0x03, concatPacketData([msg]))
-        .catch(handleError(addMessage, sendMessageError))
-    } else {
-      const id = msg.startsWith('/')
-        ? is1191
-          ? 0x04
-          : 0x03
-        : is1191
-        ? 0x05
-        : 0x04
-      const timestamp = Buffer.alloc(8)
-      timestamp.writeIntBE(Date.now(), 2, 6) // writeBigInt64BE(BigInt(Date.now()))
-      const salt = connection.connection.msgSalt ?? Buffer.alloc(8)
-      // TODO-1.19: Send signature(s), preview chat, last seen messages and last received message if possible.
-      const data: PacketDataTypes[] = [
-        msg.startsWith('/') ? msg.substring(1) : msg,
-        timestamp,
-        salt,
-        writeVarInt(0),
-        false
-      ]
-      if (is1191) data.push(writeVarInt(0), writeVarInt(0))
-      connection.connection
-        .writePacket(id, concatPacketData(data))
-        .catch(handleError(addMessage, sendMessageError))
-    }
+    const protocolVersion = connection.connection.options.protocolVersion
+    connection.connection
+      .writePacket(...makeChatMessagePacket(msg, protocolVersion))
+      .catch(handleError(addMessage, sendMessageError))
   }
 
   const handleClickEvent = useCallback(
diff --git a/src/screens/chat/packetHandler.ts b/src/screens/chat/packetHandler.ts
@@ -2,8 +2,9 @@ import React from 'react'
 import { Status } from './ChatScreen'
 import { MinecraftChat, parseValidJson } from '../../minecraft/chatToJsx'
 import { ServerConnection } from '../../minecraft/connection'
-import { concatPacketData, Packet } from '../../minecraft/packet'
+import { Packet } from '../../minecraft/packet'
 import { protocolMap, readVarInt, writeVarInt } from '../../minecraft/utils'
+import { makeChatMessagePacket } from '../../minecraft/packets/chat'
 
 export const enderChatPrefix = '\u00A74[\u00A7cEnderChat\u00A74] \u00A7c'
 export const parseMessageError = 'An error occurred when parsing chat.'
@@ -94,13 +95,15 @@ export const packetHandler =
       statusRef.current = 'CONNECTED'
       const joinMessageToSend = joinMessage.substring(0, charLimit).trim()
       if (sendJoinMessage && joinMessageToSend) {
+        const protocolVer = connection.options.protocolVersion
         connection
-          .writePacket(0x03, concatPacketData([joinMessageToSend]))
+          .writePacket(...makeChatMessagePacket(joinMessageToSend, protocolVer))
           .catch(handleError(addMessage, sendMessageError))
       }
       if (sendSpawnCommand) {
+        const protocolVer = connection.options.protocolVersion
         connection
-          .writePacket(0x03, concatPacketData(['/spawn']))
+          .writePacket(...makeChatMessagePacket('/spawn', protocolVer))
           .catch(handleError(addMessage, sendMessageError))
       }
     }
