jay/angram
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor: ➖ remove sleeper's prismarine-gameplay dependence

Browse Source
This commit is contained in:
jay 2020-12-24 10:35:01 +05:00
parent 8e4eb7748f
commit a7ccb08d43
1 changed files with 19 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lib/plugins/sleeper.js
View File

@ -1,13 +1,6 @@
let pathfinder let pathfinder
//TODO replace with simple pathfinder motions //TODO replace with simple pathfinder motions
const {
gameplay,
MoveTo,
MoveToInteract,
ObtainItem,
// Craft
} = require('prismarine-gameplay')
let cfg = {} let cfg = {}
let bot = {} let bot = {}
@ -33,42 +26,33 @@ function sleep(quiet) {
} }
if (bed && bedstatus == "") { if (bed && bedstatus == "") {
bot.lookAt(bed.position) bot.lookAt(bed.position)
// const nearbed = bot.waitForChunksToLoad(() => {
bot.gameplay.solveFor( cfg.plugins.moveNear(bed.position)
new MoveTo((bed.position.range = 2) && bed.position), (err) => { bot.sleep(bed, (err) => {
// new MoveTo(bed.position), (err) => {
// new MoveToInteract(bed.position), (err) => {
if (err) { if (err) {
!quiet && bot.chat(`can't reach bed: ${err.message}`) !quiet && bot.chat(`can't sleep: ${err.message}`)
} else { } else {
bot.waitForChunksToLoad(() => { !quiet && bot.chat("zzz")
bot.sleep(bed, (err) => { console.log("sleeping? ", bot.isSleeping)
if (err) { // hack until this is fixed
!quiet && bot.chat(`can't sleep: ${err.message}`) // bot.isSleeping = bot.isSleeping ? bot.isSleeping : true
} else { bot.isSleeping = true
!quiet && bot.chat("zzz")
console.log("sleeping? ", bot.isSleeping)
// hack until this is fixed
// bot.isSleeping = bot.isSleeping ? bot.isSleeping : true
bot.isSleeping = true
}
})
})
} }
}) })
// } else if (bed){ })
} else if (inv && inv.equipItem("red_bed", "hand", true)) { } else if (inv && inv.equipItem("red_bed", "hand", true)) {
// doesn't work fortunately // doesn't work fortunately
// FIXME: DONT IMPLEMENT until it is detected as NOT NETHER // FIXME: DONT IMPLEMENT until it is detected as NOT NETHER
bot.placeBlock() // bot.placeBlock()
} else { } else {
bot.gameplay.solveFor( // TODO: use mover
new ObtainItem("bed"), (err) => { // bot.gameplay.solveFor(
if (err) { // new ObtainItem("bed"), (err) => {
!quiet && bot.chat(`need a${bedstatus} bed: may not see if just placed`) // if (err) {
} // !quiet && bot.chat(`need a${bedstatus} bed: may not see if just placed`)
} // }
) // }
// )
// bot.chat('/afk') // bot.chat('/afk')
} }
bot.pathfinder.movements bot.pathfinder.movements
@ -104,7 +88,6 @@ const load = (config) => {
pathfinder = bot.pathfinder || require('mineflayer-pathfinder').pathfinder pathfinder = bot.pathfinder || require('mineflayer-pathfinder').pathfinder
// bot.loadPlugin(pathfinder) // bot.loadPlugin(pathfinder)
bot.loadPlugin(gameplay)
inv = cfg.plugins["inventory"] inv = cfg.plugins["inventory"]
bot.on("time", autoSleep) bot.on("time", autoSleep)