mirrors/mindcraft
1
0
Fork 0
mirror of https://github.com/kolbytn/mindcraft.git synced 2025-08-04 14:25:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

smelting fixes

Browse source
This commit is contained in:
Kolby Nottingham 2024-02-12 23:42:19 -08:00
parent 6b123c275e
commit 16c8192872
1 changed files with 49 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
src/agent/item_goal.js
View file

@ -3,6 +3,21 @@ import * as world from './library/world.js';
import * as mc from '../utils/mcdata.js'; import * as mc from '../utils/mcdata.js';
const blacklist = [
'coal_block',
'iron_block',
'gold_block',
'diamond_block',
'deepslate',
'blackstone',
'netherite',
'_wood',
'stripped_',
'crimson',
'warped'
]
class ItemNode { class ItemNode {
constructor(manager, wrapper, name) { constructor(manager, wrapper, name) {
this.manager = manager; this.manager = manager;
@ -52,9 +67,15 @@ class ItemNode {
if (this.manager.nodes['furnace'] === undefined) if (this.manager.nodes['furnace'] === undefined)
this.manager.nodes['furnace'] = new ItemWrapper(this.manager, this.wrapper, 'furnace'); this.manager.nodes['furnace'] = new ItemWrapper(this.manager, this.wrapper, 'furnace');
this.prereq = this.manager.nodes['furnace']; this.prereq = this.manager.nodes['furnace'];
if (this.manager.nodes[source_item] === undefined) if (this.manager.nodes[source_item] === undefined)
this.manager.nodes[source_item] = new ItemWrapper(this.manager, this.wrapper, source_item); this.manager.nodes[source_item] = new ItemWrapper(this.manager, this.wrapper, source_item);
this.source = this.manager.nodes[source_item]; if (this.manager.nodes['coal'] === undefined)
this.manager.nodes['coal'] = new ItemWrapper(this.manager, this.wrapper, 'coal');
this.recipe = [
{node: this.manager.nodes[source_item], quantity: 1},
{node: this.manager.nodes['coal'], quantity: 1}
];
return this; return this;
} }
@ -140,7 +161,7 @@ class ItemNode {
if (this.isDone(q)) if (this.isDone(q))
return null; return null;
if (this.isReady()) if (this.isReady())
return this; return {node: this, quantity: q};
for (let child of this.getChildren()) { for (let child of this.getChildren()) {
let res = child.node.getNext(child.quantity); let res = child.node.getNext(child.quantity);
if (res) if (res)
@ -149,20 +170,27 @@ class ItemNode {
return null; return null;
} }
async execute() { async execute(quantity=1) {
if (!this.isReady()) { if (!this.isReady()) {
this.fails += 1; this.fails += 1;
return; return;
} }
let init_quantity = world.getInventoryCounts(this.manager.agent.bot)[this.name] || 0; let inventory = world.getInventoryCounts(this.manager.agent.bot);
let init_quantity = inventory[this.name] || 0;
if (this.type === 'block') { if (this.type === 'block') {
await skills.collectBlock(this.manager.agent.bot, this.source); await skills.collectBlock(this.manager.agent.bot, this.source, quantity);
} else if (this.type === 'smelt') { } else if (this.type === 'smelt') {
await skills.smeltItem(this.manager.agent.bot, this.name); let to_smelt_name = this.recipe[0].node.name;
let to_smelt_quantity = Math.min(quantity, inventory[to_smelt_name] || 1);
await skills.smeltItem(this.manager.agent.bot, to_smelt_name, to_smelt_quantity);
} else if (this.type === 'hunt') { } else if (this.type === 'hunt') {
await skills.attackNearest(this.manager.agent.bot, this.source); for (let i=0; i<quantity; i++) {
res = await skills.attackNearest(this.manager.agent.bot, this.source);
if (!res)
break;
}
} else if (this.type === 'craft') { } else if (this.type === 'craft') {
await skills.craftRecipe(this.manager.agent.bot, this.name); await skills.craftRecipe(this.manager.agent.bot, this.name, quantity);
} }
let final_quantity = world.getInventoryCounts(this.manager.agent.bot)[this.name] || 0; let final_quantity = world.getInventoryCounts(this.manager.agent.bot)[this.name] || 0;
if (final_quantity <= init_quantity) { if (final_quantity <= init_quantity) {
@ -179,7 +207,15 @@ class ItemWrapper {
this.parent = parent; this.parent = parent;
this.methods = []; this.methods = [];
if (!this.containsCircularDependency()) { let blacklisted = false;
for (let match of blacklist) {
if (name.includes(match)) {
blacklisted = true;
break;
}
}
if (!blacklisted && !this.containsCircularDependency()) {
this.createChildren(); this.createChildren();
} }
} }
@ -298,7 +334,9 @@ export class ItemGoal {
return; return;
// Get next goal to execute // Get next goal to execute
let next = goal.getNext(); let next_info = goal.getNext();
let next = next_info.node;
let quantity = next_info.quantity;
// Prevent unnecessary attempts to obtain blocks that are not nearby // Prevent unnecessary attempts to obtain blocks that are not nearby
if (next.type === 'block' && !world.getNearbyBlockTypes(this.agent.bot).includes(next.source) || if (next.type === 'block' && !world.getNearbyBlockTypes(this.agent.bot).includes(next.source) ||
@ -317,7 +355,7 @@ export class ItemGoal {
let init_quantity = world.getInventoryCounts(this.agent.bot)[next.name] || 0; let init_quantity = world.getInventoryCounts(this.agent.bot)[next.name] || 0;
this.agent.coder.interruptible = true; this.agent.coder.interruptible = true;
await this.agent.coder.execute(async () => { await this.agent.coder.execute(async () => {
await next.execute(); await next.execute(quantity);
}, this.timeout); }, this.timeout);
this.agent.coder.interruptible = false; this.agent.coder.interruptible = false;
let final_quantity = world.getInventoryCounts(this.agent.bot)[next.name] || 0; let final_quantity = world.getInventoryCounts(this.agent.bot)[next.name] || 0;