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

package/.vscode/settings.json

@@ -1,5 +1,5 @@
-{
-    "print.colourScheme": "GitHub",
-    "ecl.launchConfiguration": "not found",
-    "ecl.targetCluster": {}
+{
+    "print.colourScheme": "GitHub",
+    "ecl.launchConfiguration": "not found",
+    "ecl.targetCluster": {}
 }

package/README.md

@@ -1 +1 @@
-# mineflayer-physics-utils
+# mineflayer-physics-utils

package/dist/physics/engines/botcraft.js

@@ -223,13 +223,14 @@ class BotcraftPhysics {
     physicsTick(ctx, world) {
         // Check for rocket boosting if currently in elytra flying mode
         const entity = ctx.state;
-        if (ctx.state.elytraFlying) {
-            // TODO: entity check for fireworks
-            // TODO: check if firework is attached to player
-            if (false) {
-                // player->speed += player->front_vector * 0.1 + (player->front_vector * 1.5 - player->speed) * 0.5;
-            }
-        }
+        // if (ctx.state.elytraFlying) {
+        //   // TODO: entity check for fireworks
+        //   // TODO: check if firework is attached to player
+        //   if (false) {
+        //     // player->speed += player->front_vector * 0.1 + (player->front_vector * 1.5 - player->speed) * 0.5;
+        //   }
+        // }
+        // for now, only check if this is a player.
         const playerFlag = ctx.entityType.type === "player";
         this.fluidPhysics(ctx, world, true);
         this.fluidPhysics(ctx, world, false);
@@ -796,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,
+            });
         }
-        // Calculate what the speed is (0.1 if no modification)
-        const attributeSpeed = attributes.getAttributeValue(attribute);
+        // --- 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 the final speed and cast the entire result to a 32-bit float
+        const attributeSpeed = Math.fround(attributes.getAttributeValue(attribute));
         return attributeSpeed;
     }
     /**
@@ -940,8 +959,21 @@ class BotcraftPhysics {
                 if (player.onGround) {
                     player.fallFlying = false;
                 }
+                // Potentially not the correct place for this logic, but it is easier to implement here for now. This is the firework boost from elytra flying.
+                if (player.fireworkRocketDuration > 0) {
+                    const { lookDir } = (0, physicsUtils_1.getLookingVector)(player);
+                    player.vel.x += lookDir.x * 0.1 + (lookDir.x * 1.5 - player.vel.x) * 0.5;
+                    player.vel.y += lookDir.y * 0.1 + (lookDir.y * 1.5 - player.vel.y) * 0.5;
+                    player.vel.z += lookDir.z * 0.1 + (lookDir.z * 1.5 - player.vel.z) * 0.5;
+                    --player.fireworkRocketDuration;
+                }
+                // we're on ground or in air, not flying.
             }
             else {
+                // clear firework boost if on ground or in air without flying, otherwise it can cause issues with movement.
+                if (player.fireworkRocketDuration > 0) {
+                    player.fireworkRocketDuration = 0;
+                }
                 const blockBelow = world.getBlock(this.getBlockBelowAffectingMovement(player, world));
                 // deviation. using our stores slipperiness values.
                 const friction = blockBelow

package/dist/physics/states/playerState.js

@@ -288,7 +288,7 @@ class PlayerState {
                 break;
             case "survival":
             case "adventure":
-                this.flySpeed = 0;
+                this.flySpeed = 0.05; // same as creative
                 this.mayFly = bot.entity.canFly;
                 break;
             default:

package/eslint.config.mjs

@@ -1,17 +1,17 @@
-import { defineConfig } from "eslint/config";
-import globals from "globals";
-import js from "@eslint/js";
-import tseslint from "typescript-eslint";
-
-export default defineConfig([
-  {
-    files: ["**/*.{ts,tsx}"], // Only check TypeScript files
-    languageOptions: { globals: globals.browser }
-  },
-  {
-    files: ["**/*.{ts,tsx}"], // Only check TypeScript files
-    plugins: { js },
-    extends: ["js/recommended"]
-  },
-  tseslint.configs.recommended,
-]);
+import { defineConfig } from "eslint/config";
+import globals from "globals";
+import js from "@eslint/js";
+import tseslint from "typescript-eslint";
+
+export default defineConfig([
+  {
+    files: ["**/*.{ts,tsx}"], // Only check TypeScript files
+    languageOptions: { globals: globals.browser }
+  },
+  {
+    files: ["**/*.{ts,tsx}"], // Only check TypeScript files
+    plugins: { js },
+    extends: ["js/recommended"]
+  },
+  tseslint.configs.recommended,
+]);

package/package.json

@@ -1,46 +1,46 @@
-{
-    "name": "@nxg-org/mineflayer-physics-util",
-    "version": "1.8.14",
-    "description": "Provides functionality for more accurate entity and projectile tracking.",
-    "keywords": [
-        "mineflayer",
-        "mineflayer-plugin",
-        "mineflayer-tracker"
-    ],
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/nxg-org/mineflayer-physics-utils.git"
-    },
-    "license": "GPL-3.0",
-    "author": "generel_schwerz",
-    "main": "dist/index.js",
-    "types": "dist/index.d.ts",
-    "scripts": {
-        "lint": "eslint . --ext .ts,.tsx",
-        "build": "npx tsc",
-        "prepublishOnly": "npm run build",
-        "test": "mocha --require ts-node/register --recursive tests/**/*.test.ts"
-    },
-    "dependencies": {
-        "@nxg-org/mineflayer-util-plugin": "^1.8.2"
-    },
-    "devDependencies": {
-        "@eslint/js": "^9.23.0",
-        "@types/mocha": "^10.0.10",
-        "@typescript-eslint/eslint-plugin": "^8.27.0",
-        "@typescript-eslint/parser": "^8.27.0",
-        "eslint": "^9.23.0",
-        "expect": "^29.7.0",
-        "globals": "^16.0.0",
-        "minecraft-data": "^3.83.1",
-        "mineflayer": "^4.26.0",
-        "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": "^5.8.2",
-        "typescript-eslint": "^8.27.0"
-    },
-    "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
-}
+{
+    "name": "@nxg-org/mineflayer-physics-util",
+    "version": "1.8.16",
+    "description": "Provides functionality for more accurate entity and projectile tracking.",
+    "keywords": [
+        "mineflayer",
+        "mineflayer-plugin",
+        "mineflayer-tracker"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/nxg-org/mineflayer-physics-utils.git"
+    },
+    "license": "GPL-3.0",
+    "author": "generel_schwerz",
+    "main": "dist/index.js",
+    "types": "dist/index.d.ts",
+    "scripts": {
+        "lint": "eslint . --ext .ts,.tsx",
+        "build": "npx tsc",
+        "prepublishOnly": "npm run build",
+        "test": "mocha --require ts-node/register --recursive tests/**/*.test.ts"
+    },
+    "dependencies": {
+        "@nxg-org/mineflayer-util-plugin": "^1.8.2"
+    },
+    "devDependencies": {
+        "@eslint/js": "^9.23.0",
+        "@types/mocha": "^10.0.10",
+        "@typescript-eslint/eslint-plugin": "^8.27.0",
+        "@typescript-eslint/parser": "^8.27.0",
+        "eslint": "^9.23.0",
+        "expect": "^29.7.0",
+        "globals": "^16.0.0",
+        "minecraft-data": "^3.83.1",
+        "mineflayer": "^4.26.0",
+        "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": "^5.8.2",
+        "typescript-eslint": "^8.27.0"
+    },
+    "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+}