minecraft-inventory 0.1.0 → 0.1.2

package/src/registry/inventories.ts

@@ -1,17 +1,23 @@
-import type { InventoryTypeDefinition } from '../types'
+import type { InventoryTypeDefinition, SlotDefinition } from '../types'
 
 const SLOT_SIZE = 18
 
-function playerInv(
-  yOffset: number,
-  invStartIndex = 9,
-  hotbarStartIndex = 36,
-): InventoryTypeDefinition['slots'] {
-  const slots: InventoryTypeDefinition['slots'] = []
+type RawSlot = Omit<SlotDefinition, 'index'> & { index?: number }
+
+function withSequentialIndexes(slots: RawSlot[]): SlotDefinition[] {
+  let next = 0
+  return slots.map((slot) => {
+    const index = slot.index !== undefined ? slot.index : next
+    next = index + 1
+    return { ...slot, index }
+  })
+}
+
+function playerInv(yOffset: number): RawSlot[] {
+  const slots: RawSlot[] = []
   for (let row = 0; row < 3; row++) {
     for (let col = 0; col < 9; col++) {
       slots.push({
-        index: invStartIndex + row * 9 + col,
         x: 8 + col * SLOT_SIZE,
         y: yOffset + row * SLOT_SIZE,
         group: 'inventory',
@@ -20,7 +26,6 @@ function playerInv(
   }
   for (let col = 0; col < 9; col++) {
     slots.push({
-      index: hotbarStartIndex + col,
       x: 8 + col * SLOT_SIZE,
       y: yOffset + 58,
       group: 'hotbar',
@@ -29,9 +34,8 @@ function playerInv(
   return slots
 }
 
-function hotbarSlots(yOffset: number, indexOffset = 36, xOffset = 8): InventoryTypeDefinition['slots'] {
+function hotbarSlots(yOffset: number, xOffset = 8): RawSlot[] {
   return Array.from({ length: 9 }, (_, col) => ({
-    index: indexOffset + col,
     x: xOffset + col * SLOT_SIZE,
     y: yOffset,
     group: 'hotbar',
@@ -39,18 +43,16 @@ function hotbarSlots(yOffset: number, indexOffset = 36, xOffset = 8): InventoryT
 }
 
 function gridSlots(
-  startIndex: number,
   cols: number,
   rows: number,
   x: number,
   y: number,
   group: string,
-): InventoryTypeDefinition['slots'] {
-  const slots: InventoryTypeDefinition['slots'] = []
+): RawSlot[] {
+  const slots: RawSlot[] = []
   for (let row = 0; row < rows; row++) {
     for (let col = 0; col < cols; col++) {
       slots.push({
-        index: startIndex + row * cols + col,
         x: x + col * SLOT_SIZE,
         y: y + row * SLOT_SIZE,
         group,
@@ -60,89 +62,110 @@ function gridSlots(
   return slots
 }
 
-export const inventoryDefinitions: Record<string, InventoryTypeDefinition> = {
+// Slot positions within gui/widgets hotbar texture — matches layouts.mjs Hotbar:
+// itemgrid at x: 3, y: 4, margin: 4, width: 9 (20px per slot: 16+4)
+const HUD_SLOT_STEP = 20
+function hudHotbarSlots(): RawSlot[] {
+  return Array.from({ length: 9 }, (_, col) => ({
+    // First slot carries explicit index: 36 so the running counter starts there
+    ...(col === 0 ? { index: 36 } : {}),
+    x: 3.2 + col * HUD_SLOT_STEP,
+    y: 3.2,
+    group: 'hotbar',
+  }))
+}
+
+type RawInventoryDefinition = Omit<InventoryTypeDefinition, 'slots'> & { slots: RawSlot[] }
+
+const makeInventoryDefinitions = <T extends string>(
+  inv: Record<T, RawInventoryDefinition>,
+): Record<T, InventoryTypeDefinition> =>
+  Object.fromEntries(
+    Object.entries(inv).map(([k, v]) => [
+      k,
+      { ...(v as RawInventoryDefinition), slots: withSequentialIndexes((v as RawInventoryDefinition).slots) },
+    ]),
+  ) as Record<T, InventoryTypeDefinition>
+
+export const inventoryDefinitions = makeInventoryDefinitions({
   player: {
     name: 'player',
     title: 'Inventory',
-    backgroundTexture: 'gui/container/inventory',
+    backgroundTexture: '1.21.11/textures/gui/container/inventory.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
     slots: [
-      // Result
-      { index: 0, x: 154, y: 28, group: 'result', resultSlot: true },
-      // Crafting 2x2
-      ...gridSlots(1, 2, 2, 98, 18, 'crafting'),
-      // Armor (head to feet = slots 5-8)
-      { index: 5, x: 8, y: 8, group: 'armor', label: 'Head' },
-      { index: 6, x: 8, y: 26, group: 'armor', label: 'Chest' },
-      { index: 7, x: 8, y: 44, group: 'armor', label: 'Legs' },
-      { index: 8, x: 8, y: 62, group: 'armor', label: 'Feet' },
-      // Offhand
-      { index: 45, x: 77, y: 62, group: 'offhand', label: 'Offhand' },
+      // Result (0)
+      { x: 154, y: 28, group: 'result', resultSlot: true },
+      // Crafting 2x2 (1-4)
+      ...gridSlots(2, 2, 98, 18, 'crafting'),
+      // Armor head-to-feet (5-8)
+      { x: 8, y: 8, group: 'armor', label: 'Head' },
+      { x: 8, y: 26, group: 'armor', label: 'Chest' },
+      { x: 8, y: 44, group: 'armor', label: 'Legs' },
+      { x: 8, y: 62, group: 'armor', label: 'Feet' },
       // Player inventory 9-35, hotbar 36-44
-      ...playerInv(84, 9, 36),
+      ...playerInv(84),
+      // Offhand (45) — must come after playerInv so auto-index lands at 45
+      { x: 77, y: 62, group: 'offhand', label: 'Offhand' },
     ],
   },
 
   chest: {
     name: 'chest',
     title: 'Chest',
-    backgroundTexture: 'gui/container/shulker_box',
+    backgroundTexture: '1.21.11/textures/gui/container/shulker_box.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
     playerInventoryOffset: { x: 8, y: 84 },
     slots: [
-      ...gridSlots(0, 9, 3, 8, 18, 'container'),
-      // player inv: 27-53, hotbar: 54-62
-      ...playerInv(84, 27, 54),
+      ...gridSlots(9, 3, 8, 18, 'container'),
+      ...playerInv(84),
     ],
   },
 
   generic_9x1: {
     name: 'generic_9x1',
     title: 'Container',
-    backgroundTexture: 'gui/container/shulker_box',
+    backgroundTexture: '1.21.11/textures/gui/container/shulker_box.png',
     backgroundWidth: 176,
     backgroundHeight: 96,
     slots: [
-      ...gridSlots(0, 9, 1, 8, 18, 'container'),
-      // inv: 9-35, hotbar: 36-44
-      ...playerInv(14, 9, 36),
+      ...gridSlots(9, 1, 8, 18, 'container'),
+      ...playerInv(14),
     ],
   },
 
   large_chest: {
     name: 'large_chest',
     title: 'Large Chest',
-    backgroundTexture: 'gui/container/generic_54',
+    backgroundTexture: '1.21.11/textures/gui/container/generic_54.png',
     backgroundWidth: 176,
     backgroundHeight: 222,
     playerInventoryOffset: { x: 8, y: 140 },
     slots: [
-      ...gridSlots(0, 9, 6, 8, 18, 'container'),
-      // player inv: 54-80, hotbar: 81-89
-      ...playerInv(140, 54, 81),
+      ...gridSlots(9, 6, 8, 18, 'container'),
+      ...playerInv(140),
     ],
   },
 
   crafting_table: {
     name: 'crafting_table',
     title: 'Crafting',
-    backgroundTexture: 'gui/container/crafting_table',
+    backgroundTexture: '1.21.11/textures/gui/container/crafting_table.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
     slots: [
-      { index: 0, x: 124, y: 35, group: 'result', resultSlot: true },
-      ...gridSlots(1, 3, 3, 30, 17, 'crafting'),
-      // inv: 10-36, hotbar: 37-45
-      ...playerInv(84, 10, 37),
+      { x: 124, y: 35, group: 'result', resultSlot: true },
+      ...gridSlots(3, 3, 30, 17, 'crafting'),
+      ...playerInv(84),
     ],
   },
 
   furnace: {
     name: 'furnace',
     title: 'Furnace',
-    backgroundTexture: 'gui/container/furnace',
+    backgroundTexture: '1.21.11/textures/gui/container/furnace.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
     properties: {
@@ -171,18 +194,17 @@ export const inventoryDefinitions: Record<string, InventoryTypeDefinition> = {
       },
     ],
     slots: [
-      { index: 0, x: 56, y: 17, group: 'input' },
-      { index: 1, x: 56, y: 53, group: 'fuel', fuelSlot: true },
-      { index: 2, x: 116, y: 35, group: 'result', resultSlot: true },
-      // player inv: 3-29, hotbar: 30-38
-      ...playerInv(84, 3, 30),
+      { x: 56, y: 17, group: 'input' },
+      { x: 56, y: 53, group: 'fuel', fuelSlot: true },
+      { x: 116, y: 35, group: 'result', resultSlot: true },
+      ...playerInv(84),
     ],
   },
 
   blast_furnace: {
     name: 'blast_furnace',
     title: 'Blast Furnace',
-    backgroundTexture: 'gui/container/blast_furnace',
+    backgroundTexture: '1.21.11/textures/gui/container/blast_furnace.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
     properties: {
@@ -210,17 +232,17 @@ export const inventoryDefinitions: Record<string, InventoryTypeDefinition> = {
       },
     ],
     slots: [
-      { index: 0, x: 56, y: 17, group: 'input' },
-      { index: 1, x: 56, y: 53, group: 'fuel', fuelSlot: true },
-      { index: 2, x: 116, y: 35, group: 'result', resultSlot: true },
-      ...playerInv(84, 3, 30),
+      { x: 56, y: 17, group: 'input' },
+      { x: 56, y: 53, group: 'fuel', fuelSlot: true },
+      { x: 116, y: 35, group: 'result', resultSlot: true },
+      ...playerInv(84),
     ],
   },
 
   smoker: {
     name: 'smoker',
     title: 'Smoker',
-    backgroundTexture: 'gui/container/smoker',
+    backgroundTexture: '1.21.11/textures/gui/container/smoker.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
     properties: {
@@ -248,18 +270,17 @@ export const inventoryDefinitions: Record<string, InventoryTypeDefinition> = {
       },
     ],
     slots: [
-      { index: 0, x: 56, y: 17, group: 'input' },
-      { index: 1, x: 56, y: 53, group: 'fuel', fuelSlot: true },
-      { index: 2, x: 116, y: 35, group: 'result', resultSlot: true },
-      // smoker: inv 3-29, hotbar: 30-38
-      ...playerInv(84, 3, 30),
+      { x: 56, y: 17, group: 'input' },
+      { x: 56, y: 53, group: 'fuel', fuelSlot: true },
+      { x: 116, y: 35, group: 'result', resultSlot: true },
+      ...playerInv(84),
     ],
   },
 
   brewing_stand: {
     name: 'brewing_stand',
     title: 'Brewing Stand',
-    backgroundTexture: 'gui/container/brewing_stand',
+    backgroundTexture: '1.21.11/textures/gui/container/brewing_stand.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
     properties: {
@@ -285,52 +306,50 @@ export const inventoryDefinitions: Record<string, InventoryTypeDefinition> = {
       },
     ],
     slots: [
-      { index: 0, x: 56, y: 51, group: 'bottle', label: 'Left' },
-      { index: 1, x: 79, y: 58, group: 'bottle', label: 'Center' },
-      { index: 2, x: 102, y: 51, group: 'bottle', label: 'Right' },
-      { index: 3, x: 79, y: 17, group: 'ingredient' },
-      { index: 4, x: 17, y: 17, group: 'fuel', fuelSlot: true },
-      // inv: 5-31, hotbar: 32-40
-      ...playerInv(84, 5, 32),
+      { x: 56, y: 51, group: 'bottle', label: 'Left' },
+      { x: 79, y: 58, group: 'bottle', label: 'Center' },
+      { x: 102, y: 51, group: 'bottle', label: 'Right' },
+      { x: 79, y: 17, group: 'ingredient' },
+      { x: 17, y: 17, group: 'fuel', fuelSlot: true },
+      ...playerInv(84),
     ],
   },
 
   anvil: {
     name: 'anvil',
     title: 'Repair & Name',
-    backgroundTexture: 'gui/container/anvil',
+    backgroundTexture: '1.21.11/textures/gui/container/anvil.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
     properties: {
       repairCost: { dataSlot: 0, description: 'Level cost' },
     },
     slots: [
-      { index: 0, x: 27, y: 47, group: 'input' },
-      { index: 1, x: 76, y: 47, group: 'input' },
-      { index: 2, x: 134, y: 47, group: 'result', resultSlot: true },
-      // inv: 3-29, hotbar: 30-38
-      ...playerInv(84, 3, 30),
+      { x: 27, y: 47, group: 'input' },
+      { x: 76, y: 47, group: 'input' },
+      { x: 134, y: 47, group: 'result', resultSlot: true },
+      ...playerInv(84),
     ],
   },
 
   grindstone: {
     name: 'grindstone',
     title: 'Repair & Disenchant',
-    backgroundTexture: 'gui/container/grindstone',
+    backgroundTexture: '1.21.11/textures/gui/container/grindstone.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
     slots: [
-      { index: 0, x: 49, y: 19, group: 'input' },
-      { index: 1, x: 49, y: 40, group: 'input' },
-      { index: 2, x: 129, y: 34, group: 'result', resultSlot: true },
-      ...playerInv(84, 3, 30),
+      { x: 49, y: 19, group: 'input' },
+      { x: 49, y: 40, group: 'input' },
+      { x: 129, y: 34, group: 'result', resultSlot: true },
+      ...playerInv(84),
     ],
   },
 
   enchanting_table: {
     name: 'enchanting_table',
     title: 'Enchant',
-    backgroundTexture: 'gui/container/enchanting_table',
+    backgroundTexture: '1.21.11/textures/gui/container/enchanting_table.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
     properties: {
@@ -343,270 +362,259 @@ export const inventoryDefinitions: Record<string, InventoryTypeDefinition> = {
       bottomEnchantId: { dataSlot: 6, description: 'Bottom enchantment ID' },
     },
     slots: [
-      { index: 0, x: 15, y: 47, group: 'enchant' },
-      { index: 1, x: 35, y: 47, group: 'lapis', label: 'Lapis Lazuli' },
-      // inv: 2-28, hotbar: 29-37
-      ...playerInv(84, 2, 29),
+      { x: 15, y: 47, group: 'enchant' },
+      { x: 35, y: 47, group: 'lapis', label: 'Lapis Lazuli' },
+      ...playerInv(84),
     ],
   },
 
   smithing_table: {
     name: 'smithing_table',
     title: 'Upgrade Gear',
-    backgroundTexture: 'gui/container/smithing',
-    guiTextureVersion: '1.21.4',
+    backgroundTexture: '1.21.11/textures/gui/container/smithing.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
+    titleOffset: {
+      x: 40,
+      y: 13,
+    },
     slots: [
-      { index: 0, x: 8, y: 48, group: 'template', label: 'Template' },
-      { index: 1, x: 26, y: 48, group: 'input', label: 'Base' },
-      { index: 2, x: 44, y: 48, group: 'addition', label: 'Material' },
-      { index: 3, x: 98, y: 48, group: 'result', resultSlot: true },
-      // inv: 4-30, hotbar: 31-39
-      ...playerInv(84, 4, 31),
+      { x: 8, y: 48, group: 'template', label: 'Template' },
+      { x: 26, y: 48, group: 'input', label: 'Base' },
+      { x: 44, y: 48, group: 'addition', label: 'Material' },
+      { x: 98, y: 48, group: 'result', resultSlot: true },
+      ...playerInv(84),
     ],
   },
 
   smithing_table_legacy: {
     name: 'smithing_table_legacy',
     title: 'Upgrade Gear',
-    backgroundTexture: 'gui/container/smithing',
+    backgroundTexture: '1.16.4/textures/gui/container/smithing.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
+    titleOffset: {
+      x: 50,
+      y: 13,
+    },
     slots: [
-      { index: 0, x: 27, y: 47, group: 'input', label: 'Base' },
-      { index: 1, x: 76, y: 47, group: 'addition', label: 'Material' },
-      { index: 2, x: 134, y: 47, group: 'result', resultSlot: true },
-      ...playerInv(84, 3, 30),
+      { x: 27, y: 47, group: 'input', label: 'Base' },
+      { x: 76, y: 47, group: 'addition', label: 'Material' },
+      { x: 134, y: 47, group: 'result', resultSlot: true },
+      ...playerInv(84),
     ],
   },
 
   hopper: {
     name: 'hopper',
     title: 'Item Hopper',
-    backgroundTexture: 'gui/container/hopper',
+    backgroundTexture: '1.21.11/textures/gui/container/hopper.png',
     backgroundWidth: 176,
     backgroundHeight: 133,
     slots: [
-      ...gridSlots(0, 5, 1, 44, 20, 'container'),
-      ...Array.from({ length: 27 }, (_, i) => ({
-        index: 5 + i,
-        x: 8 + (i % 9) * SLOT_SIZE,
-        y: 51 + Math.floor(i / 9) * SLOT_SIZE,
-        group: 'inventory' as const,
-      })),
-      ...hotbarSlots(109, 32),
+      ...gridSlots(5, 1, 44, 20, 'container'),
+      ...gridSlots(9, 3, 8, 51, 'inventory'),
+      ...hotbarSlots(109),
     ],
   },
 
   dispenser: {
     name: 'dispenser',
     title: 'Dispenser',
-    backgroundTexture: 'gui/container/dispenser',
+    backgroundTexture: '1.21.11/textures/gui/container/dispenser.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
     slots: [
-      ...gridSlots(0, 3, 3, 62, 17, 'container'),
-      // inv: 9-35, hotbar: 36-44
-      ...playerInv(84, 9, 36),
+      ...gridSlots(3, 3, 62, 17, 'container'),
+      ...playerInv(84),
     ],
   },
 
   dropper: {
     name: 'dropper',
     title: 'Dropper',
-    backgroundTexture: 'gui/container/dispenser',
+    backgroundTexture: '1.21.11/textures/gui/container/dispenser.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
     slots: [
-      ...gridSlots(0, 3, 3, 62, 17, 'container'),
-      ...playerInv(84, 9, 36),
+      ...gridSlots(3, 3, 62, 17, 'container'),
+      ...playerInv(84),
     ],
   },
 
   beacon: {
     name: 'beacon',
     title: 'Beacon',
-    backgroundTexture: 'gui/container/beacon',
+    backgroundTexture: '1.21.11/textures/gui/container/beacon.png',
     backgroundWidth: 230,
     backgroundHeight: 219,
     slots: [
-      { index: 0, x: 136, y: 110, group: 'payment', label: 'Payment' },
-      // inv: 1-27, hotbar: 28-36
-      ...playerInv(136, 1, 28),
+      { x: 136, y: 110, group: 'payment', label: 'Payment' },
+      ...playerInv(136),
     ],
   },
 
   horse: {
     name: 'horse',
     title: 'Horse',
-    backgroundTexture: 'gui/container/horse',
+    backgroundTexture: '1.21.11/textures/gui/container/horse.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
     slots: [
-      { index: 0, x: 8, y: 18, group: 'saddle', label: 'Saddle' },
-      { index: 1, x: 8, y: 36, group: 'armor', label: 'Horse Armor' },
-      // inv: 2-28, hotbar: 29-37
-      ...playerInv(84, 2, 29),
+      { x: 8, y: 18, group: 'saddle', label: 'Saddle' },
+      { x: 8, y: 36, group: 'armor', label: 'Horse Armor' },
+      ...playerInv(84),
     ],
   },
 
   donkey: {
     name: 'donkey',
     title: 'Donkey',
-    backgroundTexture: 'gui/container/horse',
+    backgroundTexture: '1.21.11/textures/gui/container/horse.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
     slots: [
-      { index: 0, x: 8, y: 18, group: 'saddle', label: 'Saddle' },
-      // chest items 2-16 (3x5) when has chest
-      ...Array.from({ length: 15 }, (_, i) => ({
-        index: 2 + i,
-        x: 80 + (i % 5) * SLOT_SIZE,
-        y: 18 + Math.floor(i / 5) * SLOT_SIZE,
-        group: 'chest' as const,
-      })),
-      // inv: 17-43, hotbar: 44-52 (after 2 equipment + 15 chest)
-      ...playerInv(84, 17, 44),
+      // Saddle (0); slot 1 (horse armor) is absent for donkeys — gap is intentional
+      { x: 8, y: 18, group: 'saddle', label: 'Saddle' },
+      // Chest items start at index 2; explicit index jumps the counter over the gap
+      ...gridSlots(5, 3, 80, 18, 'chest').map((s, i) => i === 0 ? { ...s, index: 2 } : s),
+      ...playerInv(84),
     ],
   },
 
   llama: {
     name: 'llama',
     title: 'Llama',
-    backgroundTexture: 'gui/container/horse',
+    backgroundTexture: '1.21.11/textures/gui/container/horse.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
     slots: [
-      { index: 0, x: 8, y: 18, group: 'saddle', label: 'Carpet' },
-      ...Array.from({ length: 15 }, (_, i) => ({
-        index: 2 + i,
-        x: 80 + (i % 5) * SLOT_SIZE,
-        y: 18 + Math.floor(i / 5) * SLOT_SIZE,
-        group: 'chest' as const,
-      })),
-      ...playerInv(84, 17, 44),
+      { x: 8, y: 18, group: 'saddle', label: 'Carpet' },
+      ...gridSlots(5, 3, 80, 18, 'chest').map((s, i) => i === 0 ? { ...s, index: 2 } : s),
+      ...playerInv(84),
     ],
   },
 
   villager: {
     name: 'villager',
     title: 'Villager',
-    backgroundTexture: 'gui/container/villager2',
+    backgroundTexture: '1.14/textures/gui/container/villager2.png',
     backgroundWidth: 276,
     backgroundHeight: 166,
     slots: [
-      { index: 0, x: 136, y: 37, group: 'trade_input1' },
-      { index: 1, x: 162, y: 37, group: 'trade_input2' },
-      { index: 2, x: 216, y: 37, group: 'trade_result', resultSlot: true },
-      ...Array.from({ length: 27 }, (_, i) => ({
-        index: 3 + i,
-        x: 108 + (i % 9) * SLOT_SIZE,
-        y: 84 + Math.floor(i / 9) * SLOT_SIZE,
-        group: 'inventory' as const,
-      })),
-      ...hotbarSlots(142, 30, 108),
+      { x: 136, y: 37, group: 'trade_input1' },
+      { x: 162, y: 37, group: 'trade_input2' },
+      { x: 216, y: 37, group: 'trade_result', resultSlot: true },
+      ...gridSlots(9, 3, 108, 84, 'inventory'),
+      ...hotbarSlots(142, 108),
     ],
   },
 
   shulker_box: {
     name: 'shulker_box',
     title: 'Shulker Box',
-    backgroundTexture: 'gui/container/shulker_box',
+    backgroundTexture: '1.21.11/textures/gui/container/shulker_box.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
     slots: [
-      ...gridSlots(0, 9, 3, 8, 18, 'container'),
-      ...playerInv(84, 27, 54),
+      ...gridSlots(9, 3, 8, 18, 'container'),
+      ...playerInv(84),
     ],
   },
 
   barrel: {
     name: 'barrel',
     title: 'Barrel',
-    backgroundTexture: 'gui/container/shulker_box',
+    backgroundTexture: '1.21.11/textures/gui/container/shulker_box.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
     slots: [
-      ...gridSlots(0, 9, 3, 8, 18, 'container'),
-      ...playerInv(84, 27, 54),
+      ...gridSlots(9, 3, 8, 18, 'container'),
+      ...playerInv(84),
     ],
   },
 
   cartography_table: {
     name: 'cartography_table',
     title: 'Cartography Table',
-    backgroundTexture: 'gui/container/cartography_table',
+    backgroundTexture: '1.21.11/textures/gui/container/cartography_table.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
     slots: [
-      { index: 0, x: 15, y: 15, group: 'input', label: 'Map' },
-      { index: 1, x: 15, y: 39, group: 'input', label: 'Paper/Map' },
-      { index: 2, x: 145, y: 39, group: 'result', resultSlot: true },
-      ...playerInv(84, 3, 30),
+      { x: 15, y: 15, group: 'input', label: 'Map' },
+      { x: 15, y: 39, group: 'input', label: 'Paper/Map' },
+      { x: 145, y: 39, group: 'result', resultSlot: true },
+      ...playerInv(84),
     ],
   },
 
   loom: {
     name: 'loom',
     title: 'Loom',
-    backgroundTexture: 'gui/container/loom',
+    backgroundTexture: '1.21.11/textures/gui/container/loom.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
     slots: [
-      { index: 0, x: 13, y: 26, group: 'input', label: 'Banner' },
-      { index: 1, x: 33, y: 26, group: 'input', label: 'Dye' },
-      { index: 2, x: 23, y: 45, group: 'input', label: 'Pattern' },
-      { index: 3, x: 143, y: 58, group: 'result', resultSlot: true },
-      ...playerInv(84, 4, 31),
+      { x: 13, y: 26, group: 'input', label: 'Banner' },
+      { x: 33, y: 26, group: 'input', label: 'Dye' },
+      { x: 23, y: 45, group: 'input', label: 'Pattern' },
+      { x: 143, y: 58, group: 'result', resultSlot: true },
+      ...playerInv(84),
     ],
   },
 
   stonecutter: {
     name: 'stonecutter',
     title: 'Stonecutter',
-    backgroundTexture: 'gui/container/stonecutter',
+    backgroundTexture: '1.21.11/textures/gui/container/stonecutter.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
     slots: [
-      { index: 0, x: 20, y: 33, group: 'input' },
-      { index: 1, x: 143, y: 33, group: 'result', resultSlot: true },
-      ...playerInv(84, 2, 29),
+      { x: 20, y: 33, group: 'input' },
+      { x: 143, y: 33, group: 'result', resultSlot: true },
+      ...playerInv(84),
     ],
   },
 
-  lectern: {
-    name: 'lectern',
-    title: 'Lectern',
-    backgroundTexture: 'gui/container/lectern',
-    backgroundWidth: 176,
-    backgroundHeight: 166,
-    slots: [],
-  },
-
   crafter: {
     name: 'crafter',
     title: 'Crafter',
-    backgroundTexture: 'gui/container/crafter',
-    guiTextureVersion: '1.21.4',
+    backgroundTexture: '1.21.11/textures/gui/container/crafter.png',
     backgroundWidth: 176,
     backgroundHeight: 166,
     slots: [
-      ...gridSlots(0, 3, 3, 30, 17, 'crafting'),
-      { index: 9, x: 124, y: 35, group: 'result', resultSlot: true },
-      ...playerInv(84, 10, 37),
+      ...gridSlots(3, 3, 30, 17, 'crafting'),
+      { x: 124, y: 35, group: 'result', resultSlot: true },
+      ...playerInv(84),
     ],
   },
 
   creative: {
     name: 'creative',
     title: 'Creative Inventory',
-    backgroundTexture: 'gui/container/creative_inventory/tab_items',
+    backgroundTexture: '1.21.11/textures/gui/container/creative_inventory/tab_items.png',
     backgroundWidth: 195,
     backgroundHeight: 136,
     slots: [
-      ...gridSlots(0, 9, 5, 9, 48, 'body'),
-      ...hotbarSlots(142, 0),
+      ...gridSlots(9, 5, 9, 48, 'body'),
+      // Creative hotbar indices start at 0 (separate window mapping), explicit to override counter
+      ...hotbarSlots(142).map((s, i) => ({ ...s, index: i })),
     ],
   },
-}
+
+  // Standalone hotbar HUD container — mirrors layouts.mjs `Hotbar`
+  // Background: gui/widgets (182×22 hotbar strip), slots at HUD pixel coords
+  // Indices 36–44 are the standard player hotbar
+  hotbar: {
+    name: 'hotbar',
+    title: '',
+    backgroundTexture: '1.15/textures/gui/widgets.png',
+    backgroundWidth: 182,
+    backgroundHeight: 22,
+    slots: [
+      // 9 hotbar slots (36–44) within the 182×22 hotbar strip.
+      // index: 36 on the first slot starts the running counter at 36.
+      ...hudHotbarSlots(),
+    ],
+  },
+})