blockmine 1.25.0 → 1.27.0

package/backend/src/core/nodes/inventory/equip.js

@@ -1,45 +1,54 @@
-/**
- * inventory:equip - Экипировать предмет
- */
-async function evaluate(node, pinId, context, helpers) {
-  const bot = context.bot;
-  const itemName = await helpers.resolvePinValue(node, 'itemName');
-  const destination = (await helpers.resolvePinValue(node, 'destination')) || 'hand';
-
-  if (pinId === 'exec') {
-    return true; // Exec output
-  }
-
-  if (!bot?.inventory || !itemName) {
-    if (pinId === 'success') return false;
-    return null;
-  }
-
-  try {
-    // Ищем предмет в инвентаре
-    const searchName = itemName.toLowerCase().replace('minecraft:', '');
-    const item = bot.inventory.items().find(i =>
-      i.name.toLowerCase().includes(searchName) ||
-      i.displayName?.toLowerCase().includes(searchName)
-    );
-
-    if (!item) {
-      if (pinId === 'success') return false;
-      return null;
-    }
-
-    // Экипируем предмет
-    await bot.equip(item, destination);
-
-    if (pinId === 'success') {
-      return true;
-    }
-  } catch (error) {
-    console.error('[inventory:equip] Error:', error.message);
-    if (pinId === 'success') return false;
-  }
-
-  return null;
-}
-
-module.exports = { evaluate };
+async function execute(node, context, helpers) {
+  const { resolvePinValue, traverse, memo } = helpers;
+  const bot = context.bot;
+
+  if (!bot) {
+    memo.set(`${node.id}:success`, false);
+    await traverse(node, 'exec');
+    return;
+  }
+
+  const itemName = await resolvePinValue(node, 'itemName', node.data?.itemName);
+  const destination = await resolvePinValue(node, 'destination', node.data?.destination) || 'hand';
+
+  if (!itemName) {
+    memo.set(`${node.id}:success`, false);
+    await traverse(node, 'exec');
+    return;
+  }
+
+  try {
+    const searchName = itemName.toLowerCase().replace('minecraft:', '');
+    const item = bot.inventory.items().find(i =>
+      i.name.toLowerCase().includes(searchName) ||
+      i.displayName?.toLowerCase().includes(searchName)
+    );
+
+    if (!item) {
+      memo.set(`${node.id}:success`, false);
+      await traverse(node, 'exec');
+      return;
+    }
+
+    await bot.equip(item, destination);
+
+    memo.set(`${node.id}:success`, true);
+    await traverse(node, 'exec');
+  } catch (error) {
+    console.error('[inventory:equip] Error:', error.message);
+    memo.set(`${node.id}:success`, false);
+    await traverse(node, 'exec');
+  }
+}
+
+async function evaluate(node, pinId, context, helpers) {
+  const { memo } = helpers;
+
+  if (pinId === 'success') {
+    return memo.get(`${node.id}:success`) ?? false;
+  }
+
+  return null;
+}
+
+module.exports = { execute, evaluate };

package/backend/src/core/nodes/inventory/select_slot.js

