@nxg-org/mineflayer-util-plugin 1.3.9 → 1.3.10

package/lib/movementFunctions.d.ts

@@ -1,13 +1,13 @@
 import type { Bot } from "mineflayer";
 import type { Entity } from "prismarine-entity";
 import type { Vec3 } from "vec3";
-import { goals } from "mineflayer-pathfinder";
+import { goals, Movements } from "mineflayer-pathfinder";
 export declare class MovementFunctions {
-    bot: Bot;
+    private bot;
     goalArray: goals.GoalCompositeAll;
-    lastYaw: number;
-    lastPitch: number;
     constructor(bot: Bot);
+    set movements(movements: Movements);
+    get movements(): Movements;
     /**
      * Fuckin' mineflayer-pathfinder still doesn't have typings.
      * Pain in my goddamn ass.
@@ -38,6 +38,6 @@ export declare class MovementFunctions {
      */
     followEntityWithRespectRange(entity: Entity, followDistance: number, invertDistance?: number): boolean;
     forceLook(yaw: number, pitch: number, update?: boolean): void;
-    forceLookAt(pos: Vec3, update?: boolean, trueForce?: boolean): void;
+    forceLookAt(pos: Vec3, update?: boolean): void;
     lazyTeleport(endPos: Vec3): void;
 }

package/lib/movementFunctions.js

@@ -1,14 +1,23 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MovementFunctions = void 0;
 const mineflayer_pathfinder_1 = require("mineflayer-pathfinder");
+const minecraft_data_1 = __importDefault(require("minecraft-data"));
 const { GoalCompositeAll, GoalInvert, GoalFollow } = mineflayer_pathfinder_1.goals;
 class MovementFunctions {
     constructor(bot) {
         this.bot = bot;
         this.goalArray = new GoalCompositeAll();
-        this.lastYaw = 0;
-        this.lastPitch = 0;
+        this.movements = new mineflayer_pathfinder_1.Movements(bot, (0, minecraft_data_1.default)(bot.version));
+    }
+    set movements(movements) {
+        this.bot.pathfinder.setMovements(movements);
+    }
+    get movements() {
+        return this.movements;
     }
     /**
      * Fuckin' mineflayer-pathfinder still doesn't have typings.
@@ -85,23 +94,21 @@ class MovementFunctions {
     }
     forceLook(yaw, pitch, update = false) {
         const notchianYawAndPitch = { yaw: this.bot.util.math.toNotchianYaw(yaw), pitch: this.bot.util.math.toNotchianPitch(pitch) };
-        this.bot._client.write("look", Object.assign(Object.assign({}, notchianYawAndPitch), { onGround: false }));
+        this.bot._client.write("look", Object.assign(Object.assign({}, notchianYawAndPitch), { onGround: this.bot.entity.onGround }));
         if (update) {
-            // this.bot.entity.yaw = yaw;
-            // this.bot.entity.pitch = pitch
-            this.bot.look(yaw, pitch, true);
+            this.bot.entity.yaw = yaw;
+            this.bot.entity.pitch = pitch;
+            // this.bot.look(yaw, pitch, true);
         }
     }
-    forceLookAt(pos, update = false, trueForce = false) {
+    forceLookAt(pos, update = false) {
         const { yaw, pitch } = this.bot.util.math.pointToYawAndPitch(this.bot, pos);
         const nyp = { yaw: this.bot.util.math.toNotchianYaw(yaw), pitch: this.bot.util.math.toNotchianPitch(pitch) };
-        if (nyp.yaw !== this.lastYaw || nyp.pitch !== this.lastPitch || trueForce) {
-            this.bot._client.write("look", Object.assign(Object.assign({}, nyp), { onGround: false }));
-            if (update) {
-                // this.bot.entity.yaw = yaw;
-                // this.bot.entity.pitch = pitch
-                this.bot.look(yaw, pitch, true);
-            }
+        this.bot._client.write("look", Object.assign(Object.assign({}, nyp), { onGround: this.bot.entity.onGround }));
+        if (update) {
+            this.bot.entity.yaw = yaw;
+            this.bot.entity.pitch = pitch;
+            // this.bot.look(yaw, pitch, true);
         }
     }
     lazyTeleport(endPos) { }

package/package.json

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