added back block backtracking

Author: GenerelSchwerz

src/mineflayer-specific/move.ts

@@ -5,8 +5,8 @@ import { EntityState } from '@nxg-org/mineflayer-physics-util'
 import { BreakHandler, PlaceHandler } from './movements/interactionUtils'
 const emptyVec = new Vec3(0, 0, 0)
 
-const TOPLACE: PlaceHandler[] = []
-const TOBREAK: BreakHandler[] = []
+// const TOPLACE: PlaceHandler[] = []
+// const TOBREAK: BreakHandler[] = []
 
 export class Move implements PathData {
   hash: string
@@ -23,8 +23,8 @@ export class Move implements PathData {
     public readonly x: number,
     public readonly y: number,
     public readonly z: number,
-    // toPlace: PlaceHandler[],
-    // toBreak: BreakHandler[],
+    toPlace: PlaceHandler[],
+    toBreak: BreakHandler[],
     public readonly remainingBlocks: number,
     public readonly cost: number,
     public readonly moveType: MovementProvider,
@@ -44,16 +44,18 @@ export class Move implements PathData {
     this.cachedVec = new Vec3(this.x, this.y, this.z)
     Object.freeze(this.cachedVec)
 
-    this.toPlace = TOPLACE
-    this.toBreak = TOBREAK
+    // this.toPlace = TOPLACE
+    // this.toBreak = TOBREAK
+    this.toPlace = toPlace
+    this.toBreak = toBreak
     // this.x = x;
     // this.y = y;
     // this.z = z;
     // this.hash = this.x.toFixed(1) + "," + this.y.toFixed(1) + "," + this.z.toFixed(1);
   }
 
   static startMove (type: MovementProvider, pos: Vec3, vel: Vec3, remainingBlocks: number): Move {
-    return new Move(pos.x, pos.y, pos.z, remainingBlocks, 0, type, pos, vel, pos, vel)
+    return new Move(pos.x, pos.y, pos.z, [], [], remainingBlocks, 0, type, pos, vel, pos, vel)
     // new Map());
   }
 
@@ -62,8 +64,8 @@ export class Move implements PathData {
     state: EntityState,
     prevMove: Move,
     type: MovementProvider,
-    // toPlace: PlaceHandler[] = [],
-    // toBreak: BreakHandler[] = []
+    toPlace: PlaceHandler[] = [],
+    toBreak: BreakHandler[] = []
   ): Move {
     // const p = new Map(prevMove.interactMap);
     // for (const breakH of toBreak) {
@@ -76,8 +78,8 @@ export class Move implements PathData {
       state.pos.x,
       state.pos.y,
       state.pos.z,
-      // toPlace,
-      // toBreak,
+      toPlace,
+      toBreak,
       prevMove.remainingBlocks - 0, //toPlace.length,
       cost,
       type,
@@ -96,8 +98,8 @@ export class Move implements PathData {
     pos: Vec3,
     prevMove: Move,
     type: MovementProvider,
-    // toPlace: PlaceHandler[] = [],
-    // toBreak: BreakHandler[] = []
+    toPlace: PlaceHandler[] = [],
+    toBreak: BreakHandler[] = []
   ): Move {
     // const p = new Map(prevMove.interactMap);
     // for (const place of toPlace) {
@@ -110,8 +112,8 @@ export class Move implements PathData {
       pos.x,
       pos.y,
       pos.z,
-      // toPlace,
-      // toBreak,
+      toPlace,
+      toBreak,
       prevMove.remainingBlocks -  0,//toPlace.length,
       cost,
       type,

src/mineflayer-specific/movements/movementProvider.ts

@@ -60,25 +60,25 @@ export abstract class MovementProvider extends Movement {
 
   getBlockInfoRaw (yes: Vec3): BlockInfo {
     //
-    // let move: Move | undefined = this.currentMove
+    let move: Move | undefined = this.currentMove
 
-    // let i = 0
-    // while (move !== undefined && i++ < 3) { // 5 levels
+    let i = 0
+    while (move !== undefined && i++ < 3) { // 5 levels
 
-    //   for (const m of move.toPlace) {
-    //     if (m.x === yes.x && m.y === yes.y && m.z === yes.z) {
-    //       return m.blockInfo
-    //     }
-    //   }
+      for (const m of move.toPlace) {
+        if (m.x === yes.x && m.y === yes.y && m.z === yes.z) {
+          return m.blockInfo
+        }
+      }
 
-    //   for (const m of move.toBreak) {
-    //     if (m.x === yes.x && m.y === yes.y && m.z === yes.z) {
-    //       return m.blockInfo
-    //     }
-    //   }
+      for (const m of move.toBreak) {
+        if (m.x === yes.x && m.y === yes.y && m.z === yes.z) {
+          return m.blockInfo
+        }
+      }
 
-    //   move = move.parent
-    // }
+      move = move.parent
+    }
 
     // if (i > 0) console.log('i', i)
     // const wantedDx = pos.x - this.orgPos.x + dx + this.halfway[0]

src/mineflayer-specific/post/optimizer.ts

@@ -53,8 +53,8 @@ export abstract class MovementOptimizer {
       startMove.x,
       startMove.y,
       startMove.z,
-      // toPlace,
-      // toBreak,
+      toPlace,
+      toBreak,
       endMove.remainingBlocks,
       costSum,
       startMove.moveType,