@nxg-org/mineflayer-physics-util 1.9.0 → 1.9.2

package/.vscode/settings.json

@@ -1,5 +1,5 @@
-{
-    "print.colourScheme": "GitHub",
-    "ecl.launchConfiguration": "not found",
-    "ecl.targetCluster": {}
+{
+    "print.colourScheme": "GitHub",
+    "ecl.launchConfiguration": "not found",
+    "ecl.targetCluster": {}
 }

package/README.md

@@ -1 +1 @@
-# mineflayer-physics-utils
+# mineflayer-physics-utils

package/dist/index.d.ts

@@ -8,6 +8,7 @@ declare module "mineflayer" {
 }
 export default function loader(bot: Bot): void;
 export declare function initSetup(data: IndexedData): void;
+export { PhysicsUtilWrapper } from "./wrapper";
 export { EPhysicsCtx, PhysicsWorldSettings } from "./physics/settings";
 export { BaseSimulator } from "./simulators";
 export { EntityPhysics, BotcraftPhysics } from "./physics/engines";

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyToPlayerState = exports.convertPlayerState = exports.ControlStateHandler = exports.PlayerPoses = exports.PlayerState = exports.EntityState = exports.BotcraftPhysics = exports.EntityPhysics = exports.BaseSimulator = exports.PhysicsWorldSettings = exports.EPhysicsCtx = void 0;
+exports.applyToPlayerState = exports.convertPlayerState = exports.ControlStateHandler = exports.PlayerPoses = exports.PlayerState = exports.EntityState = exports.BotcraftPhysics = exports.EntityPhysics = exports.BaseSimulator = exports.PhysicsWorldSettings = exports.EPhysicsCtx = exports.PhysicsUtilWrapper = void 0;
 exports.default = loader;
 exports.initSetup = initSetup;
 const settings_1 = require("./physics/settings");
@@ -14,6 +14,8 @@ function loader(bot) {
 function initSetup(data) {
     settings_1.EPhysicsCtx.loadData(data);
 }
+var wrapper_2 = require("./wrapper");
+Object.defineProperty(exports, "PhysicsUtilWrapper", { enumerable: true, get: function () { return wrapper_2.PhysicsUtilWrapper; } });
 var settings_2 = require("./physics/settings");
 Object.defineProperty(exports, "EPhysicsCtx", { enumerable: true, get: function () { return settings_2.EPhysicsCtx; } });
 Object.defineProperty(exports, "PhysicsWorldSettings", { enumerable: true, get: function () { return settings_2.PhysicsWorldSettings; } });

package/dist/physics/engines/botcraft.js

@@ -752,7 +752,7 @@ class BotcraftPhysics {
             !player.isInWater &&
             /* !player->GetDataSharedFlagsIdImpl(EntitySharedFlagsId::FallFlying) && */ !player.fallFlying &&
             !hasLevitationEffect) {
-            const hasElytra = player.elytraEquipped;
+            const hasElytra = player.validElytraEquipped;
             if (hasElytra) {
                 player.fallFlying = true;
                 // https://github.com/adepierre/Botcraft/blob/6c572071b0237c27a85211a246ce10565ef4d80f/botcraft/src/Game/Physics/PhysicsManager.cpp#L792

package/dist/physics/engines/entityPhysics.js

@@ -733,7 +733,7 @@ class EntityPhysics {
                 entity.state.control.sprint = false;
             }
             entity.state.fallFlying =
-                entity.state.fallFlying && entity.state.elytraEquipped && !entity.state.onGround && !entity.state.levitation;
+                entity.state.fallFlying && entity.state.validElytraEquipped && !entity.state.onGround && !entity.state.levitation;
             // for now, only check if this is a player.
             if (entity.state instanceof states_1.PlayerState) {
                 if (entity.state.fireworkRocketDuration > 0) {

package/dist/physics/engines/optimizedPhysics.js

@@ -731,7 +731,7 @@ class EntityPhysics {
                 entity.state.control.sprint = false;
             }
         }
-        entity.state.fallFlying = entity.state.fallFlying && entity.state.elytraEquipped && !entity.state.onGround && !entity.state.levitation;
+        entity.state.fallFlying = entity.state.fallFlying && entity.state.validElytraEquipped && !entity.state.onGround && !entity.state.levitation;
         if (entity.state.fireworkRocketDuration > 0) {
             if (!entity.state.fallFlying) {
                 entity.state.fireworkRocketDuration = 0;

package/dist/physics/settings/entityPhysicsCtx.d.ts

@@ -24,8 +24,6 @@ export declare class EPhysicsCtx<State extends IEntityState = IEntityState> {
     static mcData: md.IndexedData;
     static entityData: md.IndexedData["entitiesByName"];
     static mobData: md.IndexedData["mobs"];
-    readonly position: Vec3;
-    readonly velocity: Vec3;
     stepHeight: number;
     gravity: number;
     waterGravity: number;
@@ -42,6 +40,8 @@ export declare class EPhysicsCtx<State extends IEntityState = IEntityState> {
     doSolidCollisions: boolean;
     doLiquidCollisions: boolean;
     collisionBehavior: CollisionContext;
+    get position(): Vec3;
+    get velocity(): Vec3;
     constructor(ctx: IPhysics, worldSettings: PhysicsWorldSettings, pose: PlayerPoses, state: State, entityType?: md.Entity);
     static FROM_BOT(ctx: IPhysics, bot: Bot, settings?: PhysicsWorldSettings): EPhysicsCtx<PlayerState>;
     static FROM_ENTITY(ctx: IPhysics, entity: Entity, settings?: PhysicsWorldSettings): EPhysicsCtx<EntityState>;

package/dist/physics/settings/entityPhysicsCtx.js

@@ -21,6 +21,12 @@ function load(data) {
 }
 exports.emptyVec = new vec3_1.Vec3(0, 0, 0);
 class EPhysicsCtx {
+    get position() {
+        return this.state.pos;
+    }
+    get velocity() {
+        return this.state.vel;
+    }
     constructor(ctx, worldSettings, pose, state, entityType = physicsUtils_1.DefaultPlayer) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         this.ctx = ctx;
@@ -28,6 +34,7 @@ class EPhysicsCtx {
         this.pose = pose;
         this.state = state;
         this.entityType = entityType;
+        // public static globalSettings = PhysicsSettings
         this.stepHeight = 0;
         this.gravity = 0.08;
         this.airdrag = Math.fround(1 - 0.0);
@@ -45,8 +52,6 @@ class EPhysicsCtx {
             blockEffects: false,
             affectedAfterCollision: true,
         };
-        this.position = state.pos;
-        this.velocity = state.vel;
         // TODO cleanup all of this code.
         if (entityType.type === "player" || !!EPhysicsCtx.mobData[entityType.id]) {
             // @ts-expect-error

package/dist/physics/states/entityState.d.ts

@@ -22,7 +22,7 @@ export declare class EntityState implements IEntityState {
     isInLava: boolean;
     isInWeb: boolean;
     fallFlying: boolean;
-    elytraEquipped: boolean;
+    validElytraEquipped: boolean;
     isCollidedHorizontally: boolean;
     isCollidedVertically: boolean;
     jumpTicks: number;

package/dist/physics/states/entityState.js

@@ -40,7 +40,7 @@ class EntityState {
         this.isInLava = false;
         this.isInWeb = false;
         this.fallFlying = false;
-        this.elytraEquipped = false;
+        this.validElytraEquipped = false;
         this.isCollidedHorizontally = false;
         this.isCollidedVertically = false;
         this.sneakCollision = false; //TODO
@@ -92,10 +92,10 @@ class EntityState {
         return this;
     }
     updateFromEntity(entity, all = false) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         if (all) {
             // most mobs don't have this defined, so ignore it (only self does).
-            this.vel = entity.velocity.clone();
+            this.vel.set(entity.velocity.x, entity.velocity.y, entity.velocity.z);
             this.onGround = entity.onGround;
             this.onClimbable = entity.onClimbable;
             this.isInWater = entity.isInWater;
@@ -106,10 +106,10 @@ class EntityState {
             this.isCollidedVertically = entity.isCollidedVertically;
             this.sneakCollision = false; //TODO
             this.attributes || (this.attributes = entity.attributes);
-            this.elytraEquipped = entity.equipment[4] && ((_c = entity.equipment[4]) === null || _c === void 0 ? void 0 : _c.name.includes("elytra"));
-            this.fallFlying = this.elytraEquipped && this.fallFlying;
+            this.validElytraEquipped = (0, physicsUtils_1.isUsableElytraItem)(entity.equipment[4]);
+            this.fallFlying = this.validElytraEquipped && this.fallFlying;
         }
-        this.pos = entity.position.clone();
+        this.pos.set(entity.position.x, entity.position.y, entity.position.z);
         //not sure what to do here, ngl.
         this.jumpTicks || (this.jumpTicks = 0);
         this.jumpQueued || (this.jumpQueued = false);
@@ -133,7 +133,7 @@ class EntityState {
         const boots = entity.equipment[5];
         if (boots && boots.nbt) {
             const simplifiedNbt = prismarine_nbt_1.default.simplify(boots.nbt);
-            const enchantments = (_e = (_d = simplifiedNbt.Enchantments) !== null && _d !== void 0 ? _d : simplifiedNbt.ench) !== null && _e !== void 0 ? _e : [];
+            const enchantments = (_d = (_c = simplifiedNbt.Enchantments) !== null && _c !== void 0 ? _c : simplifiedNbt.ench) !== null && _d !== void 0 ? _d : [];
             this.depthStrider = this.ctx.getEnchantmentLevel(physicsUtils_1.CheapEnchantments.DEPTH_STRIDER, enchantments);
         }
         else {
@@ -162,7 +162,7 @@ class EntityState {
         this.isInLava = (_r = other.isInLava) !== null && _r !== void 0 ? _r : this.isInLava;
         this.isInWeb = (_s = other.isInWeb) !== null && _s !== void 0 ? _s : this.isInWeb;
         this.fallFlying = (_u = (_t = other.fallFlying) !== null && _t !== void 0 ? _t : other.elytraFlying) !== null && _u !== void 0 ? _u : this.fallFlying;
-        this.elytraEquipped = (_v = other.elytraEquipped) !== null && _v !== void 0 ? _v : this.elytraEquipped;
+        this.validElytraEquipped = (_v = other.validElytraEquipped) !== null && _v !== void 0 ? _v : this.validElytraEquipped;
         return this;
     }
     applyToBot(bot) {
@@ -181,7 +181,7 @@ class EntityState {
         bot.entity.isInWeb = this.isInWeb;
         bot.entity.fallFlying = this.fallFlying;
         bot.entity.elytraFlying = this.fallFlying;
-        bot.entity.elytraEquipped = this.elytraEquipped;
+        bot.entity.elytraEquipped = this.validElytraEquipped;
         bot.entity.isCollidedHorizontally = this.isCollidedHorizontally;
         bot.entity.isCollidedVertically = this.isCollidedVertically;
         bot.entity.sneakCollision = this.sneakCollision;
@@ -193,8 +193,8 @@ class EntityState {
      * No idea when you'd use this.
      */
     applyToEntity(entity) {
-        entity.position = this.pos;
-        entity.velocity = this.vel;
+        entity.position.set(this.pos.x, this.pos.y, this.pos.z);
+        entity.velocity.set(this.vel.x, this.vel.y, this.vel.z);
         // entity.position.set(this.position.x, this.position.y, this.position.z);
         // entity.velocity.set(this.velocity.x, this.velocity.y, this.velocity.z);
         entity.onGround = this.onGround;
@@ -213,7 +213,7 @@ class EntityState {
         other.isInLava = this.isInLava;
         other.isInWeb = this.isInWeb;
         other.fallFlying = this.fallFlying;
-        other.elytraEquipped = this.elytraEquipped;
+        other.validElytraEquipped = this.validElytraEquipped;
         other.fireworkRocketDuration = this.fireworkRocketDuration;
         other.jumpTicks = this.jumpTicks;
         other.jumpQueued = this.jumpQueued;
@@ -235,8 +235,8 @@ class EntityState {
     }
     merge(other) {
         this.age = other.age;
-        this.pos = other.pos.clone();
-        this.vel = other.vel.clone();
+        this.pos.set(other.pos.x, other.pos.y, other.pos.z);
+        this.vel.set(other.vel.x, other.vel.y, other.vel.z);
         this.onGround = other.onGround;
         this.onClimbable = other.onClimbable;
         this.isCollidedHorizontally = other.isCollidedHorizontally;
@@ -245,7 +245,7 @@ class EntityState {
         this.isInLava = other.isInLava;
         this.isInWeb = other.isInWeb;
         this.fallFlying = other.fallFlying;
-        this.elytraEquipped = other.elytraEquipped;
+        this.validElytraEquipped = other.validElytraEquipped;
         this.fireworkRocketDuration = other.fireworkRocketDuration;
         this.jumpTicks = other.jumpTicks;
         this.jumpQueued = other.jumpQueued;

package/dist/physics/states/index.d.ts

@@ -29,7 +29,7 @@ export interface IEntityState {
     isInWeb: boolean;
     fallFlying: boolean;
     elytraFlying: boolean;
-    elytraEquipped: boolean;
+    validElytraEquipped: boolean;
     fireworkRocketDuration: number;
     sneakCollision: boolean;
     isCollidedHorizontally: boolean;

package/dist/physics/states/playerState.d.ts

@@ -40,7 +40,7 @@ export declare class PlayerState implements IEntityState {
     isInLava: boolean;
     isUnderLava: boolean;
     isInWeb: boolean;
-    elytraEquipped: boolean;
+    validElytraEquipped: boolean;
     fireworkRocketDuration: number;
     isCollidedHorizontally: boolean;
     isCollidedHorizontallyMinor: boolean;

package/dist/physics/states/playerState.js

@@ -142,7 +142,7 @@ class PlayerState {
         this.isInLava = false;
         this.isUnderLava = false;
         this.isInWeb = false;
-        this.elytraEquipped = false;
+        this.validElytraEquipped = false;
         this.fireworkRocketDuration = 0;
         this.isCollidedHorizontally = false;
         this.isCollidedHorizontallyMinor = false;
@@ -216,7 +216,7 @@ class PlayerState {
         this.update(bot, playerControls_1.ControlStateHandler.COPY_BOT(bot));
     }
     update(bot, control) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         // const bot.entity = bot instanceof bot.entity ? bot : bot.entity;
         // Input / Outputs
         this.pos.set(bot.entity.position.x, bot.entity.position.y, bot.entity.position.z);
@@ -230,16 +230,16 @@ class PlayerState {
         this.isInLava = bot.entity.isInLava;
         this.isUnderLava = bot.entity.isUnderLava;
         this.isInWeb = bot.entity.isInWeb;
-        this.elytraEquipped = ((_c = bot.inventory.slots[bot.getEquipmentDestSlot('torso')]) === null || _c === void 0 ? void 0 : _c.name) === 'elytra';
+        this.validElytraEquipped = (0, physicsUtils_1.isUsableElytraItem)(bot.inventory.slots[bot.getEquipmentDestSlot('torso')]);
         this.fireworkRocketDuration = bot.fireworkRocketDuration;
         this.isCollidedHorizontally = bot.entity.isCollidedHorizontally;
         this.isCollidedHorizontallyMinor = bot.entity.isCollidedHorizontallyMinor;
         this.isCollidedVertically = bot.entity.isCollidedVertically;
         // dunno what to do about these, ngl.
-        this.jumpTicks = (_d = bot.jumpTicks) !== null && _d !== void 0 ? _d : 0;
-        this.jumpQueued = (_e = bot.jumpQueued) !== null && _e !== void 0 ? _e : false;
-        this.flyJumpTriggerTime = (_f = bot.flyJumpTriggerTime) !== null && _f !== void 0 ? _f : 0;
-        this.sprintTriggerTime = (_g = bot.sprintTriggerTime) !== null && _g !== void 0 ? _g : 0;
+        this.jumpTicks = (_c = bot.jumpTicks) !== null && _c !== void 0 ? _c : 0;
+        this.jumpQueued = (_d = bot.jumpQueued) !== null && _d !== void 0 ? _d : false;
+        this.flyJumpTriggerTime = (_e = bot.flyJumpTriggerTime) !== null && _e !== void 0 ? _e : 0;
+        this.sprintTriggerTime = (_f = bot.sprintTriggerTime) !== null && _f !== void 0 ? _f : 0;
         // Input only (not modified)
         this.attributes = bot.entity.attributes;
         this.yaw = bot.entity.yaw;
@@ -261,7 +261,7 @@ class PlayerState {
         const boots = bot.entity.equipment[5];
         if (boots && boots.nbt) {
             const simplifiedNbt = nbt.simplify(boots.nbt);
-            const enchantments = (_j = (_h = simplifiedNbt.Enchantments) !== null && _h !== void 0 ? _h : simplifiedNbt.ench) !== null && _j !== void 0 ? _j : [];
+            const enchantments = (_h = (_g = simplifiedNbt.Enchantments) !== null && _g !== void 0 ? _g : simplifiedNbt.ench) !== null && _h !== void 0 ? _h : [];
             this.depthStrider = this.ctx.getEnchantmentLevel(physicsUtils_1.CheapEnchantments.DEPTH_STRIDER, enchantments);
             this.soulSpeed = this.ctx.getEnchantmentLevel(physicsUtils_1.CheapEnchantments.SOUL_SPEED, enchantments);
         }
@@ -272,7 +272,7 @@ class PlayerState {
         const leggings = bot.entity.equipment[3];
         if (leggings && leggings.nbt) {
             const simplifiedNbt = nbt.simplify(leggings.nbt);
-            const enchantments = (_l = (_k = simplifiedNbt.Enchantments) !== null && _k !== void 0 ? _k : simplifiedNbt.ench) !== null && _l !== void 0 ? _l : [];
+            const enchantments = (_k = (_j = simplifiedNbt.Enchantments) !== null && _j !== void 0 ? _j : simplifiedNbt.ench) !== null && _k !== void 0 ? _k : [];
             this.swiftSneak = this.ctx.getEnchantmentLevel(physicsUtils_1.CheapEnchantments.SWIFT_SNEAK, enchantments);
         }
         else {
@@ -282,10 +282,10 @@ class PlayerState {
         this.gameMode = bot.game.gameMode;
         this.food = bot.food;
         // TODO:
-        this.swimming = (_m = bot.entity.swimming) !== null && _m !== void 0 ? _m : false;
-        this.sprinting = (_o = bot.entity.sprinting) !== null && _o !== void 0 ? _o : false;
-        this.crouching = (_p = bot.entity.crouching) !== null && _p !== void 0 ? _p : false;
-        this.fallFlying = (_r = (_q = bot.entity.fallFlying) !== null && _q !== void 0 ? _q : bot.entity.elytraFlying) !== null && _r !== void 0 ? _r : false;
+        this.swimming = (_l = bot.entity.swimming) !== null && _l !== void 0 ? _l : false;
+        this.sprinting = (_m = bot.entity.sprinting) !== null && _m !== void 0 ? _m : false;
+        this.crouching = (_o = bot.entity.crouching) !== null && _o !== void 0 ? _o : false;
+        this.fallFlying = (_q = (_p = bot.entity.fallFlying) !== null && _p !== void 0 ? _p : bot.entity.elytraFlying) !== null && _q !== void 0 ? _q : false;
         switch (bot.game.gameMode) {
             case "creative":
                 this.flySpeed = 0.05;
@@ -319,7 +319,7 @@ class PlayerState {
         bot.entity.isInLava = this.isInLava;
         bot.entity.isUnderLava = this.isUnderLava;
         bot.entity.isInWeb = this.isInWeb;
-        bot.entity.elytraEquipped = this.elytraEquipped;
+        bot.entity.elytraEquipped = this.validElytraEquipped;
         bot.fireworkRocketDuration = this.fireworkRocketDuration;
         bot.entity.isCollidedHorizontally = this.isCollidedHorizontally;
         bot.entity.isCollidedHorizontallyMinor = this.isCollidedHorizontallyMinor;
@@ -332,6 +332,9 @@ class PlayerState {
         bot.sprintTriggerTime = this.sprintTriggerTime;
         bot.entity.yaw = this.yaw;
         bot.entity.pitch = this.pitch;
+        bot.entity.height = this.height;
+        bot.entity.width = this.halfWidth * 2;
+        bot.entity.eyeHeight = this.eyeHeight;
         Object.assign(bot.entity, this.pose);
         bot.game.gameMode = this.gameMode; // this should never actually be in charge.
         bot.food = this.food; // this should also never actually be in charge.
@@ -358,7 +361,7 @@ class PlayerState {
         tmp.isInLava = this.isInLava;
         tmp.isUnderLava = this.isUnderLava;
         tmp.isInWeb = this.isInWeb;
-        tmp.elytraEquipped = this.elytraEquipped;
+        tmp.validElytraEquipped = this.validElytraEquipped;
         tmp.fireworkRocketDuration = this.fireworkRocketDuration;
         tmp.isCollidedHorizontally = this.isCollidedHorizontally;
         tmp.isCollidedHorizontallyMinor = this.isCollidedHorizontallyMinor;
@@ -414,7 +417,7 @@ class PlayerState {
         this.isInLava = other.isInLava;
         this.isUnderLava = other.isUnderLava;
         this.isInWeb = other.isInWeb;
-        this.elytraEquipped = other.elytraEquipped;
+        this.validElytraEquipped = other.validElytraEquipped;
         this.fireworkRocketDuration = other.fireworkRocketDuration;
         this.isCollidedHorizontally = other.isCollidedHorizontally;
         this.isCollidedHorizontallyMinor = other.isCollidedHorizontallyMinor;

package/dist/util/physicsUtils.d.ts

@@ -27,6 +27,11 @@ export declare enum CheapEnchantments {
 export declare function isEntityUsingItem(entity: Entity, supportFeature: SupportFeature): boolean;
 export declare function whichHandIsEntityUsing(entity: Entity, supportFeature: SupportFeature): "hand" | "off-hand";
 export declare function whichHandIsEntityUsingBoolean(entity: Entity, supportFeature: SupportFeature): boolean;
+export declare function isUsableElytraItem(item: {
+    name?: string;
+    durabilityUsed?: number;
+    maxDurability?: number;
+} | null): boolean;
 export declare function getStatusEffectNamesForVersion(supportFeature: SupportFeature): {
     jumpBoostEffectName: string;
     speedEffectName: string;

package/dist/util/physicsUtils.js

@@ -9,6 +9,7 @@ exports.applyMdToNewEntity = applyMdToNewEntity;
 exports.isEntityUsingItem = isEntityUsingItem;
 exports.whichHandIsEntityUsing = whichHandIsEntityUsing;
 exports.whichHandIsEntityUsingBoolean = whichHandIsEntityUsingBoolean;
+exports.isUsableElytraItem = isUsableElytraItem;
 exports.getStatusEffectNamesForVersion = getStatusEffectNamesForVersion;
 exports.getEnchantmentNamesForVersion = getEnchantmentNamesForVersion;
 exports.getBetweenRectangle = getBetweenRectangle;
@@ -71,6 +72,14 @@ function whichHandIsEntityUsing(entity, supportFeature) {
 function whichHandIsEntityUsingBoolean(entity, supportFeature) {
     return entity.metadata[getMetadataIndex(supportFeature)] > 2;
 }
+function isUsableElytraItem(item) {
+    if (!item || item.name !== "elytra")
+        return false;
+    if (typeof item.durabilityUsed === "number" && typeof item.maxDurability === "number") {
+        return item.durabilityUsed < item.maxDurability - 1;
+    }
+    return true;
+}
 function getStatusEffectNamesForVersion(supportFeature) {
     if (supportFeature("effectNamesAreRegistryNames")) {
         // seems to not matter right now.
@@ -177,7 +186,7 @@ function getLookingVector(entity) {
  * @returns A newly formatted PlayerState instance.
  */
 function convertPlayerState(bot, oldState, ctx) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
     // 1. Initialize the new state. 
     // This automatically runs update() and pulls the bot's current real state.
     const newState = new states_1.PlayerState(ctx, bot);
@@ -195,12 +204,12 @@ function convertPlayerState(bot, oldState, ctx) {
     newState.isCollidedVertically = (_f = oldState.isCollidedVertically) !== null && _f !== void 0 ? _f : newState.isCollidedVertically;
     // 4. Map movement and action states
     newState.fallFlying = (_h = (_g = oldState.fallFlying) !== null && _g !== void 0 ? _g : oldState.elytraFlying) !== null && _h !== void 0 ? _h : newState.fallFlying;
-    newState.elytraEquipped = (_j = oldState.elytraEquipped) !== null && _j !== void 0 ? _j : newState.elytraEquipped;
-    newState.jumpTicks = (_k = oldState.jumpTicks) !== null && _k !== void 0 ? _k : newState.jumpTicks;
-    newState.jumpQueued = (_l = oldState.jumpQueued) !== null && _l !== void 0 ? _l : newState.jumpQueued;
-    newState.fireworkRocketDuration = (_m = oldState.fireworkRocketDuration) !== null && _m !== void 0 ? _m : newState.fireworkRocketDuration;
-    newState.yaw = (_o = oldState.yaw) !== null && _o !== void 0 ? _o : newState.yaw;
-    newState.pitch = (_p = oldState.pitch) !== null && _p !== void 0 ? _p : newState.pitch;
+    newState.validElytraEquipped = (_k = (_j = oldState.validElytraEquipped) !== null && _j !== void 0 ? _j : oldState.elytraEquipped) !== null && _k !== void 0 ? _k : newState.validElytraEquipped;
+    newState.jumpTicks = (_l = oldState.jumpTicks) !== null && _l !== void 0 ? _l : newState.jumpTicks;
+    newState.jumpQueued = (_m = oldState.jumpQueued) !== null && _m !== void 0 ? _m : newState.jumpQueued;
+    newState.fireworkRocketDuration = (_o = oldState.fireworkRocketDuration) !== null && _o !== void 0 ? _o : newState.fireworkRocketDuration;
+    newState.yaw = (_p = oldState.yaw) !== null && _p !== void 0 ? _p : newState.yaw;
+    newState.pitch = (_q = oldState.pitch) !== null && _q !== void 0 ? _q : newState.pitch;
     // 5. Map Control State
     // The old state uses a standard object for controls; the new uses ControlStateHandler.
     if (oldState.control) {
@@ -209,14 +218,14 @@ function convertPlayerState(bot, oldState, ctx) {
         Object.assign(newState.control, oldState.control);
     }
     // 6. Map Attributes, Effects, and Enchantments
-    newState.attributes = (_q = oldState.attributes) !== null && _q !== void 0 ? _q : newState.attributes;
-    newState.jumpBoost = (_r = oldState.jumpBoost) !== null && _r !== void 0 ? _r : newState.jumpBoost;
-    newState.speed = (_s = oldState.speed) !== null && _s !== void 0 ? _s : newState.speed;
-    newState.slowness = (_t = oldState.slowness) !== null && _t !== void 0 ? _t : newState.slowness;
-    newState.dolphinsGrace = (_u = oldState.dolphinsGrace) !== null && _u !== void 0 ? _u : newState.dolphinsGrace;
-    newState.slowFalling = (_v = oldState.slowFalling) !== null && _v !== void 0 ? _v : newState.slowFalling;
-    newState.levitation = (_w = oldState.levitation) !== null && _w !== void 0 ? _w : newState.levitation;
-    newState.depthStrider = (_x = oldState.depthStrider) !== null && _x !== void 0 ? _x : newState.depthStrider;
+    newState.attributes = (_r = oldState.attributes) !== null && _r !== void 0 ? _r : newState.attributes;
+    newState.jumpBoost = (_s = oldState.jumpBoost) !== null && _s !== void 0 ? _s : newState.jumpBoost;
+    newState.speed = (_t = oldState.speed) !== null && _t !== void 0 ? _t : newState.speed;
+    newState.slowness = (_u = oldState.slowness) !== null && _u !== void 0 ? _u : newState.slowness;
+    newState.dolphinsGrace = (_v = oldState.dolphinsGrace) !== null && _v !== void 0 ? _v : newState.dolphinsGrace;
+    newState.slowFalling = (_w = oldState.slowFalling) !== null && _w !== void 0 ? _w : newState.slowFalling;
+    newState.levitation = (_x = oldState.levitation) !== null && _x !== void 0 ? _x : newState.levitation;
+    newState.depthStrider = (_y = oldState.depthStrider) !== null && _y !== void 0 ? _y : newState.depthStrider;
     return newState;
 }
 /**
@@ -244,7 +253,8 @@ function applyToPlayerState(newState, oldState) {
     // 3. Map Movement & Actions
     oldState.fallFlying = newState.fallFlying;
     oldState.elytraFlying = newState.fallFlying;
-    oldState.elytraEquipped = newState.elytraEquipped;
+    oldState.validElytraEquipped = newState.validElytraEquipped;
+    oldState.elytraEquipped = newState.validElytraEquipped;
     oldState.jumpTicks = newState.jumpTicks;
     oldState.jumpQueued = newState.jumpQueued;
     oldState.fireworkRocketDuration = newState.fireworkRocketDuration;

package/eslint.config.mjs

@@ -1,17 +1,17 @@
-import { defineConfig } from "eslint/config";
-import globals from "globals";
-import js from "@eslint/js";
-import tseslint from "typescript-eslint";
-
-export default defineConfig([
-  {
-    files: ["**/*.{ts,tsx}"], // Only check TypeScript files
-    languageOptions: { globals: globals.browser }
-  },
-  {
-    files: ["**/*.{ts,tsx}"], // Only check TypeScript files
-    plugins: { js },
-    extends: ["js/recommended"]
-  },
-  tseslint.configs.recommended,
-]);
+import { defineConfig } from "eslint/config";
+import globals from "globals";
+import js from "@eslint/js";
+import tseslint from "typescript-eslint";
+
+export default defineConfig([
+  {
+    files: ["**/*.{ts,tsx}"], // Only check TypeScript files
+    languageOptions: { globals: globals.browser }
+  },
+  {
+    files: ["**/*.{ts,tsx}"], // Only check TypeScript files
+    plugins: { js },
+    extends: ["js/recommended"]
+  },
+  tseslint.configs.recommended,
+]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxg-org/mineflayer-physics-util",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "description": "Provides functionality for more accurate entity and projectile tracking.",
   "keywords": [
     "mineflayer",
@@ -26,7 +26,7 @@
     "eslint": "^9.23.0",
     "expect": "^29.7.0",
     "globals": "^16.0.0",
-    "minecraft-data": "^3.83.1",
+    "minecraft-data": "^3.109.0",
     "mineflayer": "link:/home/genpc/github_stuff/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
     "mocha": "^11.1.0",