minecraft-inventory 0.1.28 → 0.1.29

package/package.json

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

package/src/components/InventoryOverlay/InventoryOverlay.tsx

@@ -326,7 +326,7 @@ export function InventoryOverlay({
               lineHeight: 1,
             }}
           >
-            INV 0.1.28
+            INV 0.1.29
           </a>
         )}
 

package/src/components/InventoryWindow/BeaconEffects.tsx

@@ -0,0 +1,350 @@
+import React, { useState, useEffect } from 'react'
+import { useInventoryContext } from '../../context/InventoryContext'
+import { useTextures } from '../../context/TextureContext'
+import { useScale } from '../../context/ScaleContext'
+
+// Bundled payment item textures (not available via texture provider in the full client)
+import netherite_ingot_png from '../../assets/beacon/netherite_ingot.png'
+import emerald_png from '../../assets/beacon/emerald.png'
+import diamond_png from '../../assets/beacon/diamond.png'
+import gold_ingot_png from '../../assets/beacon/gold_ingot.png'
+import iron_ingot_png from '../../assets/beacon/iron_ingot.png'
+
+const SPRITE_BASE = '1.21.11/textures/gui/sprites/container/beacon'
+const MOB_EFFECT_BASE = '1.21.11/textures/mob_effect'
+
+// Effect IDs matching vanilla BeaconMenu.encodeEffect: registry_id + 1
+// ContainerData: ≤0 = none, 1+ = effect (1-based)
+// Protocol set_beacon_effect option(varint) uses the same 1-based encoding
+const EFFECTS = {
+  NONE: -1,
+  SPEED: 1,          // registry 0 + 1
+  HASTE: 3,          // registry 2 + 1
+  STRENGTH: 5,       // registry 4 + 1
+  JUMP_BOOST: 8,     // registry 7 + 1
+  REGENERATION: 10,  // registry 9 + 1
+  RESISTANCE: 11,    // registry 10 + 1
+} as const
+
+const EFFECT_INFO: Record<number, { name: string; sprite: string }> = {
+  [EFFECTS.SPEED]: { name: 'Speed', sprite: 'speed' },
+  [EFFECTS.HASTE]: { name: 'Haste', sprite: 'haste' },
+  [EFFECTS.RESISTANCE]: { name: 'Resistance', sprite: 'resistance' },
+  [EFFECTS.JUMP_BOOST]: { name: 'Jump Boost', sprite: 'jump_boost' },
+  [EFFECTS.STRENGTH]: { name: 'Strength', sprite: 'strength' },
+  [EFFECTS.REGENERATION]: { name: 'Regeneration', sprite: 'regeneration' },
+}
+
+// Primary buttons: 3 tiers of effects
+const PRIMARY_TIERS: { tier: number; y: number; effects: number[] }[] = [
+  { tier: 0, y: 22, effects: [EFFECTS.SPEED, EFFECTS.HASTE] },
+  { tier: 1, y: 47, effects: [EFFECTS.RESISTANCE, EFFECTS.JUMP_BOOST] },
+  { tier: 2, y: 72, effects: [EFFECTS.STRENGTH] },
+]
+
+const PRIMARY_CENTER_X = 76
+
+// Payment indicator items shown next to the payment slot (vanilla renderBg)
+const PAYMENT_ITEMS: { src: string; x: number }[] = [
+  { src: netherite_ingot_png, x: 20 },
+  { src: emerald_png, x: 41 },
+  { src: diamond_png, x: 63 },
+  { src: gold_ingot_png, x: 86 },
+  { src: iron_ingot_png, x: 108 },
+]
+
+interface BeaconEffectsProps {
+  properties: Record<string, number>
+}
+
+export function BeaconEffects({ properties }: BeaconEffectsProps) {
+  const { sendAction, getSlot } = useInventoryContext()
+  const textures = useTextures()
+  const { scale } = useScale()
+
+  const levels = properties.levels ?? 0
+  // ContainerData: ≤0 means "no effect" (server sends -1 for uninitialized, vanilla sends 0)
+  const serverPrimary = (properties.primaryEffect ?? -1) > 0 ? properties.primaryEffect! : EFFECTS.NONE
+  const serverSecondary = (properties.secondaryEffect ?? -1) > 0 ? properties.secondaryEffect! : EFFECTS.NONE
+
+  const [selectedPrimary, setSelectedPrimary] = useState(serverPrimary)
+  const [selectedSecondary, setSelectedSecondary] = useState(serverSecondary)
+  const [hoveredButton, setHoveredButton] = useState<string | null>(null)
+
+  // Sync local state when server properties change
+  useEffect(() => {
+    setSelectedPrimary(serverPrimary)
+    setSelectedSecondary(serverSecondary)
+  }, [serverPrimary, serverSecondary])
+
+  // Payment slot is index 0 in the beacon container
+  const paymentSlot = getSlot(0)
+  const hasPayment = paymentSlot?.item != null
+
+  // Confirm requires payment AND a primary selection (valid effects are > 0)
+  const canConfirm = hasPayment && selectedPrimary > 0
+
+  // Upgrade button mirrors the LOCAL selected primary (vanilla: BeaconScreen.this.primary)
+  const showUpgrade = selectedPrimary > 0
+
+  const getButtonSprite = (disabled: boolean, selected: boolean, hovered: boolean) => {
+    if (disabled) return textures.getGuiTextureUrl(`${SPRITE_BASE}/button_disabled.png`)
+    if (selected) return textures.getGuiTextureUrl(`${SPRITE_BASE}/button_selected.png`)
+    if (hovered) return textures.getGuiTextureUrl(`${SPRITE_BASE}/button_highlighted.png`)
+    return textures.getGuiTextureUrl(`${SPRITE_BASE}/button.png`)
+  }
+
+  const getEffectSprite = (effect: number) => {
+    const info = EFFECT_INFO[effect]
+    if (!info) return undefined
+    return textures.getGuiTextureUrl(`${MOB_EFFECT_BASE}/${info.sprite}.png`)
+  }
+
+  const handleConfirm = () => {
+    if (!canConfirm) return
+    sendAction({
+      type: 'beacon',
+      primaryEffect: selectedPrimary,
+      secondaryEffect: selectedSecondary,
+    })
+    sendAction({ type: 'close' })
+  }
+
+  const handleCancel = () => {
+    sendAction({ type: 'close' })
+  }
+
+  // Center buttons around a given X coordinate
+  const getButtonX = (centerX: number, index: number, count: number) => {
+    const totalWidth = count * 22 + (count - 1) * 2
+    return centerX + index * 24 - totalWidth / 2
+  }
+
+  const renderEffectButton = (
+    effect: number,
+    x: number,
+    y: number,
+    disabled: boolean,
+    isSelected: boolean,
+    isPrimary: boolean,
+    key: string,
+    tooltip?: string,
+  ) => {
+    const hovered = hoveredButton === key && !disabled
+    const info = EFFECT_INFO[effect]
+    const title = tooltip ?? info?.name
+
+    return (
+      <div
+        key={key}
+        onClick={() => {
+          if (disabled) return
+          if (isPrimary) {
+            setSelectedPrimary(effect)
+          } else {
+            setSelectedSecondary(effect)
+          }
+        }}
+        onMouseEnter={() => setHoveredButton(key)}
+        onMouseLeave={() => setHoveredButton(null)}
+        title={title}
+        style={{
+          position: 'absolute',
+          left: x * scale,
+          top: y * scale,
+          width: 22 * scale,
+          height: 22 * scale,
+          cursor: disabled ? 'default' : 'pointer',
+        }}
+      >
+        <img
+          src={getButtonSprite(disabled, isSelected, hovered)}
+          alt=""
+          draggable={false}
+          style={{
+            position: 'absolute',
+            left: 0,
+            top: 0,
+            width: 22 * scale,
+            height: 22 * scale,
+            imageRendering: 'pixelated',
+          }}
+        />
+        {getEffectSprite(effect) && (
+          <img
+            src={getEffectSprite(effect)}
+            alt=""
+            draggable={false}
+            style={{
+              position: 'absolute',
+              left: 2 * scale,
+              top: 2 * scale,
+              width: 18 * scale,
+              height: 18 * scale,
+              imageRendering: 'pixelated',
+            }}
+          />
+        )}
+      </div>
+    )
+  }
+
+  const labelStyle = (x: number): React.CSSProperties => ({
+    position: 'absolute',
+    left: x * scale,
+    top: 10 * scale,
+    fontSize: 8 * scale,
+    fontFamily: "'Minecraft', monospace",
+    color: '#E0E0E0',
+    textShadow: 'none',
+    transform: 'translateX(-50%)',
+    whiteSpace: 'nowrap',
+    pointerEvents: 'none',
+  })
+
+  return (
+    <>
+      {/* Labels */}
+      <span style={labelStyle(62)}>Primary Power</span>
+      <span style={labelStyle(169)}>Secondary Power</span>
+
+      {/* Payment item indicators (decorative icons showing valid payment items) */}
+      {PAYMENT_ITEMS.map(({ src, x }) => (
+        <img
+          key={`pay-${x}`}
+          src={src}
+          alt=""
+          draggable={false}
+          style={{
+            position: 'absolute',
+            left: x * scale,
+            top: 109 * scale,
+            width: 16 * scale,
+            height: 16 * scale,
+            imageRendering: 'pixelated',
+            pointerEvents: 'none',
+          }}
+        />
+      ))}
+
+      {/* Primary effect buttons (3 tiers) */}
+      {PRIMARY_TIERS.map(({ tier, y, effects }) =>
+        effects.map((effect, idx) => {
+          const x = getButtonX(PRIMARY_CENTER_X, idx, effects.length)
+          const disabled = tier >= levels
+          const isSelected = selectedPrimary === effect
+          return renderEffectButton(effect, x, y, disabled, isSelected, true, `primary-${effect}`)
+        })
+      )}
+
+      {/* Secondary: Regeneration button (fixed position x=144) */}
+      {renderEffectButton(
+        EFFECTS.REGENERATION,
+        144,
+        47,
+        3 >= levels,
+        selectedSecondary === EFFECTS.REGENERATION,
+        false,
+        'secondary-regen',
+      )}
+
+      {/* Secondary: Upgrade button (fixed position x=168, mirrors local primary selection) */}
+      {showUpgrade && renderEffectButton(
+        selectedPrimary,
+        168,
+        47,
+        3 >= levels,
+        selectedSecondary === selectedPrimary,
+        false,
+        'secondary-upgrade',
+        `${EFFECT_INFO[selectedPrimary]?.name ?? 'Effect'} II`,
+      )}
+
+      {/* Confirm button */}
+      <div
+        onClick={handleConfirm}
+        onMouseEnter={() => setHoveredButton('confirm')}
+        onMouseLeave={() => setHoveredButton(null)}
+        title="Done"
+        style={{
+          position: 'absolute',
+          left: 164 * scale,
+          top: 107 * scale,
+          width: 22 * scale,
+          height: 22 * scale,
+          cursor: canConfirm ? 'pointer' : 'default',
+        }}
+      >
+        <img
+          src={getButtonSprite(!canConfirm, false, hoveredButton === 'confirm' && canConfirm)}
+          alt=""
+          draggable={false}
+          style={{
+            position: 'absolute',
+            left: 0,
+            top: 0,
+            width: 22 * scale,
+            height: 22 * scale,
+            imageRendering: 'pixelated',
+          }}
+        />
+        <img
+          src={textures.getGuiTextureUrl(`${SPRITE_BASE}/confirm.png`)}
+          alt=""
+          draggable={false}
+          style={{
+            position: 'absolute',
+            left: 2 * scale,
+            top: 2 * scale,
+            width: 18 * scale,
+            height: 18 * scale,
+            imageRendering: 'pixelated',
+          }}
+        />
+      </div>
+
+      {/* Cancel button */}
+      <div
+        onClick={handleCancel}
+        onMouseEnter={() => setHoveredButton('cancel')}
+        onMouseLeave={() => setHoveredButton(null)}
+        title="Cancel"
+        style={{
+          position: 'absolute',
+          left: 190 * scale,
+          top: 107 * scale,
+          width: 22 * scale,
+          height: 22 * scale,
+          cursor: 'pointer',
+        }}
+      >
+        <img
+          src={getButtonSprite(false, false, hoveredButton === 'cancel')}
+          alt=""
+          draggable={false}
+          style={{
+            position: 'absolute',
+            left: 0,
+            top: 0,
+            width: 22 * scale,
+            height: 22 * scale,
+            imageRendering: 'pixelated',
+          }}
+        />
+        <img
+          src={textures.getGuiTextureUrl(`${SPRITE_BASE}/cancel.png`)}
+          alt=""
+          draggable={false}
+          style={{
+            position: 'absolute',
+            left: 2 * scale,
+            top: 2 * scale,
+            width: 18 * scale,
+            height: 18 * scale,
+            imageRendering: 'pixelated',
+          }}
+        />
+      </div>
+    </>
+  )
+}

