@nxg-org/mineflayer-physics-util 1.5.6 → 1.5.8

package/dist/physics/engines/entityPhysics.js

@@ -662,8 +662,9 @@ class EntityPhysics {
         }
         const vel = entity.velocity;
         const pos = entity.position;
-        const waterBB = this.getEntityBB(entity, pos).contract(0.001, 0.401, 0.001);
-        const lavaBB = this.getEntityBB(entity, pos).contract(0.1, 0.4, 0.1);
+        const offset = vel.y < 0 ? 0.4 : 0;
+        const waterBB = this.getEntityBB(entity, pos).contract(0.001, offset + 0.001, 0.001);
+        const lavaBB = this.getEntityBB(entity, pos).contract(0.1, offset, 0.1);
         // assume that if we shouldn't move entity, isInWater and isInLava are already properly set.
         entity.state.isInWater = this.isInWaterApplyCurrent(waterBB, vel, world);
         entity.state.isInLava = this.isMaterialInBB(lavaBB, this.lavaId, world);

package/dist/physics/states/entityState.d.ts

@@ -96,6 +96,8 @@ export declare class EntityState implements EntityStateBuilder {
      * @returns AABB
      */
     getAABB(): AABB;
+    lookAt(vec3: Vec3): void;
+    look(yaw: number, pitch: number): void;
     getUnderlyingBlockBBs(world: any): AABB[];
     getSurroundingBBs(world: any): AABB[];
 }

package/dist/physics/states/entityState.js

@@ -258,6 +258,17 @@ class EntityState {
         const w = this.halfWidth;
         return new mineflayer_util_plugin_1.AABB(this.pos.x - w, this.pos.y, this.pos.z - w, this.pos.x + w, this.pos.y + this.height, this.pos.z + w);
     }
+    lookAt(vec3) {
+        const dx = vec3.x - this.pos.x;
+        const dy = vec3.y - this.pos.y;
+        const dz = vec3.z - this.pos.z;
+        this.yaw = Math.atan2(dz, dx) * 180 / Math.PI - 90;
+        this.pitch = -Math.atan2(dy, Math.sqrt(dx * dx + dz * dz)) * 180 / Math.PI;
+    }
+    look(yaw, pitch) {
+        this.yaw = yaw;
+        this.pitch = pitch;
+    }
     getUnderlyingBlockBBs(world /*prismarine-world*/) {
         const queryBB = this.getAABB();
         return this.ctx.getUnderlyingBlockBBs(queryBB, world);

package/dist/physics/states/playerState.d.ts

@@ -26,6 +26,7 @@ export declare class EntityDimensions {
 export declare class PlayerState implements EntityStateBuilder {
     readonly bot: Bot;
     height: number;
+    eyeHeight: number;
     halfWidth: number;
     pos: Vec3;
     vel: Vec3;

package/dist/physics/states/playerState.js

@@ -72,7 +72,8 @@ exports.EntityDimensions = EntityDimensions;
 class PlayerState {
     constructor(ctx, bot, control) {
         var _a, _b, _c, _d, _e;
-        this.height = 1.62;
+        this.height = 1.8;
+        this.eyeHeight = 1.62;
         this.halfWidth = 0.3;
         this.supportFeature = (0, physicsUtils_1.makeSupportFeature)(ctx.data);
         this.ctx = ctx;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nxg-org/mineflayer-physics-util",
-    "version": "1.5.6",
+    "version": "1.5.8",
     "description": "Provides functionality for more accurate entity and projectile tracking.",
     "keywords": [
         "mineflayer",
@@ -17,7 +17,7 @@
     "types": "dist/index.d.ts",
     "scripts": {
         "build": "npx tsc",
-        "prepublish": "npm run build",
+        "prepublishOnly": "npm run build",
         "test": "ts-node -T tests/fakeWorld.ts"
     },
     "dependencies": {
@@ -25,7 +25,7 @@
     },
     "devDependencies": {
         "expect": "^29.5.0",
-        "mineflayer": "^4.17.0",
+        "mineflayer": "^4.18.0",
         "mineflayer-pathfinder": "^2.4.4",
         "prismarine-entity": "^2.4.0",
         "typescript": "^4.5.5"

package/tests/actualBot.ts

@@ -11,12 +11,22 @@ const bot: Bot = createBot({
     username: "testingbot"
 })
 
-bot.once('spawn', () => {
+bot.once('spawn', async () => {
     bot.loadPlugin(loader)
     bot.loadPlugin(pathfinder)
+    await bot.waitForTicks(20)
+    bot.chat('rocky1928')
 })
 
 
+const rl = require('readline').createInterface({
+    input: process.stdin,
+    output: process.stdout
+
+})
+
+rl.on('line', (line: any) => bot.chat(line))
+
 bot.on("chat", (user, message) => {
     const [cmd, ...args] = message.split(' ')
     const author = bot.nearestEntity(e=>e.username===user);
@@ -28,14 +38,24 @@ bot.on("chat", (user, message) => {
             bot.physics = new Physics(bot.registry, bot.world);
             break;
         case "new":
-            // rough patching in custom physics for the time being.
-            const fuck0 =  new EntityPhysics(bot.registry)
-            bot.physics = fuck0 as any;
-            (bot.physics as any).simulatePlayer = (state: EntityState, world: any /* prismarine-world*/) =>  {
-                const entity = EPhysicsCtx.FROM_ENTITY_STATE(fuck0, state)
-                return fuck0.simulate(entity, world);
-            }
+            const val = new EntityPhysics(bot.registry)
+            const oldSim = (bot.physics as any).simulatePlayer;
+
+            (EntityState.prototype as any).apply = function (bot: Bot) {
+                this.applyToBot(bot);
+              };
+            (bot.physics as any).simulatePlayer = (...args: any[]) => {
+            //   bot.jumpTicks = 0
+              const ctx = EPhysicsCtx.FROM_BOT(val, bot)
+              ctx.state.jumpTicks = 0; // allow immediate jumping
+              // ctx.state.control.set('sneak', true)
+              return val.simulate(ctx, bot.world);
+              return oldSim(...args);
+            };
             break;
+        case "jump":
+            bot.setControlState('jump', true)
+            break
         case "come":
             if (!author) return bot.chat(`Cannot see ${user}!`);
             const goal0 = new goals.GoalNear(author.position.x, author.position.y, author.position.z, 3);
@@ -48,6 +68,7 @@ bot.on("chat", (user, message) => {
             break;
         case "stop":
             bot.pathfinder.stop();
+            bot.clearControlStates();
             bot.chat('Stopped!')
             break;