fix: don't reset the world in mesher after resourece pack textures up…

…date
zardoy · Oct 30, 2024 · 7d0c364 · 7d0c364
1 parent 5791626
commit 7d0c364
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/prismarine-viewer/viewer/lib/mesher/mesher.ts b/prismarine-viewer/viewer/lib/mesher/mesher.ts
@@ -76,8 +76,10 @@ const handleMessage = data => {
   }
 
   if (data.config) {
-    if (data.type === 'mesherData' && allDataReady) {
-      world = undefined as any // reset models
+    if (data.type === 'mesherData' && world) {
+      // reset models
+      world.blockCache = {}
+      world.erroredBlockModel = undefined
     }
 
     world ??= new World(data.config.version)

diff --git a/prismarine-viewer/viewer/lib/mesher/world.ts b/prismarine-viewer/viewer/lib/mesher/world.ts
@@ -38,7 +38,7 @@ export class World {
   blockCache = {}
   biomeCache: { [id: number]: mcData.Biome }
   preflat: boolean
-  erroredBlockModel: BlockModelPartsResolved
+  erroredBlockModel?: BlockModelPartsResolved
 
   constructor (version) {
     this.Chunk = Chunks(version) as any

diff --git a/prismarine-viewer/viewer/lib/viewer.ts b/prismarine-viewer/viewer/lib/viewer.ts
@@ -98,7 +98,7 @@ export class Viewer {
   }
 
   setBlockStateId (pos: Vec3, stateId: number) {
-    if (!this.world.loadedChunks[`${Math.floor(pos.x / 16)},${Math.floor(pos.z / 16)}`]) {
+    if (!this.world.loadedChunks[`${Math.floor(pos.x / 16) * 16},${Math.floor(pos.z / 16) * 16}`]) {
       console.warn('[should be unreachable] setBlockStateId called for unloaded chunk', pos)
     }
     this.world.setBlockStateId(pos, stateId)

diff --git a/src/resourcePack.ts b/src/resourcePack.ts
@@ -301,15 +301,17 @@ export const onAppLoad = () => {
       const forced = 'forced' in packet ? packet.forced : false
       const choice = options.serverResourcePacks === 'always'
         ? true
-        : await showOptionsModal(promptMessage, ['Download & Install'], {
+        : await showOptionsModal(promptMessage, ['Download & Install (recommended)', 'Pretend Installed (not recommended)'], {
           cancel: !forced
         })
       if (!choice) return
       bot.acceptResourcePack()
-      await downloadAndUseResourcePack(packet.url).catch((err) => {
-        console.error(err)
-        showNotification('Failed to download resource pack: ' + err.message)
-      })
+      if (choice === 'Download & Install (recommended)') {
+        await downloadAndUseResourcePack(packet.url).catch((err) => {
+          console.error(err)
+          showNotification('Failed to download resource pack: ' + err.message)
+        })
+      }
     }
     bot._client.on('resource_pack_send', handleResourcePackRequest)
     bot._client.on('add_resource_pack' as any, handleResourcePackRequest)