fix aimmodulo360

Author: aesthetic0001

lib/plugins/physics.js

@@ -38,7 +38,7 @@ function cloneInput(input) {
 }
 
 function inject(bot, {physicsEnabled, maxCatchupTicks}) {
-  const FLYING_EVERY_N_TICKS = (bot.version === "1.21.5" ? 19 : 20)
+  const POSITION_EVERY_N_TICKS = (bot.version === "1.21.5" ? 19 : 20)
   const PHYSICS_CATCHUP_TICKS = maxCatchupTicks ?? 4
   const world = {
     getBlock: (pos) => {
@@ -47,8 +47,6 @@ function inject(bot, {physicsEnabled, maxCatchupTicks}) {
   }
   const physics = Physics(bot.registry, world)
 
-  const positionUpdateSentEveryTick = bot.supportFeature('positionUpdateSentEveryTick')
-
   bot.jumpQueued = false
   bot.jumpTicks = 0 // autojump cooldown
 
@@ -62,8 +60,6 @@ function inject(bot, {physicsEnabled, maxCatchupTicks}) {
     sneak: false
   }
 
-  let lastSentYaw = null
-  let lastSentPitch = null
   let doPhysicsTimer = null
   let lastPhysicsFrameTime = null
   let shouldUsePhysics = false
@@ -74,8 +70,12 @@ function inject(bot, {physicsEnabled, maxCatchupTicks}) {
     x: 0,
     y: 0,
     z: 0,
+    // notchian
     yaw: 0,
     pitch: 0,
+    // non-notchian
+    entityYaw: 0,
+    entityPitch: 0,
     onGround: false,
     ticker: 20,
     flags: {onGround: false, hasHorizontalCollision: false},
@@ -126,11 +126,6 @@ function inject(bot, {physicsEnabled, maxCatchupTicks}) {
     bot.emit('physicsTickEnd')
   }
 
-  // remove this when 'physicTick' is removed
-  bot.on('newListener', (name) => {
-    if (name === 'physicTick') console.warn('Mineflayer detected that you are using a deprecated event (physicTick)! Please use this event (physicsTick) instead.')
-  })
-
   function cleanup() {
     clearInterval(doPhysicsTimer)
     doPhysicsTimer = null
@@ -226,51 +221,52 @@ function inject(bot, {physicsEnabled, maxCatchupTicks}) {
       })
     }
 
-    // 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)
+    bot.entity.pitch = math.clamp(-PI / 2, bot.entity.pitch, PI / 2)
 
-    const maxDeltaYaw = PHYSICS_TIMESTEP * physics.yawSpeed
-    const maxDeltaPitch = PHYSICS_TIMESTEP * physics.pitchSpeed
+    const lastSentYaw = lastSent.entityYaw
+    const lastSentPitch = lastSent.entityPitch
 
-    lastSentYaw += math.clamp(-maxDeltaYaw, dYaw, maxDeltaYaw)
-    lastSentPitch += math.clamp(-maxDeltaPitch, dPitch, maxDeltaPitch)
+    const sensitivity = conv.fromNotchianPitch(rawSensitivity) // this is equal to 100% sensitivity in vanilla
+    const dYaw = Math.round(deltaYaw(bot.entity.yaw, lastSentYaw) / sensitivity) * sensitivity
+    const dPitch = Math.round((bot.entity.pitch - (lastSentPitch || 0)) / sensitivity) * sensitivity
 
-    lastSentPitch = math.clamp(-PI / 2, lastSentPitch, PI / 2)
+    const yaw = Math.fround(conv.toNotchianYaw(lastSentYaw + dYaw))
+    const pitch = Math.fround(conv.toNotchianPitch(lastSentPitch + dPitch))
 
-    const yaw = Math.fround(conv.toNotchianYaw(lastSentYaw))
-    const pitch = Math.fround(conv.toNotchianPitch(lastSentPitch))
     const position = bot.entity.position
     const onGround = bot.entity.onGround
 
     // Only send a position update if necessary, select the appropriate packet
     const positionUpdated = lastSent.x !== position.x || lastSent.y !== position.y || lastSent.z !== position.z ||
-      // Send a position update every second, even if no other update was made
-      // This function rounds to the nearest 50ms (or PHYSICS_INTERVAL_MS) and checks if a second has passed.
-      // should be
-      lastSent.ticker === 0
+        // Send a position update every second, even if no other update was made
+        // This function rounds to the nearest 50ms (or PHYSICS_INTERVAL_MS) and checks if a second has passed.
+        // should be
+        lastSent.ticker === 0
     const lookUpdated = lastSent.yaw !== yaw || lastSent.pitch !== pitch
     if (positionUpdated && lookUpdated) {
       sendPacketPositionAndLook(position, yaw, pitch, onGround)
-      lastSent.ticker = FLYING_EVERY_N_TICKS // only reset if positionUpdated is true
+      lastSent.ticker = POSITION_EVERY_N_TICKS // only reset if positionUpdated is true
     } else if (positionUpdated) {
       sendPacketPosition(position, onGround)
-      lastSent.ticker = FLYING_EVERY_N_TICKS // only reset if positionUpdated is true
+      lastSent.ticker = POSITION_EVERY_N_TICKS // only reset if positionUpdated is true
     } else if (lookUpdated) {
       sendPacketLook(yaw, pitch, onGround)
     } else if (onGround !== lastSent.onGround) {
       // For versions < 1.12, one player packet should be sent every tick
       // for the server to update health correctly
       // For versions >= 1.12, onGround !== lastSent.onGround should be used, but it doesn't ever trigger outside of login
-      lastSent.ticker = FLYING_EVERY_N_TICKS
       bot._client.write('flying', {
         onGround: bot.entity.onGround,
         flags: {onGround: bot.entity.onGround, hasHorizontalCollision: undefined} // 1.21.3+
       })
-    } else {
+    }
+
+    if (!positionUpdated) {
       lastSent.ticker -= 1
     }
 
+    lastSent.entityYaw = lastSentYaw + dYaw
+    lastSent.entityPitch = lastSentPitch + dPitch
     lastSent.onGround = bot.entity.onGround // onGround is always set
   }
 
@@ -354,10 +350,22 @@ function inject(bot, {physicsEnabled, maxCatchupTicks}) {
   }
 
   let lookingTask = createDoneTask()
+  let targetYaw = null
+  let targetPitch = null
 
-  bot.on('move', () => {
-    if (!lookingTask.done && Math.abs(deltaYaw(bot.entity.yaw, lastSentYaw)) < 0.001) {
-      lookingTask.finish()
+  bot.on('physicsTick', () => {
+    if (!lookingTask.done) {
+      if (Math.abs(deltaYaw(bot.entity.yaw, targetYaw)) < 0.001 && Math.abs(bot.entity.pitch - targetPitch) < 0.001) {
+        lookingTask.finish()
+      } else {
+        // look toward it
+        const dYaw = deltaYaw(targetYaw, bot.entity.yaw)
+        const dPitch = targetPitch - bot.entity.pitch
+        const yawChange = math.clamp(-physics.yawSpeed, dYaw, physics.yawSpeed)
+        const pitchChange = math.clamp(-physics.pitchSpeed, dPitch, physics.pitchSpeed)
+        bot.entity.yaw += yawChange
+        bot.entity.pitch += pitchChange
+      }
     }
   })
 
@@ -381,8 +389,9 @@ function inject(bot, {physicsEnabled, maxCatchupTicks}) {
   bot.look = async (yaw, pitch, force) => {
     if (!lookingTask.done) {
       lookingTask.finish() // finish the previous one
+      targetYaw = null
+      targetPitch = null
     }
-    lookingTask = createTask()
 
     // this is done to bypass certain anticheat checks that detect the player's sensitivity
     // by calculating the gcd of how much they move the mouse each tick
@@ -394,16 +403,15 @@ function inject(bot, {physicsEnabled, maxCatchupTicks}) {
       return
     }
 
-    bot.entity.yaw += yawChange
-    bot.entity.pitch += pitchChange
-
     if (force) {
-      lastSentYaw = yaw
-      lastSentPitch = pitch
+      bot.entity.yaw += yawChange
+      bot.entity.pitch += pitchChange
       return
     }
-
-    await lookingTask.promise
+    lookingTask = createTask()
+    targetYaw = yaw
+    targetPitch = pitch
+    return await lookingTask.promise
   }
 
   bot.lookAt = async (point, force) => {
@@ -435,31 +443,31 @@ function inject(bot, {physicsEnabled, maxCatchupTicks}) {
       // Modern path with bitflags object
       // Velocity is only set to 0 if the flag is not set, otherwise keep current velocity
       vel.set(
-        packet.flags.x ? vel.x : 0,
-        packet.flags.y ? vel.y : 0,
-        packet.flags.z ? vel.z : 0
+          packet.flags.x ? vel.x : 0,
+          packet.flags.y ? vel.y : 0,
+          packet.flags.z ? vel.z : 0
       )
       // If flag is set, then the corresponding value is relative, else it is absolute
       pos.set(
-        packet.flags.x ? (pos.x + packet.x) : packet.x,
-        packet.flags.y ? (pos.y + packet.y) : packet.y,
-        packet.flags.z ? (pos.z + packet.z) : packet.z
+          packet.flags.x ? (pos.x + packet.x) : packet.x,
+          packet.flags.y ? (pos.y + packet.y) : packet.y,
+          packet.flags.z ? (pos.z + packet.z) : packet.z
       )
       newYaw = (packet.flags.yaw ? conv.toNotchianYaw(bot.entity.yaw) : 0) + packet.yaw
       newPitch = (packet.flags.pitch ? conv.toNotchianPitch(bot.entity.pitch) : 0) + packet.pitch
     } else {
       // Legacy path with bitmask number
       // Velocity is only set to 0 if the flag is not set, otherwise keep current velocity
       vel.set(
-        packet.flags & 1 ? vel.x : 0,
-        packet.flags & 2 ? vel.y : 0,
-        packet.flags & 4 ? vel.z : 0
+          packet.flags & 1 ? vel.x : 0,
+          packet.flags & 2 ? vel.y : 0,
+          packet.flags & 4 ? vel.z : 0
       )
       // If flag is set, then the corresponding value is relative, else it is absolute
       pos.set(
-        packet.flags & 1 ? (pos.x + packet.x) : packet.x,
-        packet.flags & 2 ? (pos.y + packet.y) : packet.y,
-        packet.flags & 4 ? (pos.z + packet.z) : packet.z
+          packet.flags & 1 ? (pos.x + packet.x) : packet.x,
+          packet.flags & 2 ? (pos.y + packet.y) : packet.y,
+          packet.flags & 4 ? (pos.z + packet.z) : packet.z
       )
       newYaw = (packet.flags & 8 ? conv.toNotchianYaw(bot.entity.yaw) : 0) + packet.yaw
       newPitch = (packet.flags & 16 ? conv.toNotchianPitch(bot.entity.pitch) : 0) + packet.pitch
@@ -476,8 +484,6 @@ function inject(bot, {physicsEnabled, maxCatchupTicks}) {
 
     shouldUsePhysics = true
     bot.jumpTicks = 0
-    lastSentYaw = bot.entity.yaw
-    lastSentPitch = bot.entity.pitch
 
     bot.emit('forcedMove')
   })