diff --git a/base-types/package-lock.json b/base-types/package-lock.json
index beef171..2ec0601 100644
--- a/base-types/package-lock.json
+++ b/base-types/package-lock.json
@@ -15,9 +15,9 @@
         "@babel/preset-env": "^7.26.0",
         "@babel/preset-typescript": "^7.26.0",
         "babel-plugin-module-resolver": "^5.0.2",
+        "minecraftlegion-statemachine": "^2.0.0",
         "mineflayer": "^4.23.0",
         "mineflayer-pathfinder": "^2.4.5",
-        "mineflayer-statemachine": "^1.7.0",
         "prismarine-block": "^1.19.0",
         "prismarine-entity": "^2.4.0",
         "prismarine-item": "^1.15.0",
@@ -1713,6 +1713,12 @@
         "safe-buffer": "~5.1.1"
       }
     },
+    "node_modules/@types/readable-stream/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
     "node_modules/@xboxreplay/errors": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/@xboxreplay/errors/-/errors-0.1.0.tgz",
@@ -2316,26 +2322,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/content-disposition/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/content-type": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
@@ -2878,26 +2864,6 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
-    "node_modules/express/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -4119,6 +4085,24 @@
         "node": ">=14"
       }
     },
+    "node_modules/minecraftlegion-statemachine": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/minecraftlegion-statemachine/-/minecraftlegion-statemachine-2.0.0.tgz",
+      "integrity": "sha512-K/VSl8GcR6DFmDWUOrn+yZXki64z4onxs8bL7Cg+df4xZCwckdKic4E+P2q8SgC/zJjI/PWsmbgPty85rPpwhg==",
+      "dev": true,
+      "dependencies": {
+        "express": "^4.21.2",
+        "minecraft-data": "^3.80.0",
+        "mineflayer": "^4.23.0",
+        "mineflayer-pathfinder": "^2.4.5",
+        "node": "^23.5.0",
+        "prismarine-block": "^1.19.0",
+        "prismarine-entity": "^2.4.0",
+        "prismarine-item": "^1.15.0",
+        "socket.io": "^4.8.1",
+        "vec3": "^0.1.10"
+      }
+    },
     "node_modules/mineflayer": {
       "version": "4.23.0",
       "resolved": "https://registry.npmjs.org/mineflayer/-/mineflayer-4.23.0.tgz",
@@ -4162,24 +4146,6 @@
         "vec3": "^0.1.7"
       }
     },
-    "node_modules/mineflayer-statemachine": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/mineflayer-statemachine/-/mineflayer-statemachine-1.7.0.tgz",
-      "integrity": "sha512-oJXx2AmV2H2s9vQkRzXP7DYWvz/1ebFmG9aSCzXkP+zasmewP4FxwGVaWqSAnQpRepYrnm+P8TKxblvk7G9r8g==",
-      "dev": true,
-      "dependencies": {
-        "express": "^4.18.1",
-        "minecraft-data": "^3.10.2",
-        "mineflayer": "^4.4.0",
-        "mineflayer-pathfinder": "^2.3.1",
-        "node": "^19.1.0",
-        "prismarine-block": "^1.16.3",
-        "prismarine-entity": "^2.1.1",
-        "prismarine-item": "^1.11.5",
-        "socket.io": "^4.5.1",
-        "vec3": "^0.1.7"
-      }
-    },
     "node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -4260,9 +4226,9 @@
       }
     },
     "node_modules/node": {
-      "version": "19.8.1",
-      "resolved": "https://registry.npmjs.org/node/-/node-19.8.1.tgz",
-      "integrity": "sha512-qAoX6xM9F/eEv4q4qgCXGSbXWruHVzVJX32XCZizSUNsg5ywYY7di9QMqSDFmPwvJrXjZuhNq2z80+lR9GumLg==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/node/-/node-23.5.0.tgz",
+      "integrity": "sha512-Wco8qYfFUAotVJJoMbB30cYdPbTqFd9QtzC528GvTCYWMldnPUu1pLNz4sKNKxal+dgBuAyUu8tRkeLVx1VT8Q==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -4438,9 +4404,9 @@
       }
     },
     "node_modules/own-keys": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.0.tgz",
