fix: decouple integration tests from production default inventory

Add optional createInventory factory to PlayerSystem and AuthoritativeWorld
so tests can supply a stable fixed layout. Create tests/helpers/test-inventory.ts
with a frozen layout (cobblestone at hotbar[8], glass at main[0]) used by
authoritative-world and client-server tests. Update inventory.test.ts to reflect
the current production default (glass at hotbar[8], main fully empty). Fix sky
light propagation to treat non-full-occlusion blocks as light-transparent.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: r1tsuu

packages/core/src/server/authoritative-world.ts

@@ -127,12 +127,14 @@ export class AuthoritativeWorld {
   public constructor(
     private world: WorldSummary,
     private readonly storage: WorldStorage,
+    options?: { createInventory?: () => InventorySnapshot },
   ) {
     this.playerSystem = new PlayerSystem(
       this.world.name,
       this.storage,
       this.spawnPosition,
       this.entityState,
+      options?.createInventory,
     )
     this.droppedItemSystem = new DroppedItemSystem(
       this.world.name,

packages/core/src/server/lighting-system.ts

@@ -9,7 +9,7 @@ import {
   normalizeWorldTimeState,
   type WorldTimeState,
 } from '../shared/lighting.ts'
-import { BLOCK_IDS, getBlockEmittedLightLevel } from '../world/blocks.ts'
+import { Blocks, BLOCK_IDS, getBlockEmittedLightLevel } from '../world/blocks.ts'
 import { CHUNK_HEIGHT, CHUNK_SIZE, WORLD_MAX_BLOCK_Y } from '../world/constants.ts'
 
 const LIGHT_DIRECTIONS = [
@@ -34,7 +34,7 @@ interface ChunkLightBuffers {
 
 const chunkKey = ({ x, z }: ChunkCoord): string => `${x},${z}`
 
-const isLightPassable = (blockId: BlockId): boolean => blockId === BLOCK_IDS.air
+const isLightPassable = (blockId: BlockId): boolean => Blocks[blockId].occlusion !== 'full'
 
 const localIndex = (localX: number, localY: number, localZ: number): number =>
   localX + CHUNK_SIZE * (localZ + CHUNK_SIZE * localY)

packages/core/src/server/player-system.ts

@@ -62,6 +62,7 @@ export class PlayerSystem {
     private readonly storage: WorldStorage,
     private readonly spawnPosition: readonly [number, number, number],
     private readonly entities: WorldEntityState,
+    private readonly createInventory: () => InventorySnapshot = createStarterInventory,
   ) {}
 
   public getPlayerName(entityId: EntityId): PlayerName | null {
@@ -416,7 +417,7 @@ export class PlayerSystem {
       flying: false,
     })
     this.entities.playerInventory.set(entityId, {
-      inventory: createStarterInventory(),
+      inventory: this.createInventory(),
     })
     this.entities.playerSession.set(entityId, { active: false })
     this.entities.playerPersistence.set(entityId, {

packages/core/src/world/content-spec.ts

@@ -528,11 +528,6 @@ export const DEFAULT_STARTER_INVENTORY_STACK_SPECS = [
   },
   {
     slot: 8,
-    itemKey: 'cobblestone',
-    count: 64,
-  },
-  {
-    slot: 9,
     itemKey: 'glass',
     count: 64,
   },

packages/core/src/world/generated/content-registry.ts

@@ -499,6 +499,5 @@ export const STARTER_INVENTORY_STACKS = [
   { slot: 4, itemId: ITEM_IDS.log, count: 64 },
   { slot: 5, itemId: ITEM_IDS.leaves, count: 64 },
   { slot: 7, itemId: ITEM_IDS.planks, count: 64 },
-  { slot: 8, itemId: ITEM_IDS.cobblestone, count: 64 },
-  { slot: 9, itemId: ITEM_IDS.glass, count: 64 },
+  { slot: 8, itemId: ITEM_IDS.glass, count: 64 },
 ] as const satisfies readonly StarterInventoryStackDefinition[];

tests/authoritative-world.test.ts

@@ -7,6 +7,7 @@ import type { BlockId } from '../packages/core/src/types.ts'
 
 import { AuthoritativeWorld } from '../packages/core/src/server/authoritative-world.ts'
 import { BinaryWorldStorage } from '../packages/core/src/server/world-storage.ts'
+import { createTestStarterInventory } from './helpers/test-inventory.ts'
 import { BLOCK_IDS, getDroppedItemIdForBlock } from '../packages/core/src/world/blocks.ts'
 import { Chunk } from '../packages/core/src/world/chunk.ts'
 import { CHUNK_SIZE, WORLD_SEA_LEVEL } from '../packages/core/src/world/constants.ts'
@@ -32,7 +33,7 @@ test('authoritative world keeps per-player state separate and persists it by pla
 
   try {
     const worldRecord = await storage.createWorld('Alpha', 42)
-    const world = new AuthoritativeWorld(worldRecord, storage)
+    const world = new AuthoritativeWorld(worldRecord, storage, { createInventory: createTestStarterInventory })
 
     const joinedA = await world.joinPlayer(PLAYER_A)
     expect(joinedA.clientPlayer.name).toBe(PLAYER_A)
@@ -77,7 +78,7 @@ test('authoritative world keeps per-player state separate and persists it by pla
 
     const reloadedRecord = await storage.getWorld('Alpha')
     expect(reloadedRecord).not.toBeNull()
-    const reloadedWorld = new AuthoritativeWorld(reloadedRecord!, storage)
+    const reloadedWorld = new AuthoritativeWorld(reloadedRecord!, storage, { createInventory: createTestStarterInventory })
 
     const rejoinedA = await reloadedWorld.joinPlayer(PLAYER_A)
     expect(rejoinedA.clientPlayer.entityId).toBe(joinedA.clientPlayer.entityId)
@@ -107,7 +108,7 @@ test('authoritative world spawns and persists dropped items until players pick t
 
   try {
     const worldRecord = await storage.createWorld('Drops', 42)
-    const world = new AuthoritativeWorld(worldRecord, storage)
+    const world = new AuthoritativeWorld(worldRecord, storage, { createInventory: createTestStarterInventory })
     const joined = await world.joinPlayer(PLAYER_A)
 
     const targetX = 1
@@ -136,7 +137,7 @@ test('authoritative world spawns and persists dropped items until players pick t
 
     const reloadedRecord = await storage.getWorld('Drops')
     expect(reloadedRecord).not.toBeNull()
-    const reloadedWorld = new AuthoritativeWorld(reloadedRecord!, storage)
+    const reloadedWorld = new AuthoritativeWorld(reloadedRecord!, storage, { createInventory: createTestStarterInventory })
     const rejoined = await reloadedWorld.joinPlayer(PLAYER_A)
     expect(rejoined.droppedItems).toHaveLength(1)
     expect(rejoined.droppedItems[0]?.itemId).toBe(droppedItemId!)
@@ -151,7 +152,7 @@ test('authoritative world pregenerates and persists the startup chunk set', asyn
 
   try {
     const worldRecord = await storage.createWorld('Startup', 42)
-    const world = new AuthoritativeWorld(worldRecord, storage)
+    const world = new AuthoritativeWorld(worldRecord, storage, { createInventory: createTestStarterInventory })
     const expectedCoords = world.getStartupChunkCoords()
     const progress: Array<{ completedChunks: number; totalChunks: number }> = []
 
@@ -195,7 +196,7 @@ test('survival cannot break bedrock but creative can', async () => {
 
   try {
     const worldRecord = await storage.createWorld('Bedrock', 42)
-    const world = new AuthoritativeWorld(worldRecord, storage)
+    const world = new AuthoritativeWorld(worldRecord, storage, { createInventory: createTestStarterInventory })
     const joined = await world.joinPlayer(PLAYER_A)
     const targetIndex = 1 + 1 * CHUNK_SIZE + 0 * CHUNK_SIZE * CHUNK_SIZE
 
@@ -224,7 +225,7 @@ test('creative block mutations neither spawn drops nor consume held items', asyn
 
   try {
     const worldRecord = await storage.createWorld('CreativeItems', 42)
-    const world = new AuthoritativeWorld(worldRecord, storage)
+    const world = new AuthoritativeWorld(worldRecord, storage, { createInventory: createTestStarterInventory })
     const joined = await world.joinPlayer(PLAYER_A)
     await world.setPlayerGamemode(joined.clientPlayer.entityId, 1)
 
@@ -276,7 +277,7 @@ test('placing a solid block into water replaces the water cell', async () => {
 
   try {
     const worldRecord = await storage.createWorld('WaterReplace', 42)
-    const world = new AuthoritativeWorld(worldRecord, storage)
+    const world = new AuthoritativeWorld(worldRecord, storage, { createInventory: createTestStarterInventory })
     const joined = await world.joinPlayer(PLAYER_A)
 
     let targetX = 0
@@ -341,7 +342,7 @@ test('block mutations relight only the nearby loaded chunk neighborhood', async
 
   try {
     const worldRecord = await storage.createWorld('LocalRelight', 42)
-    const world = new AuthoritativeWorld(worldRecord, storage)
+    const world = new AuthoritativeWorld(worldRecord, storage, { createInventory: createTestStarterInventory })
     const joined = await world.joinPlayer(PLAYER_A)
     const targetY = WORLD_SEA_LEVEL + 8
     const targetChunk = worldToChunkCoord(1, targetY, 1).chunk

tests/client-server.test.ts

@@ -12,6 +12,7 @@ import type {
 import { PortClientAdapter } from '../apps/client/src/app/client-adapter.ts'
 import { ClientWorldRuntime } from '../apps/client/src/app/world-runtime.ts'
 import { AuthoritativeWorld } from '../packages/core/src/server/authoritative-world.ts'
+import { createTestStarterInventory } from './helpers/test-inventory.ts'
 import { ServerRuntime } from '../packages/core/src/server/runtime.ts'
 import { PortServerAdapter } from '../packages/core/src/server/server-adapter.ts'
 import { BinaryWorldStorage } from '../packages/core/src/server/world-storage.ts'
@@ -60,7 +61,7 @@ const createHarness = async (): Promise<{
   const storage = new BinaryWorldStorage(rootDir)
   const worldRecord = await storage.createWorld('Alpha', 42)
   let nowMs = 0
-  const serverRuntime = new ServerRuntime(server, new AuthoritativeWorld(worldRecord, storage), {
+  const serverRuntime = new ServerRuntime(server, new AuthoritativeWorld(worldRecord, storage, { createInventory: createTestStarterInventory }), {
     tickIntervalMs: 10,
     maxCatchUpTicks: 100,
     autoSaveIntervalTicks: 10,

tests/helpers/test-inventory.ts

@@ -0,0 +1,46 @@
+import type { InventorySnapshot } from '../../packages/core/src/types.ts'
+
+import {
+  createEmptyInventory,
+  DEFAULT_INVENTORY_STACK_SIZE,
+  HOTBAR_SLOT_COUNT,
+} from '../../packages/core/src/world/inventory.ts'
+import { ITEM_IDS } from '../../packages/core/src/world/items.ts'
+
+/**
+ * A stable, test-only starter inventory that does not change with the
+ * production default. Integration tests reference specific slots and items
+ * from this layout so that changes to DEFAULT_STARTER_INVENTORY_STACK_SPECS
+ * do not break them.
+ *
+ * Layout:
+ *   Hotbar [0-8]: grass, glowstone, dirt, stone, log, leaves, <empty>, planks, cobblestone
+ *   Main   [0]  : glass (slot index 9)
+ */
+export const createTestStarterInventory = (): InventorySnapshot => {
+  const inventory = createEmptyInventory()
+  const slots = [...inventory.slots]
+
+  const hotbar: Array<keyof typeof ITEM_IDS> = [
+    'grass',
+    'glowstone',
+    'dirt',
+    'stone',
+    'log',
+    'leaves',
+    'empty', // slot 6 intentionally empty
+    'planks',
+    'cobblestone',
+  ]
+
+  for (let i = 0; i < hotbar.length; i++) {
+    const key = hotbar[i]!
+    if (key === 'empty') continue
+    slots[i] = { itemId: ITEM_IDS[key], count: DEFAULT_INVENTORY_STACK_SIZE }
+  }
+
+  // main[0] = glass
+  slots[HOTBAR_SLOT_COUNT] = { itemId: ITEM_IDS.glass, count: DEFAULT_INVENTORY_STACK_SIZE }
+
+  return { ...inventory, slots }
+}

tests/inventory.test.ts

@@ -32,16 +32,10 @@ test('starter inventory creates a full hotbar plus a starter brick stack', () =>
     { itemId: ITEM_IDS.leaves, count: DEFAULT_INVENTORY_STACK_SIZE },
     { itemId: ITEM_IDS.empty, count: 0 },
     { itemId: ITEM_IDS.planks, count: DEFAULT_INVENTORY_STACK_SIZE },
-    { itemId: ITEM_IDS.cobblestone, count: DEFAULT_INVENTORY_STACK_SIZE },
+    { itemId: ITEM_IDS.glass, count: DEFAULT_INVENTORY_STACK_SIZE },
   ])
   expect(main).toHaveLength(MAIN_INVENTORY_SLOT_COUNT)
-  expect(main[0]).toEqual({
-    itemId: ITEM_IDS.glass,
-    count: DEFAULT_INVENTORY_STACK_SIZE,
-  })
-  expect(main.slice(1).every((slot) => slot.itemId === ITEM_IDS.empty && slot.count === 0)).toBe(
-    true,
-  )
+  expect(main.every((slot) => slot.itemId === ITEM_IDS.empty && slot.count === 0)).toBe(true)
   expect(inventory.selectedSlot).toBe(0)
   expect(inventory.cursor).toBeNull()
 })
@@ -102,8 +96,7 @@ test('adding items fills empty main-inventory stacks when hotbar stacks are full
 
   expect(result.added).toBe(5)
   expect(result.remaining).toBe(0)
-  expect(main[0]).toEqual({ itemId: ITEM_IDS.glass, count: 64 })
-  expect(main[1]).toEqual({ itemId: ITEM_IDS.grass, count: 5 })
+  expect(main[0]).toEqual({ itemId: ITEM_IDS.grass, count: 5 })
 })
 
 test('inventory interaction picks up, places, and merges stacks', () => {