minecraft-inventory 0.1.5 → 0.1.7

package/src/connector/types.ts

@@ -28,6 +28,7 @@ export interface MineflayerBotWindow {
   type: string
   title?: string
   slots: Array<{ type: number; count: number; metadata?: number; nbt?: unknown } | null>
+  selectedItem?: { type: number; count: number; metadata?: number; nbt?: unknown } | null
 }
 
 /** Villager window from bot.openVillager() — has trade() */

package/src/context/InventoryContext.tsx

@@ -42,6 +42,9 @@ export interface InventoryContextValue {
   /** Pending first digit for P-key slot number entry */
   pKeyDigit: string
   setPKeyDigit: (d: string) => void
+  /** Ref set to true when a drag just ended; cleared on next mouseDown.
+   *  Used by Slot to suppress spurious click events that fire after endDrag. */
+  dragEndedRef: React.MutableRefObject<boolean>
 }
 
 const InventoryContext = createContext<InventoryContextValue | null>(null)
@@ -90,6 +93,10 @@ export function InventoryProvider({ connector, children, noDragSpread = false }:
   const dragButtonRef = useRef(dragButton)
   dragButtonRef.current = dragButton
 
+  // Set to true when endDrag fires; cleared on the next mouseDown in Slot.
+  // Prevents spurious mouseUp events from sending unwanted clicks after a drag.
+  const dragEndedRef = useRef(false)
+
   useEffect(() => {
     if (!connector) return
     setWindowState(connector.getWindowState())
@@ -159,6 +166,7 @@ export function InventoryProvider({ connector, children, noDragSpread = false }:
 
   const startDrag = useCallback((slotIndex: number, button: 'left' | 'right') => {
     if (noDragSpread) return
+    dragEndedRef.current = false
     setIsDragging(true)
     setDragButton(button)
     setDragSlots([slotIndex])
@@ -175,6 +183,7 @@ export function InventoryProvider({ connector, children, noDragSpread = false }:
   }, [computeDragPreview, dragButton, heldItem, windowState])
 
   const endDrag = useCallback(() => {
+    dragEndedRef.current = true
     setDragSlots((slots) => {
       const button = dragButtonRef.current
       const held = heldItemRef.current
@@ -196,7 +205,6 @@ export function InventoryProvider({ connector, children, noDragSpread = false }:
           })
           if (compatibleSlots.length > 0) {
             const perSlot = Math.floor(held.count / compatibleSlots.length)
-            // Vanilla behavior: if perSlot=0 (more slots than items), nothing is distributed
             if (perSlot > 0) {
               let totalPlaced = 0
               for (const idx of compatibleSlots) {
@@ -302,6 +310,7 @@ export function InventoryProvider({ connector, children, noDragSpread = false }:
     setFocusedSlot,
     pKeyDigit,
     setPKeyDigit,
+    dragEndedRef,
   }
 
   return <InventoryContext.Provider value={value}>{children}</InventoryContext.Provider>

package/src/generated/localTextures.ts

@@ -28,6 +28,72 @@ import _gui_widgets from 'mc-assets/dist/other-textures/1.15/gui/widgets.png'
 import _gui_sprites_container_anvil_text_field from 'mc-assets/dist/other-textures/latest/gui/sprites/container/anvil/text_field.png'
 import _gui_sprites_container_anvil_text_field_disabled from 'mc-assets/dist/other-textures/latest/gui/sprites/container/anvil/text_field_disabled.png'
 
+/**
+ * Versioned texture path → bundled asset URL (or undefined for remote fallback).
+ * Keys are full mc-assets paths e.g. "1.21.11/textures/gui/container/inventory.png"
+ */
+export const bundledTextureMap: Record<string, string | undefined> = {
+  '1.21.11/textures/gui/container/inventory.png': _gui_container_inventory,
+  '1.21.11/textures/gui/container/shulker_box.png': _gui_container_shulker_box,
+  '1.21.11/textures/gui/container/generic_54.png': _gui_container_generic_54,
+  '1.21.11/textures/gui/container/crafting_table.png': _gui_container_crafting_table,
+  '1.21.11/textures/gui/container/furnace.png': _gui_container_furnace,
+  '1.21.11/textures/gui/container/blast_furnace.png': _gui_container_blast_furnace,
+  '1.21.11/textures/gui/container/smoker.png': _gui_container_smoker,
+  '1.21.11/textures/gui/container/brewing_stand.png': _gui_container_brewing_stand,
+  '1.21.11/textures/gui/container/anvil.png': _gui_container_anvil,
+  '1.21.11/textures/gui/container/grindstone.png': _gui_container_grindstone,
+  '1.21.11/textures/gui/container/enchanting_table.png': _gui_container_enchanting_table,
+  '1.21.11/textures/gui/container/smithing.png': _gui_container_smithing,
+  '1.16.4/textures/gui/container/smithing.png': _gui_container_smithing_2,
+  '1.21.11/textures/gui/container/hopper.png': _gui_container_hopper,
+  '1.21.11/textures/gui/container/dispenser.png': _gui_container_dispenser,
+  '1.21.11/textures/gui/container/beacon.png': _gui_container_beacon,
+  '1.21.11/textures/gui/container/horse.png': _gui_container_horse,
+  '1.14/textures/gui/container/villager2.png': _gui_container_villager2,
+  '1.21.11/textures/gui/container/cartography_table.png': _gui_container_cartography_table,
+  '1.21.11/textures/gui/container/loom.png': _gui_container_loom,
+  '1.21.11/textures/gui/container/stonecutter.png': _gui_container_stonecutter,
+  '1.21.11/textures/gui/container/crafter.png': _gui_container_crafter,
+  '1.21.11/textures/gui/container/creative_inventory/tab_items.png': _gui_container_creative_inventory_tab_items,
+  '1.15/textures/gui/widgets.png': _gui_widgets,
+  '1.21.11/textures/gui/sprites/container/anvil/text_field.png': _gui_sprites_container_anvil_text_field,
+  '1.21.11/textures/gui/sprites/container/anvil/text_field_disabled.png': _gui_sprites_container_anvil_text_field_disabled,
+}
+
+
+/**
+ * All texture paths without version prefix (e.g. "gui/container/inventory.png").
+ * Same set as bundledTextureMap keys with version stripped.
+ */
+export const allTexturePaths: readonly string[] = [
+  'gui/container/inventory.png',
+  'gui/container/shulker_box.png',
+  'gui/container/generic_54.png',
+  'gui/container/crafting_table.png',
+  'gui/container/furnace.png',
+  'gui/container/blast_furnace.png',
+  'gui/container/smoker.png',
+  'gui/container/brewing_stand.png',
+  'gui/container/anvil.png',
+  'gui/container/grindstone.png',
+  'gui/container/enchanting_table.png',
+  'gui/container/smithing.png',
+  'gui/container/hopper.png',
+  'gui/container/dispenser.png',
+  'gui/container/beacon.png',
+  'gui/container/horse.png',
+  'gui/container/villager2.png',
+  'gui/container/cartography_table.png',
+  'gui/container/loom.png',
+  'gui/container/stonecutter.png',
+  'gui/container/crafter.png',
+  'gui/container/creative_inventory/tab_items.png',
+  'gui/widgets.png',
+  'gui/sprites/container/anvil/text_field.png',
+  'gui/sprites/container/anvil/text_field_disabled.png',
+]
+
 /**
  * Maps each inventory type name to its texture path (version prefix stripped).
  */
@@ -68,54 +134,3 @@ export const allContainerPaths: Record<string, string> = {
   creative: 'gui/container/creative_inventory/tab_items.png',
   hotbar: 'gui/widgets.png',
 }
-
-// Internal: versioned texture key → bundled asset URL (or undefined → remote fallback)
-const _map: Record<string, string | undefined> = {
-  '1.21.11/textures/gui/container/inventory.png': _gui_container_inventory,
-  '1.21.11/textures/gui/container/shulker_box.png': _gui_container_shulker_box,
-  '1.21.11/textures/gui/container/generic_54.png': _gui_container_generic_54,
-  '1.21.11/textures/gui/container/crafting_table.png': _gui_container_crafting_table,
-  '1.21.11/textures/gui/container/furnace.png': _gui_container_furnace,
-  '1.21.11/textures/gui/container/blast_furnace.png': _gui_container_blast_furnace,
-  '1.21.11/textures/gui/container/smoker.png': _gui_container_smoker,
-  '1.21.11/textures/gui/container/brewing_stand.png': _gui_container_brewing_stand,
-  '1.21.11/textures/gui/container/anvil.png': _gui_container_anvil,
-  '1.21.11/textures/gui/container/grindstone.png': _gui_container_grindstone,
-  '1.21.11/textures/gui/container/enchanting_table.png': _gui_container_enchanting_table,
-  '1.21.11/textures/gui/container/smithing.png': _gui_container_smithing,
-  '1.16.4/textures/gui/container/smithing.png': _gui_container_smithing_2,
-  '1.21.11/textures/gui/container/hopper.png': _gui_container_hopper,
-  '1.21.11/textures/gui/container/dispenser.png': _gui_container_dispenser,
-  '1.21.11/textures/gui/container/beacon.png': _gui_container_beacon,
-  '1.21.11/textures/gui/container/horse.png': _gui_container_horse,
-  '1.14/textures/gui/container/villager2.png': _gui_container_villager2,
-  '1.21.11/textures/gui/container/cartography_table.png': _gui_container_cartography_table,
-  '1.21.11/textures/gui/container/loom.png': _gui_container_loom,
-  '1.21.11/textures/gui/container/stonecutter.png': _gui_container_stonecutter,
-  '1.21.11/textures/gui/container/crafter.png': _gui_container_crafter,
-  '1.21.11/textures/gui/container/creative_inventory/tab_items.png': _gui_container_creative_inventory_tab_items,
-  '1.15/textures/gui/widgets.png': _gui_widgets,
-  '1.21.11/textures/gui/sprites/container/anvil/text_field.png': _gui_sprites_container_anvil_text_field,
-  '1.21.11/textures/gui/sprites/container/anvil/text_field_disabled.png': _gui_sprites_container_anvil_text_field_disabled,
-}
-
-/**
- * Partial TextureConfig that resolves inventory GUI textures from locally bundled
- * mc-assets assets instead of remote GitHub URLs.
- *
- * Pass to `<TextureProvider config={localTexturesConfig}>` to use offline/bundled assets.
- *
- * Unknown paths (not bundled) fall back to the mc-assets remote URL automatically.
- */
-const _MC_ASSETS_REMOTE = "https://raw.githubusercontent.com/zardoy/mc-assets/refs/heads/gh-pages"
-export const localTexturesConfig = {
-  getGuiTextureUrl(path: string): string {
-    const local = _map[path] as string | undefined
-    if (local) return local
-    // Fall back to remote mc-assets URL for paths not in the bundle
-    if (path.endsWith('.png') && path.includes('/textures/')) {
-      return `${_MC_ASSETS_REMOTE}/${path}`
-    }
-    return path
-  },
-}

package/src/index.tsx

@@ -67,4 +67,22 @@ export type {
   RecipeGuide,
   RecipeNavFrame,
   EntityDisplayArea,
+  TextureSlice,
+  BlockFaceSlice,
+  BlockTextureRender,
 } from './types'
+
+// Bundled textures config
+export {
+  createBundledTexturesConfig,
+  localBundledTexturesConfig,
+  allTexturePaths,
+  allContainerPaths,
+} from './bundledTexturesConfig'
+export type {
+  BundledTexturesConfig,
+  BundledTexturesConfigOptions,
+} from './bundledTexturesConfig'
+
+// Texture cache (for resetRenderedSlots / manual invalidation)
+export { clearTextureCache } from './cache/textureCache'

package/src/registry/inventories.ts

@@ -95,6 +95,7 @@ export const inventoryDefinitions = makeInventoryDefinitions({
     backgroundWidth: 176,
     backgroundHeight: 166,
     entityDisplay: { x: 26, y: 8, width: 49, height: 70 },
+    entityPlaceholder: 'player',
     slots: [
       // Result (0)
       { x: 154, y: 28, group: 'result', resultSlot: true },
@@ -140,7 +141,7 @@ export const inventoryDefinitions = makeInventoryDefinitions({
     containerRows: 1,
     slots: [
       ...gridSlots(9, 1, 8, 18, 'container'),
-      ...playerInv(48), // 1*18 + 30
+      ...playerInv(50), // 1*18 + 30 + 2px offset below
     ],
   },
 
@@ -153,7 +154,7 @@ export const inventoryDefinitions = makeInventoryDefinitions({
     containerRows: 2,
     slots: [
       ...gridSlots(9, 2, 8, 18, 'container'),
-      ...playerInv(66), // 2*18 + 30
+      ...playerInv(68), // 2*18 + 30 + 2px offset below
     ],
   },
 
@@ -164,10 +165,10 @@ export const inventoryDefinitions = makeInventoryDefinitions({
     backgroundWidth: 176,
     backgroundHeight: 168, // 3*18 + 114
     containerRows: 3,
-    playerInventoryOffset: { x: 8, y: 84 },
+    playerInventoryOffset: { x: 8, y: 82 },
     slots: [
       ...gridSlots(9, 3, 8, 18, 'container'),
-      ...playerInv(84), // 3*18 + 30
+      ...playerInv(86), // 3*18 + 30 + 2px offset below
     ],
   },
 
@@ -180,7 +181,7 @@ export const inventoryDefinitions = makeInventoryDefinitions({
     containerRows: 4,
     slots: [
       ...gridSlots(9, 4, 8, 18, 'container'),
-      ...playerInv(102), // 4*18 + 30
+      ...playerInv(104), // 4*18 + 30 + 2px offset below
     ],
   },
 
@@ -193,7 +194,7 @@ export const inventoryDefinitions = makeInventoryDefinitions({
     containerRows: 5,
     slots: [
       ...gridSlots(9, 5, 8, 18, 'container'),
-      ...playerInv(120), // 5*18 + 30
+      ...playerInv(122), // 5*18 + 30 + 2px offset below
     ],
   },
 
@@ -204,6 +205,7 @@ export const inventoryDefinitions = makeInventoryDefinitions({
     backgroundWidth: 176,
     backgroundHeight: 222, // full 6-row texture, no stitching needed (N*18+114 = 222)
     playerInventoryOffset: { x: 8, y: 140 },
+    containerRows: 6,
     slots: [
       ...gridSlots(9, 6, 8, 18, 'container'),
       ...playerInv(140), // matches large_chest
@@ -216,7 +218,8 @@ export const inventoryDefinitions = makeInventoryDefinitions({
     backgroundTexture: '1.21.11/textures/gui/container/generic_54.png',
     backgroundWidth: 176,
     backgroundHeight: 222,
-    playerInventoryOffset: { x: 8, y: 140 },
+    containerRows: 6,
+    playerInventoryOffset: { x: 8, y: 138 },
     slots: [
       ...gridSlots(9, 6, 8, 18, 'container'),
       ...playerInv(140),
@@ -550,6 +553,7 @@ export const inventoryDefinitions = makeInventoryDefinitions({
     backgroundWidth: 176,
     backgroundHeight: 166,
     entityDisplay: { x: 26, y: 18, width: 52, height: 52 },
+    entityPlaceholder: 'horse',
     slots: [
       // Saddle (0); slot 1 (horse armor) is absent for donkeys — gap is intentional
       { x: 8, y: 18, group: 'saddle', label: 'Saddle' },
@@ -566,6 +570,7 @@ export const inventoryDefinitions = makeInventoryDefinitions({
     backgroundWidth: 176,
     backgroundHeight: 166,
     entityDisplay: { x: 26, y: 18, width: 52, height: 52 },
+    entityPlaceholder: 'llama',
     slots: [
       { x: 8, y: 18, group: 'saddle', label: 'Carpet' },
       ...gridSlots(5, 3, 80, 18, 'chest').map((s, i) => i === 0 ? { ...s, index: 2 } : s),

package/src/types.ts

@@ -1,3 +1,24 @@
+/** Slice rect [x, y, width, height] in source texture pixels. */
+export type TextureSlice = [x:number, y:number, width:number, height:number]
+
+/** Block face slice for isometric block rendering. */
+export interface BlockFaceSlice {
+  slice: TextureSlice
+}
+
+/**
+ * Block-style render config. When set, ItemCanvas uses an aux canvas to composite
+ * top/left/right faces into an isometric icon instead of a single texture.
+ * Useful for blocks in mineflayer connector where block texture atlas faces differ.
+ */
+export interface BlockTextureRender {
+  /** Source texture URL or preloaded HTMLImageElement. */
+  source: string | HTMLImageElement
+  top: BlockFaceSlice
+  left: BlockFaceSlice
+  right: BlockFaceSlice
+}
+
 export interface ItemStack {
   type: number
   count: number
@@ -19,6 +40,17 @@ export interface ItemStack {
    * Example: `"item/dye_black"` or `"entity/spider/spider"`
    */
   textureKey?: string
+  /**
+   * Direct texture override. When set, bypasses getItemTextureUrl.
+   * - `string`: URL (data URL or http) used as img src.
+   * - `HTMLImageElement`: preloaded image, drawn directly.
+   */
+  texture?: string | HTMLImageElement
+  /**
+   * Block-style isometric render. When set, ItemCanvas uses a canvas pool to composite
+   * top/left/right face slices into the icon. Use in mineflayer itemMapper for blocks.
+   */
+  blockTexture?: BlockTextureRender
   /**
    * Arbitrary debug identifier exposed as a `data-debug` attribute on the slot element.
    * The mineflayer connector sets this to `"<type>:<metadata>"` by default, making it easy
@@ -145,6 +177,11 @@ export interface InventoryTypeDefinition {
   extraData?: Record<string, unknown>
   /** Bounds for the entity preview area (e.g. player model, horse model). */
   entityDisplay?: EntityDisplayArea
+  /**
+   * Bundled placeholder image for the entity panel when `renderEntity` is not set.
+   * Maps to files under `src/assets/entities/`.
+   */
+  entityPlaceholder?: 'player' | 'horse' | 'llama'
   /**
    * When set, InventoryBackground will canvas-stitch the background texture:
    * top (title + N container rows) + bottom (player inventory section) from