Merge branch 'next'

src/browserfs.ts

@@ -7,7 +7,7 @@ import * as browserfs from 'browserfs'
 import { options, resetOptions } from './optionsStorage'
 
 import { fsState, loadSave } from './loadSave'
-import { installTexturePackFromHandle, updateTexturePackInstalledState } from './texturePack'
+import { installTexturePack, installTexturePackFromHandle, updateTexturePackInstalledState } from './texturePack'
 import { miscUiState } from './globalState'
 import { setLoadingScreenStatus } from './utils'
 
@@ -422,3 +422,42 @@ export const resetLocalStorageWithoutWorld = () => {
 }
 
 window.resetLocalStorageWorld = resetLocalStorageWorld
+export const openFilePicker = (specificCase?: 'resourcepack') => {
+  // create and show input picker
+  let picker: HTMLInputElement = document.body.querySelector('input#file-zip-picker')!
+  if (!picker) {
+    picker = document.createElement('input')
+    picker.type = 'file'
+    picker.accept = '.zip'
+
+    picker.addEventListener('change', () => {
+      const file = picker.files?.[0]
+      picker.value = ''
+      if (!file) return
+      if (!file.name.endsWith('.zip')) {
+        const doContinue = confirm(`Are you sure ${file.name.slice(-20)} is .zip file? Only .zip files are supported. Continue?`)
+        if (!doContinue) return
+      }
+      if (specificCase === 'resourcepack') {
+        void installTexturePack(file)
+      } else {
+        void openWorldZip(file)
+      }
+    })
+    picker.hidden = true
+    document.body.appendChild(picker)
+  }
+
+  picker.click()
+}
+
+export const resetStateAfterDisconnect = () => {
+  miscUiState.gameLoaded = false
+  miscUiState.loadedDataVersion = null
+  miscUiState.singleplayer = false
+  miscUiState.flyingSquid = false
+  miscUiState.wanOpened = false
+  miscUiState.currentDisplayQr = null
+
+  fsState.saveLoaded = false
+}

src/devtools.ts

