Release (#449)

Author: zardoy

package.json

@@ -157,7 +157,7 @@
     "mc-assets": "^0.2.62",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer#gen-the-master",
-    "mineflayer-mouse": "^0.1.21",
+    "mineflayer-mouse": "^0.1.23",
     "npm-run-all": "^4.1.5",
     "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.1",

pnpm-lock.yaml

@@ -331,14 +331,16 @@ const implementedContainersGuiMap = {
   'minecraft:generic_9x4': 'Generic95Win',
   'minecraft:generic_9x5': 'Generic95Win',
   // hopper
+  'minecraft:hopper': 'HopperWin',
   'minecraft:generic_5x1': 'HopperWin',
   'minecraft:generic_9x6': 'LargeChestWin',
   'minecraft:generic_3x3': 'DropDispenseWin',
   'minecraft:furnace': 'FurnaceWin',
   'minecraft:smoker': 'FurnaceWin',
-  'minecraft:shulker_box': 'ChestWin',
   'minecraft:blast_furnace': 'FurnaceWin',
+  'minecraft:shulker_box': 'ChestWin',
   'minecraft:crafting': 'CraftingWin',
+  'minecraft:smithing': 'will_be_patched_in_openWindow',
   'minecraft:crafting3x3': 'CraftingWin', // todo different result slot
   'minecraft:anvil': 'AnvilWin',
   // enchant
@@ -407,6 +409,9 @@ const upWindowItemsLocal = () => {
 
 let skipClosePacketSending = false
 const openWindow = (type: string | undefined, title: string | any = undefined) => {
+  // patch implementedContainersGuiMap
+  implementedContainersGuiMap['minecraft:smithing'] = versionToNumber(bot.version) < versionToNumber('1.20') ? 'SmithingTableLegacyWin' : 'SmithingTableWin'
+
   // if (activeModalStack.some(x => x.reactType?.includes?.('player_win:'))) {
   if (activeModalStack.length && !miscUiState.disconnectedCleanup) { // game is not in foreground, don't close current modal
     if (type) {
@@ -421,19 +426,6 @@ const openWindow = (type: string | undefined, title: string | any = undefined) =
   showModal({
     reactType: `player_win:${type}`,
   })
-  onModalClose(() => {
-    // might be already closed (event fired)
-    if (type !== undefined && bot.currentWindow && !skipClosePacketSending) bot.currentWindow['close']()
-    lastWindow.destroy()
-    lastWindow = null as any
-    lastWindowType = undefined
-    window.inventory = null
-    miscUiState.displaySearchInput = false
-    destroyFn()
-    skipClosePacketSending = false
-
-    modelViewerState.model = undefined
-  })
   if (type === undefined) {
     showInventoryPlayer()
   }
@@ -470,6 +462,20 @@ const openWindow = (type: string | undefined, title: string | any = undefined) =
 
   lastWindow = inv
 
+  onModalClose(() => {
+    // might be already closed (event fired)
+    if (type !== undefined && bot.currentWindow && !skipClosePacketSending) bot.currentWindow['close']()
+    lastWindow.destroy()
+    lastWindow = null as any
+    lastWindowType = undefined
+    window.inventory = null
+    miscUiState.displaySearchInput = false
+    destroyFn()
+    skipClosePacketSending = false
+
+    modelViewerState.model = undefined
+  })
+
   upWindowItemsLocal()
 
   lastWindow.pwindow.touch = miscUiState.currentTouch ?? false

src/inventoryWindows.ts

@@ -1,4 +1,5 @@
 import { useEffect, useRef, useState } from 'react'
+import type { Entity } from 'prismarine-entity'
 import { useSnapshot } from 'valtio'
 import type { Block } from 'prismarine-block'
 import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
@@ -39,6 +40,7 @@ export default () => {
   const [timeOfDay, setTimeOfDay] = useState(0)
   const [dimension, setDimension] = useState('')
   const [cursorBlock, setCursorBlock] = useState<Block | null>(null)
+  const [cursorEntity, setCursorEntity] = useState<Entity | null>(null)
   const [blockInfo, setBlockInfo] = useState<{ customBlockName?: string, modelInfo?: BlockStateModelInfo } | null>(null)
   const [clientTps, setClientTps] = useState(0)
   const [serverTps, setServerTps] = useState(null as null | { value: number, frozen: boolean })
@@ -55,6 +57,14 @@ export default () => {
 
   const viewDegToMinecraft = (yaw) => yaw % 360 - 180 * (yaw < 0 ? -1 : 1)
 
+  const shortenUuid = (uuid: string | undefined): string | undefined => {
+    if (!uuid) return undefined
+    // Format: 2383-*-3243 (first 4 chars, *, last 4 chars)
+    const cleaned = uuid.replaceAll('-', '')
+    if (cleaned.length < 8) return uuid
+    return `${cleaned.slice(0, 4)}-*-${cleaned.slice(-4)}`
+  }
+
   const readPacket = (data, { name }, _buf, fullBuffer) => {
     if (fullBuffer) {
       const size = fullBuffer.byteLength
@@ -129,7 +139,9 @@ export default () => {
       setDimension(bot.game.dimension)
       setDay(bot.time.day)
       setTimeOfDay(bot.time.timeOfDay)
-      setCursorBlock(bot.mouse.getCursorState().cursorBlock)
+      const cursorState = bot.mouse.getCursorState()
+      setCursorBlock(cursorState.cursorBlock)
+      setCursorEntity(cursorState.entity)
     }, 100)
 
     const notFrequentUpdateInterval = setInterval(async () => {
@@ -212,6 +224,22 @@ export default () => {
       {cursorBlock ? (
         <p>Looking at: {cursorBlock.position.x} {cursorBlock.position.y} {cursorBlock.position.z}</p>
       ) : ''}
+      {cursorEntity ? (<>
+        <div className={styles.empty} />
+        <p>E: {cursorEntity.name}</p>
+        {cursorEntity.displayName && <p>{cursorEntity.displayName}</p>}
+        {cursorEntity.id !== undefined && <p>ID: {cursorEntity.id}</p>}
+        {shortenUuid(cursorEntity.uuid) && <p>UUID: {shortenUuid(cursorEntity.uuid)}</p>}
+        {cursorEntity.username && <p>Username: {cursorEntity.username}</p>}
+        {cursorEntity.position && (
+          <p>{cursorEntity.position.x.toFixed(2)} {cursorEntity.position.y.toFixed(2)} {cursorEntity.position.z.toFixed(2)}</p>
+        )}
+        {cursorEntity.yaw !== undefined && <p>Yaw: {cursorEntity.yaw.toFixed(1)}</p>}
+        {cursorEntity.pitch !== undefined && <p>Pitch: {cursorEntity.pitch.toFixed(1)}</p>}
+        {cursorEntity.type && <p>Type: {cursorEntity.type}</p>}
+        {cursorEntity.health !== undefined && <p>Health: {cursorEntity.health.toFixed(1)}</p>}
+      </>)
+        : ''}
       <div className={styles.empty} />
       {blockInfo && (() => {
         const { customBlockName, modelInfo } = blockInfo