@nxg-org/mineflayer-util-plugin 1.2.2 → 1.2.6

package/lib/entityFunctions.d.ts

@@ -23,9 +23,21 @@ export declare class EntityFunctions {
     /**
      * TODO: Version specific right now. Generalize. Unknown method.
      * @param metadata metadata from Prismarine-Entity Entity.
-     * @returns
+     * @returns number
      */
     getHealth(entity?: Entity): number;
+    /**
+     *
+     * @param metadata Must be FULL metadata object.
+     * @returns number
+     */
+    getHealthFromMetadata(metadata: object[]): number;
+    /**
+     * TODO: Version specific right now. Generalize. Unknown method.
+     * @param metadata metadata from Prismarine-Entity Entity.
+     * @returns
+     */
+    getHealthChange(packetMetadata: any, entity: Entity): number;
     getDistanceToEntity(entity: Entity): number;
     getDistanceBetweenEntities(first: Entity, second: Entity): number;
     getEntityAABB(entity: {
@@ -33,4 +45,5 @@ export declare class EntityFunctions {
         height: number;
         width?: number;
     }): AABB;
+    private parseMetadata;
 }

package/lib/entityFunctions.js

@@ -45,15 +45,13 @@ class EntityFunctions {
     /**
      * TODO: Version specific right now. Generalize. Unknown method.
      * @param metadata metadata from Prismarine-Entity Entity.
-     * @returns
+     * @returns number
      */
     getHealth(entity) {
         var _a, _b;
-        entity = entity !== null && entity !== void 0 ? entity : this.bot.entity;
-        let metadata = entity.metadata;
-        //console.log(entity.metadata, this.healthSlot, this.bot.entity.health)
-        let healthSlot = this.healthSlot; //metadata[this.healthSlot] ? this.healthSlot : metadata.findIndex((met) => Number(met) > 1 && Number(met) <= 20);
-        // return Number(metadata[healthSlot]) + (Number(metadata[healthSlot + 4]) ?? 0);
+        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]);
         if (!health || health === 0)
             health = entity === this.bot.entity ? (_a = this.bot.entity.health) !== null && _a !== void 0 ? _a : 0 : 0;
@@ -62,6 +60,25 @@ class EntityFunctions {
         // console.log(health + (Number(metadata[this.healthSlot + 4]) ?? 0))
         return health + ((_b = Number(metadata[this.healthSlot + 4])) !== null && _b !== void 0 ? _b : 0);
     }
+    /**
+     *
+     * @param metadata Must be FULL metadata object.
+     * @returns number
+     */
+    getHealthFromMetadata(metadata) {
+        var _a;
+        return (_a = (Number(metadata[this.healthSlot]) + Number(metadata[this.healthSlot + 4]))) !== null && _a !== void 0 ? _a : undefined;
+    }
+    /**
+     * TODO: Version specific right now. Generalize. Unknown method.
+     * @param metadata metadata from Prismarine-Entity Entity.
+     * @returns
+     */
+    getHealthChange(packetMetadata, entity) {
+        const oldHealth = this.getHealthFromMetadata(entity.metadata);
+        const newHealth = this.getHealthFromMetadata(this.parseMetadata(packetMetadata, entity.metadata));
+        return -(oldHealth - newHealth);
+    }
     getDistanceToEntity(entity) {
         return this.getDistanceBetweenEntities(this.bot.entity, entity);
     }
@@ -74,5 +91,14 @@ class EntityFunctions {
         const { x, y, z } = entity.position;
         return new aabb_1.AABB(-w, 0, -w, w, entity.height, w).offset(x, y, z);
     }
+    //Stolen from mineflayer.
+    parseMetadata(packetMetadata, entityMetadata = {}) {
+        if (packetMetadata !== undefined) {
+            for (const { key, value } of packetMetadata) {
+                entityMetadata[key] = value;
+            }
+        }
+        return entityMetadata;
+    }
 }
 exports.EntityFunctions = EntityFunctions;

package/lib/index.d.ts

@@ -25,5 +25,4 @@ declare module "prismarine-entity" {
     }
 }
 export default function inject(bot: Bot): void;
-export { CommonSense } from "./commonSense";
 export { AABB } from "./calcs/aabb";

