no good

Author: GenerelSchwerz

examples/staticTest.js

@@ -1,4 +1,4 @@
-const mcVersion = "1.21.4"
+const mcVersion = "1.8.9"
 
 function stringifyItem(registry, item) {
   const mdItem = registry.items[item.id]
@@ -32,7 +32,8 @@ async function main(mcVersion) {
   const wantedAmount = parseInt(process.argv[3]) || 1
 
   const sticks = {id: mcData.itemsByName[wantedItemName].id, count: wantedAmount}
-  const plan = crafter(sticks)
+  const plan = crafter(sticks, {availableItems: [{id: mcData.itemsByName.log.id, count: 2}],multipleRecipes: true})
+  // const plan = crafter(sticks)
 
   console.log(beautifyPlan(mcData, plan))
 }

examples/staticTest.ts

@@ -0,0 +1,65 @@
+import minecraftData from 'minecraft-data';
+
+interface Item {
+  id: number;
+  count: number;
+}
+
+interface Recipe {
+  ingredients: Item[] | null;
+  delta: Item[];
+  result: Item;
+}
+
+interface RecipeAndAmt {
+  recipe: Recipe;
+  recipeApplications: number;
+}
+
+interface Plan {
+  itemsRequired: Item[];
+  recipesToDo: RecipeAndAmt[];
+}
+
+interface Registry {
+  items: { [key: number]: { name: string } };
+  itemsByName: { [key: string]: { id: number } };
+}
+
+function stringifyItem(registry: Registry, item: Item): string {
+  const mdItem = registry.items[item.id];
+  return `${mdItem.name} x ${item.count}`;
+}
+
+function beautifyPlan(registry: Registry, plan: Plan): string {
+  const itemsRequired = plan.itemsRequired.filter(i => i.count > 0).map(stringifyItem.bind(null, registry)).join(", ");
+  const plans = plan.recipesToDo.map(recipeAndAmt => {
+    const { recipeApplications, recipe } = recipeAndAmt;
+    
+    if (recipe.ingredients != null) {
+      const items = recipe.ingredients.map(stringifyItem.bind(null, registry)).join(", ");
+      return `${items} => ${stringifyItem(registry, recipe.result)}  (x${recipeApplications})`;
+    } else {
+      const items = recipe.delta.filter(i => i.count < 0).map(stringifyItem.bind(null, registry)).join(", ");
+      return `${items} => ${stringifyItem(registry, recipe.result)}  (x${recipeApplications})`;
+    }
+  }).join("\n\t");
+
+  return `Items required:\n\t${itemsRequired}\nPlans:\n\t${plans}`;
+}
+
+async function main(mcVersion: string): Promise<void> {
+  const mcData = minecraftData(mcVersion);
+  const crafter = await (await import("../src")).buildStatic(mcData); // buildStatic is async
+
+  const wantedItemName = process.argv[2] || "wooden_pickaxe";
+  const wantedAmount = parseInt(process.argv[3]) || 1;
+
+  const sticks: Item = { id: mcData.itemsByName[wantedItemName].id, count: wantedAmount };
+  const plan = crafter(sticks, {availableItems: [{id: mcData.itemsByName.oak_log.id, count: 2}],multipleRecipes: true})
+//   const plan = crafter(sticks);
+
+  console.log(beautifyPlan(mcData, plan));
+}
+
+(async () => main("1.21.4"))();

examples/test.js

@@ -1,9 +1,9 @@
 const mineflayer = require("mineflayer")
 
-const crafter = require("mineflayer-crafting-util").plugin
+const crafter = require("../lib").plugin
 
 const bot = mineflayer.createBot({
-    host: "localhost", // optional
+    host: process.argv[2], // optional
     port: 25565,       // optional
     username: "bot"
 })
@@ -142,11 +142,14 @@ bot.once("spawn", () => {
                     }
 
                 }
+                let idx = 0;
                 console.log(plan2.itemsRequired.map(stringifyItem).join(", "))
+                console.log(plan2.recipesToDo)
                 for (const info of plan2.recipesToDo) {
-                    console.log(info.recipe.delta.map(stringifyItem).join(", "))
+                    console.log(idx, info.recipe.delta.map(stringifyItem).join(", "))
                     await bot.chat(`Crafting ${bot.registry.items[info.recipe.result.id].name} x ${info.recipe.result.count}`)
                     await bot.craft(info.recipe, info.recipeApplications, craftingTable)
+                    idx++;
                     await bot.waitForTicks(10)
                 }
 

src/craftingInjection.ts

@@ -17,7 +17,7 @@ export function _build(Recipe: typeof PRecipe): CraftingFunc {
     target = item.count
   ): { success: boolean; itemsRequired: Item[]; recipesToDo: Array<{ recipeApplications: number; recipe: PRecipe }> } {
     const id = item.id;
-    const recipes = Recipe.find(id, null);
+    let recipes = Recipe.find(id, null);
 
     const availableItems = opts.availableItems;
     const includeRecursion = opts.includeRecursion ?? false;
@@ -34,6 +34,10 @@ export function _build(Recipe: typeof PRecipe): CraftingFunc {
       recipe: PRecipe;
     }> = [];
 
+    // disregard recipes that combine the item itself back together, as that is pointless for our usecase.
+    recipes = recipes.filter((r) => r.delta.slice(0, -1).some((e) => e.id !== id));
+
+
     if (availableItems !== undefined) {
       matchingItem = availableItems.find((e) => e.id === id && e.count >= target);
       if (matchingItem != null) {
@@ -53,13 +57,18 @@ export function _build(Recipe: typeof PRecipe): CraftingFunc {
         return { success: false, itemsRequired: [item], recipesToDo: [] };
       }
 
-      seen.set(id, item);
+      seen.set(id, item); 
 
-      recipeWanted = recipes.find((r) =>
-        r.delta.slice(0, -1).every((e) => (availableItems.find((i) => i.id === e.id)?.count ?? 0) >= -e.count)
+      recipeWanted = recipes.find((r) => {
+        if (r.ingredients != null) return r.ingredients.every(e=>(availableItems.find(i=>i.id === e.id)?.count ?? 0) >= -e.count)
+        else return r.delta.slice(0, -1).every((e) => (availableItems.find((i) => i.id === e.id)?.count ?? 0) >= -e.count)
+      }
+       
       );
 
+
       if (recipeWanted != null) {
+      
       } else {
         // since no recipes exist with all items available, search for the recipe with the most amount of items available inline
 
@@ -141,10 +150,10 @@ export function _build(Recipe: typeof PRecipe): CraftingFunc {
             for (const toDo of test.recipesToDo) {
               for (const ing of toDo.recipe.delta) {
                 const index = currentItems.findIndex((e) => e.id === ing.id);
-                const num = (currentItems[index]?.count ?? 0) + ing.count * toDo.recipeApplications;
-                if (num < 0) { // this should never happen, but just in case.
-                  return { success: false, itemsRequired: [item], recipesToDo: [] };
-                }
+                // const num = (currentItems[index]?.count ?? 0) + ing.count * toDo.recipeApplications;
+                // if (num < 0) { // this should never happen, but just in case.
+                //   return { success: false, itemsRequired: [item], recipesToDo: [] };
+                // }
                 if (index !== -1) {
                   currentItems[index].count += ing.count * toDo.recipeApplications;
                 } else {
@@ -188,7 +197,7 @@ export function _build(Recipe: typeof PRecipe): CraftingFunc {
       }
     } else {
       // TODO : should be replaced by smelting recipe data
-      const found = recipes.find((r) => r.result.count >= 1);
+      const found = recipes.find((r) => r.result.count > 1);
       recipeWanted = found ?? recipes[0];
 
       if (recipes.length == 0 || gettableItems.includes(id)) {
@@ -257,6 +266,8 @@ export function _build(Recipe: typeof PRecipe): CraftingFunc {
 
     const ret = _newCraft(item, opts, seen);
 
+    console.log('internal', ret)
+
     const availableItems = opts.availableItems;
 
     const ret1 = ret as CraftingPlan;