Merge pull request #247 from kolbytn/fix-inf-jump

Fix Infinite Jumping (mostly)

andy.json

@@ -11,6 +11,7 @@
     
     "modes": {
         "self_preservation": true,
+        "unstuck": true,
         "cowardice": true,
         "self_defense": true,
         "hunting": true,

patches/mineflayer-pathfinder+2.4.5.patch

@@ -1,17 +1,16 @@
 diff --git a/node_modules/mineflayer-pathfinder/index.js b/node_modules/mineflayer-pathfinder/index.js
-index b38bd30..cfaa677 100644
+index b38bd30..bf16a63 100644
 --- a/node_modules/mineflayer-pathfinder/index.js
 +++ b/node_modules/mineflayer-pathfinder/index.js
-@@ -541,7 +541,7 @@ function inject (bot) {
-       let canPlace = true
-       if (placingBlock.jump) {
-         bot.setControlState('jump', true)
--        canPlace = placingBlock.y + 1 < bot.entity.position.y
-+        canPlace = placingBlock.y + 1.8 < bot.entity.position.y
-       }
-       if (canPlace) {
-         if (!lockEquipItem.tryAcquire()) return
-@@ -557,6 +557,7 @@ function inject (bot) {
+@@ -550,6 +550,7 @@ function inject (bot) {
+             lockEquipItem.release()
+             const refBlock = bot.blockAt(new Vec3(placingBlock.x, placingBlock.y, placingBlock.z), false)
+             if (!lockPlaceBlock.tryAcquire()) return
++            bot.world.setBlockStateId(refBlock.position.offset(placingBlock.dx, placingBlock.dy, placingBlock.dz), 1)
+             if (interactableBlocks.includes(refBlock.name)) {
+               bot.setControlState('sneak', true)
+             }
+@@ -557,6 +558,7 @@ function inject (bot) {
                .then(function () {
                  // Dont release Sneak if the block placement was not successful
                  bot.setControlState('sneak', false)

profiles/andy_npc.json

@@ -13,6 +13,7 @@
     
     "modes": {
         "self_preservation": true,
+        "unstuck": true,
         "cowardice": true,
         "self_defense": true,
         "hunting": true,

profiles/claude.json

@@ -16,6 +16,7 @@
 
     "modes": {
         "self_preservation": true,
+        "unstuck": true,
         "cowardice": false,
         "self_defense": true,
         "hunting": true,

profiles/freeguy.json

@@ -13,6 +13,7 @@
     
     "modes": {
         "self_preservation": true,
+        "unstuck": true,
         "cowardice": true,
         "self_defense": true,
         "hunting": true,

profiles/gemini.json

@@ -13,6 +13,7 @@
 
     "modes": {
         "self_preservation": true,
+        "unstuck": true,
         "cowardice": false,
         "self_defense": true,
         "hunting": true,

profiles/gpt.json

@@ -11,6 +11,7 @@
 
     "modes": {
         "self_preservation": true,
+        "unstuck": true,
         "cowardice": false,
         "self_defense": true,
         "hunting": true,

profiles/llama.json

@@ -15,6 +15,7 @@
 
     "modes": {
         "self_preservation": true,
+        "unstuck": true,
         "cowardice": false,
         "self_defense": true,
         "hunting": true,

src/agent/commands/index.js

@@ -14,7 +14,7 @@ export function getCommand(name) {
     return commandMap[name];
 }
 
-const commandRegex = /!(\w+)(?:\(((?:[^)(]+|'[^']*'|"[^"]*")*)\))?/
+const commandRegex = /!(\w+)(?:\(([\s\S]*)\))?/
 const argRegex = /(?:"[^"]*"|'[^']*'|[^,])+/g;
 
 export function containsCommand(message) {