Merge pull request #614 from mindcraft-bots/develop

New Release

Author: MaxRobinsonTheGreat

Dockerfile

@@ -13,7 +13,7 @@ RUN apt-get -y install python3-boto3
 RUN apt-get -y install python3-tqdm
 RUN apt-get -y install tmux
 
-RUN git clone https://github.com/kolbytn/mindcraft.git /mindcraft
+RUN git clone https://github.com/mindcraft-bots/mindcraft.git /mindcraft
 WORKDIR /mindcraft
 COPY ./server_data.zip /mindcraft
 RUN unzip server_data.zip
@@ -48,4 +48,4 @@ RUN ./aws/install
 
 VOLUME /data
 
-EXPOSE 8000
+EXPOSE 8000

README.md

@@ -2,7 +2,7 @@
 
 Crafting minds for Minecraft with LLMs and [Mineflayer!](https://prismarinejs.github.io/mineflayer/#/)
 
-[FAQ](https://github.com/kolbytn/mindcraft/blob/main/FAQ.md) | [Discord Support](https://discord.gg/mp73p35dzC) | [Video Tutorial](https://www.youtube.com/watch?v=gRotoL8P8D8) | [Blog Post](https://kolbynottingham.com/mindcraft/) | [Contributor TODO](https://github.com/users/kolbytn/projects/1) | [Paper Website](https://mindcraft-minecollab.github.io/index.html) | [MineCollab](https://github.com/kolbytn/mindcraft/blob/main/minecollab.md) 
+[FAQ](https://github.com/mindcraft-bots/mindcraft/blob/main/FAQ.md) | [Discord Support](https://discord.gg/mp73p35dzC) | [Video Tutorial](https://www.youtube.com/watch?v=gRotoL8P8D8) | [Blog Post](https://kolbynottingham.com/mindcraft/) | [Contributor TODO](https://github.com/users/kolbytn/projects/1) | [Paper Website](https://mindcraft-minecollab.github.io/index.html) | [MineCollab](https://github.com/mindcraft-bots/mindcraft/blob/main/minecollab.md) 
 
 
 > [!Caution]
@@ -18,7 +18,7 @@ Do not connect this bot to public servers with coding enabled. This project allo
 
 1. Make sure you have the requirements above.
 
-2. Clone or download this repository (big green button) 'git clone https://github.com/kolbytn/mindcraft.git'
+2. Clone or download this repository (big green button) 'git clone https://github.com/mindcraft-bots/mindcraft.git'
 
 3. Rename `keys.example.json` to `keys.json` and fill in your API keys (you only need one). The desired model is set in `andy.json` or other profiles. For other models refer to the table below.
 
@@ -28,7 +28,7 @@ Do not connect this bot to public servers with coding enabled. This project allo
 
 6. Run `node main.js` from the installed directory
 
-If you encounter issues, check the [FAQ](https://github.com/kolbytn/mindcraft/blob/main/FAQ.md) or find support on [discord](https://discord.gg/mp73p35dzC). We are currently not very responsive to github issues. To run tasks please refer to [Minecollab Instructions](minecollab.md#installation)
+If you encounter issues, check the [FAQ](https://github.com/mindcraft-bots/mindcraft/blob/main/FAQ.md) or find support on [discord](https://discord.gg/mp73p35dzC). We are currently not very responsive to github issues. To run tasks please refer to [Minecollab Instructions](minecollab.md#installation)
 
 ## Tasks
 

package.json

@@ -2,8 +2,8 @@
     "type": "module",
     "dependencies": {
         "@anthropic-ai/sdk": "^0.17.1",
-        "@google/genai": "^1.15.0",
         "@cerebras/cerebras_cloud_sdk": "^1.46.0",
+        "@google/genai": "^1.15.0",
         "@huggingface/inference": "^2.8.1",
         "@mistralai/mistralai": "^1.1.0",
         "canvas": "^3.1.0",
@@ -12,7 +12,7 @@
         "google-translate-api-x": "^10.7.1",
         "groq-sdk": "^0.15.0",
         "minecraft-data": "^3.97.0",
-        "mineflayer": "^4.32.0",
+        "mineflayer": "^4.33.0",
         "mineflayer-armor-manager": "^2.0.1",
         "mineflayer-auto-eat": "^3.3.6",
         "mineflayer-collectblock": "^1.4.1",

patches/mineflayer+4.32.0.patch

@@ -0,0 +1,54 @@
+diff --git a/node_modules/mineflayer/lib/plugins/digging.js b/node_modules/mineflayer/lib/plugins/digging.js
+index 496cf63..813a667 100644
+--- a/node_modules/mineflayer/lib/plugins/digging.js
++++ b/node_modules/mineflayer/lib/plugins/digging.js
+@@ -242,11 +242,14 @@ function inject (bot) {
+       enchantments = enchantments.concat(helmetEnchantments)
+     }
+ 
++    if (block.material === 'incorrect_for_wooden_tool')
++      block.material = 'mineable/pickaxe'
++
+     const creative = bot.game.gameMode === 'creative'
+     return block.digTime(
+       type,
+       creative,
+-      bot.entity.isInWater,
++      false, // isInWater, water calc is bugged, so always false
+       !bot.entity.onGround,
+       enchantments,
+       bot.entity.effects
+diff --git a/node_modules/mineflayer/lib/plugins/inventory.js b/node_modules/mineflayer/lib/plugins/inventory.js
+index 70db312..93d2054 100644
+--- a/node_modules/mineflayer/lib/plugins/inventory.js
++++ b/node_modules/mineflayer/lib/plugins/inventory.js
+@@ -125,10 +125,15 @@ function inject (bot, { hideErrors }) {
+         cursorZ: -1
+       })
+     } else if (bot.supportFeature('useItemWithOwnPacket')) {
++      const yawDeg = -bot.entity.yaw * 180 / Math.PI + 180 // invert + shift
++      const pitchDeg = -bot.entity.pitch * 180 / Math.PI // invert
+       bot._client.write('use_item', {
+         hand: offHand ? 1 : 0,
+         sequence,
+-        rotation: { x: 0, y: 0 }
++        rotation: {
++          x: yawDeg,
++          y: pitchDeg
++        }
+       })
+     }
+   }
+diff --git a/node_modules/mineflayer/lib/plugins/place_block.js b/node_modules/mineflayer/lib/plugins/place_block.js
+index fdaec6b..08983b6 100644
+--- a/node_modules/mineflayer/lib/plugins/place_block.js
++++ b/node_modules/mineflayer/lib/plugins/place_block.js
+@@ -11,7 +11,7 @@ function inject (bot) {
+     let newBlock = bot.blockAt(dest)
+     if (oldBlock.type === newBlock.type) {
+       [oldBlock, newBlock] = await onceWithCleanup(bot, `blockUpdate:${dest}`, {
+-        timeout: 5000,
++        timeout: 500,
+         // Condition to wait to receive block update actually changing the block type, in case the bot receives block updates with no changes
+         // oldBlock and newBlock will both be null when the world unloads
+         checkCondition: (oldBlock, newBlock) => !oldBlock || !newBlock || oldBlock.type !== newBlock.type

patches/mineflayer+4.33.0.patch

@@ -1,7 +1,7 @@
 {
     "cooldown": 3000,
 
-    "conversing": "You are a playful Minecraft bot named $NAME that can converse with players, see, move, mine, build, and interact with the world by using commands.\n$SELF_PROMPT Act human-like as if you were a typical Minecraft player, rather than an AI. Be very brief in your responses, don't apologize constantly, don't give instructions or make lists unless asked, and don't refuse requests. Don't pretend to act, use commands immediately when requested. Do NOT say this: 'Sure, I've stopped.', instead say this: 'Sure, I'll stop. !stop'. Do NOT say this: 'On my way! Give me a moment.', instead say this: 'On my way! !goToPlayer(\"playername\", 3)'. Respond only as $NAME, never output '(FROM OTHER BOT)' or pretend to be someone else. If you have nothing to say or do, respond with an just a tab '\t'. This is extremely important to me, take a deep breath and have fun :)\nSummarized memory:'$MEMORY'\n$STATS\n$INVENTORY\n$COMMAND_DOCS\n$EXAMPLES\nConversation Begin:",
+    "conversing": "You are an AI Minecraft bot named $NAME that can converse with players, see, move, mine, build, and interact with the world by using commands.\n$SELF_PROMPT Be a friendly, casual, effective, and efficient robot. Be very brief in your responses, don't apologize constantly, don't give instructions or make lists unless asked, and don't refuse requests. Don't pretend to act, use commands immediately when requested. Do NOT say this: 'Sure, I've stopped. *stops*', instead say this: 'Sure, I'll stop. !stop'. Respond only as $NAME, never output '(FROM OTHER BOT)' or pretend to be someone else. If you have nothing to say or do, respond with an just a tab '\t'. This is extremely important to me, take a deep breath and have fun :)\nSummarized memory:'$MEMORY'\n$STATS\n$INVENTORY\n$COMMAND_DOCS\n$EXAMPLES\nConversation Begin:",
 
     "coding": "You are an intelligent mineflayer bot $NAME that plays minecraft by writing javascript codeblocks. Given the conversation, use the provided skills and world functions to write a js codeblock that controls the mineflayer bot ``` // using this syntax ```. The code will be executed and you will receive it's output. If an error occurs, write another codeblock and try to fix the problem. Be maximally efficient, creative, and correct. Be mindful of previous actions. Do not use commands !likeThis, only use codeblocks. The code is asynchronous and MUST USE AWAIT for all async function calls, and must contain at least one await. You have `Vec3`, `skills`, and `world` imported, and the mineflayer `bot` is given. Do not import other libraries. Do not use setTimeout or setInterval. Do not speak conversationally, only use codeblocks. Do any planning in comments. This is extremely important to me, think step-by-step, take a deep breath and good luck! \n$SELF_PROMPT\nSummarized memory:'$MEMORY'\n$STATS\n$INVENTORY\n$CODE_DOCS\n$EXAMPLES\nConversation:",
 

profiles/defaults/_default.json

@@ -1,9 +1,9 @@
 {
     "name": "gemini",
 
-    "model": "gemini-2.5-flash",
+    "model": "gemini-2.5-pro",
 
     "speak_model": "google/gemini-2.5-flash-preview-tts/Kore",
 
-    "cooldown": 5000
+    "cooldown": 2000
 }

profiles/gemini.json

@@ -5,7 +5,7 @@
         "model": "gpt-5",
         "params": {
             "reasoning": {
-                "effort": "minimal"
+                "effort": "low"
             }
         }
     }

profiles/gpt.json

@@ -67,6 +67,7 @@ export class Agent {
         });
 
         const spawnTimeout = setTimeout(() => {
+            console.error('Bot has not spawned after 30 seconds. Exiting.');
             process.exit(0);
         }, 30000);
         this.bot.once('spawn', async () => {

src/agent/agent.js

@@ -301,7 +301,7 @@ export const actionsList = [
         {
         name: '!placeHere',
         description: 'Place a given block in the current location. Do NOT use to build structures, only use for single blocks/torches.',
-        params: {'type': { type: 'BlockName', description: 'The block type to place.' }},
+        params: {'type': { type: 'BlockOrItemName', description: 'The block type to place.' }},
         perform: runAsAction(async (agent, type) => {
             let pos = agent.bot.entity.position;
             await skills.placeBlock(agent.bot, type, pos.x, pos.y, pos.z);
@@ -383,9 +383,29 @@ export const actionsList = [
             return 'Self-prompting stopped.';
         }
     },
+    {
+        name: '!showVillagerTrades',
+        description: 'Show trades of a specified villager.',
+        params: {'id': { type: 'int', description: 'The id number of the villager that you want to trade with.' }},
+        perform: runAsAction(async (agent, id) => {
+            await skills.showVillagerTrades(agent.bot, id);
+        })
+    },
+    {
+        name: '!tradeWithVillager',
+        description: 'Trade with a specified villager.',
+        params: {
+            'id': { type: 'int', description: 'The id number of the villager that you want to trade with.' },
+            'index': { type: 'int', description: 'The index of the trade you want executed (1-indexed).', domain: [1, Number.MAX_SAFE_INTEGER] },
+            'count': { type: 'int', description: 'How many times that trade should be executed.', domain: [1, Number.MAX_SAFE_INTEGER] },
+        },
+        perform: runAsAction(async (agent, id, index, count) => {
+            await skills.tradeWithVillager(agent.bot, id, index, count);
+        })
+    },
     {
         name: '!startConversation',
-        description: 'Start a conversation with a player. Use for bots only.',
+        description: 'Start a conversation with a bot. (FOR OTHER BOTS ONLY)',
         params: {
             'player_name': { type: 'string', description: 'The name of the player to send the message to.' },
             'message': { type: 'string', description: 'The message to send.' },
@@ -402,7 +422,7 @@ export const actionsList = [
     },
     {
         name: '!endConversation',
-        description: 'End the conversation with the given player.',
+        description: 'End the conversation with the given bot. (FOR OTHER BOTS ONLY)',
         params: {
             'player_name': { type: 'string', description: 'The name of the player to end the conversation with.' }
         },