@nxg-org/mineflayer-physics-util 1.6.0 → 1.7.0

package/dist/index.d.ts

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

package/dist/physics/info/entity_physics.json

@@ -18,7 +18,8 @@
             }
         },
         "player": {
-            "stepHeight": 0.6
+            "stepHeight": 0.6,
+            "airborneInertia": 0.91
         }
     },
     "projectiles": {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nxg-org/mineflayer-physics-util",
-    "version": "1.6.0",
+    "version": "1.7.0",
     "description": "Provides functionality for more accurate entity and projectile tracking.",
     "keywords": [
         "mineflayer",
@@ -25,7 +25,8 @@
     },
     "devDependencies": {
         "expect": "^29.5.0",
-        "mineflayer": "^4.18.0",
+        "minecraft-data": "^3.83.1",
+        "mineflayer": "^4.22.0",
         "mineflayer-pathfinder": "^2.4.4",
         "prismarine-entity": "^2.4.0",
         "typescript": "^4.5.5"

package/tests/actualBot.ts

@@ -8,6 +8,7 @@ const bot: Bot = createBot({
   host: process.argv[2],
   port: Number(process.argv[3]),
   username: "testingbot",
+  version: process.argv[4],
 });
 
 bot.once("spawn", async () => {
@@ -24,13 +25,44 @@ const rl = require("readline").createInterface({
 
 rl.on("line", (line: any) => bot.chat(line));
 
+// print whenever bot hits the ground
+
+let wasOnGround = false;
+let printNextPos = false;
+bot.on("move", (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
+let lastPositions: Record<string, boolean> = {};
+bot.on("entityMoved", (entity) => {
+  console.log(entity.username)
+  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]) {
+      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;
+    }}
+});
+
 bot.on("chat", (user, message) => {
   const [cmd, ...args] = message.split(" ");
   const author = bot.nearestEntity((e) => e.username === user);
 
   switch (cmd) {
+    case "control":
+      if (args.length !== 2) return bot.chat("Invalid control command!");
+      if (args[0] === "clear") return bot.clearControlStates();
+      bot.setControlState(args[0] as any, args[1] === "true");
+      break;
     case "original":
       bot.physics = new Physics(bot.registry, bot.world);
+      bot.chat("Switched to original physics!");
       break;
     case "new":
       const val = new EntityPhysics(bot.registry);
@@ -54,6 +86,7 @@ bot.on("chat", (user, message) => {
         return val.simulate(ctx, bot.world);
         return oldSim(...args);
       };
+      bot.chat("Switched to new physics!");
       break;
     case "jump":
       bot.setControlState("jump", true);

package/tests/fakeWorld.ts

@@ -12,12 +12,14 @@ import expect from "expect";
 
 import { initSetup } from "../src/index";
 
-const mcData = md("1.17.1");
-const Block = (block as any)("1.17.1");
+const mcData = md("1.12.2");
+const Block = (block as any)("1.12.2");
+
+const groundLevel = 4;
 
 const fakeWorld = {
     getBlock: (pos: { x: number; y: number; z: number }) => {
-        const type = pos.y < 60 ? mcData.blocksByName.stone.id : mcData.blocksByName.air.id;
+        const type = pos.y < groundLevel ? mcData.blocksByName.stone.id : mcData.blocksByName.air.id;
         const b = new Block(type, 0, 0);
         b.position = pos;
         return b;
@@ -45,7 +47,7 @@ function createFakePlayer(pos: Vec3) {
             slots: [],
         },
 
-        setControlState: (...args) => {}
+        setControlState: (...args: any) => {}
     };
 }
 
@@ -55,7 +57,7 @@ initSetup(mcData);
 
 //create fake bot
 const playerType = mcData.entitiesByName["player"]; // specify type we will be simulating.
-const fakePlayer = createFakePlayer(new Vec3(0, 80, 0)); // call function supplied by prismarine-physics
+const fakePlayer = createFakePlayer(new Vec3(0, groundLevel + 20, 0)); // call function supplied by prismarine-physics
 fakePlayer.entity = applyMdToNewEntity(EPhysicsCtx, playerType, fakePlayer.entity); // ensure compatibility.
 
 // create physics context.
@@ -69,6 +71,7 @@ const playerCtx = EPhysicsCtx.FROM_ENTITY_STATE(physics, playerState, playerType
 playerState.control = ControlStateHandler.DEFAULT(); // specific to players and mobs, specify control scheme to apply.
 playerState.control.forward = true;
 
+
 // simulate until on ground.
 while (!playerCtx.state.onGround) {
     physics.simulate(playerCtx, fakeWorld).applyToBot(fakePlayer as any); // (applyToBot since fakePlayer is supposed to be a bot)
@@ -76,9 +79,9 @@ while (!playerCtx.state.onGround) {
 }
 
 if (playerState.control.forward) {
-    expect(fakePlayer.entity.position).toEqual(new Vec3(0, 60, -3.4508449226731694)); // it works.
+    expect(fakePlayer.entity.position).toEqual(new Vec3(0, groundLevel, -3.4508449226731694)); // it works.
 } else {
-    expect(fakePlayer.entity.position).toEqual(new Vec3(0, 60, 0)); // it works.
+    expect(fakePlayer.entity.position).toEqual(new Vec3(0, groundLevel, 0)); // it works.
 }
 
 playerCtx.state.control.set("jump", true);
@@ -88,9 +91,9 @@ for (let i = 0; i < 12; i++) {
 }
 
 if (playerState.control.forward) {
-    expect(fakePlayer.entity.position).toEqual(new Vec3(0, 60, -5.788782872583908)); // it works.
+    expect(fakePlayer.entity.position).toEqual(new Vec3(0, groundLevel, -5.788782872583908)); // it works.
 } else {
-    expect(fakePlayer.entity.position).toEqual(new Vec3(0, 60, 0)); // it works.
+    expect(fakePlayer.entity.position).toEqual(new Vec3(0, groundLevel, 0)); // it works.
 }