@nxg-org/mineflayer-physics-util 1.8.17 → 1.8.19

package/dist/index.d.ts

@@ -14,3 +14,4 @@ export { EntityPhysics, BotcraftPhysics } from "./physics/engines";
 export { EntityState, PlayerState, PlayerPoses, IEntityState } from "./physics/states";
 export { ControlStateHandler } from "./physics/player";
 export type { SimulationGoal, Controller, OnGoalReachFunction } from "./simulators";
+export { convertPlayerState, applyToPlayerState } from "./util/physicsUtils";

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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 = void 0;
 exports.default = loader;
 exports.initSetup = initSetup;
 const settings_1 = require("./physics/settings");
@@ -28,3 +28,6 @@ Object.defineProperty(exports, "PlayerState", { enumerable: true, get: function
 Object.defineProperty(exports, "PlayerPoses", { enumerable: true, get: function () { return states_1.PlayerPoses; } });
 var player_1 = require("./physics/player");
 Object.defineProperty(exports, "ControlStateHandler", { enumerable: true, get: function () { return player_1.ControlStateHandler; } });
+var physicsUtils_1 = require("./util/physicsUtils");
+Object.defineProperty(exports, "convertPlayerState", { enumerable: true, get: function () { return physicsUtils_1.convertPlayerState; } });
+Object.defineProperty(exports, "applyToPlayerState", { enumerable: true, get: function () { return physicsUtils_1.applyToPlayerState; } });

package/dist/util/physicsUtils.d.ts

@@ -2,7 +2,10 @@ import { Entity } from "prismarine-entity";
 import { EPhysicsCtx } from "../physics/settings";
 import { AABB } from "@nxg-org/mineflayer-util-plugin";
 import md from "minecraft-data";
+import { PlayerState } from "../physics/states";
 import { Vec3 } from "vec3";
+import { IPhysics } from "../physics/engines";
+import { Bot } from "mineflayer";
 export declare function makeSupportFeature(mcData: md.IndexedData): (feature: string) => boolean;
 type SupportFeature = ReturnType<typeof makeSupportFeature>;
 export declare const DefaultPlayer: md.Entity;
@@ -54,4 +57,19 @@ export declare function getLookingVector(entity: {
     lookZ: number;
     lookDir: Vec3;
 };
+/**
+ * Converts an old PlayerState object into the new PlayerState class format.
+ * * @param bot The current Mineflayer bot instance.
+ * @param oldState The old PlayerState object to migrate.
+ * @param ctx The IPhysics context required by the new PlayerState constructor.
+ * @returns A newly formatted PlayerState instance.
+ */
+export declare function convertPlayerState(bot: Bot, oldState: any, ctx: IPhysics): PlayerState;
+/**
+ * Applies the values of the new PlayerState class back onto an old PlayerState object.
+ * This updates the oldState in-place.
+ * * @param newState The current, updated instance of the new PlayerState class.
+ * @param oldState The old PlayerState object to be overwritten.
+ */
+export declare function applyToPlayerState(newState: PlayerState, oldState: any): void;
 export {};

package/dist/util/physicsUtils.js

@@ -13,8 +13,11 @@ exports.getStatusEffectNamesForVersion = getStatusEffectNamesForVersion;
 exports.getEnchantmentNamesForVersion = getEnchantmentNamesForVersion;
 exports.getBetweenRectangle = getBetweenRectangle;
 exports.getLookingVector = getLookingVector;
+exports.convertPlayerState = convertPlayerState;
+exports.applyToPlayerState = applyToPlayerState;
 const mineflayer_util_plugin_1 = require("@nxg-org/mineflayer-util-plugin");
 const features_json_1 = __importDefault(require("../physics/info/features.json"));
+const states_1 = require("../physics/states");
 const vec3_1 = require("vec3");
 function makeSupportFeature(mcData) {
     return (feature) => features_json_1.default.some(({ name, versions }) => name === feature && versions.includes(mcData.version.majorVersion));
@@ -166,3 +169,107 @@ function getLookingVector(entity) {
         lookDir
     };
 }
+/**
+ * Converts an old PlayerState object into the new PlayerState class format.
+ * * @param bot The current Mineflayer bot instance.
+ * @param oldState The old PlayerState object to migrate.
+ * @param ctx The IPhysics context required by the new PlayerState constructor.
+ * @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;
+    // 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);
+    // 2. Overwrite spatial and velocity data with the old simulated state
+    if (oldState.pos)
+        newState.pos.set(oldState.pos.x, oldState.pos.y, oldState.pos.z);
+    if (oldState.vel)
+        newState.vel.set(oldState.vel.x, oldState.vel.y, oldState.vel.z);
+    // 3. Map collision and environment flags
+    newState.onGround = (_a = oldState.onGround) !== null && _a !== void 0 ? _a : newState.onGround;
+    newState.isInWater = (_b = oldState.isInWater) !== null && _b !== void 0 ? _b : newState.isInWater;
+    newState.isInLava = (_c = oldState.isInLava) !== null && _c !== void 0 ? _c : newState.isInLava;
+    newState.isInWeb = (_d = oldState.isInWeb) !== null && _d !== void 0 ? _d : newState.isInWeb;
+    newState.isCollidedHorizontally = (_e = oldState.isCollidedHorizontally) !== null && _e !== void 0 ? _e : newState.isCollidedHorizontally;
+    newState.isCollidedVertically = (_f = oldState.isCollidedVertically) !== null && _f !== void 0 ? _f : newState.isCollidedVertically;
+    // 4. Map movement and action states
+    newState.elytraFlying = (_g = oldState.elytraFlying) !== null && _g !== void 0 ? _g : newState.elytraFlying;
+    newState.elytraEquipped = (_h = oldState.elytraEquipped) !== null && _h !== void 0 ? _h : newState.elytraEquipped;
+    newState.jumpTicks = (_j = oldState.jumpTicks) !== null && _j !== void 0 ? _j : newState.jumpTicks;
+    newState.jumpQueued = (_k = oldState.jumpQueued) !== null && _k !== void 0 ? _k : newState.jumpQueued;
+    newState.fireworkRocketDuration = (_l = oldState.fireworkRocketDuration) !== null && _l !== void 0 ? _l : newState.fireworkRocketDuration;
+    newState.yaw = (_m = oldState.yaw) !== null && _m !== void 0 ? _m : newState.yaw;
+    newState.pitch = (_o = oldState.pitch) !== null && _o !== void 0 ? _o : newState.pitch;
+    // 5. Map Control State
+    // The old state uses a standard object for controls; the new uses ControlStateHandler.
+    if (oldState.control) {
+        // Create a fresh clone of the bot's current controls, then overwrite with simulated ones
+        newState.control = states_1.ControlStateHandler.COPY_BOT(bot);
+        Object.assign(newState.control, oldState.control);
+    }
+    // 6. Map Attributes, Effects, and Enchantments
+    newState.attributes = (_p = oldState.attributes) !== null && _p !== void 0 ? _p : newState.attributes;
+    newState.jumpBoost = (_q = oldState.jumpBoost) !== null && _q !== void 0 ? _q : newState.jumpBoost;
+    newState.speed = (_r = oldState.speed) !== null && _r !== void 0 ? _r : newState.speed;
+    newState.slowness = (_s = oldState.slowness) !== null && _s !== void 0 ? _s : newState.slowness;
+    newState.dolphinsGrace = (_t = oldState.dolphinsGrace) !== null && _t !== void 0 ? _t : newState.dolphinsGrace;
+    newState.slowFalling = (_u = oldState.slowFalling) !== null && _u !== void 0 ? _u : newState.slowFalling;
+    newState.levitation = (_v = oldState.levitation) !== null && _v !== void 0 ? _v : newState.levitation;
+    newState.depthStrider = (_w = oldState.depthStrider) !== null && _w !== void 0 ? _w : newState.depthStrider;
+    return newState;
+}
+/**
+ * Applies the values of the new PlayerState class back onto an old PlayerState object.
+ * This updates the oldState in-place.
+ * * @param newState The current, updated instance of the new PlayerState class.
+ * @param oldState The old PlayerState object to be overwritten.
+ */
+function applyToPlayerState(newState, oldState) {
+    // 1. Update Spatial and Velocity Data
+    // Using .set() preserves the original Vec3 object reference in the old state.
+    if (oldState.pos && newState.pos) {
+        oldState.pos.set(newState.pos.x, newState.pos.y, newState.pos.z);
+    }
+    if (oldState.vel && newState.vel) {
+        oldState.vel.set(newState.vel.x, newState.vel.y, newState.vel.z);
+    }
+    // 2. Map Environment & Collision Flags
+    oldState.onGround = newState.onGround;
+    oldState.isInWater = newState.isInWater;
+    oldState.isInLava = newState.isInLava;
+    oldState.isInWeb = newState.isInWeb;
+    oldState.isCollidedHorizontally = newState.isCollidedHorizontally;
+    oldState.isCollidedVertically = newState.isCollidedVertically;
+    // 3. Map Movement & Actions
+    oldState.elytraFlying = newState.elytraFlying;
+    oldState.elytraEquipped = newState.elytraEquipped;
+    oldState.jumpTicks = newState.jumpTicks;
+    oldState.jumpQueued = newState.jumpQueued;
+    oldState.fireworkRocketDuration = newState.fireworkRocketDuration;
+    oldState.yaw = newState.yaw;
+    oldState.pitch = newState.pitch;
+    // 4. Downgrade Control State
+    // Extracts standard booleans from the ControlStateHandler so the old state 
+    // doesn't accidentally inherit class methods.
+    if (newState.control) {
+        oldState.control = {
+            forward: newState.control.forward,
+            back: newState.control.back,
+            left: newState.control.left,
+            right: newState.control.right,
+            jump: newState.control.jump,
+            sprint: newState.control.sprint,
+            sneak: newState.control.sneak
+        };
+    }
+    // 5. Map Attributes, Effects, and Enchantments
+    oldState.attributes = newState.attributes;
+    oldState.jumpBoost = newState.jumpBoost;
+    oldState.speed = newState.speed;
+    oldState.slowness = newState.slowness;
+    oldState.dolphinsGrace = newState.dolphinsGrace;
+    oldState.slowFalling = newState.slowFalling;
+    oldState.levitation = newState.levitation;
+    oldState.depthStrider = newState.depthStrider;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nxg-org/mineflayer-physics-util",
-    "version": "1.8.17",
+    "version": "1.8.19",
     "description": "Provides functionality for more accurate entity and projectile tracking.",
     "keywords": [
         "mineflayer",