@@ -1,46 +1,48 @@
-/**
- * inventory:select_slot - Выбрать слот хотбара
- */
-async function evaluate(node, pinId, context, helpers) {
-  const bot = context.bot;
-  const slot = await helpers.resolvePinValue(node, 'slot');
-
-  if (pinId === 'exec') {
-    return true; // Exec output
-  }
-
-  if (!bot?.inventory || slot === undefined || slot === null) {
-    if (pinId === 'item') return null;
-    return null;
-  }
-
-  try {
-    // Валидация номера слота (0-8)
-    const slotNumber = Math.max(0, Math.min(8, parseInt(slot)));
-
-    // Устанавливаем выбранный слот
-    bot.setQuickBarSlot(slotNumber);
-
-    if (pinId === 'item') {
-      // Возвращаем предмет в выбранном слоте
-      const item = bot.inventory.slots[slotNumber + 36]; // Хотбар начинается с 36
-      if (!item) return null;
-
-      return {
-        name: item.name,
-        displayName: item.displayName,
-        count: item.count,
-        slot: item.slot,
-        type: item.type,
-        metadata: item.metadata
-      };
-    }
-  } catch (error) {
-    console.error('[inventory:select_slot] Error:', error.message);
-    if (pinId === 'item') return null;
-  }
-
-  return null;
-}
-
-module.exports = { evaluate };
+async function execute(node, context, helpers) {
+  const { resolvePinValue, traverse, memo } = helpers;
+  const bot = context.bot;
+
+  if (!bot) {
+    await traverse(node, 'exec');
+    return;
+  }
+
+  const slot = await resolvePinValue(node, 'slot', node.data?.slot);
+
+  if (slot === undefined || slot === null) {
+    await traverse(node, 'exec');
+    return;
+  }
+
+  try {
+    const slotNumber = Math.max(0, Math.min(8, parseInt(slot)));
+    bot.setQuickBarSlot(slotNumber);
+
+    const item = bot.inventory.slots[slotNumber + 36];
+    memo.set(`${node.id}:item`, item ? {
+      name: item.name,
+      displayName: item.displayName,
+      count: item.count,
+      slot: item.slot,
+      type: item.type,
+      metadata: item.metadata
+    } : null);
+
+    await traverse(node, 'exec');
+  } catch (error) {
+    console.error('[inventory:select_slot] Error:', error.message);
+    await traverse(node, 'exec');
+  }
+}
+
+async function evaluate(node, pinId, context, helpers) {
+  const { memo } = helpers;
+
+  if (pinId === 'item') {
+    return memo.get(`${node.id}:item`) ?? null;
+  }
+
+  return null;
+}
+
+module.exports = { execute, evaluate };

package/backend/src/core/nodes/navigation/follow.js

@@ -1,51 +1,54 @@
-const { goals } = require('mineflayer-pathfinder');
-
-/**
- * navigation:follow - Следовать за игроком
- */
-async function evaluate(node, pinId, context, helpers) {
-  const bot = context.bot;
-
-  if (pinId === 'exec') {
-    return true;
-  }
-
-  if (!bot?.pathfinder) {
-    if (pinId === 'following') return false;
-    return null;
-  }
-
-  const target = await helpers.resolvePinValue(node, 'target');
-  const range = (await helpers.resolvePinValue(node, 'range')) || 3;
-
-  if (!target) {
-    if (pinId === 'following') return false;
-    return null;
-  }
-
-  try {
-    const player = bot.players[target];
-
-    if (!player?.entity) {
-      console.error(`[navigation:follow] Player "${target}" not found or not visible`);
-      if (pinId === 'following') return false;
-      return null;
-    }
-
-    // Используем GoalFollow для непрерывного следования
-    const goal = new goals.GoalFollow(player.entity, range);
-    bot.pathfinder.setGoal(goal, true); // true = dynamic, обновляется при движении цели
-
-    if (pinId === 'following') {
-      return true;
-    }
-  } catch (error) {
-    console.error('[navigation:follow] Error:', error.message);
-
-    if (pinId === 'following') return false;
-  }
-
-  return null;
-}
-
-module.exports = { evaluate };
+const { goals } = require('mineflayer-pathfinder');
+
+async function execute(node, context, helpers) {
+  const { resolvePinValue, traverse, memo } = helpers;
+  const bot = context.bot;
+
+  if (!bot?.pathfinder) {
+    memo.set(`${node.id}:following`, false);
+    await traverse(node, 'exec');
+    return;
+  }
+
+  const target = await resolvePinValue(node, 'target', node.data?.target);
+  const range = await resolvePinValue(node, 'range', node.data?.range) ?? 3;
+
+  if (!target) {
+    memo.set(`${node.id}:following`, false);
+    await traverse(node, 'exec');
+    return;
+  }
+
+  try {
+    const player = bot.players[target];
+
+    if (!player?.entity) {
+      console.error(`[navigation:follow] Player "${target}" not found or not visible`);
+      memo.set(`${node.id}:following`, false);
+      await traverse(node, 'exec');
+      return;
+    }
+
+    const goal = new goals.GoalFollow(player.entity, Number(range));
+    bot.pathfinder.setGoal(goal, true);
+
+    memo.set(`${node.id}:following`, true);
+    await traverse(node, 'exec');
+  } catch (error) {
+    console.error('[navigation:follow] Error:', error.message);
+    memo.set(`${node.id}:following`, false);
+    await traverse(node, 'exec');
+  }
+}
+
+async function evaluate(node, pinId, context, helpers) {
+  const { memo } = helpers;
+
+  if (pinId === 'following') {
+    return memo.get(`${node.id}:following`) ?? false;
+  }
+
+  return null;
+}
+
+module.exports = { execute, evaluate };

