@nxg-org/mineflayer-util-plugin 1.3.2 → 1.3.3

package/lib/calcs/aabb.d.ts

@@ -28,13 +28,19 @@ export declare class AABB {
     computeOffsetY(other: AABB, offsetY: number): number;
     computeOffsetZ(other: AABB, offsetZ: number): number;
     intersects(other: AABB): boolean;
-    xzIntersectsRay(origin: Vec3, direction: Vec3): {
+    xzIntersectsRay(org: Vec3, dir: Vec3): {
         x: number;
         z: number;
     } | null;
-    intersectsRay(origin: Vec3, direction: Vec3): Vec3 | null;
+    intersectsRay(org: Vec3, dir: Vec3): Vec3 | null;
+    xzIntersectsSegment(org: Vec3, dest: Vec3): {
+        x: number;
+        z: number;
+    } | null;
+    intersectsSegment(org: Vec3, dest: Vec3): Vec3 | null;
     distanceFromRay(origin: Vec3, direction: Vec3, xz?: boolean): number;
     equals(other: AABB): boolean;
+    xzDistanceTo(pos: Vec3, heightOffset?: number): number;
     distanceTo(pos: Vec3, heightOffset?: number): number;
 }
 export default AABB;

package/lib/calcs/aabb.js

@@ -125,17 +125,29 @@ class AABB {
             this.minZ < other.maxZ &&
             this.maxZ > other.minZ);
     }
-    xzIntersectsRay(origin, direction) {
-        const d = this.distanceFromRay(origin, direction, true);
-        return d === Infinity ? null : { x: origin.x + direction.x * d, z: origin.z + direction.z * d };
-    }
-    intersectsRay(origin, direction) {
-        const d = this.distanceFromRay(origin, direction);
-        return d === Infinity ? null : new vec3_1.Vec3(origin.x + direction.x * d, origin.y + direction.y * d, origin.z + direction.z * d);
+    xzIntersectsRay(org, dir) {
+        const d = this.distanceFromRay(org, dir, true);
+        return d === Infinity ? null : { x: org.x + dir.x * d, z: org.z + dir.z * d };
+    }
+    intersectsRay(org, dir) {
+        const d = this.distanceFromRay(org, dir);
+        return d === Infinity ? null : new vec3_1.Vec3(org.x + dir.x * d, org.y + dir.y * d, org.z + dir.z * d);
+    }
+    //TODO: Better check for hit reg of PLANES.
+    xzIntersectsSegment(org, dest) {
+        const dir = dest.clone().subtract(org).normalize();
+        const d = this.distanceFromRay(org, dir, true);
+        return d > dest.distanceTo(org) || d < 0 ? null : { x: org.x + dir.x * d, z: org.z + dir.z * d };
+    }
+    //TODO: Better check for hit reg of PLANES.
+    intersectsSegment(org, dest) {
+        const dir = dest.clone().subtract(org).normalize();
+        const d = this.distanceFromRay(org, dir);
+        return d > dest.distanceTo(org) || d < 0 ? null : new vec3_1.Vec3(org.x + dir.x * d, org.y + dir.y * d, org.z + dir.z * d);
     }
     distanceFromRay(origin, direction, xz = false) {
         const ro = origin.toArray();
-        const rd = direction.normalize().toArray();
+        const rd = direction.clone().normalize().toArray();
         const aabb = this.toMinAndMaxArrays();
         const dims = ro.length; // will change later.
         const dif = xz ? 2 : 1;
@@ -168,6 +180,12 @@ class AABB {
             this.maxY === other.maxY &&
             this.maxZ === other.maxZ);
     }
+    xzDistanceTo(pos, heightOffset = 0) {
+        const { x, y, z } = pos.offset(0, heightOffset, 0);
+        let dx = Math.max(this.minX - x, 0, x - this.maxX);
+        let dz = Math.max(this.minZ - z, 0, z - this.maxZ);
+        return Math.sqrt(dx * dx + dz * dz);
+    }
     distanceTo(pos, heightOffset = 0) {
         const { x, y, z } = pos.offset(0, heightOffset, 0);
         let dx = Math.max(this.minX - x, 0, x - this.maxX);

package/package.json

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