@nxg-org/mineflayer-util-plugin 1.5.2 → 1.6.1

package/lib/customImplementations/inventory.d.ts

@@ -0,0 +1,10 @@
+import type { Bot, EquipmentDestination } from "mineflayer";
+import type { Item } from "prismarine-item";
+export declare class CustomInventoryFunctions {
+    private bot;
+    armorSlots: any;
+    constructor(bot: Bot);
+    equip(item: Item, destination: EquipmentDestination): Promise<void>;
+    setQuickBarSlot(slot: number): void;
+    getDestSlot(destination: EquipmentDestination): any;
+}

package/lib/customImplementations/inventory.js

@@ -0,0 +1,95 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CustomInventoryFunctions = void 0;
+const assert_1 = __importDefault(require("assert"));
+const util_1 = require("util");
+const sleep = (0, util_1.promisify)(setTimeout);
+const QUICK_BAR_COUNT = 9;
+const QUICK_BAR_START = 36;
+let nextQuickBarSlot = 0;
+//lazy. will fix this later.
+class CustomInventoryFunctions {
+    constructor(bot) {
+        this.bot = bot;
+        this.armorSlots = {
+            head: 5,
+            torso: 6,
+            legs: 7,
+            feet: 8,
+        };
+        if (!bot.supportFeature("doesntHaveOffHandSlot")) {
+            this.armorSlots["off-hand"] = 45;
+        }
+    }
+    equip(item, destination) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (item == null || typeof item !== "object") {
+                throw new Error("Invalid item object in equip (item is null or typeof item is not object)");
+            }
+            if (!destination || destination === null) {
+                destination = "hand";
+            }
+            const sourceSlot = item.slot;
+            let destSlot = this.getDestSlot(destination);
+            if (sourceSlot === destSlot) {
+                // don't need to do anything
+                return;
+            }
+            if (destination !== "hand") {
+                yield this.bot.moveSlotItem(sourceSlot, destSlot);
+                return;
+            }
+            if (destSlot >= QUICK_BAR_START &&
+                destSlot < QUICK_BAR_START + QUICK_BAR_COUNT &&
+                sourceSlot >= QUICK_BAR_START &&
+                sourceSlot < QUICK_BAR_START + QUICK_BAR_COUNT) {
+                // all we have to do is change the quick bar selection
+                this.bot.setQuickBarSlot(sourceSlot - QUICK_BAR_START);
+                return;
+            }
+            // find an empty slot on the quick bar to put the source item in
+            destSlot = this.bot.inventory.firstEmptySlotRange(QUICK_BAR_START, QUICK_BAR_START + QUICK_BAR_COUNT);
+            if (destSlot == null) {
+                // LRU cache for the quick bar items
+                destSlot = QUICK_BAR_START + nextQuickBarSlot;
+                nextQuickBarSlot = (nextQuickBarSlot + 1) % QUICK_BAR_COUNT;
+            }
+            this.setQuickBarSlot(destSlot - QUICK_BAR_START);
+            yield this.bot.moveSlotItem(sourceSlot, destSlot);
+        });
+    }
+    setQuickBarSlot(slot) {
+        assert_1.default.ok(slot >= 0);
+        assert_1.default.ok(slot < 9);
+        if (this.bot.quickBarSlot === slot)
+            return;
+        this.bot.quickBarSlot = slot;
+        this.bot._client.write("held_item_slot", {
+            slotId: slot,
+        });
+        this.bot.updateHeldItem();
+    }
+    getDestSlot(destination) {
+        if (destination === "hand") {
+            return QUICK_BAR_START + this.bot.quickBarSlot;
+        }
+        else {
+            const destSlot = this.armorSlots[destination];
+            assert_1.default.ok(destSlot != null, `invalid destination: ${destination}`);
+            return destSlot;
+        }
+    }
+}
+exports.CustomInventoryFunctions = CustomInventoryFunctions;

package/lib/index.d.ts

@@ -1,9 +1,10 @@
 import type { Bot } from "mineflayer";
 import { UtilFunctions } from "./utilFunctions";
+import md from "minecraft-data";
 declare module "mineflayer" {
-    type PrioGroups = "inventory" | "movement";
     interface Bot {
         util: UtilFunctions;
+        registry: md.IndexedData;
     }
 }
 export default function inject(bot: Bot): void;

package/lib/index.js

