@nxg-org/mineflayer-physics-util 1.5.0 → 1.5.2

package/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "print.colourScheme": "GitHub"
+}

package/dist/index.d.ts

@@ -4,7 +4,6 @@ import { PhysicsUtilWrapper } from "./wrapper";
 declare module "mineflayer" {
     interface Bot {
         physicsUtil: PhysicsUtilWrapper;
-        registry: IndexedData;
     }
 }
 export default function loader(bot: Bot): void;

package/dist/physics/engines/entityPhysics.js

@@ -165,7 +165,7 @@ class EntityPhysics {
         const oldVelY = dy;
         let oldVelZ = dz;
         const oldOldVelZ = dz;
-        if (entity.useControls && entity.state.controlState.sneak && entity.state.onGround) {
+        if (entity.useControls && entity.state.control.sneak && entity.state.onGround) {
             const step = 0.05;
             // In the 3 loops bellow, y offset should be -1, but that doesnt reproduce vanilla behavior.
             for (; dx !== 0 && this.getSurroundingBBs(this.getEntityBB(entity, pos).translate(dx, 0, 0), world).length === 0; oldVelX = dx) {
@@ -293,7 +293,7 @@ class EntityPhysics {
             if (entity.collisionBehavior.blockEffects &&
                 blockAtFeet &&
                 blockAtFeet.type === this.slimeBlockId &&
-                !entity.state.controlState.sneak) {
+                !entity.state.control.sneak) {
                 vel.y = -vel.y;
             }
             else {
@@ -540,7 +540,7 @@ class EntityPhysics {
                 // setSprinting in LivingEntity.java
                 //TODO: Generalize to all entities.
                 playerSpeedAttribute = attributes.deleteAttributeModifier(playerSpeedAttribute, physicsSettings_1.PhysicsSettings.sprintingUUID); // always delete sprinting (if it exists)
-                if (entity.state.controlState.sprint) {
+                if (entity.state.control.sprint) {
                     if (!attributes.checkAttributeModifier(playerSpeedAttribute, physicsSettings_1.PhysicsSettings.sprintingUUID)) {
                         playerSpeedAttribute = attributes.addAttributeModifier(playerSpeedAttribute, {
                             uuid: physicsSettings_1.PhysicsSettings.sprintingUUID,
@@ -560,12 +560,12 @@ class EntityPhysics {
             if (entity.collisionBehavior.blockEffects && this.isOnLadder(pos, world)) {
                 vel.x = math.clamp(-physicsSettings_1.PhysicsSettings.ladderMaxSpeed, vel.x, physicsSettings_1.PhysicsSettings.ladderMaxSpeed);
                 vel.z = math.clamp(-physicsSettings_1.PhysicsSettings.ladderMaxSpeed, vel.z, physicsSettings_1.PhysicsSettings.ladderMaxSpeed);
-                vel.y = Math.max(vel.y, entity.state.controlState.sneak ? 0 : -physicsSettings_1.PhysicsSettings.ladderMaxSpeed);
+                vel.y = Math.max(vel.y, entity.state.control.sneak ? 0 : -physicsSettings_1.PhysicsSettings.ladderMaxSpeed);
             }
             this.moveEntity(entity, vel.x, vel.y, vel.z, world);
             if (entity.collisionBehavior.blockEffects &&
                 this.isOnLadder(pos, world) &&
-                (entity.state.isCollidedHorizontally || (this.supportFeature("climbUsingJump") && entity.state.controlState.jump))) {
+                (entity.state.isCollidedHorizontally || (this.supportFeature("climbUsingJump") && entity.state.control.jump))) {
                 vel.y = physicsSettings_1.PhysicsSettings.ladderClimbSpeed; // climb ladder
             }
             // Not adding an additional function call. No point.
@@ -647,7 +647,7 @@ class EntityPhysics {
         let forward = 0;
         // Handle inputs
         if (entity.useControls) {
-            if (entity.state.controlState.jump || entity.state.jumpQueued) {
+            if (entity.state.control.jump || entity.state.jumpQueued) {
                 if (entity.state.jumpTicks > 0)
                     entity.state.jumpTicks--;
                 if (entity.state.isInWater || entity.state.isInLava) {
@@ -660,7 +660,7 @@ class EntityPhysics {
                     if (entity.state.jumpBoost > 0) {
                         vel.y += 0.1 * entity.state.jumpBoost;
                     }
-                    if (entity.state.controlState.sprint) {
+                    if (entity.state.control.sprint) {
                         const yaw = Math.PI - entity.state.yaw;
                         vel.x -= Math.sin(yaw) * 0.2;
                         vel.z += Math.cos(yaw) * 0.2;
@@ -673,18 +673,18 @@ class EntityPhysics {
             }
             entity.state.jumpQueued = false;
             strafe =
-                (entity.state.controlState.left - entity.state.controlState.right) * 0.98;
+                (entity.state.control.left - entity.state.control.right) * 0.98;
             forward =
-                (entity.state.controlState.forward - entity.state.controlState.back) * 0.98;
-            if (entity.state.controlState.sneak) {
+                (entity.state.control.forward - entity.state.control.back) * 0.98;
+            if (entity.state.control.sneak) {
                 strafe *= physicsSettings_1.PhysicsSettings.sneakSpeed;
                 forward *= physicsSettings_1.PhysicsSettings.sneakSpeed;
-                entity.state.controlState.sprint = false;
+                entity.state.control.sprint = false;
             }
             if (entity.state.isUsingItem) {
                 strafe *= physicsSettings_1.PhysicsSettings.usingItemSpeed;
                 forward *= physicsSettings_1.PhysicsSettings.usingItemSpeed;
-                entity.state.controlState.sprint = false;
+                entity.state.control.sprint = false;
             }
         }
         this.moveEntityWithHeading(entity, strafe, forward, world);

package/dist/physics/player/playerControls.js

@@ -20,7 +20,7 @@ class ControlStateHandler {
         return new ControlStateHandler(bot.controlState.forward, bot.controlState.back, bot.controlState.left, bot.controlState.right, bot.controlState.jump, bot.controlState.sprint, bot.controlState.sneak);
     }
     static COPY_STATE(state) {
-        return new ControlStateHandler(state.controlState.forward, state.controlState.back, state.controlState.left, state.controlState.right, state.controlState.jump, state.controlState.sprint, state.controlState.sneak);
+        return new ControlStateHandler(state.control.forward, state.control.back, state.control.left, state.control.right, state.control.jump, state.control.sprint, state.control.sneak);
     }
     set(state, wanted) {
         this[state] = wanted;
@@ -86,7 +86,7 @@ class PlayerControls extends ControlStateHandler {
         return new PlayerControls(bot.controlState.forward, bot.controlState.back, bot.controlState.left, bot.controlState.right, bot.controlState.jump, bot.controlState.sprint, bot.controlState.sneak, bot.util.entity.isMainHandActive(), bot.util.entity.isOffHandActive(), bot.entity.yaw, bot.entity.pitch, false);
     }
     static COPY_STATE(state) {
-        return new PlayerControls(state.controlState.forward, state.controlState.back, state.controlState.left, state.controlState.right, state.controlState.jump, state.controlState.sprint, state.controlState.sneak, state.isUsingMainHand, state.isUsingOffHand, state.yaw, state.pitch, false);
+        return new PlayerControls(state.control.forward, state.control.back, state.control.left, state.control.right, state.control.jump, state.control.sprint, state.control.sneak, state.isUsingMainHand, state.isUsingOffHand, state.yaw, state.pitch, false);
     }
     clone() {
         return new PlayerControls(this.forward, this.back, this.left, this.right, this.jump, this.sprint, this.sneak, this.leftClick, this.rightClick, this.yaw, this.pitch, this.force);

package/dist/physics/settings/entityPhysicsCtx.js

@@ -43,8 +43,8 @@ class EPhysicsCtx {
             blockEffects: false,
             affectedAfterCollision: true,
         };
-        this.position = state.position;
-        this.velocity = state.velocity;
+        this.position = state.pos;
+        this.velocity = state.vel;
         if (entityType.type === "player" || !!EPhysicsCtx.mobData[entityType.id]) {
             // @ts-expect-error
             const additional = entity_physics_json_1.default.living_entities[entityType.type];
@@ -150,18 +150,18 @@ class EPhysicsCtx {
         return new EPhysicsCtx(this.ctx, this.state.pose, this.state.clone(), this.entityType);
     }
     get height() {
-        var _a;
+        var _a, _b;
         if (this.entityType.type === "player") {
-            return EPhysicsCtx.playerPoseContext[this.pose].height;
+            return EPhysicsCtx.playerPoseContext[(_a = this.pose) !== null && _a !== void 0 ? _a : 0].height;
         }
-        return (_a = this.entityType.height) !== null && _a !== void 0 ? _a : 0;
+        return (_b = this.entityType.height) !== null && _b !== void 0 ? _b : 0;
     }
     get width() {
-        var _a;
+        var _a, _b;
         if (this.entityType.type === "player") {
-            return EPhysicsCtx.playerPoseContext[this.pose].width;
+            return EPhysicsCtx.playerPoseContext[(_a = this.pose) !== null && _a !== void 0 ? _a : 0].width;
         }
-        return (_a = this.entityType.width) !== null && _a !== void 0 ? _a : 0;
+        return (_b = this.entityType.width) !== null && _b !== void 0 ? _b : 0;
     }
     getHalfWidth() {
         return this.width / 2;

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

@@ -9,11 +9,11 @@ import { IPhysics } from "../engines";
 export interface EntityStateBuilder {
     height: number;
     halfWidth: number;
-    position: Vec3;
-    velocity: Vec3;
+    pos: Vec3;
+    vel: Vec3;
     pitch: number;
     yaw: number;
-    controlState: ControlStateHandler;
+    control: ControlStateHandler;
     onGround: boolean;
     isUsingItem?: boolean;
     isInWater?: boolean;
@@ -35,12 +35,12 @@ export declare class EntityState implements EntityStateBuilder {
     ctx: IPhysics;
     height: number;
     halfWidth: number;
-    position: Vec3;
-    velocity: Vec3;
+    pos: Vec3;
+    vel: Vec3;
     onGround: boolean;
-    controlState: ControlStateHandler;
     yaw: number;
     pitch: number;
+    control: ControlStateHandler;
     age: number;
     isInWater: boolean;
     isInLava: boolean;
@@ -63,7 +63,7 @@ export declare class EntityState implements EntityStateBuilder {
     depthStrider: number;
     effects: Effect[];
     pose: PlayerPoses;
-    constructor(ctx: IPhysics, height: number, halfWidth: number, position: Vec3, velocity: Vec3, onGround: boolean, controlState: ControlStateHandler, yaw: number, pitch: number);
+    constructor(ctx: IPhysics, height: number, halfWidth: number, pos: Vec3, vel: Vec3, onGround: boolean, yaw: number, pitch: number, control?: ControlStateHandler);
     static CREATE_FROM_BOT(ctx: IPhysics, bot: Bot): EntityState;
     static CREATE_FROM_ENTITY(ctx: IPhysics, entity: Entity): EntityState;
     static CREATE_FROM_PLAYER_STATE(ctx: IPhysics, state: PlayerState): EntityState;

package/dist/physics/states/entityState.js

@@ -14,16 +14,16 @@ const emptyVec = new vec3_1.Vec3(0, 0, 0);
 class EntityState {
     // public effects: Effect[];
     // public statusEffectNames;
-    constructor(ctx, height, halfWidth, position, velocity, onGround, controlState, yaw, pitch) {
+    constructor(ctx, height, halfWidth, pos, vel, onGround, yaw, pitch, control = playerControls_1.ControlStateHandler.DEFAULT()) {
         this.ctx = ctx;
         this.height = height;
         this.halfWidth = halfWidth;
-        this.position = position;
-        this.velocity = velocity;
+        this.pos = pos;
+        this.vel = vel;
         this.onGround = onGround;
-        this.controlState = controlState;
         this.yaw = yaw;
         this.pitch = pitch;
+        this.control = control;
         // may keep this, may not. Who knows?
         this.age = 0;
         this.isInWater = false;
@@ -52,13 +52,13 @@ class EntityState {
         this.pose = poses_1.PlayerPoses.STANDING;
     }
     static CREATE_FROM_BOT(ctx, bot) {
-        return new EntityState(ctx, bot.entity.height, bot.entity.width / 2, bot.entity.position.clone(), bot.entity.velocity.clone(), bot.entity.onGround, playerControls_1.ControlStateHandler.COPY_BOT(bot), bot.entity.yaw, bot.entity.pitch).updateFromBot(bot);
+        return new EntityState(ctx, bot.entity.height, bot.entity.width / 2, bot.entity.position.clone(), bot.entity.velocity.clone(), bot.entity.onGround, bot.entity.yaw, bot.entity.pitch, playerControls_1.ControlStateHandler.COPY_BOT(bot)).updateFromBot(bot);
     }
     static CREATE_FROM_ENTITY(ctx, entity) {
-        return new EntityState(ctx, entity.height, entity.width / 2, entity.position.clone(), entity.velocity.clone(), entity.onGround, playerControls_1.ControlStateHandler.DEFAULT(), entity.yaw, entity.pitch).updateFromEntity(entity);
+        return new EntityState(ctx, entity.height, entity.width / 2, entity.position.clone(), entity.velocity.clone(), entity.onGround, entity.yaw, entity.pitch, playerControls_1.ControlStateHandler.DEFAULT()).updateFromEntity(entity);
     }
     static CREATE_FROM_PLAYER_STATE(ctx, state) {
-        return new EntityState(ctx, state.height, state.halfWidth, state.position.clone(), state.velocity.clone(), state.onGround, state.controlState.clone(), state.yaw, state.pitch).updateFromRaw(state);
+        return new EntityState(ctx, state.height, state.halfWidth, state.pos.clone(), state.vel.clone(), state.onGround, state.yaw, state.pitch, state.control.clone()).updateFromRaw(state);
     }
     /**
      * Slightly different from the other two, use a pre-built object (assuming cloned) material.
@@ -67,11 +67,11 @@ class EntityState {
      * @returns PhysicsState
      */
     static CREATE_RAW(ctx, raw) {
-        return new EntityState(ctx, raw.height, raw.halfWidth, raw.position, raw.velocity, raw.onGround, raw.controlState, raw.yaw, raw.pitch);
+        return new EntityState(ctx, raw.height, raw.halfWidth, raw.pos, raw.vel, raw.onGround, raw.yaw, raw.pitch, raw.control);
     }
     updateFromBot(bot) {
         this.updateFromEntity(bot.entity, true);
-        this.controlState = playerControls_1.ControlStateHandler.COPY_BOT(bot);
+        this.control = playerControls_1.ControlStateHandler.COPY_BOT(bot);
         this.jumpTicks = bot.jumpTicks;
         this.jumpQueued = bot.jumpQueued;
         return this;
@@ -80,7 +80,7 @@ class EntityState {
         var _a, _b;
         if (all) {
             // most mobs don't have this defined, so ignore it (only self does).
-            this.velocity = entity.velocity.clone();
+            this.vel = entity.velocity.clone();
             this.onGround = entity.onGround;
             this.isInWater = entity.isInWater;
             this.isInLava = entity.isInLava;
@@ -90,14 +90,14 @@ class EntityState {
             this.sneakCollision = false; //TODO
             this.attributes || (this.attributes = entity.attributes);
         }
-        this.position = entity.position.clone();
+        this.pos = entity.position.clone();
         //not sure what to do here, ngl.
         this.jumpTicks || (this.jumpTicks = 0);
         this.jumpQueued || (this.jumpQueued = false);
         // Input only (not modified)
         this.yaw = entity.yaw;
         this.pitch = entity.pitch;
-        this.controlState || (this.controlState = playerControls_1.ControlStateHandler.DEFAULT());
+        this.control || (this.control = playerControls_1.ControlStateHandler.DEFAULT());
         this.isUsingItem = (0, physicsUtils_1.isEntityUsingItem)(entity);
         this.isUsingMainHand = !(0, physicsUtils_1.whichHandIsEntityUsingBoolean)(entity) && this.isUsingItem;
         this.isUsingOffHand = (0, physicsUtils_1.whichHandIsEntityUsingBoolean)(entity) && this.isUsingItem;
@@ -139,20 +139,20 @@ class EntityState {
         return this;
     }
     applyToBot(bot) {
-        bot.entity.position.set(this.position.x, this.position.y, this.position.z);
-        bot.entity.velocity.set(this.velocity.x, this.velocity.y, this.velocity.z);
+        bot.entity.position.set(this.pos.x, this.pos.y, this.pos.z);
+        bot.entity.velocity.set(this.vel.x, this.vel.y, this.vel.z);
         bot.entity.onGround = this.onGround;
         bot.entity.yaw = this.yaw;
         bot.entity.pitch = this.pitch;
-        bot.controlState = this.controlState;
+        bot.controlState = this.control;
         return this;
     }
     /**
      * No idea when you'd use this.
      */
     applyToEntity(entity) {
-        entity.position = this.position;
-        entity.velocity = this.velocity;
+        entity.position = this.pos;
+        entity.velocity = this.vel;
         // 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;
@@ -161,7 +161,7 @@ class EntityState {
         return this;
     }
     clone() {
-        const other = new EntityState(this.ctx, this.height, this.halfWidth, this.position.clone(), this.velocity.clone(), this.onGround, this.controlState.clone(), this.yaw, this.pitch);
+        const other = new EntityState(this.ctx, this.height, this.halfWidth, this.pos.clone(), this.vel.clone(), this.onGround, this.yaw, this.pitch, this.control.clone());
         other.age = this.age;
         other.isCollidedHorizontally = this.isCollidedHorizontally;
         other.isCollidedVertically = this.isCollidedVertically;
@@ -188,8 +188,8 @@ class EntityState {
     }
     merge(other) {
         this.age = other.age;
-        this.position = other.position.clone();
-        this.velocity = other.velocity.clone();
+        this.pos = other.pos.clone();
+        this.vel = other.vel.clone();
         this.onGround = other.onGround;
         this.isCollidedHorizontally = other.isCollidedHorizontally;
         this.isCollidedVertically = other.isCollidedVertically;
@@ -215,7 +215,7 @@ class EntityState {
         return this;
     }
     clearControlStates() {
-        this.controlState = playerControls_1.ControlStateHandler.DEFAULT();
+        this.control = playerControls_1.ControlStateHandler.DEFAULT();
         return this;
     }
     /**
@@ -224,7 +224,7 @@ class EntityState {
      */
     getAABB() {
         const w = this.halfWidth;
-        return new mineflayer_util_plugin_1.AABB(this.position.x - w, this.position.y, this.position.z - w, this.position.x + w, this.position.y + this.height, this.position.z + w);
+        return new mineflayer_util_plugin_1.AABB(this.pos.x - w, this.pos.y, this.pos.z - w, this.pos.x + w, this.pos.y + this.height, this.pos.z + w);
     }
     getUnderlyingBlockBBs(world /*prismarine-world*/) {
         const queryBB = this.getAABB();

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

@@ -26,8 +26,8 @@ export declare class PlayerState implements EntityStateBuilder {
     readonly bot: Bot;
     height: number;
     halfWidth: number;
-    position: Vec3;
-    velocity: Vec3;
+    pos: Vec3;
+    vel: Vec3;
     onGround: boolean;
     isInWater: boolean;
     isInLava: boolean;
@@ -40,7 +40,7 @@ export declare class PlayerState implements EntityStateBuilder {
     attributes: any;
     yaw: number;
     pitch: number;
-    controlState: ControlStateHandler;
+    control: ControlStateHandler;
     isUsingItem: boolean;
     isUsingMainHand: boolean;
     isUsingOffHand: boolean;

package/dist/physics/states/playerState.js

@@ -73,8 +73,8 @@ class PlayerState {
         this.supportFeature = (0, physicsUtils_1.makeSupportFeature)(ctx.data);
         this.ctx = ctx;
         this.bot = bot;
-        this.position = bot.entity.position.clone();
-        this.velocity = bot.entity.velocity.clone();
+        this.pos = bot.entity.position.clone();
+        this.vel = bot.entity.velocity.clone();
         this.onGround = bot.entity.onGround;
         this.isInWater = bot.entity.isInWater;
         this.isInLava = bot.entity.isInLava;
@@ -89,7 +89,7 @@ class PlayerState {
         this.attributes = bot.entity.attributes;
         this.yaw = bot.entity.yaw;
         this.pitch = bot.entity.pitch;
-        this.controlState = control !== null && control !== void 0 ? control : playerControls_1.ControlStateHandler.DEFAULT();
+        this.control = control !== null && control !== void 0 ? control : playerControls_1.ControlStateHandler.DEFAULT();
         this.isUsingItem = (0, physicsUtils_1.isEntityUsingItem)(bot.entity);
         this.isUsingMainHand = !(0, physicsUtils_1.whichHandIsEntityUsingBoolean)(bot.entity) && this.isUsingItem;
         this.isUsingOffHand = (0, physicsUtils_1.whichHandIsEntityUsingBoolean)(bot.entity) && this.isUsingItem;
@@ -124,8 +124,8 @@ class PlayerState {
         var _a, _b, _c, _d;
         // const bot.entity = bot instanceof bot.entity ? bot : bot.entity;
         // Input / Outputs
-        this.position = bot.entity.position.clone();
-        this.velocity = bot.entity.velocity.clone();
+        this.pos = bot.entity.position.clone();
+        this.vel = bot.entity.velocity.clone();
         this.onGround = bot.entity.onGround;
         this.isInWater = bot.entity.isInWater;
         this.isInLava = bot.entity.isInLava;
@@ -139,7 +139,7 @@ class PlayerState {
         this.attributes = bot.entity.attributes;
         this.yaw = bot.entity.yaw;
         this.pitch = bot.entity.pitch;
-        this.controlState = control !== null && control !== void 0 ? control : this.controlState;
+        this.control = control !== null && control !== void 0 ? control : this.control;
         this.isUsingItem = (0, physicsUtils_1.isEntityUsingItem)(bot.entity);
         this.isUsingMainHand = !(0, physicsUtils_1.whichHandIsEntityUsingBoolean)(bot.entity) && this.isUsingItem;
         this.isUsingOffHand = (0, physicsUtils_1.whichHandIsEntityUsingBoolean)(bot.entity) && this.isUsingItem;
@@ -166,8 +166,8 @@ class PlayerState {
     }
     apply(bot) {
         // const bot.entity = bot instanceof bot.entity ? bot : bot.entity;
-        bot.entity.position = this.position;
-        bot.entity.velocity = this.velocity;
+        bot.entity.position = this.pos;
+        bot.entity.velocity = this.vel;
         bot.entity.onGround = this.onGround;
         bot.entity.isInWater = this.isInWater;
         bot.entity.isInLava = this.isInLava;
@@ -179,13 +179,13 @@ class PlayerState {
         bot.jumpQueued = this.jumpQueued;
         bot.entity.yaw = this.yaw;
         bot.entity.pitch = this.pitch;
-        bot.controlState = this.controlState;
+        bot.controlState = this.control;
     }
     clone() {
         var _a, _b;
-        const tmp = new PlayerState(this.ctx, this.bot, this.controlState);
-        tmp.position = this.position.clone();
-        tmp.velocity = this.velocity.clone();
+        const tmp = new PlayerState(this.ctx, this.bot, this.control);
+        tmp.pos = this.pos.clone();
+        tmp.vel = this.vel.clone();
         tmp.onGround = this.onGround;
         tmp.isInWater = this.isInWater;
         tmp.isInLava = this.isInLava;
@@ -200,7 +200,7 @@ class PlayerState {
         tmp.attributes = this.attributes;
         tmp.yaw = this.yaw;
         tmp.pitch = this.pitch;
-        tmp.controlState = this.controlState;
+        tmp.control = this.control;
         tmp.isUsingItem = this.isUsingItem;
         tmp.isUsingMainHand = this.isUsingMainHand;
         tmp.isUsingOffHand = this.isUsingOffHand;
@@ -218,8 +218,8 @@ class PlayerState {
     }
     merge(other) {
         var _a, _b;
-        this.position = other.position.clone();
-        this.velocity = other.velocity.clone();
+        this.pos = other.pos.clone();
+        this.vel = other.vel.clone();
         this.onGround = other.onGround;
         this.isInWater = other.isInWater;
         this.isInLava = other.isInLava;
@@ -234,7 +234,7 @@ class PlayerState {
         this.attributes = other.attributes;
         this.yaw = other.yaw;
         this.pitch = other.pitch;
-        this.controlState = other.controlState.clone();
+        this.control = other.control.clone();
         this.isUsingItem = other.isUsingItem;
         this.isUsingMainHand = other.isUsingMainHand;
         this.isUsingOffHand = other.isUsingOffHand;
@@ -251,12 +251,12 @@ class PlayerState {
         return this;
     }
     clearControlStates() {
-        this.controlState = defaultMoves;
+        this.control = defaultMoves;
         return this;
     }
     getAABB() {
         const w = this.halfWidth;
-        return new mineflayer_util_plugin_1.AABB(this.position.x - w, this.position.y, this.position.z - w, this.position.x + w, this.position.y + this.height, this.position.z + w);
+        return new mineflayer_util_plugin_1.AABB(this.pos.x - w, this.pos.y, this.pos.z - w, this.pos.x + w, this.pos.y + this.height, this.pos.z + w);
     }
     getUnderlyingBlockBBs(world /*prismarine-world*/) {
         const queryBB = this.getAABB();

package/dist/simulators/baseSimulator.d.ts

@@ -7,7 +7,7 @@ import { Vec3 } from "vec3";
 export declare type SimulationGoal = (state: EntityState, ticks: number) => boolean | ((state: EntityState) => boolean);
 export declare type OnGoalReachFunction = (state: EntityState) => void;
 export declare type Controller = (state: EntityState, ticks: number) => void;
-export declare abstract class BaseSimulator {
+export declare class BaseSimulator {
     readonly ctx: IPhysics;
     constructor(ctx: IPhysics);
     predictGenerator(simCtx: EPhysicsCtx, world: any, ticks?: number, controls?: ControlStateHandler): Generator<EntityState, EPhysicsCtx, unknown>;

package/dist/simulators/baseSimulator.js

@@ -7,7 +7,7 @@ class BaseSimulator {
         this.ctx = ctx;
     }
     *predictGenerator(simCtx, world, ticks = 1, controls) {
-        simCtx.state.controlState = controls !== null && controls !== void 0 ? controls : simCtx.state.controlState;
+        simCtx.state.control = controls !== null && controls !== void 0 ? controls : simCtx.state.control;
         for (let current = 0; current < ticks; current++) {
             yield this.ctx.simulate(simCtx, world);
         }
@@ -15,14 +15,14 @@ class BaseSimulator {
     }
     predictForward(target, world, ticks = 1, controls) {
         const simCtx = settings_1.EPhysicsCtx.FROM_ENTITY(this.ctx, target);
-        simCtx.state.controlState = controls !== null && controls !== void 0 ? controls : simCtx.state.controlState;
+        simCtx.state.control = controls !== null && controls !== void 0 ? controls : simCtx.state.control;
         for (let current = 0; current < ticks; current++) {
             this.ctx.simulate(simCtx, world);
         }
         return simCtx.state;
     }
     predictForwardRaw(simCtx, world, ticks = 1, controls) {
-        simCtx.state.controlState = controls !== null && controls !== void 0 ? controls : simCtx.state.controlState;
+        simCtx.state.control = controls !== null && controls !== void 0 ? controls : simCtx.state.control;
         for (let current = 0; current < ticks; current++) {
             this.ctx.simulate(simCtx, world);
         }
@@ -34,8 +34,6 @@ class BaseSimulator {
                 onGoalReach(simCtx.state);
                 break;
             }
-            if (simCtx.state.isInLava)
-                break;
             controller(simCtx.state, i);
             this.ctx.simulate(simCtx, world);
             simCtx.state.age++;
@@ -44,7 +42,7 @@ class BaseSimulator {
     }
     static getReached(...path) {
         return (state) => {
-            const delta = path[0].minus(state.position);
+            const delta = path[0].minus(state.pos);
             return Math.abs(delta.x) <= 0.35 && Math.abs(delta.z) <= 0.35 && Math.abs(delta.y) < 1 && (state.onGround || state.isInWater);
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nxg-org/mineflayer-physics-util",
-    "version": "1.5.0",
+    "version": "1.5.2",
     "description": "Provides functionality for more accurate entity and projectile tracking.",
     "keywords": [
         "mineflayer",
@@ -24,7 +24,10 @@
         "@nxg-org/mineflayer-util-plugin": "^1.7.11"
     },
     "devDependencies": {
-        "mineflayer": "^4.6.0",
+        "expect": "^29.5.0",
+        "mineflayer": "^4.9.0",
+        "mineflayer-pathfinder": "^2.4.4",
+        "prismarine-physics": "^1.6.0",
         "typescript": "^4.5.5"
     }
 }

package/tests/actualBot.ts

@@ -0,0 +1,61 @@
+import {pathfinder, goals} from 'mineflayer-pathfinder'
+import { Bot, createBot } from 'mineflayer'
+import loader, { EntityPhysics, EntityState, EPhysicsCtx } from '../src/index'
+
+
+const {Physics} = require('prismarine-physics')
+
+const bot: Bot = createBot({
+    host: process.argv[2],
+    port: Number(process.argv[3]),
+    username: "testingbot"
+})
+
+bot.once('spawn', () => {
+    bot.loadPlugin(loader)
+    bot.loadPlugin(pathfinder)
+})
+
+
+bot.on("chat", (user, message) => {
+    const [cmd, ...args] = message.split(' ')
+    const author = bot.nearestEntity(e=>e.username===user);
+
+
+
+    switch (cmd) {
+        case "original":
+            bot.physics = new Physics(bot.registry, bot.world);
+            break;
+        case "new":
+            // rough patching in custom physics for the time being.
+            const fuck0 =  new EntityPhysics(bot.registry)
+            bot.physics = fuck0 as any;
+            (bot.physics as any).simulatePlayer = (state: EntityState, world: any /* prismarine-world*/) =>  {
+                const entity = EPhysicsCtx.FROM_ENTITY_STATE(fuck0, state)
+                return fuck0.simulate(entity, world);
+            }
+            break;
+        case "come":
+            if (!author) return bot.chat(`Cannot see ${user}!`);
+            const goal0 = new goals.GoalNear(author.position.x, author.position.y, author.position.z, 3);
+            bot.pathfinder.setGoal(goal0);
+            break;
+        case "goto":
+            if (!author) return bot.chat(`Cannot see ${user}!`);
+            const goal1 = new goals.GoalNear(Number(args[0]), Number(args[1]), Number(args[2]), 3);
+            bot.pathfinder.setGoal(goal1);
+            break;
+        case "stop":
+            bot.pathfinder.stop();
+            bot.chat('Stopped!')
+            break;
+        
+
+
+
+
+    }
+
+
+})