@@ -13,3 +13,6 @@ window.cursorBlockRel = (x = 0, y = 0, z = 0) => {
 window.cursorEntity = () => {
   return getEntityCursor()
 }
+
+// wanderer
+window.inspectPlayer = () => require('fs').promises.readFile('/world/playerdata/9e487d23-2ffc-365a-b1f8-f38203f59233.dat').then(window.nbt.parse).then(console.log)

src/flyingSquidUtils.ts

@@ -30,3 +30,12 @@ export const saveServer = async (autoSave = true) => {
   const worlds = [(localServer as any).overworld] as Array<import('prismarine-world').world.World>
   await Promise.all([savePlayers(autoSave), ...worlds.map(async world => world.saveNow())])
 }
+export const disconnect = async () => {
+  if (localServer) {
+    await saveServer()
+    //@ts-expect-error todo expose!
+    void localServer.quit() // todo investigate we should await
+  }
+  window.history.replaceState({}, '', `${window.location.pathname}`) // remove qs
+  bot.end('You left the server')
+}

src/globalDomListeners.ts

@@ -0,0 +1,35 @@
+import { saveServer } from './flyingSquidUtils'
+import { isGameActive, activeModalStack } from './globalState'
+import { options } from './optionsStorage'
+
+window.addEventListener('unload', (e) => {
+  if (!window.justReloaded) {
+    sessionStorage.justReloaded = false
+  }
+  void saveServer()
+})
+
+document.addEventListener('visibilitychange', () => {
+  if (document.visibilityState === 'hidden') void saveServer()
+})
+document.addEventListener('blur', () => {
+  void saveServer()
+})
+
+window.addEventListener('beforeunload', (event) => {
+  if (!window.justReloaded) {
+    sessionStorage.justReloaded = false
+  }
+
+  // todo-low maybe exclude chat?
+  if (!isGameActive(true) && activeModalStack.at(-1)?.elem?.id !== 'chat') return
+  if (sessionStorage.lastReload && !options.preventDevReloadWhilePlaying) return
+  if (!options.closeConfirmation) return
+
+  // For major browsers doning only this is enough
+  event.preventDefault()
+
+  // Display a confirmation prompt
+  event.returnValue = '' // Required for some browsers
+  return 'The game is running. Are you sure you want to close this page?'
+})

src/globalState.ts

@@ -2,10 +2,7 @@
 
 import { proxy, ref, subscribe } from 'valtio'
 import { pointerLock } from './utils'
-import { options } from './optionsStorage'
 import type { OptionsGroupType } from './optionsGuiScheme'
-import { saveServer } from './flyingSquidUtils'
-import { fsState } from './loadSave'
 
 // todo: refactor structure with support of hideNext=false
 
@@ -145,17 +142,6 @@ export const miscUiState = proxy({
   displaySearchInput: false,
 })
 
-export const resetStateAfterDisconnect = () => {
-  miscUiState.gameLoaded = false
-  miscUiState.loadedDataVersion = null
-  miscUiState.singleplayer = false
-  miscUiState.flyingSquid = false
-  miscUiState.wanOpened = false
-  miscUiState.currentDisplayQr = null
-
-  fsState.saveLoaded = false
-}
-
 export const isGameActive = (foregroundCheck: boolean) => {
   if (foregroundCheck && activeModalStack.length) return false
   return miscUiState.gameLoaded
@@ -186,38 +172,3 @@ export const showNotification = (newNotification: Partial<typeof notification>)
 }
 
 // todo restore auto-save on interval for player data! (or implement it in flying squid since there is already auto-save for world)
-
-window.addEventListener('unload', (e) => {
-  if (!window.justReloaded) {
-    sessionStorage.justReloaded = false
-  }
-  void saveServer()
-})
-
-document.addEventListener('visibilitychange', () => {
-  if (document.visibilityState === 'hidden') void saveServer()
-})
-document.addEventListener('blur', () => {
-  void saveServer()
-})
-
-window.inspectPlayer = () => require('fs').promises.readFile('/world/playerdata/9e487d23-2ffc-365a-b1f8-f38203f59233.dat').then(window.nbt.parse).then(console.log)
-
-// todo move from global state
-window.addEventListener('beforeunload', (event) => {
-  if (!window.justReloaded) {
-    sessionStorage.justReloaded = false
-  }
-
-  // todo-low maybe exclude chat?
-  if (!isGameActive(true) && activeModalStack.at(-1)?.elem?.id !== 'chat') return
-  if (sessionStorage.lastReload && !options.preventDevReloadWhilePlaying) return
-  if (!options.closeConfirmation) return
-
-  // For major browsers doning only this is enough
-  event.preventDefault()
-
-  // Display a confirmation prompt
-  event.returnValue = '' // Required for some browsers
-  return 'The game is running. Are you sure you want to close this page?'
-})

src/index.ts

@@ -5,6 +5,7 @@ import './globals'
 import 'iconify-icon'
 import './devtools'
 import './entities'
+import './globalDomListeners'
 import initCollisionShapes from './getCollisionShapes'
 import { onGameLoad } from './playerWindows'
 import { supportedVersions } from 'minecraft-protocol'
@@ -29,7 +30,7 @@ import { options, watchValue } from './optionsStorage'
 import './reactUi.jsx'
 import { contro, onBotCreate } from './controls'
 import './dragndrop'
-import { possiblyCleanHandle } from './browserfs'
+import { possiblyCleanHandle, resetStateAfterDisconnect } from './browserfs'
 import './eruda'
 import { watchOptionsAfterViewerInit } from './watchOptions'
 import downloadAndOpenFile from './downloadAndOpenFile'
@@ -54,10 +55,11 @@ import {
   showModal, activeModalStacks,
   insertActiveModalStack,
   isGameActive,
-  miscUiState, resetStateAfterDisconnect,
+  miscUiState,
   notification
 } from './globalState'
 
+
 import {
   pointerLock,
   toMajorVersion,

src/loadSave.ts

@@ -4,11 +4,11 @@ import * as nbt from 'prismarine-nbt'
 import { proxy } from 'valtio'
 import { gzip } from 'node-gzip'
 import { options } from './optionsStorage'
-import { nameToMcOfflineUUID } from './flyingSquidUtils'
+import { nameToMcOfflineUUID, disconnect } from './flyingSquidUtils'
 import { forceCachedDataPaths } from './browserfs'
-import { disconnect, isMajorVersionGreater } from './utils'
-import { activeModalStack, activeModalStacks, hideModal, insertActiveModalStack, miscUiState } from './globalState'
-import { appStatusState } from './react/AppStatusProvider'
+import { isMajorVersionGreater } from './utils'
+
+import { activeModalStacks, insertActiveModalStack, miscUiState } from './globalState'
 
 // todo include name of opened handle (zip)!
 // additional fs metadata

src/optionsGuiScheme.tsx

@@ -6,9 +6,10 @@ import { AppOptions, options } from './optionsStorage'
 import Button from './react/Button'
 import { OptionMeta, OptionSlider } from './react/OptionsItems'
 import Slider from './react/Slider'
-import { getScreenRefreshRate, openFilePicker, setLoadingScreenStatus } from './utils'
+import { getScreenRefreshRate, setLoadingScreenStatus } from './utils'
+import { openFilePicker, resetLocalStorageWithoutWorld } from './browserfs'
 import { getResourcePackName, resourcePackState, uninstallTexturePack } from './texturePack'
-import { resetLocalStorageWithoutWorld } from './browserfs'
+
 
 export const guiOptionsScheme: {
   [t in OptionsGroupType]: Array<{ [K in keyof AppOptions]?: Partial<OptionMeta<AppOptions[K]>> } & { custom?}>

src/react/DeathScreenProvider.tsx

@@ -1,8 +1,8 @@
 import { useEffect } from 'react'
 import { proxy, useSnapshot } from 'valtio'
-import { disconnect } from '../utils'
+import { disconnect } from '../flyingSquidUtils'
 import { MessageFormatPart, formatMessage } from '../botUtils'
-import { showModal, hideModal, activeModalStack } from '../globalState'
+import { showModal, hideModal } from '../globalState'
 import { options } from '../optionsStorage'
 import DeathScreen from './DeathScreen'
 import { useIsModalActive } from './utils'

src/react/MainMenuRenderApp.tsx

@@ -4,8 +4,9 @@ import { useSnapshot } from 'valtio'
 import { useEffect } from 'react'
 import { activeModalStack, miscUiState, openOptionsMenu, showModal } from '../globalState'
 import { openURL } from '../menus/components/common'
-import { openFilePicker, openGithub, setLoadingScreenStatus } from '../utils'
-import { copyFilesAsync, mkdirRecursive, openWorldDirectory, removeFileRecursiveAsync } from '../browserfs'
+import { openGithub, setLoadingScreenStatus } from '../utils'
+import { openFilePicker, copyFilesAsync, mkdirRecursive, openWorldDirectory, removeFileRecursiveAsync } from '../browserfs'
+
 import MainMenu from './MainMenu'
 
 // todo clean

src/styles.css

@@ -158,6 +158,12 @@ body {
   color: #999;
 }
 
+@media screen and (min-width: 430px) {
+  .span-2 {
+    grid-column: span 2;
+  }
+}
+
 @keyframes dive-animation {
   0% {
     transform: translateZ(-150px);

src/utils.ts

@@ -1,9 +1,6 @@
 import { hideModal, isGameActive, miscUiState, notification, showModal } from './globalState'
 import { options } from './optionsStorage'
-import { openWorldZip } from './browserfs'
-import { installTexturePack } from './texturePack'
 import { appStatusState } from './react/AppStatusProvider'
-import { saveServer } from './flyingSquidUtils'
 
 export const goFullscreen = async (doToggle = false) => {
   if (!document.fullscreenElement) {
@@ -147,17 +144,6 @@ export const setLoadingScreenStatus = function (status: string | undefined | nul
   appStatusState.status = status
 }
 
-
-export const disconnect = async () => {
-  if (localServer) {
-    await saveServer()
-    //@ts-expect-error todo expose!
-    void localServer.quit() // todo investigate we should await
-  }
-  window.history.replaceState({}, '', `${window.location.pathname}`) // remove qs
-  bot.end('You left the server')
-}
-
 // doesn't support snapshots
 export const toMajorVersion = (version) => {
   const [a, b] = (String(version)).split('.')
@@ -181,35 +167,6 @@ export const reloadChunks = async () => {
   await worldView.updatePosition(bot.entity.position, true)
 }
 
-export const openFilePicker = (specificCase?: 'resourcepack') => {
-  // create and show input picker
-  let picker: HTMLInputElement = document.body.querySelector('input#file-zip-picker')!
-  if (!picker) {
-    picker = document.createElement('input')
-    picker.type = 'file'
-    picker.accept = '.zip'
-
-    picker.addEventListener('change', () => {
-      const file = picker.files?.[0]
-      picker.value = ''
-      if (!file) return
-      if (!file.name.endsWith('.zip')) {
-        const doContinue = confirm(`Are you sure ${file.name.slice(-20)} is .zip file? Only .zip files are supported. Continue?`)
-        if (!doContinue) return
-      }
-      if (specificCase === 'resourcepack') {
-        void installTexturePack(file)
-      } else {
-        void openWorldZip(file)
-      }
-    })
-    picker.hidden = true
-    document.body.appendChild(picker)
-  }
-
-  picker.click()
-}
-
 export const openGithub = () => {
   window.open(process.env.GITHUB_URL, '_blank')
 }