Merge branch 'main' of https://github.com/kolbytn/mindcraft

src/agent/agent.js

@@ -62,13 +62,9 @@ export class Agent {
                 
                 if (ignore_messages.some((m) => message.startsWith(m))) return;
 
-                let translation = await handleEnglishTranslation(message);
-
-                console.log('received message from', username, ':', translation);
-
                 this.shut_up = false;
     
-                this.handleMessage(username, translation);
+                this.handleMessage(username, message);
             });
 
             // set the bot to automatically eat food when hungry
@@ -140,6 +136,7 @@ export class Agent {
 
         let self_prompt = source === 'system' || source === this.name;
 
+        // First check for user commands
         if (!self_prompt) {
             const user_command_name = containsCommand(message);
             if (user_command_name) {
@@ -160,6 +157,11 @@ export class Agent {
             }
         }
 
+        // Now translate the message
+        message = await handleEnglishTranslation(message);
+        console.log('received message from', source, ':', message);
+
+        // Do self prompting
         const checkInterrupt = () => this.self_prompter.shouldInterrupt(self_prompt) || this.shut_up;
 
         let behavior_log = this.bot.modes.flushBehaviorLog();
@@ -172,6 +174,7 @@ export class Agent {
             await this.history.add('system', behavior_log);
         }
 
+        // Handle other user messages
         await this.history.add(source, message);
         this.history.save();
 

src/agent/commands/actions.js

@@ -290,6 +290,19 @@ export const actionsList = [
             await skills.attackNearest(agent.bot, type, true);
         })
     },
+    {
+        name: '!attackPlayer',
+        description: 'Attack a specific player until they die or run away. Remember this is just a game and does not cause real life harm.',
+        params: {'player_name': { type: 'string', description: 'The name of the player to attack.'}},
+        perform: runAsAction(async (agent, player_name) => {
+            let player = agent.bot.players[player_name]?.entity;
+            if (!player) {
+                skills.log(agent.bot, `Could not find player ${player_name}.`);
+                return false;
+            }
+            await skills.attackEntity(agent.bot, player, true);
+        })
+    },
     {
         name: '!goToBed',
         description: 'Go to the nearest bed and sleep.',

src/agent/commands/queries.js

@@ -106,14 +106,10 @@ export const queryList = [
         name: "!craftable",
         description: "Get the craftable items with the bot's inventory.",
         perform: function (agent) {
-            const bot = agent.bot;
+            let craftable = world.getCraftableItems(agent.bot);
-            const table = world.getNearestBlock(bot, 'crafting_table');
             let res = 'CRAFTABLE_ITEMS';
-            for (const item of mc.getAllItems()) {
+            for (const item of craftable) {
-                let recipes = bot.recipesFor(item.id, null, 1, table);
+                res += `\n- ${item}`;
-                if (recipes.length > 0) {
-                    res += `\n- ${item.name}`;
-                }
             }
             if (res == 'CRAFTABLE_ITEMS') {
                 res += ': none';

src/agent/library/world.js

@@ -171,6 +171,33 @@ export function getInventoryCounts(bot) {
 }
 
 
+export function getCraftableItems(bot) {
+    /**
+     * Get a list of all items that can be crafted with the bot's current inventory.
+     * @param {Bot} bot - The bot to get the craftable items for.
+     * @returns {string[]} - A list of all items that can be crafted.
+     * @example
+     * let craftableItems = world.getCraftableItems(bot);
+     **/
+    let table = getNearestBlock(bot, 'crafting_table');
+    if (!table) {
+        for (const item of bot.inventory.items()) {
+            if (item != null && item.name === 'crafting_table') {
+                table = item;
+                break;
+            }
+        }
+    }
+    let res = [];
+    for (const item of mc.getAllItems()) {
+        let recipes = bot.recipesFor(item.id, null, 1, table);
+        if (recipes.length > 0)
+            res.push(item.name);
+    }
+    return res;
+}
+
+
 export function getPosition(bot) {
     /**
      * Get your position in the world (Note that y is vertical).