@nxg-org/mineflayer-physics-util 1.8.5 → 1.8.6

package/dist/physics/engines/botcraft.js

@@ -311,9 +311,11 @@ class BotcraftPhysics {
             for (blockPos.y = Math.floor(minAABB.y); blockPos.y <= Math.floor(maxAABB.y); ++blockPos.y) {
                 for (blockPos.z = Math.floor(minAABB.z); blockPos.z <= Math.floor(maxAABB.z); ++blockPos.z) {
                     const block = world.getBlock(blockPos);
+                    if (block == null)
+                        continue;
                     const waterRes = waterCond(block);
                     const lavaRes = lavaCond(block);
-                    if (block == null || (waterRes && !water) || (lavaRes && water) || (!waterRes && !lavaRes)) {
+                    if ((waterRes && !water) || (lavaRes && water) || (!waterRes && !lavaRes)) {
                         continue;
                     }
                     let fluidHeight = 0.0;
@@ -587,14 +589,17 @@ class BotcraftPhysics {
     }
     inputsToSprint(ctx, heading, world) {
         const player = ctx.state;
-        // Start sprinting if possible
+        // console.log('is sprinting', player.sprinting, 'can sprint', this.canStartSprinting(ctx, heading), player.sprinting)
         if (this.canStartSprinting(ctx, heading) &&
-            (player.control.sprint ||
-                (player.sprintTriggerTime > 0 && heading.forward >= (player.isInWater ? 1e-5 : 0.8)))) {
+            (player.control.sprint || (player.sprintTriggerTime > 0 && heading.forward >= (player.isInWater ? 1e-5 : 0.8)))) {
             this.setSprinting(ctx, true);
         }
+        // console.log('should stop', this.shouldStopRunSprinting(ctx, heading), 'minor collision', player.isCollidedHorizontallyMinor)
         // Stop sprinting if necessary
         if (player.sprinting) {
+            if (!player.control.sprint) {
+                this.setSprinting(ctx, false);
+            }
             if (this.isSwimming(ctx)) {
                 if (this.shouldStopSwimSprinting(ctx, heading)) {
                     this.setSprinting(ctx, false);
@@ -659,8 +664,7 @@ class BotcraftPhysics {
         let attr = player.attributes[this.movementSpeedAttribute];
         if (attr != null)
             attributes.deleteAttributeModifier(attr, ctx.worldSettings.sprintingUUID);
-        else
-            attr = attributes.createAttributeValue(ctx.worldSettings.playerSpeed);
+        attr = attributes.createAttributeValue(ctx.worldSettings.playerSpeed);
         if (value) {
             attributes.addAttributeModifier(attr, {
                 uuid: ctx.worldSettings.sprintingUUID,
@@ -668,6 +672,10 @@ class BotcraftPhysics {
                 operation: 2,
             });
         }
+        // potential deviation from vanilla.
+        // if (value != player.sprinting) {
+        //   player.sprintTriggerTime = ctx.worldSettings.sprintTimeTriggerCooldown;
+        // }
         player.attributes[this.movementSpeedAttribute] = attr;
         player.sprinting = value;
     }
@@ -685,7 +693,7 @@ class BotcraftPhysics {
                 // If double jump in creative, swap flying mode
                 if (player.prevControl.jump && player.control.jump) {
                     if (player.flyJumpTriggerTime === 0) {
-                        player.flyJumpTriggerTime = 7;
+                        player.flyJumpTriggerTime = ctx.worldSettings.flyJumpTriggerCooldown;
                     }
                     else if (this.isSwimmingAndNotFlying(ctx, world)) {
                         player.flying = !player.flying;
@@ -738,6 +746,7 @@ class BotcraftPhysics {
                         blockJumpFactor = 0.4;
                     }
                     if (this.verLessThan("1.20.5")) {
+                        console.log(blockJumpFactor);
                         player.vel.y = Math.fround(0.42) * blockJumpFactor + jumpBoost;
                         if (player.sprinting) {
                             const yawRad = Math.PI - player.yaw; // should already be in yaw. MINEFLAYER SPECIFC CHANGE, MATH.PI -
@@ -750,7 +759,7 @@ class BotcraftPhysics {
                     }
                     else {
                         // something about getting an attribute for jump strength?
-                        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 value = (_b = (_a = entity.attributes[this.jumpStrengthAttribute]) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : Math.fround(0.42); // default value from previous versions
                         const jumpPower = value * blockJumpFactor + jumpBoost;
                         if (jumpPower > 1e-5) {
                             player.vel.y = jumpPower;
@@ -1161,7 +1170,7 @@ class BotcraftPhysics {
             //       return false;
             //    }
             // }
-            const yawRad = player.yaw * (Math.PI / 180);
+            const yawRad = Math.PI - player.yaw; //* (Math.PI / 180);
             const sinYaw = Math.sin(yawRad);
             const cosYaw = Math.cos(yawRad);
             const xxa = player.prevHeading.forward;
@@ -1172,7 +1181,9 @@ class BotcraftPhysics {
             const horizMovement = Math.pow(var1.x, 2) + Math.pow(var1.z, 2);
             if (horizSpeed >= 1e-5 && horizMovement >= 1e-5) {
                 const dot = xxaRot * var1.x + zzaRot * var1.z;
-                const angle = Math.acos(dot / Math.sqrt(horizSpeed * horizMovement));
+                let angle = Math.acos(dot / Math.sqrt(horizSpeed * horizMovement));
+                // unsure why this is needed, but this ends up matching.
+                angle = Math.abs(angle - Math.PI / 2);
                 return angle < 0.13962634; // magic number
             }
             else

package/dist/physics/settings/physicsSettings.d.ts

@@ -18,6 +18,8 @@ export declare class PhysicsWorldSettings {
     ladderClimbSpeed: number;
     defaultSlipperiness: number;
     outOfLiquidImpulse: number;
+    sprintTimeTriggerCooldown: number;
+    flyJumpTriggerCooldown: number;
     autojumpCooldown: number;
     bubbleColumnSurfaceDrag: BubbleColumnInfo;
     bubbleColumnDrag: BubbleColumnInfo;

package/dist/physics/settings/physicsSettings.js

@@ -18,6 +18,8 @@ class PhysicsWorldSettings {
         // public liquidAcceleration: number = 0.02;
         this.defaultSlipperiness = 0.6;
         this.outOfLiquidImpulse = Math.fround(0.3);
+        this.sprintTimeTriggerCooldown = 2;
+        this.flyJumpTriggerCooldown = 7;
         this.autojumpCooldown = 10; // ticks (0.5s)
         this.bubbleColumnSurfaceDrag = {
             down: 0.03,

package/dist/physics/states/playerState.js

@@ -110,6 +110,8 @@ class PlayerState {
                 return 1.62;
             case poses_1.PlayerPoses.SNEAKING:
                 return 1.27;
+            case poses_1.PlayerPoses.DYING:
+            case poses_1.PlayerPoses.SLEEPING:
             case poses_1.PlayerPoses.SWIMMING:
             case poses_1.PlayerPoses.FALL_FLYING:
             case poses_1.PlayerPoses.SPIN_ATTACK:

package/package.json

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

package/tests/actualBot.ts

@@ -16,12 +16,16 @@ function buildBot() {
   console.log("hey!");
 
   const bot = createBot({
-    host: process.argv[2],
+    host: process.argv[2] || 'localhost',
     port: Number(process.argv[3]),
     username: "testingbot",
     version: process.argv[4],
   });
 
+  bot.on('login', () => {
+    bot.chat("Hello! I am a testing bot!");
+  })
+
   bot.once("spawn", async () => {
     bot.loadPlugin(loader);
     bot.loadPlugin(pathfinder);