@nxg-org/mineflayer-physics-util 1.7.4 → 1.7.5

package/dist/physics/engines/botcraft.js

@@ -479,14 +479,15 @@ class BotcraftPhysics {
             // Compensate water downward speed depending on looking direction (?)
             if (this.isSwimmingAndNotFlying(ctx, world)) {
                 const mSinPitch = player.pitch;
-                const condition = mSinPitch < 0.0 || player.control.jump;
+                let condition = mSinPitch < 0.0 || player.control.jump;
                 if (!condition) {
                     // check above block
                     const bl1 = world.getBlock(new vec3_1.Vec3(player.pos.x, player.pos.y + 1.0 - 0.1, player.pos.z));
-                    const condition1 = bl1 && this.waterLike.has(bl1.type);
-                    if (condition1) {
-                        player.vel.y += (mSinPitch - player.vel.y) * (mSinPitch < -0.2 ? 0.085 : 0.06);
-                    }
+                    condition = bl1 != null && (this.waterId === bl1.type || this.waterLike.has(bl1.type));
+                }
+                if (condition) {
+                    // console.log('changing vel by',  (mSinPitch - player.vel.y) * (mSinPitch < -0.2 ? 0.085 : 0.06));
+                    player.vel.y += (mSinPitch - player.vel.y) * (mSinPitch < -0.2 ? 0.085 : 0.06);
                 }
             }
             const velY = player.vel.y;
@@ -892,7 +893,7 @@ class BotcraftPhysics {
                 const inertia = player.onGround ? friction * ctx.airborneInertia : ctx.airborneInertia;
                 // deviation, adding additional logic for changing attribute values.
                 const movementSpeedAttr = this.getMovementSpeedAttribute(ctx);
-                const inputStrength = player.onGround ? movementSpeedAttr * (0.21600002 / (friction * friction * friction)) : 0.02;
+                const inputStrength = player.onGround ? movementSpeedAttr * (0.21600002 / (friction * friction * friction)) : (movementSpeedAttr) * 0.2;
                 this.applyInputs(inputStrength, player);
                 if (player.onClimbable) {
                     // LivingEntity::handleOnClimbable
@@ -1201,7 +1202,7 @@ 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)
+        console.log("current input strength of normal movement", inputStrength, player.onGround, player.sprinting, player.control);
         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/package.json

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

package/tests/actualBot.ts

@@ -1,5 +1,6 @@
 import { pathfinder, goals } from "mineflayer-pathfinder";
 import { Bot, createBot } from "mineflayer";
+const physicsInject = require("mineflayer/lib/plugins/physics")
 import loader, { BotcraftPhysics, EntityPhysics, EntityState, EPhysicsCtx } from "../src/index";
 import { PlayerState } from "../src/physics/states";
 
@@ -16,7 +17,9 @@ bot.once("spawn", async () => {
   bot.loadPlugin(loader);
   bot.loadPlugin(pathfinder);
   await bot.waitForTicks(20);
-  bot.chat("rocky1928");
+  (bot as any).physics.yawSpeed = 50;
+  (bot as any).physics.pitchSpeed = 50;
+  // setupNewPhysics(bot);
 });
 
 const rl = require("readline").createInterface({
@@ -40,7 +43,6 @@ bot.on("move", (pos) => {
 // print whenever another player hits the ground
 let lastPositions: Record<string, boolean> = {};
 bot.on("entityMoved", (entity) => {
-  console.log("entityMove", entity.username)
   if (entity.username && entity.username !== bot.username) {
     // check by seeing is y value is an integer
     if (Math.floor(entity.position.y) === entity.position.y && !lastPositions[entity.username]) {
@@ -56,11 +58,40 @@ bot.on("entityMoved", (entity) => {
     }}
 });
 
+function setupNewPhysics(bot: Bot) {
+  const val = new BotcraftPhysics(bot.registry);
+
+      (EntityState.prototype as any).apply = function (this: EntityState, bot: Bot) {
+        // console.log(this.control, this.isUsingItem);
+        this.applyToBot(bot);
+      };
+
+      const ctx = EPhysicsCtx.FROM_BOT(val, bot);
+      const state = ctx.state as PlayerState
+
+      // EntityPhysics.prototype.simulate = function (ctx, world) {
+      //   bot.physics.simulatePlayer(ctx.state, world);
+      // }
+
+      (bot.physics as any).autojumpCooldown = 0;
+      // (bot.physics).jumpTicks = 0;
+
+      (bot.physics as any).simulatePlayer = (...args: any[]) => {
+        state.update(bot);
+        ctx.state.jumpTicks = 0; // allow immediate jumping
+        return val.simulate(ctx, bot.world);
+      };
+}
+
 bot.on("chat", (user, message) => {
   const [cmd, ...args] = message.split(" ");
   const author = bot.nearestEntity((e) => e.username === user);
 
   switch (cmd) {
+    case "lookatme":
+      if (!author) return bot.chat("I can't see you!");
+      bot.lookAt(author.position.offset(0, author.height, 0));
+      break;
     case "status":
       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);
@@ -80,34 +111,11 @@ bot.on("chat", (user, message) => {
       bot.setControlState(args[0] as any, args[1] === "true");
       break;
     case "original":
-      bot.physics = new Physics(bot.registry, bot.world);
+      bot.loadPlugin(physicsInject);
       bot.chat("Switched to original physics!");
       break;
     case "new":
-      const val = new BotcraftPhysics(bot.registry);
-      const oldSim = (bot.physics as any).simulatePlayer;
-
-      (EntityState.prototype as any).apply = function (this: EntityState, bot: Bot) {
-        // console.log(this.control, this.isUsingItem);
-        this.applyToBot(bot);
-      };
-
-      const ctx = EPhysicsCtx.FROM_BOT(val, bot);
-      const state = ctx.state as PlayerState
-
-      // EntityPhysics.prototype.simulate = function (ctx, world) {
-      //   bot.physics.simulatePlayer(ctx.state, world);
-      // }
-
-      (bot.physics as any).autojumpCooldown = 0;
-      // (bot.physics).jumpTicks = 0;
-
-      (bot.physics as any).simulatePlayer = (...args: any[]) => {
-        state.update(bot);
-        ctx.state.jumpTicks = 0; // allow immediate jumping
-        return val.simulate(ctx, bot.world);
-        return oldSim(...args);
-      };
+      setupNewPhysics(bot);
       bot.chat("Switched to new physics!");
       break;
     case "jump":