BlueGit

timfa questward

Fix item spawner containers missing in play world.

WorldView wired chunk/event sync to upsertItemContainer/despawnItemContainer
but never defined those APIs, so chest/barrel/crate overlays never appeared
and snapshot apply threw. Implement the overlays, clear them on chunk unload,
and add a regression guard.

timfa Tim Falken · pushed by timfa

Authored 2026-09-15 · 2 months ago

Hash
d5d45a60b93bf84e7556ca3d6f7a5db3c2ff98ad
Parent
4d19e1e5
3 files changed +82 −2
client/src/play/main.js +2 −2
@@ -2400,13 +2400,13 @@ async function main ()
2400 2400 case MessageType.entitySkull:
2401 2401 view?.updateEntitySkull(message.entityId, message.skullValue);
2402 2402 break;
2403 case MessageType.itemContainerAppear:
2403 case MessageType.itemContainerAppear:
2404 2404 view?.upsertItemContainer(message);
2405 2405 break;
2406 2406 case MessageType.itemContainerDespawn:
2407 2407 view?.despawnItemContainer(message.containerId);
2408 2408 break;
2409 case MessageType.groundItemAppear:
2409 case MessageType.groundItemAppear:
2410 2410 if (isForeignDimensionMessage(message))
2411 2411 { break; }
2412 2412 view?.upsertGroundItem(message);
@@ -2400,13 +2400,13 @@ async function main ()
2400 case MessageType.entitySkull:
2400 case MessageType.entitySkull:
2401 view?.updateEntitySkull(message.entityId, message.skullValue);
2401 view?.updateEntitySkull(message.entityId, message.skullValue);
2402 break;
2402 break;
2403 case MessageType.itemContainerAppear:
2403 case MessageType.itemContainerAppear:
2404 view?.upsertItemContainer(message);
2404 view?.upsertItemContainer(message);
2405 break;
2405 break;
2406 case MessageType.itemContainerDespawn:
2406 case MessageType.itemContainerDespawn:
2407 view?.despawnItemContainer(message.containerId);
2407 view?.despawnItemContainer(message.containerId);
2408 break;
2408 break;
2409case MessageType.groundItemAppear:
2409 case MessageType.groundItemAppear:
2410 if (isForeignDimensionMessage(message))
2410 if (isForeignDimensionMessage(message))
2411 { break; }
2411 { break; }
2412 view?.upsertGroundItem(message);
2412 view?.upsertGroundItem(message);
client/src/render/worldView.js +63 −0
@@ -1416,6 +1416,11 @@ export class WorldView
1416 1416 if (Math.floor(item.tileX / CHUNK_SIZE) === chunkX && Math.floor(item.tileY / CHUNK_SIZE) === chunkY)
1417 1417 { this.despawnGroundItem(id); }
1418 1418 }
1419 for (const [id, entry] of [...this.itemContainers.entries()])
1420 {
1421 if (Math.floor(entry.tileX / CHUNK_SIZE) === chunkX && Math.floor(entry.tileY / CHUNK_SIZE) === chunkY)
1422 { this.despawnItemContainer(id); }
1423 }
1419 1424 // Server sends unsubscribeChunk when a chunk leaves the static 5×5 ring.
1420 1425 // Entity replication is limited to the inner 3×3; static-only chunks strip dynamics via staticOnly snapshots.
1421 1426 for (const [id, entity] of [...this.entities.entries()])
@@ -2167,6 +2172,64 @@ export class WorldView
2167 2172 this.groundItems.delete(groundItemId);
2168 2173 }
2169 2174
2175 upsertItemContainer (payload)
2176 {
2177 if (payload?.dimensionId != null
2178 && normalizeDimensionId(payload.dimensionId) !== normalizeDimensionId(this.dimensionId))
2179 { return; }
2180 const containerId = payload.containerId | 0;
2181 if (!containerId)
2182 { return; }
2183 const size = this.tileSize();
2184 const pivot = tilePivot(payload.tileX, payload.tileY, size);
2185 const spriteName = payload.sprite
2186 ?? itemSpawnerContainerSpriteName(payload.appearance, payload.material);
2187 let entry = this.itemContainers.get(containerId);
2188 if (!entry)
2189 {
2190 const object = new GameObject(
2191 0,
2192 0,
2193 this.game.images[spriteName] ?? this.game.images[itemSpriteName(null)],
2194 SORT_BLOCK
2195 );
2196 this.scene.addObject(object);
2197 entry = { object };
2198 this.itemContainers.set(containerId, entry);
2199 }
2200 else if (entry.object?.renderer && this.game.images[spriteName])
2201 { entry.object.renderer.sprite = this.game.images[spriteName]; }
2202 entry.containerId = containerId;
2203 entry.spawnerId = payload.spawnerId ?? null;
2204 entry.tileX = payload.tileX | 0;
2205 entry.tileY = payload.tileY | 0;
2206 entry.dimensionId = normalizeDimensionId(payload.dimensionId ?? this.dimensionId ?? OVERWORLD_ID);
2207 entry.appearance = payload.appearance;
2208 entry.material = payload.material;
2209 entry.displayName = payload.displayName;
2210 entry.sprite = spriteName;
2211 this.#placePivoted(entry.object, pivot.x, pivot.y, pivot.y - 0.02, SORT_BLOCK);
2212 }
2213
2214 despawnItemContainer (containerId)
2215 {
2216 const entry = this.itemContainers.get(containerId);
2217 if (!entry)
2218 { return; }
2219 entry.object?.destroy();
2220 this.itemContainers.delete(containerId);
2221 }
2222
2223 itemContainerAtTile (tileX, tileY)
2224 {
2225 for (const entry of this.itemContainers.values())
2226 {
2227 if (entry.tileX === tileX && entry.tileY === tileY)
2228 { return entry; }
2229 }
2230 return null;
2231 }
2232
2170 2233 #syncGroundChequeOverlay (item, pivot)
2171 2234 {
2172 2235 const stack = {
@@ -1416,6 +1416,11 @@ export class WorldView
1416 if (Math.floor(item.tileX / CHUNK_SIZE) === chunkX && Math.floor(item.tileY / CHUNK_SIZE) === chunkY)
1416 if (Math.floor(item.tileX / CHUNK_SIZE) === chunkX && Math.floor(item.tileY / CHUNK_SIZE) === chunkY)
1417 { this.despawnGroundItem(id); }
1417 { this.despawnGroundItem(id); }
1418 }
1418 }
1419 for (const [id, entry] of [...this.itemContainers.entries()])
1420 {
1421 if (Math.floor(entry.tileX / CHUNK_SIZE) === chunkX && Math.floor(entry.tileY / CHUNK_SIZE) === chunkY)
1422 { this.despawnItemContainer(id); }
1423 }
1419 // Server sends unsubscribeChunk when a chunk leaves the static 5×5 ring.
1424 // Server sends unsubscribeChunk when a chunk leaves the static 5×5 ring.
1420 // Entity replication is limited to the inner 3×3; static-only chunks strip dynamics via staticOnly snapshots.
1425 // Entity replication is limited to the inner 3×3; static-only chunks strip dynamics via staticOnly snapshots.
1421 for (const [id, entity] of [...this.entities.entries()])
1426 for (const [id, entity] of [...this.entities.entries()])
@@ -2167,6 +2172,64 @@ export class WorldView
2167 this.groundItems.delete(groundItemId);
2172 this.groundItems.delete(groundItemId);
2168 }
2173 }
2169
2174
2175 upsertItemContainer (payload)
2176 {
2177 if (payload?.dimensionId != null
2178 && normalizeDimensionId(payload.dimensionId) !== normalizeDimensionId(this.dimensionId))
2179 { return; }
2180 const containerId = payload.containerId | 0;
2181 if (!containerId)
2182 { return; }
2183 const size = this.tileSize();
2184 const pivot = tilePivot(payload.tileX, payload.tileY, size);
2185 const spriteName = payload.sprite
2186 ?? itemSpawnerContainerSpriteName(payload.appearance, payload.material);
2187 let entry = this.itemContainers.get(containerId);
2188 if (!entry)
2189 {
2190 const object = new GameObject(
2191 0,
2192 0,
2193 this.game.images[spriteName] ?? this.game.images[itemSpriteName(null)],
2194 SORT_BLOCK
2195 );
2196 this.scene.addObject(object);
2197 entry = { object };
2198 this.itemContainers.set(containerId, entry);
2199 }
2200 else if (entry.object?.renderer && this.game.images[spriteName])
2201 { entry.object.renderer.sprite = this.game.images[spriteName]; }
2202 entry.containerId = containerId;
2203 entry.spawnerId = payload.spawnerId ?? null;
2204 entry.tileX = payload.tileX | 0;
2205 entry.tileY = payload.tileY | 0;
2206 entry.dimensionId = normalizeDimensionId(payload.dimensionId ?? this.dimensionId ?? OVERWORLD_ID);
2207 entry.appearance = payload.appearance;
2208 entry.material = payload.material;
2209 entry.displayName = payload.displayName;
2210 entry.sprite = spriteName;
2211 this.#placePivoted(entry.object, pivot.x, pivot.y, pivot.y - 0.02, SORT_BLOCK);
2212 }
2213
2214 despawnItemContainer (containerId)
2215 {
2216 const entry = this.itemContainers.get(containerId);
2217 if (!entry)
2218 { return; }
2219 entry.object?.destroy();
2220 this.itemContainers.delete(containerId);
2221 }
2222
2223 itemContainerAtTile (tileX, tileY)
2224 {
2225 for (const entry of this.itemContainers.values())
2226 {
2227 if (entry.tileX === tileX && entry.tileY === tileY)
2228 { return entry; }
2229 }
2230 return null;
2231 }
2232
2170 #syncGroundChequeOverlay (item, pivot)
2233 #syncGroundChequeOverlay (item, pivot)
2171 {
2234 {
2172 const stack = {
2235 const stack = {
client/tests/item-containers-view.test.js added +17 −0
@@ -0,0 +1,17 @@
1 import test from "node:test";
2 import assert from "node:assert/strict";
3 import { readFileSync } from "node:fs";
4 import { fileURLToPath } from "node:url";
5 import { dirname, join } from "node:path";
6
7 const root = join(dirname(fileURLToPath(import.meta.url)), "..");
8
9 test("WorldView defines play-time item container overlay APIs", () =>
10 {
11 const src = readFileSync(join(root, "src/render/worldView.js"), "utf8");
12 // Method definitions (not mere call sites) — commit 4d19e1e wired calls without these.
13 assert.match(src, /^\tupsertItemContainer\s*\(/m);
14 assert.match(src, /^\tdespawnItemContainer\s*\(/m);
15 assert.match(src, /^\titemContainerAtTile\s*\(/m);
16 assert.match(src, /removeChunk[\s\S]*?despawnItemContainer\(id\)/);
17 });
@@ -0,0 +1,17 @@
1import test from "node:test";
2import assert from "node:assert/strict";
3import { readFileSync } from "node:fs";
4import { fileURLToPath } from "node:url";
5import { dirname, join } from "node:path";
6
7const root = join(dirname(fileURLToPath(import.meta.url)), "..");
8
9test("WorldView defines play-time item container overlay APIs", () =>
10{
11 const src = readFileSync(join(root, "src/render/worldView.js"), "utf8");
12 // Method definitions (not mere call sites) — commit 4d19e1e wired calls without these.
13 assert.match(src, /^\tupsertItemContainer\s*\(/m);
14 assert.match(src, /^\tdespawnItemContainer\s*\(/m);
15 assert.match(src, /^\titemContainerAtTile\s*\(/m);
16 assert.match(src, /removeChunk[\s\S]*?despawnItemContainer\(id\)/);
17});