Update digging.js for state changes #3136
+34
−12
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,12 +7,23 @@ module.exports = inject | |
|
|
||
| function inject (bot) { | ||
| let swingInterval = 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) { | ||
|
|
@@ -110,20 +121,30 @@ function inject (bot) { | |
| location: block.position, | ||
| face: diggingFace // default face is 1 (top) | ||
| }) | ||
| if (waitInterval) { clearInterval(waitInterval) } | ||
| waitInterval = setInterval(() => { | ||
| bot.digPercentage += (50 / bot.digTime(block)) | ||
|
There was a problem hiding this comment. does the vanilla client follow this algorithm when state change while digging ? do you have a reference ? There was a problem hiding this comment. Probably not this exact algorithm but it mimics what I've seen in game, and I've yet to see something abnormal from it. |
||
| if (bot.digPercentage >= 1.0) { | ||
| finishDigging() | ||
| } | ||
| }, 50) | ||
| bot.targetDigBlock = block | ||
| bot.swingArm() | ||
|
|
||
| swingInterval = setInterval(() => { | ||
| if (bot.targetDigBlock) { | ||
| bot.swingArm() | ||
| } else { | ||
| clearInterval(swingInterval) | ||
| } | ||
| }, 250) | ||
|
There was a problem hiding this comment. why the change from 350 to 250 ? There was a problem hiding this comment. @Vakore can you change this back or give w reason to why you changed the interval? There was a problem hiding this comment. I changed the interval to fix the arm swing bug |
||
|
|
||
| function finishDigging () { | ||
| bot.digPercentage = 0 | ||
| clearInterval(swingInterval) | ||
| clearInterval(waitInterval) | ||
| swingInterval = null | ||
| waitInterval = null | ||
| if (bot.targetDigBlock) { | ||
| bot._client.write('block_dig', { | ||
| status: 2, // finish digging | ||
|
|
@@ -143,9 +164,10 @@ function inject (bot) { | |
| if (!bot.targetDigBlock) return | ||
| bot.removeListener(eventName, onBlockUpdate) | ||
| clearInterval(swingInterval) | ||
| bot.digPercentage = 0 | ||
| clearInterval(waitInterval) | ||
| swingInterval = null | ||
| waitInterval = null | ||
| bot._client.write('block_dig', { | ||
| status: 1, // cancel digging | ||
| location: bot.targetDigBlock.position, | ||
|
|
@@ -162,13 +184,13 @@ 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 | ||
|
There was a problem hiding this comment. Why did you remove this comment? There was a problem hiding this comment. Can you add the comment back? There was a problem hiding this comment. I have a more updated version of digging.js on the discord. Search for attachments from 'Vakore', unable to do stuff with npm rn. |
||
| if (newBlock?.type !== 0) return | ||
| bot.removeListener(eventName, onBlockUpdate) | ||
| clearInterval(swingInterval) | ||
| clearInterval(waitInterval) | ||
| swingInterval = null | ||
| waitInterval = null | ||
| bot.digPercentage = 0.0 | ||
| bot.targetDigBlock = null | ||
| bot.lastDigTime = performance.now() | ||
| bot.emit('diggingCompleted', newBlock) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think any held item change cancels the dig process? Even increasing the item amount in a slot.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Surprisingly no. If you have two pickaxes with equal durability and/or nbt, and switch between them, or switch between different fist slots while mining, it won't cancel the mining timer. Mining a tree with fists and picking up a log while mining will reset it, though constantly mining with logs while the stack size increases doesn't last time I checked. I'll double check later today but I'm pretty sure this is correct.
Though now that I'm looking at this the system here won't take into account durability/enchant differences, though that's just nbt and can likely be changed easily. This system will still work in most cases though and is better than nothing, but it should be fixed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A better way to check if items are equal is the stringify the item and compare that. You could make a string of the item you started mining with and reset the progress if the string of the held item changes.