lib/index.js

@@ -95,14 +95,13 @@ cfg.quiet = true
 bot.once("spawn", () => {
     plugins = {
         command: require('./plugins/command'),
-        eater: require('./plugins/eater'),
-        inventory: require('./plugins/inventory'),
-        informer: require('./plugins/informer'),
-        finder: require('./plugins/finder'),
         sleeper: require('./plugins/sleeper'),
         armor: require('./plugins/armor'),
         mover: require('./plugins/mover'),
         guard: require('./plugins/guard'),
+        inventory: require('./plugins/inventory'),
+        eater: require('./plugins/eater'),
+        finder: require('./plugins/finder'),
         // miner: require('./plugins/miner.js'),
         // statemachine: require('./plugins/statemachine'),
     }

lib/plugins/command.js

@@ -1,5 +1,5 @@
 const v = require('vec3')
-let mcData
+let mcData = require('minecraft-data')
 
 let cfg = {}
 let bot = {}
@@ -426,51 +426,29 @@ function command(username, message) {
                 // case "take":
                 //     // TODO take only what's requested, then throw all the rest
                 //     // TODO take all
-
+                // case "toss":
-                // TODO move subcommands to cfg.plugins.inventory.itemByName
+                // case "drop":
-                case "toss":
+                //     if (!message_parts[1]) { return false } // FIXME, works but ugly
-                case "drop":
+                //     if (!checkItemExists(message_parts[1])) { return false }
-                    if (!message_parts[1]) { return false } // FIXME, works but ugly
+                //     switch (message_parts.length) {
-                    // TODO use cfg.plugins.inventory.itemByName
+                //         case 2:
-                    const item = cfg.plugins.inventory.itemByName(message_parts[1])
+                //             bot.toss(mcData.blocksByName[message_parts[1]].id)
-                    if (!mcData.findItemOrBlockByName(message_parts[1])) {
+                //             break
-                        console.log("doesn't exist:", message_parts[1])
+                //         case 3:
-                        cfg.quiet || bot.chat(`item doesn't exist: ${message_parts[1]}`)
+                //             bot.tossStack(
-                        return false
+                //                 mcData.itemsByName[message_parts[1]].id,
-                    } else if (!item) {
+                //                 (err) => {
-                        console.log("don't have:", message_parts[1])
+                //                     if (err) {
-                        cfg.quiet || bot.chat(`don't have item: ${message_parts[1]}`)
+                //                         console.log(err)
-                    }
+                //                         bot.chat(err)
-                    switch (message_parts.length) {
+                //                     }
-                        case 2:
+                //                 }
-                            bot.tossStack(
+                //             )
-                                item,
+                //             break
-                                (err) => {
+                //         default:
-                                    if (err) {
+                //             break
-                                        console.error(err)
+                //     }
-                                        cfg.quiet || bot.chat(err.message)
+                //     break;
-                                    }
-                                }
-                            )
-                            break
-                        case 3:
-                            const amount = parseInt(message_parts[2])
-                            bot.toss(
-                                item.type,
-                                null, //metadata
-                                amount,
-                                (err) => {
-                                    if (err) {
-                                        console.error(err)
-                                        cfg.quiet || bot.chat(err.message)
-                                    }
-                                }
-                            )
-                            break
-                        default:
-                            break
-                    }
-                    break;
                 case "location":
                     // TODO put in /lib/location
                     switch (message_parts[1]) {
@@ -569,12 +547,13 @@ const load = (config) => {
     cfg = config
     bot = cfg.bot
 
-    mcData = bot.mcData || (bot.mcData = require('minecraft-data')(bot.version))
+    mcData = mcData(bot.version)
     for (const [key, fn] of Object.entries(events)) {
         events_registered.push(
             bot.on(key, fn)
         )
     }
+    mcData = require('minecraft-data')(bot.version)
 }
 
 const unload = () => {

lib/plugins/informer.js

@@ -1,22 +0,0 @@
-let cfg
-let bot
-let mcData
-
-function info() {
-    const block = bot.blockAtCursor()
-    console.log(block)
-    cfg.quiet || bot.chat([block.id, block.name])
-}
-
-const load = (config) => {
-    cfg = config
-    bot = cfg.bot
-    cfg.info = {
-        quiet: cfg.quiet,
-    }
-    mcData = bot.mcData || (bot.mcData = require('minecraft-data')(bot.version))
-}
-
-const unload = () => {}
-
-module.exports = { load, unload, info }

lib/plugins/inventory.js

@@ -225,4 +225,4 @@ const unload = () => {
     bot.off('chat', inventory)
 }
 
-module.exports = { load, unload, equipItem, craftItem, itemByName }
+module.exports = { load, unload, equipItem, craftItem }

lib/plugins/mover.js

@@ -1,26 +1,31 @@
+// import { EntityFilters } from "mineflayer-statemachine"
+// import v from "vec3"
 
+// import { Movements } from "mineflayer-pathfinder"
+
+// const mineflayer = require('mineflayer')
 const { Movements } = require('mineflayer-pathfinder')
+// const { GoalBLah } = require('mineflayer-pathfinder').goals
 const v = require('vec3')
 
 let cfg = {}
 let bot = {}
 // let moving
 let pathfinder
-let mcData
 let movements = []
 
 
-function initMoves(bot = bot, mcData = bot.mcData) {
+function initMoves(bot = bot, mcData = require('minecraft-data')(bot.version)) {
     console.info(movements)
     if (movements.length > 0) {
-        bot.pathfinder.setMovements(movements.defaultMove)
+        bot.pathfinder.setMovements(defaultMove)
         return console.warn("movements already initialized!")
     }
     let defaultMove = new Movements(bot, mcData)
     defaultMove.canDig = false
     defaultMove.scafoldingBlocks.push(mcData.blocksByName.slime_block.id)
-    defaultMove.blocksCantBreak.add(mcData.blocksByName.glass.id)
+    // defaultMove.blocksCantBreak.add(mcData.blocksByName.glass.id)
-    defaultMove.blocksToAvoid.add(mcData.blocksByName.magma_block.id)
+    // defaultMove.blocksToAvoid.add(mcData.blocksByName.magma.id)
     movements.push(defaultMove)
     movements.defaultMove = movements[0]
 
@@ -41,6 +46,8 @@ function follow(entity, dynamic = true) {
     console.assert(entity)
     const { GoalFollow } = require('mineflayer-pathfinder').goals
 
+
+
     cfg.quiet && console.log(entity)
         || bot.chat(
             `following ${entity.type
@@ -76,16 +83,19 @@ const load = (config) => {
         movements: []
     }
 
-    mcData = bot.mcData || (bot.mcData = require('minecraft-data')(bot.version))
     pathfinder = bot.pathfinder || bot.loadPlugin(require('mineflayer-pathfinder').pathfinder)
 
     // initMoves(bot, mcData)
-    setTimeout(initMoves, 500, bot, mcData)
+    setTimeout(initMoves, 500, bot)
+
+    // bot.loadPlugin(pathfinder)
+
+    // bot.on('time', hello)
 
 }
 
 const unload = () => {
-    stop()
+    // TODO stop pathfinding maybe?
 }
 
 module.exports = { load, unload, stop, initMoves, moveNear, follow }