package/src/components/InventoryWindow/InventoryWindow.tsx

@@ -13,6 +13,7 @@ import { HotbarExtras } from './HotbarExtras'
 import { AnvilInput } from './AnvilInput'
 import { AnvilCost } from './AnvilCost'
 import { EntityDisplay } from './EntityDisplay'
+import { BeaconEffects } from './BeaconEffects'
 
 interface InventoryWindowProps {
   type: string
@@ -67,7 +68,9 @@ export function InventoryWindow({
   }
 
   // Player inventory: don't show title (it's just the player's own inventory)
-  const effectiveTitle = type === 'player' ? undefined : (title ?? windowState?.title ?? def.title)
+  // Beacon: vanilla overrides renderLabels to show "Primary/Secondary Power" instead of title
+  const isBeacon = def?.name === 'beacon'
+  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'
@@ -144,6 +147,9 @@ export function InventoryWindow({
         {isAnvil && <AnvilInput x={59} y={20} width={110} height={16} />}
         {isAnvil && <AnvilCost properties={effectiveProperties} backgroundWidth={def.backgroundWidth} />}
 
+        {/* Beacon effect selection panel */}
+        {isBeacon && <BeaconEffects properties={effectiveProperties} />}
+
         {/* Hotbar extras: active slot indicator, offhand slot, open-inventory button */}
         {isHotbar && (
           <HotbarExtras

package/src/connector/mineflayer.ts

@@ -654,21 +654,27 @@ export function createMineflayerConnector(bot: MineflayerBot, options?: Mineflay
         }
   
         if (action.type === 'beacon' && win && isBeaconWindow(win)) {
+          // EFFECTS values are 1-based (matching vanilla encodeEffect: registry_id + 1)
+          // Protocol option(varint): undefined=absent, varint=1-based effect ID
+          // Server ContainerData uses same encoding: ≤0 = none, 1+ = effect
+          const protoPrimary = action.primaryEffect > 0 ? action.primaryEffect : undefined
+          const protoSecondary = action.secondaryEffect > 0 ? action.secondaryEffect : undefined
+
           let handled = false
           if (typeof win.setBeaconEffects === 'function') {
             logHelperIntent(action, 'window.setBeaconEffects', {
-              primaryEffect: action.primaryEffect,
-              secondaryEffect: action.secondaryEffect,
+              primaryEffect: protoPrimary,
+              secondaryEffect: protoSecondary,
             })
-            await win.setBeaconEffects(action.primaryEffect, action.secondaryEffect)
+            await win.setBeaconEffects(protoPrimary as any, protoSecondary as any)
             handled = true
           } else if (ext._client) {
             const packet = {
-              primaryEffect: action.primaryEffect,
-              secondaryEffect: action.secondaryEffect,
+              primary_effect: protoPrimary,
+              secondary_effect: protoSecondary,
             }
-            logPacketWrite('beacon_effect', packet)
-            ext._client.write('beacon_effect', packet)
+            logPacketWrite('set_beacon_effect', packet)
+            ext._client.write('set_beacon_effect', packet)
             handled = true
           }
           if (handled) {

package/src/generated/localTextures.ts

@@ -44,6 +44,18 @@ import _gui_sprites_container_enchanting_table_level_3 from 'mc-assets/dist/othe
 import _gui_sprites_container_enchanting_table_level_1_disabled from 'mc-assets/dist/other-textures/latest/gui/sprites/container/enchanting_table/level_1_disabled.png'
 import _gui_sprites_container_enchanting_table_level_2_disabled from 'mc-assets/dist/other-textures/latest/gui/sprites/container/enchanting_table/level_2_disabled.png'
 import _gui_sprites_container_enchanting_table_level_3_disabled from 'mc-assets/dist/other-textures/latest/gui/sprites/container/enchanting_table/level_3_disabled.png'
+import _gui_sprites_container_beacon_button from 'mc-assets/dist/other-textures/latest/gui/sprites/container/beacon/button.png'
+import _gui_sprites_container_beacon_button_disabled from 'mc-assets/dist/other-textures/latest/gui/sprites/container/beacon/button_disabled.png'
+import _gui_sprites_container_beacon_button_selected from 'mc-assets/dist/other-textures/latest/gui/sprites/container/beacon/button_selected.png'
+import _gui_sprites_container_beacon_button_highlighted from 'mc-assets/dist/other-textures/latest/gui/sprites/container/beacon/button_highlighted.png'
+import _gui_sprites_container_beacon_confirm from 'mc-assets/dist/other-textures/latest/gui/sprites/container/beacon/confirm.png'
+import _gui_sprites_container_beacon_cancel from 'mc-assets/dist/other-textures/latest/gui/sprites/container/beacon/cancel.png'
+import _mob_effect_speed from 'mc-assets/dist/other-textures/latest/mob_effect/speed.png'
+import _mob_effect_haste from 'mc-assets/dist/other-textures/latest/mob_effect/haste.png'
+import _mob_effect_resistance from 'mc-assets/dist/other-textures/latest/mob_effect/resistance.png'
+import _mob_effect_jump_boost from 'mc-assets/dist/other-textures/latest/mob_effect/jump_boost.png'
+import _mob_effect_strength from 'mc-assets/dist/other-textures/latest/mob_effect/strength.png'
+import _mob_effect_regeneration from 'mc-assets/dist/other-textures/latest/mob_effect/regeneration.png'
 
 /**
  * Versioned texture path → bundled asset URL (or undefined for remote fallback).
@@ -93,6 +105,18 @@ export const bundledTextureMap: Record<string, string | undefined> = {
   '1.21.11/textures/gui/sprites/container/enchanting_table/level_1_disabled.png': _gui_sprites_container_enchanting_table_level_1_disabled,
   '1.21.11/textures/gui/sprites/container/enchanting_table/level_2_disabled.png': _gui_sprites_container_enchanting_table_level_2_disabled,
   '1.21.11/textures/gui/sprites/container/enchanting_table/level_3_disabled.png': _gui_sprites_container_enchanting_table_level_3_disabled,
+  '1.21.11/textures/gui/sprites/container/beacon/button.png': _gui_sprites_container_beacon_button,
+  '1.21.11/textures/gui/sprites/container/beacon/button_disabled.png': _gui_sprites_container_beacon_button_disabled,
+  '1.21.11/textures/gui/sprites/container/beacon/button_selected.png': _gui_sprites_container_beacon_button_selected,
+  '1.21.11/textures/gui/sprites/container/beacon/button_highlighted.png': _gui_sprites_container_beacon_button_highlighted,
+  '1.21.11/textures/gui/sprites/container/beacon/confirm.png': _gui_sprites_container_beacon_confirm,
+  '1.21.11/textures/gui/sprites/container/beacon/cancel.png': _gui_sprites_container_beacon_cancel,
+  '1.21.11/textures/mob_effect/speed.png': _mob_effect_speed,
+  '1.21.11/textures/mob_effect/haste.png': _mob_effect_haste,
+  '1.21.11/textures/mob_effect/resistance.png': _mob_effect_resistance,
+  '1.21.11/textures/mob_effect/jump_boost.png': _mob_effect_jump_boost,
+  '1.21.11/textures/mob_effect/strength.png': _mob_effect_strength,
+  '1.21.11/textures/mob_effect/regeneration.png': _mob_effect_regeneration,
 }
 
 
@@ -143,6 +167,18 @@ export const allTexturePaths: readonly string[] = [
   'gui/sprites/container/enchanting_table/level_1_disabled.png',
   'gui/sprites/container/enchanting_table/level_2_disabled.png',
   'gui/sprites/container/enchanting_table/level_3_disabled.png',
+  'gui/sprites/container/beacon/button.png',
+  'gui/sprites/container/beacon/button_disabled.png',
+  'gui/sprites/container/beacon/button_selected.png',
+  'gui/sprites/container/beacon/button_highlighted.png',
+  'gui/sprites/container/beacon/confirm.png',
+  'gui/sprites/container/beacon/cancel.png',
+  'mob_effect/speed.png',
+  'mob_effect/haste.png',
+  'mob_effect/resistance.png',
+  'mob_effect/jump_boost.png',
+  'mob_effect/strength.png',
+  'mob_effect/regeneration.png',
 ]
 
 /**

package/src/registry/inventories.ts

@@ -13,12 +13,12 @@ function withSequentialIndexes(slots: RawSlot[]): SlotDefinition[] {
   })
 }
 
-function playerInv(yOffset: number): RawSlot[] {
+function playerInv(yOffset: number, xStart = 8): RawSlot[] {
   const slots: RawSlot[] = []
   for (let row = 0; row < 3; row++) {
     for (let col = 0; col < 9; col++) {
       slots.push({
-        x: 8 + col * SLOT_SIZE,
+        x: xStart + col * SLOT_SIZE,
         y: yOffset + row * SLOT_SIZE,
         group: 'inventory',
       })
@@ -26,7 +26,7 @@ function playerInv(yOffset: number): RawSlot[] {
   }
   for (let col = 0; col < 9; col++) {
     slots.push({
-      x: 8 + col * SLOT_SIZE,
+      x: xStart + col * SLOT_SIZE,
       y: yOffset + 58,
       group: 'hotbar',
     })
@@ -546,9 +546,14 @@ export const inventoryDefinitions = makeInventoryDefinitions({
     backgroundTexture: '1.21.11/textures/gui/container/beacon.png',
     backgroundWidth: 230,
     backgroundHeight: 219,
+    properties: {
+      levels: { dataSlot: 0, description: 'Beacon pyramid level (0-4)' },
+      primaryEffect: { dataSlot: 1, description: 'Primary effect (encoded: 0=none, registry_id+1)' },
+      secondaryEffect: { dataSlot: 2, description: 'Secondary effect (encoded: 0=none, registry_id+1)' },
+    },
     slots: [
       { x: 136, y: 110, group: 'payment', label: 'Payment' },
-      ...playerInv(136),
+      ...playerInv(137, 36),
     ],
   },
 
@@ -759,4 +764,18 @@ export const registryExtraTextures: string[] = [
   '1.21.11/textures/gui/sprites/container/enchanting_table/level_1_disabled.png',
   '1.21.11/textures/gui/sprites/container/enchanting_table/level_2_disabled.png',
   '1.21.11/textures/gui/sprites/container/enchanting_table/level_3_disabled.png',
+  // Beacon button sprites
+  '1.21.11/textures/gui/sprites/container/beacon/button.png',
+  '1.21.11/textures/gui/sprites/container/beacon/button_disabled.png',
+  '1.21.11/textures/gui/sprites/container/beacon/button_selected.png',
+  '1.21.11/textures/gui/sprites/container/beacon/button_highlighted.png',
+  '1.21.11/textures/gui/sprites/container/beacon/confirm.png',
+  '1.21.11/textures/gui/sprites/container/beacon/cancel.png',
+  // Beacon mob effect icons
+  '1.21.11/textures/mob_effect/speed.png',
+  '1.21.11/textures/mob_effect/haste.png',
+  '1.21.11/textures/mob_effect/resistance.png',
+  '1.21.11/textures/mob_effect/jump_boost.png',
+  '1.21.11/textures/mob_effect/strength.png',
+  '1.21.11/textures/mob_effect/regeneration.png',
 ]