@nxg-org/mineflayer-util-plugin 1.3.0 → 1.3.5

package/lib/calcs/aabb.d.ts

@@ -19,6 +19,7 @@ export declare class AABB {
         0: Vec3;
         1: Vec3;
     };
+    toVertices(): Vec3[];
     floor(): void;
     extend(dx: number, dy: number, dz: number): this;
     contract(x: number, y: number, z: number): this;
@@ -28,9 +29,19 @@ export declare class AABB {
     computeOffsetY(other: AABB, offsetY: number): number;
     computeOffsetZ(other: AABB, offsetZ: number): number;
     intersects(other: AABB): boolean;
-    intersectsRay(origin: Vec3, direction: Vec3): Vec3 | null;
-    distanceFromRay(origin: Vec3, direction: Vec3): number;
+    xzIntersectsRay(org: Vec3, dir: Vec3): {
+        x: number;
+        z: number;
+    } | 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

@@ -34,6 +34,18 @@ class AABB {
     toVecs() {
         return { 0: new vec3_1.Vec3(this.minX, this.minY, this.minZ), 1: new vec3_1.Vec3(this.maxX, this.maxY, this.maxZ) };
     }
+    toVertices() {
+        return [
+            new vec3_1.Vec3(this.minX, this.minY, this.minZ),
+            new vec3_1.Vec3(this.minX, this.minY, this.maxZ),
+            new vec3_1.Vec3(this.minX, this.maxY, this.minZ),
+            new vec3_1.Vec3(this.minX, this.maxY, this.maxZ),
+            new vec3_1.Vec3(this.maxX, this.minY, this.minZ),
+            new vec3_1.Vec3(this.maxX, this.minY, this.maxZ),
+            new vec3_1.Vec3(this.maxX, this.maxY, this.minZ),
+            new vec3_1.Vec3(this.maxX, this.maxY, this.maxZ),
+        ];
+    }
     floor() {
         this.minX = Math.floor(this.minX);
         this.minY = Math.floor(this.minY);
@@ -125,24 +137,36 @@ class AABB {
             this.minZ < other.maxZ &&
             this.maxZ > other.minZ);
     }
-    intersectsRay(origin, direction) {
-        const d = this.distanceFromRay(origin, direction);
-        if (d === Infinity) {
-            return null;
-        }
-        else {
-            return 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 };
     }
-    distanceFromRay(origin, direction) {
+    //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;
         let lo = -Infinity;
         let hi = +Infinity;
         // let test = origin.clone()
-        for (let i = 0; i < dims; i++) {
+        for (let i = 0; i < dims; i += dif) {
             let dimLo = (aabb[0][i] - ro[i]) / rd[i];
             let dimHi = (aabb[1][i] - ro[i]) / rd[i];
             if (dimLo > dimHi) {
@@ -150,21 +174,7 @@ class AABB {
                 dimLo = dimHi;
                 dimHi = tmp;
             }
-            // let num;
-            // switch (i) {
-            //     case 0:
-            //         num = "x"
-            //         break;
-            //     case 1:
-            //         num = "y"
-            //         break;
-            //     case 2:
-            //         num = "z"
-            //         break;
-            // }
-            // console.log(num, aabb[0][i], aabb[1][i], ro[i], "highest overall:", lo, hi )
             if (dimHi < lo || dimLo > hi) {
-                console.log("fuck", dimHi < lo, dimLo > hi);
                 return Infinity;
             }
             if (dimLo > lo)
@@ -182,6 +192,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/lib/rayTracingFunctions.js

@@ -33,7 +33,7 @@ class RayTraceFunctions {
         let targetDist = maxDistance;
         for (let i = 0; i < entities.length; i++) {
             const e = entities[i];
-            const w = e.height === 1.62 ? 0.3 : e.height / 2;
+            const w = e.height >= 1.62 && e.height <= 1.99 || e.height === 2.9 ? 0.3 : e.height / 2;
             const shapes = [[-w, 0, -w, w, e.height + (e.height === 1.62 ? 0.18 : 0), w]];
             const intersect = iterator.intersect(shapes, e.position);
             if (intersect) {

package/package.json

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