package/backend/src/core/nodes/navigation/go_to.js

@@ -1,53 +1,41 @@
-const { goals } = require('mineflayer-pathfinder');
-
-/**
- * navigation:go_to - Идти к указанным координатам
- */
-async function evaluate(node, pinId, context, helpers) {
-  const bot = context.bot;
-
-  if (pinId === 'exec' || pinId === 'exec_failed') {
-    // Exec выходы обрабатываются движком
-    return true;
-  }
-
-  if (!bot?.pathfinder) {
-    if (pinId === 'success') return false;
-    return null;
-  }
-
-  const x = await helpers.resolvePinValue(node, 'x');
-  const y = await helpers.resolvePinValue(node, 'y');
-  const z = await helpers.resolvePinValue(node, 'z');
-  const range = (await helpers.resolvePinValue(node, 'range')) || 1;
-
-  // Используем данные ноды если входы не подключены
-  const targetX = x ?? node.data?.x ?? 0;
-  const targetY = y ?? node.data?.y ?? 64;
-  const targetZ = z ?? node.data?.z ?? 0;
-
-  try {
-    const goal = new goals.GoalNear(targetX, targetY, targetZ, range);
-    await bot.pathfinder.goto(goal);
-
-    if (pinId === 'success') {
-      return true;
-    }
-
-    // Указываем движку какой exec выход активировать
-    context._nextExecPin = 'exec';
-  } catch (error) {
-    console.error('[navigation:go_to] Error:', error.message);
-
-    if (pinId === 'success') {
-      return false;
-    }
-
-    // При ошибке активируем exec_failed
-    context._nextExecPin = 'exec_failed';
-  }
-
-  return null;
-}
-
-module.exports = { evaluate };
+const { goals } = require('mineflayer-pathfinder');
+
+async function execute(node, context, helpers) {
+  const { resolvePinValue, traverse, memo } = helpers;
+  const bot = context.bot;
+
+  if (!bot?.pathfinder) {
+    memo.set(`${node.id}:success`, false);
+    await traverse(node, 'exec_failed');
+    return;
+  }
+
+  const x = await resolvePinValue(node, 'x', node.data?.x) ?? 0;
+  const y = await resolvePinValue(node, 'y', node.data?.y) ?? 64;
+  const z = await resolvePinValue(node, 'z', node.data?.z) ?? 0;
+  const range = await resolvePinValue(node, 'range', node.data?.range) ?? 1;
+
+  try {
+    const goal = new goals.GoalNear(Number(x), Number(y), Number(z), Number(range));
+    await bot.pathfinder.goto(goal);
+
+    memo.set(`${node.id}:success`, true);
+    await traverse(node, 'exec');
+  } catch (error) {
+    console.error('[navigation:go_to] Error:', error.message);
+    memo.set(`${node.id}:success`, false);
+    await traverse(node, 'exec_failed');
+  }
+}
+
+async function evaluate(node, pinId, context, helpers) {
+  const { memo } = helpers;
+
+  if (pinId === 'success') {
+    return memo.get(`${node.id}:success`) ?? false;
+  }
+
+  return null;
+}
+
+module.exports = { execute, evaluate };