package/lib/index.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AABB = exports.CommonSense = void 0;
+exports.AABB = void 0;
 const utilFunctions_1 = require("./utilFunctions");
 function inject(bot) {
     bot.util = new utilFunctions_1.UtilFunctions(bot);
 }
 exports.default = inject;
-var commonSense_1 = require("./commonSense");
-Object.defineProperty(exports, "CommonSense", { enumerable: true, get: function () { return commonSense_1.CommonSense; } });
 var aabb_1 = require("./calcs/aabb");
 Object.defineProperty(exports, "AABB", { enumerable: true, get: function () { return aabb_1.AABB; } });

package/lib/utilFunctions.d.ts

@@ -6,7 +6,6 @@ import { InventoryFunctions } from "./inventoryFunctions";
 import { MovementFunctions } from "./movementFunctions";
 import { PredictiveFunctions } from "./predictiveFunctions";
 import { MathFunctions } from "./mathUtil";
-import { CommonSense } from "./commonSense";
 import { WorldFunctions } from "./WorldFunctions";
 export declare type BuiltInPriorityOptions = {
     group: PrioGroups;
@@ -28,7 +27,6 @@ export declare class UtilFunctions {
     predict: PredictiveFunctions;
     filters: FilterFunctions;
     math: MathFunctions;
-    commonSense: CommonSense;
     world: WorldFunctions;
     private builtInsPriorityStore;
     private customPriorityStore;

package/lib/utilFunctions.js

@@ -17,7 +17,6 @@ const movementFunctions_1 = require("./movementFunctions");
 const util_1 = require("util");
 const predictiveFunctions_1 = require("./predictiveFunctions");
 const mathUtil_1 = require("./mathUtil");
-const commonSense_1 = require("./commonSense");
 const WorldFunctions_1 = require("./WorldFunctions");
 class UtilFunctions {
     constructor(bot) {
@@ -28,7 +27,6 @@ class UtilFunctions {
         this.entity = new entityFunctions_1.EntityFunctions(bot);
         this.predict = new predictiveFunctions_1.PredictiveFunctions(bot);
         this.filters = new filterFunctions_1.FilterFunctions(bot);
-        this.commonSense = new commonSense_1.CommonSense(bot);
         this.world = new WorldFunctions_1.WorldFunctions(bot);
         this.math = new mathUtil_1.MathFunctions();
         this.builtInsPriorityStore = {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nxg-org/mineflayer-util-plugin",
-    "version": "1.2.2",
+    "version": "1.2.6",
     "description": "mineflayer utils for NextGEN mineflayer plugins.",
     "keywords": [
         "mineflayer",
@@ -19,7 +19,6 @@
         "prepublish": "npm run build"
     },
     "dependencies": {
-        "@nxg-org/mineflayer-util-plugin": "^1.0.1",
         "minecraft-data": "^2.97.0",
         "mineflayer": "^3.11.2",
         "mineflayer-pathfinder": "^1.8.0",

package/lib/commonSense.d.ts

@@ -1,22 +0,0 @@
-import type { Bot } from "mineflayer";
-import type { Block } from "prismarine-block";
-export declare class CommonSense {
-    bot: Bot;
-    autoRespond: boolean;
-    isFalling: boolean;
-    isOnFire: boolean;
-    checkForFalling: boolean;
-    checkForFire: boolean;
-    useOffHand: boolean;
-    requipLastItem: boolean;
-    puttingOutFire: boolean;
-    MLGing: boolean;
-    constructor(bot: Bot);
-    onMetadataFireCheck(packet: any): Promise<void>;
-    onStatusFireCheck(packet: any): Promise<void>;
-    putOutFire(): Promise<boolean>;
-    pickUpWater(nearbyBlock?: Block | null, maxDistance?: number, immediate?: boolean): Promise<void>;
-    isFallingCheckEasy(): Promise<void>;
-    private findBlockForWaterPlacement;
-    waterBucket(): Promise<boolean>;
-}

package/lib/commonSense.js

@@ -1,220 +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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommonSense = void 0;
-const vec3_1 = require("vec3");
-const util_1 = require("util");
-const sleep = (0, util_1.promisify)(setTimeout);
-class CommonSense {
-    constructor(bot) {
-        this.bot = bot;
-        this.autoRespond = false;
-        this.isFalling = false;
-        this.isOnFire = false;
-        this.checkForFalling = true;
-        this.checkForFire = true;
-        this.useOffHand = true;
-        this.requipLastItem = false;
-        this.puttingOutFire = false;
-        this.MLGing = false;
-        this.bot.on("physicsTick", this.isFallingCheckEasy.bind(this));
-        this.bot._client.on("entity_metadata", this.onMetadataFireCheck.bind(this));
-        this.bot._client.on("entity_status", this.onStatusFireCheck.bind(this));
-        // this.bot.on("physicsTick", this.onPhysicsTickFireCheck.bind(this));
-        //TODO: Move this to bot movement.
-    }
-    // async onPhysicsTickFireCheck() {
-    //     if ((this.bot.entity.metadata[0] as any) === 1) {
-    //         this.isOnFire = true;
-    //         while (!this.bot.entity.onGround) await sleep(0);
-    //         if (!this.puttingOutFire && this.autoRespond) this.putOutFire();
-    //     } else {
-    //         this.isOnFire = false
-    //     }
-    // }
-    onMetadataFireCheck(packet) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.checkForFire)
-                return;
-            if (!packet.entityId)
-                return;
-            const entity = this.bot.entities[packet.entityId];
-            if (!entity || entity !== this.bot.entity)
-                return;
-            // if ((entity.metadata[0] as any).value !== 1) {
-            const wantedKey = packet.metadata.findIndex((md) => md.key === 0);
-            if (wantedKey === -1)
-                return;
-            if (((_a = packet.metadata[wantedKey]) === null || _a === void 0 ? void 0 : _a.value) !== 1) {
-                this.isOnFire = false;
-                return;
-            }
-            // }
-            this.isOnFire = true;
-            while (!this.bot.entity.onGround)
-                yield this.bot.waitForTicks(1);
-            if (!this.puttingOutFire && this.autoRespond)
-                this.putOutFire();
-        });
-    }
-    onStatusFireCheck(packet) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.checkForFire)
-                return;
-            if (!packet.entityId)
-                return;
-            const entity = this.bot.entities[packet.entityId];
-            if (!entity || entity !== this.bot.entity)
-                return;
-            if (!packet.entityStatus || packet.entityStatus !== 37) {
-                this.isOnFire = false;
-                return;
-            }
-            this.isOnFire = true;
-            while (!this.bot.entity.onGround)
-                yield sleep(0);
-            if (!this.puttingOutFire && this.autoRespond)
-                this.putOutFire();
-        });
-    }
-    putOutFire() {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.puttingOutFire)
-                return true;
-            this.puttingOutFire = true;
-            const water = this.bot.util.inv.getAllItemsExceptCurrent("off-hand").find((item) => item === null || item === void 0 ? void 0 : item.name.includes("water_bucket"));
-            const holdingItem = (_a = this.bot.util.inv.getHandWithItem(this.useOffHand)) === null || _a === void 0 ? void 0 : _a.name.includes("water_bucket");
-            if (!water && !holdingItem) {
-                this.puttingOutFire = false;
-                return false;
-            }
-            else if (!holdingItem && water)
-                yield this.bot.util.inv.customEquip(water, "off-hand");
-            if ((_b = this.bot.util.inv.getHandWithItem(this.useOffHand)) === null || _b === void 0 ? void 0 : _b.name.includes("water_bucket")) {
-                const nearbyBlock = this.bot.findBlock({ matching: (block) => (block === null || block === void 0 ? void 0 : block.name) === "fire", maxDistance: 2 });
-                if (nearbyBlock) {
-                    yield this.bot.dig(nearbyBlock, true);
-                    yield this.bot.util.move.forceLookAt(nearbyBlock.position.offset(0, -1, 0));
-                }
-                else {
-                    yield this.bot.util.move.forceLook(this.bot.entity.yaw, -90);
-                }
-                // while (!this.bot.entity.isCollidedVertically) await this.bot.waitForTicks(1);
-                this.bot.activateItem(this.useOffHand);
-                yield this.pickUpWater(nearbyBlock);
-                this.puttingOutFire = false;
-                return true;
-            }
-            else {
-                this.puttingOutFire = false;
-                return false;
-            }
-        });
-    }
-    pickUpWater(nearbyBlock = null, maxDistance = 2, immediate = false) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!immediate)
-                yield this.bot.waitForTicks(3);
-            const block = this.bot.findBlock({
-                point: (_a = nearbyBlock === null || nearbyBlock === void 0 ? void 0 : nearbyBlock.position) !== null && _a !== void 0 ? _a : this.bot.entity.position,
-                matching: (block) => (block.type === 8 || block.type === 9) && block.metadata === 0,
-                //@ts-expect-error
-                useExtraInfo: (block) => {
-                    return this.bot.util.world.getBlockAABB(block).distanceTo(this.bot.entity.position, 1.62) < 4;
-                },
-                maxDistance: maxDistance,
-            });
-            if (block) {
-                this.bot.util.move.forceLookAt(block.position.offset(0.5, 0.5, 0.5), true);
-                this.bot.activateItem(this.useOffHand);
-            }
-            else {
-                console.log("didn't get block. fuck.");
-            }
-        });
-    }
-    isFallingCheckEasy() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.checkForFalling)
-                return;
-            if (this.bot.entity.velocity.y >= -0.6) {
-                this.isFalling = false;
-                return;
-            }
-            this.isFalling = true;
-            if (!this.MLGing && this.autoRespond) {
-                yield this.waterBucket();
-            }
-        });
-    }
-    findBlockForWaterPlacement() {
-        const pos = this.bot.entity.position.offset(this.bot.entity.velocity.x, 0, this.bot.entity.velocity.z);
-        const aabb = this.bot.util.entity.getEntityAABB({
-            position: pos,
-            height: this.bot.entity.height,
-            width: 0.3,
-        });
-        const spacing = { x0: aabb.minX, z0: aabb.minZ, x1: aabb.maxX, z1: aabb.maxZ };
-        const floored = { x0: Math.floor(spacing.x0), z0: Math.floor(spacing.z0), x1: Math.floor(spacing.x1), z1: Math.floor(spacing.z1) };
-        let blocks = [];
-        const posY = this.bot.entity.position.clone().floored().y;
-        loop1: for (let i = floored.x0; i <= floored.x1; i++) {
-            loop2: for (let j = floored.z0; j <= floored.z1; j++) {
-                loop3: for (let k = posY; k > 0; k--) {
-                    const block = this.bot.blockAt(new vec3_1.Vec3(i, k, j));
-                    if (!!block && block.type !== 0) {
-                        blocks.push(block);
-                        break loop3;
-                    }
-                }
-            }
-        }
-        const maxY = Math.max(...blocks.map((b) => b.position.y));
-        blocks = blocks.filter((b) => b.position.y === maxY);
-        const block = blocks.sort((a, b) => this.bot.util.world.getBlockAABB(b).distanceTo(pos) - this.bot.util.world.getBlockAABB(a).distanceTo(pos))[0];
-        // console.log(block.position, this.bot.entity.position, this.bot.entity.position.distanceTo(block.position).toFixed(2));
-        return block;
-    }
-    waterBucket() {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.MLGing)
-                return true;
-            this.MLGing = true;
-            const water = this.bot.util.inv.getAllItemsExceptCurrent("off-hand").find((item) => item === null || item === void 0 ? void 0 : item.name.includes("water_bucket"));
-            const holdingItem = (_a = this.bot.util.inv.getHandWithItem(true)) === null || _a === void 0 ? void 0 : _a.name.includes("water_bucket");
-            if (!water && !holdingItem) {
-                this.MLGing = false;
-                return false;
-            }
-            else if (!holdingItem && water)
-                yield this.bot.util.inv.customEquip(water, "off-hand");
-            for (let i = 0; i < 120; i++) {
-                const landingBlock = this.findBlockForWaterPlacement();
-                if (landingBlock) {
-                    yield this.bot.util.move.forceLookAt(landingBlock.position.offset(0.5, 0.5, 0.5), true);
-                }
-                if (this.bot.entity.position.y <= ((_b = landingBlock === null || landingBlock === void 0 ? void 0 : landingBlock.position.y) !== null && _b !== void 0 ? _b : 0) + 3) {
-                    this.bot.activateItem(this.useOffHand);
-                    break;
-                }
-                yield this.bot.waitForTicks(1);
-            }
-            yield this.pickUpWater(null, 2);
-            this.MLGing = false;
-            return true;
-        });
-    }
-}
-exports.CommonSense = CommonSense;