@nxg-org/mineflayer-util-plugin 1.5.0 → 1.5.1

package/lib/calcs/iterators.d.ts

@@ -32,7 +32,7 @@ export declare class RaycastIterator {
     tMaxZ: number;
     maxDistance: number;
     constructor(pos: Vec3, dir: Vec3, maxDistance: number);
-    intersect(shapes: [x0: BlockFace, y0: BlockFace, z0: BlockFace, x1: BlockFace, y1: BlockFace, z1: BlockFace][], offset: Vec3): {
+    intersect(shapes: [x0: number, y0: number, z0: number, x1: number, y1: number, z1: number][], offset: Vec3): {
         pos: Vec3;
         face: BlockFace;
     } | null;

package/lib/entityFunctions.d.ts

@@ -39,7 +39,8 @@ export declare class EntityFunctions {
      */
     getHealthChange(packetMetadata: any, entity: Entity): number;
     getDistanceToEntity(entity: Entity): number;
-    getDistanceBetweenEntities(first: Entity, second: Entity): number;
+    getEyeDistanceToEntity(entity: Entity): number;
+    getEyeDistanceBetweenEntities(first: Entity, second: Entity): number;
     getEntityAABB(entity: {
         type: string;
         position: Vec3;

package/lib/entityFunctions.js

@@ -16,11 +16,6 @@ class EntityFunctions {
         this.bot = bot;
         this.healthSlot = 7;
         this.bot.on("spawn", () => __awaiter(this, void 0, void 0, function* () {
-            // await this.bot.util.sleep(1000)
-            // const slot = this.bot.entity.metadata.slice(5).findIndex((data) => Number(data) === 20);
-            // if (slot > 0) {
-            //     this.healthSlot = slot + 5;
-            // }
             this.healthSlot = Number(this.bot.version.split(".")[1]) <= 16 ? 7 : 9;
         }));
     }
@@ -51,11 +46,9 @@ class EntityFunctions {
         var _a, _b;
         entity !== null && entity !== void 0 ? entity : (entity = this.bot.entity);
         const metadata = entity.metadata;
-        const healthSlot = this.healthSlot; //metadata[this.healthSlot] ? this.healthSlot : metadata.findIndex((met) => Number(met) > 1 && Number(met) <= 20);
-        let health = Number(metadata[healthSlot]);
+        let health = Number(metadata[this.healthSlot]);
         if (!health || health === 0)
             health = entity === this.bot.entity ? (_a = this.bot.entity.health) !== null && _a !== void 0 ? _a : 0 : 0;
-        // console.log(health + (Number(metadata[this.healthSlot + 4]) ?? 0))
         return health + ((_b = Number(metadata[this.healthSlot + 4])) !== null && _b !== void 0 ? _b : 0);
     }
     /**
@@ -75,23 +68,25 @@ class EntityFunctions {
     getHealthChange(packetMetadata, entity) {
         const oldHealth = this.getHealthFromMetadata(entity.metadata);
         const newHealth = this.getHealthFromMetadata(this.parseMetadata(packetMetadata, entity.metadata));
-        return -(oldHealth - newHealth);
+        return newHealth - oldHealth;
     }
     getDistanceToEntity(entity) {
-        return this.getDistanceBetweenEntities(this.bot.entity, entity);
+        return this.bot.entity.position.distanceTo(entity.position);
     }
-    getDistanceBetweenEntities(first, second) {
-        return first.position.distanceTo(second.position);
+    getEyeDistanceToEntity(entity) {
+        return this.getEntityAABB(entity).distanceToVec(this.bot.entity.position.offset(0, 1.62, 0));
+    }
+    getEyeDistanceBetweenEntities(first, second) {
+        return this.getEntityAABB(second).distanceToVec(first.position.offset(0, first.height, 0));
     }
     getEntityAABB(entity) {
-        var _a;
         switch (entity.type) {
             case "player":
                 return this.getPlayerAABB({ position: entity.position });
             case "mob":
             default:
                 //TODO: Implement better AABBs. However, this may just be correct.
-                return this.getEntityAABBRaw({ position: entity.position, height: entity.height, width: (_a = entity.width) !== null && _a !== void 0 ? _a : entity.height });
+                return this.getEntityAABBRaw({ position: entity.position, height: entity.height, width: entity.width });
         }
     }
     getPlayerAABB(entity) {

package/lib/example.js

@@ -21,7 +21,6 @@ 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,
-    version: "1.17.1",
 });
 bot.loadPlugin(index_1.default);
 const emptyVec = new vec3_1.Vec3(0, 0, 0);
@@ -47,7 +46,7 @@ bot.on("chat", (username, message) => __awaiter(void 0, void 0, void 0, function
             const health = bot.util.entity.getHealth();
             bot.chat(`${health}`);
             break;
-        case "WhatAmILookingAt":
+        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");

package/lib/filterFunctions.d.ts

@@ -18,6 +18,5 @@ export declare class FilterFunctions {
     static specificNamesFilter(bot: Bot, ...names: string[]): Entity | null;
     nearestCrystalFilter(): Entity | null;
     static nearestCrystalFilter(bot: Bot): Entity | null;
-    entityAtPosition(position: Vec3): Entity | null;
-    static entityAtPosition(bot: Bot, position: Vec3): void;
+    crystalAtPosition(position: Vec3): Entity | null;
 }

package/lib/filterFunctions.js

@@ -37,9 +37,8 @@ class FilterFunctions {
     static nearestCrystalFilter(bot) {
         return FilterFunctions.getNearestEntity(bot, (e) => e.name === "ender_crystal");
     }
-    entityAtPosition(position) {
+    crystalAtPosition(position) {
         return this.getNearestEntity((entity) => entity.position.offset(-0.5, -1, -0.5).equals(position));
     }
-    static entityAtPosition(bot, position) { }
 }
 exports.FilterFunctions = FilterFunctions;

package/lib/index.d.ts

@@ -5,18 +5,9 @@ declare module "mineflayer" {
     interface Bot {
         util: UtilFunctions;
     }
-    interface BotEvents {
-        startedEquippingMainHand: () => void;
-        startedEquippingOffHand: () => void;
-        stoppedEquippingMainHand: () => void;
-        stoppedEquippingOffHand: () => void;
-        startedEquippingOtherSlot: () => void;
-        stoppedEquippingOtherSlot: () => void;
-    }
-}
-declare module "prismarine-entity" {
 }
 export default function inject(bot: Bot): void;
 export { AABB } from "./calcs/aabb";
 export { InterceptFunctions } from "./calcs/intercept";
+export { RaycastIterator, BlockFace } from "./calcs/iterators";
 export { AABBUtils, MathUtils } from "./static";

package/lib/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MathUtils = exports.AABBUtils = exports.InterceptFunctions = exports.AABB = void 0;
+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.pathfinder)
+    if (!bot.hasPlugin(mineflayer_pathfinder_1.pathfinder))
         bot.loadPlugin(mineflayer_pathfinder_1.pathfinder);
     bot.util = new utilFunctions_1.UtilFunctions(bot);
 }
@@ -13,6 +13,9 @@ var aabb_1 = require("./calcs/aabb");
 Object.defineProperty(exports, "AABB", { enumerable: true, get: function () { return aabb_1.AABB; } });
 var intercept_1 = require("./calcs/intercept");
 Object.defineProperty(exports, "InterceptFunctions", { enumerable: true, get: function () { return intercept_1.InterceptFunctions; } });
+var iterators_1 = require("./calcs/iterators");
+Object.defineProperty(exports, "RaycastIterator", { enumerable: true, get: function () { return iterators_1.RaycastIterator; } });
+Object.defineProperty(exports, "BlockFace", { enumerable: true, get: function () { return iterators_1.BlockFace; } });
 var static_1 = require("./static");
 Object.defineProperty(exports, "AABBUtils", { enumerable: true, get: function () { return static_1.AABBUtils; } });
 Object.defineProperty(exports, "MathUtils", { enumerable: true, get: function () { return static_1.MathUtils; } });

package/lib/inventoryFunctions.d.ts

@@ -1,6 +1,5 @@
 import { Bot, EquipmentDestination } from "mineflayer";
 import { Item } from "prismarine-item";
-import { BuiltInPriorityOptions } from "./utilFunctions";
 /**
  * Error codes:
  *
@@ -34,12 +33,5 @@ export declare class InventoryFunctions {
     findItem(name: string, metadata?: number): Item | null;
     has(name: string, metadata?: number): boolean;
     equipItemRaw(item: Item, dest: EquipmentDestination): Promise<boolean>;
-    equipItem(name: string, dest: EquipmentDestination, options: BuiltInPriorityOptions): Promise<number>;
-    equipMainHand(name: string, options?: BuiltInPriorityOptions): Promise<number>;
-    equipOffHand(name: string, options?: BuiltInPriorityOptions): Promise<number>;
-    equipSlot(name: string, destination: EquipmentDestination, options?: BuiltInPriorityOptions): Promise<number>;
-    equipMainHandNoWait(name: string, options: BuiltInPriorityOptions): Promise<number>;
-    equipOffHandNoWait(name: string, options: BuiltInPriorityOptions): Promise<number>;
-    equipSlotNoWait(name: string, dest: EquipmentDestination, options: BuiltInPriorityOptions): Promise<number>;
     customEquip(item: Item, destination: EquipmentDestination, retries?: number): Promise<boolean>;
 }

package/lib/inventoryFunctions.js

@@ -35,10 +35,8 @@ class InventoryFunctions {
     set equippingOtherSlot(value) {
         if (this._equippingOtherSlot === value)
             return;
-        if (value)
-            this.bot.emit("startedEquippingOtherSlot");
-        else
-            this.bot.emit("stoppedEquippingOtherSlot");
+        // if (value) this.bot.emit("startedEquippingOtherSlot");
+        // else this.bot.emit("stoppedEquippingOtherSlot");
         this._equippingOtherSlot = value;
     }
     get equippingOtherSlot() {
@@ -47,10 +45,8 @@ class InventoryFunctions {
     set equippingMainHand(value) {
         if (this._equippingMainHand === value)
             return;
-        if (value)
-            this.bot.emit("startedEquippingMainHand");
-        else
-            this.bot.emit("stoppedEquippingMainHand");
+        // if (value) this.bot.emit("startedEquippingMainHand");
+        // else this.bot.emit("stoppedEquippingMainHand");
         this._equippingMainHand = value;
     }
     get equippingMainHand() {
@@ -59,10 +55,8 @@ class InventoryFunctions {
     set equippingOffHand(value) {
         if (this._equippingOffHand === value)
             return;
-        if (value)
-            this.bot.emit("startedEquippingOffHand");
-        else
-            this.bot.emit("stoppedEquippingOffHand");
+        // if (value) this.bot.emit("startedEquippingOffHand");
+        // else this.bot.emit("stoppedEquippingOffHand");
         this._equippingOffHand = value;
     }
     get equippingOffHand() {
@@ -77,8 +71,8 @@ class InventoryFunctions {
     getAllItemsExceptCurrent(current) {
         return [
             ...this.bot.inventory.items(),
-            ...["hand", "head", "torso", "legs", "feet", "off-hand"]
-                .filter((name) => name !== current)
+            ...(["hand", "head", "torso", "legs", "feet", "off-hand"]
+                .filter((name) => name !== current))
                 .map((name) => this.bot.inventory.slots[this.bot.getEquipmentDestSlot(name)]),
         ].filter((e) => !!e);
     }
@@ -114,73 +108,6 @@ class InventoryFunctions {
             return false;
         });
     }
-    equipItem(name, dest, options) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            if ((_a = this.bot.inventory.slots[this.bot.getEquipmentDestSlot(dest)]) === null || _a === void 0 ? void 0 : _a.name.includes(name))
-                return 1;
-            const item = this.getAllItemsExceptCurrent(dest).find((item) => item === null || item === void 0 ? void 0 : item.name.includes(name));
-            if (!!item) {
-                yield this.bot.util.builtInsPriority(options, this.bot.equip, item, dest);
-                return 0;
-            }
-            return 2;
-        });
-    }
-    equipMainHand(name, options = { group: "inventory", priority: 1 }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            while (this._equippingMainHand) {
-                yield sleep(0);
-            }
-            return yield this.equipMainHandNoWait(name, options);
-        });
-    }
-    equipOffHand(name, options = { group: "inventory", priority: 1 }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            while (this._equippingOffHand) {
-                yield sleep(0);
-            }
-            return yield this.equipOffHandNoWait(name, options);
-        });
-    }
-    equipSlot(name, destination, options = { group: "inventory", priority: 1 }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            while (this._equippingOtherSlot) {
-                yield sleep(0);
-            }
-            return yield this.equipSlotNoWait(name, destination, options);
-        });
-    }
-    equipMainHandNoWait(name, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._equippingMainHand)
-                return 3;
-            this._equippingMainHand = true;
-            const result = yield this.equipItem(name, "hand", options);
-            this._equippingMainHand = false;
-            return result;
-        });
-    }
-    equipOffHandNoWait(name, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._equippingOffHand)
-                return 3;
-            this.equippingOffHand = true;
-            const result = yield this.equipItem(name, "off-hand", options);
-            this.equippingOffHand = false;
-            return result;
-        });
-    }
-    equipSlotNoWait(name, dest, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._equippingOtherSlot)
-                return 3;
-            this.equippingOtherSlot = true;
-            const result = yield this.equipItem(name, dest, options);
-            this.equippingOtherSlot = false;
-            return result;
-        });
-    }
     customEquip(item, destination, retries = 1) {
         return __awaiter(this, void 0, void 0, function* () {
             for (let i = 0; i < retries; i++) {

package/lib/movementFunctions.d.ts

@@ -1,5 +1,4 @@
 import type { Bot } from "mineflayer";
-import type { Entity } from "prismarine-entity";
 import type { Vec3 } from "vec3";
 import { goals, Movements } from "mineflayer-pathfinder";
 export declare class MovementFunctions {
@@ -30,13 +29,13 @@ export declare class MovementFunctions {
      * @param entity Prismarine-Entity Entity
      * @returns have the goals changed.
      */
-    retreatFromEntity(entity: Entity, distance: number, dynamic?: boolean): boolean;
+    retreatFromEntity(entity: any, 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;
+    followEntityWithRespectRange(entity: any, 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/static/aabbUtil.js

@@ -15,13 +15,12 @@ var AABBUtils;
     }
     AABBUtils.getBlockPosAABB = getBlockPosAABB;
     function getEntityAABB(entity) {
-        var _a;
         switch (entity.type) {
             case "player":
                 return getPlayerAABB({ position: entity.position });
             case "mob":
             default: //TODO: Implement better AABBs. However, this may just be correct.
-                return getEntityAABBRaw({ position: entity.position, height: entity.height, width: (_a = entity.width) !== null && _a !== void 0 ? _a : entity.height });
+                return getEntityAABBRaw({ position: entity.position, height: entity.height, width: entity.width });
         }
     }
     AABBUtils.getEntityAABB = getEntityAABB;

package/lib/static/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/static/mathUtil.d.ts

@@ -1,6 +1,10 @@
 import { Bot } from "mineflayer";
 import { Vec3 } from "vec3";
 export declare namespace MathUtils {
+    const TO_RAD: number;
+    const TO_DEG: number;
+    const FROM_NOTCH_BYTE: number;
+    const FROM_NOTCH_VEL: number;
     const toNotchianYaw: (yaw: number) => number;
     const toNotchianPitch: (pitch: number) => number;
     const fromNotchianYawByte: (yaw: number) => number;

package/lib/static/mathUtil.js

@@ -2,30 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MathUtils = void 0;
 const vec3_1 = require("vec3");
-const PI = Math.PI;
-const PI_2 = Math.PI * 2;
-const TO_RAD = PI / 180;
-const TO_DEG = 1 / TO_RAD;
-const FROM_NOTCH_BYTE = 360 / 256;
-// From wiki.vg: Velocity is believed to be in units of 1/8000 of a block per server tick (50ms)
-const FROM_NOTCH_VEL = 1 / 8000;
 var MathUtils;
 (function (MathUtils) {
+    const PI = Math.PI;
+    const PI_2 = Math.PI * 2;
+    MathUtils.TO_RAD = PI / 180;
+    MathUtils.TO_DEG = 1 / MathUtils.TO_RAD;
+    MathUtils.FROM_NOTCH_BYTE = 360 / 256;
+    // From wiki.vg: Velocity is believed to be in units of 1/8000 of a block per server tick (50ms)
+    MathUtils.FROM_NOTCH_VEL = 1 / 8000;
     MathUtils.toNotchianYaw = (yaw) => toDegrees(PI - yaw);
     MathUtils.toNotchianPitch = (pitch) => toDegrees(-pitch);
-    MathUtils.fromNotchianYawByte = (yaw) => fromNotchianYaw(yaw * FROM_NOTCH_BYTE);
-    MathUtils.fromNotchianPitchByte = (pitch) => fromNotchianPitch(pitch * FROM_NOTCH_BYTE);
+    MathUtils.fromNotchianYawByte = (yaw) => fromNotchianYaw(yaw * MathUtils.FROM_NOTCH_BYTE);
+    MathUtils.fromNotchianPitchByte = (pitch) => fromNotchianPitch(pitch * MathUtils.FROM_NOTCH_BYTE);
     function euclideanMod(numerator, denominator) {
         const result = numerator % denominator;
         return result < 0 ? result + denominator : result;
     }
     MathUtils.euclideanMod = euclideanMod;
     function toRadians(degrees) {
-        return TO_RAD * degrees;
+        return MathUtils.TO_RAD * degrees;
     }
     MathUtils.toRadians = toRadians;
     function toDegrees(radians) {
-        return TO_DEG * radians;
+        return MathUtils.TO_DEG * radians;
     }
     MathUtils.toDegrees = toDegrees;
     function fromNotchianYaw(yaw) {
@@ -37,7 +37,7 @@ var MathUtils;
     }
     MathUtils.fromNotchianPitch = fromNotchianPitch;
     function fromNotchVelocity(vel) {
-        return new vec3_1.Vec3(vel.x * FROM_NOTCH_VEL, vel.y * FROM_NOTCH_VEL, vel.z * FROM_NOTCH_VEL);
+        return new vec3_1.Vec3(vel.x * MathUtils.FROM_NOTCH_VEL, vel.y * MathUtils.FROM_NOTCH_VEL, vel.z * MathUtils.FROM_NOTCH_VEL);
     }
     MathUtils.fromNotchVelocity = fromNotchVelocity;
     function pointToYawAndPitch(bot, point) {

package/lib/utilFunctions.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import type { Bot, PrioGroups } from "mineflayer";
+import type { Bot } from "mineflayer";
 import { EntityFunctions } from "./entityFunctions";
 import { FilterFunctions } from "./filterFunctions";
 import { InventoryFunctions } from "./inventoryFunctions";
@@ -8,18 +8,21 @@ import { PredictiveFunctions } from "./predictiveFunctions";
 import { MathFunctions } from "./mathUtil";
 import { WorldFunctions } from "./WorldFunctions";
 import { RayTraceFunctions } from "./rayTracingFunctions";
-export declare type BuiltInPriorityOptions = {
-    group: PrioGroups;
-    priority: number;
-    returnIfRunning?: boolean;
-    errCancel?: boolean;
-};
-export declare type CustomPriorityOptions = {
-    priority: number;
-    group?: PrioGroups;
-    returnIfRunning?: boolean;
-    errCancel?: boolean;
-};
+/**
+ * I don't believe I need any locks, as I'm only going to have one instance of this per bot.
+ * This is added to bot context so multiple instances will exist in memory.
+ * Therefore, I don't need this. https://www.npmjs.com/package/async-lock
+ */
+/**
+ * I may add listeners to this class, as halting until an item is equipped may be good.
+ */
+/**
+ * I can't inherit from multiple classes. This language sucks.
+ * I'm not using mixins. Fuck you, fuck that.
+ * I'm just going to segregate these functions into separate categories
+ * because once again, fuck you.
+ *
+ */
 export declare class UtilFunctions {
     bot: Bot;
     inv: InventoryFunctions;
@@ -30,21 +33,6 @@ export declare class UtilFunctions {
     math: MathFunctions;
     world: WorldFunctions;
     raytrace: RayTraceFunctions;
-    private builtInsPriorityStore;
-    private customPriorityStore;
-    private builtInCurrentExecuting;
-    private customCurrentExecuting;
     constructor(bot: Bot);
     sleep: typeof import("timers/promises").setTimeout;
-    isBuiltInsEmpty(name?: string): boolean;
-    isCustomEmpty(name?: string): boolean;
-    /**
-     *
-     * @param object \{priority, errCancel} => priority of function (highest order first), throw error if already running a function.
-     * @param func any custom function.
-     * @param args the arguments of passed in function.
-     * @returns Error if errCancel and already executing, otherwise result of function.
-     */
-    customPriority<K extends (...args: any) => any>({ priority, group, returnIfRunning, errCancel }: CustomPriorityOptions, func: K, ...args: Parameters<K>): number | Promise<ReturnType<K> | Error>;
-    builtInsPriority<K extends (...args: any) => any>({ group, priority, returnIfRunning, errCancel }: BuiltInPriorityOptions, func: K, ...args: Parameters<K>): number | Promise<ReturnType<K> | Error>;
 }

package/lib/utilFunctions.js

@@ -1,13 +1,4 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UtilFunctions = void 0;
 const entityFunctions_1 = require("./entityFunctions");
@@ -19,6 +10,21 @@ const predictiveFunctions_1 = require("./predictiveFunctions");
 const mathUtil_1 = require("./mathUtil");
 const WorldFunctions_1 = require("./WorldFunctions");
 const rayTracingFunctions_1 = require("./rayTracingFunctions");
+/**
+ * I don't believe I need any locks, as I'm only going to have one instance of this per bot.
+ * This is added to bot context so multiple instances will exist in memory.
+ * Therefore, I don't need this. https://www.npmjs.com/package/async-lock
+ */
+/**
+ * I may add listeners to this class, as halting until an item is equipped may be good.
+ */
+/**
+ * I can't inherit from multiple classes. This language sucks.
+ * I'm not using mixins. Fuck you, fuck that.
+ * I'm just going to segregate these functions into separate categories
+ * because once again, fuck you.
+ *
+ */
 class UtilFunctions {
     constructor(bot) {
         this.bot = bot;
@@ -31,110 +37,6 @@ class UtilFunctions {
         this.world = new WorldFunctions_1.WorldFunctions(bot);
         this.raytrace = new rayTracingFunctions_1.RayTraceFunctions(bot);
         this.math = new mathUtil_1.MathFunctions();
-        this.builtInsPriorityStore = {};
-        this.customPriorityStore = {};
-        this.builtInCurrentExecuting = {};
-        this.customCurrentExecuting = {};
-    }
-    isBuiltInsEmpty(name) {
-        var _a;
-        if (name) {
-            return !((_a = this.builtInsPriorityStore[name]) === null || _a === void 0 ? void 0 : _a.length) || !this.builtInCurrentExecuting[name];
-        }
-        else {
-            return !Object.values(this.builtInsPriorityStore).length || !Object.values(this.builtInCurrentExecuting).length;
-        }
-    }
-    isCustomEmpty(name) {
-        var _a;
-        if (name) {
-            return !((_a = this.customPriorityStore[name]) === null || _a === void 0 ? void 0 : _a.length) && !this.customCurrentExecuting[name];
-        }
-        else {
-            return !Object.values(this.customPriorityStore).length && !Object.values(this.customCurrentExecuting).length;
-        }
-    }
-    /**
-     *
-     * @param object \{priority, errCancel} => priority of function (highest order first), throw error if already running a function.
-     * @param func any custom function.
-     * @param args the arguments of passed in function.
-     * @returns Error if errCancel and already executing, otherwise result of function.
-     */
-    customPriority({ priority, group, returnIfRunning, errCancel }, func, ...args) {
-        var _a, _b;
-        var _c;
-        const name = (_a = group !== null && group !== void 0 ? group : func.name) !== null && _a !== void 0 ? _a : "anonymous";
-        const actionQueue = ((_b = (_c = this.customPriorityStore)[name]) !== null && _b !== void 0 ? _b : (_c[name] = []));
-        // console.log("custom", group ?? func.name ?? "anonymous", actionQueue, this.isCustomEmpty(name))
-        if (errCancel && actionQueue.length > 1)
-            throw "already executing";
-        if (returnIfRunning && !this.isCustomEmpty(name))
-            return 1;
-        // console.log("running.")
-        return new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
-            var _d, _e;
-            const currentlyExecuting = actionQueue.shift();
-            if (currentlyExecuting)
-                this.customCurrentExecuting[(_d = group !== null && group !== void 0 ? group : currentlyExecuting[1].name) !== null && _d !== void 0 ? _d : "anonymous"] = currentlyExecuting;
-            const index = actionQueue.findIndex(([prio]) => priority > prio);
-            actionQueue.splice(index === -1 ? actionQueue.length : index, 0, [
-                priority,
-                () => __awaiter(this, void 0, void 0, function* () {
-                    var _f;
-                    try {
-                        res(yield func(...args));
-                    }
-                    catch (e) {
-                        rej(e);
-                    }
-                    actionQueue.shift();
-                    yield ((_f = actionQueue[0]) === null || _f === void 0 ? void 0 : _f[1]());
-                }),
-            ]);
-            if (currentlyExecuting) {
-                actionQueue.unshift(currentlyExecuting);
-                this.customCurrentExecuting[(_e = group !== null && group !== void 0 ? group : currentlyExecuting[1].name) !== null && _e !== void 0 ? _e : "anonymous"] = undefined;
-            }
-            else
-                yield actionQueue[0][1]();
-        }));
-    }
-    builtInsPriority({ group, priority, returnIfRunning, errCancel }, func, ...args) {
-        var _a;
-        var _b;
-        const actionQueue = ((_a = (_b = this.builtInsPriorityStore)[group]) !== null && _a !== void 0 ? _a : (_b[group] = []));
-        // console.log("builtin", group, actionQueue)
-        if (errCancel && !this.isBuiltInsEmpty(group))
-            throw "already executing";
-        if (returnIfRunning && !this.isBuiltInsEmpty(group))
-            return 1;
-        return new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
-            const currentlyExecuting = actionQueue.shift();
-            if (currentlyExecuting)
-                this.customCurrentExecuting[group] = currentlyExecuting;
-            const index = actionQueue.findIndex(([prio]) => priority > prio);
-            actionQueue.splice(index === -1 ? actionQueue.length : index, 0, [
-                priority,
-                () => __awaiter(this, void 0, void 0, function* () {
-                    var _c;
-                    try {
-                        res(yield func.bind(this.bot)(...args));
-                    }
-                    catch (e) {
-                        rej(e);
-                    }
-                    actionQueue.shift();
-                    yield ((_c = actionQueue[0]) === null || _c === void 0 ? void 0 : _c[1]());
-                }),
-            ]);
-            if (currentlyExecuting) {
-                actionQueue.unshift(currentlyExecuting);
-                this.builtInCurrentExecuting[group] = undefined;
-            }
-            else
-                yield actionQueue[0][1]();
-        }));
     }
 }
 exports.UtilFunctions = UtilFunctions;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nxg-org/mineflayer-util-plugin",
-    "version": "1.5.0",
+    "version": "1.5.1",
     "description": "mineflayer utils for NextGEN mineflayer plugins.",
     "keywords": [
         "mineflayer",
@@ -20,16 +20,12 @@
         "test": "node --trace-warnings lib/example.js"
     },
     "dependencies": {
-        "minecraft-data": "^2.113.0",
-        "mineflayer": "^4.0.0",
-        "mineflayer-pathfinder": "^1.9.1",
-        "prismarine-block": "^1.13.1",
-        "prismarine-entity": "^2.0.0",
-        "prismarine-item": "^1.11.2",
+        "mineflayer-pathfinder": "^2.3.3",
         "vec3": "^0.1.7"
     },
     "devDependencies": {
         "@types/node": "^17.0.4",
+        "mineflayer": "^4.4.0",
         "typescript": "^4.5.2"
     }
 }

package/lib/customImplementations/inventory.d.ts

@@ -1,10 +0,0 @@
-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

@@ -1,95 +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 };
-};
-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;