-      "integrity": "sha512-HcuIjzpjrUbqZPGzWHVg95Bc2Y37KoY5n66QQyEGMzrIWVKHsgHcv8/Aq5Cu3qFUQJzMSPVP8MD3oaFoaME1lg==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
+      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
       "dev": true,
       "dependencies": {
         "get-intrinsic": "^1.2.6",
@@ -5155,10 +5121,24 @@
       }
     },
     "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
     },
     "node_modules/safe-push-apply": {
       "version": "1.0.0",
@@ -5541,26 +5521,6 @@
         "safe-buffer": "~5.2.0"
       }
     },
-    "node_modules/string_decoder/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/string.prototype.trim": {
       "version": "1.2.10",
       "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
diff --git a/base-types/package.json b/base-types/package.json
index fd6c2bc..160508d 100644
--- a/base-types/package.json
+++ b/base-types/package.json
@@ -26,9 +26,9 @@
     "@babel/preset-env": "^7.26.0",
     "@babel/preset-typescript": "^7.26.0",
     "babel-plugin-module-resolver": "^5.0.2",
+    "minecraftlegion-statemachine": "^2.0.0",
     "mineflayer": "^4.23.0",
     "mineflayer-pathfinder": "^2.4.5",
-    "mineflayer-statemachine": "^1.7.0",
     "prismarine-block": "^1.19.0",
     "prismarine-entity": "^2.4.0",
     "prismarine-item": "^1.15.0",
diff --git a/base-types/src/package.json b/base-types/src/package.json
index f3852c5..4b9be9e 100644
--- a/base-types/src/package.json
+++ b/base-types/src/package.json
@@ -37,13 +37,13 @@
     "babel-plugin-module-resolver": "^5.0.0",
     "minecraft-data": "^3.30.0",
     "minecraft-wrap": "^1.5.1",
+    "minecraftlegion-statemachine": "^2.0.0",
     "mineflayer": "^4.8.1",
     "mineflayer-pathfinder": "^2.4.2",
-    "mineflayer-statemachine": "^1.7.0",
     "prismarine-block": "^1.16.3",
     "prismarine-entity": "^2.2.0",
     "prismarine-item": "^1.12.1",
     "typescript": "^5.0.4",
     "vec3": "^0.1.8"
   }
-}
\ No newline at end of file
+}
diff --git a/core/package-lock.json b/core/package-lock.json
index 4b9a99c..81a5b46 100644
--- a/core/package-lock.json
+++ b/core/package-lock.json
@@ -18,7 +18,6 @@
                 "minecraftlegion-statemachine": "^2.0.0",
                 "mineflayer": "4.23.0",
                 "mineflayer-pathfinder": "2.4.5",
-                "mineflayer-statemachine": "1.7.0",
                 "mineflayer-web-inventory": "1.8.5",
                 "prismarine-viewer": "1.28.0",
                 "socket.io-client": "4.8.1",
