@nxg-org/mineflayer-util-plugin 1.3.7 → 1.3.11

package/lib/calcs/intercept.d.ts

@@ -1,25 +1,20 @@
 import { Bot } from "mineflayer";
 import { Block } from "prismarine-block";
 import { Vec3 } from "vec3";
+declare type Iteration = {
+    x: number;
+    y: number;
+    z: number;
+    face: number;
+};
+declare type BlockAndIterations = {
+    block: Block | null;
+    iterations: Iteration[];
+};
 export declare class InterceptFunctions {
-    bot: Bot;
+    private bot;
     constructor(bot: Bot);
-    check(from: Vec3, to: Vec3): {
-        block: Block | null;
-        iterations: {
-            x: number;
-            y: number;
-            z: number;
-            face: number;
-        }[];
-    };
-    raycast(from: Vec3, direction: Vec3, range: number): {
-        block: Block | null;
-        iterations: {
-            x: number;
-            y: number;
-            z: number;
-            face: number;
-        }[];
-    };
+    check(from: Vec3, to: Vec3): BlockAndIterations;
+    raycast(from: Vec3, direction: Vec3, range: number): BlockAndIterations;
 }
+export {};

package/lib/index.js

@@ -2,7 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InterceptFunctions = exports.AABB = void 0;
 const utilFunctions_1 = require("./utilFunctions");
+const mineflayer_pathfinder_1 = require("mineflayer-pathfinder");
 function inject(bot) {
+    if (!bot.pathfinder)
+        bot.loadPlugin(mineflayer_pathfinder_1.pathfinder);
     bot.util = new utilFunctions_1.UtilFunctions(bot);
 }
 exports.default = inject;

package/lib/inventoryFunctions.js

@@ -90,18 +90,17 @@ class InventoryFunctions {
     }
     findItemByID(itemId, metadata) {
         var _a, _b;
-        const potentialMatches = this.getAllItems().filter((item) => item.type === itemId);
         if (metadata)
-            return (_a = potentialMatches.find((item) => item.metadata === metadata)) !== null && _a !== void 0 ? _a : null;
-        return (_b = potentialMatches[0]) !== null && _b !== void 0 ? _b : null;
+            return (_a = this.getAllItems().find((item) => item.type === itemId && item.metadata === metadata)) !== null && _a !== void 0 ? _a : null;
+        else
+            return (_b = this.getAllItems().find((item) => item.type === itemId)) !== null && _b !== void 0 ? _b : null;
     }
     findItem(name, metadata) {
         var _a, _b;
-        //[...this.getAllItems(), this.bot.inventory.selectedItem!]
-        const potentialMatches = this.getAllItems().filter((item) => item === null || item === void 0 ? void 0 : item.name.includes(name));
         if (metadata)
-            return (_a = potentialMatches.find((item) => item.metadata === metadata)) !== null && _a !== void 0 ? _a : null;
-        return (_b = potentialMatches[0]) !== null && _b !== void 0 ? _b : null;
+            return (_a = this.getAllItems().find((item) => item.name === name && item.metadata === metadata)) !== null && _a !== void 0 ? _a : null;
+        else
+            return (_b = this.getAllItems().find((item) => item.name === name)) !== null && _b !== void 0 ? _b : null;
     }
     //alias.
     has(name, metadata) {

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", notchianYawAndPitch);
         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.lookAt(pos, true);
-            }
+        this.bot._client.write("look", nyp);
+        if (update) {
+            this.bot.entity.yaw = yaw;
+            this.bot.entity.pitch = pitch;
+            // this.bot.look(yaw, pitch, true);
         }
     }
     lazyTeleport(endPos) { }

package/lib/predictiveFunctions.js

@@ -91,15 +91,21 @@ const AIR_BLOCK = { type: 0 };
 class PredictiveFunctions {
     constructor(bot) {
         this.bot = bot;
-        this.damageMultiplier = 7; // for 1.12+ 8 for 1.8 TODO check when the change occur (likely 1.9)
         this.resistanceIndex = "11";
-        if (require('minecraft-data')(bot.version).isNewerOrEqualTo("1.16")) {
+        const version = Number(bot.version.split(".")[1]);
+        if (version === 16) {
             this.armorToughnessKey = "generic.armorToughness";
             this.armorProtectionKey = "generic.armor";
         }
         else {
-            this.armorToughnessKey = "generic.armorToughness";
-            this.armorProtectionKey = "generic.armor";
+            this.armorToughnessKey = "minecraft:generic.armor_toughness";
+            this.armorProtectionKey = "minecraft:generic.armor";
+        }
+        if (version > 9) {
+            this.damageMultiplier = 8;
+        }
+        else {
+            this.damageMultiplier = 7;
         }
         const effects = (0, minecraft_data_1.default)(bot.version).effects;
         for (const effectId in effects) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nxg-org/mineflayer-util-plugin",
-    "version": "1.3.7",
+    "version": "1.3.11",
     "description": "mineflayer utils for NextGEN mineflayer plugins.",
     "keywords": [
         "mineflayer",
@@ -28,7 +28,7 @@
         "vec3": "^0.1.7"
     },
     "devDependencies": {
-        "@types/node": "^16.11.11",
+        "@types/node": "^17.0.4",
         "typescript": "^4.5.2"
     }
 }