Compare commits

...

4 Commits

Author SHA1 Message Date
jay
8e719d5ccf feat(sleeper): add and adjust functionality to properly sleep
Can now use beds in inventory but with a hacky block placing workaround.
`findBlock` returns a null position.
So it uses the closest adjacent block and assumes it'll work.

Bot also is more robust at sleeping,
2020-12-27 05:50:16 +05:00
jay
112eb04a8d refactor(sleeper): ♻️ simplify and make sleeping code more robust 2020-12-27 01:58:17 +05:00
jay
ba7c53be0c refactor(command): ♻️ make toss exit early if non-existent block 2020-12-27 00:30:46 +05:00
jay
5b4718fa5d fix(command): 🐛 add missing return 2020-12-25 07:29:06 +05:00
2 changed files with 53 additions and 26 deletions

View File

@ -431,15 +431,16 @@ function command(username, message) {
case "toss": case "toss":
case "drop": case "drop":
if (!message_parts[1]) { return false } // FIXME, works but ugly if (!message_parts[1]) { return false } // FIXME, works but ugly
// TODO use cfg.plugins.inventory.itemByName
const item = cfg.plugins.inventory.itemByName(message_parts[1])
if (!mcData.findItemOrBlockByName(message_parts[1])) { if (!mcData.findItemOrBlockByName(message_parts[1])) {
console.log("doesn't exist:", message_parts[1]) console.log("doesn't exist:", message_parts[1])
cfg.quiet || bot.chat(`item doesn't exist: ${message_parts[1]}`) cfg.quiet || bot.chat(`item doesn't exist: ${message_parts[1]}`)
return false return false
} else if (!item) { }
const item = cfg.plugins.inventory.itemByName(message_parts[1])
if (!item) {
console.log("don't have:", message_parts[1]) console.log("don't have:", message_parts[1])
cfg.quiet || bot.chat(`don't have item: ${message_parts[1]}`) cfg.quiet || bot.chat(`don't have item: ${message_parts[1]}`)
return false
} }
switch (message_parts.length) { switch (message_parts.length) {
case 2: case 2:

View File

@ -7,27 +7,32 @@ let bot = {}
let inv let inv
// cfg.autosleep = false // cfg.autosleep = false
function sleep(quiet) { function sleep(quiet = cfg.sleep.quiet) {
quiet = quiet !== undefined ? quiet : cfg.sleep.quiet
if(bot.game.dimension !== "minecraft:overworld" || cfg.sleep.force){ if(bot.game.dimension !== "minecraft:overworld" || cfg.sleep.force){
!quiet && bot.chat("can't sleep, not in overworld now") !quiet && bot.chat("can't sleep, not in overworld now")
return return
} }
if (bot.isSleeping && !cfg.sleep.force) {
!quiet && bot.chat("already in bed!")
return
}
let bed = bot.findBlock({ let bed = bot.findBlock({
matching: block => bot.isABed(block) matching: block => bot.isABed(block)
}) })
let bedstatus = bed && bot.parseBedMetadata(bed).occupied ? "n unoccupied" : "" let bed_occupied = bed && bot.parseBedMetadata(bed).occupied
if(bed && bedstatus == "n unoccupied"){ if (bed && bed_occupied) {
bot.lookAt(bed.position) bot.lookAt(bed.position)
bed = bot.findBlock({ bed = bot.findBlock({
matching: block => bot.isABed(block) && !bot.parseBedMetadata(block).occupied matching: block => bot.isABed(block) && !bot.parseBedMetadata(block).occupied
}) || bed }) || bed
bedstatus = bot.parseBedMetadata(bed).occupied ? "n unoccupied" : "" bed_occupied = bot.parseBedMetadata(bed).occupied
} }
if (bed && bedstatus == "") { if (bed && !bed_occupied) {
bot.lookAt(bed.position) bot.lookAt(bed.position)
bot.waitForChunksToLoad(() => { bot.waitForChunksToLoad(() => {
cfg.plugins.mover.moveNear(bed.position) cfg.plugins.mover && cfg.plugins.mover.moveNear(bed.position, 2)
bot.once('goal_reached', (goal) => {
console.info(goal)
bot.sleep(bed, (err) => { bot.sleep(bed, (err) => {
if (err) { if (err) {
!quiet && bot.chat(`can't sleep: ${err.message}`) !quiet && bot.chat(`can't sleep: ${err.message}`)
@ -35,21 +40,42 @@ function sleep(quiet) {
!quiet && bot.chat("zzz") !quiet && bot.chat("zzz")
console.log("sleeping? ", bot.isSleeping) console.log("sleeping? ", bot.isSleeping)
// hack until this is fixed // hack until this is fixed
// bot.isSleeping = bot.isSleeping ? bot.isSleeping : true // TODO confirm this is fixed
bot.isSleeping = true // bot.isSleeping = true
} }
}) })
}) })
} else if (inv && inv.equipItem("red_bed", "hand", true)) { })
// doesn't work fortunately } else if (bed = bot.inventory.items().filter(bot.isABed)[0]) {
// FIXME: DONT IMPLEMENT until it is detected as NOT NETHER const v = require('vec3')
// bot.placeBlock() bot.equip(bed, "hand", (err) => { if (err) console.error(err) })
bot.waitForChunksToLoad(() => {
let refBlock =
// FIXME hack to get around findBlock returning null
bot.blockAt(bot.entity.position.offset(1, 0, 1), false)
// bot.findBlock({
// matching: (block) => {
// // if (block && block.type !== 0 && block.position) {
// if (block && block.position) {
// console.info("found", block)
// const blockAbove = bot.blockAt(block.position.offset(0, 1, 0))
// return !blockAbove || blockAbove.type === 0
// }
// // console.info("not found", block)
// return false
// }
// , maxDistance: 10
// })
console.log(refBlock)
bot.placeBlock(refBlock, new v.Vec3(0, 1, 0), console.error)
setTimeout(sleep, 3000, true)
})
} else { } else {
// TODO: use mover // TODO: use mover
// bot.gameplay.solveFor( // bot.gameplay.solveFor(
// new ObtainItem("bed"), (err) => { // new ObtainItem("bed"), (err) => {
// if (err) { // if (err) {
// !quiet && bot.chat(`need a${bedstatus} bed: may not see if just placed`) !quiet && bot.chat(`need a${bed_occupied ? "n unoccupied" : ""} bed: may not see if just placed`)
// } // }
// } // }
// ) // )
@ -72,7 +98,7 @@ 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) 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.isDay, bot.time.timeOfDay)
} }
} }