@@ -1993,9 +1992,9 @@
             }
         },
         "node_modules/@swc/core": {
-            "version": "1.10.3",
-            "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.10.3.tgz",
-            "integrity": "sha512-2yjqCcsBx6SNBQZIYNlwxED9aYXW/7QBZyr8LYAxTx5bzmoNhKiClYbsNLe1NJ6ccf5uSbcInw12PjXLduNEdQ==",
+            "version": "1.10.4",
+            "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.10.4.tgz",
+            "integrity": "sha512-ut3zfiTLORMxhr6y/GBxkHmzcGuVpwJYX4qyXWuBKkpw/0g0S5iO1/wW7RnLnZbAi8wS/n0atRZoaZlXWBkeJg==",
             "dev": true,
             "hasInstallScript": true,
             "dependencies": {
@@ -2010,16 +2009,16 @@
                 "url": "https://opencollective.com/swc"
             },
             "optionalDependencies": {
-                "@swc/core-darwin-arm64": "1.10.3",
-                "@swc/core-darwin-x64": "1.10.3",
-                "@swc/core-linux-arm-gnueabihf": "1.10.3",
-                "@swc/core-linux-arm64-gnu": "1.10.3",
-                "@swc/core-linux-arm64-musl": "1.10.3",
-                "@swc/core-linux-x64-gnu": "1.10.3",
-                "@swc/core-linux-x64-musl": "1.10.3",
-                "@swc/core-win32-arm64-msvc": "1.10.3",
-                "@swc/core-win32-ia32-msvc": "1.10.3",
-                "@swc/core-win32-x64-msvc": "1.10.3"
+                "@swc/core-darwin-arm64": "1.10.4",
+                "@swc/core-darwin-x64": "1.10.4",
+                "@swc/core-linux-arm-gnueabihf": "1.10.4",
+                "@swc/core-linux-arm64-gnu": "1.10.4",
+                "@swc/core-linux-arm64-musl": "1.10.4",
+                "@swc/core-linux-x64-gnu": "1.10.4",
+                "@swc/core-linux-x64-musl": "1.10.4",
+                "@swc/core-win32-arm64-msvc": "1.10.4",
+                "@swc/core-win32-ia32-msvc": "1.10.4",
+                "@swc/core-win32-x64-msvc": "1.10.4"
             },
             "peerDependencies": {
                 "@swc/helpers": "*"
@@ -2031,9 +2030,9 @@
             }
         },
         "node_modules/@swc/core-darwin-arm64": {
-            "version": "1.10.3",
-            "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.10.3.tgz",
-            "integrity": "sha512-LFFCxAUKBy69AUE+01rgazQcafIXrYs6tBa9SyKPR51ft6Tp66dAVrWg9MTykaWskuXEe80LPUvUw1ga3bOH3A==",
+            "version": "1.10.4",
+            "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.10.4.tgz",
+            "integrity": "sha512-sV/eurLhkjn/197y48bxKP19oqcLydSel42Qsy2zepBltqUx+/zZ8+/IS0Bi7kaWVFxerbW1IPB09uq8Zuvm3g==",
             "cpu": [
                 "arm64"
             ],
@@ -2047,9 +2046,9 @@
             }
         },
         "node_modules/@swc/core-darwin-x64": {
-            "version": "1.10.3",
-            "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.10.3.tgz",
-            "integrity": "sha512-yZNv1+yPg0GvYdThsMI8WpaPRAPuw2gQDMdgijLFfRcRlr2l1sTWsDHqGd7QMTx+acYM3uB537gyd31WjUAwlQ==",
+            "version": "1.10.4",
+            "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.10.4.tgz",
+            "integrity": "sha512-gjYNU6vrAUO4+FuovEo9ofnVosTFXkF0VDuo1MKPItz6e2pxc2ale4FGzLw0Nf7JB1sX4a8h06CN16/pLJ8Q2w==",
             "cpu": [
                 "x64"
             ],
@@ -2063,9 +2062,9 @@
             }
         },
         "node_modules/@swc/core-linux-arm-gnueabihf": {
-            "version": "1.10.3",
-            "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.10.3.tgz",
-            "integrity": "sha512-Qa6hu5ASoKV4rcYUBGG3y3z+9UT042KAG4A7ivqqYQFcMfkB4NbZb5So2YWOpUc0/5YlSVkgL22h3Mbj5EXy7A==",
+            "version": "1.10.4",
+            "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.10.4.tgz",
+            "integrity": "sha512-zd7fXH5w8s+Sfvn2oO464KDWl+ZX1MJiVmE4Pdk46N3PEaNwE0koTfgx2vQRqRG4vBBobzVvzICC3618WcefOA==",
             "cpu": [
                 "arm"
             ],
@@ -2079,9 +2078,9 @@
             }
         },
         "node_modules/@swc/core-linux-arm64-gnu": {
-            "version": "1.10.3",
-            "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.10.3.tgz",
-            "integrity": "sha512-BGnoZrmo0nlkXrOxVHk5U3j9u4BuquFviC+LvMe+HrDc5YLVe1gSXMUSBKhIz9MY9uFgxXW977TnB1XjLSKe5Q==",
+            "version": "1.10.4",
+            "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.10.4.tgz",
+            "integrity": "sha512-+UGfoHDxsMZgFD3tABKLeEZHqLNOkxStu+qCG7atGBhS4Slri6h6zijVvf4yI5X3kbXdvc44XV/hrP/Klnui2A==",
             "cpu": [
                 "arm64"
             ],
@@ -2095,9 +2094,9 @@
             }
         },
         "node_modules/@swc/core-linux-arm64-musl": {
-            "version": "1.10.3",
-            "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.10.3.tgz",
-            "integrity": "sha512-L07/4zKnIY2S/00bE+Yn3oEHkyGjWmGGE8Ta4luVCL+00s04EIwMoE1Hc8E8xFB5zLew5ViKFc5kNb5YZ/tRFQ==",
+            "version": "1.10.4",
+            "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.10.4.tgz",
+            "integrity": "sha512-cDDj2/uYsOH0pgAnDkovLZvKJpFmBMyXkxEG6Q4yw99HbzO6QzZ5HDGWGWVq/6dLgYKlnnmpjZCPPQIu01mXEg==",
             "cpu": [
                 "arm64"
             ],
@@ -2111,9 +2110,9 @@
             }
         },
         "node_modules/@swc/core-linux-x64-gnu": {
-            "version": "1.10.3",
-            "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.10.3.tgz",
-            "integrity": "sha512-cvTCekY4u0fBIDNfhv/2UxcOXqH4XJE2iNxKuQejS5KIapFJwrZ+fRQ2lha3+yopI/d2p96BlBEWTAcBzeTntw==",
+            "version": "1.10.4",
+            "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.10.4.tgz",
+            "integrity": "sha512-qJXh9D6Kf5xSdGWPINpLGixAbB5JX8JcbEJpRamhlDBoOcQC79dYfOMEIxWPhTS1DGLyFakAx2FX/b2VmQmj0g==",
             "cpu": [
                 "x64"
             ],
@@ -2127,9 +2126,9 @@
             }
         },
         "node_modules/@swc/core-linux-x64-musl": {
-            "version": "1.10.3",
-            "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.10.3.tgz",
-            "integrity": "sha512-h9kUOTrSSpY9JNc41a+NMAwK62USk/pvNE9Fi/Pfoklmlf9j9j8gRCitqvHpmZcEF4PPIsoMdiGetDipTwvWlw==",
+            "version": "1.10.4",
+            "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.10.4.tgz",
+            "integrity": "sha512-A76lIAeyQnHCVt0RL/pG+0er8Qk9+acGJqSZOZm67Ve3B0oqMd871kPtaHBM0BW3OZAhoILgfHW3Op9Q3mx3Cw==",
             "cpu": [
                 "x64"
             ],
@@ -2143,9 +2142,9 @@
             }
         },
         "node_modules/@swc/core-win32-arm64-msvc": {
-            "version": "1.10.3",
-            "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.10.3.tgz",
-            "integrity": "sha512-iHOmLYkZYn3r1Ff4rfyczdrYGt/wVIWyY0t8swsO9o1TE+zmucGFZuYZzgj3ng8Kp4sojJrydAGz8TINQZDBzQ==",
+            "version": "1.10.4",
+            "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.10.4.tgz",
+            "integrity": "sha512-e6j5kBu4fIY7fFxFxnZI0MlEovRvp50Lg59Fw+DVbtqHk3C85dckcy5xKP+UoXeuEmFceauQDczUcGs19SRGSQ==",
             "cpu": [
                 "arm64"
             ],
@@ -2159,9 +2158,9 @@
             }
         },
         "node_modules/@swc/core-win32-ia32-msvc": {
-            "version": "1.10.3",
-            "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.10.3.tgz",
-            "integrity": "sha512-4SqLSE4Ozh8SxuVuHIZhkSyJQru5+WbQMRs5ggLRqeUy3vkUPHOAFAY3oMwDJUN6BwbAr8+664TmdrMwaWh8Ng==",
+            "version": "1.10.4",
+            "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.10.4.tgz",
+            "integrity": "sha512-RSYHfdKgNXV/amY5Tqk1EWVsyQnhlsM//jeqMLw5Fy9rfxP592W9UTumNikNRPdjI8wKKzNMXDb1U29tQjN0dg==",
             "cpu": [
                 "ia32"
             ],
@@ -2175,9 +2174,9 @@
             }
         },
         "node_modules/@swc/core-win32-x64-msvc": {
-            "version": "1.10.3",
-            "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.10.3.tgz",
-            "integrity": "sha512-jTyf/IbNq7NVyqqDIEDzgjALjWu1IMfXKLXXAJArreklIMzkfHU1sV32ZJLOBmRKPyslCoalxIAU+hTx4reUTQ==",
+            "version": "1.10.4",
+            "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.10.4.tgz",
+            "integrity": "sha512-1ujYpaqfqNPYdwKBlvJnOqcl+Syn3UrQ4XE0Txz6zMYgyh6cdU6a3pxqLqIUSJ12MtXRA9ZUhEz1ekU3LfLWXw==",
             "cpu": [
                 "x64"
             ],
@@ -5971,38 +5970,6 @@
                 "vec3": "^0.1.7"
             }
         },
