@nxg-org/mineflayer-util-plugin 1.8.2 → 1.8.4

package/lib/calcs/aabb.d.ts

@@ -17,6 +17,7 @@ export declare class AABB {
     constructor(x0: number, y0: number, z0: number, x1: number, y1: number, z1: number);
     static fromVecs(min: FakeVec3, max: FakeVec3): AABB;
     static fromBlock(min: FakeVec3): AABB;
+    static fromBlockPos(min: FakeVec3): AABB;
     static fromShape(pts: AABBPoints, offset?: Vec3): AABB;
     set(x0: number, y0: number, z0: number, x1: number, y1: number, z1: number): void;
     clone(): AABB;
@@ -72,8 +73,9 @@ export declare class AABB {
     intersectsCoords(d: number, d2: number, d3: number, d4: number, d5: number, d6: number): boolean;
     collides(aABB: AABB): boolean;
     collidesCoords(d: number, d2: number, d3: number, d4: number, d5: number, d6: number): boolean;
+    contains(aABB: AABB): boolean;
     containsVec(vec: FakeVec3): boolean;
-    contains(x: number, y: number, z: number): boolean;
+    containsCoords(x: number, y: number, z: number): boolean;
     getCenter(): Vec3;
 }
 export default AABB;

package/lib/calcs/aabb.js

@@ -21,6 +21,9 @@ class AABB {
     static fromBlock(min) {
         return new AABB(min.x, min.y, min.z, min.x + 1.0, min.y + 1.0, min.z + 1.0);
     }
+    static fromBlockPos(min) {
+        return new AABB(Math.floor(min.x), Math.floor(min.y), Math.floor(min.z), Math.floor(min.x) + 1.0, Math.floor(min.y) + 1.0, Math.floor(min.z) + 1.0);
+    }
     static fromShape(pts, offset = emptyVec) {
         return new AABB(pts[0], pts[1], pts[2], pts[3], pts[4], pts[5]).translateVec(offset);
     }
@@ -308,17 +311,15 @@ class AABB {
         return this.collidesCoords(aABB.minX, aABB.minY, aABB.minZ, aABB.maxX, aABB.maxY, aABB.maxZ);
     }
     collidesCoords(d, d2, d3, d4, d5, d6) {
-        return (this.minX <= d4 && this.maxX >= d && this.minY <= d5 && this.maxY >= d2 && this.minZ <= d6 && this.maxZ >= d3);
+        return this.minX <= d4 && this.maxX >= d && this.minY <= d5 && this.maxY >= d2 && this.minZ <= d6 && this.maxZ >= d3;
+    }
+    contains(aABB) {
+        return this.containsCoords(aABB.minX, aABB.minY, aABB.minZ) && this.containsCoords(aABB.maxX, aABB.maxY, aABB.maxZ);
     }
     containsVec(vec) {
-        return (this.minX <= vec.x &&
-            this.maxX >= vec.x &&
-            this.minY <= vec.y &&
-            this.maxY >= vec.y &&
-            this.minZ <= vec.z &&
-            this.maxZ >= vec.z);
-    }
-    contains(x, y, z) {
+        return this.minX <= vec.x && this.maxX >= vec.x && this.minY <= vec.y && this.maxY >= vec.y && this.minZ <= vec.z && this.maxZ >= vec.z;
+    }
+    containsCoords(x, y, z) {
         return this.minX <= x && this.maxX >= x && this.minY <= y && this.maxY >= y && this.minZ <= z && this.maxZ >= z;
     }
     getCenter() {

package/lib/inventoryFunctions.d.ts

@@ -25,6 +25,7 @@ export declare class InventoryFunctions {
     get equippingMainHand(): boolean;
     set equippingOffHand(value: boolean);
     get equippingOffHand(): boolean;
+    get equipmentSlots(): EquipmentDestination[];
     getAllItems(): Item[];
     getAllItemsExceptCurrent(current: EquipmentDestination): Item[];
     getHandWithItem(offhand?: boolean): Item | null;

package/lib/inventoryFunctions.js

@@ -62,16 +62,23 @@ class InventoryFunctions {
     get equippingOffHand() {
         return this._equippingOffHand;
     }
+    get equipmentSlots() {
+        const ret = ["hand", "head", "torso", "legs", "feet"];
+        if (!this.bot.supportFeature('doesntHaveOffHandSlot')) {
+            ret.push("off-hand");
+        }
+        return ret;
+    }
     getAllItems() {
         return [
             ...this.bot.inventory.items(),
-            ...["hand", "head", "torso", "legs", "feet", "off-hand"].map((name) => this.bot.inventory.slots[this.bot.getEquipmentDestSlot(name)]),
+            ...this.equipmentSlots.map((name) => this.bot.inventory.slots[this.bot.getEquipmentDestSlot(name)]),
         ].filter((e) => !!e);
     }
     getAllItemsExceptCurrent(current) {
         return [
             ...this.bot.inventory.items(),
-            ...(["hand", "head", "torso", "legs", "feet", "off-hand"]
+            ...(this.equipmentSlots
                 .filter((name) => name !== current))
                 .map((name) => this.bot.inventory.slots[this.bot.getEquipmentDestSlot(name)]),
         ].filter((e) => !!e);

package/lib/static/aabbUtil.js

@@ -25,17 +25,17 @@ var AABBUtils;
     }
     AABBUtils.getEntityAABB = getEntityAABB;
     function getPlayerAABB(entity) {
-        const w = entity.width ? entity.width / 2 : 0.6;
-        return new aabb_1.AABB(-w, 0, -w, w, entity.height ? entity.height + 0.18 : 1.8, w).translateVec(entity.position);
+        const hw = entity.width ? entity.width / 2 : 0.3;
+        return new aabb_1.AABB(-hw, 0, -hw, hw, entity.height ? entity.height + 0.18 : 1.8, hw).translateVec(entity.position);
     }
     AABBUtils.getPlayerAABB = getPlayerAABB;
     function getPlayerAABBRaw(position, height = 1.8) {
-        return new aabb_1.AABB(-0.6, 0, -0.6, 0.6, height, 0.6).translateVec(position);
+        return new aabb_1.AABB(-0.3, 0, -0.3, 0.3, height, 0.3).translateVec(position);
     }
     AABBUtils.getPlayerAABBRaw = getPlayerAABBRaw;
     function getEntityAABBRaw(entity) {
-        const w = entity.width ? entity.width / 2 : entity.height / 2;
-        return new aabb_1.AABB(-w, 0, -w, w, entity.height, w).translateVec(entity.position);
+        const hw = entity.width ? entity.width / 2 : entity.height / 2;
+        return new aabb_1.AABB(-hw, 0, -hw, hw, entity.height, hw).translateVec(entity.position);
     }
     AABBUtils.getEntityAABBRaw = getEntityAABBRaw;
 })(AABBUtils = exports.AABBUtils || (exports.AABBUtils = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nxg-org/mineflayer-util-plugin",
-    "version": "1.8.2",
+    "version": "1.8.4",
     "description": "mineflayer utils for NextGEN mineflayer plugins.",
     "keywords": [
         "mineflayer",