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

package/dist/physics/states/playerState.js

@@ -98,6 +98,15 @@ class PlayerState {
         // console.trace('set sprinting', value)
         this._sprinting = value;
     }
+    /**
+     * Deprecated compatibility alias for fallFlying.
+     */
+    get elytraFlying() {
+        return this.fallFlying;
+    }
+    set elytraFlying(value) {
+        this.fallFlying = value;
+    }
     get onGroundWithoutSupportingBlock() {
         return this.onGround && !this.supportingBlockPos;
     }
@@ -126,13 +135,13 @@ class PlayerState {
     constructor(ctx, bot, control) {
         this.age = 0;
         this.onGround = false;
+        this.lastOnGround = false;
         this.onClimbable = false;
         this.isInWater = false;
         this.isUnderWater = false;
         this.isInLava = false;
         this.isUnderLava = false;
         this.isInWeb = false;
-        this.elytraFlying = false;
         this.elytraEquipped = false;
         this.fireworkRocketDuration = 0;
         this.isCollidedHorizontally = false;
@@ -207,30 +216,30 @@ 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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
         // 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);
         this.vel.set(bot.entity.velocity.x, bot.entity.velocity.y, bot.entity.velocity.z);
         this.supportingBlockPos = (_a = bot.entity.supportingBlockPos) !== null && _a !== void 0 ? _a : null;
         this.onGround = bot.entity.onGround;
+        this.lastOnGround = (_b = bot.entity.lastOnGround) !== null && _b !== void 0 ? _b : bot.entity.onGround;
         this.onClimbable = bot.entity.onClimbable;
         this.isInWater = bot.entity.isInWater;
         this.isUnderWater = bot.entity.isUnderWater;
         this.isInLava = bot.entity.isInLava;
         this.isUnderLava = bot.entity.isUnderLava;
         this.isInWeb = bot.entity.isInWeb;
-        this.elytraFlying = bot.entity.elytraFlying;
-        this.elytraEquipped = ((_b = bot.inventory.slots[bot.getEquipmentDestSlot('torso')]) === null || _b === void 0 ? void 0 : _b.name) === 'elytra';
+        this.elytraEquipped = ((_c = bot.inventory.slots[bot.getEquipmentDestSlot('torso')]) === null || _c === void 0 ? void 0 : _c.name) === 'elytra';
         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 = (_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;
+        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;
         // Input only (not modified)
         this.attributes = bot.entity.attributes;
         this.yaw = bot.entity.yaw;
@@ -252,7 +261,7 @@ class PlayerState {
         const boots = bot.entity.equipment[5];
         if (boots && boots.nbt) {
             const simplifiedNbt = nbt.simplify(boots.nbt);
-            const enchantments = (_h = (_g = simplifiedNbt.Enchantments) !== null && _g !== void 0 ? _g : simplifiedNbt.ench) !== null && _h !== void 0 ? _h : [];
+            const enchantments = (_j = (_h = simplifiedNbt.Enchantments) !== null && _h !== void 0 ? _h : simplifiedNbt.ench) !== null && _j !== void 0 ? _j : [];
             this.depthStrider = this.ctx.getEnchantmentLevel(physicsUtils_1.CheapEnchantments.DEPTH_STRIDER, enchantments);
             this.soulSpeed = this.ctx.getEnchantmentLevel(physicsUtils_1.CheapEnchantments.SOUL_SPEED, enchantments);
         }
@@ -263,7 +272,7 @@ class PlayerState {
         const leggings = bot.entity.equipment[3];
         if (leggings && leggings.nbt) {
             const simplifiedNbt = nbt.simplify(leggings.nbt);
-            const enchantments = (_k = (_j = simplifiedNbt.Enchantments) !== null && _j !== void 0 ? _j : simplifiedNbt.ench) !== null && _k !== void 0 ? _k : [];
+            const enchantments = (_l = (_k = simplifiedNbt.Enchantments) !== null && _k !== void 0 ? _k : simplifiedNbt.ench) !== null && _l !== void 0 ? _l : [];
             this.swiftSneak = this.ctx.getEnchantmentLevel(physicsUtils_1.CheapEnchantments.SWIFT_SNEAK, enchantments);
         }
         else {
@@ -273,10 +282,10 @@ class PlayerState {
         this.gameMode = bot.game.gameMode;
         this.food = bot.food;
         // TODO:
-        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 = (_p = bot.entity.fallFlying) !== null && _p !== void 0 ? _p : false;
+        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;
         switch (bot.game.gameMode) {
             case "creative":
                 this.flySpeed = 0.05;
@@ -298,18 +307,18 @@ class PlayerState {
         return this;
     }
     apply(bot) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         // const bot.entity = bot instanceof bot.entity ? bot : bot.entity;
         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.lastOnGround = this.lastOnGround;
         bot.entity.onClimbable = this.onClimbable;
         bot.entity.isInWater = this.isInWater;
         bot.entity.isUnderWater = this.isUnderWater;
         bot.entity.isInLava = this.isInLava;
         bot.entity.isUnderLava = this.isUnderLava;
         bot.entity.isInWeb = this.isInWeb;
-        bot.entity.elytraFlying = this.elytraFlying;
         bot.entity.elytraEquipped = this.elytraEquipped;
         bot.fireworkRocketDuration = this.fireworkRocketDuration;
         bot.entity.isCollidedHorizontally = this.isCollidedHorizontally;
@@ -330,7 +339,8 @@ class PlayerState {
         bot.entity.swimming = (_b = this.swimming) !== null && _b !== void 0 ? _b : false;
         bot.entity.sprinting = (_c = this.sprinting) !== null && _c !== void 0 ? _c : false;
         bot.entity.crouching = (_d = this.crouching) !== null && _d !== void 0 ? _d : false;
-        bot.entity.fallFlying = (_e = this.fallFlying) !== null && _e !== void 0 ? _e : false;
+        bot.entity.fallFlying = this.fallFlying;
+        bot.entity.elytraFlying = this.fallFlying;
         bot.entity.attributes = this.attributes;
         this.control.applyControls(bot);
         bot.entity.prevControl = this.prevControl;
@@ -341,13 +351,13 @@ class PlayerState {
         tmp.pos.set(this.pos.x, this.pos.y, this.pos.z);
         tmp.vel.set(this.vel.x, this.vel.y, this.vel.z);
         tmp.onGround = this.onGround;
+        tmp.lastOnGround = this.lastOnGround;
         tmp.onClimbable = this.onClimbable;
         tmp.isInWater = this.isInWater;
         tmp.isUnderWater = this.isUnderWater;
         tmp.isInLava = this.isInLava;
         tmp.isUnderLava = this.isUnderLava;
         tmp.isInWeb = this.isInWeb;
-        tmp.elytraFlying = this.elytraFlying;
         tmp.elytraEquipped = this.elytraEquipped;
         tmp.fireworkRocketDuration = this.fireworkRocketDuration;
         tmp.isCollidedHorizontally = this.isCollidedHorizontally;
@@ -397,13 +407,13 @@ class PlayerState {
         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.lastOnGround = other.lastOnGround;
         this.onClimbable = other.onClimbable;
         this.isInWater = other.isInWater;
         this.isUnderWater = other.isUnderWater;
         this.isInLava = other.isInLava;
         this.isUnderLava = other.isUnderLava;
         this.isInWeb = other.isInWeb;
-        this.elytraFlying = other.elytraFlying;
         this.elytraEquipped = other.elytraEquipped;
         this.fireworkRocketDuration = other.fireworkRocketDuration;
         this.isCollidedHorizontally = other.isCollidedHorizontally;

package/dist/physics/states/poses.js

@@ -17,12 +17,12 @@ var PlayerPoses;
 })(PlayerPoses || (exports.PlayerPoses = PlayerPoses = {}));
 exports.playerPoseCtx = {
     0: { width: 0.6, height: 1.8 },
-    1: { width: 0.2, height: 0.2 },
-    2: { width: 0.6, height: 0.6 },
+    1: { width: 0.6, height: 0.6 },
+    2: { width: 0.2, height: 0.2 },
     3: { width: 0.6, height: 0.6 },
     4: { width: 0.6, height: 0.6 },
-    5: { width: 0.6, height: 0.6 },
-    6: { width: 0.6, height: 1.5 },
+    5: { width: 0.6, height: 1.5 },
+    6: { width: 0.6, height: 1.8 },
     7: { width: 0.2, height: 0.2 },
 };
 function getCollider(entityPose, middleBottomPos) {

package/dist/util/physicsUtils.d.ts

@@ -65,4 +65,11 @@ export declare function getLookingVector(entity: {
  * @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

@@ -14,6 +14,7 @@ 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");
@@ -176,7 +177,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;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
     // 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);
@@ -193,13 +194,13 @@ function convertPlayerState(bot, oldState, ctx) {
     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;
+    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;
     // 5. Map Control State
     // The old state uses a standard object for controls; the new uses ControlStateHandler.
     if (oldState.control) {
@@ -208,13 +209,68 @@ function convertPlayerState(bot, oldState, ctx) {
         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;
+    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;
     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.fallFlying = newState.fallFlying;
+    oldState.elytraFlying = newState.fallFlying;
+    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/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,47 +1,49 @@
-{
-    "name": "@nxg-org/mineflayer-physics-util",
-    "version": "1.8.18",
-    "description": "Provides functionality for more accurate entity and projectile tracking.",
-    "keywords": [
-        "mineflayer",
-        "mineflayer-plugin",
-        "mineflayer-tracker"
-    ],
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/nxg-org/mineflayer-physics-utils.git"
-    },
-    "license": "GPL-3.0",
-    "author": "generel_schwerz",
-    "main": "dist/index.js",
-    "types": "dist/index.d.ts",
-    "scripts": {
-        "lint": "eslint . --ext .ts,.tsx",
-        "build": "npx tsc",
-        "prepublishOnly": "npm run build",
-        "test": "mocha --require ts-node/register --recursive tests/**/*.test.ts"
-    },
-    "dependencies": {
-        "@nxg-org/mineflayer-util-plugin": "^1.8.2"
-    },
-    "devDependencies": {
-        "@eslint/js": "^9.23.0",
-        "@types/mocha": "^10.0.10",
-        "@typescript-eslint/eslint-plugin": "^8.27.0",
-        "@typescript-eslint/parser": "^8.27.0",
-        "eslint": "^9.23.0",
-        "expect": "^29.7.0",
-        "globals": "^16.0.0",
-        "minecraft-data": "^3.83.1",
-        "mineflayer": "^4.26.0",
-        "mineflayer-pathfinder": "^2.4.4",
-        "mocha": "^11.1.0",
-        "prismarine-entity": "^2.4.0",
-        "prismarine-physics": "^1.10.0",
-        "prismarine-registry": "^1.11.0",
-        "ts-node": "^10.9.2",
-        "typescript": "^5.8.2",
-        "typescript-eslint": "^8.27.0"
-    },
-    "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
-}
+{
+  "name": "@nxg-org/mineflayer-physics-util",
+  "version": "1.9.0",
+  "description": "Provides functionality for more accurate entity and projectile tracking.",
+  "keywords": [
+    "mineflayer",
+    "mineflayer-plugin",
+    "mineflayer-tracker"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/nxg-org/mineflayer-physics-utils.git"
+  },
+  "license": "GPL-3.0",
+  "author": "generel_schwerz",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "dependencies": {
+    "@nxg-org/mineflayer-util-plugin": "^1.8.2"
+  },
+  "devDependencies": {
+    "@eslint/js": "^9.23.0",
+    "@types/mocha": "^10.0.10",
+    "@typescript-eslint/eslint-plugin": "^8.27.0",
+    "@typescript-eslint/parser": "^8.27.0",
+    "eslint": "^9.23.0",
+    "expect": "^29.7.0",
+    "globals": "^16.0.0",
+    "minecraft-data": "^3.83.1",
+    "mineflayer": "link:/home/genpc/github_stuff/mineflayer",
+    "mineflayer-pathfinder": "^2.4.4",
+    "mocha": "^11.1.0",
+    "prismarine-block": "^1.22.0",
+    "prismarine-entity": "^2.4.0",
+    "prismarine-nbt": "^2.8.0",
+    "prismarine-physics": "^1.10.0",
+    "prismarine-registry": "^1.11.0",
+    "prismarine-world": "^3.6.3",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.8.2",
+    "typescript-eslint": "^8.27.0",
+    "vec3": "^0.1.10"
+  },
+  "scripts": {
+    "lint": "eslint . --ext .ts,.tsx",
+    "build": "npx tsc",
+    "test": "mocha --require ts-node/register --recursive tests/**/*.test.ts"
+  }
+}

package/tests/actualBot.ts

@@ -1,201 +0,0 @@
-import { pathfinder, goals } from "mineflayer-pathfinder";
-import { Bot, createBot } from "mineflayer";
-const physicsInject = require("mineflayer/lib/plugins/physics");
-import loader, { BotcraftPhysics, EntityPhysics, EntityState, EPhysicsCtx } from "../src/index";
-import { PlayerState } from "../src/physics/states";
-
-const { Physics } = require("prismarine-physics");
-
-const rl = require("readline").createInterface({
-  input: process.stdin,
-  output: process.stdout,
-});
-
-let bot1: Bot;
-function buildBot() {
-  console.log("hey!");
-
-  const bot = createBot({
-    host: process.argv[2] || 'localhost',
-    port: Number(process.argv[3]),
-    username: "testingbot",
-    version: process.argv[4],
-  });
-
-  bot.on('login', () => {
-    bot.chat("Hello! I am a testing bot!");
-  })
-
-  bot.once("spawn", async () => {
-    bot.loadPlugin(loader);
-    bot.loadPlugin(pathfinder);
-    await bot.waitForTicks(20);
-    (bot as any).physics.yawSpeed = 50;
-    (bot as any).physics.pitchSpeed = 50;
-    // setupNewPhysics(bot);
-    // setupNewPhysics(bot);
-  });
-
-  bot.on('entityMoved', (entity => {
-    // if (entity !== bot.entity)
-    // console.log(entity.attributes) 
-  }))
-
-  let wasOnGround = false;
-  const printNextPos = false;
-
-  bot.on("move", (pos) => {
-    // console.log(pos);
-    if (bot.entity.onGround && !wasOnGround) {
-      // bot.chat("Hit the ground! " + bot.entity.position.toString());
-    }
-    wasOnGround = bot.entity.onGround;
-  });
-
-  // print whenever another player hits the ground
-  const lastPositions: Record<string, boolean> = {};
-  bot.on("entityMoved", (entity) => {
-    if (entity.username && entity.username !== bot.username) {
-      // check by seeing is y value is an integer
-      if (Math.floor(entity.position.y) === entity.position.y && !lastPositions[entity.username]) {
-        // check if in liquid
-        const block = bot.blockAt(entity.position);
-        if (block && (block.type === bot.registry.blocksByName.water.id || block.type === bot.registry.blocksByName.lava.id)) return;
-
-        bot.chat(`${entity.username} hit the ground! ${entity.position.toString()}`);
-        lastPositions[entity.username] = true;
-      } else if (Math.floor(entity.position.y) !== entity.position.y) {
-        lastPositions[entity.username] = false;
-      }
-    }
-  });
-
-  let usingNew = false;
-  let oldSimulate: any = null;
-  let state: PlayerState | null = null;
-
-  function setupNewPhysics(bot: Bot) {
-    if (usingNew) return;
-    usingNew = true;
-    oldSimulate = (bot.physics as any).simulatePlayer;
-
-    const val = new BotcraftPhysics(bot.registry);
-
-    (EntityState.prototype as any).apply = function (this: EntityState, bot: Bot) {
-      console.log(this.control, this.isUsingItem);
-      this.applyToBot(bot);
-    };
-
-    const ctx = EPhysicsCtx.FROM_BOT(val, bot);
-    state = ctx.state as PlayerState;
-
-    // EntityPhysics.prototype.simulate = function (ctx, world) {
-    //   bot.physics.simulatePlayer(ctx.state, world);
-    // }
-
-    (bot.physics as any).autojumpCooldown = 0;
-    // (bot.physics).jumpTicks = 0;
-
-    (bot.physics as any).simulatePlayer = (...args: any[]) => {
-      state!.update(bot);
-      ctx.state.jumpTicks = 0; // allow immediate jumping
-      return val.simulate(ctx, bot.world);
-    };
-  }
-
-  bot.on("chat", async (user, message) => {
-    const [cmd, ...args] = message.split(" ");
-    const author = bot.nearestEntity((e) => e.username === user);
-
-    switch (cmd) {
-      case "using":
-        bot.chat(`Using new physics: ${usingNew}`);
-        break;
-      case "lookatme":
-        if (!author) return bot.chat("I can't see you!");
-        bot.lookAt(author.position.offset(0, author.height, 0));
-        break;
-      case "status":
-        const str0 = `pos: ${bot.entity.position.toString()}, vel: ${bot.entity.velocity.toString()}, yaw: ${bot.entity.yaw}, pitch: ${bot.entity.pitch}`;
-        bot.chat(str0);
-
-        const str = `onGround: ${bot.entity.onGround}, hCol: ${(bot.entity as any).isCollidedHorizontally}, vCol: ${(bot.entity as any).isCollidedVertically
-          }, inWater: ${(bot.entity as any).isInWater}, inLava: ${(bot.entity as any).isInLava}`;
-        bot.chat(str);
-
-        if (state != null) {
-          const str1 = `crouching: ${state.crouching}, sprinting: ${state.sprinting}`;
-          bot.chat(str1);
-        }
-        break;
-      case "use":
-        if (bot.usingHeldItem) bot.deactivateItem();
-        else bot.activateItem();
-        break;
-      case "useoff":
-        bot.deactivateItem();
-        bot.activateItem(true);
-        break;
-      case "control":
-        if (args[0] === "clear") return bot.clearControlStates();
-        if (args.length === 1) return bot.setControlState(args[0] as any, !bot.getControlState(args[0] as any));
-        bot.setControlState(args[0] as any, args[1] === "true");
-        break;
-      case "sim":
-        // turn all but the mentioned ones off
-        const [time, ...controls] = args;
-        bot.clearControlStates();
-        for (const control of controls) {
-          bot.setControlState(control as any, true);
-        }
-
-        for (let i = 0; i <= Number(time); i++) {
-          console.log(bot.entity.position, bot.entity.velocity, i);
-          await bot.waitForTicks(1);
-        }
-        bot.clearControlStates();
-
-        break;
-      case "reset":
-        usingNew = false;
-        bot.quit();
-        await new Promise((res) => setTimeout(res, 3000));
-        bot1 = buildBot();
-
-        break;
-      case "new":
-        setupNewPhysics(bot);
-        bot.chat("Switched to new physics!");
-        break;
-      case "jump":
-        bot.setControlState("jump", true);
-        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.deactivateItem();
-        bot.pathfinder.stop();
-        bot.clearControlStates();
-        bot.chat("Stopped!");
-        break;
-    }
-  });
-
-  rl.on("line", (line: any) => bot.chat(line));
-
-  return bot;
-}
-
-bot1 = buildBot();