-        "node_modules/mineflayer-statemachine": {
-            "version": "1.7.0",
-            "resolved": "https://registry.npmjs.org/mineflayer-statemachine/-/mineflayer-statemachine-1.7.0.tgz",
-            "integrity": "sha512-oJXx2AmV2H2s9vQkRzXP7DYWvz/1ebFmG9aSCzXkP+zasmewP4FxwGVaWqSAnQpRepYrnm+P8TKxblvk7G9r8g==",
-            "dependencies": {
-                "express": "^4.18.1",
-                "minecraft-data": "^3.10.2",
-                "mineflayer": "^4.4.0",
-                "mineflayer-pathfinder": "^2.3.1",
-                "node": "^19.1.0",
-                "prismarine-block": "^1.16.3",
-                "prismarine-entity": "^2.1.1",
-                "prismarine-item": "^1.11.5",
-                "socket.io": "^4.5.1",
-                "vec3": "^0.1.7"
-            }
-        },
-        "node_modules/mineflayer-statemachine/node_modules/node": {
-            "version": "19.8.1",
-            "resolved": "https://registry.npmjs.org/node/-/node-19.8.1.tgz",
-            "integrity": "sha512-qAoX6xM9F/eEv4q4qgCXGSbXWruHVzVJX32XCZizSUNsg5ywYY7di9QMqSDFmPwvJrXjZuhNq2z80+lR9GumLg==",
-            "hasInstallScript": true,
-            "dependencies": {
-                "node-bin-setup": "^1.0.0"
-            },
-            "bin": {
-                "node": "bin/node"
-            },
-            "engines": {
-                "npm": ">=5.0.0"
-            }
-        },
         "node_modules/mineflayer-web-inventory": {
             "version": "1.8.5",
             "resolved": "https://registry.npmjs.org/mineflayer-web-inventory/-/mineflayer-web-inventory-1.8.5.tgz",
@@ -6612,9 +6579,9 @@
             }
         },
         "node_modules/own-keys": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.0.tgz",
