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

fixed a couple bugs

Browse source
This commit is contained in:
MaxRobinsonTheGreat 2024-10-15 17:03:51 -05:00
parent 0bf2e7da0e
commit cc6fc66be2
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/agent/commands/index.js
View file

@ -2,7 +2,7 @@ import { getBlockId, getItemId } from "../../utils/mcdata.js";
import { actionsList } from './actions.js'; import { actionsList } from './actions.js';
import { queryList } from './queries.js'; import { queryList } from './queries.js';
const suppressNoDomainWarning = false; let suppressNoDomainWarning = false;
const commandList = queryList.concat(actionsList); const commandList = queryList.concat(actionsList);
const commandMap = {}; const commandMap = {};
@ -114,7 +114,7 @@ function parseCommandMessage(message) {
case 'int': case 'int':
arg = Number.parseInt(arg); break; arg = Number.parseInt(arg); break;
case 'float': case 'float':
arg = Number.parseInt(arg); break; arg = Number.parseFloat(arg); break;
case 'boolean': case 'boolean':
arg = parseBoolean(arg); break; arg = parseBoolean(arg); break;
case 'BlockName': case 'BlockName':
@ -127,7 +127,7 @@ function parseCommandMessage(message) {
throw new Error(`Command '${commandName}' parameter '${paramNames[i]}' has an unknown type: ${param.type}`); throw new Error(`Command '${commandName}' parameter '${paramNames[i]}' has an unknown type: ${param.type}`);
} }
if(arg === null || Number.isNaN(arg)) if(arg === null || Number.isNaN(arg))
return `${paramNames[i]} must be of type ${param.type}.` return `Error: Param '${paramNames[i]}' must be of type ${param.type}.`
if(typeof arg === 'number') { //Check the domain of numbers if(typeof arg === 'number') { //Check the domain of numbers
const domain = param.domain; const domain = param.domain;
@ -139,7 +139,7 @@ function parseCommandMessage(message) {
if (!domain[2]) domain[2] = '[)'; //By default, lower bound is included. Upper is not. if (!domain[2]) domain[2] = '[)'; //By default, lower bound is included. Upper is not.
if(!checkInInterval(arg, ...domain)) { if(!checkInInterval(arg, ...domain)) {
return `${paramNames[i]} must be an element of ${domain[2][0]}${domain[0]}, ${domain[1]}${domain[2][1]}.`; // search_range must be an element of [1,64]. return `Error: Param '${paramNames[i]}' must be an element of ${domain[2][0]}${domain[0]}, ${domain[1]}${domain[2][1]}.`;
//Alternatively arg could be set to the nearest value in the domain. //Alternatively arg could be set to the nearest value in the domain.
} }
} else if (!suppressNoDomainWarning) { } else if (!suppressNoDomainWarning) {

4
src/utils/mcdata.js
View file

@ -259,14 +259,14 @@ export function ingredientsFromPrismarineRecipe(recipe) {
if (recipe.inShape) if (recipe.inShape)
for (const ingredient of recipe.inShape.flat()) { for (const ingredient of recipe.inShape.flat()) {
if(ingredient.id<0) continue; //prismarine-recipe uses id -1 as an empty crafting slot if(ingredient.id<0) continue; //prismarine-recipe uses id -1 as an empty crafting slot
const ingredientName = mc.getItemName(ingredient.id); const ingredientName = getItemName(ingredient.id);
requiredIngedients[ingredientName] ??=0; requiredIngedients[ingredientName] ??=0;
requiredIngedients[ingredientName] += ingredient.count; requiredIngedients[ingredientName] += ingredient.count;
} }
if (recipe.ingredients) if (recipe.ingredients)
for (const ingredient of recipe.ingredients) { for (const ingredient of recipe.ingredients) {
if(ingredient.id<0) continue; if(ingredient.id<0) continue;
const ingredientName = mc.getItemName(ingredient.id); const ingredientName = getItemName(ingredient.id);
requiredIngedients[ingredientName] ??=0; requiredIngedients[ingredientName] ??=0;
requiredIngedients[ingredientName] -= ingredient.count; requiredIngedients[ingredientName] -= ingredient.count;
//Yes, the `-=` is intended. //Yes, the `-=` is intended.