@nxg-org/mineflayer-util-plugin 1.0.0 → 1.2.0

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 oldMetadata = entity.metadata;
+        const newMetadata = this.parseMetadata(packetMetadata, oldMetadata);
+        return this.getHealthFromMetadata(newMetadata) - this.getHealthFromMetadata(oldMetadata);
+    }
     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(metadata, entityMetadata = {}) {
+        if (metadata !== undefined) {
+            for (const { key, value } of metadata) {
+                entityMetadata[key] = value;
+            }
+        }
+        return entityMetadata;
+    }
 }
 exports.EntityFunctions = EntityFunctions;

package/lib/index.d.ts

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

package/lib/index.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.AABB = void 0;
 const utilFunctions_1 = require("./utilFunctions");
 function inject(bot) {
     bot.util = new utilFunctions_1.UtilFunctions(bot);
 }
 exports.default = inject;
+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 = {};