Fix 1.20.6 IDs, fix chat bug, support keybind chat

retrixe · retrixe · commit 096c5143a961 · 2024-06-07T03:09:12.000+05:30
diff --git a/android/app/src/main/java/com/enderchat/modules/connection/ConnectionModule.kt b/android/app/src/main/java/com/enderchat/modules/connection/ConnectionModule.kt
@@ -194,20 +194,31 @@ class ConnectionModule(reactContext: ReactApplicationContext)
             val loginAcknowledgedId = 0x03
             val setCompressionId = 0x03
             // Configuration state packet IDs
-            val configurationKeepAliveClientBoundId = 0x03
-            val configurationKeepAliveServerBoundId = 0x03
-            val finishConfigurationClientBoundId = 0x02
-            val finishConfigurationServerBoundId = 0x02
+            val configurationKeepAliveClientBoundId =
+                if (protocolVersion >= PROTOCOL_VERSION_1205) 0x04
+                else 0x03
+            val configurationKeepAliveServerBoundId =
+                if (protocolVersion >= PROTOCOL_VERSION_1205) 0x04
+                else 0x03
+            val finishConfigurationClientBoundId =
+                if (protocolVersion >= PROTOCOL_VERSION_1205) 0x03
+                else 0x02
+            val finishConfigurationServerBoundId =
+                if (protocolVersion >= PROTOCOL_VERSION_1205) 0x03
+                else 0x02
             // Play state packet IDs
             val startConfigurationClientBoundId =
-                if (protocolVersion >= PROTOCOL_VERSION_1203) 0x67
+                if (protocolVersion >= PROTOCOL_VERSION_1205) 0x69
+                else if (protocolVersion >= PROTOCOL_VERSION_1203) 0x67
                 else if (protocolVersion >= PROTOCOL_VERSION_1202) 0x65
                 else -1
             val acknowledgeConfigurationServerBoundId =
-                if (protocolVersion >= PROTOCOL_VERSION_1202) 0x0b
+                if (protocolVersion >= PROTOCOL_VERSION_1205) 0x0c
+                else if (protocolVersion >= PROTOCOL_VERSION_1202) 0x0b
                 else -1
             val playKeepAliveClientBoundId =
-                if (protocolVersion >= PROTOCOL_VERSION_1202) 0x24
+                if (protocolVersion >= PROTOCOL_VERSION_1205) 0x26
+                else if (protocolVersion >= PROTOCOL_VERSION_1202) 0x24
                 else if (protocolVersion >= PROTOCOL_VERSION_1194) 0x23
                 else if (protocolVersion >= PROTOCOL_VERSION_1193) 0x1f
                 else if (protocolVersion >= PROTOCOL_VERSION_1191) 0x20
@@ -216,7 +227,8 @@ class ConnectionModule(reactContext: ReactApplicationContext)
                 else if (protocolVersion >= PROTOCOL_VERSION_1164) 0x1f
                 else -1
             val playKeepAliveServerBoundId =
-                if (protocolVersion >= PROTOCOL_VERSION_1203) 0x15
+                if (protocolVersion >= PROTOCOL_VERSION_1205) 0x18
+                else if (protocolVersion >= PROTOCOL_VERSION_1203) 0x15
                 else if (protocolVersion >= PROTOCOL_VERSION_1202) 0x14
                 else if (protocolVersion >= PROTOCOL_VERSION_1194) 0x12
                 else if (protocolVersion >= PROTOCOL_VERSION_1193) 0x11
diff --git a/android/app/src/main/java/com/enderchat/modules/connection/Utils.kt b/android/app/src/main/java/com/enderchat/modules/connection/Utils.kt
@@ -18,6 +18,7 @@ const val PROTOCOL_VERSION_1193 = 761
 const val PROTOCOL_VERSION_1194 = 762
 const val PROTOCOL_VERSION_1202 = 764
 const val PROTOCOL_VERSION_1203 = 765
+const val PROTOCOL_VERSION_1205 = 766
 
 fun compressData(bytes: ByteArray): ByteArray {
     ByteArrayOutputStream(bytes.size).use {
diff --git a/src/minecraft/chatToJsx.tsx b/src/minecraft/chatToJsx.tsx
@@ -3,6 +3,7 @@ import { type StyleProp, type TextProps, type TextStyle } from 'react-native'
 import translationsJson from './translations.json'
 
 const translations: Record<string, string> = translationsJson
+// Keybinds are not supported in EnderChat, so we'll just display the keybind as text in keybindChat
 
 export const mojangColorMap: ColorMap = {
   black: '#000000',
@@ -75,6 +76,10 @@ export interface TranslatedChat extends BaseChat {
   with: MinecraftChat[]
 }
 
+export interface KeybindChat extends BaseChat {
+  keybind: string
+}
+
 export type MinecraftChat = PlainTextChat | TranslatedChat | string
 
 export interface ClickEvent {
@@ -193,7 +198,8 @@ const trimComponentsByLine = (chat: PlainTextChat[]): PlainTextChat[] => {
 }
 
 const isTranslatedChat = (chat: MinecraftChat): chat is TranslatedChat =>
-  typeof (chat as TranslatedChat).translate === 'string'
+  typeof (chat as TranslatedChat).translate === 'string' ||
+  (chat as TranslatedChat).type === 'translatable'
 
 const translateChat = (chat: TranslatedChat): PlainTextChat => {
   const { translate, with: tw, ...c } = chat
@@ -215,8 +221,28 @@ const translateChat = (chat: TranslatedChat): PlainTextChat => {
   }
 }
 
+const isKeybindChat = (chat: MinecraftChat): chat is KeybindChat =>
+  typeof (chat as KeybindChat).keybind === 'string' ||
+  (chat as KeybindChat).type === 'keybind'
+
+const keybindChat = (chat: KeybindChat): PlainTextChat => {
+  const { keybind, ...c } = chat
+  return { ...c, text: keybind }
+}
+
 const flattenComponents = (chat: MinecraftChat): PlainTextChat[] => {
   if (typeof chat === 'string') return parseColorCodes(chat)
+  // Fix components with empty string keys.....
+  const looseChat = chat as any
+  if (looseChat['']) {
+    const key = isTranslatedChat(chat)
+      ? 'translate'
+      : isKeybindChat(chat)
+        ? 'keybind'
+        : 'text'
+    looseChat[key] = looseChat['']
+  }
+  if (isKeybindChat(chat)) chat = keybindChat(chat)
   else if (isTranslatedChat(chat)) chat = translateChat(chat)
   const { extra, ...c } = chat
   const arr =
