Backport velocity field changes from 1.21.9+ to older versions (#3839)

* Backport velocity naming changes

* Update ci.yml

* Update package.json

* Update ci.yml

* Update package.json

* dbg

* Remove debug logging

---------

Co-authored-by: extremeheat <extreme@protonmail.ch>

Author: SuperGamerTron

lib/plugins/entities.js

@@ -271,13 +271,7 @@ function inject (bot) {
     entity.yaw = conv.fromNotchianYawByte(packet.yaw)
     entity.pitch = conv.fromNotchianPitchByte(packet.pitch)
     entity.headPitch = conv.fromNotchianPitchByte(packet.headPitch)
-
-    let notchVel
-    if (bot.supportFeature('entityVelocityIsLpVec3')) {
-      notchVel = new Vec3(packet.velocity.x, packet.velocity.y, packet.velocity.z)
-    } else {
-      notchVel = new Vec3(packet.velocityX, packet.velocityY, packet.velocityZ)
-    }
+    const notchVel = new Vec3(packet.velocity.x, packet.velocity.y, packet.velocity.z)
     entity.velocity.update(conv.fromNotchVelocity(notchVel))
     entity.metadata = parseMetadata(packet.metadata, entity.metadata)
 
@@ -287,12 +281,7 @@ function inject (bot) {
   bot._client.on('entity_velocity', (packet) => {
     // entity velocity
     const entity = fetchEntity(packet.entityId)
-    let notchVel
-    if (bot.supportFeature('entityVelocityIsLpVec3')) {
-      notchVel = new Vec3(packet.velocity.x, packet.velocity.y, packet.velocity.z)
-    } else {
-      notchVel = new Vec3(packet.velocityX, packet.velocityY, packet.velocityZ)
-    }
+    const notchVel = new Vec3(packet.velocity.x, packet.velocity.y, packet.velocity.z)
     entity.velocity.update(conv.fromNotchVelocity(notchVel))
   })
 

test/internalTest.js

@@ -215,9 +215,6 @@ for (const supportedVersion of mineflayer.testedVersions) {
           pitch: 14,
           headPitch: 14,
           velocity: { x: 15, y: 16, z: 17 },
-          velocityX: 16,
-          velocityY: 17,
-          velocityZ: 18,
           metadata: []
         })
         client.write('entity_effect', {
@@ -688,10 +685,7 @@ for (const supportedVersion of mineflayer.testedVersions) {
               yaw: 0,
               headPitch: 0,
               objectData: 1,
-              velocity: { x: 0, y: 0, z: 0 },
-              velocityX: 0,
-              velocityY: 0,
-              velocityZ: 0
+              velocity: { x: 0, y: 0, z: 0 }
             })
           } else {
             client.write('named_entity_spawn', {
@@ -939,10 +933,7 @@ for (const supportedVersion of mineflayer.testedVersions) {
               yaw: 0,
               headPitch: 0,
               objectData: 1,
-              velocity: { x: 0, y: 0, z: 0 },
-              velocityX: 0,
-              velocityY: 0,
-              velocityZ: 0
+              velocity: { x: 0, y: 0, z: 0 }
             })
           } else {
             client.write('named_entity_spawn', {
@@ -996,9 +987,6 @@ for (const supportedVersion of mineflayer.testedVersions) {
             pitch: 14,
             headPitch: 14,
             velocity: { x: 15, y: 16, z: 17 },
-            velocityX: 16,
-            velocityY: 17,
-            velocityZ: 18,
             metadata: [
               { type: 0, key: bot.registry.supportFeature('mcDataHasEntityMetadata') ? 'byte' : 0, value: 0 },
               { type: 0, key: bot.registry.supportFeature('mcDataHasEntityMetadata') ? 'int' : 1, value: 1 }
@@ -1044,10 +1032,7 @@ for (const supportedVersion of mineflayer.testedVersions) {
             yaw: 0,
             headPitch: 0,
             objectData: 1,
-            velocity: { x: 0, y: 0, z: 0 },
-            velocityX: 0,
-            velocityY: 0,
-            velocityZ: 0
+            velocity: { x: 0, y: 0, z: 0 }
           })
 
           const metadataPacket = {
@@ -1186,9 +1171,6 @@ for (const supportedVersion of mineflayer.testedVersions) {
           pitch: 0,
           headPitch: 0,
           velocity: { x: 0, y: 0, z: 0 },
-          velocityX: 0,
-          velocityY: 0,
-          velocityZ: 0,
           metadata: []
         })