-            "integrity": "sha512-HcuIjzpjrUbqZPGzWHVg95Bc2Y37KoY5n66QQyEGMzrIWVKHsgHcv8/Aq5Cu3qFUQJzMSPVP8MD3oaFoaME1lg==",
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
+            "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
             "dev": true,
             "dependencies": {
                 "get-intrinsic": "^1.2.6",
diff --git a/core/package.json b/core/package.json
index 50076c9..a6fba66 100644
--- a/core/package.json
+++ b/core/package.json
@@ -31,7 +31,6 @@
         "minecraftlegion-statemachine": "^2.0.0",
         "mineflayer": "4.23.0",
         "mineflayer-pathfinder": "2.4.5",
-        "mineflayer-statemachine": "1.7.0",
         "mineflayer-web-inventory": "1.8.5",
         "prismarine-viewer": "1.28.0",
         "socket.io-client": "4.8.1",
diff --git a/core/src/trash_files/events_issue.js b/core/src/trash_files/events_issue.js
index 719bf47..e48454e 100644
--- a/core/src/trash_files/events_issue.js
+++ b/core/src/trash_files/events_issue.js
@@ -52,7 +52,7 @@ bot.once('spawn', () => {
     BotStateMachine,
     BehaviorIdle,
     BehaviorMoveTo
-  } = require('mineflayer-statemachine')
+  } = require('minecraftlegion-statemachine')
   const targets = {}
 
   function walkFunction (bot, targets) {
diff --git a/package-lock.json b/package-lock.json
index ed0d635..51e53c8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,9 +15,9 @@
       "devDependencies": {
         "minecraft-data": "^3.80.0",
         "minecraft-wrap": "^1.5.1",
+        "minecraftlegion-statemachine": "^2.0.0",
         "mineflayer": "^4.23.0",
         "mineflayer-pathfinder": "^2.4.5",
-        "mineflayer-statemachine": "^1.7.0",
         "prismarine-block": "^1.19.0",
         "prismarine-entity": "^2.4.0",
         "prismarine-item": "^1.15.0",
@@ -96,6 +96,12 @@
         "safe-buffer": "~5.1.1"
       }
     },
+    "node_modules/@types/readable-stream/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
     "node_modules/@types/yauzl": {
       "version": "2.10.3",
       "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
@@ -393,26 +399,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/content-disposition/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/content-type": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
@@ -751,26 +737,6 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
-    "node_modules/express/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/extract-zip": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
@@ -1366,6 +1332,24 @@
         "runMinecraft": "examples/exampleWrapClient.js"
       }
     },
