@nxg-org/mineflayer-physics-util 1.7.13 → 1.8.0

package/dist/physics/engines/botcraft.js

@@ -740,6 +740,7 @@ class BotcraftPhysics {
      * @returns
      */
     getMovementSpeedAttribute(entity) {
+        const isSprinting = entity.state instanceof states_1.PlayerState && entity.state.sprinting;
         let attribute;
         if (entity.state.attributes && entity.state.attributes[this.movementSpeedAttribute]) {
             // Use server-side player attributes
@@ -754,7 +755,7 @@ class BotcraftPhysics {
         // setSprinting in Livingentity.state.java
         //TODO: Generalize to all entities.
         attribute = attributes.deleteAttributeModifier(attribute, entity.worldSettings.sprintingUUID); // always delete sprinting (if it exists)
-        if (entity.state.control.sprint) {
+        if (isSprinting) {
             if (!attributes.checkAttributeModifier(attribute, entity.worldSettings.sprintingUUID)) {
                 attribute = attributes.addAttributeModifier(attribute, {
                     uuid: entity.worldSettings.sprintingUUID,
@@ -901,7 +902,7 @@ class BotcraftPhysics {
                 else {
                     inputStrength = 0.02;
                     // DEVIATION: taken from p-physics, fixes motion!
-                    if (player.control.sprint) {
+                    if (player.sprinting) {
                         const airSprintFactor = ctx.airborneAccel * 0.3;
                         inputStrength += airSprintFactor;
                     }
@@ -1272,7 +1273,14 @@ class BotcraftPhysics {
         movedAABB.translate(thisAxis == 0 ? movementLst[0] : 0, thisAxis == 1 ? movementLst[1] : 0, thisAxis == 2 ? movementLst[2] : 0);
     }
     applyInputs(inputStrength, player) {
-        // console.log("current input strength of normal movement", inputStrength, player.onGround, player.sprinting, player.control)
+        // Add slowdown when using items (like food)
+        if (player.isUsingItem) {
+            inputStrength *= 0.2;
+        }
+        // Use flySpeed for horizontal movement when flying
+        if (player.flying) {
+            inputStrength *= player.flySpeed * 40;
+        }
         const inputVector = new vec3_1.Vec3(player.heading.strafe, 0, player.heading.forward);
         const sqrNorm = Math.pow(inputVector.norm(), 2);
         if (sqrNorm < 1e-7) {

package/dist/physics/states/playerState.js

@@ -193,7 +193,7 @@ class PlayerState {
         this.update(bot, playerControls_1.ControlStateHandler.COPY_BOT(bot));
     }
     update(bot, control) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         // const bot.entity = bot instanceof bot.entity ? bot : bot.entity;
         // Input / Outputs
         this.pos.set(bot.entity.position.x, bot.entity.position.y, bot.entity.position.z);
@@ -220,7 +220,7 @@ class PlayerState {
         this.yaw = bot.entity.yaw;
         this.pitch = bot.entity.pitch;
         this.control = control !== null && control !== void 0 ? control : playerControls_1.ControlStateHandler.COPY_BOT(bot); // prevControl only updated internally.
-        this.isUsingItem = (0, physicsUtils_1.isEntityUsingItem)(bot.entity, this.ctx.supportFeature);
+        this.isUsingItem = bot.usingHeldItem; /*  || isEntityUsingItem(bot.entity, this.ctx.supportFeature); */
         this.isUsingMainHand = !(0, physicsUtils_1.whichHandIsEntityUsingBoolean)(bot.entity, this.ctx.supportFeature) && this.isUsingItem;
         this.isUsingOffHand = (0, physicsUtils_1.whichHandIsEntityUsingBoolean)(bot.entity, this.ctx.supportFeature) && this.isUsingItem;
         // effects
@@ -257,11 +257,10 @@ class PlayerState {
         this.gameMode = bot.game.gameMode;
         this.food = bot.food;
         // TODO:
-        this.flying = (_k = bot.entity.flying) !== null && _k !== void 0 ? _k : false;
-        this.swimming = (_l = bot.entity.swimming) !== null && _l !== void 0 ? _l : false;
-        this.sprinting = (_m = bot.entity.sprinting) !== null && _m !== void 0 ? _m : false;
-        this.crouching = (_o = bot.entity.crouching) !== null && _o !== void 0 ? _o : false;
-        this.fallFlying = (_p = bot.entity.fallFlying) !== null && _p !== void 0 ? _p : false;
+        this.swimming = (_k = bot.entity.swimming) !== null && _k !== void 0 ? _k : false;
+        this.sprinting = bot.controlState.sprint;
+        this.crouching = bot.controlState.sneak;
+        this.fallFlying = (_l = bot.entity.fallFlying) !== null && _l !== void 0 ? _l : false;
         switch (bot.game.gameMode) {
             case "creative":
                 this.flySpeed = 0.05;
@@ -274,11 +273,12 @@ class PlayerState {
             case "survival":
             case "adventure":
                 this.flySpeed = 0;
-                this.mayFly = false;
+                this.mayFly = bot.entity.canFly;
                 break;
             default:
                 throw new Error("Unknown game mode: " + bot.game.gameMode);
         }
+        this.flying = !!bot.entity.flying && this.mayFly;
         return this;
     }
     apply(bot) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nxg-org/mineflayer-physics-util",
-    "version": "1.7.13",
+    "version": "1.8.0",
     "description": "Provides functionality for more accurate entity and projectile tracking.",
     "keywords": [
         "mineflayer",
@@ -27,12 +27,13 @@
         "@types/mocha": "^10.0.10",
         "expect": "^29.7.0",
         "minecraft-data": "^3.83.1",
-        "mineflayer": "^4.22.0",
+        "mineflayer": "github:GenerelSchwerz/mineflayer",
         "mineflayer-pathfinder": "^2.4.4",
         "mocha": "^11.1.0",
         "prismarine-entity": "^2.4.0",
         "prismarine-registry": "^1.11.0",
         "ts-node": "^10.9.2",
         "typescript": "^4.5.5"
-    }
+    },
+    "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }