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

package/lib/calcs/aabb.d.ts

@@ -28,8 +28,12 @@ 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): {
+        x: number;
+        z: number;
+    } | null;
     intersectsRay(origin: Vec3, direction: Vec3): Vec3 | null;
-    distanceFromRay(origin: Vec3, direction: Vec3): number;
+    distanceFromRay(origin: Vec3, direction: Vec3, xz?: boolean): number;
     equals(other: AABB): boolean;
     distanceTo(pos: Vec3, heightOffset?: number): number;
 }

package/lib/calcs/aabb.js

@@ -125,24 +125,24 @@ class AABB {
             this.minZ < other.maxZ &&
             this.maxZ > other.minZ);
     }
+    xzIntersectsRay(origin, direction) {
+        const d = this.distanceFromRay(origin, direction);
+        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);
-        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);
-        }
+        return d === Infinity ? null : new vec3_1.Vec3(origin.x + direction.x * d, origin.y + direction.y * d, origin.z + direction.z * d);
     }
-    distanceFromRay(origin, direction) {
+    distanceFromRay(origin, direction, xz = false) {
         const ro = origin.toArray();
         const rd = direction.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 +150,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)

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.1",
     "description": "mineflayer utils for NextGEN mineflayer plugins.",
     "keywords": [
         "mineflayer",