better typing

Author: GenerelSchwerz

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 { EntityPhysics, EPhysicsCtx, PhysicsWorldSettings, initSetup } = require('@nxg-org/mineflayer-physics-util')
+const { EntityPhysics, EPhysicsCtx, PhysicsWorldSettings, initSetup, PlayerState } = require('@nxg-org/mineflayer-physics-util')
 
 module.exports = inject
 
@@ -53,7 +53,11 @@ function inject (bot, { physicsEnabled, maxCatchupTicks }) {
   settings.pitchSpeed = 0.3
   settings.overrides = {} // additional settings/attempts to modify the entity state can be used here. not sure how to make this elegant yet.
 
-  let ectx
+
+  /**
+   * @type {EPhysicsCtx<PlayerState> | undefined}
+   */
+  let ectx;
 
   const lastSent = {
     x: 0,
@@ -95,16 +99,49 @@ function inject (bot, { physicsEnabled, maxCatchupTicks }) {
 
   function tickPhysics (now) {
     if (bot.blockAt(bot.entity.position) == null) return // check if chunk is unloaded
+
+    // Initialize if null (e.g., right after spawn before first packet)
+    if (lastSentYaw === null) lastSentYaw = bot.entity.yaw
+    if (lastSentPitch === null) lastSentPitch = bot.entity.pitch
+
+    if (shouldUsePhysics) {
+      // 1. Advance the interpolated yaw/pitch first
+      const dYaw = deltaYaw(bot.entity.yaw, lastSentYaw)
+      const dPitch = bot.entity.pitch - lastSentPitch
+      
+      const maxDeltaYaw = PHYSICS_TIMESTEP * bot.physicsSettings.yawSpeed
+      const maxDeltaPitch = PHYSICS_TIMESTEP * bot.physicsSettings.pitchSpeed
+      
+      lastSentYaw += math.clamp(-maxDeltaYaw, dYaw, maxDeltaYaw)
+      lastSentPitch += math.clamp(-maxDeltaPitch, dPitch, maxDeltaPitch)
+    }
+
     if (bot.physicsEnabled && shouldUsePhysics) {
       ectx ??= EPhysicsCtx.FROM_BOT(physics, bot, settings)
       ectx.state.update(bot)
+
+      // 2. Sync physics engine to the interpolated look to satisfy anticheats
+      ectx.state.yaw = lastSentYaw
+      ectx.state.pitch = lastSentPitch
+
       Object.assign(ectx, settings.overrides)
 
+      // 3. Save target yaw/pitch before applying physics
+      const targetYaw = bot.entity.yaw
+      const targetPitch = bot.entity.pitch
+
       physics.simulate(ectx, world).apply(bot)
 
+      // console.log(ectx.state.effects, bot.entity.effects)
+
+      // 4. Restore target yaw/pitch so the bot doesn't forget where it's trying to look
+      bot.entity.yaw = targetYaw
+      bot.entity.pitch = targetPitch
+
       bot.emit('physicsTick')
       bot.emit('physicTick') // Deprecated, only exists to support old plugins. May be removed in the future
     }
+    
     if (shouldUsePhysics) {
       updatePosition(now)
     }
@@ -184,15 +221,7 @@ function inject (bot, { physicsEnabled, maxCatchupTicks }) {
     // Only send updates for 20 ticks after death
     if (isEntityRemoved()) return
 
-    // Increment the yaw in baby steps so that notchian clients (not the server) can keep up.
-    const dYaw = deltaYaw(bot.entity.yaw, lastSentYaw)
-    const dPitch = bot.entity.pitch - (lastSentPitch || 0)
-
-    // Vanilla doesn't clamp yaw, so we don't want to do it either
-    const maxDeltaYaw = PHYSICS_TIMESTEP * bot.physicsSettings.yawSpeed
-    const maxDeltaPitch = PHYSICS_TIMESTEP * bot.physicsSettings.pitchSpeed
-    lastSentYaw += math.clamp(-maxDeltaYaw, dYaw, maxDeltaYaw)
-    lastSentPitch += math.clamp(-maxDeltaPitch, dPitch, maxDeltaPitch)
+    // Interpolation logic has been moved to tickPhysics()
 
     const yaw = Math.fround(conv.toNotchianYaw(lastSentYaw))
     const pitch = Math.fround(conv.toNotchianPitch(lastSentPitch))
@@ -257,11 +286,6 @@ function inject (bot, { physicsEnabled, maxCatchupTicks }) {
       lastUpdated.pitch = pitch
     }
 
-    if (lookUpdated) {
-      lastUpdated.yaw = yaw
-      lastUpdated.pitch = pitch
-    }
-
     lastSent.onGround = bot.entity.onGround // onGround is always set
     bot.physicsEngineCtx = ectx
   }
@@ -604,4 +628,4 @@ function inject (bot, { physicsEnabled, maxCatchupTicks }) {
     }
   })
   bot.on('end', cleanup)
-}
+}