+    "node_modules/minecraftlegion-statemachine": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/minecraftlegion-statemachine/-/minecraftlegion-statemachine-2.0.0.tgz",
+      "integrity": "sha512-K/VSl8GcR6DFmDWUOrn+yZXki64z4onxs8bL7Cg+df4xZCwckdKic4E+P2q8SgC/zJjI/PWsmbgPty85rPpwhg==",
+      "dev": true,
+      "dependencies": {
+        "express": "^4.21.2",
+        "minecraft-data": "^3.80.0",
+        "mineflayer": "^4.23.0",
+        "mineflayer-pathfinder": "^2.4.5",
+        "node": "^23.5.0",
+        "prismarine-block": "^1.19.0",
+        "prismarine-entity": "^2.4.0",
+        "prismarine-item": "^1.15.0",
+        "socket.io": "^4.8.1",
+        "vec3": "^0.1.10"
+      }
+    },
     "node_modules/mineflayer": {
       "version": "4.23.0",
       "resolved": "https://registry.npmjs.org/mineflayer/-/mineflayer-4.23.0.tgz",
@@ -1409,24 +1393,6 @@
         "vec3": "^0.1.7"
       }
     },
-    "node_modules/mineflayer-statemachine": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/mineflayer-statemachine/-/mineflayer-statemachine-1.7.0.tgz",
-      "integrity": "sha512-oJXx2AmV2H2s9vQkRzXP7DYWvz/1ebFmG9aSCzXkP+zasmewP4FxwGVaWqSAnQpRepYrnm+P8TKxblvk7G9r8g==",
-      "dev": true,
-      "dependencies": {
-        "express": "^4.18.1",
-        "minecraft-data": "^3.10.2",
-        "mineflayer": "^4.4.0",
-        "mineflayer-pathfinder": "^2.3.1",
-        "node": "^19.1.0",
-        "prismarine-block": "^1.16.3",
-        "prismarine-entity": "^2.1.1",
-        "prismarine-item": "^1.11.5",
-        "socket.io": "^4.5.1",
-        "vec3": "^0.1.7"
-      }
-    },
     "node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -1524,9 +1490,9 @@
       }
     },
     "node_modules/node": {
-      "version": "19.8.1",
-      "resolved": "https://registry.npmjs.org/node/-/node-19.8.1.tgz",
-      "integrity": "sha512-qAoX6xM9F/eEv4q4qgCXGSbXWruHVzVJX32XCZizSUNsg5ywYY7di9QMqSDFmPwvJrXjZuhNq2z80+lR9GumLg==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/node/-/node-23.5.0.tgz",
+      "integrity": "sha512-Wco8qYfFUAotVJJoMbB30cYdPbTqFd9QtzC528GvTCYWMldnPUu1pLNz4sKNKxal+dgBuAyUu8tRkeLVx1VT8Q==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -2019,10 +1985,24 @@
       }
     },
     "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
@@ -2303,26 +2283,6 @@
         "safe-buffer": "~5.2.0"
       }
     },
-    "node_modules/string_decoder/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/thenify": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
diff --git a/package.json b/package.json
index e9aae93..d03ce0e 100644
--- a/package.json
+++ b/package.json
@@ -32,9 +32,9 @@
   "devDependencies": {
     "minecraft-data": "^3.80.0",
     "minecraft-wrap": "^1.5.1",
+    "minecraftlegion-statemachine": "^2.0.0",
     "mineflayer": "^4.23.0",
     "mineflayer-pathfinder": "^2.4.5",
-    "mineflayer-statemachine": "^1.7.0",
     "prismarine-block": "^1.19.0",
     "prismarine-entity": "^2.4.0",
     "prismarine-item": "^1.15.0",