minecraft-inventory 0.1.44 → 0.1.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minecraft-inventory",
-  "version": "0.1.44",
+  "version": "0.1.46",
   "type": "module",
   "license": "MIT",
   "release": {

package/src/components/InventoryOverlay/InventoryOverlay.tsx

@@ -353,7 +353,7 @@ export function InventoryOverlay({
               lineHeight: 1,
             }}
           >
-            INV 0.1.44
+            INV 0.1.46
           </a>
         )}
 

package/src/components/InventoryWindow/InventoryWindow.tsx

@@ -47,8 +47,9 @@ export function InventoryWindow({
   const { scale, slotSize, contentSize } = useScale()
   // borderPx removed from slot positioning: registry coords already point to the item area
   const borderPx = 0
+  const isHotbar = type === 'hotbar'
 
-  useKeyboardShortcuts(enableKeyboardShortcuts)
+  useKeyboardShortcuts(enableKeyboardShortcuts && !isHotbar)
 
   const effectiveSlots = useMemo(() => {
     if (slotsProp) return slotsProp
@@ -73,7 +74,6 @@ export function InventoryWindow({
   const effectiveTitle = (type === 'player' || isBeacon) ? undefined : (title ?? windowState?.title ?? def.title)
   const isVillager = type === 'villager'
   const isEnchanting = def?.name === 'enchanting_table'
-  const isHotbar = type === 'hotbar'
   const isAnvil = def?.name === 'anvil'
 
   const resolveItem = (slotIndex: number) => {

package/src/components/Slot/Slot.module.css

@@ -75,12 +75,9 @@
   z-index: 10001;
 }
 
-.mobileMenuTitle {
-  color: #ffffff;
-  font-weight: bold;
-  padding-bottom: 4px;
-  border-bottom: 1px solid #555555;
+.mobileMenuInfo {
   margin-bottom: 4px;
+  flex-shrink: 0;
 }
 
 .mobileBtn {

package/src/components/Slot/Slot.tsx

@@ -4,6 +4,8 @@ import { useInventoryContext } from '../../context/InventoryContext'
 import { useScale } from '../../context/ScaleContext'
 import { ItemCanvas } from '../ItemCanvas'
 import { Tooltip } from '../Tooltip'
+import { ItemTooltipBody } from '../Tooltip/ItemTooltipBody'
+import tooltipStyles from '../Tooltip/Tooltip.module.css'
 import { useMobile } from '../../hooks/useMobile'
 import styles from './Slot.module.css'
 
@@ -606,7 +608,7 @@ function MobileSlotMenu({ item, x, y, onPickAll, onPickHalf, onDropOne, onDropAl
     if (top + mh > vh - 4) top = vh - mh - 4
     if (top < 4) top = 4
     setPos({ left, top })
-  }, [x, y])
+  }, [x, y, item])
 
   // Wrapper to handle both touch and click, preventing event bubbling to the slot
   const touchBtn = (handler: () => void) => ({
@@ -631,8 +633,17 @@ function MobileSlotMenu({ item, x, y, onPickAll, onPickHalf, onDropOne, onDropAl
         minWidth: 100 * scale,
       }}
     >
-      <div className={styles.mobileMenuTitle}>
-        {item.displayName ?? item.name ?? `Item #${item.type}`} ×{item.count}
+      <div
+        className={[tooltipStyles.tooltip, styles.mobileMenuInfo].join(' ')}
+        style={{
+          fontSize: Math.round(8 * scale),
+          padding: Math.round(3 * scale),
+          gap: Math.round(0.5 * scale),
+          width: 'max-content',
+          maxWidth: 'min(90vw, 280px)',
+        }}
+      >
+        <ItemTooltipBody item={item} />
       </div>
       <button className={styles.mobileBtn} {...touchBtn(onPickAll)}>Select All ({item.count})</button>
       <button className={styles.mobileBtn} {...touchBtn(onPickHalf)}>Pick Half ({Math.ceil(item.count / 2)})</button>

package/src/components/Tooltip/ItemTooltipBody.tsx

@@ -0,0 +1,69 @@
+import React from 'react'
+import type { ItemStack } from '../../types'
+import { MessageFormattedString } from '../Text/MessageFormattedString'
+import styles from './Tooltip.module.css'
+
+function getRarityColor(item: ItemStack): string {
+  if (item.enchantments && item.enchantments.length > 0) return '#8080ff'
+  return '#ffffff'
+}
+
+function formatEnchantment(e: { name: string; level: number }): string {
+  const roman = ['', 'I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX', 'X']
+  return e.level <= 10 ? `${e.name} ${roman[e.level]}` : `${e.name} ${e.level}`
+}
+
+export function getItemTooltipDisplayName(item: ItemStack): string {
+  return item.displayName ?? (item.name ? item.name.replace(/_/g, ' ') : `Item #${item.type}`)
+}
+
+/** Item name, enchantments, lore, durability, and type id — shared by desktop tooltip and mobile menu. */
+export function ItemTooltipBody({ item }: { item: ItemStack }) {
+  const nameColor = getRarityColor(item)
+  const hasDurability =
+    item.durability !== undefined &&
+    item.maxDurability !== undefined &&
+    item.durability < item.maxDurability
+
+  return (
+    <>
+      <div className={styles.name} style={{ color: nameColor }}>
+        <MessageFormattedString
+          text={getItemTooltipDisplayName(item)}
+          fallbackColor={nameColor}
+        />
+      </div>
+
+      {item.enchantments && item.enchantments.length > 0 && (
+        <div className={styles.section}>
+          {item.enchantments.map((e, i) => (
+            <div key={i} className={styles.enchantment}>
+              {formatEnchantment(e)}
+            </div>
+          ))}
+        </div>
+      )}
+
+      {item.lore && item.lore.length > 0 && (
+        <div className={styles.lore}>
+          {item.lore.map((line, i) => (
+            <div key={i}>
+              <MessageFormattedString text={line} />
+            </div>
+          ))}
+        </div>
+      )}
+
+      {hasDurability && (
+        <div className={styles.durability}>
+          Durability: {item.durability} / {item.maxDurability}
+        </div>
+      )}
+
+      <div className={styles.typeId}>
+        {item.name ?? `#${item.type}`}
+        {item.metadata !== undefined && item.metadata > 0 ? `:${item.metadata}` : ''}
+      </div>
+    </>
+  )
+}

package/src/components/Tooltip/Tooltip.tsx

@@ -2,8 +2,8 @@ import React, { useRef, useEffect } from 'react'
 import { createPortal } from 'react-dom'
 import type { ItemStack } from '../../types'
 import { useScale } from '../../context/ScaleContext'
-import { MessageFormattedString } from '../Text/MessageFormattedString'
 import { globalMouse } from '../../utils/globalMouse'
+import { ItemTooltipBody } from './ItemTooltipBody'
 import styles from './Tooltip.module.css'
 
 interface TooltipProps {
@@ -11,16 +11,6 @@ interface TooltipProps {
   visible: boolean
 }
 
-function getRarityColor(item: ItemStack): string {
-  if (item.enchantments && item.enchantments.length > 0) return '#8080ff'
-  return '#ffffff'
-}
-
-function formatEnchantment(e: { name: string; level: number }): string {
-  const roman = ['', 'I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX', 'X']
-  return e.level <= 10 ? `${e.name} ${roman[e.level]}` : `${e.name} ${e.level}`
-}
-
 export function Tooltip({ item, visible }: TooltipProps) {
   const { scale } = useScale()
   const ref = useRef<HTMLDivElement>(null)
@@ -63,12 +53,6 @@ export function Tooltip({ item, visible }: TooltipProps) {
 
   if (!visible) return null
 
-  const nameColor = getRarityColor(item)
-  const hasDurability =
-    item.durability !== undefined &&
-    item.maxDurability !== undefined &&
-    item.durability < item.maxDurability
-
   const fs = Math.round(8 * scale)
   const pad = Math.round(3 * scale)
   const gap2 = Math.round(0.5 * scale)
@@ -91,43 +75,7 @@ export function Tooltip({ item, visible }: TooltipProps) {
         pointerEvents: 'none',
       }}
     >
-      <div className={styles.name} style={{ color: nameColor }}>
-        <MessageFormattedString
-          text={item.displayName ?? (item.name ? item.name.replace(/_/g, ' ') : `Item #${item.type}`)}
-          fallbackColor={nameColor}
-        />
-      </div>
-
-      {item.enchantments && item.enchantments.length > 0 && (
-        <div className={styles.section}>
-          {item.enchantments.map((e, i) => (
-            <div key={i} className={styles.enchantment}>
-              {formatEnchantment(e)}
-            </div>
-          ))}
-        </div>
-      )}
-
-      {item.lore && item.lore.length > 0 && (
-        <div className={styles.lore}>
-          {item.lore.map((line, i) => (
-            <div key={i}>
-              <MessageFormattedString text={line} />
-            </div>
-          ))}
-        </div>
-      )}
-
-      {hasDurability && (
-        <div className={styles.durability}>
-          Durability: {item.durability} / {item.maxDurability}
-        </div>
-      )}
-
-      <div className={styles.typeId}>
-        {item.name ?? `#${item.type}`}
-        {item.metadata !== undefined && item.metadata > 0 ? `:${item.metadata}` : ''}
-      </div>
+      <ItemTooltipBody item={item} />
     </div>
   )
 

package/src/connector/mineflayer.ts

@@ -147,6 +147,14 @@ function isEnchantmentTableWindow(win: unknown): win is { enchant: (choice: numb
   return win != null && typeof (win as Record<string, unknown>).enchant === 'function'
 }
 
+/** Registry property keys for the three enchant rows (craft_progress_bar data slots 0–2). */
+const ENCHANT_OPTION_LEVEL_KEYS = ['topEnchantLevel', 'middleEnchantLevel', 'bottomEnchantLevel'] as const
+
+function isEnchantingTableWindowType(type: string | undefined | null): boolean {
+  if (!type) return false
+  return getInventoryType(type)?.name === 'enchanting_table'
+}
+
 function isAnvilWindow(
   win: unknown
 ): win is {
@@ -641,10 +649,55 @@ export function createMineflayerConnector(bot: MineflayerBot, options?: Mineflay
           return
         }
   
-        if (action.type === 'enchant' && win && isEnchantmentTableWindow(win)) {
-          logHelperIntent(action, 'window.enchant', { enchantIndex: action.enchantIndex })
-          await win.enchant(action.enchantIndex)
-          logActionEvent('connector.action.success', action)
+        if (action.type === 'enchant') {
+          if (!win) {
+            logActionEvent('connector.action.skipped', action, { reason: 'no_open_window' })
+            return
+          }
+          if (!isEnchantingTableWindowType(win.type)) {
+            logActionEvent('connector.action.skipped', action, {
+              reason: 'not_enchanting_table',
+              windowType: win.type,
+            })
+            return
+          }
+          const choice = action.enchantIndex
+          if (!Number.isInteger(choice) || choice < 0 || choice > 2) {
+            logActionEvent('connector.action.skipped', action, { reason: 'invalid_enchant_index' })
+            return
+          }
+          const optionLevel = windowProperties[ENCHANT_OPTION_LEVEL_KEYS[choice]] ?? -1
+          if (optionLevel <= 0) {
+            logActionEvent('connector.action.skipped', action, {
+              reason: 'enchant_option_unavailable',
+              level: optionLevel,
+            })
+            return
+          }
+
+          // Direct enchant_item packet — same as mineflayer/lib/plugins/enchantment_table.js.
+          // Does not require bot.openEnchantmentTable() (win.enchant is optional).
+          if (ext._client) {
+            const packet = {
+              windowId: win.id,
+              enchantment: choice,
+            }
+            logPacketWrite('enchant_item', packet)
+            ext._client.write('enchant_item', packet)
+            scheduleSlotUpdate()
+            logActionEvent('connector.action.success', action)
+            return
+          }
+
+          if (isEnchantmentTableWindow(win)) {
+            logHelperIntent(action, 'window.enchant', { enchantIndex: choice })
+            await win.enchant(choice)
+            onSetSlot()
+            logActionEvent('connector.action.success', action)
+            return
+          }
+
+          logActionEvent('connector.action.skipped', action, { reason: 'missing_client' })
           return
         }