From cb6a14b83bdb1b18074b654adb97c2e3385e30e0 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Thu, 26 Jun 2025 16:14:37 +0000
Subject: [PATCH 001/136] Rename WorldDataEmitter class to WorldView and update
 file structure

- Renamed renderer/viewer/lib/worldDataEmitter.ts to WorldView.ts
- Renamed WorldDataEmitter class to WorldView (kept WorldDataEmitterWorker unchanged)
- Updated all imports and references throughout the codebase:
  - src/watchOptions.ts
  - src/globals.d.ts
  - src/appViewer.ts
  - renderer/playground/baseScene.ts
  - renderer/viewer/three/panorama.ts
  - renderer/viewer/lib/worldrendererCommon.ts
- Maintained backward compatibility for WorldDataEmitterWorker class
---
 renderer/playground/baseScene.ts                          | 4 ++--
 renderer/viewer/lib/{worldDataEmitter.ts => WorldView.ts} | 6 +++---
 renderer/viewer/lib/worldrendererCommon.ts                | 2 +-
 renderer/viewer/three/panorama.ts                         | 4 ++--
 src/appViewer.ts                                          | 6 +++---
 src/globals.d.ts                                          | 2 +-
 src/watchOptions.ts                                       | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)
 rename renderer/viewer/lib/{worldDataEmitter.ts => WorldView.ts} (98%)

diff --git a/renderer/playground/baseScene.ts b/renderer/playground/baseScene.ts
index b9e7791d..94e06dfa 100644
--- a/renderer/playground/baseScene.ts
+++ b/renderer/playground/baseScene.ts
@@ -14,7 +14,7 @@ import { OrbitControls } from 'three/addons/controls/OrbitControls.js'
 import GUI from 'lil-gui'
 import _ from 'lodash'
 import { toMajorVersion } from '../../src/utils'
-import { WorldDataEmitter } from '../viewer'
+import { WorldView } from '../viewer/lib/WorldView'
 import { Viewer } from '../viewer/lib/viewer'
 import { BlockNames } from '../../src/mcDataTypes'
 import { initWithRenderer, statsEnd, statsStart } from '../../src/topRightStats'
@@ -178,7 +178,7 @@ export class BasePlaygroundScene {
 
     this.initGui()
 
-    const worldView = new WorldDataEmitter(world, this.viewDistance, this.targetPos)
+    const worldView = new WorldView(world, this.viewDistance, this.targetPos)
     worldView.addWaitTime = 0
     window.worldView = worldView
 
diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/WorldView.ts
similarity index 98%
rename from renderer/viewer/lib/worldDataEmitter.ts
rename to renderer/viewer/lib/WorldView.ts
index 78da96d9..f9eb9cb8 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/WorldView.ts
@@ -34,11 +34,11 @@ export class WorldDataEmitterWorker extends (EventEmitter as new () => TypedEmit
   static readonly restorerName = 'WorldDataEmitterWorker'
 }
 
-export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<WorldDataEmitterEvents>) {
+export class WorldView extends (EventEmitter as new () => TypedEmitter<WorldDataEmitterEvents>) {
   loadedChunks: Record<ChunkPosKey, boolean>
   readonly lastPos: Vec3
   private eventListeners: Record<string, any> = {}
-  private readonly emitter: WorldDataEmitter
+  private readonly emitter: WorldView
   debugChunksInfo: Record<ChunkPosKey, {
     loads: Array<{
       dataLength: number
@@ -355,4 +355,4 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
       this.lastPos.update(pos)
     }
   }
-}
+}
\ No newline at end of file
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index dfa4f43b..fcc52af9 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -15,7 +15,7 @@ import { buildCleanupDecorator } from './cleanupDecorator'
 import { HighestBlockInfo, CustomBlockModels, BlockStateModelInfo, getBlockAssetsCacheKey, MesherConfig, MesherMainEvent } from './mesher/shared'
 import { chunkPos } from './simpleUtils'
 import { addNewStat, removeAllStats, updatePanesVisibility, updateStatText } from './ui/newStats'
-import { WorldDataEmitterWorker } from './worldDataEmitter'
+import { WorldDataEmitterWorker } from './WorldView'
 import { getPlayerStateUtils, PlayerStateReactive, PlayerStateRenderer, PlayerStateUtils } from './basePlayerState'
 import { MesherLogReader } from './mesherlogReader'
 import { setSkinsConfig } from './utils/skins'
diff --git a/renderer/viewer/three/panorama.ts b/renderer/viewer/three/panorama.ts
index 7e975d4b..60edf37e 100644
--- a/renderer/viewer/three/panorama.ts
+++ b/renderer/viewer/three/panorama.ts
@@ -4,7 +4,7 @@ import { getSyncWorld } from 'renderer/playground/shared'
 import { Vec3 } from 'vec3'
 import * as tweenJs from '@tweenjs/tween.js'
 import type { GraphicsInitOptions } from '../../../src/appViewer'
-import { WorldDataEmitter } from '../lib/worldDataEmitter'
+import { WorldView } from '../lib/WorldView'
 import { defaultWorldRendererConfig, WorldRendererCommon } from '../lib/worldrendererCommon'
 import { getDefaultRendererState } from '../baseGraphicsBackend'
 import { loadThreeJsTextureFromUrl, loadThreeJsTextureFromUrlSync } from '../lib/utils/skins'
@@ -186,7 +186,7 @@ export class PanoramaRenderer {
     this.camera.position.set(0.5, sizeY / 2 + 0.5, 0.5)
     this.camera.rotation.set(0, 0, 0)
     const initPos = new Vec3(...this.camera.position.toArray())
-    const worldView = new WorldDataEmitter(world, 2, initPos)
+    const worldView = new WorldView(world, 2, initPos)
     // worldView.addWaitTime = 0
     if (this.abortController.signal.aborted) return
 
diff --git a/src/appViewer.ts b/src/appViewer.ts
index 0be6c2e8..af98a7b0 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -1,4 +1,4 @@
-import { WorldDataEmitter, WorldDataEmitterWorker } from 'renderer/viewer/lib/worldDataEmitter'
+import { WorldView, WorldDataEmitterWorker } from 'renderer/viewer/lib/WorldView'
 import { getInitialPlayerState, PlayerStateRenderer, PlayerStateReactive } from 'renderer/viewer/lib/basePlayerState'
 import { subscribeKey } from 'valtio/utils'
 import { defaultWorldRendererConfig, WorldRendererConfig } from 'renderer/viewer/lib/worldrendererCommon'
@@ -97,7 +97,7 @@ export class AppViewer {
   waitBackendLoadPromises = [] as Array<Promise<void>>
 
   resourcesManager = new ResourcesManager()
-  worldView: WorldDataEmitter | undefined
+      worldView: WorldView | undefined
   readonly config: GraphicsBackendConfig = {
     ...defaultGraphicsBackendConfig,
     powerPreference: options.gpuPreference === 'default' ? undefined : options.gpuPreference
@@ -184,7 +184,7 @@ export class AppViewer {
     if (this.currentDisplay === 'world') throw new Error('World already started')
     this.currentDisplay = 'world'
     const startPosition = bot.entity?.position ?? new Vec3(0, 64, 0)
-    this.worldView = new WorldDataEmitter(world, renderDistance, startPosition)
+          this.worldView = new WorldView(world, renderDistance, startPosition)
     window.worldView = this.worldView
     watchOptionsAfterWorldViewInit(this.worldView)
 
diff --git a/src/globals.d.ts b/src/globals.d.ts
index 7a2c6f1f..71caf128 100644
--- a/src/globals.d.ts
+++ b/src/globals.d.ts
@@ -12,7 +12,7 @@ declare const bot: Omit<import('mineflayer').Bot, 'world' | '_client'> & {
 }
 declare const __type_bot: typeof bot
 declare const appViewer: import('./appViewer').AppViewer
-declare const worldView: import('renderer/viewer/lib/worldDataEmitter').WorldDataEmitter | undefined
+declare const worldView: import('renderer/viewer/lib/WorldView').WorldView | undefined
 declare const addStatPerSec: (name: string) => void
 declare const localServer: import('flying-squid/dist/index').FullServer & { options } | undefined
 /** all currently loaded mc data */
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index 478da4fb..63f2746f 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -2,7 +2,7 @@
 
 import { subscribeKey } from 'valtio/utils'
 import { isMobile } from 'renderer/viewer/lib/simpleUtils'
-import { WorldDataEmitter } from 'renderer/viewer/lib/worldDataEmitter'
+import { WorldView } from 'renderer/viewer/lib/WorldView'
 import { options, watchValue } from './optionsStorage'
 import { reloadChunks } from './utils'
 import { miscUiState } from './globalState'
@@ -117,7 +117,7 @@ export const watchOptionsAfterViewerInit = () => {
   })
 }
 
-export const watchOptionsAfterWorldViewInit = (worldView: WorldDataEmitter) => {
+export const watchOptionsAfterWorldViewInit = (worldView: WorldView) => {
   watchValue(options, o => {
     if (!worldView) return
     worldView.keepChunksDistance = o.keepChunksDistance

From eedd9f1b8f11ee21797d23f87aebbf591e95f29d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 27 Jun 2025 16:28:15 +0300
Subject: [PATCH 002/136] feat: Now settings and servers list synced via
 top-domain cookies! Eg different subdomains like s.mcraft.fun and mcraft.fun
 will now share the same settings! Can be disabled. feat: Now its possible to
 import data!

---
 rsbuild.config.ts                  |   1 +
 src/core/importExport.ts           | 219 +++++++++++++++++++++
 src/defaultOptions.ts              | 152 +++++++++++++++
 src/globalState.ts                 |   2 +
 src/optionsGuiScheme.tsx           |  76 +++-----
 src/optionsStorage.ts              | 165 +---------------
 src/react/StorageConflictModal.tsx |  94 +++++++++
 src/react/appStorageProvider.ts    | 294 +++++++++++++++++++++++++++--
 src/reactUi.tsx                    |   2 +
 9 files changed, 780 insertions(+), 225 deletions(-)
 create mode 100644 src/core/importExport.ts
 create mode 100644 src/defaultOptions.ts
 create mode 100644 src/react/StorageConflictModal.tsx

diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index 5e76646e..548be4e2 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -140,6 +140,7 @@ const appConfig = defineConfig({
             'process.env.RELEASE_CHANGELOG': JSON.stringify(releaseChangelog),
             'process.env.DISABLE_SERVICE_WORKER': JSON.stringify(disableServiceWorker),
             'process.env.INLINED_APP_CONFIG': JSON.stringify(configSource === 'BUNDLED' ? configJson : null),
+            'process.env.ENABLE_COOKIE_STORAGE': JSON.stringify(process.env.ENABLE_COOKIE_STORAGE || true),
         },
     },
     server: {
diff --git a/src/core/importExport.ts b/src/core/importExport.ts
new file mode 100644
index 00000000..b3e26347
--- /dev/null
+++ b/src/core/importExport.ts
@@ -0,0 +1,219 @@
+import { appStorage } from '../react/appStorageProvider'
+import { getChangedSettings, options } from '../optionsStorage'
+import { customKeymaps } from '../controls'
+import { showInputsModal } from '../react/SelectOption'
+
+interface ExportedFile {
+  _about: string
+  options?: Record<string, any>
+  keybindings?: Record<string, any>
+  servers?: any[]
+  username?: string
+  proxy?: string
+  proxies?: string[]
+  accountTokens?: any[]
+}
+
+export const importData = async () => {
+  try {
+    const input = document.createElement('input')
+    input.type = 'file'
+    input.accept = '.json'
+    input.click()
+
+    const file = await new Promise<File>((resolve) => {
+      input.onchange = () => {
+        if (!input.files?.[0]) return
+        resolve(input.files[0])
+      }
+    })
+
+    const text = await file.text()
+    const data = JSON.parse(text)
+
+    if (!data._about?.includes('Minecraft Web Client')) {
+      const doContinue = confirm('This file does not appear to be a Minecraft Web Client profile. Continue anyway?')
+      if (!doContinue) return
+    }
+
+    // Build available data types for selection
+    const availableData: Record<keyof Omit<ExportedFile, '_about'>, { present: boolean, description: string }> = {
+      options: { present: !!data.options, description: 'Game settings and preferences' },
+      keybindings: { present: !!data.keybindings, description: 'Custom key mappings' },
+      servers: { present: !!data.servers, description: 'Saved server list' },
+      username: { present: !!data.username, description: 'Username' },
+      proxy: { present: !!data.proxy, description: 'Selected proxy server' },
+      proxies: { present: !!data.proxies, description: 'Global proxies list' },
+      accountTokens: { present: !!data.accountTokens, description: 'Account authentication tokens' },
+    }
+
+    // Filter to only present data types
+    const presentTypes = Object.fromEntries(Object.entries(availableData)
+      .filter(([_, info]) => info.present)
+      .map<any>(([key, info]) => [key, info]))
+
+    if (Object.keys(presentTypes).length === 0) {
+      alert('No compatible data found in the imported file.')
+      return
+    }
+
+    const importChoices = await showInputsModal('Select Data to Import', {
+      mergeData: {
+        type: 'checkbox',
+        label: 'Merge with existing data (uncheck to remove old data)',
+        defaultValue: true,
+      },
+      ...Object.fromEntries(Object.entries(presentTypes).map(([key, info]) => [key, {
+        type: 'checkbox',
+        label: info.description,
+        defaultValue: true,
+      }]))
+    }) as { mergeData: boolean } & Record<keyof ExportedFile, boolean>
+
+    if (!importChoices) return
+
+    const importedTypes: string[] = []
+    const shouldMerge = importChoices.mergeData
+
+    if (importChoices.options && data.options) {
+      if (shouldMerge) {
+        Object.assign(options, data.options)
+      } else {
+        for (const key of Object.keys(options)) {
+          if (key in data.options) {
+            options[key as any] = data.options[key]
+          }
+        }
+      }
+      importedTypes.push('settings')
+    }
+
+    if (importChoices.keybindings && data.keybindings) {
+      if (shouldMerge) {
+        Object.assign(customKeymaps, data.keybindings)
+      } else {
+        for (const key of Object.keys(customKeymaps)) delete customKeymaps[key]
+        Object.assign(customKeymaps, data.keybindings)
+      }
+      importedTypes.push('keybindings')
+    }
+
+    if (importChoices.servers && data.servers) {
+      if (shouldMerge && appStorage.serversList) {
+        // Merge by IP, update existing entries and add new ones
+        const existingIps = new Set(appStorage.serversList.map(s => s.ip))
+        const newServers = data.servers.filter(s => !existingIps.has(s.ip))
+        appStorage.serversList = [...appStorage.serversList, ...newServers]
+      } else {
+        appStorage.serversList = data.servers
+      }
+      importedTypes.push('servers')
+    }
+
+    if (importChoices.username && data.username) {
+      appStorage.username = data.username
+      importedTypes.push('username')
+    }
+
+    if ((importChoices.proxy && data.proxy) || (importChoices.proxies && data.proxies)) {
+      if (!appStorage.proxiesData) {
+        appStorage.proxiesData = { proxies: [], selected: '' }
+      }
+
+      if (importChoices.proxies && data.proxies) {
+        if (shouldMerge) {
+          // Merge unique proxies
+          const uniqueProxies = new Set([...appStorage.proxiesData.proxies, ...data.proxies])
+          appStorage.proxiesData.proxies = [...uniqueProxies]
+        } else {
+          appStorage.proxiesData.proxies = data.proxies
+        }
+        importedTypes.push('proxies list')
+      }
+
+      if (importChoices.proxy && data.proxy) {
+        appStorage.proxiesData.selected = data.proxy
+        importedTypes.push('selected proxy')
+      }
+    }
+
+    if (importChoices.accountTokens && data.accountTokens) {
+      if (shouldMerge && appStorage.authenticatedAccounts) {
+        // Merge by unique identifier (assuming accounts have some unique ID or username)
+        const existingAccounts = new Set(appStorage.authenticatedAccounts.map(a => a.username))
+        const newAccounts = data.accountTokens.filter(a => !existingAccounts.has(a.username))
+        appStorage.authenticatedAccounts = [...appStorage.authenticatedAccounts, ...newAccounts]
+      } else {
+        appStorage.authenticatedAccounts = data.accountTokens
+      }
+      importedTypes.push('account tokens')
+    }
+
+    alert(`Profile imported successfully! Imported data: ${importedTypes.join(', ')}.\nYou may need to reload the page for some changes to take effect.`)
+  } catch (err) {
+    console.error('Failed to import profile:', err)
+    alert('Failed to import profile: ' + (err.message || err))
+  }
+}
+
+export const exportData = async () => {
+  const data = await showInputsModal('Export Profile', {
+    profileName: {
+      type: 'text',
+    },
+    exportSettings: {
+      type: 'checkbox',
+      defaultValue: true,
+    },
+    exportKeybindings: {
+      type: 'checkbox',
+      defaultValue: true,
+    },
+    exportServers: {
+      type: 'checkbox',
+      defaultValue: true,
+    },
+    saveUsernameAndProxy: {
+      type: 'checkbox',
+      defaultValue: true,
+    },
+    exportGlobalProxiesList: {
+      type: 'checkbox',
+      defaultValue: false,
+    },
+    exportAccountTokens: {
+      type: 'checkbox',
+      defaultValue: false,
+    },
+  })
+  const fileName = `${data.profileName ? `${data.profileName}-` : ''}web-client-profile.json`
+  const json: ExportedFile = {
+    _about: 'Minecraft Web Client (mcraft.fun) Profile',
+    ...data.exportSettings ? {
+      options: getChangedSettings(),
+    } : {},
+    ...data.exportKeybindings ? {
+      keybindings: customKeymaps,
+    } : {},
+    ...data.exportServers ? {
+      servers: appStorage.serversList,
+    } : {},
+    ...data.saveUsernameAndProxy ? {
+      username: appStorage.username,
+      proxy: appStorage.proxiesData?.selected,
+    } : {},
+    ...data.exportGlobalProxiesList ? {
+      proxies: appStorage.proxiesData?.proxies,
+    } : {},
+    ...data.exportAccountTokens ? {
+      accountTokens: appStorage.authenticatedAccounts,
+    } : {},
+  }
+  const blob = new Blob([JSON.stringify(json, null, 2)], { type: 'application/json' })
+  const url = URL.createObjectURL(blob)
+  const a = document.createElement('a')
+  a.href = url
+  a.download = fileName
+  a.click()
+  URL.revokeObjectURL(url)
+}
diff --git a/src/defaultOptions.ts b/src/defaultOptions.ts
new file mode 100644
index 00000000..d2d510ec
--- /dev/null
+++ b/src/defaultOptions.ts
@@ -0,0 +1,152 @@
+export const defaultOptions = {
+  renderDistance: 3,
+  keepChunksDistance: 1,
+  multiplayerRenderDistance: 3,
+  closeConfirmation: true,
+  autoFullScreen: false,
+  mouseRawInput: true,
+  autoExitFullscreen: false,
+  localUsername: 'wanderer',
+  mouseSensX: 50,
+  mouseSensY: -1,
+  chatWidth: 320,
+  chatHeight: 180,
+  chatScale: 100,
+  chatOpacity: 100,
+  chatOpacityOpened: 100,
+  messagesLimit: 200,
+  volume: 50,
+  enableMusic: false,
+  // fov: 70,
+  fov: 75,
+  guiScale: 3,
+  autoRequestCompletions: true,
+  touchButtonsSize: 40,
+  touchButtonsOpacity: 80,
+  touchButtonsPosition: 12,
+  touchControlsPositions: getDefaultTouchControlsPositions(),
+  touchControlsSize: getTouchControlsSize(),
+  touchMovementType: 'modern' as 'modern' | 'classic',
+  touchInteractionType: 'classic' as 'classic' | 'buttons',
+  gpuPreference: 'default' as 'default' | 'high-performance' | 'low-power',
+  backgroundRendering: '20fps' as 'full' | '20fps' | '5fps',
+  /** @unstable */
+  disableAssets: false,
+  /** @unstable */
+  debugLogNotFrequentPackets: false,
+  unimplementedContainers: false,
+  dayCycleAndLighting: true,
+  loadPlayerSkins: true,
+  renderEars: true,
+  lowMemoryMode: false,
+  starfieldRendering: true,
+  enabledResourcepack: null as string | null,
+  useVersionsTextures: 'latest',
+  serverResourcePacks: 'prompt' as 'prompt' | 'always' | 'never',
+  showHand: true,
+  viewBobbing: true,
+  displayRecordButton: true,
+  packetsLoggerPreset: 'all' as 'all' | 'no-buffers',
+  serversAutoVersionSelect: 'auto' as 'auto' | 'latest' | '1.20.4' | string,
+  customChannels: false,
+  remoteContentNotSameOrigin: false as boolean | string[],
+  packetsRecordingAutoStart: false,
+  language: 'auto',
+  preciseMouseInput: false,
+  // todo ui setting, maybe enable by default?
+  waitForChunksRender: false as 'sp-only' | boolean,
+  jeiEnabled: true as boolean | Array<'creative' | 'survival' | 'adventure' | 'spectator'>,
+  modsSupport: false,
+  modsAutoUpdate: 'check' as 'check' | 'never' | 'always',
+  modsUpdatePeriodCheck: 24, // hours
+  preventBackgroundTimeoutKick: false,
+  preventSleep: false,
+  debugContro: false,
+  debugChatScroll: false,
+  chatVanillaRestrictions: true,
+  debugResponseTimeIndicator: false,
+  chatPingExtension: true,
+  // antiAliasing: false,
+  topRightTimeDisplay: 'only-fullscreen' as 'only-fullscreen' | 'always' | 'never',
+
+  clipWorldBelowY: undefined as undefined | number, // will be removed
+  disableSignsMapsSupport: false,
+  singleplayerAutoSave: false,
+  showChunkBorders: false, // todo rename option
+  frameLimit: false as number | false,
+  alwaysBackupWorldBeforeLoading: undefined as boolean | undefined | null,
+  alwaysShowMobileControls: false,
+  excludeCommunicationDebugEvents: [],
+  preventDevReloadWhilePlaying: false,
+  numWorkers: 4,
+  localServerOptions: {
+    gameMode: 1
+  } as any,
+  preferLoadReadonly: false,
+  disableLoadPrompts: false,
+  guestUsername: 'guest',
+  askGuestName: true,
+  errorReporting: true,
+  /** Actually might be useful */
+  showCursorBlockInSpectator: false,
+  renderEntities: true,
+  smoothLighting: true,
+  newVersionsLighting: false,
+  chatSelect: true,
+  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',
+  rendererPerfDebugOverlay: false,
+
+  // advanced bot options
+  autoRespawn: false,
+  mutedSounds: [] as string[],
+  plugins: [] as Array<{ enabled: boolean, name: string, description: string, script: string }>,
+  /** Wether to popup sign editor on server action */
+  autoSignEditor: true,
+  wysiwygSignEditor: 'auto' as 'auto' | 'always' | 'never',
+  showMinimap: 'never' as 'always' | 'singleplayer' | 'never',
+  minimapOptimizations: true,
+  displayBossBars: true,
+  disabledUiParts: [] as string[],
+  neighborChunkUpdates: true,
+  highlightBlockColor: 'auto' as 'auto' | 'blue' | 'classic',
+  activeRenderer: 'threejs',
+  rendererSharedOptions: {
+    _experimentalSmoothChunkLoading: true,
+    _renderByChunks: false
+  }
+}
+
+function getDefaultTouchControlsPositions () {
+  return {
+    action: [
+      70,
+      76
+    ],
+    sneak: [
+      84,
+      76
+    ],
+    break: [
+      70,
+      57
+    ],
+    jump: [
+      84,
+      57
+    ],
+  } as Record<string, [number, number]>
+}
+
+function getTouchControlsSize () {
+  return {
+    joystick: 55,
+    action: 36,
+    break: 36,
+    jump: 36,
+    sneak: 36,
+  }
+}
diff --git a/src/globalState.ts b/src/globalState.ts
index 671d7907..b8982de7 100644
--- a/src/globalState.ts
+++ b/src/globalState.ts
@@ -46,6 +46,8 @@ export const showModal = (elem: /* (HTMLElement & Record<string, any>) |  */{ re
   activeModalStack.push(resolved)
 }
 
+window.showModal = showModal
+
 /**
  *
  * @returns true if previous modal was restored
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 3409dc76..ba52e333 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -20,6 +20,7 @@ import { getVersionAutoSelect } from './connect'
 import { createNotificationProgressReporter } from './core/progressReporter'
 import { customKeymaps } from './controls'
 import { appStorage } from './react/appStorageProvider'
+import { exportData, importData } from './core/importExport'
 
 export const guiOptionsScheme: {
   [t in OptionsGroupType]: Array<{ [K in keyof AppOptions]?: Partial<OptionMeta<AppOptions[K]>> } & { custom? }>
@@ -532,6 +533,30 @@ export const guiOptionsScheme: {
         return <Button label='Export/Import...' onClick={() => openOptionsMenu('export-import')} inScreen />
       }
     },
+    {
+      custom () {
+        const { cookieStorage } = useSnapshot(appStorage)
+        return <Button
+          label={`Storage: ${cookieStorage ? 'Synced Cookies' : 'Local Storage'}`} onClick={() => {
+            appStorage.cookieStorage = !cookieStorage
+            alert('Reload the page to apply this change')
+          }}
+          inScreen
+        />
+      }
+    },
+    {
+      custom () {
+        const { cookieStorage } = useSnapshot(appStorage)
+        return <Button
+          label={`Storage: ${cookieStorage ? 'Synced Cookies' : 'Local Storage'}`} onClick={() => {
+            appStorage.cookieStorage = !cookieStorage
+            alert('Reload the page to apply this change')
+          }}
+          inScreen
+        />
+      }
+    },
     {
       custom () {
         return <Category>Server Connection</Category>
@@ -637,8 +662,7 @@ export const guiOptionsScheme: {
       custom () {
         return <Button
           inScreen
-          disabled={true}
-          onClick={() => {}}
+          onClick={importData}
         >Import Data</Button>
       }
     },
@@ -646,53 +670,7 @@ export const guiOptionsScheme: {
       custom () {
         return <Button
           inScreen
-          onClick={async () => {
-            const data = await showInputsModal('Export Profile', {
-              profileName: {
-                type: 'text',
-              },
-              exportSettings: {
-                type: 'checkbox',
-                defaultValue: true,
-              },
-              exportKeybindings: {
-                type: 'checkbox',
-                defaultValue: true,
-              },
-              exportServers: {
-                type: 'checkbox',
-                defaultValue: true,
-              },
-              saveUsernameAndProxy: {
-                type: 'checkbox',
-                defaultValue: true,
-              },
-            })
-            const fileName = `${data.profileName ? `${data.profileName}-` : ''}web-client-profile.json`
-            const json = {
-              _about: 'Minecraft Web Client (mcraft.fun) Profile',
-              ...data.exportSettings ? {
-                options: getChangedSettings(),
-              } : {},
-              ...data.exportKeybindings ? {
-                keybindings: customKeymaps,
-              } : {},
-              ...data.exportServers ? {
-                servers: appStorage.serversList,
-              } : {},
-              ...data.saveUsernameAndProxy ? {
-                username: appStorage.username,
-                proxy: appStorage.proxiesData?.selected,
-              } : {},
-            }
-            const blob = new Blob([JSON.stringify(json, null, 2)], { type: 'application/json' })
-            const url = URL.createObjectURL(blob)
-            const a = document.createElement('a')
-            a.href = url
-            a.download = fileName
-            a.click()
-            URL.revokeObjectURL(url)
-          }}
+          onClick={exportData}
         >Export Data</Button>
       }
     },
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 882610f8..22d5ef26 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -5,161 +5,10 @@ import { appQueryParams, appQueryParamsArray } from './appParams'
 import type { AppConfig } from './appConfig'
 import { appStorage } from './react/appStorageProvider'
 import { miscUiState } from './globalState'
+import { defaultOptions } from './defaultOptions'
 
 const isDev = process.env.NODE_ENV === 'development'
 const initialAppConfig = process.env?.INLINED_APP_CONFIG as AppConfig ?? {}
-const defaultOptions = {
-  renderDistance: 3,
-  keepChunksDistance: 1,
-  multiplayerRenderDistance: 3,
-  closeConfirmation: true,
-  autoFullScreen: false,
-  mouseRawInput: true,
-  autoExitFullscreen: false,
-  localUsername: 'wanderer',
-  mouseSensX: 50,
-  mouseSensY: -1,
-  chatWidth: 320,
-  chatHeight: 180,
-  chatScale: 100,
-  chatOpacity: 100,
-  chatOpacityOpened: 100,
-  messagesLimit: 200,
-  volume: 50,
-  enableMusic: false,
-  // fov: 70,
-  fov: 75,
-  guiScale: 3,
-  autoRequestCompletions: true,
-  touchButtonsSize: 40,
-  touchButtonsOpacity: 80,
-  touchButtonsPosition: 12,
-  touchControlsPositions: getDefaultTouchControlsPositions(),
-  touchControlsSize: getTouchControlsSize(),
-  touchMovementType: 'modern' as 'modern' | 'classic',
-  touchInteractionType: 'classic' as 'classic' | 'buttons',
-  gpuPreference: 'default' as 'default' | 'high-performance' | 'low-power',
-  backgroundRendering: '20fps' as 'full' | '20fps' | '5fps',
-  /** @unstable */
-  disableAssets: false,
-  /** @unstable */
-  debugLogNotFrequentPackets: false,
-  unimplementedContainers: false,
-  dayCycleAndLighting: true,
-  loadPlayerSkins: true,
-  renderEars: true,
-  lowMemoryMode: false,
-  starfieldRendering: true,
-  enabledResourcepack: null as string | null,
-  useVersionsTextures: 'latest',
-  serverResourcePacks: 'prompt' as 'prompt' | 'always' | 'never',
-  showHand: true,
-  viewBobbing: true,
-  displayRecordButton: true,
-  packetsLoggerPreset: 'all' as 'all' | 'no-buffers',
-  serversAutoVersionSelect: 'auto' as 'auto' | 'latest' | '1.20.4' | string,
-  customChannels: false,
-  remoteContentNotSameOrigin: false as boolean | string[],
-  packetsRecordingAutoStart: false,
-  language: 'auto',
-  preciseMouseInput: false,
-  // todo ui setting, maybe enable by default?
-  waitForChunksRender: false as 'sp-only' | boolean,
-  jeiEnabled: true as boolean | Array<'creative' | 'survival' | 'adventure' | 'spectator'>,
-  modsSupport: false,
-  modsAutoUpdate: 'check' as 'check' | 'never' | 'always',
-  modsUpdatePeriodCheck: 24, // hours
-  preventBackgroundTimeoutKick: false,
-  preventSleep: false,
-  debugContro: false,
-  debugChatScroll: false,
-  chatVanillaRestrictions: true,
-  debugResponseTimeIndicator: false,
-  chatPingExtension: true,
-  // antiAliasing: false,
-  topRightTimeDisplay: 'only-fullscreen' as 'only-fullscreen' | 'always' | 'never',
-
-  clipWorldBelowY: undefined as undefined | number, // will be removed
-  disableSignsMapsSupport: false,
-  singleplayerAutoSave: false,
-  showChunkBorders: false, // todo rename option
-  frameLimit: false as number | false,
-  alwaysBackupWorldBeforeLoading: undefined as boolean | undefined | null,
-  alwaysShowMobileControls: false,
-  excludeCommunicationDebugEvents: [],
-  preventDevReloadWhilePlaying: false,
-  numWorkers: 4,
-  localServerOptions: {
-    gameMode: 1
-  } as any,
-  preferLoadReadonly: false,
-  disableLoadPrompts: false,
-  guestUsername: 'guest',
-  askGuestName: true,
-  errorReporting: true,
-  /** Actually might be useful */
-  showCursorBlockInSpectator: false,
-  renderEntities: true,
-  smoothLighting: true,
-  newVersionsLighting: false,
-  chatSelect: true,
-  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',
-  rendererPerfDebugOverlay: false,
-
-  // advanced bot options
-  autoRespawn: false,
-  mutedSounds: [] as string[],
-  plugins: [] as Array<{ enabled: boolean, name: string, description: string, script: string }>,
-  /** Wether to popup sign editor on server action */
-  autoSignEditor: true,
-  wysiwygSignEditor: 'auto' as 'auto' | 'always' | 'never',
-  showMinimap: 'never' as 'always' | 'singleplayer' | 'never',
-  minimapOptimizations: true,
-  displayBossBars: true,
-  disabledUiParts: [] as string[],
-  neighborChunkUpdates: true,
-  highlightBlockColor: 'auto' as 'auto' | 'blue' | 'classic',
-  activeRenderer: 'threejs',
-  rendererSharedOptions: {
-    _experimentalSmoothChunkLoading: true,
-    _renderByChunks: false
-  }
-}
-
-function getDefaultTouchControlsPositions () {
-  return {
-    action: [
-      70,
-      76
-    ],
-    sneak: [
-      84,
-      76
-    ],
-    break: [
-      70,
-      57
-    ],
-    jump: [
-      84,
-      57
-    ],
-  } as Record<string, [number, number]>
-}
-
-function getTouchControlsSize () {
-  return {
-    joystick: 55,
-    action: 36,
-    break: 36,
-    jump: 36,
-    sneak: 36,
-  }
-}
 
 // const qsOptionsRaw = new URLSearchParams(location.search).getAll('setting')
 const qsOptionsRaw = appQueryParamsArray.setting ?? []
@@ -191,15 +40,15 @@ const migrateOptions = (options: Partial<AppOptions & Record<string, any>>) => {
   return options
 }
 const migrateOptionsLocalStorage = () => {
-  if (Object.keys(appStorage.options).length) {
-    for (const key of Object.keys(appStorage.options)) {
+  if (Object.keys(appStorage['options'] ?? {}).length) {
+    for (const key of Object.keys(appStorage['options'])) {
       if (!(key in defaultOptions)) continue // drop unknown options
       const defaultValue = defaultOptions[key]
-      if (JSON.stringify(defaultValue) !== JSON.stringify(appStorage.options[key])) {
-        appStorage.changedSettings[key] = appStorage.options[key]
+      if (JSON.stringify(defaultValue) !== JSON.stringify(appStorage['options'][key])) {
+        appStorage.changedSettings[key] = appStorage['options'][key]
       }
     }
-    appStorage.options = {}
+    delete appStorage['options']
   }
 }
 
@@ -311,3 +160,5 @@ export const getAppLanguage = () => {
   }
   return options.language
 }
+
+export { defaultOptions } from './defaultOptions'
diff --git a/src/react/StorageConflictModal.tsx b/src/react/StorageConflictModal.tsx
new file mode 100644
index 00000000..9e20ca2d
--- /dev/null
+++ b/src/react/StorageConflictModal.tsx
@@ -0,0 +1,94 @@
+import { useSnapshot } from 'valtio'
+import { activeModalStack, hideCurrentModal } from '../globalState'
+import { resolveStorageConflicts, getStorageConflicts } from './appStorageProvider'
+import { useIsModalActive } from './utilsApp'
+import Screen from './Screen'
+import Button from './Button'
+
+const formatTimestamp = (timestamp?: number) => {
+  if (!timestamp) return 'Unknown time'
+  return new Date(timestamp).toLocaleString()
+}
+
+export default () => {
+  const isModalActive = useIsModalActive('storage-conflict')
+  const conflicts = getStorageConflicts()
+
+  if (!isModalActive/*  || conflicts.length === 0 */) return null
+
+  const conflictText = conflicts.map(conflict => {
+    const localTime = formatTimestamp(conflict.localStorageTimestamp)
+    const cookieTime = formatTimestamp(conflict.cookieTimestamp)
+    return `${conflict.key}: LocalStorage (${localTime}) vs Cookie (${cookieTime})`
+  }).join('\n')
+
+  return (
+    <div
+    >
+      <div style={{
+        background: '#dcb58f',
+        border: '2px solid #654321',
+        padding: '20px',
+        margin: '10px',
+        color: '#FFFFFF',
+        fontFamily: 'minecraft, monospace',
+        textAlign: 'center'
+      }}>
+        <div style={{
+          fontSize: '16px',
+          fontWeight: 'bold',
+          color: '#000000',
+          marginBottom: '15px'
+        }}>
+          Data Conflict Found
+        </div>
+
+        <div style={{
+          fontSize: '12px',
+          marginBottom: '20px',
+          whiteSpace: 'pre-line',
+          // backgroundColor: 'rgba(0, 0, 0, 0.5)',
+          color: '#642323',
+          padding: '10px',
+          // border: '1px solid #654321'
+        }}>
+          You have conflicting data between localStorage (old) and cookies (new, domain-synced) for the following settings:
+          {'\n\n'}
+          {conflictText}
+          {'\n\n'}
+          Please choose which version to keep:
+        </div>
+
+        <div style={{ display: 'flex', gap: '10px', justifyContent: 'center', fontSize: '8px', color: 'black' }}>
+          <div
+            onClick={() => {
+              resolveStorageConflicts(true) // Use localStorage
+              hideCurrentModal()
+            }}
+            style={{
+              border: '1px solid #654321',
+              padding: '8px 16px',
+              cursor: 'pointer'
+            }}
+          >
+            Use Local Storage & Disable Cookie Sync
+          </div>
+
+          <div
+            onClick={() => {
+              resolveStorageConflicts(false) // Use cookies
+              hideCurrentModal()
+            }}
+            style={{
+              border: '1px solid #654321',
+              padding: '8px 16px',
+              cursor: 'pointer'
+            }}
+          >
+            Use Cookie Data & Remove Local Data
+          </div>
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/src/react/appStorageProvider.ts b/src/react/appStorageProvider.ts
index 499ec71c..bee8e408 100644
--- a/src/react/appStorageProvider.ts
+++ b/src/react/appStorageProvider.ts
@@ -8,7 +8,9 @@ import type { BaseServerInfo } from './AddServerOrConnect'
 
 // when opening html file locally in browser, localStorage is shared between all ever opened html files, so we try to avoid conflicts
 const localStoragePrefix = process.env?.SINGLE_FILE_BUILD ? 'minecraft-web-client:' : ''
+const cookiePrefix = ''
 const { localStorage } = window
+const migrateRemoveLocalStorage = false
 
 export interface SavedProxiesData {
   proxies: string[]
@@ -31,12 +33,19 @@ export interface StoreServerItem extends BaseServerInfo {
   isRecommended?: boolean
 }
 
+interface StorageConflict {
+  key: string
+  localStorageValue: any
+  localStorageTimestamp?: number
+  cookieValue: any
+  cookieTimestamp?: number
+}
+
 type StorageData = {
+  cookieStorage: boolean | { ignoreKeys: Array<keyof StorageData> }
   customCommands: Record<string, CustomCommand> | undefined
   username: string | undefined
   keybindings: UserOverridesConfig | undefined
-  /** @deprecated */
-  options: any
   changedSettings: any
   proxiesData: SavedProxiesData | undefined
   serversHistory: ServerHistoryEntry[]
@@ -46,10 +55,115 @@ type StorageData = {
   firstModsPageVisit: boolean
 }
 
+const cookieStoreKeys: Array<keyof StorageData> = [
+  'customCommands',
+  'username',
+  'keybindings',
+  'changedSettings',
+  'serversList',
+]
+
 const oldKeysAliases: Partial<Record<keyof StorageData, string>> = {
   serversHistory: 'serverConnectionHistory',
 }
 
+// Cookie storage functions
+const getCookieValue = (key: string): string | null => {
+  const cookie = document.cookie.split(';').find(c => c.trimStart().startsWith(`${cookiePrefix}${key}=`))
+  if (cookie) {
+    return decodeURIComponent(cookie.split('=')[1])
+  }
+  return null
+}
+
+const topLevelDomain = window.location.hostname.split('.').slice(-2).join('.')
+const cookieBase = `; Domain=.${topLevelDomain}; Path=/; SameSite=Strict; Secure`
+
+const setCookieValue = (key: string, value: string): boolean => {
+  try {
+    const cookieKey = `${cookiePrefix}${key}`
+    let cookie = `${cookieKey}=${encodeURIComponent(value)}`
+    cookie += `${cookieBase}; Max-Age=2147483647`
+
+    // Test if cookie exceeds size limit
+    if (cookie.length > 4096) {
+      throw new Error(`Cookie size limit exceeded for key '${key}'. Cookie size: ${cookie.length} bytes, limit: 4096 bytes.`)
+    }
+
+    document.cookie = cookie
+    return true
+  } catch (error) {
+    console.error(`Failed to set cookie for key '${key}':`, error)
+    window.showNotification(`Failed to save data to cookies: ${error.message}`, 'Consider switching to localStorage in advanced settings.', true)
+    return false
+  }
+}
+
+const deleteCookie = (key: string) => {
+  const cookieKey = `${cookiePrefix}${key}`
+  document.cookie = `${cookieKey}=; ${cookieBase}; expires=Thu, 01 Jan 1970 00:00:00 UTC;`
+}
+
+// Storage conflict detection and resolution
+let storageConflicts: StorageConflict[] = []
+
+const detectStorageConflicts = (): StorageConflict[] => {
+  const conflicts: StorageConflict[] = []
+
+  for (const key of cookieStoreKeys) {
+    const localStorageKey = `${localStoragePrefix}${key}`
+    const localStorageValue = localStorage.getItem(localStorageKey)
+    const cookieValue = getCookieValue(key)
+
+    if (localStorageValue && cookieValue) {
+      try {
+        const localParsed = JSON.parse(localStorageValue)
+        const cookieParsed = JSON.parse(cookieValue)
+
+        if (localParsed?.migrated) {
+          continue
+        }
+
+        // Extract timestamps if they exist
+        const localTimestamp = localParsed?.timestamp
+        const cookieTimestamp = cookieParsed?.timestamp
+
+        // Compare the actual data (excluding timestamp)
+        const localData = localTimestamp ? { ...localParsed } : localParsed
+        const cookieData = cookieTimestamp ? { ...cookieParsed } : cookieParsed
+        delete localData.timestamp
+        delete cookieData.timestamp
+
+        if (JSON.stringify(localData) !== JSON.stringify(cookieData)) {
+          conflicts.push({
+            key,
+            localStorageValue: localData,
+            localStorageTimestamp: localTimestamp,
+            cookieValue: cookieData,
+            cookieTimestamp
+          })
+        }
+      } catch (e) {
+        console.error(`Failed to parse storage values for conflict detection on key '${key}':`, e, localStorageValue, cookieValue)
+      }
+    }
+  }
+
+  return conflicts
+}
+
+const showStorageConflictModal = () => {
+  // Import showModal dynamically to avoid circular dependency
+  const showModal = (window as any).showModal || ((modal: any) => {
+    console.error('Modal system not available:', modal)
+    console.warn('Storage conflicts detected but modal system not available:', storageConflicts)
+  })
+
+  setTimeout(() => {
+    showModal({ reactType: 'storage-conflict', conflicts: storageConflicts })
+  }, 100)
+}
+
 const migrateLegacyData = () => {
   const proxies = localStorage.getItem('proxies')
   const selectedProxy = localStorage.getItem('selectedProxy')
@@ -75,10 +189,10 @@ const migrateLegacyData = () => {
 }
 
 const defaultStorageData: StorageData = {
+  cookieStorage: !!process.env.ENABLE_COOKIE_STORAGE && !process.env?.SINGLE_FILE_BUILD,
   customCommands: undefined,
   username: undefined,
   keybindings: undefined,
-  options: {},
   changedSettings: {},
   proxiesData: undefined,
   serversHistory: [],
@@ -108,29 +222,140 @@ export const getRandomUsername = (appConfig: AppConfig) => {
 
 export const appStorage = proxy({ ...defaultStorageData })
 
-// Restore data from localStorage
-for (const key of Object.keys(defaultStorageData)) {
-  const prefixedKey = `${localStoragePrefix}${key}`
-  const aliasedKey = oldKeysAliases[key]
-  const storedValue = localStorage.getItem(prefixedKey) ?? (aliasedKey ? localStorage.getItem(aliasedKey) : undefined)
-  if (storedValue) {
+// Check if cookie storage should be used (will be set by options)
+const shouldUseCookieStorage = () => {
+  const isSecureCookiesAvailable = () => {
+    // either https or localhost
+    return window.location.protocol === 'https:' || window.location.hostname === 'localhost'
+  }
+  if (!isSecureCookiesAvailable()) {
+    return false
+  }
+
+  const localStorageValue = localStorage.getItem(`${localStoragePrefix}cookieStorage`)
+  if (localStorageValue === null) {
+    return appStorage.cookieStorage === true
+  }
+  return localStorageValue === 'true'
+}
+
+// Restore data from storage with conflict detection
+const restoreStorageData = () => {
+  const useCookieStorage = shouldUseCookieStorage()
+
+  if (useCookieStorage) {
+    // Detect conflicts first
+    storageConflicts = detectStorageConflicts()
+
+    if (storageConflicts.length > 0) {
+      // Show conflict resolution modal
+      showStorageConflictModal()
+      return // Don't restore data until conflict is resolved
+    }
+  }
+
+  for (const key of Object.keys(defaultStorageData)) {
+    const typedKey = key
+    const prefixedKey = `${localStoragePrefix}${key}`
+    const aliasedKey = oldKeysAliases[typedKey]
+
+    let storedValue: string | null = null
+    let cookieValueCanBeUsed = false
+    let usingLocalStorageValue = false
+
+    // Try cookie storage first if enabled and key is in cookieStoreKeys
+    if (useCookieStorage && cookieStoreKeys.includes(typedKey)) {
+      storedValue = getCookieValue(key)
+      cookieValueCanBeUsed = true
+    }
+
+    // Fallback to localStorage if no cookie value found
+    if (storedValue === null) {
+      storedValue = localStorage.getItem(prefixedKey) ?? (aliasedKey ? localStorage.getItem(aliasedKey) : null)
+      usingLocalStorageValue = true
+    }
+
+    if (storedValue) {
+      try {
+        let parsed = JSON.parse(storedValue)
+
+        // Handle timestamped data
+        if (parsed && typeof parsed === 'object' && parsed.timestamp) {
+          delete parsed.timestamp
+          // If it was a wrapped primitive, unwrap it
+          if ('data' in parsed && Object.keys(parsed).length === 1) {
+            parsed = parsed.data
+          }
+        }
+
+        appStorage[typedKey] = parsed
+
+        if (usingLocalStorageValue && cookieValueCanBeUsed) {
+          // migrate localStorage to cookie
+          saveKey(key)
+          markLocalStorageAsMigrated(key)
+        }
+      } catch (e) {
+        console.error(`Failed to parse stored value for ${key}:`, e)
+      }
+    }
+  }
+}
+
+const markLocalStorageAsMigrated = (key: keyof StorageData) => {
+  const localStorageKey = `${localStoragePrefix}${key}`
+  if (migrateRemoveLocalStorage) {
+    localStorage.removeItem(localStorageKey)
+    return
+  }
+
+  const data = localStorage.getItem(localStorageKey)
+  if (data) {
     try {
-      const parsed = JSON.parse(storedValue)
-      // appStorage[key] = parsed && typeof parsed === 'object' ? ref(parsed) : parsed
-      appStorage[key] = parsed
-    } catch (e) {
-      console.error(`Failed to parse stored value for ${key}:`, e)
+      localStorage.setItem(localStorageKey, JSON.stringify({ ...JSON.parse(data), migrated: Date.now() }))
+    } catch (err) {
     }
   }
 }
 
 const saveKey = (key: keyof StorageData) => {
+  const useCookieStorage = shouldUseCookieStorage()
   const prefixedKey = `${localStoragePrefix}${key}`
   const value = appStorage[key]
-  if (value === undefined) {
-    localStorage.removeItem(prefixedKey)
-  } else {
-    localStorage.setItem(prefixedKey, JSON.stringify(value))
+
+  const dataToSave = value === undefined ? undefined : (
+    value && typeof value === 'object' && !Array.isArray(value)
+      ? { ...value, timestamp: Date.now() }
+      : { data: value, timestamp: Date.now() }
+  )
+
+  const serialized = dataToSave === undefined ? undefined : JSON.stringify(dataToSave)
+
+  let useLocalStorage = true
+  // Save to cookie if enabled and key is in cookieStoreKeys
+  if (useCookieStorage && cookieStoreKeys.includes(key)) {
+    useLocalStorage = false
+    if (serialized === undefined) {
+      deleteCookie(key)
+    } else {
+      const success = setCookieValue(key, serialized)
+      if (success) {
+        // Remove from localStorage if cookie save was successful
+        markLocalStorageAsMigrated(key)
+      } else {
+        // Disabling for now so no confusing conflicts modal after page reload
+        // useLocalStorage = true
+      }
+    }
+  }
+
+  if (useLocalStorage) {
+    // Save to localStorage
+    if (value === undefined) {
+      localStorage.removeItem(prefixedKey)
+    } else {
+      localStorage.setItem(prefixedKey, JSON.stringify(value))
+    }
   }
 }
 
@@ -141,7 +366,6 @@ subscribe(appStorage, (ops) => {
     saveKey(key as keyof StorageData)
   }
 })
-// Subscribe to changes and save to localStorage
 
 export const resetAppStorage = () => {
   for (const key of Object.keys(appStorage)) {
@@ -153,6 +377,38 @@ export const resetAppStorage = () => {
       localStorage.removeItem(key)
     }
   }
+
+  if (!shouldUseCookieStorage()) return
+  const shouldContinue = window.confirm(`Removing all synced cookies will remove all data from all ${topLevelDomain} subdomains websites. Continue?`)
+  if (!shouldContinue) return
+
+  // Clear cookies
+  for (const key of cookieStoreKeys) {
+    deleteCookie(key)
+  }
 }
 
+// Export functions for conflict resolution
+export const resolveStorageConflicts = (useLocalStorage: boolean) => {
+  if (useLocalStorage) {
+    // Disable cookie storage and use localStorage data
+    appStorage.cookieStorage = false
+  } else {
+    // Remove localStorage data and continue using cookie storage
+    for (const conflict of storageConflicts) {
+      const prefixedKey = `${localStoragePrefix}${conflict.key}`
+      localStorage.removeItem(prefixedKey)
+    }
+  }
+
+  // Clear conflicts and restore data
+  storageConflicts = []
+  restoreStorageData()
+}
+
+export const getStorageConflicts = () => storageConflicts
+
 migrateLegacyData()
+
+// Restore data after checking for conflicts
+restoreStorageData()
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 8e94b35d..59ed9124 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -65,6 +65,7 @@ import RendererDebugMenu from './react/RendererDebugMenu'
 import CreditsAboutModal from './react/CreditsAboutModal'
 import GlobalOverlayHints from './react/GlobalOverlayHints'
 import FullscreenTime from './react/FullscreenTime'
+import StorageConflictModal from './react/StorageConflictModal'
 
 const isFirefox = ua.getBrowser().name === 'Firefox'
 if (isFirefox) {
@@ -247,6 +248,7 @@ const App = () => {
 
             <SelectOption />
             <CreditsAboutModal />
+            <StorageConflictModal />
             <NoModalFoundProvider />
           </RobustPortal>
           <RobustPortal to={document.body}>

From af5a0b2835312945ea251014ba231977070bb70a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 27 Jun 2025 16:50:44 +0300
Subject: [PATCH 003/136] fix: fix camera desync updates in 3rd view and
 starfield

---
 renderer/viewer/lib/worldrendererCommon.ts  |  6 +--
 renderer/viewer/three/entities.ts           |  2 +-
 renderer/viewer/three/worldrendererThree.ts | 47 +++++++++++++++++----
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index dfa4f43b..4441201c 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -106,7 +106,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   }>
   customTexturesDataUrl = undefined as string | undefined
   workers: any[] = []
-  viewerPosition?: Vec3
+  viewerChunkPosition?: Vec3
   lastCamUpdate = 0
   droppedFpsPercentage = 0
   initialChunkLoadWasStartedIn: number | undefined
@@ -499,7 +499,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   timeUpdated? (newTime: number): void
 
   updateViewerPosition (pos: Vec3) {
-    this.viewerPosition = pos
+    this.viewerChunkPosition = pos
     for (const [key, value] of Object.entries(this.loadedChunks)) {
       if (!value) continue
       this.updatePosDataChunk?.(key)
@@ -513,7 +513,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   }
 
   getDistance (posAbsolute: Vec3) {
-    const [botX, botZ] = chunkPos(this.viewerPosition!)
+    const [botX, botZ] = chunkPos(this.viewerChunkPosition!)
     const dx = Math.abs(botX - Math.floor(posAbsolute.x / 16))
     const dz = Math.abs(botZ - Math.floor(posAbsolute.z / 16))
     return [dx, dz] as [number, number]
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index fea7f710..b4de4f1b 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -344,7 +344,7 @@ export class Entities {
     }
 
     const dt = this.clock.getDelta()
-    const botPos = this.worldRenderer.viewerPosition
+    const botPos = this.worldRenderer.viewerChunkPosition
     const VISIBLE_DISTANCE = 10 * 10
 
     // Update regular entities
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index b4ae4961..c4482052 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -88,7 +88,7 @@ export class WorldRendererThree extends WorldRendererCommon {
 
     this.renderer = renderer
     displayOptions.rendererState.renderer = WorldRendererThree.getRendererInfo(renderer) ?? '...'
-    this.starField = new StarField(this.scene)
+    this.starField = new StarField(this)
     this.cursorBlock = new CursorBlock(this)
     this.holdingBlock = new HoldingBlock(this)
     this.holdingBlockLeft = new HoldingBlock(this, true)
@@ -318,10 +318,11 @@ export class WorldRendererThree extends WorldRendererCommon {
     section.renderOrder = 500 - chunkDistance
   }
 
-  updateViewerPosition (pos: Vec3): void {
-    this.viewerPosition = pos
-    const cameraPos = this.cameraObject.position.toArray().map(x => Math.floor(x / 16)) as [number, number, number]
-    this.cameraSectionPos = new Vec3(...cameraPos)
+  override updateViewerPosition (pos: Vec3): void {
+    this.viewerChunkPosition = pos
+  }
+
+  cameraSectionPositionUpdate () {
     // eslint-disable-next-line guard-for-in
     for (const key in this.sectionObjects) {
       const value = this.sectionObjects[key]
@@ -447,11 +448,35 @@ export class WorldRendererThree extends WorldRendererCommon {
     return tex
   }
 
+  getCameraPosition () {
+    const worldPos = new THREE.Vector3()
+    this.camera.getWorldPosition(worldPos)
+    return worldPos
+  }
+
+  getWorldCameraPosition () {
+    const pos = this.getCameraPosition()
+    return new Vec3(
+      Math.floor(pos.x / 16),
+      Math.floor(pos.y / 16),
+      Math.floor(pos.z / 16)
+    )
+  }
+
+  updateCameraSectionPos () {
+    const newSectionPos = this.getWorldCameraPosition()
+    if (!this.cameraSectionPos.equals(newSectionPos)) {
+      this.cameraSectionPos = newSectionPos
+      this.cameraSectionPositionUpdate()
+    }
+  }
+
   setFirstPersonCamera (pos: Vec3 | null, yaw: number, pitch: number) {
     const yOffset = this.playerStateReactive.eyeHeight
 
     this.updateCamera(pos?.offset(0, yOffset, 0) ?? null, yaw, pitch)
     this.media.tryIntersectMedia()
+    this.updateCameraSectionPos()
   }
 
   getThirdPersonCamera (pos: THREE.Vector3 | null, yaw: number, pitch: number) {
@@ -636,6 +661,8 @@ export class WorldRendererThree extends WorldRendererCommon {
         }
       }
     }
+
+    this.updateCameraSectionPos()
   }
 
   debugChunksVisibilityOverride () {
@@ -988,7 +1015,9 @@ class StarField {
     }
   }
 
-  constructor (private readonly scene: THREE.Scene) {
+  constructor (
+    private readonly worldRenderer: WorldRendererThree
+  ) {
   }
 
   addToScene () {
@@ -1030,11 +1059,11 @@ class StarField {
 
     // Create points and add them to the scene
     this.points = new THREE.Points(geometry, material)
-    this.scene.add(this.points)
+    this.worldRenderer.scene.add(this.points)
 
     const clock = new THREE.Clock()
     this.points.onBeforeRender = (renderer, scene, camera) => {
-      this.points?.position.copy?.(camera.position)
+      this.points?.position.copy?.(this.worldRenderer.getCameraPosition())
       material.uniforms.time.value = clock.getElapsedTime() * speed
     }
     this.points.renderOrder = -1
@@ -1044,7 +1073,7 @@ class StarField {
     if (this.points) {
       this.points.geometry.dispose();
       (this.points.material as THREE.Material).dispose()
-      this.scene.remove(this.points)
+      this.worldRenderer.scene.remove(this.points)
 
       this.points = undefined
     }

From 83d783226fb2c726aac107b0c3c6b0b59727bdfc Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 27 Jun 2025 18:08:03 +0300
Subject: [PATCH 004/136] fix migration marking

---
 src/react/appStorageProvider.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/react/appStorageProvider.ts b/src/react/appStorageProvider.ts
index bee8e408..a9bac660 100644
--- a/src/react/appStorageProvider.ts
+++ b/src/react/appStorageProvider.ts
@@ -312,7 +312,12 @@ const markLocalStorageAsMigrated = (key: keyof StorageData) => {
   const data = localStorage.getItem(localStorageKey)
   if (data) {
     try {
-      localStorage.setItem(localStorageKey, JSON.stringify({ ...JSON.parse(data), migrated: Date.now() }))
+      const parsed = JSON.parse(data)
+      localStorage.setItem(
+        localStorageKey, JSON.stringify(typeof parsed === 'object' ? {
+          ...parsed, migrated: Date.now()
+        } : { data: parsed, migrated: Date.now() })
+      )
     } catch (err) {
     }
   }

From 3336680a0ee5d8b3f5bc030388de19f57c17373c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 27 Jun 2025 18:08:33 +0300
Subject: [PATCH 005/136] fix z index of modal

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

diff --git a/src/react/StorageConflictModal.tsx b/src/react/StorageConflictModal.tsx
index 9e20ca2d..0b4224f3 100644
--- a/src/react/StorageConflictModal.tsx
+++ b/src/react/StorageConflictModal.tsx
@@ -32,7 +32,8 @@ export default () => {
         margin: '10px',
         color: '#FFFFFF',
         fontFamily: 'minecraft, monospace',
-        textAlign: 'center'
+        textAlign: 'center',
+        zIndex: 1000,
       }}>
         <div style={{
           fontSize: '16px',

From 0e4435ef911a6160037dcdb970bcd3ee48a3fccb Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 27 Jun 2025 22:06:10 +0300
Subject: [PATCH 006/136] feat: add support for /ping command, fix chat fading!

---
 src/react/Chat.css                 | 11 ++++---
 src/react/Chat.tsx                 | 47 +++++++++++++++++-------------
 src/react/ChatProvider.tsx         | 23 +++++++++++----
 src/react/StorageConflictModal.tsx |  3 ++
 src/react/appStorageProvider.ts    | 15 ++--------
 src/reactUi.tsx                    |  2 +-
 6 files changed, 55 insertions(+), 46 deletions(-)

diff --git a/src/react/Chat.css b/src/react/Chat.css
index f1e92338..47394948 100644
--- a/src/react/Chat.css
+++ b/src/react/Chat.css
@@ -189,23 +189,22 @@ input[type=text],
   background-color: rgba(0, 0, 0, 0.5);
   list-style: none;
   overflow-wrap: break-word;
-}
-
-.chat-message-fadeout {
   opacity: 1;
-  transition: all 3s;
 }
 
-.chat-message-fade {
+.chat-message-fading {
   opacity: 0;
+  transition: opacity 3s ease-in-out;
 }
 
 .chat-message-faded {
-  transition: none !important;
+  display: none;
 }
 
+/* Ensure messages are always visible when chat is open */
 .chat.opened .chat-message {
   opacity: 1 !important;
+  display: block !important;
   transition: none !important;
 }
 
diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index 41a6cb6f..7c1c8633 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -11,19 +11,37 @@ import { useScrollBehavior } from './hooks/useScrollBehavior'
 export type Message = {
   parts: MessageFormatPart[],
   id: number
-  fading?: boolean
-  faded?: boolean
+  timestamp?: number
 }
 
-const MessageLine = ({ message, currentPlayerName }: { message: Message, currentPlayerName?: string }) => {
+const MessageLine = ({ message, currentPlayerName, chatOpened }: { message: Message, currentPlayerName?: string, chatOpened?: boolean }) => {
+  const [fadeState, setFadeState] = useState<'visible' | 'fading' | 'faded'>('visible')
+
+  useEffect(() => {
+    // Start fading after 5 seconds
+    const fadeTimeout = setTimeout(() => {
+      setFadeState('fading')
+    }, 5000)
+
+    // Remove after fade animation (3s) completes
+    const removeTimeout = setTimeout(() => {
+      setFadeState('faded')
+    }, 8000)
+
+    // Cleanup timeouts if component unmounts
+    return () => {
+      clearTimeout(fadeTimeout)
+      clearTimeout(removeTimeout)
+    }
+  }, []) // Empty deps array since we only want this to run once when message is added
+
   const classes = {
-    'chat-message-fadeout': message.fading,
-    'chat-message-fade': message.fading,
-    'chat-message-faded': message.faded,
-    'chat-message': true
+    'chat-message': true,
+    'chat-message-fading': !chatOpened && fadeState === 'fading',
+    'chat-message-faded': !chatOpened && fadeState === 'faded'
   }
 
-  return <li className={Object.entries(classes).filter(([, val]) => val).map(([name]) => name).join(' ')}>
+  return <li className={Object.entries(classes).filter(([, val]) => val).map(([name]) => name).join(' ')} data-time={message.timestamp ? new Date(message.timestamp).toLocaleString('en-US', { hour12: false }) : undefined}>
     {message.parts.map((msg, i) => {
       // Check if this is a text part that might contain a mention
       if (msg.text && currentPlayerName) {
@@ -70,17 +88,6 @@ export const chatInputValueGlobal = proxy({
   value: ''
 })
 
-export const fadeMessage = (message: Message, initialTimeout: boolean, requestUpdate: () => void) => {
-  setTimeout(() => {
-    message.fading = true
-    requestUpdate()
-    setTimeout(() => {
-      message.faded = true
-      requestUpdate()
-    }, 3000)
-  }, initialTimeout ? 5000 : 0)
-}
-
 export default ({
   messages,
   opacity = 1,
@@ -372,7 +379,7 @@ export default ({
             </div>
           )}
           {messages.map((m) => (
-            <MessageLine key={reactKeyForMessage(m)} message={m} currentPlayerName={playerNameValidated} />
+            <MessageLine key={reactKeyForMessage(m)} message={m} currentPlayerName={playerNameValidated} chatOpened={opened} />
           ))}
         </div> || undefined}
       </div>
diff --git a/src/react/ChatProvider.tsx b/src/react/ChatProvider.tsx
index 83691b83..0bb13285 100644
--- a/src/react/ChatProvider.tsx
+++ b/src/react/ChatProvider.tsx
@@ -5,7 +5,7 @@ import { getBuiltinCommandsList, tryHandleBuiltinCommand } from '../builtinComma
 import { gameAdditionalState, hideCurrentModal, miscUiState } from '../globalState'
 import { options } from '../optionsStorage'
 import { viewerVersionState } from '../viewerConnector'
-import Chat, { Message, fadeMessage } from './Chat'
+import Chat, { Message } from './Chat'
 import { useIsModalActive } from './utilsApp'
 import { hideNotification, notificationProxy, showNotification } from './NotificationProvider'
 import { getServerIndex, updateLoadedServerData } from './serversStorage'
@@ -16,6 +16,7 @@ export default () => {
   const [messages, setMessages] = useState([] as Message[])
   const isChatActive = useIsModalActive('chat')
   const lastMessageId = useRef(0)
+  const lastPingTime = useRef(0)
   const usingTouch = useSnapshot(miscUiState).currentTouch
   const { chatSelect, messagesLimit, chatOpacity, chatOpacityOpened, chatVanillaRestrictions, debugChatScroll, chatPingExtension } = useSnapshot(options)
   const isUsingMicrosoftAuth = useMemo(() => !!lastConnectOptions.value?.authenticatedAccount, [])
@@ -29,18 +30,23 @@ export default () => {
         jsonMsg = jsonMsg['unsigned']
       }
       const parts = formatMessage(jsonMsg)
+      const messageText = parts.map(part => part.text).join('')
+
+      // Handle ping response
+      if (messageText === 'Pong!' && lastPingTime.current > 0) {
+        const latency = Date.now() - lastPingTime.current
+        parts.push({ text: ` Latency: ${latency}ms`, color: '#00ff00' })
+        lastPingTime.current = 0
+      }
 
       setMessages(m => {
         lastMessageId.current++
         const newMessage: Message = {
           parts,
           id: lastMessageId.current,
-          faded: false,
+          timestamp: Date.now()
         }
-        fadeMessage(newMessage, true, () => {
-          // eslint-disable-next-line max-nested-callbacks
-          setMessages(m => [...m])
-        })
+
         return [...m, newMessage].slice(-messagesLimit)
       })
     })
@@ -61,6 +67,11 @@ export default () => {
       return players.filter(name => (!value || name.toLowerCase().includes(value.toLowerCase())) && name !== bot.username).map(name => `@${name}`)
     }}
     sendMessage={async (message) => {
+      // Record ping command time
+      if (message === '/ping') {
+        lastPingTime.current = Date.now()
+      }
+
       const builtinHandled = tryHandleBuiltinCommand(message)
       if (getServerIndex() !== undefined && (message.startsWith('/login') || message.startsWith('/register'))) {
         showNotification('Click here to save your password in browser for auto-login', undefined, false, undefined, () => {
diff --git a/src/react/StorageConflictModal.tsx b/src/react/StorageConflictModal.tsx
index 0b4224f3..ac78d90a 100644
--- a/src/react/StorageConflictModal.tsx
+++ b/src/react/StorageConflictModal.tsx
@@ -34,6 +34,9 @@ export default () => {
         fontFamily: 'minecraft, monospace',
         textAlign: 'center',
         zIndex: 1000,
+        position: 'fixed',
+        left: 0,
+        right: 0
       }}>
         <div style={{
           fontSize: '16px',
diff --git a/src/react/appStorageProvider.ts b/src/react/appStorageProvider.ts
index a9bac660..c65cc701 100644
--- a/src/react/appStorageProvider.ts
+++ b/src/react/appStorageProvider.ts
@@ -120,7 +120,7 @@ const detectStorageConflicts = (): StorageConflict[] => {
         const localParsed = JSON.parse(localStorageValue)
         const cookieParsed = JSON.parse(cookieValue)
 
-        if (localParsed?.migrated) {
+        if (localStorage.getItem(`${localStorageKey}:migrated`)) {
           continue
         }
 
@@ -309,18 +309,7 @@ const markLocalStorageAsMigrated = (key: keyof StorageData) => {
     return
   }
 
-  const data = localStorage.getItem(localStorageKey)
-  if (data) {
-    try {
-      const parsed = JSON.parse(data)
-      localStorage.setItem(
-        localStorageKey, JSON.stringify(typeof parsed === 'object' ? {
-          ...parsed, migrated: Date.now()
-        } : { data: parsed, migrated: Date.now() })
-      )
-    } catch (err) {
-    }
-  }
+  localStorage.setItem(`${localStorageKey}:migrated`, 'true')
 }
 
 const saveKey = (key: keyof StorageData) => {
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 59ed9124..b15cb79d 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -229,6 +229,7 @@ const App = () => {
             <div />
           </RobustPortal>
           <EnterFullscreenButton />
+          <StorageConflictModal />
           <InGameUi />
           <RobustPortal to={document.querySelector('#ui-root')}>
             <AllWidgets />
@@ -248,7 +249,6 @@ const App = () => {
 
             <SelectOption />
             <CreditsAboutModal />
-            <StorageConflictModal />
             <NoModalFoundProvider />
           </RobustPortal>
           <RobustPortal to={document.body}>

From e161426caf15a29439b4bc77987c3630b1733c6f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 27 Jun 2025 22:11:49 +0300
Subject: [PATCH 007/136] always dipslay close buttons from settings

---
 src/react/OptionsItems.tsx | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/react/OptionsItems.tsx b/src/react/OptionsItems.tsx
index 4759b3d7..32f99b9e 100644
--- a/src/react/OptionsItems.tsx
+++ b/src/react/OptionsItems.tsx
@@ -189,18 +189,16 @@ interface Props {
 }
 
 export default ({ items, title, backButtonAction }: Props) => {
-  const { currentTouch } = useSnapshot(miscUiState)
 
   return <Screen
     title={title}
   >
     <div className='screen-items'>
-      {currentTouch && (
-        <div style={{ position: 'fixed', marginLeft: '-30px', display: 'flex', flexDirection: 'column', gap: 1, }}>
-          <Button icon={pixelartIcons['close']} onClick={hideAllModals} style={{ color: '#ff5d5d', }} />
-          <Button icon={pixelartIcons['chevron-left']} onClick={backButtonAction} style={{ color: 'yellow', }} />
-        </div>
-      )}
+      <div style={{ position: 'fixed', marginLeft: '-30px', display: 'flex', flexDirection: 'column', gap: 1, }}>
+        <Button icon={pixelartIcons['close']} onClick={hideAllModals} style={{ color: '#ff5d5d', }} />
+        <Button icon={pixelartIcons['chevron-left']} onClick={backButtonAction} style={{ color: 'yellow', }} />
+      </div>
+
       {items.map((element, i) => {
         // make sure its unique!
         return <RenderOption key={element.id ?? `${title}-${i}`} item={element} />

From 369166e0942cf234d34f31b587c4a08424129b09 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 28 Jun 2025 00:45:54 +0300
Subject: [PATCH 008/136] fix tsc, up readme

---
 README.MD                  |  6 ++++--
 src/react/Chat.stories.tsx | 11 +----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/README.MD b/README.MD
index 4769192a..5f7a83f6 100644
--- a/README.MD
+++ b/README.MD
@@ -6,9 +6,11 @@ Minecraft **clone** rewritten in TypeScript using the best modern web technologi
 
 You can try this out at [mcraft.fun](https://mcraft.fun/), [pcm.gg](https://pcm.gg) (short link), [mcon.vercel.app](https://mcon.vercel.app/) or the GitHub pages deploy. Every commit from the default (`develop`) branch is deployed to [s.mcraft.fun](https://s.mcraft.fun/) and [s.pcm.gg](https://s.pcm.gg/) - so it's usually newer, but might be less stable.
 
-Don't confuse with [Eaglercraft](https://git.eaglercraft.rip/eaglercraft/eaglercraft-1.8) which is a REAL vanilla Minecraft Java edition port to the web (but with its own limitations). Eaglercraft is a fully playable solution, but this project is more in position of a "technical demo" to show how it's possible to build games for web at scale entirely with the JS ecosystem. Have fun!
+> For Turkey/Russia use [ru.mcraft.fun](https://ru.mcraft.fun/) (since Cloudflare is blocked)
 
-For building the project yourself / contributing, see [Development, Debugging & Contributing](#development-debugging--contributing). For reference at what and how web technologies / frameworks are used, see [TECH.md](./TECH.md).
+Don't confuse with [Eaglercraft](https://git.eaglercraft.rip/eaglercraft/eaglercraft-1.8) which is a REAL vanilla Minecraft Java edition port to the web (but with its own limitations). Eaglercraft is a fully playable solution, meanwhile this project is aimed for *device-compatiiblity* and better performance so it feels portable, flexible and lightweight. It's also a very strong example on how to build true HTML games for the web at scale entirely with the JS ecosystem. Have fun!
+
+For building the project yourself / contributing, see [Development, Debugging & Contributing](#development-debugging--contributing). For reference at what and how web technologies / frameworks are used, see [TECH.md](./TECH.md) (also for comparison with Eaglercraft).
 
 ### Big Features
 
diff --git a/src/react/Chat.stories.tsx b/src/react/Chat.stories.tsx
index 192d5cb4..e1aaf761 100644
--- a/src/react/Chat.stories.tsx
+++ b/src/react/Chat.stories.tsx
@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'
 
 import { useEffect, useState } from 'react'
 import { formatMessage } from '../chatUtils'
-import Chat, { fadeMessage, chatInputValueGlobal } from './Chat'
+import Chat, { chatInputValueGlobal } from './Chat'
 import Button from './Button'
 
 window.spamMessage = window.spamMessage ?? ''
@@ -63,14 +63,6 @@ const meta: Meta<typeof Chat> = {
       return () => clearInterval(interval)
     }, [autoSpam])
 
-    const fadeMessages = () => {
-      for (const m of messages) {
-        fadeMessage(m, false, () => {
-          setMessages([...messages])
-        })
-      }
-    }
-
     return <div style={{
       marginTop: args.usingTouch ? 100 : 0
     }}
@@ -88,7 +80,6 @@ const meta: Meta<typeof Chat> = {
         }}
       />
       <Button onClick={() => setOpen(s => !s)}>Open: {open ? 'on' : 'off'}</Button>
-      <Button onClick={() => fadeMessages()}>Fade</Button>
       <Button onClick={() => setAutoSpam(s => !s)}>Auto Spam: {autoSpam ? 'on' : 'off'}</Button>
       <Button onClick={() => setMessages(args.messages)}>Reset</Button>
     </div>

From fec887c28da80e2f50e28412ae81b89b2c6a76bf Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 29 Jun 2025 00:56:37 +0300
Subject: [PATCH 009/136] deeply stringify gui items to avoid futher
 modifications

---
 pnpm-lock.yaml          | 26 +++++++++++++-------------
 src/inventoryWindows.ts | 13 +++++++++++--
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fbdf89ac..a034c919 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/45f29f9fd1ad6d43d76bbd0b196f2ed4e675772b(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d(encoding@0.1.13))
       minecraft-data:
         specifier: 3.89.0
         version: 3.89.0
@@ -338,10 +338,10 @@ importers:
         version: 0.2.59
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
-        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f425e6a2db796d42cd2c09cf715dad841dec643d(@types/react@18.3.18)(react@18.3.1)
+        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379(@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/45f29f9fd1ad6d43d76bbd0b196f2ed4e675772b(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d(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)
@@ -6705,8 +6705,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/f425e6a2db796d42cd2c09cf715dad841dec643d:
-    resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f425e6a2db796d42cd2c09cf715dad841dec643d}
+  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379:
+    resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379}
     version: 1.0.1
 
   minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284:
@@ -6736,8 +6736,8 @@ packages:
     resolution: {integrity: sha512-3bxph4jfbkBh5HpeouorxzrfSLNV+i+1gugNJ2jf52HW+rt+tW7eiiFPxrJEsOVkPT/3O/dEIW7j93LRlojMkQ==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/45f29f9fd1ad6d43d76bbd0b196f2ed4e675772b:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/45f29f9fd1ad6d43d76bbd0b196f2ed4e675772b}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d}
     version: 4.27.0
     engines: {node: '>=22'}
 
@@ -13346,7 +13346,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
@@ -16285,7 +16285,7 @@ snapshots:
   https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
     transitivePeerDependencies:
       - supports-color
     optional: true
@@ -17127,12 +17127,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/45f29f9fd1ad6d43d76bbd0b196f2ed4e675772b(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d(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=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/45f29f9fd1ad6d43d76bbd0b196f2ed4e675772b(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17443,7 +17443,7 @@ snapshots:
 
   minecraft-folder-path@1.2.0: {}
 
-  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f425e6a2db796d42cd2c09cf715dad841dec643d(@types/react@18.3.18)(react@18.3.1):
+  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379(@types/react@18.3.18)(react@18.3.1):
     dependencies:
       valtio: 1.13.2(@types/react@18.3.18)(react@18.3.1)
     transitivePeerDependencies:
@@ -17569,7 +17569,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/45f29f9fd1ad6d43d76bbd0b196f2ed4e675772b(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.89.0
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 05426d15..01d1691d 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -159,7 +159,9 @@ const getImage = ({ path = undefined as string | undefined, texture = undefined
   if (image) {
     return image
   }
-  if (!path && !texture) throw new Error('Either pass path or texture')
+  if (!path && !texture) {
+    throw new Error('Either pass path or texture')
+  }
   const loadPath = (blockData ? 'blocks' : path ?? texture)!
   if (loadedImagesCache.has(loadPath)) {
     onLoad()
@@ -201,6 +203,11 @@ const itemToVisualKey = (slot: RenderItem | Item | null) => {
   ].join('|')
   return keys
 }
+const validateSlot = (slot: any, index: number) => {
+  if (!slot.texture) {
+    throw new Error(`Slot has no texture: ${index} ${slot.name}`)
+  }
+}
 const mapSlots = (slots: Array<RenderItem | Item | null>, isJei = false) => {
   const newSlots = slots.map((slot, i) => {
     if (!slot) return null
@@ -210,6 +217,7 @@ const mapSlots = (slots: Array<RenderItem | Item | null>, isJei = false) => {
       const newKey = itemToVisualKey(slot)
       slot['cacheKey'] = i + '|' + newKey
       if (oldKey && oldKey === newKey) {
+        validateSlot(lastMappedSlots[i], i)
         return lastMappedSlots[i]
       }
     }
@@ -228,12 +236,13 @@ const mapSlots = (slots: Array<RenderItem | Item | null>, isJei = false) => {
         const { icon, ...rest } = slot
         return rest
       }
+      validateSlot(slot, i)
     } catch (err) {
       inGameError(err)
     }
     return slot
   })
-  lastMappedSlots = newSlots
+  lastMappedSlots = JSON.parse(JSON.stringify(newSlots))
   return newSlots
 }
 

From 34eecc166f9a39cc5438b649e9c972e51c0490ee Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 29 Jun 2025 02:38:19 +0300
Subject: [PATCH 010/136] feat: rework singleplayer generators types. now any
 generator can be used internally. add a few

---
 package.json                      |  2 +-
 pnpm-lock.yaml                    | 10 +++++-----
 src/loadSave.ts                   | 21 ---------------------
 src/react/CreateWorld.tsx         |  2 +-
 src/react/CreateWorldProvider.tsx | 22 +++-------------------
 src/sounds/botSoundSystem.ts      |  1 +
 6 files changed, 11 insertions(+), 47 deletions(-)

diff --git a/package.json b/package.json
index 25cce1a5..516d57f3 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "esbuild-plugin-polyfill-node": "^0.3.0",
     "express": "^4.18.2",
     "filesize": "^10.0.12",
-    "flying-squid": "npm:@zardoy/flying-squid@^0.0.59",
+    "flying-squid": "npm:@zardoy/flying-squid@^0.0.62",
     "framer-motion": "^12.9.2",
     "fs-extra": "^11.1.1",
     "google-drive-browserfs": "github:zardoy/browserfs#google-drive",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a034c919..f954791a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -117,8 +117,8 @@ importers:
         specifier: ^10.0.12
         version: 10.1.6
       flying-squid:
-        specifier: npm:@zardoy/flying-squid@^0.0.59
-        version: '@zardoy/flying-squid@0.0.59(encoding@0.1.13)'
+        specifier: npm:@zardoy/flying-squid@^0.0.62
+        version: '@zardoy/flying-squid@0.0.62(encoding@0.1.13)'
       framer-motion:
         specifier: ^12.9.2
         version: 12.9.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -3410,8 +3410,8 @@ packages:
     engines: {node: '>=8'}
     hasBin: true
 
-  '@zardoy/flying-squid@0.0.59':
-    resolution: {integrity: sha512-Ztrmv127csGovqJEWEtT19y1wGEB5tIVfneQ3+p/TirP/bTGYpLlW+Ns4sSAc4KrewUP9PW/6L0AtB69CWhQFQ==}
+  '@zardoy/flying-squid@0.0.62':
+    resolution: {integrity: sha512-M6icydO/yrmwevBhmgKcqEPC63AhWfU/Es9N/uadVrmKaxGm2FQMMLcybbutRYm1xZ6qsdxDUOUZnN56PsVwfQ==}
     engines: {node: '>=8'}
     hasBin: true
 
@@ -13249,7 +13249,7 @@ snapshots:
       - encoding
       - supports-color
 
-  '@zardoy/flying-squid@0.0.59(encoding@0.1.13)':
+  '@zardoy/flying-squid@0.0.62(encoding@0.1.13)':
     dependencies:
       '@tootallnate/once': 2.0.0
       chalk: 5.4.1
diff --git a/src/loadSave.ts b/src/loadSave.ts
index 7c9f7277..f1676cff 100644
--- a/src/loadSave.ts
+++ b/src/loadSave.ts
@@ -85,7 +85,6 @@ export const loadSave = async (root = '/world', connectOptions?: Partial<Connect
   }
 
   let version: string | undefined | null
-  let isFlat = false
   if (levelDat) {
     version = appQueryParams.mapVersion ?? levelDat.Version?.Name
     if (!version) {
@@ -103,21 +102,6 @@ export const loadSave = async (root = '/world', connectOptions?: Partial<Connect
       version = prompt(`Version ${version} is not supported, supported versions are ${supportedVersions.join(', ')}, what try to use instead?`, lowerBound ? firstSupportedVersion : lastSupportedVersion)
       if (!version) return
     }
-    if (levelDat.WorldGenSettings) {
-      for (const [key, value] of Object.entries(levelDat.WorldGenSettings.dimensions)) {
-        if (key.slice(10) === 'overworld') {
-          if (value.generator.type === 'flat') isFlat = true
-          break
-        }
-      }
-    }
-
-    if (levelDat.generatorName) {
-      isFlat = levelDat.generatorName === 'flat'
-    }
-    if (!isFlat && levelDat.generatorName !== 'default' && levelDat.generatorName !== 'customized') {
-      // warnings.push(`Generator ${levelDat.generatorName} may not be supported yet, be careful of new chunks writes`)
-    }
 
     const playerUuid = nameToMcOfflineUUID(options.localUsername)
     const playerDatPath = `${root}/playerdata/${playerUuid}.dat`
@@ -188,11 +172,6 @@ export const loadSave = async (root = '/world', connectOptions?: Partial<Connect
     // todo check gamemode level.dat data etc
     detail: {
       version,
-      ...isFlat ? {
-        generation: {
-          name: 'superflat'
-        }
-      } : {},
       ...root === '/world' ? {} : {
         'worldFolder': root
       },
diff --git a/src/react/CreateWorld.tsx b/src/react/CreateWorld.tsx
index 32e67ddb..4cdf186d 100644
--- a/src/react/CreateWorld.tsx
+++ b/src/react/CreateWorld.tsx
@@ -11,7 +11,7 @@ import styles from './createWorld.module.css'
 import { InputOption, showInputsModal, showOptionsModal } from './SelectOption'
 
 // const worldTypes = ['default', 'flat', 'largeBiomes', 'amplified', 'customized', 'buffet', 'debug_all_block_states']
-const worldTypes = ['default', 'flat'/* , 'void' */]
+const worldTypes = ['default', 'flat', 'empty', 'nether', 'all_the_blocks']
 const gameModes = ['survival', 'creative'/* , 'adventure', 'spectator' */]
 
 export const creatingWorldState = proxy({
diff --git a/src/react/CreateWorldProvider.tsx b/src/react/CreateWorldProvider.tsx
index 6872474d..619a31f5 100644
--- a/src/react/CreateWorldProvider.tsx
+++ b/src/react/CreateWorldProvider.tsx
@@ -32,30 +32,14 @@ export default () => {
         const savePath = await uniqueFileNameFromWorldName(title, getWorldsPath())
         await mkdirRecursive(savePath)
         await loadPluginsIntoWorld(savePath, plugins)
-        let generation
-        if (type === 'flat') {
-          generation = {
-            name: 'superflat',
-          }
-        }
-        if (type === 'void') {
-          generation = {
-            name: 'superflat',
-            layers: [],
-            noDefaults: true
-          }
-        }
-        if (type === 'nether') {
-          generation = {
-            name: 'nether'
-          }
-        }
         hideCurrentModal()
         window.dispatchEvent(new CustomEvent('singleplayer', {
           detail: {
             levelName: title,
             version,
-            generation,
+            generation: {
+              name: type
+            },
             'worldFolder': savePath,
             gameMode: gameMode === 'survival' ? 0 : 1,
           },
diff --git a/src/sounds/botSoundSystem.ts b/src/sounds/botSoundSystem.ts
index 225aa345..0e23a98a 100644
--- a/src/sounds/botSoundSystem.ts
+++ b/src/sounds/botSoundSystem.ts
@@ -136,6 +136,7 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
   let lastStepSound = 0
   const movementHappening = async () => {
     if (!bot.entity || !soundMap) return // no info yet
+    if (appViewer.playerState.reactive.gameMode === 'spectator') return // Don't play step sounds in spectator mode
     const VELOCITY_THRESHOLD = 0.1
     const RUN_THRESHOLD = 0.15
     const { x, z, y } = bot.entity.velocity

From 6eae7136ecc9251ea41510a5b101d46372bad0a2 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 29 Jun 2025 15:34:25 +0300
Subject: [PATCH 011/136] fix storage conflict modal

---
 src/react/StorageConflictModal.tsx | 6 +++++-
 src/react/appStorageProvider.ts    | 9 ++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/react/StorageConflictModal.tsx b/src/react/StorageConflictModal.tsx
index ac78d90a..85affa7a 100644
--- a/src/react/StorageConflictModal.tsx
+++ b/src/react/StorageConflictModal.tsx
@@ -16,10 +16,14 @@ export default () => {
 
   if (!isModalActive/*  || conflicts.length === 0 */) return null
 
+  const clampText = (text: string) => {
+    return text.length > 30 ? text.slice(0, 30) + '...' : text
+  }
+
   const conflictText = conflicts.map(conflict => {
     const localTime = formatTimestamp(conflict.localStorageTimestamp)
     const cookieTime = formatTimestamp(conflict.cookieTimestamp)
-    return `${conflict.key}: LocalStorage (${localTime}) vs Cookie (${cookieTime})`
+    return `${conflict.key}: LocalStorage (${localTime}, ${clampText(conflict.localStorageValue)}) vs Cookie (${cookieTime}, ${clampText(conflict.cookieValue)})`
   }).join('\n')
 
   return (
diff --git a/src/react/appStorageProvider.ts b/src/react/appStorageProvider.ts
index c65cc701..e36d43cf 100644
--- a/src/react/appStorageProvider.ts
+++ b/src/react/appStorageProvider.ts
@@ -134,7 +134,14 @@ const detectStorageConflicts = (): StorageConflict[] => {
         delete localData.timestamp
         delete cookieData.timestamp
 
-        if (JSON.stringify(localData) !== JSON.stringify(cookieData)) {
+        const isDataEmpty = (data: any) => {
+          if (typeof data === 'object' && data !== null) {
+            return Object.keys(data).length === 0
+          }
+          return !data && data !== 0 && data !== false
+        }
+
+        if (JSON.stringify(localData) !== JSON.stringify(cookieData) && !isDataEmpty(localData) && !isDataEmpty(cookieData)) {
           conflicts.push({
             key,
             localStorageValue: localData,

From f2a11d0a73ab42de75509e76edc004483adb0a34 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sun, 29 Jun 2025 20:44:58 +0300
Subject: [PATCH 012/136] Steingify if needed

---
 src/react/StorageConflictModal.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/react/StorageConflictModal.tsx b/src/react/StorageConflictModal.tsx
index 85affa7a..966292d5 100644
--- a/src/react/StorageConflictModal.tsx
+++ b/src/react/StorageConflictModal.tsx
@@ -17,6 +17,7 @@ export default () => {
   if (!isModalActive/*  || conflicts.length === 0 */) return null
 
   const clampText = (text: string) => {
+    if (typeof text !== "string") text = JSON.stringify(text)
     return text.length > 30 ? text.slice(0, 30) + '...' : text
   }
 

From 31b91e5a335383ffe95838a038fb194d4f47288a Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Mon, 30 Jun 2025 02:06:45 +0300
Subject: [PATCH 013/136] add logging to sw unregistration on error

---
 index.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 5a6318ec..371e22b1 100644
--- a/index.html
+++ b/index.html
@@ -49,9 +49,13 @@
               if (window.navigator.maxTouchPoints > 1) window.location.hash = '#dev' // show eruda
               // unregister all sw
               if (window.navigator.serviceWorker) {
+                console.log('got worker')
                 window.navigator.serviceWorker.getRegistrations().then(registrations => {
                   registrations.forEach(registration => {
-                    registration.unregister()
+                    console.log('got registration')
+                    registration.unregister().then(() => {
+                      console.log('worker unregistered')
+                    })
                   })
                 })
               }

From dc2c5a2d88c3ba006645331b4603e8585e811866 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 30 Jun 2025 19:11:59 +0300
Subject: [PATCH 014/136] fix: make it run on ios 15!

---
 index.html                         | 15 ++++++++++++
 patches/pixelarticons@1.8.1.patch  |  7 +++---
 pnpm-lock.yaml                     | 38 +++++++++++++++---------------
 renderer/viewer/lib/utils/skins.ts | 14 +++++++++--
 renderer/viewer/three/entities.ts  |  6 ++---
 rsbuild.config.ts                  | 16 +++++++++++++
 src/react/StorageConflictModal.tsx |  2 +-
 7 files changed, 70 insertions(+), 28 deletions(-)

diff --git a/index.html b/index.html
index 371e22b1..6471c495 100644
--- a/index.html
+++ b/index.html
@@ -27,6 +27,7 @@
         <div style="font-size: var(--font-size);color: rgb(176, 176, 176);margin-top: 3px;text-align: center" class="subtitle">A true Minecraft client in your browser!</div>
         <!-- small text pre -->
         <div style="font-size: calc(var(--font-size) * 0.6);color: rgb(150, 150, 150);margin-top: 3px;text-align: center;white-space: pre-line;" class="advanced-info"></div>
+        <div style="font-size: calc(var(--font-size) * 0.6);color: rgb(255, 100, 100);margin-top: 10px;text-align: center;display: none;" class="ios-warning">Only iOS 15+ is supported due to performance optimizations</div>
     </div>
 </div>
 `
@@ -36,6 +37,13 @@
           if (!window.pageLoaded) {
             document.documentElement.appendChild(loadingDivElem)
           }
+
+          // iOS version detection
+          const getIOSVersion = () => {
+            const match = navigator.userAgent.match(/OS (\d+)_(\d+)_?(\d+)?/);
+            return match ? parseInt(match[1], 10) : null;
+          }
+
           // load error handling
           const onError = (errorOrMessage, log = false) => {
             let message = errorOrMessage instanceof Error ? (errorOrMessage.stack ?? errorOrMessage.message) : errorOrMessage
@@ -46,6 +54,13 @@
               const [errorMessage, ...errorStack] = message.split('\n')
               document.querySelector('.initial-loader').querySelector('.subtitle').textContent = errorMessage
               document.querySelector('.initial-loader').querySelector('.advanced-info').textContent = errorStack.join('\n')
+
+              // Show iOS warning if applicable
+              const iosVersion = getIOSVersion();
+              if (iosVersion !== null && iosVersion < 15) {
+                document.querySelector('.initial-loader').querySelector('.ios-warning').style.display = 'block';
+              }
+
               if (window.navigator.maxTouchPoints > 1) window.location.hash = '#dev' // show eruda
               // unregister all sw
               if (window.navigator.serviceWorker) {
diff --git a/patches/pixelarticons@1.8.1.patch b/patches/pixelarticons@1.8.1.patch
index 10044536..b65b6f2b 100644
--- a/patches/pixelarticons@1.8.1.patch
+++ b/patches/pixelarticons@1.8.1.patch
@@ -1,5 +1,5 @@
 diff --git a/fonts/pixelart-icons-font.css b/fonts/pixelart-icons-font.css
-index 3b2ebe839370d96bf93ef5ca94a827f07e49378d..103ab4d6b9f3b5c9f41d1407e3cbf4ac392fbf41 100644
+index 3b2ebe839370d96bf93ef5ca94a827f07e49378d..4f8d76be2ca6e4ddc43c68d0a6f0f69979165ab4 100644
 --- a/fonts/pixelart-icons-font.css
 +++ b/fonts/pixelart-icons-font.css
 @@ -1,16 +1,13 @@
@@ -10,10 +10,11 @@ index 3b2ebe839370d96bf93ef5ca94a827f07e49378d..103ab4d6b9f3b5c9f41d1407e3cbf4ac
 +  src:
    url("pixelart-icons-font.woff2?t=1711815892278") format("woff2"),
    url("pixelart-icons-font.woff?t=1711815892278") format("woff"),
-   url('pixelart-icons-font.ttf?t=1711815892278') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
+-  url('pixelart-icons-font.ttf?t=1711815892278') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
 -  url('pixelart-icons-font.svg?t=1711815892278#pixelart-icons-font') format('svg'); /* iOS 4.1- */
++  url('pixelart-icons-font.ttf?t=1711815892278') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
  }
- 
+
  [class^="pixelart-icons-font-"], [class*=" pixelart-icons-font-"] {
    font-family: 'pixelart-icons-font' !important;
 -  font-size:24px;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f954791a..2a46908a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -28,7 +28,7 @@ patchedDependencies:
     hash: a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad
     path: patches/mineflayer-item-map-downloader@1.2.0.patch
   pixelarticons@1.8.1:
-    hash: d6a3d784047beba873565d1198bed425d9eb2de942e3fc8edac55f25473e4325
+    hash: 533230072bc402f425c86abd3d0356fe087b14cab2a254d93f419b083f2d8dfa
     path: patches/pixelarticons@1.8.1.patch
 
 importers:
@@ -136,13 +136,13 @@ 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/0380bed150fe03db4ac37f0194e0cee98356647d(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470(encoding@0.1.13))
       minecraft-data:
         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=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(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)
@@ -160,7 +160,7 @@ importers:
         version: 1.5.4
       pixelarticons:
         specifier: ^1.8.1
-        version: 1.8.1(patch_hash=d6a3d784047beba873565d1198bed425d9eb2de942e3fc8edac55f25473e4325)
+        version: 1.8.1(patch_hash=533230072bc402f425c86abd3d0356fe087b14cab2a254d93f419b083f2d8dfa)
       pretty-bytes:
         specifier: ^6.1.1
         version: 6.1.1
@@ -341,7 +341,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379(@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/0380bed150fe03db4ac37f0194e0cee98356647d(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470(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)
@@ -6709,8 +6709,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379}
     version: 1.0.1
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284:
-    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284}
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085:
+    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085}
     version: 1.57.0
     engines: {node: '>=22'}
 
@@ -6736,8 +6736,8 @@ packages:
     resolution: {integrity: sha512-3bxph4jfbkBh5HpeouorxzrfSLNV+i+1gugNJ2jf52HW+rt+tW7eiiFPxrJEsOVkPT/3O/dEIW7j93LRlojMkQ==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470}
     version: 4.27.0
     engines: {node: '>=22'}
 
@@ -13224,7 +13224,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.89.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13260,7 +13260,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.89.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -17127,12 +17127,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/0380bed150fe03db4ac37f0194e0cee98356647d(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470(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=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17450,7 +17450,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17549,7 +17549,7 @@ snapshots:
   mineflayer@4.27.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.89.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       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
@@ -17569,11 +17569,11 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470(encoding@0.1.13):
     dependencies:
       '@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=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       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
@@ -18263,7 +18263,7 @@ snapshots:
 
   pirates@4.0.6: {}
 
-  pixelarticons@1.8.1(patch_hash=d6a3d784047beba873565d1198bed425d9eb2de942e3fc8edac55f25473e4325): {}
+  pixelarticons@1.8.1(patch_hash=533230072bc402f425c86abd3d0356fe087b14cab2a254d93f419b083f2d8dfa): {}
 
   pixelmatch@4.0.2:
     dependencies:
diff --git a/renderer/viewer/lib/utils/skins.ts b/renderer/viewer/lib/utils/skins.ts
index e0c8c32e..de5a3675 100644
--- a/renderer/viewer/lib/utils/skins.ts
+++ b/renderer/viewer/lib/utils/skins.ts
@@ -16,12 +16,22 @@ export const loadThreeJsTextureFromUrlSync = (imageUrl: string) => {
   }
 }
 
+export const createCanvas = (width: number, height: number): OffscreenCanvas => {
+  if (typeof OffscreenCanvas !== 'undefined') {
+    return new OffscreenCanvas(width, height)
+  }
+  const canvas = document.createElement('canvas')
+  canvas.width = width
+  canvas.height = height
+  return canvas as unknown as OffscreenCanvas // todo-low
+}
+
 export const loadThreeJsTextureFromUrl = async (imageUrl: string) => {
   const loaded = new THREE.TextureLoader().loadAsync(imageUrl)
   return loaded
 }
 export const loadThreeJsTextureFromBitmap = (image: ImageBitmap) => {
-  const canvas = new OffscreenCanvas(image.width, image.height)
+  const canvas = createCanvas(image.width, image.height)
   const ctx = canvas.getContext('2d')!
   ctx.drawImage(image, 0, 0)
   const texture = new THREE.Texture(canvas)
@@ -83,7 +93,7 @@ export async function loadSkinImage (skinUrl: string): Promise<{ canvas: Offscre
   }
 
   const image = await loadImageFromUrl(skinUrl)
-  const skinCanvas = new OffscreenCanvas(64, 64)
+  const skinCanvas = createCanvas(64, 64)
   loadSkinToCanvas(skinCanvas, image)
   return { canvas: skinCanvas, image }
 }
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index b4de4f1b..3e37102c 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -18,7 +18,7 @@ import { isEntityAttackable } from 'mineflayer-mouse/dist/attackableEntity'
 import { Vec3 } from 'vec3'
 import { EntityMetadataVersions } from '../../../src/mcDataTypes'
 import { ItemSpecificContextProperties } from '../lib/basePlayerState'
-import { loadSkinImage, loadSkinFromUsername, stevePngUrl, steveTexture } from '../lib/utils/skins'
+import { loadSkinImage, loadSkinFromUsername, stevePngUrl, steveTexture, createCanvas } from '../lib/utils/skins'
 import { loadTexture } from '../lib/utils'
 import { getBlockMeshFromModel } from './holdingBlock'
 import * as Entity from './entity/EntityMesh'
@@ -96,7 +96,7 @@ function getUsernameTexture ({
   nameTagBackgroundColor = 'rgba(0, 0, 0, 0.3)',
   nameTagTextOpacity = 255
 }: any, { fontFamily = 'sans-serif' }: any) {
-  const canvas = new OffscreenCanvas(64, 64)
+  const canvas = createCanvas(64, 64)
   const ctx = canvas.getContext('2d')
   if (!ctx) throw new Error('Could not get 2d context')
 
@@ -550,7 +550,7 @@ export class Entities {
       let skinCanvas: OffscreenCanvas
       if (skinUrl === stevePngUrl) {
         skinTexture = await steveTexture
-        const canvas = new OffscreenCanvas(64, 64)
+        const canvas = createCanvas(64, 64)
         const ctx = canvas.getContext('2d')
         if (!ctx) throw new Error('Failed to get context')
         ctx.drawImage(skinTexture.image, 0, 0)
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index 548be4e2..f7cbfaac 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -111,6 +111,22 @@ const appConfig = defineConfig({
             js: 'source-map',
             css: true,
         },
+        minify: {
+            // js: false,
+            jsOptions: {
+                minimizerOptions: {
+                    mangle: {
+                        safari10: true,
+                        keep_classnames: true,
+                        keep_fnames: true,
+                        keep_private_props: true,
+                    },
+                    compress: {
+                        unused: true,
+                    },
+                },
+            },
+        },
         distPath: SINGLE_FILE_BUILD ? {
             html: './single',
         } : undefined,
diff --git a/src/react/StorageConflictModal.tsx b/src/react/StorageConflictModal.tsx
index 966292d5..e1d3299d 100644
--- a/src/react/StorageConflictModal.tsx
+++ b/src/react/StorageConflictModal.tsx
@@ -17,7 +17,7 @@ export default () => {
   if (!isModalActive/*  || conflicts.length === 0 */) return null
 
   const clampText = (text: string) => {
-    if (typeof text !== "string") text = JSON.stringify(text)
+    if (typeof text !== 'string') text = JSON.stringify(text)
     return text.length > 30 ? text.slice(0, 30) + '...' : text
   }
 

From 1310109c016c5911330abae186008237ae1bf025 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 30 Jun 2025 19:48:43 +0300
Subject: [PATCH 015/136] fix: username was not saved after properly after
 resolving the storage conflict

---
 rsbuild.config.ts               |  1 +
 src/react/appStorageProvider.ts | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index f7cbfaac..8bcbd75d 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -157,6 +157,7 @@ const appConfig = defineConfig({
             'process.env.DISABLE_SERVICE_WORKER': JSON.stringify(disableServiceWorker),
             'process.env.INLINED_APP_CONFIG': JSON.stringify(configSource === 'BUNDLED' ? configJson : null),
             'process.env.ENABLE_COOKIE_STORAGE': JSON.stringify(process.env.ENABLE_COOKIE_STORAGE || true),
+            'process.env.COOKIE_STORAGE_PREFIX': JSON.stringify(process.env.COOKIE_STORAGE_PREFIX || ''),
         },
     },
     server: {
diff --git a/src/react/appStorageProvider.ts b/src/react/appStorageProvider.ts
index e36d43cf..bce6feca 100644
--- a/src/react/appStorageProvider.ts
+++ b/src/react/appStorageProvider.ts
@@ -8,7 +8,7 @@ import type { BaseServerInfo } from './AddServerOrConnect'
 
 // when opening html file locally in browser, localStorage is shared between all ever opened html files, so we try to avoid conflicts
 const localStoragePrefix = process.env?.SINGLE_FILE_BUILD ? 'minecraft-web-client:' : ''
-const cookiePrefix = ''
+const cookiePrefix = process.env.COOKIE_STORAGE_PREFIX || ''
 const { localStorage } = window
 const migrateRemoveLocalStorage = false
 
@@ -146,7 +146,7 @@ const detectStorageConflicts = (): StorageConflict[] => {
             key,
             localStorageValue: localData,
             localStorageTimestamp: localTimestamp,
-            cookieValue: cookieData,
+            cookieValue: (typeof cookieData === 'object' && cookieData !== null && 'data' in cookieData) ? cookieData.data : cookieData,
             cookieTimestamp
           })
         }
@@ -231,9 +231,10 @@ export const appStorage = proxy({ ...defaultStorageData })
 
 // Check if cookie storage should be used (will be set by options)
 const shouldUseCookieStorage = () => {
+  const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent)
   const isSecureCookiesAvailable = () => {
     // either https or localhost
-    return window.location.protocol === 'https:' || window.location.hostname === 'localhost'
+    return window.location.protocol === 'https:' || (window.location.hostname === 'localhost' && !isSafari)
   }
   if (!isSecureCookiesAvailable()) {
     return false
@@ -402,6 +403,12 @@ export const resolveStorageConflicts = (useLocalStorage: boolean) => {
     }
   }
 
+  // forcefully set data again
+  for (const conflict of storageConflicts) {
+    appStorage[conflict.key] = useLocalStorage ? conflict.localStorageValue : conflict.cookieValue
+    saveKey(conflict.key as keyof StorageData)
+  }
+
   // Clear conflicts and restore data
   storageConflicts = []
   restoreStorageData()

From d4ff7de64ede876703bce76b254124c9f929bccf Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 30 Jun 2025 19:53:09 +0300
Subject: [PATCH 016/136] stop building storybook...

---
 .github/workflows/ci.yml      | 2 +-
 .github/workflows/preview.yml | 1 -
 .github/workflows/release.yml | 5 ++---
 README.MD                     | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cc344aad..8fc56ea9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
           cd package
           zip -r ../self-host.zip .
       - run: pnpm build-playground
-      - run: pnpm build-storybook
+      # - run: pnpm build-storybook
       - run: pnpm test-unit
       - run: pnpm lint
 
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index f35e6a00..f243a395 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -78,7 +78,6 @@ jobs:
         run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
         env:
           CONFIG_JSON_SOURCE: BUNDLED
-      - run: pnpm build-storybook
       - name: Copy playground files
         run: |
           mkdir -p .vercel/output/static/playground
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 14c4b471..76322cb5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,7 +34,6 @@ jobs:
       - run: vercel build --token=${{ secrets.VERCEL_TOKEN }} --prod
         env:
           CONFIG_JSON_SOURCE: BUNDLED
-      - run: pnpm build-storybook
       - name: Copy playground files
         run: |
           mkdir -p .vercel/output/static/playground
@@ -48,12 +47,12 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: .vercel/output/static
           force_orphan: true
-          
+
       - name: Change index.html title
         run: |
           # change <title>Minecraft Web Client</title> to <title>Minecraft Web Client — Free Online Browser Version</title>
           sed -i 's/<title>Minecraft Web Client<\/title>/<title>Minecraft Web Client — Free Online Browser Version<\/title>/' .vercel/output/static/index.html
-          
+
       - name: Deploy Project to Vercel
         uses: mathiasvr/command-output@v2.0.0
         with:
diff --git a/README.MD b/README.MD
index 5f7a83f6..281d2539 100644
--- a/README.MD
+++ b/README.MD
@@ -30,7 +30,7 @@ For building the project yourself / contributing, see [Development, Debugging &
 - Support for custom rendering 3D engines. Modular architecture.
 - even even more!
 
-All components that are in [Storybook](https://mcraft.fun/storybook) are published as npm module and can be used in other projects: [`minecraft-react`](https://npmjs.com/minecraft-react)
+All components that are in [Storybook](https://minimap.mcraft.fun/storybook/) are published as npm module and can be used in other projects: [`minecraft-react`](https://npmjs.com/minecraft-react)
 
 ### Recommended Settings
 

From 13e145cc3ad4ef2b2501ad79624e0fcac9e6f120 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 1 Jul 2025 00:05:43 +0300
Subject: [PATCH 017/136] docs: add one liner script!

---
 README.MD | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.MD b/README.MD
index 281d2539..ea5a1453 100644
--- a/README.MD
+++ b/README.MD
@@ -12,6 +12,9 @@ Don't confuse with [Eaglercraft](https://git.eaglercraft.rip/eaglercraft/eaglerc
 
 For building the project yourself / contributing, see [Development, Debugging & Contributing](#development-debugging--contributing). For reference at what and how web technologies / frameworks are used, see [TECH.md](./TECH.md) (also for comparison with Eaglercraft).
 
+> **Note**: You can deploy it on your own server in less than a minute using a one-liner script from [Minecraft Everywhere repo](https://github.com/zardoy/minecraft-everywhere)
+
+
 ### Big Features
 
 - Official Mineflayer [plugin integration](https://github.com/zardoy/mcraft-fun-mineflayer-plugin)! View / Control your bot remotely.

From 6f5239e1d81709a5284c395dbeac18aa3570604f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 1 Jul 2025 02:29:37 +0300
Subject: [PATCH 018/136] fix: fix inventory crash on picking item with
 gui-generated texture, fix shulker box

---
 renderer/viewer/three/renderSlot.ts |  2 --
 src/inventoryWindows.ts             | 15 ++++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/renderer/viewer/three/renderSlot.ts b/renderer/viewer/three/renderSlot.ts
index fd1eae91..d82e58e3 100644
--- a/renderer/viewer/three/renderSlot.ts
+++ b/renderer/viewer/three/renderSlot.ts
@@ -14,7 +14,6 @@ export const renderSlot = (model: ResolvedItemModelRender, resourcesManager: Res
   scale?: number,
   slice?: number[],
   modelName?: string,
-  image?: ImageBitmap
 } | undefined => {
   let itemModelName = model.modelName
   const isItem = loadedData.itemsByName[itemModelName]
@@ -36,7 +35,6 @@ export const renderSlot = (model: ResolvedItemModelRender, resourcesManager: Res
       const y = item.v * atlas.height
       return {
         texture: 'gui',
-        image: resourcesManager.currentResources!.guiAtlas!.image,
         slice: [x, y, atlas.tileSize, atlas.tileSize],
         scale: 0.25,
       }
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 01d1691d..c9f60d59 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -23,7 +23,7 @@ import { MessageFormatPart } from './chatUtils'
 import { GeneralInputItem, getItemMetadata, getItemModelName, getItemNameRaw, RenderItem } from './mineflayer/items'
 import { playerState } from './mineflayer/playerState'
 
-const loadedImagesCache = new Map<string, HTMLImageElement>()
+const loadedImagesCache = new Map<string, HTMLImageElement | ImageBitmap>()
 const cleanLoadedImagesCache = () => {
   loadedImagesCache.delete('blocks')
   loadedImagesCache.delete('items')
@@ -132,11 +132,12 @@ export const onGameLoad = () => {
   }
 }
 
-const getImageSrc = (path): string | HTMLImageElement => {
+const getImageSrc = (path): string | HTMLImageElement | ImageBitmap => {
   switch (path) {
     case 'gui/container/inventory': return appReplacableResources.latest_gui_container_inventory.content
     case 'blocks': return appViewer.resourcesManager.blocksAtlasParser.latestImage
     case 'items': return appViewer.resourcesManager.itemsAtlasParser.latestImage
+    case 'gui': return appViewer.resourcesManager.currentResources!.guiAtlas!.image
     case 'gui/container/dispenser': return appReplacableResources.latest_gui_container_dispenser.content
     case 'gui/container/furnace': return appReplacableResources.latest_gui_container_furnace.content
     case 'gui/container/crafting_table': return appReplacableResources.latest_gui_container_crafting_table.content
@@ -167,6 +168,12 @@ const getImage = ({ path = undefined as string | undefined, texture = undefined
     onLoad()
   } else {
     const imageSrc = getImageSrc(loadPath)
+    if (imageSrc instanceof ImageBitmap) {
+      onLoad()
+      loadedImagesCache.set(loadPath, imageSrc)
+      return imageSrc
+    }
+
     let image: HTMLImageElement
     if (imageSrc instanceof Image) {
       image = imageSrc
@@ -277,6 +284,7 @@ const implementedContainersGuiMap = {
   'minecraft:generic_3x3': 'DropDispenseWin',
   'minecraft:furnace': 'FurnaceWin',
   'minecraft:smoker': 'FurnaceWin',
+  'minecraft:shulker_box': 'ChestWin',
   'minecraft:blast_furnace': 'FurnaceWin',
   'minecraft:crafting': 'CraftingWin',
   'minecraft:crafting3x3': 'CraftingWin', // todo different result slot
@@ -367,7 +375,7 @@ const openWindow = (type: string | undefined) => {
     lastWindow.destroy()
     lastWindow = null as any
     lastWindowType = null
-    window.lastWindow = lastWindow
+    window.inventory = null
     miscUiState.displaySearchInput = false
     destroyFn()
     skipClosePacketSending = false
@@ -375,6 +383,7 @@ const openWindow = (type: string | undefined) => {
   cleanLoadedImagesCache()
   const inv = openItemsCanvas(type)
   inv.canvasManager.children[0].mobileHelpers = miscUiState.currentTouch
+  window.inventory = inv
   const title = bot.currentWindow?.title
   const PrismarineChat = PrismarineChatLoader(bot.version)
   try {

From f79e54f11dfb1608c7c8ce2426bf3ab31c526342 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 05:45:14 +0300
Subject: [PATCH 019/136] limit columns in player tab

---
 src/react/PlayerListOverlayProvider.tsx | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/react/PlayerListOverlayProvider.tsx b/src/react/PlayerListOverlayProvider.tsx
index 3ff69c41..4d8a8ed7 100644
--- a/src/react/PlayerListOverlayProvider.tsx
+++ b/src/react/PlayerListOverlayProvider.tsx
@@ -5,6 +5,7 @@ import PlayerListOverlay from './PlayerListOverlay'
 import './PlayerListOverlay.css'
 import { lastConnectOptions } from './AppStatusProvider'
 
+const MAX_COLUMNS = 4
 const MAX_ROWS_PER_COL = 10
 
 type Players = typeof bot.players
@@ -56,21 +57,24 @@ export default () => {
     }
   }, [serverIp])
 
-
   const playersArray = Object.values(players).sort((a, b) => {
     if (a.username > b.username) return 1
     if (a.username < b.username) return -1
     return 0
   })
+
+  // Calculate optimal column distribution
+  const totalPlayers = playersArray.length
+  const numColumns = Math.min(MAX_COLUMNS, Math.ceil(totalPlayers / MAX_ROWS_PER_COL))
+  const playersPerColumn = Math.ceil(totalPlayers / numColumns)
+
   const lists = [] as Array<typeof playersArray>
 
-  let tempList = [] as typeof playersArray
-  for (let i = 0; i < playersArray.length; i++) {
-    tempList.push(playersArray[i])
-
-    if ((i + 1) % MAX_ROWS_PER_COL === 0 || i + 1 === playersArray.length) {
-      lists.push([...tempList])
-      tempList = []
+  for (let i = 0; i < numColumns; i++) {
+    const startIdx = i * playersPerColumn
+    const endIdx = Math.min(startIdx + playersPerColumn, totalPlayers)
+    if (startIdx < totalPlayers) {
+      lists.push(playersArray.slice(startIdx, endIdx))
     }
   }
 

From a2711dbe6c58f6f59ef8c881193b1e2d69f3d8cb Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 05:45:18 +0300
Subject: [PATCH 020/136] 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 516d57f3..8d40c477 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.59",
+    "mc-assets": "^0.2.62",
     "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 2a46908a..4d49692d 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.59
-        version: 0.2.59
+        specifier: ^0.2.62
+        version: 0.2.62
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379(@types/react@18.3.18)(react@18.3.1)
@@ -6487,8 +6487,8 @@ packages:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
 
-  mc-assets@0.2.59:
-    resolution: {integrity: sha512-HGdy6v09X5nks8+NuwrL3KQ763D+eWFeSpWLXx3+doWz6hSEeLjgBPOrB1stvQOjPDiQCzsIv5gaRB5sl6ng1A==}
+  mc-assets@0.2.62:
+    resolution: {integrity: sha512-RYZeD1+joNlPuUpi+tIWkbP0ieVJr+R6IFkI6/8juhSxx9zE4osoSmteybrfspGm8A6u+YbbY1epqRKEMwVR6Q==}
     engines: {node: '>=18.0.0'}
 
   mcraft-fun-mineflayer@0.1.23:
@@ -17122,7 +17122,7 @@ snapshots:
 
   math-intrinsics@1.1.0: {}
 
-  mc-assets@0.2.59:
+  mc-assets@0.2.62:
     dependencies:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2

From c55827db962c60d8ab2f21189ee372c98113a188 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 05:46:53 +0300
Subject: [PATCH 021/136] up mc-data

---
 package.json   |  4 +--
 pnpm-lock.yaml | 74 +++++++++++++++++++++++++-------------------------
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/package.json b/package.json
index 8d40c477..eb53a8bf 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     "jszip": "^3.10.1",
     "lodash-es": "^4.17.21",
     "mcraft-fun-mineflayer": "^0.1.23",
-    "minecraft-data": "3.89.0",
+    "minecraft-data": "3.92.0",
     "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
     "mineflayer-item-map-downloader": "github:zardoy/mineflayer-item-map-downloader",
     "mojangson": "^2.0.4",
@@ -201,7 +201,7 @@
       "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.89.0",
+      "minecraft-data": "3.92.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 4d49692d..c904c3f3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12,7 +12,7 @@ overrides:
   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.89.0
+  minecraft-data: 3.92.0
   prismarine-provider-anvil: github:zardoy/prismarine-provider-anvil#everything
   prismarine-physics: github:zardoy/prismarine-physics
   minecraft-protocol: github:PrismarineJS/node-minecraft-protocol#master
@@ -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/67db1808c38fab66d77ccf7822ff7c4f59308470(encoding@0.1.13))
       minecraft-data:
-        specifier: 3.89.0
-        version: 3.89.0
+        specifier: 3.92.0
+        version: 3.92.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
         version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(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.89.0)
+        version: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.92.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.89.0)
+        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-schematic:
         specifier: ^1.2.0
         version: 1.2.3
@@ -6699,8 +6699,8 @@ packages:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
 
-  minecraft-data@3.89.0:
-    resolution: {integrity: sha512-v6dUr1M7Pjc6N4ujanrBZu3IP4/HbSBpxSSXNbK6HVFVJqfaqKSMXN57G/JAlDcwqXYsVd9H4tbKFHCO+VmQpg==}
+  minecraft-data@3.92.0:
+    resolution: {integrity: sha512-CGfO50svzm+pSRa4Mbq4owsmRKbPCNkSZ3MCOyH+epC7yNjh+PUhPQFHWq72O51qsY7pAB5qM/bJn1ncwG1J5g==}
 
   minecraft-folder-path@1.2.0:
     resolution: {integrity: sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==}
@@ -7436,7 +7436,7 @@ packages:
   prismarine-biome@1.3.0:
     resolution: {integrity: sha512-GY6nZxq93mTErT7jD7jt8YS1aPrOakbJHh39seYsJFXvueIOdHAmW16kYQVrTVMW5MlWLQVxV/EquRwOgr4MnQ==}
     peerDependencies:
-      minecraft-data: 3.89.0
+      minecraft-data: 3.92.0
       prismarine-registry: ^1.1.0
 
   prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
@@ -11422,7 +11422,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.89.0
+      minecraft-data: 3.92.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
@@ -13223,16 +13223,16 @@ snapshots:
       exit-hook: 2.2.1
       flatmap: 0.0.3
       long: 5.3.1
-      minecraft-data: 3.89.0
+      minecraft-data: 3.92.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(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.89.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.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.89.0)
+      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.92.0)
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       rambda: 9.4.2
@@ -13259,16 +13259,16 @@ snapshots:
       exit-hook: 2.2.1
       flatmap: 0.0.3
       long: 5.3.1
-      minecraft-data: 3.89.0
+      minecraft-data: 3.92.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(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.89.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.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.89.0)
+      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.92.0)
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       rambda: 9.4.2
@@ -14673,8 +14673,8 @@ snapshots:
 
   diamond-square@https://codeload.github.com/zardoy/diamond-square/tar.gz/cfaad2d1d5909fdfa63c8cc7bc05fb5e87782d71:
     dependencies:
-      minecraft-data: 3.89.0
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0)
+      minecraft-data: 3.92.0
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-registry: 1.11.0
       random-seed: 0.3.0
       vec3: 0.1.10
@@ -17439,7 +17439,7 @@ snapshots:
 
   min-indent@1.0.1: {}
 
-  minecraft-data@3.89.0: {}
+  minecraft-data@3.92.0: {}
 
   minecraft-folder-path@1.2.0: {}
 
@@ -17459,7 +17459,7 @@ snapshots:
       debug: 4.4.0(supports-color@8.1.1)
       endian-toggle: 0.0.0
       lodash.merge: 4.6.2
-      minecraft-data: 3.89.0
+      minecraft-data: 3.92.0
       minecraft-folder-path: 1.2.0
       node-fetch: 2.7.0(encoding@0.1.13)
       node-rsa: 0.4.2
@@ -17538,7 +17538,7 @@ snapshots:
 
   mineflayer-pathfinder@2.4.5:
     dependencies:
-      minecraft-data: 3.89.0
+      minecraft-data: 3.92.0
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
@@ -17548,12 +17548,12 @@ snapshots:
 
   mineflayer@4.27.0(encoding@0.1.13):
     dependencies:
-      minecraft-data: 3.89.0
+      minecraft-data: 3.92.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0)
+      prismarine-biome: 1.3.0(minecraft-data@3.92.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.89.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
@@ -17572,12 +17572,12 @@ snapshots:
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
-      minecraft-data: 3.89.0
+      minecraft-data: 3.92.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0)
+      prismarine-biome: 1.3.0(minecraft-data@3.92.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.89.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
@@ -18363,15 +18363,15 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  prismarine-biome@1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0):
+  prismarine-biome@1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0):
     dependencies:
-      minecraft-data: 3.89.0
+      minecraft-data: 3.92.0
       prismarine-registry: 1.11.0
 
   prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
     dependencies:
-      minecraft-data: 3.89.0
-      prismarine-biome: 1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0)
+      minecraft-data: 3.92.0
+      prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-chat: 1.11.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
@@ -18383,9 +18383,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.89.0):
+  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0):
     dependencies:
-      prismarine-biome: 1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0)
+      prismarine-biome: 1.3.0(minecraft-data@3.92.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
@@ -18414,14 +18414,14 @@ snapshots:
 
   prismarine-physics@https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b:
     dependencies:
-      minecraft-data: 3.89.0
+      minecraft-data: 3.92.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.89.0):
+  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.92.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.89.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       uint4: 0.1.2
@@ -18443,13 +18443,13 @@ snapshots:
 
   prismarine-registry@1.11.0:
     dependencies:
-      minecraft-data: 3.89.0
+      minecraft-data: 3.92.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.89.0
+      minecraft-data: 3.92.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

From 661892af7c5c57479a230b77a86226e6fa843120 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 05:47:49 +0300
Subject: [PATCH 022/136] up mineflayer

---
 pnpm-lock.yaml | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c904c3f3..bf718ae0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -136,13 +136,13 @@ 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/67db1808c38fab66d77ccf7822ff7c4f59308470(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13))
       minecraft-data:
         specifier: 3.92.0
         version: 3.92.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(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)
@@ -341,7 +341,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379(@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/67db1808c38fab66d77ccf7822ff7c4f59308470(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(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)
@@ -6709,9 +6709,9 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379}
     version: 1.0.1
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085:
-    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085}
-    version: 1.57.0
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176:
+    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176}
+    version: 1.58.0
     engines: {node: '>=22'}
 
   minecraft-wrap@1.6.0:
@@ -6732,13 +6732,13 @@ packages:
   mineflayer-pathfinder@2.4.5:
     resolution: {integrity: sha512-Jh3JnUgRLwhMh2Dugo4SPza68C41y+NPP5sdsgxRu35ydndo70i1JJGxauVWbXrpNwIxYNztUw78aFyb7icw8g==}
 
-  mineflayer@4.27.0:
-    resolution: {integrity: sha512-3bxph4jfbkBh5HpeouorxzrfSLNV+i+1gugNJ2jf52HW+rt+tW7eiiFPxrJEsOVkPT/3O/dEIW7j93LRlojMkQ==}
+  mineflayer@4.30.0:
+    resolution: {integrity: sha512-GtW4hkijyZbSu5LKYYD89xZu+XY7OoP7IkrCnNEn6EdPm0+vr2THoJgFGKrlze9/81+T+P3E4qvJXNFiU/zeJg==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470}
-    version: 4.27.0
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033}
+    version: 4.30.0
     engines: {node: '>=22'}
 
   minimalistic-assert@1.0.1:
@@ -11423,7 +11423,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.92.0
-      mineflayer: 4.27.0(encoding@0.1.13)
+      mineflayer: 4.30.0(encoding@0.1.13)
       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
@@ -13224,7 +13224,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13260,7 +13260,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -17127,12 +17127,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/67db1808c38fab66d77ccf7822ff7c4f59308470(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(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/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17450,7 +17450,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17502,7 +17502,7 @@ snapshots:
 
   mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13):
     dependencies:
-      mineflayer: 4.27.0(encoding@0.1.13)
+      mineflayer: 4.30.0(encoding@0.1.13)
       sharp: 0.30.7
     transitivePeerDependencies:
       - encoding
@@ -17546,10 +17546,10 @@ snapshots:
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
 
-  mineflayer@4.27.0(encoding@0.1.13):
+  mineflayer@4.30.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
@@ -17569,11 +17569,11 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0

From b1298cbe1f4c1c8fddf6a6d9df38edb8354915bb Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Wed, 2 Jul 2025 02:50:15 +0000
Subject: [PATCH 023/136] feat: Config option to proxy skin textures (#382)

---
 config.json                                 |  1 +
 renderer/viewer/lib/worldrendererCommon.ts  |  1 +
 renderer/viewer/three/entities.ts           |  5 +++++
 renderer/viewer/three/worldrendererThree.ts |  7 ++++++-
 src/appConfig.ts                            |  3 +++
 src/entities.ts                             | 13 +++++++++++--
 6 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/config.json b/config.json
index fe26a9e5..eed32396 100644
--- a/config.json
+++ b/config.json
@@ -3,6 +3,7 @@
   "defaultHost": "<from-proxy>",
   "defaultProxy": "https://proxy.mcraft.fun",
   "mapsProvider": "https://maps.mcraft.fun/",
+  "skinTexturesProxy": "",
   "peerJsServer": "",
   "peerJsServerFallback": "https://p2p.mcraft.fun",
   "promoteServers": [
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 4441201c..7501b279 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -36,6 +36,7 @@ export const defaultWorldRendererConfig = {
   mesherWorkers: 4,
   isPlayground: false,
   renderEars: true,
+  skinTexturesProxy: undefined as string | undefined,
   // game renderer setting actually
   showHand: false,
   viewBobbing: false,
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 3e37102c..fd67ea80 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -1404,6 +1404,11 @@ function addArmorModel (worldRenderer: WorldRendererThree, entityMesh: THREE.Obj
         if (textureData) {
           const decodedData = JSON.parse(Buffer.from(textureData, 'base64').toString())
           texturePath = decodedData.textures?.SKIN?.url
+          const { skinTexturesProxy } = this.worldRenderer.worldRendererConfig
+          if (skinTexturesProxy) {
+            texturePath = texturePath?.replace('http://textures.minecraft.net/', skinTexturesProxy)
+              .replace('https://textures.minecraft.net/', skinTexturesProxy)
+          }
         }
       } catch (err) {
         console.error('Error decoding player head texture:', err)
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index c4482052..e5b93f88 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -755,7 +755,12 @@ export class WorldRendererThree extends WorldRendererCommon {
 
     try {
       const textureData = JSON.parse(Buffer.from(textures.Value, 'base64').toString())
-      const skinUrl = textureData.textures?.SKIN?.url
+      let skinUrl = textureData.textures?.SKIN?.url
+      const { skinTexturesProxy } = this.worldRendererConfig
+      if (skinTexturesProxy) {
+        skinUrl = skinUrl?.replace('http://textures.minecraft.net/', skinTexturesProxy)
+          .replace('https://textures.minecraft.net/', skinTexturesProxy)
+      }
 
       const mesh = getMesh(this, skinUrl, armorModel.head)
       const group = new THREE.Group()
diff --git a/src/appConfig.ts b/src/appConfig.ts
index 261ec7d3..ca1d513c 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -54,6 +54,7 @@ export type AppConfig = {
   supportedLanguages?: string[]
   showModsButton?: boolean
   defaultUsername?: string
+  skinTexturesProxy?: string
 }
 
 export const loadAppConfig = (appConfig: AppConfig) => {
@@ -82,6 +83,8 @@ export const loadAppConfig = (appConfig: AppConfig) => {
     updateBinds(customKeymaps)
   }
 
+  appViewer.inWorldRenderingConfig.skinTexturesProxy = appConfig.skinTexturesProxy
+
   setStorageDataOnAppConfigLoad(appConfig)
 }
 
diff --git a/src/entities.ts b/src/entities.ts
index b9f7998e..2ff51a48 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -199,6 +199,15 @@ customEvents.on('gameLoaded', () => {
 
   // Texture override from packet properties
   bot._client.on('player_info', (packet) => {
+    const applySkinTexturesProxy = (url: string) => {
+      const { appConfig } = miscUiState
+      if (appConfig?.skinTexturesProxy) {
+        return url?.replace('http://textures.minecraft.net/', appConfig.skinTexturesProxy)
+          .replace('https://textures.minecraft.net/', appConfig.skinTexturesProxy)
+      }
+      return url
+    }
+
     for (const playerEntry of packet.data) {
       if (!playerEntry.player && !playerEntry.properties) continue
       let textureProperty = playerEntry.properties?.find(prop => prop?.name === 'textures')
@@ -208,8 +217,8 @@ customEvents.on('gameLoaded', () => {
       if (textureProperty) {
         try {
           const textureData = JSON.parse(Buffer.from(textureProperty.value, 'base64').toString())
-          const skinUrl = textureData.textures?.SKIN?.url
-          const capeUrl = textureData.textures?.CAPE?.url
+          const skinUrl = applySkinTexturesProxy(textureData.textures?.SKIN?.url)
+          const capeUrl = applySkinTexturesProxy(textureData.textures?.CAPE?.url)
 
           // Find entity with matching UUID and update skin
           let entityId = ''

From 3bcf0f533a062ade905a4d5e247a24a4d37d59d0 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 06:06:21 +0300
Subject: [PATCH 024/136] up protocol patch

---
 patches/minecraft-protocol.patch | 50 ++++++++++++++++----------------
 pnpm-lock.yaml                   | 17 +++++------
 2 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/patches/minecraft-protocol.patch b/patches/minecraft-protocol.patch
index a3a4a6a3..6a82d5cf 100644
--- a/patches/minecraft-protocol.patch
+++ b/patches/minecraft-protocol.patch
@@ -1,26 +1,26 @@
 diff --git a/src/client/chat.js b/src/client/chat.js
-index f14269bea055d4329cd729271e7406ec4b344de7..00f5482eb6e3c911381ca9a728b1b4aae0d1d337 100644
+index 8d0869b150681574ad19292a026cce9f67a137ee..2efa2e6600f017b566155974cb9fb1856fa582f9 100644
 --- a/src/client/chat.js
 +++ b/src/client/chat.js
-@@ -111,7 +111,7 @@ module.exports = function (client, options) {
-         for (const player of packet.data) {
-           if (!player.chatSession) continue
-           client._players[player.UUID] = {
--            publicKey: crypto.createPublicKey({ key: player.chatSession.publicKey.keyBytes, format: 'der', type: 'spki' }),
-+            // publicKey: crypto.createPublicKey({ key: player.chatSession.publicKey.keyBytes, format: 'der', type: 'spki' }),
-             publicKeyDER: player.chatSession.publicKey.keyBytes,
-             sessionUuid: player.chatSession.uuid
-           }
-@@ -127,7 +127,7 @@ module.exports = function (client, options) {
-       for (const player of packet.data) {
-         if (player.crypto) {
-           client._players[player.UUID] = {
--            publicKey: crypto.createPublicKey({ key: player.crypto.publicKey, format: 'der', type: 'spki' }),
-+            // publicKey: crypto.createPublicKey({ key: player.crypto.publicKey, format: 'der', type: 'spki' }),
-             publicKeyDER: player.crypto.publicKey,
-             signature: player.crypto.signature,
-             displayName: player.displayName || player.name
-@@ -198,7 +198,7 @@ module.exports = function (client, options) {
+@@ -109,7 +109,7 @@ module.exports = function (client, options) {
+     for (const player of packet.data) {
+       if (player.chatSession) {
+         client._players[player.uuid] = {
+-          publicKey: crypto.createPublicKey({ key: player.chatSession.publicKey.keyBytes, format: 'der', type: 'spki' }),
++          // publicKey: crypto.createPublicKey({ key: player.chatSession.publicKey.keyBytes, format: 'der', type: 'spki' }),
+           publicKeyDER: player.chatSession.publicKey.keyBytes,
+           sessionUuid: player.chatSession.uuid
+         }
+@@ -119,7 +119,7 @@ module.exports = function (client, options) {
+ 
+       if (player.crypto) {
+         client._players[player.uuid] = {
+-          publicKey: crypto.createPublicKey({ key: player.crypto.publicKey, format: 'der', type: 'spki' }),
++          // publicKey: crypto.createPublicKey({ key: player.crypto.publicKey, format: 'der', type: 'spki' }),
+           publicKeyDER: player.crypto.publicKey,
+           signature: player.crypto.signature,
+           displayName: player.displayName || player.name
+@@ -189,7 +189,7 @@ module.exports = function (client, options) {
      if (mcData.supportFeature('useChatSessions')) {
        const tsDelta = BigInt(Date.now()) - packet.timestamp
        const expired = !packet.timestamp || tsDelta > messageExpireTime || tsDelta < 0
@@ -29,7 +29,7 @@ index f14269bea055d4329cd729271e7406ec4b344de7..00f5482eb6e3c911381ca9a728b1b4aa
        if (verified) client._signatureCache.push(packet.signature)
        client.emit('playerChat', {
          plainMessage: packet.plainMessage,
-@@ -363,7 +363,7 @@ module.exports = function (client, options) {
+@@ -354,7 +354,7 @@ module.exports = function (client, options) {
      }
    }
  
@@ -38,7 +38,7 @@ index f14269bea055d4329cd729271e7406ec4b344de7..00f5482eb6e3c911381ca9a728b1b4aa
      options.timestamp = options.timestamp || BigInt(Date.now())
      options.salt = options.salt || 1n
  
-@@ -405,7 +405,7 @@ module.exports = function (client, options) {
+@@ -396,7 +396,7 @@ module.exports = function (client, options) {
          message,
          timestamp: options.timestamp,
          salt: options.salt,
@@ -47,7 +47,7 @@ index f14269bea055d4329cd729271e7406ec4b344de7..00f5482eb6e3c911381ca9a728b1b4aa
          offset: client._lastSeenMessages.pending,
          acknowledged
        })
-@@ -419,7 +419,7 @@ module.exports = function (client, options) {
+@@ -410,7 +410,7 @@ module.exports = function (client, options) {
          message,
          timestamp: options.timestamp,
          salt: options.salt,
@@ -74,7 +74,7 @@ index b9d21bab9faccd5dbf1975fc423fc55c73e906c5..99ffd76527b410e3a393181beb260108
  
        function onJoinServerResponse (err) {
 diff --git a/src/client/play.js b/src/client/play.js
-index 6e06dc15291b38e1eeeec8d7102187b2a23d70a3..f67454942db9276cbb9eab99c281cfe182cb8a1f 100644
+index 559607f34e9a5b2b7809423f8ca4cd6746b60225..4dc1c3139438cc2729b05c57e57bd00252728f8a 100644
 --- a/src/client/play.js
 +++ b/src/client/play.js
 @@ -53,7 +53,7 @@ module.exports = function (client, options) {
@@ -87,7 +87,7 @@ index 6e06dc15291b38e1eeeec8d7102187b2a23d70a3..f67454942db9276cbb9eab99c281cfe1
        })
        // 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
+index 5c7a62b013daa69be91ec9e763b1f48ffe96ffa6..174d42a77740a937afcb106e1f39a9ee824a24b9 100644
 --- a/src/client.js
 +++ b/src/client.js
 @@ -89,10 +89,12 @@ class Client extends EventEmitter {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bf718ae0..2ad22c38 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,9 +21,6 @@ overrides:
   prismarine-item: latest
 
 patchedDependencies:
-  minecraft-protocol:
-    hash: 09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762
-    path: patches/minecraft-protocol.patch
   mineflayer-item-map-downloader@1.2.0:
     hash: a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad
     path: patches/mineflayer-item-map-downloader@1.2.0.patch
@@ -142,7 +139,7 @@ importers:
         version: 3.92.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(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)
@@ -13224,7 +13221,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13260,7 +13257,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -17131,7 +17128,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/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
       mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
@@ -17450,7 +17447,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17549,7 +17546,7 @@ snapshots:
   mineflayer@4.30.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
@@ -17573,7 +17570,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0

From 7aea07f83a2f8fbbe0379e74611e0c09565c2bc4 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 06:13:40 +0300
Subject: [PATCH 025/136] up patch again

---
 pnpm-lock.yaml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2ad22c38..90f9b15f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,6 +21,9 @@ overrides:
   prismarine-item: latest
 
 patchedDependencies:
+  minecraft-protocol:
+    hash: a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0
+    path: patches/minecraft-protocol.patch
   mineflayer-item-map-downloader@1.2.0:
     hash: a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad
     path: patches/mineflayer-item-map-downloader@1.2.0.patch
@@ -139,7 +142,7 @@ importers:
         version: 3.92.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(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)
@@ -13221,7 +13224,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13257,7 +13260,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -17128,7 +17131,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/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
       mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
@@ -17447,7 +17450,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17546,7 +17549,7 @@ snapshots:
   mineflayer@4.30.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
@@ -17570,7 +17573,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0

From 71257bdf137dc918f7cc762dad1fc600788a1113 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 06:16:06 +0300
Subject: [PATCH 026/136] add fuchsmc.net server partner back!

---
 config.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config.json b/config.json
index eed32396..57b1c207 100644
--- a/config.json
+++ b/config.json
@@ -10,6 +10,9 @@
     {
       "ip": "wss://play.mcraft.fun"
     },
+    {
+      "ip": "wss://ws.fuchsmc.net"
+    },
     {
       "ip": "wss://play2.mcraft.fun"
     },

From 8a504123951876a9b1c5281d86ff815fa82e2cba Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 06:19:31 +0300
Subject: [PATCH 027/136] fix app crash

---
 src/appConfig.ts | 2 +-
 src/appViewer.ts | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/appConfig.ts b/src/appConfig.ts
index ca1d513c..0805c448 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -83,7 +83,7 @@ export const loadAppConfig = (appConfig: AppConfig) => {
     updateBinds(customKeymaps)
   }
 
-  appViewer.inWorldRenderingConfig.skinTexturesProxy = appConfig.skinTexturesProxy
+  appViewer?.appConfigUdpate()
 
   setStorageDataOnAppConfigLoad(appConfig)
 }
diff --git a/src/appViewer.ts b/src/appViewer.ts
index 0be6c2e8..05b1cf41 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -180,6 +180,12 @@ export class AppViewer {
     this.worldView!.listenToBot(bot)
   }
 
+  appConfigUdpate () {
+    if (miscUiState.appConfig) {
+      this.inWorldRenderingConfig.skinTexturesProxy = miscUiState.appConfig.skinTexturesProxy
+    }
+  }
+
   async startWorld (world, renderDistance: number, playerStateSend: PlayerStateRenderer = this.playerState.reactive) {
     if (this.currentDisplay === 'world') throw new Error('World already started')
     this.currentDisplay = 'world'
@@ -187,6 +193,7 @@ export class AppViewer {
     this.worldView = new WorldDataEmitter(world, renderDistance, startPosition)
     window.worldView = this.worldView
     watchOptionsAfterWorldViewInit(this.worldView)
+    this.appConfigUdpate()
 
     const displayWorldOptions: DisplayWorldOptions = {
       version: this.resourcesManager.currentConfig!.version,

From 9086435aee77b4c42c9b45254b2bb993b1c92e7e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 06:21:15 +0300
Subject: [PATCH 028/136] rm building storybook

---
 .github/workflows/next-deploy.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/next-deploy.yml b/.github/workflows/next-deploy.yml
index 943727eb..99172bf7 100644
--- a/.github/workflows/next-deploy.yml
+++ b/.github/workflows/next-deploy.yml
@@ -36,7 +36,6 @@ jobs:
         run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
         env:
           CONFIG_JSON_SOURCE: BUNDLED
-      - run: pnpm build-storybook
       - name: Copy playground files
         run: |
           mkdir -p .vercel/output/static/playground

From ed7c33ff9f1a16442f1e89aac92b12214e56f7cc Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 06:22:17 +0300
Subject: [PATCH 029/136] up mouse

---
 package.json   |   2 +-
 pnpm-lock.yaml | 270 ++-----------------------------------------------
 2 files changed, 7 insertions(+), 265 deletions(-)

diff --git a/package.json b/package.json
index eb53a8bf..268afaab 100644
--- a/package.json
+++ b/package.json
@@ -153,7 +153,7 @@
     "mc-assets": "^0.2.62",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer#gen-the-master",
-    "mineflayer-mouse": "^0.1.10",
+    "mineflayer-mouse": "^0.1.11",
     "mineflayer-pathfinder": "^2.4.4",
     "npm-run-all": "^4.1.5",
     "os-browserify": "^0.3.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 90f9b15f..5bb171b4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -343,8 +343,8 @@ importers:
         specifier: github:zardoy/mineflayer#gen-the-master
         version: https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(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)
+        specifier: ^0.1.11
+        version: 0.1.11
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.5
@@ -3308,47 +3308,18 @@ packages:
   '@vitest/expect@0.34.6':
     resolution: {integrity: sha512-QUzKpUQRc1qC7qdGo7rMK3AkETI7w18gTCUrsNnyjjJKYiuUB9+TQK3QnR1unhCnWRC0AbKv2omLGQDF/mIjOw==}
 
-  '@vitest/expect@3.0.8':
-    resolution: {integrity: sha512-Xu6TTIavTvSSS6LZaA3EebWFr6tsoXPetOWNMOlc7LO88QVVBwq2oQWBoDiLCN6YTvNYsGSjqOO8CAdjom5DCQ==}
-
-  '@vitest/mocker@3.0.8':
-    resolution: {integrity: sha512-n3LjS7fcW1BCoF+zWZxG7/5XvuYH+lsFg+BDwwAz0arIwHQJFUEsKBQ0BLU49fCxuM/2HSeBPHQD8WjgrxMfow==}
-    peerDependencies:
-      msw: ^2.4.9
-      vite: ^5.0.0 || ^6.0.0
-    peerDependenciesMeta:
-      msw:
-        optional: true
-      vite:
-        optional: true
-
-  '@vitest/pretty-format@3.0.8':
-    resolution: {integrity: sha512-BNqwbEyitFhzYMYHUVbIvepOyeQOSFA/NeJMIP9enMntkkxLgOcgABH6fjyXG85ipTgvero6noreavGIqfJcIg==}
-
   '@vitest/runner@0.34.6':
     resolution: {integrity: sha512-1CUQgtJSLF47NnhN+F9X2ycxUP0kLHQ/JWvNHbeBfwW8CzEGgeskzNnHDyv1ieKTltuR6sdIHV+nmR6kPxQqzQ==}
 
-  '@vitest/runner@3.0.8':
-    resolution: {integrity: sha512-c7UUw6gEcOzI8fih+uaAXS5DwjlBaCJUo7KJ4VvJcjL95+DSR1kova2hFuRt3w41KZEFcOEiq098KkyrjXeM5w==}
-
   '@vitest/snapshot@0.34.6':
     resolution: {integrity: sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==}
 
-  '@vitest/snapshot@3.0.8':
-    resolution: {integrity: sha512-x8IlMGSEMugakInj44nUrLSILh/zy1f2/BgH0UeHpNyOocG18M9CWVIFBaXPt8TrqVZWmcPjwfG/ht5tnpba8A==}
-
   '@vitest/spy@0.34.6':
     resolution: {integrity: sha512-xaCvneSaeBw/cz8ySmF7ZwGvL0lBjfvqc1LpQ/vcdHEvpLn3Ff1vAvjw+CoGn0802l++5L/pxb7whwcWAw+DUQ==}
 
-  '@vitest/spy@3.0.8':
-    resolution: {integrity: sha512-MR+PzJa+22vFKYb934CejhR4BeRpMSoxkvNoDit68GQxRLSf11aT6CTj3XaqUU9rxgWJFnqicN/wxw6yBRkI1Q==}
-
   '@vitest/utils@0.34.6':
     resolution: {integrity: sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==}
 
-  '@vitest/utils@3.0.8':
-    resolution: {integrity: sha512-nkBC3aEhfX2PdtQI/QwAWp8qZWwzASsU4Npbcd5RdMPBSSLCpkZp52P3xku3s3uA0HIEhGvEcF8rNkBsz9dQ4Q==}
-
   '@xboxreplay/errors@0.1.0':
     resolution: {integrity: sha512-Tgz1d/OIPDWPeyOvuL5+aai5VCcqObhPnlI3skQuf80GVF3k1I0lPCnGC+8Cm5PV9aLBT5m8qPcJoIUQ2U4y9g==}
 
@@ -3672,10 +3643,6 @@ packages:
   assertion-error@1.1.0:
     resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==}
 
-  assertion-error@2.0.1:
-    resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==}
-    engines: {node: '>=12'}
-
   assign-symbols@1.0.0:
     resolution: {integrity: sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==}
     engines: {node: '>=0.10.0'}
@@ -4012,10 +3979,6 @@ packages:
     resolution: {integrity: sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==}
     engines: {node: '>=4'}
 
-  chai@5.2.0:
-    resolution: {integrity: sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==}
-    engines: {node: '>=12'}
-
   chalk@2.4.2:
     resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
     engines: {node: '>=4'}
@@ -4043,10 +4006,6 @@ packages:
   check-error@1.0.3:
     resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==}
 
-  check-error@2.1.1:
-    resolution: {integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==}
-    engines: {node: '>= 16'}
-
   check-more-types@2.24.0:
     resolution: {integrity: sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==}
     engines: {node: '>= 0.8.0'}
@@ -4472,10 +4431,6 @@ packages:
     resolution: {integrity: sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==}
     engines: {node: '>=6'}
 
-  deep-eql@5.0.2:
-    resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==}
-    engines: {node: '>=6'}
-
   deep-extend@0.6.0:
     resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
     engines: {node: '>=4.0.0'}
@@ -4796,9 +4751,6 @@ packages:
   es-module-lexer@0.9.3:
     resolution: {integrity: sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==}
 
-  es-module-lexer@1.6.0:
-    resolution: {integrity: sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==}
-
   es-object-atoms@1.1.1:
     resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==}
     engines: {node: '>= 0.4'}
@@ -5045,9 +4997,6 @@ packages:
   estree-walker@2.0.2:
     resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
 
-  estree-walker@3.0.3:
-    resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
-
   esutils@2.0.3:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
     engines: {node: '>=0.10.0'}
@@ -5103,10 +5052,6 @@ packages:
     resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
     engines: {node: '>=6'}
 
-  expect-type@1.2.0:
-    resolution: {integrity: sha512-80F22aiJ3GLyVnS/B3HzgR6RelZVumzj9jkL0Rhz4h0xYbNW9PjlQz5h3J/SShErbXBc295vseR4/MIbVmUbeA==}
-    engines: {node: '>=12.0.0'}
-
   exponential-backoff@3.1.2:
     resolution: {integrity: sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==}
 
@@ -6403,9 +6348,6 @@ packages:
   loupe@2.3.7:
     resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==}
 
-  loupe@3.1.3:
-    resolution: {integrity: sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==}
-
   lower-case@2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
 
@@ -6725,8 +6667,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
     version: 1.2.0
 
-  mineflayer-mouse@0.1.10:
-    resolution: {integrity: sha512-bxrBzOVQX2Ok5KOiJMaoOLYaHMDecMkJpLn5oGIdyLRqiTF3WAnZc9oYQq+/f3YNA88W1vBIjai3v3vZe6wyaQ==}
+  mineflayer-mouse@0.1.11:
+    resolution: {integrity: sha512-BL47pXZ1+92BA/7ym6KaJctEHKnL0up+tpuagVwSKJvAgibeqWQJJwDlNUWkOLvpnruRKDxMR5OB1hUXFoDNSg==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   mineflayer-pathfinder@2.4.5:
@@ -7271,10 +7213,6 @@ packages:
   pathval@1.1.1:
     resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==}
 
-  pathval@2.0.0:
-    resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==}
-    engines: {node: '>= 14.16'}
-
   pause-stream@0.0.11:
     resolution: {integrity: sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==}
 
@@ -8716,22 +8654,10 @@ packages:
     resolution: {integrity: sha512-zSYNUlYSMhJ6Zdou4cJwo/p7w5nmAH17GRfU/ui3ctvjXFErXXkruT4MWW6poDeXgCaIBlGLrfU6TbTXxyGMww==}
     engines: {node: '>=14.0.0'}
 
-  tinypool@1.0.2:
-    resolution: {integrity: sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==}
-    engines: {node: ^18.0.0 || >=20.0.0}
-
-  tinyrainbow@2.0.0:
-    resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==}
-    engines: {node: '>=14.0.0'}
-
   tinyspy@2.2.1:
     resolution: {integrity: sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==}
     engines: {node: '>=14.0.0'}
 
-  tinyspy@3.0.2:
-    resolution: {integrity: sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==}
-    engines: {node: '>=14.0.0'}
-
   title-case@3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
 
@@ -9218,11 +9144,6 @@ packages:
     engines: {node: '>=v14.18.0'}
     hasBin: true
 
-  vite-node@3.0.8:
-    resolution: {integrity: sha512-6PhR4H9VGlcwXZ+KWCdMqbtG649xCPZqfI9j2PsK1FcXgEzro5bGHcVKFCTqPLaNKZES8Evqv4LwvZARsq5qlg==}
-    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
-    hasBin: true
-
   vite@4.5.9:
     resolution: {integrity: sha512-qK9W4xjgD3gXbC0NmdNFFnVFLMWSNiR3swj957yutwzzN16xF/E7nmtAyp1rT9hviDroQANjE4HK3H4WqWdFtw==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -9322,34 +9243,6 @@ packages:
       webdriverio:
         optional: true
 
-  vitest@3.0.8:
-    resolution: {integrity: sha512-dfqAsNqRGUc8hB9OVR2P0w8PZPEckti2+5rdZip0WIz9WW0MnImJ8XiR61QhqLa92EQzKP2uPkzenKOAHyEIbA==}
-    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
-    hasBin: true
-    peerDependencies:
-      '@edge-runtime/vm': '*'
-      '@types/debug': ^4.1.12
-      '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0
-      '@vitest/browser': 3.0.8
-      '@vitest/ui': 3.0.8
-      happy-dom: '*'
-      jsdom: '*'
-    peerDependenciesMeta:
-      '@edge-runtime/vm':
-        optional: true
-      '@types/debug':
-        optional: true
-      '@types/node':
-        optional: true
-      '@vitest/browser':
-        optional: true
-      '@vitest/ui':
-        optional: true
-      happy-dom:
-        optional: true
-      jsdom:
-        optional: true
-
   vm-browserify@1.1.2:
     resolution: {integrity: sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==}
 
@@ -13086,68 +12979,28 @@ snapshots:
       '@vitest/utils': 0.34.6
       chai: 4.5.0
 
-  '@vitest/expect@3.0.8':
-    dependencies:
-      '@vitest/spy': 3.0.8
-      '@vitest/utils': 3.0.8
-      chai: 5.2.0
-      tinyrainbow: 2.0.0
-
-  '@vitest/mocker@3.0.8(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))':
-    dependencies:
-      '@vitest/spy': 3.0.8
-      estree-walker: 3.0.3
-      magic-string: 0.30.17
-    optionalDependencies:
-      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)
-
-  '@vitest/pretty-format@3.0.8':
-    dependencies:
-      tinyrainbow: 2.0.0
-
   '@vitest/runner@0.34.6':
     dependencies:
       '@vitest/utils': 0.34.6
       p-limit: 4.0.0
       pathe: 1.1.2
 
-  '@vitest/runner@3.0.8':
-    dependencies:
-      '@vitest/utils': 3.0.8
-      pathe: 2.0.3
-
   '@vitest/snapshot@0.34.6':
     dependencies:
       magic-string: 0.30.17
       pathe: 1.1.2
       pretty-format: 29.7.0
 
-  '@vitest/snapshot@3.0.8':
-    dependencies:
-      '@vitest/pretty-format': 3.0.8
-      magic-string: 0.30.17
-      pathe: 2.0.3
-
   '@vitest/spy@0.34.6':
     dependencies:
       tinyspy: 2.2.1
 
-  '@vitest/spy@3.0.8':
-    dependencies:
-      tinyspy: 3.0.2
-
   '@vitest/utils@0.34.6':
     dependencies:
       diff-sequences: 29.6.3
       loupe: 2.3.7
       pretty-format: 29.7.0
 
-  '@vitest/utils@3.0.8':
-    dependencies:
-      '@vitest/pretty-format': 3.0.8
-      loupe: 3.1.3
-      tinyrainbow: 2.0.0
-
   '@xboxreplay/errors@0.1.0': {}
 
   '@xboxreplay/xboxlive-auth@3.3.3(debug@4.4.0)':
@@ -13562,8 +13415,6 @@ snapshots:
 
   assertion-error@1.1.0: {}
 
-  assertion-error@2.0.1: {}
-
   assign-symbols@1.0.0: {}
 
   ast-types@0.16.1:
@@ -13995,14 +13846,6 @@ snapshots:
       pathval: 1.1.1
       type-detect: 4.1.0
 
-  chai@5.2.0:
-    dependencies:
-      assertion-error: 2.0.1
-      check-error: 2.1.1
-      deep-eql: 5.0.2
-      loupe: 3.1.3
-      pathval: 2.0.0
-
   chalk@2.4.2:
     dependencies:
       ansi-styles: 3.2.1
@@ -14041,8 +13884,6 @@ snapshots:
     dependencies:
       get-func-name: 2.0.2
 
-  check-error@2.1.1: {}
-
   check-more-types@2.24.0:
     optional: true
 
@@ -14557,8 +14398,6 @@ snapshots:
     dependencies:
       type-detect: 4.1.0
 
-  deep-eql@5.0.2: {}
-
   deep-extend@0.6.0: {}
 
   deep-is@0.1.4: {}
@@ -15056,8 +14895,6 @@ snapshots:
 
   es-module-lexer@0.9.3: {}
 
-  es-module-lexer@1.6.0: {}
-
   es-object-atoms@1.1.1:
     dependencies:
       es-errors: 1.3.0
@@ -15440,10 +15277,6 @@ snapshots:
 
   estree-walker@2.0.2: {}
 
-  estree-walker@3.0.3:
-    dependencies:
-      '@types/estree': 1.0.6
-
   esutils@2.0.3: {}
 
   etag@1.8.1: {}
@@ -15521,8 +15354,6 @@ snapshots:
 
   expand-template@2.0.3: {}
 
-  expect-type@1.2.0: {}
-
   exponential-backoff@3.1.2:
     optional: true
 
@@ -17024,8 +16855,6 @@ snapshots:
     dependencies:
       get-func-name: 2.0.2
 
-  loupe@3.1.3: {}
-
   lower-case@2.0.2:
     dependencies:
       tslib: 2.8.1
@@ -17508,33 +17337,14 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer-mouse@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-mouse@0.1.11:
     dependencies:
       change-case: 5.4.4
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       prismarine-item: 1.16.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
-      vitest: 3.0.8(@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)
     transitivePeerDependencies:
-      - '@edge-runtime/vm'
-      - '@types/debug'
-      - '@types/node'
-      - '@vitest/browser'
-      - '@vitest/ui'
-      - happy-dom
-      - jiti
-      - jsdom
-      - less
-      - lightningcss
-      - msw
-      - sass
-      - sass-embedded
-      - stylus
-      - sugarss
       - supports-color
-      - terser
-      - tsx
-      - yaml
 
   mineflayer-pathfinder@2.4.5:
     dependencies:
@@ -18202,8 +18012,6 @@ snapshots:
 
   pathval@1.1.1: {}
 
-  pathval@2.0.0: {}
-
   pause-stream@0.0.11:
     dependencies:
       through: 2.3.8
@@ -20064,14 +19872,8 @@ snapshots:
 
   tinypool@0.7.0: {}
 
-  tinypool@1.0.2: {}
-
-  tinyrainbow@2.0.0: {}
-
   tinyspy@2.2.1: {}
 
-  tinyspy@3.0.2: {}
-
   title-case@3.0.3:
     dependencies:
       tslib: 2.8.1
@@ -20560,27 +20362,6 @@ snapshots:
       - supports-color
       - terser
 
-  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.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)
-    transitivePeerDependencies:
-      - '@types/node'
-      - jiti
-      - less
-      - lightningcss
-      - sass
-      - sass-embedded
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-      - tsx
-      - yaml
-
   vite@4.5.9(@types/node@22.13.9)(terser@5.39.0):
     dependencies:
       esbuild: 0.18.20
@@ -20639,45 +20420,6 @@ snapshots:
       - supports-color
       - terser
 
-  vitest@3.0.8(@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):
-    dependencies:
-      '@vitest/expect': 3.0.8
-      '@vitest/mocker': 3.0.8(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))
-      '@vitest/pretty-format': 3.0.8
-      '@vitest/runner': 3.0.8
-      '@vitest/snapshot': 3.0.8
-      '@vitest/spy': 3.0.8
-      '@vitest/utils': 3.0.8
-      chai: 5.2.0
-      debug: 4.4.1
-      expect-type: 1.2.0
-      magic-string: 0.30.17
-      pathe: 2.0.3
-      std-env: 3.8.1
-      tinybench: 2.9.0
-      tinyexec: 0.3.2
-      tinypool: 1.0.2
-      tinyrainbow: 2.0.0
-      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)
-      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)
-      why-is-node-running: 2.3.0
-    optionalDependencies:
-      '@types/debug': 4.1.12
-      '@types/node': 22.13.9
-    transitivePeerDependencies:
-      - jiti
-      - less
-      - lightningcss
-      - msw
-      - sass
-      - sass-embedded
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-      - tsx
-      - yaml
-
   vm-browserify@1.1.2: {}
 
   w3c-keyname@2.2.8: {}

From 3320f65b9c1a075e07138d762b8114e85136128a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 06:24:02 +0300
Subject: [PATCH 030/136] now app crash should be fixed

---
 README.MD      | 4 ++--
 src/globals.js | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.MD b/README.MD
index ea5a1453..36066fef 100644
--- a/README.MD
+++ b/README.MD
@@ -127,7 +127,7 @@ Instead I recommend setting `options.debugLogNotFrequentPackets`. Also you can u
 
 - `bot` - Mineflayer bot instance. See Mineflayer documentation for more.
 - `viewer` - Three.js viewer instance, basically does all the rendering.
-- `viewer.world.sectionObjects` - Object with all active chunk sections (geometries) in the world. Each chunk section is a Three.js mesh or group.
+- `world.sectionObjects` - Object with all active chunk sections (geometries) in the world. Each chunk section is a Three.js mesh or group.
 - `debugSceneChunks` - The same as above, but relative to current bot position (e.g. 0,0 is the current chunk).
 - `debugChangedOptions` - See what options are changed. Don't change options here.
 - `localServer`/`server` - Only for singleplayer mode/host. Flying Squid server instance, see it's documentation for more.
@@ -136,7 +136,7 @@ Instead I recommend setting `options.debugLogNotFrequentPackets`. Also you can u
 
 - `nbt.simplify(someNbt)` - Simplifies nbt data, so it's easier to read.
 
-The most useful thing in devtools is the watch expression. You can add any expression there and it will be re-evaluated in real time. For example, you can add `viewer.camera.position` to see the camera position and so on.
+The most useful thing in devtools is the watch expression. You can add any expression there and it will be re-evaluated in real time. For example, you can add `camera.position` to see the camera position and so on.
 
 <img src="./docs-assets/watch-expr.png" alt="Watch expression" width="480"/>
 
diff --git a/src/globals.js b/src/globals.js
index f9125c8c..11351555 100644
--- a/src/globals.js
+++ b/src/globals.js
@@ -5,7 +5,8 @@ window.bot = undefined
 window.THREE = undefined
 window.localServer = undefined
 window.worldView = undefined
-window.viewer = undefined
+window.viewer = undefined // legacy
+window.appViewer = undefined
 window.loadedData = undefined
 window.customEvents = new EventEmitter()
 window.customEvents.setMaxListeners(10_000)

From c913d63c46a8f7c05987cb442d60fc0dc48f4eb4 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 16:25:36 +0300
Subject: [PATCH 031/136] fix(regression): fix ios 16 world rendering support!

---
 experiments/three.ts               | 134 ++++++++++-------------------
 renderer/viewer/lib/utils/skins.ts |  16 +++-
 2 files changed, 62 insertions(+), 88 deletions(-)

diff --git a/experiments/three.ts b/experiments/three.ts
index 7a629a13..9b158dec 100644
--- a/experiments/three.ts
+++ b/experiments/three.ts
@@ -1,101 +1,61 @@
 import * as THREE from 'three'
-import * as tweenJs  from '@tweenjs/tween.js'
-import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js'
-import * as THREE from 'three';
-import Jimp from 'jimp';
+import { loadThreeJsTextureFromBitmap } from '../renderer/viewer/lib/utils/skins'
 
+// Create scene, camera and renderer
 const scene = new THREE.Scene()
 const camera = new THREE.PerspectiveCamera(75, window.innerWidth / window.innerHeight, 0.1, 1000)
-camera.position.set(0, 0, 5)
 const renderer = new THREE.WebGLRenderer()
 renderer.setSize(window.innerWidth, window.innerHeight)
 document.body.appendChild(renderer.domElement)
 
-const controls = new OrbitControls(camera, renderer.domElement)
+// Position camera
+camera.position.z = 5
 
-const geometry = new THREE.BoxGeometry(1, 1, 1)
-const material = new THREE.MeshBasicMaterial({ color: 0x00ff00 })
-const cube = new THREE.Mesh(geometry, material)
-cube.position.set(0.5, 0.5, 0.5);
-const group = new THREE.Group()
-group.add(cube)
-group.position.set(-0.5, -0.5, -0.5);
-const outerGroup = new THREE.Group()
-outerGroup.add(group)
-outerGroup.scale.set(0.2, 0.2, 0.2)
-outerGroup.position.set(1, 1, 0)
-scene.add(outerGroup)
+// Create a canvas with some content
+const canvas = document.createElement('canvas')
+canvas.width = 256
+canvas.height = 256
+const ctx = canvas.getContext('2d')
 
-// const mesh = new THREE.Mesh(new THREE.BoxGeometry(1, 1, 1), new THREE.MeshBasicMaterial({ color: 0x00_00_ff, transparent: true, opacity: 0.5 }))
-//     mesh.position.set(0.5, 1, 0.5)
-//     const group = new THREE.Group()
-//     group.add(mesh)
-//     group.position.set(-0.5, -1, -0.5)
-//     const outerGroup = new THREE.Group()
-//     outerGroup.add(group)
-//     // outerGroup.position.set(this.camera.position.x, this.camera.position.y, this.camera.position.z)
-//     scene.add(outerGroup)
+scene.background = new THREE.Color(0x444444)
 
-    new tweenJs.Tween(group.rotation).to({ z: THREE.MathUtils.degToRad(90) }, 1000).yoyo(true).repeat(Infinity).start()
+// Draw something on the canvas
+ctx.fillStyle = '#444444'
+// ctx.fillRect(0, 0, 256, 256)
+ctx.fillStyle = 'red'
+ctx.font = '48px Arial'
+ctx.textAlign = 'center'
+ctx.textBaseline = 'middle'
+ctx.fillText('Hello!', 128, 128)
 
-const tweenGroup = new tweenJs.Group()
-function animate () {
-    tweenGroup.update()
-  requestAnimationFrame(animate)
-//   cube.rotation.x += 0.01
-//   cube.rotation.y += 0.01
-  renderer.render(scene, camera)
+// Create bitmap and texture
+async function createTexturedBox() {
+    const canvas2 = new OffscreenCanvas(256, 256)
+    const ctx2 = canvas2.getContext('2d')!
+    ctx2.drawImage(canvas, 0, 0)
+    const texture = new THREE.Texture(canvas2)
+    texture.magFilter = THREE.NearestFilter
+    texture.minFilter = THREE.NearestFilter
+    texture.needsUpdate = true
+    texture.flipY = false
+
+    // Create box with texture
+    const geometry = new THREE.BoxGeometry(2, 2, 2)
+    const material = new THREE.MeshBasicMaterial({
+        map: texture,
+        side: THREE.DoubleSide,
+        premultipliedAlpha: false,
+    })
+    const cube = new THREE.Mesh(geometry, material)
+    scene.add(cube)
+}
+
+// Create the textured box
+createTexturedBox()
+
+// Animation loop
+function animate() {
+    requestAnimationFrame(animate)
+    renderer.render(scene, camera)
 }
 animate()
-
-// let animation
-
-window.animate = () => {
-    // new Tween.Tween(group.position).to({ y: group.position.y - 1}, 1000 * 0.35/2).yoyo(true).repeat(1).start()
-    new tweenJs.Tween(group.rotation, tweenGroup).to({ z: THREE.MathUtils.degToRad(90) }, 1000 * 0.35 / 2).yoyo(true).repeat(Infinity).start().onRepeat(() => {
-        console.log('done')
-    })
-}
-
-window.stop = () => {
-    tweenGroup.removeAll()
-}
-
-
-function createGeometryFromImage() {
-    return new Promise<THREE.ShapeGeometry>((resolve, reject) => {
-        const img = new Image();
-        img.src = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAABEElEQVQ4jWNkIAPw2Zv9J0cfXPOSvx/+L/n74T+HqsJ/JlI1T9u3i6H91B7ybdY+vgZuO1majV+fppFmPnuz/+ihy2dv9t/49Wm8mlECkV1FHh5FfPZm/1XXTGX4cechA4eKPMNVq1CGH7cfMBJ0rlxX+X8OVYX/xq9P/5frKifoZ0Z0AwS8HRkYGBgYvt+8xyDXUUbQZgwJPnuz/+wq8gw/7zxk+PXsFUFno0h6mon+l5fgZFhwnYmBTUqMgYGBgaAhLMiaHQyFGOZvf8Lw49FXRgYGhv8MDAwwg/7jMoQFFury/C8Y5m9/wnADohnZVryJhoWBARJ9Cw69gtmMAgiFAcuvZ68Yfj17hU8NXgAATdKfkzbQhBEAAAAASUVORK5CYII='
-        console.log('img.complete', img.complete)
-        img.onload = () => {
-            const canvas = document.createElement('canvas');
-            canvas.width = img.width;
-            canvas.height = img.height;
-            const context = canvas.getContext('2d');
-            context.drawImage(img, 0, 0, img.width, img.height);
-            const imgData = context.getImageData(0, 0, img.width, img.height);
-
-            const shape = new THREE.Shape();
-            for (let y = 0; y < img.height; y++) {
-                for (let x = 0; x < img.width; x++) {
-                    const index = (y * img.width + x) * 4;
-                    const alpha = imgData.data[index + 3];
-                    if (alpha !== 0) {
-                        shape.lineTo(x, y);
-                    }
-                }
-            }
-
-            const geometry = new THREE.ShapeGeometry(shape);
-            resolve(geometry);
-        };
-        img.onerror = reject;
-    });
-}
-
-// Usage:
-const shapeGeomtry = createGeometryFromImage().then(geometry => {
-    const material = new THREE.MeshBasicMaterial({ color: 0xffffff });
-    const mesh = new THREE.Mesh(geometry, material);
-    scene.add(mesh);
-})
diff --git a/renderer/viewer/lib/utils/skins.ts b/renderer/viewer/lib/utils/skins.ts
index de5a3675..9aa97340 100644
--- a/renderer/viewer/lib/utils/skins.ts
+++ b/renderer/viewer/lib/utils/skins.ts
@@ -3,6 +3,20 @@ import * as THREE from 'three'
 import stevePng from 'mc-assets/dist/other-textures/latest/entity/player/wide/steve.png'
 import { getLoadedImage } from 'mc-assets/dist/utils'
 
+const detectFullOffscreenCanvasSupport = () => {
+  if (typeof OffscreenCanvas === 'undefined') return false
+  try {
+    const canvas = new OffscreenCanvas(1, 1)
+    // Try to get a WebGL context - this will fail on iOS where only 2D is supported (iOS 16)
+    const gl = canvas.getContext('webgl2') || canvas.getContext('webgl')
+    return gl !== null
+  } catch (e) {
+    return false
+  }
+}
+
+const hasFullOffscreenCanvasSupport = detectFullOffscreenCanvasSupport()
+
 export const loadThreeJsTextureFromUrlSync = (imageUrl: string) => {
   const texture = new THREE.Texture()
   const promise = getLoadedImage(imageUrl).then(image => {
@@ -17,7 +31,7 @@ export const loadThreeJsTextureFromUrlSync = (imageUrl: string) => {
 }
 
 export const createCanvas = (width: number, height: number): OffscreenCanvas => {
-  if (typeof OffscreenCanvas !== 'undefined') {
+  if (hasFullOffscreenCanvasSupport) {
     return new OffscreenCanvas(width, height)
   }
   const canvas = document.createElement('canvas')

From 3cc862b05d4f008cd79502a1063c687882cf7dd4 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 16:53:30 +0300
Subject: [PATCH 032/136] up mineflayer

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

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5bb171b4..02e27584 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/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc(encoding@0.1.13))
       minecraft-data:
         specifier: 3.92.0
         version: 3.92.0
@@ -341,7 +341,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379(@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/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.11
         version: 0.1.11
@@ -6678,8 +6678,8 @@ packages:
     resolution: {integrity: sha512-GtW4hkijyZbSu5LKYYD89xZu+XY7OoP7IkrCnNEn6EdPm0+vr2THoJgFGKrlze9/81+T+P3E4qvJXNFiU/zeJg==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc}
     version: 4.30.0
     engines: {node: '>=22'}
 
@@ -16956,12 +16956,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/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc(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/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17379,7 +17379,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0

From 3bf34a8781a9e5c6665b1ec70215526489e46c02 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 16:55:32 +0300
Subject: [PATCH 033/136] add browserstack partner

---
 README.MD | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.MD b/README.MD
index 36066fef..3205dfb4 100644
--- a/README.MD
+++ b/README.MD
@@ -45,9 +45,12 @@ All components that are in [Storybook](https://minimap.mcraft.fun/storybook/) ar
 
 ### Browser Notes
 
-These browsers have issues with capturing pointer:
+This project is tested with BrowserStack ! [BrowserStack](https://www.browserstack.com/)
+
+Howerver, these browsers have issues:
 
 **Opera Mini**: Disable *mouse gestures* in browsre settings to avoid opening new tab on right click hold
+
 **Vivaldi**: Disable Controls -> *Raw Input* in game settings if experiencing issues
 
 ### Versions Support

From 08fbc67c31fec68bc56a18ba5c26ef2e82f4c6a6 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 17:22:44 +0300
Subject: [PATCH 034/136] add update git deps script, fix inventory crashes

---
 .cursor/rules/vars-usage.mdc |   2 +
 CONTRIBUTING.md              |   7 +-
 package.json                 |   8 +-
 pnpm-lock.yaml               |   8 +-
 scripts/updateGitDeps.ts     | 160 +++++++++++++++++++++++++++++++++++
 5 files changed, 178 insertions(+), 7 deletions(-)
 create mode 100644 scripts/updateGitDeps.ts

diff --git a/.cursor/rules/vars-usage.mdc b/.cursor/rules/vars-usage.mdc
index 7120e7ae..233e0aba 100644
--- a/.cursor/rules/vars-usage.mdc
+++ b/.cursor/rules/vars-usage.mdc
@@ -14,3 +14,5 @@ Ask AI
 - Some other global variables that can be used without window prefixes are listed in src/globals.d.ts
 
 Rationale: This ensures a clean separation between the Mineflayer logic (server-side/game logic) and the renderer (client-side/view logic), making the renderer portable and testable, and maintains proper usage of global state.
+
+For more general project contributing guides see CONTRIBUTING.md on like how to setup the project. Use pnpm tsc if needed to validate result with typechecking the whole project.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 06df61fa..a5a3482d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -177,8 +177,13 @@ New React components, improve UI (including mobile support).
 
 ## Updating Dependencies
 
-1. Ensure mineflayer fork is up to date with the latest version of mineflayer original repo
+1. Use `pnpm update-git-deps` to check and update git dependencies (like mineflayer fork, prismarine packages etc). The script will:
+   - Show which git dependencies have updates available
+   - Ask if you want to update them
+   - Skip dependencies listed in `pnpm.updateConfig.ignoreDependencies`
+
 2. Update PrismarineJS dependencies to the latest version: `minecraft-data` (be sure to replace the version twice in the package.json), `mineflayer`, `minecraft-protocol`, `prismarine-block`, `prismarine-chunk`, `prismarine-item`, ...
+
 3. If `minecraft-protocol` patch fails, do this:
      1. Remove the patch from `patchedDependencies` in `package.json`
      2. Run `pnpm patch minecraft-protocol`, open patch directory
diff --git a/package.json b/package.json
index 268afaab..a09b92a3 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,8 @@
     "run-playground": "run-p watch-mesher watch-other-workers watch-playground",
     "run-all": "run-p start run-playground",
     "build-playground": "rsbuild build --config renderer/rsbuild.config.ts",
-    "watch-playground": "rsbuild dev --config renderer/rsbuild.config.ts"
+    "watch-playground": "rsbuild dev --config renderer/rsbuild.config.ts",
+    "update-git-deps": "tsx scripts/updateGitDeps.ts"
   },
   "keywords": [
     "prismarine",
@@ -210,7 +211,10 @@
       "prismarine-item": "latest"
     },
     "updateConfig": {
-      "ignoreDependencies": []
+      "ignoreDependencies": [
+        "browserfs",
+        "google-drive-browserfs"
+      ]
     },
     "patchedDependencies": {
       "pixelarticons@1.8.1": "patches/pixelarticons@1.8.1.patch",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 02e27584..b146bd80 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -338,7 +338,7 @@ importers:
         version: 0.2.62
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
-        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379(@types/react@18.3.18)(react@18.3.1)
+        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41(@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/1616261f727398d0b14359262726828d24797fcc(encoding@0.1.13)
@@ -6647,8 +6647,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/5494f356b1e59eddc876c3ae05ff395f12a46379:
-    resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379}
+  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41:
+    resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41}
     version: 1.0.1
 
   minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176:
@@ -17272,7 +17272,7 @@ snapshots:
 
   minecraft-folder-path@1.2.0: {}
 
-  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379(@types/react@18.3.18)(react@18.3.1):
+  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41(@types/react@18.3.18)(react@18.3.1):
     dependencies:
       valtio: 1.13.2(@types/react@18.3.18)(react@18.3.1)
     transitivePeerDependencies:
diff --git a/scripts/updateGitDeps.ts b/scripts/updateGitDeps.ts
new file mode 100644
index 00000000..f3f253ec
--- /dev/null
+++ b/scripts/updateGitDeps.ts
@@ -0,0 +1,160 @@
+import fs from 'fs'
+import path from 'path'
+import yaml from 'yaml'
+import { execSync } from 'child_process'
+import { createInterface } from 'readline'
+
+interface LockfilePackage {
+  specifier: string
+  version: string
+}
+
+interface Lockfile {
+  importers: {
+    '.': {
+      dependencies?: Record<string, LockfilePackage>
+      devDependencies?: Record<string, LockfilePackage>
+    }
+  }
+}
+
+interface PackageJson {
+  pnpm?: {
+    updateConfig?: {
+      ignoreDependencies?: string[]
+    }
+  }
+}
+
+async function prompt(question: string): Promise<string> {
+  const rl = createInterface({
+    input: process.stdin,
+    output: process.stdout
+  })
+
+  return new Promise(resolve => {
+    rl.question(question, answer => {
+      rl.close()
+      resolve(answer.toLowerCase().trim())
+    })
+  })
+}
+
+async function getLatestCommit(owner: string, repo: string): Promise<string> {
+  const response = await fetch(`https://api.github.com/repos/${owner}/${repo}/commits/HEAD`)
+  if (!response.ok) {
+    throw new Error(`Failed to fetch latest commit: ${response.statusText}`)
+  }
+  const data = await response.json()
+  return data.sha
+}
+
+function extractGitInfo(specifier: string): { owner: string; repo: string; branch: string } | null {
+  const match = specifier.match(/github:([^/]+)\/([^#]+)(?:#(.+))?/)
+  if (!match) return null
+  return {
+    owner: match[1],
+    repo: match[2],
+    branch: match[3] || 'master'
+  }
+}
+
+function extractCommitHash(version: string): string | null {
+  const match = version.match(/https:\/\/codeload\.github\.com\/[^/]+\/[^/]+\/tar\.gz\/([a-f0-9]+)/)
+  return match ? match[1] : null
+}
+
+function getIgnoredDependencies(): string[] {
+  try {
+    const packageJsonPath = path.join(process.cwd(), 'package.json')
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8')) as PackageJson
+    return packageJson.pnpm?.updateConfig?.ignoreDependencies || []
+  } catch (error) {
+    console.warn('Failed to read package.json for ignored dependencies:', error)
+    return []
+  }
+}
+
+async function main() {
+  const lockfilePath = path.join(process.cwd(), 'pnpm-lock.yaml')
+  const lockfileContent = fs.readFileSync(lockfilePath, 'utf8')
+  const lockfile = yaml.parse(lockfileContent) as Lockfile
+
+  const ignoredDependencies = new Set(getIgnoredDependencies())
+  console.log('Ignoring dependencies:', Array.from(ignoredDependencies).join(', ') || 'none')
+
+  const dependencies = {
+    ...lockfile.importers['.'].dependencies,
+    ...lockfile.importers['.'].devDependencies
+  }
+
+  const updates: Array<{
+    name: string
+    currentHash: string
+    latestHash: string
+    gitInfo: ReturnType<typeof extractGitInfo>
+  }> = []
+
+  console.log('\nChecking git dependencies...')
+  for (const [name, pkg] of Object.entries(dependencies)) {
+    if (ignoredDependencies.has(name)) {
+      console.log(`Skipping ignored dependency: ${name}`)
+      continue
+    }
+
+    if (!pkg.specifier.startsWith('github:')) continue
+
+    const gitInfo = extractGitInfo(pkg.specifier)
+    if (!gitInfo) continue
+
+    const currentHash = extractCommitHash(pkg.version)
+    if (!currentHash) continue
+
+    try {
+      process.stdout.write(`Checking ${name}... `)
+      const latestHash = await getLatestCommit(gitInfo.owner, gitInfo.repo)
+      if (currentHash !== latestHash) {
+        console.log('update available')
+        updates.push({ name, currentHash, latestHash, gitInfo })
+      } else {
+        console.log('up to date')
+      }
+    } catch (error) {
+      console.log('failed')
+      console.error(`Error checking ${name}:`, error)
+    }
+  }
+
+  if (updates.length === 0) {
+    console.log('\nAll git dependencies are up to date!')
+    return
+  }
+
+  console.log('\nThe following git dependencies can be updated:')
+  for (const update of updates) {
+    console.log(`\n${update.name}:`)
+    console.log(`  Current: ${update.currentHash}`)
+    console.log(`  Latest:  ${update.latestHash}`)
+    console.log(`  Repo:    ${update.gitInfo!.owner}/${update.gitInfo!.repo}`)
+  }
+
+  const answer = await prompt('\nWould you like to update these dependencies? (y/N): ')
+  if (answer === 'y' || answer === 'yes') {
+    let newLockfileContent = lockfileContent
+    for (const update of updates) {
+      newLockfileContent = newLockfileContent.replace(
+        new RegExp(update.currentHash, 'g'),
+        update.latestHash
+      )
+    }
+    fs.writeFileSync(lockfilePath, newLockfileContent)
+    console.log('\nUpdated pnpm-lock.yaml with new commit hashes')
+    console.log('Running pnpm install to apply changes...')
+    execSync('pnpm install', { stdio: 'inherit' })
+    console.log('Done!')
+  } else {
+    console.log('\nNo changes were made.')
+  }
+}
+
+main().catch(console.error)

From 043e28ed975825298e97093d46d398636df490bf Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 18:16:44 +0300
Subject: [PATCH 035/136] add more visible integration trigger

---
 README.MD | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.MD b/README.MD
index 3205dfb4..8ca36a3b 100644
--- a/README.MD
+++ b/README.MD
@@ -1,3 +1,5 @@
+This project is tested with BrowserStack
+
 # Minecraft Web Client
 
 ![banner](./docs-assets/banner.jpg)

From d112b0117793a5ba121001395b1d8f9acf0006fa Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 18:55:33 +0300
Subject: [PATCH 036/136] fix gameLoaded

---
 index.html       | 2 +-
 src/appStatus.ts | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 6471c495..b2fa3dbd 100644
--- a/index.html
+++ b/index.html
@@ -63,7 +63,7 @@
 
               if (window.navigator.maxTouchPoints > 1) window.location.hash = '#dev' // show eruda
               // unregister all sw
-              if (window.navigator.serviceWorker) {
+              if (window.navigator.serviceWorker && document.querySelector('.initial-loader').style.opacity !== 0) {
                 console.log('got worker')
                 window.navigator.serviceWorker.getRegistrations().then(registrations => {
                   registrations.forEach(registration => {
diff --git a/src/appStatus.ts b/src/appStatus.ts
index 054975f3..101714f5 100644
--- a/src/appStatus.ts
+++ b/src/appStatus.ts
@@ -1,3 +1,4 @@
+import { resetStateAfterDisconnect } from './browserfs'
 import { hideModal, activeModalStack, showModal, miscUiState } from './globalState'
 import { appStatusState, resetAppStatusState } from './react/AppStatusProvider'
 
@@ -25,7 +26,6 @@ export const setLoadingScreenStatus = function (status: string | undefined | nul
   }
   showModal({ reactType: 'app-status' })
   if (appStatusState.isError) {
-    miscUiState.gameLoaded = false
     return
   }
   appStatusState.hideDots = hideDots
@@ -33,5 +33,9 @@ export const setLoadingScreenStatus = function (status: string | undefined | nul
   appStatusState.lastStatus = isError ? appStatusState.status : ''
   appStatusState.status = status
   appStatusState.minecraftJsonMessage = minecraftJsonMessage ?? null
+
+  if (isError && miscUiState.gameLoaded) {
+    resetStateAfterDisconnect()
+  }
 }
 globalThis.setLoadingScreenStatus = setLoadingScreenStatus

From fcf987efe4bc5e58c5329c2ffb6ad3e49ab5bc06 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 19:21:18 +0300
Subject: [PATCH 037/136] always display reconnect button on mcraft.fun

---
 .github/workflows/build-single-file.yml |  2 ++
 .github/workflows/build-zip.yml         |  2 ++
 .github/workflows/next-deploy.yml       |  1 +
 .github/workflows/preview.yml           |  1 +
 .github/workflows/release.yml           |  1 +
 config.mcraft-only.json                 |  3 +++
 renderer/viewer/three/threeJsSound.ts   |  8 +++++--
 rsbuild.config.ts                       |  5 +++--
 src/appConfig.ts                        |  1 +
 src/env.d.ts                            | 30 +++++++++++++++++++++++++
 src/react/PauseScreen.tsx               |  3 ++-
 11 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 config.mcraft-only.json
 create mode 100644 src/env.d.ts

diff --git a/.github/workflows/build-single-file.yml b/.github/workflows/build-single-file.yml
index 93b1b77f..5f9800db 100644
--- a/.github/workflows/build-single-file.yml
+++ b/.github/workflows/build-single-file.yml
@@ -23,6 +23,8 @@ jobs:
 
       - name: Build single-file version - minecraft.html
         run: pnpm build-single-file && mv dist/single/index.html minecraft.html
+        env:
+          LOCAL_CONFIG_FILE: config.mcraft-only.json
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/build-zip.yml b/.github/workflows/build-zip.yml
index cc472476..76ca65ca 100644
--- a/.github/workflows/build-zip.yml
+++ b/.github/workflows/build-zip.yml
@@ -23,6 +23,8 @@ jobs:
 
       - name: Build project
         run: pnpm build
+        env:
+          LOCAL_CONFIG_FILE: config.mcraft-only.json
 
       - name: Bundle server.js
         run: |
diff --git a/.github/workflows/next-deploy.yml b/.github/workflows/next-deploy.yml
index 99172bf7..75b39f6c 100644
--- a/.github/workflows/next-deploy.yml
+++ b/.github/workflows/next-deploy.yml
@@ -36,6 +36,7 @@ jobs:
         run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
         env:
           CONFIG_JSON_SOURCE: BUNDLED
+          LOCAL_CONFIG_FILE: config.mcraft-only.json
       - name: Copy playground files
         run: |
           mkdir -p .vercel/output/static/playground
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index f243a395..89fd6698 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -78,6 +78,7 @@ jobs:
         run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
         env:
           CONFIG_JSON_SOURCE: BUNDLED
+          LOCAL_CONFIG_FILE: config.mcraft-only.json
       - name: Copy playground files
         run: |
           mkdir -p .vercel/output/static/playground
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 76322cb5..cbf52251 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,6 +34,7 @@ jobs:
       - run: vercel build --token=${{ secrets.VERCEL_TOKEN }} --prod
         env:
           CONFIG_JSON_SOURCE: BUNDLED
+          LOCAL_CONFIG_FILE: config.mcraft-only.json
       - name: Copy playground files
         run: |
           mkdir -p .vercel/output/static/playground
diff --git a/config.mcraft-only.json b/config.mcraft-only.json
new file mode 100644
index 00000000..51b6eee6
--- /dev/null
+++ b/config.mcraft-only.json
@@ -0,0 +1,3 @@
+{
+  "alwaysReconnectButton": true
+}
diff --git a/renderer/viewer/three/threeJsSound.ts b/renderer/viewer/three/threeJsSound.ts
index 627cabf8..46aefda9 100644
--- a/renderer/viewer/three/threeJsSound.ts
+++ b/renderer/viewer/three/threeJsSound.ts
@@ -39,7 +39,9 @@ export class ThreeJsSound implements SoundSystem {
       sound.position.set(position.x, position.y, position.z)
       sound.onEnded = () => {
         this.worldRenderer.scene.remove(sound)
-        sound.disconnect()
+        if (sound.source) {
+          sound.disconnect()
+        }
         this.activeSounds.delete(sound)
         audioLoader.manager.itemEnd(path)
       }
@@ -51,7 +53,9 @@ export class ThreeJsSound implements SoundSystem {
     // Stop and clean up all active sounds
     for (const sound of this.activeSounds) {
       sound.stop()
-      sound.disconnect()
+      if (sound.source) {
+        sound.disconnect()
+      }
     }
 
     // Remove and cleanup audio listener
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index 8bcbd75d..5014bdf9 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -1,3 +1,4 @@
+/// <reference types="./src/env" />
 import { defineConfig, mergeRsbuildConfig, RsbuildPluginAPI } from '@rsbuild/core'
 import { pluginReact } from '@rsbuild/plugin-react'
 import { pluginTypedCSSModules } from '@rsbuild/plugin-typed-css-modules'
@@ -48,7 +49,7 @@ if (fs.existsSync('./assets/release.json')) {
 
 const configJson = JSON.parse(fs.readFileSync('./config.json', 'utf8'))
 try {
-    Object.assign(configJson, JSON.parse(fs.readFileSync('./config.local.json', 'utf8')))
+    Object.assign(configJson, JSON.parse(fs.readFileSync(process.env.LOCAL_CONFIG_FILE || './config.local.json', 'utf8')))
 } catch (err) {}
 if (dev) {
     configJson.defaultProxy = ':8080'
@@ -198,7 +199,7 @@ const appConfig = defineConfig({
                     }
 
                     if (configSource === 'REMOTE') {
-                        fs.writeFileSync('./dist/config.json', JSON.stringify(configJson), 'utf8')
+                        fs.writeFileSync('./dist/config.json', JSON.stringify(configJson, undefined, 2), 'utf8')
                     }
                     if (fs.existsSync('./generated/sounds.js')) {
                         fs.copyFileSync('./generated/sounds.js', './dist/sounds.js')
diff --git a/src/appConfig.ts b/src/appConfig.ts
index 0805c448..b8c1e219 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -55,6 +55,7 @@ export type AppConfig = {
   showModsButton?: boolean
   defaultUsername?: string
   skinTexturesProxy?: string
+  alwaysReconnectButton?: boolean
 }
 
 export const loadAppConfig = (appConfig: AppConfig) => {
diff --git a/src/env.d.ts b/src/env.d.ts
new file mode 100644
index 00000000..4cb5bafd
--- /dev/null
+++ b/src/env.d.ts
@@ -0,0 +1,30 @@
+declare namespace NodeJS {
+  interface ProcessEnv {
+    // Build configuration
+    NODE_ENV: 'development' | 'production'
+    SINGLE_FILE_BUILD?: string
+    DISABLE_SERVICE_WORKER?: string
+    CONFIG_JSON_SOURCE?: 'BUNDLED' | 'REMOTE'
+    LOCAL_CONFIG_FILE?: string
+    BUILD_VERSION?: string
+
+    // GitHub and Vercel related
+    GITHUB_REPOSITORY?: string
+    VERCEL_GIT_REPO_OWNER?: string
+    VERCEL_GIT_REPO_SLUG?: string
+
+    // UI and Features
+    MAIN_MENU_LINKS?: string
+    ENABLE_COOKIE_STORAGE?: string
+    COOKIE_STORAGE_PREFIX?: string
+
+    // Release information
+    RELEASE_TAG?: string
+    RELEASE_LINK?: string
+    RELEASE_CHANGELOG?: string
+
+    // Other configurations
+    DEPS_VERSIONS?: string
+    INLINED_APP_CONFIG?: string
+  }
+}
diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index 22e00ded..4bdd2974 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -163,6 +163,7 @@ export default () => {
   const { noConnection } = useSnapshot(gameAdditionalState)
   const { active: packetsReplaceActive, hasRecordedPackets: packetsReplaceHasRecordedPackets } = useSnapshot(packetsRecordingState)
   const { displayRecordButton: displayPacketsButtons } = useSnapshot(options)
+  const { appConfig } = useSnapshot(miscUiState)
 
   const handlePointerLockChange = () => {
     if (!pointerLock.hasPointerLock && activeModalStack.length === 0) {
@@ -293,7 +294,7 @@ export default () => {
           {fsState.inMemorySave && !fsState.syncFs && !fsState.isReadonly ? 'Save & Quit' : 'Disconnect & Reset'}
         </Button>
       </>}
-      {noConnection && (
+      {(noConnection || appConfig?.alwaysReconnectButton) && (
         <Button className="button" style={{ width: '204px' }} onClick={reconnectReload}>
           Reconnect
         </Button>

From 7162d2f549c400f9cee9282c9ce7e19baf3dbd6c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 19:22:47 +0300
Subject: [PATCH 038/136] fix music crash

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

diff --git a/src/sounds/botSoundSystem.ts b/src/sounds/botSoundSystem.ts
index 0e23a98a..72aa3da8 100644
--- a/src/sounds/botSoundSystem.ts
+++ b/src/sounds/botSoundSystem.ts
@@ -71,7 +71,7 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
   }
 
   const musicStartCheck = async (force = false) => {
-    if (!soundMap) return
+    if (!soundMap || !bot) return
     // 20% chance to start music
     if (Math.random() > 0.2 && !force && !options.enableMusic) return
 

From 9f3d3f93fb29c86793bc26f7eba8c6cd144da52a Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Thu, 3 Jul 2025 18:01:38 +0300
Subject: [PATCH 039/136] docs: update README to clarify BrowserStack testing
 (#384)

---
 README.MD | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/README.MD b/README.MD
index 8ca36a3b..61a5b733 100644
--- a/README.MD
+++ b/README.MD
@@ -1,5 +1,3 @@
-This project is tested with BrowserStack
-
 # Minecraft Web Client
 
 ![banner](./docs-assets/banner.jpg)
@@ -47,9 +45,9 @@ All components that are in [Storybook](https://minimap.mcraft.fun/storybook/) ar
 
 ### Browser Notes
 
-This project is tested with BrowserStack ! [BrowserStack](https://www.browserstack.com/)
+This project is tested with BrowserStack. Special thanks to [BrowserStack](https://www.browserstack.com/) for providing testing infrastructure!
 
-Howerver, these browsers have issues:
+Howerver, it's known that these browsers have issues:
 
 **Opera Mini**: Disable *mouse gestures* in browsre settings to avoid opening new tab on right click hold
 

From 4277c3a26299849848d6044e6f5429889f6519c9 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Thu, 3 Jul 2025 15:15:24 +0000
Subject: [PATCH 040/136] feat: Support nameTagVisibility option of teams
 (#373)

---
 renderer/viewer/lib/basePlayerState.ts  |  4 +-
 renderer/viewer/lib/worldDataEmitter.ts |  1 +
 renderer/viewer/three/entities.ts       | 23 ++++++++-
 src/entities.ts                         | 64 +++++++++++++++++++++++++
 src/mineflayer/playerState.ts           |  4 ++
 5 files changed, 93 insertions(+), 3 deletions(-)

diff --git a/renderer/viewer/lib/basePlayerState.ts b/renderer/viewer/lib/basePlayerState.ts
index f9e4b2c9..af5d9d06 100644
--- a/renderer/viewer/lib/basePlayerState.ts
+++ b/renderer/viewer/lib/basePlayerState.ts
@@ -1,5 +1,5 @@
 import { ItemSelector } from 'mc-assets/dist/itemDefinitions'
-import { GameMode } from 'mineflayer'
+import { GameMode, Team } from 'mineflayer'
 import { proxy } from 'valtio'
 import type { HandItemBlock } from '../three/holdingBlock'
 
@@ -50,6 +50,8 @@ export const getInitialPlayerState = () => proxy({
   perspective: 'first_person' as CameraPerspective,
 
   cameraSpectatingEntity: undefined as number | undefined,
+
+  team: undefined as Team | undefined,
 })
 
 export const getPlayerStateUtils = (reactive: PlayerStateReactive) => ({
diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index 78da96d9..e1ac2f24 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -104,6 +104,7 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
         ...e,
         pos: e.position,
         username: e.username,
+        team: bot.teamMap[e.username] || bot.teamMap[e.uuid],
         // set debugTree (obj) {
         //   e.debugTree = obj
         // }
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index fd67ea80..414b0279 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -16,6 +16,7 @@ import { Item } from 'prismarine-item'
 import { BlockModel } from 'mc-assets'
 import { isEntityAttackable } from 'mineflayer-mouse/dist/attackableEntity'
 import { Vec3 } from 'vec3'
+import { Team } from 'mineflayer'
 import { EntityMetadataVersions } from '../../../src/mcDataTypes'
 import { ItemSpecificContextProperties } from '../lib/basePlayerState'
 import { loadSkinImage, loadSkinFromUsername, stevePngUrl, steveTexture, createCanvas } from '../lib/utils/skins'
@@ -209,7 +210,7 @@ export type SceneEntity = THREE.Object3D & {
   username?: string
   uuid?: string
   additionalCleanup?: () => void
-  originalEntity: import('prismarine-entity').Entity & { delete?; pos?, name }
+  originalEntity: import('prismarine-entity').Entity & { delete?; pos?, name, team?: Team }
 }
 
 export class Entities {
@@ -900,6 +901,8 @@ export class Entities {
           nameTag.position.y = playerObject.position.y + playerObject.scale.y * 16 + 3
           nameTag.renderOrder = 1000
 
+          nameTag.name = 'nametag'
+
           //@ts-expect-error
           wrapper.add(nameTag)
         }
@@ -1111,10 +1114,12 @@ export class Entities {
       }
     }
 
-    if (entity.username) {
+    if (entity.username !== undefined) {
       e.username = entity.username
     }
 
+    this.updateNameTagVisibility(e)
+
     this.updateEntityPosition(entity, justAdded, overrides)
   }
 
@@ -1183,6 +1188,20 @@ export class Entities {
     }
   }
 
+  updateNameTagVisibility (entity: SceneEntity) {
+    const playerTeam = this.worldRenderer.playerStateReactive.team
+    const entityTeam = entity.originalEntity.team
+    const nameTagVisibility = entityTeam?.nameTagVisibility || 'always'
+    const showNameTag = nameTagVisibility === 'always' ||
+      (nameTagVisibility === 'hideForOwnTeam' && entityTeam?.team !== playerTeam?.team) ||
+      (nameTagVisibility === 'hideForOtherTeams' && (entityTeam?.team === playerTeam?.team || playerTeam === undefined))
+    entity.traverse(c => {
+      if (c.name === 'nametag') {
+        c.visible = showNameTag
+      }
+    })
+  }
+
   addMapModel (entityMesh: THREE.Object3D, mapNumber: number, rotation: number) {
     const imageData = this.cachedMapsImages?.[mapNumber]
     let texture: THREE.Texture | null = null
diff --git a/src/entities.ts b/src/entities.ts
index 2ff51a48..3dac51ce 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -4,6 +4,7 @@ import tracker from '@nxg-org/mineflayer-tracker'
 import { loader as autoJumpPlugin } from '@nxg-org/mineflayer-auto-jump'
 import { subscribeKey } from 'valtio/utils'
 import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
+import { Team } from 'mineflayer'
 import { options, watchValue } from './optionsStorage'
 import { gameAdditionalState, miscUiState } from './globalState'
 import { EntityStatus } from './mineflayer/entityStatus'
@@ -237,4 +238,67 @@ customEvents.on('gameLoaded', () => {
     }
 
   })
+
+  bot.on('teamUpdated', (team: Team) => {
+    for (const entity of Object.values(bot.entities)) {
+      if (entity.type === 'player' && entity.username && team.members.includes(entity.username) || entity.uuid && team.members.includes(entity.uuid)) {
+        bot.emit('entityUpdate', entity)
+      }
+    }
+  })
+
+  const updateEntityNameTags = (team: Team) => {
+    for (const entity of Object.values(bot.entities)) {
+      const entityTeam = entity.type === 'player' && entity.username ? bot.teamMap[entity.username] : entity.uuid ? bot.teamMap[entity.uuid] : undefined
+      if ((entityTeam?.nameTagVisibility === 'hideForOwnTeam' && entityTeam.name === team.name)
+        || (entityTeam?.nameTagVisibility === 'hideForOtherTeams' && entityTeam.name !== team.name)) {
+        bot.emit('entityUpdate', entity)
+      }
+    }
+  }
+
+  const doEntitiesNeedUpdating = (team: Team) => {
+    return team.nameTagVisibility === 'never'
+      || (team.nameTagVisibility === 'hideForOtherTeams' && appViewer.playerState.reactive.team?.team !== team.team)
+      || (team.nameTagVisibility === 'hideForOwnTeam' && appViewer.playerState.reactive.team?.team === team.team)
+  }
+
+  bot.on('teamMemberAdded', (team: Team, members: string[]) => {
+    if (members.includes(bot.username) && appViewer.playerState.reactive.team?.team !== team.team) {
+      appViewer.playerState.reactive.team = team
+      // Player was added to a team, need to check if any entities need updating
+      updateEntityNameTags(team)
+    } else if (doEntitiesNeedUpdating(team)) {
+      // Need to update all entities that were added
+      for (const entity of Object.values(bot.entities)) {
+        if (entity.type === 'player' && entity.username && members.includes(entity.username) || entity.uuid && members.includes(entity.uuid)) {
+          bot.emit('entityUpdate', entity)
+        }
+      }
+    }
+  })
+
+  bot.on('teamMemberRemoved', (team: Team, members: string[]) => {
+    if (members.includes(bot.username) && appViewer.playerState.reactive.team?.team === team.team) {
+      appViewer.playerState.reactive.team = undefined
+      // Player was removed from a team, need to check if any entities need updating
+      updateEntityNameTags(team)
+    } else if (doEntitiesNeedUpdating(team)) {
+      // Need to update all entities that were removed
+      for (const entity of Object.values(bot.entities)) {
+        if (entity.type === 'player' && entity.username && members.includes(entity.username) || entity.uuid && members.includes(entity.uuid)) {
+          bot.emit('entityUpdate', entity)
+        }
+      }
+    }
+  })
+
+  bot.on('teamRemoved', (team: Team) => {
+    if (appViewer.playerState.reactive.team?.team === team.team) {
+      appViewer.playerState.reactive.team = undefined
+      // Player's team was removed, need to update all entities that are in a team
+      updateEntityNameTags(team)
+    }
+  })
+
 })
diff --git a/src/mineflayer/playerState.ts b/src/mineflayer/playerState.ts
index b7b4d2bd..b8919a14 100644
--- a/src/mineflayer/playerState.ts
+++ b/src/mineflayer/playerState.ts
@@ -99,6 +99,10 @@ export class PlayerStateControllerMain {
     })
     this.reactive.gameMode = bot.game?.gameMode
 
+    customEvents.on('gameLoaded', () => {
+      this.reactive.team = bot.teamMap[bot.username]
+    })
+
     this.watchReactive()
   }
 

From cdd23bc6a6a370eca0d9da79bee762af81b78ff1 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 3 Jul 2025 18:16:21 +0300
Subject: [PATCH 041/136] fix(critical): fix support for all versions above
 1.20.2 in mineflayer dependency

---
 pnpm-lock.yaml           | 14 +++++++-------
 scripts/updateGitDeps.ts |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b146bd80..291cec39 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/1616261f727398d0b14359262726828d24797fcc(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8(encoding@0.1.13))
       minecraft-data:
         specifier: 3.92.0
         version: 3.92.0
@@ -341,7 +341,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41(@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/1616261f727398d0b14359262726828d24797fcc(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.11
         version: 0.1.11
@@ -6678,8 +6678,8 @@ packages:
     resolution: {integrity: sha512-GtW4hkijyZbSu5LKYYD89xZu+XY7OoP7IkrCnNEn6EdPm0+vr2THoJgFGKrlze9/81+T+P3E4qvJXNFiU/zeJg==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8}
     version: 4.30.0
     engines: {node: '>=22'}
 
@@ -16956,12 +16956,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/1616261f727398d0b14359262726828d24797fcc(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8(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/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17379,7 +17379,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
diff --git a/scripts/updateGitDeps.ts b/scripts/updateGitDeps.ts
index f3f253ec..797aea8f 100644
--- a/scripts/updateGitDeps.ts
+++ b/scripts/updateGitDeps.ts
@@ -149,8 +149,8 @@ async function main() {
     }
     fs.writeFileSync(lockfilePath, newLockfileContent)
     console.log('\nUpdated pnpm-lock.yaml with new commit hashes')
-    console.log('Running pnpm install to apply changes...')
-    execSync('pnpm install', { stdio: 'inherit' })
+    // console.log('Running pnpm install to apply changes...')
+    // execSync('pnpm install', { stdio: 'inherit' })
     console.log('Done!')
   } else {
     console.log('\nNo changes were made.')

From 5cfd301d10890d37ff9cc804774fa9b485c7967d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 3 Jul 2025 19:35:19 +0300
Subject: [PATCH 042/136] fix: fix controls debug was not visible

---
 src/optionsGuiScheme.tsx  | 12 ------------
 src/react/ControDebug.tsx | 32 ++++++++++++++++++--------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index ba52e333..b03db37d 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -545,18 +545,6 @@ export const guiOptionsScheme: {
         />
       }
     },
-    {
-      custom () {
-        const { cookieStorage } = useSnapshot(appStorage)
-        return <Button
-          label={`Storage: ${cookieStorage ? 'Synced Cookies' : 'Local Storage'}`} onClick={() => {
-            appStorage.cookieStorage = !cookieStorage
-            alert('Reload the page to apply this change')
-          }}
-          inScreen
-        />
-      }
-    },
     {
       custom () {
         return <Category>Server Connection</Category>
diff --git a/src/react/ControDebug.tsx b/src/react/ControDebug.tsx
index 9c5f272c..ca096707 100644
--- a/src/react/ControDebug.tsx
+++ b/src/react/ControDebug.tsx
@@ -50,20 +50,24 @@ export default () => {
   if (!options.debugContro) return null
 
   return (
-    <div style={{
-      position: 'fixed',
-      right: 0,
-      top: '50%',
-      transform: 'translateY(-50%)',
-      backgroundColor: 'rgba(0, 0, 0, 0.5)',
-      padding: '8px',
-      fontFamily: 'monospace',
-      fontSize: '8px',
-      color: 'white',
-      display: 'flex',
-      flexDirection: 'column',
-      gap: '4px'
-    }}>
+    <div
+      className='debug-contro'
+      style={{
+        position: 'fixed',
+        right: 0,
+        top: '50%',
+        transform: 'translateY(-50%)',
+        backgroundColor: 'rgba(0, 0, 0, 0.5)',
+        padding: '8px',
+        fontFamily: 'monospace',
+        fontSize: '8px',
+        color: 'white',
+        display: 'flex',
+        flexDirection: 'column',
+        gap: '4px',
+        zIndex: 2,
+      }}
+    >
       <div>Keys: {[...pressedKeys].join(', ')}</div>
       <div style={{ color: 'limegreen' }}>Actions: {actions.join(', ')}</div>
     </div>

From e8b0a34c0ba3ec43485bcaeb34692dd6177bde4d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 3 Jul 2025 19:52:49 +0300
Subject: [PATCH 043/136] fix: fix chat visual text alignment issues on chat
 opening

---
 src/react/Chat.css | 9 ++++++++-
 src/react/Chat.tsx | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/react/Chat.css b/src/react/Chat.css
index 47394948..1f29a59c 100644
--- a/src/react/Chat.css
+++ b/src/react/Chat.css
@@ -4,6 +4,8 @@ div.chat-wrapper {
   /* z-index: 10; */
   padding-left: calc(env(safe-area-inset-left) / 2);
   padding-right: calc(env(safe-area-inset-right, 4px) / 2);
+  box-sizing: content-box;
+  overflow: hidden;
 }
 
 .chat-messages-wrapper {
@@ -11,12 +13,17 @@ div.chat-wrapper {
   padding: 4px;
   padding-left: 0;
   max-height: var(--chatHeight);
-  width: var(--chatWidth);
+  width: calc(var(--chatWidth) - 5px); /* Custom scrollbar width */
   transform-origin: bottom left;
   transform: scale(var(--chatScale));
   pointer-events: none;
 }
 
+/* Restore full width when chat is opened */
+.chat-messages-wrapper.chat-opened {
+  width: var(--chatWidth);
+}
+
 .chat-input-wrapper {
   bottom: 1px;
   width: calc(100% - 3px);
diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index 7c1c8633..2bfe94db 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -18,6 +18,7 @@ const MessageLine = ({ message, currentPlayerName, chatOpened }: { message: Mess
   const [fadeState, setFadeState] = useState<'visible' | 'fading' | 'faded'>('visible')
 
   useEffect(() => {
+    if (window.debugStopChatFade) return
     // Start fading after 5 seconds
     const fadeTimeout = setTimeout(() => {
       setFadeState('fading')
@@ -324,7 +325,7 @@ export default ({
   return (
     <>
       <div
-        className={`chat-wrapper chat-messages-wrapper ${usingTouch ? 'display-mobile' : ''}`} style={{
+        className={`chat-wrapper chat-messages-wrapper ${usingTouch ? 'display-mobile' : ''} ${opened ? 'chat-opened' : ''}`} style={{
           userSelect: opened && allowSelection ? 'text' : undefined,
         }}
       >

From 01567ea589c8501956c362200ad2ca74744bf8fd Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 4 Jul 2025 01:44:26 +0300
Subject: [PATCH 044/136] add "mcraft.fun/debug-inputs.html"

---
 assets/debug-inputs.html | 237 +++++++++++++++++++++++++++++++++++++++
 rsbuild.config.ts        |   1 +
 2 files changed, 238 insertions(+)
 create mode 100644 assets/debug-inputs.html

diff --git a/assets/debug-inputs.html b/assets/debug-inputs.html
new file mode 100644
index 00000000..584fe4d7
--- /dev/null
+++ b/assets/debug-inputs.html
@@ -0,0 +1,237 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Web Input Debugger</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            padding: 20px;
+            background: #f0f0f0;
+        }
+        .key-container {
+            display: grid;
+            grid-template-columns: repeat(3, 60px);
+            gap: 5px;
+            margin: 20px 0;
+        }
+        .key {
+            width: 60px;
+            height: 60px;
+            border: 2px solid #333;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-weight: bold;
+            background: white;
+            position: relative;
+            user-select: none;
+        }
+        .key.pressed {
+            background: #90EE90;
+        }
+        .key .duration {
+            position: absolute;
+            bottom: 2px;
+            font-size: 10px;
+        }
+        .key .count {
+            position: absolute;
+            top: 2px;
+            right: 2px;
+            font-size: 10px;
+        }
+        .controls {
+            margin: 20px 0;
+            padding: 10px;
+            background: white;
+            border-radius: 5px;
+        }
+        .wasd-container {
+            position: relative;
+            width: 190px;
+            height: 130px;
+        }
+        #KeyW {
+            position: absolute;
+            left: 65px;
+            top: 0;
+        }
+        #KeyA {
+            position: absolute;
+            left: 0;
+            top: 65px;
+        }
+        #KeyS {
+            position: absolute;
+            left: 65px;
+            top: 65px;
+        }
+        #KeyD {
+            position: absolute;
+            left: 130px;
+            top: 65px;
+        }
+        .space-container {
+            margin-top: 20px;
+        }
+        #Space {
+            width: 190px;
+        }
+    </style>
+</head>
+<body>
+    <div class="controls">
+        <label>
+            <input type="checkbox" id="repeatMode"> Use keydown repeat mode (auto key-up after 150ms of no repeat)
+        </label>
+    </div>
+
+    <div class="wasd-container">
+        <div id="KeyW" class="key" data-code="KeyW">W</div>
+        <div id="KeyA" class="key" data-code="KeyA">A</div>
+        <div id="KeyS" class="key" data-code="KeyS">S</div>
+        <div id="KeyD" class="key" data-code="KeyD">D</div>
+    </div>
+
+    <div class="key-container">
+        <div id="ControlLeft" class="key" data-code="ControlLeft">Ctrl</div>
+    </div>
+
+    <div class="space-container">
+        <div id="Space" class="key" data-code="Space">Space</div>
+    </div>
+
+    <script>
+        const keys = {};
+        const keyStats = {};
+        const pressStartTimes = {};
+        const keyTimeouts = {};
+
+        function initKeyStats(code) {
+            if (!keyStats[code]) {
+                keyStats[code] = {
+                    pressCount: 0,
+                    duration: 0,
+                    startTime: 0
+                };
+            }
+        }
+
+        function updateKeyVisuals(code) {
+            const element = document.getElementById(code);
+            if (!element) return;
+
+            const stats = keyStats[code];
+            if (keys[code]) {
+                element.classList.add('pressed');
+                const currentDuration = ((Date.now() - stats.startTime) / 1000).toFixed(1);
+                element.innerHTML = `${element.getAttribute('data-code').replace('Key', '').replace('Left', '')}<span class="duration">${currentDuration}s</span><span class="count">${stats.pressCount}</span>`;
+            } else {
+                element.classList.remove('pressed');
+                element.innerHTML = `${element.getAttribute('data-code').replace('Key', '').replace('Left', '')}<span class="count">${stats.pressCount}</span>`;
+            }
+        }
+
+        function releaseKey(code) {
+            keys[code] = false;
+            if (pressStartTimes[code]) {
+                keyStats[code].duration += (Date.now() - pressStartTimes[code]) / 1000;
+                delete pressStartTimes[code];
+            }
+            updateKeyVisuals(code);
+        }
+
+        function handleKeyDown(event) {
+            const code = event.code;
+            const isRepeatMode = document.getElementById('repeatMode').checked;
+
+            initKeyStats(code);
+
+            // Clear any existing timeout for this key
+            if (keyTimeouts[code]) {
+                clearTimeout(keyTimeouts[code]);
+                delete keyTimeouts[code];
+            }
+
+            if (isRepeatMode) {
+                // In repeat mode, always handle the keydown
+                if (!keys[code] || event.repeat) {
+                    keys[code] = true;
+                    if (!event.repeat) {
+                        // Only increment count on initial press, not repeats
+                        keyStats[code].pressCount++;
+                        keyStats[code].startTime = Date.now();
+                        pressStartTimes[code] = Date.now();
+                    }
+                }
+
+                // Set timeout to release key if no repeat events come
+                keyTimeouts[code] = setTimeout(() => {
+                    releaseKey(code);
+                }, 150);
+            } else {
+                // In normal mode, only handle keydown if key is not already pressed
+                if (!keys[code]) {
+                    keys[code] = true;
+                    keyStats[code].pressCount++;
+                    keyStats[code].startTime = Date.now();
+                    pressStartTimes[code] = Date.now();
+                }
+            }
+
+            updateKeyVisuals(code);
+            event.preventDefault();
+        }
+
+        function handleKeyUp(event) {
+            const code = event.code;
+            const isRepeatMode = document.getElementById('repeatMode').checked;
+
+            if (!isRepeatMode) {
+                releaseKey(code);
+            }
+
+            event.preventDefault();
+        }
+
+        // Initialize all monitored keys
+        const monitoredKeys = ['KeyW', 'KeyA', 'KeyS', 'KeyD', 'ControlLeft', 'Space'];
+        monitoredKeys.forEach(code => {
+            initKeyStats(code);
+            const element = document.getElementById(code);
+            if (element) {
+                element.innerHTML = `${element.getAttribute('data-code').replace('Key', '').replace('Left', '')}<span class="count">0</span>`;
+            }
+        });
+
+        // Start visual updates
+        setInterval(() => {
+            monitoredKeys.forEach(code => {
+                if (keys[code]) {
+                    updateKeyVisuals(code);
+                }
+            });
+        }, 100);
+
+        // Event listeners
+        document.addEventListener('keydown', handleKeyDown);
+        document.addEventListener('keyup', handleKeyUp);
+
+        // Handle mode changes
+        document.getElementById('repeatMode').addEventListener('change', () => {
+            // Release all keys when switching modes
+            monitoredKeys.forEach(code => {
+                if (keys[code]) {
+                    releaseKey(code);
+                }
+                if (keyTimeouts[code]) {
+                    clearTimeout(keyTimeouts[code]);
+                    delete keyTimeouts[code];
+                }
+            });
+        });
+    </script>
+</body>
+</html>
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index 5014bdf9..219fe57e 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -193,6 +193,7 @@ const appConfig = defineConfig({
                     fs.copyFileSync('./assets/playground.html', './dist/playground.html')
                     fs.copyFileSync('./assets/manifest.json', './dist/manifest.json')
                     fs.copyFileSync('./assets/config.html', './dist/config.html')
+                    fs.copyFileSync('./assets/debug-inputs.html', './dist/debug-inputs.html')
                     fs.copyFileSync('./assets/loading-bg.jpg', './dist/loading-bg.jpg')
                     if (fs.existsSync('./assets/release.json')) {
                         fs.copyFileSync('./assets/release.json', './dist/release.json')

From 45bc76d825ea656a9154d11bfd54a1323a02891a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 4 Jul 2025 17:29:55 +0300
Subject: [PATCH 045/136] hotfix(chat): fix all annoying issues on mobile. fix
 chat was not visible on mobile at all!

---
 src/react/Chat.css | 11 +++++-
 src/react/Chat.tsx | 87 ++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 91 insertions(+), 7 deletions(-)

diff --git a/src/react/Chat.css b/src/react/Chat.css
index 1f29a59c..246f17b3 100644
--- a/src/react/Chat.css
+++ b/src/react/Chat.css
@@ -5,6 +5,10 @@ div.chat-wrapper {
   padding-left: calc(env(safe-area-inset-left) / 2);
   padding-right: calc(env(safe-area-inset-right, 4px) / 2);
   box-sizing: content-box;
+}
+
+/* Only apply overflow hidden when not in mobile mode */
+div.chat-wrapper:not(.display-mobile):not(.input-mobile) {
   overflow: hidden;
 }
 
@@ -69,7 +73,7 @@ div.chat-wrapper {
   top: 100%;
   padding-left: calc(env(safe-area-inset-left) / 2);
   margin-top: 14px;
-  margin-left: 20px;
+  margin-left: 40px;
   /* input height */
 }
 
@@ -116,6 +120,11 @@ div.chat-wrapper {
   justify-content: flex-start;
 }
 
+.input-mobile .chat-completions-items > div {
+  padding: 4px 0;
+  font-size: 10px;
+}
+
 .input-mobile {
   top: 15px;
   position: absolute;
diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index 2bfe94db..a45d7a69 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -112,7 +112,9 @@ export default ({
 
   const sendHistoryRef = useRef(JSON.parse(window.sessionStorage.chatHistory || '[]'))
   const [isInputFocused, setIsInputFocused] = useState(false)
-  const spellCheckEnabled = false
+  const [spellCheckEnabled, setSpellCheckEnabled] = useState(false)
+  const [preservedInputValue, setPreservedInputValue] = useState('')
+  const [inputKey, setInputKey] = useState(0)
   const pingHistoryRef = useRef(JSON.parse(window.localStorage.pingHistory || '[]'))
 
   const [completePadText, setCompletePadText] = useState('')
@@ -237,12 +239,16 @@ export default ({
     if (opened) {
       completeRequestValue.current = ''
       resetCompletionItems()
+    } else {
+      setPreservedInputValue('')
     }
   }, [opened])
 
   const onMainInputChange = () => {
     const lastWord = chatInput.current.value.slice(0, chatInput.current.selectionEnd ?? chatInput.current.value.length).split(' ').at(-1)!
-    if (lastWord.startsWith('@') && getPingComplete) {
+    const isCommand = chatInput.current.value.startsWith('/')
+
+    if (lastWord.startsWith('@') && getPingComplete && !isCommand) {
       setCompletePadText(lastWord)
       void fetchPingCompletions(true, lastWord.slice(1))
       return
@@ -322,6 +328,29 @@ export default ({
     return completeValue
   }
 
+  const handleSlashCommand = () => {
+    remountInput('/')
+  }
+
+  const handleAcceptFirstCompletion = () => {
+    if (completionItems.length > 0) {
+      acceptComplete(completionItems[0])
+    }
+  }
+
+  const remountInput = (newValue?: string) => {
+    if (newValue !== undefined) {
+      setPreservedInputValue(newValue)
+    }
+    setInputKey(k => k + 1)
+  }
+
+  useEffect(() => {
+    if (preservedInputValue && chatInput.current) {
+      chatInput.current.focus()
+    }
+  }, [inputKey]) // Changed from spellCheckEnabled to inputKey
+
   return (
     <>
       <div
@@ -386,8 +415,53 @@ export default ({
       </div>
 
       <div className={`chat-wrapper chat-input-wrapper ${usingTouch ? 'input-mobile' : ''}`} hidden={!opened}>
-        {/* close button */}
-        {usingTouch && <Button icon={pixelartIcons.close} onClick={() => onClose?.()} />}
+        {usingTouch && (
+          <>
+            <Button
+              icon={pixelartIcons.close}
+              onClick={() => onClose?.()}
+              style={{
+                width: 20,
+                flexShrink: 0,
+              }}
+            />
+
+            {(chatInput.current?.value && !chatInput.current.value.startsWith('/')) ? (
+              // TOGGLE SPELL CHECK
+              <Button
+                style={{
+                  width: 20,
+                  flexShrink: 0,
+                }}
+                overlayColor={spellCheckEnabled ? '#00ff00' : '#ff0000'}
+                icon={pixelartIcons['text-wrap']}
+                onClick={() => {
+                  setPreservedInputValue(chatInput.current?.value || '')
+                  setSpellCheckEnabled(!spellCheckEnabled)
+                  remountInput()
+                }}
+              />
+            ) : (
+              // SLASH COMMAND
+              <Button
+                style={{
+                  width: 20,
+                  flexShrink: 0,
+                }}
+                label={chatInput.current?.value ? undefined : '/'}
+                icon={chatInput.current?.value ? pixelartIcons['arrow-right'] : undefined}
+                onClick={() => {
+                  const inputValue = chatInput.current.value
+                  if (!inputValue) {
+                    handleSlashCommand()
+                  } else if (completionItems.length > 0) {
+                    handleAcceptFirstCompletion()
+                  }
+                }}
+              />
+            )}
+          </>
+        )}
         <div className="chat-input">
           {isInputFocused && completionItems?.length ? (
             <div className="chat-completions">
@@ -431,9 +505,10 @@ export default ({
             />}
             <input
               maxLength={chatVanillaRestrictions ? 256 : undefined}
-              defaultValue=''
+              defaultValue={preservedInputValue}
               // ios doesn't support toggling autoCorrect on the fly so we need to re-create the input
-              key={spellCheckEnabled ? 'true' : 'false'}
+              key={`${inputKey}`}
+              autoCapitalize={preservedInputValue ? 'off' : 'on'}
               ref={chatInput}
               type="text"
               className="chat-input"

From f489c5f4776993187138c487e4dad039fb6ae9f4 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Fri, 4 Jul 2025 14:33:36 +0000
Subject: [PATCH 046/136] fix: skin from textures property would not show
 (#385)

---
 pnpm-lock.yaml                    | 14 ++++----
 renderer/viewer/three/entities.ts |  1 +
 src/entities.ts                   | 60 ++++++++++++++-----------------
 3 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 291cec39..c37e0510 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/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980(encoding@0.1.13))
       minecraft-data:
         specifier: 3.92.0
         version: 3.92.0
@@ -341,7 +341,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41(@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/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.11
         version: 0.1.11
@@ -6678,8 +6678,8 @@ packages:
     resolution: {integrity: sha512-GtW4hkijyZbSu5LKYYD89xZu+XY7OoP7IkrCnNEn6EdPm0+vr2THoJgFGKrlze9/81+T+P3E4qvJXNFiU/zeJg==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980}
     version: 4.30.0
     engines: {node: '>=22'}
 
@@ -16956,12 +16956,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/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980(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/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17379,7 +17379,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 414b0279..c05aac99 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -486,6 +486,7 @@ export class Entities {
       .some(channel => channel !== 0)
   }
 
+  // todo true/undefined doesnt reset the skin to the default one
   // eslint-disable-next-line max-params
   async updatePlayerSkin (entityId: string | number, username: string | undefined, uuidCache: string | undefined, skinUrl: string | true, capeUrl: string | true | undefined = undefined) {
     if (uuidCache) {
diff --git a/src/entities.ts b/src/entities.ts
index 3dac51ce..79602aa5 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -198,46 +198,40 @@ customEvents.on('gameLoaded', () => {
     }
   })
 
-  // Texture override from packet properties
-  bot._client.on('player_info', (packet) => {
-    const applySkinTexturesProxy = (url: string) => {
-      const { appConfig } = miscUiState
-      if (appConfig?.skinTexturesProxy) {
-        return url?.replace('http://textures.minecraft.net/', appConfig.skinTexturesProxy)
-          .replace('https://textures.minecraft.net/', appConfig.skinTexturesProxy)
-      }
-      return url
+  const applySkinTexturesProxy = (url: string | undefined) => {
+    const { appConfig } = miscUiState
+    if (appConfig?.skinTexturesProxy) {
+      return url?.replace('http://textures.minecraft.net/', appConfig.skinTexturesProxy)
+        .replace('https://textures.minecraft.net/', appConfig.skinTexturesProxy)
     }
+    return url
+  }
 
-    for (const playerEntry of packet.data) {
-      if (!playerEntry.player && !playerEntry.properties) continue
-      let textureProperty = playerEntry.properties?.find(prop => prop?.name === 'textures')
-      if (!textureProperty) {
-        textureProperty = playerEntry.player?.properties?.find(prop => prop?.key === 'textures')
-      }
-      if (textureProperty) {
-        try {
-          const textureData = JSON.parse(Buffer.from(textureProperty.value, 'base64').toString())
-          const skinUrl = applySkinTexturesProxy(textureData.textures?.SKIN?.url)
-          const capeUrl = applySkinTexturesProxy(textureData.textures?.CAPE?.url)
+  // Texture override from packet properties
+  const updateSkin = (player: import('mineflayer').Player) => {
+    if (!player.uuid || !player.username || !player.skinData) return
 
-          // Find entity with matching UUID and update skin
-          let entityId = ''
-          for (const [entId, entity] of Object.entries(bot.entities)) {
-            if (entity.uuid === playerEntry.uuid) {
-              entityId = entId
-              break
-            }
-          }
-          // even if not found, still record to cache
-          void getThreeJsRendererMethods()?.updatePlayerSkin(entityId, playerEntry.player?.name, playerEntry.uuid, skinUrl, capeUrl)
-        } catch (err) {
-          console.error('Error decoding player texture:', err)
+    try {
+      const skinUrl = applySkinTexturesProxy(player.skinData.url)
+      const capeUrl = applySkinTexturesProxy((player.skinData as any).capeUrl)
+
+      // Find entity with matching UUID and update skin
+      let entityId = ''
+      for (const [entId, entity] of Object.entries(bot.entities)) {
+        if (entity.uuid === player.uuid) {
+          entityId = entId
+          break
         }
       }
+      // even if not found, still record to cache
+      void getThreeJsRendererMethods()?.updatePlayerSkin(entityId, player.username, player.uuid, skinUrl ?? true, capeUrl)
+    } catch (err) {
+      console.error('Error decoding player texture:', err)
     }
+  }
 
-  })
+  bot.on('playerJoined', updateSkin)
+  bot.on('playerUpdated', updateSkin)
 
   bot.on('teamUpdated', (team: Team) => {
     for (const entity of Object.values(bot.entities)) {

From fa56d479b1f06c3f2c699d60e7b6f08ba5df34b1 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 4 Jul 2025 18:04:24 +0300
Subject: [PATCH 047/136] feat: add report bug button

---
 config.mcraft-only.json   |  3 ++-
 src/appConfig.ts          |  1 +
 src/react/PauseScreen.tsx | 56 ++++++++++++++++++++++++++++++++++-----
 src/utils.ts              |  2 +-
 4 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/config.mcraft-only.json b/config.mcraft-only.json
index 51b6eee6..7d9a7b59 100644
--- a/config.mcraft-only.json
+++ b/config.mcraft-only.json
@@ -1,3 +1,4 @@
 {
-  "alwaysReconnectButton": true
+  "alwaysReconnectButton": true,
+  "reportBugButtonWithReconnect": true
 }
diff --git a/src/appConfig.ts b/src/appConfig.ts
index b8c1e219..ae9851b6 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -56,6 +56,7 @@ export type AppConfig = {
   defaultUsername?: string
   skinTexturesProxy?: string
   alwaysReconnectButton?: boolean
+  reportBugButtonWithReconnect?: boolean
 }
 
 export const loadAppConfig = (appConfig: AppConfig) => {
diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index 4bdd2974..12748b54 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -32,7 +32,7 @@ import Screen from './Screen'
 import styles from './PauseScreen.module.css'
 import { DiscordButton } from './DiscordButton'
 import { showNotification } from './NotificationProvider'
-import { appStatusState, reconnectReload } from './AppStatusProvider'
+import { appStatusState, lastConnectOptions, reconnectReload } from './AppStatusProvider'
 import NetworkStatus from './NetworkStatus'
 import PauseLinkButtons from './PauseLinkButtons'
 import { pixelartIcons } from './PixelartIcon'
@@ -265,7 +265,7 @@ export default () => {
     <div className={styles.pause_container}>
       <Button className="button" style={{ width: '204px' }} onClick={onReturnPress}>Back to Game</Button>
       <PauseLinkButtons />
-      <Button className="button" style={{ width: '204px' }} onClick={() => openOptionsMenu('main')}>Options</Button>
+      <Button className="button" style={{ width: '204px' }} onClick={() => openOptionsMenu('main')}>Options...</Button>
       {singleplayer ? (
         <div className={styles.row}>
           <Button className="button" style={{ width: '170px' }} onClick={async () => clickJoinLinkButton()}>
@@ -294,10 +294,54 @@ export default () => {
           {fsState.inMemorySave && !fsState.syncFs && !fsState.isReadonly ? 'Save & Quit' : 'Disconnect & Reset'}
         </Button>
       </>}
-      {(noConnection || appConfig?.alwaysReconnectButton) && (
-        <Button className="button" style={{ width: '204px' }} onClick={reconnectReload}>
-          Reconnect
-        </Button>
+      {(true) && (
+        <div className={styles.row}>
+          <Button className="button" style={{ width: '98px' }} onClick={reconnectReload}>
+            Reconnect
+          </Button>
+          {true && (
+            <Button
+              label="Report Problem"
+              className="button"
+              style={{ width: '98px' }}
+              onClick={async () => {
+                const platform = (navigator as any).userAgentData?.platform ?? navigator.platform
+                const body = `Version: ${window.location.hostname}\nServer: ${lastConnectOptions.value?.server ?? '<not a server>'}\nPlatform: ${platform}\nWebsite: ${window.location.href}`
+                const currentHost = window.location.hostname
+                const options = [
+                  'GitHub (please use it if you can)',
+                  'Email',
+                  ...((currentHost === 'mcraft.fun' || currentHost === 'ru.mcraft.fun') ? ['Try Beta Version'] : []),
+                  // 'Use previous versions of client'
+                ]
+                const action = await showOptionsModal('Report client issue', options)
+                if (!action) return
+
+                switch (action) {
+                  case 'GitHub (please use it if you can)':
+                    openGithub(`/issues/new?body=${encodeURIComponent(body)}&title=${encodeURIComponent('[Bug Report] <describe your issue here>')}&labels=bug`)
+                    break
+                  case 'Email': {
+                    window.location.href = `mailto:support@mcraft.fun?body=${encodeURIComponent(body)}`
+                    break
+                  }
+                  case 'Try Beta Version': {
+                    if (currentHost === 'mcraft.fun') {
+                      window.location.href = 'https://s.mcraft.fun'
+                    } else if (currentHost === 'ru.mcraft.fun') {
+                      window.location.href = 'https://s.pcm.gg'
+                    }
+                    break
+                  }
+                  case 'Use previous versions of client':
+                    // TODO: Implement versions screen
+                    void showOptionsModal('Previous versions', [])
+                    break
+                }
+              }}
+            />
+          )}
+        </div>
       )}
     </div>
     <LoadingTimer />
diff --git a/src/utils.ts b/src/utils.ts
index d48fbbc3..3ccc7fc4 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -163,7 +163,7 @@ export const reloadChunks = async () => {
 }
 
 export const openGithub = (addUrl = '') => {
-  window.open(`${process.env.GITHUB_URL}${addUrl}`, '_blank')
+  window.open(`${process.env.GITHUB_URL?.replace(/\/$/, '')}${addUrl}`, '_blank')
 }
 
 export const resolveTimeout = async (promise, timeout = 10_000) => {

From 2f93c08b1e66a8410f3f4ad327921d717381b814 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 4 Jul 2025 18:05:26 +0300
Subject: [PATCH 048/136] fix lint

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

diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index 12748b54..3036aa4b 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -294,12 +294,12 @@ export default () => {
           {fsState.inMemorySave && !fsState.syncFs && !fsState.isReadonly ? 'Save & Quit' : 'Disconnect & Reset'}
         </Button>
       </>}
-      {(true) && (
+      {(noConnection || appConfig?.alwaysReconnectButton) && (
         <div className={styles.row}>
-          <Button className="button" style={{ width: '98px' }} onClick={reconnectReload}>
+          <Button className="button" style={{ width: appConfig?.reportBugButtonWithReconnect ? '98px' : '204px' }} onClick={reconnectReload}>
             Reconnect
           </Button>
-          {true && (
+          {appConfig?.reportBugButtonWithReconnect && (
             <Button
               label="Report Problem"
               className="button"

From 089f2224e25a6f193dba187d11d354afee645292 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 8 Jul 2025 15:12:23 +0300
Subject: [PATCH 049/136] fix(mobile): drop stack on hotbar hold feat(config):
 add powerful way to disable some actions in the client entirely (eg opening
 inventory or dropping items)

---
 src/appConfig.ts              |  3 +++
 src/controls.ts               | 15 +++++++++++++++
 src/react/HotbarRenderApp.tsx | 26 ++++++++++----------------
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/appConfig.ts b/src/appConfig.ts
index ae9851b6..52fba96d 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -24,6 +24,7 @@ export type MobileButtonConfig = {
   readonly icon?: string
   readonly action?: ActionType
   readonly actionHold?: ActionType | ActionHoldConfig
+  readonly iconStyle?: React.CSSProperties
 }
 
 export type AppConfig = {
@@ -57,9 +58,11 @@ export type AppConfig = {
   skinTexturesProxy?: string
   alwaysReconnectButton?: boolean
   reportBugButtonWithReconnect?: boolean
+  disabledCommands?: string[] // Array of command IDs to disable (e.g. ['general.jump', 'general.chat'])
 }
 
 export const loadAppConfig = (appConfig: AppConfig) => {
+
   if (miscUiState.appConfig) {
     Object.assign(miscUiState.appConfig, appConfig)
   } else {
diff --git a/src/controls.ts b/src/controls.ts
index 44de8f11..9430f9c1 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -116,6 +116,10 @@ export const contro = new ControMax({
 window.controMax = contro
 export type Command = CommandEventArgument<typeof contro['_commandsRaw']>['command']
 
+export const isCommandDisabled = (command: Command) => {
+  return miscUiState.appConfig?.disabledCommands?.includes(command)
+}
+
 onControInit()
 
 updateBinds(customKeymaps)
@@ -544,6 +548,8 @@ const customCommandsHandler = ({ command }) => {
 contro.on('trigger', customCommandsHandler)
 
 contro.on('trigger', ({ command }) => {
+  if (isCommandDisabled(command)) return
+
   const willContinue = !isGameActive(true)
   alwaysPressedHandledCommand(command)
   if (willContinue) return
@@ -677,6 +683,8 @@ contro.on('trigger', ({ command }) => {
 })
 
 contro.on('release', ({ command }) => {
+  if (isCommandDisabled(command)) return
+
   inModalCommand(command, false)
   onTriggerOrReleased(command, false)
 })
@@ -996,9 +1004,16 @@ export const handleMobileButtonCustomAction = (action: CustomAction) => {
   }
 }
 
+export const triggerCommand = (command: Command, isDown: boolean) => {
+  handleMobileButtonActionCommand(command, isDown)
+}
+
 export const handleMobileButtonActionCommand = (command: ActionType | ActionHoldConfig, isDown: boolean) => {
   const commandValue = typeof command === 'string' ? command : 'command' in command ? command.command : command
 
+  // Check if command is disabled before proceeding
+  if (typeof commandValue === 'string' && isCommandDisabled(commandValue as Command)) return
+
   if (typeof commandValue === 'string' && !stringStartsWith(commandValue, 'custom')) {
     const event: CommandEventArgument<typeof contro['_commandsRaw']> = {
       command: commandValue as Command,
diff --git a/src/react/HotbarRenderApp.tsx b/src/react/HotbarRenderApp.tsx
index 80f0a789..ed1f42e6 100644
--- a/src/react/HotbarRenderApp.tsx
+++ b/src/react/HotbarRenderApp.tsx
@@ -2,15 +2,15 @@ import { useEffect, useRef, useState } from 'react'
 import { motion, AnimatePresence } from 'framer-motion'
 import { createPortal } from 'react-dom'
 import { subscribe, useSnapshot } from 'valtio'
-import { openItemsCanvas, openPlayerInventory, upInventoryItems } from '../inventoryWindows'
+import { openItemsCanvas, upInventoryItems } from '../inventoryWindows'
 import { activeModalStack, isGameActive, miscUiState } from '../globalState'
 import { currentScaling } from '../scaleInterface'
 import { watchUnloadForCleanup } from '../gameUnload'
 import { getItemNameRaw } from '../mineflayer/items'
 import { isInRealGameSession } from '../utils'
+import { triggerCommand } from '../controls'
 import MessageFormattedString from './MessageFormattedString'
 import SharedHudVars from './SharedHudVars'
-import { packetsReplayState } from './state/packetsReplayState'
 
 
 const ItemName = ({ itemKey }: { itemKey: string }) => {
@@ -75,6 +75,8 @@ const HotbarInner = () => {
   const container = useRef<HTMLDivElement>(null!)
   const [itemKey, setItemKey] = useState('')
   const hasModals = useSnapshot(activeModalStack).length
+  const { currentTouch, appConfig } = useSnapshot(miscUiState)
+  const mobileOpenInventory = currentTouch && !appConfig?.disabledCommands?.includes('general.inventory')
 
   useEffect(() => {
     const controller = new AbortController()
@@ -105,7 +107,7 @@ const HotbarInner = () => {
       canvasManager.setScale(currentScaling.scale)
 
       canvasManager.windowHeight = 25 * canvasManager.scale
-      canvasManager.windowWidth = (210 - (inv.inventory.supportsOffhand ? 0 : 25) + (miscUiState.currentTouch ? 28 : 0)) * canvasManager.scale
+      canvasManager.windowWidth = (210 - (inv.inventory.supportsOffhand ? 0 : 25) + (mobileOpenInventory ? 28 : 0)) * canvasManager.scale
     }
     setSize()
     watchUnloadForCleanup(subscribe(currentScaling, setSize))
@@ -119,8 +121,9 @@ const HotbarInner = () => {
     canvasManager.canvas.onclick = (e) => {
       if (!isGameActive(true)) return
       const pos = inv.canvasManager.getMousePos(inv.canvas, e)
-      if (canvasManager.canvas.width - pos.x < 35 * inv.canvasManager.scale) {
-        openPlayerInventory()
+      if (canvasManager.canvas.width - pos.x < 35 * inv.canvasManager.scale && mobileOpenInventory) {
+        triggerCommand('general.inventory', true)
+        triggerCommand('general.inventory', false)
       }
     }
 
@@ -180,17 +183,8 @@ const HotbarInner = () => {
     })
     document.addEventListener('touchend', (e) => {
       if (touchStart && (e.target as HTMLElement).closest('.hotbar') && Date.now() - touchStart > 700) {
-        // drop item
-        bot._client.write('block_dig', {
-          'status': 4,
-          'location': {
-            'x': 0,
-            'z': 0,
-            'y': 0
-          },
-          'face': 0,
-          sequence: 0
-        })
+        triggerCommand('general.dropStack', true)
+        triggerCommand('general.dropStack', false)
       }
       touchStart = 0
     })

From c844b99cf2fc2ae62299817b7d3408da6fd58f00 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 8 Jul 2025 15:15:54 +0300
Subject: [PATCH 050/136] fix(regression): fix chat completions were not
 visible on pc

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

diff --git a/src/react/Chat.css b/src/react/Chat.css
index 246f17b3..ff9f60b1 100644
--- a/src/react/Chat.css
+++ b/src/react/Chat.css
@@ -9,7 +9,7 @@ div.chat-wrapper {
 
 /* Only apply overflow hidden when not in mobile mode */
 div.chat-wrapper:not(.display-mobile):not(.input-mobile) {
-  overflow: hidden;
+  /* overflow: hidden; */
 }
 
 .chat-messages-wrapper {

From 09b0e2e493f841077e090a57bc4d125a70353566 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 8 Jul 2025 15:42:06 +0300
Subject: [PATCH 051/136] add a way to disable some parts of bars ui via config
 and select them via devtool elem select

---
 src/react/ArmorBar.css        |  1 -
 src/react/BreathBar.css       |  1 -
 src/react/FoodBar.css         |  1 -
 src/react/HealthBar.css       |  1 -
 src/react/HudBarsProvider.tsx | 20 ++++++++++++--------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/react/ArmorBar.css b/src/react/ArmorBar.css
index ca579a72..9718e553 100644
--- a/src/react/ArmorBar.css
+++ b/src/react/ArmorBar.css
@@ -8,7 +8,6 @@
   --offset: calc(-1 * 25px);
   --bg-x: calc(-1 * 16px);
   --bg-y: calc(-1 * 9px);
-  pointer-events: none;
   image-rendering: pixelated;
 }
 
diff --git a/src/react/BreathBar.css b/src/react/BreathBar.css
index e98cf7c2..bcf93303 100644
--- a/src/react/BreathBar.css
+++ b/src/react/BreathBar.css
@@ -9,7 +9,6 @@
   --offset: calc(-1 * 16px);
   --bg-x: calc(-1 * 16px);
   --bg-y: calc(-1 * 18px);
-  pointer-events: none;
   image-rendering: pixelated;
 }
 
diff --git a/src/react/FoodBar.css b/src/react/FoodBar.css
index ca3629cd..83da3c25 100644
--- a/src/react/FoodBar.css
+++ b/src/react/FoodBar.css
@@ -11,7 +11,6 @@
   --offset: calc(-1 * (52px + (9px * (4 * var(--kind) + var(--lightened) * 2))));
   --bg-x: calc(-1 * (16px + 9px * var(--lightened)));
   --bg-y: calc(-1 * 27px);
-  pointer-events: none;
   image-rendering: pixelated;
 }
 
diff --git a/src/react/HealthBar.css b/src/react/HealthBar.css
index a6fefe09..72f5a1fe 100644
--- a/src/react/HealthBar.css
+++ b/src/react/HealthBar.css
@@ -11,7 +11,6 @@
   --offset: calc(-1 * (52px + (9px * (4 * var(--kind) + var(--lightened) * 2)) ));
   --bg-x: calc(-1 * (16px + 9px * var(--lightened)));
   --bg-y: calc(-1 * var(--hardcore) * 45px);
-  pointer-events: none;
   image-rendering: pixelated;
 }
 
diff --git a/src/react/HudBarsProvider.tsx b/src/react/HudBarsProvider.tsx
index db061500..42fa8378 100644
--- a/src/react/HudBarsProvider.tsx
+++ b/src/react/HudBarsProvider.tsx
@@ -1,5 +1,7 @@
 import { useRef, useState, useMemo } from 'react'
 import { GameMode } from 'mineflayer'
+import { useSnapshot } from 'valtio'
+import { options } from '../optionsStorage'
 import { armor } from './armorValues'
 import HealthBar from './HealthBar'
 import FoodBar from './FoodBar'
@@ -8,6 +10,8 @@ import BreathBar from './BreathBar'
 import './HealthBar.css'
 
 export default () => {
+  const { disabledUiParts } = useSnapshot(options)
+
   const [damaged, setDamaged] = useState(false)
   const [healthValue, setHealthValue] = useState(bot.health)
   const [food, setFood] = useState(bot.food)
@@ -91,7 +95,7 @@ export default () => {
   }, [])
 
   return <div className='hud-bars-container'>
-    <HealthBar
+    {!disabledUiParts.includes('health-bar') && <HealthBar
       gameMode={gameMode}
       isHardcore={isHardcore}
       damaged={damaged}
@@ -102,12 +106,12 @@ export default () => {
         setEffectToAdd(null)
         setEffectToRemove(null)
       }}
-    />
-    <ArmorBar
+    />}
+    {!disabledUiParts.includes('armor-bar') && <ArmorBar
       armorValue={armorValue}
       style={gameMode !== 'survival' && gameMode !== 'adventure' ? { display: 'none' } : { display: 'flex' }}
-    />
-    <FoodBar
+    />}
+    {!disabledUiParts.includes('food-bar') && <FoodBar
       gameMode={gameMode}
       food={food}
       effectToAdd={effectToAdd}
@@ -116,9 +120,9 @@ export default () => {
         setEffectToAdd(null)
         setEffectToRemove(null)
       }}
-    />
-    <BreathBar
+    />}
+    {!disabledUiParts.includes('breath-bar') && <BreathBar
       oxygen={gameMode !== 'survival' && gameMode !== 'adventure' ? 0 : oxygen}
-    />
+    />}
   </div>
 }

From 16609aa010fd92cdce7aac3fab54f126feae28de Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 8 Jul 2025 16:35:05 +0300
Subject: [PATCH 052/136] fix falsey settings apply

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

diff --git a/src/appConfig.ts b/src/appConfig.ts
index 52fba96d..92fde21a 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -74,7 +74,7 @@ export const loadAppConfig = (appConfig: AppConfig) => {
       if (value) {
         disabledSettings.value.add(key)
         // since the setting is forced, we need to set it to that value
-        if (appConfig.defaultSettings?.[key] && !qsOptions[key]) {
+        if (appConfig.defaultSettings && key in appConfig.defaultSettings && !qsOptions[key]) {
           options[key] = appConfig.defaultSettings[key]
         }
       } else {
@@ -82,6 +82,7 @@ export const loadAppConfig = (appConfig: AppConfig) => {
       }
     }
   }
+  // todo apply defaultSettings to defaults even if not forced in case of remote config
 
   if (appConfig.keybindings) {
     Object.assign(customKeymaps, defaultsDeep(appConfig.keybindings, customKeymaps))

From 826b24d9e266b0e59948ac4778bd9750e8e51973 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Wed, 9 Jul 2025 16:10:50 +0300
Subject: [PATCH 053/136] Metrics server (#390)

---
 package.json           |   4 +-
 rsbuild.config.ts      |  10 ++++
 scripts/requestData.ts |  42 +++++++++++++++++
 scripts/wsServer.ts    |  45 ++++++++++++++++++
 src/devtools.ts        | 103 +++++++++++++++++++++++++++++++++++++++++
 src/env.d.ts           |   1 +
 6 files changed, 204 insertions(+), 1 deletion(-)
 create mode 100644 scripts/requestData.ts
 create mode 100644 scripts/wsServer.ts

diff --git a/package.json b/package.json
index a09b92a3..fe4adb16 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
     "dev-proxy": "node server.js",
     "start": "run-p dev-proxy dev-rsbuild watch-mesher",
     "start2": "run-p dev-rsbuild watch-mesher",
+    "start-metrics": "ENABLE_METRICS=true rsbuild dev",
     "build": "pnpm build-other-workers && rsbuild build",
     "build-analyze": "BUNDLE_ANALYZE=true rsbuild build && pnpm build-other-workers",
     "build-single-file": "SINGLE_FILE_BUILD=true rsbuild build",
@@ -32,7 +33,8 @@
     "run-all": "run-p start run-playground",
     "build-playground": "rsbuild build --config renderer/rsbuild.config.ts",
     "watch-playground": "rsbuild dev --config renderer/rsbuild.config.ts",
-    "update-git-deps": "tsx scripts/updateGitDeps.ts"
+    "update-git-deps": "tsx scripts/updateGitDeps.ts",
+    "request-data": "tsx scripts/requestData.ts"
   },
   "keywords": [
     "prismarine",
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index 219fe57e..e264f6b7 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -15,6 +15,7 @@ import { appAndRendererSharedConfig } from './renderer/rsbuildSharedConfig'
 import { genLargeDataAliases } from './scripts/genLargeDataAliases'
 import sharp from 'sharp'
 import supportedVersions from './src/supportedVersions.mjs'
+import { startWsServer } from './scripts/wsServer'
 
 const SINGLE_FILE_BUILD = process.env.SINGLE_FILE_BUILD === 'true'
 
@@ -59,6 +60,8 @@ const configSource = (SINGLE_FILE_BUILD ? 'BUNDLED' : (process.env.CONFIG_JSON_S
 
 const faviconPath = 'favicon.png'
 
+const enableMetrics = process.env.ENABLE_METRICS === 'true'
+
 // base options are in ./renderer/rsbuildSharedConfig.ts
 const appConfig = defineConfig({
     html: {
@@ -159,6 +162,7 @@ const appConfig = defineConfig({
             'process.env.INLINED_APP_CONFIG': JSON.stringify(configSource === 'BUNDLED' ? configJson : null),
             'process.env.ENABLE_COOKIE_STORAGE': JSON.stringify(process.env.ENABLE_COOKIE_STORAGE || true),
             'process.env.COOKIE_STORAGE_PREFIX': JSON.stringify(process.env.COOKIE_STORAGE_PREFIX || ''),
+            'process.env.WS_PORT': JSON.stringify(enableMetrics ? 8081 : false),
         },
     },
     server: {
@@ -216,6 +220,12 @@ const appConfig = defineConfig({
                         await execAsync('pnpm run build-mesher')
                     }
                     fs.writeFileSync('./dist/version.txt', buildingVersion, 'utf-8')
+
+                    // Start WebSocket server in development
+                    if (dev && enableMetrics) {
+                        await startWsServer(8081, false)
+                    }
+
                     console.timeEnd('total-prep')
                 }
                 if (!dev) {
diff --git a/scripts/requestData.ts b/scripts/requestData.ts
new file mode 100644
index 00000000..dc866a1b
--- /dev/null
+++ b/scripts/requestData.ts
@@ -0,0 +1,42 @@
+import WebSocket from 'ws'
+
+function formatBytes(bytes: number) {
+  return `${(bytes).toFixed(2)} MB`
+}
+
+function formatTime(ms: number) {
+  return `${(ms / 1000).toFixed(2)}s`
+}
+
+const ws = new WebSocket('ws://localhost:8081')
+
+ws.on('open', () => {
+  console.log('Connected to metrics server, waiting for metrics...')
+})
+
+ws.on('message', (data) => {
+  try {
+    const metrics = JSON.parse(data.toString())
+    console.log('\nPerformance Metrics:')
+    console.log('------------------')
+    console.log(`Load Time: ${formatTime(metrics.loadTime)}`)
+    console.log(`Memory Usage: ${formatBytes(metrics.memoryUsage)}`)
+    console.log(`Timestamp: ${new Date(metrics.timestamp).toLocaleString()}`)
+    if (!process.argv.includes('-f')) { // follow mode
+      process.exit(0)
+    }
+  } catch (error) {
+    console.error('Error parsing metrics:', error)
+  }
+})
+
+ws.on('error', (error) => {
+  console.error('WebSocket error:', error)
+  process.exit(1)
+})
+
+// Exit if no metrics received after 5 seconds
+setTimeout(() => {
+  console.error('Timeout waiting for metrics')
+  process.exit(1)
+}, 5000)
diff --git a/scripts/wsServer.ts b/scripts/wsServer.ts
new file mode 100644
index 00000000..43035f52
--- /dev/null
+++ b/scripts/wsServer.ts
@@ -0,0 +1,45 @@
+import {WebSocketServer} from 'ws'
+
+export function startWsServer(port: number = 8081, tryOtherPort: boolean = true): Promise<number> {
+  return new Promise((resolve, reject) => {
+    const tryPort = (currentPort: number) => {
+      const wss = new WebSocketServer({ port: currentPort })
+        .on('listening', () => {
+          console.log(`WebSocket server started on port ${currentPort}`)
+          resolve(currentPort)
+        })
+        .on('error', (err: any) => {
+          if (err.code === 'EADDRINUSE' && tryOtherPort) {
+            console.log(`Port ${currentPort} in use, trying ${currentPort + 1}`)
+            wss.close()
+            tryPort(currentPort + 1)
+          } else {
+            reject(err)
+          }
+        })
+
+      wss.on('connection', (ws) => {
+        console.log('Client connected')
+
+        ws.on('message', (message) => {
+          try {
+            // Simply relay the message to all connected clients except sender
+            wss.clients.forEach(client => {
+              if (client !== ws && client.readyState === WebSocket.OPEN) {
+                client.send(message.toString())
+              }
+            })
+          } catch (error) {
+            console.error('Error processing message:', error)
+          }
+        })
+
+        ws.on('close', () => {
+          console.log('Client disconnected')
+        })
+      })
+    }
+
+    tryPort(port)
+  })
+}
diff --git a/src/devtools.ts b/src/devtools.ts
index b9267127..547d0571 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -209,3 +209,106 @@ setInterval(() => {
 }, 1000)
 
 // ---
+
+// Add type declaration for performance.memory
+declare global {
+  interface Performance {
+    memory?: {
+      usedJSHeapSize: number
+      totalJSHeapSize: number
+      jsHeapSizeLimit: number
+    }
+  }
+}
+
+// Performance metrics WebSocket client
+let ws: WebSocket | null = null
+let wsReconnectTimeout: NodeJS.Timeout | null = null
+let metricsInterval: NodeJS.Timeout | null = null
+
+// Start collecting metrics immediately
+const startTime = performance.now()
+
+function collectAndSendMetrics () {
+  if (!ws || ws.readyState !== WebSocket.OPEN) return
+
+  const metrics = {
+    loadTime: performance.now() - startTime,
+    memoryUsage: (performance.memory?.usedJSHeapSize ?? 0) / 1024 / 1024,
+    timestamp: Date.now()
+  }
+
+  ws.send(JSON.stringify(metrics))
+}
+
+function getWebSocketUrl () {
+  const wsPort = process.env.WS_SERVER
+  if (!wsPort) return null
+
+  const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:'
+  const { hostname } = window.location
+  return `${protocol}//${hostname}:${wsPort}`
+}
+
+function connectWebSocket () {
+  if (ws) return
+
+  const wsUrl = getWebSocketUrl()
+  if (!wsUrl) {
+    console.log('WebSocket server not configured')
+    return
+  }
+
+  ws = new WebSocket(wsUrl)
+
+  ws.onopen = () => {
+    console.log('Connected to metrics server')
+    if (wsReconnectTimeout) {
+      clearTimeout(wsReconnectTimeout)
+      wsReconnectTimeout = null
+    }
+
+    // Start sending metrics immediately after connection
+    collectAndSendMetrics()
+
+    // Clear existing interval if any
+    if (metricsInterval) {
+      clearInterval(metricsInterval)
+    }
+
+    // Set new interval
+    metricsInterval = setInterval(collectAndSendMetrics, 500)
+  }
+
+  ws.onclose = () => {
+    console.log('Disconnected from metrics server')
+    ws = null
+
+    // Clear metrics interval
+    if (metricsInterval) {
+      clearInterval(metricsInterval)
+      metricsInterval = null
+    }
+
+    // Try to reconnect after 3 seconds
+    wsReconnectTimeout = setTimeout(connectWebSocket, 3000)
+  }
+
+  ws.onerror = (error) => {
+    console.error('WebSocket error:', error)
+  }
+}
+
+// Connect immediately
+connectWebSocket()
+
+// Add command to request current metrics
+window.requestMetrics = () => {
+  const metrics = {
+    loadTime: performance.now() - startTime,
+    memoryUsage: (performance.memory?.usedJSHeapSize ?? 0) / 1024 / 1024,
+    timestamp: Date.now()
+  }
+  console.log('Current metrics:', metrics)
+  return metrics
+}
diff --git a/src/env.d.ts b/src/env.d.ts
index 4cb5bafd..c743d6b4 100644
--- a/src/env.d.ts
+++ b/src/env.d.ts
@@ -3,6 +3,7 @@ declare namespace NodeJS {
     // Build configuration
     NODE_ENV: 'development' | 'production'
     SINGLE_FILE_BUILD?: string
+    WS_SERVER?: string
     DISABLE_SERVICE_WORKER?: string
     CONFIG_JSON_SOURCE?: 'BUNDLED' | 'REMOTE'
     LOCAL_CONFIG_FILE?: string

From 95cc0e6c7408f5f28b012f3d0067ebb8e0af2e80 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 9 Jul 2025 16:33:50 +0300
Subject: [PATCH 054/136] reduce ram usage by 15%

---
 renderer/viewer/lib/mesher/models.ts       | 7 -------
 renderer/viewer/lib/mesher/shared.ts       | 1 -
 renderer/viewer/lib/worldrendererCommon.ts | 4 ----
 3 files changed, 12 deletions(-)

diff --git a/renderer/viewer/lib/mesher/models.ts b/renderer/viewer/lib/mesher/models.ts
index a69d3e9a..aca47e15 100644
--- a/renderer/viewer/lib/mesher/models.ts
+++ b/renderer/viewer/lib/mesher/models.ts
@@ -542,7 +542,6 @@ export function getSectionGeometry (sx: number, sy: number, sz: number, world: W
     heads: {},
     signs: {},
     // isFull: true,
-    highestBlocks: new Map(),
     hadErrors: false,
     blocksCount: 0
   }
@@ -552,12 +551,6 @@ export function getSectionGeometry (sx: number, sy: number, sz: number, world: W
     for (cursor.z = sz; cursor.z < sz + 16; cursor.z++) {
       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.get(`${cursor.x},${cursor.z}`)
-          if (!highest || highest.y < cursor.y) {
-            attr.highestBlocks.set(`${cursor.x},${cursor.z}`, { y: cursor.y, stateId: block.stateId, biomeId: block.biome.id })
-          }
-        }
         if (INVISIBLE_BLOCKS.has(block.name)) continue
         if ((block.name.includes('_sign') || block.name === 'sign') && !world.config.disableSignsMapsSupport) {
           const key = `${cursor.x},${cursor.y},${cursor.z}`
diff --git a/renderer/viewer/lib/mesher/shared.ts b/renderer/viewer/lib/mesher/shared.ts
index 53e0c534..230db6b9 100644
--- a/renderer/viewer/lib/mesher/shared.ts
+++ b/renderer/viewer/lib/mesher/shared.ts
@@ -42,7 +42,6 @@ export type MesherGeometryOutput = {
   heads: Record<string, any>,
   signs: Record<string, any>,
   // isFull: boolean
-  highestBlocks: Map<string, HighestBlockInfo>
   hadErrors: boolean
   blocksCount: number
   customBlockModels?: CustomBlockModels
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 7501b279..5c4fd6b5 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -123,7 +123,6 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
   handleResize = () => { }
   highestBlocksByChunks = new Map<string, { [chunkKey: string]: HighestBlockInfo }>()
-  highestBlocksBySections = new Map<string, { [sectionKey: string]: HighestBlockInfo }>()
   blockEntities = {}
 
   workersProcessAverageTime = 0
@@ -389,8 +388,6 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       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
-      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])))
     }
@@ -688,7 +685,6 @@ 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}`]
-      this.highestBlocksBySections.delete(`${x},${y},${z}`)
     }
     this.highestBlocksByChunks.delete(`${x},${z}`)
 

From e9320c68d242f1015a701b566693128211bc7f29 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 9 Jul 2025 17:13:36 +0300
Subject: [PATCH 055/136] fix metrics port

---
 src/devtools.ts | 2 +-
 src/env.d.ts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/devtools.ts b/src/devtools.ts
index 547d0571..8890fdea 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -242,7 +242,7 @@ function collectAndSendMetrics () {
 }
 
 function getWebSocketUrl () {
-  const wsPort = process.env.WS_SERVER
+  const wsPort = process.env.WS_PORT
   if (!wsPort) return null
 
   const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:'
diff --git a/src/env.d.ts b/src/env.d.ts
index c743d6b4..9b3e9774 100644
--- a/src/env.d.ts
+++ b/src/env.d.ts
@@ -3,7 +3,7 @@ declare namespace NodeJS {
     // Build configuration
     NODE_ENV: 'development' | 'production'
     SINGLE_FILE_BUILD?: string
-    WS_SERVER?: string
+    WS_PORT?: string
     DISABLE_SERVICE_WORKER?: string
     CONFIG_JSON_SOURCE?: 'BUNDLED' | 'REMOTE'
     LOCAL_CONFIG_FILE?: string

From 39aca1735ee268735946c235e0e1238a49676482 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Fri, 11 Jul 2025 14:13:24 +0000
Subject: [PATCH 056/136] fix: custom item model data on 1.21.4+ (#392)

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

diff --git a/src/mineflayer/items.ts b/src/mineflayer/items.ts
index 495c4f39..48d0dfe0 100644
--- a/src/mineflayer/items.ts
+++ b/src/mineflayer/items.ts
@@ -58,9 +58,17 @@ export const getItemMetadata = (item: GeneralInputItem, resourcesManager: Resour
     }
     if (customModelDataDefinitions) {
       const customModelDataComponent: any = componentMap.get('custom_model_data')
-      if (customModelDataComponent?.data && typeof customModelDataComponent.data === 'number') {
-        const customModelData = customModelDataComponent.data
-        if (customModelDataDefinitions[customModelData]) {
+      if (customModelDataComponent?.data) {
+        let customModelData: number | undefined
+        if (typeof customModelDataComponent.data === 'number') {
+          customModelData = customModelDataComponent.data
+        } else if (typeof customModelDataComponent.data === 'object'
+          && 'floats' in customModelDataComponent.data
+          && Array.isArray(customModelDataComponent.data.floats)
+          && customModelDataComponent.data.floats.length > 0) {
+          customModelData = customModelDataComponent.data.floats[0]
+        }
+        if (customModelData && customModelDataDefinitions[customModelData]) {
           customModel = customModelDataDefinitions[customModelData]
         }
       }

From a09cd7d3ed095e57433d4b9e896ff3380362c74d Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Fri, 11 Jul 2025 14:56:37 +0000
Subject: [PATCH 057/136] fix: Nametag & sign text fixes (#391)

---
 experiments/three.ts                        |   1 -
 renderer/viewer/lib/renderUtils.js          |  11 -
 renderer/viewer/lib/utils.ts                |  57 ++---
 renderer/viewer/lib/utils/skins.ts          |  65 +----
 renderer/viewer/sign-renderer/index.ts      | 251 +++++++++++++-------
 renderer/viewer/sign-renderer/playground.ts |   9 +-
 renderer/viewer/sign-renderer/tests.test.ts |   6 +-
 renderer/viewer/three/entities.ts           |  70 +++---
 renderer/viewer/three/entity/EntityMesh.ts  |   2 +-
 renderer/viewer/{lib => three}/hand.ts      |   5 +-
 renderer/viewer/three/holdingBlock.ts       |   2 +-
 renderer/viewer/three/panorama.ts           |   2 +-
 renderer/viewer/three/threeJsUtils.ts       |  55 +++++
 renderer/viewer/three/world/cursorBlock.ts  |   4 +-
 renderer/viewer/three/worldrendererThree.ts |  11 +-
 15 files changed, 309 insertions(+), 242 deletions(-)
 delete mode 100644 renderer/viewer/lib/renderUtils.js
 rename renderer/viewer/{lib => three}/hand.ts (95%)

diff --git a/experiments/three.ts b/experiments/three.ts
index 9b158dec..21142b5f 100644
--- a/experiments/three.ts
+++ b/experiments/three.ts
@@ -1,5 +1,4 @@
 import * as THREE from 'three'
-import { loadThreeJsTextureFromBitmap } from '../renderer/viewer/lib/utils/skins'
 
 // Create scene, camera and renderer
 const scene = new THREE.Scene()
diff --git a/renderer/viewer/lib/renderUtils.js b/renderer/viewer/lib/renderUtils.js
deleted file mode 100644
index 14176561..00000000
--- a/renderer/viewer/lib/renderUtils.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { fromFormattedString } from '@xmcl/text-component'
-
-export const formattedStringToSimpleString = (str) => {
-  const result = fromFormattedString(str)
-  str = result.text
-  // todo recursive
-  for (const extra of result.extra) {
-    str += extra.text
-  }
-  return str
-}
diff --git a/renderer/viewer/lib/utils.ts b/renderer/viewer/lib/utils.ts
index 5c9c00f1..f471aa9d 100644
--- a/renderer/viewer/lib/utils.ts
+++ b/renderer/viewer/lib/utils.ts
@@ -1,30 +1,3 @@
-import * as THREE from 'three'
-import { loadThreeJsTextureFromUrl, loadThreeJsTextureFromUrlSync } from './utils/skins'
-
-let textureCache: Record<string, THREE.Texture> = {}
-let imagesPromises: Record<string, Promise<THREE.Texture>> = {}
-
-export async function loadTexture (texture: string, cb: (texture: THREE.Texture) => void, onLoad?: () => void): Promise<void> {
-  const cached = textureCache[texture]
-  if (!cached) {
-    const { promise, resolve } = Promise.withResolvers<THREE.Texture>()
-    const t = loadThreeJsTextureFromUrlSync(texture)
-    textureCache[texture] = t.texture
-    void t.promise.then(resolve)
-    imagesPromises[texture] = promise
-  }
-
-  cb(textureCache[texture])
-  void imagesPromises[texture].then(() => {
-    onLoad?.()
-  })
-}
-
-export const clearTextureCache = () => {
-  textureCache = {}
-  imagesPromises = {}
-}
-
 export const loadScript = async function (scriptSrc: string, highPriority = true): Promise<HTMLScriptElement> {
   const existingScript = document.querySelector<HTMLScriptElement>(`script[src="${scriptSrc}"]`)
   if (existingScript) {
@@ -52,3 +25,33 @@ export const loadScript = async function (scriptSrc: string, highPriority = true
     document.head.appendChild(scriptElement)
   })
 }
+
+const detectFullOffscreenCanvasSupport = () => {
+  if (typeof OffscreenCanvas === 'undefined') return false
+  try {
+    const canvas = new OffscreenCanvas(1, 1)
+    // Try to get a WebGL context - this will fail on iOS where only 2D is supported (iOS 16)
+    const gl = canvas.getContext('webgl2') || canvas.getContext('webgl')
+    return gl !== null
+  } catch (e) {
+    return false
+  }
+}
+
+const hasFullOffscreenCanvasSupport = detectFullOffscreenCanvasSupport()
+
+export const createCanvas = (width: number, height: number): OffscreenCanvas => {
+  if (hasFullOffscreenCanvasSupport) {
+    return new OffscreenCanvas(width, height)
+  }
+  const canvas = document.createElement('canvas')
+  canvas.width = width
+  canvas.height = height
+  return canvas as unknown as OffscreenCanvas // todo-low
+}
+
+export async function loadImageFromUrl (imageUrl: string): Promise<ImageBitmap> {
+  const response = await fetch(imageUrl)
+  const blob = await response.blob()
+  return createImageBitmap(blob)
+}
diff --git a/renderer/viewer/lib/utils/skins.ts b/renderer/viewer/lib/utils/skins.ts
index 9aa97340..3163702c 100644
--- a/renderer/viewer/lib/utils/skins.ts
+++ b/renderer/viewer/lib/utils/skins.ts
@@ -1,68 +1,7 @@
 import { loadSkinToCanvas } from 'skinview-utils'
-import * as THREE from 'three'
-import stevePng from 'mc-assets/dist/other-textures/latest/entity/player/wide/steve.png'
-import { getLoadedImage } from 'mc-assets/dist/utils'
+import { createCanvas, loadImageFromUrl } from '../utils'
 
-const detectFullOffscreenCanvasSupport = () => {
-  if (typeof OffscreenCanvas === 'undefined') return false
-  try {
-    const canvas = new OffscreenCanvas(1, 1)
-    // Try to get a WebGL context - this will fail on iOS where only 2D is supported (iOS 16)
-    const gl = canvas.getContext('webgl2') || canvas.getContext('webgl')
-    return gl !== null
-  } catch (e) {
-    return false
-  }
-}
-
-const hasFullOffscreenCanvasSupport = detectFullOffscreenCanvasSupport()
-
-export const loadThreeJsTextureFromUrlSync = (imageUrl: string) => {
-  const texture = new THREE.Texture()
-  const promise = getLoadedImage(imageUrl).then(image => {
-    texture.image = image
-    texture.needsUpdate = true
-    return texture
-  })
-  return {
-    texture,
-    promise
-  }
-}
-
-export const createCanvas = (width: number, height: number): OffscreenCanvas => {
-  if (hasFullOffscreenCanvasSupport) {
-    return new OffscreenCanvas(width, height)
-  }
-  const canvas = document.createElement('canvas')
-  canvas.width = width
-  canvas.height = height
-  return canvas as unknown as OffscreenCanvas // todo-low
-}
-
-export const loadThreeJsTextureFromUrl = async (imageUrl: string) => {
-  const loaded = new THREE.TextureLoader().loadAsync(imageUrl)
-  return loaded
-}
-export const loadThreeJsTextureFromBitmap = (image: ImageBitmap) => {
-  const canvas = createCanvas(image.width, image.height)
-  const ctx = canvas.getContext('2d')!
-  ctx.drawImage(image, 0, 0)
-  const texture = new THREE.Texture(canvas)
-  texture.magFilter = THREE.NearestFilter
-  texture.minFilter = THREE.NearestFilter
-  return texture
-}
-
-export const stevePngUrl = stevePng
-export const steveTexture = loadThreeJsTextureFromUrl(stevePngUrl)
-
-
-export async function loadImageFromUrl (imageUrl: string): Promise<ImageBitmap> {
-  const response = await fetch(imageUrl)
-  const blob = await response.blob()
-  return createImageBitmap(blob)
-}
+export { default as stevePngUrl } from 'mc-assets/dist/other-textures/latest/entity/player/wide/steve.png'
 
 const config = {
   apiEnabled: true,
diff --git a/renderer/viewer/sign-renderer/index.ts b/renderer/viewer/sign-renderer/index.ts
index a1e4331f..f14b9b4c 100644
--- a/renderer/viewer/sign-renderer/index.ts
+++ b/renderer/viewer/sign-renderer/index.ts
@@ -1,5 +1,5 @@
-import { fromFormattedString, render, RenderNode, TextComponent } from '@xmcl/text-component'
 import type { ChatMessage } from 'prismarine-chat'
+import { createCanvas } from '../lib/utils'
 
 type SignBlockEntity = {
   Color?: string
@@ -32,29 +32,40 @@ const parseSafe = (text: string, task: string) => {
   }
 }
 
-export const renderSign = (blockEntity: SignBlockEntity, PrismarineChat: typeof ChatMessage, ctxHook = (ctx) => { }) => {
+const LEGACY_COLORS = {
+  black: '#000000',
+  dark_blue: '#0000AA',
+  dark_green: '#00AA00',
+  dark_aqua: '#00AAAA',
+  dark_red: '#AA0000',
+  dark_purple: '#AA00AA',
+  gold: '#FFAA00',
+  gray: '#AAAAAA',
+  dark_gray: '#555555',
+  blue: '#5555FF',
+  green: '#55FF55',
+  aqua: '#55FFFF',
+  red: '#FF5555',
+  light_purple: '#FF55FF',
+  yellow: '#FFFF55',
+  white: '#FFFFFF',
+}
+
+export const renderSign = (
+  blockEntity: SignBlockEntity,
+  isHanging: boolean,
+  PrismarineChat: typeof ChatMessage,
+  ctxHook = (ctx) => { },
+  canvasCreator = (width, height): OffscreenCanvas => { return createCanvas(width, height) }
+) => {
   // todo don't use texture rendering, investigate the font rendering when possible
   // or increase factor when needed
   const factor = 40
+  const fontSize = 1.6 * factor
   const signboardY = [16, 9]
   const heightOffset = signboardY[0] - signboardY[1]
   const heightScalar = heightOffset / 16
-
-  let canvas: HTMLCanvasElement | undefined
-  let _ctx: CanvasRenderingContext2D | null = null
-  const getCtx = () => {
-    if (_ctx) return _ctx
-    canvas = document.createElement('canvas')
-
-    canvas.width = 16 * factor
-    canvas.height = heightOffset * factor
-
-    _ctx = canvas.getContext('2d')!
-    _ctx.imageSmoothingEnabled = false
-
-    ctxHook(_ctx)
-    return _ctx
-  }
+  // todo the text should be clipped based on it's render width (needs investigate)
 
   const texts = 'front_text' in blockEntity ? /* > 1.20 */ blockEntity.front_text.messages : [
     blockEntity.Text1,
@@ -62,78 +73,144 @@ export const renderSign = (blockEntity: SignBlockEntity, PrismarineChat: typeof
     blockEntity.Text3,
     blockEntity.Text4
   ]
+
+  if (!texts.some((text) => text !== 'null')) {
+    return undefined
+  }
+
+  const canvas = canvasCreator(16 * factor, heightOffset * factor)
+
+  const _ctx = canvas.getContext('2d')!
+
+  ctxHook(_ctx)
   const defaultColor = ('front_text' in blockEntity ? blockEntity.front_text.color : blockEntity.Color) || 'black'
   for (const [lineNum, text] of texts.slice(0, 4).entries()) {
-    // todo: in pre flatenning it seems the format was not json
     if (text === 'null') continue
-    const parsed = text?.startsWith('{') || text?.startsWith('"') ? parseSafe(text ?? '""', 'sign text') : text
-    if (!parsed || (typeof parsed !== 'object' && typeof parsed !== 'string')) continue
-    // todo fix type
-    const message = typeof parsed === 'string' ? fromFormattedString(parsed) : new PrismarineChat(parsed) as never
-    const patchExtra = ({ extra }: TextComponent) => {
-      if (!extra) return
-      for (const child of extra) {
-        if (child.color) {
-          child.color = child.color === 'dark_green' ? child.color.toUpperCase() : child.color.toLowerCase()
-        }
-        patchExtra(child)
-      }
-    }
-    patchExtra(message)
-    const rendered = render(message)
-
-    const toRenderCanvas: Array<{
-      fontStyle: string
-      fillStyle: string
-      underlineStyle: boolean
-      strikeStyle: boolean
-      text: string
-    }> = []
-    let plainText = ''
-    // todo the text should be clipped based on it's render width (needs investigate)
-    const MAX_LENGTH = 50 // avoid abusing the signboard
-    const renderText = (node: RenderNode) => {
-      const { component } = node
-      let { text } = component
-      if (plainText.length + text.length > MAX_LENGTH) {
-        text = text.slice(0, MAX_LENGTH - plainText.length)
-        if (!text) return false
-      }
-      plainText += text
-      toRenderCanvas.push({
-        fontStyle: `${component.bold ? 'bold' : ''} ${component.italic ? 'italic' : ''}`,
-        fillStyle: node.style['color'] || defaultColor,
-        underlineStyle: component.underlined ?? false,
-        strikeStyle: component.strikethrough ?? false,
-        text
-      })
-      for (const child of node.children) {
-        const stop = renderText(child) === false
-        if (stop) return false
-      }
-    }
-
-    renderText(rendered)
-
-    // skip rendering empty lines (and possible signs)
-    if (!plainText.trim()) continue
-
-    const ctx = getCtx()
-    const fontSize = 1.6 * factor
-    ctx.font = `${fontSize}px mojangles`
-    const textWidth = ctx.measureText(plainText).width
-
-    let renderedWidth = 0
-    for (const { fillStyle, fontStyle, strikeStyle, text, underlineStyle } of toRenderCanvas) {
-      // todo strikeStyle, underlineStyle
-      ctx.fillStyle = fillStyle
-      ctx.font = `${fontStyle} ${fontSize}px mojangles`
-      ctx.fillText(text, (canvas!.width - textWidth) / 2 + renderedWidth, fontSize * (lineNum + 1))
-      renderedWidth += ctx.measureText(text).width // todo isn't the font is monospace?
-    }
+    renderComponent(text, PrismarineChat, canvas, fontSize, defaultColor, fontSize * (lineNum + 1) + (isHanging ? 0 : -8))
   }
-  // ctx.fillStyle = 'red'
-  // ctx.fillRect(0, 0, canvas.width, canvas.height)
-
   return canvas
 }
+
+export const renderComponent = (
+  text: JsonEncodedType | string | undefined,
+  PrismarineChat: typeof ChatMessage,
+  canvas: OffscreenCanvas,
+  fontSize: number,
+  defaultColor: string,
+  offset = 0
+) => {
+  // todo: in pre flatenning it seems the format was not json
+  const parsed = typeof text === 'string' && (text?.startsWith('{') || text?.startsWith('"')) ? parseSafe(text ?? '""', 'sign text') : text
+  if (!parsed || (typeof parsed !== 'object' && typeof parsed !== 'string')) return
+  // todo fix type
+
+  const ctx = canvas.getContext('2d')!
+  if (!ctx) throw new Error('Could not get 2d context')
+  ctx.imageSmoothingEnabled = false
+  ctx.font = `${fontSize}px mojangles`
+
+  type Formatting = {
+    color: string | undefined
+    underlined: boolean | undefined
+    strikethrough: boolean | undefined
+    bold: boolean | undefined
+    italic: boolean | undefined
+  }
+
+  type Message = ChatMessage & Formatting & { text: string }
+
+  const message = new PrismarineChat(parsed) as Message
+
+  const toRenderCanvas: Array<{
+    fontStyle: string
+    fillStyle: string
+    underlineStyle: boolean
+    strikeStyle: boolean
+    offset: number
+    text: string
+  }> = []
+  let visibleFormatting = false
+  let plainText = ''
+  let textOffset = offset
+  const textWidths: number[] = []
+
+  const renderText = (component: Message, parentFormatting?: Formatting | undefined) => {
+    const { text } = component
+    const formatting = {
+      color: component.color ?? parentFormatting?.color,
+      underlined: component.underlined ?? parentFormatting?.underlined,
+      strikethrough: component.strikethrough ?? parentFormatting?.strikethrough,
+      bold: component.bold ?? parentFormatting?.bold,
+      italic: component.italic ?? parentFormatting?.italic
+    }
+    visibleFormatting = visibleFormatting || formatting.underlined || formatting.strikethrough || false
+    if (text?.includes('\n')) {
+      for (const line of text.split('\n')) {
+        addTextPart(line, formatting)
+        textOffset += fontSize
+        plainText = ''
+      }
+    } else if (text) {
+      addTextPart(text, formatting)
+    }
+    if (component.extra) {
+      for (const child of component.extra) {
+        renderText(child as Message, formatting)
+      }
+    }
+  }
+
+  const addTextPart = (text: string, formatting: Formatting) => {
+    plainText += text
+    textWidths[textOffset] = ctx.measureText(plainText).width
+    let color = formatting.color ?? defaultColor
+    if (!color.startsWith('#')) {
+      color = LEGACY_COLORS[color.toLowerCase()] || color
+    }
+    toRenderCanvas.push({
+      fontStyle: `${formatting.bold ? 'bold' : ''} ${formatting.italic ? 'italic' : ''}`,
+      fillStyle: color,
+      underlineStyle: formatting.underlined ?? false,
+      strikeStyle: formatting.strikethrough ?? false,
+      offset: textOffset,
+      text
+    })
+  }
+
+  renderText(message)
+
+  // skip rendering empty lines
+  if (!visibleFormatting && !message.toString().trim()) return
+
+  let renderedWidth = 0
+  let previousOffsetY = 0
+  for (const { fillStyle, fontStyle, underlineStyle, strikeStyle, offset: offsetY, text } of toRenderCanvas) {
+    if (previousOffsetY !== offsetY) {
+      renderedWidth = 0
+    }
+    previousOffsetY = offsetY
+    ctx.fillStyle = fillStyle
+    ctx.textRendering = 'optimizeLegibility'
+    ctx.font = `${fontStyle} ${fontSize}px mojangles`
+    const textWidth = textWidths[offsetY] ?? ctx.measureText(text).width
+    const offsetX = (canvas.width - textWidth) / 2 + renderedWidth
+    ctx.fillText(text, offsetX, offsetY)
+    if (strikeStyle) {
+      ctx.lineWidth = fontSize / 8
+      ctx.strokeStyle = fillStyle
+      ctx.beginPath()
+      ctx.moveTo(offsetX, offsetY - ctx.lineWidth * 2.5)
+      ctx.lineTo(offsetX + ctx.measureText(text).width, offsetY - ctx.lineWidth * 2.5)
+      ctx.stroke()
+    }
+    if (underlineStyle) {
+      ctx.lineWidth = fontSize / 8
+      ctx.strokeStyle = fillStyle
+      ctx.beginPath()
+      ctx.moveTo(offsetX, offsetY + ctx.lineWidth)
+      ctx.lineTo(offsetX + ctx.measureText(text).width, offsetY + ctx.lineWidth)
+      ctx.stroke()
+    }
+    renderedWidth += ctx.measureText(text).width
+  }
+}
diff --git a/renderer/viewer/sign-renderer/playground.ts b/renderer/viewer/sign-renderer/playground.ts
index 92ff5d03..a7438092 100644
--- a/renderer/viewer/sign-renderer/playground.ts
+++ b/renderer/viewer/sign-renderer/playground.ts
@@ -21,9 +21,14 @@ const blockEntity = {
 
 await document.fonts.load('1em mojangles')
 
-const canvas = renderSign(blockEntity, PrismarineChat, (ctx) => {
+const canvas = renderSign(blockEntity, false, PrismarineChat, (ctx) => {
   ctx.drawImage(img, 0, 0, ctx.canvas.width, ctx.canvas.height)
-})
+}, (width, height) => {
+  const canvas = document.createElement('canvas')
+  canvas.width = width
+  canvas.height = height
+  return canvas as unknown as OffscreenCanvas
+}) as unknown as HTMLCanvasElement
 
 if (canvas) {
   canvas.style.imageRendering = 'pixelated'
diff --git a/renderer/viewer/sign-renderer/tests.test.ts b/renderer/viewer/sign-renderer/tests.test.ts
index b8fc94fc..ab268849 100644
--- a/renderer/viewer/sign-renderer/tests.test.ts
+++ b/renderer/viewer/sign-renderer/tests.test.ts
@@ -22,7 +22,7 @@ global.document = {
 
 const render = (entity) => {
   ctxTexts = []
-  renderSign(entity, PrismarineChat)
+  renderSign(entity, true, PrismarineChat)
   return ctxTexts.map(({ text, y }) => [y / 64, text])
 }
 
@@ -37,10 +37,6 @@ test('sign renderer', () => {
   } as any
   expect(render(blockEntity)).toMatchInlineSnapshot(`
     [
-      [
-        1,
-        "",
-      ],
       [
         1,
         "Minecraft ",
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index c05aac99..51292d2f 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -1,11 +1,10 @@
 //@ts-check
-import EventEmitter from 'events'
 import { UnionToIntersection } from 'type-fest'
 import nbt from 'prismarine-nbt'
 import * as TWEEN from '@tweenjs/tween.js'
 import * as THREE from 'three'
-import { PlayerObject, PlayerAnimation } from 'skinview3d'
-import { loadSkinToCanvas, loadEarsToCanvasFromSkin, inferModelType, loadCapeToCanvas, loadImage } from 'skinview-utils'
+import { PlayerAnimation, PlayerObject } from 'skinview3d'
+import { inferModelType, loadCapeToCanvas, loadEarsToCanvasFromSkin } from 'skinview-utils'
 // todo replace with url
 import { degreesToRadians } from '@nxg-org/mineflayer-tracker/lib/mathUtils'
 import { NameTagObject } from 'skinview3d/libs/nametag'
@@ -13,22 +12,24 @@ import { flat, fromFormattedString } from '@xmcl/text-component'
 import mojangson from 'mojangson'
 import { snakeCase } from 'change-case'
 import { Item } from 'prismarine-item'
-import { BlockModel } from 'mc-assets'
 import { isEntityAttackable } from 'mineflayer-mouse/dist/attackableEntity'
-import { Vec3 } from 'vec3'
 import { Team } from 'mineflayer'
+import PrismarineChatLoader from 'prismarine-chat'
 import { EntityMetadataVersions } from '../../../src/mcDataTypes'
 import { ItemSpecificContextProperties } from '../lib/basePlayerState'
-import { loadSkinImage, loadSkinFromUsername, stevePngUrl, steveTexture, createCanvas } from '../lib/utils/skins'
-import { loadTexture } from '../lib/utils'
+import { loadSkinFromUsername, loadSkinImage, stevePngUrl } from '../lib/utils/skins'
+import { renderComponent } from '../sign-renderer'
+import { createCanvas } from '../lib/utils'
 import { getBlockMeshFromModel } from './holdingBlock'
 import * as Entity from './entity/EntityMesh'
 import { getMesh } from './entity/EntityMesh'
 import { WalkingGeneralSwing } from './entity/animations'
-import { disposeObject } from './threeJsUtils'
-import { armorModel, elytraTexture, armorTextures } from './entity/armorModels'
+import { disposeObject, loadTexture, loadThreeJsTextureFromUrl } from './threeJsUtils'
+import { armorModel, armorTextures, elytraTexture } from './entity/armorModels'
 import { WorldRendererThree } from './worldrendererThree'
 
+export const steveTexture = loadThreeJsTextureFromUrl(stevePngUrl)
+
 export const TWEEN_DURATION = 120
 
 type PlayerObjectType = PlayerObject & {
@@ -96,8 +97,11 @@ function getUsernameTexture ({
   username,
   nameTagBackgroundColor = 'rgba(0, 0, 0, 0.3)',
   nameTagTextOpacity = 255
-}: any, { fontFamily = 'sans-serif' }: any) {
+}: any, { fontFamily = 'mojangles' }: any, version: string) {
   const canvas = createCanvas(64, 64)
+
+  const PrismarineChat = PrismarineChatLoader(version)
+
   const ctx = canvas.getContext('2d')
   if (!ctx) throw new Error('Could not get 2d context')
 
@@ -105,35 +109,36 @@ function getUsernameTexture ({
   const padding = 5
   ctx.font = `${fontSize}px ${fontFamily}`
 
-  const lines = String(username).split('\n')
-
+  const plainLines = String(typeof username === 'string' ? username : new PrismarineChat(username).toString()).split('\n')
   let textWidth = 0
-  for (const line of lines) {
+  for (const line of plainLines) {
     const width = ctx.measureText(line).width + padding * 2
     if (width > textWidth) textWidth = width
   }
 
   canvas.width = textWidth
-  canvas.height = (fontSize + padding) * lines.length
+  canvas.height = (fontSize + padding) * plainLines.length
 
   ctx.fillStyle = nameTagBackgroundColor
   ctx.fillRect(0, 0, canvas.width, canvas.height)
 
-  ctx.font = `${fontSize}px ${fontFamily}`
-  ctx.fillStyle = `rgba(255, 255, 255, ${nameTagTextOpacity / 255})`
-  let i = 0
-  for (const line of lines) {
-    i++
-    ctx.fillText(line, (textWidth - ctx.measureText(line).width) / 2, -padding + fontSize * i)
-  }
+  ctx.globalAlpha = nameTagTextOpacity / 255
+
+  renderComponent(username, PrismarineChat, canvas, fontSize, 'white', -padding + fontSize)
+
+  ctx.globalAlpha = 1
 
   return canvas
 }
 
-const addNametag = (entity, options, mesh) => {
+const addNametag = (entity, options: { fontFamily: string }, mesh, version: string) => {
+  for (const c of mesh.children) {
+    if (c.name === 'nametag') {
+      c.removeFromParent()
+    }
+  }
   if (entity.username !== undefined) {
-    if (mesh.children.some(c => c.name === 'nametag')) return // todo update
-    const canvas = getUsernameTexture(entity, options)
+    const canvas = getUsernameTexture(entity, options, version)
     const tex = new THREE.Texture(canvas)
     tex.needsUpdate = true
     let nameTag
@@ -174,7 +179,7 @@ const nametags = {}
 
 const isFirstUpperCase = (str) => str.charAt(0) === str.charAt(0).toUpperCase()
 
-function getEntityMesh (entity: import('prismarine-entity').Entity & { delete?: any; pos?: any; name?: any }, world: WorldRendererThree | undefined, options: { fontFamily: string }, overrides) {
+function getEntityMesh (entity: import('prismarine-entity').Entity & { delete?: any; pos?: any; name?: any }, world: WorldRendererThree, options: { fontFamily: string }, overrides) {
   if (entity.name) {
     try {
       // https://github.com/PrismarineJS/prismarine-viewer/pull/410
@@ -182,7 +187,7 @@ function getEntityMesh (entity: import('prismarine-entity').Entity & { delete?:
       const e = new Entity.EntityMesh('1.16.4', entityName, world, overrides)
 
       if (e.mesh) {
-        addNametag(entity, options, e.mesh)
+        addNametag(entity, options, e.mesh, world.version)
         return e.mesh
       }
     } catch (err) {
@@ -200,7 +205,7 @@ function getEntityMesh (entity: import('prismarine-entity').Entity & { delete?:
     addNametag({
       username: entity.name,
       height: entity.height,
-    }, options, cube)
+    }, options, cube, world.version)
   }
   return cube
 }
@@ -967,21 +972,22 @@ export class Entities {
     // entity specific meta
     const textDisplayMeta = getSpecificEntityMetadata('text_display', entity)
     const displayTextRaw = textDisplayMeta?.text || meta.custom_name_visible && meta.custom_name
-    const displayText = this.parseEntityLabel(displayTextRaw)
-    if (entity.name !== 'player' && displayText) {
+    if (entity.name !== 'player' && displayTextRaw) {
       const nameTagFixed = textDisplayMeta && (textDisplayMeta.billboard_render_constraints === 'fixed' || !textDisplayMeta.billboard_render_constraints)
-      const nameTagBackgroundColor = textDisplayMeta && toRgba(textDisplayMeta.background_color)
+      const nameTagBackgroundColor = (textDisplayMeta && (parseInt(textDisplayMeta.style_flags, 10) & 0x04) === 0) ? toRgba(textDisplayMeta.background_color) : undefined
       let nameTagTextOpacity: any
       if (textDisplayMeta?.text_opacity) {
         const rawOpacity = parseInt(textDisplayMeta?.text_opacity, 10)
         nameTagTextOpacity = rawOpacity > 0 ? rawOpacity : 256 - rawOpacity
       }
       addNametag(
-        { ...entity, username: displayText, nameTagBackgroundColor, nameTagTextOpacity, nameTagFixed,
+        { ...entity, username: typeof displayTextRaw === 'string' ? mojangson.simplify(mojangson.parse(displayTextRaw)) : nbt.simplify(displayTextRaw),
+          nameTagBackgroundColor, nameTagTextOpacity, nameTagFixed,
           nameTagScale: textDisplayMeta?.scale, nameTagTranslation: textDisplayMeta && (textDisplayMeta.translation || new THREE.Vector3(0, 0, 0)),
           nameTagRotationLeft: toQuaternion(textDisplayMeta?.left_rotation), nameTagRotationRight: toQuaternion(textDisplayMeta?.right_rotation) },
         this.entitiesOptions,
-        mesh
+        mesh,
+        this.worldRenderer.version
       )
     }
 
diff --git a/renderer/viewer/three/entity/EntityMesh.ts b/renderer/viewer/three/entity/EntityMesh.ts
index 454bf35c..229da6d5 100644
--- a/renderer/viewer/three/entity/EntityMesh.ts
+++ b/renderer/viewer/three/entity/EntityMesh.ts
@@ -6,7 +6,7 @@ import ocelotPng from '../../../../node_modules/mc-assets/dist/other-textures/la
 import arrowTexture from '../../../../node_modules/mc-assets/dist/other-textures/1.21.2/entity/projectiles/arrow.png'
 import spectralArrowTexture from '../../../../node_modules/mc-assets/dist/other-textures/1.21.2/entity/projectiles/spectral_arrow.png'
 import tippedArrowTexture from '../../../../node_modules/mc-assets/dist/other-textures/1.21.2/entity/projectiles/tipped_arrow.png'
-import { loadTexture } from '../../lib/utils'
+import { loadTexture } from '../threeJsUtils'
 import { WorldRendererThree } from '../worldrendererThree'
 import entities from './entities.json'
 import { externalModels } from './objModels'
diff --git a/renderer/viewer/lib/hand.ts b/renderer/viewer/three/hand.ts
similarity index 95%
rename from renderer/viewer/lib/hand.ts
rename to renderer/viewer/three/hand.ts
index 8bfa051b..2bd3832b 100644
--- a/renderer/viewer/lib/hand.ts
+++ b/renderer/viewer/three/hand.ts
@@ -1,6 +1,7 @@
 import * as THREE from 'three'
-import { loadSkinToCanvas } from 'skinview-utils'
-import { loadSkinFromUsername, loadSkinImage, steveTexture } from './utils/skins'
+import { loadSkinFromUsername, loadSkinImage } from '../lib/utils/skins'
+import { steveTexture } from './entities'
+
 
 export const getMyHand = async (image?: string, userName?: string) => {
   let newMap: THREE.Texture
diff --git a/renderer/viewer/three/holdingBlock.ts b/renderer/viewer/three/holdingBlock.ts
index af355f2e..c8a56386 100644
--- a/renderer/viewer/three/holdingBlock.ts
+++ b/renderer/viewer/three/holdingBlock.ts
@@ -4,12 +4,12 @@ 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'
-import { getMyHand } from '../lib/hand'
 import { MovementState, PlayerStateRenderer } from '../lib/basePlayerState'
 import { DebugGui } from '../lib/DebugGui'
 import { SmoothSwitcher } from '../lib/smoothSwitcher'
 import { watchProperty } from '../lib/utils/proxy'
 import { WorldRendererConfig } from '../lib/worldrendererCommon'
+import { getMyHand } from './hand'
 import { WorldRendererThree } from './worldrendererThree'
 import { disposeObject } from './threeJsUtils'
 
diff --git a/renderer/viewer/three/panorama.ts b/renderer/viewer/three/panorama.ts
index 7e975d4b..76aa285b 100644
--- a/renderer/viewer/three/panorama.ts
+++ b/renderer/viewer/three/panorama.ts
@@ -7,9 +7,9 @@ import type { GraphicsInitOptions } from '../../../src/appViewer'
 import { WorldDataEmitter } from '../lib/worldDataEmitter'
 import { defaultWorldRendererConfig, WorldRendererCommon } from '../lib/worldrendererCommon'
 import { getDefaultRendererState } from '../baseGraphicsBackend'
-import { loadThreeJsTextureFromUrl, loadThreeJsTextureFromUrlSync } from '../lib/utils/skins'
 import { ResourcesManager } from '../../../src/resourcesManager'
 import { getInitialPlayerStateRenderer } from '../lib/basePlayerState'
+import { loadThreeJsTextureFromUrl, loadThreeJsTextureFromUrlSync } from './threeJsUtils'
 import { WorldRendererThree } from './worldrendererThree'
 import { EntityMesh } from './entity/EntityMesh'
 import { DocumentRenderer } from './documentRenderer'
diff --git a/renderer/viewer/three/threeJsUtils.ts b/renderer/viewer/three/threeJsUtils.ts
index 5ae3b24f..cbef9065 100644
--- a/renderer/viewer/three/threeJsUtils.ts
+++ b/renderer/viewer/three/threeJsUtils.ts
@@ -1,4 +1,6 @@
 import * as THREE from 'three'
+import { getLoadedImage } from 'mc-assets/dist/utils'
+import { createCanvas } from '../lib/utils'
 
 export const disposeObject = (obj: THREE.Object3D, cleanTextures = false) => {
   // not cleaning texture there as it might be used by other objects, but would be good to also do that
@@ -16,3 +18,56 @@ export const disposeObject = (obj: THREE.Object3D, cleanTextures = false) => {
     }
   }
 }
+
+let textureCache: Record<string, THREE.Texture> = {}
+let imagesPromises: Record<string, Promise<THREE.Texture>> = {}
+
+export const loadThreeJsTextureFromUrlSync = (imageUrl: string) => {
+  const texture = new THREE.Texture()
+  const promise = getLoadedImage(imageUrl).then(image => {
+    texture.image = image
+    texture.needsUpdate = true
+    return texture
+  })
+  return {
+    texture,
+    promise
+  }
+}
+
+export const loadThreeJsTextureFromUrl = async (imageUrl: string) => {
+  const loaded = new THREE.TextureLoader().loadAsync(imageUrl)
+  return loaded
+}
+
+export const loadThreeJsTextureFromBitmap = (image: ImageBitmap) => {
+  const canvas = createCanvas(image.width, image.height)
+  const ctx = canvas.getContext('2d')!
+  ctx.drawImage(image, 0, 0)
+  const texture = new THREE.Texture(canvas)
+  texture.magFilter = THREE.NearestFilter
+  texture.minFilter = THREE.NearestFilter
+  return texture
+}
+
+export async function loadTexture (texture: string, cb: (texture: THREE.Texture) => void, onLoad?: () => void): Promise<void> {
+  const cached = textureCache[texture]
+  if (!cached) {
+    const { promise, resolve } = Promise.withResolvers<THREE.Texture>()
+    const t = loadThreeJsTextureFromUrlSync(texture)
+    textureCache[texture] = t.texture
+    void t.promise.then(resolve)
+    imagesPromises[texture] = promise
+  }
+
+  cb(textureCache[texture])
+  void imagesPromises[texture].then(() => {
+    onLoad?.()
+  })
+}
+
+export const clearTextureCache = () => {
+  textureCache = {}
+  imagesPromises = {}
+}
+
diff --git a/renderer/viewer/three/world/cursorBlock.ts b/renderer/viewer/three/world/cursorBlock.ts
index b3be2ca2..b71c1b8d 100644
--- a/renderer/viewer/three/world/cursorBlock.ts
+++ b/renderer/viewer/three/world/cursorBlock.ts
@@ -1,10 +1,9 @@
 import * as THREE from 'three'
 import { LineMaterial, LineSegmentsGeometry, Wireframe } from 'three-stdlib'
 import { Vec3 } from 'vec3'
-import { subscribeKey } from 'valtio/utils'
-import { Block } from 'prismarine-block'
 import { BlockShape, BlocksShapes } from 'renderer/viewer/lib/basePlayerState'
 import { WorldRendererThree } from '../worldrendererThree'
+import { loadThreeJsTextureFromUrl } from '../threeJsUtils'
 import destroyStage0 from '../../../../assets/destroy_stage_0.png'
 import destroyStage1 from '../../../../assets/destroy_stage_1.png'
 import destroyStage2 from '../../../../assets/destroy_stage_2.png'
@@ -15,7 +14,6 @@ import destroyStage6 from '../../../../assets/destroy_stage_6.png'
 import destroyStage7 from '../../../../assets/destroy_stage_7.png'
 import destroyStage8 from '../../../../assets/destroy_stage_8.png'
 import destroyStage9 from '../../../../assets/destroy_stage_9.png'
-import { loadThreeJsTextureFromUrl } from '../../lib/utils/skins'
 
 export class CursorBlock {
   _cursorLinesHidden = false
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index e5b93f88..bc95f06b 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -10,13 +10,12 @@ import { WorldRendererCommon } from '../lib/worldrendererCommon'
 import { addNewStat } from '../lib/ui/newStats'
 import { MesherGeometryOutput } from '../lib/mesher/shared'
 import { ItemSpecificContextProperties } from '../lib/basePlayerState'
-import { getMyHand } from '../lib/hand'
 import { setBlockPosition } from '../lib/mesher/standaloneRenderer'
-import { loadThreeJsTextureFromBitmap } from '../lib/utils/skins'
+import { getMyHand } from './hand'
 import HoldingBlock from './holdingBlock'
 import { getMesh } from './entity/EntityMesh'
 import { armorModel } from './entity/armorModels'
-import { disposeObject } from './threeJsUtils'
+import { disposeObject, loadThreeJsTextureFromBitmap } from './threeJsUtils'
 import { CursorBlock } from './world/cursorBlock'
 import { getItemUv } from './appShared'
 import { Entities } from './entities'
@@ -426,7 +425,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.scene.add(object)
   }
 
-  getSignTexture (position: Vec3, blockEntity, backSide = false) {
+  getSignTexture (position: Vec3, blockEntity, isHanging, backSide = false) {
     const chunk = chunkPos(position)
     let textures = this.chunkTextures.get(`${chunk[0]},${chunk[1]}`)
     if (!textures) {
@@ -438,7 +437,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     if (textures[texturekey]) return textures[texturekey]
 
     const PrismarineChat = PrismarineChatLoader(this.version)
-    const canvas = renderSign(blockEntity, PrismarineChat)
+    const canvas = renderSign(blockEntity, isHanging, PrismarineChat)
     if (!canvas) return
     const tex = new THREE.Texture(canvas)
     tex.magFilter = THREE.NearestFilter
@@ -784,7 +783,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   renderSign (position: Vec3, rotation: number, isWall: boolean, isHanging: boolean, blockEntity) {
-    const tex = this.getSignTexture(position, blockEntity)
+    const tex = this.getSignTexture(position, blockEntity, isHanging)
 
     if (!tex) return
 

From 64da60229472cc62c9814edf2fe5bd44e0d642d5 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 12 Jul 2025 05:38:24 +0300
Subject: [PATCH 058/136] add creative server

---
 config.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config.json b/config.json
index 57b1c207..940fb738 100644
--- a/config.json
+++ b/config.json
@@ -16,6 +16,10 @@
     {
       "ip": "wss://play2.mcraft.fun"
     },
+    {
+      "ip": "wss://play-creative.mcraft.fun",
+      "description": "Might be available soon, stay tuned!"
+    },
     {
       "ip": "kaboom.pw",
       "version": "1.20.3",

From 7a83a2a65702e1ec76f60d673f8753688fe05c06 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 14 Jul 2025 00:13:51 +0300
Subject: [PATCH 059/136] fix(important): fix all known issues wiht panorama
 crashing whole game in single file build (minecraft.html)

---
 renderer/viewer/baseGraphicsBackend.ts  |  5 ++--
 renderer/viewer/lib/worldDataEmitter.ts |  2 +-
 renderer/viewer/three/panorama.ts       |  3 +-
 renderer/viewer/three/panoramaShared.ts |  1 +
 src/appViewer.ts                        | 37 +++++++++++++++++--------
 src/shims/minecraftData.ts              | 13 +++++++--
 6 files changed, 43 insertions(+), 18 deletions(-)
 create mode 100644 renderer/viewer/three/panoramaShared.ts

diff --git a/renderer/viewer/baseGraphicsBackend.ts b/renderer/viewer/baseGraphicsBackend.ts
index 3cd227de..486c930f 100644
--- a/renderer/viewer/baseGraphicsBackend.ts
+++ b/renderer/viewer/baseGraphicsBackend.ts
@@ -1,3 +1,4 @@
+import { proxy } from 'valtio'
 import { NonReactiveState, RendererReactiveState } from '../../src/appViewer'
 
 export const getDefaultRendererState = (): {
@@ -5,7 +6,7 @@ export const getDefaultRendererState = (): {
   nonReactive: NonReactiveState
 } => {
   return {
-    reactive: {
+    reactive: proxy({
       world: {
         chunksLoaded: new Set(),
         heightmaps: new Map(),
@@ -15,7 +16,7 @@ export const getDefaultRendererState = (): {
       },
       renderer: '',
       preventEscapeMenu: false
-    },
+    }),
     nonReactive: {
       world: {
         chunksLoaded: new Set(),
diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index e1ac2f24..e9153af7 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -210,7 +210,7 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
     if (bot?.time?.timeOfDay) {
       this.emitter.emit('time', bot.time.timeOfDay)
     }
-    if (bot.entity) {
+    if (bot?.entity) {
       this.emitter.emit('playerEntity', bot.entity)
     }
     this.emitterGotConnected()
diff --git a/renderer/viewer/three/panorama.ts b/renderer/viewer/three/panorama.ts
index 76aa285b..254b980c 100644
--- a/renderer/viewer/three/panorama.ts
+++ b/renderer/viewer/three/panorama.ts
@@ -13,6 +13,7 @@ import { loadThreeJsTextureFromUrl, loadThreeJsTextureFromUrlSync } from './thre
 import { WorldRendererThree } from './worldrendererThree'
 import { EntityMesh } from './entity/EntityMesh'
 import { DocumentRenderer } from './documentRenderer'
+import { PANORAMA_VERSION } from './panoramaShared'
 
 const panoramaFiles = [
   'panorama_3.png', // right (+x)
@@ -156,7 +157,7 @@ export class PanoramaRenderer {
   }
 
   async worldBlocksPanorama () {
-    const version = '1.21.4'
+    const version = PANORAMA_VERSION
     const fullResourceManager = this.options.resourcesManager as ResourcesManager
     fullResourceManager.currentConfig = { version, noInventoryGui: true, }
     await fullResourceManager.updateAssetsData({ })
diff --git a/renderer/viewer/three/panoramaShared.ts b/renderer/viewer/three/panoramaShared.ts
new file mode 100644
index 00000000..ad80367f
--- /dev/null
+++ b/renderer/viewer/three/panoramaShared.ts
@@ -0,0 +1 @@
+export const PANORAMA_VERSION = '1.21.4'
diff --git a/src/appViewer.ts b/src/appViewer.ts
index 05b1cf41..bf01b989 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -8,6 +8,7 @@ import { proxy, subscribe } from 'valtio'
 import { getDefaultRendererState } from 'renderer/viewer/baseGraphicsBackend'
 import { getSyncWorld } from 'renderer/playground/shared'
 import { MaybePromise } from 'contro-max/build/types/store'
+import { PANORAMA_VERSION } from 'renderer/viewer/three/panoramaShared'
 import { playerState } from './mineflayer/playerState'
 import { createNotificationProgressReporter, ProgressReporter } from './core/progressReporter'
 import { setLoadingScreenStatus } from './appStatus'
@@ -15,6 +16,7 @@ import { activeModalStack, miscUiState } from './globalState'
 import { options } from './optionsStorage'
 import { ResourcesManager, ResourcesManagerTransferred } from './resourcesManager'
 import { watchOptionsAfterWorldViewInit } from './watchOptions'
+import { loadMinecraftData } from './connect'
 
 export interface RendererReactiveState {
   world: {
@@ -112,7 +114,7 @@ export class AppViewer {
   inWorldRenderingConfig: WorldRendererConfig = proxy(defaultWorldRendererConfig)
   lastCamUpdate = 0
   playerState = playerState
-  rendererState = proxy(getDefaultRendererState().reactive)
+  rendererState = getDefaultRendererState().reactive
   nonReactiveState: NonReactiveState = getDefaultRendererState().nonReactive
   worldReady: Promise<void>
   private resolveWorldReady: () => void
@@ -162,11 +164,15 @@ export class AppViewer {
 
     // Execute queued action if exists
     if (this.currentState) {
-      const { method, args } = this.currentState
-      this.backend[method](...args)
-      if (method === 'startWorld') {
-        void this.worldView!.init(bot.entity.position)
-        // void this.worldView!.init(args[0].playerState.getPosition())
+      if (this.currentState.method === 'startPanorama') {
+        this.startPanorama()
+      } else {
+        const { method, args } = this.currentState
+        this.backend[method](...args)
+        if (method === 'startWorld') {
+          void this.worldView!.init(bot.entity.position)
+          // void this.worldView!.init(args[0].playerState.getPosition())
+        }
       }
     }
 
@@ -225,10 +231,16 @@ export class AppViewer {
 
   startPanorama () {
     if (this.currentDisplay === 'menu') return
-    this.currentDisplay = 'menu'
     if (options.disableAssets) return
-    if (this.backend) {
-      this.backend.startPanorama()
+    if (this.backend && !hasAppStatus()) {
+      this.currentDisplay = 'menu'
+      if (process.env.SINGLE_FILE_BUILD_MODE) {
+        void loadMinecraftData(PANORAMA_VERSION).then(() => {
+          this.backend?.startPanorama()
+        })
+      } else {
+        this.backend.startPanorama()
+      }
     }
     this.currentState = { method: 'startPanorama', args: [] }
   }
@@ -316,15 +328,16 @@ const initialMenuStart = async () => {
 }
 window.initialMenuStart = initialMenuStart
 
+const hasAppStatus = () => activeModalStack.some(m => m.reactType === 'app-status')
+
 const modalStackUpdateChecks = () => {
   // maybe start panorama
-  if (!miscUiState.gameLoaded) {
+  if (!miscUiState.gameLoaded && !hasAppStatus()) {
     void initialMenuStart()
   }
 
   if (appViewer.backend) {
-    const hasAppStatus = activeModalStack.some(m => m.reactType === 'app-status')
-    appViewer.backend.setRendering(!hasAppStatus)
+    appViewer.backend.setRendering(!hasAppStatus())
   }
 
   appViewer.inWorldRenderingConfig.foreground = activeModalStack.length === 0
diff --git a/src/shims/minecraftData.ts b/src/shims/minecraftData.ts
index 989aa698..33dff5fe 100644
--- a/src/shims/minecraftData.ts
+++ b/src/shims/minecraftData.ts
@@ -19,11 +19,20 @@ const customResolver = () => {
   }
 }
 
+let dataStatus = 'not-called'
+
 const optimizedDataResolver = customResolver()
 window._MC_DATA_RESOLVER = optimizedDataResolver
 window._LOAD_MC_DATA = async () => {
   if (optimizedDataResolver.resolvedData) return
-  optimizedDataResolver.resolve(await importLargeData('mcData'))
+  dataStatus = 'loading'
+  try {
+    optimizedDataResolver.resolve(await importLargeData('mcData'))
+    dataStatus = 'ready'
+  } catch (e) {
+    dataStatus = 'error'
+    throw e
+  }
 }
 
 // 30 seconds
@@ -39,7 +48,7 @@ const possiblyGetFromCache = (version: string) => {
   }
   const inner = () => {
     if (!optimizedDataResolver.resolvedData) {
-      throw new Error(`Data for ${version} is not ready yet`)
+      throw new Error(`Minecraft data are not ready yet. Ensure you await window._LOAD_MC_DATA() before using it. Status: ${dataStatus}`)
     }
     const dataTypes = Object.keys(optimizedDataResolver.resolvedData)
     const allRestored = {}

From b2f2d85e4f146fadd24a1697db293380389439b6 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 14 Jul 2025 00:18:42 +0300
Subject: [PATCH 060/136] feat(setting): add a way to specify default
 perspective view

---
 src/defaultOptions.ts         | 1 +
 src/mineflayer/playerState.ts | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/defaultOptions.ts b/src/defaultOptions.ts
index d2d510ec..9650ffcd 100644
--- a/src/defaultOptions.ts
+++ b/src/defaultOptions.ts
@@ -19,6 +19,7 @@ export const defaultOptions = {
   enableMusic: false,
   // fov: 70,
   fov: 75,
+  defaultPerspective: 'first_person' as 'first_person' | 'third_person_back' | 'third_person_front',
   guiScale: 3,
   autoRequestCompletions: true,
   touchButtonsSize: 40,
diff --git a/src/mineflayer/playerState.ts b/src/mineflayer/playerState.ts
index b8919a14..33f7af77 100644
--- a/src/mineflayer/playerState.ts
+++ b/src/mineflayer/playerState.ts
@@ -3,6 +3,7 @@ import { getInitialPlayerState, getPlayerStateUtils, PlayerStateReactive, Player
 import { subscribe } from 'valtio'
 import { subscribeKey } from 'valtio/utils'
 import { gameAdditionalState } from '../globalState'
+import { options } from '../optionsStorage'
 
 /**
  * can be used only in main thread. Mainly for more convenient reactive state updates.
@@ -42,6 +43,7 @@ export class PlayerStateControllerMain {
   private botCreated () {
     console.log('bot created & plugins injected')
     this.reactive = getInitialPlayerState()
+    this.reactive.perspective = options.defaultPerspective
     this.utils = getPlayerStateUtils(this.reactive)
     this.onBotCreatedOrGameJoined()
 

From 52c0c75ccfc78da777a65da7f8c1ae22bc6b9f41 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Wed, 16 Jul 2025 12:09:34 +0300
Subject: [PATCH 061/136] docs: update readme

---
 README.MD | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.MD b/README.MD
index 61a5b733..e9127a73 100644
--- a/README.MD
+++ b/README.MD
@@ -14,7 +14,6 @@ For building the project yourself / contributing, see [Development, Debugging &
 
 > **Note**: You can deploy it on your own server in less than a minute using a one-liner script from [Minecraft Everywhere repo](https://github.com/zardoy/minecraft-everywhere)
 
-
 ### Big Features
 
 - Official Mineflayer [plugin integration](https://github.com/zardoy/mcraft-fun-mineflayer-plugin)! View / Control your bot remotely.
@@ -57,6 +56,7 @@ Howerver, it's known that these browsers have issues:
 
 Server versions 1.8 - 1.21.4 are supported.
 First class versions (most of the features are tested on these versions):
+
 - 1.19.4
 - 1.21.4
 
@@ -125,11 +125,11 @@ There is world renderer playground ([link](https://mcon.vercel.app/playground/))
 
 However, there are many things that can be done in online production version (like debugging actual source code). Also you can access some global variables in the console and there are a few useful examples:
 
-- `localStorage.debug = '*'` - Enables all debug messages! Warning: this will start all packets spam.
+- If you type `debugToggle`, press enter in console - It will enables all debug messages! Warning: this will start all packets spam.
 Instead I recommend setting `options.debugLogNotFrequentPackets`. Also you can use `debugTopPackets` (with JSON.stringify) to see what packets were received/sent by name
 
 - `bot` - Mineflayer bot instance. See Mineflayer documentation for more.
-- `viewer` - Three.js viewer instance, basically does all the rendering.
+- `world` - Three.js world instance, basically does all the rendering (part of renderer backend).
 - `world.sectionObjects` - Object with all active chunk sections (geometries) in the world. Each chunk section is a Three.js mesh or group.
 - `debugSceneChunks` - The same as above, but relative to current bot position (e.g. 0,0 is the current chunk).
 - `debugChangedOptions` - See what options are changed. Don't change options here.
@@ -139,7 +139,7 @@ Instead I recommend setting `options.debugLogNotFrequentPackets`. Also you can u
 
 - `nbt.simplify(someNbt)` - Simplifies nbt data, so it's easier to read.
 
-The most useful thing in devtools is the watch expression. You can add any expression there and it will be re-evaluated in real time. For example, you can add `camera.position` to see the camera position and so on.
+The most useful thing in devtools is the watch expression. You can add any expression there and it will be re-evaluated in real time. For example, you can add `world.getCameraPosition()` to see the camera position and so on.
 
 <img src="./docs-assets/watch-expr.png" alt="Watch expression" width="480"/>
 

From e9c7840dae6aad023dd3a9c0363f459503c82c30 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 16 Jul 2025 16:18:15 +0300
Subject: [PATCH 062/136] feat(mobile): fix annoying issues with box and foods
 usage on screen hold

---
 package.json                         |  2 +-
 pnpm-lock.yaml                       | 10 +++++-----
 src/react/GameInteractionOverlay.tsx | 19 +++++++++++++++----
 src/react/TouchAreasControls.tsx     | 11 +++++++----
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index fe4adb16..257fff7c 100644
--- a/package.json
+++ b/package.json
@@ -156,7 +156,7 @@
     "mc-assets": "^0.2.62",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer#gen-the-master",
-    "mineflayer-mouse": "^0.1.11",
+    "mineflayer-mouse": "^0.1.14",
     "mineflayer-pathfinder": "^2.4.4",
     "npm-run-all": "^4.1.5",
     "os-browserify": "^0.3.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c37e0510..1e6fddf3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -343,8 +343,8 @@ importers:
         specifier: github:zardoy/mineflayer#gen-the-master
         version: https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980(encoding@0.1.13)
       mineflayer-mouse:
-        specifier: ^0.1.11
-        version: 0.1.11
+        specifier: ^0.1.14
+        version: 0.1.14
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.5
@@ -6667,8 +6667,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
     version: 1.2.0
 
-  mineflayer-mouse@0.1.11:
-    resolution: {integrity: sha512-BL47pXZ1+92BA/7ym6KaJctEHKnL0up+tpuagVwSKJvAgibeqWQJJwDlNUWkOLvpnruRKDxMR5OB1hUXFoDNSg==}
+  mineflayer-mouse@0.1.14:
+    resolution: {integrity: sha512-DjytRMlRLxR44GqZ6udMgbMO4At7Ura5TQC80exRhzkfptyCGLTWzXaf0oeXSNYkNMnaaEv4XP/9YRwuvL+rsQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   mineflayer-pathfinder@2.4.5:
@@ -17337,7 +17337,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer-mouse@0.1.11:
+  mineflayer-mouse@0.1.14:
     dependencies:
       change-case: 5.4.4
       debug: 4.4.1
diff --git a/src/react/GameInteractionOverlay.tsx b/src/react/GameInteractionOverlay.tsx
index 63cee586..268162ec 100644
--- a/src/react/GameInteractionOverlay.tsx
+++ b/src/react/GameInteractionOverlay.tsx
@@ -2,6 +2,7 @@ import { useRef, useEffect } from 'react'
 import { subscribe, useSnapshot } from 'valtio'
 import { useUtilsEffect } from '@zardoy/react-util'
 import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
+import { isItemActivatableMobile } from 'mineflayer-mouse/dist/activatableItemsMobile'
 import { options } from '../optionsStorage'
 import { activeModalStack, isGameActive, miscUiState } from '../globalState'
 import { onCameraMove, CameraMoveEvent } from '../cameraRotationControls'
@@ -77,7 +78,10 @@ function GameInteractionOverlayInner ({
       if (options.touchInteractionType === 'classic') {
         virtualClickTimeout ??= setTimeout(() => {
           virtualClickActive = true
-          document.dispatchEvent(new MouseEvent('mousedown', { button: 0 }))
+          // If held item is activatable, use right click instead of left
+          const heldItemName = bot?.heldItem?.name
+          const isOnlyActivatable = heldItemName && isItemActivatableMobile(heldItemName, loadedData)
+          document.dispatchEvent(new MouseEvent('mousedown', { button: isOnlyActivatable ? 2 : 0 }))
         }, touchStartBreakingBlockMs)
       }
     }
@@ -150,16 +154,23 @@ function GameInteractionOverlayInner ({
 
       if (virtualClickActive) {
         // button 0 is left click
-        document.dispatchEvent(new MouseEvent('mouseup', { button: 0 }))
+        // If held item is activatable, use right click instead of left
+        const heldItemName = bot?.heldItem?.name
+        const isOnlyActivatable = heldItemName && isItemActivatableMobile(heldItemName, loadedData)
+        document.dispatchEvent(new MouseEvent('mouseup', { button: isOnlyActivatable ? 2 : 0 }))
         virtualClickActive = false
       } else if (!capturedPointer.active.activateCameraMove && (Date.now() - capturedPointer.active.time < touchStartBreakingBlockMs)) {
         // single click action
         const MOUSE_BUTTON_RIGHT = 2
         const MOUSE_BUTTON_LEFT = 0
+        const heldItemName = bot?.heldItem?.name
+        const isOnlyActivatable = heldItemName && isItemActivatableMobile(heldItemName, loadedData)
         const gonnaAttack = !!bot.mouse.getCursorState().entity || !!videoCursorInteraction()
-        document.dispatchEvent(new MouseEvent('mousedown', { button: gonnaAttack ? MOUSE_BUTTON_LEFT : MOUSE_BUTTON_RIGHT }))
+        // If not attacking entity and item is activatable, use right click for breaking
+        const useButton = !gonnaAttack && isOnlyActivatable ? MOUSE_BUTTON_RIGHT : (gonnaAttack ? MOUSE_BUTTON_LEFT : MOUSE_BUTTON_RIGHT)
+        document.dispatchEvent(new MouseEvent('mousedown', { button: useButton }))
         bot.mouse.update()
-        document.dispatchEvent(new MouseEvent('mouseup', { button: gonnaAttack ? MOUSE_BUTTON_LEFT : MOUSE_BUTTON_RIGHT }))
+        document.dispatchEvent(new MouseEvent('mouseup', { button: useButton }))
       }
 
       if (screenTouches > 0) {
diff --git a/src/react/TouchAreasControls.tsx b/src/react/TouchAreasControls.tsx
index ec9d201b..469097bd 100644
--- a/src/react/TouchAreasControls.tsx
+++ b/src/react/TouchAreasControls.tsx
@@ -1,5 +1,6 @@
 import { CSSProperties, PointerEvent, useEffect, useRef, useState } from 'react'
 import { proxy, ref, useSnapshot } from 'valtio'
+import activatableItemsMobile from 'mineflayer-mouse/dist/activatableItemsMobile'
 import { contro } from '../controls'
 import { options } from '../optionsStorage'
 import PixelartIcon from './PixelartIcon'
@@ -72,10 +73,12 @@ export default ({ setupActive, closeButtonsSetup, foregroundGameActive }: Props)
       break: false,
       jump: bot?.getControlState('jump'),
     }[name]
+    const RIGHT_MOUSE_BUTTON = 2
+    const LEFT_MOUSE_BUTTON = 0
     const holdDown = {
       action () {
         if (!bot) return
-        document.dispatchEvent(new MouseEvent('mousedown', { button: 2 }))
+        document.dispatchEvent(new MouseEvent('mousedown', { button: RIGHT_MOUSE_BUTTON }))
         bot.mouse.update()
       },
       sneak () {
@@ -87,7 +90,7 @@ export default ({ setupActive, closeButtonsSetup, foregroundGameActive }: Props)
       },
       break () {
         if (!bot) return
-        document.dispatchEvent(new MouseEvent('mousedown', { button: 0 }))
+        document.dispatchEvent(new MouseEvent('mousedown', { button: LEFT_MOUSE_BUTTON }))
         bot.mouse.update()
         active = true
       },
@@ -101,7 +104,7 @@ export default ({ setupActive, closeButtonsSetup, foregroundGameActive }: Props)
     }
     const holdUp = {
       action () {
-        document.dispatchEvent(new MouseEvent('mouseup', { button: 2 }))
+        document.dispatchEvent(new MouseEvent('mouseup', { button: RIGHT_MOUSE_BUTTON }))
       },
       sneak () {
         void contro.emit('release', {
@@ -112,7 +115,7 @@ export default ({ setupActive, closeButtonsSetup, foregroundGameActive }: Props)
       },
       break () {
         if (!bot) return
-        document.dispatchEvent(new MouseEvent('mouseup', { button: 0 }))
+        document.dispatchEvent(new MouseEvent('mouseup', { button: LEFT_MOUSE_BUTTON }))
         bot.mouse.update()
         active = false
       },

From 5bd33a546a25b54015ac4b88c40b406ebc9246e6 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Fri, 18 Jul 2025 04:39:05 +0300
Subject: [PATCH 063/136] More build configs & optimise reconnect and immediate
 game enter (#398)

feat(custom-builds): Add a way to bundle only specific minecraft version data, this does not affect assets though
env:
MIN_MC_VERSION
MAX_MC_VERSION
new SKIP_MC_DATA_RECIPES - if recipes are not used in game
fix: refactor QS params handling to ensure panorama & main menu never loaded when immedieate game enter action is expected (eg ?autoConnect=1)
---
 rsbuild.config.ts                 |  11 +-
 scripts/genLargeDataAliases.ts    |   5 +-
 scripts/makeOptimizedMcData.mjs   |  80 +++++++---
 src/downloadAndOpenFile.ts        |   6 +
 src/env.d.ts                      |  20 ++-
 src/index.ts                      | 246 +++++++++++++++++-------------
 src/inventoryWindows.ts           |   6 +-
 src/react/AddServerOrConnect.tsx  |  14 +-
 src/react/ServersListProvider.tsx |  24 ++-
 9 files changed, 253 insertions(+), 159 deletions(-)

diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index e264f6b7..42d6867b 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -139,6 +139,13 @@ const appConfig = defineConfig({
         // 50kb limit for data uri
         dataUriLimit: SINGLE_FILE_BUILD ? 1 * 1024 * 1024 * 1024 : 50 * 1024
     },
+    performance: {
+        // prefetch: {
+        //     include(filename) {
+        //         return filename.includes('mc-data') || filename.includes('mc-assets')
+        //     },
+        // },
+    },
     source: {
         entry: {
             index: './src/index.ts',
@@ -154,7 +161,7 @@ const appConfig = defineConfig({
             'process.platform': '"browser"',
             'process.env.GITHUB_URL':
                 JSON.stringify(`https://github.com/${process.env.GITHUB_REPOSITORY || `${process.env.VERCEL_GIT_REPO_OWNER}/${process.env.VERCEL_GIT_REPO_SLUG}` || githubRepositoryFallback}`),
-            'process.env.DEPS_VERSIONS': JSON.stringify({}),
+            'process.env.ALWAYS_MINIMAL_SERVER_UI': JSON.stringify(process.env.ALWAYS_MINIMAL_SERVER_UI),
             'process.env.RELEASE_TAG': JSON.stringify(releaseTag),
             'process.env.RELEASE_LINK': JSON.stringify(releaseLink),
             'process.env.RELEASE_CHANGELOG': JSON.stringify(releaseChangelog),
@@ -190,7 +197,7 @@ const appConfig = defineConfig({
                         childProcess.execSync('tsx ./scripts/optimizeBlockCollisions.ts', { stdio: 'inherit' })
                     }
                     // childProcess.execSync(['tsx', './scripts/genLargeDataAliases.ts', ...(SINGLE_FILE_BUILD ? ['--compressed'] : [])].join(' '), { stdio: 'inherit' })
-                    genLargeDataAliases(SINGLE_FILE_BUILD)
+                    genLargeDataAliases(SINGLE_FILE_BUILD || process.env.ALWAYS_COMPRESS_LARGE_DATA === 'true')
                     fsExtra.copySync('./node_modules/mc-assets/dist/other-textures/latest/entity', './dist/textures/entity')
                     fsExtra.copySync('./assets/background', './dist/background')
                     fs.copyFileSync('./assets/favicon.png', './dist/favicon.png')
diff --git a/scripts/genLargeDataAliases.ts b/scripts/genLargeDataAliases.ts
index 0cf206df..2372dbfd 100644
--- a/scripts/genLargeDataAliases.ts
+++ b/scripts/genLargeDataAliases.ts
@@ -16,7 +16,8 @@ export const genLargeDataAliases = async (isCompressed: boolean) => {
 
     let str = `${decoderCode}\nexport const importLargeData = async (mod: ${Object.keys(modules).map(x => `'${x}'`).join(' | ')}) => {\n`
     for (const [module, { compressed, raw }] of Object.entries(modules)) {
-        let importCode = `(await import('${isCompressed ? compressed : raw}')).default`;
+        const chunkName = module === 'mcData' ? 'mc-data' : 'mc-assets';
+        let importCode = `(await import(/* webpackChunkName: "${chunkName}" */ '${isCompressed ? compressed : raw}')).default`;
         if (isCompressed) {
             importCode = `JSON.parse(decompressFromBase64(${importCode}))`
         }
@@ -30,6 +31,8 @@ export const genLargeDataAliases = async (isCompressed: boolean) => {
 const decoderCode = /* ts */ `
 import pako from 'pako';
 
+globalThis.pako = { inflate: pako.inflate.bind(pako) }
+
 function decompressFromBase64(input) {
     console.time('decompressFromBase64')
     // Decode the Base64 string
diff --git a/scripts/makeOptimizedMcData.mjs b/scripts/makeOptimizedMcData.mjs
index 05948cf2..0b5752d8 100644
--- a/scripts/makeOptimizedMcData.mjs
+++ b/scripts/makeOptimizedMcData.mjs
@@ -6,8 +6,8 @@ import { dirname } from 'node:path'
 import supportedVersions from '../src/supportedVersions.mjs'
 import { gzipSizeFromFileSync } from 'gzip-size'
 import fs from 'fs'
-import  {default as _JsonOptimizer}  from '../src/optimizeJson'
-import { gzipSync } from 'zlib';
+import { default as _JsonOptimizer } from '../src/optimizeJson'
+import { gzipSync } from 'zlib'
 import MinecraftData from 'minecraft-data'
 import MCProtocol from 'minecraft-protocol'
 
@@ -21,12 +21,12 @@ const require = Module.createRequire(import.meta.url)
 
 const dataPaths = require('minecraft-data/minecraft-data/data/dataPaths.json')
 
-function toMajor (version) {
+function toMajor(version) {
   const [a, b] = (version + '').split('.')
   return `${a}.${b}`
 }
 
-const versions = {}
+let versions = {}
 const dataTypes = new Set()
 
 for (const [version, dataSet] of Object.entries(dataPaths.pc)) {
@@ -42,6 +42,31 @@ const versionToNumber = (ver) => {
   return +`${x.padStart(2, '0')}${y.padStart(2, '0')}${z.padStart(2, '0')}`
 }
 
+// Version clipping support
+const minVersion = process.env.MIN_MC_VERSION
+const maxVersion = process.env.MAX_MC_VERSION
+
+// Filter versions based on MIN_VERSION and MAX_VERSION if provided
+if (minVersion || maxVersion) {
+  const filteredVersions = {}
+  const minVersionNum = minVersion ? versionToNumber(minVersion) : 0
+  const maxVersionNum = maxVersion ? versionToNumber(maxVersion) : Infinity
+
+  for (const [version, dataSet] of Object.entries(versions)) {
+    const versionNum = versionToNumber(version)
+    if (versionNum >= minVersionNum && versionNum <= maxVersionNum) {
+      filteredVersions[version] = dataSet
+    }
+  }
+
+  versions = filteredVersions
+
+  console.log(`Version clipping applied: ${minVersion || 'none'} to ${maxVersion || 'none'}`)
+  console.log(`Processing ${Object.keys(versions).length} versions:`, Object.keys(versions).sort((a, b) => versionToNumber(a) - versionToNumber(b)))
+}
+
+console.log('Bundling version range:', Object.keys(versions)[0], 'to', Object.keys(versions).at(-1))
+
 // if not included here (even as {}) will not be bundled & accessible!
 // const compressedOutput = !!process.env.SINGLE_FILE_BUILD
 const compressedOutput = true
@@ -57,18 +82,20 @@ const dataTypeBundling2 = {
   }
 }
 const dataTypeBundling = {
-  language: {
+  language: process.env.SKIP_MC_DATA_LANGUAGE === 'true' ? {
+    raw: {}
+  } : {
     ignoreRemoved: true,
     ignoreChanges: true
   },
   blocks: {
     arrKey: 'name',
-    processData (current, prev) {
+    processData(current, prev) {
       for (const block of current) {
         if (block.transparent) {
           const forceOpaque = block.name.includes('shulker_box') || block.name.match(/^double_.+_slab\d?$/) || ['melon_block', 'lit_pumpkin', 'lit_redstone_ore', 'lit_furnace'].includes(block.name)
 
-          const prevBlock = prev?.find(x => x.name === block.name);
+          const prevBlock = prev?.find(x => x.name === block.name)
           if (forceOpaque || (prevBlock && !prevBlock.transparent)) {
             block.transparent = false
           }
@@ -136,7 +163,9 @@ const dataTypeBundling = {
   blockLoot: {
     arrKey: 'block'
   },
-  recipes: {
+  recipes: process.env.SKIP_MC_DATA_RECIPES === 'true' ? {
+    raw: {}
+  } : {
     raw: true
     // processData: processRecipes
   },
@@ -150,7 +179,7 @@ const dataTypeBundling = {
   // }
 }
 
-function processRecipes (current, prev, getData, version) {
+function processRecipes(current, prev, getData, version) {
   // can require the same multiple times per different versions
   if (current._proccessed) return
   const items = getData('items')
@@ -242,30 +271,39 @@ for (const [i, [version, dataSet]] of versionsArr.reverse().entries()) {
   for (const [dataType, dataPath] of Object.entries(dataSet)) {
     const config = dataTypeBundling[dataType]
     if (!config) continue
-    if (dataType === 'blockCollisionShapes' && versionToNumber(version) >= versionToNumber('1.13')) {
-      // contents += `      get ${dataType} () { return window.globalGetCollisionShapes?.("${version}") },\n`
-      continue
-    }
+    const ignoreCollisionShapes = dataType === 'blockCollisionShapes' && versionToNumber(version) >= versionToNumber('1.13')
+
     let injectCode = ''
-    const getData = (type) => {
+    const getRealData = (type) => {
       const loc = `minecraft-data/data/${dataSet[type]}/`
       const dataPathAbsolute = require.resolve(`minecraft-data/${loc}${type}`)
       // const data = fs.readFileSync(dataPathAbsolute, 'utf8')
       const dataRaw = require(dataPathAbsolute)
       return dataRaw
     }
-    const dataRaw = getData(dataType)
+    const dataRaw = getRealData(dataType)
     let rawData = dataRaw
     if (config.raw) {
       rawDataVersions[dataType] ??= {}
       rawDataVersions[dataType][version] = rawData
-      rawData = dataRaw
+      if (config.raw === true) {
+        rawData = dataRaw
+      } else {
+        rawData = config.raw
+      }
+
+      if (ignoreCollisionShapes && dataType === 'blockCollisionShapes') {
+        rawData = {
+          blocks: {},
+          shapes: {}
+        }
+      }
     } else {
       if (!diffSources[dataType]) {
         diffSources[dataType] = new JsonOptimizer(config.arrKey, config.ignoreChanges, config.ignoreRemoved)
       }
       try {
-        config.processData?.(dataRaw, previousData[dataType], getData, version)
+        config.processData?.(dataRaw, previousData[dataType], getRealData, version)
         diffSources[dataType].recordDiff(version, dataRaw)
         injectCode = `restoreDiff(sources, ${JSON.stringify(dataType)}, ${JSON.stringify(version)})`
       } catch (err) {
@@ -297,16 +335,16 @@ console.log('total size (mb)', totalSize / 1024 / 1024)
 console.log(
   'size per data type (mb, %)',
   Object.fromEntries(Object.entries(sizePerDataType).map(([dataType, size]) => {
-    return [dataType, [size / 1024 / 1024, Math.round(size / totalSize * 100)]];
+    return [dataType, [size / 1024 / 1024, Math.round(size / totalSize * 100)]]
   }).sort((a, b) => {
     //@ts-ignore
-    return b[1][1] - a[1][1];
+    return b[1][1] - a[1][1]
   }))
 )
 
 function compressToBase64(input) {
-  const buffer = gzipSync(input);
-  return buffer.toString('base64');
+  const buffer = gzipSync(input)
+  return buffer.toString('base64')
 }
 
 const filePath = './generated/minecraft-data-optimized.json'
diff --git a/src/downloadAndOpenFile.ts b/src/downloadAndOpenFile.ts
index 1e703369..1ff318ff 100644
--- a/src/downloadAndOpenFile.ts
+++ b/src/downloadAndOpenFile.ts
@@ -11,6 +11,12 @@ export const getFixedFilesize = (bytes: number) => {
   return prettyBytes(bytes, { minimumFractionDigits: 2, maximumFractionDigits: 2 })
 }
 
+export const isInterestedInDownload = () => {
+  const { map, texturepack, replayFileUrl } = appQueryParams
+  const { mapDir } = appQueryParamsArray
+  return !!map || !!texturepack || !!replayFileUrl || !!mapDir
+}
+
 const inner = async () => {
   const { map, texturepack, replayFileUrl } = appQueryParams
   const { mapDir } = appQueryParamsArray
diff --git a/src/env.d.ts b/src/env.d.ts
index 9b3e9774..e565fcec 100644
--- a/src/env.d.ts
+++ b/src/env.d.ts
@@ -2,30 +2,36 @@ declare namespace NodeJS {
   interface ProcessEnv {
     // Build configuration
     NODE_ENV: 'development' | 'production'
-    SINGLE_FILE_BUILD?: string
+    MIN_MC_VERSION?: string
+    MAX_MC_VERSION?: string
+    ALWAYS_COMPRESS_LARGE_DATA?: 'true' | 'false'
+    SINGLE_FILE_BUILD?: 'true' | 'false'
     WS_PORT?: string
-    DISABLE_SERVICE_WORKER?: string
+    DISABLE_SERVICE_WORKER?: 'true' | 'false'
     CONFIG_JSON_SOURCE?: 'BUNDLED' | 'REMOTE'
     LOCAL_CONFIG_FILE?: string
     BUILD_VERSION?: string
 
-    // GitHub and Vercel related
+    // Build internals
     GITHUB_REPOSITORY?: string
     VERCEL_GIT_REPO_OWNER?: string
     VERCEL_GIT_REPO_SLUG?: string
 
-    // UI and Features
+    // UI
     MAIN_MENU_LINKS?: string
+    ALWAYS_MINIMAL_SERVER_UI?: 'true' | 'false'
+
+    // App features
     ENABLE_COOKIE_STORAGE?: string
     COOKIE_STORAGE_PREFIX?: string
 
-    // Release information
+    // Build info. Release information
     RELEASE_TAG?: string
     RELEASE_LINK?: string
     RELEASE_CHANGELOG?: string
 
-    // Other configurations
-    DEPS_VERSIONS?: string
+    // Build info
     INLINED_APP_CONFIG?: string
+    GITHUB_URL?: string
   }
 }
diff --git a/src/index.ts b/src/index.ts
index 185caab6..7a553ca7 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -29,7 +29,7 @@ import './reactUi'
 import { lockUrl, onBotCreate } from './controls'
 import './dragndrop'
 import { possiblyCleanHandle } from './browserfs'
-import downloadAndOpenFile from './downloadAndOpenFile'
+import downloadAndOpenFile, { isInterestedInDownload } from './downloadAndOpenFile'
 
 import fs from 'fs'
 import net, { Socket } from 'net'
@@ -97,6 +97,7 @@ import { registerOpenBenchmarkListener } from './benchmark'
 import { tryHandleBuiltinCommand } from './builtinCommands'
 import { loadingTimerState } from './react/LoadingTimer'
 import { loadPluginsIntoWorld } from './react/CreateWorldProvider'
+import { getCurrentProxy, getCurrentUsername } from './react/ServersList'
 
 window.debug = debug
 window.beforeRenderFrame = []
@@ -166,6 +167,7 @@ export async function connect (connectOptions: ConnectOptions) {
     })
   }
 
+  appStatusState.showReconnect = false
   loadingTimerState.loading = true
   loadingTimerState.start = Date.now()
   miscUiState.hasErrors = false
@@ -880,37 +882,7 @@ export async function connect (connectOptions: ConnectOptions) {
   }
 }
 
-const reconnectOptions = sessionStorage.getItem('reconnectOptions') ? JSON.parse(sessionStorage.getItem('reconnectOptions')!) : undefined
-
 listenGlobalEvents()
-const unsubscribe = subscribe(miscUiState, async () => {
-  if (miscUiState.fsReady && miscUiState.appConfig) {
-    unsubscribe()
-    if (reconnectOptions) {
-      sessionStorage.removeItem('reconnectOptions')
-      if (Date.now() - reconnectOptions.timestamp < 1000 * 60 * 2) {
-        void connect(reconnectOptions.value)
-      }
-    } else {
-      if (appQueryParams.singleplayer === '1' || appQueryParams.sp === '1') {
-        loadSingleplayer({}, {
-          worldFolder: undefined,
-          ...appQueryParams.version ? { version: appQueryParams.version } : {}
-        })
-      }
-      if (appQueryParams.loadSave) {
-        const savePath = `/data/worlds/${appQueryParams.loadSave}`
-        try {
-          await fs.promises.stat(savePath)
-        } catch (err) {
-          alert(`Save ${savePath} not found`)
-          return
-        }
-        await loadInMemorySave(savePath)
-      }
-    }
-  }
-})
 
 // #region fire click event on touch as we disable default behaviors
 let activeTouch: { touch: Touch, elem: HTMLElement, start: number } | undefined
@@ -946,90 +918,153 @@ document.body.addEventListener('touchstart', (e) => {
 }, { passive: false })
 // #endregion
 
-// qs open actions
-if (!reconnectOptions) {
-  downloadAndOpenFile().then((downloadAction) => {
-    if (downloadAction) return
-    if (appQueryParams.reconnect && process.env.NODE_ENV === 'development') {
-      const lastConnect = JSON.parse(localStorage.lastConnectOptions ?? {})
+// immediate game enter actions: reconnect or URL QS
+const maybeEnterGame = () => {
+  const waitForConfigFsLoad = (fn: () => void) => {
+    let unsubscribe: () => void | undefined
+    const checkDone = () => {
+      if (miscUiState.fsReady && miscUiState.appConfig) {
+        fn()
+        unsubscribe?.()
+        return true
+      }
+      return false
+    }
+
+    if (!checkDone()) {
+      const text = miscUiState.appConfig ? 'Loading' : 'Loading config'
+      setLoadingScreenStatus(text)
+      unsubscribe = subscribe(miscUiState, checkDone)
+    }
+  }
+
+  const reconnectOptions = sessionStorage.getItem('reconnectOptions') ? JSON.parse(sessionStorage.getItem('reconnectOptions')!) : undefined
+
+  if (reconnectOptions) {
+    sessionStorage.removeItem('reconnectOptions')
+    if (Date.now() - reconnectOptions.timestamp < 1000 * 60 * 2) {
+      return waitForConfigFsLoad(async () => {
+        void connect(reconnectOptions.value)
+      })
+    }
+  }
+
+  if (appQueryParams.reconnect && process.env.NODE_ENV === 'development') {
+    const lastConnect = JSON.parse(localStorage.lastConnectOptions ?? {})
+    return waitForConfigFsLoad(async () => {
       void connect({
         botVersion: appQueryParams.version ?? undefined,
         ...lastConnect,
         ip: appQueryParams.ip || undefined
       })
-      return
-    }
-    if (appQueryParams.ip || appQueryParams.proxy) {
-      const waitAppConfigLoad = !appQueryParams.proxy
-      const openServerEditor = () => {
-        hideModal()
-        if (appQueryParams.onlyConnect) {
-          showModal({ reactType: 'only-connect-server' })
-        } else {
-          showModal({ reactType: 'editServer' })
-        }
-      }
-      showModal({ reactType: 'empty' })
-      if (waitAppConfigLoad) {
-        const unsubscribe = subscribe(miscUiState, checkCanDisplay)
-        checkCanDisplay()
-        // eslint-disable-next-line no-inner-declarations
-        function checkCanDisplay () {
-          if (miscUiState.appConfig) {
-            unsubscribe()
-            openServerEditor()
-            return true
-          }
-        }
-      } else {
-        openServerEditor()
-      }
-    }
-
-    void Promise.resolve().then(() => {
-      // try to connect to peer
-      const peerId = appQueryParams.connectPeer
-      const peerOptions = {} as ConnectPeerOptions
-      if (appQueryParams.server) {
-        peerOptions.server = appQueryParams.server
-      }
-      const version = appQueryParams.peerVersion
-      if (peerId) {
-        let username: string | null = options.guestUsername
-        if (options.askGuestName) username = prompt('Enter your username', username)
-        if (!username) return
-        options.guestUsername = username
-        void connect({
-          username,
-          botVersion: version || undefined,
-          peerId,
-          peerOptions
-        })
-      }
     })
+  }
 
-    if (appQueryParams.serversList && !appQueryParams.ip) {
-      showModal({ reactType: 'serversList' })
-    }
-
-    const viewerWsConnect = appQueryParams.viewerConnect
-    if (viewerWsConnect) {
-      void connect({
-        username: `viewer-${Math.random().toString(36).slice(2, 10)}`,
-        viewerWsConnect,
+  if (appQueryParams.singleplayer === '1' || appQueryParams.sp === '1') {
+    return waitForConfigFsLoad(async () => {
+      loadSingleplayer({}, {
+        worldFolder: undefined,
+        ...appQueryParams.version ? { version: appQueryParams.version } : {}
       })
-    }
-
-    if (appQueryParams.modal) {
-      const modals = appQueryParams.modal.split(',')
-      for (const modal of modals) {
-        showModal({ reactType: modal })
+    })
+  }
+  if (appQueryParams.loadSave) {
+    const enterSave = async () => {
+      const savePath = `/data/worlds/${appQueryParams.loadSave}`
+      try {
+        await fs.promises.stat(savePath)
+        await loadInMemorySave(savePath)
+      } catch (err) {
+        alert(`Save ${savePath} not found`)
       }
     }
-  }, (err) => {
-    console.error(err)
-    alert(`Something went wrong: ${err}`)
-  })
+    return waitForConfigFsLoad(enterSave)
+  }
+
+  if (appQueryParams.ip || appQueryParams.proxy) {
+    const waitAppConfigLoad = !appQueryParams.proxy
+    const openServerAction = () => {
+      if (appQueryParams.autoConnect && miscUiState.appConfig?.allowAutoConnect) {
+        void connect({
+          server: appQueryParams.ip,
+          proxy: getCurrentProxy(),
+          botVersion: appQueryParams.version ?? undefined,
+          username: getCurrentUsername()!,
+        })
+        return
+      }
+
+      setLoadingScreenStatus(undefined)
+      if (appQueryParams.onlyConnect || process.env.ALWAYS_MINIMAL_SERVER_UI === 'true') {
+        showModal({ reactType: 'only-connect-server' })
+      } else {
+        showModal({ reactType: 'editServer' })
+      }
+    }
+
+    // showModal({ reactType: 'empty' })
+    if (waitAppConfigLoad) {
+      return waitForConfigFsLoad(openServerAction)
+    }
+    openServerAction()
+    return
+  }
+
+  if (appQueryParams.connectPeer) {
+    // try to connect to peer
+    const peerId = appQueryParams.connectPeer
+    const peerOptions = {} as ConnectPeerOptions
+    if (appQueryParams.server) {
+      peerOptions.server = appQueryParams.server
+    }
+    const version = appQueryParams.peerVersion
+    let username: string | null = options.guestUsername
+    if (options.askGuestName) username = prompt('Enter your username to connect to peer', username)
+    if (!username) return
+    options.guestUsername = username
+    void connect({
+      username,
+      botVersion: version || undefined,
+      peerId,
+      peerOptions
+    })
+    return
+
+  }
+
+  if (appQueryParams.viewerConnect) {
+    void connect({
+      username: `viewer-${Math.random().toString(36).slice(2, 10)}`,
+      viewerWsConnect: appQueryParams.viewerConnect,
+    })
+    return
+  }
+
+  if (appQueryParams.modal) {
+    const modals = appQueryParams.modal.split(',')
+    for (const modal of modals) {
+      showModal({ reactType: modal })
+    }
+    return
+  }
+
+  if (appQueryParams.serversList && !miscUiState.appConfig?.appParams?.serversList) {
+    // open UI only if it's in URL
+    showModal({ reactType: 'serversList' })
+  }
+
+  if (isInterestedInDownload()) {
+    void downloadAndOpenFile()
+  }
+
+  void possiblyHandleStateVariable()
+}
+
+try {
+  maybeEnterGame()
+} catch (err) {
+  console.error(err)
+  alert(`Something went wrong: ${err}`)
 }
 
 // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
@@ -1040,6 +1075,5 @@ if (initialLoader) {
 }
 window.pageLoaded = true
 
-void possiblyHandleStateVariable()
 appViewer.waitBackendLoadPromises.push(appStartup())
 registerOpenBenchmarkListener()
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index c9f60d59..1e17db14 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -522,7 +522,7 @@ const getResultingRecipe = (slots: Array<Item | null>, gridRows: number) => {
   type Result = RecipeItem | undefined
   let shapelessResult: Result
   let shapeResult: Result
-  outer: for (const [id, recipeVariants] of Object.entries(loadedData.recipes)) {
+  outer: for (const [id, recipeVariants] of Object.entries(loadedData.recipes ?? {})) {
     for (const recipeVariant of recipeVariants) {
       if ('inShape' in recipeVariant && equals(currentShape, recipeVariant.inShape as number[][])) {
         shapeResult = recipeVariant.result!
@@ -550,7 +550,7 @@ const getAllItemRecipes = (itemName: string) => {
   const item = loadedData.itemsByName[itemName]
   if (!item) return
   const itemId = item.id
-  const recipes = loadedData.recipes[itemId]
+  const recipes = loadedData.recipes?.[itemId]
   if (!recipes) return
   const results = [] as Array<{
     result: Item,
@@ -595,7 +595,7 @@ const getAllItemUsages = (itemName: string) => {
   if (!item) return
   const foundRecipeIds = [] as string[]
 
-  for (const [id, recipes] of Object.entries(loadedData.recipes)) {
+  for (const [id, recipes] of Object.entries(loadedData.recipes ?? {})) {
     for (const recipe of recipes) {
       if ('inShape' in recipe) {
         if (recipe.inShape.some(row => row.includes(item.id))) {
diff --git a/src/react/AddServerOrConnect.tsx b/src/react/AddServerOrConnect.tsx
index 08e4d69e..d478b3e7 100644
--- a/src/react/AddServerOrConnect.tsx
+++ b/src/react/AddServerOrConnect.tsx
@@ -29,10 +29,9 @@ interface Props {
   accounts?: string[]
   authenticatedAccounts?: number
   versions?: string[]
-  allowAutoConnect?: boolean
 }
 
-export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQs, onQsConnect, placeholders, accounts, versions, allowAutoConnect }: Props) => {
+export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQs, onQsConnect, placeholders, accounts, versions }: Props) => {
   const isSmallHeight = !usePassesScaledDimensions(null, 350)
   const qsParamName = parseQs ? appQueryParams.name : undefined
   const qsParamIp = parseQs ? appQueryParams.ip : undefined
@@ -40,7 +39,6 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
   const qsParamProxy = parseQs ? appQueryParams.proxy : undefined
   const qsParamUsername = parseQs ? appQueryParams.username : undefined
   const qsParamLockConnect = parseQs ? appQueryParams.lockConnect : undefined
-  const qsParamAutoConnect = parseQs ? appQueryParams.autoConnect : undefined
 
   const parsedQsIp = parseServerAddress(qsParamIp)
   const parsedInitialIp = parseServerAddress(initialData?.ip)
@@ -118,12 +116,6 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
     }
   }
 
-  useEffect(() => {
-    if (qsParamAutoConnect && qsParamIp && qsParamVersion && allowAutoConnect) {
-      onQsConnect?.(commonUseOptions)
-    }
-  }, [])
-
   const displayConnectButton = qsParamIp
   const serverExamples = ['example.com:25565', 'play.hypixel.net', 'ws://play.pcm.gg']
   // pick random example
@@ -231,7 +223,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
             Cancel
           </ButtonWrapper>
           <ButtonWrapper type='submit'>
-            {displayConnectButton ? 'Save' : <strong>Save</strong>}
+            {displayConnectButton ? translate('Save') : <strong>{translate('Save')}</strong>}
           </ButtonWrapper>
         </>}
         {displayConnectButton && (
@@ -246,7 +238,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
                 onQsConnect?.(commonUseOptions)
               }}
             >
-              <strong>Connect</strong>
+              <strong>{translate('Connect')}</strong>
             </ButtonWrapper>
           </div>
         )}
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index d95d4e9e..2509db74 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -156,13 +156,22 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
               const isWebSocket = server.ip.startsWith('ws://') || server.ip.startsWith('wss://')
               let data
               if (isWebSocket) {
-                const pingResult = await getServerInfo(server.ip, undefined, undefined, true)
-                console.log('pingResult.fullInfo.description', pingResult.fullInfo.description)
-                data = {
-                  formattedText: pingResult.fullInfo.description,
-                  textNameRight: `ws ${pingResult.latency}ms`,
-                  textNameRightGrayed: `${pingResult.fullInfo.players?.online ?? '??'}/${pingResult.fullInfo.players?.max ?? '??'}`,
-                  offline: false
+                try {
+                  const pingResult = await getServerInfo(server.ip, undefined, undefined, true)
+                  console.log('pingResult.fullInfo.description', pingResult.fullInfo.description)
+                  data = {
+                    formattedText: pingResult.fullInfo.description,
+                    textNameRight: `ws ${pingResult.latency}ms`,
+                    textNameRightGrayed: `${pingResult.fullInfo.players?.online ?? '??'}/${pingResult.fullInfo.players?.max ?? '??'}`,
+                    offline: false
+                  }
+                } catch (err) {
+                  data = {
+                    formattedText: 'Failed to connect',
+                    textNameRight: '',
+                    textNameRightGrayed: '',
+                    offline: true
+                  }
                 }
               } else {
                 data = await fetchServerStatus(server.ip, /* signal */undefined, server.versionOverride) // DONT ADD SIGNAL IT WILL CRUSH JS RUNTIME
@@ -217,7 +226,6 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
   })
 
   const editModalJsx = isEditScreenModal ? <AddServerOrConnect
-    allowAutoConnect={miscUiState.appConfig?.allowAutoConnect}
     placeholders={{
       proxyOverride: getCurrentProxy(),
       usernameOverride: getCurrentUsername(),

From a8635e9e2fcd418acd13f78e4c87f65f2963148b Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Fri, 18 Jul 2025 02:55:29 +0000
Subject: [PATCH 064/136] fix: Effects and Game Indicators overlay toggles
 didn't work (#397)

---
 src/react/IndicatorEffectsProvider.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/react/IndicatorEffectsProvider.tsx b/src/react/IndicatorEffectsProvider.tsx
index c479d7e1..df52296a 100644
--- a/src/react/IndicatorEffectsProvider.tsx
+++ b/src/react/IndicatorEffectsProvider.tsx
@@ -5,7 +5,6 @@ import { Effect } from 'mineflayer'
 import { inGameError } from '../utils'
 import { fsState } from '../loadSave'
 import { gameAdditionalState, miscUiState } from '../globalState'
-import { options } from '../optionsStorage'
 import IndicatorEffects, { EffectType, defaultIndicatorsState } from './IndicatorEffects'
 import { images } from './effectsImages'
 
@@ -67,7 +66,6 @@ export default ({ displayEffects = true, displayIndicators = true }: { displayEf
   const { mesherWork } = useSnapshot(appViewer.rendererState).world
 
   const { hasErrors } = useSnapshot(miscUiState)
-  const { disabledUiParts } = useSnapshot(options)
   const { isReadonly, openReadOperations, openWriteOperations } = useSnapshot(fsState)
   const { noConnection, poorConnection } = useSnapshot(gameAdditionalState)
   const allIndicators: typeof defaultIndicatorsState = {
@@ -122,7 +120,7 @@ export default ({ displayEffects = true, displayIndicators = true }: { displayEf
   return <IndicatorEffects
     indicators={allIndicators}
     effects={effects}
-    displayIndicators
-    displayEffects
+    displayIndicators={displayIndicators}
+    displayEffects={displayEffects}
   />
 }

From c360115f6017e5e0a37a5ad787fb54b10d122d2b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 18 Jul 2025 07:46:25 +0300
Subject: [PATCH 065/136] fix: fix rare ios safari bug where hotbar would not
 be visible due to unclear fixed&bottom:0 css using

---
 src/react/HotbarRenderApp.tsx | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/react/HotbarRenderApp.tsx b/src/react/HotbarRenderApp.tsx
index ed1f42e6..6b6e3207 100644
--- a/src/react/HotbarRenderApp.tsx
+++ b/src/react/HotbarRenderApp.tsx
@@ -200,17 +200,28 @@ const HotbarInner = () => {
     <ItemName itemKey={itemKey} />
     <Portal>
       <div
-        className='hotbar' ref={container} style={{
+        className='hotbar-fullscreen-container'
+        style={{
           position: 'fixed',
+          top: 0,
           left: 0,
-          right: 0,
+          width: '100dvw',
+          height: '100dvh',
+          zIndex: hasModals ? 1 : 8,
           display: 'flex',
           justifyContent: 'center',
-          zIndex: hasModals ? 1 : 8,
           pointerEvents: 'none',
-          bottom: 'var(--hud-bottom-raw)'
-        }}
-      />
+        }}>
+        <div
+          className='hotbar'
+          ref={container}
+          style={{
+            position: 'absolute',
+            pointerEvents: 'none',
+            bottom: 'var(--hud-bottom-raw)'
+          }}
+        />
+      </div>
     </Portal>
   </SharedHudVars>
 }

From 45408476a539302c098a0969012662b16430225c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 18 Jul 2025 07:53:47 +0300
Subject: [PATCH 066/136] fix(appStorage): Fix that settings were not possible
 to save on vercel domains, use robust self-checking mechanism to ensure user
 data never lost when cookies storage enabled!

---
 src/react/appStorageProvider.ts | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/react/appStorageProvider.ts b/src/react/appStorageProvider.ts
index bce6feca..fd469186 100644
--- a/src/react/appStorageProvider.ts
+++ b/src/react/appStorageProvider.ts
@@ -91,6 +91,14 @@ const setCookieValue = (key: string, value: string): boolean => {
     }
 
     document.cookie = cookie
+
+    // Verify the cookie was actually saved by reading it back
+    const savedValue = getCookieValue(key)
+    if (savedValue !== value) {
+      console.warn(`Cookie verification failed for key '${key}'. Expected: ${value}, Got: ${savedValue}`)
+      return false
+    }
+
     return true
   } catch (error) {
     console.error(`Failed to set cookie for key '${key}':`, error)
@@ -229,12 +237,19 @@ export const getRandomUsername = (appConfig: AppConfig) => {
 
 export const appStorage = proxy({ ...defaultStorageData })
 
+// Track if cookies failed in this session
+let cookiesFailedThisSession = false
+
 // Check if cookie storage should be used (will be set by options)
 const shouldUseCookieStorage = () => {
-  const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent)
+  // If cookies failed this session, don't try again
+  if (cookiesFailedThisSession) {
+    return false
+  }
+
   const isSecureCookiesAvailable = () => {
     // either https or localhost
-    return window.location.protocol === 'https:' || (window.location.hostname === 'localhost' && !isSafari)
+    return window.location.protocol === 'https:' || (window.location.hostname === 'localhost')
   }
   if (!isSecureCookiesAvailable()) {
     return false
@@ -345,8 +360,10 @@ const saveKey = (key: keyof StorageData) => {
         // Remove from localStorage if cookie save was successful
         markLocalStorageAsMigrated(key)
       } else {
-        // Disabling for now so no confusing conflicts modal after page reload
-        // useLocalStorage = true
+        // Cookie save failed, disable cookies for this session and fallback to localStorage
+        console.warn(`Cookie save failed for key '${key}', disabling cookies for this session`)
+        cookiesFailedThisSession = true
+        useLocalStorage = true
       }
     }
   }

From de9bfba3a8924578a76c049c5e7e355735501f19 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 18 Jul 2025 08:02:13 +0300
Subject: [PATCH 067/136] allow auto connect on mcraft for last integrations

---
 config.mcraft-only.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config.mcraft-only.json b/config.mcraft-only.json
index 7d9a7b59..52a3aa2c 100644
--- a/config.mcraft-only.json
+++ b/config.mcraft-only.json
@@ -1,4 +1,5 @@
 {
   "alwaysReconnectButton": true,
-  "reportBugButtonWithReconnect": true
+  "reportBugButtonWithReconnect": true,
+  "allowAutoConnect": true
 }

From 0dca8bbbe5848812697e959c796b0bc6367db6d5 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 18 Jul 2025 08:32:32 +0300
Subject: [PATCH 068/136] fix(important): F3 actions didn't work on mobile at
 all like chunks reload

---
 src/controls.ts            | 18 ++++++---
 src/react/OptionsItems.tsx | 81 +++++++++++++++++++++++++++-----------
 2 files changed, 70 insertions(+), 29 deletions(-)

diff --git a/src/controls.ts b/src/controls.ts
index 9430f9c1..db6a6fc6 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -818,6 +818,11 @@ export const f3Keybinds: Array<{
   }
 ]
 
+export const reloadChunksAction = () => {
+  const action = f3Keybinds.find(f3Keybind => f3Keybind.key === 'KeyA')
+  void action!.action()
+}
+
 document.addEventListener('keydown', (e) => {
   if (!isGameActive(false)) return
   if (contro.pressedKeys.has('F3')) {
@@ -987,14 +992,17 @@ export function updateBinds (commands: any) {
 }
 
 export const onF3LongPress = async () => {
-  const select = await showOptionsModal('', f3Keybinds.filter(f3Keybind => {
+  const actions = f3Keybinds.filter(f3Keybind => {
     return f3Keybind.mobileTitle && (f3Keybind.enabled?.() ?? true)
-  }).map(f3Keybind => {
+  })
+  const actionNames = actions.map(f3Keybind => {
     return `${f3Keybind.mobileTitle}${f3Keybind.key ? ` (F3+${f3Keybind.key})` : ''}`
-  }))
+  })
+  const select = await showOptionsModal('', actionNames)
   if (!select) return
-  const f3Keybind = f3Keybinds.find(f3Keybind => f3Keybind.mobileTitle === select)
-  if (f3Keybind) void f3Keybind.action()
+  const actionIndex = actionNames.indexOf(select)
+  const f3Keybind = actions[actionIndex]!
+  void f3Keybind.action()
 }
 
 export const handleMobileButtonCustomAction = (action: CustomAction) => {
diff --git a/src/react/OptionsItems.tsx b/src/react/OptionsItems.tsx
index 32f99b9e..ccc04bcb 100644
--- a/src/react/OptionsItems.tsx
+++ b/src/react/OptionsItems.tsx
@@ -4,11 +4,13 @@ import { titleCase } from 'title-case'
 import { useMemo } from 'react'
 import { disabledSettings, options, qsOptions } from '../optionsStorage'
 import { hideAllModals, miscUiState } from '../globalState'
+import { reloadChunksAction } from '../controls'
 import Button from './Button'
 import Slider from './Slider'
 import Screen from './Screen'
 import { showOptionsModal } from './SelectOption'
 import PixelartIcon, { pixelartIcons } from './PixelartIcon'
+import { reconnectReload } from './AppStatusProvider'
 
 type GeneralItem<T extends string | number | boolean> = {
   id?: string
@@ -18,7 +20,8 @@ type GeneralItem<T extends string | number | boolean> = {
   tooltip?: string
   // description?: string
   enableWarning?: string
-  willHaveNoEffect?: boolean
+  requiresRestart?: boolean
+  requiresChunksReload?: boolean
   values?: Array<T | [T, string]>
   disableIf?: [option: keyof typeof options, value: any]
 }
@@ -56,7 +59,14 @@ const useCommonComponentsProps = (item: OptionMeta) => {
   }
 }
 
-export const OptionButton = ({ item }: { item: Extract<OptionMeta, { type: 'toggle' }> }) => {
+const ignoreReloadWarningsCache = new Set<string>()
+
+export const OptionButton = ({ item, onClick, valueText, cacheKey }: {
+  item: Extract<OptionMeta, { type: 'toggle' }>,
+  onClick?: () => void,
+  valueText?: string,
+  cacheKey?: string,
+}) => {
   const { disabledBecauseOfSetting } = useCommonComponentsProps(item)
 
   const optionValue = useSnapshot(options)[item.id!]
@@ -84,40 +94,63 @@ export const OptionButton = ({ item }: { item: Extract<OptionMeta, { type: 'togg
 
   return <Button
     data-setting={item.id}
-    label={`${item.text}: ${valuesTitlesMap[optionValue]}`}
-    // label={`${item.text}:`}
-    // postLabel={valuesTitlesMap[optionValue]}
+    label={`${translate(item.text)}: ${translate(valueText ?? valuesTitlesMap[optionValue])}`}
     onClick={async (event) => {
       if (disabledReason) {
-        await showOptionsModal(`The option is unavailable. ${disabledReason}`, [])
+        await showOptionsModal(`${translate('The option is not available')}: ${disabledReason}`, [])
         return
       }
       if (item.enableWarning && !options[item.id!]) {
         const result = await showOptionsModal(item.enableWarning, ['Enable'])
         if (!result) return
       }
-      const { values } = item
-      if (values) {
-        const getOptionValue = (arrItem) => {
-          if (typeof arrItem === 'string') {
-            return arrItem
+      onClick?.()
+      if (item.id) {
+        const { values } = item
+        if (values) {
+          const getOptionValue = (arrItem) => {
+            if (typeof arrItem === 'string') {
+              return arrItem
+            } else {
+              return arrItem[0]
+            }
+          }
+          const currentIndex = values.findIndex((value) => {
+            return getOptionValue(value) === optionValue
+          })
+          if (currentIndex === -1) {
+            options[item.id] = getOptionValue(values[0])
           } else {
-            return arrItem[0]
+            const nextIndex = event.shiftKey
+              ? (currentIndex - 1 + values.length) % values.length
+              : (currentIndex + 1) % values.length
+            options[item.id] = getOptionValue(values[nextIndex])
+          }
+        } else {
+          options[item.id] = !options[item.id]
+        }
+      }
+
+      const toCacheKey = cacheKey ?? item.id ?? ''
+      if (toCacheKey && !ignoreReloadWarningsCache.has(toCacheKey)) {
+        ignoreReloadWarningsCache.add(toCacheKey)
+
+        if (item.requiresRestart) {
+          const result = await showOptionsModal(translate('The option requires a restart to take effect'), ['Restart', 'I will do it later'], {
+            cancel: false,
+          })
+          if (result) {
+            reconnectReload()
           }
         }
-        const currentIndex = values.findIndex((value) => {
-          return getOptionValue(value) === optionValue
-        })
-        if (currentIndex === -1) {
-          options[item.id!] = getOptionValue(values[0])
-        } else {
-          const nextIndex = event.shiftKey
-            ? (currentIndex - 1 + values.length) % values.length
-            : (currentIndex + 1) % values.length
-          options[item.id!] = getOptionValue(values[nextIndex])
+        if (item.requiresChunksReload) {
+          const result = await showOptionsModal(translate('The option requires a chunks reload to take effect'), ['Reload', 'I will do it later'], {
+            cancel: false,
+          })
+          if (result) {
+            reloadChunksAction()
+          }
         }
-      } else {
-        options[item.id!] = !options[item.id!]
       }
     }}
     title={disabledReason ? `${disabledReason} | ${item.tooltip}` : item.tooltip}

From b6d4728c447592d1a01303448d41adc83822b973 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 18 Jul 2025 09:44:50 +0300
Subject: [PATCH 069/136] display disconnect always last

---
 renderer/viewer/three/documentRenderer.ts |  3 ++-
 src/devtools.ts                           |  1 -
 src/react/PauseScreen.tsx                 | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/renderer/viewer/three/documentRenderer.ts b/renderer/viewer/three/documentRenderer.ts
index 8ff31e69..a5dc060d 100644
--- a/renderer/viewer/three/documentRenderer.ts
+++ b/renderer/viewer/three/documentRenderer.ts
@@ -61,8 +61,9 @@ export class DocumentRenderer {
     this.previousCanvasWidth = this.canvas.width
     this.previousCanvasHeight = this.canvas.height
 
+    const supportsWebGL2 = 'WebGL2RenderingContext' in window
     // Only initialize stats and DOM-related features in main thread
-    if (!externalCanvas) {
+    if (!externalCanvas && supportsWebGL2) {
       this.stats = new TopRightStats(this.canvas as HTMLCanvasElement, this.config.statsVisible)
       this.setupFpsTracking()
     }
diff --git a/src/devtools.ts b/src/devtools.ts
index 8890fdea..6c47f73d 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -255,7 +255,6 @@ function connectWebSocket () {
 
   const wsUrl = getWebSocketUrl()
   if (!wsUrl) {
-    console.log('WebSocket server not configured')
     return
   }
 
diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index 3036aa4b..856ac932 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -289,11 +289,6 @@ export default () => {
           />
         </div>
       ) : null}
-      {!lockConnect && <>
-        <Button className="button" style={{ width: '204px' }} onClick={disconnect}>
-          {fsState.inMemorySave && !fsState.syncFs && !fsState.isReadonly ? 'Save & Quit' : 'Disconnect & Reset'}
-        </Button>
-      </>}
       {(noConnection || appConfig?.alwaysReconnectButton) && (
         <div className={styles.row}>
           <Button className="button" style={{ width: appConfig?.reportBugButtonWithReconnect ? '98px' : '204px' }} onClick={reconnectReload}>
@@ -343,6 +338,11 @@ export default () => {
           )}
         </div>
       )}
+      {!lockConnect && <>
+        <Button className="button" style={{ width: '204px' }} onClick={disconnect}>
+          {fsState.inMemorySave && !fsState.syncFs && !fsState.isReadonly ? 'Save & Quit' : 'Disconnect & Reset'}
+        </Button>
+      </>}
     </div>
     <LoadingTimer />
   </Screen>

From a49877870325b010160c3e9e3dfca5719b8552f8 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 18 Jul 2025 09:56:50 +0300
Subject: [PATCH 070/136] always wait for config load so autoConnect works on
 remote config

---
 src/index.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 7a553ca7..8de98894 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -982,7 +982,6 @@ const maybeEnterGame = () => {
   }
 
   if (appQueryParams.ip || appQueryParams.proxy) {
-    const waitAppConfigLoad = !appQueryParams.proxy
     const openServerAction = () => {
       if (appQueryParams.autoConnect && miscUiState.appConfig?.allowAutoConnect) {
         void connect({
@@ -1003,11 +1002,7 @@ const maybeEnterGame = () => {
     }
 
     // showModal({ reactType: 'empty' })
-    if (waitAppConfigLoad) {
-      return waitForConfigFsLoad(openServerAction)
-    }
-    openServerAction()
-    return
+    return waitForConfigFsLoad(openServerAction)
   }
 
   if (appQueryParams.connectPeer) {

From 4d7e3df8597fffea6a66f7a6df4810dae1d8cd96 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Fri, 18 Jul 2025 11:18:05 +0000
Subject: [PATCH 071/136] feat: Item projectiles support (#395)

---
 pnpm-lock.yaml                        | 14 +++---
 renderer/viewer/three/entities.ts     | 72 ++++++++++++++++-----------
 renderer/viewer/three/holdingBlock.ts |  2 +-
 3 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1e6fddf3..52c2ff30 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/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767(encoding@0.1.13))
       minecraft-data:
         specifier: 3.92.0
         version: 3.92.0
@@ -341,7 +341,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41(@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/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.14
         version: 0.1.14
@@ -6678,8 +6678,8 @@ packages:
     resolution: {integrity: sha512-GtW4hkijyZbSu5LKYYD89xZu+XY7OoP7IkrCnNEn6EdPm0+vr2THoJgFGKrlze9/81+T+P3E4qvJXNFiU/zeJg==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767}
     version: 4.30.0
     engines: {node: '>=22'}
 
@@ -16956,12 +16956,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/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767(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/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17379,7 +17379,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 51292d2f..6c6f8900 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -717,7 +717,7 @@ export class Entities {
     return typeof component === 'string' ? component : component.text ?? ''
   }
 
-  getItemMesh (item, specificProps: ItemSpecificContextProperties, previousModel?: string) {
+  getItemMesh (item, specificProps: ItemSpecificContextProperties, faceCamera = false, previousModel?: string) {
     if (!item.nbt && item.nbtData) item.nbt = item.nbtData
     const textureUv = this.worldRenderer.getItemRenderData(item, specificProps)
     if (previousModel && previousModel === textureUv?.modelName) return undefined
@@ -757,26 +757,37 @@ export class Entities {
       itemsTexture.needsUpdate = true
       itemsTexture.magFilter = THREE.NearestFilter
       itemsTexture.minFilter = THREE.NearestFilter
-      const itemsTextureFlipped = itemsTexture.clone()
-      itemsTextureFlipped.repeat.x *= -1
-      itemsTextureFlipped.needsUpdate = true
-      itemsTextureFlipped.offset.set(u + (sizeX), 1 - v - sizeY)
-      const material = new THREE.MeshStandardMaterial({
-        map: itemsTexture,
-        transparent: true,
-        alphaTest: 0.1,
-      })
-      const materialFlipped = new THREE.MeshStandardMaterial({
-        map: itemsTextureFlipped,
-        transparent: true,
-        alphaTest: 0.1,
-      })
-      const mesh = new THREE.Mesh(new THREE.BoxGeometry(1, 1, 0), [
-        // top left and right bottom are black box materials others are transparent
-        new THREE.MeshBasicMaterial({ color: 0x00_00_00 }), new THREE.MeshBasicMaterial({ color: 0x00_00_00 }),
-        new THREE.MeshBasicMaterial({ color: 0x00_00_00 }), new THREE.MeshBasicMaterial({ color: 0x00_00_00 }),
-        material, materialFlipped,
-      ])
+      let mesh: THREE.Object3D
+      let itemsTextureFlipped: THREE.Texture | undefined
+      if (faceCamera) {
+        const spriteMat = new THREE.SpriteMaterial({
+          map: itemsTexture,
+          transparent: true,
+          alphaTest: 0.1,
+        })
+        mesh = new THREE.Sprite(spriteMat)
+      } else {
+        itemsTextureFlipped = itemsTexture.clone()
+        itemsTextureFlipped.repeat.x *= -1
+        itemsTextureFlipped.needsUpdate = true
+        itemsTextureFlipped.offset.set(u + (sizeX), 1 - v - sizeY)
+        const material = new THREE.MeshStandardMaterial({
+          map: itemsTexture,
+          transparent: true,
+          alphaTest: 0.1,
+        })
+        const materialFlipped = new THREE.MeshStandardMaterial({
+          map: itemsTextureFlipped,
+          transparent: true,
+          alphaTest: 0.1,
+        })
+        mesh = new THREE.Mesh(new THREE.BoxGeometry(1, 1, 0), [
+          // top left and right bottom are black box materials others are transparent
+          new THREE.MeshBasicMaterial({ color: 0x00_00_00 }), new THREE.MeshBasicMaterial({ color: 0x00_00_00 }),
+          new THREE.MeshBasicMaterial({ color: 0x00_00_00 }), new THREE.MeshBasicMaterial({ color: 0x00_00_00 }),
+          material, materialFlipped,
+        ])
+      }
       let SCALE = 1
       if (specificProps['minecraft:display_context'] === 'ground') {
         SCALE = 0.5
@@ -805,8 +816,6 @@ export class Entities {
   }
 
   update (entity: SceneEntity['originalEntity'], overrides) {
-    const justAdded = !this.entities[entity.id]
-
     const isPlayerModel = entity.name === 'player'
     if (entity.name === 'zombie_villager' || entity.name === 'husk') {
       overrides.texture = `textures/1.16.4/entity/${entity.name === 'zombie_villager' ? 'zombie_villager/zombie_villager.png' : `zombie/${entity.name}.png`}`
@@ -817,6 +826,7 @@ export class Entities {
     }
     // this can be undefined in case where packet entity_destroy was sent twice (so it was already deleted)
     let e = this.entities[entity.id]
+    const justAdded = !e
 
     if (entity.delete) {
       if (!e) return
@@ -836,21 +846,23 @@ export class Entities {
     if (e === undefined) {
       const group = new THREE.Group() as unknown as SceneEntity
       group.originalEntity = entity
-      if (entity.name === 'item' || entity.name === 'tnt' || entity.name === 'falling_block') {
-        const item = entity.name === 'tnt'
-          ? { name: 'tnt' }
+      if (entity.name === 'item' || entity.name === 'tnt' || entity.name === 'falling_block' || entity.name === 'snowball'
+        || entity.name === 'egg' || entity.name === 'ender_pearl' || entity.name === 'experience_bottle'
+        || entity.name === 'splash_potion' || entity.name === 'lingering_potion') {
+        const item = entity.name === 'tnt' || entity.type === 'projectile'
+          ? { name: entity.name }
           : entity.name === 'falling_block'
             ? { blockState: entity['objectData'] }
             : entity.metadata?.find((m: any) => typeof m === 'object' && m?.itemCount)
         if (item) {
           const object = this.getItemMesh(item, {
             'minecraft:display_context': 'ground',
-          })
+          }, entity.type === 'projectile')
           if (object) {
             mesh = object.mesh
-            if (entity.name === 'item') {
+            if (entity.name === 'item' || entity.type === 'projectile') {
               mesh.scale.set(0.5, 0.5, 0.5)
-              mesh.position.set(0, 0.2, 0)
+              mesh.position.set(0, entity.name === 'item' ? 0.2 : 0.1, 0)
             } else {
               mesh.scale.set(2, 2, 2)
               mesh.position.set(0, 0.5, 0)
@@ -858,8 +870,8 @@ export class Entities {
             // set faces
             // mesh.position.set(targetPos.x + 0.5 + 2, targetPos.y + 0.5, targetPos.z + 0.5)
             // viewer.scene.add(mesh)
-            const clock = new THREE.Clock()
             if (entity.name === 'item') {
+              const clock = new THREE.Clock()
               mesh.onBeforeRender = () => {
                 const delta = clock.getDelta()
                 mesh!.rotation.y += delta
diff --git a/renderer/viewer/three/holdingBlock.ts b/renderer/viewer/three/holdingBlock.ts
index c8a56386..f9d00f0e 100644
--- a/renderer/viewer/three/holdingBlock.ts
+++ b/renderer/viewer/three/holdingBlock.ts
@@ -357,7 +357,7 @@ export default class HoldingBlock {
         'minecraft:display_context': 'firstperson',
         'minecraft:use_duration': this.worldRenderer.playerStateReactive.itemUsageTicks,
         'minecraft:using_item': !!this.worldRenderer.playerStateReactive.itemUsageTicks,
-      }, this.lastItemModelName)
+      }, false, this.lastItemModelName)
       if (result) {
         const { mesh: itemMesh, isBlock, modelName } = result
         if (isBlock) {

From b9c8ade9bf05b3eea2842bcfe2e03bb7428cfafb Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 20 Jul 2025 10:06:57 +0300
Subject: [PATCH 072/136] fix: fix chat was crashing sometimes

---
 src/index.ts       | 4 ++++
 src/react/Chat.tsx | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/index.ts b/src/index.ts
index 8de98894..d28261f4 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -278,6 +278,10 @@ export async function connect (connectOptions: ConnectOptions) {
         return
       }
     }
+    if (e.reason?.stack?.includes('chrome-extension://')) {
+      // ignore issues caused by chrome extension
+      return
+    }
     handleError(e.reason)
   }, {
     signal: errorAbortController.signal
diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index a45d7a69..20d77a10 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -45,7 +45,7 @@ const MessageLine = ({ message, currentPlayerName, chatOpened }: { message: Mess
   return <li className={Object.entries(classes).filter(([, val]) => val).map(([name]) => name).join(' ')} data-time={message.timestamp ? new Date(message.timestamp).toLocaleString('en-US', { hour12: false }) : undefined}>
     {message.parts.map((msg, i) => {
       // Check if this is a text part that might contain a mention
-      if (msg.text && currentPlayerName) {
+      if (typeof msg.text === 'string' && currentPlayerName) {
         const parts = msg.text.split(new RegExp(`(@${currentPlayerName})`, 'i'))
         if (parts.length > 1) {
           return parts.map((txtPart, j) => {

From 67855ae25a97d00a5206299963794bf223e2eebe Mon Sep 17 00:00:00 2001
From: Kesu <40177436+Kesuaheli@users.noreply.github.com>
Date: Sun, 27 Jul 2025 15:24:26 +0200
Subject: [PATCH 073/136] fix: fix some window titles (#401)

---
 src/inventoryWindows.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 1e17db14..bc7dcbaf 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -9,6 +9,7 @@ import PItem, { Item } from 'prismarine-item'
 import { versionToNumber } from 'renderer/viewer/common/utils'
 import { getRenamedData } from 'flying-squid/dist/blockRenames'
 import PrismarineChatLoader from 'prismarine-chat'
+import * as nbt from 'prismarine-nbt'
 import { BlockModel } from 'mc-assets'
 import { renderSlot } from 'renderer/viewer/three/renderSlot'
 import Generic95 from '../assets/generic_95.png'
@@ -59,9 +60,9 @@ export const onGameLoad = () => {
   bot.on('windowOpen', (win) => {
     const implementedWindow = implementedContainersGuiMap[mapWindowType(win.type as string, win.inventoryStart)]
     if (implementedWindow) {
-      openWindow(implementedWindow)
+      openWindow(implementedWindow, nbt.simplify(win.title as any))
     } else if (options.unimplementedContainers) {
-      openWindow('ChestWin')
+      openWindow('ChestWin', nbt.simplify(win.title as any))
     } else {
       // todo format
       displayClientChat(`[client error] cannot open unimplemented window ${win.id} (${win.type}). Slots: ${win.slots.map(item => getItemName(item)).filter(Boolean).join(', ')}`)
@@ -354,7 +355,7 @@ const upWindowItemsLocal = () => {
 }
 
 let skipClosePacketSending = false
-const openWindow = (type: string | undefined) => {
+const openWindow = (type: string | undefined, title: string | any = undefined) => {
   // if (activeModalStack.some(x => x.reactType?.includes?.('player_win:'))) {
   if (activeModalStack.length) { // game is not in foreground, don't close current modal
     if (type) {
@@ -384,7 +385,6 @@ const openWindow = (type: string | undefined) => {
   const inv = openItemsCanvas(type)
   inv.canvasManager.children[0].mobileHelpers = miscUiState.currentTouch
   window.inventory = inv
-  const title = bot.currentWindow?.title
   const PrismarineChat = PrismarineChatLoader(bot.version)
   try {
     inv.canvasManager.children[0].customTitleText = title ?

From c4b284b9b7b644fc0c7eee2a7231752df499b452 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sat, 2 Aug 2025 21:34:33 +0300
Subject: [PATCH 074/136] fix: fix supported versions display in server menu

---
 src/react/ServersListProvider.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index 2509db74..75f95d3f 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -1,9 +1,11 @@
 import { useEffect, useMemo, useState } from 'react'
 import { useUtilsEffect } from '@zardoy/react-util'
 import { useSnapshot } from 'valtio'
+import { supportedVersions } from 'minecraft-protocol'
+import { versionToNumber } from 'mc-assets/dist/utils'
 import { ConnectOptions } from '../connect'
 import { activeModalStack, hideCurrentModal, miscUiState, notHideableModalsWithoutForce, showModal } from '../globalState'
-import supportedVersions from '../supportedVersions.mjs'
+import appSupportedVersions from '../supportedVersions.mjs'
 import { appQueryParams } from '../appParams'
 import { fetchServerStatus, isServerValid } from '../api/mcStatusApi'
 import { getServerInfo } from '../mineflayer/mc-protocol'
@@ -20,6 +22,10 @@ import Button from './Button'
 import { pixelartIcons } from './PixelartIcon'
 import { showNotification } from './NotificationProvider'
 
+const firstProtocolVersion = versionToNumber(supportedVersions[0])
+const lastProtocolVersion = versionToNumber(supportedVersions.at(-1)!)
+const protocolSupportedVersions = appSupportedVersions.filter(v => versionToNumber(v) >= firstProtocolVersion && versionToNumber(v) <= lastProtocolVersion)
+
 const EXPLICIT_SHARE_SERVER_MODE = false
 
 if (appQueryParams.lockConnect) {
@@ -262,7 +268,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
       }
       dispatchEvent(new CustomEvent('connect', { detail: connectOptions }))
     }}
-    versions={supportedVersions}
+    versions={protocolSupportedVersions}
   /> : null
 
   const serversListJsx = <ServersList

From 24ab260e8ed60be8a40777d4b1905e456633d755 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 3 Aug 2025 03:20:38 +0300
Subject: [PATCH 075/136] fix: up protocol to support 1.21.5

---
 patches/minecraft-protocol.patch | 110 +++++++++++++++++--------------
 pnpm-lock.yaml                   |  77 +++++++++++-----------
 2 files changed, 101 insertions(+), 86 deletions(-)

diff --git a/patches/minecraft-protocol.patch b/patches/minecraft-protocol.patch
index 6a82d5cf..108085a1 100644
--- a/patches/minecraft-protocol.patch
+++ b/patches/minecraft-protocol.patch
@@ -1,8 +1,8 @@
 diff --git a/src/client/chat.js b/src/client/chat.js
-index 8d0869b150681574ad19292a026cce9f67a137ee..2efa2e6600f017b566155974cb9fb1856fa582f9 100644
+index a50f4b988ad9fb29d5eb9e1633b498615aa9cd28..b8b819eef0762a77d9db5c0fb06be648303628c7 100644
 --- a/src/client/chat.js
 +++ b/src/client/chat.js
-@@ -109,7 +109,7 @@ module.exports = function (client, options) {
+@@ -110,7 +110,7 @@ module.exports = function (client, options) {
      for (const player of packet.data) {
        if (player.chatSession) {
          client._players[player.uuid] = {
@@ -11,8 +11,8 @@ index 8d0869b150681574ad19292a026cce9f67a137ee..2efa2e6600f017b566155974cb9fb185
            publicKeyDER: player.chatSession.publicKey.keyBytes,
            sessionUuid: player.chatSession.uuid
          }
-@@ -119,7 +119,7 @@ module.exports = function (client, options) {
- 
+@@ -120,7 +120,7 @@ module.exports = function (client, options) {
+
        if (player.crypto) {
          client._players[player.uuid] = {
 -          publicKey: crypto.createPublicKey({ key: player.crypto.publicKey, format: 'der', type: 'spki' }),
@@ -20,7 +20,7 @@ index 8d0869b150681574ad19292a026cce9f67a137ee..2efa2e6600f017b566155974cb9fb185
            publicKeyDER: player.crypto.publicKey,
            signature: player.crypto.signature,
            displayName: player.displayName || player.name
-@@ -189,7 +189,7 @@ module.exports = function (client, options) {
+@@ -190,7 +190,7 @@ module.exports = function (client, options) {
      if (mcData.supportFeature('useChatSessions')) {
        const tsDelta = BigInt(Date.now()) - packet.timestamp
        const expired = !packet.timestamp || tsDelta > messageExpireTime || tsDelta < 0
@@ -28,26 +28,26 @@ index 8d0869b150681574ad19292a026cce9f67a137ee..2efa2e6600f017b566155974cb9fb185
 +      const verified = false && !packet.unsignedChatContent && updateAndValidateSession(packet.senderUuid, packet.plainMessage, packet.signature, packet.index, packet.previousMessages, packet.salt, packet.timestamp) && !expired
        if (verified) client._signatureCache.push(packet.signature)
        client.emit('playerChat', {
-         plainMessage: packet.plainMessage,
-@@ -354,7 +354,7 @@ module.exports = function (client, options) {
+         globalIndex: packet.globalIndex,
+@@ -356,7 +356,7 @@ module.exports = function (client, options) {
      }
    }
- 
+
 -  client._signedChat = (message, options = {}) => {
 +  client._signedChat = async (message, options = {}) => {
      options.timestamp = options.timestamp || BigInt(Date.now())
      options.salt = options.salt || 1n
- 
-@@ -396,7 +396,7 @@ module.exports = function (client, options) {
+
+@@ -401,7 +401,7 @@ module.exports = function (client, options) {
          message,
          timestamp: options.timestamp,
          salt: options.salt,
 -        signature: (client.profileKeys && client._session) ? client.signMessage(message, options.timestamp, options.salt, undefined, acknowledgements) : undefined,
 +        signature: (client.profileKeys && client._session) ? await client.signMessage(message, options.timestamp, options.salt, undefined, acknowledgements) : undefined,
          offset: client._lastSeenMessages.pending,
+         checksum: computeChatChecksum(client._lastSeenMessages), // 1.21.5+
          acknowledged
-       })
-@@ -410,7 +410,7 @@ module.exports = function (client, options) {
+@@ -416,7 +416,7 @@ module.exports = function (client, options) {
          message,
          timestamp: options.timestamp,
          salt: options.salt,
@@ -57,7 +57,7 @@ index 8d0869b150681574ad19292a026cce9f67a137ee..2efa2e6600f017b566155974cb9fb185
          previousMessages: client._lastSeenMessages.map((e) => ({
            messageSender: e.sender,
 diff --git a/src/client/encrypt.js b/src/client/encrypt.js
-index b9d21bab9faccd5dbf1975fc423fc55c73e906c5..99ffd76527b410e3a393181beb260108f4c63536 100644
+index 63cc2bd9615100bd2fd63dfe14c094aa6b8cd1c9..36df57d1196af9761d920fa285ac48f85410eaef 100644
 --- a/src/client/encrypt.js
 +++ b/src/client/encrypt.js
 @@ -25,7 +25,11 @@ module.exports = function (client, options) {
@@ -71,7 +71,7 @@ index b9d21bab9faccd5dbf1975fc423fc55c73e906c5..99ffd76527b410e3a393181beb260108
 +        //   clearTimeout(loginTimeout)
 +        // })
        }
- 
+
        function onJoinServerResponse (err) {
 diff --git a/src/client/play.js b/src/client/play.js
 index 559607f34e9a5b2b7809423f8ca4cd6746b60225..4dc1c3139438cc2729b05c57e57bd00252728f8a 100644
@@ -87,27 +87,10 @@ index 559607f34e9a5b2b7809423f8ca4cd6746b60225..4dc1c3139438cc2729b05c57e57bd002
        })
        // 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 5c7a62b013daa69be91ec9e763b1f48ffe96ffa6..174d42a77740a937afcb106e1f39a9ee824a24b9 100644
+index e369e77d055ba919e8f9da7b8e8b5dc879c74cf4..11c6bff299f1186ab1ecb6744f53ff0c648ab192 100644
 --- a/src/client.js
 +++ b/src/client.js
-@@ -89,10 +89,12 @@ class Client extends EventEmitter {
-       parsed.metadata.name = parsed.data.name
-       parsed.data = parsed.data.params
-       parsed.metadata.state = state
--      debug('read packet ' + state + '.' + parsed.metadata.name)
--      if (debug.enabled) {
--        const s = JSON.stringify(parsed.data, null, 2)
--        debug(s && s.length > 10000 ? parsed.data : s)
-+      if (!globalThis.excludeCommunicationDebugEvents?.includes(parsed.metadata.name)) {
-+        debug('read packet ' + state + '.' + parsed.metadata.name)
-+        if (debug.enabled) {
-+          const s = JSON.stringify(parsed.data, null, 2)
-+          debug(s && s.length > 10000 ? parsed.data : s)
-+        }
-       }
-       if (this._hasBundlePacket && parsed.metadata.name === 'bundle_delimiter') {
-         if (this._mcBundle.length) { // End bundle
-@@ -110,7 +112,13 @@ class Client extends EventEmitter {
+@@ -111,7 +111,13 @@ class Client extends EventEmitter {
            this._hasBundlePacket = false
          }
        } else {
@@ -122,9 +105,9 @@ index 5c7a62b013daa69be91ec9e763b1f48ffe96ffa6..174d42a77740a937afcb106e1f39a9ee
        }
      })
    }
-@@ -168,7 +176,10 @@ class Client extends EventEmitter {
+@@ -169,7 +175,10 @@ class Client extends EventEmitter {
      }
- 
+
      const onFatalError = (err) => {
 -      this.emit('error', err)
 +      // todo find out what is trying to write after client disconnect
@@ -133,8 +116,8 @@ index 5c7a62b013daa69be91ec9e763b1f48ffe96ffa6..174d42a77740a937afcb106e1f39a9ee
 +      }
        endSocket()
      }
- 
-@@ -197,6 +208,8 @@ class Client extends EventEmitter {
+
+@@ -198,6 +207,8 @@ class Client extends EventEmitter {
      serializer -> framer -> socket -> splitter -> deserializer */
      if (this.serializer) {
        this.serializer.end()
@@ -143,17 +126,48 @@ index 5c7a62b013daa69be91ec9e763b1f48ffe96ffa6..174d42a77740a937afcb106e1f39a9ee
      } else {
        if (this.socket) this.socket.end()
      }
-@@ -238,8 +251,11 @@ class Client extends EventEmitter {
- 
-   write (name, params) {
-     if (!this.serializer.writable) { return }
--    debug('writing packet ' + this.state + '.' + name)
--    debug(params)
-+    if (!globalThis.excludeCommunicationDebugEvents?.includes(name)) {
-+      debug(`[${this.state}] from ${this.isServer ? 'server' : 'client'}: ` + name)
-+      debug(params)
-+    }
+@@ -243,6 +254,7 @@ class Client extends EventEmitter {
+       debug('writing packet ' + this.state + '.' + name)
+       debug(params)
+     }
 +    this.emit('writePacket', name, params)
      this.serializer.write({ name, params })
    }
- 
+
+diff --git a/src/client.js.rej b/src/client.js.rej
+new file mode 100644
+index 0000000000000000000000000000000000000000..1101e2477adfdc004381b78e7d70953dacb7b484
+--- /dev/null
++++ b/src/client.js.rej
+@@ -0,0 +1,31 @@
++@@ -89,10 +89,12 @@
++       parsed.metadata.name = parsed.data.name
++       parsed.data = parsed.data.params
++       parsed.metadata.state = state
++-      debug('read packet ' + state + '.' + parsed.metadata.name)
++-      if (debug.enabled) {
++-        const s = JSON.stringify(parsed.data, null, 2)
++-        debug(s && s.length > 10000 ? parsed.data : s)
+++      if (!globalThis.excludeCommunicationDebugEvents?.includes(parsed.metadata.name)) {
+++        debug('read packet ' + state + '.' + parsed.metadata.name)
+++        if (debug.enabled) {
+++          const s = JSON.stringify(parsed.data, null, 2)
+++          debug(s && s.length > 10000 ? parsed.data : s)
+++        }
++       }
++       if (this._hasBundlePacket && parsed.metadata.name === 'bundle_delimiter') {
++         if (this._mcBundle.length) { // End bundle
++@@ -239,8 +252,11 @@
++
++   write (name, params) {
++     if (!this.serializer.writable) { return }
++-    debug('writing packet ' + this.state + '.' + name)
++-    debug(params)
+++    if (!globalThis.excludeCommunicationDebugEvents?.includes(name)) {
+++      debug(`[${this.state}] from ${this.isServer ? 'server' : 'client'}: ` + name)
+++      debug(params)
+++    }
+++    this.emit('writePacket', name, params)
++     this.serializer.write({ name, params })
++   }
++
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 52c2ff30..aa67e479 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -22,7 +22,7 @@ overrides:
 
 patchedDependencies:
   minecraft-protocol:
-    hash: a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0
+    hash: 40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150
     path: patches/minecraft-protocol.patch
   mineflayer-item-map-downloader@1.2.0:
     hash: a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad
@@ -136,13 +136,13 @@ 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/26c04c26f8eed2499a7c56eb4664649f3f54b767(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13))
       minecraft-data:
         specifier: 3.92.0
         version: 3.92.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(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)
@@ -341,7 +341,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41(@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/26c04c26f8eed2499a7c56eb4664649f3f54b767(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.14
         version: 0.1.14
@@ -6651,9 +6651,9 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41}
     version: 1.0.1
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176:
-    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176}
-    version: 1.58.0
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453:
+    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453}
+    version: 1.60.0
     engines: {node: '>=22'}
 
   minecraft-wrap@1.6.0:
@@ -6678,9 +6678,9 @@ packages:
     resolution: {integrity: sha512-GtW4hkijyZbSu5LKYYD89xZu+XY7OoP7IkrCnNEn6EdPm0+vr2THoJgFGKrlze9/81+T+P3E4qvJXNFiU/zeJg==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767}
-    version: 4.30.0
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448}
+    version: 4.31.0
     engines: {node: '>=22'}
 
   minimalistic-assert@1.0.1:
@@ -7392,8 +7392,8 @@ packages:
   prismarine-entity@2.5.0:
     resolution: {integrity: sha512-nRPCawUwf9r3iKqi4I7mZRlir1Ix+DffWYdWq6p/KNnmiXve+xHE5zv8XCdhZlUmOshugHv5ONl9o6ORAkCNIA==}
 
-  prismarine-item@1.16.0:
-    resolution: {integrity: sha512-88Tz+/6HquYIsDuseae5G3IbqLeMews2L+ba2gX+p6K6soU9nuFhCfbwN56QuB7d/jZFcWrCYAPE5+UhwWh67w==}
+  prismarine-item@1.17.0:
+    resolution: {integrity: sha512-wN1OjP+f+Uvtjo3KzeCkVSy96CqZ8yG7cvuvlGwcYupQ6ct7LtNkubHp0AHuLMJ0vbbfAC0oZ2bWOgI1DYp8WA==}
 
   prismarine-nbt@2.7.0:
     resolution: {integrity: sha512-Du9OLQAcCj3y29YtewOJbbV4ARaSUEJiTguw0PPQbPBy83f+eCyDRkyBpnXTi/KPyEpgYCzsjGzElevLpFoYGQ==}
@@ -8324,6 +8324,7 @@ packages:
   source-map@0.8.0-beta.0:
     resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==}
     engines: {node: '>= 8'}
+    deprecated: The work that was done in this beta branch won't be included in future versions
 
   sourcemap-codec@1.4.8:
     resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
@@ -9668,7 +9669,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:
@@ -11318,7 +11319,7 @@ snapshots:
       minecraft-data: 3.92.0
       mineflayer: 4.30.0(encoding@0.1.13)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
-      prismarine-item: 1.16.0
+      prismarine-item: 1.17.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
     transitivePeerDependencies:
@@ -12881,7 +12882,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 6.1.0
       '@typescript-eslint/visitor-keys': 6.1.0
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.7.1
@@ -13077,13 +13078,13 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(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.92.0)
       prismarine-entity: 2.5.0
-      prismarine-item: 1.16.0
+      prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
       prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.92.0)
       prismarine-windows: 2.9.0
@@ -13113,13 +13114,13 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(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.92.0)
       prismarine-entity: 2.5.0
-      prismarine-item: 1.16.0
+      prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
       prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.92.0)
       prismarine-windows: 2.9.0
@@ -14502,7 +14503,7 @@ snapshots:
   detect-port@1.6.1:
     dependencies:
       address: 1.2.2
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
     transitivePeerDependencies:
       - supports-color
 
@@ -16109,7 +16110,7 @@ snapshots:
   https-proxy-agent@4.0.0:
     dependencies:
       agent-base: 5.1.1
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
     transitivePeerDependencies:
       - supports-color
 
@@ -16956,13 +16957,13 @@ 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/26c04c26f8eed2499a7c56eb4664649f3f54b767(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(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/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767(encoding@0.1.13)
-      prismarine-item: 1.16.0
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
+      prismarine-item: 1.17.0
       ws: 8.18.1
     transitivePeerDependencies:
       - bufferutil
@@ -17191,7 +17192,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
@@ -17279,7 +17280,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17341,7 +17342,7 @@ snapshots:
     dependencies:
       change-case: 5.4.4
       debug: 4.4.1
-      prismarine-item: 1.16.0
+      prismarine-item: 1.17.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
     transitivePeerDependencies:
       - supports-color
@@ -17351,7 +17352,7 @@ snapshots:
       minecraft-data: 3.92.0
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-entity: 2.5.0
-      prismarine-item: 1.16.0
+      prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
@@ -17359,13 +17360,13 @@ snapshots:
   mineflayer@4.30.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.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.92.0)
       prismarine-entity: 2.5.0
-      prismarine-item: 1.16.0
+      prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       prismarine-recipe: 1.3.1(prismarine-registry@1.11.0)
@@ -17379,17 +17380,17 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.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.92.0)
       prismarine-entity: 2.5.0
-      prismarine-item: 1.16.0
+      prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       prismarine-recipe: 1.3.1(prismarine-registry@1.11.0)
@@ -18181,7 +18182,7 @@ snapshots:
       minecraft-data: 3.92.0
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-chat: 1.11.0
-      prismarine-item: 1.16.0
+      prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
 
@@ -18207,11 +18208,11 @@ snapshots:
   prismarine-entity@2.5.0:
     dependencies:
       prismarine-chat: 1.11.0
-      prismarine-item: 1.16.0
+      prismarine-item: 1.17.0
       prismarine-registry: 1.11.0
       vec3: 0.1.10
 
-  prismarine-item@1.16.0:
+  prismarine-item@1.17.0:
     dependencies:
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
@@ -18265,7 +18266,7 @@ snapshots:
 
   prismarine-windows@2.9.0:
     dependencies:
-      prismarine-item: 1.16.0
+      prismarine-item: 1.17.0
       prismarine-registry: 1.11.0
       typed-emitter: 2.1.0
 

From d41527edc8db54c26ce1edcdee3664e44e324726 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 3 Aug 2025 03:33:37 +0300
Subject: [PATCH 076/136] manually fix lockfile because of silly pnpm dep
 resolution

---
 pnpm-lock.yaml | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index aa67e479..b79d619e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6674,10 +6674,6 @@ packages:
   mineflayer-pathfinder@2.4.5:
     resolution: {integrity: sha512-Jh3JnUgRLwhMh2Dugo4SPza68C41y+NPP5sdsgxRu35ydndo70i1JJGxauVWbXrpNwIxYNztUw78aFyb7icw8g==}
 
-  mineflayer@4.30.0:
-    resolution: {integrity: sha512-GtW4hkijyZbSu5LKYYD89xZu+XY7OoP7IkrCnNEn6EdPm0+vr2THoJgFGKrlze9/81+T+P3E4qvJXNFiU/zeJg==}
-    engines: {node: '>=22'}
-
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448}
     version: 4.31.0
@@ -11317,7 +11313,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.92.0
-      mineflayer: 4.30.0(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.17.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
@@ -17332,7 +17328,7 @@ snapshots:
 
   mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13):
     dependencies:
-      mineflayer: 4.30.0(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
       sharp: 0.30.7
     transitivePeerDependencies:
       - encoding
@@ -17357,29 +17353,6 @@ snapshots:
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
 
-  mineflayer@4.30.0(encoding@0.1.13):
-    dependencies:
-      minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.92.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.92.0)
-      prismarine-entity: 2.5.0
-      prismarine-item: 1.17.0
-      prismarine-nbt: 2.7.0
-      prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
-      prismarine-recipe: 1.3.1(prismarine-registry@1.11.0)
-      prismarine-registry: 1.11.0
-      prismarine-windows: 2.9.0
-      prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
-      protodef: 1.18.0
-      typed-emitter: 1.4.0
-      vec3: 0.1.10
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10

From d7bd26b6b5f94e838d04c4cf19a8b9acc5966c5e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 6 Aug 2025 01:47:09 +0300
Subject: [PATCH 077/136] up protocol patch

---
 patches/minecraft-protocol.patch | 13 --------
 pnpm-lock.yaml                   | 51 ++++++++++++++++++++++++--------
 2 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/patches/minecraft-protocol.patch b/patches/minecraft-protocol.patch
index 108085a1..e74f7e1d 100644
--- a/patches/minecraft-protocol.patch
+++ b/patches/minecraft-protocol.patch
@@ -73,19 +73,6 @@ index 63cc2bd9615100bd2fd63dfe14c094aa6b8cd1c9..36df57d1196af9761d920fa285ac48f8
        }
 
        function onJoinServerResponse (err) {
-diff --git a/src/client/play.js b/src/client/play.js
-index 559607f34e9a5b2b7809423f8ca4cd6746b60225..4dc1c3139438cc2729b05c57e57bd00252728f8a 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 e369e77d055ba919e8f9da7b8e8b5dc879c74cf4..11c6bff299f1186ab1ecb6744f53ff0c648ab192 100644
 --- a/src/client.js
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b79d619e..db095f5b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -22,7 +22,7 @@ overrides:
 
 patchedDependencies:
   minecraft-protocol:
-    hash: 40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150
+    hash: b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9
     path: patches/minecraft-protocol.patch
   mineflayer-item-map-downloader@1.2.0:
     hash: a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad
@@ -142,7 +142,7 @@ importers:
         version: 3.92.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(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)
@@ -6651,9 +6651,9 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41}
     version: 1.0.1
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453:
-    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453}
-    version: 1.60.0
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb:
+    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb}
+    version: 1.60.1
     engines: {node: '>=22'}
 
   minecraft-wrap@1.6.0:
@@ -6674,6 +6674,10 @@ packages:
   mineflayer-pathfinder@2.4.5:
     resolution: {integrity: sha512-Jh3JnUgRLwhMh2Dugo4SPza68C41y+NPP5sdsgxRu35ydndo70i1JJGxauVWbXrpNwIxYNztUw78aFyb7icw8g==}
 
+  mineflayer@4.31.0:
+    resolution: {integrity: sha512-oqiNa5uP4kXiPlj4+Jn+9QozPMsMy0U8/YP5d6+KSAeWthtuJHeQqcYgWG5lkC3LHMqHqtEu4MNdXt6GZjFNTQ==}
+    engines: {node: '>=22'}
+
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448}
     version: 4.31.0
@@ -11313,7 +11317,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.92.0
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
+      mineflayer: 4.31.0(encoding@0.1.13)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.17.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
@@ -13074,7 +13078,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13110,7 +13114,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -16957,7 +16961,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/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
       mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
       prismarine-item: 1.17.0
       ws: 8.18.1
@@ -17276,7 +17280,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17328,7 +17332,7 @@ snapshots:
 
   mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13):
     dependencies:
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
+      mineflayer: 4.31.0(encoding@0.1.13)
       sharp: 0.30.7
     transitivePeerDependencies:
       - encoding
@@ -17353,11 +17357,34 @@ snapshots:
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
 
+  mineflayer@4.31.0(encoding@0.1.13):
+    dependencies:
+      minecraft-data: 3.92.0
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
+      prismarine-biome: 1.3.0(minecraft-data@3.92.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.92.0)
+      prismarine-entity: 2.5.0
+      prismarine-item: 1.17.0
+      prismarine-nbt: 2.7.0
+      prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
+      prismarine-recipe: 1.3.1(prismarine-registry@1.11.0)
+      prismarine-registry: 1.11.0
+      prismarine-windows: 2.9.0
+      prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
+      protodef: 1.18.0
+      typed-emitter: 1.4.0
+      vec3: 0.1.10
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0

From 167b49da08bf66f2617188f6d905e5efee9da42f Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Fri, 8 Aug 2025 01:07:52 +0200
Subject: [PATCH 078/136] fix: fix cannot write after stream was destroyed
 message (#413)

---
 README.MD                        |  2 +-
 patches/minecraft-protocol.patch | 77 +++++++++-----------------------
 pnpm-lock.yaml                   | 16 +++----
 src/index.ts                     |  8 +++-
 4 files changed, 36 insertions(+), 67 deletions(-)

diff --git a/README.MD b/README.MD
index e9127a73..7978cee5 100644
--- a/README.MD
+++ b/README.MD
@@ -54,7 +54,7 @@ Howerver, it's known that these browsers have issues:
 
 ### Versions Support
 
-Server versions 1.8 - 1.21.4 are supported.
+Server versions 1.8 - 1.21.5 are supported.
 First class versions (most of the features are tested on these versions):
 
 - 1.19.4
diff --git a/patches/minecraft-protocol.patch b/patches/minecraft-protocol.patch
index e74f7e1d..5dec44d7 100644
--- a/patches/minecraft-protocol.patch
+++ b/patches/minecraft-protocol.patch
@@ -1,8 +1,8 @@
 diff --git a/src/client/chat.js b/src/client/chat.js
-index a50f4b988ad9fb29d5eb9e1633b498615aa9cd28..b8b819eef0762a77d9db5c0fb06be648303628c7 100644
+index 0021870994fc59a82f0ac8aba0a65a8be43ef2f4..a53fceb843105ea2a1d88722b3fc7c3b43cb102a 100644
 --- a/src/client/chat.js
 +++ b/src/client/chat.js
-@@ -110,7 +110,7 @@ module.exports = function (client, options) {
+@@ -116,7 +116,7 @@ module.exports = function (client, options) {
      for (const player of packet.data) {
        if (player.chatSession) {
          client._players[player.uuid] = {
@@ -11,8 +11,8 @@ index a50f4b988ad9fb29d5eb9e1633b498615aa9cd28..b8b819eef0762a77d9db5c0fb06be648
            publicKeyDER: player.chatSession.publicKey.keyBytes,
            sessionUuid: player.chatSession.uuid
          }
-@@ -120,7 +120,7 @@ module.exports = function (client, options) {
-
+@@ -126,7 +126,7 @@ module.exports = function (client, options) {
+ 
        if (player.crypto) {
          client._players[player.uuid] = {
 -          publicKey: crypto.createPublicKey({ key: player.crypto.publicKey, format: 'der', type: 'spki' }),
@@ -20,7 +20,7 @@ index a50f4b988ad9fb29d5eb9e1633b498615aa9cd28..b8b819eef0762a77d9db5c0fb06be648
            publicKeyDER: player.crypto.publicKey,
            signature: player.crypto.signature,
            displayName: player.displayName || player.name
-@@ -190,7 +190,7 @@ module.exports = function (client, options) {
+@@ -196,7 +196,7 @@ module.exports = function (client, options) {
      if (mcData.supportFeature('useChatSessions')) {
        const tsDelta = BigInt(Date.now()) - packet.timestamp
        const expired = !packet.timestamp || tsDelta > messageExpireTime || tsDelta < 0
@@ -29,16 +29,16 @@ index a50f4b988ad9fb29d5eb9e1633b498615aa9cd28..b8b819eef0762a77d9db5c0fb06be648
        if (verified) client._signatureCache.push(packet.signature)
        client.emit('playerChat', {
          globalIndex: packet.globalIndex,
-@@ -356,7 +356,7 @@ module.exports = function (client, options) {
+@@ -362,7 +362,7 @@ module.exports = function (client, options) {
      }
    }
-
+ 
 -  client._signedChat = (message, options = {}) => {
 +  client._signedChat = async (message, options = {}) => {
      options.timestamp = options.timestamp || BigInt(Date.now())
      options.salt = options.salt || 1n
-
-@@ -401,7 +401,7 @@ module.exports = function (client, options) {
+ 
+@@ -407,7 +407,7 @@ module.exports = function (client, options) {
          message,
          timestamp: options.timestamp,
          salt: options.salt,
@@ -47,7 +47,7 @@ index a50f4b988ad9fb29d5eb9e1633b498615aa9cd28..b8b819eef0762a77d9db5c0fb06be648
          offset: client._lastSeenMessages.pending,
          checksum: computeChatChecksum(client._lastSeenMessages), // 1.21.5+
          acknowledged
-@@ -416,7 +416,7 @@ module.exports = function (client, options) {
+@@ -422,7 +422,7 @@ module.exports = function (client, options) {
          message,
          timestamp: options.timestamp,
          salt: options.salt,
@@ -71,10 +71,10 @@ index 63cc2bd9615100bd2fd63dfe14c094aa6b8cd1c9..36df57d1196af9761d920fa285ac48f8
 +        //   clearTimeout(loginTimeout)
 +        // })
        }
-
+ 
        function onJoinServerResponse (err) {
 diff --git a/src/client.js b/src/client.js
-index e369e77d055ba919e8f9da7b8e8b5dc879c74cf4..11c6bff299f1186ab1ecb6744f53ff0c648ab192 100644
+index e369e77d055ba919e8f9da7b8e8b5dc879c74cf4..54bb9e6644388e9b6bd42b3012951875989cdf0c 100644
 --- a/src/client.js
 +++ b/src/client.js
 @@ -111,7 +111,13 @@ class Client extends EventEmitter {
@@ -94,7 +94,7 @@ index e369e77d055ba919e8f9da7b8e8b5dc879c74cf4..11c6bff299f1186ab1ecb6744f53ff0c
    }
 @@ -169,7 +175,10 @@ class Client extends EventEmitter {
      }
-
+ 
      const onFatalError = (err) => {
 -      this.emit('error', err)
 +      // todo find out what is trying to write after client disconnect
@@ -103,58 +103,23 @@ index e369e77d055ba919e8f9da7b8e8b5dc879c74cf4..11c6bff299f1186ab1ecb6744f53ff0c
 +      }
        endSocket()
      }
-
-@@ -198,6 +207,8 @@ class Client extends EventEmitter {
+ 
+@@ -198,6 +207,10 @@ class Client extends EventEmitter {
      serializer -> framer -> socket -> splitter -> deserializer */
      if (this.serializer) {
        this.serializer.end()
-+      this.socket?.end()
-+      this.socket?.emit('end')
++      setTimeout(() => {
++        this.socket?.end()
++        this.socket?.emit('end')
++      }, 2000) // allow the serializer to finish writing
      } else {
        if (this.socket) this.socket.end()
      }
-@@ -243,6 +254,7 @@ class Client extends EventEmitter {
+@@ -243,6 +256,7 @@ class Client extends EventEmitter {
        debug('writing packet ' + this.state + '.' + name)
        debug(params)
      }
 +    this.emit('writePacket', name, params)
      this.serializer.write({ name, params })
    }
-
-diff --git a/src/client.js.rej b/src/client.js.rej
-new file mode 100644
-index 0000000000000000000000000000000000000000..1101e2477adfdc004381b78e7d70953dacb7b484
---- /dev/null
-+++ b/src/client.js.rej
-@@ -0,0 +1,31 @@
-+@@ -89,10 +89,12 @@
-+       parsed.metadata.name = parsed.data.name
-+       parsed.data = parsed.data.params
-+       parsed.metadata.state = state
-+-      debug('read packet ' + state + '.' + parsed.metadata.name)
-+-      if (debug.enabled) {
-+-        const s = JSON.stringify(parsed.data, null, 2)
-+-        debug(s && s.length > 10000 ? parsed.data : s)
-++      if (!globalThis.excludeCommunicationDebugEvents?.includes(parsed.metadata.name)) {
-++        debug('read packet ' + state + '.' + parsed.metadata.name)
-++        if (debug.enabled) {
-++          const s = JSON.stringify(parsed.data, null, 2)
-++          debug(s && s.length > 10000 ? parsed.data : s)
-++        }
-+       }
-+       if (this._hasBundlePacket && parsed.metadata.name === 'bundle_delimiter') {
-+         if (this._mcBundle.length) { // End bundle
-+@@ -239,8 +252,11 @@
-+
-+   write (name, params) {
-+     if (!this.serializer.writable) { return }
-+-    debug('writing packet ' + this.state + '.' + name)
-+-    debug(params)
-++    if (!globalThis.excludeCommunicationDebugEvents?.includes(name)) {
-++      debug(`[${this.state}] from ${this.isServer ? 'server' : 'client'}: ` + name)
-++      debug(params)
-++    }
-++    this.emit('writePacket', name, params)
-+     this.serializer.write({ name, params })
-+   }
-+
+ 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index db095f5b..132ef32c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -22,7 +22,7 @@ overrides:
 
 patchedDependencies:
   minecraft-protocol:
-    hash: b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9
+    hash: 2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea
     path: patches/minecraft-protocol.patch
   mineflayer-item-map-downloader@1.2.0:
     hash: a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad
@@ -142,7 +142,7 @@ importers:
         version: 3.92.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(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)
@@ -13078,7 +13078,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13114,7 +13114,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -16961,7 +16961,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/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
       mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
       prismarine-item: 1.17.0
       ws: 8.18.1
@@ -17280,7 +17280,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17360,7 +17360,7 @@ snapshots:
   mineflayer@4.31.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
@@ -17384,7 +17384,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
diff --git a/src/index.ts b/src/index.ts
index d28261f4..c0213f56 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -231,8 +231,12 @@ export async function connect (connectOptions: ConnectOptions) {
       bot.emit('end', '')
       bot.removeAllListeners()
       bot._client.removeAllListeners()
-      //@ts-expect-error TODO?
-      bot._client = undefined
+      bot._client = {
+        //@ts-expect-error
+        write (packetName) {
+          console.warn('Tried to write packet', packetName, 'after bot was destroyed')
+        }
+      }
       //@ts-expect-error
       window.bot = bot = undefined
     }

From caf4695637f1e1b86a98db90f12021df00822ca7 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 8 Aug 2025 18:33:20 +0300
Subject: [PATCH 079/136] feat: silly player on fire renderer effect

---
 renderer/viewer/lib/basePlayerState.ts |   1 +
 src/entities.ts                        |  63 ++++++++++
 src/react/FireRenderer.tsx             | 152 +++++++++++++++++++++++++
 src/reactUi.tsx                        |   2 +
 4 files changed, 218 insertions(+)
 create mode 100644 src/react/FireRenderer.tsx

diff --git a/renderer/viewer/lib/basePlayerState.ts b/renderer/viewer/lib/basePlayerState.ts
index af5d9d06..9cf1350a 100644
--- a/renderer/viewer/lib/basePlayerState.ts
+++ b/renderer/viewer/lib/basePlayerState.ts
@@ -48,6 +48,7 @@ export const getInitialPlayerState = () => proxy({
   heldItemMain: undefined as HandItemBlock | undefined,
   heldItemOff: undefined as HandItemBlock | undefined,
   perspective: 'first_person' as CameraPerspective,
+  onFire: false,
 
   cameraSpectatingEntity: undefined as number | undefined,
 
diff --git a/src/entities.ts b/src/entities.ts
index 79602aa5..cf91ff2c 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -126,6 +126,28 @@ customEvents.on('gameLoaded', () => {
     if (entityStatus === EntityStatus.HURT) {
       getThreeJsRendererMethods()?.damageEntity(entityId, entityStatus)
     }
+
+    if (entityStatus === EntityStatus.BURNED) {
+      updateEntityStates(entityId, true, true)
+    }
+  })
+
+  // on fire events
+  bot._client.on('entity_metadata', (data) => {
+    if (data.entityId !== bot.entity.id) return
+    handleEntityMetadata(data)
+  })
+
+  bot.on('end', () => {
+    if (onFireTimeout) {
+      clearTimeout(onFireTimeout)
+    }
+  })
+
+  bot.on('respawn', () => {
+    if (onFireTimeout) {
+      clearTimeout(onFireTimeout)
+    }
   })
 
   const updateCamera = (entity: Entity) => {
@@ -296,3 +318,44 @@ customEvents.on('gameLoaded', () => {
   })
 
 })
+
+// Constants
+const SHARED_FLAGS_KEY = 0
+const ENTITY_FLAGS = {
+  ON_FIRE: 0x01, // Bit 0
+  SNEAKING: 0x02, // Bit 1
+  SPRINTING: 0x08, // Bit 3
+  SWIMMING: 0x10, // Bit 4
+  INVISIBLE: 0x20, // Bit 5
+  GLOWING: 0x40, // Bit 6
+  FALL_FLYING: 0x80 // Bit 7 (elytra flying)
+}
+
+let onFireTimeout: NodeJS.Timeout | undefined
+const updateEntityStates = (entityId: number, onFire: boolean, timeout?: boolean) => {
+  if (entityId !== bot.entity.id) return
+  appViewer.playerState.reactive.onFire = onFire
+  if (onFireTimeout) {
+    clearTimeout(onFireTimeout)
+  }
+  if (timeout) {
+    onFireTimeout = setTimeout(() => {
+      updateEntityStates(entityId, false, false)
+    }, 5000)
+  }
+}
+
+// Process entity metadata packet
+function handleEntityMetadata (packet: { entityId: number, metadata: Array<{ key: number, type: string, value: number }> }) {
+  const { entityId, metadata } = packet
+
+  // Find shared flags in metadata
+  const flagsData = metadata.find(meta => meta.key === SHARED_FLAGS_KEY &&
+    meta.type === 'byte')
+
+  // Update fire state if flags were found
+  if (flagsData) {
+    const wasOnFire = appViewer.playerState.reactive.onFire
+    appViewer.playerState.reactive.onFire = (flagsData.value & ENTITY_FLAGS.ON_FIRE) !== 0
+  }
+}
diff --git a/src/react/FireRenderer.tsx b/src/react/FireRenderer.tsx
new file mode 100644
index 00000000..3a188558
--- /dev/null
+++ b/src/react/FireRenderer.tsx
@@ -0,0 +1,152 @@
+/* eslint-disable no-await-in-loop */
+import { useSnapshot } from 'valtio'
+import { useEffect, useState } from 'react'
+import { getLoadedImage } from 'mc-assets/dist/utils'
+import { createCanvas } from 'renderer/viewer/lib/utils'
+
+const TEXTURE_UPDATE_INTERVAL = 100 // 5 times per second
+
+export default () => {
+  const { onFire, perspective } = useSnapshot(appViewer.playerState.reactive)
+  const [fireTextures, setFireTextures] = useState<string[]>([])
+  const [currentTextureIndex, setCurrentTextureIndex] = useState(0)
+
+  useEffect(() => {
+    let animationFrameId: number
+    let lastTextureUpdate = 0
+
+    const updateTexture = (timestamp: number) => {
+      if (onFire && fireTextures.length > 0) {
+        if (timestamp - lastTextureUpdate >= TEXTURE_UPDATE_INTERVAL) {
+          setCurrentTextureIndex(prev => (prev + 1) % fireTextures.length)
+          lastTextureUpdate = timestamp
+        }
+      }
+      animationFrameId = requestAnimationFrame(updateTexture)
+    }
+
+    animationFrameId = requestAnimationFrame(updateTexture)
+    return () => cancelAnimationFrame(animationFrameId)
+  }, [onFire, fireTextures])
+
+  useEffect(() => {
+    const loadTextures = async () => {
+      const fireImageUrls: string[] = []
+
+      const { resourcesManager } = appViewer
+      const { blocksAtlasParser } = resourcesManager
+      if (!blocksAtlasParser?.atlas?.latest) {
+        console.warn('FireRenderer: Blocks atlas parser not available')
+        return
+      }
+
+      const keys = Object.keys(blocksAtlasParser.atlas.latest.textures).filter(key => /^fire_\d+$/.exec(key))
+      for (const key of keys) {
+        const textureInfo = blocksAtlasParser.getTextureInfo(key) as { u: number, v: number, width?: number, height?: number }
+        if (textureInfo) {
+          const defaultSize = blocksAtlasParser.atlas.latest.tileSize
+          const imageWidth = blocksAtlasParser.atlas.latest.width
+          const imageHeight = blocksAtlasParser.atlas.latest.height
+          const textureWidth = textureInfo.width ?? defaultSize
+          const textureHeight = textureInfo.height ?? defaultSize
+
+          // Create a temporary canvas for the full texture
+          const tempCanvas = createCanvas(textureWidth, textureHeight)
+          const tempCtx = tempCanvas.getContext('2d')
+          if (tempCtx && blocksAtlasParser.latestImage) {
+            const image = await getLoadedImage(blocksAtlasParser.latestImage)
+            tempCtx.drawImage(
+              image,
+              textureInfo.u * imageWidth,
+              textureInfo.v * imageHeight,
+              textureWidth,
+              textureHeight,
+              0,
+              0,
+              textureWidth,
+              textureHeight
+            )
+
+            // Create final canvas with only top 20% of the texture
+            const finalHeight = Math.ceil(textureHeight * 0.4)
+            const canvas = createCanvas(textureWidth, finalHeight)
+            const ctx = canvas.getContext('2d')
+            if (ctx) {
+              // Draw only the top portion
+              ctx.drawImage(
+                tempCanvas,
+                0,
+                0, // Start from top
+                textureWidth,
+                finalHeight,
+                0,
+                0,
+                textureWidth,
+                finalHeight
+              )
+
+              const blob = await canvas.convertToBlob()
+              const url = URL.createObjectURL(blob)
+              fireImageUrls.push(url)
+            }
+          }
+        }
+      }
+
+      setFireTextures(fireImageUrls)
+    }
+
+    // Load textures initially
+    if (appViewer.resourcesManager.currentResources) {
+      void loadTextures()
+    }
+
+    // Set up listener for texture updates
+    const onAssetsUpdated = () => {
+      void loadTextures()
+    }
+    appViewer.resourcesManager.on('assetsTexturesUpdated', onAssetsUpdated)
+
+    // Cleanup
+    return () => {
+      appViewer.resourcesManager.off('assetsTexturesUpdated', onAssetsUpdated)
+      // Cleanup texture URLs
+      for (const url of fireTextures) URL.revokeObjectURL(url)
+    }
+  }, [])
+
+  if (!onFire || fireTextures.length === 0 || perspective !== 'first_person') return null
+
+  return (
+    <div
+      className='fire-renderer-container'
+      style={{
+        position: 'fixed',
+        left: 0,
+        right: 0,
+        bottom: 0,
+        height: '20dvh',
+        pointerEvents: 'none',
+        display: 'flex',
+        justifyContent: 'center',
+        alignItems: 'flex-end',
+        overflow: 'hidden'
+      }}
+    >
+      <div
+        style={{
+          position: 'absolute',
+          width: '100%',
+          height: '100%',
+          backgroundImage: `url(${fireTextures[currentTextureIndex]})`,
+          backgroundSize: '50% 100%',
+          backgroundPosition: 'center',
+          backgroundRepeat: 'repeat-x',
+          opacity: 0.7,
+          filter: 'brightness(1.2) contrast(1.2)',
+          mixBlendMode: 'screen'
+        }}
+      />
+    </div>
+  )
+}
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index b15cb79d..4f8c4541 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -66,6 +66,7 @@ import CreditsAboutModal from './react/CreditsAboutModal'
 import GlobalOverlayHints from './react/GlobalOverlayHints'
 import FullscreenTime from './react/FullscreenTime'
 import StorageConflictModal from './react/StorageConflictModal'
+import FireRenderer from './react/FireRenderer'
 
 const isFirefox = ua.getBrowser().name === 'Firefox'
 if (isFirefox) {
@@ -171,6 +172,7 @@ const InGameUi = () => {
           <VoiceMicrophone />
           <ChunksDebugScreen />
           <RendererDebugMenu />
+          {!disabledUiParts.includes('fire') && <FireRenderer />}
         </PerComponentErrorBoundary>
       </div>
 

From 53cbff7699d5255974a09e5f1e50b02759116a63 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 8 Aug 2025 18:37:10 +0300
Subject: [PATCH 080/136] dont conflict fire with chat

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

diff --git a/src/react/FireRenderer.tsx b/src/react/FireRenderer.tsx
index 3a188558..20ad4606 100644
--- a/src/react/FireRenderer.tsx
+++ b/src/react/FireRenderer.tsx
@@ -130,7 +130,8 @@ export default () => {
         display: 'flex',
         justifyContent: 'center',
         alignItems: 'flex-end',
-        overflow: 'hidden'
+        overflow: 'hidden',
+        zIndex: -1
       }}
     >
       <div

From 353ba2ecb33a60638f17fac8a8266dda690dd11a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 8 Aug 2025 21:52:55 +0300
Subject: [PATCH 081/136] fix: some blocks textures were not update in hotbar
 after texturepack change

---
 renderer/viewer/three/renderSlot.ts | 20 +++++++++++++-------
 src/inventoryWindows.ts             |  1 +
 src/react/HotbarRenderApp.tsx       |  3 ++-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/renderer/viewer/three/renderSlot.ts b/renderer/viewer/three/renderSlot.ts
index d82e58e3..321633eb 100644
--- a/renderer/viewer/three/renderSlot.ts
+++ b/renderer/viewer/three/renderSlot.ts
@@ -10,11 +10,11 @@ export type ResolvedItemModelRender = {
 
 export const renderSlot = (model: ResolvedItemModelRender, resourcesManager: ResourcesManagerCommon, debugIsQuickbar = false, fullBlockModelSupport = false): {
   texture: string,
-  blockData?: Record<string, { slice, path }> & { resolvedModel: BlockModel },
-  scale?: number,
-  slice?: number[],
-  modelName?: string,
-} | undefined => {
+  blockData: Record<string, { slice, path }> & { resolvedModel: BlockModel } | null,
+  scale: number | null,
+  slice: number[] | null,
+  modelName: string | null,
+} => {
   let itemModelName = model.modelName
   const isItem = loadedData.itemsByName[itemModelName]
 
@@ -37,6 +37,8 @@ export const renderSlot = (model: ResolvedItemModelRender, resourcesManager: Res
         texture: 'gui',
         slice: [x, y, atlas.tileSize, atlas.tileSize],
         scale: 0.25,
+        blockData: null,
+        modelName: null
       }
     }
   }
@@ -63,14 +65,18 @@ export const renderSlot = (model: ResolvedItemModelRender, resourcesManager: Res
     return {
       texture: itemTexture.type,
       slice: itemTexture.slice,
-      modelName: itemModelName
+      modelName: itemModelName,
+      blockData: null,
+      scale: null
     }
   } else {
     // is block
     return {
       texture: 'blocks',
       blockData: itemTexture,
-      modelName: itemModelName
+      modelName: itemModelName,
+      slice: null,
+      scale: null
     }
   }
 }
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index bc7dcbaf..a9f89d1b 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -259,6 +259,7 @@ export const upInventoryItems = (isInventory: boolean, invWindow = lastWindow) =
   // inv.pwindow.inv.slots[2].blockData = getBlockData('dirt')
   const customSlots = mapSlots((isInventory ? bot.inventory : bot.currentWindow)!.slots)
   invWindow.pwindow.setSlots(customSlots)
+  return customSlots
 }
 
 export const onModalClose = (callback: () => any) => {
diff --git a/src/react/HotbarRenderApp.tsx b/src/react/HotbarRenderApp.tsx
index 6b6e3207..c782e6ef 100644
--- a/src/react/HotbarRenderApp.tsx
+++ b/src/react/HotbarRenderApp.tsx
@@ -115,7 +115,7 @@ const HotbarInner = () => {
     container.current.appendChild(inv.canvas)
     const upHotbarItems = () => {
       if (!appViewer.resourcesManager?.itemsAtlasParser) return
-      upInventoryItems(true, inv)
+      globalThis.debugHotbarItems = upInventoryItems(true, inv)
     }
 
     canvasManager.canvas.onclick = (e) => {
@@ -127,6 +127,7 @@ const HotbarInner = () => {
       }
     }
 
+    globalThis.debugUpHotbarItems = upHotbarItems
     upHotbarItems()
     bot.inventory.on('updateSlot', upHotbarItems)
     appViewer.resourcesManager.on('assetsTexturesUpdated', upHotbarItems)

From fb395041b9e40449819e5a8d0361f06264bfa80b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 11 Aug 2025 01:39:08 +0300
Subject: [PATCH 082/136] fix: fix on 1.18.2 many blocks like mushrom blocks,
 fence gates, deepslate, basalt, copper stuff like ore, infested stone, cakes
 and tinted glass was resulting in instant breaking on the client dev: add
 debugTestPing

---
 scripts/makeOptimizedMcData.mjs |  7 +++--
 src/mineflayer/mc-protocol.ts   | 49 ++++++++++++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/scripts/makeOptimizedMcData.mjs b/scripts/makeOptimizedMcData.mjs
index 0b5752d8..76e0f1c2 100644
--- a/scripts/makeOptimizedMcData.mjs
+++ b/scripts/makeOptimizedMcData.mjs
@@ -90,16 +90,19 @@ const dataTypeBundling = {
   },
   blocks: {
     arrKey: 'name',
-    processData(current, prev) {
+    processData(current, prev, _, version) {
       for (const block of current) {
+        const prevBlock = prev?.find(x => x.name === block.name)
         if (block.transparent) {
           const forceOpaque = block.name.includes('shulker_box') || block.name.match(/^double_.+_slab\d?$/) || ['melon_block', 'lit_pumpkin', 'lit_redstone_ore', 'lit_furnace'].includes(block.name)
 
-          const prevBlock = prev?.find(x => x.name === block.name)
           if (forceOpaque || (prevBlock && !prevBlock.transparent)) {
             block.transparent = false
           }
         }
+        if (block.hardness === 0 && prevBlock && prevBlock.hardness > 0) {
+          block.hardness = prevBlock.hardness
+        }
       }
     }
     // ignoreRemoved: true,
diff --git a/src/mineflayer/mc-protocol.ts b/src/mineflayer/mc-protocol.ts
index 2376cd03..a0348c5d 100644
--- a/src/mineflayer/mc-protocol.ts
+++ b/src/mineflayer/mc-protocol.ts
@@ -1,8 +1,11 @@
+import net from 'net'
 import { Client } from 'minecraft-protocol'
 import { appQueryParams } from '../appParams'
 import { downloadAllMinecraftData, getVersionAutoSelect } from '../connect'
 import { gameAdditionalState } from '../globalState'
 import { ProgressReporter } from '../core/progressReporter'
+import { parseServerAddress } from '../parseServerAddress'
+import { getCurrentProxy } from '../react/ServersList'
 import { pingServerVersion, validatePacket } from './minecraft-protocol-extra'
 import { getWebsocketStream } from './websocket-core'
 
@@ -35,7 +38,7 @@ setInterval(() => {
 }, 1000)
 
 
-export const getServerInfo = async (ip: string, port?: number, preferredVersion = getVersionAutoSelect(), ping = false, progressReporter?: ProgressReporter) => {
+export const getServerInfo = async (ip: string, port?: number, preferredVersion = getVersionAutoSelect(), ping = false, progressReporter?: ProgressReporter, setProxyParams?: ProxyParams) => {
   await downloadAllMinecraftData()
   const isWebSocket = ip.startsWith('ws://') || ip.startsWith('wss://')
   let stream
@@ -43,6 +46,8 @@ export const getServerInfo = async (ip: string, port?: number, preferredVersion
     progressReporter?.setMessage('Connecting to WebSocket server')
     stream = (await getWebsocketStream(ip)).mineflayerStream
     progressReporter?.setMessage('WebSocket connected. Ping packet sent, waiting for response')
+  } else if (setProxyParams) {
+    setProxy(setProxyParams)
   }
   window.setLoadingMessage = (message?: string) => {
     if (message === undefined) {
@@ -59,3 +64,45 @@ export const getServerInfo = async (ip: string, port?: number, preferredVersion
     window.setLoadingMessage = undefined
   })
 }
+
+globalThis.debugTestPing = async (ip: string) => {
+  const parsed = parseServerAddress(ip, false)
+  const result = await getServerInfo(parsed.host, parsed.port ? Number(parsed.port) : undefined, undefined, true, undefined, { address: getCurrentProxy(), })
+  console.log('result', result)
+  return result
+}
+
+export const getDefaultProxyParams = () => {
+  return {
+    headers: {
+      Authorization: `Bearer ${new URLSearchParams(location.search).get('token') ?? ''}`
+    }
+  }
+}
+
+export type ProxyParams = {
+  address?: string
+  headers?: Record<string, string>
+}
+
+export const setProxy = (proxyParams: ProxyParams) => {
+  if (proxyParams.address?.startsWith(':')) {
+    proxyParams.address = `${location.protocol}//${location.hostname}${proxyParams.address}`
+  }
+  if (proxyParams.address && location.port !== '80' && location.port !== '443' && !/:\d+$/.test(proxyParams.address)) {
+    const https = proxyParams.address.startsWith('https://') || location.protocol === 'https:'
+    proxyParams.address = `${proxyParams.address}:${https ? 443 : 80}`
+  }
+
+  const parsedProxy = parseServerAddress(proxyParams.address, false)
+  const proxy = { host: parsedProxy.host, port: parsedProxy.port }
+  proxyParams.headers ??= getDefaultProxyParams().headers
+  net['setProxy']({
+    hostname: proxy.host,
+    port: proxy.port,
+    headers: proxyParams.headers
+  })
+  return {
+    proxy
+  }
+}

From e7c358d3fc0497b66fa25c70a401d2aed4be3294 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 11 Aug 2025 03:12:05 +0300
Subject: [PATCH 083/136] feat: add
 `minecraft-web-client:block-interactions-customization`

---
 package.json          |  2 +-
 pnpm-lock.yaml        | 20 ++++++++++----------
 src/customChannels.ts | 31 +++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 257fff7c..b719b877 100644
--- a/package.json
+++ b/package.json
@@ -156,7 +156,7 @@
     "mc-assets": "^0.2.62",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer#gen-the-master",
-    "mineflayer-mouse": "^0.1.14",
+    "mineflayer-mouse": "^0.1.17",
     "mineflayer-pathfinder": "^2.4.4",
     "npm-run-all": "^4.1.5",
     "os-browserify": "^0.3.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 132ef32c..da2b3912 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -343,8 +343,8 @@ importers:
         specifier: github:zardoy/mineflayer#gen-the-master
         version: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
       mineflayer-mouse:
-        specifier: ^0.1.14
-        version: 0.1.14
+        specifier: ^0.1.17
+        version: 0.1.17
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.5
@@ -6667,8 +6667,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
     version: 1.2.0
 
-  mineflayer-mouse@0.1.14:
-    resolution: {integrity: sha512-DjytRMlRLxR44GqZ6udMgbMO4At7Ura5TQC80exRhzkfptyCGLTWzXaf0oeXSNYkNMnaaEv4XP/9YRwuvL+rsQ==}
+  mineflayer-mouse@0.1.17:
+    resolution: {integrity: sha512-0eCR8pnGb42Qd9QmAxOjl0PhA5Fa+9+6H1G/YsbsO5rg5mDf94Tusqp/8NAGLPQCPVDzbarLskXdjR3h0E0bEQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   mineflayer-pathfinder@2.4.5:
@@ -10294,7 +10294,7 @@ snapshots:
       '@babel/parser': 7.26.9
       '@babel/template': 7.26.9
       '@babel/types': 7.26.9
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -12864,7 +12864,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/typescript-estree': 6.1.0(typescript@5.5.4)
       '@typescript-eslint/utils': 6.1.0(eslint@8.57.1)(typescript@5.5.4)
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       eslint: 8.57.1
       ts-api-utils: 1.4.3(typescript@5.5.4)
     optionalDependencies:
@@ -12896,7 +12896,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 6.21.0
       '@typescript-eslint/visitor-keys': 6.21.0
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.3
@@ -12911,7 +12911,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 8.26.0
       '@typescript-eslint/visitor-keys': 8.26.0
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       fast-glob: 3.3.3
       is-glob: 4.0.3
       minimatch: 9.0.5
@@ -17338,7 +17338,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer-mouse@0.1.14:
+  mineflayer-mouse@0.1.17:
     dependencies:
       change-case: 5.4.4
       debug: 4.4.1
@@ -18457,7 +18457,7 @@ snapshots:
   puppeteer-core@2.1.1:
     dependencies:
       '@types/mime-types': 2.1.4
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       extract-zip: 1.7.0
       https-proxy-agent: 4.0.0
       mime: 2.6.0
diff --git a/src/customChannels.ts b/src/customChannels.ts
index 57c057d5..3f6a8217 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -15,6 +15,7 @@ export default () => {
     registerMediaChannels()
     registerSectionAnimationChannels()
     registeredJeiChannel()
+    registerBlockInteractionsCustomizationChannel()
   })
 }
 
@@ -32,6 +33,36 @@ const registerChannel = (channelName: string, packetStructure: any[], handler: (
   console.debug(`registered custom channel ${channelName} channel`)
 }
 
+const registerBlockInteractionsCustomizationChannel = () => {
+  const CHANNEL_NAME = 'minecraft-web-client:block-interactions-customization'
+  const packetStructure = [
+    'container',
+    [
+      {
+        name: 'newConfiguration',
+        type: ['pstring', { countType: 'i16' }]
+      },
+    ]
+  ]
+
+  registerChannel(CHANNEL_NAME, packetStructure, (data) => {
+    const config = JSON.parse(data.newConfiguration)
+    if (config.customBreakTime !== undefined && Object.values(config.customBreakTime).every(x => typeof x === 'number')) {
+      bot.mouse.customBreakTime = config.customBreakTime
+    }
+    if (config.customBreakTimeToolAllowance !== undefined) {
+      bot.mouse.customBreakTimeToolAllowance = new Set(config.customBreakTimeToolAllowance)
+    }
+
+    if (config.blockPlacePrediction !== undefined) {
+      bot.mouse.settings.blockPlacePrediction = config.blockPlacePrediction
+    }
+    if (config.blockPlacePredictionDelay !== undefined) {
+      bot.mouse.settings.blockPlacePredictionDelay = config.blockPlacePredictionDelay
+    }
+  }, true)
+}
+
 const registerBlockModelsChannel = () => {
   const CHANNEL_NAME = 'minecraft-web-client:blockmodels'
 

From cdd8c31a0e9261ee57fb66ff8ca5af0e074bff78 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 11 Aug 2025 21:21:44 +0300
Subject: [PATCH 084/136] fix: fix player colored username rendering, fix
 sometimes skin was overriden

---
 renderer/viewer/three/entities.ts | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 6c6f8900..24f64803 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -141,7 +141,7 @@ const addNametag = (entity, options: { fontFamily: string }, mesh, version: stri
     const canvas = getUsernameTexture(entity, options, version)
     const tex = new THREE.Texture(canvas)
     tex.needsUpdate = true
-    let nameTag
+    let nameTag: THREE.Object3D
     if (entity.nameTagFixed) {
       const geometry = new THREE.PlaneGeometry()
       const material = new THREE.MeshBasicMaterial({ map: tex })
@@ -171,6 +171,7 @@ const addNametag = (entity, options: { fontFamily: string }, mesh, version: stri
     nameTag.name = 'nametag'
 
     mesh.add(nameTag)
+    return nameTag
   }
 }
 
@@ -494,6 +495,10 @@ export class Entities {
   // todo true/undefined doesnt reset the skin to the default one
   // eslint-disable-next-line max-params
   async updatePlayerSkin (entityId: string | number, username: string | undefined, uuidCache: string | undefined, skinUrl: string | true, capeUrl: string | true | undefined = undefined) {
+    const isCustomSkin = skinUrl !== stevePngUrl
+    if (isCustomSkin) {
+      this.loadedSkinEntityIds.add(String(entityId))
+    }
     if (uuidCache) {
       if (typeof skinUrl === 'string' || typeof capeUrl === 'string') this.uuidPerSkinUrlsCache[uuidCache] = {}
       if (typeof skinUrl === 'string') this.uuidPerSkinUrlsCache[uuidCache].skinUrl = skinUrl
@@ -912,20 +917,14 @@ export class Entities {
         mesh = wrapper
 
         if (entity.username) {
-          // todo proper colors
-          const nameTag = new NameTagObject(fromFormattedString(entity.username).text, {
-            font: `48px ${this.entitiesOptions.fontFamily}`,
-          })
-          nameTag.position.y = playerObject.position.y + playerObject.scale.y * 16 + 3
-          nameTag.renderOrder = 1000
-
-          nameTag.name = 'nametag'
-
-          //@ts-expect-error
-          wrapper.add(nameTag)
+          const nametag = addNametag(entity, { fontFamily: 'mojangles' }, wrapper, this.worldRenderer.version)
+          if (nametag) {
+            nametag.position.y = playerObject.position.y + playerObject.scale.y * 16 + 3
+            nametag.scale.multiplyScalar(12)
+          }
         }
       } else {
-        mesh = getEntityMesh(entity, this.worldRenderer, this.entitiesOptions, overrides)
+        mesh = getEntityMesh(entity, this.worldRenderer, this.entitiesOptions, { ...overrides, customModel: entity['customModel'] })
       }
       if (!mesh) return
       mesh.name = 'mesh'
@@ -1181,8 +1180,7 @@ export class Entities {
     const cameraPos = this.worldRenderer.cameraObject.position
     const distance = mesh.position.distanceTo(cameraPos)
     if (distance < MAX_DISTANCE_SKIN_LOAD && distance < (this.worldRenderer.viewDistance * 16)) {
-      if (this.loadedSkinEntityIds.has(entityId)) return
-      this.loadedSkinEntityIds.add(entityId)
+      if (this.loadedSkinEntityIds.has(String(entityId))) return
       void this.updatePlayerSkin(entityId, mesh.playerObject.realUsername, mesh.playerObject.realPlayerUuid, true, true)
     }
   }

From 0a474e67803827cdd657b135ba6a7380091cdab4 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Tue, 12 Aug 2025 06:27:06 +0300
Subject: [PATCH 085/136] feat: add custom experimental waypints impl

---
 experiments/three-labels.html               |   5 +
 experiments/three-labels.ts                 |  67 ++++
 renderer/viewer/three/graphicsBackend.ts    |   3 +
 renderer/viewer/three/waypointSprite.ts     | 394 ++++++++++++++++++++
 renderer/viewer/three/waypoints.ts          | 142 +++++++
 renderer/viewer/three/worldrendererThree.ts |  25 +-
 src/customChannels.ts                       |  57 +++
 7 files changed, 685 insertions(+), 8 deletions(-)
 create mode 100644 experiments/three-labels.html
 create mode 100644 experiments/three-labels.ts
 create mode 100644 renderer/viewer/three/waypointSprite.ts
 create mode 100644 renderer/viewer/three/waypoints.ts

diff --git a/experiments/three-labels.html b/experiments/three-labels.html
new file mode 100644
index 00000000..2b25bc23
--- /dev/null
+++ b/experiments/three-labels.html
@@ -0,0 +1,5 @@
+<script type="module" src="three-labels.ts"></script>
+<style>
+  body { margin: 0; }
+  canvas { display: block; }
+</style>
diff --git a/experiments/three-labels.ts b/experiments/three-labels.ts
new file mode 100644
index 00000000..b69dc95b
--- /dev/null
+++ b/experiments/three-labels.ts
@@ -0,0 +1,67 @@
+import * as THREE from 'three'
+import { FirstPersonControls } from 'three/addons/controls/FirstPersonControls.js'
+import { createWaypointSprite, WAYPOINT_CONFIG } from '../renderer/viewer/three/waypointSprite'
+
+// Create scene, camera and renderer
+const scene = new THREE.Scene()
+const camera = new THREE.PerspectiveCamera(75, window.innerWidth / window.innerHeight, 0.1, 1000)
+const renderer = new THREE.WebGLRenderer({ antialias: true })
+renderer.setSize(window.innerWidth, window.innerHeight)
+document.body.appendChild(renderer.domElement)
+
+// Add FirstPersonControls
+const controls = new FirstPersonControls(camera, renderer.domElement)
+controls.lookSpeed = 0.1
+controls.movementSpeed = 10
+controls.lookVertical = true
+controls.constrainVertical = true
+controls.verticalMin = 0.1
+controls.verticalMax = Math.PI - 0.1
+
+// Position camera
+camera.position.y = 1.6 // Typical eye height
+camera.lookAt(0, 1.6, -1)
+
+// Create a helper grid and axes
+const grid = new THREE.GridHelper(20, 20)
+scene.add(grid)
+const axes = new THREE.AxesHelper(5)
+scene.add(axes)
+
+// Create waypoint sprite via utility
+const waypoint = createWaypointSprite({
+  position: new THREE.Vector3(0, 0, -5),
+  color: 0xff0000,
+  label: 'Target',
+})
+scene.add(waypoint.group)
+
+// Use built-in offscreen arrow from utils
+waypoint.enableOffscreenArrow(true)
+waypoint.setArrowParent(scene)
+
+// Animation loop
+function animate() {
+  requestAnimationFrame(animate)
+
+  const delta = Math.min(clock.getDelta(), 0.1)
+  controls.update(delta)
+
+  // Unified camera update (size, distance text, arrow, visibility)
+  const sizeVec = renderer.getSize(new THREE.Vector2())
+  waypoint.updateForCamera(camera.position, camera, sizeVec.width, sizeVec.height)
+
+  renderer.render(scene, camera)
+}
+
+// Handle window resize
+window.addEventListener('resize', () => {
+  camera.aspect = window.innerWidth / window.innerHeight
+  camera.updateProjectionMatrix()
+  renderer.setSize(window.innerWidth, window.innerHeight)
+})
+
+// Add clock for controls
+const clock = new THREE.Clock()
+
+animate()
diff --git a/renderer/viewer/three/graphicsBackend.ts b/renderer/viewer/three/graphicsBackend.ts
index 5ea89b34..92b6ec66 100644
--- a/renderer/viewer/three/graphicsBackend.ts
+++ b/renderer/viewer/three/graphicsBackend.ts
@@ -44,6 +44,9 @@ const getBackendMethods = (worldRenderer: WorldRendererThree) => {
     shakeFromDamage: worldRenderer.cameraShake.shakeFromDamage.bind(worldRenderer.cameraShake),
     onPageInteraction: worldRenderer.media.onPageInteraction.bind(worldRenderer.media),
     downloadMesherLog: worldRenderer.downloadMesherLog.bind(worldRenderer),
+
+    addWaypoint: worldRenderer.waypoints.addWaypoint.bind(worldRenderer.waypoints),
+    removeWaypoint: worldRenderer.waypoints.removeWaypoint.bind(worldRenderer.waypoints),
   }
 }
 
diff --git a/renderer/viewer/three/waypointSprite.ts b/renderer/viewer/three/waypointSprite.ts
new file mode 100644
index 00000000..7c8cf1f6
--- /dev/null
+++ b/renderer/viewer/three/waypointSprite.ts
@@ -0,0 +1,394 @@
+import * as THREE from 'three'
+
+// Centralized visual configuration (in screen pixels)
+export const WAYPOINT_CONFIG = {
+  // Target size in screen pixels (this controls the final sprite size)
+  TARGET_SCREEN_PX: 150,
+  // Canvas size for internal rendering (keep power of 2 for textures)
+  CANVAS_SIZE: 256,
+  // Relative positions in canvas (0-1)
+  LAYOUT: {
+    DOT_Y: 0.3,
+    NAME_Y: 0.45,
+    DISTANCE_Y: 0.55,
+  },
+  // Multiplier for canvas internal resolution to keep text crisp
+  CANVAS_SCALE: 2,
+  ARROW: {
+    enabledDefault: false,
+    pixelSize: 30,
+    paddingPx: 50,
+  },
+}
+
+export type WaypointSprite = {
+  group: THREE.Group
+  sprite: THREE.Sprite
+  // Offscreen arrow controls
+  enableOffscreenArrow: (enabled: boolean) => void
+  setArrowParent: (parent: THREE.Object3D | null) => void
+  // Convenience combined updater
+  updateForCamera: (
+    cameraPosition: THREE.Vector3,
+    camera: THREE.PerspectiveCamera,
+    viewportWidthPx: number,
+    viewportHeightPx: number
+  ) => boolean
+  // Utilities
+  setColor: (color: number) => void
+  setLabel: (label?: string) => void
+  updateDistanceText: (label: string, distanceText: string) => void
+  setVisible: (visible: boolean) => void
+  setPosition: (x: number, y: number, z: number) => void
+  dispose: () => void
+}
+
+export function createWaypointSprite (options: {
+  position: THREE.Vector3 | { x: number, y: number, z: number },
+  color?: number,
+  label?: string,
+  depthTest?: boolean,
+  // Y offset in world units used by updateScaleWorld only (screen-pixel API ignores this)
+  labelYOffset?: number,
+}): WaypointSprite {
+  const color = options.color ?? 0xFF_00_00
+  const depthTest = options.depthTest ?? false
+  const labelYOffset = options.labelYOffset ?? 1.5
+
+  // Build combined sprite
+  const sprite = createCombinedSprite(color, options.label ?? '', '0m', depthTest)
+  sprite.renderOrder = 10
+  let currentLabel = options.label ?? ''
+
+  // Offscreen arrow (detached by default)
+  let arrowSprite: THREE.Sprite | undefined
+  let arrowParent: THREE.Object3D | null = null
+  let arrowEnabled = WAYPOINT_CONFIG.ARROW.enabledDefault
+
+  // Group for easy add/remove
+  const group = new THREE.Group()
+  group.add(sprite)
+
+  // Initial position
+  const { x, y, z } = options.position
+  group.position.set(x, y, z)
+
+  function setColor (newColor: number) {
+    const canvas = drawCombinedCanvas(newColor, currentLabel, '0m')
+    const texture = new THREE.CanvasTexture(canvas)
+    const mat = sprite.material
+    mat.map?.dispose()
+    mat.map = texture
+    mat.needsUpdate = true
+  }
+
+  function setLabel (newLabel?: string) {
+    currentLabel = newLabel ?? ''
+    const canvas = drawCombinedCanvas(color, currentLabel, '0m')
+    const texture = new THREE.CanvasTexture(canvas)
+    const mat = sprite.material
+    mat.map?.dispose()
+    mat.map = texture
+    mat.needsUpdate = true
+  }
+
+  function updateDistanceText (label: string, distanceText: string) {
+    const canvas = drawCombinedCanvas(color, label, distanceText)
+    const texture = new THREE.CanvasTexture(canvas)
+    const mat = sprite.material
+    mat.map?.dispose()
+    mat.map = texture
+    mat.needsUpdate = true
+  }
+
+  function setVisible (visible: boolean) {
+    sprite.visible = visible
+  }
+
+  function setPosition (nx: number, ny: number, nz: number) {
+    group.position.set(nx, ny, nz)
+  }
+
+  // Keep constant pixel size on screen using global config
+  function updateScaleScreenPixels (
+    cameraPosition: THREE.Vector3,
+    cameraFov: number,
+    distance: number,
+    viewportHeightPx: number
+  ) {
+    const vFovRad = cameraFov * Math.PI / 180
+    const worldUnitsPerScreenHeightAtDist = Math.tan(vFovRad / 2) * 2 * distance
+    // Use configured target screen size
+    const scale = worldUnitsPerScreenHeightAtDist * (WAYPOINT_CONFIG.TARGET_SCREEN_PX / viewportHeightPx)
+    sprite.scale.set(scale, scale, 1)
+  }
+
+  function ensureArrow () {
+    if (arrowSprite) return
+    const size = 128
+    const canvas = document.createElement('canvas')
+    canvas.width = size
+    canvas.height = size
+    const ctx = canvas.getContext('2d')!
+    ctx.clearRect(0, 0, size, size)
+    ctx.beginPath()
+    ctx.moveTo(size * 0.2, size * 0.5)
+    ctx.lineTo(size * 0.8, size * 0.5)
+    ctx.lineTo(size * 0.5, size * 0.2)
+    ctx.closePath()
+    ctx.lineWidth = 4
+    ctx.strokeStyle = 'black'
+    ctx.stroke()
+    ctx.fillStyle = 'white'
+    ctx.fill()
+    const texture = new THREE.CanvasTexture(canvas)
+    const material = new THREE.SpriteMaterial({ map: texture, transparent: true, depthTest: false, depthWrite: false })
+    arrowSprite = new THREE.Sprite(material)
+    arrowSprite.renderOrder = 12
+    arrowSprite.visible = false
+    if (arrowParent) arrowParent.add(arrowSprite)
+  }
+
+  function enableOffscreenArrow (enabled: boolean) {
+    arrowEnabled = enabled
+    if (!enabled && arrowSprite) arrowSprite.visible = false
+  }
+
+  function setArrowParent (parent: THREE.Object3D | null) {
+    if (arrowSprite?.parent) arrowSprite.parent.remove(arrowSprite)
+    arrowParent = parent
+    if (arrowSprite && parent) parent.add(arrowSprite)
+  }
+
+  function updateOffscreenArrow (
+    camera: THREE.PerspectiveCamera,
+    viewportWidthPx: number,
+    viewportHeightPx: number
+  ): boolean {
+    if (!arrowEnabled) return true
+    ensureArrow()
+    if (!arrowSprite) return true
+
+    // Build camera basis using camera.up to respect custom orientations
+    const forward = new THREE.Vector3()
+    camera.getWorldDirection(forward) // camera look direction
+    const upWorld = camera.up.clone().normalize()
+    const right = new THREE.Vector3().copy(forward).cross(upWorld).normalize()
+    const upCam = new THREE.Vector3().copy(right).cross(forward).normalize()
+
+    // Vector from camera to waypoint
+    const camPos = new THREE.Vector3().setFromMatrixPosition(camera.matrixWorld)
+    const toWp = new THREE.Vector3(group.position.x, group.position.y, group.position.z).sub(camPos)
+
+    // Components in camera basis
+    const z = toWp.dot(forward)
+    const x = toWp.dot(right)
+    const y = toWp.dot(upCam)
+
+    const aspect = viewportWidthPx / viewportHeightPx
+    const vFovRad = camera.fov * Math.PI / 180
+    const hFovRad = 2 * Math.atan(Math.tan(vFovRad / 2) * aspect)
+
+    // Determine if waypoint is inside view frustum using angular checks
+    const thetaX = Math.atan2(x, z)
+    const thetaY = Math.atan2(y, z)
+    const visible = z > 0 && Math.abs(thetaX) <= hFovRad / 2 && Math.abs(thetaY) <= vFovRad / 2
+    if (visible) {
+      arrowSprite.visible = false
+      return true
+    }
+
+    // Direction on screen in normalized frustum units
+    let rx = thetaX / (hFovRad / 2)
+    let ry = thetaY / (vFovRad / 2)
+
+    // If behind the camera, snap to dominant axis to avoid confusing directions
+    if (z <= 0) {
+      if (Math.abs(rx) > Math.abs(ry)) {
+        rx = Math.sign(rx)
+        ry = 0
+      } else {
+        rx = 0
+        ry = Math.sign(ry)
+      }
+    }
+
+    // Place on the rectangle border [-1,1]x[-1,1]
+    const s = Math.max(Math.abs(rx), Math.abs(ry)) || 1
+    let ndcX = rx / s
+    let ndcY = ry / s
+
+    // Apply padding in pixel space by clamping
+    const padding = WAYPOINT_CONFIG.ARROW.paddingPx
+    const pxX = ((ndcX + 1) * 0.5) * viewportWidthPx
+    const pxY = ((1 - ndcY) * 0.5) * viewportHeightPx
+    const clampedPxX = Math.min(Math.max(pxX, padding), viewportWidthPx - padding)
+    const clampedPxY = Math.min(Math.max(pxY, padding), viewportHeightPx - padding)
+    ndcX = (clampedPxX / viewportWidthPx) * 2 - 1
+    ndcY = -(clampedPxY / viewportHeightPx) * 2 + 1
+
+    // Compute world position at a fixed distance in front of the camera using camera basis
+    const placeDist = Math.max(2, camera.near * 4)
+    const halfPlaneHeight = Math.tan(vFovRad / 2) * placeDist
+    const halfPlaneWidth = halfPlaneHeight * aspect
+    const pos = camPos.clone()
+      .add(forward.clone().multiplyScalar(placeDist))
+      .add(right.clone().multiplyScalar(ndcX * halfPlaneWidth))
+      .add(upCam.clone().multiplyScalar(ndcY * halfPlaneHeight))
+
+    // Update arrow sprite
+    arrowSprite.visible = true
+    arrowSprite.position.copy(pos)
+
+    // Angle for rotation relative to screen right/up (derived from camera up vector)
+    const angle = Math.atan2(ry, rx)
+    arrowSprite.material.rotation = angle - Math.PI / 2
+
+    // Constant pixel size for arrow (use fixed placement distance)
+    const worldUnitsPerScreenHeightAtDist = Math.tan(vFovRad / 2) * 2 * placeDist
+    const sPx = worldUnitsPerScreenHeightAtDist * (WAYPOINT_CONFIG.ARROW.pixelSize / viewportHeightPx)
+    arrowSprite.scale.set(sPx, sPx, 1)
+    return false
+  }
+
+  function computeDistance (cameraPosition: THREE.Vector3): number {
+    return cameraPosition.distanceTo(group.position)
+  }
+
+  function updateForCamera (
+    cameraPosition: THREE.Vector3,
+    camera: THREE.PerspectiveCamera,
+    viewportWidthPx: number,
+    viewportHeightPx: number
+  ): boolean {
+    const distance = computeDistance(cameraPosition)
+    // Keep constant pixel size
+    updateScaleScreenPixels(cameraPosition, camera.fov, distance, viewportHeightPx)
+    // Update text
+    updateDistanceText(currentLabel, `${Math.round(distance)}m`)
+    // Update arrow and visibility
+    const onScreen = updateOffscreenArrow(camera, viewportWidthPx, viewportHeightPx)
+    setVisible(onScreen)
+    return onScreen
+  }
+
+  function dispose () {
+    const mat = sprite.material
+    mat.map?.dispose()
+    mat.dispose()
+    if (arrowSprite) {
+      const am = arrowSprite.material
+      am.map?.dispose()
+      am.dispose()
+    }
+  }
+
+  return {
+    group,
+    sprite,
+    enableOffscreenArrow,
+    setArrowParent,
+    updateForCamera,
+    setColor,
+    setLabel,
+    updateDistanceText,
+    setVisible,
+    setPosition,
+    dispose,
+  }
+}
+
+// Internal helpers
+function drawCombinedCanvas (color: number, id: string, distance: string): HTMLCanvasElement {
+  const scale = WAYPOINT_CONFIG.CANVAS_SCALE * (globalThis.devicePixelRatio || 1)
+  const size = WAYPOINT_CONFIG.CANVAS_SIZE * scale
+  const canvas = document.createElement('canvas')
+  canvas.width = size
+  canvas.height = size
+  const ctx = canvas.getContext('2d')!
+
+  // Clear canvas
+  ctx.clearRect(0, 0, size, size)
+
+  // Draw dot
+  const centerX = size / 2
+  const dotY = Math.round(size * WAYPOINT_CONFIG.LAYOUT.DOT_Y)
+  const radius = Math.round(size * 0.05) // Dot takes up ~12% of canvas height
+  const borderWidth = Math.max(2, Math.round(4 * scale))
+
+  // Outer border (black)
+  ctx.beginPath()
+  ctx.arc(centerX, dotY, radius + borderWidth, 0, Math.PI * 2)
+  ctx.fillStyle = 'black'
+  ctx.fill()
+
+  // Inner circle (colored)
+  ctx.beginPath()
+  ctx.arc(centerX, dotY, radius, 0, Math.PI * 2)
+  ctx.fillStyle = `#${color.toString(16).padStart(6, '0')}`
+  ctx.fill()
+
+  // Text properties
+  ctx.textAlign = 'center'
+  ctx.textBaseline = 'middle'
+
+  // Title
+  const nameFontPx = Math.round(size * 0.08) // ~8% of canvas height
+  const distanceFontPx = Math.round(size * 0.06) // ~6% of canvas height
+  ctx.font = `bold ${nameFontPx}px mojangles`
+  ctx.lineWidth = Math.max(2, Math.round(3 * scale))
+  const nameY = Math.round(size * WAYPOINT_CONFIG.LAYOUT.NAME_Y)
+
+  ctx.strokeStyle = 'black'
+  ctx.strokeText(id, centerX, nameY)
+  ctx.fillStyle = 'white'
+  ctx.fillText(id, centerX, nameY)
+
+  // Distance
+  ctx.font = `bold ${distanceFontPx}px mojangles`
+  ctx.lineWidth = Math.max(2, Math.round(2 * scale))
+  const distanceY = Math.round(size * WAYPOINT_CONFIG.LAYOUT.DISTANCE_Y)
+
+  ctx.strokeStyle = 'black'
+  ctx.strokeText(distance, centerX, distanceY)
+  ctx.fillStyle = '#CCCCCC'
+  ctx.fillText(distance, centerX, distanceY)
+
+  return canvas
+}
+
+function createCombinedSprite (color: number, id: string, distance: string, depthTest: boolean): THREE.Sprite {
+  const canvas = drawCombinedCanvas(color, id, distance)
+  const texture = new THREE.CanvasTexture(canvas)
+  texture.anisotropy = 1
+  texture.magFilter = THREE.LinearFilter
+  texture.minFilter = THREE.LinearFilter
+  const material = new THREE.SpriteMaterial({
+    map: texture,
+    transparent: true,
+    opacity: 1,
+    depthTest,
+    depthWrite: false,
+  })
+  const sprite = new THREE.Sprite(material)
+  sprite.position.set(0, 0, 0)
+  return sprite
+}
+
+export const WaypointHelpers = {
+  // World-scale constant size helper
+  computeWorldScale (distance: number, fixedReference = 10) {
+    return Math.max(0.0001, distance / fixedReference)
+  },
+  // Screen-pixel constant size helper
+  computeScreenPixelScale (
+    camera: THREE.PerspectiveCamera,
+    distance: number,
+    pixelSize: number,
+    viewportHeightPx: number
+  ) {
+    const vFovRad = camera.fov * Math.PI / 180
+    const worldUnitsPerScreenHeightAtDist = Math.tan(vFovRad / 2) * 2 * distance
+    return worldUnitsPerScreenHeightAtDist * (pixelSize / viewportHeightPx)
+  }
+}
diff --git a/renderer/viewer/three/waypoints.ts b/renderer/viewer/three/waypoints.ts
new file mode 100644
index 00000000..c7ec9a93
--- /dev/null
+++ b/renderer/viewer/three/waypoints.ts
@@ -0,0 +1,142 @@
+import * as THREE from 'three'
+import { WorldRendererThree } from './worldrendererThree'
+import { createWaypointSprite, type WaypointSprite } from './waypointSprite'
+
+interface Waypoint {
+  id: string
+  x: number
+  y: number
+  z: number
+  minDistance: number
+  color: number
+  label?: string
+  sprite: WaypointSprite
+}
+
+interface WaypointOptions {
+  color?: number
+  label?: string
+  minDistance?: number
+}
+
+export class WaypointsRenderer {
+  private readonly waypoints = new Map<string, Waypoint>()
+  private readonly waypointScene = new THREE.Scene()
+  private readonly FIXED_REFERENCE = 10 // Fixed reference distance for scaling
+
+  constructor (
+    private readonly worldRenderer: WorldRendererThree
+  ) {
+    if (process.env.NODE_ENV !== 'production') {
+      this.addWaypoint('spawn', 0, 0, 0, { })
+    }
+  }
+
+  private updateWaypoints () {
+    const playerPos = this.worldRenderer.cameraObject.position
+    const sizeVec = this.worldRenderer.renderer.getSize(new THREE.Vector2())
+
+    for (const waypoint of this.waypoints.values()) {
+      const waypointPos = new THREE.Vector3(waypoint.x, waypoint.y, waypoint.z)
+      const distance = playerPos.distanceTo(waypointPos)
+      const visible = !waypoint.minDistance || distance >= waypoint.minDistance
+
+      waypoint.sprite.setVisible(visible)
+
+      if (visible) {
+        // Update position
+        waypoint.sprite.setPosition(waypoint.x, waypoint.y, waypoint.z)
+        // Ensure camera-based update each frame
+        waypoint.sprite.updateForCamera(this.worldRenderer.getCameraPosition(), this.worldRenderer.camera, sizeVec.width, sizeVec.height)
+      }
+    }
+  }
+
+  render () {
+    if (this.waypoints.size === 0) return
+
+    // Update waypoint scaling
+    this.updateWaypoints()
+
+    // Render waypoints scene with the world camera
+    this.worldRenderer.renderer.render(this.waypointScene, this.worldRenderer.camera)
+  }
+
+  // Removed sprite/label texture creation. Use utils/waypointSprite.ts
+
+  addWaypoint (
+    id: string,
+    x: number,
+    y: number,
+    z: number,
+    options: WaypointOptions = {}
+  ) {
+    // Remove existing waypoint if it exists
+    this.removeWaypoint(id)
+
+    const color = options.color ?? 0xFF_00_00
+    const { label } = options
+    const minDistance = options.minDistance ?? 0
+
+    const sprite = createWaypointSprite({
+      position: new THREE.Vector3(x, y, z),
+      color,
+      label: (label || id),
+    })
+    sprite.enableOffscreenArrow(true)
+    sprite.setArrowParent(this.waypointScene)
+
+    this.waypointScene.add(sprite.group)
+
+    this.waypoints.set(id, {
+      id, x, y, z, minDistance,
+      color, label,
+      sprite,
+    })
+  }
+
+  removeWaypoint (id: string) {
+    const waypoint = this.waypoints.get(id)
+    if (waypoint) {
+      this.waypointScene.remove(waypoint.sprite.group)
+      waypoint.sprite.dispose()
+      this.waypoints.delete(id)
+    }
+  }
+
+  clear () {
+    for (const id of this.waypoints.keys()) {
+      this.removeWaypoint(id)
+    }
+  }
+
+  testWaypoint () {
+    this.addWaypoint('Test Point', 0, 70, 0, { color: 0x00_FF_00, label: 'Test Point' })
+    this.addWaypoint('Spawn', 0, 64, 0, { color: 0xFF_FF_00, label: 'Spawn' })
+    this.addWaypoint('Far Point', 100, 70, 100, { color: 0x00_00_FF, label: 'Far Point' })
+  }
+
+  getWaypoint (id: string): Waypoint | undefined {
+    return this.waypoints.get(id)
+  }
+
+  getAllWaypoints (): Waypoint[] {
+    return [...this.waypoints.values()]
+  }
+
+  setWaypointColor (id: string, color: number) {
+    const waypoint = this.waypoints.get(id)
+    if (waypoint) {
+      waypoint.sprite.setColor(color)
+      waypoint.color = color
+    }
+  }
+
+  setWaypointLabel (id: string, label?: string) {
+    const waypoint = this.waypoints.get(id)
+    if (waypoint) {
+      waypoint.label = label
+      waypoint.sprite.setLabel(label)
+    }
+  }
+}
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index bc95f06b..82856cb9 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -23,6 +23,7 @@ import { ThreeJsSound } from './threeJsSound'
 import { CameraShake } from './cameraShake'
 import { ThreeJsMedia } from './threeJsMedia'
 import { Fountain } from './threeJsParticles'
+import { WaypointsRenderer } from './waypoints'
 
 type SectionKey = string
 
@@ -48,6 +49,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   cameraContainer: THREE.Object3D
   media: ThreeJsMedia
   waitingChunksToDisplay = {} as { [chunkKey: string]: SectionKey[] }
+  waypoints: WaypointsRenderer
   camera: THREE.PerspectiveCamera
   renderTimeAvg = 0
   sectionsOffsetsAnimations = {} as {
@@ -99,6 +101,8 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.soundSystem = new ThreeJsSound(this)
     this.cameraShake = new CameraShake(this, this.onRender)
     this.media = new ThreeJsMedia(this)
+    this.waypoints = new WaypointsRenderer(this)
+
     // this.fountain = new Fountain(this.scene, this.scene, {
     //   position: new THREE.Vector3(0, 10, 0),
     // })
@@ -119,6 +123,8 @@ export class WorldRendererThree extends WorldRendererCommon {
       this.protocolCustomBlocks.clear()
       // Reset section animations
       this.sectionsOffsetsAnimations = {}
+      // Clear waypoints
+      this.waypoints.clear()
     })
   }
 
@@ -453,7 +459,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     return worldPos
   }
 
-  getWorldCameraPosition () {
+  getSectionCameraPosition () {
     const pos = this.getCameraPosition()
     return new Vec3(
       Math.floor(pos.x / 16),
@@ -463,7 +469,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   updateCameraSectionPos () {
-    const newSectionPos = this.getWorldCameraPosition()
+    const newSectionPos = this.getSectionCameraPosition()
     if (!this.cameraSectionPos.equals(newSectionPos)) {
       this.cameraSectionPos = newSectionPos
       this.cameraSectionPositionUpdate()
@@ -737,6 +743,8 @@ export class WorldRendererThree extends WorldRendererCommon {
       fountain.render()
     }
 
+    this.waypoints.render()
+
     for (const onRender of this.onRender) {
       onRender()
     }
@@ -1022,6 +1030,13 @@ class StarField {
   constructor (
     private readonly worldRenderer: WorldRendererThree
   ) {
+    const clock = new THREE.Clock()
+    const speed = 0.2
+    this.worldRenderer.onRender.push(() => {
+      if (!this.points) return
+      this.points.position.copy(this.worldRenderer.getCameraPosition());
+      (this.points.material as StarfieldMaterial).uniforms.time.value = clock.getElapsedTime() * speed
+    })
   }
 
   addToScene () {
@@ -1032,7 +1047,6 @@ class StarField {
     const count = 7000
     const factor = 7
     const saturation = 10
-    const speed = 0.2
 
     const geometry = new THREE.BufferGeometry()
 
@@ -1065,11 +1079,6 @@ class StarField {
     this.points = new THREE.Points(geometry, material)
     this.worldRenderer.scene.add(this.points)
 
-    const clock = new THREE.Clock()
-    this.points.onBeforeRender = (renderer, scene, camera) => {
-      this.points?.position.copy?.(this.worldRenderer.getCameraPosition())
-      material.uniforms.time.value = clock.getElapsedTime() * speed
-    }
     this.points.renderOrder = -1
   }
 
diff --git a/src/customChannels.ts b/src/customChannels.ts
index 3f6a8217..6d3aa7e9 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -16,6 +16,7 @@ export default () => {
     registerSectionAnimationChannels()
     registeredJeiChannel()
     registerBlockInteractionsCustomizationChannel()
+    registerWaypointChannels()
   })
 }
 
@@ -63,6 +64,62 @@ const registerBlockInteractionsCustomizationChannel = () => {
   }, true)
 }
 
+const registerWaypointChannels = () => {
+  const packetStructure = [
+    'container',
+    [
+      {
+        name: 'id',
+        type: ['pstring', { countType: 'i16' }]
+      },
+      {
+        name: 'x',
+        type: 'f32'
+      },
+      {
+        name: 'y',
+        type: 'f32'
+      },
+      {
+        name: 'z',
+        type: 'f32'
+      },
+      {
+        name: 'minDistance',
+        type: 'i32'
+      },
+      {
+        name: 'label',
+        type: ['pstring', { countType: 'i16' }]
+      },
+      {
+        name: 'color',
+        type: 'i32'
+      }
+    ]
+  ]
+
+  registerChannel('minecraft-web-client:waypoint-add', packetStructure, (data) => {
+    getThreeJsRendererMethods()?.addWaypoint(data.id, data.x, data.y, data.z, {
+      minDistance: data.minDistance,
+      label: data.label || undefined,
+      color: data.color || undefined
+    })
+  })
+
+  registerChannel('minecraft-web-client:waypoint-delete', [
+    'container',
+    [
+      {
+        name: 'id',
+        type: ['pstring', { countType: 'i16' }]
+      }
+    ]
+  ], (data) => {
+    getThreeJsRendererMethods()?.removeWaypoint(data.id)
+  })
+}
+
 const registerBlockModelsChannel = () => {
   const CHANNEL_NAME = 'minecraft-web-client:blockmodels'
 

From 8827aab981d27d95b4863156a35fd66ba7b810c2 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Tue, 12 Aug 2025 06:27:42 +0300
Subject: [PATCH 086/136] dont add test waypoints on dev

---
 renderer/viewer/three/waypoints.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/renderer/viewer/three/waypoints.ts b/renderer/viewer/three/waypoints.ts
index c7ec9a93..45937ee8 100644
--- a/renderer/viewer/three/waypoints.ts
+++ b/renderer/viewer/three/waypoints.ts
@@ -22,14 +22,10 @@ interface WaypointOptions {
 export class WaypointsRenderer {
   private readonly waypoints = new Map<string, Waypoint>()
   private readonly waypointScene = new THREE.Scene()
-  private readonly FIXED_REFERENCE = 10 // Fixed reference distance for scaling
 
   constructor (
     private readonly worldRenderer: WorldRendererThree
   ) {
-    if (process.env.NODE_ENV !== 'production') {
-      this.addWaypoint('spawn', 0, 0, 0, { })
-    }
   }
 
   private updateWaypoints () {

From 60fc5ef315ea8b73f58070e271dd8f3dc90fc8e4 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 13 Aug 2025 19:19:46 +0300
Subject: [PATCH 087/136] feat: add skybox renderer: test it by dragging an
 image window into window, fix waypoint block pos

---
 renderer/viewer/three/graphicsBackend.ts    |  3 +
 renderer/viewer/three/skyboxRenderer.ts     | 77 +++++++++++++++++++++
 renderer/viewer/three/waypoints.ts          |  2 +-
 renderer/viewer/three/worldrendererThree.ts | 11 +++
 src/dragndrop.ts                            | 32 +++++++++
 5 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100644 renderer/viewer/three/skyboxRenderer.ts

diff --git a/renderer/viewer/three/graphicsBackend.ts b/renderer/viewer/three/graphicsBackend.ts
index 92b6ec66..04cb00ca 100644
--- a/renderer/viewer/three/graphicsBackend.ts
+++ b/renderer/viewer/three/graphicsBackend.ts
@@ -47,6 +47,9 @@ const getBackendMethods = (worldRenderer: WorldRendererThree) => {
 
     addWaypoint: worldRenderer.waypoints.addWaypoint.bind(worldRenderer.waypoints),
     removeWaypoint: worldRenderer.waypoints.removeWaypoint.bind(worldRenderer.waypoints),
+
+    // New method for updating skybox
+    setSkyboxImage: worldRenderer.skyboxRenderer.setSkyboxImage.bind(worldRenderer.skyboxRenderer)
   }
 }
 
diff --git a/renderer/viewer/three/skyboxRenderer.ts b/renderer/viewer/three/skyboxRenderer.ts
new file mode 100644
index 00000000..294c72aa
--- /dev/null
+++ b/renderer/viewer/three/skyboxRenderer.ts
@@ -0,0 +1,77 @@
+import * as THREE from 'three'
+
+export class SkyboxRenderer {
+  private texture: THREE.Texture | null = null
+  private mesh: THREE.Mesh<THREE.SphereGeometry, THREE.MeshBasicMaterial> | null = null
+
+  constructor (private readonly scene: THREE.Scene, public initialImage: string | null) {}
+
+  async init () {
+    if (this.initialImage) {
+      await this.setSkyboxImage(this.initialImage)
+    }
+  }
+
+  async setSkyboxImage (imageUrl: string) {
+    // Dispose old textures if they exist
+    if (this.texture) {
+      this.texture.dispose()
+    }
+
+    // Load the equirectangular texture
+    const textureLoader = new THREE.TextureLoader()
+    this.texture = await new Promise((resolve) => {
+      textureLoader.load(
+        imageUrl,
+        (texture) => {
+          texture.mapping = THREE.EquirectangularReflectionMapping
+          texture.encoding = THREE.sRGBEncoding
+          // Keep pixelated look
+          texture.minFilter = THREE.NearestFilter
+          texture.magFilter = THREE.NearestFilter
+          texture.needsUpdate = true
+          resolve(texture)
+        }
+      )
+    })
+
+    // Create or update the skybox
+    if (this.mesh) {
+      // Just update the texture on the existing material
+      this.mesh.material.map = this.texture
+      this.mesh.material.needsUpdate = true
+    } else {
+      // Create a large sphere geometry for the skybox
+      const geometry = new THREE.SphereGeometry(500, 60, 40)
+      // Flip the geometry inside out
+      geometry.scale(-1, 1, 1)
+
+      // Create material using the loaded texture
+      const material = new THREE.MeshBasicMaterial({
+        map: this.texture,
+        side: THREE.FrontSide // Changed to FrontSide since we're flipping the geometry
+      })
+
+      // Create and add the skybox mesh
+      this.mesh = new THREE.Mesh(geometry, material)
+      this.scene.add(this.mesh)
+    }
+  }
+
+  update (cameraPosition: THREE.Vector3) {
+    if (this.mesh) {
+      this.mesh.position.copy(cameraPosition)
+    }
+  }
+
+  dispose () {
+    if (this.texture) {
+      this.texture.dispose()
+    }
+    if (this.mesh) {
+      this.mesh.geometry.dispose()
+      ;(this.mesh.material as THREE.Material).dispose()
+      this.scene.remove(this.mesh)
+    }
+  }
+}
diff --git a/renderer/viewer/three/waypoints.ts b/renderer/viewer/three/waypoints.ts
index 45937ee8..cebd779a 100644
--- a/renderer/viewer/three/waypoints.ts
+++ b/renderer/viewer/three/waypoints.ts
@@ -85,7 +85,7 @@ export class WaypointsRenderer {
     this.waypointScene.add(sprite.group)
 
     this.waypoints.set(id, {
-      id, x, y, z, minDistance,
+      id, x: x + 0.5, y: y + 0.5, z: z + 0.5, minDistance,
       color, label,
       sprite,
     })
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 82856cb9..fb6c8e11 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -24,6 +24,7 @@ import { CameraShake } from './cameraShake'
 import { ThreeJsMedia } from './threeJsMedia'
 import { Fountain } from './threeJsParticles'
 import { WaypointsRenderer } from './waypoints'
+import { SkyboxRenderer } from './skyboxRenderer'
 
 type SectionKey = string
 
@@ -71,6 +72,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
   fountains: Fountain[] = []
   DEBUG_RAYCAST = false
+  skyboxRenderer: SkyboxRenderer
 
   private currentPosTween?: tweenJs.Tween<THREE.Vector3>
   private currentRotTween?: tweenJs.Tween<{ pitch: number, yaw: number }>
@@ -94,6 +96,10 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.holdingBlock = new HoldingBlock(this)
     this.holdingBlockLeft = new HoldingBlock(this, true)
 
+    // Initialize skybox renderer
+    this.skyboxRenderer = new SkyboxRenderer(this.scene, null)
+    void this.skyboxRenderer.init()
+
     this.addDebugOverlay()
     this.resetScene()
     void this.init()
@@ -708,6 +714,10 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.cursorBlock.render()
     this.updateSectionOffsets()
 
+    // Update skybox position to follow camera
+    const cameraPos = this.getCameraPosition()
+    this.skyboxRenderer.update(cameraPos)
+
     const sizeOrFovChanged = sizeChanged || this.displayOptions.inWorldRenderingConfig.fov !== this.camera.fov
     if (sizeOrFovChanged) {
       const size = this.renderer.getSize(new THREE.Vector2())
@@ -947,6 +957,7 @@ export class WorldRendererThree extends WorldRendererCommon {
 
   destroy (): void {
     super.destroy()
+    this.skyboxRenderer.dispose()
   }
 
   shouldObjectVisible (object: THREE.Object3D) {
diff --git a/src/dragndrop.ts b/src/dragndrop.ts
index 6be90551..5a16bc05 100644
--- a/src/dragndrop.ts
+++ b/src/dragndrop.ts
@@ -3,6 +3,7 @@ import fs from 'fs'
 import * as nbt from 'prismarine-nbt'
 import RegionFile from 'prismarine-provider-anvil/src/region'
 import { versions } from 'minecraft-data'
+import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
 import { openWorldDirectory, openWorldZip } from './browserfs'
 import { isGameActive } from './globalState'
 import { showNotification } from './react/NotificationProvider'
@@ -12,6 +13,9 @@ const parseNbt = promisify(nbt.parse)
 const simplifyNbt = nbt.simplify
 window.nbt = nbt
 
+// Supported image types for skybox
+const VALID_IMAGE_EXTENSIONS = ['.png', '.jpg', '.jpeg', '.webp']
+
 // todo display drop zone
 for (const event of ['drag', 'dragstart', 'dragend', 'dragover', 'dragenter', 'dragleave', 'drop']) {
   window.addEventListener(event, (e: any) => {
@@ -45,6 +49,34 @@ window.addEventListener('drop', async e => {
 })
 
 async function handleDroppedFile (file: File) {
+  // Check for image files first when game is active
+  if (isGameActive(false) && VALID_IMAGE_EXTENSIONS.some(ext => file.name.toLowerCase().endsWith(ext))) {
+    try {
+      // Convert image to base64
+      const reader = new FileReader()
+      const base64Promise = new Promise<string>((resolve, reject) => {
+        reader.onload = () => resolve(reader.result as string)
+        reader.onerror = reject
+      })
+      reader.readAsDataURL(file)
+      const base64Image = await base64Promise
+
+      // Get ThreeJS backend methods and update skybox
+      const setSkyboxImage = getThreeJsRendererMethods()?.setSkyboxImage
+      if (setSkyboxImage) {
+        await setSkyboxImage(base64Image)
+        showNotification('Skybox updated successfully')
+      } else {
+        showNotification('Cannot update skybox - renderer does not support it')
+      }
+      return
+    } catch (err) {
+      console.error('Failed to update skybox:', err)
+      showNotification('Failed to update skybox', 'error')
+      return
+    }
+  }
+
   if (file.name.endsWith('.zip')) {
     void openWorldZip(file)
     return

From 15e3325971ed85ee54d5a3022b789a8881a7f4e4 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Thu, 14 Aug 2025 01:25:24 +0300
Subject: [PATCH 088/136] add param for testing for immediate reconnect after
 kick or error (warning: will cause infinite reload loop)

---
 src/appParams.ts                |  1 +
 src/index.ts                    | 13 +++++++++----
 src/react/AppStatusProvider.tsx | 24 ++++++++++++++----------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/appParams.ts b/src/appParams.ts
index 59a24788..8d487f8d 100644
--- a/src/appParams.ts
+++ b/src/appParams.ts
@@ -12,6 +12,7 @@ export type AppQsParams = {
   username?: string
   lockConnect?: string
   autoConnect?: string
+  alwaysReconnect?: string
   // googledrive.ts params
   state?: string
   // ServersListProvider.tsx params
diff --git a/src/index.ts b/src/index.ts
index c0213f56..4a118cee 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -62,7 +62,7 @@ import { onAppLoad, resourcepackReload, resourcePackState } from './resourcePack
 import { ConnectPeerOptions, connectToPeer } from './localServerMultiplayer'
 import CustomChannelClient from './customClient'
 import { registerServiceWorker } from './serviceWorker'
-import { appStatusState, lastConnectOptions } from './react/AppStatusProvider'
+import { appStatusState, lastConnectOptions, quickDevReconnect } from './react/AppStatusProvider'
 
 import { fsState } from './loadSave'
 import { watchFov } from './rendererUtils'
@@ -215,8 +215,13 @@ export async function connect (connectOptions: ConnectOptions) {
   const destroyAll = (wasKicked = false) => {
     if (ended) return
     loadingTimerState.loading = false
-    if (!wasKicked && miscUiState.appConfig?.allowAutoConnect && appQueryParams.autoConnect && hadConnected) {
-      location.reload()
+    const { alwaysReconnect } = appQueryParams
+    if ((!wasKicked && miscUiState.appConfig?.allowAutoConnect && appQueryParams.autoConnect && hadConnected) || (alwaysReconnect)) {
+      if (alwaysReconnect === 'quick' || alwaysReconnect === 'fast') {
+        quickDevReconnect()
+      } else {
+        location.reload()
+      }
     }
     errorAbortController.abort()
     ended = true
@@ -957,7 +962,7 @@ const maybeEnterGame = () => {
     }
   }
 
-  if (appQueryParams.reconnect && process.env.NODE_ENV === 'development') {
+  if (appQueryParams.reconnect && localStorage.lastConnectOptions && process.env.NODE_ENV === 'development') {
     const lastConnect = JSON.parse(localStorage.lastConnectOptions ?? {})
     return waitForConfigFsLoad(async () => {
       void connect({
diff --git a/src/react/AppStatusProvider.tsx b/src/react/AppStatusProvider.tsx
index e7e36cb7..9c7b34ac 100644
--- a/src/react/AppStatusProvider.tsx
+++ b/src/react/AppStatusProvider.tsx
@@ -54,6 +54,17 @@ export const reconnectReload = () => {
   }
 }
 
+export const quickDevReconnect = () => {
+  if (!lastConnectOptions.value) {
+    return
+  }
+
+  resetAppStatusState()
+  window.dispatchEvent(new window.CustomEvent('connect', {
+    detail: lastConnectOptions.value
+  }))
+}
+
 export default () => {
   const lastState = useRef(JSON.parse(JSON.stringify(appStatusState)))
   const currentState = useSnapshot(appStatusState)
@@ -105,13 +116,6 @@ export default () => {
     }
   }, [isOpen])
 
-  const reconnect = () => {
-    resetAppStatusState()
-    window.dispatchEvent(new window.CustomEvent('connect', {
-      detail: lastConnectOptions.value
-    }))
-  }
-
   useEffect(() => {
     const controller = new AbortController()
     window.addEventListener('keyup', (e) => {
@@ -119,7 +123,7 @@ export default () => {
       if (activeModalStack.at(-1)?.reactType !== 'app-status') return
       // todo do only if reconnect is possible
       if (e.code !== 'KeyR' || !lastConnectOptions.value) return
-      reconnect()
+      quickDevReconnect()
     }, {
       signal: controller.signal
     })
@@ -140,7 +144,7 @@ export default () => {
     const account = await showOptionsModal('Choose account to connect with', [...accounts.map(account => account.username), 'Use other account'])
     if (!account) return
     lastConnectOptions.value!.authenticatedAccount = accounts.find(acc => acc.username === account) || true
-    reconnect()
+    quickDevReconnect()
   }
 
   const lastAutoCapturedPackets = getLastAutoCapturedPackets()
@@ -184,7 +188,7 @@ export default () => {
       actionsSlot={
         <>
           {displayAuthButton && <Button label='Authenticate' onClick={authReconnectAction} />}
-          {displayVpnButton && <PossiblyVpnBypassProxyButton reconnect={reconnect} />}
+          {displayVpnButton && <PossiblyVpnBypassProxyButton reconnect={quickDevReconnect} />}
           {replayActive && <Button label={`Download Packets Replay ${replayLogger?.contents.split('\n').length}L`} onClick={downloadPacketsReplay} />}
           {wasDisconnected && lastAutoCapturedPackets && <Button label={`Inspect Last ${lastAutoCapturedPackets} Packets`} onClick={() => downloadAutoCapturedPackets()} />}
         </>

From e2b141cca0dca279e22f8ef59bde41978675b5b8 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 14 Aug 2025 04:51:37 +0300
Subject: [PATCH 089/136] fix a few packet specific errors

---
 src/entities.ts                 | 2 +-
 src/react/ChunksDebugScreen.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/entities.ts b/src/entities.ts
index cf91ff2c..dcec6143 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -310,7 +310,7 @@ customEvents.on('gameLoaded', () => {
   })
 
   bot.on('teamRemoved', (team: Team) => {
-    if (appViewer.playerState.reactive.team?.team === team.team) {
+    if (appViewer.playerState.reactive.team?.team === team?.team) {
       appViewer.playerState.reactive.team = undefined
       // Player's team was removed, need to update all entities that are in a team
       updateEntityNameTags(team)
diff --git a/src/react/ChunksDebugScreen.tsx b/src/react/ChunksDebugScreen.tsx
index 9f47d023..de33e454 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 1ddaa79162d417c3e8855936eaf11bcfec7e4bb1 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Fri, 15 Aug 2025 01:12:24 +0300
Subject: [PATCH 090/136] rm not tested pathfinder (#415)

---
 package.json                    |  1 -
 pnpm-lock.yaml                  | 16 ----------------
 renderer/rsbuildSharedConfig.ts |  6 +++---
 src/connect.ts                  |  2 --
 4 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index b719b877..ba58b3da 100644
--- a/package.json
+++ b/package.json
@@ -157,7 +157,6 @@
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer#gen-the-master",
     "mineflayer-mouse": "^0.1.17",
-    "mineflayer-pathfinder": "^2.4.4",
     "npm-run-all": "^4.1.5",
     "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index da2b3912..ac6a0a7c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -345,9 +345,6 @@ importers:
       mineflayer-mouse:
         specifier: ^0.1.17
         version: 0.1.17
-      mineflayer-pathfinder:
-        specifier: ^2.4.4
-        version: 2.4.5
       npm-run-all:
         specifier: ^4.1.5
         version: 4.1.5
@@ -6671,9 +6668,6 @@ packages:
     resolution: {integrity: sha512-0eCR8pnGb42Qd9QmAxOjl0PhA5Fa+9+6H1G/YsbsO5rg5mDf94Tusqp/8NAGLPQCPVDzbarLskXdjR3h0E0bEQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
-  mineflayer-pathfinder@2.4.5:
-    resolution: {integrity: sha512-Jh3JnUgRLwhMh2Dugo4SPza68C41y+NPP5sdsgxRu35ydndo70i1JJGxauVWbXrpNwIxYNztUw78aFyb7icw8g==}
-
   mineflayer@4.31.0:
     resolution: {integrity: sha512-oqiNa5uP4kXiPlj4+Jn+9QozPMsMy0U8/YP5d6+KSAeWthtuJHeQqcYgWG5lkC3LHMqHqtEu4MNdXt6GZjFNTQ==}
     engines: {node: '>=22'}
@@ -17347,16 +17341,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  mineflayer-pathfinder@2.4.5:
-    dependencies:
-      minecraft-data: 3.92.0
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
-      prismarine-entity: 2.5.0
-      prismarine-item: 1.17.0
-      prismarine-nbt: 2.7.0
-      prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
-      vec3: 0.1.10
-
   mineflayer@4.31.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.92.0
diff --git a/renderer/rsbuildSharedConfig.ts b/renderer/rsbuildSharedConfig.ts
index 57091d99..45da30b1 100644
--- a/renderer/rsbuildSharedConfig.ts
+++ b/renderer/rsbuildSharedConfig.ts
@@ -73,12 +73,12 @@ export const appAndRendererSharedConfig = () => defineConfig({
 })
 
 export const rspackViewerConfig = (config, { appendPlugins, addRules, rspack }: ModifyRspackConfigUtils) => {
-    appendPlugins(new rspack.NormalModuleReplacementPlugin(/data/, (resource) => {
+    appendPlugins(new rspack.NormalModuleReplacementPlugin(/data|prismarine-physics/, (resource) => {
         let absolute: string
         const request = resource.request.replaceAll('\\', '/')
         absolute = path.join(resource.context, request).replaceAll('\\', '/')
-        if (request.includes('minecraft-data/data/pc/1.')) {
-            console.log('Error: incompatible resource', request, resource.contextInfo.issuer)
+        if (request.includes('minecraft-data/data/pc/1.') || request.includes('prismarine-physics')) {
+            console.log('Error: incompatible resource', request, 'from', resource.contextInfo.issuer)
             process.exit(1)
             // throw new Error(`${resource.request} was requested by ${resource.contextInfo.issuer}`)
         }
diff --git a/src/connect.ts b/src/connect.ts
index 914303c6..cb6b8f65 100644
--- a/src/connect.ts
+++ b/src/connect.ts
@@ -3,7 +3,6 @@
 import MinecraftData from 'minecraft-data'
 import PrismarineBlock from 'prismarine-block'
 import PrismarineItem from 'prismarine-item'
-import pathfinder from 'mineflayer-pathfinder'
 import { miscUiState } from './globalState'
 import supportedVersions from './supportedVersions.mjs'
 import { options } from './optionsStorage'
@@ -65,7 +64,6 @@ export const loadMinecraftData = async (version: string) => {
   window.PrismarineItem = PrismarineItem(mcData.version.minecraftVersion!)
   window.loadedData = mcData
   window.mcData = mcData
-  window.pathfinder = pathfinder
   miscUiState.loadedDataVersion = version
 }
 

From 65575e2665940ac8ed2160454bd3d5b4c45aebf8 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 15 Aug 2025 01:33:37 +0300
Subject: [PATCH 091/136] rm faulty mineflayer ver, fix kickin in singleplayer

---
 .eslintrc.json        |  1 +
 package.json          |  1 +
 pnpm-lock.yaml        | 48 ++++++++++---------------------------------
 src/customClient.js   | 19 ++++++++++++++---
 src/defaultOptions.ts |  2 +-
 5 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 3552f6a7..63f6749a 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -23,6 +23,7 @@
         // ],
         "@stylistic/arrow-spacing": "error",
         "@stylistic/block-spacing": "error",
+        "@typescript-eslint/no-this-alias": "off",
         "@stylistic/brace-style": [
             "error",
             "1tbs",
diff --git a/package.json b/package.json
index ba58b3da..1d9dfc0c 100644
--- a/package.json
+++ b/package.json
@@ -196,6 +196,7 @@
   },
   "pnpm": {
     "overrides": {
+      "mineflayer": "github:zardoy/mineflayer#gen-the-master",
       "@nxg-org/mineflayer-physics-util": "1.8.10",
       "buffer": "^6.0.3",
       "vec3": "0.1.10",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ac6a0a7c..f495c831 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,7 @@ settings:
   excludeLinksFromLockfile: false
 
 overrides:
+  mineflayer: github:zardoy/mineflayer#gen-the-master
   '@nxg-org/mineflayer-physics-util': 1.8.10
   buffer: ^6.0.3
   vec3: 0.1.10
@@ -136,7 +137,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/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13))
       minecraft-data:
         specifier: 3.92.0
         version: 3.92.0
@@ -341,7 +342,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41(@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/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.17
         version: 0.1.17
@@ -6668,13 +6669,9 @@ packages:
     resolution: {integrity: sha512-0eCR8pnGb42Qd9QmAxOjl0PhA5Fa+9+6H1G/YsbsO5rg5mDf94Tusqp/8NAGLPQCPVDzbarLskXdjR3h0E0bEQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
-  mineflayer@4.31.0:
-    resolution: {integrity: sha512-oqiNa5uP4kXiPlj4+Jn+9QozPMsMy0U8/YP5d6+KSAeWthtuJHeQqcYgWG5lkC3LHMqHqtEu4MNdXt6GZjFNTQ==}
-    engines: {node: '>=22'}
-
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448}
-    version: 4.31.0
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09}
+    version: 8.0.0
     engines: {node: '>=22'}
 
   minimalistic-assert@1.0.1:
@@ -11311,7 +11308,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.92.0
-      mineflayer: 4.31.0(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.17.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
@@ -16951,12 +16948,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/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(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/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)
       prismarine-item: 1.17.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17326,7 +17323,7 @@ snapshots:
 
   mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13):
     dependencies:
-      mineflayer: 4.31.0(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)
       sharp: 0.30.7
     transitivePeerDependencies:
       - encoding
@@ -17341,30 +17338,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  mineflayer@4.31.0(encoding@0.1.13):
-    dependencies:
-      minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.92.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.92.0)
-      prismarine-entity: 2.5.0
-      prismarine-item: 1.17.0
-      prismarine-nbt: 2.7.0
-      prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
-      prismarine-recipe: 1.3.1(prismarine-registry@1.11.0)
-      prismarine-registry: 1.11.0
-      prismarine-windows: 2.9.0
-      prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
-      protodef: 1.18.0
-      typed-emitter: 1.4.0
-      vec3: 0.1.10
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
diff --git a/src/customClient.js b/src/customClient.js
index b6c85fcc..b1a99904 100644
--- a/src/customClient.js
+++ b/src/customClient.js
@@ -1,6 +1,7 @@
+//@ts-check
+import * as nbt from 'prismarine-nbt'
 import { options } from './optionsStorage'
 
-//@ts-check
 const { EventEmitter } = require('events')
 const debug = require('debug')('minecraft-protocol')
 const states = require('minecraft-protocol/src/states')
@@ -51,8 +52,20 @@ class CustomChannelClient extends EventEmitter {
     this.emit('state', newProperty, oldProperty)
   }
 
-  end(reason) {
-    this._endReason = reason
+  end(endReason, fullReason) {
+    // eslint-disable-next-line unicorn/no-this-assignment
+    const client = this
+    if (client.state === states.PLAY) {
+      fullReason ||= loadedData.supportFeature('chatPacketsUseNbtComponents')
+        ? nbt.comp({ text: nbt.string(endReason) })
+        : JSON.stringify({ text: endReason })
+      client.write('kick_disconnect', { reason: fullReason })
+    } else if (client.state === states.LOGIN) {
+      fullReason ||= JSON.stringify({ text: endReason })
+      client.write('disconnect', { reason: fullReason })
+    }
+
+    this._endReason = endReason
     this.emit('end', this._endReason) // still emits on server side only, doesn't send anything to our client
   }
 
diff --git a/src/defaultOptions.ts b/src/defaultOptions.ts
index 9650ffcd..945ad37a 100644
--- a/src/defaultOptions.ts
+++ b/src/defaultOptions.ts
@@ -77,7 +77,7 @@ export const defaultOptions = {
   frameLimit: false as number | false,
   alwaysBackupWorldBeforeLoading: undefined as boolean | undefined | null,
   alwaysShowMobileControls: false,
-  excludeCommunicationDebugEvents: [],
+  excludeCommunicationDebugEvents: [] as string[],
   preventDevReloadWhilePlaying: false,
   numWorkers: 4,
   localServerOptions: {

From 54c114a702cbbc7e08220d89f5dc8b3b2c96072e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 15 Aug 2025 05:26:11 +0300
Subject: [PATCH 092/136] feat(big): items are now rendered in 3d not in 2d and
 it makes insanely huge difference on the game visuals

---
 experiments/three-item.html       |  13 +
 experiments/three-item.ts         | 108 ++++++++
 renderer/viewer/three/entities.ts |  80 ++----
 renderer/viewer/three/itemMesh.ts | 427 ++++++++++++++++++++++++++++++
 4 files changed, 575 insertions(+), 53 deletions(-)
 create mode 100644 experiments/three-item.html
 create mode 100644 experiments/three-item.ts
 create mode 100644 renderer/viewer/three/itemMesh.ts

diff --git a/experiments/three-item.html b/experiments/three-item.html
new file mode 100644
index 00000000..70155c50
--- /dev/null
+++ b/experiments/three-item.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Minecraft Item Viewer</title>
+    <style>
+        body { margin: 0; overflow: hidden; }
+        canvas { display: block; }
+    </style>
+</head>
+<body>
+    <script type="module" src="./three-item.ts"></script>
+</body>
+</html>
diff --git a/experiments/three-item.ts b/experiments/three-item.ts
new file mode 100644
index 00000000..b9d492fe
--- /dev/null
+++ b/experiments/three-item.ts
@@ -0,0 +1,108 @@
+import * as THREE from 'three'
+import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'
+import itemsAtlas from 'mc-assets/dist/itemsAtlasLegacy.png'
+import { createItemMeshFromCanvas, createItemMesh } from '../renderer/viewer/three/itemMesh'
+
+// Create scene, camera and renderer
+const scene = new THREE.Scene()
+const camera = new THREE.PerspectiveCamera(75, window.innerWidth / window.innerHeight, 0.1, 1000)
+const renderer = new THREE.WebGLRenderer({ antialias: true })
+renderer.setSize(window.innerWidth, window.innerHeight)
+document.body.appendChild(renderer.domElement)
+
+// Setup camera and controls
+camera.position.set(0, 0, 3)
+const controls = new OrbitControls(camera, renderer.domElement)
+controls.enableDamping = true
+
+// Background and lights
+scene.background = new THREE.Color(0x333333)
+const ambientLight = new THREE.AmbientLight(0xffffff, 0.7)
+scene.add(ambientLight)
+
+// Animation loop
+function animate () {
+  requestAnimationFrame(animate)
+  controls.update()
+  renderer.render(scene, camera)
+}
+
+async function setupItemMesh () {
+  try {
+    const loader = new THREE.TextureLoader()
+    const atlasTexture = await loader.loadAsync(itemsAtlas)
+
+    // Pixel-art configuration
+    atlasTexture.magFilter = THREE.NearestFilter
+    atlasTexture.minFilter = THREE.NearestFilter
+    atlasTexture.generateMipmaps = false
+    atlasTexture.wrapS = atlasTexture.wrapT = THREE.ClampToEdgeWrapping
+
+    // Extract the tile at x=2, y=0 (16x16)
+    const tileSize = 16
+    const tileX = 2
+    const tileY = 0
+
+    const canvas = document.createElement('canvas')
+    canvas.width = tileSize
+    canvas.height = tileSize
+    const ctx = canvas.getContext('2d')!
+
+    ctx.imageSmoothingEnabled = false
+    ctx.drawImage(
+      atlasTexture.image,
+      tileX * tileSize,
+      tileY * tileSize,
+      tileSize,
+      tileSize,
+      0,
+      0,
+      tileSize,
+      tileSize
+    )
+
+    // Test both approaches - working manual extraction:
+    const meshOld = createItemMeshFromCanvas(canvas, { depth: 0.1 })
+    meshOld.position.x = -1
+    meshOld.rotation.x = -Math.PI / 12
+    meshOld.rotation.y = Math.PI / 12
+    scene.add(meshOld)
+
+    // And new unified function:
+    const atlasWidth = atlasTexture.image.width
+    const atlasHeight = atlasTexture.image.height
+    const u = (tileX * tileSize) / atlasWidth
+    const v = (tileY * tileSize) / atlasHeight
+    const sizeX = tileSize / atlasWidth
+    const sizeY = tileSize / atlasHeight
+
+    console.log('Debug texture coords:', {u, v, sizeX, sizeY, atlasWidth, atlasHeight})
+
+    const resultNew = createItemMesh(atlasTexture, {
+      u, v, sizeX, sizeY
+    }, {
+      faceCamera: false,
+      use3D: true,
+      depth: 0.1
+    })
+
+    resultNew.mesh.position.x = 1
+    resultNew.mesh.rotation.x = -Math.PI / 12
+    resultNew.mesh.rotation.y = Math.PI / 12
+    scene.add(resultNew.mesh)
+
+    animate()
+  } catch (err) {
+    console.error('Failed to create item mesh:', err)
+  }
+}
+
+// Handle window resize
+window.addEventListener('resize', () => {
+  camera.aspect = window.innerWidth / window.innerHeight
+  camera.updateProjectionMatrix()
+  renderer.setSize(window.innerWidth, window.innerHeight)
+})
+
+// Start
+setupItemMesh()
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 24f64803..b1828d92 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -21,6 +21,7 @@ import { loadSkinFromUsername, loadSkinImage, stevePngUrl } from '../lib/utils/s
 import { renderComponent } from '../sign-renderer'
 import { createCanvas } from '../lib/utils'
 import { getBlockMeshFromModel } from './holdingBlock'
+import { createItemMesh } from './itemMesh'
 import * as Entity from './entity/EntityMesh'
 import { getMesh } from './entity/EntityMesh'
 import { WalkingGeneralSwing } from './entity/animations'
@@ -741,71 +742,42 @@ export class Entities {
       return {
         mesh: outerGroup,
         isBlock: true,
-        itemsTexture: null,
-        itemsTextureFlipped: null,
         modelName: textureUv.modelName,
       }
     }
 
-    // TODO: Render proper model (especially for blocks) instead of flat texture
+    // Render proper 3D model for items
     if (textureUv) {
       const textureThree = textureUv.renderInfo?.texture === 'blocks' ? this.worldRenderer.material.map! : this.worldRenderer.itemsTexture
-      // todo use geometry buffer uv instead!
       const { u, v, su, sv } = textureUv
-      const size = undefined
-      const itemsTexture = textureThree.clone()
-      itemsTexture.flipY = true
-      const sizeY = (sv ?? size)!
-      const sizeX = (su ?? size)!
-      itemsTexture.offset.set(u, 1 - v - sizeY)
-      itemsTexture.repeat.set(sizeX, sizeY)
-      itemsTexture.needsUpdate = true
-      itemsTexture.magFilter = THREE.NearestFilter
-      itemsTexture.minFilter = THREE.NearestFilter
-      let mesh: THREE.Object3D
-      let itemsTextureFlipped: THREE.Texture | undefined
-      if (faceCamera) {
-        const spriteMat = new THREE.SpriteMaterial({
-          map: itemsTexture,
-          transparent: true,
-          alphaTest: 0.1,
-        })
-        mesh = new THREE.Sprite(spriteMat)
-      } else {
-        itemsTextureFlipped = itemsTexture.clone()
-        itemsTextureFlipped.repeat.x *= -1
-        itemsTextureFlipped.needsUpdate = true
-        itemsTextureFlipped.offset.set(u + (sizeX), 1 - v - sizeY)
-        const material = new THREE.MeshStandardMaterial({
-          map: itemsTexture,
-          transparent: true,
-          alphaTest: 0.1,
-        })
-        const materialFlipped = new THREE.MeshStandardMaterial({
-          map: itemsTextureFlipped,
-          transparent: true,
-          alphaTest: 0.1,
-        })
-        mesh = new THREE.Mesh(new THREE.BoxGeometry(1, 1, 0), [
-          // top left and right bottom are black box materials others are transparent
-          new THREE.MeshBasicMaterial({ color: 0x00_00_00 }), new THREE.MeshBasicMaterial({ color: 0x00_00_00 }),
-          new THREE.MeshBasicMaterial({ color: 0x00_00_00 }), new THREE.MeshBasicMaterial({ color: 0x00_00_00 }),
-          material, materialFlipped,
-        ])
-      }
+      const sizeX = su ?? 1 // su is actually width
+      const sizeY = sv ?? 1 // sv is actually height
+
+      // Use the new unified item mesh function
+      const result = createItemMesh(textureThree, {
+        u,
+        v,
+        sizeX,
+        sizeY
+      }, {
+        faceCamera,
+        use3D: !faceCamera, // Only use 3D for non-camera-facing items
+        depth: 0.03
+      })
+
       let SCALE = 1
       if (specificProps['minecraft:display_context'] === 'ground') {
         SCALE = 0.5
       } else if (specificProps['minecraft:display_context'] === 'thirdperson') {
         SCALE = 6
       }
-      mesh.scale.set(SCALE, SCALE, SCALE)
+      result.mesh.scale.set(SCALE, SCALE, SCALE)
+
       return {
-        mesh,
+        mesh: result.mesh,
         isBlock: false,
-        itemsTexture,
-        itemsTextureFlipped,
         modelName: textureUv.modelName,
+        cleanup: result.cleanup
       }
     }
   }
@@ -905,8 +877,9 @@ export class Entities {
 
             group.additionalCleanup = () => {
               // important: avoid texture memory leak and gpu slowdown
-              object.itemsTexture?.dispose()
-              object.itemsTextureFlipped?.dispose()
+              if (object.cleanup) {
+                object.cleanup()
+              }
             }
           }
         }
@@ -1295,8 +1268,9 @@ export class Entities {
           const group = new THREE.Object3D()
           group['additionalCleanup'] = () => {
             // important: avoid texture memory leak and gpu slowdown
-            itemObject.itemsTexture?.dispose()
-            itemObject.itemsTextureFlipped?.dispose()
+            if (itemObject.cleanup) {
+              itemObject.cleanup()
+            }
           }
           const itemMesh = itemObject.mesh
           group.rotation.z = -Math.PI / 16
diff --git a/renderer/viewer/three/itemMesh.ts b/renderer/viewer/three/itemMesh.ts
new file mode 100644
index 00000000..4a886675
--- /dev/null
+++ b/renderer/viewer/three/itemMesh.ts
@@ -0,0 +1,427 @@
+import * as THREE from 'three'
+
+export interface Create3DItemMeshOptions {
+  depth?: number
+  pixelSize?: number
+}
+
+export interface Create3DItemMeshResult {
+  geometry: THREE.BufferGeometry
+  totalVertices: number
+  totalTriangles: number
+}
+
+/**
+ * Creates a 3D item geometry with front/back faces and connecting edges
+ * from a canvas containing the item texture
+ */
+export function create3DItemMesh (
+  canvas: HTMLCanvasElement,
+  options: Create3DItemMeshOptions = {}
+): Create3DItemMeshResult {
+  const { depth = 0.03, pixelSize } = options
+
+  // Validate canvas dimensions
+  if (canvas.width <= 0 || canvas.height <= 0) {
+    throw new Error(`Invalid canvas dimensions: ${canvas.width}x${canvas.height}`)
+  }
+
+  const ctx = canvas.getContext('2d')!
+  const imageData = ctx.getImageData(0, 0, canvas.width, canvas.height)
+  const { data } = imageData
+
+  const w = canvas.width
+  const h = canvas.height
+  const halfDepth = depth / 2
+  const actualPixelSize = pixelSize ?? (1 / Math.max(w, h))
+
+  // Find opaque pixels
+  const isOpaque = (x: number, y: number) => {
+    if (x < 0 || y < 0 || x >= w || y >= h) return false
+    const i = (y * w + x) * 4
+    return data[i + 3] > 128 // alpha > 128
+  }
+
+  const vertices: number[] = []
+  const indices: number[] = []
+  const uvs: number[] = []
+  const normals: number[] = []
+
+  let vertexIndex = 0
+
+  // Helper to add a vertex
+  const addVertex = (x: number, y: number, z: number, u: number, v: number, nx: number, ny: number, nz: number) => {
+    vertices.push(x, y, z)
+    uvs.push(u, v)
+    normals.push(nx, ny, nz)
+    return vertexIndex++
+  }
+
+  // Helper to add a quad (two triangles)
+  const addQuad = (v0: number, v1: number, v2: number, v3: number) => {
+    indices.push(v0, v1, v2, v0, v2, v3)
+  }
+
+  // Convert pixel coordinates to world coordinates
+  const pixelToWorld = (px: number, py: number) => {
+    const x = (px / w - 0.5) * actualPixelSize * w
+    const y = -(py / h - 0.5) * actualPixelSize * h
+    return { x, y }
+  }
+
+  // Create a grid of vertices for front and back faces
+  const frontVertices: Array<Array<number | null>> = Array.from({ length: h + 1 }, () => Array.from({ length: w + 1 }, () => null))
+  const backVertices: Array<Array<number | null>> = Array.from({ length: h + 1 }, () => Array.from({ length: w + 1 }, () => null))
+
+  // Create vertices at pixel corners
+  for (let py = 0; py <= h; py++) {
+    for (let px = 0; px <= w; px++) {
+      const { x, y } = pixelToWorld(px - 0.5, py - 0.5)
+
+      // UV coordinates should map to the texture space of the extracted tile
+      const u = px / w
+      const v = py / h
+
+      // Check if this vertex is needed for any face or edge
+      let needVertex = false
+
+      // Check all 4 adjacent pixels to see if any are opaque
+      const adjacentPixels = [
+        [px - 1, py - 1], // top-left pixel
+        [px, py - 1], // top-right pixel
+        [px - 1, py], // bottom-left pixel
+        [px, py] // bottom-right pixel
+      ]
+
+      for (const [adjX, adjY] of adjacentPixels) {
+        if (isOpaque(adjX, adjY)) {
+          needVertex = true
+          break
+        }
+      }
+
+      if (needVertex) {
+        frontVertices[py][px] = addVertex(x, y, halfDepth, u, v, 0, 0, 1)
+        backVertices[py][px] = addVertex(x, y, -halfDepth, u, v, 0, 0, -1)
+      }
+    }
+  }
+
+  // Create front and back faces
+  for (let py = 0; py < h; py++) {
+    for (let px = 0; px < w; px++) {
+      if (!isOpaque(px, py)) continue
+
+      const v00 = frontVertices[py][px]
+      const v10 = frontVertices[py][px + 1]
+      const v11 = frontVertices[py + 1][px + 1]
+      const v01 = frontVertices[py + 1][px]
+
+      const b00 = backVertices[py][px]
+      const b10 = backVertices[py][px + 1]
+      const b11 = backVertices[py + 1][px + 1]
+      const b01 = backVertices[py + 1][px]
+
+      if (v00 !== null && v10 !== null && v11 !== null && v01 !== null) {
+        // Front face
+        addQuad(v00, v10, v11, v01)
+      }
+
+      if (b00 !== null && b10 !== null && b11 !== null && b01 !== null) {
+        // Back face (reversed winding)
+        addQuad(b10, b00, b01, b11)
+      }
+    }
+  }
+
+  // Create edge faces for each side of the pixel with proper UVs
+  for (let py = 0; py < h; py++) {
+    for (let px = 0; px < w; px++) {
+      if (!isOpaque(px, py)) continue
+
+      const pixelU = (px + 0.5) / w // Center of current pixel
+      const pixelV = (py + 0.5) / h
+
+      // Left edge (x = px)
+      if (!isOpaque(px - 1, py)) {
+        const f0 = frontVertices[py][px]
+        const f1 = frontVertices[py + 1][px]
+        const b0 = backVertices[py][px]
+        const b1 = backVertices[py + 1][px]
+
+        if (f0 !== null && f1 !== null && b0 !== null && b1 !== null) {
+          // Create new vertices for edge with current pixel's UV
+          const ef0 = addVertex(vertices[f0 * 3], vertices[f0 * 3 + 1], vertices[f0 * 3 + 2], pixelU, pixelV, -1, 0, 0)
+          const ef1 = addVertex(vertices[f1 * 3], vertices[f1 * 3 + 1], vertices[f1 * 3 + 2], pixelU, pixelV, -1, 0, 0)
+          const eb1 = addVertex(vertices[b1 * 3], vertices[b1 * 3 + 1], vertices[b1 * 3 + 2], pixelU, pixelV, -1, 0, 0)
+          const eb0 = addVertex(vertices[b0 * 3], vertices[b0 * 3 + 1], vertices[b0 * 3 + 2], pixelU, pixelV, -1, 0, 0)
+          addQuad(ef0, ef1, eb1, eb0)
+        }
+      }
+
+      // Right edge (x = px + 1)
+      if (!isOpaque(px + 1, py)) {
+        const f0 = frontVertices[py + 1][px + 1]
+        const f1 = frontVertices[py][px + 1]
+        const b0 = backVertices[py + 1][px + 1]
+        const b1 = backVertices[py][px + 1]
+
+        if (f0 !== null && f1 !== null && b0 !== null && b1 !== null) {
+          const ef0 = addVertex(vertices[f0 * 3], vertices[f0 * 3 + 1], vertices[f0 * 3 + 2], pixelU, pixelV, 1, 0, 0)
+          const ef1 = addVertex(vertices[f1 * 3], vertices[f1 * 3 + 1], vertices[f1 * 3 + 2], pixelU, pixelV, 1, 0, 0)
+          const eb1 = addVertex(vertices[b1 * 3], vertices[b1 * 3 + 1], vertices[b1 * 3 + 2], pixelU, pixelV, 1, 0, 0)
+          const eb0 = addVertex(vertices[b0 * 3], vertices[b0 * 3 + 1], vertices[b0 * 3 + 2], pixelU, pixelV, 1, 0, 0)
+          addQuad(ef0, ef1, eb1, eb0)
+        }
+      }
+
+      // Top edge (y = py)
+      if (!isOpaque(px, py - 1)) {
+        const f0 = frontVertices[py][px]
+        const f1 = frontVertices[py][px + 1]
+        const b0 = backVertices[py][px]
+        const b1 = backVertices[py][px + 1]
+
+        if (f0 !== null && f1 !== null && b0 !== null && b1 !== null) {
+          const ef0 = addVertex(vertices[f0 * 3], vertices[f0 * 3 + 1], vertices[f0 * 3 + 2], pixelU, pixelV, 0, -1, 0)
+          const ef1 = addVertex(vertices[f1 * 3], vertices[f1 * 3 + 1], vertices[f1 * 3 + 2], pixelU, pixelV, 0, -1, 0)
+          const eb1 = addVertex(vertices[b1 * 3], vertices[b1 * 3 + 1], vertices[b1 * 3 + 2], pixelU, pixelV, 0, -1, 0)
+          const eb0 = addVertex(vertices[b0 * 3], vertices[b0 * 3 + 1], vertices[b0 * 3 + 2], pixelU, pixelV, 0, -1, 0)
+          addQuad(ef0, ef1, eb1, eb0)
+        }
+      }
+
+      // Bottom edge (y = py + 1)
+      if (!isOpaque(px, py + 1)) {
+        const f0 = frontVertices[py + 1][px + 1]
+        const f1 = frontVertices[py + 1][px]
+        const b0 = backVertices[py + 1][px + 1]
+        const b1 = backVertices[py + 1][px]
+
+        if (f0 !== null && f1 !== null && b0 !== null && b1 !== null) {
+          const ef0 = addVertex(vertices[f0 * 3], vertices[f0 * 3 + 1], vertices[f0 * 3 + 2], pixelU, pixelV, 0, 1, 0)
+          const ef1 = addVertex(vertices[f1 * 3], vertices[f1 * 3 + 1], vertices[f1 * 3 + 2], pixelU, pixelV, 0, 1, 0)
+          const eb1 = addVertex(vertices[b1 * 3], vertices[b1 * 3 + 1], vertices[b1 * 3 + 2], pixelU, pixelV, 0, 1, 0)
+          const eb0 = addVertex(vertices[b0 * 3], vertices[b0 * 3 + 1], vertices[b0 * 3 + 2], pixelU, pixelV, 0, 1, 0)
+          addQuad(ef0, ef1, eb1, eb0)
+        }
+      }
+    }
+  }
+
+  const geometry = new THREE.BufferGeometry()
+  geometry.setAttribute('position', new THREE.Float32BufferAttribute(vertices, 3))
+  geometry.setAttribute('uv', new THREE.Float32BufferAttribute(uvs, 2))
+  geometry.setAttribute('normal', new THREE.Float32BufferAttribute(normals, 3))
+  geometry.setIndex(indices)
+
+  // Compute normals properly
+  geometry.computeVertexNormals()
+
+  return {
+    geometry,
+    totalVertices: vertexIndex,
+    totalTriangles: indices.length / 3
+  }
+}
+
+export interface ItemTextureInfo {
+  u: number
+  v: number
+  sizeX: number
+  sizeY: number
+}
+
+export interface ItemMeshResult {
+  mesh: THREE.Object3D
+  itemsTexture?: THREE.Texture
+  itemsTextureFlipped?: THREE.Texture
+  cleanup?: () => void
+}
+
+/**
+ * Extracts item texture region to a canvas
+ */
+export function extractItemTextureToCanvas (
+  sourceTexture: THREE.Texture,
+  textureInfo: ItemTextureInfo
+): HTMLCanvasElement {
+  const { u, v, sizeX, sizeY } = textureInfo
+
+  // Calculate canvas size - fix the calculation
+  const canvasWidth = Math.max(1, Math.floor(sizeX * sourceTexture.image.width))
+  const canvasHeight = Math.max(1, Math.floor(sizeY * sourceTexture.image.height))
+
+  const canvas = document.createElement('canvas')
+  canvas.width = canvasWidth
+  canvas.height = canvasHeight
+
+  const ctx = canvas.getContext('2d')!
+  ctx.imageSmoothingEnabled = false
+
+  // Draw the item texture region to canvas
+  ctx.drawImage(
+    sourceTexture.image,
+    u * sourceTexture.image.width,
+    v * sourceTexture.image.height,
+    sizeX * sourceTexture.image.width,
+    sizeY * sourceTexture.image.height,
+    0,
+    0,
+    canvas.width,
+    canvas.height
+  )
+
+  return canvas
+}
+
+/**
+ * Creates either a 2D or 3D item mesh based on parameters
+ */
+export function createItemMesh (
+  sourceTexture: THREE.Texture,
+  textureInfo: ItemTextureInfo,
+  options: {
+    faceCamera?: boolean
+    use3D?: boolean
+    depth?: number
+  } = {}
+): ItemMeshResult {
+  const { faceCamera = false, use3D = true, depth = 0.03 } = options
+  const { u, v, sizeX, sizeY } = textureInfo
+
+  if (faceCamera) {
+    // Create sprite for camera-facing items
+    const itemsTexture = sourceTexture.clone()
+    itemsTexture.flipY = true
+    itemsTexture.offset.set(u, 1 - v - sizeY)
+    itemsTexture.repeat.set(sizeX, sizeY)
+    itemsTexture.needsUpdate = true
+    itemsTexture.magFilter = THREE.NearestFilter
+    itemsTexture.minFilter = THREE.NearestFilter
+
+    const spriteMat = new THREE.SpriteMaterial({
+      map: itemsTexture,
+      transparent: true,
+      alphaTest: 0.1,
+    })
+    const mesh = new THREE.Sprite(spriteMat)
+
+    return {
+      mesh,
+      itemsTexture,
+      cleanup () {
+        itemsTexture.dispose()
+      }
+    }
+  }
+
+  if (use3D) {
+    // Try to create 3D mesh
+    try {
+      const canvas = extractItemTextureToCanvas(sourceTexture, textureInfo)
+      const { geometry } = create3DItemMesh(canvas, { depth })
+
+      // Create texture from canvas for the 3D mesh
+      const itemsTexture = new THREE.CanvasTexture(canvas)
+      itemsTexture.magFilter = THREE.NearestFilter
+      itemsTexture.minFilter = THREE.NearestFilter
+      itemsTexture.wrapS = itemsTexture.wrapT = THREE.ClampToEdgeWrapping
+      itemsTexture.flipY = false
+      itemsTexture.needsUpdate = true
+
+      const material = new THREE.MeshStandardMaterial({
+        map: itemsTexture,
+        side: THREE.DoubleSide,
+        transparent: true,
+        alphaTest: 0.1,
+      })
+
+      const mesh = new THREE.Mesh(geometry, material)
+
+      return {
+        mesh,
+        itemsTexture,
+        cleanup () {
+          itemsTexture.dispose()
+          geometry.dispose()
+          if (material.map) material.map.dispose()
+          material.dispose()
+        }
+      }
+    } catch (error) {
+      console.warn('Failed to create 3D item mesh, falling back to 2D:', error)
+      // Fall through to 2D rendering
+    }
+  }
+
+  // Fallback to 2D flat rendering
+  const itemsTexture = sourceTexture.clone()
+  itemsTexture.flipY = true
+  itemsTexture.offset.set(u, 1 - v - sizeY)
+  itemsTexture.repeat.set(sizeX, sizeY)
+  itemsTexture.needsUpdate = true
+  itemsTexture.magFilter = THREE.NearestFilter
+  itemsTexture.minFilter = THREE.NearestFilter
+
+  const itemsTextureFlipped = itemsTexture.clone()
+  itemsTextureFlipped.repeat.x *= -1
+  itemsTextureFlipped.needsUpdate = true
+  itemsTextureFlipped.offset.set(u + sizeX, 1 - v - sizeY)
+
+  const material = new THREE.MeshStandardMaterial({
+    map: itemsTexture,
+    transparent: true,
+    alphaTest: 0.1,
+  })
+  const materialFlipped = new THREE.MeshStandardMaterial({
+    map: itemsTextureFlipped,
+    transparent: true,
+    alphaTest: 0.1,
+  })
+  const mesh = new THREE.Mesh(new THREE.BoxGeometry(1, 1, 0), [
+    new THREE.MeshBasicMaterial({ color: 0x00_00_00 }), new THREE.MeshBasicMaterial({ color: 0x00_00_00 }),
+    new THREE.MeshBasicMaterial({ color: 0x00_00_00 }), new THREE.MeshBasicMaterial({ color: 0x00_00_00 }),
+    material, materialFlipped,
+  ])
+
+  return {
+    mesh,
+    itemsTexture,
+    itemsTextureFlipped,
+    cleanup () {
+      itemsTexture.dispose()
+      itemsTextureFlipped.dispose()
+      material.dispose()
+      materialFlipped.dispose()
+    }
+  }
+}
+
+/**
+ * Creates a complete 3D item mesh from a canvas texture
+ */
+export function createItemMeshFromCanvas (
+  canvas: HTMLCanvasElement,
+  options: Create3DItemMeshOptions = {}
+): THREE.Mesh {
+  const { geometry } = create3DItemMesh(canvas, options)
+
+  // Base color texture for the item
+  const colorTexture = new THREE.CanvasTexture(canvas)
+  colorTexture.magFilter = THREE.NearestFilter
+  colorTexture.minFilter = THREE.NearestFilter
+  colorTexture.wrapS = colorTexture.wrapT = THREE.ClampToEdgeWrapping
+  colorTexture.flipY = false // Important for canvas textures
+  colorTexture.needsUpdate = true
+
+  // Material - no transparency, no alpha test needed for edges
+  const material = new THREE.MeshBasicMaterial({
+    map: colorTexture,
+    side: THREE.DoubleSide,
+    transparent: true,
+    alphaTest: 0.1
+  })
+
+  return new THREE.Mesh(geometry, material)
+}

From cc4f705aea814c763238a19f96229a12958d7a4c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 15 Aug 2025 07:46:52 +0300
Subject: [PATCH 093/136] feat: new experimental chunk loading logic by forcing
 into spiral queue feat: add highly experimental logic to try to self-restore
 any issues with chunks loading by automating f3+a action. write debug info
 into chat for now. can be disabled feat: rework chunks debug screen showing
 actually useful information now

---
 renderer/playground/shared.ts           |  4 +-
 renderer/viewer/lib/worldDataEmitter.ts | 73 +++++++++++++++++++------
 renderer/viewer/three/entities.ts       |  1 -
 renderer/viewer/three/itemMesh.ts       | 10 ++--
 src/appViewer.ts                        |  7 +++
 src/defaultOptions.ts                   |  1 +
 src/react/ChunksDebug.tsx               |  5 +-
 src/react/ChunksDebugScreen.tsx         | 53 ++++++++++++++++--
 8 files changed, 125 insertions(+), 29 deletions(-)

diff --git a/renderer/playground/shared.ts b/renderer/playground/shared.ts
index ba58a57f..9d12fae9 100644
--- a/renderer/playground/shared.ts
+++ b/renderer/playground/shared.ts
@@ -65,7 +65,7 @@ function getAllMethods (obj) {
   return [...methods] as string[]
 }
 
-export const delayedIterator = async <T> (arr: T[], delay: number, exec: (item: T, index: number) => void, chunkSize = 1) => {
+export const delayedIterator = async <T> (arr: T[], delay: number, exec: (item: T, index: number) => Promise<void>, chunkSize = 1) => {
   // if delay is 0 then don't use setTimeout
   for (let i = 0; i < arr.length; i += chunkSize) {
     if (delay) {
@@ -74,6 +74,6 @@ export const delayedIterator = async <T> (arr: T[], delay: number, exec: (item:
         setTimeout(resolve, delay)
       })
     }
-    exec(arr[i], i)
+    await exec(arr[i], i)
   }
 }
diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index e9153af7..3bc2acd3 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -35,7 +35,15 @@ export class WorldDataEmitterWorker extends (EventEmitter as new () => TypedEmit
 }
 
 export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<WorldDataEmitterEvents>) {
+  spiralNumber = 0
+  gotPanicLastTime = false
+  panicChunksReload = () => {}
   loadedChunks: Record<ChunkPosKey, boolean>
+  private inLoading = false
+  private chunkReceiveTimes: number[] = []
+  private lastChunkReceiveTime = 0
+  public lastChunkReceiveTimeAvg = 0
+  private panicTimeout?: NodeJS.Timeout
   readonly lastPos: Vec3
   private eventListeners: Record<string, any> = {}
   private readonly emitter: WorldDataEmitter
@@ -133,12 +141,19 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
         this.emitter.emit('entity', { id: e.id, delete: true })
       },
       chunkColumnLoad: (pos: Vec3) => {
+        const now = performance.now()
+        if (this.lastChunkReceiveTime) {
+          this.chunkReceiveTimes.push(now - this.lastChunkReceiveTime)
+        }
+        this.lastChunkReceiveTime = now
+
         if (this.waitingSpiralChunksLoad[`${pos.x},${pos.z}`]) {
           this.waitingSpiralChunksLoad[`${pos.x},${pos.z}`](true)
           delete this.waitingSpiralChunksLoad[`${pos.x},${pos.z}`]
         } else if (this.loadedChunks[`${pos.x},${pos.z}`]) {
           void this.loadChunk(pos, false, 'Received another chunkColumnLoad event while already loaded')
         }
+        this.chunkProgress()
       },
       chunkColumnUnload: (pos: Vec3) => {
         this.unloadChunk(pos)
@@ -219,33 +234,59 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
     const positions = generateSpiralMatrix(this.viewDistance).map(([x, z]) => new Vec3((botX + x) * 16, 0, (botZ + z) * 16))
 
     this.lastPos.update(pos)
-    await this._loadChunks(positions)
+    await this._loadChunks(positions, pos)
   }
 
-  async _loadChunks (positions: Vec3[], sliceSize = 5) {
+  chunkProgress () {
+    if (this.panicTimeout) clearTimeout(this.panicTimeout)
+    if (this.chunkReceiveTimes.length >= 5) {
+      const avgReceiveTime = this.chunkReceiveTimes.reduce((a, b) => a + b, 0) / this.chunkReceiveTimes.length
+      this.lastChunkReceiveTimeAvg = avgReceiveTime
+      const timeoutDelay = avgReceiveTime * 2 + 1000 // 2x average + 1 second
+
+      // Clear any existing timeout
+      if (this.panicTimeout) clearTimeout(this.panicTimeout)
+
+      // Set new timeout for panic reload
+      this.panicTimeout = setTimeout(() => {
+        if (!this.gotPanicLastTime && this.inLoading) {
+          console.warn('Chunk loading seems stuck, triggering panic reload')
+          this.gotPanicLastTime = true
+          this.panicChunksReload()
+        }
+      }, timeoutDelay)
+    }
+  }
+
+  async _loadChunks (positions: Vec3[], centerPos: Vec3) {
+    this.spiralNumber++
+    const { spiralNumber } = this
     // stop loading previous chunks
     for (const pos of Object.keys(this.waitingSpiralChunksLoad)) {
       this.waitingSpiralChunksLoad[pos](false)
       delete this.waitingSpiralChunksLoad[pos]
     }
 
-    const promises = [] as Array<Promise<void>>
     let continueLoading = true
+    this.inLoading = true
     await delayedIterator(positions, this.addWaitTime, async (pos) => {
-      const promise = (async () => {
-        if (!continueLoading || this.loadedChunks[`${pos.x},${pos.z}`]) return
+      if (!continueLoading || this.loadedChunks[`${pos.x},${pos.z}`]) return
 
-        if (!this.world.getColumnAt(pos)) {
-          continueLoading = await new Promise<boolean>(resolve => {
-            this.waitingSpiralChunksLoad[`${pos.x},${pos.z}`] = resolve
-          })
-        }
-        if (!continueLoading) return
-        await this.loadChunk(pos)
-      })()
-      promises.push(promise)
+      // Wait for chunk to be available from server
+      if (!this.world.getColumnAt(pos)) {
+        continueLoading = await new Promise<boolean>(resolve => {
+          this.waitingSpiralChunksLoad[`${pos.x},${pos.z}`] = resolve
+        })
+      }
+      if (!continueLoading) return
+      await this.loadChunk(pos, undefined, `spiral ${spiralNumber} from ${centerPos.x},${centerPos.z}`)
+      this.chunkProgress()
     })
-    await Promise.all(promises)
+    if (this.panicTimeout) clearTimeout(this.panicTimeout)
+    this.inLoading = false
+    this.gotPanicLastTime = false
+    this.chunkReceiveTimes = []
+    this.lastChunkReceiveTime = 0
   }
 
   readdDebug () {
@@ -350,7 +391,7 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
         return undefined!
       }).filter(a => !!a)
       this.lastPos.update(pos)
-      void this._loadChunks(positions)
+      void this._loadChunks(positions, pos)
     } else {
       this.emitter.emit('chunkPosUpdate', { pos }) // todo-low
       this.lastPos.update(pos)
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index b1828d92..7849686b 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -762,7 +762,6 @@ export class Entities {
       }, {
         faceCamera,
         use3D: !faceCamera, // Only use 3D for non-camera-facing items
-        depth: 0.03
       })
 
       let SCALE = 1
diff --git a/renderer/viewer/three/itemMesh.ts b/renderer/viewer/three/itemMesh.ts
index 4a886675..3fa069b9 100644
--- a/renderer/viewer/three/itemMesh.ts
+++ b/renderer/viewer/three/itemMesh.ts
@@ -1,7 +1,7 @@
 import * as THREE from 'three'
 
 export interface Create3DItemMeshOptions {
-  depth?: number
+  depth: number
   pixelSize?: number
 }
 
@@ -17,9 +17,9 @@ export interface Create3DItemMeshResult {
  */
 export function create3DItemMesh (
   canvas: HTMLCanvasElement,
-  options: Create3DItemMeshOptions = {}
+  options: Create3DItemMeshOptions
 ): Create3DItemMeshResult {
-  const { depth = 0.03, pixelSize } = options
+  const { depth, pixelSize } = options
 
   // Validate canvas dimensions
   if (canvas.width <= 0 || canvas.height <= 0) {
@@ -287,7 +287,7 @@ export function createItemMesh (
     depth?: number
   } = {}
 ): ItemMeshResult {
-  const { faceCamera = false, use3D = true, depth = 0.03 } = options
+  const { faceCamera = false, use3D = true, depth = 0.04 } = options
   const { u, v, sizeX, sizeY } = textureInfo
 
   if (faceCamera) {
@@ -403,7 +403,7 @@ export function createItemMesh (
  */
 export function createItemMeshFromCanvas (
   canvas: HTMLCanvasElement,
-  options: Create3DItemMeshOptions = {}
+  options: Create3DItemMeshOptions
 ): THREE.Mesh {
   const { geometry } = create3DItemMesh(canvas, options)
 
diff --git a/src/appViewer.ts b/src/appViewer.ts
index bf01b989..879fe938 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -17,6 +17,8 @@ import { options } from './optionsStorage'
 import { ResourcesManager, ResourcesManagerTransferred } from './resourcesManager'
 import { watchOptionsAfterWorldViewInit } from './watchOptions'
 import { loadMinecraftData } from './connect'
+import { reloadChunks } from './utils'
+import { displayClientChat } from './botUtils'
 
 export interface RendererReactiveState {
   world: {
@@ -197,6 +199,11 @@ export class AppViewer {
     this.currentDisplay = 'world'
     const startPosition = bot.entity?.position ?? new Vec3(0, 64, 0)
     this.worldView = new WorldDataEmitter(world, renderDistance, startPosition)
+    this.worldView.panicChunksReload = () => {
+      if (!options.experimentalClientSelfReload) return
+      displayClientChat(`[client] client panicked due to too long loading time. Soft reloading chunks...`)
+      void reloadChunks()
+    }
     window.worldView = this.worldView
     watchOptionsAfterWorldViewInit(this.worldView)
     this.appConfigUdpate()
diff --git a/src/defaultOptions.ts b/src/defaultOptions.ts
index 945ad37a..95dbfd63 100644
--- a/src/defaultOptions.ts
+++ b/src/defaultOptions.ts
@@ -84,6 +84,7 @@ export const defaultOptions = {
     gameMode: 1
   } as any,
   preferLoadReadonly: false,
+  experimentalClientSelfReload: true,
   disableLoadPrompts: false,
   guestUsername: 'guest',
   askGuestName: true,
diff --git a/src/react/ChunksDebug.tsx b/src/react/ChunksDebug.tsx
index 7b42cf4d..2e4fa139 100644
--- a/src/react/ChunksDebug.tsx
+++ b/src/react/ChunksDebug.tsx
@@ -98,13 +98,16 @@ export default ({
                 cursor: chunk ? 'pointer' : 'default',
                 position: 'relative',
                 width: `${tileSize}px`,
+                flexDirection: 'column',
                 height: `${tileSize}px`,
+                padding: 1,
                 // pre-wrap
                 whiteSpace: 'pre',
               }}
             >
               {relX}, {relZ}{'\n'}
-              {chunk?.lines.join('\n')}
+              {chunk?.lines[0]}{'\n'}
+              <span style={{ fontSize: `${fontSize * 0.8}px` }}>{chunk?.lines[1]}</span>
             </div>
           )
         })}
diff --git a/src/react/ChunksDebugScreen.tsx b/src/react/ChunksDebugScreen.tsx
index de33e454..28b0bbc4 100644
--- a/src/react/ChunksDebugScreen.tsx
+++ b/src/react/ChunksDebugScreen.tsx
@@ -2,6 +2,8 @@ import { useEffect, useState } from 'react'
 import { useUtilsEffect } from '@zardoy/react-util'
 import { WorldRendererCommon } from 'renderer/viewer/lib/worldrendererCommon'
 import { WorldRendererThree } from 'renderer/viewer/three/worldrendererThree'
+import { Vec3 } from 'vec3'
+import { generateSpiralMatrix } from 'flying-squid/dist/utils'
 import Screen from './Screen'
 import ChunksDebug, { ChunkDebug } from './ChunksDebug'
 import { useIsModalActive } from './utilsApp'
@@ -12,6 +14,10 @@ const Inner = () => {
   const [update, setUpdate] = useState(0)
 
   useUtilsEffect(({ interval }) => {
+    const up = () => {
+      // setUpdate(u => u + 1)
+    }
+    bot.on('chunkColumnLoad', up)
     interval(
       500,
       () => {
@@ -20,15 +26,46 @@ const Inner = () => {
         setUpdate(u => u + 1)
       }
     )
+    return () => {
+      bot.removeListener('chunkColumnLoad', up)
+    }
   }, [])
 
+  // Track first load time for all chunks
+  const allLoadTimes = Object.values(worldView!.debugChunksInfo)
+    .map(chunk => chunk?.loads[0]?.time ?? Infinity)
+    .filter(time => time !== Infinity)
+    .sort((a, b) => a - b)
+
+  const allSpiralChunks = Object.fromEntries(generateSpiralMatrix(worldView!.viewDistance).map(pos => [`${pos[0]},${pos[1]}`, pos]))
+
   const mapChunk = (key: string, state: ChunkDebug['state']): ChunkDebug => {
+    const x = Number(key.split(',')[0])
+    const z = Number(key.split(',')[1])
+    const chunkX = Math.floor(x / 16)
+    const chunkZ = Math.floor(z / 16)
+
+    delete allSpiralChunks[`${chunkX},${chunkZ}`]
     const chunk = worldView!.debugChunksInfo[key]
+    const firstLoadTime = chunk?.loads[0]?.time
+    const loadIndex = firstLoadTime ? allLoadTimes.indexOf(firstLoadTime) + 1 : 0
+    // const timeSinceFirstLoad = firstLoadTime ? firstLoadTime - allLoadTimes[0] : 0
+    const timeSinceFirstLoad = firstLoadTime ? firstLoadTime - allLoadTimes[0] : 0
+    let line = ''
+    let line2 = ''
+    if (loadIndex) {
+      line = `${loadIndex}`
+      line2 = `${timeSinceFirstLoad}ms`
+    }
+    if (chunk?.loads.length > 1) {
+      line += ` - ${chunk.loads.length}`
+    }
+
     return {
-      x: Number(key.split(',')[0]),
-      z: Number(key.split(',')[1]),
+      x,
+      z,
       state,
-      lines: [String(chunk?.loads.length ?? 0)],
+      lines: [line, line2],
       sidebarLines: [
         `loads: ${chunk?.loads?.map(l => `${l.reason} ${l.dataLength} ${l.time}`).join('\n')}`,
         // `blockUpdates: ${chunk.blockUpdates}`,
@@ -55,14 +92,22 @@ const Inner = () => {
 
   const chunksDone = Object.keys(world.finishedChunks).map(key => mapChunk(key, 'done'))
 
+
+  const chunksWaitingOrder = Object.values(allSpiralChunks).map(([x, z]) => {
+    const pos = new Vec3(x * 16, 0, z * 16)
+    if (bot.world.getColumnAt(pos) === null) return null
+    return mapChunk(`${pos.x},${pos.z}`, 'order-queued')
+  }).filter(a => !!a)
+
   const allChunks = [
     ...chunksWaitingServer,
     ...chunksWaitingClient,
     ...clientProcessingChunks,
     ...chunksDone,
     ...chunksDoneEmpty,
+    ...chunksWaitingOrder,
   ]
-  return <Screen title="Chunks Debug">
+  return <Screen title={`Chunks Debug (avg: ${worldView!.lastChunkReceiveTimeAvg.toFixed(1)}ms)`}>
     <ChunksDebug
       chunks={allChunks}
       playerChunk={{

From e1293b6cb3ee73889a75c957c8c0d14cf7661b10 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 16 Aug 2025 09:15:37 +0300
Subject: [PATCH 094/136] - Introduced a patchAssets script to apply custom
 textures to the blocks and items atlases. - Enhanced the ThreeJsSound class
 to support sound playback timeout and volume adjustments. - Added a custom
 sound system to handle named sound effects with metadata.

---
 assets/customTextures/readme.md       |   2 +
 renderer/viewer/three/threeJsSound.ts |  40 ++++++--
 rsbuild.config.ts                     |   4 +
 scripts/patchAssets.ts                | 137 ++++++++++++++++++++++++++
 src/basicSounds.ts                    |  30 +++++-
 src/defaultOptions.ts                 |   1 +
 src/react/Slider.tsx                  |  58 ++++++++++-
 src/sounds/botSoundSystem.ts          |  11 ++-
 src/sounds/customSoundSystem.ts       |  44 +++++++++
 src/sounds/soundsMap.ts               |  10 +-
 src/watchOptions.ts                   |   4 +
 11 files changed, 323 insertions(+), 18 deletions(-)
 create mode 100644 assets/customTextures/readme.md
 create mode 100644 scripts/patchAssets.ts
 create mode 100644 src/sounds/customSoundSystem.ts

diff --git a/assets/customTextures/readme.md b/assets/customTextures/readme.md
new file mode 100644
index 00000000..e2a78c20
--- /dev/null
+++ b/assets/customTextures/readme.md
@@ -0,0 +1,2 @@
+here you can place custom textures for bundled files (blocks/items) e.g. blocks/stone.png
+get file names from here (blocks/items) https://zardoy.github.io/mc-assets/
diff --git a/renderer/viewer/three/threeJsSound.ts b/renderer/viewer/three/threeJsSound.ts
index 46aefda9..699bb2cc 100644
--- a/renderer/viewer/three/threeJsSound.ts
+++ b/renderer/viewer/three/threeJsSound.ts
@@ -2,7 +2,7 @@ import * as THREE from 'three'
 import { WorldRendererThree } from './worldrendererThree'
 
 export interface SoundSystem {
-  playSound: (position: { x: number, y: number, z: number }, path: string, volume?: number, pitch?: number) => void
+  playSound: (position: { x: number, y: number, z: number }, path: string, volume?: number, pitch?: number, timeout?: number) => void
   destroy: () => void
 }
 
@@ -10,7 +10,17 @@ export class ThreeJsSound implements SoundSystem {
   audioListener: THREE.AudioListener | undefined
   private readonly activeSounds = new Set<THREE.PositionalAudio>()
   private readonly audioContext: AudioContext | undefined
+  private readonly soundVolumes = new Map<THREE.PositionalAudio, number>()
+  baseVolume = 1
+
   constructor (public worldRenderer: WorldRendererThree) {
+    worldRenderer.onWorldSwitched.push(() => {
+      this.stopAll()
+    })
+
+    worldRenderer.onReactiveConfigUpdated('volume', (volume) => {
+      this.changeVolume(volume)
+    })
   }
 
   initAudioListener () {
@@ -19,20 +29,24 @@ export class ThreeJsSound implements SoundSystem {
     this.worldRenderer.camera.add(this.audioListener)
   }
 
-  playSound (position: { x: number, y: number, z: number }, path: string, volume = 1, pitch = 1) {
+  playSound (position: { x: number, y: number, z: number }, path: string, volume = 1, pitch = 1, timeout = 500) {
     this.initAudioListener()
 
     const sound = new THREE.PositionalAudio(this.audioListener!)
     this.activeSounds.add(sound)
+    this.soundVolumes.set(sound, volume)
 
     const audioLoader = new THREE.AudioLoader()
     const start = Date.now()
     void audioLoader.loadAsync(path).then((buffer) => {
-      if (Date.now() - start > 500) return
+      if (Date.now() - start > timeout) {
+        console.warn('Ignored playing sound', path, 'due to timeout:', timeout, 'ms <', Date.now() - start, 'ms')
+        return
+      }
       // play
       sound.setBuffer(buffer)
       sound.setRefDistance(20)
-      sound.setVolume(volume)
+      sound.setVolume(volume * this.baseVolume)
       sound.setPlaybackRate(pitch) // set the pitch
       this.worldRenderer.scene.add(sound)
       // set sound position
@@ -43,21 +57,35 @@ export class ThreeJsSound implements SoundSystem {
           sound.disconnect()
         }
         this.activeSounds.delete(sound)
+        this.soundVolumes.delete(sound)
         audioLoader.manager.itemEnd(path)
       }
       sound.play()
     })
   }
 
-  destroy () {
-    // Stop and clean up all active sounds
+  stopAll () {
     for (const sound of this.activeSounds) {
+      if (!sound) continue
       sound.stop()
       if (sound.source) {
         sound.disconnect()
       }
+      this.worldRenderer.scene.remove(sound)
     }
+    this.activeSounds.clear()
+    this.soundVolumes.clear()
+  }
 
+  changeVolume (volume: number) {
+    this.baseVolume = volume
+    for (const [sound, individualVolume] of this.soundVolumes) {
+      sound.setVolume(individualVolume * this.baseVolume)
+    }
+  }
+
+  destroy () {
+    this.stopAll()
     // Remove and cleanup audio listener
     if (this.audioListener) {
       this.audioListener.removeFromParent()
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index 42d6867b..6cd6b2ed 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -240,6 +240,10 @@ const appConfig = defineConfig({
                         prep()
                     })
                     build.onAfterBuild(async () => {
+                        if (fs.readdirSync('./assets/customTextures').length > 0) {
+                            childProcess.execSync('tsx ./scripts/patchAssets.ts', { stdio: 'inherit' })
+                        }
+
                         if (SINGLE_FILE_BUILD) {
                             // check that only index.html is in the dist/single folder
                             const singleBuildFiles = fs.readdirSync('./dist/single')
diff --git a/scripts/patchAssets.ts b/scripts/patchAssets.ts
new file mode 100644
index 00000000..99994f5f
--- /dev/null
+++ b/scripts/patchAssets.ts
@@ -0,0 +1,137 @@
+import blocksAtlas from 'mc-assets/dist/blocksAtlases.json'
+import itemsAtlas from 'mc-assets/dist/itemsAtlases.json'
+import * as fs from 'fs'
+import * as path from 'path'
+import sharp from 'sharp'
+
+interface AtlasFile {
+  latest: {
+    suSv: number
+    tileSize: number
+    width: number
+    height: number
+    textures: {
+      [key: string]: {
+        u: number
+        v: number
+        su: number
+        sv: number
+        tileIndex: number
+      }
+    }
+  }
+}
+
+async function patchTextureAtlas(
+  atlasType: 'blocks' | 'items',
+  atlasData: AtlasFile,
+  customTexturesDir: string,
+  distDir: string
+) {
+  // Check if custom textures directory exists and has files
+  if (!fs.existsSync(customTexturesDir) || fs.readdirSync(customTexturesDir).length === 0) {
+    return
+  }
+
+  // Find the latest atlas file
+  const atlasFiles = fs.readdirSync(distDir)
+    .filter(file => file.startsWith(`${atlasType}AtlasLatest`) && file.endsWith('.png'))
+    .sort()
+
+  if (atlasFiles.length === 0) {
+    console.log(`No ${atlasType}AtlasLatest.png found in ${distDir}`)
+    return
+  }
+
+  const latestAtlasFile = atlasFiles[atlasFiles.length - 1]
+  const atlasPath = path.join(distDir, latestAtlasFile)
+  console.log(`Patching ${atlasPath}`)
+
+  // Get atlas dimensions
+  const atlasMetadata = await sharp(atlasPath).metadata()
+  if (!atlasMetadata.width || !atlasMetadata.height) {
+    throw new Error(`Failed to get atlas dimensions for ${atlasPath}`)
+  }
+
+  // Process each custom texture
+  const customTextureFiles = fs.readdirSync(customTexturesDir)
+    .filter(file => file.endsWith('.png'))
+
+  if (customTextureFiles.length === 0) return
+
+  // Prepare composite operations
+  const composites: sharp.OverlayOptions[] = []
+
+  for (const textureFile of customTextureFiles) {
+    const textureName = path.basename(textureFile, '.png')
+
+    if (atlasData.latest.textures[textureName]) {
+      const textureData = atlasData.latest.textures[textureName]
+      const customTexturePath = path.join(customTexturesDir, textureFile)
+
+      try {
+        // Convert UV coordinates to pixel coordinates
+        const x = Math.round(textureData.u * atlasMetadata.width)
+        const y = Math.round(textureData.v * atlasMetadata.height)
+        const width = Math.round((textureData.su ?? atlasData.latest.suSv) * atlasMetadata.width)
+        const height = Math.round((textureData.sv ?? atlasData.latest.suSv) * atlasMetadata.height)
+
+        // Resize custom texture to match atlas dimensions and add to composite operations
+        const resizedTextureBuffer = await sharp(customTexturePath)
+          .resize(width, height, {
+            fit: 'fill',
+            kernel: 'nearest' // Preserve pixel art quality
+          })
+          .png()
+          .toBuffer()
+
+        composites.push({
+          input: resizedTextureBuffer,
+          left: x,
+          top: y,
+          blend: 'over'
+        })
+
+        console.log(`Prepared ${textureName} at (${x}, ${y}) with size (${width}, ${height})`)
+      } catch (error) {
+        console.error(`Failed to prepare ${textureName}:`, error)
+      }
+    } else {
+      console.warn(`Texture ${textureName} not found in ${atlasType} atlas`)
+    }
+  }
+
+  if (composites.length > 0) {
+    // Apply all patches at once using Sharp's composite
+    await sharp(atlasPath)
+      .composite(composites)
+      .png()
+      .toFile(atlasPath + '.tmp')
+
+    // Replace original with patched version
+    fs.renameSync(atlasPath + '.tmp', atlasPath)
+    console.log(`Saved patched ${atlasType} atlas to ${atlasPath}`)
+  }
+}
+
+async function main() {
+  const customBlocksDir = './assets/customTextures/blocks'
+  const customItemsDir = './assets/customTextures/items'
+  const distDir = './dist/static/image'
+
+  try {
+    // Patch blocks atlas
+    await patchTextureAtlas('blocks', blocksAtlas as unknown as AtlasFile, customBlocksDir, distDir)
+
+    // Patch items atlas
+    await patchTextureAtlas('items', itemsAtlas as unknown as AtlasFile, customItemsDir, distDir)
+
+    console.log('Texture atlas patching completed!')
+  } catch (error) {
+    console.error('Failed to patch texture atlases:', error)
+    process.exit(1)
+  }
+}
+
+// Run the script
+main()
diff --git a/src/basicSounds.ts b/src/basicSounds.ts
index 40428c6b..37f8dccd 100644
--- a/src/basicSounds.ts
+++ b/src/basicSounds.ts
@@ -43,7 +43,7 @@ export async function loadSound (path: string, contents = path) {
   }
 }
 
-export const loadOrPlaySound = async (url, soundVolume = 1, loadTimeout = 500) => {
+export const loadOrPlaySound = async (url, soundVolume = 1, loadTimeout = options.remoteSoundsLoadTimeout, loop = false) => {
   const soundBuffer = sounds[url]
   if (!soundBuffer) {
     const start = Date.now()
@@ -51,10 +51,10 @@ export const loadOrPlaySound = async (url, soundVolume = 1, loadTimeout = 500) =
     if (cancelled || Date.now() - start > loadTimeout) return
   }
 
-  return playSound(url, soundVolume)
+  return playSound(url, soundVolume, loop)
 }
 
-export async function playSound (url, soundVolume = 1) {
+export async function playSound (url, soundVolume = 1, loop = false) {
   const volume = soundVolume * (options.volume / 100)
 
   if (!volume) return
@@ -75,6 +75,7 @@ export async function playSound (url, soundVolume = 1) {
   const gainNode = audioContext.createGain()
   const source = audioContext.createBufferSource()
   source.buffer = soundBuffer
+  source.loop = loop
   source.connect(gainNode)
   gainNode.connect(audioContext.destination)
   gainNode.gain.value = volume
@@ -99,6 +100,16 @@ export async function playSound (url, soundVolume = 1) {
     onEnded (callback: () => void) {
       callbacks.push(callback)
     },
+    stop () {
+      try {
+        source.stop()
+        // Remove from active sounds
+        const index = activeSounds.findIndex(s => s.source === source)
+        if (index !== -1) activeSounds.splice(index, 1)
+      } catch (err) {
+        console.warn('Failed to stop sound:', err)
+      }
+    },
   }
 }
 
@@ -113,6 +124,19 @@ export function stopAllSounds () {
   activeSounds.length = 0
 }
 
+export function stopSound (url: string) {
+  const soundIndex = activeSounds.findIndex(s => s.source.buffer === sounds[url])
+  if (soundIndex !== -1) {
+    const { source } = activeSounds[soundIndex]
+    try {
+      source.stop()
+    } catch (err) {
+      console.warn('Failed to stop sound:', err)
+    }
+    activeSounds.splice(soundIndex, 1)
+  }
+}
+
 export function changeVolumeOfCurrentlyPlayingSounds (newVolume: number) {
   const normalizedVolume = newVolume / 100
   for (const { gainNode, volumeMultiplier } of activeSounds) {
diff --git a/src/defaultOptions.ts b/src/defaultOptions.ts
index 95dbfd63..378cd14a 100644
--- a/src/defaultOptions.ts
+++ b/src/defaultOptions.ts
@@ -85,6 +85,7 @@ export const defaultOptions = {
   } as any,
   preferLoadReadonly: false,
   experimentalClientSelfReload: true,
+  remoteSoundsLoadTimeout: 500,
   disableLoadPrompts: false,
   guestUsername: 'guest',
   askGuestName: true,
diff --git a/src/react/Slider.tsx b/src/react/Slider.tsx
index e177578c..2a068264 100644
--- a/src/react/Slider.tsx
+++ b/src/react/Slider.tsx
@@ -1,5 +1,5 @@
 // Slider.tsx
-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect, useRef, useCallback } from 'react'
 import styles from './slider.module.css'
 import SharedHudVars from './SharedHudVars'
 
@@ -12,6 +12,7 @@ interface Props extends React.ComponentProps<'div'> {
   min?: number;
   max?: number;
   disabledReason?: string;
+  throttle?: number | false; // milliseconds, default 100, false to disable
 
   updateValue?: (value: number) => void;
   updateOnDragEnd?: boolean;
@@ -26,15 +27,24 @@ const Slider: React.FC<Props> = ({
   min = 0,
   max = 100,
   disabledReason,
+  throttle = 0,
 
   updateOnDragEnd = false,
   updateValue,
   ...divProps
 }) => {
+  label = translate(label)
+  disabledReason = translate(disabledReason)
+  valueDisplay = typeof valueDisplay === 'string' ? translate(valueDisplay) : valueDisplay
+
   const [value, setValue] = useState(valueProp)
   const getRatio = (v = value) => Math.max(Math.min((v - min) / (max - min), 1), 0)
   const [ratio, setRatio] = useState(getRatio())
 
+  // Throttling refs
+  const timeoutRef = useRef<NodeJS.Timeout | null>(null)
+  const lastValueRef = useRef<number>(valueProp)
+
   useEffect(() => {
     setValue(valueProp)
   }, [valueProp])
@@ -42,14 +52,52 @@ const Slider: React.FC<Props> = ({
     setRatio(getRatio())
   }, [value, min, max])
 
-  const fireValueUpdate = (dragEnd: boolean, v = value) => {
+  const throttledUpdateValue = useCallback((newValue: number, dragEnd: boolean) => {
     if (updateOnDragEnd !== dragEnd) return
-    updateValue?.(v)
+    if (!updateValue) return
+
+    lastValueRef.current = newValue
+
+    if (!throttle) {
+      // No throttling
+      updateValue(newValue)
+      return
+    }
+
+    // Clear existing timeout
+    if (timeoutRef.current) {
+      clearTimeout(timeoutRef.current)
+    }
+
+    // Set new timeout
+    timeoutRef.current = setTimeout(() => {
+      updateValue(lastValueRef.current)
+      timeoutRef.current = null
+    }, throttle)
+  }, [updateValue, updateOnDragEnd, throttle])
+
+  // Cleanup timeout on unmount
+  useEffect(() => {
+    return () => {
+      if (timeoutRef.current) {
+        clearTimeout(timeoutRef.current)
+        // Fire the last value immediately on cleanup
+        if (updateValue && lastValueRef.current !== undefined) {
+          updateValue(lastValueRef.current)
+        }
+      }
+    }
+  }, [updateValue])
+
+  const fireValueUpdate = (dragEnd: boolean, v = value) => {
+    throttledUpdateValue(v, dragEnd)
   }
 
+  const labelText = `${label}: ${valueDisplay ?? value} ${unit}`
+
   return (
     <SharedHudVars>
-      <div className={styles['slider-container']} style={{ width }} {...divProps}>
+      <div className={`${styles['slider-container']} settings-text-container ${labelText.length > 17 ? 'settings-text-container-long' : ''}`} style={{ width }} {...divProps}>
         <input
           type="range"
           className={styles.slider}
@@ -76,7 +124,7 @@ const Slider: React.FC<Props> = ({
         <div className={styles.disabled} title={disabledReason} />
         <div className={styles['slider-thumb']} style={{ left: `calc((100% * ${ratio}) - (8px * ${ratio}))` }} />
         <label className={styles.label}>
-          {label}: {valueDisplay ?? value} {unit}
+          {labelText}
         </label>
       </div>
     </SharedHudVars>
diff --git a/src/sounds/botSoundSystem.ts b/src/sounds/botSoundSystem.ts
index 72aa3da8..cb237072 100644
--- a/src/sounds/botSoundSystem.ts
+++ b/src/sounds/botSoundSystem.ts
@@ -11,6 +11,7 @@ import { showNotification } from '../react/NotificationProvider'
 import { pixelartIcons } from '../react/PixelartIcon'
 import { createSoundMap, SoundMap } from './soundsMap'
 import { musicSystem } from './musicSystem'
+import './customSoundSystem'
 
 let soundMap: SoundMap | undefined
 
@@ -50,8 +51,9 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
         appViewer.backend?.soundSystem?.playSound(
           position,
           soundData.url,
-          soundData.volume * (options.volume / 100),
-          Math.max(Math.min(pitch ?? 1, 2), 0.5)
+          soundData.volume,
+          Math.max(Math.min(pitch ?? 1, 2), 0.5),
+          soundData.timeout ?? options.remoteSoundsLoadTimeout
         )
       }
       if (getDistance(bot.entity.position, position) < 4 * 16) {
@@ -81,7 +83,7 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
     }
     const randomMusicKey = musicKeys[Math.floor(Math.random() * musicKeys.length)]
     const soundData = await soundMap.getSoundUrl(randomMusicKey)
-    if (!soundData) return
+    if (!soundData || !soundMap) return
     await musicSystem.playMusic(soundData.url, soundData.volume)
   }
 
@@ -109,6 +111,9 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
   }
 
   bot.on('soundEffectHeard', async (soundId, position, volume, pitch) => {
+    if (/^https?:/.test(soundId.replace('minecraft:', ''))) {
+      return
+    }
     await playHardcodedSound(soundId, position, volume, pitch)
   })
 
diff --git a/src/sounds/customSoundSystem.ts b/src/sounds/customSoundSystem.ts
new file mode 100644
index 00000000..5dfa89f7
--- /dev/null
+++ b/src/sounds/customSoundSystem.ts
@@ -0,0 +1,44 @@
+import { loadOrPlaySound, stopAllSounds, stopSound } from '../basicSounds'
+
+const customSoundSystem = () => {
+  bot._client.on('named_sound_effect', packet => {
+    let { soundName } = packet
+    let metadata = {} as { loadTimeout?: number, loop?: boolean }
+
+    // Extract JSON metadata from parentheses at the end
+    const jsonMatch = /\(({.*})\)$/.exec(soundName)
+    if (jsonMatch) {
+      try {
+        metadata = JSON.parse(jsonMatch[1])
+        soundName = soundName.slice(0, -jsonMatch[0].length)
+      } catch (e) {
+        console.warn('Failed to parse sound metadata:', jsonMatch[1])
+      }
+    }
+
+    if (/^https?:/.test(soundName.replace('minecraft:', ''))) {
+      const { loadTimeout, loop } = metadata
+      void loadOrPlaySound(soundName, packet.volume, loadTimeout, loop)
+    }
+  })
+
+  bot._client.on('stop_sound', packet => {
+    const { flags, source, sound } = packet
+
+    if (flags === 0) {
+      // Stop all sounds
+      stopAllSounds()
+    } else if (sound) {
+      // Stop specific sound by name
+      stopSound(sound)
+    }
+  })
+
+  bot.on('end', () => {
+    stopAllSounds()
+  })
+}
+
+customEvents.on('mineflayerBotCreated', () => {
+  customSoundSystem()
+})
diff --git a/src/sounds/soundsMap.ts b/src/sounds/soundsMap.ts
index 1b0a0178..47028971 100644
--- a/src/sounds/soundsMap.ts
+++ b/src/sounds/soundsMap.ts
@@ -35,6 +35,7 @@ interface ResourcePackSoundEntry {
   name: string
   stream?: boolean
   volume?: number
+  timeout?: number
 }
 
 interface ResourcePackSound {
@@ -140,7 +141,7 @@ export class SoundMap {
     await scan(soundsBasePath)
   }
 
-  async getSoundUrl (soundKey: string, volume = 1): Promise<{ url: string; volume: number } | undefined> {
+  async getSoundUrl (soundKey: string, volume = 1): Promise<{ url: string; volume: number, timeout?: number } | undefined> {
     // First check resource pack sounds.json
     if (this.activeResourcePackSoundsJson && soundKey in this.activeResourcePackSoundsJson) {
       const rpSound = this.activeResourcePackSoundsJson[soundKey]
@@ -151,6 +152,13 @@ export class SoundMap {
       if (this.activeResourcePackBasePath) {
         const tryFormat = async (format: string) => {
           try {
+            if (sound.name.startsWith('http://') || sound.name.startsWith('https://')) {
+              return {
+                url: sound.name,
+                volume: soundVolume * Math.max(Math.min(volume, 1), 0),
+                timeout: sound.timeout
+              }
+            }
             const resourcePackPath = path.join(this.activeResourcePackBasePath!, `/assets/minecraft/sounds/${sound.name}.${format}`)
             const fileData = await fs.promises.readFile(resourcePackPath)
             return {
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index 478da4fb..2f5199c0 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -80,6 +80,10 @@ export const watchOptionsAfterViewerInit = () => {
     updateFpsLimit(o)
   })
 
+  watchValue(options, o => {
+    appViewer.inWorldRenderingConfig.volume = Math.max(o.volume / 100, 0)
+  })
+
   watchValue(options, o => {
     appViewer.inWorldRenderingConfig.vrSupport = o.vrSupport
     appViewer.inWorldRenderingConfig.vrPageGameRendering = o.vrPageGameRendering

From d6eb1601e918b179b11ed2898df2befbd7d93d2d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 16 Aug 2025 09:16:29 +0300
Subject: [PATCH 095/136] disable remote sounds by default

---
 src/defaultOptions.ts           | 1 +
 src/sounds/customSoundSystem.ts | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/defaultOptions.ts b/src/defaultOptions.ts
index 378cd14a..28b64059 100644
--- a/src/defaultOptions.ts
+++ b/src/defaultOptions.ts
@@ -85,6 +85,7 @@ export const defaultOptions = {
   } as any,
   preferLoadReadonly: false,
   experimentalClientSelfReload: true,
+  remoteSoundsSupport: false,
   remoteSoundsLoadTimeout: 500,
   disableLoadPrompts: false,
   guestUsername: 'guest',
diff --git a/src/sounds/customSoundSystem.ts b/src/sounds/customSoundSystem.ts
index 5dfa89f7..1880aa70 100644
--- a/src/sounds/customSoundSystem.ts
+++ b/src/sounds/customSoundSystem.ts
@@ -1,7 +1,9 @@
 import { loadOrPlaySound, stopAllSounds, stopSound } from '../basicSounds'
+import { options } from '../optionsStorage'
 
 const customSoundSystem = () => {
   bot._client.on('named_sound_effect', packet => {
+    if (!options.remoteSoundsSupport) return
     let { soundName } = packet
     let metadata = {} as { loadTimeout?: number, loop?: boolean }
 

From 9a84a7acfba4a9a7c56fdb4612fa2e35818ae085 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 18 Aug 2025 11:37:20 +0300
Subject: [PATCH 096/136] do less annoying logging

---
 renderer/viewer/lib/worldDataEmitter.ts | 1 -
 src/appViewer.ts                        | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index 3bc2acd3..86a85f77 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -379,7 +379,6 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
           chunksToUnload.push(p)
         }
       }
-      console.log('unloading', chunksToUnload.length, 'total now', Object.keys(this.loadedChunks).length)
       for (const p of chunksToUnload) {
         this.unloadChunk(p)
       }
diff --git a/src/appViewer.ts b/src/appViewer.ts
index 879fe938..628d11b4 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -201,7 +201,9 @@ export class AppViewer {
     this.worldView = new WorldDataEmitter(world, renderDistance, startPosition)
     this.worldView.panicChunksReload = () => {
       if (!options.experimentalClientSelfReload) return
-      displayClientChat(`[client] client panicked due to too long loading time. Soft reloading chunks...`)
+      if (process.env.NODE_ENV === 'development') {
+        displayClientChat(`[client] client panicked due to too long loading time. Soft reloading chunks...`)
+      }
       void reloadChunks()
     }
     window.worldView = this.worldView

From a8fa3d47d1e43d95313cd19ea1838678e423ba21 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Tue, 19 Aug 2025 12:49:33 +0300
Subject: [PATCH 097/136] up protocol & mineflayer for 1.21.6

---
 pnpm-lock.yaml | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f495c831..e7cb1872 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -137,13 +137,13 @@ 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/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13))
       minecraft-data:
         specifier: 3.92.0
         version: 3.92.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(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)
@@ -342,7 +342,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41(@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/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.17
         version: 0.1.17
@@ -6649,8 +6649,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41}
     version: 1.0.1
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb:
-    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb}
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074:
+    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074}
     version: 1.60.1
     engines: {node: '>=22'}
 
@@ -6669,8 +6669,8 @@ packages:
     resolution: {integrity: sha512-0eCR8pnGb42Qd9QmAxOjl0PhA5Fa+9+6H1G/YsbsO5rg5mDf94Tusqp/8NAGLPQCPVDzbarLskXdjR3h0E0bEQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8}
     version: 8.0.0
     engines: {node: '>=22'}
 
@@ -11308,7 +11308,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.92.0
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.17.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
@@ -13069,7 +13069,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13105,7 +13105,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -16948,12 +16948,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/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(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/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)
       prismarine-item: 1.17.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17271,7 +17271,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17323,7 +17323,7 @@ snapshots:
 
   mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13):
     dependencies:
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)
       sharp: 0.30.7
     transitivePeerDependencies:
       - encoding
@@ -17338,11 +17338,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0

From 4a5f2e799ca1778cd45dce9fa3132d66881bec37 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 20 Aug 2025 20:02:57 +0300
Subject: [PATCH 098/136] disable experimentalClientSelfReload by default until
 it's reworked with more fine-tuned checks against server connection

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

diff --git a/src/defaultOptions.ts b/src/defaultOptions.ts
index 28b64059..6045e70b 100644
--- a/src/defaultOptions.ts
+++ b/src/defaultOptions.ts
@@ -84,7 +84,7 @@ export const defaultOptions = {
     gameMode: 1
   } as any,
   preferLoadReadonly: false,
-  experimentalClientSelfReload: true,
+  experimentalClientSelfReload: false,
   remoteSoundsSupport: false,
   remoteSoundsLoadTimeout: 500,
   disableLoadPrompts: false,

From 72e9e656cca70d66372ddfa722abdf01fb4981e3 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 20 Aug 2025 20:42:40 +0300
Subject: [PATCH 099/136] new! helpful errors on custom channels payloads!

---
 patches/minecraft-protocol.patch | 13 +++++++++++++
 src/mineflayer/mc-protocol.ts    | 30 ++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/patches/minecraft-protocol.patch b/patches/minecraft-protocol.patch
index 5dec44d7..e29f87d9 100644
--- a/patches/minecraft-protocol.patch
+++ b/patches/minecraft-protocol.patch
@@ -73,6 +73,19 @@ index 63cc2bd9615100bd2fd63dfe14c094aa6b8cd1c9..36df57d1196af9761d920fa285ac48f8
        }
  
        function onJoinServerResponse (err) {
+diff --git a/src/client/pluginChannels.js b/src/client/pluginChannels.js
+index 671eb452f31e6b5fcd57d715f1009d010160c65f..7f69f511c8fb97d431ec5125c851b49be8e2ab76 100644
+--- a/src/client/pluginChannels.js
++++ b/src/client/pluginChannels.js
+@@ -57,7 +57,7 @@ module.exports = function (client, options) {
+         try {
+           packet.data = proto.parsePacketBuffer(channel, packet.data).data
+         } catch (error) {
+-          client.emit('error', error)
++          client.emit('error', error, { customPayload: packet })
+           return
+         }
+       }
 diff --git a/src/client.js b/src/client.js
 index e369e77d055ba919e8f9da7b8e8b5dc879c74cf4..54bb9e6644388e9b6bd42b3012951875989cdf0c 100644
 --- a/src/client.js
diff --git a/src/mineflayer/mc-protocol.ts b/src/mineflayer/mc-protocol.ts
index a0348c5d..0171387a 100644
--- a/src/mineflayer/mc-protocol.ts
+++ b/src/mineflayer/mc-protocol.ts
@@ -11,6 +11,36 @@ import { getWebsocketStream } from './websocket-core'
 
 let lastPacketTime = 0
 customEvents.on('mineflayerBotCreated', () => {
+  // const oldParsePacketBuffer = bot._client.deserializer.parsePacketBuffer
+  //   try {
+  //     const parsed = oldParsePacketBuffer(buffer)
+  //   } catch (err) {
+  //     debugger
+  //     reportError(new Error(`Error parsing packet ${buffer.subarray(0, 30).toString('hex')}`, { cause: err }))
+  //     throw err
+  //   }
+  // }
+  class MinecraftProtocolError extends Error {
+    constructor (message: string, cause?: Error, public data?: any) {
+      if (data?.customPayload) {
+        message += ` (Custom payload: ${data.customPayload.channel})`
+      }
+      super(message, { cause })
+      this.name = 'MinecraftProtocolError'
+    }
+  }
+
+  const onClientError = (err, data) => {
+    const error = new MinecraftProtocolError(`Minecraft protocol client error: ${err.message}`, err, data)
+    reportError(error)
+  }
+  if (typeof bot._client['_events'].error === 'function') {
+    // dont report to bot for more explicit error
+    bot._client['_events'].error = onClientError
+  } else {
+    bot._client.on('error' as any, onClientError)
+  }
+
   // todo move more code here
   if (!appQueryParams.noPacketsValidation) {
     (bot._client as unknown as Client).on('packet', (data, packetMeta, buffer, fullBuffer) => {

From 6e0d54ea17178a091d8c103a48f82a4723f5b23d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 20 Aug 2025 20:45:02 +0300
Subject: [PATCH 100/136] up mc-protocol patch

---
 pnpm-lock.yaml | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e7cb1872..c7e1d1b9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -23,7 +23,7 @@ overrides:
 
 patchedDependencies:
   minecraft-protocol:
-    hash: 2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea
+    hash: 4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b
     path: patches/minecraft-protocol.patch
   mineflayer-item-map-downloader@1.2.0:
     hash: a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad
@@ -143,7 +143,7 @@ importers:
         version: 3.92.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(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)
@@ -430,13 +430,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.92.0)
       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
@@ -6651,7 +6651,7 @@ packages:
 
   minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074:
     resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074}
-    version: 1.60.1
+    version: 1.61.0
     engines: {node: '>=22'}
 
   minecraft-wrap@1.6.0:
@@ -11309,7 +11309,7 @@ snapshots:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.92.0
       mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(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.17.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
@@ -13069,7 +13069,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13105,7 +13105,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -16952,7 +16952,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/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)
       prismarine-item: 1.17.0
       ws: 8.18.1
@@ -17271,7 +17271,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17342,9 +17342,9 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(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.92.0)
       prismarine-entity: 2.5.0
@@ -18135,7 +18135,7 @@ snapshots:
       minecraft-data: 3.92.0
       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.92.0
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
@@ -18143,6 +18143,8 @@ snapshots:
       prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
+    transitivePeerDependencies:
+      - prismarine-registry
 
   prismarine-chat@1.11.0:
     dependencies:
@@ -18153,7 +18155,7 @@ snapshots:
   prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0):
     dependencies:
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(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
@@ -18187,7 +18189,7 @@ snapshots:
 
   prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.92.0):
     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.92.0)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
@@ -18211,16 +18213,18 @@ snapshots:
   prismarine-registry@1.11.0:
     dependencies:
       minecraft-data: 3.92.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-schematic@1.2.3:
+  prismarine-schematic@1.2.3(prismarine-registry@1.11.0):
     dependencies:
       minecraft-data: 3.92.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-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 a12c61bc6c8f3ede1910dba4567d71d7f907feeb Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Thu, 21 Aug 2025 13:21:02 +0300
Subject: [PATCH 101/136] add simple monaco (#418)

---
 package.json               |   1 +
 pnpm-lock.yaml             |  58 +++++++++++++++-----
 src/core/ideChannels.ts    | 106 +++++++++++++++++++++++++++++++++++++
 src/customChannels.ts      |   2 +
 src/react/MonacoEditor.css |  58 ++++++++++++++++++++
 src/react/MonacoEditor.tsx |  73 +++++++++++++++++++++++++
 src/reactUi.tsx            |   3 +-
 7 files changed, 286 insertions(+), 15 deletions(-)
 create mode 100644 src/core/ideChannels.ts
 create mode 100644 src/react/MonacoEditor.css
 create mode 100644 src/react/MonacoEditor.tsx

diff --git a/package.json b/package.json
index 1d9dfc0c..a8c2c4e7 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
   "dependencies": {
     "@dimaka/interface": "0.0.3-alpha.0",
     "@floating-ui/react": "^0.26.1",
+    "@monaco-editor/react": "^4.7.0",
     "@nxg-org/mineflayer-auto-jump": "^0.7.18",
     "@nxg-org/mineflayer-tracker": "1.3.0",
     "@react-oauth/google": "^0.12.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c7e1d1b9..8acb9681 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -42,6 +42,9 @@ importers:
       '@floating-ui/react':
         specifier: ^0.26.1
         version: 0.26.28(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@monaco-editor/react':
+        specifier: ^4.7.0
+        version: 4.7.0(monaco-editor@0.52.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@nxg-org/mineflayer-auto-jump':
         specifier: ^0.7.18
         version: 0.7.18
@@ -430,13 +433,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.92.0)
       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
@@ -1989,6 +1992,16 @@ packages:
   '@module-federation/webpack-bundler-runtime@0.11.2':
     resolution: {integrity: sha512-WdwIE6QF+MKs/PdVu0cKPETF743JB9PZ62/qf7Uo3gU4fjsUMc37RnbJZ/qB60EaHHfjwp1v6NnhZw1r4eVsnw==}
 
+  '@monaco-editor/loader@1.5.0':
+    resolution: {integrity: sha512-hKoGSM+7aAc7eRTRjpqAZucPmoNOC4UUbknb/VNoTkEIkCPhqV8LfbsgM1webRM7S/z21eHEx9Fkwx8Z/C/+Xw==}
+
+  '@monaco-editor/react@4.7.0':
+    resolution: {integrity: sha512-cyzXQCtO47ydzxpQtCGSQGOC8Gk3ZUeBXFAxD+CWXYFo5OqZyZUonFl0DwUlTyAfRHntBfw2p3w4s9R6oe1eCA==}
+    peerDependencies:
+      monaco-editor: '>= 0.25.0 < 1'
+      react: ^18.2.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
   '@msgpack/msgpack@2.8.0':
     resolution: {integrity: sha512-h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ==}
     engines: {node: '>= 10'}
@@ -6769,6 +6782,9 @@ packages:
   mojangson@2.0.4:
     resolution: {integrity: sha512-HYmhgDjr1gzF7trGgvcC/huIg2L8FsVbi/KacRe6r1AswbboGVZDS47SOZlomPuMWvZLas8m9vuHHucdZMwTmQ==}
 
+  monaco-editor@0.52.2:
+    resolution: {integrity: sha512-GEQWEZmfkOGLdd3XK8ryrfWz3AIP8YymVXiPHEdewrUq7mh0qrKrfHLNCXcbB6sTnMLnOZ3ztSiKcciFUkIJwQ==}
+
   moo@0.5.2:
     resolution: {integrity: sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==}
 
@@ -8373,6 +8389,9 @@ packages:
   stacktrace-js@2.0.2:
     resolution: {integrity: sha512-Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg==}
 
+  state-local@1.0.7:
+    resolution: {integrity: sha512-HTEHMNieakEnoe33shBYcZ7NX83ACUjCu8c40iOGEZsngj9zRnkqS9j1pqQPXwobB0ZcVTk27REb7COQ0UR59w==}
+
   static-extend@0.1.2:
     resolution: {integrity: sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==}
     engines: {node: '>=0.10.0'}
@@ -11254,6 +11273,17 @@ snapshots:
       '@module-federation/runtime': 0.11.2
       '@module-federation/sdk': 0.11.2
 
+  '@monaco-editor/loader@1.5.0':
+    dependencies:
+      state-local: 1.0.7
+
+  '@monaco-editor/react@4.7.0(monaco-editor@0.52.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+    dependencies:
+      '@monaco-editor/loader': 1.5.0
+      monaco-editor: 0.52.2
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+
   '@msgpack/msgpack@2.8.0': {}
 
   '@ndelangen/get-tarball@3.0.9':
@@ -11309,7 +11339,7 @@ snapshots:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.92.0
       mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(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.17.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
@@ -17344,7 +17374,7 @@ snapshots:
       minecraft-data: 3.92.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(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.92.0)
       prismarine-entity: 2.5.0
@@ -17461,6 +17491,8 @@ snapshots:
     dependencies:
       nearley: 2.20.1
 
+  monaco-editor@0.52.2: {}
+
   moo@0.5.2: {}
 
   morgan@1.10.0:
@@ -18135,7 +18167,7 @@ snapshots:
       minecraft-data: 3.92.0
       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.92.0
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
@@ -18143,8 +18175,6 @@ snapshots:
       prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
-    transitivePeerDependencies:
-      - prismarine-registry
 
   prismarine-chat@1.11.0:
     dependencies:
@@ -18155,7 +18185,7 @@ snapshots:
   prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0):
     dependencies:
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(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
@@ -18189,7 +18219,7 @@ snapshots:
 
   prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.92.0):
     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.92.0)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
@@ -18213,18 +18243,16 @@ snapshots:
   prismarine-registry@1.11.0:
     dependencies:
       minecraft-data: 3.92.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-schematic@1.2.3(prismarine-registry@1.11.0):
+  prismarine-schematic@1.2.3:
     dependencies:
       minecraft-data: 3.92.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-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       vec3: 0.1.10
-    transitivePeerDependencies:
-      - prismarine-registry
 
   prismarine-windows@2.9.0:
     dependencies:
@@ -19521,6 +19549,8 @@ snapshots:
       stack-generator: 2.0.10
       stacktrace-gps: 3.1.2
 
+  state-local@1.0.7: {}
+
   static-extend@0.1.2:
     dependencies:
       define-property: 0.2.5
diff --git a/src/core/ideChannels.ts b/src/core/ideChannels.ts
new file mode 100644
index 00000000..a9c517f7
--- /dev/null
+++ b/src/core/ideChannels.ts
@@ -0,0 +1,106 @@
+import { proxy } from 'valtio'
+
+export const ideState = proxy({
+  id: '',
+  contents: '',
+  line: 0,
+  column: 0,
+  language: 'typescript',
+  title: '',
+})
+globalThis.ideState = ideState
+
+export const registerIdeChannels = () => {
+  registerIdeOpenChannel()
+  registerIdeSaveChannel()
+}
+
+const registerIdeOpenChannel = () => {
+  const CHANNEL_NAME = 'minecraft-web-client:ide-open'
+
+  const packetStructure = [
+    'container',
+    [
+      {
+        name: 'id',
+        type: ['pstring', { countType: 'i16' }]
+      },
+      {
+        name: 'language',
+        type: ['pstring', { countType: 'i16' }]
+      },
+      {
+        name: 'contents',
+        type: ['pstring', { countType: 'i16' }]
+      },
+      {
+        name: 'line',
+        type: 'i32'
+      },
+      {
+        name: 'column',
+        type: 'i32'
+      },
+      {
+        name: 'title',
+        type: ['pstring', { countType: 'i16' }]
+      }
+    ]
+  ]
+
+  bot._client.registerChannel(CHANNEL_NAME, packetStructure, true)
+
+  bot._client.on(CHANNEL_NAME as any, (data) => {
+    const { id, language, contents, line, column, title } = data
+
+    ideState.contents = contents
+    ideState.line = line
+    ideState.column = column
+    ideState.id = id
+    ideState.language = language || 'typescript'
+    ideState.title = title
+  })
+
+  console.debug(`registered custom channel ${CHANNEL_NAME} channel`)
+}
+const IDE_SAVE_CHANNEL_NAME = 'minecraft-web-client:ide-save'
+const registerIdeSaveChannel = () => {
+
+  const packetStructure = [
+    'container',
+    [
+      {
+        name: 'id',
+        type: ['pstring', { countType: 'i16' }]
+      },
+      {
+        name: 'contents',
+        type: ['pstring', { countType: 'i16' }]
+      },
+      {
+        name: 'language',
+        type: ['pstring', { countType: 'i16' }]
+      },
+      {
+        name: 'line',
+        type: 'i32'
+      },
+      {
+        name: 'column',
+        type: 'i32'
+      },
+    ]
+  ]
+  bot._client.registerChannel(IDE_SAVE_CHANNEL_NAME, packetStructure, true)
+}
+
+export const saveIde = () => {
+  bot._client.writeChannel(IDE_SAVE_CHANNEL_NAME, {
+    id: ideState.id,
+    contents: ideState.contents,
+    language: ideState.language,
+    // todo: reflect updated
+    line: ideState.line,
+    column: ideState.column,
+  })
+}
diff --git a/src/customChannels.ts b/src/customChannels.ts
index 6d3aa7e9..717c7c93 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -2,6 +2,7 @@ import PItem from 'prismarine-item'
 import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
 import { options } from './optionsStorage'
 import { jeiCustomCategories } from './inventoryWindows'
+import { registerIdeChannels } from './core/ideChannels'
 
 export default () => {
   customEvents.on('mineflayerBotCreated', async () => {
@@ -17,6 +18,7 @@ export default () => {
     registeredJeiChannel()
     registerBlockInteractionsCustomizationChannel()
     registerWaypointChannels()
+    registerIdeChannels()
   })
 }
 
diff --git a/src/react/MonacoEditor.css b/src/react/MonacoEditor.css
new file mode 100644
index 00000000..86d2ad0a
--- /dev/null
+++ b/src/react/MonacoEditor.css
@@ -0,0 +1,58 @@
+.monaco-editor-container {
+  position: fixed;
+  inset: 0;
+  z-index: 1000;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  padding: 16px;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+.monaco-editor-title {
+  font-size: 20px;
+  font-weight: bold;
+  color: #fff;
+  margin-bottom: 8px;
+}
+
+.monaco-editor-wrapper {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  max-width: 80vw;
+  max-height: 80vh;
+  border: 3px solid #000;
+  background-color: #000;
+  padding: 3px;
+  box-shadow: inset 0 0 0 1px #fff, inset 0 0 0 2px #000;
+}
+
+.monaco-editor-close {
+  position: fixed;
+  top: 16px;
+  left: 16px;
+  z-index: 1001;
+  cursor: pointer;
+  padding: 8px;
+}
+
+@media (max-width: 768px) {
+  .monaco-editor-container {
+    padding: 0;
+  }
+  .monaco-editor-wrapper {
+    max-width: 100%;
+    max-height: 100%;
+    border-radius: 0;
+  }
+  .monaco-editor-close {
+    top: 8px;
+    left: 8px;
+  }
+  .monaco-editor-title {
+    /* todo: make it work on mobile */
+    display: none;
+  }
+}
diff --git a/src/react/MonacoEditor.tsx b/src/react/MonacoEditor.tsx
new file mode 100644
index 00000000..32162b21
--- /dev/null
+++ b/src/react/MonacoEditor.tsx
@@ -0,0 +1,73 @@
+import { proxy, useSnapshot } from 'valtio'
+import { useEffect } from 'react'
+import { Editor } from '@monaco-editor/react'
+import PixelartIcon, { pixelartIcons } from '../react/PixelartIcon'
+import { useIsModalActive } from '../react/utilsApp'
+import { showNotification } from '../react/NotificationProvider'
+import { hideModal, showModal } from '../globalState'
+import { ideState, saveIde } from '../core/ideChannels'
+import './MonacoEditor.css'
+
+export default () => {
+  const { contents, line, column, id, language, title } = useSnapshot(ideState)
+  const isModalActive = useIsModalActive('monaco-editor')
+  const bodyFont = getComputedStyle(document.body).fontFamily
+
+  useEffect(() => {
+    if (id && !isModalActive) {
+      showModal({ reactType: 'monaco-editor' })
+    }
+    if (!id && isModalActive) {
+      hideModal()
+    }
+  }, [id])
+
+  useEffect(() => {
+    if (!isModalActive && id) {
+      try {
+        saveIde()
+      } catch (err) {
+        reportError(err)
+        showNotification('Failed to save the editor', 'Please try again', true)
+      }
+      ideState.id = ''
+      ideState.contents = ''
+    }
+  }, [isModalActive])
+
+  if (!isModalActive) return null
+
+  return <div className="monaco-editor-container">
+    <div className="monaco-editor-close">
+      <PixelartIcon
+        iconName={pixelartIcons.close}
+        width={26}
+        onClick={() => {
+          hideModal()
+        }}
+      />
+    </div>
+    <div className="monaco-editor-title">
+      {title}
+    </div>
+    <div className="monaco-editor-wrapper">
+      <Editor
+        height="100%"
+        width="100%"
+        language={language}
+        theme='vs-dark'
+        line={line}
+        onChange={(value) => {
+          ideState.contents = value ?? ''
+        }}
+        value={contents}
+        options={{
+          fontFamily: bodyFont,
+          minimap: {
+            enabled: true,
+          },
+        }}
+      />
+    </div>
+  </div>
+}
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 4f8c4541..1e6f13eb 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -67,6 +67,7 @@ import GlobalOverlayHints from './react/GlobalOverlayHints'
 import FullscreenTime from './react/FullscreenTime'
 import StorageConflictModal from './react/StorageConflictModal'
 import FireRenderer from './react/FireRenderer'
+import MonacoEditor from './react/MonacoEditor'
 
 const isFirefox = ua.getBrowser().name === 'Firefox'
 if (isFirefox) {
@@ -248,7 +249,6 @@ const App = () => {
             <PacketsReplayProvider />
             <NotificationProvider />
             <ModsPage />
-
             <SelectOption />
             <CreditsAboutModal />
             <NoModalFoundProvider />
@@ -259,6 +259,7 @@ const App = () => {
             </div>
             <div />
             <DebugEdges />
+            <MonacoEditor />
             <DebugResponseTimeIndicator />
           </RobustPortal>
         </ButtonAppProvider>

From bc2972fe99692510643cb482128ab978970a9c2f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 24 Aug 2025 19:53:44 +0300
Subject: [PATCH 102/136] fix registering custom channels too late (a few ms
 diff)

---
 src/customChannels.ts | 19 ++++++++-----------
 src/resourcePack.ts   | 11 -----------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/src/customChannels.ts b/src/customChannels.ts
index 717c7c93..8e70078f 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -7,18 +7,15 @@ import { registerIdeChannels } from './core/ideChannels'
 export default () => {
   customEvents.on('mineflayerBotCreated', async () => {
     if (!options.customChannels) return
-    await new Promise(resolve => {
-      bot.once('login', () => {
-        resolve(true)
-      })
+    bot.once('login', () => {
+      registerBlockModelsChannel()
+      registerMediaChannels()
+      registerSectionAnimationChannels()
+      registeredJeiChannel()
+      registerBlockInteractionsCustomizationChannel()
+      registerWaypointChannels()
+      registerIdeChannels()
     })
-    registerBlockModelsChannel()
-    registerMediaChannels()
-    registerSectionAnimationChannels()
-    registeredJeiChannel()
-    registerBlockInteractionsCustomizationChannel()
-    registerWaypointChannels()
-    registerIdeChannels()
   })
 }
 
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index e0f0fca4..ea6c73fd 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -486,17 +486,6 @@ const downloadAndUseResourcePack = async (url: string, progressReporter: Progres
   }
 }
 
-const waitForGameEvent = async () => {
-  if (miscUiState.gameLoaded) return
-  await new Promise<void>(resolve => {
-    const listener = () => resolve()
-    customEvents.once('gameLoaded', listener)
-    watchUnloadForCleanup(() => {
-      customEvents.removeListener('gameLoaded', listener)
-    })
-  })
-}
-
 export const onAppLoad = () => {
   customEvents.on('mineflayerBotCreated', () => {
     // todo also handle resourcePack

From 8f62fbd4daddbdccf61191949889925bed2b4632 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 26 Aug 2025 13:50:36 +0300
Subject: [PATCH 103/136] fix: window title sometimes was not showing up on old
 versions

---
 src/chatUtils.ts        |  8 ++++++++
 src/inventoryWindows.ts | 15 +++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/chatUtils.ts b/src/chatUtils.ts
index 88437bc3..849d5847 100644
--- a/src/chatUtils.ts
+++ b/src/chatUtils.ts
@@ -118,6 +118,14 @@ export const formatMessage = (message: MessageInput, mcData: IndexedData = globa
   return msglist
 }
 
+export const messageToString = (message: MessageInput | string) => {
+  if (typeof message === 'string') {
+    return message
+  }
+  const msglist = formatMessage(message)
+  return msglist.map(msg => msg.text).join('')
+}
+
 const blockToItemRemaps = {
   water: 'water_bucket',
   lava: 'lava_bucket',
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index a9f89d1b..166e42a7 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -57,12 +57,23 @@ export const onGameLoad = () => {
     return type
   }
 
+  const maybeParseNbtJson = (data: any) => {
+    if (typeof data === 'string') {
+      try {
+        data = JSON.parse(data)
+      } catch (err) {
+        // ignore
+      }
+    }
+    return nbt.simplify(data) ?? data
+  }
+
   bot.on('windowOpen', (win) => {
     const implementedWindow = implementedContainersGuiMap[mapWindowType(win.type as string, win.inventoryStart)]
     if (implementedWindow) {
-      openWindow(implementedWindow, nbt.simplify(win.title as any))
+      openWindow(implementedWindow, maybeParseNbtJson(win.title))
     } else if (options.unimplementedContainers) {
-      openWindow('ChestWin', nbt.simplify(win.title as any))
+      openWindow('ChestWin', maybeParseNbtJson(win.title))
     } else {
       // todo format
       displayClientChat(`[client error] cannot open unimplemented window ${win.id} (${win.type}). Slots: ${win.slots.map(item => getItemName(item)).filter(Boolean).join(', ')}`)

From 9718610131a44b1d0aa46fdf97d696d0af4dc663 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 27 Aug 2025 12:08:20 +0300
Subject: [PATCH 104/136] ci: add deployment step for mcw-mcraft-page
 repository in GitHub Actions

---
 .github/workflows/release.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cbf52251..68ead92f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -49,6 +49,18 @@ jobs:
           publish_dir: .vercel/output/static
           force_orphan: true
 
+      # Deploy to mcw-mcraft-page repository (github.mcraft.fun)
+      - name: Deploy to mcw-mcraft-page repository
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          personal_token: ${{ secrets.MCW_MCRAFT_PAGE_DEPLOY_TOKEN }}
+          external_repository: ${{ github.repository_owner }}/mcw-mcraft-pages
+          publish_dir: .vercel/output/static
+          publish_branch: main
+          destination_dir: docs
+          cname: github.mcraft.fun
+          force_orphan: true
+
       - name: Change index.html title
         run: |
           # change <title>Minecraft Web Client</title> to <title>Minecraft Web Client — Free Online Browser Version</title>

From 2a1746eb7a6bd96f40de9cffbb13d78e422388f2 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 27 Aug 2025 13:33:39 +0300
Subject: [PATCH 105/136] [skip ci] fix repository name

---
 .github/workflows/release.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 68ead92f..3710eebd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -49,12 +49,11 @@ jobs:
           publish_dir: .vercel/output/static
           force_orphan: true
 
-      # Deploy to mcw-mcraft-page repository (github.mcraft.fun)
-      - name: Deploy to mcw-mcraft-page repository
+      - name: Deploy to mwc-mcraft-pages repository
         uses: peaceiris/actions-gh-pages@v3
         with:
           personal_token: ${{ secrets.MCW_MCRAFT_PAGE_DEPLOY_TOKEN }}
-          external_repository: ${{ github.repository_owner }}/mcw-mcraft-pages
+          external_repository: ${{ github.repository_owner }}/mwc-mcraft-pages
           publish_dir: .vercel/output/static
           publish_branch: main
           destination_dir: docs

From 1f240d8c2047de469965076dc23ae72fe534a83a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 27 Aug 2025 19:50:53 +0300
Subject: [PATCH 106/136] up mouse allowing to disable positive break block

---
 package.json          |  2 +-
 pnpm-lock.yaml        | 10 +++++-----
 src/customChannels.ts | 14 +-------------
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index a8c2c4e7..5dcd9547 100644
--- a/package.json
+++ b/package.json
@@ -157,7 +157,7 @@
     "mc-assets": "^0.2.62",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer#gen-the-master",
-    "mineflayer-mouse": "^0.1.17",
+    "mineflayer-mouse": "^0.1.21",
     "npm-run-all": "^4.1.5",
     "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8acb9681..6c393ac7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -347,8 +347,8 @@ importers:
         specifier: github:zardoy/mineflayer#gen-the-master
         version: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)
       mineflayer-mouse:
-        specifier: ^0.1.17
-        version: 0.1.17
+        specifier: ^0.1.21
+        version: 0.1.21
       npm-run-all:
         specifier: ^4.1.5
         version: 4.1.5
@@ -6678,8 +6678,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
     version: 1.2.0
 
-  mineflayer-mouse@0.1.17:
-    resolution: {integrity: sha512-0eCR8pnGb42Qd9QmAxOjl0PhA5Fa+9+6H1G/YsbsO5rg5mDf94Tusqp/8NAGLPQCPVDzbarLskXdjR3h0E0bEQ==}
+  mineflayer-mouse@0.1.21:
+    resolution: {integrity: sha512-1XTVuw3twIrEcqQ1QRSB8NcStIUEZ+tbxiAG6rOrN/9M4thhtlS5PTJzFdmdrcYgWEBLvuOdJszaKE5zFfiXhg==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8:
@@ -17359,7 +17359,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer-mouse@0.1.17:
+  mineflayer-mouse@0.1.21:
     dependencies:
       change-case: 5.4.4
       debug: 4.4.1
diff --git a/src/customChannels.ts b/src/customChannels.ts
index 8e70078f..b566f9dd 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -47,19 +47,7 @@ const registerBlockInteractionsCustomizationChannel = () => {
 
   registerChannel(CHANNEL_NAME, packetStructure, (data) => {
     const config = JSON.parse(data.newConfiguration)
-    if (config.customBreakTime !== undefined && Object.values(config.customBreakTime).every(x => typeof x === 'number')) {
-      bot.mouse.customBreakTime = config.customBreakTime
-    }
-    if (config.customBreakTimeToolAllowance !== undefined) {
-      bot.mouse.customBreakTimeToolAllowance = new Set(config.customBreakTimeToolAllowance)
-    }
-
-    if (config.blockPlacePrediction !== undefined) {
-      bot.mouse.settings.blockPlacePrediction = config.blockPlacePrediction
-    }
-    if (config.blockPlacePredictionDelay !== undefined) {
-      bot.mouse.settings.blockPlacePredictionDelay = config.blockPlacePredictionDelay
-    }
+    bot.mouse.setConfigFromPacket(config)
   }, true)
 }
 

From e81d608554d8d0e98982df7f3570b70793a0927c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 27 Aug 2025 19:52:09 +0300
Subject: [PATCH 107/136] fix cname

---
 .github/workflows/release.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3710eebd..3e8c4136 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -49,6 +49,10 @@ jobs:
           publish_dir: .vercel/output/static
           force_orphan: true
 
+      # Create CNAME file for custom domain
+      - name: Create CNAME file
+        run: echo "github.mcraft.fun" > .vercel/output/static/CNAME
+
       - name: Deploy to mwc-mcraft-pages repository
         uses: peaceiris/actions-gh-pages@v3
         with:
@@ -57,7 +61,6 @@ jobs:
           publish_dir: .vercel/output/static
           publish_branch: main
           destination_dir: docs
-          cname: github.mcraft.fun
           force_orphan: true
 
       - name: Change index.html title

From d0d5234ba43c33d11325696a763163196c3206ad Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 31 Aug 2025 18:31:49 +0300
Subject: [PATCH 108/136] fix: stop right click emulation once window got
 opened eg chest

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

diff --git a/src/mineflayer/plugins/mouse.ts b/src/mineflayer/plugins/mouse.ts
index fc1ce0fd..14e19345 100644
--- a/src/mineflayer/plugins/mouse.ts
+++ b/src/mineflayer/plugins/mouse.ts
@@ -110,7 +110,7 @@ const domListeners = (bot: Bot) => {
   }, { signal: abortController.signal })
 
   bot.mouse.beforeUpdateChecks = () => {
-    if (!document.hasFocus()) {
+    if (!document.hasFocus() || !isGameActive(true)) {
       // deactive all buttons
       bot.mouse.buttons.fill(false)
     }

From cb82188272ef5bec257efdf0150460136cf267bd Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 31 Aug 2025 19:31:26 +0300
Subject: [PATCH 109/136] add addPing query param for testing

---
 README.MD                     | 1 +
 src/appParams.ts              | 1 +
 src/index.ts                  | 2 +-
 src/mineflayer/mc-protocol.ts | 3 ++-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.MD b/README.MD
index 7978cee5..82aac011 100644
--- a/README.MD
+++ b/README.MD
@@ -176,6 +176,7 @@ Server specific:
 - `?lockConnect=true` - Only works then `ip` parameter is set. Disables cancel/save buttons and all inputs in the connect screen already set as parameters. Useful for integrates iframes.
 - `?autoConnect=true` - Only works then `ip` and `version` parameters are set and `allowAutoConnect` is `true` in config.json! Directly connects to the specified server. Useful for integrates iframes.
 - `?serversList=<list_or_url>` - `<list_or_url>` can be a list of servers in the format `ip:version,ip` or a url to a json file with the same format (array) or a txt file with line-delimited list of server IPs.
+- `?addPing=<ping>` - Add a latency to both sides of the connection. Useful for testing ping issues. For example `?addPing=100` will add 200ms to your ping.
 
 Single player specific:
 
diff --git a/src/appParams.ts b/src/appParams.ts
index 8d487f8d..4c8ca186 100644
--- a/src/appParams.ts
+++ b/src/appParams.ts
@@ -47,6 +47,7 @@ export type AppQsParams = {
   connectText?: string
   freezeSettings?: string
   testIosCrash?: string
+  addPing?: string
 
   // Replay params
   replayFilter?: string
diff --git a/src/index.ts b/src/index.ts
index 4a118cee..54731a16 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -305,7 +305,7 @@ export async function connect (connectOptions: ConnectOptions) {
 
   if (connectOptions.server && !connectOptions.viewerWsConnect && !parsedServer.isWebSocket) {
     console.log(`using proxy ${proxy.host}:${proxy.port || location.port}`)
-    net['setProxy']({ hostname: proxy.host, port: proxy.port, headers: { Authorization: `Bearer ${new URLSearchParams(location.search).get('token') ?? ''}` } })
+    net['setProxy']({ hostname: proxy.host, port: proxy.port, headers: { Authorization: `Bearer ${new URLSearchParams(location.search).get('token') ?? ''}` }, artificialDelay: appQueryParams.addPing ? Number(appQueryParams.addPing) : undefined })
   }
 
   const renderDistance = singleplayer ? renderDistanceSingleplayer : multiplayerRenderDistance
diff --git a/src/mineflayer/mc-protocol.ts b/src/mineflayer/mc-protocol.ts
index 0171387a..cd21d01f 100644
--- a/src/mineflayer/mc-protocol.ts
+++ b/src/mineflayer/mc-protocol.ts
@@ -130,7 +130,8 @@ export const setProxy = (proxyParams: ProxyParams) => {
   net['setProxy']({
     hostname: proxy.host,
     port: proxy.port,
-    headers: proxyParams.headers
+    headers: proxyParams.headers,
+    artificialDelay: appQueryParams.addPing ? Number(appQueryParams.addPing) : undefined
   })
   return {
     proxy

From 513201be87401c53231103da9264693a3ccadb92 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Mon, 1 Sep 2025 08:56:08 +0300
Subject: [PATCH 110/136] up browserify

---
 pnpm-lock.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6c393ac7..6a4773d2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -155,7 +155,7 @@ importers:
         version: 2.0.4
       net-browserify:
         specifier: github:zardoy/prismarinejs-net-browserify
-        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/17fb901e8ea480a52c8fd46373695be172be8aa5
+        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/e754999ffdea67853bc9b10553b5e9908b40f618
       node-gzip:
         specifier: ^1.1.2
         version: 1.1.2
@@ -6849,8 +6849,8 @@ packages:
   neo-async@2.6.2:
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/17fb901e8ea480a52c8fd46373695be172be8aa5:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/17fb901e8ea480a52c8fd46373695be172be8aa5}
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/e754999ffdea67853bc9b10553b5e9908b40f618:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/e754999ffdea67853bc9b10553b5e9908b40f618}
     version: 0.2.4
 
   nice-try@1.0.5:
@@ -17574,7 +17574,7 @@ snapshots:
 
   neo-async@2.6.2: {}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/17fb901e8ea480a52c8fd46373695be172be8aa5:
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/e754999ffdea67853bc9b10553b5e9908b40f618:
     dependencies:
       body-parser: 1.20.3
       express: 4.21.2

From 7e3ba8bece2e4c85bcc8ef7f2caa22627f88d50d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 2 Sep 2025 19:02:30 +0300
Subject: [PATCH 111/136] up integrated server for the latest fixes and better
 stability

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

diff --git a/package.json b/package.json
index 5dcd9547..b5f66bfb 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "esbuild-plugin-polyfill-node": "^0.3.0",
     "express": "^4.18.2",
     "filesize": "^10.0.12",
-    "flying-squid": "npm:@zardoy/flying-squid@^0.0.62",
+    "flying-squid": "npm:@zardoy/flying-squid@^0.0.104",
     "framer-motion": "^12.9.2",
     "fs-extra": "^11.1.1",
     "google-drive-browserfs": "github:zardoy/browserfs#google-drive",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6a4773d2..f6188b6d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -121,8 +121,8 @@ importers:
         specifier: ^10.0.12
         version: 10.1.6
       flying-squid:
-        specifier: npm:@zardoy/flying-squid@^0.0.62
-        version: '@zardoy/flying-squid@0.0.62(encoding@0.1.13)'
+        specifier: npm:@zardoy/flying-squid@^0.0.104
+        version: '@zardoy/flying-squid@0.0.104(encoding@0.1.13)'
       framer-motion:
         specifier: ^12.9.2
         version: 12.9.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -3387,13 +3387,13 @@ packages:
     resolution: {integrity: sha512-6xm38yGVIa6mKm/DUCF2zFFJhERh/QWp1ufm4cNUvxsONBmfPg8uZ9pZBdOmF6qFGr/HlT6ABBkCSx/dlEtvWg==}
     engines: {node: '>=12 <14 || 14.2 - 14.9 || >14.10.0'}
 
-  '@zardoy/flying-squid@0.0.49':
-    resolution: {integrity: sha512-Kt4wr5/R+44tcLU9gjuNG2an9weWeKEpIoKXfsgJN2GGQqdnbd5nBpxfGDdgZ9aMdFugsVW8BsyPZNhj9vbMXA==}
+  '@zardoy/flying-squid@0.0.104':
+    resolution: {integrity: sha512-jGhQ7fn7o8UN+mUwZbt9674D37YLuBi+Au4TwKcopCA6huIQdHTFNl2e+0ZSTI5mnhN+NpyVoR3vmtH6L58vHQ==}
     engines: {node: '>=8'}
     hasBin: true
 
-  '@zardoy/flying-squid@0.0.62':
-    resolution: {integrity: sha512-M6icydO/yrmwevBhmgKcqEPC63AhWfU/Es9N/uadVrmKaxGm2FQMMLcybbutRYm1xZ6qsdxDUOUZnN56PsVwfQ==}
+  '@zardoy/flying-squid@0.0.49':
+    resolution: {integrity: sha512-Kt4wr5/R+44tcLU9gjuNG2an9weWeKEpIoKXfsgJN2GGQqdnbd5nBpxfGDdgZ9aMdFugsVW8BsyPZNhj9vbMXA==}
     engines: {node: '>=8'}
     hasBin: true
 
@@ -6444,6 +6444,12 @@ packages:
     resolution: {integrity: sha512-RYZeD1+joNlPuUpi+tIWkbP0ieVJr+R6IFkI6/8juhSxx9zE4osoSmteybrfspGm8A6u+YbbY1epqRKEMwVR6Q==}
     engines: {node: '>=18.0.0'}
 
+  mc-bridge@0.1.3:
+    resolution: {integrity: sha512-H9jPt2xEU77itC27dSz3qazHYqN9qVsv4HgMPozg7RqQ1uwgXmEa+ojKIlDtXf/TLJsG6Kv4EbzGa8a1Wh72uA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    peerDependencies:
+      minecraft-data: 3.92.0
+
   mcraft-fun-mineflayer@0.1.23:
     resolution: {integrity: sha512-qmI1rQQ0Ro5zJdi99rClWLF+mS9JZffgNX2vyWWesS3Hsk3Xblp/8swYTJKHSaFpNgzkVfXV92fEIrBqeH6iKA==}
     version: 0.1.23
@@ -13088,7 +13094,7 @@ snapshots:
       '@types/emscripten': 1.40.0
       tslib: 1.14.1
 
-  '@zardoy/flying-squid@0.0.49(encoding@0.1.13)':
+  '@zardoy/flying-squid@0.0.104(encoding@0.1.13)':
     dependencies:
       '@tootallnate/once': 2.0.0
       chalk: 5.4.1
@@ -13098,11 +13104,13 @@ snapshots:
       exit-hook: 2.2.1
       flatmap: 0.0.3
       long: 5.3.1
+      mc-bridge: 0.1.3(minecraft-data@3.92.0)
       minecraft-data: 3.92.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
+      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.92.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.17.0
@@ -13124,7 +13132,7 @@ snapshots:
       - encoding
       - supports-color
 
-  '@zardoy/flying-squid@0.0.62(encoding@0.1.13)':
+  '@zardoy/flying-squid@0.0.49(encoding@0.1.13)':
     dependencies:
       '@tootallnate/once': 2.0.0
       chalk: 5.4.1
@@ -16978,6 +16986,10 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
+  mc-bridge@0.1.3(minecraft-data@3.92.0):
+    dependencies:
+      minecraft-data: 3.92.0
+
   mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)

From 9d54c70fb724884cd98782cdca093aef622095ba Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 2 Sep 2025 19:05:18 +0300
Subject: [PATCH 112/136] use node 22

---
 .github/workflows/benchmark.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index f913b9b6..e80b7100 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -26,7 +26,7 @@ jobs:
         uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
           cache: "pnpm"
       - name: Move Cypress to dependencies
         run: |

From 70534d8b5a64ed9df64229b8933c6adc2ac61ea4 Mon Sep 17 00:00:00 2001
From: Kesuaheli <kesuaheligame@gmail.com>
Date: Thu, 4 Sep 2025 12:51:56 +0200
Subject: [PATCH 113/136] fix: adding support for newer skin profile data
 structure in player heads

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

diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index fb6c8e11..39b8e1de 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -767,12 +767,17 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   renderHead (position: Vec3, rotation: number, isWall: boolean, blockEntity) {
-    const textures = blockEntity.SkullOwner?.Properties?.textures[0]
-    if (!textures) return
+    let textureData: string
+    if (blockEntity.SkullOwner) {
+      textureData = blockEntity.SkullOwner.Properties?.textures[0]?.Value
+    } else {
+      textureData = blockEntity.profile?.properties?.find(p => p.name === 'textures')?.value
+    }
+    if (!textureData) return
 
     try {
-      const textureData = JSON.parse(Buffer.from(textures.Value, 'base64').toString())
-      let skinUrl = textureData.textures?.SKIN?.url
+      const decodedData = JSON.parse(Buffer.from(textureData, 'base64').toString())
+      let skinUrl = decodedData.textures?.SKIN?.url
       const { skinTexturesProxy } = this.worldRendererConfig
       if (skinTexturesProxy) {
         skinUrl = skinUrl?.replace('http://textures.minecraft.net/', skinTexturesProxy)

From 528d8f516b1d8f86552fbf64d8130b138e1aba23 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Thu, 4 Sep 2025 21:55:02 +0300
Subject: [PATCH 114/136] Update worldrendererThree.ts

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

diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 39b8e1de..440061ad 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -769,7 +769,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   renderHead (position: Vec3, rotation: number, isWall: boolean, blockEntity) {
     let textureData: string
     if (blockEntity.SkullOwner) {
-      textureData = blockEntity.SkullOwner.Properties?.textures[0]?.Value
+      textureData = blockEntity.SkullOwner.Properties?.textures?.[0]?.Value
     } else {
       textureData = blockEntity.profile?.properties?.find(p => p.name === 'textures')?.value
     }

From b2e36840b9d3531ed352e08e09fc54734026cc51 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Fri, 5 Sep 2025 05:02:54 +0300
Subject: [PATCH 115/136] feat: brand new default skybox with fog, better
 daycycle and colors (#425)

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 README.MD                                   |   1 +
 renderer/viewer/lib/worldDataEmitter.ts     |  32 +++
 renderer/viewer/lib/worldrendererCommon.ts  |  66 +++--
 renderer/viewer/three/skyboxRenderer.ts     | 281 +++++++++++++++++++-
 renderer/viewer/three/worldrendererThree.ts |  23 +-
 src/dayCycle.ts                             |  46 ----
 src/index.ts                                |   2 -
 src/watchOptions.ts                         |   1 +
 8 files changed, 375 insertions(+), 77 deletions(-)
 delete mode 100644 src/dayCycle.ts

diff --git a/README.MD b/README.MD
index 82aac011..74d4eb41 100644
--- a/README.MD
+++ b/README.MD
@@ -233,3 +233,4 @@ Only during development:
 
 - [https://github.com/ClassiCube/ClassiCube](ClassiCube - Better C# Rewrite) [DEMO](https://www.classicube.net/server/play/?warned=true)
 - [https://m.eaglercraft.com/](EaglerCraft) - Eaglercraft runnable on mobile (real Minecraft in the browser)
+- [js-minecraft](https://github.com/LabyStudio/js-minecraft) - An insanely well done clone from the graphical side that inspired many features here
diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index 86a85f77..dfbdb35c 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -7,6 +7,7 @@ import { Vec3 } from 'vec3'
 import { BotEvents } from 'mineflayer'
 import { proxy } from 'valtio'
 import TypedEmitter from 'typed-emitter'
+import { Biome } from 'minecraft-data'
 import { delayedIterator } from '../../playground/shared'
 import { chunkPos } from './simpleUtils'
 
@@ -28,6 +29,8 @@ export type WorldDataEmitterEvents = {
   updateLight: (data: { pos: Vec3 }) => void
   onWorldSwitch: () => void
   end: () => void
+  biomeUpdate: (data: { biome: Biome }) => void
+  biomeReset: () => void
 }
 
 export class WorldDataEmitterWorker extends (EventEmitter as new () => TypedEmitter<WorldDataEmitterEvents>) {
@@ -360,8 +363,37 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
     delete this.debugChunksInfo[`${pos.x},${pos.z}`]
   }
 
+  lastBiomeId: number | null = null
+
+  udpateBiome (pos: Vec3) {
+    try {
+      const biomeId = this.world.getBiome(pos)
+      if (biomeId !== this.lastBiomeId) {
+        this.lastBiomeId = biomeId
+        const biomeData = loadedData.biomes[biomeId]
+        if (biomeData) {
+          this.emitter.emit('biomeUpdate', {
+            biome: biomeData
+          })
+        } else {
+          // unknown biome
+          this.emitter.emit('biomeReset')
+        }
+      }
+    } catch (e) {
+      console.error('error updating biome', e)
+    }
+  }
+
+  lastPosCheck: Vec3 | null = null
   async updatePosition (pos: Vec3, force = false) {
     if (!this.allowPositionUpdate) return
+    const posFloored = pos.floored()
+    if (!force && this.lastPosCheck && this.lastPosCheck.equals(posFloored)) return
+    this.lastPosCheck = posFloored
+
+    this.udpateBiome(pos)
+
     const [lastX, lastZ] = chunkPos(this.lastPos)
     const [botX, botZ] = chunkPos(pos)
     if (lastX !== botX || lastZ !== botZ || force) {
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 5c4fd6b5..e2455915 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -32,31 +32,44 @@ const toMajorVersion = version => {
 export const worldCleanup = buildCleanupDecorator('resetWorld')
 
 export const defaultWorldRendererConfig = {
+  // Debug settings
   showChunkBorders: false,
+  enableDebugOverlay: false,
+
+  // Performance settings
   mesherWorkers: 4,
-  isPlayground: false,
-  renderEars: true,
-  skinTexturesProxy: undefined as string | undefined,
-  // game renderer setting actually
-  showHand: false,
-  viewBobbing: false,
-  extraBlockRenderers: true,
-  clipWorldBelowY: undefined as number | undefined,
+  addChunksBatchWaitTime: 200,
+  _experimentalSmoothChunkLoading: true,
+  _renderByChunks: false,
+
+  // Rendering engine settings
+  dayCycle: true,
   smoothLighting: true,
   enableLighting: true,
   starfield: true,
-  addChunksBatchWaitTime: 200,
+  renderEntities: true,
+  extraBlockRenderers: true,
+  foreground: true,
+  fov: 75,
+  volume: 1,
+
+  // Camera visual related settings
+  showHand: false,
+  viewBobbing: false,
+  renderEars: true,
+  highlightBlockColor: 'blue',
+
+  // Player models
+  fetchPlayerSkins: true,
+  skinTexturesProxy: undefined as string | undefined,
+
+  // VR settings
   vrSupport: true,
   vrPageGameRendering: true,
-  renderEntities: true,
-  fov: 75,
-  fetchPlayerSkins: true,
-  highlightBlockColor: 'blue',
-  foreground: true,
-  enableDebugOverlay: false,
-  _experimentalSmoothChunkLoading: true,
-  _renderByChunks: false,
-  volume: 1
+
+  // World settings
+  clipWorldBelowY: undefined as number | undefined,
+  isPlayground: false
 }
 
 export type WorldRendererConfig = typeof defaultWorldRendererConfig
@@ -496,6 +509,10 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
   timeUpdated? (newTime: number): void
 
+  biomeUpdated? (biome: any): void
+
+  biomeReset? (): void
+
   updateViewerPosition (pos: Vec3) {
     this.viewerChunkPosition = pos
     for (const [key, value] of Object.entries(this.loadedChunks)) {
@@ -817,12 +834,9 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     })
 
     worldEmitter.on('time', (timeOfDay) => {
+      if (!this.worldRendererConfig.dayCycle) return
       this.timeUpdated?.(timeOfDay)
 
-      if (timeOfDay < 0 || timeOfDay > 24_000) {
-        throw new Error('Invalid time of day. It should be between 0 and 24000.')
-      }
-
       this.timeOfTheDay = timeOfDay
 
       // if (this.worldRendererConfig.skyLight === skyLight) return
@@ -831,6 +845,14 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       //   (this).rerenderAllChunks?.()
       // }
     })
+
+    worldEmitter.on('biomeUpdate', ({ biome }) => {
+      this.biomeUpdated?.(biome)
+    })
+
+    worldEmitter.on('biomeReset', () => {
+      this.biomeReset?.()
+    })
   }
 
   setBlockStateIdInner (pos: Vec3, stateId: number | undefined, needAoRecalculation = true) {
diff --git a/renderer/viewer/three/skyboxRenderer.ts b/renderer/viewer/three/skyboxRenderer.ts
index 294c72aa..aa8c3bb6 100644
--- a/renderer/viewer/three/skyboxRenderer.ts
+++ b/renderer/viewer/three/skyboxRenderer.ts
@@ -1,10 +1,28 @@
 import * as THREE from 'three'
 
+export const DEFAULT_TEMPERATURE = 0.75
+
 export class SkyboxRenderer {
   private texture: THREE.Texture | null = null
   private mesh: THREE.Mesh<THREE.SphereGeometry, THREE.MeshBasicMaterial> | null = null
+  private skyMesh: THREE.Mesh | null = null
+  private voidMesh: THREE.Mesh | null = null
 
-  constructor (private readonly scene: THREE.Scene, public initialImage: string | null) {}
+  // World state
+  private worldTime = 0
+  private partialTicks = 0
+  private viewDistance = 4
+  private temperature = DEFAULT_TEMPERATURE
+  private inWater = false
+  private waterBreathing = false
+  private fogBrightness = 0
+  private prevFogBrightness = 0
+
+  constructor (private readonly scene: THREE.Scene, public initialImage: string | null) {
+    if (!initialImage) {
+      this.createGradientSky()
+    }
+  }
 
   async init () {
     if (this.initialImage) {
@@ -58,10 +76,255 @@ export class SkyboxRenderer {
     }
   }
 
-  update (cameraPosition: THREE.Vector3) {
-    if (this.mesh) {
-      this.mesh.position.copy(cameraPosition)
+  update (cameraPosition: THREE.Vector3, newViewDistance: number) {
+    if (newViewDistance !== this.viewDistance) {
+      this.viewDistance = newViewDistance
+      this.updateSkyColors()
     }
+
+    if (this.mesh) {
+      // Update skybox position
+      this.mesh.position.copy(cameraPosition)
+    } else if (this.skyMesh) {
+      // Update gradient sky position
+      this.skyMesh.position.copy(cameraPosition)
+      this.voidMesh?.position.copy(cameraPosition)
+      this.updateSkyColors() // Update colors based on time of day
+    }
+  }
+
+  // Update world time
+  updateTime (timeOfDay: number, partialTicks = 0) {
+    this.worldTime = timeOfDay
+    this.partialTicks = partialTicks
+    this.updateSkyColors()
+  }
+
+  // Update view distance
+  updateViewDistance (viewDistance: number) {
+    this.viewDistance = viewDistance
+    this.updateSkyColors()
+  }
+
+  // Update temperature (for biome support)
+  updateTemperature (temperature: number) {
+    this.temperature = temperature
+    this.updateSkyColors()
+  }
+
+  // Update water state
+  updateWaterState (inWater: boolean, waterBreathing: boolean) {
+    this.inWater = inWater
+    this.waterBreathing = waterBreathing
+    this.updateSkyColors()
+  }
+
+  private createGradientSky () {
+    const size = 64
+    const scale = 256 / size + 2
+
+    {
+      const geometry = new THREE.PlaneGeometry(size * scale * 2, size * scale * 2)
+      geometry.rotateX(-Math.PI / 2)
+      geometry.translate(0, 16, 0)
+
+      const material = new THREE.MeshBasicMaterial({
+        color: 0xff_ff_ff,
+        side: THREE.DoubleSide,
+        depthTest: false
+      })
+
+      this.skyMesh = new THREE.Mesh(geometry, material)
+      this.scene.add(this.skyMesh)
+    }
+
+    {
+      const geometry = new THREE.PlaneGeometry(size * scale * 2, size * scale * 2)
+      geometry.rotateX(-Math.PI / 2)
+      geometry.translate(0, -16, 0)
+
+      const material = new THREE.MeshBasicMaterial({
+        color: 0xff_ff_ff,
+        side: THREE.DoubleSide,
+        depthTest: false
+      })
+
+      this.voidMesh = new THREE.Mesh(geometry, material)
+      this.scene.add(this.voidMesh)
+    }
+
+    this.updateSkyColors()
+  }
+
+  private getFogColor (partialTicks = 0): THREE.Vector3 {
+    const angle = this.getCelestialAngle(partialTicks)
+    let rotation = Math.cos(angle * Math.PI * 2) * 2 + 0.5
+    rotation = Math.max(0, Math.min(1, rotation))
+
+    let x = 0.752_941_2
+    let y = 0.847_058_83
+    let z = 1
+
+    x *= (rotation * 0.94 + 0.06)
+    y *= (rotation * 0.94 + 0.06)
+    z *= (rotation * 0.91 + 0.09)
+
+    return new THREE.Vector3(x, y, z)
+  }
+
+  private getSkyColor (x = 0, z = 0, partialTicks = 0): THREE.Vector3 {
+    const angle = this.getCelestialAngle(partialTicks)
+    let brightness = Math.cos(angle * 3.141_593 * 2) * 2 + 0.5
+
+    if (brightness < 0) brightness = 0
+    if (brightness > 1) brightness = 1
+
+    const temperature = this.getTemperature(x, z)
+    const rgb = this.getSkyColorByTemp(temperature)
+
+    const red = ((rgb >> 16) & 0xff) / 255
+    const green = ((rgb >> 8) & 0xff) / 255
+    const blue = (rgb & 0xff) / 255
+
+    return new THREE.Vector3(
+      red * brightness,
+      green * brightness,
+      blue * brightness
+    )
+  }
+
+  private calculateCelestialAngle (time: number, partialTicks: number): number {
+    const modTime = (time % 24_000)
+    let angle = (modTime + partialTicks) / 24_000 - 0.25
+
+    if (angle < 0) {
+      angle++
+    }
+    if (angle > 1) {
+      angle--
+    }
+
+    angle = 1 - ((Math.cos(angle * Math.PI) + 1) / 2)
+    angle += (angle - angle) / 3
+
+    return angle
+  }
+
+  private getCelestialAngle (partialTicks: number): number {
+    return this.calculateCelestialAngle(this.worldTime, partialTicks)
+  }
+
+  private getTemperature (x: number, z: number): number {
+    return this.temperature
+  }
+
+  private getSkyColorByTemp (temperature: number): number {
+    temperature /= 3
+    if (temperature < -1) temperature = -1
+    if (temperature > 1) temperature = 1
+
+    const hue = 0.622_222_2 - temperature * 0.05
+    const saturation = 0.5 + temperature * 0.1
+    const brightness = 1
+
+    return this.hsbToRgb(hue, saturation, brightness)
+  }
+
+  private hsbToRgb (hue: number, saturation: number, brightness: number): number {
+    let r = 0; let g = 0; let b = 0
+    if (saturation === 0) {
+      r = g = b = Math.floor(brightness * 255 + 0.5)
+    } else {
+      const h = (hue - Math.floor(hue)) * 6
+      const f = h - Math.floor(h)
+      const p = brightness * (1 - saturation)
+      const q = brightness * (1 - saturation * f)
+      const t = brightness * (1 - (saturation * (1 - f)))
+      switch (Math.floor(h)) {
+        case 0:
+          r = Math.floor(brightness * 255 + 0.5)
+          g = Math.floor(t * 255 + 0.5)
+          b = Math.floor(p * 255 + 0.5)
+          break
+        case 1:
+          r = Math.floor(q * 255 + 0.5)
+          g = Math.floor(brightness * 255 + 0.5)
+          b = Math.floor(p * 255 + 0.5)
+          break
+        case 2:
+          r = Math.floor(p * 255 + 0.5)
+          g = Math.floor(brightness * 255 + 0.5)
+          b = Math.floor(t * 255 + 0.5)
+          break
+        case 3:
+          r = Math.floor(p * 255 + 0.5)
+          g = Math.floor(q * 255 + 0.5)
+          b = Math.floor(brightness * 255 + 0.5)
+          break
+        case 4:
+          r = Math.floor(t * 255 + 0.5)
+          g = Math.floor(p * 255 + 0.5)
+          b = Math.floor(brightness * 255 + 0.5)
+          break
+        case 5:
+          r = Math.floor(brightness * 255 + 0.5)
+          g = Math.floor(p * 255 + 0.5)
+          b = Math.floor(q * 255 + 0.5)
+          break
+      }
+    }
+    return 0xff_00_00_00 | (r << 16) | (g << 8) | (Math.trunc(b))
+  }
+
+  private updateSkyColors () {
+    if (!this.skyMesh || !this.voidMesh) return
+
+    // Update fog brightness with smooth transition
+    this.prevFogBrightness = this.fogBrightness
+    const renderDistance = this.viewDistance / 32
+    const brightnessAtPosition = 1 // Could be affected by light level in future
+    const targetBrightness = brightnessAtPosition * (1 - renderDistance) + renderDistance
+    this.fogBrightness += (targetBrightness - this.fogBrightness) * 0.1
+
+    // Handle water fog
+    if (this.inWater) {
+      const waterViewDistance = this.waterBreathing ? 100 : 5
+      this.scene.fog = new THREE.Fog(new THREE.Color(0, 0, 1), 0.0025, waterViewDistance)
+      this.scene.background = new THREE.Color(0, 0, 1)
+
+      // Update sky and void colors for underwater effect
+      ;(this.skyMesh.material as THREE.MeshBasicMaterial).color.set(new THREE.Color(0, 0, 1))
+      ;(this.voidMesh.material as THREE.MeshBasicMaterial).color.set(new THREE.Color(0, 0, 0.6))
+      return
+    }
+
+    // Normal sky colors
+    const viewDistance = this.viewDistance * 16
+    const viewFactor = 1 - (0.25 + 0.75 * this.viewDistance / 32) ** 0.25
+
+    const angle = this.getCelestialAngle(this.partialTicks)
+    const skyColor = this.getSkyColor(0, 0, this.partialTicks)
+    const fogColor = this.getFogColor(this.partialTicks)
+
+    const brightness = Math.cos(angle * Math.PI * 2) * 2 + 0.5
+    const clampedBrightness = Math.max(0, Math.min(1, brightness))
+
+    // Interpolate fog brightness
+    const interpolatedBrightness = this.prevFogBrightness + (this.fogBrightness - this.prevFogBrightness) * this.partialTicks
+
+    const red = (fogColor.x + (skyColor.x - fogColor.x) * viewFactor) * clampedBrightness * interpolatedBrightness
+    const green = (fogColor.y + (skyColor.y - fogColor.y) * viewFactor) * clampedBrightness * interpolatedBrightness
+    const blue = (fogColor.z + (skyColor.z - fogColor.z) * viewFactor) * clampedBrightness * interpolatedBrightness
+
+    this.scene.background = new THREE.Color(red, green, blue)
+    this.scene.fog = new THREE.Fog(new THREE.Color(red, green, blue), 0.0025, viewDistance * 2)
+
+    ;(this.skyMesh.material as THREE.MeshBasicMaterial).color.set(new THREE.Color(skyColor.x, skyColor.y, skyColor.z))
+    ;(this.voidMesh.material as THREE.MeshBasicMaterial).color.set(new THREE.Color(
+      skyColor.x * 0.2 + 0.04,
+      skyColor.y * 0.2 + 0.04,
+      skyColor.z * 0.6 + 0.1
+    ))
   }
 
   dispose () {
@@ -73,5 +336,15 @@ export class SkyboxRenderer {
       ;(this.mesh.material as THREE.Material).dispose()
       this.scene.remove(this.mesh)
     }
+    if (this.skyMesh) {
+      this.skyMesh.geometry.dispose()
+      ;(this.skyMesh.material as THREE.Material).dispose()
+      this.scene.remove(this.skyMesh)
+    }
+    if (this.voidMesh) {
+      this.voidMesh.geometry.dispose()
+      ;(this.voidMesh.material as THREE.Material).dispose()
+      this.scene.remove(this.voidMesh)
+    }
   }
 }
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 440061ad..29e9223c 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -3,6 +3,7 @@ import { Vec3 } from 'vec3'
 import nbt from 'prismarine-nbt'
 import PrismarineChatLoader from 'prismarine-chat'
 import * as tweenJs from '@tweenjs/tween.js'
+import { Biome } from 'minecraft-data'
 import { renderSign } from '../sign-renderer'
 import { DisplayWorldOptions, GraphicsInitOptions } from '../../../src/appViewer'
 import { chunkPos, sectionPos } from '../lib/simpleUtils'
@@ -24,7 +25,7 @@ import { CameraShake } from './cameraShake'
 import { ThreeJsMedia } from './threeJsMedia'
 import { Fountain } from './threeJsParticles'
 import { WaypointsRenderer } from './waypoints'
-import { SkyboxRenderer } from './skyboxRenderer'
+import { DEFAULT_TEMPERATURE, SkyboxRenderer } from './skyboxRenderer'
 
 type SectionKey = string
 
@@ -173,7 +174,10 @@ export class WorldRendererThree extends WorldRendererCommon {
   override watchReactivePlayerState () {
     super.watchReactivePlayerState()
     this.onReactivePlayerStateUpdated('inWater', (value) => {
-      this.scene.fog = value ? new THREE.Fog(0x00_00_ff, 0.1, this.playerStateReactive.waterBreathing ? 100 : 20) : null
+      this.skyboxRenderer.updateWaterState(value, this.playerStateReactive.waterBreathing)
+    })
+    this.onReactivePlayerStateUpdated('waterBreathing', (value) => {
+      this.skyboxRenderer.updateWaterState(this.playerStateReactive.inWater, value)
     })
     this.onReactivePlayerStateUpdated('ambientLight', (value) => {
       if (!value) return
@@ -264,6 +268,19 @@ export class WorldRendererThree extends WorldRendererCommon {
     } else {
       this.starField.remove()
     }
+
+    this.skyboxRenderer.updateTime(newTime)
+  }
+
+  biomeUpdated (biome: Biome): void {
+    if (biome?.temperature !== undefined) {
+      this.skyboxRenderer.updateTemperature(biome.temperature)
+    }
+  }
+
+  biomeReset (): void {
+    // Reset to default temperature when biome is unknown
+    this.skyboxRenderer.updateTemperature(DEFAULT_TEMPERATURE)
   }
 
   getItemRenderData (item: Record<string, any>, specificProps: ItemSpecificContextProperties) {
@@ -716,7 +733,7 @@ export class WorldRendererThree extends WorldRendererCommon {
 
     // Update skybox position to follow camera
     const cameraPos = this.getCameraPosition()
-    this.skyboxRenderer.update(cameraPos)
+    this.skyboxRenderer.update(cameraPos, this.viewDistance)
 
     const sizeOrFovChanged = sizeChanged || this.displayOptions.inWorldRenderingConfig.fov !== this.camera.fov
     if (sizeOrFovChanged) {
diff --git a/src/dayCycle.ts b/src/dayCycle.ts
deleted file mode 100644
index 50e63a21..00000000
--- a/src/dayCycle.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { options } from './optionsStorage'
-import { assertDefined } from './utils'
-import { updateBackground } from './water'
-
-export default () => {
-  const timeUpdated = () => {
-    // 0 morning
-    const dayTotal = 24_000
-    const evening = 11_500
-    const night = 13_500
-    const morningStart = 23_000
-    const morningEnd = 23_961
-    const timeProgress = options.dayCycleAndLighting ? bot.time.timeOfDay : 0
-
-    // todo check actual colors
-    const dayColorRainy = { r: 111 / 255, g: 156 / 255, b: 236 / 255 }
-    // todo yes, we should make animations (and rain)
-    // eslint-disable-next-line unicorn/numeric-separators-style
-    const dayColor = bot.isRaining ? dayColorRainy : { r: 0.6784313725490196, g: 0.8470588235294118, b: 0.9019607843137255 } // lightblue
-    // let newColor = dayColor
-    let int = 1
-    if (timeProgress < evening) {
-      // stay dayily
-    } else if (timeProgress < night) {
-      const progressNorm = timeProgress - evening
-      const progressMax = night - evening
-      int = 1 - progressNorm / progressMax
-    } else if (timeProgress < morningStart) {
-      int = 0
-    } else if (timeProgress < morningEnd) {
-      const progressNorm = timeProgress - morningStart
-      const progressMax = night - morningEnd
-      int = progressNorm / progressMax
-    }
-    // todo need to think wisely how to set these values & also move directional light around!
-    const colorInt = Math.max(int, 0.1)
-    updateBackground({ r: dayColor.r * colorInt, g: dayColor.g * colorInt, b: dayColor.b * colorInt })
-    if (!options.newVersionsLighting && bot.supportFeature('blockStateId')) {
-      appViewer.playerState.reactive.ambientLight = Math.max(int, 0.25)
-      appViewer.playerState.reactive.directionalLight = Math.min(int, 0.5)
-    }
-  }
-
-  bot.on('time', timeUpdated)
-  timeUpdated()
-}
diff --git a/src/index.ts b/src/index.ts
index 54731a16..7764188f 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -56,7 +56,6 @@ import { isCypress } from './standaloneUtils'
 
 import { startLocalServer, unsupportedLocalServerFeatures } from './createLocalServer'
 import defaultServerOptions from './defaultLocalServerOptions'
-import dayCycle from './dayCycle'
 
 import { onAppLoad, resourcepackReload, resourcePackState } from './resourcePack'
 import { ConnectPeerOptions, connectToPeer } from './localServerMultiplayer'
@@ -794,7 +793,6 @@ export async function connect (connectOptions: ConnectOptions) {
       }
 
       initMotionTracking()
-      dayCycle()
 
       // Bot position callback
       const botPosition = () => {
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index 2f5199c0..da75cc74 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -128,5 +128,6 @@ export const watchOptionsAfterWorldViewInit = (worldView: WorldDataEmitter) => {
     appViewer.inWorldRenderingConfig.renderEars = o.renderEars
     appViewer.inWorldRenderingConfig.showHand = o.showHand
     appViewer.inWorldRenderingConfig.viewBobbing = o.viewBobbing
+    appViewer.inWorldRenderingConfig.dayCycle = o.dayCycleAndLighting
   })
 }

From 265d02d18d46fbde79437857eb58254fb68b1cf0 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sun, 7 Sep 2025 18:23:13 +0000
Subject: [PATCH 116/136] up protocol for 1.21.8

---
 pnpm-lock.yaml | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f6188b6d..fd8be62b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -140,13 +140,13 @@ 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/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13))
       minecraft-data:
         specifier: 3.92.0
         version: 3.92.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(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)
@@ -345,7 +345,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41(@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/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.21
         version: 0.1.21
@@ -6668,8 +6668,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41}
     version: 1.0.1
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074:
-    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074}
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9:
+    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9}
     version: 1.61.0
     engines: {node: '>=22'}
 
@@ -6688,8 +6688,8 @@ packages:
     resolution: {integrity: sha512-1XTVuw3twIrEcqQ1QRSB8NcStIUEZ+tbxiAG6rOrN/9M4thhtlS5PTJzFdmdrcYgWEBLvuOdJszaKE5zFfiXhg==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e}
     version: 8.0.0
     engines: {node: '>=22'}
 
@@ -11344,7 +11344,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.92.0
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.17.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
@@ -13106,7 +13106,7 @@ snapshots:
       long: 5.3.1
       mc-bridge: 0.1.3(minecraft-data@3.92.0)
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13143,7 +13143,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -16990,12 +16990,12 @@ snapshots:
     dependencies:
       minecraft-data: 3.92.0
 
-  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(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/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13)
       prismarine-item: 1.17.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17313,7 +17313,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17365,7 +17365,7 @@ snapshots:
 
   mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13):
     dependencies:
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13)
       sharp: 0.30.7
     transitivePeerDependencies:
       - encoding
@@ -17380,11 +17380,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0

From 7f7a14ac65105649621ed825245ca23c2f2c5f85 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 8 Sep 2025 04:19:38 +0300
Subject: [PATCH 117/136] feat: Add overlay model viewer. Already integrated
 into inventory to display player!

---
 renderer/viewer/lib/createPlayerObject.ts |  55 +++
 renderer/viewer/three/entities.ts         |   7 +-
 src/inventoryWindows.ts                   |  35 ++
 src/react/OverlayModelViewer.tsx          | 505 ++++++++++++++++++++++
 src/reactUi.tsx                           |   2 +
 5 files changed, 598 insertions(+), 6 deletions(-)
 create mode 100644 renderer/viewer/lib/createPlayerObject.ts
 create mode 100644 src/react/OverlayModelViewer.tsx

diff --git a/renderer/viewer/lib/createPlayerObject.ts b/renderer/viewer/lib/createPlayerObject.ts
new file mode 100644
index 00000000..836c8062
--- /dev/null
+++ b/renderer/viewer/lib/createPlayerObject.ts
@@ -0,0 +1,55 @@
+import { PlayerObject, PlayerAnimation } from 'skinview3d'
+import * as THREE from 'three'
+import { WalkingGeneralSwing } from '../three/entity/animations'
+import { loadSkinImage, stevePngUrl } from './utils/skins'
+
+export type PlayerObjectType = PlayerObject & {
+  animation?: PlayerAnimation
+  realPlayerUuid: string
+  realUsername: string
+}
+
+export function createPlayerObject (options: {
+  username?: string
+  uuid?: string
+  scale?: number
+}): {
+    playerObject: PlayerObjectType
+    wrapper: THREE.Group
+  } {
+  const wrapper = new THREE.Group()
+  const playerObject = new PlayerObject() as PlayerObjectType
+
+  playerObject.realPlayerUuid = options.uuid ?? ''
+  playerObject.realUsername = options.username ?? ''
+  playerObject.position.set(0, 16, 0)
+
+  // fix issues with starfield
+  playerObject.traverse((obj) => {
+    if (obj instanceof THREE.Mesh && obj.material instanceof THREE.MeshStandardMaterial) {
+      obj.material.transparent = true
+    }
+  })
+
+  wrapper.add(playerObject as any)
+  const scale = options.scale ?? (1 / 16)
+  wrapper.scale.set(scale, scale, scale)
+  wrapper.rotation.set(0, Math.PI, 0)
+
+  // Set up animation
+  playerObject.animation = new WalkingGeneralSwing()
+  ;(playerObject.animation as WalkingGeneralSwing).isMoving = false
+  playerObject.animation.update(playerObject, 0)
+
+  return { playerObject, wrapper }
+}
+
+export const applySkinToPlayerObject = async (playerObject: PlayerObjectType, skinUrl: string) => {
+  return loadSkinImage(skinUrl || stevePngUrl).then(({ canvas }) => {
+    const skinTexture = new THREE.CanvasTexture(canvas)
+    skinTexture.magFilter = THREE.NearestFilter
+    skinTexture.minFilter = THREE.NearestFilter
+    skinTexture.needsUpdate = true
+    playerObject.skin.map = skinTexture as any
+  }).catch(console.error)
+}
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 7849686b..fad30182 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -20,6 +20,7 @@ import { ItemSpecificContextProperties } from '../lib/basePlayerState'
 import { loadSkinFromUsername, loadSkinImage, stevePngUrl } from '../lib/utils/skins'
 import { renderComponent } from '../sign-renderer'
 import { createCanvas } from '../lib/utils'
+import { PlayerObjectType } from '../lib/createPlayerObject'
 import { getBlockMeshFromModel } from './holdingBlock'
 import { createItemMesh } from './itemMesh'
 import * as Entity from './entity/EntityMesh'
@@ -33,12 +34,6 @@ export const steveTexture = loadThreeJsTextureFromUrl(stevePngUrl)
 
 export const TWEEN_DURATION = 120
 
-type PlayerObjectType = PlayerObject & {
-  animation?: PlayerAnimation
-  realPlayerUuid: string
-  realUsername: string
-}
-
 function convert2sComplementToHex (complement: number) {
   if (complement < 0) {
     complement = (0xFF_FF_FF_FF + complement + 1) >>> 0
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 166e42a7..d16fee20 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -12,6 +12,7 @@ import PrismarineChatLoader from 'prismarine-chat'
 import * as nbt from 'prismarine-nbt'
 import { BlockModel } from 'mc-assets'
 import { renderSlot } from 'renderer/viewer/three/renderSlot'
+import { loadSkinFromUsername } from 'renderer/viewer/lib/utils/skins'
 import Generic95 from '../assets/generic_95.png'
 import { appReplacableResources } from './generated/resources'
 import { activeModalStack, hideCurrentModal, hideModal, miscUiState, showModal } from './globalState'
@@ -23,6 +24,7 @@ import { getItemDescription } from './itemsDescriptions'
 import { MessageFormatPart } from './chatUtils'
 import { GeneralInputItem, getItemMetadata, getItemModelName, getItemNameRaw, RenderItem } from './mineflayer/items'
 import { playerState } from './mineflayer/playerState'
+import { modelViewerState } from './react/OverlayModelViewer'
 
 const loadedImagesCache = new Map<string, HTMLImageElement | ImageBitmap>()
 const cleanLoadedImagesCache = () => {
@@ -40,6 +42,34 @@ export const jeiCustomCategories = proxy({
   value: [] as Array<{ id: string, categoryTitle: string, items: any[] }>
 })
 
+let remotePlayerSkin: string | undefined | Promise<string>
+
+export const showInventoryPlayer = () => {
+  modelViewerState.model = {
+    positioning: {
+      windowWidth: 176,
+      windowHeight: 166,
+      x: 25,
+      y: 8,
+      width: 50,
+      height: 70,
+      scaled: true,
+      onlyInitialScale: true,
+      followCursor: true,
+    },
+    // models: ['https://bucket.mcraft.fun/sitarbuckss.glb'],
+    // debug: true,
+    steveModelSkin: appViewer.playerState.reactive.playerSkin ?? (typeof remotePlayerSkin === 'string' ? remotePlayerSkin : ''),
+  }
+  if (remotePlayerSkin === undefined && !appViewer.playerState.reactive.playerSkin) {
+    remotePlayerSkin = loadSkinFromUsername(bot.username, 'skin').then(a => {
+      setTimeout(() => { showInventoryPlayer() }, 0) // todo patch instead and make reactive
+      remotePlayerSkin = a ?? ''
+      return remotePlayerSkin
+    })
+  }
+}
+
 export const onGameLoad = () => {
   version = bot.version
 
@@ -392,7 +422,12 @@ const openWindow = (type: string | undefined, title: string | any = undefined) =
     miscUiState.displaySearchInput = false
     destroyFn()
     skipClosePacketSending = false
+
+    modelViewerState.model = undefined
   })
+  if (type === undefined) {
+    showInventoryPlayer()
+  }
   cleanLoadedImagesCache()
   const inv = openItemsCanvas(type)
   inv.canvasManager.children[0].mobileHelpers = miscUiState.currentTouch
diff --git a/src/react/OverlayModelViewer.tsx b/src/react/OverlayModelViewer.tsx
new file mode 100644
index 00000000..24dc836d
--- /dev/null
+++ b/src/react/OverlayModelViewer.tsx
@@ -0,0 +1,505 @@
+import { proxy, useSnapshot, subscribe } from 'valtio'
+import { useEffect, useMemo, useRef } from 'react'
+import * as THREE from 'three'
+import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'
+import { OBJLoader } from 'three/examples/jsm/loaders/OBJLoader'
+import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader'
+import { applySkinToPlayerObject, createPlayerObject, PlayerObjectType } from '../../renderer/viewer/lib/createPlayerObject'
+import { currentScaling } from '../scaleInterface'
+
+THREE.ColorManagement.enabled = false
+
+export const modelViewerState = proxy({
+  model: undefined as undefined | {
+    models?: string[] // Array of model URLs (URL itself is the cache key)
+    steveModelSkin?: string
+    debug?: boolean
+    // absolute positioning
+    positioning: {
+      windowWidth: number
+      windowHeight: number
+      x: number
+      y: number
+      width: number
+      height: number
+      scaled?: boolean
+      onlyInitialScale?: boolean
+      followCursor?: boolean
+    }
+    modelCustomization?: { [modelUrl: string]: { color?: string, opacity?: number, metalness?: number, roughness?: number } }
+    resetRotationOnReleae?: boolean
+    continiousRender?: boolean
+  }
+})
+globalThis.modelViewerState = modelViewerState
+
+// Global debug function to get camera and model values
+globalThis.getModelViewerValues = () => {
+  const scene = globalThis.sceneRef?.current
+  if (!scene) return null
+
+  const { camera, playerObject } = scene
+  if (!playerObject) return null
+
+  const wrapper = playerObject.parent
+  if (!wrapper) return null
+
+  const box = new THREE.Box3().setFromObject(wrapper)
+  const size = box.getSize(new THREE.Vector3())
+  const center = box.getCenter(new THREE.Vector3())
+
+  return {
+    camera: {
+      position: camera.position.clone(),
+      fov: camera.fov,
+      aspect: camera.aspect
+    },
+    model: {
+      position: wrapper.position.clone(),
+      rotation: wrapper.rotation.clone(),
+      scale: wrapper.scale.clone(),
+      size,
+      center
+    },
+    cursor: {
+      position: globalThis.cursorPosition || { x: 0, y: 0 },
+      normalized: globalThis.cursorPosition ? {
+        x: globalThis.cursorPosition.x * 2 - 1,
+        y: globalThis.cursorPosition.y * 2 - 1
+      } : { x: 0, y: 0 }
+    },
+    visibleArea: {
+      height: 2 * Math.tan(camera.fov * Math.PI / 180 / 2) * camera.position.z,
+      width: 2 * Math.tan(camera.fov * Math.PI / 180 / 2) * camera.position.z * camera.aspect
+    }
+  }
+}
+
+export default () => {
+  const { model } = useSnapshot(modelViewerState)
+  const containerRef = useRef<HTMLDivElement>(null)
+  const sceneRef = useRef<{
+    scene: THREE.Scene
+    camera: THREE.PerspectiveCamera
+    renderer: THREE.WebGLRenderer
+    controls: OrbitControls
+    playerObject?: PlayerObjectType
+    dispose: () => void
+  }>()
+  const initialScale = useMemo(() => {
+    return currentScaling.scale
+  }, [])
+  globalThis.sceneRef = sceneRef
+
+  // Cursor following state
+  const cursorPosition = useRef({ x: 0, y: 0 })
+  const isFollowingCursor = useRef(false)
+
+  // Model management state
+  const loadedModels = useRef<Map<string, THREE.Object3D>>(new Map())
+  const modelLoaders = useRef<Map<string, GLTFLoader | OBJLoader>>(new Map())
+
+  // Model management functions
+  const loadModel = (modelUrl: string) => {
+    if (loadedModels.current.has(modelUrl)) return // Already loaded
+
+    const isGLTF = modelUrl.toLowerCase().endsWith('.gltf') || modelUrl.toLowerCase().endsWith('.glb')
+    const loader = isGLTF ? new GLTFLoader() : new OBJLoader()
+    modelLoaders.current.set(modelUrl, loader)
+
+    const onLoad = (object: THREE.Object3D) => {
+      // Apply customization if available
+      const customization = model?.modelCustomization?.[modelUrl]
+      if (customization) {
+        object.traverse((child) => {
+          if (child instanceof THREE.Mesh && child.material) {
+            const material = child.material as THREE.MeshStandardMaterial
+            if (customization.color) {
+              material.color.setHex(parseInt(customization.color.replace('#', ''), 16))
+            }
+            if (customization.opacity !== undefined) {
+              material.opacity = customization.opacity
+              material.transparent = customization.opacity < 1
+            }
+            if (customization.metalness !== undefined) {
+              material.metalness = customization.metalness
+            }
+            if (customization.roughness !== undefined) {
+              material.roughness = customization.roughness
+            }
+          }
+        })
+      }
+
+      // Center and scale model
+      const box = new THREE.Box3().setFromObject(object)
+      const center = box.getCenter(new THREE.Vector3())
+      const size = box.getSize(new THREE.Vector3())
+      const maxDim = Math.max(size.x, size.y, size.z)
+      const scale = 2 / maxDim
+      object.scale.setScalar(scale)
+      object.position.sub(center.multiplyScalar(scale))
+
+      // Store the model using URL as key
+      loadedModels.current.set(modelUrl, object)
+      sceneRef.current?.scene.add(object)
+
+      // Trigger render
+      if (sceneRef.current) {
+        setTimeout(() => {
+          const render = () => sceneRef.current?.renderer.render(sceneRef.current.scene, sceneRef.current.camera)
+          render()
+        }, 0)
+      }
+    }
+
+    if (isGLTF) {
+      (loader as GLTFLoader).load(modelUrl, (gltf) => {
+        onLoad(gltf.scene)
+      })
+    } else {
+      (loader as OBJLoader).load(modelUrl, onLoad)
+    }
+  }
+
+  const removeModel = (modelUrl: string) => {
+    const model = loadedModels.current.get(modelUrl)
+    if (model) {
+      sceneRef.current?.scene.remove(model)
+      model.traverse((child) => {
+        if (child instanceof THREE.Mesh) {
+          if (child.material) {
+            if (Array.isArray(child.material)) {
+              for (const mat of child.material) {
+                mat.dispose()
+              }
+            } else {
+              child.material.dispose()
+            }
+          }
+          if (child.geometry) {
+            child.geometry.dispose()
+          }
+        }
+      })
+      loadedModels.current.delete(modelUrl)
+    }
+    modelLoaders.current.delete(modelUrl)
+  }
+
+  // Subscribe to model changes
+  useEffect(() => {
+    if (!modelViewerState.model?.models) return
+
+    const modelsChanged = () => {
+      const currentModels = modelViewerState.model?.models || []
+      const currentModelUrls = new Set(currentModels)
+      const loadedModelUrls = new Set(loadedModels.current.keys())
+
+      // Remove models that are no longer in the state
+      for (const modelUrl of loadedModelUrls) {
+        if (!currentModelUrls.has(modelUrl)) {
+          removeModel(modelUrl)
+        }
+      }
+
+      // Add new models
+      for (const modelUrl of currentModels) {
+        if (!loadedModelUrls.has(modelUrl)) {
+          loadModel(modelUrl)
+        }
+      }
+    }
+    const unsubscribe = subscribe(modelViewerState.model.models, modelsChanged)
+
+    let unmounted = false
+    setTimeout(() => {
+      if (unmounted) return
+      modelsChanged()
+    })
+
+    return () => {
+      unmounted = true
+      unsubscribe?.()
+    }
+  }, [model?.models])
+
+  useEffect(() => {
+    if (!model || !containerRef.current) return
+
+    // Setup scene
+    const scene = new THREE.Scene()
+    scene.background = null // Transparent background
+
+    // Setup camera with optimal settings for player model viewing
+    const camera = new THREE.PerspectiveCamera(
+      50, // Reduced FOV for better model viewing
+      model.positioning.width / model.positioning.height,
+      0.1,
+      1000
+    )
+    camera.position.set(0, 0, 3) // Position camera to view player model optimally
+
+    // Setup renderer with pixel density awareness
+    const renderer = new THREE.WebGLRenderer({ alpha: true })
+    let scale = window.devicePixelRatio || 1
+    if (modelViewerState.model?.positioning.scaled) {
+      scale *= currentScaling.scale
+    }
+    renderer.setPixelRatio(scale)
+    renderer.setSize(model.positioning.width, model.positioning.height)
+    containerRef.current.appendChild(renderer.domElement)
+
+    // Setup controls
+    const controls = new OrbitControls(camera, renderer.domElement)
+    // controls.enableZoom = false
+    // controls.enablePan = false
+    controls.minPolarAngle = Math.PI / 2 // Lock vertical rotation
+    controls.maxPolarAngle = Math.PI / 2
+    controls.enableDamping = true
+    controls.dampingFactor = 0.05
+
+    // Add ambient light
+    const ambientLight = new THREE.AmbientLight(0xff_ff_ff, 1)
+    scene.add(ambientLight)
+
+    // Cursor following function
+    const updatePlayerLookAt = () => {
+      if (!isFollowingCursor.current || !sceneRef.current?.playerObject) return
+
+      const { playerObject } = sceneRef.current
+      const { x, y } = cursorPosition.current
+
+      // Convert 0-1 cursor position to normalized coordinates (-1 to 1)
+      const normalizedX = x * 2 - 1
+      const normalizedY = y * 2 - 1 // Inverted: top of screen = negative pitch, bottom = positive pitch
+
+      // Calculate head rotation based on cursor position
+      // Limit head movement to realistic angles
+      const maxHeadYaw = Math.PI / 3 // 60 degrees
+      const maxHeadPitch = Math.PI / 4 // 45 degrees
+
+      const headYaw = normalizedX * maxHeadYaw
+      const headPitch = normalizedY * maxHeadPitch
+
+      // Apply head rotation with smooth interpolation
+      const lerpFactor = 0.1 // Smooth interpolation factor
+      playerObject.skin.head.rotation.y = THREE.MathUtils.lerp(
+        playerObject.skin.head.rotation.y,
+        headYaw,
+        lerpFactor
+      )
+      playerObject.skin.head.rotation.x = THREE.MathUtils.lerp(
+        playerObject.skin.head.rotation.x,
+        headPitch,
+        lerpFactor
+      )
+
+      // Apply slight body rotation for more natural movement
+      const bodyYaw = headYaw * 0.3 // Body follows head but with less rotation
+      playerObject.rotation.y = THREE.MathUtils.lerp(
+        playerObject.rotation.y,
+        bodyYaw,
+        lerpFactor * 0.5 // Slower body movement
+      )
+
+      render()
+    }
+
+    // Render function
+    const render = () => {
+      renderer.render(scene, camera)
+    }
+
+    // Setup animation/render strategy
+    if (model.continiousRender) {
+      // Continuous animation loop
+      const animate = () => {
+        requestAnimationFrame(animate)
+        render()
+      }
+      animate()
+    } else {
+      // Render only on camera movement
+      controls.addEventListener('change', render)
+      // Initial render
+      render()
+      // Render after model loads
+      if (model.steveModelSkin !== undefined) {
+        // Create player model
+        const { playerObject, wrapper } = createPlayerObject({
+          scale: 1 // Start with base scale, will adjust below
+        })
+
+        // Calculate proper scale and positioning for camera view
+        const box = new THREE.Box3().setFromObject(wrapper)
+        const size = box.getSize(new THREE.Vector3())
+        const center = box.getCenter(new THREE.Vector3())
+
+        // Calculate scale to fit within camera view (considering FOV and distance)
+        const cameraDistance = camera.position.z
+        const fov = camera.fov * Math.PI / 180 // Convert to radians
+        const visibleHeight = 2 * Math.tan(fov / 2) * cameraDistance
+        const visibleWidth = visibleHeight * (model.positioning.width / model.positioning.height)
+
+        const scaleFactor = Math.min(
+          (visibleHeight) / size.y,
+          (visibleWidth) / size.x
+        )
+
+        wrapper.scale.multiplyScalar(scaleFactor)
+
+        // Center the player object
+        wrapper.position.sub(center.multiplyScalar(scaleFactor))
+
+        // Rotate to face camera (remove the default 180° rotation)
+        wrapper.rotation.set(0, 0, 0)
+
+        scene.add(wrapper)
+        sceneRef.current = {
+          ...sceneRef.current!,
+          playerObject
+        }
+
+        void applySkinToPlayerObject(playerObject, model.steveModelSkin).then(() => {
+          setTimeout(render, 0)
+        })
+
+        // Set up cursor following if enabled
+        if (model.positioning.followCursor) {
+          isFollowingCursor.current = true
+        }
+      }
+    }
+
+    // Window cursor tracking for followCursor
+    let lastCursorUpdate = 0
+    let waitingRender = false
+    const handleWindowPointerMove = (event: PointerEvent) => {
+      if (!model.positioning.followCursor) return
+
+      // Track cursor position as 0-1 across the entire window
+      const newPosition = {
+        x: event.clientX / window.innerWidth,
+        y: event.clientY / window.innerHeight
+      }
+      cursorPosition.current = newPosition
+      globalThis.cursorPosition = newPosition // Expose for debug
+      lastCursorUpdate = Date.now()
+      updatePlayerLookAt()
+      if (!waitingRender) {
+        requestAnimationFrame(() => {
+          render()
+          waitingRender = false
+        })
+        waitingRender = true
+      }
+    }
+
+    // Add window event listeners
+    if (model.positioning.followCursor) {
+      window.addEventListener('pointermove', handleWindowPointerMove)
+      isFollowingCursor.current = true
+    }
+
+    // Store refs for cleanup
+    sceneRef.current = {
+      ...sceneRef.current!,
+      scene,
+      camera,
+      renderer,
+      controls,
+      dispose () {
+        if (!model.continiousRender) {
+          controls.removeEventListener('change', render)
+        }
+        if (model.positioning.followCursor) {
+          window.removeEventListener('pointermove', handleWindowPointerMove)
+        }
+
+        // Clean up loaded models
+        for (const [modelUrl, model] of loadedModels.current) {
+          scene.remove(model)
+          model.traverse((child) => {
+            if (child instanceof THREE.Mesh) {
+              if (child.material) {
+                if (Array.isArray(child.material)) {
+                  for (const mat of child.material) {
+                    mat.dispose()
+                  }
+                } else {
+                  child.material.dispose()
+                }
+              }
+              if (child.geometry) {
+                child.geometry.dispose()
+              }
+            }
+          })
+        }
+        loadedModels.current.clear()
+        modelLoaders.current.clear()
+
+        const playerObject = sceneRef.current?.playerObject
+        if (playerObject?.skin.map) {
+          (playerObject.skin.map as unknown as THREE.Texture).dispose()
+        }
+        renderer.dispose()
+        renderer.domElement?.remove()
+      }
+    }
+
+    return () => {
+      sceneRef.current?.dispose()
+    }
+  }, [model])
+
+  if (!model) return null
+
+  const { x, y, width, height, scaled, onlyInitialScale } = model.positioning
+  const { windowWidth } = model.positioning
+  const { windowHeight } = model.positioning
+  const scaleValue = onlyInitialScale ? initialScale : 'var(--guiScale)'
+
+  return (
+    <div
+      className='overlay-model-viewer-container'
+      style={{
+        zIndex: 100,
+        position: 'fixed',
+        inset: 0,
+        width: '100dvw',
+        height: '100dvh',
+        display: 'flex',
+        justifyContent: 'center',
+        alignItems: 'center',
+        transform: scaled ? `scale(${scaleValue})` : 'none',
+        pointerEvents: 'none',
+      }}
+    >
+      <div
+        className='overlay-model-viewer-window'
+        style={{
+          width: windowWidth,
+          height: windowHeight,
+          position: 'relative',
+          pointerEvents: 'none',
+        }}
+      >
+        <div
+          ref={containerRef}
+          className='overlay-model-viewer'
+          style={{
+            position: 'absolute',
+            left: x,
+            top: y,
+            width,
+            height,
+            pointerEvents: 'auto',
+            backgroundColor: model.debug ? 'red' : undefined,
+          }}
+        />
+      </div>
+    </div>
+  )
+}
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 1e6f13eb..6339686e 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -68,6 +68,7 @@ import FullscreenTime from './react/FullscreenTime'
 import StorageConflictModal from './react/StorageConflictModal'
 import FireRenderer from './react/FireRenderer'
 import MonacoEditor from './react/MonacoEditor'
+import OverlayModelViewer from './react/OverlayModelViewer'
 
 const isFirefox = ua.getBrowser().name === 'Firefox'
 if (isFirefox) {
@@ -259,6 +260,7 @@ const App = () => {
             </div>
             <div />
             <DebugEdges />
+            <OverlayModelViewer />
             <MonacoEditor />
             <DebugResponseTimeIndicator />
           </RobustPortal>

From 739a6fad24478c5b13b03f96babd853c569dcbbc Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 8 Sep 2025 04:34:17 +0300
Subject: [PATCH 118/136] fix lockfile

---
 pnpm-lock.yaml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fd8be62b..516370ce 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -140,7 +140,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/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13))
       minecraft-data:
         specifier: 3.92.0
         version: 3.92.0
@@ -345,7 +345,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41(@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/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.21
         version: 0.1.21
@@ -6670,7 +6670,7 @@ packages:
 
   minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9:
     resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9}
-    version: 1.61.0
+    version: 1.62.0
     engines: {node: '>=22'}
 
   minecraft-wrap@1.6.0:
@@ -6688,8 +6688,8 @@ packages:
     resolution: {integrity: sha512-1XTVuw3twIrEcqQ1QRSB8NcStIUEZ+tbxiAG6rOrN/9M4thhtlS5PTJzFdmdrcYgWEBLvuOdJszaKE5zFfiXhg==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659}
     version: 8.0.0
     engines: {node: '>=22'}
 
@@ -11344,7 +11344,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.92.0
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.17.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
@@ -16990,12 +16990,12 @@ snapshots:
     dependencies:
       minecraft-data: 3.92.0
 
-  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(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/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13)
       prismarine-item: 1.17.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17365,7 +17365,7 @@ snapshots:
 
   mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13):
     dependencies:
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13)
       sharp: 0.30.7
     transitivePeerDependencies:
       - encoding
@@ -17380,7 +17380,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0

From 0b1183f541bb76a47ed15cfd63ef59340f91be9f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 8 Sep 2025 04:36:09 +0300
Subject: [PATCH 119/136] up minecraft-data

---
 package.json                    | 4 ++--
 scripts/makeOptimizedMcData.mjs | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index b5f66bfb..ff673726 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "jszip": "^3.10.1",
     "lodash-es": "^4.17.21",
     "mcraft-fun-mineflayer": "^0.1.23",
-    "minecraft-data": "3.92.0",
+    "minecraft-data": "3.98.0",
     "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
     "mineflayer-item-map-downloader": "github:zardoy/mineflayer-item-map-downloader",
     "mojangson": "^2.0.4",
@@ -205,7 +205,7 @@
       "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.92.0",
+      "minecraft-data": "3.98.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/scripts/makeOptimizedMcData.mjs b/scripts/makeOptimizedMcData.mjs
index 76e0f1c2..a572d067 100644
--- a/scripts/makeOptimizedMcData.mjs
+++ b/scripts/makeOptimizedMcData.mjs
@@ -371,6 +371,7 @@ console.log('size', fs.lstatSync(filePath).size / 1000 / 1000, gzipSizeFromFileS
 
 const { defaultVersion } = MCProtocol
 const data = MinecraftData(defaultVersion)
+console.log('defaultVersion', defaultVersion, !!data)
 const initialMcData = {
   [defaultVersion]: {
     version: data.version,

From f24cb49a8728a63cab19b8cc76fdbfb1888566eb Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 8 Sep 2025 04:55:43 +0300
Subject: [PATCH 120/136] up lockfile

---
 pnpm-lock.yaml | 74 +++++++++++++++++++++++++-------------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 516370ce..5bcd74a0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,7 +13,7 @@ overrides:
   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.92.0
+  minecraft-data: 3.98.0
   prismarine-provider-anvil: github:zardoy/prismarine-provider-anvil#everything
   prismarine-physics: github:zardoy/prismarine-physics
   minecraft-protocol: github:PrismarineJS/node-minecraft-protocol#master
@@ -142,8 +142,8 @@ importers:
         specifier: ^0.1.23
         version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13))
       minecraft-data:
-        specifier: 3.92.0
-        version: 3.92.0
+        specifier: 3.98.0
+        version: 3.98.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
         version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
@@ -170,7 +170,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.92.0)
+        version: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.98.0)
       prosemirror-example-setup:
         specifier: ^1.2.2
         version: 1.2.3
@@ -436,7 +436,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.92.0)
+        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.98.0)
       prismarine-schematic:
         specifier: ^1.2.0
         version: 1.2.3
@@ -6448,7 +6448,7 @@ packages:
     resolution: {integrity: sha512-H9jPt2xEU77itC27dSz3qazHYqN9qVsv4HgMPozg7RqQ1uwgXmEa+ojKIlDtXf/TLJsG6Kv4EbzGa8a1Wh72uA==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     peerDependencies:
-      minecraft-data: 3.92.0
+      minecraft-data: 3.98.0
 
   mcraft-fun-mineflayer@0.1.23:
     resolution: {integrity: sha512-qmI1rQQ0Ro5zJdi99rClWLF+mS9JZffgNX2vyWWesS3Hsk3Xblp/8swYTJKHSaFpNgzkVfXV92fEIrBqeH6iKA==}
@@ -6658,8 +6658,8 @@ packages:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
 
-  minecraft-data@3.92.0:
-    resolution: {integrity: sha512-CGfO50svzm+pSRa4Mbq4owsmRKbPCNkSZ3MCOyH+epC7yNjh+PUhPQFHWq72O51qsY7pAB5qM/bJn1ncwG1J5g==}
+  minecraft-data@3.98.0:
+    resolution: {integrity: sha512-JAPqJ/TZoxMUlAPPdWUh1v5wdqvYGFSZ4rW9bUtmaKBkGpomDSjw4V02ocBqbxKJvcTtmc5nM/LfN9/0DDqHrQ==}
 
   minecraft-folder-path@1.2.0:
     resolution: {integrity: sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==}
@@ -7387,7 +7387,7 @@ packages:
   prismarine-biome@1.3.0:
     resolution: {integrity: sha512-GY6nZxq93mTErT7jD7jt8YS1aPrOakbJHh39seYsJFXvueIOdHAmW16kYQVrTVMW5MlWLQVxV/EquRwOgr4MnQ==}
     peerDependencies:
-      minecraft-data: 3.92.0
+      minecraft-data: 3.98.0
       prismarine-registry: ^1.1.0
 
   prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
@@ -11343,7 +11343,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.92.0
+      minecraft-data: 3.98.0
       mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.17.0
@@ -13104,18 +13104,18 @@ snapshots:
       exit-hook: 2.2.1
       flatmap: 0.0.3
       long: 5.3.1
-      mc-bridge: 0.1.3(minecraft-data@3.92.0)
-      minecraft-data: 3.92.0
+      mc-bridge: 0.1.3(minecraft-data@3.98.0)
+      minecraft-data: 3.98.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
       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.92.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.98.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
-      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.92.0)
+      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.98.0)
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       rambda: 9.4.2
@@ -13142,16 +13142,16 @@ snapshots:
       exit-hook: 2.2.1
       flatmap: 0.0.3
       long: 5.3.1
-      minecraft-data: 3.92.0
+      minecraft-data: 3.98.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(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.92.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.98.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
-      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.92.0)
+      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.98.0)
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       rambda: 9.4.2
@@ -14542,8 +14542,8 @@ snapshots:
 
   diamond-square@https://codeload.github.com/zardoy/diamond-square/tar.gz/cfaad2d1d5909fdfa63c8cc7bc05fb5e87782d71:
     dependencies:
-      minecraft-data: 3.92.0
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
+      minecraft-data: 3.98.0
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.98.0)
       prismarine-registry: 1.11.0
       random-seed: 0.3.0
       vec3: 0.1.10
@@ -16986,9 +16986,9 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
-  mc-bridge@0.1.3(minecraft-data@3.92.0):
+  mc-bridge@0.1.3(minecraft-data@3.98.0):
     dependencies:
-      minecraft-data: 3.92.0
+      minecraft-data: 3.98.0
 
   mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13)):
     dependencies:
@@ -17302,7 +17302,7 @@ snapshots:
 
   min-indent@1.0.1: {}
 
-  minecraft-data@3.92.0: {}
+  minecraft-data@3.98.0: {}
 
   minecraft-folder-path@1.2.0: {}
 
@@ -17322,7 +17322,7 @@ snapshots:
       debug: 4.4.0(supports-color@8.1.1)
       endian-toggle: 0.0.0
       lodash.merge: 4.6.2
-      minecraft-data: 3.92.0
+      minecraft-data: 3.98.0
       minecraft-folder-path: 1.2.0
       node-fetch: 2.7.0(encoding@0.1.13)
       node-rsa: 0.4.2
@@ -17383,12 +17383,12 @@ snapshots:
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
-      minecraft-data: 3.92.0
+      minecraft-data: 3.98.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
+      prismarine-biome: 1.3.0(minecraft-data@3.98.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.92.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.98.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
@@ -18174,15 +18174,15 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  prismarine-biome@1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0):
+  prismarine-biome@1.3.0(minecraft-data@3.98.0)(prismarine-registry@1.11.0):
     dependencies:
-      minecraft-data: 3.92.0
+      minecraft-data: 3.98.0
       prismarine-registry: 1.11.0
 
   prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
     dependencies:
-      minecraft-data: 3.92.0
-      prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
+      minecraft-data: 3.98.0
+      prismarine-biome: 1.3.0(minecraft-data@3.98.0)(prismarine-registry@1.11.0)
       prismarine-chat: 1.11.0
       prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
@@ -18194,9 +18194,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.92.0):
+  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.98.0):
     dependencies:
-      prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
+      prismarine-biome: 1.3.0(minecraft-data@3.98.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
@@ -18225,14 +18225,14 @@ snapshots:
 
   prismarine-physics@https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b:
     dependencies:
-      minecraft-data: 3.92.0
+      minecraft-data: 3.98.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.92.0):
+  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.98.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.92.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.98.0)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       uint4: 0.1.2
@@ -18254,13 +18254,13 @@ snapshots:
 
   prismarine-registry@1.11.0:
     dependencies:
-      minecraft-data: 3.92.0
+      minecraft-data: 3.98.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.92.0
+      minecraft-data: 3.98.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

From 1525fac2a192f1fe7e2f858480c444948bbe9651 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 8 Sep 2025 05:22:24 +0300
Subject: [PATCH 121/136] fix: some visual camera world view issues (visible
 lines between blocks)

---
 renderer/viewer/three/cameraShake.ts       | 25 ++++++++++++++++++++--
 renderer/viewer/three/world/cursorBlock.ts | 18 ++++++++++++----
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/renderer/viewer/three/cameraShake.ts b/renderer/viewer/three/cameraShake.ts
index 593b4628..7b159509 100644
--- a/renderer/viewer/three/cameraShake.ts
+++ b/renderer/viewer/three/cameraShake.ts
@@ -80,8 +80,12 @@ export class CameraShake {
       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)
+      // Add tiny offsets to prevent z-fighting at ideal angles (90, 180, 270 degrees)
+      const pitchOffset = this.addAntiZfightingOffset(this.basePitch)
+      const yawOffset = this.addAntiZfightingOffset(this.baseYaw)
+
+      const pitchQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(1, 0, 0), pitchOffset)
+      const yawQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), yawOffset)
       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)
@@ -96,4 +100,21 @@ export class CameraShake {
   private easeInOut (t: number): number {
     return t < 0.5 ? 2 * t * t : 1 - (-2 * t + 2) ** 2 / 2
   }
+
+  private addAntiZfightingOffset (angle: number): number {
+    const offset = 0.001 // Very small offset in radians (about 0.057 degrees)
+
+    // Check if the angle is close to ideal angles (0, π/2, π, 3π/2)
+    const normalizedAngle = ((angle % (Math.PI * 2)) + Math.PI * 2) % (Math.PI * 2)
+    const tolerance = 0.01 // Tolerance for considering an angle "ideal"
+
+    if (Math.abs(normalizedAngle) < tolerance ||
+      Math.abs(normalizedAngle - Math.PI / 2) < tolerance ||
+      Math.abs(normalizedAngle - Math.PI) < tolerance ||
+      Math.abs(normalizedAngle - 3 * Math.PI / 2) < tolerance) {
+      return angle + offset
+    }
+
+    return angle
+  }
 }
diff --git a/renderer/viewer/three/world/cursorBlock.ts b/renderer/viewer/three/world/cursorBlock.ts
index b71c1b8d..a03a6999 100644
--- a/renderer/viewer/three/world/cursorBlock.ts
+++ b/renderer/viewer/three/world/cursorBlock.ts
@@ -28,7 +28,7 @@ export class CursorBlock {
   }
 
   cursorLineMaterial: LineMaterial
-  interactionLines: null | { blockPos: Vec3, mesh: THREE.Group } = null
+  interactionLines: null | { blockPos: Vec3, mesh: THREE.Group, shapePositions: BlocksShapes | undefined } = null
   prevColor: string | undefined
   blockBreakMesh: THREE.Mesh
   breakTextures: THREE.Texture[] = []
@@ -62,6 +62,13 @@ export class CursorBlock {
     this.worldRenderer.onReactivePlayerStateUpdated('gameMode', () => {
       this.updateLineMaterial()
     })
+    // todo figure out why otherwise fog from skybox breaks it
+    setTimeout(() => {
+      this.updateLineMaterial()
+      if (this.interactionLines) {
+        this.setHighlightCursorBlock(this.interactionLines.blockPos, this.interactionLines.shapePositions, true)
+      }
+    })
   }
 
   // Update functions
@@ -69,6 +76,9 @@ export class CursorBlock {
     const inCreative = this.worldRenderer.playerStateReactive.gameMode === 'creative'
     const pixelRatio = this.worldRenderer.renderer.getPixelRatio()
 
+    if (this.cursorLineMaterial) {
+      this.cursorLineMaterial.dispose()
+    }
     this.cursorLineMaterial = new LineMaterial({
       color: (() => {
         switch (this.worldRenderer.worldRendererConfig.highlightBlockColor) {
@@ -115,8 +125,8 @@ export class CursorBlock {
     }
   }
 
-  setHighlightCursorBlock (blockPos: Vec3 | null, shapePositions?: BlocksShapes): void {
-    if (blockPos && this.interactionLines && blockPos.equals(this.interactionLines.blockPos)) {
+  setHighlightCursorBlock (blockPos: Vec3 | null, shapePositions?: BlocksShapes, force = false): void {
+    if (blockPos && this.interactionLines && blockPos.equals(this.interactionLines.blockPos) && !force) {
       return
     }
     if (this.interactionLines !== null) {
@@ -140,7 +150,7 @@ export class CursorBlock {
     }
     this.worldRenderer.scene.add(group)
     group.visible = !this.cursorLinesHidden
-    this.interactionLines = { blockPos, mesh: group }
+    this.interactionLines = { blockPos, mesh: group, shapePositions }
   }
 
   render () {

From c4097975bf8ea14764bf7f2b70aa00e45dc5b399 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 8 Sep 2025 05:29:34 +0300
Subject: [PATCH 122/136] add a way to disable sky box for old behavior (not
 tested)

---
 renderer/viewer/lib/worldrendererCommon.ts  |  1 +
 renderer/viewer/three/skyboxRenderer.ts     | 25 ++++++++++++++++++++-
 renderer/viewer/three/worldrendererThree.ts |  5 ++++-
 src/defaultOptions.ts                       |  1 +
 src/watchOptions.ts                         |  4 ++++
 5 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index e2455915..4140e3fa 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -47,6 +47,7 @@ export const defaultWorldRendererConfig = {
   smoothLighting: true,
   enableLighting: true,
   starfield: true,
+  defaultSkybox: true,
   renderEntities: true,
   extraBlockRenderers: true,
   foreground: true,
diff --git a/renderer/viewer/three/skyboxRenderer.ts b/renderer/viewer/three/skyboxRenderer.ts
index aa8c3bb6..cd7bd879 100644
--- a/renderer/viewer/three/skyboxRenderer.ts
+++ b/renderer/viewer/three/skyboxRenderer.ts
@@ -18,7 +18,7 @@ export class SkyboxRenderer {
   private fogBrightness = 0
   private prevFogBrightness = 0
 
-  constructor (private readonly scene: THREE.Scene, public initialImage: string | null) {
+  constructor (private readonly scene: THREE.Scene, public defaultSkybox: boolean, public initialImage: string | null) {
     if (!initialImage) {
       this.createGradientSky()
     }
@@ -119,6 +119,12 @@ export class SkyboxRenderer {
     this.updateSkyColors()
   }
 
+  // Update default skybox setting
+  updateDefaultSkybox (defaultSkybox: boolean) {
+    this.defaultSkybox = defaultSkybox
+    this.updateSkyColors()
+  }
+
   private createGradientSky () {
     const size = 64
     const scale = 256 / size + 2
@@ -279,6 +285,23 @@ export class SkyboxRenderer {
   private updateSkyColors () {
     if (!this.skyMesh || !this.voidMesh) return
 
+    // If default skybox is disabled, hide the skybox meshes
+    if (!this.defaultSkybox) {
+      this.skyMesh.visible = false
+      this.voidMesh.visible = false
+      if (this.mesh) {
+        this.mesh.visible = false
+      }
+      return
+    }
+
+    // Show skybox meshes when default skybox is enabled
+    this.skyMesh.visible = true
+    this.voidMesh.visible = true
+    if (this.mesh) {
+      this.mesh.visible = true
+    }
+
     // Update fog brightness with smooth transition
     this.prevFogBrightness = this.fogBrightness
     const renderDistance = this.viewDistance / 32
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 29e9223c..1b4e6152 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -98,7 +98,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.holdingBlockLeft = new HoldingBlock(this, true)
 
     // Initialize skybox renderer
-    this.skyboxRenderer = new SkyboxRenderer(this.scene, null)
+    this.skyboxRenderer = new SkyboxRenderer(this.scene, this.worldRendererConfig.defaultSkybox, null)
     void this.skyboxRenderer.init()
 
     this.addDebugOverlay()
@@ -206,6 +206,9 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.onReactiveConfigUpdated('showChunkBorders', (value) => {
       this.updateShowChunksBorder(value)
     })
+    this.onReactiveConfigUpdated('defaultSkybox', (value) => {
+      this.skyboxRenderer.updateDefaultSkybox(value)
+    })
   }
 
   changeHandSwingingState (isAnimationPlaying: boolean, isLeft = false) {
diff --git a/src/defaultOptions.ts b/src/defaultOptions.ts
index 6045e70b..361879be 100644
--- a/src/defaultOptions.ts
+++ b/src/defaultOptions.ts
@@ -41,6 +41,7 @@ export const defaultOptions = {
   renderEars: true,
   lowMemoryMode: false,
   starfieldRendering: true,
+  defaultSkybox: true,
   enabledResourcepack: null as string | null,
   useVersionsTextures: 'latest',
   serverResourcePacks: 'prompt' as 'prompt' | 'always' | 'never',
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index da75cc74..779aa29f 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -116,6 +116,10 @@ export const watchOptionsAfterViewerInit = () => {
     appViewer.inWorldRenderingConfig.starfield = o.starfieldRendering
   })
 
+  watchValue(options, o => {
+    appViewer.inWorldRenderingConfig.defaultSkybox = o.defaultSkybox
+  })
+
   watchValue(options, o => {
     // appViewer.inWorldRenderingConfig.neighborChunkUpdates = o.neighborChunkUpdates
   })

From 06dc3cb033129f925dd492b01a809e9e5f3cd19c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 8 Sep 2025 05:38:16 +0300
Subject: [PATCH 123/136] feat: Add saveLoginPassword option to control
 password saving behavior in browser for offline auth on servers

---
 src/defaultOptions.ts      |  1 +
 src/optionsGuiScheme.tsx   | 10 ++++++++++
 src/react/ChatProvider.tsx | 20 ++++++++++++++++----
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/defaultOptions.ts b/src/defaultOptions.ts
index 361879be..85ebae17 100644
--- a/src/defaultOptions.ts
+++ b/src/defaultOptions.ts
@@ -84,6 +84,7 @@ export const defaultOptions = {
   localServerOptions: {
     gameMode: 1
   } as any,
+  saveLoginPassword: 'prompt' as 'prompt' | 'never' | 'always',
   preferLoadReadonly: false,
   experimentalClientSelfReload: false,
   remoteSoundsSupport: false,
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index b03db37d..a47c06eb 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -550,6 +550,16 @@ export const guiOptionsScheme: {
         return <Category>Server Connection</Category>
       },
     },
+    {
+      saveLoginPassword: {
+        tooltip: 'Controls whether to save login passwords for servers in this browser memory.',
+        values: [
+          'prompt',
+          'always',
+          'never'
+        ]
+      },
+    },
     {
       custom () {
         const { serversAutoVersionSelect } = useSnapshot(options)
diff --git a/src/react/ChatProvider.tsx b/src/react/ChatProvider.tsx
index 0bb13285..066bc48a 100644
--- a/src/react/ChatProvider.tsx
+++ b/src/react/ChatProvider.tsx
@@ -73,16 +73,28 @@ export default () => {
       }
 
       const builtinHandled = tryHandleBuiltinCommand(message)
-      if (getServerIndex() !== undefined && (message.startsWith('/login') || message.startsWith('/register'))) {
-        showNotification('Click here to save your password in browser for auto-login', undefined, false, undefined, () => {
+      if (getServerIndex() !== undefined && (message.startsWith('/login') || message.startsWith('/register')) && options.saveLoginPassword !== 'never') {
+        const savePassword = () => {
+          let hadPassword = false
           updateLoadedServerData((server) => {
             server.autoLogin ??= {}
             const password = message.split(' ')[1]
+            hadPassword = !!server.autoLogin[bot.username]
             server.autoLogin[bot.username] = password
             return { ...server }
           })
-          hideNotification()
-        })
+          if (options.saveLoginPassword === 'always') {
+            const message = hadPassword ? 'Password updated in browser for auto-login' : 'Password saved in browser for auto-login'
+            showNotification(message, undefined, false, undefined)
+          } else {
+            hideNotification()
+          }
+        }
+        if (options.saveLoginPassword === 'prompt') {
+          showNotification('Click here to save your password in browser for auto-login', undefined, false, undefined, savePassword)
+        } else {
+          savePassword()
+        }
         notificationProxy.id = 'auto-login'
         const listener = () => {
           hideNotification()

From 852dd737aefc045a1d4193d17803d10a0cce1b48 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 11 Sep 2025 22:24:04 +0300
Subject: [PATCH 124/136] fix: fix some UI like error screen was not visible
 fully (buttons were clipped behind the screen) on larger scale on large
 screens

---
 src/screens.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/screens.css b/src/screens.css
index f0040e2d..e503c305 100644
--- a/src/screens.css
+++ b/src/screens.css
@@ -26,6 +26,10 @@
     display: flex;
     justify-content: center;
     z-index: 12;
+    /* Account for GUI scaling */
+    width: calc(100dvw / var(--guiScale, 1));
+    height: calc(100dvh / var(--guiScale, 1));
+    overflow: hidden;
 }
 
 .screen-content {

From c930365e329aef0c44845ab06aa42266f5a6a16e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 18 Sep 2025 07:49:44 +0300
Subject: [PATCH 125/136] fix sometimes inventory player should not be rendered

---
 src/inventoryWindows.ts          |  2 ++
 src/react/OverlayModelViewer.tsx | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index d16fee20..d40260df 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -470,6 +470,7 @@ const openWindow = (type: string | undefined, title: string | any = undefined) =
       const isRightClick = type === 'rightclick'
       const isLeftClick = type === 'leftclick'
       if (isLeftClick || isRightClick) {
+        modelViewerState.model = undefined
         inv.canvasManager.children[0].showRecipesOrUsages(isLeftClick, item)
       }
     } else {
@@ -501,6 +502,7 @@ const openWindow = (type: string | undefined, title: string | any = undefined) =
       if (freeSlot === null) return
       void bot.creative.setInventorySlot(freeSlot, item)
     } else {
+      modelViewerState.model = undefined
       inv.canvasManager.children[0].showRecipesOrUsages(!isRightclick, mapSlots([item], true)[0])
     }
   }
diff --git a/src/react/OverlayModelViewer.tsx b/src/react/OverlayModelViewer.tsx
index 24dc836d..0fdeae75 100644
--- a/src/react/OverlayModelViewer.tsx
+++ b/src/react/OverlayModelViewer.tsx
@@ -6,6 +6,7 @@ import { OBJLoader } from 'three/examples/jsm/loaders/OBJLoader'
 import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader'
 import { applySkinToPlayerObject, createPlayerObject, PlayerObjectType } from '../../renderer/viewer/lib/createPlayerObject'
 import { currentScaling } from '../scaleInterface'
+import { activeModalStack } from '../globalState'
 
 THREE.ColorManagement.enabled = false
 
@@ -29,6 +30,7 @@ export const modelViewerState = proxy({
     modelCustomization?: { [modelUrl: string]: { color?: string, opacity?: number, metalness?: number, roughness?: number } }
     resetRotationOnReleae?: boolean
     continiousRender?: boolean
+    alwaysRender?: boolean
   }
 })
 globalThis.modelViewerState = modelViewerState
@@ -75,6 +77,15 @@ globalThis.getModelViewerValues = () => {
   }
 }
 
+subscribe(activeModalStack, () => {
+  if (!modelViewerState.model || !modelViewerState.model?.alwaysRender) {
+    return
+  }
+  if (activeModalStack.length === 0) {
+    modelViewerState.model = undefined
+  }
+})
+
 export default () => {
   const { model } = useSnapshot(modelViewerState)
   const containerRef = useRef<HTMLDivElement>(null)

From 636a7fdb54a2fec622b5b31da4691a632049b5f0 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Fri, 19 Sep 2025 04:42:22 +0200
Subject: [PATCH 126/136] feat: improve fog a little (#427)

---
 renderer/viewer/three/skyboxRenderer.ts | 43 ++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/renderer/viewer/three/skyboxRenderer.ts b/renderer/viewer/three/skyboxRenderer.ts
index cd7bd879..fb9edae6 100644
--- a/renderer/viewer/three/skyboxRenderer.ts
+++ b/renderer/viewer/three/skyboxRenderer.ts
@@ -1,4 +1,5 @@
 import * as THREE from 'three'
+import { DebugGui } from '../lib/DebugGui'
 
 export const DEFAULT_TEMPERATURE = 0.75
 
@@ -17,11 +18,33 @@ export class SkyboxRenderer {
   private waterBreathing = false
   private fogBrightness = 0
   private prevFogBrightness = 0
+  private readonly fogOrangeness = 0 // Debug property to control sky color orangeness
+  private readonly distanceFactor = 2.7
+
+  private readonly brightnessAtPosition = 1
+  debugGui: DebugGui
 
   constructor (private readonly scene: THREE.Scene, public defaultSkybox: boolean, public initialImage: string | null) {
+    this.debugGui = new DebugGui('skybox_renderer', this, [
+      'temperature',
+      'worldTime',
+      'inWater',
+      'waterBreathing',
+      'fogOrangeness',
+      'brightnessAtPosition',
+      'distanceFactor'
+    ], {
+      brightnessAtPosition: { min: 0, max: 1, step: 0.01 },
+      temperature: { min: 0, max: 1, step: 0.01 },
+      worldTime: { min: 0, max: 24_000, step: 1 },
+      fogOrangeness: { min: -1, max: 1, step: 0.01 },
+      distanceFactor: { min: 0, max: 5, step: 0.01 },
+    })
+
     if (!initialImage) {
       this.createGradientSky()
     }
+    // this.debugGui.activate()
   }
 
   async init () {
@@ -95,6 +118,7 @@ export class SkyboxRenderer {
 
   // Update world time
   updateTime (timeOfDay: number, partialTicks = 0) {
+    if (this.debugGui.visible) return
     this.worldTime = timeOfDay
     this.partialTicks = partialTicks
     this.updateSkyColors()
@@ -108,12 +132,14 @@ export class SkyboxRenderer {
 
   // Update temperature (for biome support)
   updateTemperature (temperature: number) {
+    if (this.debugGui.visible) return
     this.temperature = temperature
     this.updateSkyColors()
   }
 
   // Update water state
   updateWaterState (inWater: boolean, waterBreathing: boolean) {
+    if (this.debugGui.visible) return
     this.inWater = inWater
     this.waterBreathing = waterBreathing
     this.updateSkyColors()
@@ -121,6 +147,7 @@ export class SkyboxRenderer {
 
   // Update default skybox setting
   updateDefaultSkybox (defaultSkybox: boolean) {
+    if (this.debugGui.visible) return
     this.defaultSkybox = defaultSkybox
     this.updateSkyColors()
   }
@@ -229,8 +256,15 @@ export class SkyboxRenderer {
     if (temperature < -1) temperature = -1
     if (temperature > 1) temperature = 1
 
-    const hue = 0.622_222_2 - temperature * 0.05
-    const saturation = 0.5 + temperature * 0.1
+    // Apply debug fog orangeness to hue - positive values make it more orange, negative make it less orange
+    const baseHue = 0.622_222_2 - temperature * 0.05
+    // Orange is around hue 0.08-0.15, so we need to shift from blue-purple (0.62) toward orange
+    // Use a more dramatic shift and also increase saturation for more noticeable effect
+    const orangeHue = 0.12 // Orange hue value
+    const hue = this.fogOrangeness > 0
+      ? baseHue + (orangeHue - baseHue) * this.fogOrangeness * 0.8 // Blend toward orange
+      : baseHue + this.fogOrangeness * 0.1 // Subtle shift for negative values
+    const saturation = 0.5 + temperature * 0.1 + Math.abs(this.fogOrangeness) * 0.3 // Increase saturation with orangeness
     const brightness = 1
 
     return this.hsbToRgb(hue, saturation, brightness)
@@ -305,8 +339,7 @@ export class SkyboxRenderer {
     // Update fog brightness with smooth transition
     this.prevFogBrightness = this.fogBrightness
     const renderDistance = this.viewDistance / 32
-    const brightnessAtPosition = 1 // Could be affected by light level in future
-    const targetBrightness = brightnessAtPosition * (1 - renderDistance) + renderDistance
+    const targetBrightness = this.brightnessAtPosition * (1 - renderDistance) + renderDistance
     this.fogBrightness += (targetBrightness - this.fogBrightness) * 0.1
 
     // Handle water fog
@@ -340,7 +373,7 @@ export class SkyboxRenderer {
     const blue = (fogColor.z + (skyColor.z - fogColor.z) * viewFactor) * clampedBrightness * interpolatedBrightness
 
     this.scene.background = new THREE.Color(red, green, blue)
-    this.scene.fog = new THREE.Fog(new THREE.Color(red, green, blue), 0.0025, viewDistance * 2)
+    this.scene.fog = new THREE.Fog(new THREE.Color(red, green, blue), 0.0025, viewDistance * this.distanceFactor)
 
     ;(this.skyMesh.material as THREE.MeshBasicMaterial).color.set(new THREE.Color(skyColor.x, skyColor.y, skyColor.z))
     ;(this.voidMesh.material as THREE.MeshBasicMaterial).color.set(new THREE.Color(

From 3b94889bed40e9c687be52c5ca9a87172c6c6a9d Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sat, 20 Sep 2025 01:57:59 +0200
Subject: [PATCH 127/136] feat: make arrows colorful and metadata (#430)

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
---
 renderer/viewer/three/waypointSprite.ts | 36 ++++++++++++++++++++-----
 renderer/viewer/three/waypoints.ts      |  4 ++-
 src/customChannels.ts                   | 17 +++++++++++-
 3 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/renderer/viewer/three/waypointSprite.ts b/renderer/viewer/three/waypointSprite.ts
index 7c8cf1f6..6a30e6db 100644
--- a/renderer/viewer/three/waypointSprite.ts
+++ b/renderer/viewer/three/waypointSprite.ts
@@ -16,7 +16,7 @@ export const WAYPOINT_CONFIG = {
   CANVAS_SCALE: 2,
   ARROW: {
     enabledDefault: false,
-    pixelSize: 30,
+    pixelSize: 50,
     paddingPx: 50,
   },
 }
@@ -50,6 +50,7 @@ export function createWaypointSprite (options: {
   depthTest?: boolean,
   // Y offset in world units used by updateScaleWorld only (screen-pixel API ignores this)
   labelYOffset?: number,
+  metadata?: any,
 }): WaypointSprite {
   const color = options.color ?? 0xFF_00_00
   const depthTest = options.depthTest ?? false
@@ -131,16 +132,22 @@ export function createWaypointSprite (options: {
     canvas.height = size
     const ctx = canvas.getContext('2d')!
     ctx.clearRect(0, 0, size, size)
+
+    // Draw arrow shape
     ctx.beginPath()
-    ctx.moveTo(size * 0.2, size * 0.5)
-    ctx.lineTo(size * 0.8, size * 0.5)
-    ctx.lineTo(size * 0.5, size * 0.2)
+    ctx.moveTo(size * 0.15, size * 0.5)
+    ctx.lineTo(size * 0.85, size * 0.5)
+    ctx.lineTo(size * 0.5, size * 0.15)
     ctx.closePath()
-    ctx.lineWidth = 4
+
+    // Use waypoint color for arrow
+    const colorHex = `#${color.toString(16).padStart(6, '0')}`
+    ctx.lineWidth = 6
     ctx.strokeStyle = 'black'
     ctx.stroke()
-    ctx.fillStyle = 'white'
+    ctx.fillStyle = colorHex
     ctx.fill()
+
     const texture = new THREE.CanvasTexture(canvas)
     const material = new THREE.SpriteMaterial({ map: texture, transparent: true, depthTest: false, depthWrite: false })
     arrowSprite = new THREE.Sprite(material)
@@ -169,6 +176,9 @@ export function createWaypointSprite (options: {
     ensureArrow()
     if (!arrowSprite) return true
 
+    // Check if onlyLeftRight is enabled in metadata
+    const onlyLeftRight = options.metadata?.onlyLeftRight === true
+
     // Build camera basis using camera.up to respect custom orientations
     const forward = new THREE.Vector3()
     camera.getWorldDirection(forward) // camera look direction
@@ -213,6 +223,20 @@ export function createWaypointSprite (options: {
       }
     }
 
+    // Apply onlyLeftRight logic - restrict arrows to left/right edges only
+    if (onlyLeftRight) {
+      // Force the arrow to appear only on left or right edges
+      if (Math.abs(rx) > Math.abs(ry)) {
+        // Horizontal direction is dominant, keep it
+        ry = 0
+      } else {
+        // Vertical direction is dominant, but we want only left/right
+        // So choose left or right based on the sign of rx
+        rx = rx >= 0 ? 1 : -1
+        ry = 0
+      }
+    }
+
     // Place on the rectangle border [-1,1]x[-1,1]
     const s = Math.max(Math.abs(rx), Math.abs(ry)) || 1
     let ndcX = rx / s
diff --git a/renderer/viewer/three/waypoints.ts b/renderer/viewer/three/waypoints.ts
index cebd779a..256ca6df 100644
--- a/renderer/viewer/three/waypoints.ts
+++ b/renderer/viewer/three/waypoints.ts
@@ -17,6 +17,7 @@ interface WaypointOptions {
   color?: number
   label?: string
   minDistance?: number
+  metadata?: any
 }
 
 export class WaypointsRenderer {
@@ -71,13 +72,14 @@ export class WaypointsRenderer {
     this.removeWaypoint(id)
 
     const color = options.color ?? 0xFF_00_00
-    const { label } = options
+    const { label, metadata } = options
     const minDistance = options.minDistance ?? 0
 
     const sprite = createWaypointSprite({
       position: new THREE.Vector3(x, y, z),
       color,
       label: (label || id),
+      metadata,
     })
     sprite.enableOffscreenArrow(true)
     sprite.setArrowParent(this.waypointScene)
diff --git a/src/customChannels.ts b/src/customChannels.ts
index b566f9dd..506ea776 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -82,15 +82,30 @@ const registerWaypointChannels = () => {
       {
         name: 'color',
         type: 'i32'
+      },
+      {
+        name: 'metadataJson',
+        type: ['pstring', { countType: 'i16' }]
       }
     ]
   ]
 
   registerChannel('minecraft-web-client:waypoint-add', packetStructure, (data) => {
+    // Parse metadata if provided
+    let metadata: any = {}
+    if (data.metadataJson && data.metadataJson.trim() !== '') {
+      try {
+        metadata = JSON.parse(data.metadataJson)
+      } catch (error) {
+        console.warn('Failed to parse waypoint metadataJson:', error)
+      }
+    }
+
     getThreeJsRendererMethods()?.addWaypoint(data.id, data.x, data.y, data.z, {
       minDistance: data.minDistance,
       label: data.label || undefined,
-      color: data.color || undefined
+      color: data.color || undefined,
+      metadata
     })
   })
 

From 4f421ae45fda892cc364cc60de47e4fc79799eee Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 28 Sep 2025 21:59:00 +0300
Subject: [PATCH 128/136] respect loadPlayerSkins option for inventory skin

---
 src/watchOptions.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index 779aa29f..de7d30d3 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -3,6 +3,7 @@
 import { subscribeKey } from 'valtio/utils'
 import { isMobile } from 'renderer/viewer/lib/simpleUtils'
 import { WorldDataEmitter } from 'renderer/viewer/lib/worldDataEmitter'
+import { setSkinsConfig } from 'renderer/viewer/lib/utils/skins'
 import { options, watchValue } from './optionsStorage'
 import { reloadChunks } from './utils'
 import { miscUiState } from './globalState'
@@ -97,6 +98,8 @@ export const watchOptionsAfterViewerInit = () => {
     appViewer.inWorldRenderingConfig.highlightBlockColor = o.highlightBlockColor
     appViewer.inWorldRenderingConfig._experimentalSmoothChunkLoading = o.rendererSharedOptions._experimentalSmoothChunkLoading
     appViewer.inWorldRenderingConfig._renderByChunks = o.rendererSharedOptions._renderByChunks
+
+    setSkinsConfig({ apiEnabled: o.loadPlayerSkins })
   })
 
   appViewer.inWorldRenderingConfig.smoothLighting = options.smoothLighting

From b239636356c9bb828181cf069c3756c722cebd33 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 28 Sep 2025 22:04:17 +0300
Subject: [PATCH 129/136] feat: add debugServerPacketNames and
 debugClientPacketNames for quick access of names with intellisense of packets
 for current protocol. Should be used with `window.inspectPacket` in console

---
 src/devtools.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/devtools.ts b/src/devtools.ts
index 6c47f73d..1f8ef8e8 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -5,6 +5,17 @@ import { WorldRendererThree } from 'renderer/viewer/three/worldrendererThree'
 import { enable, disable, enabled } from 'debug'
 import { Vec3 } from 'vec3'
 
+customEvents.on('mineflayerBotCreated', () => {
+  window.debugServerPacketNames = Object.fromEntries(Object.keys(loadedData.protocol.play.toClient.types).map(name => {
+    name = name.replace('packet_', '')
+    return [name, name]
+  }))
+  window.debugClientPacketNames = Object.fromEntries(Object.keys(loadedData.protocol.play.toServer.types).map(name => {
+    name = name.replace('packet_', '')
+    return [name, name]
+  }))
+})
+
 window.Vec3 = Vec3
 window.cursorBlockRel = (x = 0, y = 0, z = 0) => {
   const newPos = bot.blockAtCursor(5)?.position.offset(x, y, z)

From 05cd560d6b67e287acd6684ffeacc0db4b0b2386 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 29 Sep 2025 02:01:04 +0300
Subject: [PATCH 130/136] add shadow and directional light for player in
 inventory (model viewer)

---
 src/react/OverlayModelViewer.tsx | 54 +++++++++++++++++++++++++++-----
 1 file changed, 46 insertions(+), 8 deletions(-)

diff --git a/src/react/OverlayModelViewer.tsx b/src/react/OverlayModelViewer.tsx
index 0fdeae75..e48a2f0b 100644
--- a/src/react/OverlayModelViewer.tsx
+++ b/src/react/OverlayModelViewer.tsx
@@ -119,11 +119,15 @@ export default () => {
     modelLoaders.current.set(modelUrl, loader)
 
     const onLoad = (object: THREE.Object3D) => {
-      // Apply customization if available
+      // Apply customization if available and enable shadows
       const customization = model?.modelCustomization?.[modelUrl]
-      if (customization) {
-        object.traverse((child) => {
-          if (child instanceof THREE.Mesh && child.material) {
+      object.traverse((child) => {
+        if (child instanceof THREE.Mesh) {
+          // Enable shadow casting and receiving for all meshes
+          child.castShadow = true
+          child.receiveShadow = true
+
+          if (child.material && customization) {
             const material = child.material as THREE.MeshStandardMaterial
             if (customization.color) {
               material.color.setHex(parseInt(customization.color.replace('#', ''), 16))
@@ -139,8 +143,8 @@ export default () => {
               material.roughness = customization.roughness
             }
           }
-        })
-      }
+        }
+      })
 
       // Center and scale model
       const box = new THREE.Box3().setFromObject(object)
@@ -259,6 +263,12 @@ export default () => {
     }
     renderer.setPixelRatio(scale)
     renderer.setSize(model.positioning.width, model.positioning.height)
+
+    // Enable shadow rendering for depth and realism
+    renderer.shadowMap.enabled = true
+    renderer.shadowMap.type = THREE.PCFSoftShadowMap // Soft shadows for better quality
+    renderer.shadowMap.autoUpdate = true
+
     containerRef.current.appendChild(renderer.domElement)
 
     // Setup controls
@@ -270,10 +280,30 @@ export default () => {
     controls.enableDamping = true
     controls.dampingFactor = 0.05
 
-    // Add ambient light
-    const ambientLight = new THREE.AmbientLight(0xff_ff_ff, 1)
+    // Add ambient light for overall illumination
+    const ambientLight = new THREE.AmbientLight(0xff_ff_ff, 0.4) // Reduced intensity to allow shadows
     scene.add(ambientLight)
 
+    // Add directional light for shadows and depth (similar to Minecraft inventory lighting)
+    const directionalLight = new THREE.DirectionalLight(0xff_ff_ff, 0.6)
+    directionalLight.position.set(2, 2, 2) // Position light from top-right-front
+    directionalLight.target.position.set(0, 0, 0) // Point towards center of scene
+
+    // Configure shadow properties for optimal quality
+    directionalLight.castShadow = true
+    directionalLight.shadow.mapSize.width = 2048 // High resolution shadow map
+    directionalLight.shadow.mapSize.height = 2048
+    directionalLight.shadow.camera.near = 0.1
+    directionalLight.shadow.camera.far = 10
+    directionalLight.shadow.camera.left = -3
+    directionalLight.shadow.camera.right = 3
+    directionalLight.shadow.camera.top = 3
+    directionalLight.shadow.camera.bottom = -3
+    directionalLight.shadow.bias = -0.0001 // Reduce shadow acne
+
+    scene.add(directionalLight)
+    scene.add(directionalLight.target)
+
     // Cursor following function
     const updatePlayerLookAt = () => {
       if (!isFollowingCursor.current || !sceneRef.current?.playerObject) return
@@ -342,6 +372,14 @@ export default () => {
           scale: 1 // Start with base scale, will adjust below
         })
 
+        // Enable shadows for player object
+        wrapper.traverse((child) => {
+          if (child instanceof THREE.Mesh) {
+            child.castShadow = true
+            child.receiveShadow = true
+          }
+        })
+
         // Calculate proper scale and positioning for camera view
         const box = new THREE.Box3().setFromObject(wrapper)
         const size = box.getSize(new THREE.Vector3())

From f51254d97a9a04be3eb5750d214c59e0c41ffe76 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 30 Sep 2025 07:20:30 +0300
Subject: [PATCH 131/136] fix: dont stop local replay server with keep alive
 connection error

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

diff --git a/src/packetsReplay/replayPackets.ts b/src/packetsReplay/replayPackets.ts
index d0d95da8..54b3d652 100644
--- a/src/packetsReplay/replayPackets.ts
+++ b/src/packetsReplay/replayPackets.ts
@@ -59,6 +59,7 @@ export const startLocalReplayServer = (contents: string) => {
   const server = createServer({
     Server: LocalServer as any,
     version: header.minecraftVersion,
+    keepAlive: false,
     'online-mode': false
   })
 

From a88c8b547044c1dab9c759e56794d614cc41ffa4 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 30 Sep 2025 09:38:37 +0300
Subject: [PATCH 132/136] possible fix for rare edgecase where skins from
 server were not applied. Cause: renderer due to rare circumnstances could be
 loaded AFTER gameLoaded which is fired only when starting rendering 3d world.
 classic no existing data handling issue

why not mineflayerBotCreated? because getThreeJsRendererMethods not available at that time so would make things only much complex
---
 src/entities.ts | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/entities.ts b/src/entities.ts
index dcec6143..674f91ef 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -246,22 +246,29 @@ customEvents.on('gameLoaded', () => {
         }
       }
       // even if not found, still record to cache
-      void getThreeJsRendererMethods()?.updatePlayerSkin(entityId, player.username, player.uuid, skinUrl ?? true, capeUrl)
+      void getThreeJsRendererMethods()!.updatePlayerSkin(entityId, player.username, player.uuid, skinUrl ?? true, capeUrl)
     } catch (err) {
-      console.error('Error decoding player texture:', err)
+      reportError(new Error('Error applying skin texture:', { cause: err }))
     }
   }
 
   bot.on('playerJoined', updateSkin)
   bot.on('playerUpdated', updateSkin)
+  for (const entity of Object.values(bot.players)) {
+    updateSkin(entity)
+  }
 
-  bot.on('teamUpdated', (team: Team) => {
+  const teamUpdated = (team: Team) => {
     for (const entity of Object.values(bot.entities)) {
       if (entity.type === 'player' && entity.username && team.members.includes(entity.username) || entity.uuid && team.members.includes(entity.uuid)) {
         bot.emit('entityUpdate', entity)
       }
     }
-  })
+  }
+  bot.on('teamUpdated', teamUpdated)
+  for (const team of Object.values(bot.teams)) {
+    teamUpdated(team)
+  }
 
   const updateEntityNameTags = (team: Team) => {
     for (const entity of Object.values(bot.entities)) {

From 634df8d03dfd90aa978433e39c23376a4116a15d Mon Sep 17 00:00:00 2001
From: Colbster937 <colbychittenden@gmail.com>
Date: Fri, 10 Oct 2025 17:52:06 -0500
Subject: [PATCH 133/136] Add WebMC & WS changes (#431)

Co-authored-by: Colbster937 <96893162+colbychittenden@users.noreply.github.com>
---
 config.json                       | 4 ++++
 src/appConfig.ts                  | 2 +-
 src/mineflayer/websocket-core.ts  | 7 +++++--
 src/react/AddServerOrConnect.tsx  | 2 +-
 src/react/ServersListProvider.tsx | 2 ++
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/config.json b/config.json
index 940fb738..2bfa9cfe 100644
--- a/config.json
+++ b/config.json
@@ -10,6 +10,10 @@
     {
       "ip": "wss://play.mcraft.fun"
     },
+    {
+      "ip": "wss://play.webmc.fun",
+      "name": "WebMC"
+    },
     {
       "ip": "wss://ws.fuchsmc.net"
     },
diff --git a/src/appConfig.ts b/src/appConfig.ts
index 92fde21a..c29d74e8 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -35,7 +35,7 @@ export type AppConfig = {
   // defaultVersion?: string
   peerJsServer?: string
   peerJsServerFallback?: string
-  promoteServers?: Array<{ ip, description, version? }>
+  promoteServers?: Array<{ ip, description, name?, version?, }>
   mapsProvider?: string
 
   appParams?: Record<string, any> // query string params
diff --git a/src/mineflayer/websocket-core.ts b/src/mineflayer/websocket-core.ts
index 0edd2497..f8163102 100644
--- a/src/mineflayer/websocket-core.ts
+++ b/src/mineflayer/websocket-core.ts
@@ -15,9 +15,12 @@ class CustomDuplex extends Duplex {
 }
 
 export const getWebsocketStream = async (host: string) => {
-  const baseProtocol = location.protocol === 'https:' ? 'wss' : host.startsWith('ws://') ? 'ws' : 'wss'
+  const baseProtocol = host.startsWith('ws://') ? 'ws' : 'wss'
   const hostClean = host.replace('ws://', '').replace('wss://', '')
-  const ws = new WebSocket(`${baseProtocol}://${hostClean}`)
+  const hostURL = new URL(`${baseProtocol}://${hostClean}`)
+  const hostParams = hostURL.searchParams
+  hostParams.append('client_mcraft', '')
+  const ws = new WebSocket(`${baseProtocol}://${hostURL.host}${hostURL.pathname}?${hostParams.toString()}`)
   const clientDuplex = new CustomDuplex(undefined, data => {
     ws.send(data)
   })
diff --git a/src/react/AddServerOrConnect.tsx b/src/react/AddServerOrConnect.tsx
index d478b3e7..36fd5264 100644
--- a/src/react/AddServerOrConnect.tsx
+++ b/src/react/AddServerOrConnect.tsx
@@ -117,7 +117,7 @@ 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']
+  const serverExamples = ['example.com:25565', 'play.hypixel.net', 'ws://play.pcm.gg', 'wss://play.webmc.fun']
   // pick random example
   const example = serverExamples[Math.floor(Math.random() * serverExamples.length)]
 
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index 75f95d3f..42ef2aaa 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -119,6 +119,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
     ...serversListProvided,
     ...(customServersList ? [] : (miscUiState.appConfig?.promoteServers ?? [])).map((server): StoreServerItem => ({
       ip: server.ip,
+      name: server.name,
       versionOverride: server.version,
       description: server.description,
       isRecommended: true
@@ -167,6 +168,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
                   console.log('pingResult.fullInfo.description', pingResult.fullInfo.description)
                   data = {
                     formattedText: pingResult.fullInfo.description,
+                    icon: pingResult.fullInfo.favicon,
                     textNameRight: `ws ${pingResult.latency}ms`,
                     textNameRightGrayed: `${pingResult.fullInfo.players?.online ?? '??'}/${pingResult.fullInfo.players?.max ?? '??'}`,
                     offline: false

From e9f91f8ecda1488c636f35f58cc522f459a29f82 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 11 Oct 2025 02:24:51 +0300
Subject: [PATCH 134/136] feat: enable music by default, add slider for
 controlling its volume

---
 src/basicSounds.ts         | 30 ++++++++++++++++++++----------
 src/defaultOptions.ts      |  3 ++-
 src/optionsGuiScheme.tsx   | 18 ++++++++++++++++++
 src/react/OptionsItems.tsx | 13 +++++++++++--
 src/sounds/musicSystem.ts  |  4 ++--
 5 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/src/basicSounds.ts b/src/basicSounds.ts
index 37f8dccd..54af0d35 100644
--- a/src/basicSounds.ts
+++ b/src/basicSounds.ts
@@ -7,7 +7,12 @@ let audioContext: AudioContext
 const sounds: Record<string, any> = {}
 
 // Track currently playing sounds and their gain nodes
-const activeSounds: Array<{ source: AudioBufferSourceNode; gainNode: GainNode; volumeMultiplier: number }> = []
+const activeSounds: Array<{
+  source: AudioBufferSourceNode;
+  gainNode: GainNode;
+  volumeMultiplier: number;
+  isMusic: boolean;
+}> = []
 window.activeSounds = activeSounds
 
 // load as many resources on page load as possible instead on demand as user can disable internet connection after he thinks the page is loaded
@@ -43,7 +48,7 @@ export async function loadSound (path: string, contents = path) {
   }
 }
 
-export const loadOrPlaySound = async (url, soundVolume = 1, loadTimeout = options.remoteSoundsLoadTimeout, loop = false) => {
+export const loadOrPlaySound = async (url, soundVolume = 1, loadTimeout = options.remoteSoundsLoadTimeout, loop = false, isMusic = false) => {
   const soundBuffer = sounds[url]
   if (!soundBuffer) {
     const start = Date.now()
@@ -51,11 +56,11 @@ export const loadOrPlaySound = async (url, soundVolume = 1, loadTimeout = option
     if (cancelled || Date.now() - start > loadTimeout) return
   }
 
-  return playSound(url, soundVolume, loop)
+  return playSound(url, soundVolume, loop, isMusic)
 }
 
-export async function playSound (url, soundVolume = 1, loop = false) {
-  const volume = soundVolume * (options.volume / 100)
+export async function playSound (url, soundVolume = 1, loop = false, isMusic = false) {
+  const volume = soundVolume * (options.volume / 100) * (isMusic ? options.musicVolume / 100 : 1)
 
   if (!volume) return
 
@@ -82,7 +87,7 @@ export async function playSound (url, soundVolume = 1, loop = false) {
   source.start(0)
 
   // Add to active sounds
-  activeSounds.push({ source, gainNode, volumeMultiplier: soundVolume })
+  activeSounds.push({ source, gainNode, volumeMultiplier: soundVolume, isMusic })
 
   const callbacks = [] as Array<() => void>
   source.onended = () => {
@@ -110,6 +115,7 @@ export async function playSound (url, soundVolume = 1, loop = false) {
         console.warn('Failed to stop sound:', err)
       }
     },
+    gainNode,
   }
 }
 
@@ -137,11 +143,11 @@ export function stopSound (url: string) {
   }
 }
 
-export function changeVolumeOfCurrentlyPlayingSounds (newVolume: number) {
+export function changeVolumeOfCurrentlyPlayingSounds (newVolume: number, newMusicVolume: number) {
   const normalizedVolume = newVolume / 100
-  for (const { gainNode, volumeMultiplier } of activeSounds) {
+  for (const { gainNode, volumeMultiplier, isMusic } of activeSounds) {
     try {
-      gainNode.gain.value = normalizedVolume * volumeMultiplier
+      gainNode.gain.value = normalizedVolume * volumeMultiplier * (isMusic ? newMusicVolume / 100 : 1)
     } catch (err) {
       console.warn('Failed to change sound volume:', err)
     }
@@ -149,5 +155,9 @@ export function changeVolumeOfCurrentlyPlayingSounds (newVolume: number) {
 }
 
 subscribeKey(options, 'volume', () => {
-  changeVolumeOfCurrentlyPlayingSounds(options.volume)
+  changeVolumeOfCurrentlyPlayingSounds(options.volume, options.musicVolume)
+})
+
+subscribeKey(options, 'musicVolume', () => {
+  changeVolumeOfCurrentlyPlayingSounds(options.volume, options.musicVolume)
 })
diff --git a/src/defaultOptions.ts b/src/defaultOptions.ts
index 85ebae17..48c1cfad 100644
--- a/src/defaultOptions.ts
+++ b/src/defaultOptions.ts
@@ -16,7 +16,8 @@ export const defaultOptions = {
   chatOpacityOpened: 100,
   messagesLimit: 200,
   volume: 50,
-  enableMusic: false,
+  enableMusic: true,
+  musicVolume: 50,
   // fov: 70,
   fov: 75,
   defaultPerspective: 'first_person' as 'first_person' | 'third_person_back' | 'third_person_front',
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index a47c06eb..0cb0fe1e 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -480,6 +480,24 @@ export const guiOptionsScheme: {
   ],
   sound: [
     { volume: {} },
+    {
+      custom () {
+        return <OptionSlider
+          valueOverride={options.enableMusic ? undefined : 0}
+          onChange={(value) => {
+            options.musicVolume = value
+          }}
+          item={{
+            type: 'slider',
+            id: 'musicVolume',
+            text: 'Music Volume',
+            min: 0,
+            max: 100,
+            unit: '%',
+          }}
+        />
+      },
+    },
     {
       custom () {
         return <Button label='Sound Muffler' onClick={() => showModal({ reactType: 'sound-muffler' })} inScreen />
diff --git a/src/react/OptionsItems.tsx b/src/react/OptionsItems.tsx
index ccc04bcb..97e88d34 100644
--- a/src/react/OptionsItems.tsx
+++ b/src/react/OptionsItems.tsx
@@ -161,7 +161,15 @@ export const OptionButton = ({ item, onClick, valueText, cacheKey }: {
   />
 }
 
-export const OptionSlider = ({ item }: { item: Extract<OptionMeta, { type: 'slider' }> }) => {
+export const OptionSlider = ({
+  item,
+  onChange,
+  valueOverride
+}: {
+  item: Extract<OptionMeta, { type: 'slider' }>
+  onChange?: (value: number) => void
+  valueOverride?: number
+}) => {
   const { disabledBecauseOfSetting } = useCommonComponentsProps(item)
 
   const optionValue = useSnapshot(options)[item.id!]
@@ -174,7 +182,7 @@ export const OptionSlider = ({ item }: { item: Extract<OptionMeta, { type: 'slid
   return (
     <Slider
       label={item.text!}
-      value={options[item.id!]}
+      value={valueOverride ?? options[item.id!]}
       data-setting={item.id}
       disabledReason={isLocked(item) ? 'qs' : disabledBecauseOfSetting ? `Disabled because ${item.disableIf![0]} is ${item.disableIf![1]}` : item.disabledReason}
       min={item.min}
@@ -184,6 +192,7 @@ export const OptionSlider = ({ item }: { item: Extract<OptionMeta, { type: 'slid
       updateOnDragEnd={item.delayApply}
       updateValue={(value) => {
         options[item.id!] = value
+        onChange?.(value)
       }}
     />
   )
diff --git a/src/sounds/musicSystem.ts b/src/sounds/musicSystem.ts
index ecabf43e..8fad4c74 100644
--- a/src/sounds/musicSystem.ts
+++ b/src/sounds/musicSystem.ts
@@ -5,10 +5,10 @@ class MusicSystem {
   private currentMusic: string | null = null
 
   async playMusic (url: string, musicVolume = 1) {
-    if (!options.enableMusic || this.currentMusic) return
+    if (!options.enableMusic || this.currentMusic || options.musicVolume === 0) return
 
     try {
-      const { onEnded } = await loadOrPlaySound(url, 0.5 * musicVolume, 5000) ?? {}
+      const { onEnded } = await loadOrPlaySound(url, musicVolume, 5000, undefined, true) ?? {}
 
       if (!onEnded) return
 

From fef94f03fb21131cb68a1b665901fb7687afcd13 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 11 Oct 2025 02:25:06 +0300
Subject: [PATCH 135/136] feat: add support for alt+arrows navigation to
 navigate between commands only

---
 src/react/Chat.tsx | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index 20d77a10..d927a558 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -125,7 +125,9 @@ export default ({
   const chatInput = useRef<HTMLInputElement>(null!)
   const chatMessages = useRef<HTMLDivElement>(null)
   const chatHistoryPos = useRef(sendHistoryRef.current.length)
+  const commandHistoryPos = useRef(0)
   const inputCurrentlyEnteredValue = useRef('')
+  const commandHistoryRef = useRef(sendHistoryRef.current.filter((msg: string) => msg.startsWith('/')))
 
   const { scrollToBottom, isAtBottom, wasAtBottom, currentlyAtBottom } = useScrollBehavior(chatMessages, { messages, opened })
   const [rightNowAtBottom, setRightNowAtBottom] = useState(false)
@@ -142,6 +144,9 @@ export default ({
     sendHistoryRef.current = newHistory
     window.sessionStorage.chatHistory = JSON.stringify(newHistory)
     chatHistoryPos.current = newHistory.length
+    // Update command history (only messages starting with /)
+    commandHistoryRef.current = newHistory.filter((msg: string) => msg.startsWith('/'))
+    commandHistoryPos.current = commandHistoryRef.current.length
   }
 
   const acceptComplete = (item: string) => {
@@ -180,6 +185,21 @@ export default ({
     updateInputValue(sendHistoryRef.current[chatHistoryPos.current] || inputCurrentlyEnteredValue.current || '')
   }
 
+  const handleCommandArrowUp = () => {
+    if (commandHistoryPos.current === 0 || commandHistoryRef.current.length === 0) return
+    if (commandHistoryPos.current === commandHistoryRef.current.length) { // started navigating command history
+      inputCurrentlyEnteredValue.current = chatInput.current.value
+    }
+    commandHistoryPos.current--
+    updateInputValue(commandHistoryRef.current[commandHistoryPos.current] || '')
+  }
+
+  const handleCommandArrowDown = () => {
+    if (commandHistoryPos.current === commandHistoryRef.current.length) return
+    commandHistoryPos.current++
+    updateInputValue(commandHistoryRef.current[commandHistoryPos.current] || inputCurrentlyEnteredValue.current || '')
+  }
+
   const auxInputFocus = (direction: 'up' | 'down') => {
     chatInput.current.focus()
     if (direction === 'up') {
@@ -203,6 +223,7 @@ export default ({
       updateInputValue(chatInputValueGlobal.value)
       chatInputValueGlobal.value = ''
       chatHistoryPos.current = sendHistoryRef.current.length
+      commandHistoryPos.current = commandHistoryRef.current.length
       if (!usingTouch) {
         chatInput.current.focus()
       }
@@ -524,9 +545,19 @@ export default ({
               onBlur={() => setIsInputFocused(false)}
               onKeyDown={(e) => {
                 if (e.code === 'ArrowUp') {
-                  handleArrowUp()
+                  if (e.altKey) {
+                    handleCommandArrowUp()
+                    e.preventDefault()
+                  } else {
+                    handleArrowUp()
+                  }
                 } else if (e.code === 'ArrowDown') {
-                  handleArrowDown()
+                  if (e.altKey) {
+                    handleCommandArrowDown()
+                    e.preventDefault()
+                  } else {
+                    handleArrowDown()
+                  }
                 }
                 if (e.code === 'Tab') {
                   if (completionItemsSource.length) {

From 253e094c745cf7b5e2e7a974866c8d098082fc3d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 11 Oct 2025 02:25:14 +0300
Subject: [PATCH 136/136] add zardoy/mwc-proxy repo ref

---
 README.MD | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.MD b/README.MD
index 74d4eb41..018784e3 100644
--- a/README.MD
+++ b/README.MD
@@ -78,6 +78,8 @@ There is a builtin proxy, but you can also host your one! Just clone the repo, r
 
 [![Deploy to Koyeb](https://www.koyeb.com/static/images/deploy/button.svg)](https://app.koyeb.com/deploy?name=minecraft-web-client&type=git&repository=zardoy%2Fminecraft-web-client&branch=next&builder=dockerfile&env%5B%5D=&ports=8080%3Bhttp%3B%2F)
 
+> **Note**: If you want to make **your own** Minecraft server accessible to web clients (without our proxies), you can use [mwc-proxy](https://github.com/zardoy/mwc-proxy) - a lightweight JS WebSocket proxy that runs on the same server as your Minecraft server, allowing players to connect directly via `wss://play.example.com`. `?client_mcraft` is added to the URL, so the proxy will know that it's this client.
+
 Proxy servers are used to connect to Minecraft servers which use TCP protocol. When you connect connect to a server with a proxy, websocket connection is created between you (browser client) and the proxy server located in Europe, then the proxy connects to the Minecraft server and sends the data to the client (you) without any packet deserialization to avoid any additional delays. That said all the Minecraft protocol packets are processed by the client, right in your browser.
 
 ```mermaid