@nxg-org/mineflayer-util-plugin 1.3.14 → 1.3.15

package/lib/entityFunctions.js

@@ -31,7 +31,7 @@ class EntityFunctions {
      * @returns boolean
      */
     isMainHandActive(entity) {
-        return (entity !== null && entity !== void 0 ? entity : this.bot.entity).metadata[6] === 1; //as any & (1 | 0)) === (1 | 0);
+        return (entity !== null && entity !== void 0 ? entity : this.bot.entity).metadata[6] === 2; //as any & (1 | 0)) === (1 | 0);
     }
     /**
      * TODO: Version specific right now. Generalize. Unknown method.
@@ -40,7 +40,7 @@ class EntityFunctions {
      * @returns boolean
      */
     isOffHandActive(entity) {
-        return (entity !== null && entity !== void 0 ? entity : this.bot.entity).metadata[6] === 1; //& (1 | 2)) === (1 | 2);
+        return (entity !== null && entity !== void 0 ? entity : this.bot.entity).metadata[6] === 3; //& (1 | 2)) === (1 | 2);
     }
     /**
      * TODO: Version specific right now. Generalize. Unknown method.
@@ -55,8 +55,6 @@ class EntityFunctions {
         let health = Number(metadata[healthSlot]);
         if (!health || health === 0)
             health = entity === this.bot.entity ? (_a = this.bot.entity.health) !== null && _a !== void 0 ? _a : 0 : 0;
-        if (health === 0)
-            console.log(this.healthSlot, entity.metadata);
         // console.log(health + (Number(metadata[this.healthSlot + 4]) ?? 0))
         return health + ((_b = Number(metadata[this.healthSlot + 4])) !== null && _b !== void 0 ? _b : 0);
     }
@@ -97,7 +95,7 @@ class EntityFunctions {
         }
     }
     getPlayerAABB(entity) {
-        return this.getEntityAABBRaw({ position: entity.position, height: 1.8, width: 0.3 });
+        return this.getEntityAABBRaw({ position: entity.position, height: 1.8, width: 0.6 });
     }
     getEntityAABBRaw(entity) {
         const w = entity.width ? entity.width / 2 : entity.height / 2;

package/lib/example.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/example.js

@@ -0,0 +1,97 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _a, _b;
+Object.defineProperty(exports, "__esModule", { value: true });
+const mineflayer_1 = require("mineflayer");
+const index_1 = __importDefault(require("./index"));
+const vec3_1 = require("vec3");
+let target;
+const bot = (0, mineflayer_1.createBot)({
+    username: "utilTesting",
+    host: (_a = process.argv[2]) !== null && _a !== void 0 ? _a : "localhost",
+    port: (_b = Number(process.argv[3])) !== null && _b !== void 0 ? _b : 25565,
+    version: "1.17.1",
+});
+bot.loadPlugin(index_1.default);
+const emptyVec = new vec3_1.Vec3(0, 0, 0);
+bot.on("chat", (username, message) => __awaiter(void 0, void 0, void 0, function* () {
+    var _c;
+    const split = message.split(" ");
+    switch (split[0]) {
+        case "look":
+            target = bot.nearestEntity((e) => { var _a; return ((_a = e.username) !== null && _a !== void 0 ? _a : e.name) === split[1]; });
+            if (!target)
+                return console.log("no entity");
+            bot.util.move.forceLookAt(target.position, true);
+            break;
+        case "equip":
+            const item = bot.util.inv.getAllItems().find((i) => i.name.includes(split[1]));
+            if (!item)
+                return console.log("no item");
+            if (["hand", "off-hand"].includes(split[2])) {
+                bot.util.inv.customEquip(item, split[2]);
+            }
+            break;
+        case "health":
+            const health = bot.util.entity.getHealth();
+            bot.chat(`${health}`);
+            break;
+        case "WhatAmILookingAt":
+            target = bot.nearestEntity((e) => { var _a; return ((_a = e.username) !== null && _a !== void 0 ? _a : e.name) === username; });
+            if (!target)
+                return console.log("no entity");
+            const player = bot.util.raytrace.entityAtEntityCursor(target, 256);
+            if (player) {
+                console.log(player);
+                bot.chat(`${(_c = player.username) !== null && _c !== void 0 ? _c : player.name} at ${player.position}`);
+            }
+            else {
+                const block = bot.util.raytrace.blockAtEntityCursor(target, 256); //includes face and intersect. That's very nice.
+                if (block) {
+                    console.log(block);
+                    bot.chat(`${block.name} at ${block.position}`);
+                }
+                else {
+                    bot.chat("You're not looking at anything.");
+                }
+            }
+            break;
+        case "come":
+            target = bot.nearestEntity((e) => { var _a; return ((_a = e.username) !== null && _a !== void 0 ? _a : e.name) === username; });
+            if (!target)
+                return console.log("no entity");
+            if (!bot.pathfinder)
+                bot.chat("pathfinder is not loaded!");
+            bot.util.move.followEntityWithRespectRange(target, 1);
+            break;
+        case "follow":
+            target = bot.nearestEntity((e) => { var _a; return ((_a = e.username) !== null && _a !== void 0 ? _a : e.name) === split[1]; });
+            if (!target)
+                return console.log("no entity");
+            if (!bot.pathfinder)
+                bot.chat("pathfinder is not loaded!");
+            bot.util.move.followEntityWithRespectRange(target, 1);
+            break;
+        case "stop":
+            if (!bot.pathfinder)
+                bot.chat("pathfinder is not loaded!");
+            bot.util.move.stop();
+            break;
+        default:
+            console.log(username, bot.entity.username);
+            if (username !== bot.entity.username)
+                bot.chat("unknown command: " + message);
+            break;
+    }
+}));

package/lib/movementFunctions.d.ts

@@ -37,7 +37,7 @@ export declare class MovementFunctions {
      * @returns have the goals changed
      */
     followEntityWithRespectRange(entity: Entity, followDistance: number, invertDistance?: number): boolean;
-    forceLook(yaw: number, pitch: number, onGround?: boolean, update?: boolean): void;
-    forceLookAt(pos: Vec3, onGround?: boolean, update?: boolean): void;
+    forceLook(yaw: number, pitch: number, update?: boolean, onGround?: boolean): void;
+    forceLookAt(pos: Vec3, update?: boolean, onGround?: boolean): void;
     lazyTeleport(endPos: Vec3): void;
 }

