Update digging.js for state changes

lib/plugins/digging.js

@@ -7,12 +7,23 @@ module.exports = inject
 
 function inject (bot) {
   let swingInterval = null
-  let waitTimeout = null
+  let waitInterval = null
 
   let diggingTask = createDoneTask()
 
   bot.targetDigBlock = null
   bot.lastDigTime = null
+  bot.digPercentage = 0
+  bot.lastHeldItemName = ''
+  if (bot.heldItem) { bot.lastHeldItemName = bot.heldItem.name }
+  bot.on('heldItemChanged', () => {
+    let nameToCompare = ''
+    if (bot.heldItem) { nameToCompare = bot.heldItem.name }
+    if (bot.lastHeldItemName != nameToCompare) {
+      bot.lastHeldItemName = nameToCompare
+      bot.digPercentage = 0
+    }
+  })
 
   async function dig (block, forceLook, digFace) {
     if (block === null || block === undefined) {
@@ -36,17 +47,15 @@ function inject (bot) {
         } else if (digFace.z) {
           diggingFace = digFace.z > 0 ? BlockFaces.SOUTH : BlockFaces.NORTH
         }
-        await bot.lookAt(
-          block.position.offset(0.5, 0.5, 0.5).offset(digFace.x * 0.5, digFace.y * 0.5, digFace.z * 0.5),
-          forceLook
-        )
+        await bot.lookAt(block.position.offset(0.5, 0.5, 0.5).offset(digFace.x * 0.5, digFace.y * 0.5, digFace.z * 0.5), forceLook)
       } else if (digFace === 'raycast') {
         // Check faces that could be seen from the current position. If the delta is smaller then 0.5 that means the
         // bot cam most likely not see the face as the block is 1 block thick
         // this could be false for blocks that have a smaller bounding box then 1x1x1
-        const dx = bot.entity.position.x - (block.position.x + 0.5)
-        const dy = bot.entity.position.y + bot.entity.height - (block.position.y + 0.5)
-        const dz = bot.entity.position.z - (block.position.z + 0.5)
+        const dx = bot.entity.position.x - block.position.x + 0.5
+        const dy = bot.entity.position.y - block.position.y - 0.5 + bot.entity.height // -0.5 because the bot position
+        // is calculated from the block position that is inside its feet so 0.5 - 1 = -0.5
+        const dz = bot.entity.position.z - block.position.z + 0.5
         // Check y first then x and z
         const visibleFaces = {
           y: Math.sign(Math.abs(dy) > 0.5 ? dy : 0),
@@ -57,20 +66,12 @@ function inject (bot) {
         for (const i in visibleFaces) {
           if (!visibleFaces[i]) continue // skip as this face is not visible
           // target position on the target block face. -> 0.5 + (current face) * 0.5
-          const targetPos = block.position.offset(
-            0.5 + (i === 'x' ? visibleFaces[i] * 0.5 : 0),
-            0.5 + (i === 'y' ? visibleFaces[i] * 0.5 : 0),
-            0.5 + (i === 'z' ? visibleFaces[i] * 0.5 : 0)
-          )
+          const targetPos = block.position.offset(0.5 + (i === 'x' ? visibleFaces[i] * 0.5 : 0), 0.5 + (i === 'y' ? visibleFaces[i] * 0.5 : 0), 0.5 + (i === 'z' ? visibleFaces[i] * 0.5 : 0))
           const startPos = bot.entity.position.offset(0, bot.entity.height, 0)
           const rayBlock = bot.world.raycast(startPos, targetPos.clone().subtract(startPos).normalize(), 5)
           if (rayBlock) {
             const rayPos = rayBlock.position
-            if (
-              rayPos.x === block.position.x &&
-                            rayPos.y === block.position.y &&
-                            rayPos.z === block.position.z
-            ) {
+            if (rayPos.x === block.position.x && rayPos.y === block.position.y && rayPos.z === block.position.z) {
               // console.info(rayBlock)
               validFaces.push({
                 face: rayBlock.face,
@@ -85,9 +86,7 @@ function inject (bot) {
           let distSqrt = 999
           for (const i in validFaces) {
             const tPos = validFaces[i].targetPos
-            const cDist = new Vec3(tPos.x, tPos.y, tPos.z).distanceSquared(
-              bot.entity.position.offset(0, bot.entity.height, 0)
-            )
+            const cDist = new Vec3(tPos.x, tPos.y, tPos.z).distanceSquared(bot.entity.position.offset(0, bot.entity.height, 0))
             if (distSqrt > cDist) {
               closest = validFaces[i]
               distSqrt = cDist
@@ -111,19 +110,37 @@ function inject (bot) {
       face: diggingFace // default face is 1 (top)
     })
     const waitTime = bot.digTime(block)
-    waitTimeout = setTimeout(finishDigging, waitTime)
+    // waitInterval = setTimeout(finishDigging, waitTime)
+    if (waitInterval) { clearInterval(waitInterval) }
+    // bot.digPercentage = (50 / bot.digTime(block));
+    // bot.referenceTime = window.performance.now();
+    waitInterval = setInterval(() => { //! !!!
+      bot.digPercentage += (50 / bot.digTime(block))
+      // bot.digPercentage += (Math.abs(bot.referenceTime - window.performance.now()) / bot.digTime(block));
+      // console.log(Math.abs(bot.referenceTime - window.performance.now()) + ", " + bot.digPercentage);
+      // bot.referenceTime = window.performance.now();
+      if (bot.digPercentage >= 1.0) {
+        // console.log("broke it");
+        finishDigging()
+      }
+    }, 50)
     bot.targetDigBlock = block
     bot.swingArm()
 
     swingInterval = setInterval(() => {
-      bot.swingArm()
-    }, 350)
+      if (bot.targetDigBlock) {
+        bot.swingArm()
+      } else {
+        clearInterval(swingInterval)
+      }
+    }, 250)
 
     function finishDigging () {
+      bot.digPercentage = 0
       clearInterval(swingInterval)
-      clearTimeout(waitTimeout)
+      clearInterval(waitInterval)
       swingInterval = null
-      waitTimeout = null
+      waitInterval = null
       if (bot.targetDigBlock) {
         bot._client.write('block_dig', {
           status: 2, // finish digging
@@ -137,15 +154,17 @@ function inject (bot) {
     }
 
     const eventName = `blockUpdate:${block.position}`
+    // console.log(bot.digPercentage + "% " + eventName);
     bot.on(eventName, onBlockUpdate)
 
     bot.stopDigging = () => {
       if (!bot.targetDigBlock) return
       bot.removeListener(eventName, onBlockUpdate)
       clearInterval(swingInterval)
-      clearTimeout(waitTimeout)
+      bot.digPercentage = 0
+      clearInterval(waitInterval)
       swingInterval = null
-      waitTimeout = null
+      waitInterval = null
       bot._client.write('block_dig', {
         status: 1, // cancel digging
         location: bot.targetDigBlock.position,
@@ -162,13 +181,14 @@ function inject (bot) {
     function onBlockUpdate (oldBlock, newBlock) {
       // vanilla server never actually interrupt digging, but some server send block update when you start digging
       // so ignore block update if not air
-      // All block update listeners receive (null, null) when the world is unloaded. So newBlock can be null.
-      if (newBlock?.type !== 0) return
+      if (!newBlock) return
+      if (newBlock.type !== 0) return
       bot.removeListener(eventName, onBlockUpdate)
       clearInterval(swingInterval)
-      clearTimeout(waitTimeout)
+      clearInterval(waitInterval)
       swingInterval = null
-      waitTimeout = null
+      waitInterval = null
+      bot.digPercentage = 0.0
       bot.targetDigBlock = null
       bot.lastDigTime = performance.now()
       bot.emit('diggingCompleted', newBlock)
@@ -185,11 +205,7 @@ function inject (bot) {
   })
 
   function canDigBlock (block) {
-    return (
-      block &&
-            block.diggable &&
-            block.position.offset(0.5, 0.5, 0.5).distanceTo(bot.entity.position.offset(0, 1.65, 0)) <= 5.1
-    )
+    return block && block.diggable && block.position.offset(0.5, 0.5, 0.5).distanceTo(bot.entity.position.offset(0, 1.65, 0)) <= 5.1
   }
 
   function digTime (block) {
@@ -212,14 +228,7 @@ function inject (bot) {
     }
 
     const creative = bot.game.gameMode === 'creative'
-    return block.digTime(
-      type,
-      creative,
-      bot.entity.isInWater,
-      !bot.entity.onGround,
-      enchantments,
-      bot.entity.effects
-    )
+    return block.digTime(type, creative, bot.entity.isInWater, !bot.entity.onGround, enchantments, bot.entity.effects)
   }
 
   bot.dig = dig