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

Merge pull request #69 from kolbytn/mode-fixes

Browse source 
Mode Fixes
This commit is contained in:
Kolby Nottingham 2024-05-04 14:32:25 -07:00 • committed by GitHub
commit a12cc7ab09
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/agent/agent.js
View file

@ -188,6 +188,7 @@ export class Agent {
}); });
this.bot.on('idle', () => { this.bot.on('idle', () => {
this.bot.clearControlStates(); this.bot.clearControlStates();
this.bot.pathfinder.stop(); // clear any lingering pathfinder
this.bot.modes.unPauseAll(); this.bot.modes.unPauseAll();
this.coder.executeResume(); this.coder.executeResume();
}); });

8
src/agent/library/skills.js
View file

@ -15,7 +15,8 @@ async function autoLight(bot) {
let nearest_torch = world.getNearestBlock(bot, 'torch', 6); let nearest_torch = world.getNearestBlock(bot, 'torch', 6);
if (!nearest_torch) { if (!nearest_torch) {
let has_torch = bot.inventory.items().find(item => item.name === 'torch'); let has_torch = bot.inventory.items().find(item => item.name === 'torch');
if (has_torch) { const curr_block = agent.bot.blockAt(pos);
if (has_torch && curr_block.name === 'air') {
try { try {
log(bot, `Placing torch at ${bot.entity.position}.`); log(bot, `Placing torch at ${bot.entity.position}.`);
return await placeBlock(bot, 'torch', bot.entity.position.x, bot.entity.position.y, bot.entity.position.z); return await placeBlock(bot, 'torch', bot.entity.position.x, bot.entity.position.y, bot.entity.position.z);
@ -771,7 +772,7 @@ export async function avoidEnemies(bot, distance=16) {
* @example * @example
* await skills.avoidEnemies(bot, 8); * await skills.avoidEnemies(bot, 8);
**/ **/
bot.modes.pause('self_preservation'); // prevents damage-on-low-health from interrupting the bot
let enemy = world.getNearestEntityWhere(bot, entity => mc.isHostile(entity), distance); let enemy = world.getNearestEntityWhere(bot, entity => mc.isHostile(entity), distance);
while (enemy) { while (enemy) {
const follow = new pf.goals.GoalFollow(enemy, distance+1); // move a little further away const follow = new pf.goals.GoalFollow(enemy, distance+1); // move a little further away
@ -781,9 +782,10 @@ export async function avoidEnemies(bot, distance=16) {
await new Promise(resolve => setTimeout(resolve, 500)); await new Promise(resolve => setTimeout(resolve, 500));
enemy = world.getNearestEntityWhere(bot, entity => mc.isHostile(entity), distance); enemy = world.getNearestEntityWhere(bot, entity => mc.isHostile(entity), distance);
if (bot.interrupt_code) { if (bot.interrupt_code) {
return false; break;
} }
} }
bot.pathfinder.stop();
log(bot, `Moved ${distance} away from enemies.`); log(bot, `Moved ${distance} away from enemies.`);
return true; return true;
} }

15
src/agent/modes.js
View file

@ -74,7 +74,7 @@ const modes = [
if (enemy && await world.isClearPath(agent.bot, enemy)) { if (enemy && await world.isClearPath(agent.bot, enemy)) {
agent.bot.chat(`Aaa! A ${enemy.name}!`); agent.bot.chat(`Aaa! A ${enemy.name}!`);
execute(this, agent, async () => { execute(this, agent, async () => {
await skills.avoidEnemies(agent.bot, 16); await skills.avoidEnemies(agent.bot, 24);
}); });
} }
} }
@ -86,11 +86,11 @@ const modes = [
on: true, on: true,
active: false, active: false,
update: async function (agent) { update: async function (agent) {
const enemy = world.getNearestEntityWhere(agent.bot, entity => mc.isHostile(entity), 9); const enemy = world.getNearestEntityWhere(agent.bot, entity => mc.isHostile(entity), 8);
if (enemy && await world.isClearPath(agent.bot, enemy)) { if (enemy && await world.isClearPath(agent.bot, enemy)) {
agent.bot.chat(`Fighting ${enemy.name}!`); agent.bot.chat(`Fighting ${enemy.name}!`);
execute(this, agent, async () => { execute(this, agent, async () => {
await skills.defendSelf(agent.bot, 9); await skills.defendSelf(agent.bot, 8);
}); });
} }
} }
@ -155,9 +155,12 @@ const modes = [
if (torches.length > 0) { if (torches.length > 0) {
const torch = torches[0]; const torch = torches[0];
const pos = agent.bot.entity.position; const pos = agent.bot.entity.position;
execute(this, agent, async () => { const curr_block = agent.bot.blockAt(pos);
await skills.placeBlock(agent.bot, torch.name, pos.x, pos.y, pos.z); if (curr_block.name === 'air') {
}); execute(this, agent, async () => {
await skills.placeBlock(agent.bot, torch.name, pos.x, pos.y, pos.z);
});
}
} }
} }
} }

2
src/utils/mcdata.js
View file

@ -68,7 +68,7 @@ export function initBot(username) {
export function isHuntable(mob) { export function isHuntable(mob) {
if (!mob || !mob.name) return false; if (!mob || !mob.name) return false;
const animals = ['chicken', 'cod', 'cow', 'llama', 'mooshroom', 'pig', 'pufferfish', 'rabbit', 'salmon', 'sheep', 'squid', 'tropical_fish', 'turtle']; const animals = ['chicken', 'cow', 'llama', 'mooshroom', 'pig', 'rabbit', 'sheep'];
return animals.includes(mob.name.toLowerCase()) && !mob.metadata[16]; // metadata 16 is not baby return animals.includes(mob.name.toLowerCase()) && !mob.metadata[16]; // metadata 16 is not baby
} }