Merge branch 'develop' into pr/756

Author: riqvip

README.md

@@ -168,14 +168,14 @@ Bot profiles are json files (such as `andy.json`) that define:
 
 ## Model Specifications
 
-LLM models can be specified simply as `"model": "gpt-4o"`, or more specifically with `"{api}/{model}"`, like `"openrouter/google/gemini-2.5-pro"`. See all supported APIs [here](#model-customization).
+LLM models can be specified simply as `"model": "gpt-5.4"`, or more specifically with `"{api}/{model}"`, like `"openrouter/google/gemini-2.5-pro"`. See all supported APIs [here](#model-customization).
 
 The `model` field can be a string or an object. A model object must specify an `api`, and optionally a `model`, `url`, and additional `params`. You can also use different models/providers for chatting, coding, vision, embedding, and voice synthesis. See the example below.
 
 ```json
 "model": {
   "api": "openai",
-  "model": "gpt-4o",
+  "model": "gpt-5.4",
   "url": "https://api.openai.com/v1/",
   "params": {
     "max_tokens": 1000,
@@ -184,18 +184,18 @@ The `model` field can be a string or an object. A model object must specify an `
 },
 "code_model": {
   "api": "openai",
-  "model": "gpt-4",
+  "model": "gpt-5.4-mini",
   "url": "https://api.openai.com/v1/"
 },
 "vision_model": {
   "api": "openai",
-  "model": "gpt-4o",
+  "model": "gpt-5.4",
   "url": "https://api.openai.com/v1/"
 },
 "embedding": {
   "api": "openai",
   "url": "https://api.openai.com/v1/",
-  "model": "text-embedding-ada-002"
+  "model": "text-embedding-3-small"
 },
 "speak_model": "openai/tts-1/echo"
 ```

package.json

@@ -4,15 +4,20 @@
     "dependencies": {
         "@anthropic-ai/sdk": "^0.17.1",
         "@cerebras/cerebras_cloud_sdk": "^1.46.0",
+        "@eslint/js": "^9.13.0",
         "@google/genai": "^1.15.0",
         "@huggingface/inference": "^2.8.1",
         "@mistralai/mistralai": "^1.1.0",
         "canvas": "^3.1.0",
         "cheerio": "^1.0.0",
+        "eslint": "^9.13.0",
+        "eslint-plugin-no-floating-promise": "^2.0.0",
         "express": "^4.18.2",
+        "globals": "^15.11.0",
         "google-translate-api-x": "^10.7.1",
         "groq-sdk": "^0.15.0",
         "minecraft-data": "^3.97.0",
+        "minecraft-assets": "^1.16.0",
         "mineflayer": "^4.33.0",
         "mineflayer-armor-manager": "^2.0.1",
         "mineflayer-auto-eat": "^3.3.6",
@@ -43,10 +48,6 @@
         "clean:modules": "node -e \"const fs=require('fs');const p=require('path');['node_modules','package-lock.json'].forEach(f=>{if(fs.existsSync(f)){if(fs.lstatSync(f).isDirectory()){fs.rmSync(f,{recursive:true,force:true});}else{fs.unlinkSync(f);}}});\""
     },
     "devDependencies": {
-        "@eslint/js": "^9.13.0",
-        "eslint": "^9.13.0",
-        "eslint-plugin-no-floating-promise": "^2.0.0",
-        "globals": "^15.11.0",
         "patch-package": "^8.0.0"
     }
 }

profiles/claude_thinker.json

@@ -2,7 +2,7 @@
     "name": "claude_thinker",
 
     "model": {
-        "model": "claude-sonnet-4-20250514",
+        "model": "claude-sonnet-4-6",
         "params": {
             "thinking": {
                 "type": "enabled",

profiles/gemini.json

@@ -1,7 +1,7 @@
 {
     "name": "gemini",
 
-    "model": "gemini-3-flash-preview",
+    "model": "gemini-flash-latest",
 
     "speak_model": "google/gemini-2.5-flash-preview-tts/Kore",
 

settings.js

@@ -57,7 +57,6 @@ const settings = {
     "block_place_delay": 0, // delay between placing blocks (ms) if using newAction. helps avoid bot being kicked by anti-cheat mechanisms on servers.
 
     "log_all_prompts": false, // log ALL prompts to file
-
-}
+};
 
 export default settings;

src/agent/coder.js

@@ -1,10 +1,14 @@
 import { writeFile, readFile, mkdirSync } from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
 import { makeCompartment, lockdown } from './library/lockdown.js';
 import * as skills from './library/skills.js';
 import * as world from './library/world.js';
 import { Vec3 } from 'vec3';
 import {ESLint} from "eslint";
 
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
 export class Coder {
     constructor(agent) {
         this.agent = agent;
@@ -13,11 +17,11 @@ export class Coder {
         this.code_template = '';
         this.code_lint_template = '';
 
-        readFile('./bots/execTemplate.js', 'utf8', (err, data) => {
+        readFile(path.join(__dirname, '../../bots/execTemplate.js'), 'utf8', (err, data) => {
             if (err) throw err;
             this.code_template = data;
         });
-        readFile('./bots/lintTemplate.js', 'utf8', (err, data) => {
+        readFile(path.join(__dirname, '../../bots/lintTemplate.js'), 'utf8', (err, data) => {
             if (err) throw err;
             this.code_lint_template = data;
         });

src/agent/library/skills.js

@@ -27,7 +27,7 @@ async function equipHighestAttack(bot) {
         weapons = bot.inventory.items().filter(item => item.name.includes('pickaxe') || item.name.includes('shovel'));
     if (weapons.length === 0)
         return;
-    weapons.sort((a, b) => a.attackDamage < b.attackDamage);
+    weapons.sort((a, b) => b.attackDamage - a.attackDamage);
     let weapon = weapons[0];
     if (weapon)
         await bot.equip(weapon, 'hand');

src/mindcraft/mindserver.js

@@ -54,6 +54,65 @@ export function createMindServer(host_public = false, port = 8080) {
     const __dirname = path.dirname(fileURLToPath(import.meta.url));
     app.use(express.static(path.join(__dirname, 'public')));
 
+    // Texture proxy: resolve item/block textures using minecraft-assets with version fallback
+    app.get('/assets/item/:agent/:name.png', async (req, res) => {
+        try {
+            const agentName = req.params.agent;
+            const rawName = req.params.name;
+            const itemName = String(rawName).toLowerCase();
+            const conn = agent_connections[agentName];
+            const preferred = conn?.settings?.minecraft_version;
+            const candidates = [];
+            if (preferred && preferred !== 'auto') candidates.push(preferred);
+            candidates.push('1.21.8');
+
+            // Lazy import to avoid ESM/CJS conflicts
+            const mod = await import('minecraft-assets');
+            const mcAssetsFactory = mod.default || mod;
+
+            for (const ver of candidates) {
+                try {
+                    const assets = mcAssetsFactory(ver);
+                    // Prefer items path first, then blocks
+                    const item = assets.items[itemName];
+                    const block = assets.blocks[itemName];
+                    const tex = assets.textureContent?.[itemName]?.texture
+                        || (item ? assets.textureContent?.[itemName]?.texture : null)
+                        || (block ? assets.textureContent?.[itemName]?.texture : null);
+                    if (tex) {
+                        // textureContent already provides a data URL in many versions
+                        if (tex.startsWith('data:image')) {
+                            const base64 = tex.split(',')[1];
+                            const img = globalThis.Buffer.from(base64, 'base64');
+                            res.setHeader('Content-Type', 'image/png');
+                            return res.end(img);
+                        }
+                    }
+                    // If textureContent missing, try static path resolution inside package
+                    // Helps with some strange blocks like Leaf Litter
+                    const guessPaths = [];
+                    const base = assets.directory;
+                    guessPaths.push(path.join(base, 'items', `${itemName}.png`));
+                    guessPaths.push(path.join(base, 'blocks', `${itemName}.png`));
+                    for (const p of guessPaths) {
+                        try {
+                            const fsMod = await import('fs');
+                            const buf = fsMod.readFileSync(p);
+                            res.setHeader('Content-Type', 'image/png');
+                            return res.end(buf);
+                        } catch { /* ignore */ }
+                    }
+                } catch { /* ignore */ }
+            }
+            // Not found, fallback svg
+            res.setHeader('Content-Type', 'image/svg+xml');
+            res.status(404).send('<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><rect width="100%" height="100%" fill="#444"/><text x="50%" y="55%" font-size="12" fill="#bbb" text-anchor="middle">?</text></svg>');
+        } catch (e) {
+            res.setHeader('Content-Type', 'image/svg+xml');
+            res.status(500).send('<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><rect width="100%" height="100%" fill="#444"/><text x="50%" y="55%" font-size="12" fill="#bbb" text-anchor="middle">!</text></svg>');
+        }
+    });
+
     // Socket.io connection handling
     io.on('connection', (socket) => {
         let curAgentName = null;
@@ -191,18 +250,18 @@ export function createMindServer(host_public = false, port = 8080) {
             // wait 2 seconds
             setTimeout(() => {
                 console.log('Exiting MindServer');
-                process.exit(0);
+                globalThis.process.exit(0);
             }, 2000);
 
         });
 
 		socket.on('send-message', (agentName, data) => {
 			if (!agent_connections[agentName]) {
 				console.warn(`Agent ${agentName} not in game, cannot send message via MindServer.`);
-				return
+                return;
 			}
 			try {
-				agent_connections[agentName].socket.emit('send-message', data)
+                agent_connections[agentName].socket.emit('send-message', data);
 			} catch (error) {
 				console.error('Error: ', error);
 			}