@nxg-org/mineflayer-physics-util 1.7.10 → 1.7.12

package/dist/physics/engines/botcraft.js

@@ -673,6 +673,7 @@ class BotcraftPhysics {
     }
     inputsToJump(entity, world, worldSettings) {
         // TODO: implement non-player entity jumping.
+        var _a, _b;
         if (entity instanceof states_1.PlayerState) {
             const player = entity;
             if (player.control.jump && !player.flying) {
@@ -706,7 +707,8 @@ class BotcraftPhysics {
                     }
                     else {
                         // something about getting an attribute for jump strength?
-                        const jumpPower = entity.attributes[this.jumpStrengthAttribute].value * blockJumpFactor + jumpBoost;
+                        const value = (_b = (_a = entity.attributes[this.jumpStrengthAttribute]) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : 1; // random value as default
+                        const jumpPower = value * blockJumpFactor + jumpBoost;
                         if (jumpPower > 1e-5) {
                             player.vel.y = jumpPower;
                             if (player.sprinting) {
@@ -771,7 +773,7 @@ class BotcraftPhysics {
      * @param world
      */
     movePlayer(ctx, world) {
-        var _a;
+        var _a, _b, _c;
         const player = ctx.state;
         {
             // LivingEntity::travel
@@ -795,11 +797,11 @@ class BotcraftPhysics {
                     depthStriderMult = Math.min(depthStrider, 3) / 3;
                 }
                 else {
-                    depthStriderMult = player.attributes[this.waterMovementEfficiencyAttribute].value;
+                    depthStriderMult = (_b = (_a = player.attributes[this.waterMovementEfficiencyAttribute]) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : 0; // random value as default
                 }
                 if (!player.onGround) {
                     waterSlowDown += (0.54600006 - waterSlowDown) * depthStriderMult; // magic number
-                    const movementSpeed = player.attributes[this.movementSpeedAttribute].value;
+                    const movementSpeed = this.getMovementSpeedAttribute(ctx); // slight deviation, using utility method
                     inputStrength += Math.fround(movementSpeed - inputStrength) * depthStriderMult;
                 }
                 if (this.verGreaterThan("1.12.2")) {
@@ -887,7 +889,7 @@ class BotcraftPhysics {
                 const blockBelow = world.getBlock(this.getBlockBelowAffectingMovement(player, world));
                 // deviation. using our stores slipperiness values.
                 const friction = blockBelow
-                    ? (_a = this.blockSlipperiness[blockBelow.type]) !== null && _a !== void 0 ? _a : ctx.worldSettings.defaultSlipperiness
+                    ? (_c = this.blockSlipperiness[blockBelow.type]) !== null && _c !== void 0 ? _c : ctx.worldSettings.defaultSlipperiness
                     : ctx.worldSettings.defaultSlipperiness;
                 const inertia = player.onGround ? friction * ctx.airborneInertia : ctx.airborneInertia;
                 // deviation, adding additional logic for changing attribute values.
@@ -936,11 +938,13 @@ class BotcraftPhysics {
         }
     }
     applyMovement(ctx, world) {
+        var _a, _b, _c, _d;
         const player = ctx.state;
         if (player.gameMode === "spectator") {
             player.pos.translate(player.vel.x, player.vel.y, player.vel.z);
             return;
         }
+        // console.log('wtf vel?', player.vel)
         // this might be a clone.
         let movement = player.vel.clone();
         // if a player is stuck, reset stuck multiplier and set velocity to 0.
@@ -953,7 +957,7 @@ class BotcraftPhysics {
         }
         let maxUpStep = ctx.stepHeight;
         if (!this.verLessThan("1.20.5")) {
-            maxUpStep = player.attributes[this.stepHeightAttribute].value;
+            maxUpStep = (_b = (_a = player.attributes[this.stepHeightAttribute]) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : ctx.stepHeight;
         }
         // const playerAABB = player.getBB();
         if (!player.flying && movement.y <= 0.0 && player.control.sneak && player.onGround) {
@@ -977,8 +981,10 @@ class BotcraftPhysics {
             }
         }
         const movementBeforeCollisions = movement.clone();
+        // console.log('movement', movement.x, movement.y, movement.z)
         { // Entity::collide
             const playerAABB = player.getBB();
+            const fuck = playerAABB.clone();
             const hDist = (vec) => Math.sqrt(vec.x * vec.x + vec.z * vec.z);
             // const entityCollisions = world.getEntityCollisions(player, playerAABB.expand(movement));
             let newMovement = Math.pow(movement.norm(), 2) === 0 ? movement : this.collideBoundingBox(world, playerAABB, movement);
@@ -988,7 +994,8 @@ class BotcraftPhysics {
             const onGround = player.onGround || (collisionY && movement.y < 0);
             if (maxUpStep > 0 && onGround && (collisionX || collisionZ)) {
                 let stepUpMovement = this.collideBoundingBox(world, playerAABB, new vec3_1.Vec3(movement.x, maxUpStep, movement.z));
-                const stepOnlyMovement = this.collideBoundingBox(world, playerAABB.expandTowardsCoords(movement.x, 0, movement.z), new vec3_1.Vec3(0, maxUpStep, 0));
+                const expand = playerAABB.expandTowardsCoords(movement.x, 0, movement.z);
+                const stepOnlyMovement = this.collideBoundingBox(world, expand, new vec3_1.Vec3(0, maxUpStep, 0));
                 if (stepOnlyMovement.y < maxUpStep) {
                     const adjustedStepUp = this.collideBoundingBox(world, playerAABB.translateVec(stepOnlyMovement), new vec3_1.Vec3(movement.x, 0, movement.z)).add(stepOnlyMovement);
                     if (hDist(adjustedStepUp) > hDist(stepUpMovement)) {
@@ -1001,6 +1008,7 @@ class BotcraftPhysics {
             }
             movement = newMovement;
         }
+        // console.log('after all collision', movement)
         if (Math.pow(movement.norm(), 2) > 1e-7) {
             player.pos.add(movement);
         }
@@ -1073,7 +1081,8 @@ class BotcraftPhysics {
             }
         }
         if (this.verGreaterThan("1.20.6")) {
-            blockSpeedFactor = blockSpeedFactor + player.attributes[this.movementEfficiencyAttribute].value * (1 - blockSpeedFactor);
+            const factor = (_d = (_c = player.attributes[this.movementEfficiencyAttribute]) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : 1;
+            blockSpeedFactor = blockSpeedFactor + factor * (1 - blockSpeedFactor);
         }
         player.vel.x *= blockSpeedFactor;
         player.vel.z *= blockSpeedFactor;
@@ -1136,7 +1145,7 @@ class BotcraftPhysics {
         }
     }
     collideBoundingBox(world, bb, movement, colliders = []) {
-        const queryBB = bb.clone().expandTowards(movement);
+        let queryBB = bb.expandTowards(movement);
         const combinedColliders = [...colliders];
         const blockCollisions = this.getSurroundingBBs(queryBB, world);
         for (const block of blockCollisions) {
@@ -1154,20 +1163,20 @@ class BotcraftPhysics {
         if (dy !== 0.0) {
             dy = this.shapeCollide(1, bb, colliders, dy);
             if (dy !== 0.0) {
-                bb = bb.translate(0, dy, 0);
+                bb = bb.moveCoords(0, dy, 0);
             }
         }
         const prioritizeZ = Math.abs(dx) < Math.abs(dz);
         if (prioritizeZ && dz !== 0.0) {
             dz = this.shapeCollide(2, bb, colliders, dz);
             if (dz !== 0.0) {
-                bb = bb.translate(0, 0, dz);
+                bb = bb.moveCoords(0, 0, dz);
             }
         }
         if (dx !== 0.0) {
             dx = this.shapeCollide(0, bb, colliders, dx);
             if (!prioritizeZ && dx !== 0.0) {
-                bb = bb.translate(dx, 0, 0);
+                bb = bb.moveCoords(dx, 0, 0);
             }
         }
         if (!prioritizeZ && dz !== 0.0) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nxg-org/mineflayer-physics-util",
-    "version": "1.7.10",
+    "version": "1.7.12",
     "description": "Provides functionality for more accurate entity and projectile tracking.",
     "keywords": [
         "mineflayer",

package/tests/fakeWorld.test.ts

@@ -10,6 +10,7 @@ import { BotcraftPhysics, EntityPhysics, IPhysics } from "../src/physics/engines
 import { initSetup } from "../src/index";
 import { PlayerState } from "../src/physics/states";
 import { Bot, ControlState } from "mineflayer";
+import { AABB } from "@nxg-org/mineflayer-util-plugin";
 
 const version = "1.12.2";
 const mcData = md(version);
@@ -189,7 +190,7 @@ describe("Physics Simulation Tests", () => {
 
     // console.log(fakePlayer.entity.position, landingPos, playerState.pos, playerState.control)
 
-    expect(fakePlayer.entity.position.z).toEqual(-7.624010798740387);
+    expect(fakePlayer.entity.position.z).toEqual(-6.607484778042766);
     expect(fakePlayer.entity.position.y).toEqual(groundLevel);
   })
 
@@ -234,7 +235,7 @@ describe("Physics Simulation Tests", () => {
     expect(fakePlayer.entity.position.y).toEqual(groundLevel);
   });
 
-  it("hCol-z", () => {
+  it("hCol--z", () => {
     setupEntity(0);
     const blockPos = new Vec3(0, groundLevel + 1, -2);
     fakeWorld.setOverrideBlock(blockPos, mcData.blocksByName.dirt.id);
@@ -251,7 +252,7 @@ describe("Physics Simulation Tests", () => {
     expect(playerState.isCollidedHorizontally).toEqual(true);
   });
 
-  it("hCol--z", () => {
+  it("hCol-z", () => {
     setupEntity(0);
     const blockPos = new Vec3(0, groundLevel + 1, 1);
     fakeWorld.setOverrideBlock(blockPos, mcData.blocksByName.dirt.id);
@@ -301,4 +302,53 @@ describe("Physics Simulation Tests", () => {
     expect(playerState.pos.x).toEqual(0.7);
     expect(playerState.isCollidedHorizontally).toEqual(true);
   });
+
+  it("jumpIntoBlock", () => {
+    setupEntity(0);
+
+    const bl1 = new Vec3(0, groundLevel + 1, 1); 
+    fakeWorld.setOverrideBlock(bl1, mcData.blocksByName.dirt.id);
+
+    fakePlayer.entity.position = new Vec3(0.5, groundLevel, 0.7); // right up against a block
+    playerState.pos = fakePlayer.entity.position.clone();
+    playerState.look(-359.9999 * (Math.PI / 360), 0);
+
+    playerState.control.jump = true;
+    playerState.control.forward = true;
+    playerState.control.sprint = true;
+
+    for (let i = 0; i < 12; i++) {
+      physics.simulate(playerCtx, fakeWorld);
+      playerState.apply(fakePlayer);
+      // console.log(fakePlayer.entity.position, playerState.isCollidedHorizontally);
+    }
+
+    expect(playerState.pos.z).toEqual(0.7);
+    expect(playerState.isCollidedHorizontally).toEqual(true);
+  });
+
+  it("walkUpStairs", () => {
+    setupEntity(0);
+
+    const bl1 = new Vec3(0, groundLevel, -1); 
+    fakeWorld.setOverrideBlock(bl1, mcData.blocksByName.stone_stairs.id);
+
+    const shapes = fakeWorld.getBlock(bl1).shapes;
+    const bbs = shapes.map((shape) => AABB.fromShape(shape, bl1));
+
+    fakePlayer.entity.position = new Vec3(-0.3, groundLevel, -0.5); // right up against a block
+    playerState.pos = fakePlayer.entity.position.clone();
+    playerState.look(-180 * (Math.PI / 360), 0);
+
+    playerState.control.forward = true;
+    playerState.control.sprint = true;
+
+    for (let i = 0; i < 4; i++) {
+      // console.log(fakePlayer.entity.position, playerState.pos, playerState.isCollidedHorizontally);
+      physics.simulate(playerCtx, fakeWorld);
+      playerState.apply(fakePlayer);
+    }
+
+    expect(playerState.pos.y).toEqual(groundLevel + 1);
+  });
 });