fixed merge issues

This commit is contained in:
MaxRobinsonTheGreat 2023-10-19 22:49:52 -05:00
parent 126537be67
commit 8c5e4406cf
4 changed files with 4 additions and 5 deletions

View file

@ -1,7 +1,5 @@
import { sendRequest } from './utils/gpt.js'; import { sendRequest } from './utils/gpt.js';
import { getHistory, addEvent } from './utils/history.js'; import { getHistory, addEvent } from './utils/history.js';
import { getStats, getInventory, getBlocks, getNearbyPlayers, getNearbyEntities, getCraftable } from './utils/context.js';
import { currentCode, executeCode, writeCode } from './act.js';
import { getCommand, getCommandDocs } from './utils/commands.js'; import { getCommand, getCommandDocs } from './utils/commands.js';

View file

@ -1,6 +1,7 @@
{ {
"type": "module", "type": "module",
"dependencies": { "dependencies": {
"minecraft-data": "^3.46.2",
"mineflayer": "^4.14.0", "mineflayer": "^4.14.0",
"mineflayer-collectblock": "^1.4.1", "mineflayer-collectblock": "^1.4.1",
"mineflayer-pathfinder": "^2.4.4", "mineflayer-pathfinder": "^2.4.4",

View file

@ -1,4 +1,4 @@
import { getStats, getInventory, getBlocks, getNearbyPlayers, getNearbyEntities, getCraftable } from './context.js'; import { getStats, getInventory, getBlocks, getNearbyEntities, getCraftable } from './context.js';
import { currentCode, executeCode, writeCode } from '../act.js'; import { currentCode, executeCode, writeCode } from '../act.js';
const pad = (str) => { const pad = (str) => {
@ -38,7 +38,7 @@ const commandsList = [
name: "!entities", name: "!entities",
description: "Get the nearby players and entities.", description: "Get the nearby players and entities.",
perform: function (bot) { perform: function (bot) {
return pad(getNearbyPlayers(bot) + '\n' + getNearbyEntities(bot)); return pad(getNearbyEntities(bot));
} }
}, },
{ {

View file

@ -179,5 +179,5 @@ export function getNearbyBlockTypes(bot) {
found.push(blocks[i].name); found.push(blocks[i].name);
} }
} }
return Array.from(blockNames); return found;
} }