@@ -2,10 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MathUtils = exports.AABBUtils = exports.BlockFace = exports.RaycastIterator = exports.InterceptFunctions = exports.AABB = void 0;
 const utilFunctions_1 = require("./utilFunctions");
-const mineflayer_pathfinder_1 = require("mineflayer-pathfinder");
 function inject(bot) {
-    if (!bot.hasPlugin(mineflayer_pathfinder_1.pathfinder))
-        bot.loadPlugin(mineflayer_pathfinder_1.pathfinder);
     bot.util = new utilFunctions_1.UtilFunctions(bot);
 }
 exports.default = inject;

package/lib/movementFunctions.d.ts

@@ -1,42 +1,8 @@
 import type { Bot } from "mineflayer";
 import type { Vec3 } from "vec3";
-import type { Entity } from "prismarine-entity";
-import { goals, Movements } from "mineflayer-pathfinder";
 export declare class MovementFunctions {
     private bot;
-    goalArray: goals.GoalCompositeAll;
     constructor(bot: Bot);
-    set movements(movements: Movements);
-    get movements(): Movements;
-    /**
-     * Fuckin' mineflayer-pathfinder still doesn't have typings.
-     * Pain in my goddamn ass.
-     * @returns have the goal changed
-     */
-    addGoal(goal: any): boolean;
-    /**
-     * Sets current goal and clears all others.
-     * @param goal any type of mineflayer-pathfinder goal.
-     * @returns have the goal changed
-     */
-    setOnlyGoal(goal: any, dynamic?: boolean): boolean;
-    /**
-     * Reset all goals inside the goal array to none.
-     * @returns have the goals changed
-     */
-    stop(): boolean;
-    /**
-     * Retreat from current entity.
-     * @param entity Prismarine-Entity Entity
-     * @returns have the goals changed.
-     */
-    retreatFromEntity(entity: Entity, distance: number, dynamic?: boolean): boolean;
-    /**
-     * Follow entity with a specific range. Will not approach past a certain distance either.
-     * @param entity Prismarine-Entity Entity
-     * @returns have the goals changed
-     */
-    followEntityWithRespectRange(entity: Entity, followDistance: number, invertDistance?: number): boolean;
     forceLook(yaw: number, pitch: number, update?: boolean, onGround?: boolean): void;
     forceLookAt(pos: Vec3, update?: boolean, onGround?: boolean): void;
     lazyTeleport(endPos: Vec3): void;

package/lib/movementFunctions.js

@@ -1,96 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MovementFunctions = void 0;
-const mineflayer_pathfinder_1 = require("mineflayer-pathfinder");
-const minecraft_data_1 = __importDefault(require("minecraft-data"));
-const { GoalCompositeAll, GoalInvert, GoalFollow } = mineflayer_pathfinder_1.goals;
 class MovementFunctions {
     constructor(bot) {
         this.bot = bot;
-        this.goalArray = new GoalCompositeAll();
-        this.movements = new mineflayer_pathfinder_1.Movements(bot, (0, minecraft_data_1.default)(bot.version));
-    }
-    set movements(movements) {
-        this.bot.pathfinder.setMovements(movements);
-    }
-    get movements() {
-        return this.movements;
-    }
-    /**
-     * Fuckin' mineflayer-pathfinder still doesn't have typings.
-     * Pain in my goddamn ass.
-     * @returns have the goal changed
-     */
-    addGoal(goal) {
-        if (this.goalArray.goals.find((inGoal) => inGoal === goal))
-            return false;
-        this.goalArray.push(goal);
-        return true;
-    }
-    /**
-     * Sets current goal and clears all others.
-     * @param goal any type of mineflayer-pathfinder goal.
-     * @returns have the goal changed
-     */
-    setOnlyGoal(goal, dynamic = false) {
-        const goalArr = [goal];
-        if (this.goalArray.goals === goalArr)
-            return false;
-        this.goalArray.goals = goalArr;
-        this.bot.pathfinder.setGoal(this.goalArray, dynamic);
-        return true;
-    }
-    /**
-     * Reset all goals inside the goal array to none.
-     * @returns have the goals changed
-     */
-    stop() {
-        if (this.goalArray.goals.length === 0)
-            return false;
-        this.goalArray.goals = [];
-        this.bot.pathfinder.setGoal(null);
-        return true;
-    }
-    /**
-     * Retreat from current entity.
-     * @param entity Prismarine-Entity Entity
-     * @returns have the goals changed.
-     */
-    retreatFromEntity(entity, distance, dynamic = true) {
-        const oldGoals = this.goalArray.goals.length;
-        this.goalArray.goals = this.goalArray.goals.filter((goal) => { var _a, _b, _c; return ((_b = (_a = goal.goal) === null || _a === void 0 ? void 0 : _a.entity) === null || _b === void 0 ? void 0 : _b.id) === entity.id && ((_c = goal.goal) === null || _c === void 0 ? void 0 : _c.rangeSq) === distance * distance; });
-        if (oldGoals !== this.goalArray.goals.length || this.goalArray.goals.length === 0) {
-            this.goalArray.push(new GoalFollow(entity, distance));
-            this.goalArray.push(new GoalInvert(new GoalFollow(entity, distance - 1)));
-            this.bot.pathfinder.setGoal(this.goalArray, dynamic);
-            return true;
-        }
-        return false;
-    }
-    /**
-     * Follow entity with a specific range. Will not approach past a certain distance either.
-     * @param entity Prismarine-Entity Entity
-     * @returns have the goals changed
-     */
-    followEntityWithRespectRange(entity, followDistance, invertDistance) {
-        const oldGoals = this.goalArray.goals.length;
-        this.goalArray.goals = this.goalArray.goals.filter((goal) => {
-            var _a;
-            return ((_a = goal.entity) === null || _a === void 0 ? void 0 : _a.id) === entity.id && goal.rangeSq === followDistance * followDistance;
-        });
-        if (oldGoals !== this.goalArray.goals.length || !this.bot.pathfinder.isMoving() || this.goalArray.goals.length === 0) {
-            if (this.goalArray.goals.length > 0) {
-                this.goalArray.goals = [];
-            }
-            this.goalArray.push(new GoalFollow(entity, followDistance));
-            this.goalArray.push(new GoalInvert(new GoalFollow(entity, invertDistance !== null && invertDistance !== void 0 ? invertDistance : followDistance - 0.5)));
-            this.bot.pathfinder.setGoal(this.goalArray, true);
-            return true;
-        }
-        return false;
     }
     forceLook(yaw, pitch, update = false, onGround) {
         const notchianYawAndPitch = { yaw: this.bot.util.math.toNotchianYaw(yaw), pitch: this.bot.util.math.toNotchianPitch(pitch) };

package/lib/rayTracingFunctions.d.ts

@@ -1,6 +1,6 @@
 import { Bot } from "mineflayer";
-import { Vec3 } from "vec3";
 import type { Entity } from "prismarine-entity";
+import { Vec3 } from "vec3";
 export declare class RayTraceFunctions {
     private bot;
     constructor(bot: Bot);

package/lib/static/aabbUtil.d.ts

@@ -1,6 +1,6 @@
 import type { Block } from "prismarine-block";
-import { AABB } from "../calcs/aabb";
 import type { Vec3 } from "vec3";
+import { AABB } from "../calcs/aabb";
 export declare namespace AABBUtils {
     function getBlockAABB(block: Block, height?: number): AABB;
     function getBlockPosAABB(block: Vec3, height?: number): AABB;

package/lib/static/mathUtil.js

@@ -61,15 +61,7 @@ var MathUtils;
     MathUtils.getYaw = getYaw;
     //Scuffed.
     function yawPitchAndSpeedToDir(yaw, pitch, speed) {
-        const thetaY = PI + yaw;
-        const thetaP = pitch;
-        const x = speed * Math.sin(thetaY);
-        const y = speed * Math.sin(thetaP);
-        const z = speed * Math.cos(thetaY);
-        const VxMag = Math.sqrt(x * x + z * z);
-        const VxRatio = Math.sqrt(VxMag * VxMag - y * y);
-        const allRatio = VxRatio / VxMag;
-        return new vec3_1.Vec3(x * allRatio, y, z * allRatio);
+        return new vec3_1.Vec3(-Math.sin(yaw) * Math.cos(pitch), Math.sin(pitch), -Math.cos(yaw) * Math.cos(pitch)).scale(speed);
     }
     MathUtils.yawPitchAndSpeedToDir = yawPitchAndSpeedToDir;
 })(MathUtils = exports.MathUtils || (exports.MathUtils = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nxg-org/mineflayer-util-plugin",
-    "version": "1.5.2",
+    "version": "1.6.1",
     "description": "mineflayer utils for NextGEN mineflayer plugins.",
     "keywords": [
         "mineflayer",
@@ -17,15 +17,12 @@
     "scripts": {
         "build": "npx tsc",
         "prepublish": "npm run build",
-        "test": "node --trace-warnings lib/example.js"
-    },
-    "dependencies": {
-        "mineflayer-pathfinder": "^2.3.3",
-        "vec3": "^0.1.7"
+        "test": "ts-node examples/example.ts"
     },
     "devDependencies": {
         "@types/node": "^17.0.4",
-        "mineflayer": "^4.4.0",
-        "typescript": "^4.5.2"
+        "mineflayer": "^4.6.0",
+        "typescript": "^4.5.2",
+        "vec3": "^0.1.7"
     }
 }

package/lib/example.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/example.js

@@ -1,96 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var _a, _b;
-Object.defineProperty(exports, "__esModule", { value: true });
-const mineflayer_1 = require("mineflayer");
-const index_1 = __importDefault(require("./index"));
-const vec3_1 = require("vec3");
-let target;
-const bot = (0, mineflayer_1.createBot)({
-    username: "utilTesting",
-    host: (_a = process.argv[2]) !== null && _a !== void 0 ? _a : "localhost",
-    port: (_b = Number(process.argv[3])) !== null && _b !== void 0 ? _b : 25565,
-});
-bot.loadPlugin(index_1.default);
-const emptyVec = new vec3_1.Vec3(0, 0, 0);
-bot.on("chat", (username, message) => __awaiter(void 0, void 0, void 0, function* () {
-    var _c;
-    const split = message.split(" ");
-    switch (split[0]) {
-        case "look":
-            target = bot.nearestEntity((e) => { var _a; return ((_a = e.username) !== null && _a !== void 0 ? _a : e.name) === split[1]; });
-            if (!target)
-                return console.log("no entity");
-            bot.util.move.forceLookAt(target.position, true);
-            break;
-        case "equip":
-            const item = bot.util.inv.getAllItems().find((i) => i.name.includes(split[1]));
-            if (!item)
-                return console.log("no item");
-            if (["hand", "off-hand"].includes(split[2])) {
-                bot.util.inv.customEquip(item, split[2]);
-            }
-            break;
-        case "health":
-            const health = bot.util.entity.getHealth();
-            bot.chat(`${health}`);
-            break;
-        case "whatAmILookingAt":
-            target = bot.nearestEntity((e) => { var _a; return ((_a = e.username) !== null && _a !== void 0 ? _a : e.name) === username; });
-            if (!target)
-                return console.log("no entity");
-            const player = bot.util.raytrace.entityAtEntityCursor(target, 256);
-            if (player) {
-                console.log(player);
-                bot.chat(`${(_c = player.username) !== null && _c !== void 0 ? _c : player.name} at ${player.position}`);
-            }
-            else {
-                const block = bot.util.raytrace.blockAtEntityCursor(target, 256); //includes face and intersect. That's very nice.
-                if (block) {
-                    console.log(block);
-                    bot.chat(`${block.name} at ${block.position}`);
-                }
-                else {
-                    bot.chat("You're not looking at anything.");
-                }
-            }
-            break;
-        case "come":
-            target = bot.nearestEntity((e) => { var _a; return ((_a = e.username) !== null && _a !== void 0 ? _a : e.name) === username; });
-            if (!target)
-                return console.log("no entity");
-            if (!bot.pathfinder)
-                bot.chat("pathfinder is not loaded!");
-            bot.util.move.followEntityWithRespectRange(target, 1);
-            break;
-        case "follow":
-            target = bot.nearestEntity((e) => { var _a; return ((_a = e.username) !== null && _a !== void 0 ? _a : e.name) === split[1]; });
-            if (!target)
-                return console.log("no entity");
-            if (!bot.pathfinder)
-                bot.chat("pathfinder is not loaded!");
-            bot.util.move.followEntityWithRespectRange(target, 1);
-            break;
-        case "stop":
-            if (!bot.pathfinder)
-                bot.chat("pathfinder is not loaded!");
-            bot.util.move.stop();
-            break;
-        default:
-            console.log(username, bot.entity.username);
-            if (username !== bot.entity.username)
-                bot.chat("unknown command: " + message);
-            break;
-    }
-}));