package/lib/movementFunctions.js

@@ -92,23 +92,19 @@ class MovementFunctions {
         }
         return false;
     }
-    forceLook(yaw, pitch, onGround, update = false) {
+    forceLook(yaw, pitch, update = false, onGround) {
         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: onGround !== null && onGround !== void 0 ? 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.look(yaw, pitch, true);
         }
     }
-    forceLookAt(pos, onGround, update = false) {
+    forceLookAt(pos, update = false, onGround) {
         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) };
         this.bot._client.write("look", Object.assign(Object.assign({}, nyp), { onGround: onGround !== null && onGround !== void 0 ? 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.look(yaw, pitch, true);
         }
     }
     lazyTeleport(endPos) { }

package/lib/static/aabbUtil.js

@@ -26,7 +26,7 @@ var AABBUtils;
     }
     AABBUtils.getEntityAABB = getEntityAABB;
     function getPlayerAABB(entity) {
-        return getEntityAABBRaw({ position: entity.position, height: 1.8, width: 0.3 });
+        return getEntityAABBRaw({ position: entity.position, height: 1.8, width: 0.6 });
     }
     AABBUtils.getPlayerAABB = getPlayerAABB;
     function getEntityAABBRaw(entity) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nxg-org/mineflayer-util-plugin",
-    "version": "1.3.14",
+    "version": "1.3.15",
     "description": "mineflayer utils for NextGEN mineflayer plugins.",
     "keywords": [
         "mineflayer",
@@ -16,7 +16,8 @@
     "types": "lib/index.d.ts",
     "scripts": {
         "build": "npx tsc",
-        "prepublish": "npm run build"
+        "prepublish": "npm run build",
+        "test": "node --trace-warnings lib/example.js"
     },
     "dependencies": {
         "minecraft-data": "^2.97.0",