minecraft-inventory 0.1.26 → 0.1.28

package/package.json

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

package/src/components/InventoryOverlay/InventoryOverlay.tsx

@@ -133,15 +133,26 @@ export function InventoryOverlay({
   }, [jeiOnGetRecipes, jeiOnGetUsages, pushRecipeFrame])
 
   // Fires for any click that isn't stopped by an interactive panel (inventory, hotbar, JEI, etc.)
-  const handleBackdropClick = useCallback(() => {
-    // Clicking the backdrop clears focused slot (regardless of heldItem)
-    if (focusedSlot !== null) {
-      setFocusedSlot(null)
-      return
-    }
+  const handleBackdropClick = useCallback((e: React.MouseEvent) => {
+    // Only handle left (drop all) and right (drop one) mouse buttons
+    if (e.button !== 0 && e.button !== 2) return
     if (heldItem) {
-      sendAction({ type: 'drop', slotIndex: -1, all: true })
-      setHeldItem(null)
+      const dropAll = e.button === 0 // LMB = drop all, RMB = drop one
+      sendAction({ type: 'drop', slotIndex: -1, all: dropAll })
+      if (dropAll) {
+        setHeldItem(null)
+      } else {
+        // Right click: drop one, keep rest on cursor
+        if (heldItem.count > 1) {
+          setHeldItem({ ...heldItem, count: heldItem.count - 1 })
+        } else {
+          setHeldItem(null)
+        }
+      }
+      // Also clear focused slot if any
+      if (focusedSlot !== null) setFocusedSlot(null)
+    } else if (focusedSlot !== null) {
+      setFocusedSlot(null)
     } else {
       onClose?.()
     }
@@ -183,7 +194,8 @@ export function InventoryOverlay({
     <>
       <div
         className={['mc-inv-overlay', className].filter(Boolean).join(' ')}
-        onClick={handleBackdropClick}
+        onMouseDown={handleBackdropClick}
+        onContextMenu={(e) => e.preventDefault()}
         style={{
           position: 'absolute',
           inset: 0,
@@ -217,6 +229,7 @@ export function InventoryOverlay({
             {showJEI && jeiPosition === 'left' && (
               <div
                 className="mc-inv-overlay-jei mc-inv-overlay-jei-left"
+                onMouseDown={(e) => e.stopPropagation()}
                 onClick={(e) => e.stopPropagation()}
                 style={{ flex: 1, minHeight: 0, display: 'flex', flexDirection: 'column', width: '100%' }}
               >
@@ -237,12 +250,14 @@ export function InventoryOverlay({
             display: 'flex',
             justifyContent: 'center',
             alignItems: 'center',
+            pointerEvents: 'none',
           }}
         >
-          <div className="mc-inv-overlay-content" style={{ position: 'relative' }}>
+          <div className="mc-inv-overlay-content" style={{ position: 'relative', pointerEvents: 'auto' }}>
             {/* Inventory / Recipe view — clicks clear focused slot; slots stop propagation themselves */}
             <div
               className="mc-inv-overlay-window"
+              onMouseDown={(e) => e.stopPropagation()}
               onClick={(e) => {
                 e.stopPropagation()
                 // Clicking the inventory background (not a slot) clears focused slot
@@ -274,6 +289,7 @@ export function InventoryOverlay({
         {showJEI && jeiPosition === 'right' && (
           <div
             className="mc-inv-overlay-side mc-inv-overlay-side-right"
+            onMouseDown={(e) => e.stopPropagation()}
             onClick={(e) => e.stopPropagation()}
             style={{ ...sidePanelBase, right: sideGapPx, pointerEvents: 'auto' }}
           >
@@ -310,7 +326,7 @@ export function InventoryOverlay({
               lineHeight: 1,
             }}
           >
-            INV 0.1.26
+            INV 0.1.28
           </a>
         )}
 

package/src/components/InventoryWindow/AnvilInput.tsx

@@ -1,8 +1,11 @@
 import React, { useState, useCallback, useRef, useEffect } from 'react'
+import { useFocusInputShortcut } from '../../hooks/useFocusInputShortcut'
 import { useScale } from '../../context/ScaleContext'
 import { useTextures } from '../../context/TextureContext'
 import { useInventoryContext } from '../../context/InventoryContext'
 
+const ANVIL_FOCUS_KEYS = ['KeyE'] as const
+
 interface AnvilInputProps {
   x: number
   y: number
@@ -21,6 +24,8 @@ export function AnvilInput({ x, y, width, height }: AnvilInputProps) {
 
   const hasInputItem = windowState?.slots.some((s) => s.index === 0 && s.item !== null) ?? false
 
+  useFocusInputShortcut(inputRef, ANVIL_FOCUS_KEYS, hasInputItem)
+
   const textFieldUrl = textures.getGuiTextureUrl(
     hasInputItem
       ? '1.21.11/textures/gui/sprites/container/anvil/text_field.png'

package/src/components/JEI/JEI.tsx

@@ -2,6 +2,7 @@ import React, { useState, useMemo, useCallback, useEffect, useLayoutEffect, useR
 import type { ItemStack, RecipeGuide, RecipeNavFrame, BlockTextureRender } from '../../types'
 import { useScale } from '../../context/ScaleContext'
 import { useInventoryContext } from '../../context/InventoryContext'
+import { useSlashFocusInput } from '../../hooks/useFocusInputShortcut'
 import { Slot } from '../Slot'
 import { StarIcon } from './StarIcon'
 import styles from './JEI.module.css'
@@ -88,6 +89,8 @@ export function JEI({
   // Self-measured dimensions so the panel can be width:100% and fill its container
   const rootRef = useRef<HTMLDivElement>(null)
   const gridRef = useRef<HTMLDivElement>(null)
+  const searchInputRef = useRef<HTMLInputElement>(null)
+  useSlashFocusInput(searchInputRef, true)
   const [measuredCols, setMeasuredCols] = useState(ITEMS_PER_ROW)
   const [measuredRows, setMeasuredRows] = useState(5)
 
@@ -250,6 +253,7 @@ export function JEI({
         }}
       >
         <input
+          ref={searchInputRef}
           type="text"
           value={search}
           onChange={handleSearchChange}

package/src/connector/mineflayer.ts

@@ -755,13 +755,39 @@ export function createMineflayerConnector(bot: MineflayerBot, options?: Mineflay
           }
           logActionEvent('connector.action.success', action)
         } else if (action.type === 'drop') {
-          logHelperIntent(action, 'bot.clickWindow', {
-            slot: action.slotIndex,
-            mouseButton: action.all ? 1 : 0,
-            mode: 4,
-          })
-          await bot.clickWindow(action.slotIndex, action.all ? 1 : 0, 4)
-          onSetSlot()
+          if (action.slotIndex === -1) {
+            // Drop cursor item by clicking outside the window: slot=-999, mode=0
+            // Left click (all=true) drops entire stack, right click (all=false) drops one
+            if (!ext._client) {
+              logActionEvent('connector.action.skipped', action, { reason: 'missing_client' })
+              return
+            }
+            const windowId = bot.currentWindow ? bot.currentWindow.id : 0
+            const mouseButton = action.all ? 0 : 1
+            const packet = {
+              windowId,
+              stateId: dragStateId,
+              slot: -999,
+              mouseButton,
+              mode: 0,
+              changedSlots: [],
+              cursorItem: { present: false } as any,
+            }
+            logPacketWrite('window_click', packet)
+            ext._client.write('window_click', packet)
+            dragStateId++
+            // Skip onSetSlot() — mineflayer's selectedItem is not updated yet.
+            // The server will send set_slot/window_items to sync the cursor state.
+          } else {
+            // Drop from specific slot via Q key: mode=4
+            logHelperIntent(action, 'bot.clickWindow', {
+              slot: action.slotIndex,
+              mouseButton: action.all ? 1 : 0,
+              mode: 4,
+            })
+            await bot.clickWindow(action.slotIndex, action.all ? 1 : 0, 4)
+            onSetSlot()
+          }
           logActionEvent('connector.action.success', action)
         } else if (action.type === 'close') {
           if (win) {

package/src/hooks/useFocusInputShortcut.ts

@@ -0,0 +1,46 @@
+import { useEffect, useMemo, type RefObject } from 'react'
+
+function isTypingTarget(el: EventTarget | null): boolean {
+  if (!el || !(el instanceof HTMLElement)) return false
+  const tag = el.tagName
+  if (tag === 'INPUT' || tag === 'TEXTAREA' || tag === 'SELECT') return true
+  if (el.isContentEditable) return true
+  return false
+}
+
+const SLASH_KEYS = ['Slash', 'NumpadDivide'] as const
+
+/**
+ * Focus the input when one of the given keys is pressed; prevents the key from being typed.
+ * Skips when focus is in another input/textarea/select/contenteditable (same idea as useCloseOnWClick).
+ */
+export function useFocusInputShortcut(
+  inputRef: RefObject<HTMLInputElement | null>,
+  keyCodes: readonly string[],
+  enabled = true,
+) {
+  const codesSet = useMemo(() => new Set(keyCodes), [keyCodes])
+
+  useEffect(() => {
+    if (!enabled) return
+
+    const onKeyDown = (e: KeyboardEvent) => {
+      if (!codesSet.has(e.code)) return
+      if (e.repeat) return
+      if (e.ctrlKey || e.metaKey || e.altKey) return
+      if (isTypingTarget(e.target)) return
+      const el = inputRef.current
+      if (!el || el.disabled) return
+      e.preventDefault()
+      el.focus()
+    }
+
+    window.addEventListener('keydown', onKeyDown)
+    return () => window.removeEventListener('keydown', onKeyDown)
+  }, [enabled, inputRef, codesSet])
+}
+
+/** `/` or numpad `/` — focus JEI search (when JEI is mounted). */
+export function useSlashFocusInput(inputRef: RefObject<HTMLInputElement | null>, enabled = true) {
+  useFocusInputShortcut(inputRef, SLASH_KEYS, enabled)
+}