Merge branch 'main' into procedural_generation_save

andy.json

@@ -1,7 +1,7 @@
 {
     "name": "andy",
 
-    "model": "gpt-4o",
+    "model": "gpt-4o-mini",
 
     "conversation_examples": [
         [

jill.json

@@ -1,7 +1,6 @@
 {
     "name": "jill",
-
+    "model": "gpt-4o-mini",
-    "model": "gpt-4o",
 
     "conversation_examples": [
         [

src/agent/agent.js

@@ -668,7 +668,6 @@ export class Agent {
         this.history.save();
         process.exit(code);
     }
-
     async checkTaskDone() {
         if (this.task.data) {
             let res = this.task.isDone();

src/agent/task_types/cooking_tasks.js

@@ -332,6 +332,8 @@ export class CookingTaskInitiator {
                     ['minecraft:cooked_mutton', 64],
                     ['minecraft:cooked_salmon', 64],
                     ['minecraft:cooked_cod', 64]
+                    ['minecraft:gold_ingot', 64],
+                    ['minecraft:oak_planks', 64],
                 ];
 
                 // Fill the chest with random cooking items

src/agent/tasks.js

@@ -26,6 +26,7 @@ function checkItemPresence(data, agent) {
     function isTargetDictionaryWithQuantities(target) {
         return typeof target === 'object' && 
                !Array.isArray(target) && 
+
                target !== null &&
                Object.values(target).every(value => typeof value === 'number');
     }
@@ -94,7 +95,6 @@ function checkItemPresence(data, agent) {
         for (const [item, requiredCount] of Object.entries(requiredQuantities)) {
             const itemName = item.toLowerCase();
             const currentCount = inventoryCount[itemName] || 0;
-            
             if (currentCount < requiredCount) {
                 allTargetsMet = false;
                 missingItems.push({
@@ -158,16 +158,17 @@ export class Task {
             }
             this.taskTimeout = this.data.timeout || 300;
             this.taskStartTime = Date.now();
+            // Set validator based on task_type
 
             if (this.task_type === 'construction') {
                 this.validator = new ConstructionTaskValidator(this.data, this.agent);
             } else if (this.task_type === 'cooking' || this.task_type === 'techtree') {
                 this.validator = new CookingCraftingTaskValidator(this.data, this.agent);
+
             } else {
                 this.validator = null;
             }
 
-            
             if (this.data.blocked_actions) {
                 this.blocked_actions = this.data.blocked_actions[this.agent.count_id.toString()] || [];
             } else {
@@ -272,7 +273,6 @@ export class Task {
         } else {
             this.initiator = null;
         }
-
         await this.teleportBots();
 
         //wait for a bit so bots are teleported
@@ -362,7 +362,6 @@ export class Task {
             console.log(`Teleporting ${this.name} to human ${human_player_name}`)
             bot.chat(`/tp ${this.name} ${human_player_name}`)
         }
-        
         await new Promise((resolve) => setTimeout(resolve, 200));
 
         // now all bots are teleport on top of each other (which kinda looks ugly)
@@ -376,7 +375,6 @@ export class Task {
         */
 
 
-
         if (this.data.type !== 'construction') {
             const pos = getPosition(bot);
             const xOffset = getRandomOffset(5);
@@ -394,7 +392,6 @@ export class Task {
             }
         }
 
-
         if (this.data.type === 'construction'){
             //Ensures construction is cleaned out first. -> relies on cheats which are turned off?
             if (this.blueprint){
@@ -412,46 +409,3 @@ export class Task {
         }
     }
 }
-
-export function giveBlueprint(agent, blueprint) {
-    let bot = agent.bot;
-    let name = agent.name;
-    let blueprint_name = blueprint.name;
-    let blueprint_count = blueprint.count;
-    bot.chat(`/clear ${name}`);
-    console.log(`Cleared ${name}'s inventory.`);
-    bot.chat(`/give ${name} ${blueprint_name} ${blueprint_count}`);
-    console.log(`Gave ${name} ${blueprint_count} ${blueprint_name}(s).`);
-}
-
-/**
- * Auto-builds blueprint in minecraft world
- * @param agent
- * @param blueprint must be of the blueprint class
- */
-export function buildBlueprint(agent, blueprint){
-    let bot = agent.bot
-    const result = blueprint.autoBuild();
-    // const result = clearHouse(blueprint)
-    const commands = result.commands;
-    const nearbyPosition = result.nearbyPosition;
-    for (const command of commands) {
-        bot.chat(command);
-    }
-}
-
-
-/**
- * auto-deletes a built blueprint
- * @param agent
- * @param blueprint must be of the blueprint class
- */
-export function deleteBlueprint(agent, blueprint){
-    let bot = agent.bot
-    const result = blueprint.autoDelete()
-    const commands = result.commands;
-    const nearbyPosition = result.nearbyPosition;
-    for (const command of commands) {
-        bot.chat(command);
-    }
-}