Compare commits

..

5 Commits

Author SHA1 Message Date
jay
f8df1fa319 feat: update command plugin 2020-12-22 11:31:46 +05:00
jay
8eb6d790b0 feat: update sleeper 2020-12-22 11:31:06 +05:00
jay
5ead6b7267 feat: update miner 2020-12-22 11:30:16 +05:00
jay
149a01551c feat: update inventory 2020-12-22 11:29:31 +05:00
jay
b1f27f455d feat: update guard 2020-12-22 11:28:44 +05:00
5 changed files with 612 additions and 292 deletions

View File

@ -6,7 +6,7 @@ let bot = {}
// bot.chatAddPattern(new RegExp(`^hi|hello ${bot.username}`, "i"), 'greet', "General greeting") // bot.chatAddPattern(new RegExp(`^hi|hello ${bot.username}`, "i"), 'greet', "General greeting")
function todo() { function todo() {
bot.chat("not implemented yet") cfg.quiet && console.warn("not implemented") || bot.chat("not implemented yet")
} }
function checkBlockExists(name) { function checkBlockExists(name) {
@ -34,7 +34,12 @@ const events = {
if (username === cfg.admin) { if (username === cfg.admin) {
message = message.replace("\\", "@") message = message.replace("\\", "@")
console.info("whispered command", message) console.info("whispered command", message)
bot.chat("/" + message) if (/^!/.test(message)) {
command(username, message)
} else {
bot.chat(message)
// bot.chat("/" + message)
}
} else { } else {
bot.whisper(cfg.admin, `gossip ${username}: ${message}`) bot.whisper(cfg.admin, `gossip ${username}: ${message}`)
console.info(username, "whispered", message) console.info(username, "whispered", message)
@ -47,6 +52,19 @@ const events = {
const events_registered = [] const events_registered = []
function command(username, message) { function command(username, message) {
function fuzzyRespond(responses, probability = 1, timeout = 1) {
if (Math.random() < probability) {
const response = responses[Math.floor(Math.random() * responses.length)]
return setTimeout(() => bot.chat(response), timeout * Math.random() * 1000)
}
}
function swingArm(swung = 3) {
if (swung > 0) {
setTimeout(swingArm, 500 * Math.random(), --swung)
bot.swingArm()
}
}
if (username === bot.username && !message.startsWith("!")) return if (username === bot.username && !message.startsWith("!")) return
@ -59,33 +77,29 @@ function command(username, message) {
return return
} }
switch (message) {
case "hi":
case "hello":
case "howdy":
case "yo":
bot.swingArm()
return
case "69":
Math.random() > 0.5 && bot.chat("nice!")
return
case "awesome":
case "cool":
case "superb":
case "nice":
Math.random() > 0.1 && setTimeout(() => bot.chat("very nice!"), 1000)
return
default:
break;
}
if (message.startsWith("!") || cfg.botAddress.test(message)) { if (message.startsWith("!") || cfg.botAddress.test(message)) {
message = cfg.botAddress.test(message) ? cfg.botAddress.exec(message)[1] : message message = cfg.botAddress.test(message) ? cfg.botAddress.exec(message)[1] : message
console.log(message) console.log(message)
message = message.slice(1) message = message.slice(1) // remove `!`
message_parts = message.split(/\s+/) // TODO command dispatchEvent, for aliases
function subcommand(message) {
const message_parts = message.split(/\s+/)
switch (message_parts[0]) { switch (message_parts[0]) {
case "stop":
bot.pathfinder && bot.pathfinder.setGoal(null)
bot.stopDigging()
bot.chat("ok")
break;
case "mute":
case "quiet":
case "silent":
cfg.quiet = !cfg.quiet
cfg.quiet || bot.chat(`ok, ${cfg.quiet ? "" : "not "}being ${message_parts[0]}`)
break;
// case "follow": // case "follow":
// // if(username === cfg.admin) // // if(username === cfg.admin)
// cfg.stateMachines.follow.transitions[4].trigger() // cfg.stateMachines.follow.transitions[4].trigger()
@ -98,7 +112,7 @@ function command(username, message) {
case "echo": case "echo":
// bot.chat(message_parts[1]) // bot.chat(message_parts[1])
// bot.chat(message.slice(1)) // bot.chat(message.slice(1))
bot.chat(message) cfg.quiet && bot.whisper(username, message) || bot.chat(message)
break; break;
case "autosleep": case "autosleep":
case "sleep": case "sleep":
@ -106,7 +120,7 @@ function command(username, message) {
switch (message_parts[1]) { switch (message_parts[1]) {
case "auto": case "auto":
cfg.sleep.auto = !cfg.sleep.auto cfg.sleep.auto = !cfg.sleep.auto
bot.chat(`ok, ${cfg.sleep.auto ? "" : "not "}auto sleeping `) bot.chat(`ok, ${cfg.sleep.auto ? "" : "not "}auto sleeping`)
bot.chat("/afk") bot.chat("/afk")
break; break;
case "silent": case "silent":
@ -142,6 +156,133 @@ function command(username, message) {
case "wakeup": case "wakeup":
cfg.plugins.sleeper.wake() cfg.plugins.sleeper.wake()
break; break;
case "autoeat":
case "eat":
switch (message_parts[1]) {
case "auto":
cfg.eat.auto = !cfg.eat.auto
bot.chat(`ok, ${cfg.eat.auto ? "" : "not "}auto eating `)
break;
case "at":
case "set":
const amount = parseInt(message_parts[2], 10)
if (amount < 20 && amount > 0) {
cfg.eat.startAt = amount
cfg.eat.quiet || bot.chat(`ok, eating when hunger at ${amount}`)
}
break
case "silent":
case "quiet":
cfg.eat.quiet = !!!cfg.eat.quiet
break;
default:
cfg.plugins.eater.eat((err) => { if (err) { bot.chat(err.message) } })
// bot.chat(`usage: !sleep [auto | quiet | timeout <mins>], or zzz for manual sleep`)
break;
}
break;
case "follow":
subcommand("go follow me")
break;
case "come":
subcommand("go follow once")
break;
case "move":
case "go":
// TODO move most of the subcommands into mover.js?
const message_parts2 = message_parts.slice(2)
switch (message_parts[1]) {
case "init":
cfg.plugins.mover.initMoves()
break
case "near":
// message_parts2 = message_parts.slice(2)
switch (message_parts2.length) {
case 0:
cfg.plugins.mover.moveNear(bot.nearestEntity().position)
break
case 1:
switch (message_parts2[0]) {
case "me":
if (player) {
cfg.plugins.mover.moveNear(player.position)
} else {
cfg.quiet || bot.chat("can't see you")
}
break;
default:
const aPlayer = bot.players[message_parts[2]] ? bot.players[message_parts[2]].entity : null
if (aPlayer) {
cfg.plugins.mover.moveNear(aPlayer.position)
} else {
cfg.quiet || bot.chat(`can't see ${message_parts[2]}`)
}
break;
}
break
case 2:
todo()
// bot.lookAt({}) goalxz?
break
case 3:
//TODO more checks
cfg.plugins.mover.moveNear(message_parts2)
break
default:
break
}
break
case "follow":
// message_parts2 = message_parts.slice(2)
switch (message_parts2.length) {
case 0:
cfg.plugins.mover.follow(bot.nearestEntity())
break
case 1:
switch (message_parts2[0]) {
case "me":
case "once":
if (player) {
cfg.plugins.mover.follow(player, message_parts2[0] !== "once")
} else {
cfg.quiet || bot.chat("can't see you")
}
break;
default:
const aPlayer = bot.players[message_parts[2]] ? bot.players[message_parts[2]].entity : null
if (aPlayer) {
cfg.plugins.mover.follow(aPlayer)
} else {
cfg.quiet || bot.chat(`can't see ${message_parts[2]}`)
}
break;
}
break
// case 2:
// bot.lookAt({}) goalxz?
// break
// case 3:
//TODO more checks
// cfg.plugins.mover.moveNear(message_parts2)
// break
default:
todo()
break
}
break
case "stop":
cfg.plugins.mover.stop()
break
default:
return todo()
break;
}
break;
case "attack": case "attack":
case "rage": case "rage":
case "ragemode": case "ragemode":
@ -159,7 +300,7 @@ function command(username, message) {
switch (message_parts[1]) { switch (message_parts[1]) {
case "self": case "self":
cfg.guard.self = !cfg.guard.self cfg.guard.self = !cfg.guard.self
bot.chat(`ok, ${cfg.guard.self?"no longer being altruistic":"self sacrifice!"}`) bot.chat(`ok, ${cfg.guard.self ? "no longer being altruistic" : "self sacrifice!"}`)
return; return;
case "stop": case "stop":
cfg.plugins.guard.stopGuarding() cfg.plugins.guard.stopGuarding()
@ -193,15 +334,41 @@ function command(username, message) {
case "lookat": case "lookat":
// const coords = v(message_parts.splice(1)) // const coords = v(message_parts.splice(1))
switch (message_parts.length) { switch (message_parts.length) {
case 1:
bot.lookAt(bot.nearestEntity().position)
break
case 2: case 2:
switch (message_parts[1]) {
case "me":
if (player) {
bot.lookAt((new v.Vec3(0, 1, 0)).add(player.position))
} else {
cfg.quiet || bot.chat("can't see you")
}
break;
case "this":
// TODO lookat the block the user is looking at
if (player) {
bot.lookAt((new v.Vec3(0, 1, 0)).add(player.position))
todo()
} else {
cfg.quiet || bot.chat("can't see you")
}
break;
break
default:
const aPlayer = bot.players[message_parts[2]] ? bot.players[message_parts[2]].entity : null
if (aPlayer) bot.lookAt((new v.Vec3(0, 1, 0)).add(aPlayer.position))
break;
}
break
case 3: case 3:
todo() todo()
// bot.lookAt({}) // bot.lookAt({})
break break
case 1:
bot.lookAt(bot.nearestEntity().position)
break
case 4: case 4:
//TODO more checks
bot.lookAt(v(message_parts.splice(1))) bot.lookAt(v(message_parts.splice(1)))
break break
default: default:
@ -224,7 +391,10 @@ function command(username, message) {
// bot.useOn(bot.nearestEntity()) // bot.useOn(bot.nearestEntity())
// break; // break;
// // TODO move all inventory related tasks into own module // // TODO move all inventory related tasks into inventory.js
case "craft":
cfg.plugins.inventory.craftItem(message_parts[1])
break
// case "give": // case "give":
// // switch (message_parts[1]) { // // switch (message_parts[1]) {
// // case "hand": // // case "hand":
@ -270,6 +440,7 @@ function command(username, message) {
// } // }
// break; // break;
case "location": case "location":
// TODO put in /lib/location
switch (message_parts[1]) { switch (message_parts[1]) {
case "add": case "add":
case "record": case "record":
@ -283,10 +454,15 @@ function command(username, message) {
case "where?": case "where?":
// TODO put in /lib/location // TODO put in /lib/location
console.log(bot.entity.position) console.log(bot.entity.position)
bot.chat(bot.entity.position.floored().toString()) if (cfg.mods.includes(username)) //anarchy
bot.chat(
bot.game.dimension.split(":", 2)[1].replace("_", " ")
+ " " + bot.entity.position.floored().toString()
)
break; break;
case "warp": case "warp":
// if(message_parts[1] == "spawn") // if (message_parts[1] == "spawn")
// if (cfg.mods.includes(username)) //anarchy
bot.chat("/" + message) bot.chat("/" + message)
break; break;
@ -294,6 +470,65 @@ function command(username, message) {
if (cfg.mods.includes(username)) if (cfg.mods.includes(username))
bot.chat("/" + message) bot.chat("/" + message)
break; break;
}
}
subcommand(message)
} else {
// TODO, maybe extract to a new function `fuzzychat`?, so can address direct messages
switch (message) {
case "wassup":
case "what's cooking":
case "what's new":
case "what's up":
case "whats cooking":
case "whats new":
case "whats up":
case "sup":
case "suh":
fuzzyRespond([
"jus chilin", "nothin", "random stuff"
], 0.3, 3)
case "hi":
case "hey":
case "hello":
case "ola":
case "howdy":
case "heyo":
case "yo":
if (player) bot.lookAt((new v.Vec3(0, 1, 0)).add(player.position))
// TODO sneak
// function swingArm() {
// if (swung > 0) {
// setTimeout(swing, 500 * Math.random())
// bot.p()
// swung--
// }
// }
setTimeout(swingArm, 1000, 4) // or sneak greating
return
case "F":
return fuzzyRespond(["F"], 0.9, 1)
case "RIP":
return fuzzyRespond(["F", "oh no"], 0.3, 2)
case "69":
case "cool":
Math.random() < 0.5 && bot.chat("nice!")
return
case "awesome":
case "superb":
case "nice":
case "nice!":
return fuzzyRespond(["cool", "very nice!"], 0.3, 5)
case "good bot":
return fuzzyRespond(["thanks", "why, thank you!", ":)", "(:", "you're too kind!"], 1, 5)
case "bad bot":
case "not nice":
return fuzzyRespond([":(", "):", "sorry"], 0.1, 10)
default:
break;
} }
} }
} }

View File

@ -6,10 +6,12 @@ let cfg = {}
let bot = {} let bot = {}
let guardPos let guardPos
const filterallMobs = e => e.type === 'mob' const filterAllMobs = e => e.type === 'mob'
// const filterPlayers = e => e.type === 'player' && e.username !== 'Applezaus' const filterPlayers = e => e.type === 'player'
const filterMods = e => e.type === 'player' && [cfg.mods].includes(e.username)
// const filterPassiveMobs = e => e.kind === 'Passive mobs' // const filterPassiveMobs = e => e.kind === 'Passive mobs'
const filterCreeper = e => e.mobType === 'Creeper' const filterCreeper = e => e.mobType === 'Creeper'
// const filterCreeperOrEndermen = e => ['Creeper', 'EndderMen'].includes(e.mobType) //TODO endmen hostile by default?
const filterHostileMobs = e => e.kind === 'Hostile mobs' const filterHostileMobs = e => e.kind === 'Hostile mobs'
// // not needed if detecting by kind // // not needed if detecting by kind
// && e.mobType !== 'Armor Stand' // Mojang classifies armor stands as mobs for some reason? // && e.mobType !== 'Armor Stand' // Mojang classifies armor stands as mobs for some reason?
@ -60,33 +62,56 @@ function lookForMobs() {
const filter = e => e.position.distanceTo(bot.entity.position) < 16 && filterHostileMobs(e) const filter = e => e.position.distanceTo(bot.entity.position) < 16 && filterHostileMobs(e)
const entityEnemy = bot.nearestEntity(filter) const entityEnemy = bot.nearestEntity(filter)
if (entityEnemy) { if (entityEnemy && !filterCreeper(entityEnemy)) {
if(filterCreeper(entityEnemy)) // if(filterCreeper(entityEnemy))
// Start attacking // Start attacking
// bot.off('time', lookForMobs) // bot.off('time', lookForMobs)
// bot.on('physicTick', lookForMobs) // bot.on('physicTick', lookForMobs)
bot.pvp.movements.canDig = !!cfg.move && cfg.move.canDig
bot.pvp.attack(entityEnemy) bot.pvp.attack(entityEnemy)
} else if (entityEnemy) {
bot.lookAt(
// (new v.Vec3(0, 1, 0)).add(
entityEnemy.position
// )
)
cfg.quiet || bot.chat("AH! A creeper! They creep me out!")
} }
} }
function guardSelf(entity) { function guardSelf(entity) {
if (!cfg.guard.self || entity !== bot.entity || guardPos) return // Do nothing if (!cfg.guard.self || entity !== bot.entity || guardPos) return // Do nothing
// bot.chat("") // bot.chat("")
bot.chat(( const hurtMessages = [
() => { const a = ["ouch!", "oww!", "help", "", "", ""]; return a[Math.floor(Math.random() * a.length)] } "ouch!", "oww!", "help", "monster!"
)()) ]
const hurtMessagesPlayer = [
"leave me alone!", "don't hurt me!", "bully!", "go away!", "stop", "no stop", "stop it", "murderer!",
"what have i ever done to you? :(",
]
console.info(bot.nearestEntity(filterAllMobs))
console.info(bot.nearestEntity(filterallMobs)) // Only look for mobs within 5 blocks
// const filter = e => e.position.distanceTo(bot.entity.position) < 5 && filterHostileMobs(e) || filterPlayers(e) && !filterMods(e)//anarchy
// Only look for mobs within 10 blocks const filter = e => e.position.distanceTo(bot.entity.position) < 5 && filterHostileMobs(e)
const filter = e => e.position.distanceTo(bot.entity.position) < 10 && filterHostileMobs(e)
const entityEnemy = bot.nearestEntity(filter) const entityEnemy = bot.nearestEntity(filter)
cfg.quiet || 0.2 < Math.random() && entityEnemy && bot.chat(
// TODO use fuzzy message function
filterPlayers(entityEnemy) ?
hurtMessagesPlayer[Math.floor(Math.random() * hurtMessagesPlayer.length)]
:
hurtMessages[Math.floor(Math.random() * hurtMessages.length)]
)
if (entityEnemy && !filterCreeper(entityEnemy)) { if (entityEnemy && !filterCreeper(entityEnemy)) {
// Start attacking // Start attacking
// bot.off('time', lookForMobs) // bot.off('time', lookForMobs)
// bot.on('physicTick', lookForMobs) // bot.on('physicTick', lookForMobs)
bot.pvp.attack(entityEnemy) bot.pvp.attack(entityEnemy)
bot.pvp.movements.canDig = !!cfg.move && cfg.move.canDig
} }
} }

View File

@ -10,22 +10,18 @@
*/ */
const mineflayer = require('mineflayer') const mineflayer = require('mineflayer')
// if (process.argv.length < 4 || process.argv.length > 6) {
// console.log('Usage : node inventory.js <host> <port> [<name>] [<password>]')
// process.exit(1)
// }
// const bot = mineflayer.createBot({
// host: process.argv[2],
// port: parseInt(process.argv[3]),
// username: process.argv[4] ? process.argv[4] : 'inventory',
// password: process.argv[5]
// })
let cfg = {} let cfg = {}
let bot = {} let bot = {}
// let mcd // let mcd
const alt_destinations = {
offhand: "off-hand",
lefthand: "off-hand",
shield: "off-hand",
chest: "torso",
}
function inventory(username, message) { function inventory(username, message) {
if (username === bot.username) return if (username === bot.username) return
const command = message.split(' ') const command = message.split(' ')
@ -72,8 +68,8 @@ function inventory(username, message) {
function sayItems(items = bot.inventory.items()) { function sayItems(items = bot.inventory.items()) {
const output = items.map(itemToString).join(', ') const output = items.map(itemToString).join(', ')
if (output) {
console.info("inventory:", output) console.info("inventory:", output)
if (output) {
!cfg.quiet && bot.chat(output) !cfg.quiet && bot.chat(output)
} else { } else {
!cfg.quiet && bot.chat('empty') !cfg.quiet && bot.chat('empty')
@ -104,8 +100,20 @@ function tossItem(name, amount) {
function equipItem(name, destination, quiet = false) { function equipItem(name, destination, quiet = false) {
const item = itemByName(name) const item = itemByName(name)
if (item) { if (item) {
if (Object.keys(alt_destinations).includes(destination)) {
destination = alt_destinations[destination]
}
try {
bot.equip(item, destination, checkIfEquipped) bot.equip(item, destination, checkIfEquipped)
} catch (error) {
if (error.code == 'ERR_ASSERTION' && error.message.startsWith("invalid destination:")) {
bot.chat(error.message)
} else {
console.error(error)
}
}
} else { } else {
!quiet && bot.chat(`I have no ${name}`) !quiet && bot.chat(`I have no ${name}`)
} }
@ -120,6 +128,9 @@ function equipItem(name, destination, quiet = false) {
} }
function unequipItem(destination) { function unequipItem(destination) {
if (Object.keys(alt_destinations).includes(destination)) {
destination = alt_destinations[destination]
}
bot.unequip(destination, (err) => { bot.unequip(destination, (err) => {
if (err) { if (err) {
bot.chat(`cannot unequip: ${err.message}`) bot.chat(`cannot unequip: ${err.message}`)
@ -134,27 +145,54 @@ function useEquippedItem() {
bot.activateItem() bot.activateItem()
} }
function craftItem(name, amount) { function craftItem(name, amount = 1) {
amount = parseInt(amount, 10) amount = parseInt(amount, 10)
const item = require('minecraft-data')(bot.version).findItemOrBlockByName(name) const mcData = require('minecraft-data')(bot.version)
const item = mcData.findItemOrBlockByName(name)
const craftingTable = bot.findBlock({ const craftingTable = bot.findBlock({
matching: 58 matching: mcData.blocksByName["crafting_table"].id
}) })
const recipesNoTable = bot.recipesFor(item.id)
let recipes
if (recipesNoTable.length > 0) {
bot.chat("can make without crafting table!")
recipes = recipesNoTable
} else if (craftingTable) {
recipes = bot.recipesFor(item.id, null, null, craftingTable)
} else {
bot.chat("Couldn't find a crafting table. Maybe craft one?")
}
if (item) { if (item) {
const recipe = bot.recipesFor(item.id, null, 1, craftingTable)[0] let craftSuccess
if (recipe) { recipes && cfg.quiet || bot.chat(`${recipes.length} recipes`)
bot.chat(`I can make ${name}`) for (let recipe in recipes) {
bot.craft(recipe, amount, craftingTable, (err) => { if (craftSuccess) {
break
}
setTimeout(craftIt, Math.random() * 5000, recipes[recipe], amount, craftingTable)
}
function craftIt(recipe, amount, craftingTable) {
cfg.quiet || bot.chat(`I can make ${name}`)
console.log("craft:", recipe)
console.time("craft recipe")
bot.craft(recipe, amount, craftingTable, craftError)
console.timeEnd("craft recipe")
}
function craftError(err) {
if (err) { if (err) {
bot.chat(`error making ${name}`) console.error(err)
cfg.quiet || bot.chat(`error making ${name}: ${err.message}`)
// continue
} else { } else {
craftSuccess = true
bot.chat(`did the recipe for ${name} ${amount} times`) bot.chat(`did the recipe for ${name} ${amount} times`)
// break
} }
})
} else {
bot.chat(`I cannot make ${name}`)
} }
craftSuccess || cfg.quiet || bot.chat(`I couldn't make ${name}`)
} else { } else {
bot.chat(`unknown item: ${name}`) bot.chat(`unknown item: ${name}`)
} }
@ -187,4 +225,4 @@ const unload = () => {
bot.off('chat', inventory) bot.off('chat', inventory)
} }
module.exports = { load, unload, equipItem } module.exports = { load, unload, equipItem, craftItem }

View File

@ -1,5 +1,6 @@
const mineflayer = require('mineflayer') // const mineflayer = require('mineflayer')
const pathfinder = require('mineflayer-pathfinder').pathfinder // const { pathfinder } = require('mineflayer-pathfinder')
let pathfinder
const { const {
gameplay, gameplay,
MoveTo, MoveTo,
@ -10,8 +11,7 @@ const {
Craft Craft
} = require('prismarine-gameplay') } = require('prismarine-gameplay')
// const { Gameplay } = require('prismarine-gameplay/lib/gameplay') // const { Gameplay } = require('prismarine-gameplay/lib/gameplay')
// const { Vec3 } = require('vec3') const { Vec3 } = require('vec3')
let mcData = require('minecraft-data')
let cfg = {} let cfg = {}
let bot = {} let bot = {}
@ -34,8 +34,9 @@ let bot = {}
// bot.on('chat', (username, message) => mine(username, message)) // bot.on('chat', (username, message) => mine(username, message))
function checkBlockExists(name){ function checkBlockExists(name){
if (mcData.blocksByName[name] === undefined) { const item = require('minecraft-data')(bot.version).findItemOrBlockByName(name)
bot.chat(`${name} is not a block name`) if (item === undefined) {
bot.chat(`${name} is not a block or item name`)
return false return false
} else { } else {
return true return true
@ -121,10 +122,11 @@ function miner(username, message) {
itemType: command[2], itemType: command[2],
count: parseInt(command[1]) count: parseInt(command[1])
}), logError) }), logError)
break break
case /^collect [a-zA-Z_]+$/.test(message): case /^collect [a-zA-Z_]+$/.test(message):
if(!checkBlockExists(command[2])) {return false} if (!checkBlockExists(command[1])) { return false }
bot.gameplay.solveFor( bot.gameplay.solveFor(
new ObtainItem({ new ObtainItem({
itemType: command[1] itemType: command[1]
@ -141,7 +143,7 @@ function miner(username, message) {
}), logError) }), logError)
break break
case /^craft [0-9]+ [a-zA-Z_]+$/.test(message): case /^craftmine [0-9]+ [a-zA-Z_]+$/.test(message):
if(!checkBlockExists(command[2])) {return false} if(!checkBlockExists(command[2])) {return false}
bot.gameplay.solveFor( bot.gameplay.solveFor(
new Craft({ new Craft({
@ -152,23 +154,36 @@ function miner(username, message) {
break break
case /^stop$/.test(message): case /^stop$/.test(message):
bot.chat("♪♪ can't stop me now!! ♪♪") cfg.quiet || bot.chat("♪♪ can't stop me now!! ♪♪")
bot.pathfinder.setGoal(null)
bot.stopDigging()
// player = bot.player.entity // player = bot.player.entity
if (player) { // if (player) {
bot.gameplay.solveFor( // bot.gameplay.solveFor(
new MoveTo({ // new MoveTo({
x: player.position.x, // x: player.position.x,
y: player.position.y, // y: player.position.y,
z: player.position.z // z: player.position.z
}), logError) // }), logError)
} // }
break break
} }
} }
function logError(err) { function logError(err) {
if (err) if (err) {
bot.chat(`Failed task: ${err.message}`) switch (err.message) {
case "No more solutions available!":
console.log("miner: failed")
cfg.quiet || bot.chat("miner: out of solutions")
break;
default:
console.log(err)
cfg.quiet || bot.chat("miner: unknown error, check logs")
break;
}
}
} }
@ -176,10 +191,15 @@ const load = (config) => {
cfg = config cfg = config
bot = cfg.bot bot = cfg.bot
mcData = mcData(bot.version) pathfinder = bot.pathfinder || bot.loadPlugin(require('mineflayer-pathfinder').pathfinder)
bot.loadPlugin(pathfinder) // bot.loadPlugin(pathfinder)
cfg.plugins.mover.initMoves(bot)
bot.loadPlugin(gameplay) bot.loadPlugin(gameplay)
cfg.plugins.mover.initMoves(bot)
bot.on("chat", miner) bot.on("chat", miner)
// bot.pathfinder.canDig
} }
const unload = () => { const unload = () => {
@ -187,4 +207,4 @@ const unload = () => {
bot.off("chat", miner) bot.off("chat", miner)
} }
module.exports = { load, unload } module.exports = { load, unload, miner }

View File

@ -1,6 +1,6 @@
const pathfinder = require('mineflayer-pathfinder').pathfinder let pathfinder
const { Bot } = require('mineflayer') //TODO replace with simple pathfinder motions
const { const {
gameplay, gameplay,
MoveTo, MoveTo,
@ -71,6 +71,7 @@ function sleep(quiet) {
) )
// bot.chat('/afk') // bot.chat('/afk')
} }
bot.pathfinder.movements
} }
function wake() { function wake() {
@ -86,7 +87,7 @@ function wake() {
function autoSleep() { function autoSleep() {
if (!bot.time.isDay && !cfg.sleep.timeoutFn && cfg.sleep.auto && !bot.isSleeping) { if (!bot.time.isDay && !cfg.sleep.timeoutFn && cfg.sleep.auto && !bot.isSleeping) {
sleep() sleep()
cfg.sleep.timeoutFn = setTimeout(() => { cfg.sleep.timeoutFn = null }, cfg.sleep.timeout) // give 2 seconds for multiple events cfg.sleep.timeoutFn = setTimeout(() => { cfg.sleep.timeoutFn = null }, cfg.sleep.timeout)
console.log("sleeping?", bot.isSleeping, bot.time) console.log("sleeping?", bot.isSleeping, bot.time)
} }
} }
@ -98,10 +99,11 @@ const load = (config) => {
auto: true, auto: true,
// timeout: 30 * 1000, // timeout: 30 * 1000,
timeout: 2 * 60 * 1000, timeout: 2 * 60 * 1000,
quiet: false quiet: !!cfg.quiet
} }
bot.loadPlugin(pathfinder) pathfinder = bot.pathfinder || require('mineflayer-pathfinder').pathfinder
// bot.loadPlugin(pathfinder)
bot.loadPlugin(gameplay) bot.loadPlugin(gameplay)
inv = cfg.plugins["inventory"] inv = cfg.plugins["inventory"]
bot.on("time", autoSleep) bot.on("time", autoSleep)