From 28022a20546fb9b6185773780f6232cf6bb87e50 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 6 May 2025 16:36:31 +0300
Subject: [PATCH 01/62] feat: rework server data saving and auto login by using
 more aggressive strategy

---
 src/connect.ts                    |  1 -
 src/index.ts                      |  7 ++++---
 src/react/ChatProvider.tsx        |  6 +++---
 src/react/ServersListProvider.tsx |  1 -
 src/react/serversStorage.ts       | 30 ++++++++++++++++++++++++++++--
 5 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/connect.ts b/src/connect.ts
index b68e4325..914303c6 100644
--- a/src/connect.ts
+++ b/src/connect.ts
@@ -21,7 +21,6 @@ export type ConnectOptions = {
   peerId?: string
   ignoreQs?: boolean
   onSuccessfulPlay?: () => void
-  autoLoginPassword?: string
   serverIndex?: string
   authenticatedAccount?: AuthenticatedAccount | true
   peerOptions?: any
diff --git a/src/index.ts b/src/index.ts
index 26bba494..afa349fa 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -77,7 +77,7 @@ import './water'
 import { ConnectOptions, getVersionAutoSelect, downloadOtherGameData, downloadAllMinecraftData } from './connect'
 import { ref, subscribe } from 'valtio'
 import { signInMessageState } from './react/SignInMessageProvider'
-import { updateAuthenticatedAccountData, updateLoadedServerData, updateServerConnectionHistory } from './react/serversStorage'
+import { findServerPassword, updateAuthenticatedAccountData, updateLoadedServerData, updateServerConnectionHistory } from './react/serversStorage'
 import { mainMenuState } from './react/MainMenuRenderApp'
 import './mobileShim'
 import { parseFormattedMessagePacket } from './botUtils'
@@ -754,9 +754,10 @@ export async function connect (connectOptions: ConnectOptions) {
       }
       connectOptions.onSuccessfulPlay?.()
       updateDataAfterJoin()
-      if (connectOptions.autoLoginPassword) {
+      const password = findServerPassword()
+      if (password) {
         setTimeout(() => {
-          bot.chat(`/login ${connectOptions.autoLoginPassword}`)
+          bot.chat(`/login ${password}`)
         }, 500)
       }
 
diff --git a/src/react/ChatProvider.tsx b/src/react/ChatProvider.tsx
index 50912820..4acc9e79 100644
--- a/src/react/ChatProvider.tsx
+++ b/src/react/ChatProvider.tsx
@@ -8,7 +8,7 @@ import { viewerVersionState } from '../viewerConnector'
 import Chat, { Message, fadeMessage } from './Chat'
 import { useIsModalActive } from './utilsApp'
 import { hideNotification, notificationProxy, showNotification } from './NotificationProvider'
-import { updateLoadedServerData } from './serversStorage'
+import { getServerIndex, updateLoadedServerData } from './serversStorage'
 import { lastConnectOptions } from './AppStatusProvider'
 import { showOptionsModal } from './SelectOption'
 
@@ -56,13 +56,13 @@ export default () => {
     placeholder={forwardChat || !viewerConnection ? undefined : 'Chat forwarding is not enabled in the plugin settings'}
     sendMessage={async (message) => {
       const builtinHandled = tryHandleBuiltinCommand(message)
-      if (miscUiState.loadedServerIndex && (message.startsWith('/login') || message.startsWith('/register'))) {
+      if (getServerIndex() !== undefined && (message.startsWith('/login') || message.startsWith('/register'))) {
         showNotification('Click here to save your password in browser for auto-login', undefined, false, undefined, () => {
           updateLoadedServerData((server) => {
             server.autoLogin ??= {}
             const password = message.split(' ')[1]
             server.autoLogin[bot.username] = password
-            return server
+            return { ...server }
           })
           hideNotification()
         })
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index cd44a27a..8692e0bd 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -287,7 +287,6 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
         proxy: overrides.proxyOverride || getCurrentProxy(),
         botVersion: overrides.versionOverride ?? /* legacy */ overrides['version'],
         ignoreQs: true,
-        autoLoginPassword: server?.autoLogin?.[username],
         authenticatedAccount,
         saveServerToHistory: shouldSave,
         onSuccessfulPlay () {
diff --git a/src/react/serversStorage.ts b/src/react/serversStorage.ts
index b320e2f3..9b095454 100644
--- a/src/react/serversStorage.ts
+++ b/src/react/serversStorage.ts
@@ -1,6 +1,7 @@
 import { appQueryParams } from '../appParams'
 import { miscUiState } from '../globalState'
 import { BaseServerInfo } from './AddServerOrConnect'
+import { lastConnectOptions } from './AppStatusProvider'
 import { appStorage, StoreServerItem } from './appStorageProvider'
 
 const serversListQs = appQueryParams.serversList
@@ -43,9 +44,34 @@ export function updateServerConnectionHistory (ip: string, version?: string) {
   }
 }
 
-export const updateLoadedServerData = (callback: (data: StoreServerItem) => StoreServerItem, index = miscUiState.loadedServerIndex) => {
-  if (index === undefined) index = miscUiState.loadedServerIndex
+export const getServerIndex = () => {
+  const lastConnectedIp = lastConnectOptions.value?.server
+  const index = miscUiState.loadedServerIndex
+  if (index !== undefined) return index
+  if (lastConnectedIp) {
+    const idx = appStorage.serversList?.findIndex(s => s.ip === lastConnectedIp).toString()
+    if (idx === '-1') return undefined
+    return idx
+  }
+  return undefined
+}
+
+export const findServerPassword = () => {
+  const { username } = bot
+  const index = getServerIndex()
   if (index === undefined) return
+  const pswd = appStorage.serversList?.[index]?.autoLogin?.[username]
+  if (pswd) return pswd
+  // try other servers with same host
+  return appStorage.serversList?.find(s => s.ip === lastConnectOptions.value?.server && s.autoLogin?.[username])?.autoLogin?.[username]
+}
+
+export const updateLoadedServerData = (callback: (data: StoreServerItem) => StoreServerItem, index = miscUiState.loadedServerIndex) => {
+  if (index === undefined) {
+    const idx = getServerIndex()
+    if (idx === undefined) return
+    index = idx
+  }
 
   const servers = [...(appStorage.serversList ?? [])]
   const server = servers[index]

From bb9bb48efd60d3e617e48748988e86e1ce03d1a0 Mon Sep 17 00:00:00 2001
From: M G <118717627+mgDentist@users.noreply.github.com>
Date: Tue, 6 May 2025 16:39:42 +0300
Subject: [PATCH 02/62] feat: Combine IP and port input fields (#345)

---
 src/react/AddServerOrConnect.tsx | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/react/AddServerOrConnect.tsx b/src/react/AddServerOrConnect.tsx
index 08ef7f29..19332472 100644
--- a/src/react/AddServerOrConnect.tsx
+++ b/src/react/AddServerOrConnect.tsx
@@ -46,8 +46,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
   const parsedInitialIp = parseServerAddress(initialData?.ip)
 
   const [serverName, setServerName] = React.useState(initialData?.name ?? qsParamName ?? '')
-  const [serverIp, setServerIp] = React.useState(parsedQsIp.host || parsedInitialIp.host || '')
-  const [serverPort, setServerPort] = React.useState(parsedQsIp.port || parsedInitialIp.port || '')
+  const [serverIp, setServerIp] = React.useState(parsedQsIp.serverIpFull || parsedInitialIp.serverIpFull || '')
   const [versionOverride, setVersionOverride] = React.useState(initialData?.versionOverride ?? /* legacy */ initialData?.['version'] ?? qsParamVersion ?? '')
   const [proxyOverride, setProxyOverride] = React.useState(initialData?.proxyOverride ?? qsParamProxy ?? '')
   const [usernameOverride, setUsernameOverride] = React.useState(initialData?.usernameOverride ?? qsParamUsername ?? '')
@@ -61,7 +60,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
   const noAccountSelected = accountIndex === -1
   const authenticatedAccountOverride = noAccountSelected ? undefined : freshAccount ? true : accounts?.[accountIndex]
 
-  let ipFinal = serverIp.includes(':') ? serverIp : `${serverIp}${serverPort ? `:${serverPort}` : ''}`
+  let ipFinal = serverIp
   ipFinal = ipFinal.replace(/:$/, '')
   const commonUseOptions: BaseServerInfo = {
     name: serverName,
@@ -126,6 +125,9 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
   }, [])
 
   const displayConnectButton = qsParamIp
+  const serverExamples = ['example.com:25565', 'play.hypixel.net', 'ws://play.pcm.gg']
+  // pick random example
+  const example = serverExamples[Math.floor(Math.random() * serverExamples.length)]
 
   return <Screen title={qsParamIp ? 'Connect to Server' : title} backdrop>
     <form
@@ -149,11 +151,6 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
         })
       }}
       >
-        {!lockConnect && <>
-          <div style={{ gridColumn: smallWidth ? '' : 'span 2', display: 'flex', justifyContent: 'center' }}>
-            <InputWithLabel label="Server Name" value={serverName} onChange={({ target: { value } }) => setServerName(value)} placeholder='Defaults to IP' />
-          </div>
-        </>}
         <InputWithLabel
           required
           label="Server IP"
@@ -165,8 +162,13 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
             setServerOnline(false)
           }}
           validateInput={serverOnline === null || fetchedServerInfoIp !== serverIp ? undefined : validateServerIp}
+          placeholder={example}
         />
-        <InputWithLabel label="Server Port" value={serverPort} disabled={lockConnect && parsedQsIp.port !== null} onChange={({ target: { value } }) => setServerPort(value)} placeholder={serverIp.startsWith('ws://') || serverIp.startsWith('wss://') ? '' : '25565'} />
+        {!lockConnect && <>
+          <div style={{ display: 'flex', justifyContent: 'center' }}>
+            <InputWithLabel label="Server Name" value={serverName} onChange={({ target: { value } }) => setServerName(value)} placeholder='Defaults to IP' />
+          </div>
+        </>}
         {isSmallHeight ? <div style={{ gridColumn: 'span 2', marginTop: 10, }} /> : <div style={{ gridColumn: smallWidth ? '' : 'span 2' }}>Overrides:</div>}
         <div style={{
           display: 'flex',

From bf3381c80390b458291b80042e5ba4f4b1056321 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Wed, 7 May 2025 15:03:48 +0300
Subject: [PATCH 03/62] Do not automatically enable renderer debug in dev

---
 src/optionsStorage.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 65c0b4ba..bc58d21c 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -103,7 +103,7 @@ const defaultOptions = {
   autoJump: 'auto' as 'auto' | 'always' | 'never',
   autoParkour: false,
   vrSupport: true, // doesn't directly affect the VR mode, should only disable the button which is annoying to android users
-  renderDebug: (isDev ? 'advanced' : 'basic') as 'none' | 'advanced' | 'basic',
+  renderDebug: 'basic' as 'none' | 'advanced' | 'basic',
 
   // advanced bot options
   autoRespawn: false,

From b3392bea6bdc0ec3776ababf0a7235cfaa852360 Mon Sep 17 00:00:00 2001
From: M G <118717627+mgDentist@users.noreply.github.com>
Date: Wed, 7 May 2025 16:31:36 +0300
Subject: [PATCH 04/62] feat: Entity interaction button for mobile (#346)

---
 src/react/TouchInteractionHint.module.css |  7 ++++-
 src/react/TouchInteractionHint.tsx        | 36 ++++++++++++++++++-----
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/react/TouchInteractionHint.module.css b/src/react/TouchInteractionHint.module.css
index 026b49c8..73fae1fc 100644
--- a/src/react/TouchInteractionHint.module.css
+++ b/src/react/TouchInteractionHint.module.css
@@ -1,8 +1,8 @@
 .hint_container {
   position: fixed;
-  top: 20%;
   left: 0;
   right: 0;
+  bottom: calc(var(--safe-area-inset-bottom) + 55px); 
   margin: 0 auto;
   width: fit-content;
   display: flex;
@@ -13,6 +13,11 @@
   text-shadow: 1px 1px 8px rgba(0, 0, 0, 1);
 }
 
+.hint_container > button {
+  width: auto;
+  padding: 0 10px;
+}
+
 .hint_text {
   color: white;
   font-size: 10px;
diff --git a/src/react/TouchInteractionHint.tsx b/src/react/TouchInteractionHint.tsx
index e08e4634..bf2b42f0 100644
--- a/src/react/TouchInteractionHint.tsx
+++ b/src/react/TouchInteractionHint.tsx
@@ -3,28 +3,33 @@ import { useSnapshot } from 'valtio'
 import { options } from '../optionsStorage'
 import { activeModalStack } from '../globalState'
 import { videoCursorInteraction } from '../customChannels'
-import PixelartIcon, { pixelartIcons } from './PixelartIcon'
+// import PixelartIcon, { pixelartIcons } from './PixelartIcon'
 import styles from './TouchInteractionHint.module.css'
 import { useUsingTouch } from './utilsApp'
+import Button from './Button'
 
 export default () => {
   const usingTouch = useUsingTouch()
   const modalStack = useSnapshot(activeModalStack)
   const { touchInteractionType } = useSnapshot(options)
   const [hintText, setHintText] = useState<string | null>(null)
+  const [entityName, setEntityName] = useState<string | null>(null)
 
   useEffect(() => {
     const update = () => {
       const videoInteraction = videoCursorInteraction()
       if (videoInteraction) {
         setHintText(`Interact with video`)
+        setEntityName(null)
       } else {
         const cursorState = bot.mouse.getCursorState()
         if (cursorState.entity) {
-          const entityName = cursorState.entity.displayName ?? cursorState.entity.name
-          setHintText(`Attack ${entityName}`)
+          const name = cursorState.entity.displayName ?? cursorState.entity.name ?? 'Entity'
+          setHintText(`Attack ${name}`)
+          setEntityName(name)
         } else {
           setHintText(null)
+          setEntityName(null)
         }
       }
     }
@@ -40,13 +45,30 @@ export default () => {
     }
   }, [])
 
+  const handleUseButtonClick = (e: React.MouseEvent) => {
+    e.preventDefault()
+    e.stopPropagation()
+
+    document.dispatchEvent(new MouseEvent('mousedown', { button: 2 }))
+    bot.mouse.update()
+    document.dispatchEvent(new MouseEvent('mouseup', { button: 2 }))
+  }
+
   if (!usingTouch || touchInteractionType !== 'classic' || modalStack.length > 0) return null
-  if (!hintText) return null
+  if (!hintText && !entityName) return null
 
   return (
-    <div className={`${styles.hint_container} interaction-hint`}>
-      <PixelartIcon iconName={pixelartIcons['sun-alt']} width={14} />
-      <span className={styles.hint_text}>{hintText}</span>
+    <div
+      className={`${styles.hint_container} interaction-hint`}
+    >
+      {/* temporary hide hint indicator and text */}
+      {/* <PixelartIcon iconName={pixelartIcons['sun-alt']} width={14} />
+      <span className={styles.hint_text}>{hintText || 'Attack entity'}</span> */}
+      <Button
+        onClick={handleUseButtonClick}
+      >
+        {`Use ${entityName}`}
+      </Button>
     </div>
   )
 }

From 58799d973caaa19b6214658a6f3aa86638c0868e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 8 May 2025 00:07:33 +0300
Subject: [PATCH 05/62] fix transfer on 1.20 and above (should have added patch
 a long time ago)

---
 patches/minecraft-protocol.patch | 16 ++++++++++++++++
 pnpm-lock.yaml                   | 16 ++++++++--------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/patches/minecraft-protocol.patch b/patches/minecraft-protocol.patch
index 29111f69..efc79176 100644
--- a/patches/minecraft-protocol.patch
+++ b/patches/minecraft-protocol.patch
@@ -1,3 +1,6 @@
+diff --git a/README.md b/README.md
+deleted file mode 100644
+index fbcaa43667323a58b8110a4495938c2c6d2d6f83..0000000000000000000000000000000000000000
 diff --git a/src/client/chat.js b/src/client/chat.js
 index f14269bea055d4329cd729271e7406ec4b344de7..00f5482eb6e3c911381ca9a728b1b4aae0d1d337 100644
 --- a/src/client/chat.js
@@ -73,6 +76,19 @@ index b9d21bab9faccd5dbf1975fc423fc55c73e906c5..99ffd76527b410e3a393181beb260108
        }
  
        function onJoinServerResponse (err) {
+diff --git a/src/client/play.js b/src/client/play.js
+index 6e06dc15291b38e1eeeec8d7102187b2a23d70a3..f67454942db9276cbb9eab99c281cfe182cb8a1f 100644
+--- a/src/client/play.js
++++ b/src/client/play.js
+@@ -53,7 +53,7 @@ module.exports = function (client, options) {
+         client.write('configuration_acknowledged', {})
+       }
+       client.state = states.CONFIGURATION
+-      client.on('select_known_packs', () => {
++      client.once('select_known_packs', () => {
+         client.write('select_known_packs', { packs: [] })
+       })
+       // Server should send finish_configuration on its own right after sending the client a dimension codec
 diff --git a/src/client.js b/src/client.js
 index 74749698f8cee05b5dc749c271544f78d06645b0..e77e0a3f41c1ee780c3abbd54b0801d248c2a07c 100644
 --- a/src/client.js
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f099a85f..19248ee1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -22,7 +22,7 @@ overrides:
 
 patchedDependencies:
   minecraft-protocol:
-    hash: 3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab
+    hash: 1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37
     path: patches/minecraft-protocol.patch
   mineflayer-item-map-downloader@1.2.0:
     hash: a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad
@@ -142,7 +142,7 @@ importers:
         version: 3.83.1
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
         version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13)
@@ -13190,7 +13190,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13226,7 +13226,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -17023,7 +17023,7 @@ snapshots:
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
@@ -17342,7 +17342,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17441,7 +17441,7 @@ snapshots:
   mineflayer@4.27.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
@@ -17465,7 +17465,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.7
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0

From aa817139b73ee5ba23d442744a78bb85ec285f7c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 8 May 2025 04:11:17 +0300
Subject: [PATCH 06/62] fix: fix auto jump on mobile!

---
 package.json   |  2 +-
 pnpm-lock.yaml | 44 +++++++++++++++++++++++++-------------------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index 16f009f0..e1f2b6fc 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
   "dependencies": {
     "@dimaka/interface": "0.0.3-alpha.0",
     "@floating-ui/react": "^0.26.1",
-    "@nxg-org/mineflayer-auto-jump": "^0.7.12",
+    "@nxg-org/mineflayer-auto-jump": "^0.7.17",
     "@nxg-org/mineflayer-tracker": "1.2.1",
     "@react-oauth/google": "^0.12.1",
     "@stylistic/eslint-plugin": "^2.6.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 19248ee1..f3c88f2a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -42,8 +42,8 @@ importers:
         specifier: ^0.26.1
         version: 0.26.28(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@nxg-org/mineflayer-auto-jump':
-        specifier: ^0.7.12
-        version: 0.7.12
+        specifier: ^0.7.17
+        version: 0.7.17
       '@nxg-org/mineflayer-tracker':
         specifier: 1.2.1
         version: 1.2.1(encoding@0.1.13)
@@ -347,7 +347,7 @@ importers:
         version: 0.1.10(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
       mineflayer-pathfinder:
         specifier: ^2.4.4
-        version: 2.4.5
+        version: 2.4.5(prismarine-registry@1.11.0)
       npm-run-all:
         specifier: ^4.1.5
         version: 4.1.5
@@ -432,13 +432,13 @@ importers:
         version: 1.3.9
       prismarine-block:
         specifier: github:zardoy/prismarine-block#next-era
-        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chunk:
         specifier: github:zardoy/prismarine-chunk#master
         version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-schematic:
         specifier: ^1.2.0
-        version: 1.2.3
+        version: 1.2.3(prismarine-registry@1.11.0)
       process:
         specifier: ^0.11.10
         version: 0.11.10
@@ -2019,8 +2019,8 @@ packages:
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     deprecated: This functionality has been moved to @npmcli/fs
 
-  '@nxg-org/mineflayer-auto-jump@0.7.12':
-    resolution: {integrity: sha512-F5vX/lerlWx/5HVlkDNbvrtQ19PL6iG8i4ItPTIRtjGiFzusDefP7DI226zSFR8Wlaw45qHv0jn814p/4/qVdQ==}
+  '@nxg-org/mineflayer-auto-jump@0.7.17':
+    resolution: {integrity: sha512-AgIiJcyh9y8bZjwNHZ2Wp/mbC6+XfE8cM/nOLcZaQYLdoUgncUeaNinFTYLvwi1RMQ42S5bxvwI9kKUwjRhlDA==}
 
   '@nxg-org/mineflayer-physics-util@1.8.7':
     resolution: {integrity: sha512-wtLYvHqoEFr/j0ny2lyogwjbMvwpFuG2aWI8sI14+EAiGFRpL5+cog2ujSDsnRTZruO7tUXMTiPc1kebjXwfJg==}
@@ -11368,7 +11368,7 @@ snapshots:
       rimraf: 3.0.2
     optional: true
 
-  '@nxg-org/mineflayer-auto-jump@0.7.12':
+  '@nxg-org/mineflayer-auto-jump@0.7.17':
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.7
       strict-event-emitter-types: 2.0.0
@@ -11390,7 +11390,7 @@ snapshots:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.83.1
       mineflayer: 4.27.0(encoding@0.1.13)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-item: 1.16.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
@@ -17428,22 +17428,24 @@ snapshots:
       - tsx
       - yaml
 
-  mineflayer-pathfinder@2.4.5:
+  mineflayer-pathfinder@2.4.5(prismarine-registry@1.11.0):
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
+    transitivePeerDependencies:
+      - prismarine-registry
 
   mineflayer@4.27.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chat: 1.11.0
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-entity: 2.5.0
@@ -17467,7 +17469,7 @@ snapshots:
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chat: 1.11.0
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-entity: 2.5.0
@@ -18260,7 +18262,7 @@ snapshots:
       minecraft-data: 3.83.1
       prismarine-registry: 1.11.0
 
-  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
+  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0):
     dependencies:
       minecraft-data: 3.83.1
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
@@ -18268,6 +18270,8 @@ snapshots:
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
+    transitivePeerDependencies:
+      - prismarine-registry
 
   prismarine-chat@1.11.0:
     dependencies:
@@ -18278,7 +18282,7 @@ snapshots:
   prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1):
     dependencies:
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
       smart-buffer: 4.2.0
@@ -18312,7 +18316,7 @@ snapshots:
 
   prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1):
     dependencies:
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
@@ -18336,16 +18340,18 @@ snapshots:
   prismarine-registry@1.11.0:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-nbt: 2.7.0
 
-  prismarine-schematic@1.2.3:
+  prismarine-schematic@1.2.3(prismarine-registry@1.11.0):
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       vec3: 0.1.10
+    transitivePeerDependencies:
+      - prismarine-registry
 
   prismarine-windows@2.9.0:
     dependencies:

From f76c7fb782416e768f2a1610628c750c23ef4bb5 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 8 May 2025 19:51:42 +0300
Subject: [PATCH 07/62] fix: water now supports lighting when its enabled

---
 renderer/viewer/lib/mesher/models.ts | 38 ++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/renderer/viewer/lib/mesher/models.ts b/renderer/viewer/lib/mesher/models.ts
index 46258134..802ecaf0 100644
--- a/renderer/viewer/lib/mesher/models.ts
+++ b/renderer/viewer/lib/mesher/models.ts
@@ -125,6 +125,13 @@ const isCube = (block: Block) => {
   }))
 }
 
+const getVec = (v: Vec3, dir: Vec3) => {
+  for (const coord of ['x', 'y', 'z']) {
+    if (Math.abs(dir[coord]) > 0) v[coord] = 0
+  }
+  return v.plus(dir)
+}
+
 function renderLiquid (world: World, cursor: Vec3, texture: any | undefined, type: number, biome: string, water: boolean, attr: Record<string, any>, isRealWater: boolean) {
   const heights: number[] = []
   for (let z = -1; z <= 1; z++) {
@@ -142,7 +149,7 @@ function renderLiquid (world: World, cursor: Vec3, texture: any | undefined, typ
 
   // eslint-disable-next-line guard-for-in
   for (const face in elemFaces) {
-    const { dir, corners } = elemFaces[face]
+    const { dir, corners, mask1, mask2 } = elemFaces[face]
     const isUp = dir[1] === 1
 
     const neighborPos = cursor.offset(...dir as [number, number, number])
@@ -180,6 +187,9 @@ function renderLiquid (world: World, cursor: Vec3, texture: any | undefined, typ
     const { su } = texture
     const { sv } = texture
 
+    // Get base light value for the face
+    const baseLight = world.getLight(neighborPos, undefined, undefined, water ? 'water' : 'lava') / 15
+
     for (const pos of corners) {
       const height = cornerHeights[pos[2] * 2 + pos[0]]
       attr.t_positions.push(
@@ -189,7 +199,31 @@ function renderLiquid (world: World, cursor: Vec3, texture: any | undefined, typ
       )
       attr.t_normals.push(...dir)
       attr.t_uvs.push(pos[3] * su + u, pos[4] * sv * (pos[1] ? 1 : height) + v)
-      attr.t_colors.push(tint[0], tint[1], tint[2])
+
+      let cornerLightResult = baseLight
+      if (world.config.smoothLighting) {
+        const dx = pos[0] * 2 - 1
+        const dy = pos[1] * 2 - 1
+        const dz = pos[2] * 2 - 1
+        const cornerDir: [number, number, number] = [dx, dy, dz]
+        const side1Dir: [number, number, number] = [dx * mask1[0], dy * mask1[1], dz * mask1[2]]
+        const side2Dir: [number, number, number] = [dx * mask2[0], dy * mask2[1], dz * mask2[2]]
+
+        const dirVec = new Vec3(...dir as [number, number, number])
+
+        const side1LightDir = getVec(new Vec3(...side1Dir), dirVec)
+        const side1Light = world.getLight(cursor.plus(side1LightDir)) / 15
+        const side2DirLight = getVec(new Vec3(...side2Dir), dirVec)
+        const side2Light = world.getLight(cursor.plus(side2DirLight)) / 15
+        const cornerLightDir = getVec(new Vec3(...cornerDir), dirVec)
+        const cornerLight = world.getLight(cursor.plus(cornerLightDir)) / 15
+        // interpolate
+        const lights = [side1Light, side2Light, cornerLight, baseLight]
+        cornerLightResult = lights.reduce((acc, cur) => acc + cur, 0) / lights.length
+      }
+
+      // Apply light value to tint
+      attr.t_colors.push(tint[0] * cornerLightResult, tint[1] * cornerLightResult, tint[2] * cornerLightResult)
     }
   }
 }

From 25f2fdef4e766a2d53bcbe24e95ce796f95d2e90 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 8 May 2025 19:56:13 +0300
Subject: [PATCH 08/62] fix: dont display hand & cursor block outline in
 spectator.

---
 renderer/viewer/lib/basePlayerState.ts      |  2 ++
 renderer/viewer/three/worldrendererThree.ts |  2 +-
 src/mineflayer/playerState.ts               | 22 ++++++++++++++++++++-
 src/mineflayer/plugins/mouse.ts             |  6 +++++-
 src/react/ChunksDebugScreen.tsx             |  2 +-
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/renderer/viewer/lib/basePlayerState.ts b/renderer/viewer/lib/basePlayerState.ts
index df8cbc61..856772b1 100644
--- a/renderer/viewer/lib/basePlayerState.ts
+++ b/renderer/viewer/lib/basePlayerState.ts
@@ -31,6 +31,8 @@ export interface IPlayerState {
   getHeldItem?(isLeftHand: boolean): HandItemBlock | undefined
   username?: string
   onlineMode?: boolean
+  lightingDisabled?: boolean
+  shouldHideHand?: boolean
 
   events: TypedEmitter<PlayerStateEvents>
 
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 088f0ee7..5c16aa9a 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -470,7 +470,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     const cam = this.camera instanceof THREE.Group ? this.camera.children.find(child => child instanceof THREE.PerspectiveCamera) as THREE.PerspectiveCamera : this.camera
     this.renderer.render(this.scene, cam)
 
-    if (this.displayOptions.inWorldRenderingConfig.showHand/*  && !this.freeFlyMode */) {
+    if (this.displayOptions.inWorldRenderingConfig.showHand && !this.playerState.shouldHideHand /*  && !this.freeFlyMode */) {
       this.holdingBlock.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
       this.holdingBlockLeft.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
     }
diff --git a/src/mineflayer/playerState.ts b/src/mineflayer/playerState.ts
index 85f0b00c..16739c86 100644
--- a/src/mineflayer/playerState.ts
+++ b/src/mineflayer/playerState.ts
@@ -24,6 +24,7 @@ export class PlayerStateManager implements IPlayerState {
   private itemUsageTicks = 0
   private isUsingItem = false
   private ready = false
+  public lightingDisabled = false
   onlineMode = false
   get username () {
     return bot.username ?? ''
@@ -51,6 +52,21 @@ export class PlayerStateManager implements IPlayerState {
   }
 
   private botCreated () {
+    const handleDimensionData = (data) => {
+      let hasSkyLight = 1
+      try {
+        hasSkyLight = data.dimension.value.has_skylight.value
+      } catch {}
+      this.lightingDisabled = bot.game.dimension === 'the_nether' || bot.game.dimension === 'the_end' || !hasSkyLight
+    }
+
+    bot._client.on('login', (packet) => {
+      handleDimensionData(packet)
+    })
+    bot._client.on('respawn', (packet) => {
+      handleDimensionData(packet)
+    })
+
     // Movement tracking
     bot.on('move', this.updateState)
 
@@ -75,6 +91,10 @@ export class PlayerStateManager implements IPlayerState {
     this.reactive.gameMode = bot.game?.gameMode
   }
 
+  get shouldHideHand () {
+    return this.reactive.gameMode === 'spectator'
+  }
+
   // #region Movement and Physics State
   private updateState () {
     if (!bot?.entity || this.disableStateUpdates) return
@@ -118,7 +138,7 @@ export class PlayerStateManager implements IPlayerState {
   }
 
   getEyeHeight (): number {
-    return bot.controlState.sneak ? 1.27 : 1.62
+    return bot.controlState.sneak && !this.isFlying() ? 1.27 : 1.62
   }
 
   isOnGround (): boolean {
diff --git a/src/mineflayer/plugins/mouse.ts b/src/mineflayer/plugins/mouse.ts
index 4e82b770..fc1ce0fd 100644
--- a/src/mineflayer/plugins/mouse.ts
+++ b/src/mineflayer/plugins/mouse.ts
@@ -10,7 +10,7 @@ import { sendVideoInteraction, videoCursorInteraction } from '../../customChanne
 
 function cursorBlockDisplay (bot: Bot) {
   const updateCursorBlock = (data?: { block: Block }) => {
-    if (!data?.block) {
+    if (!data?.block || bot.game.gameMode === 'spectator') {
       playerState.reactive.lookingAtBlock = undefined
       return
     }
@@ -27,6 +27,10 @@ function cursorBlockDisplay (bot: Bot) {
   }
 
   bot.on('highlightCursorBlock', updateCursorBlock)
+  bot.on('game', () => {
+    const block = bot.mouse.getCursorState().cursorBlock
+    updateCursorBlock(block ? { block } : undefined)
+  })
 
   bot.on('blockBreakProgressStage', (block, stage) => {
     const mergedShape = bot.mouse.getMergedCursorShape(block)
diff --git a/src/react/ChunksDebugScreen.tsx b/src/react/ChunksDebugScreen.tsx
index 80e926d8..9f47d023 100644
--- a/src/react/ChunksDebugScreen.tsx
+++ b/src/react/ChunksDebugScreen.tsx
@@ -30,7 +30,7 @@ const Inner = () => {
       state,
       lines: [String(chunk?.loads.length ?? 0)],
       sidebarLines: [
-        `loads: ${chunk.loads.map(l => `${l.reason} ${l.dataLength} ${l.time}`).join('\n')}`,
+        `loads: ${chunk.loads?.map(l => `${l.reason} ${l.dataLength} ${l.time}`).join('\n')}`,
         // `blockUpdates: ${chunk.blockUpdates}`,
       ],
     }

From 674b6ab00daadcb1caefcffe93b30e17d0f83e81 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 8 May 2025 21:23:04 +0300
Subject: [PATCH 09/62] feat: add chat scroll debug and use alternative ways of
 forcing scroll in DOM!

---
 src/optionsGuiScheme.tsx             |  4 ++
 src/optionsStorage.ts                |  1 +
 src/react/Chat.tsx                   | 64 +++++++++++++++++++++++++++-
 src/react/ChatProvider.tsx           |  3 +-
 src/react/hooks/useScrollBehavior.ts | 59 ++++++++++++++++++-------
 5 files changed, 112 insertions(+), 19 deletions(-)

diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index b9c44b29..d4be46f6 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -605,6 +605,10 @@ export const guiOptionsScheme: {
       debugResponseTimeIndicator: {
         text: 'Debug Input Lag',
       },
+    },
+    {
+      debugChatScroll: {
+      },
     }
   ],
   'export-import': [
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index bc58d21c..ab164454 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -72,6 +72,7 @@ const defaultOptions = {
   preventBackgroundTimeoutKick: false,
   preventSleep: false,
   debugContro: false,
+  debugChatScroll: false,
   chatVanillaRestrictions: true,
   debugResponseTimeIndicator: false,
   // antiAliasing: false,
diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index 130f25a0..c2e59b07 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -41,6 +41,7 @@ type Props = {
   inputDisabled?: string
   placeholder?: string
   chatVanillaRestrictions?: boolean
+  debugChatScroll?: boolean
 }
 
 export const chatInputValueGlobal = proxy({
@@ -69,7 +70,8 @@ export default ({
   allowSelection,
   inputDisabled,
   placeholder,
-  chatVanillaRestrictions
+  chatVanillaRestrictions,
+  debugChatScroll
 }: Props) => {
   const sendHistoryRef = useRef(JSON.parse(window.sessionStorage.chatHistory || '[]'))
   const [isInputFocused, setIsInputFocused] = useState(false)
@@ -86,7 +88,16 @@ export default ({
   const chatHistoryPos = useRef(sendHistoryRef.current.length)
   const inputCurrentlyEnteredValue = useRef('')
 
-  const { scrollToBottom } = useScrollBehavior(chatMessages, { messages, opened })
+  const { scrollToBottom, isAtBottom, wasAtBottom, currentlyAtBottom } = useScrollBehavior(chatMessages, { messages, opened })
+  const [rightNowAtBottom, setRightNowAtBottom] = useState(false)
+
+  useEffect(() => {
+    if (!debugChatScroll) return
+    const interval = setInterval(() => {
+      setRightNowAtBottom(isAtBottom())
+    }, 50)
+    return () => clearInterval(interval)
+  }, [debugChatScroll])
 
   const setSendHistory = (newHistory: string[]) => {
     sendHistoryRef.current = newHistory
@@ -252,6 +263,55 @@ export default ({
         }}
       >
         {opacity && <div ref={chatMessages} className={`chat ${opened ? 'opened' : ''}`} id="chat-messages" style={{ opacity }}>
+          {debugChatScroll && (
+            <div
+              style={{
+                position: 'absolute',
+                top: 5,
+                left: 5,
+                display: 'flex',
+                gap: 4,
+                zIndex: 100,
+              }}
+            >
+              <div
+                title="Right now is at bottom (updated every 50ms)"
+                style={{
+                  width: 12,
+                  height: 12,
+                  backgroundColor: rightNowAtBottom ? '#00ff00' : '#ff0000',
+                  border: '1px solid #fff',
+                }}
+              />
+              <div
+                title="Currently at bottom"
+                style={{
+                  width: 12,
+                  height: 12,
+                  backgroundColor: currentlyAtBottom ? '#00ff00' : '#ff0000',
+                  border: '1px solid #fff',
+                }}
+              />
+              <div
+                title="Was at bottom"
+                style={{
+                  width: 12,
+                  height: 12,
+                  backgroundColor: wasAtBottom() ? '#00ff00' : '#ff0000',
+                  border: '1px solid #fff',
+                }}
+              />
+              <div
+                title="Chat opened"
+                style={{
+                  width: 12,
+                  height: 12,
+                  backgroundColor: opened ? '#00ff00' : '#ff0000',
+                  border: '1px solid #fff',
+                }}
+              />
+            </div>
+          )}
           {messages.map((m) => (
             <MessageLine key={reactKeyForMessage(m)} message={m} />
           ))}
diff --git a/src/react/ChatProvider.tsx b/src/react/ChatProvider.tsx
index 4acc9e79..5c499029 100644
--- a/src/react/ChatProvider.tsx
+++ b/src/react/ChatProvider.tsx
@@ -17,7 +17,7 @@ export default () => {
   const isChatActive = useIsModalActive('chat')
   const lastMessageId = useRef(0)
   const usingTouch = useSnapshot(miscUiState).currentTouch
-  const { chatSelect, messagesLimit, chatOpacity, chatOpacityOpened, chatVanillaRestrictions } = useSnapshot(options)
+  const { chatSelect, messagesLimit, chatOpacity, chatOpacityOpened, chatVanillaRestrictions, debugChatScroll } = useSnapshot(options)
   const isUsingMicrosoftAuth = useMemo(() => !!lastConnectOptions.value?.authenticatedAccount, [])
   const { forwardChat } = useSnapshot(viewerVersionState)
   const { viewerConnection } = useSnapshot(gameAdditionalState)
@@ -48,6 +48,7 @@ export default () => {
 
   return <Chat
     chatVanillaRestrictions={chatVanillaRestrictions}
+    debugChatScroll={debugChatScroll}
     allowSelection={chatSelect}
     usingTouch={!!usingTouch}
     opacity={(isChatActive ? chatOpacityOpened : chatOpacity) / 100}
diff --git a/src/react/hooks/useScrollBehavior.ts b/src/react/hooks/useScrollBehavior.ts
index 3b9499a6..5a839066 100644
--- a/src/react/hooks/useScrollBehavior.ts
+++ b/src/react/hooks/useScrollBehavior.ts
@@ -1,4 +1,4 @@
-import { RefObject, useEffect, useLayoutEffect, useRef } from 'react'
+import { RefObject, useEffect, useLayoutEffect, useRef, useState } from 'react'
 import { pixelartIcons } from '../PixelartIcon'
 
 export const useScrollBehavior = (
@@ -12,6 +12,8 @@ export const useScrollBehavior = (
   }
 ) => {
   const openedWasAtBottom = useRef(true) // before new messages
+  const [currentlyAtBottom, setCurrentlyAtBottom] = useState(true)
+  const scrollTimeoutRef = useRef<NodeJS.Timeout | null>(null)
 
   const isAtBottom = () => {
     if (!elementRef.current) return true
@@ -20,17 +22,30 @@ export const useScrollBehavior = (
     return distanceFromBottom < 1
   }
 
-  const scrollToBottom = () => {
-    if (elementRef.current) {
-      elementRef.current.scrollTop = elementRef.current.scrollHeight
-      setTimeout(() => {
-        if (!elementRef.current) return
-        elementRef.current.scrollTo({
-          top: elementRef.current.scrollHeight,
-          behavior: 'instant'
-        })
-      }, 0)
+  const scrollToBottom = (behavior: ScrollBehavior = 'instant') => {
+    if (!elementRef.current) return
+
+    // Clear any existing scroll timeout
+    if (scrollTimeoutRef.current) {
+      clearTimeout(scrollTimeoutRef.current)
     }
+
+    const el = elementRef.current
+
+    // Immediate scroll
+    el.scrollTop = el.scrollHeight
+
+    // Double-check after a short delay to ensure we're really at the bottom
+    scrollTimeoutRef.current = setTimeout(() => {
+      if (!elementRef.current) return
+      const el = elementRef.current
+      el.scrollTo({
+        top: el.scrollHeight,
+        behavior
+      })
+      setCurrentlyAtBottom(true)
+      openedWasAtBottom.current = true
+    }, 5)
   }
 
   // Handle scroll position tracking
@@ -39,18 +54,28 @@ export const useScrollBehavior = (
     if (!element) return
 
     const handleScroll = () => {
-      openedWasAtBottom.current = isAtBottom()
+      const atBottom = isAtBottom()
+      openedWasAtBottom.current = atBottom
+      setCurrentlyAtBottom(atBottom)
     }
 
     element.addEventListener('scroll', handleScroll)
-    return () => element.removeEventListener('scroll', handleScroll)
+    return () => {
+      element.removeEventListener('scroll', handleScroll)
+      if (scrollTimeoutRef.current) {
+        clearTimeout(scrollTimeoutRef.current)
+      }
+    }
   }, [])
 
   // Handle opened state changes
   useLayoutEffect(() => {
     if (opened) {
-      openedWasAtBottom.current = true
-    } else {
+      // Wait a frame before scrolling to ensure DOM has updated
+      requestAnimationFrame(() => {
+        scrollToBottom()
+      })
+    } else if (elementRef.current) {
       scrollToBottom()
     }
   }, [opened])
@@ -64,6 +89,8 @@ export const useScrollBehavior = (
 
   return {
     scrollToBottom,
-    isAtBottom
+    isAtBottom,
+    wasAtBottom: () => openedWasAtBottom.current,
+    currentlyAtBottom
   }
 }

From a58ff0776e8a3d63029c30f46669261be58274ca Mon Sep 17 00:00:00 2001
From: M G <118717627+mgDentist@users.noreply.github.com>
Date: Mon, 12 May 2025 18:09:10 +0300
Subject: [PATCH 10/62] server name field "flex-start" now (#351)

---
 src/react/AddServerOrConnect.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/react/AddServerOrConnect.tsx b/src/react/AddServerOrConnect.tsx
index 19332472..08e4d69e 100644
--- a/src/react/AddServerOrConnect.tsx
+++ b/src/react/AddServerOrConnect.tsx
@@ -165,7 +165,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
           placeholder={example}
         />
         {!lockConnect && <>
-          <div style={{ display: 'flex', justifyContent: 'center' }}>
+          <div style={{ display: 'flex' }}>
             <InputWithLabel label="Server Name" value={serverName} onChange={({ target: { value } }) => setServerName(value)} placeholder='Defaults to IP' />
           </div>
         </>}

From e2400ee667a1bedd8796653838d9a56feae499d4 Mon Sep 17 00:00:00 2001
From: M G <118717627+mgDentist@users.noreply.github.com>
Date: Mon, 12 May 2025 18:15:45 +0300
Subject: [PATCH 11/62] Entity Interaction Button works now (#352)

---
 src/react/TouchInteractionHint.module.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/react/TouchInteractionHint.module.css b/src/react/TouchInteractionHint.module.css
index 73fae1fc..da11a65c 100644
--- a/src/react/TouchInteractionHint.module.css
+++ b/src/react/TouchInteractionHint.module.css
@@ -8,7 +8,7 @@
   display: flex;
   align-items: center;
   gap: 8px;
-  pointer-events: none;
+  pointer-events: auto;
   z-index: 1000;
   text-shadow: 1px 1px 8px rgba(0, 0, 0, 1);
 }

From 48cdd9484fe024ed224349d40fac909c06a6a606 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 12 May 2025 18:56:20 +0300
Subject: [PATCH 12/62] annoying contextmenu on windows on right click
 sometimes was appearing

---
 src/globalDomListeners.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/globalDomListeners.ts b/src/globalDomListeners.ts
index 5055c600..bfce0d42 100644
--- a/src/globalDomListeners.ts
+++ b/src/globalDomListeners.ts
@@ -35,3 +35,12 @@ window.addEventListener('beforeunload', (event) => {
   event.returnValue = '' // Required for some browsers
   return 'The game is running. Are you sure you want to close this page?'
 })
+
+window.addEventListener('contextmenu', (e) => {
+  const ALLOW_TAGS = ['INPUT', 'TEXTAREA', 'A']
+  // allow if target is in ALLOW_TAGS or has selection text
+  if (ALLOW_TAGS.includes((e.target as HTMLElement)?.tagName) || window.getSelection()?.toString()) {
+    return
+  }
+  e.preventDefault()
+})

From 489c16793be6619812cbe8b41779b4d3794a8591 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 14 May 2025 01:24:53 +0300
Subject: [PATCH 13/62] fix original name logging on error

---
 src/inventoryWindows.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 2906177b..21e3061f 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -189,7 +189,6 @@ export const renderSlot = (model: ResolvedItemModelRender, debugIsQuickbar = fal
   image?: HTMLImageElement
 } | undefined => {
   let itemModelName = model.modelName
-  const originalItemName = itemModelName
   const isItem = loadedData.itemsByName[itemModelName]
 
   // #region normalize item name
@@ -225,7 +224,7 @@ export const renderSlot = (model: ResolvedItemModelRender, debugIsQuickbar = fal
       ?? (model.originalItemName ? appViewer.resourcesManager.currentResources.itemsRenderer.getItemTexture(model.originalItemName, {}, false, fullBlockModelSupport) : undefined)
       ?? appViewer.resourcesManager.currentResources.itemsRenderer.getItemTexture('item/missing_texture')!
   } catch (err) {
-    inGameError(`Failed to render item ${itemModelName} (original: ${originalItemName}) on ${bot.version} (resourcepack: ${options.enabledResourcepack}): ${err.stack}`)
+    inGameError(`Failed to render item ${itemModelName} (original: ${model.originalItemName}) on ${bot.version} (resourcepack: ${options.enabledResourcepack}): ${err.stack}`)
     itemTexture = blockToTopTexture(appViewer.resourcesManager.currentResources!.itemsRenderer.getItemTexture('errored')!)
   }
 

From 75adc29bf080f87236b21ac8bcf452c2f7b76f8f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 14 May 2025 03:07:02 +0300
Subject: [PATCH 14/62] up mc assets

---
 package.json   |  2 +-
 pnpm-lock.yaml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index e1f2b6fc..2388d508 100644
--- a/package.json
+++ b/package.json
@@ -150,7 +150,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.53",
+    "mc-assets": "^0.2.54",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer#gen-the-master",
     "mineflayer-mouse": "^0.1.10",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f3c88f2a..7da635c6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -334,8 +334,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.53
-        version: 0.2.53
+        specifier: ^0.2.54
+        version: 0.2.54
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/98bc5bb8ee6da8b4b771c05b404cee796318ccd4(@types/react@18.3.18)(react@18.3.1)
@@ -6466,8 +6466,8 @@ packages:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
 
-  mc-assets@0.2.53:
-    resolution: {integrity: sha512-Ucsu2pDLr/cs8bxbxU9KTszdf/vPTLphYgEHUEWxuYlMkPQUCpsQwkn3YgyykJ7RXaca7zZGlZXaTPXBAqJT6A==}
+  mc-assets@0.2.54:
+    resolution: {integrity: sha512-ZEaa9IcqfOt4cFGLVJVkZMemKPfbjQskvIxuDepkXWkJb9T+xQ+Hj86zDMh1Ah8WZWNeGx2x26CuXt8QNr6pcw==}
     engines: {node: '>=18.0.0'}
 
   mcraft-fun-mineflayer@0.1.23:
@@ -17014,7 +17014,7 @@ snapshots:
 
   math-intrinsics@1.1.0: {}
 
-  mc-assets@0.2.53:
+  mc-assets@0.2.54:
     dependencies:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2

From 7ed3413b28ac7915b17400cd5b7834ae1ef541dd Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 14 May 2025 03:12:55 +0300
Subject: [PATCH 15/62] fix save is undefined in rare cases

---
 src/flyingSquidUtils.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/flyingSquidUtils.ts b/src/flyingSquidUtils.ts
index 012830d9..2ae0be7c 100644
--- a/src/flyingSquidUtils.ts
+++ b/src/flyingSquidUtils.ts
@@ -18,9 +18,10 @@ export function nameToMcOfflineUUID (name) {
 }
 
 export async function savePlayers (autoSave: boolean) {
+  if (!localServer?.players[0]) return
   if (autoSave && new URL(location.href).searchParams.get('noSave') === 'true') return
   //@ts-expect-error TODO
-  await localServer!.savePlayersSingleplayer()
+  await localServer.savePlayersSingleplayer()
 }
 
 // todo flying squid should expose save function instead

From 0a61bbba757c47c62f2b4d82ef54aaa213cdfc13 Mon Sep 17 00:00:00 2001
From: M G <118717627+mgDentist@users.noreply.github.com>
Date: Wed, 14 May 2025 18:15:21 +0300
Subject: [PATCH 16/62] Fixed button shown even when cursor is not over the
 entity (e.g., a video) (#356)

fix: button shown even when cursor is not over the entity (e.g., a video)
---
 src/react/TouchInteractionHint.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/react/TouchInteractionHint.tsx b/src/react/TouchInteractionHint.tsx
index bf2b42f0..b3cbe268 100644
--- a/src/react/TouchInteractionHint.tsx
+++ b/src/react/TouchInteractionHint.tsx
@@ -57,6 +57,9 @@ export default () => {
   if (!usingTouch || touchInteractionType !== 'classic' || modalStack.length > 0) return null
   if (!hintText && !entityName) return null
 
+  // need to hide "Use" button if there isn't an entity name, but there is a hint text
+  if (!entityName) return null
+
   return (
     <div
       className={`${styles.hint_container} interaction-hint`}

From 6302a3815fa830b82d3ded28b05ad7cef7538754 Mon Sep 17 00:00:00 2001
From: Maxim Grigorev <gmi1987@gmail.com>
Date: Fri, 16 May 2025 20:19:23 +0700
Subject: [PATCH 17/62] feat: Add remote splash text loading via URLs

---
 config.json             |  4 ++--
 src/react/MainMenu.tsx  | 20 ++++++++++++++++---
 src/utils/splashText.ts | 43 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 src/utils/splashText.ts

diff --git a/config.json b/config.json
index ea27ca5a..0515aa40 100644
--- a/config.json
+++ b/config.json
@@ -26,7 +26,7 @@
     }
   ],
   "rightSideText": "A Minecraft client clone in the browser!",
-  "splashText": "Gen is cooking!",
+  "splashText": "https://jsonplaceholder.typicode.com/posts/1",
   "pauseLinks": [
     [
       {
@@ -37,4 +37,4 @@
       }
     ]
   ]
-}
+}
\ No newline at end of file
diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index 7ed257c0..e706a3a8 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -1,9 +1,10 @@
-import React from 'react'
+import React, { useEffect, useState } from 'react'
 import { openURL } from 'renderer/viewer/lib/simpleUtils'
 import { useSnapshot } from 'valtio'
 import { haveDirectoryPicker } from '../utils'
 import { ConnectOptions } from '../connect'
 import { miscUiState } from '../globalState'
+import { isRemoteSplashText, loadRemoteSplashText } from '../utils/splashText'
 import styles from './mainMenu.module.css'
 import Button from './Button'
 import ButtonWithTooltip from './ButtonWithTooltip'
@@ -47,6 +48,19 @@ export default ({
   singleplayerAvailable = true
 }: Props) => {
   const { appConfig } = useSnapshot(miscUiState)
+  const [splashText, setSplashText] = useState(appConfig?.splashText || '')
+
+  useEffect(() => {
+    const loadSplashText = async () => {
+      if (appConfig?.splashText && isRemoteSplashText(appConfig.splashText)) {
+        const text = await loadRemoteSplashText(appConfig.splashText)
+        setSplashText(text)
+      } else {
+        setSplashText(appConfig?.splashText || '')
+      }
+    }
+    void loadSplashText()
+  }, [appConfig?.splashText])
 
   if (!bottomRightLinks?.trim()) bottomRightLinks = undefined
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
@@ -75,7 +89,7 @@ export default ({
   const connectToServerLongPress = useLongPress(
     () => {
       if (process.env.NODE_ENV === 'development') {
-      // Connect to <origin>:25565
+        // Connect to <origin>:25565
         const origin = window.location.hostname
         const connectOptions: ConnectOptions = {
           server: `${origin}:25565`,
@@ -93,7 +107,7 @@ export default ({
       <div className={styles['game-title']}>
         <div className={styles.minecraft}>
           <div className={styles.edition} />
-          <span className={styles.splash}>{appConfig?.splashText}</span>
+          <span className={styles.splash}>{splashText}</span>
         </div>
       </div>
 
diff --git a/src/utils/splashText.ts b/src/utils/splashText.ts
new file mode 100644
index 00000000..a46da218
--- /dev/null
+++ b/src/utils/splashText.ts
@@ -0,0 +1,43 @@
+const MAX_WORDS = 5
+const HTTPS_REGEX = /^https?:\/\//
+
+const limitWords = (text: string): string => {
+  const words = text.split(/\s+/)
+  if (words.length <= MAX_WORDS) {
+    return text
+  }
+  return words.slice(0, MAX_WORDS).join(' ') + '...'
+}
+
+export const isRemoteSplashText = (text: string): boolean => {
+  return HTTPS_REGEX.test(text)
+}
+
+export const loadRemoteSplashText = async (url: string): Promise<string> => {
+  try {
+    const response = await fetch(url)
+    if (!response.ok) {
+      throw new Error(`Failed to fetch splash text: ${response.statusText}`)
+    }
+    try {
+      const json = await response.json()
+
+      if (typeof json === 'object' && json !== null) {
+        if (json.title) return limitWords(json.title)
+        if (json.text) return limitWords(json.text)
+        if (json.message) return limitWords(json.message)
+
+        return limitWords(JSON.stringify(json))
+      }
+
+      return limitWords(String(json))
+    } catch (jsonError) {
+
+      const text = await response.text()
+      return limitWords(text.trim())
+    }
+  } catch (error) {
+    console.error('Error loading remote splash text:', error)
+    return 'Failed to load splash text!'
+  }
+}

From 2b0f178fe080d9ee315fef7087a8e92e2c4adafd Mon Sep 17 00:00:00 2001
From: Maxim Grigorev <gmi1987@gmail.com>
Date: Fri, 16 May 2025 20:35:04 +0700
Subject: [PATCH 18/62] feat: improoved the code

---
 src/react/MainMenu.tsx  | 15 ++++++++++-----
 src/utils/splashText.ts |  7 ++++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index e706a3a8..86e2b1ea 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -52,11 +52,16 @@ export default ({
 
   useEffect(() => {
     const loadSplashText = async () => {
-      if (appConfig?.splashText && isRemoteSplashText(appConfig.splashText)) {
-        const text = await loadRemoteSplashText(appConfig.splashText)
-        setSplashText(text)
-      } else {
-        setSplashText(appConfig?.splashText || '')
+      try {
+        if (appConfig?.splashText && isRemoteSplashText(appConfig.splashText)) {
+          const text = await loadRemoteSplashText(appConfig.splashText)
+          setSplashText(text)
+        } else {
+          setSplashText(appConfig?.splashText || '')
+        }
+      } catch (error) {
+        console.error('Failed to load splash text:', error)
+        setSplashText('Error loading splash text')
       }
     }
     void loadSplashText()
diff --git a/src/utils/splashText.ts b/src/utils/splashText.ts
index a46da218..f60b5296 100644
--- a/src/utils/splashText.ts
+++ b/src/utils/splashText.ts
@@ -1,5 +1,5 @@
 const MAX_WORDS = 5
-const HTTPS_REGEX = /^https?:\/\//
+const HTTPS_REGEX = /^https?:\/\/[-\w@:%.+~#=]{1,256}\.[a-zA-Z\d()]{1,6}\b([-\w()@:%+.~#?&/=]*)$/
 
 const limitWords = (text: string): string => {
   const words = text.split(/\s+/)
@@ -19,6 +19,8 @@ export const loadRemoteSplashText = async (url: string): Promise<string> => {
     if (!response.ok) {
       throw new Error(`Failed to fetch splash text: ${response.statusText}`)
     }
+
+    const clonedResponse = response.clone()
     try {
       const json = await response.json()
 
@@ -32,8 +34,7 @@ export const loadRemoteSplashText = async (url: string): Promise<string> => {
 
       return limitWords(String(json))
     } catch (jsonError) {
-
-      const text = await response.text()
+      const text = await clonedResponse.text()
       return limitWords(text.trim())
     }
   } catch (error) {

From f921275c876699500b8a73301623d3eec31a8f15 Mon Sep 17 00:00:00 2001
From: Maxim Grigorev <gmi1987@gmail.com>
Date: Fri, 16 May 2025 20:44:32 +0700
Subject: [PATCH 19/62] feat: improoved code safety

---
 src/utils/splashText.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/utils/splashText.ts b/src/utils/splashText.ts
index f60b5296..9ebe157d 100644
--- a/src/utils/splashText.ts
+++ b/src/utils/splashText.ts
@@ -1,12 +1,17 @@
 const MAX_WORDS = 5
 const HTTPS_REGEX = /^https?:\/\/[-\w@:%.+~#=]{1,256}\.[a-zA-Z\d()]{1,6}\b([-\w()@:%+.~#?&/=]*)$/
+const TIMEOUT_MS = 5000
+
+const sanitizeText = (text: string): string => {
+  return text.replaceAll(/<[^>]*>/g, '').replaceAll(/[^\w\s.,!?-]/g, '')
+}
 
 const limitWords = (text: string): string => {
   const words = text.split(/\s+/)
   if (words.length <= MAX_WORDS) {
-    return text
+    return sanitizeText(text)
   }
-  return words.slice(0, MAX_WORDS).join(' ') + '...'
+  return sanitizeText(words.slice(0, MAX_WORDS).join(' ') + '...')
 }
 
 export const isRemoteSplashText = (text: string): boolean => {
@@ -15,7 +20,10 @@ export const isRemoteSplashText = (text: string): boolean => {
 
 export const loadRemoteSplashText = async (url: string): Promise<string> => {
   try {
-    const response = await fetch(url)
+    const controller = new AbortController()
+    const timeoutId = setTimeout(() => controller.abort(), TIMEOUT_MS)
+    const response = await fetch(url, { signal: controller.signal })
+    clearTimeout(timeoutId)
     if (!response.ok) {
       throw new Error(`Failed to fetch splash text: ${response.statusText}`)
     }

From 051cc5b35c8687dc2f0a75f29ef7a4a1a93ffb88 Mon Sep 17 00:00:00 2001
From: Maxim Grigorev <gmi1987@gmail.com>
Date: Fri, 16 May 2025 22:47:59 +0700
Subject: [PATCH 20/62] fix: optimized splashText working process

---
 config.json             |  1 +
 src/appConfig.ts        |  1 +
 src/react/MainMenu.tsx  | 46 +++++++++++++++++++++++++++------
 src/utils/splashText.ts | 57 ++++++++++++++++++++++++++++++++++++-----
 4 files changed, 91 insertions(+), 14 deletions(-)

diff --git a/config.json b/config.json
index 0515aa40..e45b4052 100644
--- a/config.json
+++ b/config.json
@@ -26,6 +26,7 @@
     }
   ],
   "rightSideText": "A Minecraft client clone in the browser!",
+  "splashTextFallback": "GEN is cooking",
   "splashText": "https://jsonplaceholder.typicode.com/posts/1",
   "pauseLinks": [
     [
diff --git a/src/appConfig.ts b/src/appConfig.ts
index 156c5974..769ef14d 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -24,6 +24,7 @@ export type AppConfig = {
   // hideSettings?: Record<string, boolean>
   allowAutoConnect?: boolean
   splashText?: string
+  splashTextFallback?: string
   pauseLinks?: Array<Array<Record<string, any>>>
   keybindings?: Record<string, any>
   defaultLanguage?: string
diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index 86e2b1ea..9f5d5357 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -4,7 +4,15 @@ import { useSnapshot } from 'valtio'
 import { haveDirectoryPicker } from '../utils'
 import { ConnectOptions } from '../connect'
 import { miscUiState } from '../globalState'
-import { isRemoteSplashText, loadRemoteSplashText } from '../utils/splashText'
+import {
+  isRemoteSplashText,
+  loadRemoteSplashText,
+  getDisplayText,
+  cacheSplashText,
+  hasSourceUrlChanged,
+  cacheSourceUrl,
+  clearSplashCache
+} from '../utils/splashText'
 import styles from './mainMenu.module.css'
 import Button from './Button'
 import ButtonWithTooltip from './ButtonWithTooltip'
@@ -48,24 +56,46 @@ export default ({
   singleplayerAvailable = true
 }: Props) => {
   const { appConfig } = useSnapshot(miscUiState)
-  const [splashText, setSplashText] = useState(appConfig?.splashText || '')
+
+  useEffect(() => {
+    if (hasSourceUrlChanged(appConfig?.splashText)) {
+      clearSplashCache()
+      if (appConfig?.splashText && isRemoteSplashText(appConfig.splashText)) {
+        cacheSourceUrl(appConfig.splashText)
+      }
+    }
+  }, [appConfig?.splashText])
+
+  const initialSplashText = getDisplayText(appConfig?.splashText, appConfig?.splashTextFallback)
+  const [splashText, setSplashText] = useState(initialSplashText)
+  const [showSplash, setShowSplash] = useState(false)
+
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      setShowSplash(true)
+    }, 100)
+    return () => clearTimeout(timer)
+  }, [])
 
   useEffect(() => {
     const loadSplashText = async () => {
       try {
         if (appConfig?.splashText && isRemoteSplashText(appConfig.splashText)) {
           const text = await loadRemoteSplashText(appConfig.splashText)
-          setSplashText(text)
-        } else {
-          setSplashText(appConfig?.splashText || '')
+
+          if (text && text.trim() !== '') {
+            setSplashText(text)
+            cacheSplashText(text)
+          }
+        } else if (appConfig?.splashText && !isRemoteSplashText(appConfig.splashText)) {
+          setSplashText(appConfig.splashText)
         }
       } catch (error) {
         console.error('Failed to load splash text:', error)
-        setSplashText('Error loading splash text')
       }
     }
     void loadSplashText()
-  }, [appConfig?.splashText])
+  }, [appConfig?.splashText, appConfig?.splashTextFallback])
 
   if (!bottomRightLinks?.trim()) bottomRightLinks = undefined
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
@@ -112,7 +142,7 @@ export default ({
       <div className={styles['game-title']}>
         <div className={styles.minecraft}>
           <div className={styles.edition} />
-          <span className={styles.splash}>{splashText}</span>
+          {showSplash && <span className={styles.splash}>{splashText}</span>}
         </div>
       </div>
 
diff --git a/src/utils/splashText.ts b/src/utils/splashText.ts
index 9ebe157d..2332c22a 100644
--- a/src/utils/splashText.ts
+++ b/src/utils/splashText.ts
@@ -1,17 +1,15 @@
 const MAX_WORDS = 5
 const HTTPS_REGEX = /^https?:\/\/[-\w@:%.+~#=]{1,256}\.[a-zA-Z\d()]{1,6}\b([-\w()@:%+.~#?&/=]*)$/
 const TIMEOUT_MS = 5000
-
-const sanitizeText = (text: string): string => {
-  return text.replaceAll(/<[^>]*>/g, '').replaceAll(/[^\w\s.,!?-]/g, '')
-}
+const SPLASH_CACHE_KEY = 'minecraft_splash_text_cache'
+const SPLASH_URL_KEY = 'minecraft_splash_url'
 
 const limitWords = (text: string): string => {
   const words = text.split(/\s+/)
   if (words.length <= MAX_WORDS) {
-    return sanitizeText(text)
+    return text
   }
-  return sanitizeText(words.slice(0, MAX_WORDS).join(' ') + '...')
+  return words.slice(0, MAX_WORDS).join(' ') + '...'
 }
 
 export const isRemoteSplashText = (text: string): boolean => {
@@ -50,3 +48,50 @@ export const loadRemoteSplashText = async (url: string): Promise<string> => {
     return 'Failed to load splash text!'
   }
 }
+
+export const cacheSourceUrl = (url: string): void => {
+  localStorage.setItem(SPLASH_URL_KEY, url)
+}
+
+export const hasSourceUrlChanged = (newUrl?: string): boolean => {
+  const cachedUrl = localStorage.getItem(SPLASH_URL_KEY)
+
+  if ((!cachedUrl && newUrl) || (cachedUrl && !newUrl)) {
+    return true
+  }
+
+  return cachedUrl !== newUrl
+}
+
+export const clearSplashCache = (): void => {
+  localStorage.removeItem(SPLASH_CACHE_KEY)
+}
+
+export const getCachedSplashText = (): string | null => {
+  return localStorage.getItem(SPLASH_CACHE_KEY)
+}
+
+export const cacheSplashText = (text: string): void => {
+  localStorage.setItem(SPLASH_CACHE_KEY, text)
+}
+
+export const getDisplayText = (splashText?: string, fallbackText?: string): string => {
+  const cachedText = getCachedSplashText()
+
+  if (cachedText) return cachedText
+
+  if (fallbackText) return fallbackText
+
+  if (splashText && isRemoteSplashText(splashText)) return ''
+
+  return splashText || ''
+}
+
+export const getDirectDisplayText = (splashText?: string, fallbackText?: string): string => {
+
+  if (splashText && !isRemoteSplashText(splashText)) return splashText
+
+  if (fallbackText) return fallbackText
+
+  return ''
+}

From ff29fc1fc53acfce5c42ac9b25b1297c5bbabf36 Mon Sep 17 00:00:00 2001
From: Maksim Grigorev <gmi1987@gmail.com>
Date: Fri, 16 May 2025 19:50:38 +0300
Subject: [PATCH 21/62] feat: Credits modal (#354)

---
 src/react/CreditsAboutModal.module.css      | 84 +++++++++++++++++++++
 src/react/CreditsAboutModal.module.css.d.ts | 18 +++++
 src/react/CreditsAboutModal.tsx             | 57 ++++++++++++++
 src/react/CreditsBookButton.module.css      | 27 +++++++
 src/react/CreditsBookButton.module.css.d.ts |  7 ++
 src/react/CreditsBookButton.tsx             | 22 ++++++
 src/react/MainMenu.tsx                      |  6 +-
 src/reactUi.tsx                             |  3 +-
 8 files changed, 221 insertions(+), 3 deletions(-)
 create mode 100644 src/react/CreditsAboutModal.module.css
 create mode 100644 src/react/CreditsAboutModal.module.css.d.ts
 create mode 100644 src/react/CreditsAboutModal.tsx
 create mode 100644 src/react/CreditsBookButton.module.css
 create mode 100644 src/react/CreditsBookButton.module.css.d.ts
 create mode 100644 src/react/CreditsBookButton.tsx

diff --git a/src/react/CreditsAboutModal.module.css b/src/react/CreditsAboutModal.module.css
new file mode 100644
index 00000000..753d0448
--- /dev/null
+++ b/src/react/CreditsAboutModal.module.css
@@ -0,0 +1,84 @@
+.modalScreen {
+  margin-top: -15px;
+}
+
+.container {
+  position: relative;
+  background-color: #eee0c3;
+  border: 5px solid #7A5C3E;
+  padding: 15px;
+  width: 80%;
+  margin: 0 auto;
+  color: #3F2A14;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
+  max-height: 70vh;
+  overflow-y: auto;
+}
+
+.title {
+  text-align: center;
+  margin-top: 0;
+  margin-bottom: 0;
+  font-size: 10px;
+}
+
+.contentWrapper {
+  margin-bottom: 5px;
+}
+
+.subtitle {
+  font-size: 6px;
+  margin-bottom: 4px;
+  font-style: italic;
+}
+
+.paragraph {
+  font-size: 6px;
+  margin-bottom: 4px;
+}
+
+.list {
+  list-style-type: none;
+  padding: 0;
+  font-size: 6px;
+}
+
+.listItem {
+  margin-bottom: 2px;
+}
+
+.link {
+  color: #0000AA;
+  text-decoration: none;
+}
+
+.sectionTitle {
+  margin-top: 7px;
+  margin-bottom: 5px;
+  font-size: 8px;
+}
+
+.closeButton {
+  position: absolute;
+  top: 1px;
+  right: 1px;
+  display: flex;
+  justify-content: center;
+  cursor: pointer;
+  padding: 5px;
+  background: none;
+  border: none;
+  outline: none;
+}
+
+.closeButton:hover {
+  opacity: 0.8;
+}
+
+.closeButton:focus-visible {
+  outline: 1px dashed #7A5C3E;
+}
+
+.closeIcon {
+  color: #3F2A14;
+} 
\ No newline at end of file
diff --git a/src/react/CreditsAboutModal.module.css.d.ts b/src/react/CreditsAboutModal.module.css.d.ts
new file mode 100644
index 00000000..30ac3261
--- /dev/null
+++ b/src/react/CreditsAboutModal.module.css.d.ts
@@ -0,0 +1,18 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  closeButton: string;
+  closeIcon: string;
+  container: string;
+  contentWrapper: string;
+  link: string;
+  list: string;
+  listItem: string;
+  modalScreen: string;
+  paragraph: string;
+  sectionTitle: string;
+  subtitle: string;
+  title: string;
+}
+declare const cssExports: CssExports;
+export default cssExports;
diff --git a/src/react/CreditsAboutModal.tsx b/src/react/CreditsAboutModal.tsx
new file mode 100644
index 00000000..24826cd3
--- /dev/null
+++ b/src/react/CreditsAboutModal.tsx
@@ -0,0 +1,57 @@
+import { hideCurrentModal } from '../globalState'
+import { useIsModalActive } from './utilsApp'
+import Screen from './Screen'
+import PixelartIcon, { pixelartIcons } from './PixelartIcon'
+import styles from './CreditsAboutModal.module.css'
+
+export default () => {
+  const isModalActive = useIsModalActive('credits-about')
+
+  if (!isModalActive) return null
+
+  return (
+    <Screen
+      title=""
+      backdrop
+      className={styles.modalScreen}>
+      <div className={styles.container}>
+        <h2 className={styles.title}>Minecraft Open Source JS Edition</h2>
+
+        <div className={styles.contentWrapper}>
+          <small className={styles.subtitle}><i>What if Minecraft was an online game?</i></small>
+          <p className={styles.paragraph}>
+            Hey! You are on the safest modern Minecraft clone rewritten in JavaScript. A huge amount of work has gone into this project to make it fast and complete, and many features would not be possible without these awesome people and projects:
+          </p>
+          <ul className={styles.list}>
+            <li className={styles.listItem}>- Everyone who provided awesome mods for the game</li>
+            <li className={styles.listItem}>- <span><a className={styles.link} href="https://discord.com/users/gen6442" target="_blank" rel="noopener noreferrer">[Gen]</a></span> for rewriting the physics engine to be Grim-compliant</li>
+            <li className={styles.listItem}>- <span><a className={styles.link} href="https://viaversion.com/" target="_blank" rel="noopener noreferrer">[ViaVersion]</a></span> for providing reliable sound id mappings</li>
+            <li className={styles.listItem}>- <span><a className={styles.link} href="https://github.com/BlueMap-Minecraft/BlueMap" target="_blank" rel="noopener noreferrer">[Bluemap]</a></span> for providing block entity models like chest</li>
+            <li className={styles.listItem}>- <span><a className={styles.link} href="https://github.com/misode/deepslate" target="_blank" rel="noopener noreferrer">[Deepslate]</a></span> for rendering 3d blocks in GUI (inventory)</li>
+            <li className={styles.listItem}>- <span><a className={styles.link} href="https://www.npmjs.com/package/skinview3d" target="_blank" rel="noopener noreferrer">[skinview3d]</a></span> for rendering skins & player geometry</li>
+            <li className={styles.listItem}>- <span><a className={styles.link} href="https://github.com/atxi/Polymer" target="_blank" rel="noopener noreferrer">[Polymer]</a></span> (c++ project) for providing fast & accurate server light implementation</li>
+          </ul>
+
+          <h3 className={styles.sectionTitle}>Current contributors:</h3>
+          <ul className={styles.list}>
+            <li className={styles.listItem}>- <span className={styles.link}><a className={styles.link} href="https://github.com/mgDentist" target="_blank" rel="noopener noreferrer">Maxim Grigorev</a></span> - React UI & Core Developer Maintainer</li>
+            <li className={styles.listItem}>- And many more community contributors!</li>
+          </ul>
+
+          <button
+            className={styles.closeButton}
+            onClick={() => hideCurrentModal()}
+            aria-label="Close"
+            type="button"
+          >
+            <PixelartIcon
+              iconName={pixelartIcons.close}
+              width={12}
+              className={styles.closeIcon}
+            />
+          </button>
+        </div>
+      </div>
+    </Screen>
+  )
+}
diff --git a/src/react/CreditsBookButton.module.css b/src/react/CreditsBookButton.module.css
new file mode 100644
index 00000000..83af5d80
--- /dev/null
+++ b/src/react/CreditsBookButton.module.css
@@ -0,0 +1,27 @@
+.creditsButton {
+  position: absolute;
+  top: 1px;
+  right: -30px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: none;
+  border: none;
+  cursor: pointer;
+  color: white;
+  opacity: 1;
+  transition: opacity 0.2s ease;
+}
+
+.creditsButton:hover {
+  opacity: 0.9;
+}
+
+.creditsButton:focus:not(:hover) {
+  outline: 1px solid #fff;
+}
+
+.creditsButton svg {
+  width: 15px;
+  height: 15px;
+}
diff --git a/src/react/CreditsBookButton.module.css.d.ts b/src/react/CreditsBookButton.module.css.d.ts
new file mode 100644
index 00000000..72f94435
--- /dev/null
+++ b/src/react/CreditsBookButton.module.css.d.ts
@@ -0,0 +1,7 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  creditsButton: string;
+}
+declare const cssExports: CssExports;
+export default cssExports;
diff --git a/src/react/CreditsBookButton.tsx b/src/react/CreditsBookButton.tsx
new file mode 100644
index 00000000..a3be740f
--- /dev/null
+++ b/src/react/CreditsBookButton.tsx
@@ -0,0 +1,22 @@
+import { showModal } from '../globalState'
+import styles from './CreditsBookButton.module.css'
+
+export default () => {
+  const handleClick = () => {
+    showModal({ reactType: 'credits-about' })
+  }
+
+  return (
+    <button
+      className={styles.creditsButton}
+      onClick={handleClick}
+      aria-label="Credits"
+      title="Credits"
+    >
+      <svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+        <path d="M15.4375 15.1238L15.625 15.3113V16.8113L15.4375 16.9988H14.6875L14.5 16.8113V16.4363L14.3125 16.2488H12.8125L12.625 16.0613V15.3113L12.4375 15.1238H10.9375L10.75 14.9363V14.1863L10.5625 13.9988H7.9375L7.75 14.1863V14.9363L7.5625 15.1238H6.0625L5.875 15.3113V16.0613L5.6875 16.2488H4.1875L4 16.4363V16.8113L3.8125 16.9988H3.0625L2.875 16.8113V15.3113L3.0625 15.1238H3.4375L3.625 14.9363V13.8113L3.8125 13.6238H4.1875L4.375 13.4363V11.9363L4.5625 11.7488H4.9375L5.125 11.5613V10.0613L4.9375 9.87384H4.1875L4 9.68634V8.93634L3.8125 8.74884H2.6875L2.5 8.56134V7.81134L2.3125 7.62384H1.1875L1 7.43634V6.68634L1.1875 6.49884H6.63738L6.82488 6.31134V5.61543V4.60586L7.01238 4.41836H7.5625L7.75 4.23086V2.6875L7.9375 2.5H8.43022L8.61772 2.3125V1.1875L8.80522 1H9.66735L9.85485 1.1875V2.3125L10.0424 2.5H10.5625L10.75 2.6875V4.23086L10.9375 4.41836H11.4375L11.625 4.60586V6.31134L11.8125 6.49884H17.3125L17.5 6.68634V7.43634L17.3125 7.62384H16.1875L16 7.81134V8.56134L15.8125 8.74884H14.6875L14.5 8.93634V9.68634L14.3125 9.87384H13.5625L13.375 10.0613V11.5613L13.5625 11.7488H13.9375L14.125 11.9363V13.4363L14.3125 13.6238H14.6875L14.875 13.8113V14.9363L15.0625 15.1238H15.4375Z" fill="#FFD700" />
+      </svg>
+
+    </button>
+  )
+}
diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index 7ed257c0..40751b72 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -10,6 +10,7 @@ import ButtonWithTooltip from './ButtonWithTooltip'
 import { pixelartIcons } from './PixelartIcon'
 import useLongPress from './useLongPress'
 import PauseLinkButtons from './PauseLinkButtons'
+import CreditsBookButton from './CreditsBookButton'
 
 type Action = (e: React.MouseEvent<HTMLButtonElement>) => void
 
@@ -44,7 +45,7 @@ export default ({
   versionTitle,
   onVersionStatusClick,
   bottomRightLinks,
-  singleplayerAvailable = true
+  singleplayerAvailable = true,
 }: Props) => {
   const { appConfig } = useSnapshot(miscUiState)
 
@@ -75,7 +76,7 @@ export default ({
   const connectToServerLongPress = useLongPress(
     () => {
       if (process.env.NODE_ENV === 'development') {
-      // Connect to <origin>:25565
+        // Connect to <origin>:25565
         const origin = window.location.hostname
         const connectOptions: ConnectOptions = {
           server: `${origin}:25565`,
@@ -149,6 +150,7 @@ export default ({
         <div className={styles['menu-row']}>
           <PauseLinkButtons />
         </div>
+        <CreditsBookButton />
       </div>
 
       <div className={styles['bottom-info']}>
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index c91c37d6..4409c10a 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -61,6 +61,7 @@ import ControDebug from './react/ControDebug'
 import ChunksDebug from './react/ChunksDebug'
 import ChunksDebugScreen from './react/ChunksDebugScreen'
 import DebugResponseTimeIndicator from './react/debugs/DebugResponseTimeIndicator'
+import CreditsAboutModal from './react/CreditsAboutModal'
 
 const isFirefox = ua.getBrowser().name === 'Firefox'
 if (isFirefox) {
@@ -239,7 +240,7 @@ const App = () => {
             <ModsPage />
 
             <SelectOption />
-
+            <CreditsAboutModal />
             <NoModalFoundProvider />
           </RobustPortal>
           <RobustPortal to={document.body}>

From 42f973e05728b028946dc2d8e1ceab97147ee049 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sat, 17 May 2025 05:33:31 +0300
Subject: [PATCH 22/62] Update config.json

---
 config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.json b/config.json
index e45b4052..c1589ef9 100644
--- a/config.json
+++ b/config.json
@@ -26,7 +26,7 @@
     }
   ],
   "rightSideText": "A Minecraft client clone in the browser!",
-  "splashTextFallback": "GEN is cooking",
+  "splashTextFallback": "Welcome!",
   "splashText": "https://jsonplaceholder.typicode.com/posts/1",
   "pauseLinks": [
     [

From a9b94ec897607b66491a8c2a40be41c761340209 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 17 May 2025 06:58:33 +0300
Subject: [PATCH 23/62] fix: fix sneaking didnt work with water

---
 package.json   |  2 +-
 pnpm-lock.yaml | 46 ++++++++++++++++++++--------------------------
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/package.json b/package.json
index 2388d508..4d07ffe7 100644
--- a/package.json
+++ b/package.json
@@ -194,7 +194,7 @@
   },
   "pnpm": {
     "overrides": {
-      "@nxg-org/mineflayer-physics-util": "1.8.7",
+      "@nxg-org/mineflayer-physics-util": "1.8.8",
       "buffer": "^6.0.3",
       "vec3": "0.1.10",
       "three": "0.154.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7da635c6..150468f3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,7 +5,7 @@ settings:
   excludeLinksFromLockfile: false
 
 overrides:
-  '@nxg-org/mineflayer-physics-util': 1.8.7
+  '@nxg-org/mineflayer-physics-util': 1.8.8
   buffer: ^6.0.3
   vec3: 0.1.10
   three: 0.154.0
@@ -347,7 +347,7 @@ importers:
         version: 0.1.10(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
       mineflayer-pathfinder:
         specifier: ^2.4.4
-        version: 2.4.5(prismarine-registry@1.11.0)
+        version: 2.4.5
       npm-run-all:
         specifier: ^4.1.5
         version: 4.1.5
@@ -432,13 +432,13 @@ importers:
         version: 1.3.9
       prismarine-block:
         specifier: github:zardoy/prismarine-block#next-era
-        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chunk:
         specifier: github:zardoy/prismarine-chunk#master
         version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-schematic:
         specifier: ^1.2.0
-        version: 1.2.3(prismarine-registry@1.11.0)
+        version: 1.2.3
       process:
         specifier: ^0.11.10
         version: 0.11.10
@@ -2022,8 +2022,8 @@ packages:
   '@nxg-org/mineflayer-auto-jump@0.7.17':
     resolution: {integrity: sha512-AgIiJcyh9y8bZjwNHZ2Wp/mbC6+XfE8cM/nOLcZaQYLdoUgncUeaNinFTYLvwi1RMQ42S5bxvwI9kKUwjRhlDA==}
 
-  '@nxg-org/mineflayer-physics-util@1.8.7':
-    resolution: {integrity: sha512-wtLYvHqoEFr/j0ny2lyogwjbMvwpFuG2aWI8sI14+EAiGFRpL5+cog2ujSDsnRTZruO7tUXMTiPc1kebjXwfJg==}
+  '@nxg-org/mineflayer-physics-util@1.8.8':
+    resolution: {integrity: sha512-u7CiKCroGrxtqGpIVWKo40GsE7aLc2cH1lvCDBW+Y/V4h1SaCDXzYBOADUKMeOemFss90au/AOGtkahezaoF8A==}
 
   '@nxg-org/mineflayer-tracker@1.2.1':
     resolution: {integrity: sha512-SI1ffF8zvg3/ZNE021Ja2W0FZPN+WbQDZf8yFqOcXtPRXAtM9W6HvoACdzXep8BZid7WYgYLIgjKpB+9RqvCNQ==}
@@ -11370,10 +11370,10 @@ snapshots:
 
   '@nxg-org/mineflayer-auto-jump@0.7.17':
     dependencies:
-      '@nxg-org/mineflayer-physics-util': 1.8.7
+      '@nxg-org/mineflayer-physics-util': 1.8.8
       strict-event-emitter-types: 2.0.0
 
-  '@nxg-org/mineflayer-physics-util@1.8.7':
+  '@nxg-org/mineflayer-physics-util@1.8.8':
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
 
@@ -11390,7 +11390,7 @@ snapshots:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.83.1
       mineflayer: 4.27.0(encoding@0.1.13)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.16.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
@@ -17428,24 +17428,22 @@ snapshots:
       - tsx
       - yaml
 
-  mineflayer-pathfinder@2.4.5(prismarine-registry@1.11.0):
+  mineflayer-pathfinder@2.4.5:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
-    transitivePeerDependencies:
-      - prismarine-registry
 
   mineflayer@4.27.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-entity: 2.5.0
@@ -17465,11 +17463,11 @@ snapshots:
 
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6(encoding@0.1.13):
     dependencies:
-      '@nxg-org/mineflayer-physics-util': 1.8.7
+      '@nxg-org/mineflayer-physics-util': 1.8.8
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-entity: 2.5.0
@@ -18262,7 +18260,7 @@ snapshots:
       minecraft-data: 3.83.1
       prismarine-registry: 1.11.0
 
-  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0):
+  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
     dependencies:
       minecraft-data: 3.83.1
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
@@ -18270,8 +18268,6 @@ snapshots:
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
-    transitivePeerDependencies:
-      - prismarine-registry
 
   prismarine-chat@1.11.0:
     dependencies:
@@ -18282,7 +18278,7 @@ snapshots:
   prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1):
     dependencies:
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
       smart-buffer: 4.2.0
@@ -18316,7 +18312,7 @@ snapshots:
 
   prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1):
     dependencies:
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
@@ -18340,18 +18336,16 @@ snapshots:
   prismarine-registry@1.11.0:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
 
-  prismarine-schematic@1.2.3(prismarine-registry@1.11.0):
+  prismarine-schematic@1.2.3:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       vec3: 0.1.10
-    transitivePeerDependencies:
-      - prismarine-registry
 
   prismarine-windows@2.9.0:
     dependencies:

From 785ab490f2fe76bcdd760dac046baa014c09b529 Mon Sep 17 00:00:00 2001
From: gguio <109200692+gguio@users.noreply.github.com>
Date: Sun, 18 May 2025 10:58:52 +0400
Subject: [PATCH 24/62] fix: restore minimal and full map (#348)

Co-authored-by: gguio <nikvish150@gmail.com>
---
 renderer/viewer/baseGraphicsBackend.ts     |  3 +-
 renderer/viewer/lib/mesher/mesher.ts       | 23 +++++++++++++
 renderer/viewer/lib/mesher/models.ts       |  6 ++--
 renderer/viewer/lib/mesher/shared.ts       | 11 +++++-
 renderer/viewer/lib/worldrendererCommon.ts | 33 ++++++++++++------
 src/appViewer.ts                           |  5 +--
 src/index.ts                               |  2 +-
 src/react/Minimap.tsx                      |  3 +-
 src/react/MinimapProvider.tsx              | 39 +++++++++++-----------
 9 files changed, 85 insertions(+), 40 deletions(-)

diff --git a/renderer/viewer/baseGraphicsBackend.ts b/renderer/viewer/baseGraphicsBackend.ts
index 79607695..4724076a 100644
--- a/renderer/viewer/baseGraphicsBackend.ts
+++ b/renderer/viewer/baseGraphicsBackend.ts
@@ -3,7 +3,8 @@ import { RendererReactiveState } from '../../src/appViewer'
 export const getDefaultRendererState = (): RendererReactiveState => {
   return {
     world: {
-      chunksLoaded: [],
+      chunksLoaded: new Set(),
+      heightmaps: new Map(),
       chunksTotalNumber: 0,
       allChunksLoaded: true,
       mesherWork: false,
diff --git a/renderer/viewer/lib/mesher/mesher.ts b/renderer/viewer/lib/mesher/mesher.ts
index 21e2d8ef..66621f22 100644
--- a/renderer/viewer/lib/mesher/mesher.ts
+++ b/renderer/viewer/lib/mesher/mesher.ts
@@ -148,6 +148,29 @@ const handleMessage = data => {
       global.postMessage({ type: 'customBlockModel', chunkKey, customBlockModel })
       break
     }
+    case 'getHeightmap': {
+      const heightmap = new Uint8Array(256)
+
+      const blockPos = new Vec3(0, 0, 0)
+      for (let z = 0; z < 16; z++) {
+        for (let x = 0; x < 16; x++) {
+          const blockX = x + data.x
+          const blockZ = z + data.z
+          blockPos.x = blockX; blockPos.z = blockZ
+          blockPos.y = 256
+          let block = world.getBlock(blockPos)
+          while (block?.name.includes('air')) {
+            blockPos.y -= 1
+            block = world.getBlock(blockPos)
+          }
+          const index = z * 16 + x
+          heightmap[index] = block ? blockPos.y : 0
+        }
+      }
+      postMessage({ type: 'heightmap', key: `${Math.floor(data.x / 16)},${Math.floor(data.z / 16)}`, heightmap })
+
+      break
+    }
   // No default
   }
 }
diff --git a/renderer/viewer/lib/mesher/models.ts b/renderer/viewer/lib/mesher/models.ts
index 802ecaf0..3658d120 100644
--- a/renderer/viewer/lib/mesher/models.ts
+++ b/renderer/viewer/lib/mesher/models.ts
@@ -510,7 +510,7 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
     heads: {},
     signs: {},
     // isFull: true,
-    highestBlocks: {},
+    highestBlocks: new Map(),
     hadErrors: false,
     blocksCount: 0
   }
@@ -521,9 +521,9 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
       for (cursor.x = sx; cursor.x < sx + 16; cursor.x++) {
         let block = world.getBlock(cursor, blockProvider, attr)!
         if (!INVISIBLE_BLOCKS.has(block.name)) {
-          const highest = attr.highestBlocks[`${cursor.x},${cursor.z}`]
+          const highest = attr.highestBlocks.get(`${cursor.x},${cursor.z}`)
           if (!highest || highest.y < cursor.y) {
-            attr.highestBlocks[`${cursor.x},${cursor.z}`] = { y: cursor.y, stateId: block.stateId, biomeId: block.biome.id }
+            attr.highestBlocks.set(`${cursor.x},${cursor.z}`, { y: cursor.y, stateId: block.stateId, biomeId: block.biome.id })
           }
         }
         if (INVISIBLE_BLOCKS.has(block.name)) continue
diff --git a/renderer/viewer/lib/mesher/shared.ts b/renderer/viewer/lib/mesher/shared.ts
index eb1346f4..16b89a71 100644
--- a/renderer/viewer/lib/mesher/shared.ts
+++ b/renderer/viewer/lib/mesher/shared.ts
@@ -40,12 +40,21 @@ export type MesherGeometryOutput = {
   heads: Record<string, any>,
   signs: Record<string, any>,
   // isFull: boolean
-  highestBlocks: Record<string, HighestBlockInfo>
+  highestBlocks: Map<string, HighestBlockInfo>
   hadErrors: boolean
   blocksCount: number
   customBlockModels?: CustomBlockModels
 }
 
+export interface MesherMainEvents {
+  geometry: { type: 'geometry'; key: string; geometry: MesherGeometryOutput; workerIndex: number };
+  sectionFinished: { type: 'sectionFinished'; key: string; workerIndex: number; processTime?: number };
+  blockStateModelInfo: { type: 'blockStateModelInfo'; info: Record<string, BlockStateModelInfo> };
+  heightmap: { type: 'heightmap'; key: string; heightmap: Uint8Array };
+}
+
+export type MesherMainEvent = MesherMainEvents[keyof MesherMainEvents]
+
 export type HighestBlockInfo = { y: number, stateId: number | undefined, biomeId: number | undefined }
 
 export type BlockStateModelInfo = {
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 516e4264..ef82f7af 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -14,7 +14,7 @@ import { ResourcesManager } from '../../../src/resourcesManager'
 import { DisplayWorldOptions, GraphicsInitOptions, RendererReactiveState } from '../../../src/appViewer'
 import { SoundSystem } from '../three/threeJsSound'
 import { buildCleanupDecorator } from './cleanupDecorator'
-import { HighestBlockInfo, MesherGeometryOutput, CustomBlockModels, BlockStateModelInfo, getBlockAssetsCacheKey, MesherConfig } from './mesher/shared'
+import { HighestBlockInfo, MesherGeometryOutput, CustomBlockModels, BlockStateModelInfo, getBlockAssetsCacheKey, MesherConfig, MesherMainEvent } from './mesher/shared'
 import { chunkPos } from './simpleUtils'
 import { addNewStat, removeAllStats, removeStat, updatePanesVisibility, updateStatText } from './ui/newStats'
 import { WorldDataEmitter } from './worldDataEmitter'
@@ -85,6 +85,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     dirty (pos: Vec3, value: boolean): void
     update (/* pos: Vec3, value: boolean */): void
     chunkFinished (key: string): void
+    heightmap (key: string, heightmap: Uint8Array): void
   }>
   customTexturesDataUrl = undefined as string | undefined
   workers: any[] = []
@@ -103,8 +104,8 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   ONMESSAGE_TIME_LIMIT = 30 // ms
 
   handleResize = () => { }
-  highestBlocksByChunks = {} as Record<string, { [chunkKey: string]: HighestBlockInfo }>
-  highestBlocksBySections = {} as Record<string, { [sectionKey: string]: HighestBlockInfo }>
+  highestBlocksByChunks = new Map<string, { [chunkKey: string]: HighestBlockInfo }>()
+  highestBlocksBySections = new Map<string, { [sectionKey: string]: HighestBlockInfo }>()
   blockEntities = {}
 
   workersProcessAverageTime = 0
@@ -247,7 +248,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   }
 
   async getHighestBlocks (chunkKey: string) {
-    return this.highestBlocksByChunks[chunkKey]
+    return this.highestBlocksByChunks.get(chunkKey)
   }
 
   updateCustomBlock (chunkKey: string, blockPos: string, model: string) {
@@ -365,19 +366,20 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.isProcessingQueue = false
   }
 
-  handleMessage (data) {
+  handleMessage (rawData: any) {
+    const data = rawData as MesherMainEvent
     if (!this.active) return
     this.mesherLogReader?.workerMessageReceived(data.type, data)
     if (data.type !== 'geometry' || !this.debugStopGeometryUpdate) {
       const start = performance.now()
-      this.handleWorkerMessage(data)
+      this.handleWorkerMessage(data as WorkerReceive)
       this.workerCustomHandleTime += performance.now() - start
     }
     if (data.type === 'geometry') {
       this.logWorkerWork(() => `-> ${data.workerIndex} geometry ${data.key} ${JSON.stringify({ dataSize: JSON.stringify(data).length })}`)
       this.geometryReceiveCount[data.workerIndex] ??= 0
       this.geometryReceiveCount[data.workerIndex]++
-      const geometry = data.geometry as MesherGeometryOutput
+      const { geometry } = data
       this.highestBlocksBySections[data.key] = geometry.highestBlocks
       const chunkCoords = data.key.split(',').map(Number)
       this.lastChunkDistance = Math.max(...this.getDistance(new Vec3(chunkCoords[0], 0, chunkCoords[2])))
@@ -404,6 +406,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
         if (loaded) {
           // CHUNK FINISHED
           this.finishedChunks[chunkKey] = true
+          this.reactiveState.world.chunksLoaded.add(`${Math.floor(chunkCoords[0] / 16)},${Math.floor(chunkCoords[2] / 16)}`)
           this.renderUpdateEmitter.emit(`chunkFinished`, `${chunkCoords[0]},${chunkCoords[2]}`)
           this.checkAllFinished()
           // merge highest blocks by sections into highest blocks by chunks
@@ -442,6 +445,10 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
         this.blockStateModelInfo.set(cacheKey, info)
       }
     }
+
+    if (data.type === 'heightmap') {
+      appViewer.rendererState.world.heightmaps.set(data.key, new Uint8Array(data.heightmap))
+    }
   }
 
   downloadMesherLog () {
@@ -599,7 +606,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
   updateChunksStats () {
     const loadedChunks = Object.keys(this.finishedChunks)
-    this.displayOptions.nonReactiveState.world.chunksLoaded = loadedChunks
+    this.displayOptions.nonReactiveState.world.chunksLoaded = new Set(loadedChunks)
     this.displayOptions.nonReactiveState.world.chunksTotalNumber = this.chunksLength
     this.reactiveState.world.allChunksLoaded = this.allChunksFinished
 
@@ -628,6 +635,11 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
         customBlockModels: customBlockModels || undefined
       })
     }
+    this.workers[0].postMessage({
+      type: 'getHeightmap',
+      x,
+      z,
+    })
     this.logWorkerWork(() => `-> chunk ${JSON.stringify({ x, z, chunkLength: chunk.length, customBlockModelsLength: customBlockModels ? Object.keys(customBlockModels).length : 0 })}`)
     this.mesherLogReader?.chunkReceived(x, z, chunk.length)
     for (let y = this.worldMinYRender; y < this.worldSizeParams.worldHeight; y += 16) {
@@ -664,9 +676,9 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     for (let y = this.worldSizeParams.minY; y < this.worldSizeParams.worldHeight; y += 16) {
       this.setSectionDirty(new Vec3(x, y, z), false)
       delete this.finishedSections[`${x},${y},${z}`]
-      delete this.highestBlocksBySections[`${x},${y},${z}`]
+      this.highestBlocksBySections.delete(`${x},${y},${z}`)
     }
-    delete this.highestBlocksByChunks[`${x},${z}`]
+    this.highestBlocksByChunks.delete(`${x},${z}`)
 
     this.updateChunksStats()
 
@@ -992,7 +1004,6 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.active = false
 
     this.renderUpdateEmitter.removeAllListeners()
-    this.displayOptions.worldView.removeAllListeners() // todo
     this.abortController.abort()
     removeAllStats()
   }
diff --git a/src/appViewer.ts b/src/appViewer.ts
index ca62bd1b..90ca847f 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -17,7 +17,8 @@ import { watchOptionsAfterWorldViewInit } from './watchOptions'
 
 export interface RendererReactiveState {
   world: {
-    chunksLoaded: string[]
+    chunksLoaded: Set<string>
+    heightmaps: Map<string, Uint8Array>
     chunksTotalNumber: number
     allChunksLoaded: boolean
     mesherWork: boolean
@@ -28,7 +29,7 @@ export interface RendererReactiveState {
 }
 export interface NonReactiveState {
   world: {
-    chunksLoaded: string[]
+    chunksLoaded: Set<string>
     chunksTotalNumber: number
     allChunksLoaded: boolean
     mesherWork: boolean
diff --git a/src/index.ts b/src/index.ts
index afa349fa..bea10726 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -708,7 +708,7 @@ export async function connect (connectOptions: ConnectOptions) {
           resolve()
           unsub()
         } else {
-          const perc = Math.round(appViewer.rendererState.world.chunksLoaded.length / appViewer.rendererState.world.chunksTotalNumber * 100)
+          const perc = Math.round(appViewer.rendererState.world.chunksLoaded.size / appViewer.rendererState.world.chunksTotalNumber * 100)
           progress?.reportProgress('chunks', perc / 100)
         }
       })
diff --git a/src/react/Minimap.tsx b/src/react/Minimap.tsx
index 10c2b666..25ee59ed 100644
--- a/src/react/Minimap.tsx
+++ b/src/react/Minimap.tsx
@@ -85,6 +85,7 @@ export default (
           top: '0px',
           padding: '5px 5px 0px 0px',
           textAlign: 'center',
+          zIndex: 7,
         }}
         onClick={() => {
           toggleFullMap?.()
@@ -106,7 +107,7 @@ export default (
             textShadow: '0.1em 0 black, 0 0.1em black, -0.1em 0 black, 0 -0.1em black, -0.1em -0.1em black, -0.1em 0.1em black, 0.1em -0.1em black, 0.1em 0.1em black'
           }}
         >
-          {position.x.toFixed(2)} {position.y.toFixed(2)} {position.z.toFixed(2)}
+          {Math.round(position.x)} {Math.round(position.y)} {Math.round(position.z)}
         </div>
       </div> : null
 }
diff --git a/src/react/MinimapProvider.tsx b/src/react/MinimapProvider.tsx
index 6e7e01ff..afb6a198 100644
--- a/src/react/MinimapProvider.tsx
+++ b/src/react/MinimapProvider.tsx
@@ -10,7 +10,7 @@ import { Chunk } from 'prismarine-world/types/world'
 import { Block } from 'prismarine-block'
 import { INVISIBLE_BLOCKS } from 'renderer/viewer/lib/mesher/worldConstants'
 import { getRenamedData } from 'flying-squid/dist/blockRenames'
-import { useSnapshot } from 'valtio'
+import { useSnapshot, subscribe } from 'valtio'
 import { subscribeKey } from 'valtio/utils'
 import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
 import BlockData from '../../renderer/viewer/lib/moreBlockDataGenerated.json'
@@ -42,7 +42,7 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
   yaw: number
   world: string
   warps: WorldWarp[] = gameAdditionalState.warps
-  chunksStore = new Map<string, undefined | null | 'requested' | ChunkInfo >()
+  chunksStore = new Map<string, undefined | null | 'requested' | ChunkInfo>()
   loadingChunksQueue = new Set<string>()
   loadChunk: (key: string) => Promise<void> = this.loadChunkMinimap
   mapDrawer = new MinimapDrawer(this.loadChunk, this.warps, this.loadingChunksQueue, this.chunksStore)
@@ -119,9 +119,9 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
       this.blockData.set(renamedKey, BlockData.colors[blockKey])
     }
 
-    subscribeKey(appViewer.rendererState, 'world', () => {
+    subscribe(appViewer.rendererState.world, () => {
       for (const key of this.loadingChunksQueue) {
-        if (appViewer.rendererState.world.chunksLoaded.includes(key)) {
+        if (appViewer.rendererState.world.chunksLoaded.has(key)) {
           this.loadingChunksQueue.delete(key)
           void this.loadChunk(key)
         }
@@ -205,33 +205,31 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
     const [chunkX, chunkZ] = key.split(',').map(Number)
     const chunkWorldX = chunkX * 16
     const chunkWorldZ = chunkZ * 16
-    if (appViewer.rendererState.world.chunksLoaded.includes(`${chunkWorldX},${chunkWorldZ}`)) {
-      const highestBlocks = await getThreeJsRendererMethods()?.getHighestBlocks(`${chunkWorldX},${chunkWorldZ}`)
-      if (!highestBlocks) return undefined
-      const heightmap = new Uint8Array(256)
+    if (appViewer.rendererState.world.chunksLoaded.has(key)) {
+      // console.log('[MinimapProvider] loading chunk for minimap', key)
+      const heightmap = appViewer.rendererState.world.heightmaps.get(key)
+      if (heightmap) {
+        // console.log('[MinimapProvider] did get highest blocks')
+      } else {
+        console.warn('[MinimapProvider] no highestBlocks from renderMethods')
+        return undefined
+      }
       const colors = Array.from({ length: 256 }).fill('') as string[]
       // avoid creating new object every time
       const blockPos = new Vec3(0, 0, 0)
-      // filling up colors and heightmap
+      // filling up colors
       for (let z = 0; z < 16; z += 1) {
         for (let x = 0; x < 16; x += 1) {
           const blockX = chunkWorldX + x
           const blockZ = chunkWorldZ + z
-          const hBlock = highestBlocks[`${blockX},${blockZ}`]
-          blockPos.x = blockX; blockPos.z = blockZ; blockPos.y = hBlock?.y ?? 0
-          let block = bot.world.getBlock(blockPos)
-          while (block?.name.includes('air')) {
-            blockPos.y -= 1
-            block = bot.world.getBlock(blockPos)
-          }
           const index = z * 16 + x
+          blockPos.x = blockX; blockPos.z = blockZ; blockPos.y = heightmap[index]
+          const block = bot.world.getBlock(blockPos)
           // blocks which are not set are shown as half transparent
-          if (!block || !hBlock) {
-            heightmap[index] = 0
+          if (!block) {
             colors[index] = 'rgba(0, 0, 0, 0.5)'
             continue
           }
-          heightmap[index] = block.position.y
           colors[index] = this.setColor(block)
         }
       }
@@ -242,6 +240,7 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
     } else {
       this.loadingChunksQueue.add(`${chunkX},${chunkZ}`)
       this.chunksStore.set(key, 'requested')
+      // console.log('[MinimapProvider] requested new chunk', key)
     }
   }
 
@@ -339,7 +338,7 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
     const chunkWorldX = chunkX * 16
     const chunkWorldZ = chunkZ * 16
     const highestBlocks = await getThreeJsRendererMethods()?.getHighestBlocks(`${chunkWorldX},${chunkWorldZ}`)
-    if (appViewer.rendererState.world.chunksLoaded.includes(`${chunkWorldX},${chunkWorldZ}`)) {
+    if (appViewer.rendererState.world.chunksLoaded.has(`${chunkWorldX},${chunkWorldZ}`)) {
       const heightmap = new Uint8Array(256)
       const colors = Array.from({ length: 256 }).fill('') as string[]
       if (!highestBlocks) return null

From a5d16a75ef1727164568627e5632b9593d2c714e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 19 May 2025 00:16:18 +0300
Subject: [PATCH 25/62] fix(regression): hotbar on mobile was broken

---
 src/react/HotbarRenderApp.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/react/HotbarRenderApp.tsx b/src/react/HotbarRenderApp.tsx
index 039f283f..6e91180d 100644
--- a/src/react/HotbarRenderApp.tsx
+++ b/src/react/HotbarRenderApp.tsx
@@ -80,6 +80,9 @@ const HotbarInner = () => {
     const controller = new AbortController()
 
     const inv = openItemsCanvas('HotbarWin', {
+      _client: {
+        write () {}
+      },
       clickWindow (slot, mouseButton, mode) {
         if (mouseButton === 1) {
           console.log('right click')

From 2dc811b2a14961b029872e5f56e56af0ca4442da Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 19 May 2025 00:23:20 +0300
Subject: [PATCH 26/62] adjust settings visually

---
 README.MD                 |  1 +
 src/optionsGuiScheme.tsx  | 31 ++++++++++++++++---------------
 src/react/DeathScreen.tsx |  2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/README.MD b/README.MD
index aa36f7e8..4769192a 100644
--- a/README.MD
+++ b/README.MD
@@ -34,6 +34,7 @@ All components that are in [Storybook](https://mcraft.fun/storybook) are publish
 
 - Controls -> **Touch Controls Type** -> **Joystick**
 - Controls -> **Auto Full Screen** -> **On** - To avoid ctrl+w issue
+- Interface -> **Enable Minimap** -> **Always** - To enable useful minimap (why not?)
 - Controls -> **Raw Input** -> **On** - This will make the controls more precise (UPD: already enabled by default)
 - Interface -> **Chat Select** -> **On** - To select chat messages (UPD: already enabled by default)
 
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index d4be46f6..ede367f5 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -90,8 +90,7 @@ export const guiOptionsScheme: {
       },
       lowMemoryMode: {
         text: 'Low Memory Mode',
-        enableWarning: 'Enabling it will make chunks load ~4x slower',
-        disabledDuringGame: true
+        enableWarning: 'Enabling it will make chunks load ~4x slower. When in the game, app needs to be reloaded to apply this setting.',
       },
       starfieldRendering: {},
       renderEntities: {},
@@ -286,6 +285,20 @@ export const guiOptionsScheme: {
       chatSelect: {
       },
     },
+    {
+      custom () {
+        return <Category>Map</Category>
+      },
+      showMinimap: {
+        text: 'Enable Minimap',
+        enableWarning: 'App reload is required to apply this setting',
+        values: [
+          'always',
+          'singleplayer',
+          'never'
+        ],
+      },
+    },
     {
       custom () {
         return <Category>World</Category>
@@ -321,19 +334,6 @@ export const guiOptionsScheme: {
         ],
       },
     },
-    {
-      custom () {
-        return <Category>Map</Category>
-      },
-      showMinimap: {
-        text: 'Enable Minimap',
-        values: [
-          'always',
-          'singleplayer',
-          'never'
-        ],
-      },
-    },
     {
       custom () {
         return <Category>Experimental</Category>
@@ -555,6 +555,7 @@ export const guiOptionsScheme: {
     {
       preventBackgroundTimeoutKick: {},
       preventSleep: {
+        text: 'Prevent Device Sleep',
         disabledReason: navigator.wakeLock ? undefined : 'Your browser does not support wake lock API',
         enableWarning: 'When connected to a server, prevent PC from sleeping or screen dimming. Useful for purpusely staying AFK for long time. Some events might still prevent this like loosing tab focus or going low power mode.',
       },
diff --git a/src/react/DeathScreen.tsx b/src/react/DeathScreen.tsx
index 8f4c3f00..3501368f 100644
--- a/src/react/DeathScreen.tsx
+++ b/src/react/DeathScreen.tsx
@@ -24,7 +24,7 @@ export default ({ dieReasonMessage, respawnCallback, disconnectCallback }: Props
             }}
           />
           <Button
-            label="Disconnnect" onClick={() => {
+            label="Disconnect" onClick={() => {
               disconnectCallback()
             }}
           />

From e2a0df748e0c10382fd8f1e0be342653a424df41 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 19 May 2025 00:32:44 +0300
Subject: [PATCH 27/62] rorce button height

---
 src/react/button.module.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/react/button.module.css b/src/react/button.module.css
index ae32ee5f..677a1b44 100644
--- a/src/react/button.module.css
+++ b/src/react/button.module.css
@@ -3,7 +3,7 @@
   --txrV: 66px;
   position: relative;
   width: 200px;
-  height: calc(20px * var(--scale));
+  min-height: calc(20px * var(--scale));
   font-family: minecraft, mojangles, monospace;
   font-size: 10px;
   color: white;

From 67d365b9c3a4b67b29575d1247247b2b22402065 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 19 May 2025 01:57:48 +0300
Subject: [PATCH 28/62] fix: fix crafting on 1.16.5 and below

---
 pnpm-lock.yaml | 41 +++++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 150468f3..eccaae6c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -136,7 +136,7 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: ^0.1.23
-        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d(encoding@0.1.13))
       minecraft-data:
         specifier: 3.83.1
         version: 3.83.1
@@ -338,10 +338,10 @@ importers:
         version: 0.2.54
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
-        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/98bc5bb8ee6da8b4b771c05b404cee796318ccd4(@types/react@18.3.18)(react@18.3.1)
+        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f425e6a2db796d42cd2c09cf715dad841dec643d(@types/react@18.3.18)(react@18.3.1)
       mineflayer:
         specifier: github:zardoy/mineflayer#gen-the-master
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.10
         version: 0.1.10(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
@@ -4428,6 +4428,15 @@ packages:
       supports-color:
         optional: true
 
+  debug@4.4.1:
+    resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
   decamelize-keys@1.1.1:
     resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
     engines: {node: '>=0.10.0'}
@@ -6684,8 +6693,8 @@ packages:
   minecraft-folder-path@1.2.0:
     resolution: {integrity: sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==}
 
-  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/98bc5bb8ee6da8b4b771c05b404cee796318ccd4:
-    resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/98bc5bb8ee6da8b4b771c05b404cee796318ccd4}
+  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f425e6a2db796d42cd2c09cf715dad841dec643d:
+    resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f425e6a2db796d42cd2c09cf715dad841dec643d}
     version: 1.0.1
 
   minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284:
@@ -6715,8 +6724,8 @@ packages:
     resolution: {integrity: sha512-3bxph4jfbkBh5HpeouorxzrfSLNV+i+1gugNJ2jf52HW+rt+tW7eiiFPxrJEsOVkPT/3O/dEIW7j93LRlojMkQ==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d}
     version: 4.27.0
     engines: {node: '>=22'}
 
@@ -14480,6 +14489,10 @@ snapshots:
     optionalDependencies:
       supports-color: 8.1.1
 
+  debug@4.4.1:
+    dependencies:
+      ms: 2.1.3
+
   decamelize-keys@1.1.1:
     dependencies:
       decamelize: 1.2.0
@@ -16128,7 +16141,7 @@ snapshots:
     dependencies:
       '@tootallnate/once': 2.0.0
       agent-base: 6.0.2
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
     transitivePeerDependencies:
       - supports-color
     optional: true
@@ -17019,12 +17032,12 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
-  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17335,7 +17348,7 @@ snapshots:
 
   minecraft-folder-path@1.2.0: {}
 
-  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/98bc5bb8ee6da8b4b771c05b404cee796318ccd4(@types/react@18.3.18)(react@18.3.1):
+  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f425e6a2db796d42cd2c09cf715dad841dec643d(@types/react@18.3.18)(react@18.3.1):
     dependencies:
       valtio: 1.13.2(@types/react@18.3.18)(react@18.3.1)
     transitivePeerDependencies:
@@ -17461,7 +17474,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.8
       minecraft-data: 3.83.1
@@ -19180,7 +19193,7 @@ snapshots:
 
   send@1.2.0:
     dependencies:
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       encodeurl: 2.0.0
       escape-html: 1.0.3
       etag: 1.8.1
@@ -19535,7 +19548,7 @@ snapshots:
   socks-proxy-agent@7.0.0:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       socks: 2.8.4
     transitivePeerDependencies:
       - supports-color

From 080d75f9395a4746cf6e479b9c6427c9eb556bb0 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 19 May 2025 02:01:11 +0300
Subject: [PATCH 29/62] less annoying false block swap animations

---
 renderer/viewer/three/holdingBlock.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/renderer/viewer/three/holdingBlock.ts b/renderer/viewer/three/holdingBlock.ts
index 3f1327f1..6836d4f0 100644
--- a/renderer/viewer/three/holdingBlock.ts
+++ b/renderer/viewer/three/holdingBlock.ts
@@ -1,5 +1,6 @@
 import * as THREE from 'three'
 import * as tweenJs from '@tweenjs/tween.js'
+import PrismarineItem from 'prismarine-item'
 import worldBlockProvider, { WorldBlockProvider } from 'mc-assets/dist/worldBlockProvider'
 import { BlockModel } from 'mc-assets'
 import { getThreeBlockModelGroup, renderBlockThree, setBlockPosition } from '../lib/mesher/standaloneRenderer'
@@ -293,6 +294,7 @@ export default class HoldingBlock {
   }
 
   isDifferentItem (block: HandItemBlock | undefined) {
+    const Item = PrismarineItem(this.worldRenderer.version)
     if (!this.lastHeldItem) {
       return true
     }
@@ -300,7 +302,7 @@ export default class HoldingBlock {
       return true
     }
     // eslint-disable-next-line sonarjs/prefer-single-boolean-return
-    if (JSON.stringify(this.lastHeldItem.fullItem) !== JSON.stringify(block?.fullItem ?? '{}')) {
+    if (!Item.equal(this.lastHeldItem.fullItem, block?.fullItem ?? {}) || JSON.stringify(this.lastHeldItem.fullItem.components) !== JSON.stringify(block?.fullItem?.components)) {
       return true
     }
 

From 970ed614aecea8125d421c807c8a580c06f36e82 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 19 May 2025 02:04:53 +0300
Subject: [PATCH 30/62] fix crash on error message

---
 src/mineflayer/items.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mineflayer/items.ts b/src/mineflayer/items.ts
index 45638cd4..8a4e1fcd 100644
--- a/src/mineflayer/items.ts
+++ b/src/mineflayer/items.ts
@@ -92,7 +92,8 @@ export const getItemMetadata = (item: GeneralInputItem, resourcesManager: Resour
 
 
 export const getItemNameRaw = (item: Pick<import('prismarine-item').Item, 'nbt'> | null, resourcesManager: ResourcesManager) => {
-  const { customText } = getItemMetadata(item as any, resourcesManager)
+  if (!item) return ''
+  const { customText } = getItemMetadata(item as GeneralInputItem, resourcesManager)
   if (!customText) return
   try {
     if (typeof customText === 'object') {

From f5835f54facbb7b20721038f1bede72acb5df7ef Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 19 May 2025 02:05:14 +0300
Subject: [PATCH 31/62] fix: was not possible to open blast furnace GUI

---
 src/inventoryWindows.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 21e3061f..585d3078 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -338,6 +338,7 @@ const implementedContainersGuiMap = {
   'minecraft:generic_3x3': 'DropDispenseWin',
   'minecraft:furnace': 'FurnaceWin',
   'minecraft:smoker': 'FurnaceWin',
+  'minecraft:blast_furnace': 'FurnaceWin',
   'minecraft:crafting': 'CraftingWin',
   'minecraft:crafting3x3': 'CraftingWin', // todo different result slot
   'minecraft:anvil': 'AnvilWin',

From 7f6fc00f02b47caececaea81756d65971a936370 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 19 May 2025 02:21:23 +0300
Subject: [PATCH 32/62] fix: fix lever interaction shape

---
 src/interactionShapesGenerated.json | 74 ++++++++++++++---------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/interactionShapesGenerated.json b/src/interactionShapesGenerated.json
index afd3ce0f..804952e0 100644
--- a/src/interactionShapesGenerated.json
+++ b/src/interactionShapesGenerated.json
@@ -1318,55 +1318,47 @@
         13
     ],
     "lever": {
-        "face=ceiling,facing=east": [
-            4,
-            0,
-            5,
-            12,
-            6,
-            11
-        ],
-        "face=ceiling,facing=north": [
-            5,
-            0,
-            4,
-            11,
-            6,
-            12
-        ],
-        "face=ceiling,facing=south": [
-            5,
-            0,
-            4,
-            11,
-            6,
-            12
-        ],
-        "face=ceiling,facing=west": [
-            4,
-            0,
-            5,
-            12,
-            6,
-            11
-        ],
         "face=floor,facing=east": [
             4,
-            10,
+            0,
             5,
             12,
-            16,
+            6,
             11
         ],
         "face=floor,facing=north": [
             5,
-            10,
+            0,
             4,
             11,
-            16,
+            6,
             12
         ],
         "face=floor,facing=south": [
+            5,
+            0,
+            4,
+            11,
+            6,
+            12
+        ],
+        "face=floor,facing=west": [
+            4,
+            0,
+            5,
+            12,
+            6,
+            11
+        ],
+        "face=ceiling,facing=east": [
+            4,
+            10,
+            5,
+            12,
+            16,
+            11
+        ],
+        "face=ceiling,facing=north": [
             5,
             10,
             4,
@@ -1374,7 +1366,15 @@
             16,
             12
         ],
-        "face=floor,facing=west": [
+        "face=ceiling,facing=south": [
+            5,
+            10,
+            4,
+            11,
+            16,
+            12
+        ],
+        "face=ceiling,facing=west": [
             4,
             10,
             5,

From 517f5d35018f9f7fc54bc5d484ec5a83f885bae5 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 19 May 2025 03:02:23 +0300
Subject: [PATCH 33/62] feat(ui): display persistent capture mouse indicator
 instead of notification

---
 src/cameraRotationControls.ts    |  2 --
 src/react/GlobalOverlayHints.tsx | 52 ++++++++++++++++++++++++++++++++
 src/reactUi.tsx                  |  2 ++
 src/utils.ts                     |  8 +++--
 4 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 src/react/GlobalOverlayHints.tsx

diff --git a/src/cameraRotationControls.ts b/src/cameraRotationControls.ts
index 3368666f..849e5940 100644
--- a/src/cameraRotationControls.ts
+++ b/src/cameraRotationControls.ts
@@ -74,8 +74,6 @@ export const onControInit = () => {
 }
 
 function pointerLockChangeCallback () {
-  hideNotification('pointerlockchange')
-
   if (appViewer.rendererState.preventEscapeMenu) return
   if (!pointerLock.hasPointerLock && activeModalStack.length === 0 && miscUiState.gameLoaded) {
     showModal({ reactType: 'pause-screen' })
diff --git a/src/react/GlobalOverlayHints.tsx b/src/react/GlobalOverlayHints.tsx
new file mode 100644
index 00000000..aaf1bb20
--- /dev/null
+++ b/src/react/GlobalOverlayHints.tsx
@@ -0,0 +1,52 @@
+import { useEffect } from 'react'
+import { proxy, useSnapshot } from 'valtio'
+import { pointerLock } from '../utils'
+import PixelartIcon, { pixelartIcons } from './PixelartIcon'
+import { useUsingTouch } from './utilsApp'
+
+export const displayHintsState = proxy({
+  captureMouseHint: true
+})
+
+export default () => {
+  const { captureMouseHint } = useSnapshot(displayHintsState)
+  const usingTouch = useUsingTouch()
+
+  useEffect(() => {
+    const listener = () => {
+      if (pointerLock.hasPointerLock) {
+        displayHintsState.captureMouseHint = false
+      }
+    }
+    document.addEventListener('pointerlockchange', listener)
+
+    return () => {
+      document.removeEventListener('pointerlockchange', listener)
+    }
+  }, [])
+
+  if (usingTouch) return null
+  return <div style={{
+    // below crosshair that is in center of screen
+    position: 'absolute',
+    top: '50%',
+    left: '50%',
+    transform: 'translate(-50%, -50%)',
+    color: 'white',
+    fontSize: '10px',
+    whiteSpace: 'nowrap',
+    fontWeight: 'bold',
+    marginTop: '-16px',
+    pointerEvents: 'none',
+    textShadow: '0 0 1px black'
+  }}>
+    {captureMouseHint && <div style={{
+      display: 'flex',
+      alignItems: 'center',
+      gap: '10px',
+    }}>
+      <PixelartIcon iconName={pixelartIcons['sun-alt']} />
+      <div>Click to capture mouse</div>
+    </div>}
+  </div>
+}
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 4409c10a..6405b27e 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -62,6 +62,7 @@ import ChunksDebug from './react/ChunksDebug'
 import ChunksDebugScreen from './react/ChunksDebugScreen'
 import DebugResponseTimeIndicator from './react/debugs/DebugResponseTimeIndicator'
 import CreditsAboutModal from './react/CreditsAboutModal'
+import GlobalOverlayHints from './react/GlobalOverlayHints'
 
 const isFirefox = ua.getBrowser().name === 'Firefox'
 if (isFirefox) {
@@ -174,6 +175,7 @@ const InGameUi = () => {
         <MineflayerPluginHud />
         <MineflayerPluginConsole />
         {showUI && <TouchInteractionHint />}
+        <GlobalOverlayHints />
         <div style={{ display: showUI ? 'block' : 'none' }}>
           {!disabledUiParts.includes('xp-bar') && <XPBarProvider />}
           {!disabledUiParts.includes('hud-bars') && <HudBarsProvider />}
diff --git a/src/utils.ts b/src/utils.ts
index 93e2eb7b..8ea6d3aa 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -1,5 +1,6 @@
 import { gameAdditionalState, isGameActive, miscUiState } from './globalState'
 import { options } from './optionsStorage'
+import { displayHintsState } from './react/GlobalOverlayHints'
 import { notificationProxy, showNotification } from './react/NotificationProvider'
 import { packetsReplayState } from './react/state/packetsReplayState'
 
@@ -39,9 +40,10 @@ export const pointerLock = {
       void goFullscreen()
     }
     const displayBrowserProblem = () => {
-      if (notificationProxy.id === 'auto-login') return // prevent notification hide
-      showNotification('Browser Delay Limitation', navigator['keyboard'] ? 'Click on screen, enable Auto Fullscreen or F11' : 'Click on screen or use fullscreen in Chrome')
-      notificationProxy.id = 'pointerlockchange'
+      // if (notificationProxy.id === 'auto-login') return // prevent notification hide
+      // showNotification('Browser Delay Limitation', navigator['keyboard'] ? 'Click on screen, enable Auto Fullscreen or F11' : 'Click on screen or use fullscreen in Chrome')
+      // notificationProxy.id = 'pointerlockchange'
+      displayHintsState.captureMouseHint = true
     }
     if (!(document.fullscreenElement && navigator['keyboard']) && this.justHitEscape) {
       displayBrowserProblem()

From 67dbd56f14d89be19eb291afd63b3641b76f219f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 19 May 2025 03:07:01 +0300
Subject: [PATCH 34/62] dont display new hint when gamepad is used

---
 src/react/GlobalOverlayHints.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/react/GlobalOverlayHints.tsx b/src/react/GlobalOverlayHints.tsx
index aaf1bb20..063351de 100644
--- a/src/react/GlobalOverlayHints.tsx
+++ b/src/react/GlobalOverlayHints.tsx
@@ -1,6 +1,7 @@
 import { useEffect } from 'react'
 import { proxy, useSnapshot } from 'valtio'
 import { pointerLock } from '../utils'
+import { miscUiState } from '../globalState'
 import PixelartIcon, { pixelartIcons } from './PixelartIcon'
 import { useUsingTouch } from './utilsApp'
 
@@ -10,6 +11,7 @@ export const displayHintsState = proxy({
 
 export default () => {
   const { captureMouseHint } = useSnapshot(displayHintsState)
+  const { usingGamepadInput } = useSnapshot(miscUiState)
   const usingTouch = useUsingTouch()
 
   useEffect(() => {
@@ -25,7 +27,6 @@ export default () => {
     }
   }, [])
 
-  if (usingTouch) return null
   return <div style={{
     // below crosshair that is in center of screen
     position: 'absolute',
@@ -40,7 +41,7 @@ export default () => {
     pointerEvents: 'none',
     textShadow: '0 0 1px black'
   }}>
-    {captureMouseHint && <div style={{
+    {captureMouseHint && !usingTouch && !usingGamepadInput && <div style={{
       display: 'flex',
       alignItems: 'center',
       gap: '10px',

From 90c283c5eee4302b70c83e36f7dd815d64eb4449 Mon Sep 17 00:00:00 2001
From: Maksim Grigorev <gmi1987@gmail.com>
Date: Mon, 19 May 2025 15:17:36 +0300
Subject: [PATCH 35/62] Update src/utils/splashText.ts

Co-authored-by: Vitaly <vital2580@icloud.com>
---
 src/utils/splashText.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/splashText.ts b/src/utils/splashText.ts
index 2332c22a..a3d08d1d 100644
--- a/src/utils/splashText.ts
+++ b/src/utils/splashText.ts
@@ -1,5 +1,5 @@
 const MAX_WORDS = 5
-const HTTPS_REGEX = /^https?:\/\/[-\w@:%.+~#=]{1,256}\.[a-zA-Z\d()]{1,6}\b([-\w()@:%+.~#?&/=]*)$/
+const HTTPS_REGEX = /^https?:\/\//
 const TIMEOUT_MS = 5000
 const SPLASH_CACHE_KEY = 'minecraft_splash_text_cache'
 const SPLASH_URL_KEY = 'minecraft_splash_url'

From b2a1bd10e45bdfe68aefe41331853782711f067c Mon Sep 17 00:00:00 2001
From: Maxim Grigorev <gmi1987@gmail.com>
Date: Mon, 19 May 2025 19:04:35 +0700
Subject: [PATCH 36/62] fix: improoved the code

---
 src/utils/splashText.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/utils/splashText.ts b/src/utils/splashText.ts
index a3d08d1d..746455a2 100644
--- a/src/utils/splashText.ts
+++ b/src/utils/splashText.ts
@@ -13,6 +13,7 @@ const limitWords = (text: string): string => {
 }
 
 export const isRemoteSplashText = (text: string): boolean => {
+  if (!text) return false
   return HTTPS_REGEX.test(text)
 }
 
@@ -56,6 +57,10 @@ export const cacheSourceUrl = (url: string): void => {
 export const hasSourceUrlChanged = (newUrl?: string): boolean => {
   const cachedUrl = localStorage.getItem(SPLASH_URL_KEY)
 
+  if (!cachedUrl && !newUrl) {
+    return false
+  }
+
   if ((!cachedUrl && newUrl) || (cachedUrl && !newUrl)) {
     return true
   }

From 83366ec5fa9d55832a2494c1c794ca4564f8105b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 20 May 2025 02:02:43 +0300
Subject: [PATCH 37/62] improve Click to capture mouse by not displaying it in
 less cases

---
 src/globals.d.ts                 |  6 ++++++
 src/globals.js                   |  4 ++++
 src/react/GlobalOverlayHints.tsx | 11 +++++++----
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/globals.d.ts b/src/globals.d.ts
index b8741a12..7a2c6f1f 100644
--- a/src/globals.d.ts
+++ b/src/globals.d.ts
@@ -27,8 +27,14 @@ declare const customEvents: import('typed-emitter').default<{
   search (q: string): void
   activateItem (item: Item, slot: number, offhand: boolean): void
   hurtAnimation (yaw?: number): void
+  customChannelRegister (channel: string, parser: any): void
 }>
 declare const beforeRenderFrame: Array<() => void>
+declare const translate: <T extends string | undefined>(key: T) => T
+
+// API LAYER
+declare const toggleMicrophoneMuted: undefined | (() => void)
+declare const translateText: undefined | ((text: string) => string)
 
 declare interface Document {
   exitPointerLock?(): void
diff --git a/src/globals.js b/src/globals.js
index 1aa141c6..f9125c8c 100644
--- a/src/globals.js
+++ b/src/globals.js
@@ -9,3 +9,7 @@ window.viewer = undefined
 window.loadedData = undefined
 window.customEvents = new EventEmitter()
 window.customEvents.setMaxListeners(10_000)
+window.translate = (key) => {
+  if (typeof key !== 'string') return key
+  return window.translateText?.(key) ?? key
+}
diff --git a/src/react/GlobalOverlayHints.tsx b/src/react/GlobalOverlayHints.tsx
index 063351de..aa340953 100644
--- a/src/react/GlobalOverlayHints.tsx
+++ b/src/react/GlobalOverlayHints.tsx
@@ -1,7 +1,7 @@
 import { useEffect } from 'react'
 import { proxy, useSnapshot } from 'valtio'
-import { pointerLock } from '../utils'
-import { miscUiState } from '../globalState'
+import { isInRealGameSession, pointerLock } from '../utils'
+import { activeModalStack, miscUiState } from '../globalState'
 import PixelartIcon, { pixelartIcons } from './PixelartIcon'
 import { useUsingTouch } from './utilsApp'
 
@@ -13,6 +13,9 @@ export default () => {
   const { captureMouseHint } = useSnapshot(displayHintsState)
   const { usingGamepadInput } = useSnapshot(miscUiState)
   const usingTouch = useUsingTouch()
+  const acitveModals = useSnapshot(activeModalStack).length > 0
+
+  const inRealGameSession = isInRealGameSession()
 
   useEffect(() => {
     const listener = () => {
@@ -41,13 +44,13 @@ export default () => {
     pointerEvents: 'none',
     textShadow: '0 0 1px black'
   }}>
-    {captureMouseHint && !usingTouch && !usingGamepadInput && <div style={{
+    {captureMouseHint && !usingTouch && !usingGamepadInput && !acitveModals && inRealGameSession && <div style={{
       display: 'flex',
       alignItems: 'center',
       gap: '10px',
     }}>
       <PixelartIcon iconName={pixelartIcons['sun-alt']} />
-      <div>Click to capture mouse</div>
+      <div>{translate('Click to capture mouse')}</div>
     </div>}
   </div>
 }

From b4df2e18379c9ee4b73ed38696e4a002a5a79eea Mon Sep 17 00:00:00 2001
From: Maxim Grigorev <gmi1987@gmail.com>
Date: Tue, 20 May 2025 16:56:38 +0700
Subject: [PATCH 38/62] feat: improved splash text loading for better UI

---
 config.json             |  2 +-
 src/react/MainMenu.tsx  | 82 +++++++++++++++++++++++++----------------
 src/utils/splashText.ts | 35 ------------------
 3 files changed, 51 insertions(+), 68 deletions(-)

diff --git a/config.json b/config.json
index c1589ef9..26aa3249 100644
--- a/config.json
+++ b/config.json
@@ -26,8 +26,8 @@
     }
   ],
   "rightSideText": "A Minecraft client clone in the browser!",
+  "splashText": "GEN is cooking",
   "splashTextFallback": "Welcome!",
-  "splashText": "https://jsonplaceholder.typicode.com/posts/1",
   "pauseLinks": [
     [
       {
diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index 9f5d5357..f2e2274d 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -7,9 +7,8 @@ import { miscUiState } from '../globalState'
 import {
   isRemoteSplashText,
   loadRemoteSplashText,
-  getDisplayText,
+  getCachedSplashText,
   cacheSplashText,
-  hasSourceUrlChanged,
   cacheSourceUrl,
   clearSplashCache
 } from '../utils/splashText'
@@ -56,46 +55,65 @@ export default ({
   singleplayerAvailable = true
 }: Props) => {
   const { appConfig } = useSnapshot(miscUiState)
+  const [splashText, setSplashText] = useState<string | undefined>(undefined)
 
   useEffect(() => {
-    if (hasSourceUrlChanged(appConfig?.splashText)) {
-      clearSplashCache()
-      if (appConfig?.splashText && isRemoteSplashText(appConfig.splashText)) {
-        cacheSourceUrl(appConfig.splashText)
+    const determineAndSetSplashTextForSession = async () => {
+      const configSplashFromApp = appConfig?.splashText
+      const configFallbackFromApp = appConfig?.splashTextFallback
+
+      const isRemote = configSplashFromApp && isRemoteSplashText(configSplashFromApp)
+      let currentSourceKey: string
+      if (isRemote) {
+        currentSourceKey = configSplashFromApp!
+      } else {
+        currentSourceKey = configSplashFromApp || ''
       }
-    }
-  }, [appConfig?.splashText])
 
-  const initialSplashText = getDisplayText(appConfig?.splashText, appConfig?.splashTextFallback)
-  const [splashText, setSplashText] = useState(initialSplashText)
-  const [showSplash, setShowSplash] = useState(false)
+      const storedSourceKey = localStorage.getItem('minecraft_splash_url')
 
-  useEffect(() => {
-    const timer = setTimeout(() => {
-      setShowSplash(true)
-    }, 100)
-    return () => clearTimeout(timer)
-  }, [])
+      if (storedSourceKey !== currentSourceKey) {
+        clearSplashCache()
+        cacheSourceUrl(currentSourceKey)
+      }
 
-  useEffect(() => {
-    const loadSplashText = async () => {
-      try {
-        if (appConfig?.splashText && isRemoteSplashText(appConfig.splashText)) {
-          const text = await loadRemoteSplashText(appConfig.splashText)
+      const cachedText = getCachedSplashText()
+      if (cachedText) {
+        setSplashText(cachedText)
+        return
+      }
 
-          if (text && text.trim() !== '') {
-            setSplashText(text)
-            cacheSplashText(text)
+      if (isRemote && configSplashFromApp) {
+        try {
+          const fetchedText = await loadRemoteSplashText(configSplashFromApp)
+          if (fetchedText && fetchedText.trim() !== '' && !fetchedText.includes('Failed to load')) {
+            cacheSplashText(fetchedText)
+            setSplashText(fetchedText)
+          } else {
+            const finalText = configFallbackFromApp || ''
+            setSplashText(finalText)
+            cacheSplashText(finalText)
           }
-        } else if (appConfig?.splashText && !isRemoteSplashText(appConfig.splashText)) {
-          setSplashText(appConfig.splashText)
+        } catch (error) {
+          console.error('Session splash load error:', error)
+          const finalText = configFallbackFromApp || ''
+          setSplashText(finalText)
+          cacheSplashText(finalText)
         }
-      } catch (error) {
-        console.error('Failed to load splash text:', error)
+      } else if (configSplashFromApp && typeof configSplashFromApp === 'string' && configSplashFromApp.trim() !== '') {
+        setSplashText(configSplashFromApp)
+        cacheSplashText(configSplashFromApp)
+      } else {
+        const finalText = configFallbackFromApp || ''
+        setSplashText(finalText)
+        cacheSplashText(finalText)
       }
     }
-    void loadSplashText()
-  }, [appConfig?.splashText, appConfig?.splashTextFallback])
+
+    if (appConfig) {
+      void determineAndSetSplashTextForSession()
+    }
+  }, [appConfig])
 
   if (!bottomRightLinks?.trim()) bottomRightLinks = undefined
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
@@ -142,7 +160,7 @@ export default ({
       <div className={styles['game-title']}>
         <div className={styles.minecraft}>
           <div className={styles.edition} />
-          {showSplash && <span className={styles.splash}>{splashText}</span>}
+          <span className={styles.splash}>{splashText === undefined ? '' : splashText}</span>
         </div>
       </div>
 
diff --git a/src/utils/splashText.ts b/src/utils/splashText.ts
index 746455a2..4052c4f4 100644
--- a/src/utils/splashText.ts
+++ b/src/utils/splashText.ts
@@ -54,20 +54,6 @@ export const cacheSourceUrl = (url: string): void => {
   localStorage.setItem(SPLASH_URL_KEY, url)
 }
 
-export const hasSourceUrlChanged = (newUrl?: string): boolean => {
-  const cachedUrl = localStorage.getItem(SPLASH_URL_KEY)
-
-  if (!cachedUrl && !newUrl) {
-    return false
-  }
-
-  if ((!cachedUrl && newUrl) || (cachedUrl && !newUrl)) {
-    return true
-  }
-
-  return cachedUrl !== newUrl
-}
-
 export const clearSplashCache = (): void => {
   localStorage.removeItem(SPLASH_CACHE_KEY)
 }
@@ -79,24 +65,3 @@ export const getCachedSplashText = (): string | null => {
 export const cacheSplashText = (text: string): void => {
   localStorage.setItem(SPLASH_CACHE_KEY, text)
 }
-
-export const getDisplayText = (splashText?: string, fallbackText?: string): string => {
-  const cachedText = getCachedSplashText()
-
-  if (cachedText) return cachedText
-
-  if (fallbackText) return fallbackText
-
-  if (splashText && isRemoteSplashText(splashText)) return ''
-
-  return splashText || ''
-}
-
-export const getDirectDisplayText = (splashText?: string, fallbackText?: string): string => {
-
-  if (splashText && !isRemoteSplashText(splashText)) return splashText
-
-  if (fallbackText) return fallbackText
-
-  return ''
-}

From 4d70128ac691589f58016d7d559ab2444fd772e5 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Tue, 20 May 2025 13:53:26 +0300
Subject: [PATCH 39/62] Update config.json

---
 config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.json b/config.json
index 26aa3249..09d75ced 100644
--- a/config.json
+++ b/config.json
@@ -26,7 +26,7 @@
     }
   ],
   "rightSideText": "A Minecraft client clone in the browser!",
-  "splashText": "GEN is cooking",
+  "splashText": "https://jsonplaceholder.typicode.com/posts/1",
   "splashTextFallback": "Welcome!",
   "pauseLinks": [
     [

From 5efe3508dfaf13c0bb72eda17fde208fe95980be Mon Sep 17 00:00:00 2001
From: Maxim Grigorev <gmi1987@gmail.com>
Date: Tue, 20 May 2025 21:55:47 +0700
Subject: [PATCH 40/62] fix: optimized splash text loading

---
 src/react/MainMenu.tsx | 89 ++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 55 deletions(-)

diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index f2e2274d..8c24a2de 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react'
+import React, { useEffect, useMemo } from 'react'
 import { openURL } from 'renderer/viewer/lib/simpleUtils'
 import { useSnapshot } from 'valtio'
 import { haveDirectoryPicker } from '../utils'
@@ -55,65 +55,44 @@ export default ({
   singleplayerAvailable = true
 }: Props) => {
   const { appConfig } = useSnapshot(miscUiState)
-  const [splashText, setSplashText] = useState<string | undefined>(undefined)
+
+  const splashText = useMemo(() => {
+    const cachedText = getCachedSplashText()
+
+    const configSplashFromApp = appConfig?.splashText
+    const isRemote = configSplashFromApp && isRemoteSplashText(configSplashFromApp)
+    const sourceKey = isRemote ? configSplashFromApp : (configSplashFromApp || '')
+    const storedSourceKey = localStorage.getItem('minecraft_splash_url')
+
+    if (storedSourceKey !== sourceKey) {
+      clearSplashCache()
+      cacheSourceUrl(sourceKey)
+    } else if (cachedText) {
+      return cachedText
+    }
+
+    if (!isRemote && configSplashFromApp && configSplashFromApp.trim() !== '') {
+      cacheSplashText(configSplashFromApp)
+      return configSplashFromApp
+    }
+
+    return appConfig?.splashTextFallback || ''
+  }, [appConfig])
 
   useEffect(() => {
-    const determineAndSetSplashTextForSession = async () => {
-      const configSplashFromApp = appConfig?.splashText
-      const configFallbackFromApp = appConfig?.splashTextFallback
-
-      const isRemote = configSplashFromApp && isRemoteSplashText(configSplashFromApp)
-      let currentSourceKey: string
-      if (isRemote) {
-        currentSourceKey = configSplashFromApp!
-      } else {
-        currentSourceKey = configSplashFromApp || ''
-      }
-
-      const storedSourceKey = localStorage.getItem('minecraft_splash_url')
-
-      if (storedSourceKey !== currentSourceKey) {
-        clearSplashCache()
-        cacheSourceUrl(currentSourceKey)
-      }
-
-      const cachedText = getCachedSplashText()
-      if (cachedText) {
-        setSplashText(cachedText)
-        return
-      }
-
-      if (isRemote && configSplashFromApp) {
-        try {
-          const fetchedText = await loadRemoteSplashText(configSplashFromApp)
+    const configSplashFromApp = appConfig?.splashText
+    if (configSplashFromApp && isRemoteSplashText(configSplashFromApp)) {
+      loadRemoteSplashText(configSplashFromApp)
+        .then(fetchedText => {
           if (fetchedText && fetchedText.trim() !== '' && !fetchedText.includes('Failed to load')) {
             cacheSplashText(fetchedText)
-            setSplashText(fetchedText)
-          } else {
-            const finalText = configFallbackFromApp || ''
-            setSplashText(finalText)
-            cacheSplashText(finalText)
           }
-        } catch (error) {
-          console.error('Session splash load error:', error)
-          const finalText = configFallbackFromApp || ''
-          setSplashText(finalText)
-          cacheSplashText(finalText)
-        }
-      } else if (configSplashFromApp && typeof configSplashFromApp === 'string' && configSplashFromApp.trim() !== '') {
-        setSplashText(configSplashFromApp)
-        cacheSplashText(configSplashFromApp)
-      } else {
-        const finalText = configFallbackFromApp || ''
-        setSplashText(finalText)
-        cacheSplashText(finalText)
-      }
+        })
+        .catch(error => {
+          console.error('Failed to preload splash text for next session:', error)
+        })
     }
-
-    if (appConfig) {
-      void determineAndSetSplashTextForSession()
-    }
-  }, [appConfig])
+  }, [appConfig?.splashText])
 
   if (!bottomRightLinks?.trim()) bottomRightLinks = undefined
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
@@ -160,7 +139,7 @@ export default ({
       <div className={styles['game-title']}>
         <div className={styles.minecraft}>
           <div className={styles.edition} />
-          <span className={styles.splash}>{splashText === undefined ? '' : splashText}</span>
+          <span className={styles.splash}>{splashText}</span>
         </div>
       </div>
 

From 7799ccc370f16a805e2c9515f110a9707704a500 Mon Sep 17 00:00:00 2001
From: Maksim Grigorev <gmi1987@gmail.com>
Date: Tue, 20 May 2025 19:08:34 +0300
Subject: [PATCH 41/62] Update src/react/MainMenu.tsx

Co-authored-by: Vitaly <vital2580@icloud.com>
---
 src/react/MainMenu.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index 8c24a2de..eff26bfd 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -77,7 +77,7 @@ export default ({
     }
 
     return appConfig?.splashTextFallback || ''
-  }, [appConfig])
+  }, [])
 
   useEffect(() => {
     const configSplashFromApp = appConfig?.splashText

From 4f78534ca4c6451dc96ce7be73d3eedd9e0d4c09 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Tue, 20 May 2025 19:49:36 +0300
Subject: [PATCH 42/62] Update config.json

---
 config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.json b/config.json
index 09d75ced..29f011c0 100644
--- a/config.json
+++ b/config.json
@@ -26,7 +26,7 @@
     }
   ],
   "rightSideText": "A Minecraft client clone in the browser!",
-  "splashText": "https://jsonplaceholder.typicode.com/posts/1",
+  "splashText": "The sunset is coming!",
   "splashTextFallback": "Welcome!",
   "pauseLinks": [
     [

From b2ef71fc19cc1dca9c3c42eace7d64f0e664c909 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 21 May 2025 05:37:33 +0300
Subject: [PATCH 43/62] up mc data, physics, autojump

---
 package.json    |   8 ++--
 pnpm-lock.yaml  | 100 ++++++++++++++++++++++++------------------------
 src/entities.ts |   2 +-
 3 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/package.json b/package.json
index 4d07ffe7..58b82cc7 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
   "dependencies": {
     "@dimaka/interface": "0.0.3-alpha.0",
     "@floating-ui/react": "^0.26.1",
-    "@nxg-org/mineflayer-auto-jump": "^0.7.17",
+    "@nxg-org/mineflayer-auto-jump": "^0.7.18",
     "@nxg-org/mineflayer-tracker": "1.2.1",
     "@react-oauth/google": "^0.12.1",
     "@stylistic/eslint-plugin": "^2.6.1",
@@ -83,7 +83,7 @@
     "jszip": "^3.10.1",
     "lodash-es": "^4.17.21",
     "mcraft-fun-mineflayer": "^0.1.23",
-    "minecraft-data": "3.83.1",
+    "minecraft-data": "3.89.0",
     "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
     "mineflayer-item-map-downloader": "github:zardoy/mineflayer-item-map-downloader",
     "mojangson": "^2.0.4",
@@ -194,14 +194,14 @@
   },
   "pnpm": {
     "overrides": {
-      "@nxg-org/mineflayer-physics-util": "1.8.8",
+      "@nxg-org/mineflayer-physics-util": "1.8.10",
       "buffer": "^6.0.3",
       "vec3": "0.1.10",
       "three": "0.154.0",
       "diamond-square": "github:zardoy/diamond-square",
       "prismarine-block": "github:zardoy/prismarine-block#next-era",
       "prismarine-world": "github:zardoy/prismarine-world#next-era",
-      "minecraft-data": "3.83.1",
+      "minecraft-data": "3.89.0",
       "prismarine-provider-anvil": "github:zardoy/prismarine-provider-anvil#everything",
       "prismarine-physics": "github:zardoy/prismarine-physics",
       "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index eccaae6c..be965dbe 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,14 +5,14 @@ settings:
   excludeLinksFromLockfile: false
 
 overrides:
-  '@nxg-org/mineflayer-physics-util': 1.8.8
+  '@nxg-org/mineflayer-physics-util': 1.8.10
   buffer: ^6.0.3
   vec3: 0.1.10
   three: 0.154.0
   diamond-square: github:zardoy/diamond-square
   prismarine-block: github:zardoy/prismarine-block#next-era
   prismarine-world: github:zardoy/prismarine-world#next-era
-  minecraft-data: 3.83.1
+  minecraft-data: 3.89.0
   prismarine-provider-anvil: github:zardoy/prismarine-provider-anvil#everything
   prismarine-physics: github:zardoy/prismarine-physics
   minecraft-protocol: github:PrismarineJS/node-minecraft-protocol#master
@@ -42,8 +42,8 @@ importers:
         specifier: ^0.26.1
         version: 0.26.28(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@nxg-org/mineflayer-auto-jump':
-        specifier: ^0.7.17
-        version: 0.7.17
+        specifier: ^0.7.18
+        version: 0.7.18
       '@nxg-org/mineflayer-tracker':
         specifier: 1.2.1
         version: 1.2.1(encoding@0.1.13)
@@ -138,8 +138,8 @@ importers:
         specifier: ^0.1.23
         version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d(encoding@0.1.13))
       minecraft-data:
-        specifier: 3.83.1
-        version: 3.83.1
+        specifier: 3.89.0
+        version: 3.89.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
         version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
@@ -166,7 +166,7 @@ importers:
         version: 6.1.1
       prismarine-provider-anvil:
         specifier: github:zardoy/prismarine-provider-anvil#everything
-        version: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1)
+        version: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.89.0)
       prosemirror-example-setup:
         specifier: ^1.2.2
         version: 1.2.3
@@ -435,7 +435,7 @@ importers:
         version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chunk:
         specifier: github:zardoy/prismarine-chunk#master
-        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
+        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0)
       prismarine-schematic:
         specifier: ^1.2.0
         version: 1.2.3
@@ -2019,11 +2019,11 @@ packages:
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     deprecated: This functionality has been moved to @npmcli/fs
 
-  '@nxg-org/mineflayer-auto-jump@0.7.17':
-    resolution: {integrity: sha512-AgIiJcyh9y8bZjwNHZ2Wp/mbC6+XfE8cM/nOLcZaQYLdoUgncUeaNinFTYLvwi1RMQ42S5bxvwI9kKUwjRhlDA==}
+  '@nxg-org/mineflayer-auto-jump@0.7.18':
+    resolution: {integrity: sha512-O/nRCyWrRwFpcCXXSJhmt844c4a8KhkK4OJPAOKSc63tExIIQU/sipHgjgpy0B+gVDjSmLMPYXe71CN0W327Wg==}
 
-  '@nxg-org/mineflayer-physics-util@1.8.8':
-    resolution: {integrity: sha512-u7CiKCroGrxtqGpIVWKo40GsE7aLc2cH1lvCDBW+Y/V4h1SaCDXzYBOADUKMeOemFss90au/AOGtkahezaoF8A==}
+  '@nxg-org/mineflayer-physics-util@1.8.10':
+    resolution: {integrity: sha512-JGIJEPauVmqoBFQ0I8ZtbaYo3mKn2N00srnDrWkCEt1qozyZWie4sYR0khjjwYubFCljMoWtoEA0+DLsHZLNFg==}
 
   '@nxg-org/mineflayer-tracker@1.2.1':
     resolution: {integrity: sha512-SI1ffF8zvg3/ZNE021Ja2W0FZPN+WbQDZf8yFqOcXtPRXAtM9W6HvoACdzXep8BZid7WYgYLIgjKpB+9RqvCNQ==}
@@ -6687,8 +6687,8 @@ packages:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
 
-  minecraft-data@3.83.1:
-    resolution: {integrity: sha512-5K26za9k5WV1OnfkGexA77lBhfGZeFw3rT3NM7/rbFXRZC65prCx7Tk2BQvC9UfzgxxvmxHfxM5y8G1U+Oxgfg==}
+  minecraft-data@3.89.0:
+    resolution: {integrity: sha512-v6dUr1M7Pjc6N4ujanrBZu3IP4/HbSBpxSSXNbK6HVFVJqfaqKSMXN57G/JAlDcwqXYsVd9H4tbKFHCO+VmQpg==}
 
   minecraft-folder-path@1.2.0:
     resolution: {integrity: sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==}
@@ -7424,7 +7424,7 @@ packages:
   prismarine-biome@1.3.0:
     resolution: {integrity: sha512-GY6nZxq93mTErT7jD7jt8YS1aPrOakbJHh39seYsJFXvueIOdHAmW16kYQVrTVMW5MlWLQVxV/EquRwOgr4MnQ==}
     peerDependencies:
-      minecraft-data: 3.83.1
+      minecraft-data: 3.89.0
       prismarine-registry: ^1.1.0
 
   prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
@@ -11377,12 +11377,12 @@ snapshots:
       rimraf: 3.0.2
     optional: true
 
-  '@nxg-org/mineflayer-auto-jump@0.7.17':
+  '@nxg-org/mineflayer-auto-jump@0.7.18':
     dependencies:
-      '@nxg-org/mineflayer-physics-util': 1.8.8
+      '@nxg-org/mineflayer-physics-util': 1.8.10
       strict-event-emitter-types: 2.0.0
 
-  '@nxg-org/mineflayer-physics-util@1.8.8':
+  '@nxg-org/mineflayer-physics-util@1.8.10':
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
 
@@ -11397,7 +11397,7 @@ snapshots:
   '@nxg-org/mineflayer-trajectories@1.2.0(encoding@0.1.13)':
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
-      minecraft-data: 3.83.1
+      minecraft-data: 3.89.0
       mineflayer: 4.27.0(encoding@0.1.13)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.16.0
@@ -13198,16 +13198,16 @@ snapshots:
       exit-hook: 2.2.1
       flatmap: 0.0.3
       long: 5.3.1
-      minecraft-data: 3.83.1
+      minecraft-data: 3.89.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
-      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1)
+      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.89.0)
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       rambda: 9.4.2
@@ -13234,16 +13234,16 @@ snapshots:
       exit-hook: 2.2.1
       flatmap: 0.0.3
       long: 5.3.1
-      minecraft-data: 3.83.1
+      minecraft-data: 3.89.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
-      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1)
+      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.89.0)
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       rambda: 9.4.2
@@ -14637,8 +14637,8 @@ snapshots:
 
   diamond-square@https://codeload.github.com/zardoy/diamond-square/tar.gz/cfaad2d1d5909fdfa63c8cc7bc05fb5e87782d71:
     dependencies:
-      minecraft-data: 3.83.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
+      minecraft-data: 3.89.0
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0)
       prismarine-registry: 1.11.0
       random-seed: 0.3.0
       vec3: 0.1.10
@@ -17344,7 +17344,7 @@ snapshots:
 
   min-indent@1.0.1: {}
 
-  minecraft-data@3.83.1: {}
+  minecraft-data@3.89.0: {}
 
   minecraft-folder-path@1.2.0: {}
 
@@ -17364,7 +17364,7 @@ snapshots:
       debug: 4.4.0(supports-color@8.1.1)
       endian-toggle: 0.0.0
       lodash.merge: 4.6.2
-      minecraft-data: 3.83.1
+      minecraft-data: 3.89.0
       minecraft-folder-path: 1.2.0
       node-fetch: 2.7.0(encoding@0.1.13)
       node-rsa: 0.4.2
@@ -17443,7 +17443,7 @@ snapshots:
 
   mineflayer-pathfinder@2.4.5:
     dependencies:
-      minecraft-data: 3.83.1
+      minecraft-data: 3.89.0
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
@@ -17453,12 +17453,12 @@ snapshots:
 
   mineflayer@4.27.0(encoding@0.1.13):
     dependencies:
-      minecraft-data: 3.83.1
+      minecraft-data: 3.89.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
+      prismarine-biome: 1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
@@ -17476,13 +17476,13 @@ snapshots:
 
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d(encoding@0.1.13):
     dependencies:
-      '@nxg-org/mineflayer-physics-util': 1.8.8
-      minecraft-data: 3.83.1
+      '@nxg-org/mineflayer-physics-util': 1.8.10
+      minecraft-data: 3.89.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
+      prismarine-biome: 1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
@@ -18268,15 +18268,15 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  prismarine-biome@1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0):
+  prismarine-biome@1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0):
     dependencies:
-      minecraft-data: 3.83.1
+      minecraft-data: 3.89.0
       prismarine-registry: 1.11.0
 
   prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
     dependencies:
-      minecraft-data: 3.83.1
-      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
+      minecraft-data: 3.89.0
+      prismarine-biome: 1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0)
       prismarine-chat: 1.11.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
@@ -18288,9 +18288,9 @@ snapshots:
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
 
-  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1):
+  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0):
     dependencies:
-      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
+      prismarine-biome: 1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
@@ -18319,14 +18319,14 @@ snapshots:
 
   prismarine-physics@https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b:
     dependencies:
-      minecraft-data: 3.83.1
+      minecraft-data: 3.89.0
       prismarine-nbt: 2.7.0
       vec3: 0.1.10
 
-  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1):
+  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.89.0):
     dependencies:
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       uint4: 0.1.2
@@ -18348,13 +18348,13 @@ snapshots:
 
   prismarine-registry@1.11.0:
     dependencies:
-      minecraft-data: 3.83.1
+      minecraft-data: 3.89.0
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
 
   prismarine-schematic@1.2.3:
     dependencies:
-      minecraft-data: 3.83.1
+      minecraft-data: 3.89.0
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
@@ -20461,7 +20461,7 @@ snapshots:
   vite-node@3.0.8(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0):
     dependencies:
       cac: 6.7.14
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       es-module-lexer: 1.6.0
       pathe: 2.0.3
       vite: 6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
@@ -20547,7 +20547,7 @@ snapshots:
       '@vitest/spy': 3.0.8
       '@vitest/utils': 3.0.8
       chai: 5.2.0
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       expect-type: 1.2.0
       magic-string: 0.30.17
       pathe: 2.0.3
diff --git a/src/entities.ts b/src/entities.ts
index 919d6818..e6226d6a 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -13,7 +13,7 @@ const updateAutoJump = () => {
   if (!bot?.autoJumper) return
   const autoJump = options.autoParkour || (options.autoJump === 'auto' ? miscUiState.currentTouch && !miscUiState.usingGamepadInput : options.autoJump === 'always')
   bot.autoJumper.setOpts({
-    jumpIntoWater: options.autoParkour,
+    // jumpIntoWater: options.autoParkour,
     jumpOnAllEdges: options.autoParkour,
     // strictBlockCollision: true,
   })

From ecb53fab8882a7010e58e67b116f43696976fdbb Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 21 May 2025 05:46:36 +0300
Subject: [PATCH 44/62] up tracker

---
 package.json    |  2 +-
 pnpm-lock.yaml  | 11 ++++++-----
 src/entities.ts |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 58b82cc7..7d3a5011 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "@dimaka/interface": "0.0.3-alpha.0",
     "@floating-ui/react": "^0.26.1",
     "@nxg-org/mineflayer-auto-jump": "^0.7.18",
-    "@nxg-org/mineflayer-tracker": "1.2.1",
+    "@nxg-org/mineflayer-tracker": "1.3.0",
     "@react-oauth/google": "^0.12.1",
     "@stylistic/eslint-plugin": "^2.6.1",
     "@types/gapi": "^0.0.47",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index be965dbe..c9be7ee5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -45,8 +45,8 @@ importers:
         specifier: ^0.7.18
         version: 0.7.18
       '@nxg-org/mineflayer-tracker':
-        specifier: 1.2.1
-        version: 1.2.1(encoding@0.1.13)
+        specifier: 1.3.0
+        version: 1.3.0(encoding@0.1.13)
       '@react-oauth/google':
         specifier: ^0.12.1
         version: 0.12.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -2025,8 +2025,8 @@ packages:
   '@nxg-org/mineflayer-physics-util@1.8.10':
     resolution: {integrity: sha512-JGIJEPauVmqoBFQ0I8ZtbaYo3mKn2N00srnDrWkCEt1qozyZWie4sYR0khjjwYubFCljMoWtoEA0+DLsHZLNFg==}
 
-  '@nxg-org/mineflayer-tracker@1.2.1':
-    resolution: {integrity: sha512-SI1ffF8zvg3/ZNE021Ja2W0FZPN+WbQDZf8yFqOcXtPRXAtM9W6HvoACdzXep8BZid7WYgYLIgjKpB+9RqvCNQ==}
+  '@nxg-org/mineflayer-tracker@1.3.0':
+    resolution: {integrity: sha512-HINrv51l2aZ/lDrcL77gSWDvf3Z3trd6kdiifXitCMDNdBT0FpWnXq9bi5Fr7yPpFGQ3fqGUIq5DQYYY84E9IA==}
 
   '@nxg-org/mineflayer-trajectories@1.2.0':
     resolution: {integrity: sha512-yTDHn96fyWLKwdHdOGIrnt8nss4SJmxXwJn101o7aNI4sgdnUmwaX4FoNbmrEa9eZn6IwxaXIxDf+fJmKj9RIw==}
@@ -11386,8 +11386,9 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
 
-  '@nxg-org/mineflayer-tracker@1.2.1(encoding@0.1.13)':
+  '@nxg-org/mineflayer-tracker@1.3.0(encoding@0.1.13)':
     dependencies:
+      '@nxg-org/mineflayer-physics-util': 1.8.10
       '@nxg-org/mineflayer-trajectories': 1.2.0(encoding@0.1.13)
       '@nxg-org/mineflayer-util-plugin': 1.8.4
     transitivePeerDependencies:
diff --git a/src/entities.ts b/src/entities.ts
index e6226d6a..8ee36431 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -61,7 +61,7 @@ customEvents.on('gameLoaded', () => {
       if (!tracking) continue
       const e = bot.entities[id]
       if (!e) continue
-      const speed = info.avgSpeed
+      const speed = info.avgVel
       const WALKING_SPEED = 0.03
       const SPRINTING_SPEED = 0.18
       const isCrouched = e['crouching']

From a4e70768ddca76189bf7af9e09519b029d6532e3 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 21 May 2025 05:53:59 +0300
Subject: [PATCH 45/62] fix test

---
 renderer/viewer/lib/mesher/test/tests.test.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/renderer/viewer/lib/mesher/test/tests.test.ts b/renderer/viewer/lib/mesher/test/tests.test.ts
index 7959f573..9ebd6604 100644
--- a/renderer/viewer/lib/mesher/test/tests.test.ts
+++ b/renderer/viewer/lib/mesher/test/tests.test.ts
@@ -49,7 +49,6 @@ test('Known blocks are not rendered', () => {
   // TODO resolve creaking_heart issue (1.21.3)
   expect(missingBlocks).toMatchInlineSnapshot(`
     {
-      "creaking_heart": true,
       "end_gateway": true,
       "end_portal": true,
       "structure_void": true,

From b36d08528f70ee5e7896ea76650a7e6f733bf66d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 21 May 2025 06:36:39 +0300
Subject: [PATCH 46/62] fix: fix hanging forever server ping and weboscket
 connections

---
 src/mineflayer/minecraft-protocol-extra.ts | 30 +++++++++++++++-------
 src/mineflayer/websocket-core.ts           |  4 +++
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/mineflayer/minecraft-protocol-extra.ts b/src/mineflayer/minecraft-protocol-extra.ts
index e8216a00..f3cf11e3 100644
--- a/src/mineflayer/minecraft-protocol-extra.ts
+++ b/src/mineflayer/minecraft-protocol-extra.ts
@@ -3,13 +3,11 @@ import clientAutoVersion from 'minecraft-protocol/src/client/autoVersion'
 
 export const pingServerVersion = async (ip: string, port?: number, mergeOptions: Record<string, any> = {}) => {
   const fakeClient = new EventEmitter() as any
-  fakeClient.on('error', (err) => {
-    throw new Error(err.message ?? err)
-  })
   const options = {
     host: ip,
     port,
-    noPongTimeout: Infinity, // disable timeout
+    noPongTimeout: 10_000,
+    closeTimeout: 20_000,
     ...mergeOptions,
   }
   let latency = 0
@@ -19,12 +17,26 @@ export const pingServerVersion = async (ip: string, port?: number, mergeOptions:
     fullInfo = res
   }]
 
-  // TODO! use client.socket.destroy() instead of client.end() for faster cleanup
-  await clientAutoVersion(fakeClient, options)
+  // TODO use client.socket.destroy() instead of client.end() for faster cleanup
+  clientAutoVersion(fakeClient, options)
+  await Promise.race([
+    new Promise<void>((resolve, reject) => {
+      fakeClient.once('connect_allowed', () => {
+        resolve()
+      })
+    }),
+    new Promise<void>((resolve, reject) => {
+      fakeClient.on('error', (err) => {
+        reject(new Error(err.message ?? err))
+      })
+      if (mergeOptions.stream) {
+        mergeOptions.stream.on('end', (err) => {
+          reject(new Error('Connection closed'))
+        })
+      }
+    })
+  ])
 
-  await new Promise<void>((resolve, reject) => {
-    fakeClient.once('connect_allowed', resolve)
-  })
   return {
     version: fakeClient.version,
     latency,
diff --git a/src/mineflayer/websocket-core.ts b/src/mineflayer/websocket-core.ts
index 482f0def..d24bd6be 100644
--- a/src/mineflayer/websocket-core.ts
+++ b/src/mineflayer/websocket-core.ts
@@ -33,10 +33,14 @@ export const getWebsocketStream = async (host: string) => {
   ws.addEventListener('close', () => {
     console.log('ws closed')
     clientDuplex.end()
+    setTimeout(() => {
+      clientDuplex.emit('end', 'Connection lost')
+    }, 500)
   })
 
   ws.addEventListener('error', err => {
     console.log('ws error', err)
+    clientDuplex.emit('error', err)
   })
 
   await new Promise((resolve, reject) => {

From 5ea2ab9c1af1c30d16bd3fcbcd416760de307289 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 21 May 2025 13:55:52 +0300
Subject: [PATCH 47/62] fix: update tab header/footer in real time, use player
 display name in tab

---
 src/react/PlayerListOverlay.tsx         | 4 ++--
 src/react/PlayerListOverlayProvider.tsx | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/react/PlayerListOverlay.tsx b/src/react/PlayerListOverlay.tsx
index 90dfd685..0aa99136 100644
--- a/src/react/PlayerListOverlay.tsx
+++ b/src/react/PlayerListOverlay.tsx
@@ -2,7 +2,7 @@ import MessageFormattedString from './MessageFormattedString'
 import './PlayerListOverlay.css'
 
 
-type PlayersLists = Array<Array<Pick<import('mineflayer').Player, 'uuid' | 'username' | 'ping'>>>
+type PlayersLists = Array<Array<Pick<import('mineflayer').Player, 'uuid' | 'displayName' | 'username' | 'ping'>>>
 
 type PlayerListOverlayProps = {
   playersLists: PlayersLists,
@@ -25,7 +25,7 @@ export default ({ playersLists, clientId, tablistHeader, tablistFooter, serverIP
         <div key={index} className="player-list">
           {list.map(player => (
             <div key={player.uuid ?? player.username} className={`playerlist-entry${clientId === player.uuid ? ' active-player' : ''}`} id={`plist-player-${player.uuid}`}>
-              <MessageFormattedString message={player.username} />
+              <MessageFormattedString message={player.displayName ?? player.username} />
               <div className="playerlist-ping">
                 <p className="playerlist-ping-value">{player.ping}</p>
                 <p className="playerlist-ping-label">ms</p>
diff --git a/src/react/PlayerListOverlayProvider.tsx b/src/react/PlayerListOverlayProvider.tsx
index 4d971687..478fd1d2 100644
--- a/src/react/PlayerListOverlayProvider.tsx
+++ b/src/react/PlayerListOverlayProvider.tsx
@@ -14,6 +14,7 @@ export default () => {
   const [clientId, setClientId] = useState(bot._client.uuid)
   const [players, setPlayers] = useState<Players>({})
   const [isOpen, setIsOpen] = useState(false)
+  const [counter, setCounter] = useState(0)
 
   const handleKeyDown = (e) => {
     if (!isGameActive(true)) return
@@ -60,9 +61,13 @@ export default () => {
     document.addEventListener('keydown', handleKeyDown)
     document.addEventListener('keyup', handleKeyUp)
 
+    const playerlistHeader = () => setCounter(prev => prev + 1)
+    bot._client.on('playerlist_header', playerlistHeader)
+
     return () => {
       document.removeEventListener('keydown', handleKeyDown)
       document.removeEventListener('keyup', handleKeyUp)
+      bot?._client.removeListener('playerlist_header', playerlistHeader)
     }
   }, [serverIp])
 

From 7cea1b87555a1e3cd8538133d3c0b8b1b930ea88 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Wed, 21 May 2025 18:45:54 +0300
Subject: [PATCH 48/62] fix tsc

---
 src/react/PlayerListOverlay.stories.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/react/PlayerListOverlay.stories.tsx b/src/react/PlayerListOverlay.stories.tsx
index ec1958a7..2b82938d 100644
--- a/src/react/PlayerListOverlay.stories.tsx
+++ b/src/react/PlayerListOverlay.stories.tsx
@@ -16,7 +16,7 @@ export const Primary: Story = {
         { username: 'Player 1', ping: 10, uuid: '1' },
         { username: 'Player 2', ping: 20, uuid: '2' },
         { username: 'Player 3', ping: 30, uuid: '3' },
-      ]
+      ] as any
     ],
     clientId: '2',
     tablistHeader: 'Header',

From 5a663aac2f6c908826991420e71300cdc8cc1e9b Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Wed, 21 May 2025 16:53:20 +0100
Subject: [PATCH 49/62] fix: item textures in inventory break after loading
 resourcepack (#362)

---
 src/inventoryWindows.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 585d3078..187bb997 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -25,6 +25,7 @@ import { GeneralInputItem, getItemMetadata, getItemModelName, getItemNameRaw, Re
 const loadedImagesCache = new Map<string, HTMLImageElement>()
 const cleanLoadedImagesCache = () => {
   loadedImagesCache.delete('blocks')
+  loadedImagesCache.delete('items')
 }
 
 let lastWindow: ReturnType<typeof showInventory>
@@ -120,6 +121,7 @@ export const onGameLoad = () => {
   if (!appViewer.resourcesManager['_inventoryChangeTracked']) {
     appViewer.resourcesManager['_inventoryChangeTracked'] = true
     const texturesChanged = () => {
+      cleanLoadedImagesCache()
       if (!lastWindow) return
       upWindowItemsLocal()
       upJei(lastJeiSearch)

From 972625757792641490a01efa12f59edfaa314fb8 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 22 May 2025 14:46:44 +0300
Subject: [PATCH 50/62] fix: do not display capture lock message when possilbe
 (avoid flickering - do strategy switch) feat: make tab (players list)
 keybindign configurable and add a way to assign to a gamepad button

---
 package.json                            |  2 +-
 pnpm-lock.yaml                          | 16 +++++++-------
 src/controls.ts                         |  5 +++++
 src/react/GlobalOverlayHints.tsx        |  2 +-
 src/react/PlayerListOverlayProvider.tsx | 29 ++++++-------------------
 src/utils.ts                            |  9 ++++----
 6 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/package.json b/package.json
index 7d3a5011..655cd394 100644
--- a/package.json
+++ b/package.json
@@ -140,7 +140,7 @@
     "browserify-zlib": "^0.2.0",
     "buffer": "^6.0.3",
     "constants-browserify": "^1.0.0",
-    "contro-max": "^0.1.8",
+    "contro-max": "^0.1.9",
     "crypto-browserify": "^3.12.0",
     "cypress-esbuild-preprocessor": "^1.0.2",
     "eslint": "^8.50.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c9be7ee5..60086040 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -304,8 +304,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       contro-max:
-        specifier: ^0.1.8
-        version: 0.1.8(typescript@5.5.4)
+        specifier: ^0.1.9
+        version: 0.1.9(typescript@5.5.4)
       crypto-browserify:
         specifier: ^3.12.0
         version: 3.12.1
@@ -4237,8 +4237,8 @@ packages:
     resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==}
     engines: {node: '>= 0.6'}
 
-  contro-max@0.1.8:
-    resolution: {integrity: sha512-5SoeudO8Zzfj/gbFTDrMRFJny02+MY1lBtb2NyCNiBLtHAfvhWZxZs/Z3yJvKL2rY/qKUZs9gTQOIDygBcBrdw==}
+  contro-max@0.1.9:
+    resolution: {integrity: sha512-zH9FB60EzhHKublD92d11QuarYRTdYci5rvDgwDr5XXwUqae5mr6IgzXGcr78T2odnO/Aeqmrf32RDwJIl5GfQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   convert-source-map@1.9.0:
@@ -9751,7 +9751,7 @@ snapshots:
       '@babel/core': 7.26.9
       '@babel/helper-compilation-targets': 7.26.5
       '@babel/helper-plugin-utils': 7.26.5
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       lodash.debounce: 4.0.8
       resolve: 1.22.10
     transitivePeerDependencies:
@@ -13322,7 +13322,7 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
     transitivePeerDependencies:
       - supports-color
     optional: true
@@ -14225,7 +14225,7 @@ snapshots:
 
   content-type@1.0.5: {}
 
-  contro-max@0.1.8(typescript@5.5.4):
+  contro-max@0.1.9(typescript@5.5.4):
     dependencies:
       events: 3.3.0
       lodash-es: 4.17.21
@@ -17268,7 +17268,7 @@ snapshots:
   micromark@4.0.2:
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       decode-named-character-reference: 1.1.0
       devlop: 1.1.0
       micromark-core-commonmark: 2.0.3
diff --git a/src/controls.ts b/src/controls.ts
index f8160cfd..9b2c3cbf 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -27,6 +27,7 @@ import { onCameraMove, onControInit } from './cameraRotationControls'
 import { createNotificationProgressReporter } from './core/progressReporter'
 import { appStorage } from './react/appStorageProvider'
 import { switchGameMode } from './packetsReplay/replayPackets'
+import { tabListState } from './react/PlayerListOverlayProvider'
 
 
 export const customKeymaps = proxy(appStorage.keybindings)
@@ -65,6 +66,7 @@ export const contro = new ControMax({
       // client side
       zoom: ['KeyC'],
       viewerConsole: ['Backquote'],
+      playersList: ['Tab'],
     },
     ui: {
       toggleFullscreen: ['F11'],
@@ -405,6 +407,9 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => {
       case 'general.rotateCameraDown':
         cameraRotationControls.handleCommand(command, pressed)
         break
+      case 'general.playersList':
+        tabListState.isOpen = pressed
+        break
     }
   }
 }
diff --git a/src/react/GlobalOverlayHints.tsx b/src/react/GlobalOverlayHints.tsx
index aa340953..ddbb1116 100644
--- a/src/react/GlobalOverlayHints.tsx
+++ b/src/react/GlobalOverlayHints.tsx
@@ -6,7 +6,7 @@ import PixelartIcon, { pixelartIcons } from './PixelartIcon'
 import { useUsingTouch } from './utilsApp'
 
 export const displayHintsState = proxy({
-  captureMouseHint: true
+  captureMouseHint: false
 })
 
 export default () => {
diff --git a/src/react/PlayerListOverlayProvider.tsx b/src/react/PlayerListOverlayProvider.tsx
index 478fd1d2..3ff69c41 100644
--- a/src/react/PlayerListOverlayProvider.tsx
+++ b/src/react/PlayerListOverlayProvider.tsx
@@ -1,4 +1,4 @@
-import { useSnapshot } from 'valtio'
+import { proxy, useSnapshot } from 'valtio'
 import { useState, useEffect, useMemo } from 'react'
 import { isGameActive } from '../globalState'
 import PlayerListOverlay from './PlayerListOverlay'
@@ -9,28 +9,18 @@ const MAX_ROWS_PER_COL = 10
 
 type Players = typeof bot.players
 
+export const tabListState = proxy({
+  isOpen: false,
+})
+
 export default () => {
+  const { isOpen } = useSnapshot(tabListState)
+
   const serverIp = lastConnectOptions.value?.server
   const [clientId, setClientId] = useState(bot._client.uuid)
   const [players, setPlayers] = useState<Players>({})
-  const [isOpen, setIsOpen] = useState(false)
   const [counter, setCounter] = useState(0)
 
-  const handleKeyDown = (e) => {
-    if (!isGameActive(true)) return
-    if (e.key === 'Tab') {
-      setIsOpen(prev => true)
-      e.preventDefault()
-    }
-  }
-
-  const handleKeyUp = (e) => {
-    if (e.key === 'Tab') {
-      setIsOpen(prev => false)
-      e.preventDefault()
-    }
-  }
-
   useEffect(() => {
     function requestUpdate () {
       setPlayers(bot?.players ?? {})
@@ -58,15 +48,10 @@ export default () => {
       })
     }
 
-    document.addEventListener('keydown', handleKeyDown)
-    document.addEventListener('keyup', handleKeyUp)
-
     const playerlistHeader = () => setCounter(prev => prev + 1)
     bot._client.on('playerlist_header', playerlistHeader)
 
     return () => {
-      document.removeEventListener('keydown', handleKeyDown)
-      document.removeEventListener('keyup', handleKeyUp)
       bot?._client.removeListener('playerlist_header', playerlistHeader)
     }
   }, [serverIp])
diff --git a/src/utils.ts b/src/utils.ts
index 8ea6d3aa..d48fbbc3 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -39,14 +39,14 @@ export const pointerLock = {
     if (options.autoFullScreen) {
       void goFullscreen()
     }
-    const displayBrowserProblem = () => {
+    const displayMouseCaptureFailure = () => {
       // if (notificationProxy.id === 'auto-login') return // prevent notification hide
       // showNotification('Browser Delay Limitation', navigator['keyboard'] ? 'Click on screen, enable Auto Fullscreen or F11' : 'Click on screen or use fullscreen in Chrome')
       // notificationProxy.id = 'pointerlockchange'
       displayHintsState.captureMouseHint = true
     }
     if (!(document.fullscreenElement && navigator['keyboard']) && this.justHitEscape) {
-      displayBrowserProblem()
+      displayMouseCaptureFailure()
     } else {
       //@ts-expect-error
       const promise: any = document.documentElement.requestPointerLock({
@@ -58,9 +58,10 @@ export const pointerLock = {
           document.documentElement.requestPointerLock()
         } else if (error.name === 'SecurityError') {
           // cause: https://discourse.threejs.org/t/how-to-avoid-pointerlockcontrols-error/33017/4
-          displayBrowserProblem()
+          displayMouseCaptureFailure()
         } else {
-          console.error(error)
+          displayMouseCaptureFailure()
+          console.warn('Failed to request pointer lock:', error)
         }
       })
     }

From 3cd778538c52fe6327b0d031b026190681e5f1f9 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Thu, 22 May 2025 14:50:58 +0300
Subject: [PATCH 51/62] feat: Sync armor rotation for players (#363)

---
 renderer/viewer/three/entities.ts | 86 +++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 320daff9..1a5e7c3f 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -292,6 +292,9 @@ export class Entities {
         playerObject.animation.update(playerObject, dt)
       }
 
+      // Update armor positions
+      this.syncArmorPositions(entity)
+
       // Update visibility based on distance and chunk load status
       if (botPos && entity.position) {
         const dx = entity.position.x - botPos.x
@@ -312,6 +315,79 @@ export class Entities {
     }
   }
 
+  private syncArmorPositions (entity: SceneEntity) {
+    if (!entity.playerObject) return
+
+    // todo-low use property access for less loop iterations (small performance gain)
+    entity.traverse((armor) => {
+      if (!armor.name.startsWith('geometry_armor_')) return
+
+      const { skin } = entity.playerObject!
+
+      switch (armor.name) {
+        case 'geometry_armor_head':
+          // Head armor sync
+          if (armor.children[0]?.children[0]) {
+            armor.children[0].children[0].rotation.set(
+              -skin.head.rotation.x,
+              skin.head.rotation.y,
+              skin.head.rotation.z,
+              skin.head.rotation.order
+            )
+          }
+          break
+
+        case 'geometry_armor_legs':
+          // Legs armor sync
+          if (armor.children[0]) {
+            // Left leg
+            if (armor.children[0].children[2]) {
+              armor.children[0].children[2].rotation.set(
+                -skin.leftLeg.rotation.x,
+                skin.leftLeg.rotation.y,
+                skin.leftLeg.rotation.z,
+                skin.leftLeg.rotation.order
+              )
+            }
+            // Right leg
+            if (armor.children[0].children[1]) {
+              armor.children[0].children[1].rotation.set(
+                -skin.rightLeg.rotation.x,
+                skin.rightLeg.rotation.y,
+                skin.rightLeg.rotation.z,
+                skin.rightLeg.rotation.order
+              )
+            }
+          }
+          break
+
+        case 'geometry_armor_feet':
+          // Boots armor sync
+          if (armor.children[0]) {
+            // Right boot
+            if (armor.children[0].children[0]) {
+              armor.children[0].children[0].rotation.set(
+                -skin.rightLeg.rotation.x,
+                skin.rightLeg.rotation.y,
+                skin.rightLeg.rotation.z,
+                skin.rightLeg.rotation.order
+              )
+            }
+            // Left boot (reversed Z rotation)
+            if (armor.children[0].children[1]) {
+              armor.children[0].children[1].rotation.set(
+                -skin.leftLeg.rotation.x,
+                skin.leftLeg.rotation.y,
+                -skin.leftLeg.rotation.z,
+                skin.leftLeg.rotation.order
+              )
+            }
+          }
+          break
+      }
+    })
+  }
+
   getPlayerObject (entityId: string | number) {
     const playerObject = this.entities[entityId]?.playerObject
     return playerObject
@@ -1203,6 +1279,16 @@ function addArmorModel (worldRenderer: WorldRendererThree, entityMesh: THREE.Obj
     })
   } else {
     mesh = getMesh(worldRenderer, texturePath, armorModel[slotType])
+    // // enable debug mode to see the mesh
+    // mesh.traverse(c => {
+    //   if (c instanceof THREE.Mesh) {
+    //     c.material.wireframe = true
+    //   }
+    // })
+    if (slotType === 'head') {
+      // avoid z-fighting with the head
+      mesh.children[0].position.y += 0.01
+    }
     mesh.name = meshName
     material = mesh.material
     if (!isPlayerHead) {

From 04a85e9bd19db2a626d6ec6157f10d7056eb0b2c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 24 May 2025 18:26:47 +0300
Subject: [PATCH 52/62] minimap: don't do more 20 updates per seconds

---
 src/controls.ts       | 1 +
 src/react/Minimap.tsx | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/src/controls.ts b/src/controls.ts
index 9b2c3cbf..d1e9b1e4 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -499,6 +499,7 @@ contro.on('trigger', ({ command }) => {
       case 'general.rotateCameraRight':
       case 'general.rotateCameraUp':
       case 'general.rotateCameraDown':
+      case 'general.playersList':
         // no-op
         break
       case 'general.swapHands': {
diff --git a/src/react/Minimap.tsx b/src/react/Minimap.tsx
index 25ee59ed..9eb8a253 100644
--- a/src/react/Minimap.tsx
+++ b/src/react/Minimap.tsx
@@ -22,8 +22,14 @@ export default (
   const canvasTick = useRef(0)
   const canvasRef = useRef<HTMLCanvasElement>(null)
   const [position, setPosition] = useState({ x: 0, y: 0, z: 0 })
+  const lastUpdate = useRef(0)
+  const THROTTLE_MS = 50 // 20fps
 
   const updateMap = () => {
+    const now = Date.now()
+    if (now - lastUpdate.current < THROTTLE_MS) return
+    lastUpdate.current = now
+
     setPosition({ x: adapter.playerPosition.x, y: adapter.playerPosition.y, z: adapter.playerPosition.z })
     if (adapter.mapDrawer) {
       if (!full.current) {

From 0c68e63ba619fcd39a9dbb9eb8fe8cdf689c4282 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 25 May 2025 12:55:27 +0300
Subject: [PATCH 53/62] fix: restore VR support. Fix rotation / position camera
 bugs

---
 renderer/viewer/lib/worldrendererCommon.ts  |  1 +
 renderer/viewer/three/cameraShake.ts        | 24 ++++++++++------
 renderer/viewer/three/documentRenderer.ts   | 32 ++++++++++++---------
 renderer/viewer/three/graphicsBackend.ts    |  3 ++
 renderer/viewer/three/world/vr.ts           | 17 ++++++-----
 renderer/viewer/three/worldrendererThree.ts | 30 ++++++++++---------
 src/appViewer.ts                            |  2 +-
 src/optionsGuiScheme.tsx                    |  6 +++-
 src/optionsStorage.ts                       |  1 +
 src/watchOptions.ts                         |  5 ++++
 10 files changed, 76 insertions(+), 45 deletions(-)

diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index ef82f7af..26e3bf2e 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -43,6 +43,7 @@ export const defaultWorldRendererConfig = {
   starfield: true,
   addChunksBatchWaitTime: 200,
   vrSupport: true,
+  vrPageGameRendering: true,
   renderEntities: true,
   fov: 75,
   fetchPlayerSkins: true,
diff --git a/renderer/viewer/three/cameraShake.ts b/renderer/viewer/three/cameraShake.ts
index f6a61e2e..6fe483cc 100644
--- a/renderer/viewer/three/cameraShake.ts
+++ b/renderer/viewer/three/cameraShake.ts
@@ -1,4 +1,5 @@
 import * as THREE from 'three'
+import { WorldRendererThree } from './worldrendererThree'
 
 export class CameraShake {
   private rollAngle = 0
@@ -8,7 +9,7 @@ export class CameraShake {
   private basePitch = 0
   private baseYaw = 0
 
-  constructor (public camera: THREE.Camera, public onRenderCallbacks: Array<() => void>) {
+  constructor (public worldRenderer: WorldRendererThree, public onRenderCallbacks: Array<() => void>) {
     onRenderCallbacks.push(() => {
       this.update()
     })
@@ -62,14 +63,21 @@ export class CameraShake {
       }
     }
 
-    // Create rotation quaternions
-    const pitchQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(1, 0, 0), this.basePitch)
-    const yawQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), this.baseYaw)
-    const rollQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 0, 1), THREE.MathUtils.degToRad(this.rollAngle))
+    const camera = this.worldRenderer.cameraGroupVr || this.worldRenderer.camera
 
-    // Combine rotations in the correct order: pitch -> yaw -> roll
-    const finalQuat = yawQuat.multiply(pitchQuat).multiply(rollQuat)
-    this.camera.setRotationFromQuaternion(finalQuat)
+    if (this.worldRenderer.cameraGroupVr) {
+      // For VR camera, only apply yaw rotation
+      const yawQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), this.baseYaw)
+      camera.setRotationFromQuaternion(yawQuat)
+    } else {
+      // For regular camera, apply all rotations
+      const pitchQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(1, 0, 0), this.basePitch)
+      const yawQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), this.baseYaw)
+      const rollQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 0, 1), THREE.MathUtils.degToRad(this.rollAngle))
+      // Combine rotations in the correct order: pitch -> yaw -> roll
+      const finalQuat = yawQuat.multiply(pitchQuat).multiply(rollQuat)
+      camera.setRotationFromQuaternion(finalQuat)
+    }
   }
 
   private easeOut (t: number): number {
diff --git a/renderer/viewer/three/documentRenderer.ts b/renderer/viewer/three/documentRenderer.ts
index 46672b74..1d556c2a 100644
--- a/renderer/viewer/three/documentRenderer.ts
+++ b/renderer/viewer/three/documentRenderer.ts
@@ -3,6 +3,7 @@ import Stats from 'stats.js'
 import StatsGl from 'stats-gl'
 import * as tween from '@tweenjs/tween.js'
 import { GraphicsBackendConfig, GraphicsInitOptions } from '../../../src/appViewer'
+import { WorldRendererConfig } from '../lib/worldrendererCommon'
 
 export class DocumentRenderer {
   readonly canvas = document.createElement('canvas')
@@ -23,6 +24,7 @@ export class DocumentRenderer {
   droppedFpsPercentage: number
   config: GraphicsBackendConfig
   onRender = [] as Array<(sizeChanged: boolean) => void>
+  inWorldRenderingConfig: WorldRendererConfig | undefined
 
   constructor (initOptions: GraphicsInitOptions) {
     this.config = initOptions.config
@@ -94,7 +96,7 @@ export class DocumentRenderer {
       if (this.disconnected) return
       this.animationFrameId = requestAnimationFrame(animate)
 
-      if (this.paused) return
+      if (this.paused || (this.renderer.xr.isPresenting && !this.inWorldRenderingConfig?.vrPageGameRendering)) return
 
       // Handle FPS limiting
       if (this.config.fpsLimit) {
@@ -117,18 +119,7 @@ export class DocumentRenderer {
         sizeChanged = true
       }
 
-      this.preRender()
-      this.stats.markStart()
-      tween.update()
-      if (!window.freezeRender) {
-        this.render(sizeChanged)
-      }
-      for (const fn of this.onRender) {
-        fn(sizeChanged)
-      }
-      this.renderedFps++
-      this.stats.markEnd()
-      this.postRender()
+      this.frameRender(sizeChanged)
 
       // Update stats visibility each frame
       if (this.config.statsVisible !== undefined) {
@@ -139,6 +130,21 @@ export class DocumentRenderer {
     animate()
   }
 
+  frameRender (sizeChanged: boolean) {
+    this.preRender()
+    this.stats.markStart()
+    tween.update()
+    if (!window.freezeRender) {
+      this.render(sizeChanged)
+    }
+    for (const fn of this.onRender) {
+      fn(sizeChanged)
+    }
+    this.renderedFps++
+    this.stats.markEnd()
+    this.postRender()
+  }
+
   setPaused (paused: boolean) {
     this.paused = paused
   }
diff --git a/renderer/viewer/three/graphicsBackend.ts b/renderer/viewer/three/graphicsBackend.ts
index 6ac068d7..37acfde9 100644
--- a/renderer/viewer/three/graphicsBackend.ts
+++ b/renderer/viewer/three/graphicsBackend.ts
@@ -8,6 +8,7 @@ import supportedVersions from '../../../src/supportedVersions.mjs'
 import { WorldRendererThree } from './worldrendererThree'
 import { DocumentRenderer } from './documentRenderer'
 import { PanoramaRenderer } from './panorama'
+import { initVR } from './world/vr'
 
 // https://discourse.threejs.org/t/updates-to-color-management-in-three-js-r152/50791
 THREE.ColorManagement.enabled = false
@@ -87,10 +88,12 @@ const createGraphicsBackend: GraphicsBackendLoader = (initOptions: GraphicsInitO
       panoramaRenderer = null
     }
     worldRenderer = new WorldRendererThree(documentRenderer.renderer, initOptions, displayOptions)
+    void initVR(worldRenderer, documentRenderer)
     await worldRenderer.worldReadyPromise
     documentRenderer.render = (sizeChanged: boolean) => {
       worldRenderer?.render(sizeChanged)
     }
+    documentRenderer.inWorldRenderingConfig = displayOptions.inWorldRenderingConfig
     window.world = worldRenderer
     callModsMethod('worldReady', worldRenderer)
   }
diff --git a/renderer/viewer/three/world/vr.ts b/renderer/viewer/three/world/vr.ts
index 925ba0bb..c2665585 100644
--- a/renderer/viewer/three/world/vr.ts
+++ b/renderer/viewer/three/world/vr.ts
@@ -4,8 +4,9 @@ import { XRControllerModelFactory } from 'three/examples/jsm/webxr/XRControllerM
 import { buttonMap as standardButtonsMap } from 'contro-max/build/gamepad'
 import * as THREE from 'three'
 import { WorldRendererThree } from '../worldrendererThree'
+import { DocumentRenderer } from '../documentRenderer'
 
-export async function initVR (worldRenderer: WorldRendererThree) {
+export async function initVR (worldRenderer: WorldRendererThree, documentRenderer: DocumentRenderer) {
   if (!('xr' in navigator) || !worldRenderer.worldRendererConfig.vrSupport) return
   const { renderer } = worldRenderer
 
@@ -26,12 +27,13 @@ export async function initVR (worldRenderer: WorldRendererThree) {
 
   function enableVr () {
     renderer.xr.enabled = true
+    // renderer.xr.setReferenceSpaceType('local-floor')
     worldRenderer.reactiveState.preventEscapeMenu = true
   }
 
   function disableVr () {
     renderer.xr.enabled = false
-    worldRenderer.cameraObjectOverride = undefined
+    worldRenderer.cameraGroupVr = undefined
     worldRenderer.reactiveState.preventEscapeMenu = false
     worldRenderer.scene.remove(user)
     vrButtonContainer.hidden = true
@@ -189,7 +191,7 @@ export async function initVR (worldRenderer: WorldRendererThree) {
     }
 
     // appViewer.backend?.updateCamera(null, yawOffset, 0)
-    worldRenderer.updateCamera(null, bot.entity.yaw, bot.entity.pitch)
+    // worldRenderer.updateCamera(null, bot.entity.yaw, bot.entity.pitch)
 
     // todo restore this logic (need to preserve ability to move camera)
     // const xrCamera = renderer.xr.getCamera()
@@ -197,16 +199,13 @@ export async function initVR (worldRenderer: WorldRendererThree) {
     // bot.entity.yaw = Math.atan2(-d.x, -d.z)
     // bot.entity.pitch = Math.asin(d.y)
 
-    // todo ?
-    // bot.physics.stepHeight = 1
-
-    worldRenderer.render()
+    documentRenderer.frameRender(false)
   })
   renderer.xr.addEventListener('sessionstart', () => {
-    worldRenderer.cameraObjectOverride = user
+    worldRenderer.cameraGroupVr = user
   })
   renderer.xr.addEventListener('sessionend', () => {
-    worldRenderer.cameraObjectOverride = undefined
+    worldRenderer.cameraGroupVr = undefined
   })
 
   worldRenderer.abortController.signal.addEventListener('abort', disableVr)
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 5c16aa9a..f8641ab8 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -20,7 +20,6 @@ import { armorModel } from './entity/armorModels'
 import { disposeObject } from './threeJsUtils'
 import { CursorBlock } from './world/cursorBlock'
 import { getItemUv } from './appShared'
-import { initVR } from './world/vr'
 import { Entities } from './entities'
 import { ThreeJsSound } from './threeJsSound'
 import { CameraShake } from './cameraShake'
@@ -42,7 +41,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   ambientLight = new THREE.AmbientLight(0xcc_cc_cc)
   directionalLight = new THREE.DirectionalLight(0xff_ff_ff, 0.5)
   entities = new Entities(this)
-  cameraObjectOverride?: THREE.Object3D // for xr
+  cameraGroupVr?: THREE.Object3D
   material = new THREE.MeshLambertMaterial({ vertexColors: true, transparent: true, alphaTest: 0.1 })
   itemsTexture: THREE.Texture
   cursorBlock = new CursorBlock(this)
@@ -91,10 +90,9 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.addDebugOverlay()
     this.resetScene()
     void this.init()
-    void initVR(this)
 
     this.soundSystem = new ThreeJsSound(this)
-    this.cameraShake = new CameraShake(this.camera, this.onRender)
+    this.cameraShake = new CameraShake(this, this.onRender)
     this.media = new ThreeJsMedia(this)
     // this.fountain = new Fountain(this.scene, this.scene, {
     //   position: new THREE.Vector3(0, 10, 0),
@@ -106,6 +104,10 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.worldSwitchActions()
   }
 
+  get cameraObject () {
+    return this.cameraGroupVr || this.camera
+  }
+
   worldSwitchActions () {
     this.onWorldSwitched.push(() => {
       // clear custom blocks
@@ -301,7 +303,7 @@ export class WorldRendererThree extends WorldRendererCommon {
 
   updateViewerPosition (pos: Vec3): void {
     this.viewerPosition = pos
-    const cameraPos = this.camera.position.toArray().map(x => Math.floor(x / 16)) as [number, number, number]
+    const cameraPos = this.cameraObject.position.toArray().map(x => Math.floor(x / 16)) as [number, number, number]
     this.cameraSectionPos = new Vec3(...cameraPos)
     // eslint-disable-next-line guard-for-in
     for (const key in this.sectionObjects) {
@@ -429,10 +431,8 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   setFirstPersonCamera (pos: Vec3 | null, yaw: number, pitch: number) {
-    const cam = this.cameraObjectOverride || this.camera
     const yOffset = this.displayOptions.playerState.getEyeHeight()
 
-    this.camera = cam as THREE.PerspectiveCamera
     this.updateCamera(pos?.offset(0, yOffset, 0) ?? null, yaw, pitch)
     this.media.tryIntersectMedia()
   }
@@ -445,7 +445,11 @@ export class WorldRendererThree extends WorldRendererCommon {
     // }
 
     if (pos) {
-      new tweenJs.Tween(this.camera.position).to({ x: pos.x, y: pos.y, z: pos.z }, 50).start()
+      if (this.renderer.xr.isPresenting) {
+        pos.y -= this.camera.position.y // Fix Y position of camera in world
+      }
+
+      new tweenJs.Tween(this.cameraObject.position).to({ x: pos.x, y: pos.y, z: pos.z }, 50).start()
       // this.freeFlyState.position = pos
     }
     this.cameraShake.setBaseRotation(pitch, yaw)
@@ -467,13 +471,13 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.entities.render()
 
     // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
-    const cam = this.camera instanceof THREE.Group ? this.camera.children.find(child => child instanceof THREE.PerspectiveCamera) as THREE.PerspectiveCamera : this.camera
+    const cam = this.cameraGroupVr instanceof THREE.Group ? this.cameraGroupVr.children.find(child => child instanceof THREE.PerspectiveCamera) as THREE.PerspectiveCamera : this.camera
     this.renderer.render(this.scene, cam)
 
-    if (this.displayOptions.inWorldRenderingConfig.showHand && !this.playerState.shouldHideHand /*  && !this.freeFlyMode */) {
-      this.holdingBlock.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
-      this.holdingBlockLeft.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
-    }
+    // if (this.displayOptions.inWorldRenderingConfig.showHand && !this.playerState.shouldHideHand /*  && !this.freeFlyMode */) {
+    //   this.holdingBlock.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
+    //   this.holdingBlockLeft.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
+    // }
 
     for (const fountain of this.fountains) {
       if (this.sectionObjects[fountain.sectionId] && !this.sectionObjects[fountain.sectionId].foutain) {
diff --git a/src/appViewer.ts b/src/appViewer.ts
index 90ca847f..f4a21481 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -199,7 +199,7 @@ export class AppViewer {
   resetBackend (cleanState = false) {
     this.disconnectBackend(cleanState)
     if (this.backendLoader) {
-      this.loadBackend(this.backendLoader)
+      void this.loadBackend(this.backendLoader)
     }
   }
 
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index ede367f5..7f4c34ab 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -488,7 +488,11 @@ export const guiOptionsScheme: {
           </>
         )
       },
-      vrSupport: {}
+      vrSupport: {},
+      vrPageGameRendering: {
+        text: 'Page Game Rendering',
+        tooltip: 'Wether to continue rendering page even when vr is active.',
+      }
     },
   ],
   advanced: [
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index ab164454..a0c995a0 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -104,6 +104,7 @@ const defaultOptions = {
   autoJump: 'auto' as 'auto' | 'always' | 'never',
   autoParkour: false,
   vrSupport: true, // doesn't directly affect the VR mode, should only disable the button which is annoying to android users
+  vrPageGameRendering: false,
   renderDebug: 'basic' as 'none' | 'advanced' | 'basic',
 
   // advanced bot options
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index 9fe55289..903d7da8 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -80,6 +80,11 @@ export const watchOptionsAfterViewerInit = () => {
     updateFpsLimit(o)
   })
 
+  watchValue(options, o => {
+    appViewer.inWorldRenderingConfig.vrSupport = o.vrSupport
+    appViewer.inWorldRenderingConfig.vrPageGameRendering = o.vrPageGameRendering
+  })
+
   watchValue(options, (o, isChanged) => {
     appViewer.inWorldRenderingConfig.clipWorldBelowY = o.clipWorldBelowY
     appViewer.inWorldRenderingConfig.extraBlockRenderers = !o.disableSignsMapsSupport

From 99d05fc94b0608196e48738102de6114a02c6b54 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 25 May 2025 16:16:14 +0300
Subject: [PATCH 54/62] improve stability of minimap (though full refactor is
 still needed)

---
 renderer/viewer/lib/mesher/mesher.ts       | 8 +++++---
 renderer/viewer/lib/mesher/shared.ts       | 2 ++
 renderer/viewer/lib/worldrendererCommon.ts | 4 +++-
 src/react/MinimapProvider.tsx              | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/renderer/viewer/lib/mesher/mesher.ts b/renderer/viewer/lib/mesher/mesher.ts
index 66621f22..bcfbde89 100644
--- a/renderer/viewer/lib/mesher/mesher.ts
+++ b/renderer/viewer/lib/mesher/mesher.ts
@@ -2,6 +2,7 @@ import { Vec3 } from 'vec3'
 import { World } from './world'
 import { getSectionGeometry, setBlockStatesData as setMesherData } from './models'
 import { BlockStateModelInfo } from './shared'
+import { INVISIBLE_BLOCKS } from './worldConstants'
 
 globalThis.structuredClone ??= (value) => JSON.parse(JSON.stringify(value))
 
@@ -156,10 +157,11 @@ const handleMessage = data => {
         for (let x = 0; x < 16; x++) {
           const blockX = x + data.x
           const blockZ = z + data.z
-          blockPos.x = blockX; blockPos.z = blockZ
-          blockPos.y = 256
+          blockPos.x = blockX
+          blockPos.z = blockZ
+          blockPos.y = world.config.worldMaxY
           let block = world.getBlock(blockPos)
-          while (block?.name.includes('air')) {
+          while (block && INVISIBLE_BLOCKS.has(block.name)) {
             blockPos.y -= 1
             block = world.getBlock(blockPos)
           }
diff --git a/renderer/viewer/lib/mesher/shared.ts b/renderer/viewer/lib/mesher/shared.ts
index 16b89a71..82416fab 100644
--- a/renderer/viewer/lib/mesher/shared.ts
+++ b/renderer/viewer/lib/mesher/shared.ts
@@ -3,6 +3,8 @@ import { BlockType } from '../../../playground/shared'
 // only here for easier testing
 export const defaultMesherConfig = {
   version: '',
+  worldMaxY: 256,
+  worldMinY: 0,
   enableLighting: true,
   skyLight: 15,
   smoothLighting: true,
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 26e3bf2e..3f517beb 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -560,7 +560,9 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       textureSize: this.resourcesManager.currentResources!.blocksAtlasParser.atlas.latest.width,
       debugModelVariant: undefined,
       clipWorldBelowY: this.worldRendererConfig.clipWorldBelowY,
-      disableSignsMapsSupport: !this.worldRendererConfig.extraBlockRenderers
+      disableSignsMapsSupport: !this.worldRendererConfig.extraBlockRenderers,
+      worldMinY: this.worldMinYRender,
+      worldMaxY: this.worldMinYRender + this.worldSizeParams.worldHeight,
     }
   }
 
diff --git a/src/react/MinimapProvider.tsx b/src/react/MinimapProvider.tsx
index afb6a198..26a15134 100644
--- a/src/react/MinimapProvider.tsx
+++ b/src/react/MinimapProvider.tsx
@@ -45,7 +45,7 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
   chunksStore = new Map<string, undefined | null | 'requested' | ChunkInfo>()
   loadingChunksQueue = new Set<string>()
   loadChunk: (key: string) => Promise<void> = this.loadChunkMinimap
-  mapDrawer = new MinimapDrawer(this.loadChunk, this.warps, this.loadingChunksQueue, this.chunksStore)
+  mapDrawer = new MinimapDrawer(this.loadChunk.bind(this), this.warps, this.loadingChunksQueue, this.chunksStore)
   currChunk: PCChunk | undefined
   currChunkPos: { x: number, z: number } = { x: 0, z: 0 }
   isOldVersion: boolean

From 50907138f7803987bd148b3ba490e25d4fbf7b6a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 26 May 2025 01:09:43 +0300
Subject: [PATCH 55/62] fix edge case infinite loop in mesher

---
 renderer/viewer/lib/mesher/mesher.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renderer/viewer/lib/mesher/mesher.ts b/renderer/viewer/lib/mesher/mesher.ts
index bcfbde89..f26d8022 100644
--- a/renderer/viewer/lib/mesher/mesher.ts
+++ b/renderer/viewer/lib/mesher/mesher.ts
@@ -161,7 +161,7 @@ const handleMessage = data => {
           blockPos.z = blockZ
           blockPos.y = world.config.worldMaxY
           let block = world.getBlock(blockPos)
-          while (block && INVISIBLE_BLOCKS.has(block.name)) {
+          while (block && INVISIBLE_BLOCKS.has(block.name) && blockPos.y > world.config.worldMinY) {
             blockPos.y -= 1
             block = world.getBlock(blockPos)
           }

From c500d08ed7e14e7ecbec76393a4a1c13e59d4dec Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 27 May 2025 11:30:21 +0300
Subject: [PATCH 56/62] hotfix: restore hand

---
 renderer/viewer/three/worldrendererThree.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index f8641ab8..d2d54998 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -474,10 +474,10 @@ export class WorldRendererThree extends WorldRendererCommon {
     const cam = this.cameraGroupVr instanceof THREE.Group ? this.cameraGroupVr.children.find(child => child instanceof THREE.PerspectiveCamera) as THREE.PerspectiveCamera : this.camera
     this.renderer.render(this.scene, cam)
 
-    // if (this.displayOptions.inWorldRenderingConfig.showHand && !this.playerState.shouldHideHand /*  && !this.freeFlyMode */) {
-    //   this.holdingBlock.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
-    //   this.holdingBlockLeft.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
-    // }
+    if (this.displayOptions.inWorldRenderingConfig.showHand && !this.playerState.shouldHideHand /*  && !this.freeFlyMode */ && !this.renderer.xr.isPresenting) {
+      this.holdingBlock.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
+      this.holdingBlockLeft.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
+    }
 
     for (const fountain of this.fountains) {
       if (this.sectionObjects[fountain.sectionId] && !this.sectionObjects[fountain.sectionId].foutain) {

From 087e167826d6bf488410d3d46581103f330811fd Mon Sep 17 00:00:00 2001
From: Maksim Grigorev <gmi1987@gmail.com>
Date: Fri, 30 May 2025 16:43:06 +0300
Subject: [PATCH 57/62] feat: configurable mobile top buttons! (#361)

---
 config.json                                |  30 ++-
 src/appConfig.ts                           |  22 +++
 src/controls.ts                            | 105 ++++++++++-
 src/globalState.ts                         |   1 +
 src/react/DebugOverlay.tsx                 |   8 +-
 src/react/MobileTopButtons.module.css      |  14 ++
 src/react/MobileTopButtons.module.css.d.ts |   2 +
 src/react/MobileTopButtons.tsx             | 209 ++++++++++++++-------
 8 files changed, 311 insertions(+), 80 deletions(-)

diff --git a/config.json b/config.json
index 29f011c0..3696af7a 100644
--- a/config.json
+++ b/config.json
@@ -37,5 +37,33 @@
         "type": "discord"
       }
     ]
+  ],
+  "mobileButtons": [
+    {
+      "action": "general.drop",
+      "actionHold": "",
+      "label": "Q"
+    },
+    {
+      "action": "general.debugOverlay",
+      "actionHold": "general.debugOverlayHelpMenu",
+      "label": "F3"
+    },
+     {
+      "action": "general.playersList",
+      "actionHold": "",
+      "icon": "pixelarticons:users",
+      "label": "TAB"
+    },
+    {
+      "action": "general.chat",
+      "actionHold": "",
+      "label": ""
+    },
+    {
+      "action": "ui.back",
+      "actionHold": "",
+      "label": ""
+    }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/appConfig.ts b/src/appConfig.ts
index 769ef14d..48b3665a 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -5,6 +5,27 @@ import { setLoadingScreenStatus } from './appStatus'
 import { setStorageDataOnAppConfigLoad } from './react/appStorageProvider'
 import { customKeymaps, updateBinds } from './controls'
 
+export type CustomAction = {
+  readonly type: string
+  readonly input: readonly any[]
+}
+
+export type ActionType = string | CustomAction
+
+export type ActionHoldConfig = {
+  readonly command: ActionType
+  readonly longPressAction?: ActionType
+  readonly duration?: number
+  readonly threshold?: number
+}
+
+export type MobileButtonConfig = {
+  readonly label?: string
+  readonly icon?: string
+  readonly action?: ActionType
+  readonly actionHold?: ActionType | ActionHoldConfig
+}
+
 export type AppConfig = {
   // defaultHost?: string
   // defaultHostSave?: string
@@ -26,6 +47,7 @@ export type AppConfig = {
   splashText?: string
   splashTextFallback?: string
   pauseLinks?: Array<Array<Record<string, any>>>
+  mobileButtons?: MobileButtonConfig[]
   keybindings?: Record<string, any>
   defaultLanguage?: string
   displayLanguageSelector?: boolean
diff --git a/src/controls.ts b/src/controls.ts
index d1e9b1e4..3a39798c 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -28,6 +28,7 @@ import { createNotificationProgressReporter } from './core/progressReporter'
 import { appStorage } from './react/appStorageProvider'
 import { switchGameMode } from './packetsReplay/replayPackets'
 import { tabListState } from './react/PlayerListOverlayProvider'
+import { type ActionType, type ActionHoldConfig, type CustomAction } from './appConfig'
 
 
 export const customKeymaps = proxy(appStorage.keybindings)
@@ -55,7 +56,7 @@ export const contro = new ControMax({
       attackDestroy: [null, 'Right Trigger'],
       interactPlace: [null, 'Left Trigger'],
       swapHands: ['KeyF'],
-      selectItem: ['KeyH'], // default will be removed
+      selectItem: ['KeyH'],
       rotateCameraLeft: [null],
       rotateCameraRight: [null],
       rotateCameraUp: [null],
@@ -63,10 +64,12 @@ export const contro = new ControMax({
       // ui?
       chat: [['KeyT', 'Enter']],
       command: ['Slash'],
+      playersList: ['Tab'],
+      debugOverlay: ['F3'],
+      debugOverlayHelpMenu: [null],
       // client side
       zoom: ['KeyC'],
       viewerConsole: ['Backquote'],
-      playersList: ['Tab'],
     },
     ui: {
       toggleFullscreen: ['F11'],
@@ -234,7 +237,7 @@ const inModalCommand = (command: Command, pressed: boolean) => {
   if (pressed && !gamepadUiCursorState.display) return
 
   if (pressed) {
-    if (command === 'ui.back') {
+    if (command === 'ui.back' || command === 'ui.pauseMenu') {
       hideCurrentModal()
     }
     if (command === 'ui.leftClick' || command === 'ui.rightClick') {
@@ -401,6 +404,27 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => {
       case 'general.zoom':
         gameAdditionalState.isZooming = pressed
         break
+      case 'general.debugOverlay':
+        if (pressed) {
+          hardcodedPressedKeys.add('F3')
+          const pressedKey = [...contro.pressedKeys].find(key => key !== 'F3')
+          if (pressedKey) {
+            const keybind = f3Keybinds.find((v) => v.key === pressedKey)
+            if (keybind && (keybind.enabled?.() ?? true)) {
+              void keybind.action()
+            }
+          } else {
+            miscUiState.showDebugHud = !miscUiState.showDebugHud
+          }
+        } else {
+          hardcodedPressedKeys.delete('F3')
+        }
+        break
+      case 'general.debugOverlayHelpMenu':
+        if (pressed) {
+          void onF3LongPress()
+        }
+        break
       case 'general.rotateCameraLeft':
       case 'general.rotateCameraRight':
       case 'general.rotateCameraUp':
@@ -411,6 +435,26 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => {
         tabListState.isOpen = pressed
         break
     }
+  } else if (stringStartsWith(command, 'ui')) {
+    switch (command) {
+      case 'ui.back':
+      case 'ui.pauseMenu':
+        if (pressed) {
+          if (activeModalStack.length) {
+            hideCurrentModal()
+          } else {
+            showModal({ reactType: 'pause-screen' })
+          }
+        }
+        break
+      case 'ui.toggleFullscreen':
+      case 'ui.toggleMap':
+      case 'ui.leftClick':
+      case 'ui.rightClick':
+      case 'ui.speedupCursor':
+        // These are handled elsewhere
+        break
+    }
   }
 }
 
@@ -499,6 +543,8 @@ contro.on('trigger', ({ command }) => {
       case 'general.rotateCameraRight':
       case 'general.rotateCameraUp':
       case 'general.rotateCameraDown':
+      case 'general.debugOverlay':
+      case 'general.debugOverlayHelpMenu':
       case 'general.playersList':
         // no-op
         break
@@ -567,10 +613,6 @@ contro.on('trigger', ({ command }) => {
     // toggleMicrophoneMuted()
   }
 
-  if (command === 'ui.pauseMenu') {
-    showModal({ reactType: 'pause-screen' })
-  }
-
   if (command === 'ui.toggleFullscreen') {
     void goFullscreen(true)
   }
@@ -893,3 +935,52 @@ export function updateBinds (commands: any) {
     }))
   }
 }
+
+export const onF3LongPress = async () => {
+  const select = await showOptionsModal('', f3Keybinds.filter(f3Keybind => {
+    return f3Keybind.mobileTitle && (f3Keybind.enabled?.() ?? true)
+  }).map(f3Keybind => {
+    return `${f3Keybind.mobileTitle}${f3Keybind.key ? ` (F3+${f3Keybind.key})` : ''}`
+  }))
+  if (!select) return
+  const f3Keybind = f3Keybinds.find(f3Keybind => f3Keybind.mobileTitle === select)
+  if (f3Keybind) void f3Keybind.action()
+}
+
+export const handleMobileButtonCustomAction = (action: CustomAction) => {
+  const handler = customCommandsConfig[action.type]?.handler
+  if (handler) {
+    handler([...action.input])
+  }
+}
+
+export const handleMobileButtonActionCommand = (command: ActionType | ActionHoldConfig, isDown: boolean) => {
+  const commandValue = typeof command === 'string' ? command : 'command' in command ? command.command : command
+
+  if (typeof commandValue === 'string' && !stringStartsWith(commandValue, 'custom')) {
+    const event: CommandEventArgument<typeof contro['_commandsRaw']> = {
+      command: commandValue as Command,
+      schema: {
+        keys: [],
+        gamepad: []
+      }
+    }
+    if (isDown) {
+      contro.emit('trigger', event)
+    } else {
+      contro.emit('release', event)
+    }
+  } else if (typeof commandValue === 'object') {
+    if (isDown) {
+      handleMobileButtonCustomAction(commandValue)
+    }
+  }
+}
+
+export const handleMobileButtonLongPress = (actionHold: ActionHoldConfig) => {
+  if (typeof actionHold.longPressAction === 'string' && actionHold.longPressAction === 'general.debugOverlayHelpMenu') {
+    void onF3LongPress()
+  } else if (actionHold.longPressAction) {
+    handleMobileButtonActionCommand(actionHold.longPressAction, true)
+  }
+}
diff --git a/src/globalState.ts b/src/globalState.ts
index bd845195..671d7907 100644
--- a/src/globalState.ts
+++ b/src/globalState.ts
@@ -121,6 +121,7 @@ export const miscUiState = proxy({
   /** wether game hud is shown (in playing state) */
   gameLoaded: false,
   showUI: true,
+  showDebugHud: false,
   loadedServerIndex: '',
   /** currently trying to load or loaded mc version, after all data is loaded */
   loadedDataVersion: null as string | null,
diff --git a/src/react/DebugOverlay.tsx b/src/react/DebugOverlay.tsx
index 25c102b7..7b22c96a 100644
--- a/src/react/DebugOverlay.tsx
+++ b/src/react/DebugOverlay.tsx
@@ -1,6 +1,8 @@
 import { useEffect, useRef, useState } from 'react'
+import { useSnapshot } from 'valtio'
 import type { Block } from 'prismarine-block'
 import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
+import { miscUiState } from '../globalState'
 import { getFixedFilesize } from '../downloadAndOpenFile'
 import { options } from '../optionsStorage'
 import { BlockStateModelInfo } from '../../renderer/viewer/lib/mesher/shared'
@@ -28,7 +30,7 @@ export default () => {
   window.packetsCountByName = packetsCountByName
   const ignoredPackets = useRef(new Set([] as any[]))
   const [packetsString, setPacketsString] = useState('')
-  const [showDebug, setShowDebug] = useState(false)
+  const { showDebugHud } = useSnapshot(miscUiState)
   const [pos, setPos] = useState<{ x: number, y: number, z: number }>({ x: 0, y: 0, z: 0 })
   const [skyL, setSkyL] = useState(0)
   const [blockL, setBlockL] = useState(0)
@@ -55,7 +57,7 @@ export default () => {
 
   const handleF3 = (e) => {
     if (e.code === 'F3') {
-      setShowDebug(prev => !prev)
+      miscUiState.showDebugHud = !miscUiState.showDebugHud
       e.preventDefault()
     }
   }
@@ -174,7 +176,7 @@ export default () => {
     minecraftQuad.current = Math.floor(((minecraftYaw.current + 180) / 90 + 0.5) % 4)
   }, [bot.entity.yaw])
 
-  if (!showDebug) return null
+  if (!showDebugHud) return null
 
   return <>
     <div className={`debug-left-side ${styles['debug-left-side']}`}>
diff --git a/src/react/MobileTopButtons.module.css b/src/react/MobileTopButtons.module.css
index d1692f8b..55246492 100644
--- a/src/react/MobileTopButtons.module.css
+++ b/src/react/MobileTopButtons.module.css
@@ -35,3 +35,17 @@
   padding: 4px 6px;
   outline: 0.5px solid white;
 }
+
+.tab-btn {
+  color: #fff;
+  background: #9c8c86;
+  outline: .5px solid #fff;
+  padding: 4px 6px;
+  font-family: pixelarticons, mojangles, monospace;
+  font-size: 8px;
+}
+
+.tab-btn:has(> div) {
+  padding: 3px 5px;
+  font-size: 12px;
+}
diff --git a/src/react/MobileTopButtons.module.css.d.ts b/src/react/MobileTopButtons.module.css.d.ts
index 859cc929..6b38dde0 100644
--- a/src/react/MobileTopButtons.module.css.d.ts
+++ b/src/react/MobileTopButtons.module.css.d.ts
@@ -9,6 +9,8 @@ interface CssExports {
   mobileTopBtns: string;
   'pause-btn': string;
   pauseBtn: string;
+  'tab-btn': string;
+  tabBtn: string;
 }
 declare const cssExports: CssExports;
 export default cssExports;
diff --git a/src/react/MobileTopButtons.tsx b/src/react/MobileTopButtons.tsx
index a2f1a1da..e8a82f77 100644
--- a/src/react/MobileTopButtons.tsx
+++ b/src/react/MobileTopButtons.tsx
@@ -1,91 +1,162 @@
 import { useEffect, useRef } from 'react'
-import { f3Keybinds } from '../controls'
+import { useSnapshot } from 'valtio'
+import { handleMobileButtonActionCommand, handleMobileButtonLongPress } from '../controls'
 import { watchValue } from '../optionsStorage'
-import { showModal, miscUiState, activeModalStack, hideCurrentModal } from '../globalState'
-import { showOptionsModal } from './SelectOption'
-import useLongPress from './useLongPress'
+import { type MobileButtonConfig, type ActionHoldConfig, type ActionType, type CustomAction } from '../appConfig'
+import { miscUiState } from '../globalState'
+import PixelartIcon from './PixelartIcon'
 import styles from './MobileTopButtons.module.css'
 
-
 export default () => {
   const elRef = useRef<HTMLDivElement | null>(null)
+  const { appConfig } = useSnapshot(miscUiState)
+  const mobileButtonsConfig = appConfig?.mobileButtons
 
-  const showMobileControls = (bl) => {
-    if (elRef.current) elRef.current.style.display = bl ? 'flex' : 'none'
+  const longPressTimerIdRef = useRef<number | null>(null)
+  const actionToShortPressRef = useRef<ActionType | null>(null)
+
+  const showMobileControls = (visible: boolean) => {
+    if (elRef.current) {
+      elRef.current.style.display = visible ? 'flex' : 'none'
+    }
   }
 
   useEffect(() => {
     watchValue(miscUiState, o => {
-      showMobileControls(o.currentTouch)
+      showMobileControls(Boolean(o.currentTouch))
     })
   }, [])
 
-  const onLongPress = async () => {
-    const select = await showOptionsModal('', f3Keybinds.filter(f3Keybind => {
-      return f3Keybind.mobileTitle && (f3Keybind.enabled?.() ?? true)
-    }).map(f3Keybind => {
-      return `${f3Keybind.mobileTitle}${f3Keybind.key ? ` (F3+${f3Keybind.key})` : ''}`
-    }))
-    if (!select) return
-    const f3Keybind = f3Keybinds.find(f3Keybind => f3Keybind.mobileTitle === select)
-    if (f3Keybind) void f3Keybind.action()
-  }
+  const getButtonClassName = (button: MobileButtonConfig): string => {
+    const actionForStyle = button.action || (button.actionHold && typeof button.actionHold === 'object' && 'command' in button.actionHold ? button.actionHold.command : undefined)
 
-  const defaultOptions = {
-    shouldPreventDefault: true,
-    delay: 500,
-  }
-  const longPressEvent = useLongPress(onLongPress, () => {}, defaultOptions)
-
-
-  const onChatLongPress = () => {
-    document.dispatchEvent(new KeyboardEvent('keydown', { key: 'Tab' }))
-  }
-
-  const onChatClick = () => {
-    if (activeModalStack.at(-1)?.reactType === 'chat') {
-      hideCurrentModal()
-    } else {
-      showModal({ reactType: 'chat' })
+    if (typeof actionForStyle === 'string') {
+      switch (actionForStyle) {
+        case 'general.chat':
+          return styles['chat-btn']
+        case 'ui.back':
+          return styles['pause-btn']
+        case 'general.playersList':
+          return styles['tab-btn']
+        default:
+          return styles['debug-btn']
+      }
     }
+    return styles['debug-btn']
   }
 
-  const chatLongPressEvent = useLongPress(
-    onChatLongPress,
-    onChatClick,
-    {
-      shouldPreventDefault: true,
-      delay: 300,
-    }
-  )
+  const renderConfigButtons = () => {
+    return mobileButtonsConfig?.map((button, index) => {
+      const className = getButtonClassName(button)
+      let label: string | JSX.Element = button.icon || button.label || ''
+
+      if (typeof label === 'string' && label.startsWith('pixelarticons:')) {
+        const iconName = label.replace('pixelarticons:', '')
+        label = <PixelartIcon iconName={iconName} />
+      }
+
+      const onPointerDown = (e: React.PointerEvent) => {
+        const elem = e.currentTarget as HTMLElement
+        elem.setPointerCapture(e.pointerId)
+
+        if (longPressTimerIdRef.current) {
+          clearTimeout(longPressTimerIdRef.current)
+          longPressTimerIdRef.current = null
+        }
+        actionToShortPressRef.current = null
+
+        const { actionHold, action } = button
+
+        if (actionHold) {
+          if (typeof actionHold === 'object' && 'command' in actionHold) {
+            const config = actionHold
+            if (config.longPressAction) {
+              actionToShortPressRef.current = config.command
+              longPressTimerIdRef.current = window.setTimeout(() => {
+                handleMobileButtonLongPress(config)
+                actionToShortPressRef.current = null
+                longPressTimerIdRef.current = null
+              }, config.duration || 500)
+            } else {
+              handleMobileButtonActionCommand(config.command, true)
+            }
+          } else if (action) {
+            actionToShortPressRef.current = action
+            longPressTimerIdRef.current = window.setTimeout(() => {
+              handleMobileButtonActionCommand(actionHold, true)
+              actionToShortPressRef.current = null
+              longPressTimerIdRef.current = null
+            }, 500)
+          } else {
+            handleMobileButtonActionCommand(actionHold, true)
+          }
+        } else if (action) {
+          handleMobileButtonActionCommand(action, true)
+        }
+      }
+
+      const onPointerUp = (e: React.PointerEvent) => {
+        const elem = e.currentTarget as HTMLElement
+        elem.releasePointerCapture(e.pointerId)
+
+        const { actionHold, action } = button
+        let wasShortPressHandled = false
+
+        if (longPressTimerIdRef.current) {
+          clearTimeout(longPressTimerIdRef.current)
+          longPressTimerIdRef.current = null
+          if (actionToShortPressRef.current) {
+            handleMobileButtonActionCommand(actionToShortPressRef.current, true)
+            handleMobileButtonActionCommand(actionToShortPressRef.current, false)
+            wasShortPressHandled = true
+          }
+        }
+
+        if (!wasShortPressHandled) {
+          if (actionHold) {
+            if (typeof actionHold === 'object' && 'command' in actionHold) {
+              const config = actionHold
+              if (config.longPressAction) {
+                if (actionToShortPressRef.current === null) {
+                  if (typeof config.longPressAction === 'string') {
+                    handleMobileButtonActionCommand(config.longPressAction, false)
+                  }
+                }
+              } else {
+                handleMobileButtonActionCommand(config.command, false)
+              }
+            } else if (action) {
+              if (actionToShortPressRef.current === null) {
+                handleMobileButtonActionCommand(actionHold, false)
+              }
+            } else {
+              handleMobileButtonActionCommand(actionHold, false)
+            }
+          } else if (action) {
+            handleMobileButtonActionCommand(action, false)
+          }
+        }
+        actionToShortPressRef.current = null
+      }
+
+      return (
+        <div
+          key={index}
+          className={className}
+          onPointerDown={onPointerDown}
+          onPointerUp={onPointerUp}
+          onLostPointerCapture={onPointerUp}
+        >
+          {label}
+        </div>
+      )
+    })
+  }
 
   // ios note: just don't use <button>
-  return <div ref={elRef} className={styles['mobile-top-btns']} id="mobile-top">
-    <div
-      className={styles['debug-btn']} onPointerDown={(e) => {
-        window.dispatchEvent(new MouseEvent('mousedown', { button: 1 }))
-      }}
-    >S
+  return (
+    <div ref={elRef} className={styles['mobile-top-btns']} id="mobile-top">
+      {mobileButtonsConfig && mobileButtonsConfig.length > 0 ? renderConfigButtons() : null}
     </div>
-    <div
-      className={styles['debug-btn']} onPointerDown={(e) => {
-        document.dispatchEvent(new KeyboardEvent('keydown', { code: 'F3' }))
-        document.dispatchEvent(new KeyboardEvent('keyup', { code: 'F3' }))
-      }} {...longPressEvent}
-    >F3
-    </div>
-    <div
-      className={styles['chat-btn']}
-      {...chatLongPressEvent}
-      onPointerUp={(e) => {
-        document.dispatchEvent(new KeyboardEvent('keyup', { key: 'Tab' }))
-      }}
-    />
-    <div
-      className={styles['pause-btn']} onPointerDown={(e) => {
-        e.stopPropagation()
-        showModal({ reactType: 'pause-screen' })
-      }}
-    />
-  </div>
+  )
 }

From 76353754710ee43d400760d07b4d567cd5f5bdfa Mon Sep 17 00:00:00 2001
From: Maksim Grigorev <gmi1987@gmail.com>
Date: Tue, 3 Jun 2025 13:14:34 +0300
Subject: [PATCH 58/62] Resolve issue with non-functional F3 key (#365)

---
 src/controls.ts            | 1 -
 src/react/DebugOverlay.tsx | 9 ---------
 2 files changed, 10 deletions(-)

diff --git a/src/controls.ts b/src/controls.ts
index 3a39798c..32d33fc7 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -30,7 +30,6 @@ import { switchGameMode } from './packetsReplay/replayPackets'
 import { tabListState } from './react/PlayerListOverlayProvider'
 import { type ActionType, type ActionHoldConfig, type CustomAction } from './appConfig'
 
-
 export const customKeymaps = proxy(appStorage.keybindings)
 subscribe(customKeymaps, () => {
   appStorage.keybindings = customKeymaps
diff --git a/src/react/DebugOverlay.tsx b/src/react/DebugOverlay.tsx
index 7b22c96a..8e42fd38 100644
--- a/src/react/DebugOverlay.tsx
+++ b/src/react/DebugOverlay.tsx
@@ -55,13 +55,6 @@ export default () => {
 
   const viewDegToMinecraft = (yaw) => yaw % 360 - 180 * (yaw < 0 ? -1 : 1)
 
-  const handleF3 = (e) => {
-    if (e.code === 'F3') {
-      miscUiState.showDebugHud = !miscUiState.showDebugHud
-      e.preventDefault()
-    }
-  }
-
   const readPacket = (data, { name }, _buf, fullBuffer) => {
     if (fullBuffer) {
       const size = fullBuffer.byteLength
@@ -107,7 +100,6 @@ export default () => {
       }
     }
 
-    document.addEventListener('keydown', handleF3)
     let update = 0
     const packetsUpdateInterval = setInterval(() => {
       setPacketsString(`↓ ${received.current.count} (${(received.current.size / 1024).toFixed(2)} KB/s, ${getFixedFilesize(receivedTotal.current)}) ↑ ${sent.current.count}`)
@@ -163,7 +155,6 @@ export default () => {
     })
 
     return () => {
-      document.removeEventListener('keydown', handleF3)
       clearInterval(packetsUpdateInterval)
       clearInterval(freqUpdateInterval)
       clearInterval(notFrequentUpdateInterval)

From 8b2276a7ae04cb7d3ca89e6ec2a297558cd029dc Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Wed, 4 Jun 2025 15:07:00 +0100
Subject: [PATCH 59/62] Add server-side logging and timeout option (#366)

---
 server.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/server.js b/server.js
index 20e66051..49699cdb 100644
--- a/server.js
+++ b/server.js
@@ -16,9 +16,23 @@ try {
 const app = express()
 
 const isProd = process.argv.includes('--prod') || process.env.NODE_ENV === 'production'
+const timeoutIndex = process.argv.indexOf('--timeout')
+let timeout = timeoutIndex > -1 && timeoutIndex + 1 < process.argv.length
+    ? parseInt(process.argv[timeoutIndex + 1])
+    : process.env.TIMEOUT
+        ? parseInt(process.env.TIMEOUT)
+        : 10000
+if (isNaN(timeout) || timeout < 0) {
+  console.warn('Invalid timeout value provided, using default of 10000ms')
+  timeout = 10000
+}
 app.use(compression())
 app.use(cors())
-app.use(netApi({ allowOrigin: '*' }))
+app.use(netApi({
+  allowOrigin: '*',
+  log: process.argv.includes('--log') || process.env.LOG === 'true',
+  timeout
+}))
 if (!isProd) {
   app.use('/sounds', express.static(path.join(__dirname, './generated/sounds/')))
 }

From 829e588ac1ee0f6fe02bf455cdb4220d099225a9 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 5 Jun 2025 03:32:09 +0300
Subject: [PATCH 60/62] fix F3 handling when other keys are pressed (restore),
 adjust mic button

---
 src/controls.ts | 36 ++++++------------------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/src/controls.ts b/src/controls.ts
index 32d33fc7..3aeae2b8 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -80,7 +80,7 @@ export const contro = new ControMax({
       pauseMenu: [null, 'Start']
     },
     communication: {
-      toggleMicrophone: ['KeyK'],
+      toggleMicrophone: ['KeyM'],
     },
     advanced: {
       lockUrl: ['KeyY'],
@@ -405,18 +405,7 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => {
         break
       case 'general.debugOverlay':
         if (pressed) {
-          hardcodedPressedKeys.add('F3')
-          const pressedKey = [...contro.pressedKeys].find(key => key !== 'F3')
-          if (pressedKey) {
-            const keybind = f3Keybinds.find((v) => v.key === pressedKey)
-            if (keybind && (keybind.enabled?.() ?? true)) {
-              void keybind.action()
-            }
-          } else {
-            miscUiState.showDebugHud = !miscUiState.showDebugHud
-          }
-        } else {
-          hardcodedPressedKeys.delete('F3')
+          miscUiState.showDebugHud = !miscUiState.showDebugHud
         }
         break
       case 'general.debugOverlayHelpMenu':
@@ -469,6 +458,9 @@ const alwaysPressedHandledCommand = (command: Command) => {
   if (command === 'advanced.lockUrl') {
     lockUrl()
   }
+  if (command === 'communication.toggleMicrophone') {
+    toggleMicrophoneMuted?.()
+  }
 }
 
 export function lockUrl () {
@@ -608,10 +600,6 @@ contro.on('trigger', ({ command }) => {
     }
   }
 
-  if (command === 'communication.toggleMicrophone') {
-    // toggleMicrophoneMuted()
-  }
-
   if (command === 'ui.toggleFullscreen') {
     void goFullscreen(true)
   }
@@ -755,30 +743,18 @@ export const f3Keybinds: Array<{
   }
 ]
 
-const hardcodedPressedKeys = new Set<string>()
 document.addEventListener('keydown', (e) => {
   if (!isGameActive(false)) return
-  if (hardcodedPressedKeys.has('F3')) {
+  if (contro.pressedKeys.has('F3')) {
     const keybind = f3Keybinds.find((v) => v.key === e.code)
     if (keybind && (keybind.enabled?.() ?? true)) {
       void keybind.action()
       e.stopPropagation()
     }
-    return
   }
-
-  hardcodedPressedKeys.add(e.code)
 }, {
   capture: true,
 })
-document.addEventListener('keyup', (e) => {
-  hardcodedPressedKeys.delete(e.code)
-})
-document.addEventListener('visibilitychange', (e) => {
-  if (document.visibilityState === 'hidden') {
-    hardcodedPressedKeys.clear()
-  }
-})
 
 const isFlying = () => (bot.entity as any).flying
 

From 314ddf7215b665c902a85ae8bde490692acc5a9a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 5 Jun 2025 03:37:17 +0300
Subject: [PATCH 61/62] mobile: add back select item button, drop stack on hold
 action (add command!)

---
 config.json     | 9 +++++++--
 src/controls.ts | 7 +++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/config.json b/config.json
index 3696af7a..755de450 100644
--- a/config.json
+++ b/config.json
@@ -41,15 +41,20 @@
   "mobileButtons": [
     {
       "action": "general.drop",
-      "actionHold": "",
+      "actionHold": "general.dropStack",
       "label": "Q"
     },
+    {
+      "action": "general.selectItem",
+      "actionHold": "",
+      "label": "S"
+    },
     {
       "action": "general.debugOverlay",
       "actionHold": "general.debugOverlayHelpMenu",
       "label": "F3"
     },
-     {
+    {
       "action": "general.playersList",
       "actionHold": "",
       "icon": "pixelarticons:users",
diff --git a/src/controls.ts b/src/controls.ts
index 3aeae2b8..bc620ad4 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -46,6 +46,7 @@ export const contro = new ControMax({
       jump: ['Space', 'A'],
       inventory: ['KeyE', 'X'],
       drop: ['KeyQ', 'B'],
+      dropStack: [null],
       sneak: ['ShiftLeft'],
       toggleSneakOrDown: [null, 'Right Stick'],
       sprint: ['ControlLeft', 'Left Stick'],
@@ -574,6 +575,12 @@ contro.on('trigger', ({ command }) => {
         }
         break
       }
+      case 'general.dropStack': {
+        if (bot.heldItem) {
+          void bot.tossStack(bot.heldItem)
+        }
+        break
+      }
       case 'general.chat':
         showModal({ reactType: 'chat' })
         break

From 38a1d83cf284bf49d9eda0ed91c5bb62f35eded7 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 5 Jun 2025 04:07:22 +0300
Subject: [PATCH 62/62] fix(regression): B on gamepad was opening pause menu
 instead of start (default actions map conflict). Now start if clicked again
 closes all modals

---
 config.json                    | 2 +-
 src/controls.ts                | 8 ++++++--
 src/react/MobileTopButtons.tsx | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/config.json b/config.json
index 755de450..bdfd28b2 100644
--- a/config.json
+++ b/config.json
@@ -66,7 +66,7 @@
       "label": ""
     },
     {
-      "action": "ui.back",
+      "action": "ui.pauseMenu",
       "actionHold": "",
       "label": ""
     }
diff --git a/src/controls.ts b/src/controls.ts
index bc620ad4..e270750e 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -237,9 +237,13 @@ const inModalCommand = (command: Command, pressed: boolean) => {
   if (pressed && !gamepadUiCursorState.display) return
 
   if (pressed) {
-    if (command === 'ui.back' || command === 'ui.pauseMenu') {
+    if (command === 'ui.back') {
       hideCurrentModal()
     }
+    if (command === 'ui.pauseMenu') {
+      // hide all modals
+      hideAllModals()
+    }
     if (command === 'ui.leftClick' || command === 'ui.rightClick') {
       // in percent
       const { x, y } = gamepadUiCursorState
@@ -426,7 +430,6 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => {
     }
   } else if (stringStartsWith(command, 'ui')) {
     switch (command) {
-      case 'ui.back':
       case 'ui.pauseMenu':
         if (pressed) {
           if (activeModalStack.length) {
@@ -436,6 +439,7 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => {
           }
         }
         break
+      case 'ui.back':
       case 'ui.toggleFullscreen':
       case 'ui.toggleMap':
       case 'ui.leftClick':
diff --git a/src/react/MobileTopButtons.tsx b/src/react/MobileTopButtons.tsx
index e8a82f77..f048af56 100644
--- a/src/react/MobileTopButtons.tsx
+++ b/src/react/MobileTopButtons.tsx
@@ -34,7 +34,7 @@ export default () => {
       switch (actionForStyle) {
         case 'general.chat':
           return styles['chat-btn']
-        case 'ui.back':
+        case 'ui.pauseMenu':
           return styles['pause-btn']
         case 'general.playersList':
           return styles['tab-btn']