Changed state machine to self package mineflayer-statemachine

sefirosweb · Dec 30, 2024 · 976e95e · 976e95e
1 parent e01445e
commit 976e95e
Show file tree

Hide file tree

Showing 67 changed files with 141 additions and 70 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -9,6 +9,8 @@
 	"forwardPorts": [
 		25565,
 		5173,
+		4550,
+		4540,
 		4001
 	],
 	"customizations": {

diff --git a/base-types/src/types.ts b/base-types/src/types.ts
@@ -1,5 +1,5 @@
 import { Movements } from 'mineflayer-pathfinder'
-import { StateMachineTargets } from 'mineflayer-statemachine'
+import { StateMachineTargets } from 'minecraftlegion-statemachine'
 import { Bot, Dimension_V2 } from 'mineflayer'
 import { Vec3 } from 'vec3'
 import { Jobs } from './defaultTypes'

diff --git a/core/package-lock.json b/core/package-lock.json
diff --git a/core/package.json b/core/package.json
@@ -28,6 +28,7 @@
         "express": "4.21.2",
         "minecraft-data": "3.80.0",
         "minecrafthawkeye": "1.3.9",
+        "minecraftlegion-statemachine": "^2.0.0",
         "mineflayer": "4.23.0",
         "mineflayer-pathfinder": "2.4.5",
         "mineflayer-statemachine": "1.7.0",

diff --git a/core/src/BehaviorModules/BehaviorCheckItemsInInventory.ts b/core/src/BehaviorModules/BehaviorCheckItemsInInventory.ts
@@ -2,7 +2,7 @@
 import { DepositType, LegionStateMachineTargets, Item } from "base-types"
 import { inventoryModule } from '@/modules'
 import { Item as McItem } from "prismarine-item"
-import { StateBehavior } from "mineflayer-statemachine"
+import { StateBehavior } from "minecraftlegion-statemachine"
 import { Bot } from "mineflayer";
 export class BehaviorCheckItemsInInventory implements StateBehavior {
   active: boolean;

diff --git a/core/src/BehaviorModules/BehaviorCraft.ts b/core/src/BehaviorModules/BehaviorCraft.ts
@@ -2,7 +2,7 @@
 import { LegionStateMachineTargets } from "base-types"
 import { Block } from 'prismarine-block'
 import { inventoryModule, botWebsocket } from '@/modules'
-import { StateBehavior } from "mineflayer-statemachine"
+import { StateBehavior } from "minecraftlegion-statemachine"
 import { Bot } from "mineflayer"
 export class BehaviorCraft implements StateBehavior {
   active: boolean;

diff --git a/core/src/BehaviorModules/BehaviorCustomPlaceBlock.ts b/core/src/BehaviorModules/BehaviorCustomPlaceBlock.ts
@@ -1,7 +1,7 @@
 
 import { placeBlockModule, inventoryModule, digBlockModule, botWebsocket } from '@/modules'
 import { Vec3 } from "vec3"
-import { StateBehavior } from "mineflayer-statemachine"
+import { StateBehavior } from "minecraftlegion-statemachine"
 import { LegionStateMachineTargets } from 'base-types'
 import { Bot } from 'mineflayer'
 export class BehaviorCustomPlaceBlock implements StateBehavior {

diff --git a/core/src/BehaviorModules/BehaviorDepositItemChest.ts b/core/src/BehaviorModules/BehaviorDepositItemChest.ts
@@ -2,7 +2,7 @@
 
 import { ChestTransaction, Item, LegionStateMachineTargets } from 'base-types'
 import { Bot, Chest, TransferOptions } from 'mineflayer'
-import { StateBehavior } from 'mineflayer-statemachine'
+import { StateBehavior } from 'minecraftlegion-statemachine'
 import { Block } from 'prismarine-block'
 import { Vec3 } from 'vec3'
 import { refreshChest, botWebsocket, sleep } from '@/modules'

diff --git a/core/src/BehaviorModules/BehaviorDigAndPlaceBlock.ts b/core/src/BehaviorModules/BehaviorDigAndPlaceBlock.ts
@@ -2,7 +2,7 @@
 import { Item, LegionStateMachineTargets, PositionsChecked } from "base-types"
 import { placeBlockModule, inventoryModule, minerModule, digBlockModule, botWebsocket } from '@/modules'
 import { Vec3 } from "vec3"
-import { StateBehavior } from "mineflayer-statemachine"
+import { StateBehavior } from "minecraftlegion-statemachine"
 import { Bot } from "mineflayer"
 
 type ItemWithHardness = Item & {

diff --git a/core/src/BehaviorModules/BehaviorDigBlock.ts b/core/src/BehaviorModules/BehaviorDigBlock.ts
@@ -2,7 +2,7 @@
 import { Bot } from "mineflayer"
 import { Vec3 } from "vec3"
 import { LegionStateMachineTargets } from 'base-types'
-import { StateBehavior } from "mineflayer-statemachine"
+import { StateBehavior } from "minecraftlegion-statemachine"
 import { digBlockModule, botWebsocket } from '@/modules'
 export class BehaviorDigBlock implements StateBehavior {
   active: boolean;

diff --git a/core/src/BehaviorModules/BehaviorEatFood.ts b/core/src/BehaviorModules/BehaviorEatFood.ts
@@ -3,7 +3,7 @@
 import { Food, LegionStateMachineTargets } from "base-types"
 import { botWebsocket } from '@/modules'
 import mcDataLoader from 'minecraft-data'
-import { StateBehavior } from "mineflayer-statemachine"
+import { StateBehavior } from "minecraftlegion-statemachine"
 import { Bot } from "mineflayer";
 
 export class BehaviorEatFood implements StateBehavior {

diff --git a/core/src/BehaviorModules/BehaviorEquip.ts b/core/src/BehaviorModules/BehaviorEquip.ts
@@ -3,7 +3,7 @@ import { LegionStateMachineTargets } from "base-types"
 import { botWebsocket } from '@/modules'
 import { Item as PrismarineItem } from 'prismarine-item';
 import { Bot, EquipmentDestination } from "mineflayer";
-import { StateBehavior } from "mineflayer-statemachine";
+import { StateBehavior } from "minecraftlegion-statemachine";
 
 export class BehaviorEquip implements StateBehavior {
   active: boolean;

diff --git a/core/src/BehaviorModules/BehaviorEquipAll.ts b/core/src/BehaviorModules/BehaviorEquipAll.ts
@@ -2,7 +2,7 @@
 import { LegionStateMachineTargets } from "base-types"
 import { botWebsocket } from '@/modules'
 import { inventoryModule } from '@/modules'
-import { StateBehavior } from "mineflayer-statemachine"
+import { StateBehavior } from "minecraftlegion-statemachine"
 import { Bot } from "mineflayer";
 export class BehaviorEquipAll implements StateBehavior {
   active: boolean;

diff --git a/core/src/BehaviorModules/BehaviorFertilize.ts b/core/src/BehaviorModules/BehaviorFertilize.ts
@@ -1,7 +1,7 @@
 
 import { LegionStateMachineTargets, BlocksCanFertilize } from "base-types"
 import { Bot } from "mineflayer";
-import { StateBehavior } from "mineflayer-statemachine"
+import { StateBehavior } from "minecraftlegion-statemachine"
 import { Vec3 } from "vec3"
 export class BehaviorFertilize implements StateBehavior {
   active: boolean;

diff --git a/core/src/BehaviorModules/BehaviorFindItems.ts b/core/src/BehaviorModules/BehaviorFindItems.ts
@@ -1,6 +1,6 @@
 import { LegionStateMachineTargets, EntityWithDistance } from "base-types"
 import { Bot } from "mineflayer";
-import { StateBehavior } from "mineflayer-statemachine"
+import { StateBehavior } from "minecraftlegion-statemachine"
 export class BehaviorFindItems implements StateBehavior {
   active: boolean;
   readonly bot: Bot

diff --git a/core/src/BehaviorModules/BehaviorGetPlayer.ts b/core/src/BehaviorModules/BehaviorGetPlayer.ts
@@ -2,7 +2,7 @@
 
 import { LegionStateMachineTargets } from "base-types"
 import { Bot } from "mineflayer";
-import { StateBehavior } from "mineflayer-statemachine"
+import { StateBehavior } from "minecraftlegion-statemachine"
 
 export class BehaviorGetPlayer implements StateBehavior {
   active: boolean;

diff --git a/core/src/BehaviorModules/BehaviorGetReady.ts b/core/src/BehaviorModules/BehaviorGetReady.ts
@@ -1,6 +1,6 @@
 import { LegionStateMachineTargets } from "base-types"
 import { inventoryModule } from '@/modules'
-import { StateBehavior } from "mineflayer-statemachine"
+import { StateBehavior } from "minecraftlegion-statemachine"
 import { Bot } from "mineflayer";
 export class BehaviorGetReady implements StateBehavior {
   active: boolean;

diff --git a/core/src/BehaviorModules/BehaviorInteractBlock.ts b/core/src/BehaviorModules/BehaviorInteractBlock.ts
@@ -1,6 +1,6 @@
 import { LegionStateMachineTargets } from "base-types"
 import { Bot } from "mineflayer";
-import { StateBehavior } from "mineflayer-statemachine"
+import { StateBehavior } from "minecraftlegion-statemachine"
 
 export class BehaviorInteractBlock implements StateBehavior {
   active: boolean;

diff --git a/core/src/BehaviorModules/BehaviorInteractEntity.ts b/core/src/BehaviorModules/BehaviorInteractEntity.ts
@@ -1,7 +1,7 @@
 
 import { LegionStateMachineTargets } from "base-types"
 import { Bot } from "mineflayer";
-import { StateBehavior } from "mineflayer-statemachine"
+import { StateBehavior } from "minecraftlegion-statemachine"
 
 export class BehaviorInteractEntity implements StateBehavior {
   active: boolean;

diff --git a/core/src/BehaviorModules/BehaviorLoadConfig.ts b/core/src/BehaviorModules/BehaviorLoadConfig.ts
@@ -1,4 +1,4 @@
-import { StateBehavior } from "mineflayer-statemachine"
+import { StateBehavior } from "minecraftlegion-statemachine"
 import { Config, LegionStateMachineTargets, Jobs } from "base-types"
 import { Bot } from "mineflayer"
 // TODO delete this file

diff --git a/core/src/BehaviorModules/BehaviorMoveTo.ts b/core/src/BehaviorModules/BehaviorMoveTo.ts
@@ -2,7 +2,7 @@ import { Bot, Dimension, Dimension_V2 } from 'mineflayer'
 import mineflayerPathfinder, { Movements } from 'mineflayer-pathfinder'
 import { LegionStateMachineTargets, Vec3WithDimension } from 'base-types'
 import { movementModule, botWebsocket } from '@/modules'
-import { StateBehavior } from 'mineflayer-statemachine'
+import { StateBehavior } from 'minecraftlegion-statemachine'
 
 export class BehaviorMoveTo implements StateBehavior {
   active: boolean

diff --git a/core/src/BehaviorModules/BehaviorMoveToArray.ts b/core/src/BehaviorModules/BehaviorMoveToArray.ts
@@ -1,7 +1,7 @@
 import mineflayerPathfinder, { Movements } from 'mineflayer-pathfinder'
 import { LegionStateMachineTargets } from 'base-types'
 import { Vec3 } from 'vec3'
-import { StateBehavior } from 'mineflayer-statemachine'
+import { StateBehavior } from 'minecraftlegion-statemachine'
 import { Bot } from 'mineflayer'
 import { botWebsocket } from '@/modules'
 

diff --git a/core/src/BehaviorModules/BehaviorSleep.ts b/core/src/BehaviorModules/BehaviorSleep.ts
@@ -1,6 +1,6 @@
 import { LegionStateMachineTargets } from "base-types"
 import { Bot } from "mineflayer"
-import { StateBehavior } from "mineflayer-statemachine"
+import { StateBehavior } from "minecraftlegion-statemachine"
 
 export class BehaviorSleep implements StateBehavior {
   active: boolean

diff --git a/core/src/BehaviorModules/BehaviorWithdrawItemChest.ts b/core/src/BehaviorModules/BehaviorWithdrawItemChest.ts
@@ -2,7 +2,7 @@
 import { sleep, botWebsocket, refreshChest } from '@/modules'
 import { ChestTransaction, LegionStateMachineTargets } from 'base-types'
 import { Bot, Chest, TransferOptions } from 'mineflayer'
-import { StateBehavior } from 'mineflayer-statemachine'
+import { StateBehavior } from 'minecraftlegion-statemachine'
 import { Block } from 'prismarine-block'
 import { Vec3 } from 'vec3'
 

diff --git a/core/src/BehaviorModules/combat/BehaviorAttack.ts b/core/src/BehaviorModules/combat/BehaviorAttack.ts
@@ -1,7 +1,7 @@
 
 import { LegionStateMachineTargets } from "base-types"
 import { inventoryModule } from '@/modules'
-import { StateBehavior } from "mineflayer-statemachine"
+import { StateBehavior } from "minecraftlegion-statemachine"
 import { Bot } from "mineflayer";
 
 const attackEvery = 600

diff --git a/core/src/BehaviorModules/combat/BehaviorLongAttack.ts b/core/src/BehaviorModules/combat/BehaviorLongAttack.ts
@@ -1,6 +1,6 @@
 import { LegionStateMachineTargets } from "base-types"
 import { inventoryModule, botWebsocket } from '@/modules'
-import { StateBehavior } from "mineflayer-statemachine"
+import { StateBehavior } from "minecraftlegion-statemachine"
 import { Bot } from "mineflayer";
 import { GetMasterGrade } from "minecrafthawkeye";
 export class BehaviorLongAttack implements StateBehavior {

diff --git a/core/src/BehaviorModules/guardJob/BehaviorHelpFriend.ts b/core/src/BehaviorModules/guardJob/BehaviorHelpFriend.ts
@@ -1,6 +1,6 @@
 import { Bot } from 'mineflayer';
 import { Entity } from 'prismarine-entity'
-import { StateBehavior } from 'mineflayer-statemachine'
+import { StateBehavior } from 'minecraftlegion-statemachine'
 import { BotFriends, EntityWithDistance, LegionStateMachineTargets } from 'base-types'
 import { botWebsocket } from '@/modules'
 

diff --git a/core/src/BehaviorModules/minerJob/BehaviorMinerCurrentBlock.ts b/core/src/BehaviorModules/minerJob/BehaviorMinerCurrentBlock.ts
@@ -1,6 +1,6 @@
 import { LegionStateMachineTargets, MineCordsConfig } from 'base-types'
 import { Bot } from 'mineflayer';
-import { StateBehavior } from 'mineflayer-statemachine';
+import { StateBehavior } from 'minecraftlegion-statemachine';
 import { Vec3 } from 'vec3'
 export class BehaviorMinerCurrentBlock implements StateBehavior {
   active: boolean;

diff --git a/core/src/BehaviorModules/minerJob/BehaviorMinerCurrentLayer.ts b/core/src/BehaviorModules/minerJob/BehaviorMinerCurrentLayer.ts
@@ -2,7 +2,7 @@
 import { LegionStateMachineTargets, MineCordsConfig } from 'base-types'
 
 import { botWebsocket } from '@/modules'
-import { StateBehavior } from 'mineflayer-statemachine';
+import { StateBehavior } from 'minecraftlegion-statemachine';
 import { Bot } from 'mineflayer';
 
 export class BehaviorMinerCurrentLayer implements StateBehavior {

diff --git a/core/src/BehaviorModules/sorterJob/BehaviorcCheckItemsInChest.ts b/core/src/BehaviorModules/sorterJob/BehaviorcCheckItemsInChest.ts
@@ -1,5 +1,5 @@
 import { ChestBlock, LegionStateMachineTargets } from 'base-types';
-import { StateBehavior } from 'mineflayer-statemachine';
+import { StateBehavior } from 'minecraftlegion-statemachine';
 import vec3 from 'vec3'
 import { v4 as uuidv4 } from 'uuid';
 import { Bot, Dimension_V2 } from 'mineflayer';

diff --git a/core/src/BehaviorModules/template.ts b/core/src/BehaviorModules/template.ts
@@ -1,6 +1,6 @@
 import { LegionStateMachineTargets } from "base-types"
 import { Bot } from "mineflayer";
-import { StateBehavior } from "mineflayer-statemachine"
+import { StateBehavior } from "minecraftlegion-statemachine"
 export default class template implements StateBehavior {
   active: boolean;
   readonly bot: Bot
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,8 @@ @@
     	"forwardPorts": [
 ,
 ,
+,
+,
     	],
     	"customizations": {
@@ Expand Down @@