@nxg-org/mineflayer-physics-util 1.8.15 → 1.8.16

package/dist/physics/engines/botcraft.js

@@ -797,31 +797,49 @@ class BotcraftPhysics {
     getMovementSpeedAttribute(entity) {
         const isSprinting = entity.state instanceof states_1.PlayerState && entity.state.sprinting;
         let attribute;
-        // console.log(JSON.stringify(entity.state.attributes), this.movementSpeedAttribute, entity.state.attributes[this.movementSpeedAttribute])
+        // In 1.21+, this should map to 'minecraft:movement_speed'
         if (entity.state.attributes && entity.state.attributes[this.movementSpeedAttribute]) {
-            // Use server-side player attributes
             attribute = entity.state.attributes[this.movementSpeedAttribute];
         }
         else {
-            // Create an attribute if the player does not have it
-            //TODO: Generalize to all entities.
-            attribute = attributes.createAttributeValue(entity.worldSettings.playerSpeed);
-        }
-        // Client-side sprinting (don't rely on server-side sprinting)
-        // setSprinting in Livingentity.state.java
-        //TODO: Generalize to all entities.
-        attribute = attributes.deleteAttributeModifier(attribute, entity.worldSettings.sprintingUUID); // always delete sprinting (if it exists)
+            // Create fallback if server hasn't sent it
+            attribute = attributes.createAttributeValue(Math.fround(entity.worldSettings.playerSpeed));
+        }
+        // --- SPRINTING ---
+        attribute = attributes.deleteAttributeModifier(attribute, entity.worldSettings.sprintingUUID);
         if (isSprinting) {
-            if (!attributes.checkAttributeModifier(attribute, entity.worldSettings.sprintingUUID)) {
-                attribute = attributes.addAttributeModifier(attribute, {
-                    uuid: entity.worldSettings.sprintingUUID,
-                    amount: entity.worldSettings.sprintSpeed,
-                    operation: 2,
-                });
-            }
+            attribute = attributes.addAttributeModifier(attribute, {
+                uuid: entity.worldSettings.sprintingUUID,
+                // Math.fround(0.3) perfectly resolves to 0.30000001192092896
+                amount: Math.fround(0.3),
+                operation: 2,
+            });
+        }
+        // --- SPEED EFFECT ---
+        const SPEED_UUID = "91AEAA56-376B-4498-935B-2F7F68070635";
+        attribute = attributes.deleteAttributeModifier(attribute, SPEED_UUID);
+        const speedLevel = this.getEffectLevel(physicsUtils_1.CheapEffects.SPEED, entity.state.effects);
+        if (speedLevel > 0) {
+            attribute = attributes.addAttributeModifier(attribute, {
+                uuid: SPEED_UUID,
+                // Truncate the 0.2 first, then multiply, then truncate again (how Java float math works)
+                amount: Math.fround(Math.fround(0.2) * speedLevel),
+                operation: 2,
+            });
+        }
+        // --- SLOWNESS EFFECT ---
+        const SLOWNESS_UUID = "7107DE5E-7CE8-4030-940E-514C1F160890";
+        attribute = attributes.deleteAttributeModifier(attribute, SLOWNESS_UUID);
+        const slownessLevel = this.getEffectLevel(physicsUtils_1.CheapEffects.SLOWNESS, entity.state.effects);
+        if (slownessLevel > 0) {
+            attribute = attributes.addAttributeModifier(attribute, {
+                uuid: SLOWNESS_UUID,
+                amount: Math.fround(Math.fround(-0.15) * slownessLevel),
+                operation: 2,
+            });
         }
-        // Calculate what the speed is (0.1 if no modification)
-        const attributeSpeed = attributes.getAttributeValue(attribute);
+        // Calculate the final speed and cast the entire result to a 32-bit float
+        const attributeSpeed = Math.fround(attributes.getAttributeValue(attribute));
         return attributeSpeed;
     }
     /**

package/package.json

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

package/tests/actualBot.ts

@@ -32,7 +32,7 @@ function buildBot() {
     await bot.waitForTicks(20);
     (bot as any).physics.yawSpeed = 50;
     (bot as any).physics.pitchSpeed = 50;
-    setupNewPhysics(bot);
+    // setupNewPhysics(bot);
     // setupNewPhysics(bot);
   });
 
@@ -118,10 +118,9 @@ function buildBot() {
       case "status":
         const str0 = `pos: ${bot.entity.position.toString()}, vel: ${bot.entity.velocity.toString()}, yaw: ${bot.entity.yaw}, pitch: ${bot.entity.pitch}`;
         bot.chat(str0);
-        
-        const str = `onGround: ${bot.entity.onGround}, hCol: ${(bot.entity as any).isCollidedHorizontally}, vCol: ${
-          (bot.entity as any).isCollidedVertically
-        }, inWater: ${(bot.entity as any).isInWater}, inLava: ${(bot.entity as any).isInLava}`;
+
+        const str = `onGround: ${bot.entity.onGround}, hCol: ${(bot.entity as any).isCollidedHorizontally}, vCol: ${(bot.entity as any).isCollidedVertically
+          }, inWater: ${(bot.entity as any).isInWater}, inLava: ${(bot.entity as any).isInLava}`;
         bot.chat(str);
 
         if (state != null) {
@@ -172,15 +171,19 @@ function buildBot() {
         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);
-        bot.pathfinder.setGoal(goal0);
-        break;
+        {
+          if (!author) return bot.chat(`Cannot see ${user}!`);
+          const goal0 = new goals.GoalNear(author.position.x, author.position.y, author.position.z, 3);
+          bot.pathfinder.setGoal(goal0);
+          break;
+        }
       case "goto":
-        if (!author) return bot.chat(`Cannot see ${user}!`);
-        const goal1 = new goals.GoalNear(Number(args[0]), Number(args[1]), Number(args[2]), 3);
-        bot.pathfinder.setGoal(goal1);
-        break;
+        {
+          if (!author) return bot.chat(`Cannot see ${user}!`);
+          const goal1 = new goals.GoalNear(Number(args[0]), Number(args[1]), Number(args[2]), 3);
+          bot.pathfinder.setGoal(goal1);
+          break;
+        }
       case "stop":
         bot.deactivateItem();
         bot.pathfinder.stop();