fix support for pathfinder, aka backwards compatibility

Author: GenerelSchwerz

examples/pathfinder/gps.js

@@ -1,40 +1,57 @@
 // This is an example that uses mineflayer-pathfinder to showcase how simple it is to walk to goals
 
-const mineflayer = require('../../')
-const { pathfinder, Movements, goals: { GoalNear } } = require('mineflayer-pathfinder')
+const mineflayer = require("../../");
+const {
+  pathfinder,
+  Movements,
+  goals: { GoalNear },
+} = require("mineflayer-pathfinder");
 
 if (process.argv.length < 4 || process.argv.length > 6) {
-  console.log('Usage : node gps.js <host> <port> [<name>] [<password>]')
-  process.exit(1)
+  console.log("Usage : node gps.js <host> <port> [<name>] [<password>]");
+  process.exit(1);
 }
 
 const bot = mineflayer.createBot({
   host: process.argv[2],
   port: parseInt(process.argv[3]),
-  username: process.argv[4] ? process.argv[4] : 'gps',
-  password: process.argv[5]
-})
+  username: process.argv[4] ? process.argv[4] : "gps",
+  password: process.argv[5],
+});
 
-const RANGE_GOAL = 1 // get within this radius of the player
+const RANGE_GOAL = 1; // get within this radius of the player
 
-bot.loadPlugin(pathfinder)
+bot.loadPlugin(pathfinder);
 
-bot.once('spawn', () => {
-  const defaultMove = new Movements(bot)
+bot.once("spawn", () => {
+  const defaultMove = new Movements(bot);
 
-  bot.on('chat', (username, message) => {
-    if (username === bot.username) return
-    if (message !== 'come') return
-    const target = bot.players[username]?.entity
-    if (!target) {
-      bot.chat("I don't see you !")
-      return
-    }
-    const { x: playerX, y: playerY, z: playerZ } = target.position
+  bot.on("chat", (username, message) => {
+    console.log("Chat message received: ", username, message);
+    if (username === bot.username) return;
+
+    const [cmd, ...args] = message.split(" ");
+
+  const target = bot.players[username]?.entity;
+          if (!target) {
+            bot.chat("I don't see you !");
+            return;
+          }
 
-    bot.pathfinder.setMovements(defaultMove)
-    bot.pathfinder.setGoal(new GoalNear(playerX, playerY, playerZ, RANGE_GOAL))
-  })
-})
+    switch (cmd) {
+      case "come": {
+       
+        const { x: playerX, y: playerY, z: playerZ } = target.position;
+
+        bot.pathfinder.setMovements(defaultMove);
+        bot.pathfinder.setGoal(new GoalNear(playerX, playerY, playerZ, RANGE_GOAL));
+      }
+      case "forward": {
+        bot.lookAt(target.position);
+        bot.setControlState("forward", true)
+      }
+    }
+  });
+});
 
-bot.on('error', err => console.log(err))
+bot.on("error", (err) => console.log(err));

examples/pathfinder/package.json

@@ -3,8 +3,8 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "mineflayer-pathfinder": "^2.4.5",
-    "mineflayer": "file:../../"
+    "mineflayer": "file:../../",
+    "mineflayer-pathfinder": "^2.4.5"
   },
   "description": "A mineflayer example"
 }

lib/plugins/physics.js

@@ -4,7 +4,7 @@ const math = require('../math')
 const conv = require('../conversions')
 const { performance } = require('perf_hooks')
 const { createDoneTask, createTask } = require('../promise_utils')
-const { BotcraftPhysics, EPhysicsCtx, PhysicsWorldSettings, initSetup } = require('@nxg-org/mineflayer-physics-util')
+const { EntityPhysics, EPhysicsCtx, PhysicsWorldSettings, initSetup } = require('@nxg-org/mineflayer-physics-util')
 
 module.exports = inject
 
@@ -22,7 +22,7 @@ function inject (bot, { physicsEnabled, maxCatchupTicks }) {
   const PHYSICS_CATCHUP_TICKS = maxCatchupTicks ?? 4
   const world = { getBlock: (pos) => { return bot.blockAt(pos, false) } }
 
-  const physics = new BotcraftPhysics(bot.registry)
+  const physics = new EntityPhysics(bot.registry)
 
   initSetup(bot.registry)
 
@@ -300,11 +300,16 @@ function inject (bot, { physicsEnabled, maxCatchupTicks }) {
   // compatibility for mineflayer-pathfinder
   // define method 'simulatePlayer'
 
-  obj.simulatePlayer = function (...args) {
-    ectx.state.update(bot)
-    Object.assign(ectx, settings.overrides)
+  obj.simulatePlayer = function (state, world) {
+    const eType = bot.registry.entitiesByName["player"] ?? bot.registry.entitiesByName["minecraft:player"]
+    if (!eType) {
+      throw new Error("Player entity type not found in registry")
+    }
 
-    physics.simulate(ectx, world).apply(bot)
+    const ectx = EPhysicsCtx.FROM_ENTITY_STATE(physics, state, eType, settings)
+    Object.assign(ectx, settings.overrides)
+    
+    physics.simulate(ectx, world)
   }
 
   bot.physics = obj