package/backend/src/core/nodes/navigation/go_to_entity.js

@@ -1,69 +1,65 @@
-const { goals } = require('mineflayer-pathfinder');
-
-/**
- * navigation:go_to_entity - Идти к сущности
- */
-async function evaluate(node, pinId, context, helpers) {
-  const bot = context.bot;
-
-  if (pinId === 'exec' || pinId === 'exec_failed') {
-    return true;
-  }
-
-  if (!bot?.pathfinder) {
-    if (pinId === 'success') return false;
-    return null;
-  }
-
-  const entityData = await helpers.resolvePinValue(node, 'entity');
-  const range = (await helpers.resolvePinValue(node, 'range')) || 2;
-
-  if (!entityData) {
-    if (pinId === 'success') return false;
-    context._nextExecPin = 'exec_failed';
-    return null;
-  }
-
-  try {
-    // entityData может быть объектом с id или position
-    let targetPos;
-
-    if (entityData.id !== undefined) {
-      // Ищем актуальную сущность по id
-      const entity = bot.entities[entityData.id];
-      if (entity?.position) {
-        targetPos = entity.position;
-      }
-    }
-
-    if (!targetPos && entityData.position) {
-      targetPos = entityData.position;
-    }
-
-    if (!targetPos) {
-      console.error('[navigation:go_to_entity] Entity position not found');
-      if (pinId === 'success') return false;
-      context._nextExecPin = 'exec_failed';
-      return null;
-    }
-
-    const goal = new goals.GoalNear(targetPos.x, targetPos.y, targetPos.z, range);
-    await bot.pathfinder.goto(goal);
-
-    if (pinId === 'success') {
-      return true;
-    }
-
-    context._nextExecPin = 'exec';
-  } catch (error) {
-    console.error('[navigation:go_to_entity] Error:', error.message);
-
-    if (pinId === 'success') return false;
-
-    context._nextExecPin = 'exec_failed';
-  }
-
-  return null;
-}
-
-module.exports = { evaluate };
+const { goals } = require('mineflayer-pathfinder');
+
+async function execute(node, context, helpers) {
+  const { resolvePinValue, traverse, memo } = helpers;
+  const bot = context.bot;
+
+  if (!bot?.pathfinder) {
+    memo.set(`${node.id}:success`, false);
+    await traverse(node, 'exec_failed');
+    return;
+  }
+
+  const entityData = await resolvePinValue(node, 'entity', null);
+  const range = await resolvePinValue(node, 'range', node.data?.range) ?? 2;
+
+  if (!entityData) {
+    memo.set(`${node.id}:success`, false);
+    await traverse(node, 'exec_failed');
+    return;
+  }
+
+  try {
+    let targetPos;
+
+    if (entityData.id !== undefined) {
+      const entity = bot.entities[entityData.id];
+      if (entity?.position) {
+        targetPos = entity.position;
+      }
+    }
+
+    if (!targetPos && entityData.position) {
+      targetPos = entityData.position;
+    }
+
+    if (!targetPos) {
+      console.error('[navigation:go_to_entity] Entity position not found');
+      memo.set(`${node.id}:success`, false);
+      await traverse(node, 'exec_failed');
+      return;
+    }
+
+    const goal = new goals.GoalNear(targetPos.x, targetPos.y, targetPos.z, Number(range));
+    await bot.pathfinder.goto(goal);
+
+    memo.set(`${node.id}:success`, true);
+    await traverse(node, 'exec');
+  } catch (error) {
+    console.error('[navigation:go_to_entity] Error:', error.message);
+    memo.set(`${node.id}:success`, false);
+    await traverse(node, 'exec_failed');
+  }
+}
+
+async function evaluate(node, pinId, context, helpers) {
+  const { memo } = helpers;
+
+  if (pinId === 'success') {
+    return memo.get(`${node.id}:success`) ?? false;
+  }
+
+  return null;
+}
+
+module.exports = { execute, evaluate };